Changeset 3491:9aba899e5494 for admin/langs.php

Timestamp:

01/02/17 17:03:59 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Switch from functions to closures (PHP 5.3+), fix available favorites order

File:

• admin/langs.php (modified) (4 diffs)

admin/langs.php

@@ -31 +31 @@
 } catch (Exception $e) {}
 
+# Language installation function
+$lang_install = function($file)
+{
+     $zip = new fileUnzip($file);
+     $zip->getList(false,'#(^|/)(__MACOSX|\.svn|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
+
+     if (!preg_match('/^[a-z]{2,3}(-[a-z]{2})?$/',$zip->getRootDir())) {
+          throw new Exception(__('Invalid language zip file.'));
+     }
+
+     if ($zip->isEmpty() || !$zip->hasFile($zip->getRootDir().'/main.po')) {
+          throw new Exception(__('The zip file does not appear to be a valid Dotclear language pack.'));
+     }
+
+
+     $target = dirname($file);
+     $destination = $target.'/'.$zip->getRootDir();
+     $res = 1;
+
+     if (is_dir($destination)) {
+          if (!files::deltree($destination)) {
+               throw new Exception(__('An error occurred during language upgrade.'));
+          }
+          $res = 2;
+     }
+
+     $zip->unzipAll($target);
+     return $res;
+};
+
 # Delete a language pack
 if ($is_writable && !empty($_POST['delete']) && !empty($_POST['locale_id']))
@@ -81 +111 @@
 
           try {
-               $ret_code = dc_lang_install($dest);
+               $ret_code = $lang_install($dest);
           } catch (Exception $e) {
                @unlink($dest);
@@ -117 +147 @@
 
           try {
-               $ret_code = dc_lang_install($dest);
+               $ret_code = $lang_install($dest);
           } catch (Exception $e) {
                @unlink($dest);
@@ -266 +296 @@
 dcPage::helpBlock('core_langs');
 dcPage::close();
-
-# Language installation function
-function dc_lang_install($file)
-{
-     $zip = new fileUnzip($file);
-     $zip->getList(false,'#(^|/)(__MACOSX|\.svn|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
-
-     if (!preg_match('/^[a-z]{2,3}(-[a-z]{2})?$/',$zip->getRootDir())) {
-          throw new Exception(__('Invalid language zip file.'));
-     }
-
-     if ($zip->isEmpty() || !$zip->hasFile($zip->getRootDir().'/main.po')) {
-          throw new Exception(__('The zip file does not appear to be a valid Dotclear language pack.'));
-     }
-
-
-     $target = dirname($file);
-     $destination = $target.'/'.$zip->getRootDir();
-     $res = 1;
-
-     if (is_dir($destination)) {
-          if (!files::deltree($destination)) {
-               throw new Exception(__('An error occurred during language upgrade.'));
-          }
-          $res = 2;
-     }
-
-     $zip->unzipAll($target);
-     return $res;
-}