Changeset 468:572060f80465 for inc/admin/prepend.php

Timestamp:

07/01/11 17:18:14 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

default

Message:

Un favori de plugin désactivé ou désinstallé n'est plus actif dans le menu des favoris et sur le dashboard. Il reste cependant enregistré et l'utilisateur devra le supprimer manuellement si nécessaire.

La fonction de contrôle — bien que fonctionnelle — est à revoir (bouillie de tests)

File:

• inc/admin/prepend.php (modified) (3 diffs)

inc/admin/prepend.php

@@ -21 +21 @@
 
 define('DC_CONTEXT_ADMIN',true);
+
+function dc_valid_fav($url) {
+     global $core;
+     
+     $parts = parse_url($url);
+     if (isset($parts['path'])) {
+          if ($parts['path'] == 'plugin.php') {
+               if (isset($parts['query'])) {
+                    $parts = explode('&', $parts['query']);
+                    $param = explode('=', $parts[0]);
+                    if (($param[0] == 'p') && (isset($param[1]))) {
+                         if (!$core->plugins->moduleExists($param[1])) {
+                              return false;
+                         }
+                    }
+               }
+          }
+     }
+     return true;
+}
 
 function dc_prepare_url($url) {
@@ -309 +329 @@
           // User favorites only
           if (!$v['global']) {
-               $count++;
                $fav = unserialize($v['value']);
-               $_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
-                    preg_match(dc_prepare_url($fav['url']),$_SERVER['REQUEST_URI']),
-                    (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
+               if (dc_valid_fav($fav['url'])) {
+                    $count++;
+                    $_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
+                         preg_match(dc_prepare_url($fav['url']),$_SERVER['REQUEST_URI']),
+                         (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
+               }
           }
      }    
@@ -319 +341 @@
           // Global favorites if any
           foreach ($ws->dumpPrefs() as $k => $v) {
-               $count++;
                $fav = unserialize($v['value']);
-               $_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
-                    preg_match(dc_prepare_url($fav['url']),$_SERVER['REQUEST_URI']),
-                    (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
+               if (dc_valid_fav($fav[url])) {
+                    $count++;
+                    $_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
+                         preg_match(dc_prepare_url($fav['url']),$_SERVER['REQUEST_URI']),
+                         (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
+               }
           }
      }