Changeset 2852:86651202b279 for inc

Timestamp:

12/16/14 21:59:13 (11 years ago)

Author:

Dsls

Branch:

2.7

Message:

Tuned redirections and admin urls management, should work with media & attachments now
Added adminurl->redirect to avoid confusion in "when to use & and when not to"

Location:

inc/admin

Files:

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

inc/admin/lib.dc.adminurl.php

@@ -75 +75 @@
       * @return string            the forged url
       */
-     public function get($name,$params=array(),$urlencode=true,$separator='&')
+     public function get($name,$params=array(),$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];
@@ -91 +86 @@
                $u .= '?'.http_build_query($p,'',$separator);
           }
-          return $urlencode?$u:urldecode($u);
+          return $u;
      }
+
+
+     /**
+      * retrieves a URL given its name, and optional parameters
+      *
+      * @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 redirect($name,$params=array(),$suffix="")
+     {
+          if (!isset($this->urls[$name])) {
+               throw new exception ('Unknown URL handler for '.$name);
+          }
+          http::redirect($this->get($name,$params,'&').$suffix);
+     }
+
+
+     /**
+      * retrieves a php page given its name, and optional parameters
+      * acts like get, but without the query string, should be used within forms actions
+      *
+      * @param  string $name      URL Name
+      * @return string            the forged url
+      */
+     public function getBase($name)
+     {
+          if (!isset($this->urls[$name])) {
+               throw new exception ('Unknown URL handler for '.$name);
+          }
+          return $this->urls[$name]['url'];
+     }
+
+     /**
+      * forges form hidden fields to pass to a generated <form>. Should be used in combination with
+      * form action retrieved from getBase()
+      *
+      * @param  string $name      URL Name
+      * @param  array  $params    query string parameters, given as an associative array
+      * @return string            the forged form data
+      */
+     public function getHiddenFormFields($name,$params=array())
+     {
+          if (!isset($this->urls[$name])) {
+               throw new exception ('Unknown URL handler for '.$name);
+          }
+          $url = $this->urls[$name];
+          $p = array_merge($url['qs'],$params);
+          $str = '';
+          foreach ((array)$p as $k => $v) {
+               $str .= form::hidden(array($k),$v);
+          }
+          return $str;
+     }
+
+
 
      /**
       * retrieves a URL (decoded — useful for echoing) given its name, and optional parameters
       *
-      * @deprecated should use get(...,true,...) instead
+      * should be used carefully, parameters are no more escaped
       *
       * @param  string $name      URL Name

inc/admin/lib.dc.page.php

@@ -927 +927 @@
 
      public static function getPF($file) {
-          return $GLOBALS['core']->adminurl->get('load.plugin.file',array('pf' => $file),false);
+          return $GLOBALS['core']->adminurl->get('load.plugin.file',array('pf' => $file));
      }
 }

inc/admin/lib.pager.php

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