Changeset 2849:97e1b334e54b for inc/admin

Timestamp:

12/16/14 11:46:03 (11 years ago)

Author:

Dsls

Branch:

default

Children:

2850:aacd042b1035, 2877:ae86da118440

Message:

Deprecated $core->adminurl->decode, use $core->adminurl->get instead (with urlencode set to false)

Added dcPage::getPF to shortcut plugin file inclusion

Location:

inc/admin

Files:

• lib.dc.adminurl.php (modified) (3 diffs)
• lib.dc.page.php (modified) (1 diff)
• lib.moduleslist.php (modified) (1 diff)
• lib.pager.php (modified) (1 diff)

inc/admin/lib.dc.adminurl.php

@@ -71 +71 @@
       * @param  string $name      URL Name
       * @param  array  $params    query string parameters, given as an associative array
+      * @param  boolean $urlencode set to true if url may not be encoded
       * @param  string $separator separator to use between QS parameters
       * @return string            the forged url
       */
-     public function get($name,$params=array(),$separator='&')
+     public function get($name,$params=array(),$urlencode=true,$separator='&')
      {
           if (!isset($this->urls[$name])) {
                throw new exception ('Unknown URL handler for '.$name);
+          }
+          // compatibility check for old behavior
+          if (!is_bool($urlencode)) {
+               $separator=$urlencode;
+               $urlencode = true;
           }
           $url = $this->urls[$name];
@@ -85 +91 @@
                $u .= '?'.http_build_query($p,'',$separator);
           }
-          return $u;
+          return $urlencode?$u:urldecode($u);
      }
 
      /**
       * retrieves a URL (decoded — useful for echoing) given its name, and optional parameters
+      *
+      * @deprecated should use get(...,true,...) instead
       *
       * @param  string $name      URL Name
@@ -98 +106 @@
      public function decode($name,$params=array(),$separator='&')
      {
-          return urldecode($this->get($name,$params,$separator));
+          return urldecode($this->get($name,$params,false,$separator));
      }
 

inc/admin/lib.dc.page.php

@@ -925 +925 @@
           '<script type="text/javascript" src="js/meta-editor.js"></script>';
      }
+
+     public static function getPF($file) {
+          return $GLOBALS['core']->adminurl->get('load.plugin.file',array('pf' => $file),false);
+     }
 }

inc/admin/lib.moduleslist.php

@@ -621 +621 @@
                          '<img alt="%1$s" title="%1$s" src="%2$s" />',
                          html::escapeHTML($id), file_exists($module['root'].'/icon.png') ?
-                         $this->core->adminurl->decode('load.plugin.file',array('pf' => $id.'/icon.png')) : 'images/module.png'
+                         dcPage::getPF($id.'/icon.png') : 'images/module.png'
                     ).'</td>';
                }

inc/admin/lib.pager.php

@@ -214 +214 @@
      {
           if ($this->core->auth->check('categories',$this->core->blog->id)) {
-               $cat_link = '<a href="'.$this->core->adminurl->decode('admin.category',array('id' => '%s')).'">%s</a>';
+               $cat_link = '<a href="'.$this->core->adminurl->get('admin.category',array('id' => '%s'),false).'">%s</a>';
           } else {
                $cat_link = '%2$s';