Changeset 2062:b6517fa59aed for inc/admin/prepend.php

Timestamp:

09/24/13 14:03:31 (12 years ago)

Author:

Dsls

Branch:

default

Message:

Made favorite link recognition a bit more intelligent

File:

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

inc/admin/prepend.php

@@ -35 +35 @@
 }
 
-function dc_prepare_url($url) {
-
-     $u = str_replace(array('?','&','/'),array('\?','&','\\/'),$url);
-     return (!strpos($u,'\?') ? 
-          '/'.$u.'$/' :
-          (!strpos($u,'&') ? 
-          '/'.$u.'(\?.*)?$/' :
-          '/'.$u.'(&.*)?$/'));
-}
+function dc_check_active($url) {
+     $u = explode('?',$url,2);
+     if (!preg_match('/'.preg_quote($u[0],"/").'/',$_SERVER['REQUEST_URI'])) {
+          return false;
+     }
+     if (count($u) == 2) {
+          parse_str($u[1],$p);
+          foreach ($p as $k => $v) {
+               if (!isset($_REQUEST[$k]) || $_REQUEST[$k] !== $v) {
+                    return false;
+               }
+          }
+     }
+     return true;
+}
+
 
 function dc_load_locales() {
@@ -357 +364 @@
                          $count++;
                          $_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
-                              preg_match(dc_prepare_url($fav['url']),$_SERVER['REQUEST_URI']),
+                              dc_check_active($fav['url']),
                               (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
                     }
@@ -369 +376 @@
                          $count++;
                          $_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
-                              preg_match(dc_prepare_url($fav['url']),$_SERVER['REQUEST_URI']),
+                              dc_check_active($fav['url']),
                               (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
                     }