Changeset 1773:1f2fd319f35e

Timestamp:

09/10/13 11:09:34 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

My prefs :

• display only unused favs in available favs list
• add a mention for default favorites in available favs list
• ignore hidden iconset folders (name starting with a dot)

File:

• admin/preferences.php (modified) (6 diffs)

admin/preferences.php

@@ -67 +67 @@
      if (($d = @dir($iconsets_root)) !== false) {
           while (($entry = $d->read()) !== false) {
-               if ($entry != '.' && $entry != '..' && is_dir($iconsets_root.'/'.$entry)) {
+               if ($entry != '.' && $entry != '..' && substr($entry, 0, 1) != '.' && is_dir($iconsets_root.'/'.$entry)) {
                     $iconsets_combo[$entry] = $entry;
                }
@@ -553 +553 @@
 
 $count = 0;
+$user_fav = array();
 foreach ($ws->dumpPrefs() as $k => $v) {
      // User favorites only
@@ -566 +567 @@
                     form::checkbox(array('remove[]','fuk-'.$k),$k).__($fav['title']).'</label>'.
                     '</li>';
+               $user_fav[] = $fav['name'];
           }
      }
@@ -596 +598 @@
 }
 
-/*
-echo '<div id="default-favs"><h3>'.__('Default favorites').'</h3>';
-echo '<p>'.__('Those favorites are displayed when My Favorites list is empty.').'</p>';
-$count = 0;
+$default_fav = array();
 foreach ($ws->dumpPrefs() as $k => $v) {
      // Global favorites only
@@ -605 +604 @@
           $fav = unserialize($v['value']);
           if (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)) {
-               if ($count == 0) echo '<ul class="fav-list">';
-               $count++;
-               echo '<li id="fd-'.$k.'">'.
-               '<img src="'.dc_admin_icon_url($fav['small-icon']).'" alt="" /> '.__($fav['title']).'</li>';
-          }
-     }
-}    
-if ($count > 0) echo '</ul>';
-echo '</div>';
-*/
+               $default_fav[] = $fav['name'];
+          }
+     }
+}
 
 echo '</div>'; # /box my-fav
 
 echo '<div class="fieldset" id="available-favs">';
-# Available favorites ------------------------------------- Ici, si possible afficher plutôt les Autres favoris disponibles
+# Available favorites
 echo '<h5>'.__('Available favorites').'</h5>';
 $count = 0;
@@ -633 +626 @@
 foreach ($array as $k => $fav) {
      if (($fav[5] == '*') || $core->auth->check($fav[5],$core->blog->id)) {
-          if ($count == 0) echo '<ul class="fav-list">';
-          $count++;
-          echo '<li id="fa-'.$fav[0].'">'.'<label for="fak-'.$fav[0].'">'.
-               '<img src="'.dc_admin_icon_url($fav[3]).'" alt="" /> '.
-               '<span class="zoom"><img src="'.dc_admin_icon_url($fav[4]).'" alt="" /></span>'.
-               form::checkbox(array('append[]','fak-'.$fav[0]),$k).
-               __($fav[1]).'</label>'.'</li>';
-     }
-}    
+          if (!in_array($fav[0], $user_fav)) {
+               if ($count == 0) echo '<ul class="fav-list">';
+               $count++;
+               echo '<li id="fa-'.$fav[0].'">'.'<label for="fak-'.$fav[0].'">'.
+                    '<img src="'.dc_admin_icon_url($fav[3]).'" alt="" /> '.
+                    '<span class="zoom"><img src="'.dc_admin_icon_url($fav[4]).'" alt="" /></span>'.
+                    form::checkbox(array('append[]','fak-'.$fav[0]),$k).
+                    __($fav[1]).'</label>'.
+                    (in_array($fav[0], $default_fav) ? ' <span class="default-fav">'.__('(default favorite)').'</span>' : '').
+                    '</li>';
+          }
+     }
+}
 if ($count > 0) echo '</ul>';
 echo