diff --git a/img/img.php b/img/img.php index 855d3e3..9502ab3 100644 --- a/img/img.php +++ b/img/img.php @@ -1,41 +1,53 @@ array(2.path 3.mask))* - - public static function registerFolder($path,$cat,$mask){ - self::$imgfolders[$cat] = array($path,$mask);} - - public static function get($cat = null,$id = null,$returnasjson = false){ - if(!$cat){ - return $returnasjson ? \SYSTEM\LOG\JsonResult::toString(self::$imgfolders) : self::$imgfolders;} - - if(!array_key_exists($cat, self::$imgfolders)){ - throw new \SYSTEM\LOG\ERROR("No matching Cat '".$cat."' found.");} - - $folder = self::getFolder(self::$imgfolders[$cat][0],self::$imgfolders[$cat][1]); - if($id == null){ - return $returnasjson ? \SYSTEM\LOG\JsonResult::toString($folder) : $folder;} - - if(!in_array($id, $folder)){ - throw new \SYSTEM\LOG\ERROR("No matching ID '".$id."' found.");} - - \SYSTEM\HEADER::PNG(); - return file_get_contents(self::$imgfolders[$cat][0].$id); + + public static function registerFolder($path, $cat, $mask) { + self::$imgfolders[$cat] = array($path, $mask); } - - public static function put($cat,$id,$contents){ - throw new \SYSTEM\LOG\ERROR("not implemented");} - - private static function getFolder($folder,$mask){ + + public static function get($cat = null, $id = null, $returnasjson = false) { + if (!$cat) { + return $returnasjson ? \SYSTEM\LOG\JsonResult::toString(self::$imgfolders) : self::$imgfolders; + } + + if (!array_key_exists($cat, self::$imgfolders)) { + throw new \SYSTEM\LOG\ERROR("No matching Cat '" . $cat . "' found."); + } + + $folder = self::getFolder(self::$imgfolders[$cat][0], self::$imgfolders[$cat][1]); + if ($id == null) { + return $returnasjson ? \SYSTEM\LOG\JsonResult::toString($folder) : $folder; + } + + if (!in_array($id, $folder)) { + throw new \SYSTEM\LOG\ERROR("No matching ID '" . $id . "' found."); + } + + \SYSTEM\HEADER::PNG(); + return file_get_contents(self::$imgfolders[$cat][0] . $id); + } + + public static function put($cat, $id, $contents) { + if (!array_key_exists($cat, self::$imgfolders)) { + throw new \SYSTEM\LOG\ERROR("No matching Cat '" . $cat . "' found.");} + return move_uploaded_file($contents, self::$imgfolders[$cat][0].$id); + } + + private static function getFolder($folder, $mask) { $files = array(); - foreach (glob($folder.$mask) as $file) { - $files[] = basename($file);} + foreach (glob($folder . $mask) as $file) { + $files[] = basename($file); + } return $files; } - - public static function getURL($cat,$id=null){ - return \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat='.$cat.'&id='.$id;} - + + public static function getURL($cat, $id = null) { + return \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL) . 'api.php?call=img&cat=' . $cat . '&id=' . $id; + } + } diff --git a/sai/modules/saimod_sys_img/saimod_sys_img.php b/sai/modules/saimod_sys_img/saimod_sys_img.php index 26b7e0f..e6c9237 100644 --- a/sai/modules/saimod_sys_img/saimod_sys_img.php +++ b/sai/modules/saimod_sys_img/saimod_sys_img.php @@ -2,23 +2,30 @@ namespace SYSTEM\SAI; class saimod_sys_img extends \SYSTEM\SAI\SaiModule { + public static function sai_mod__SYSTEM_SAI_saimod_sys_img_action_upload($cat){ + if(!\SYSTEM\IMG\img::put($cat, basename($_FILES['datei']['name']) , $_FILES['datei']['tmp_name'])){ + throw new \SYSTEM\LOG\ERROR("upload problem");} + + throw new \SYSTEM\LOG\ERROR("upload finished sucessful"); + } public static function sai_mod__SYSTEM_SAI_saimod_sys_img(){ //tt $result = ''; - $img_folders = \SYSTEM\IMG\img::get(); - $result .= '
"; + foreach($cat as $img){ //$result .= '