diff --git a/classes/Image.php b/classes/Image.php index 552c827..c5ff505 100644 --- a/classes/Image.php +++ b/classes/Image.php @@ -32,6 +32,7 @@ class Image public static function createAllSizes($imgName, $noWatermark = false, $folder = '') { $sizes = App::getConfig('images'); + $srcdir = App::getBasedir() . 'photos/' . $folder; $uploaddir = App::getBasedir() . 'public/photos/' . $folder; $watermarkDir = App::getBasedir() . 'watermarks/'; @@ -40,7 +41,7 @@ class Image $watermark = $noWatermark ? '' : $watermark; self::imgResize( - $uploaddir . $imgName, // Source - original image + $srcdir . $imgName, // Source - original image $uploaddir . $dir . '/' . $imgName, // Destination $size[0], // X $size[1], // Y diff --git a/controllers/ImagesController.php b/controllers/ImagesController.php index a0d1d7e..9b229d8 100644 --- a/controllers/ImagesController.php +++ b/controllers/ImagesController.php @@ -49,7 +49,7 @@ class ImagesController extends Controller { if (isset($_FILES) && !empty($_FILES) && App::$user) { $userId = App::$user->id; - $uploaddir = App::getBasedir() . 'public/photos/articles/'; + $uploaddir = App::getBasedir() . 'photos/articles/'; $fileName = (string)$_FILES['photo']['name']; $temp = pathinfo($fileName); $extension = strtolower($temp['extension']); diff --git a/controllers/JsonController.php b/controllers/JsonController.php index 1def25c..dae5b09 100644 --- a/controllers/JsonController.php +++ b/controllers/JsonController.php @@ -148,7 +148,7 @@ class JsonController extends Controller $photos = $images = array(); if (empty($errors) && !App::$request['ajax'] && isset($_POST['id']) && (int) $_POST['id']) { $id = (int) $_POST['id']; - $uploaddir = App::getBasedir().'public/photos/'; + $uploaddir = App::getBasedir().'photos/'; if (isset($_FILES) && !empty($_FILES)) { foreach ($_FILES['photos']['name'] as $key => $fileName) { diff --git a/public/photos/_84b8e.jpg b/public/photos/_84b8e.jpg deleted file mode 100644 index 681afde..0000000 Binary files a/public/photos/_84b8e.jpg and /dev/null differ