Changeset 10334

Timestamp:

Apr 12, 2011, 6:51:57 PM (13 years ago)

Author:

flop25

Message:

traduction EN and FR added
all seems good
todo : test tricky .conf.php

Location:

extensions/Icons_Set

Files:

• admin.php (modified) (4 diffs)
• main.inc.php (modified) (1 diff)

extensions/Icons_Set/admin.php

@@ -3 +3 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-global $template, $conf, $user;
+global $template, $conf, $user, $page;
 
 load_language('plugin.lang', ICONSET_PATH);
-$page['infos'] = array();
+//$page['infos'] = array();
+//$page['errors'] = array();
 
 // +-------------------------------------------------------+
@@ -47 +48 @@
     LIMIT 1';
   pwg_query($query);
-        if (!empty($error_update)) {    array_push($page['infos'], l10n('iconset_error_update').$error_update );         }
+        if (!empty($error_update)) {    array_push($page['errors'], l10n('iconset_error_update').$error_update );        }
         if (!empty($update_ok)) {       array_push($page['infos'], l10n('iconset_update_ok').$update_ok );       }
         load_conf_from_db();
@@ -123 +124 @@
                         continue;
                 }
-                if (!array_key_exists($fs_theme['id'], $conf_themes)) // theme ajouté
+                if (!is_array($conf_themes)) // theme ajouté
                 {
                         $info_new_theme.=$theme_id.'<br>';
                         $conf_themes[$theme_id]=''; // RAZ
                 }
+                elseif (!array_key_exists($fs_theme['id'], $conf_themes)) // theme ajouté
+                {
+                        $info_new_theme.=$theme_id.'<br>';
+                        $conf_themes[$theme_id]=''; // RAZ
+                }
                 if (!empty($conf_themes[$theme_id]) and !in_array($conf_themes[$theme_id], $all_icons))  //  association thème/icon supprimée
                 {
@@ -145 +151 @@
         foreach ($all_icons as $iconset) // icones ajoutées
         {
-                if (!in_array($iconset, $conf_icons))
+                if (is_array($conf_icons))
+                {
+                        if (!in_array($iconset, $conf_icons))
+                        {
+                                $info_new_icon.=$iconset.'<br>';
+                        }
+                }
+                else
                 {
                         $info_new_icon.=$iconset.'<br>';

extensions/Icons_Set/main.inc.php

@@ -33 +33 @@
         $conf_themes=$conf_iconset['themes'];
         $conf_icons=$conf_iconset['icons'];
-        if (isset($user['theme']) and array_key_exists($user['theme'], $conf_themes) and !empty($conf_themes[$user['theme']]) and file_exists(ICONS_PATH.$conf_themes[$user['theme']]) )
+        if (isset($user['theme']) and is_array($conf_themes) and array_key_exists($user['theme'], $conf_themes) and !empty($conf_themes[$user['theme']]) and file_exists(ICONS_PATH.$conf_themes[$user['theme']]) )
         {
                 include ICONS_PATH.$conf_themes[$user['theme']];