diff options
Diffstat (limited to 'admin/include/languages.class.php')
-rw-r--r-- | admin/include/languages.class.php | 77 |
1 files changed, 9 insertions, 68 deletions
diff --git a/admin/include/languages.class.php b/admin/include/languages.class.php index 6a7262bb0..bb9487bec 100644 --- a/admin/include/languages.class.php +++ b/admin/include/languages.class.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2013 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2014 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -57,7 +57,7 @@ class languages case 'activate': if (isset($crt_db_language)) { - array_push($errors, 'CANNOT ACTIVATE - LANGUAGE IS ALREADY ACTIVATED'); + $errors[] = 'CANNOT ACTIVATE - LANGUAGE IS ALREADY ACTIVATED'; break; } @@ -74,13 +74,13 @@ INSERT INTO '.LANGUAGES_TABLE.' case 'deactivate': if (!isset($crt_db_language)) { - array_push($errors, 'CANNOT DEACTIVATE - LANGUAGE IS ALREADY DEACTIVATED'); + $errors[] = 'CANNOT DEACTIVATE - LANGUAGE IS ALREADY DEACTIVATED'; break; } if ($language_id == get_default_language()) { - array_push($errors, 'CANNOT DEACTIVATE - LANGUAGE IS DEFAULT LANGUAGE'); + $errors[] = 'CANNOT DEACTIVATE - LANGUAGE IS DEFAULT LANGUAGE'; break; } @@ -95,12 +95,12 @@ DELETE case 'delete': if (!empty($crt_db_language)) { - array_push($errors, 'CANNOT DELETE - LANGUAGE IS ACTIVATED'); + $errors[] = 'CANNOT DELETE - LANGUAGE IS ACTIVATED'; break; } if (!isset($this->fs_languages[$language_id])) { - array_push($errors, 'CANNOT DELETE - LANGUAGE DOES NOT EXIST'); + $errors[] = 'CANNOT DELETE - LANGUAGE DOES NOT EXIST'; break; } @@ -112,10 +112,7 @@ UPDATE '.USER_INFOS_TABLE.' ;'; pwg_query($query); - if (!$this->deltree(PHPWG_ROOT_PATH.'language/'.$language_id)) - { - $this->send_to_trash(PHPWG_ROOT_PATH.'language/'.$language_id); - } + deltree(PHPWG_ROOT_PATH.'language/'.$language_id, PHPWG_ROOT_PATH.'language/trash'); break; case 'set_default': @@ -371,7 +368,7 @@ UPDATE '.USER_INFOS_TABLE.' and $old_files = file($extract_path.'/obsolete.list', FILE_IGNORE_NEW_LINES) and !empty($old_files)) { - array_push($old_files, 'obsolete.list'); + $old_files[] = 'obsolete.list'; foreach($old_files as $old_file) { $path = $extract_path.'/'.$old_file; @@ -381,10 +378,7 @@ UPDATE '.USER_INFOS_TABLE.' } elseif (is_dir($path)) { - if (!$this->deltree($path)) - { - $this->send_to_trash($path); - } + deltree($path, PHPWG_ROOT_PATH.'language/trash'); } } } @@ -406,59 +400,6 @@ UPDATE '.USER_INFOS_TABLE.' } /** - * delete $path directory - * @param string - path - */ - function deltree($path) - { - if (is_dir($path)) - { - $fh = opendir($path); - while ($file = readdir($fh)) - { - if ($file != '.' and $file != '..') - { - $pathfile = $path . '/' . $file; - if (is_dir($pathfile)) - { - $this->deltree($pathfile); - } - else - { - @unlink($pathfile); - } - } - } - closedir($fh); - return @rmdir($path); - } - } - - /** - * send $path to trash directory - * @param string - path - */ - function send_to_trash($path) - { - $trash_path = PHPWG_ROOT_PATH . 'language/trash'; - if (!is_dir($trash_path)) - { - @mkdir($trash_path); - $file = @fopen($trash_path . '/.htaccess', 'w'); - @fwrite($file, 'deny from all'); - @fclose($file); - } - while ($r = $trash_path . '/' . md5(uniqid(rand(), true))) - { - if (!is_dir($r)) - { - @rename($path, $r); - break; - } - } - } - - /** * Sort functions */ function language_version_compare($a, $b) |