diff --git a/img/img.php b/img/img.php index a4f7d1e..fb6dda8 100644 --- a/img/img.php +++ b/img/img.php @@ -38,9 +38,11 @@ class img { return move_uploaded_file($contents, self::$imgfolders[$cat][0].$id); } - public static function delete($cat, $id) { + public static function delete($cat, $id) { if (!array_key_exists($cat, self::$imgfolders)) { - throw new \SYSTEM\LOG\ERROR("No matching Cat '" . $cat . "' found.");} + throw new \SYSTEM\LOG\ERROR("No matching Cat '" . $cat . "' found.");} + if(!file_exists(self::$imgfolders[$cat][0].$id)){ + return false;} return unlink(self::$imgfolders[$cat][0].$id); } diff --git a/sai/modules/saimod_sys_img/saimod_sys_img.php b/sai/modules/saimod_sys_img/saimod_sys_img.php index 3f9c4ff..a8248b5 100644 --- a/sai/modules/saimod_sys_img/saimod_sys_img.php +++ b/sai/modules/saimod_sys_img/saimod_sys_img.php @@ -2,14 +2,14 @@ namespace SYSTEM\SAI; class saimod_sys_img extends \SYSTEM\SAI\SaiModule { - public static function sai_mod__SYSTEM_SAI_saimod_sys_img_action_delete($cat,$id){ + public static function sai_mod__SYSTEM_SAI_saimod_sys_img_action_del($cat,$id){ if(!\SYSTEM\IMG\img::delete($cat, $id)){ throw new \SYSTEM\LOG\ERROR("delete problem");} return \SYSTEM\LOG\JsonResult::ok(); } - public static function sai_mod__SYSTEM_SAI_saimod_sys_img_action_rename($cat,$id,$newid){ + public static function sai_mod__SYSTEM_SAI_saimod_sys_img_action_rn($cat,$id,$newid){ return \SYSTEM\LOG\JsonResult::ok(); } @@ -22,7 +22,7 @@ class saimod_sys_img extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_img(){ //tt $result = ''; - $img_folders = \SYSTEM\IMG\img::get(); + $img_folders = \SYSTEM\IMG\img::get(); foreach($img_folders as $name=>$folder){ $cat = \SYSTEM\IMG\img::get($name); $result .= "

".$name."

"; @@ -31,11 +31,12 @@ class saimod_sys_img extends \SYSTEM\SAI\SaiModule {
'; $result .= ""; - + $result .= ""; foreach($cat as $img){ //$result .= ''; - $result .= ''.$img.'
'; + $result .= ''; } + $result .= "
'.$img.'
"; } return $result; }