wpstudio/image
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Image::getClassName и проверка на существование изображения по параметру error.

Browse Source
This commit is contained in:
Alexander Demidov
2013-11-29 18:33:05 +04:00
parent ce458afdbd
commit cb1eb1369b
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Image.class.php
View File

@ -20,6 +20,11 @@ abstract class Image extends File
protected static $sizes = array(); protected static $sizes = array();
public static function getClassName()
{
return get_called_class();
}
/** /**
* @param $class string|StdClass * @param $class string|StdClass
* @throws ErrorException * @throws ErrorException

8
Upload.class.php
View File

@ -19,11 +19,11 @@ abstract class Upload
/** /**
* @param $class string|Image * @param $class string|Image
* @param $file array (ex. ['tmp_name' => '...', 'name' => '...', 'type' => '...']) * @param $file array (ex. ['tmp_name' => '...', 'name' => '...', 'error' => '...'])
* @param $force_create_variants bool * @param $force_create_variants bool
* @return Image * @return Image
* @throws ErrorException * @throws ErrorException
* TODO: Рефакторинг: убрать параметр $force_create_variants * TODO: Рефакторинг: убрать параметр $force_create_variants?
*/ */
public static function image($class, $file, $force_create_variants = true) public static function image($class, $file, $force_create_variants = true)
{ {
@ -37,6 +37,9 @@ abstract class Upload
throw new ErrorException('Class "' . $class . '" not exists.'); throw new ErrorException('Class "' . $class . '" not exists.');
} }
Image::checkSubClass($class); Image::checkSubClass($class);
if (isset($file['error']) && $file['error'] != 0) {
return false;
}
$image = is_object($class) ? $class : new $class; $image = is_object($class) ? $class : new $class;
$image->original_filename = $file['name']; $image->original_filename = $file['name'];
$greagwar_image = self::getGreagwarImage($file['tmp_name']); $greagwar_image = self::getGreagwarImage($file['tmp_name']);
@ -47,7 +50,6 @@ abstract class Upload
self::imageVariant($image, $size); self::imageVariant($image, $size);
} }
} }
// В случае, если был передан объект, возвращение результата не имеет значения
return $image; return $image;
} }