Changeset 772:2465bf307591

Timestamp:

11/28/11 10:26:03 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

default

Message:

Added new method getURLFor in urlhandler
2 new behaviors :

• publicGetURLFor
• publicRegisterURL

All changes are backward compatibles, news plugins will be encouraged
to use new urlhandler method for public URLs generation

Files:

• admin/post.php (modified) (1 diff)
• inc/core/class.dc.rs.extensions.php (modified) (3 diffs)
• inc/core/class.dc.xmlrpc.php (modified) (2 diffs)
• inc/public/class.dc.template.php (modified) (6 diffs)
• inc/public/lib.tpl.context.php (modified) (1 diff)
• inc/public/lib.urlhandlers.php (modified) (1 diff)

admin/post.php

@@ -387 +387 @@
      if ($post_id) {
           $preview_url =
-          $core->blog->url.$core->url->getBase('preview').'/'.
-          $core->auth->userID().'/'.
+          $core->url->getURLFor('preview',$core->auth->userID().'/'.
           http::browserUID(DC_MASTER_KEY.$core->auth->userID().$core->auth->getInfo('user_pwd')).
-          '/'.$post->post_url;
+          '/'.$post->post_url);
           echo '<a id="post-preview" href="'.$preview_url.'" class="button">'.__('Preview').'</a> ';
      }

inc/core/class.dc.rs.extensions.php

@@ -188 +188 @@
      public static function getCategoryURL($rs)
      {
-          return $rs->core->blog->url.$rs->core->url->getBase('category').'/'.
-          html::sanitizeURL($rs->cat_url);
+          return $rs->core->url->getURLFor('category',html::sanitizeURL($rs->cat_url));
      }
      
@@ -395 +394 @@
      public static function getTrackbackLink($rs)
      {
-          return $rs->core->blog->url.$rs->core->url->getBase('trackback').'/'.$rs->post_id;
+          return $rs->core->url->getURLFor('trackback',$rs->post_id);
      }
      
@@ -778 +777 @@
           $url = date('Y/m',strtotime($rs->dt));
           
-          return $core->blog->url.$core->url->getBase('archive').'/'.$url;
+          return $core->url->getURLFor('archive',$url);
      }
      

inc/core/class.dc.xmlrpc.php

@@ -694 +694 @@
                     'description' => $rs->cat_title,
                     'categoryName' => $rs->cat_url,
-                    'htmlUrl' => $this->core->blog->url.$this->core->url->getBase('category').'/'.$rs->cat_url,
-                    'rssUrl' => $this->core->blog->url.$this->core->url->getBase('feed').'/category/'.$rs->cat_url.'/rss2'
+                    'htmlUrl' => $this->core->url->getURLFor('category',$rs->cat_url),
+                    'rssUrl' => $this->core->url->getURLFor('feed','category/'.$rs->cat_url.'/rss2')
                );
                
@@ -1072 +1072 @@
           
           $res = array();
-          $url   = $this->core->blog->url.$this->core->url->getBase('tag').'/%s';
-          $f_url = $this->core->blog->url.$this->core->url->getBase('tag_feed').'/%s';
+          $url   = $this->core->url->getURLFor('tag','%s');
+          $f_url = $this->core->url->getURLFor('tag_feed','%s');
           while ($tags->fetch())
           {

inc/public/class.dc.template.php

@@ -742 +742 @@
      {
           $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("archive")').'; ?>';
+          return '<?php echo '.sprintf($f,'$core->url->getURLFor("archive")').'; ?>';
      }
      
@@ -796 +796 @@
           
           $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("feed")."/'.$type.'"').'; ?>';
+          return '<?php echo '.sprintf($f,'$core->url->getURLFor("feed","'.$type.'")').'; ?>';
      }
      
@@ -881 +881 @@
      {
           $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase(\'rsd\')').'; ?>';
+          return '<?php echo '.sprintf($f,'$core->url->getURLFor(\'rsd\')').'; ?>';
      }
      
@@ -1045 +1045 @@
           
           $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("feed")."/category/".'.
-          '$_ctx->categories->cat_url."/'.$type.'"').'; ?>';
+          return '<?php echo '.sprintf($f,'$core->url->getURLFor("feed","category/".'.
+          '$_ctx->categories->cat_url."/'.$type.'")').'; ?>';
      }
      
@@ -1055 +1055 @@
      {
           $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("category")."/".$_ctx->categories->cat_url').'; ?>';
+          return '<?php echo '.sprintf($f,'$core->url->getURLFor("category",$_ctx->categories->cat_url)').'; ?>';
      }
      
@@ -1934 +1934 @@
      {
           $f = $this->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("lang").$_ctx->langs->post_lang').'; ?>';
+          return '<?php echo '.sprintf($f,'$core->url->getURLFor("lang",$_ctx->langs->post_lang)').'; ?>';
      }
      

inc/public/lib.tpl.context.php

@@ -99 +99 @@
      }
      
+     
      # Static methods
      public static function global_filter($str,

inc/public/lib.urlhandlers.php

@@ -15 +15 @@
 {
      public $args;
+     
+     public function getURLFor($type,$value='') {
+          $core =& $GLOBALS['core'];
+          $url = $core->callBehavior("publicGetURLFor",$type,$value);
+          if ($url !== '') {
+               $url = $core->blog->url.$this->getBase($type);
+               if ($value !== '') {
+                    $url .= '/'.$value;
+               }
+          }
+          return $url;
+     }
+     
+     public function register($type,$url,$representation,$handler)
+     {
+          $core =& $GLOBALS['core'];
+          $t = new ArrayObject(array($type,$url,$representation,$handler));
+          $core->callBehavior("publicRegisterURL",$t);
+          parent::register($t[0],$t[1],$t[2],$t[3]);
+     }
      
      public static function p404()