Changeset 692:8b5744a9a3c6

Timestamp:

08/15/11 19:04:50 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

default

Message:

Mise en place de la sélection de l'iconset d'admin via les préférences utilisateur

Files:

• admin/preferences.php (modified) (4 diffs)
• inc/admin/prepend.php (modified) (1 diff)

admin/preferences.php

@@ -41 +41 @@
      $user_ui_hide_std_favicon = $core->auth->user_prefs->interface->hide_std_favicon;
 }
+$user_ui_iconset = @$core->auth->user_prefs->interface->iconset;
 
 $default_tab = !empty($_GET['tab']) ? html::escapeHTML($_GET['tab']) : 'user-profile';
@@ -60 +61 @@
 foreach ($core->blog->getAllPostStatus() as $k => $v) {
      $status_combo[$v] = $k;
+}
+
+$iconsets_combo = array(__('Default') => '');
+$iconsets_root = dirname(__FILE__).'/images/iconset/';
+if (is_dir($iconsets_root) && is_readable($iconsets_root)) {
+     if (($d = @dir($iconsets_root)) !== false) {
+          while (($entry = $d->read()) !== false) {
+               if ($entry != '.' && $entry != '..' && is_dir($iconsets_root.'/'.$entry)) {
+                    $iconsets_combo[$entry] = $entry;
+               }
+          }
+     }
 }
 
@@ -161 +174 @@
                $core->auth->user_prefs->interface->put('hide_std_favicon',!empty($_POST['user_ui_hide_std_favicon']),'boolean',null,true,true);
           }
+          $core->auth->user_prefs->interface->put('iconset',(!empty($_POST['user_ui_iconset']) ? $_POST['user_ui_iconset'] : ''));
           
           # Udate user
@@ -442 +456 @@
 '<p><label for="user_ui_enhanceduploader" class="classic">'.
 form::checkbox('user_ui_enhanceduploader',1,$user_ui_enhanceduploader).' '.
-__('Activate enhanced uploader in media manager').'</label></p>';
+__('Activate enhanced uploader in media manager').'</label></p>'.
+
+'<p><label for="user_ui_iconset">'.__('Iconset:').
+form::combo('user_ui_iconset',$iconsets_combo,$user_ui_iconset).'</label></p>';
 
 if ($core->auth->isSuperAdmin()) {

inc/admin/prepend.php

@@ -60 +60 @@
 function dc_admin_icon_url($img)
 {
-     if (defined('DC_ADMIN_ICONSET') && ($img)) {
+     global $core;
+     
+     $core->auth->user_prefs->addWorkspace('interface');
+     $user_ui_iconset = @$core->auth->user_prefs->interface->iconset;
+     if (($user_ui_iconset) && ($img)) {
           $icon = false;
           if ((preg_match('/^images\/menu\/(.+)$/',$img,$m)) || 
                (preg_match('/^index\.php\?pf=(.+)$/',$img,$m))) {
                if ($m[1]) {
-                    $icon = path::real(dirname(__FILE__).'/../../admin/images/iconset/'.DC_ADMIN_ICONSET.'/'.$m[1],false);
+                    $icon = path::real(dirname(__FILE__).'/../../admin/images/iconset/'.$user_ui_iconset.'/'.$m[1],false);
                     if ($icon !== false) {
                          $allow_types = array('png','jpg','jpeg','gif');
                          if (is_file($icon) && is_readable($icon) && in_array(files::getExtension($icon),$allow_types)) {
-                              return DC_ADMIN_URL.'images/iconset/'.DC_ADMIN_ICONSET.'/'.$m[1];
+                              return DC_ADMIN_URL.'images/iconset/'.$user_ui_iconset.'/'.$m[1];
                          }
                     }