Stopped storing the full path name of the images in the database. Should make it easier/possible to move the imageboard later.

This commit is contained in:
Savetheinternet 2010-11-05 20:51:39 +11:00
parent 247772323e
commit 43b62acb44
2 changed files with 12 additions and 5 deletions

View File

@ -81,7 +81,7 @@
// File info // File info
if(!empty($this->file)) { if(!empty($this->file)) {
$built .= '<p class="fileinfo">File: <a href="' . ROOT . $this->file .'">' . basename($this->file) . '</a> <span class="unimportant">(' . $built .= '<p class="fileinfo">File: <a href="' . ROOT . DIR_IMG . $this->file .'">' . $this->file . '</a> <span class="unimportant">(' .
// Filesize // Filesize
format_bytes($this->filesize) . ', ' . format_bytes($this->filesize) . ', ' .
// File dimensions // File dimensions
@ -94,7 +94,7 @@
// Filename // Filename
$built .= ', ' . $this->filename . ')</span></p>' . $built .= ', ' . $this->filename . ')</span></p>' .
// Thumbnail // Thumbnail
'<a href="' . ROOT . $this->file.'"><img src="' . ROOT . $this->thumb.'" style="width:'.$this->thumbx.'px;height:'.$this->thumby.'px;" /></a>'; '<a href="' . ROOT . DIR_IMG . $this->file.'"><img src="' . ROOT . DIR_THUMB . $this->thumb.'" style="width:'.$this->thumbx.'px;height:'.$this->thumby.'px;" /></a>';
} }
// Body // Body
@ -131,7 +131,7 @@
public function build($index=false) { public function build($index=false) {
$built = '<p class="fileinfo">File: <a href="' . ROOT . $this->file .'">' . basename($this->file) . '</a> <span class="unimportant">(' . $built = '<p class="fileinfo">File: <a href="' . ROOT . DIR_IMG . $this->file .'">' . $this->file . '</a> <span class="unimportant">(' .
// Filesize // Filesize
format_bytes($this->filesize) . ', ' . format_bytes($this->filesize) . ', ' .
// File dimensions // File dimensions
@ -144,7 +144,7 @@
// Filename // Filename
$built .= ', ' . $this->filename . ')</span></p>' . $built .= ', ' . $this->filename . ')</span></p>' .
// Thumbnail // Thumbnail
'<a href="' . ROOT . $this->file.'"><img src="' . ROOT . $this->thumb.'" style="width:'.$this->thumbx.'px;height:'.$this->thumby.'px;" /></a>'; '<a href="' . ROOT . DIR_IMG . $this->file.'"><img src="' . ROOT . DIR_THUMB . $this->thumb.'" style="width:'.$this->thumbx.'px;height:'.$this->thumby.'px;" /></a>';
$built .= '<div class="post op"><p class="intro"' . (!$index?' id="' . $this->id . '"':'') . '>'; $built .= '<div class="post op"><p class="intro"' . (!$index?' id="' . $this->id . '"':'') . '>';

View File

@ -180,6 +180,10 @@
$post['thumbheight'] = $thumb['height']; $post['thumbheight'] = $thumb['height'];
} }
// Remove DIR_* before inserting them into the database.
$post['file'] = substr_replace($post['file'], '', 0, strlen(DIR_IMG));
$post['thumb'] = substr_replace($post['thumb'], '', 0, strlen(DIR_THUMB));
// Todo: Validate some more, remove messy code, allow more specific configuration // Todo: Validate some more, remove messy code, allow more specific configuration
// MySQLify // MySQLify
@ -266,6 +270,10 @@
$dump_post['thumbwidth'] = $thumb['width']; $dump_post['thumbwidth'] = $thumb['width'];
$dump_post['thumbheight'] = $thumb['height']; $dump_post['thumbheight'] = $thumb['height'];
// Remove DIR_* before inserting them into the database.
$dump_post['file'] = substr_replace($dump_post['file'], '', 0, strlen(DIR_IMG));
$dump_post['thumb'] = substr_replace($dump_post['thumb'], '', 0, strlen(DIR_THUMB));
// Create the post // Create the post
post($dump_post, false); post($dump_post, false);
} }
@ -303,7 +311,6 @@
} else { } else {
if(!file_exists(FILE_INDEX)) { if(!file_exists(FILE_INDEX)) {
buildIndex(); buildIndex();
sql_close();
} }
header('Location: ' . ROOT . FILE_INDEX, true, 302); header('Location: ' . ROOT . FILE_INDEX, true, 302);