Changeset 2566:9bf417837888 for inc/public/lib.urlhandlers.php

Timestamp:

11/17/13 20:25:53 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.6

Children:

2567:6c11245cbf04, 2568:61c67a7d17fa

Message:

Add some people in CREDITS, remove trailing spaces and tabs.

File:

• inc/public/lib.urlhandlers.php (modified) (49 diffs)

inc/public/lib.urlhandlers.php

@@ -15 +15 @@
 {
      public $args;
-     
+
      public function getURLFor($type,$value='') {
           $core =& $GLOBALS['core'];
@@ -30 +30 @@
           return $url;
      }
-     
+
      public function register($type,$url,$representation,$handler)
      {
@@ -38 +38 @@
           parent::register($t[0],$t[1],$t[2],$t[3]);
      }
-     
+
      public static function p404()
      {
           throw new Exception ("Page not found",404);
      }
-     
+
      public static function default404($args,$type,$e)
      {
@@ -51 +51 @@
           $_ctx =& $GLOBALS['_ctx'];
           $core = $GLOBALS['core'];
-          
+
           header('Content-Type: text/html; charset=UTF-8');
           http::head(404,'Not Found');
@@ -57 +57 @@
           $_ctx->current_tpl = '404.html';
           $_ctx->content_type = 'text/html';
-          
+
           echo $core->tpl->getData($_ctx->current_tpl);
-          
+
           # --BEHAVIOR-- publicAfterDocument
           $core->callBehavior('publicAfterDocument',$core);
           exit;
      }
-     
+
      protected static function getPageNumber(&$args)
      {
@@ -74 +74 @@
                }
           }
-          
+
           return false;
      }
-     
+
      protected static function serveDocument($tpl,$content_type='text/html',$http_cache=true,$http_etag=true)
      {
           $_ctx =& $GLOBALS['_ctx'];
           $core =& $GLOBALS['core'];
-          
+
           if ($_ctx->nb_entry_per_page === null) {
                $_ctx->nb_entry_per_page = $core->blog->settings->system->nb_post_per_page;
           }
-          
+
           $tpl_file = $core->tpl->getFilePath($tpl);
-          
+
           if (!$tpl_file) {
                throw new Exception('Unable to find template ');
           }
-          
+
           $result = new ArrayObject;
-          
+
           $_ctx->current_tpl = $tpl;
           $_ctx->content_type = $content_type;
@@ -100 +100 @@
           $_ctx->http_etag = $http_etag;
           $core->callBehavior('urlHandlerBeforeGetData',$_ctx);
-          
+
           if ($_ctx->http_cache) {
                $GLOBALS['mod_files'][] = $tpl_file;
@@ -111 +111 @@
           $result['tpl'] = $_ctx->current_tpl;
           $result['blogupddt'] = $core->blog->upddt;
-          
+
           # --BEHAVIOR-- urlHandlerServeDocument
           $core->callBehavior('urlHandlerServeDocument',$result);
-          
+
           if ($_ctx->http_cache && $_ctx->http_etag) {
                http::etag($result['content'],http::getSelfURI());
@@ -120 +120 @@
           echo $result['content'];
      }
-     
+
      public function getDocument()
      {
           $core =& $GLOBALS['core'];
-          
+
           $type = $args = '';
-          
+
           if ($this->mode == 'path_info')
           {
@@ -134 +134 @@
           {
                $part = '';
-               
+
                $qs = $this->parseQueryString();
-               
+
                # Recreates some _GET and _REQUEST pairs
                if (!empty($qs))
@@ -147 +147 @@
                     $_GET = $qs;
                     $_REQUEST = array_merge($qs,$_REQUEST);
-                    
+
                     list($k,$v) = each($qs);
                     if ($v === null) {
@@ -156 +156 @@
                }
           }
-          
+
           $_SERVER['URL_REQUEST_PART'] = $part;
-          
+
           $this->getArgs($part,$type,$this->args);
-          
+
           # --BEHAVIOR-- urlHandlerGetArgsDocument
           $core->callBehavior('urlHandlerGetArgsDocument',$this);
-          
+
           if (!$type)
           {
@@ -175 +175 @@
           }
      }
-     
+
      public static function home($args)
      {
           $n = self::getPageNumber($args);
-          
+
           if ($args && !$n)
           {
-               # "Then specified URL went unrecognized by all URL handlers and 
+               # "Then specified URL went unrecognized by all URL handlers and
                # defaults to the home page, but is not a page number.
                self::p404();
@@ -189 +189 @@
           {
                $core =& $GLOBALS['core'];
-               
+
                if ($n) {
                     $GLOBALS['_page_number'] = $n;
                     $core->url->type = $n > 1 ? 'default-page' : 'default';
                }
-               
+
                if (empty($_GET['q'])) {
                     self::serveDocument('home.html');
@@ -203 +203 @@
           }
      }
-     
+
      public static function search()
      {
           $_ctx =& $GLOBALS['_ctx'];
           $core =& $GLOBALS['core'];
-          
+
           $core->url->type='search';
-          
+
           $GLOBALS['_search'] = !empty($_GET['q']) ? rawurldecode($_GET['q']) : '';
           if ($GLOBALS['_search']) {
@@ -217 +217 @@
                $GLOBALS['_search_count'] = $core->blog->getPosts($params,true)->f(0);
           }
-          
+
           self::serveDocument('search.html');
      }
-     
+
      public static function lang($args)
      {
           $_ctx =& $GLOBALS['_ctx'];
           $core =& $GLOBALS['core'];
-          
+
           $n = self::getPageNumber($args);
           $params = new ArrayObject(array(
                'lang' => $args));
-          
+
           $core->callBehavior('publicLangBeforeGetLangs',$params,$args);
-          
+
           $_ctx->langs = $core->blog->getLangs($params);
-          
+
           if ($_ctx->langs->isEmpty()) {
                # The specified language does not exist.
@@ -247 +247 @@
           }
      }
-     
+
      public static function category($args)
      {
           $_ctx =& $GLOBALS['_ctx'];
           $core =& $GLOBALS['core'];
-          
+
           $n = self::getPageNumber($args);
-          
+
           if ($args == '' && !$n) {
                # No category was specified.
@@ -265 +265 @@
                     'post_type' => 'post',
                     'without_empty' => false));
-               
+
                $core->callBehavior('publicCategoryBeforeGetCategories',$params,$args);
-               
+
                $_ctx->categories = $core->blog->getCategories($params);
-               
+
                if ($_ctx->categories->isEmpty()) {
                     # The specified category does no exist.
@@ -283 +283 @@
           }
      }
-     
+
      public static function archive($args)
      {
           $_ctx =& $GLOBALS['_ctx'];
           $core =& $GLOBALS['core'];
-          
+
           $year = $month = $cat_url = null;
           # Nothing or year and month
@@ -301 +301 @@
                     'month' => $m[2],
                     'type' => 'month'));
-               
+
                $core->callBehavior('publicArchiveBeforeGetDates',$params,$args);
-               
+
                $_ctx->archives = $core->blog->getDates($params);
-               
+
                if ($_ctx->archives->isEmpty()) {
                     # There is no entries for the specified period.
@@ -320 +320 @@
           }
      }
-     
+
      public static function post($args)
      {
@@ -331 +331 @@
                $_ctx =& $GLOBALS['_ctx'];
                $core =& $GLOBALS['core'];
-               
+
                $core->blog->withoutPassword(false);
-               
+
                $params = new ArrayObject(array(
                     'post_url' => $args));
-               
+
                $core->callBehavior('publicPostBeforeGetPosts',$params,$args);
 
                $_ctx->posts = $core->blog->getPosts($params);
-               
+
                $_ctx->comment_preview = new ArrayObject();
                $_ctx->comment_preview['content'] = '';
@@ -349 +349 @@
                $_ctx->comment_preview['preview'] = false;
                $_ctx->comment_preview['remember'] = false;
-               
+
                $core->blog->withoutPassword(true);
-               
+
                if ($_ctx->posts->isEmpty())
                {
@@ -361 +361 @@
                     $post_id = $_ctx->posts->post_id;
                     $post_password = $_ctx->posts->post_password;
-                    
+
                     # Password protected entry
                     if ($post_password != '' && !$_ctx->preview)
@@ -371 +371 @@
                               $pwd_cookie = array();
                          }
-                         
+
                          # Check for match
                          if ((!empty($_POST['password']) && $_POST['password'] == $post_password)
@@ -385 +385 @@
                          }
                     }
-                    
+
                     $post_comment =
                          isset($_POST['c_name']) && isset($_POST['c_mail']) &&
                          isset($_POST['c_site']) && isset($_POST['c_content']) &&
                          $_ctx->posts->commentsActive();
-                    
+
                     # Posting a comment
                     if ($post_comment)
@@ -402 +402 @@
                               exit;
                          }
-                         
+
                          $name = $_POST['c_name'];
                          $mail = $_POST['c_mail'];
@@ -408 +408 @@
                          $content = $_POST['c_content'];
                          $preview = !empty($_POST['preview']);
-                         
+
                          if ($content != '')
                          {
@@ -419 +419 @@
                               $content = $core->HTMLfilter($content);
                          }
-                         
+
                          $_ctx->comment_preview['content'] = $content;
                          $_ctx->comment_preview['rawcontent'] = $_POST['c_content'];
@@ -425 +425 @@
                          $_ctx->comment_preview['mail'] = $mail;
                          $_ctx->comment_preview['site'] = $site;
-                         
+
                          if ($preview)
                          {
                               # --BEHAVIOR-- publicBeforeCommentPreview
                               $core->callBehavior('publicBeforeCommentPreview',$_ctx->comment_preview);
-                              
+
                               $_ctx->comment_preview['preview'] = true;
                          }
@@ -444 +444 @@
                               $cur->comment_status = $core->blog->settings->system->comments_pub ? 1 : -1;
                               $cur->comment_ip = http::realIP();
-                              
+
                               $redir = $_ctx->posts->getURL();
                               $redir .= $core->blog->settings->system->url_scan == 'query_string' ? '&' : '?';
-                              
+
                               try
                               {
@@ -453 +453 @@
                                         throw new Exception(__('You must provide a valid email address.'));
                                    }
-                                   
+
                                    # --BEHAVIOR-- publicBeforeCommentCreate
                                    $core->callBehavior('publicBeforeCommentCreate',$cur);
-                                   if ($cur->post_id) {                         
+                                   if ($cur->post_id) {
                                         $comment_id = $core->blog->addComment($cur);
-                                        
+
                                         # --BEHAVIOR-- publicAfterCommentCreate
                                         $core->callBehavior('publicAfterCommentCreate',$cur,$comment_id);
                                    }
-                                   
+
                                    if ($cur->comment_status == 1) {
                                         $redir_arg = 'pub=1';
@@ -468 +468 @@
                                         $redir_arg = 'pub=0';
                                    }
-                                   
+
                                    header('Location: '.$redir.$redir_arg);
                               }
@@ -478 +478 @@
                          }
                     }
-                    
+
                     # The entry
                     if ($_ctx->posts->trackbacksActive()) {
@@ -487 +487 @@
           }
      }
-     
+
      public static function preview($args)
      {
           $core = $GLOBALS['core'];
           $_ctx = $GLOBALS['_ctx'];
-          
+
           if (!preg_match('#^(.+?)/([0-9a-z]{40})/(.+?)$#',$args,$m)) {
                # The specified Preview URL is malformed.
@@ -513 +513 @@
           }
      }
-     
+
      public static function feed($args)
      {
@@ -521 +521 @@
           $post_id = null;
           $subtitle = '';
-          
+
           $mime = 'application/xml';
-          
+
           $_ctx =& $GLOBALS['_ctx'];
           $core =& $GLOBALS['core'];
-          
+
           if (preg_match('!^([a-z]{2}(-[a-z]{2})?)/(.*)$!',$args,$m)) {
                $params = new ArrayObject(array('lang' => $m[1]));
-               
+
                $args = $m[3];
-               
+
                $core->callBehavior('publicFeedBeforeGetLangs',$params,$args);
-               
+
                $_ctx->langs = $core->blog->getLangs($params);
-               
+
                if ($_ctx->langs->isEmpty()) {
                     # The specified language does not exist.
@@ -544 +544 @@
                }
           }
-          
+
           if (preg_match('#^rss2/xslt$#',$args,$m))
           {
@@ -573 +573 @@
                return;
           }
-          
+
           if ($cat_url)
           {
@@ -579 +579 @@
                     'cat_url' => $cat_url,
                     'post_type' => 'post'));
-               
+
                $core->callBehavior('publicFeedBeforeGetCategories',$params,$args);
-               
+
                $_ctx->categories = $core->blog->getCategories($params);
-               
+
                if ($_ctx->categories->isEmpty()) {
                     # The specified category does no exist.
@@ -589 +589 @@
                     return;
                }
-               
+
                $subtitle = ' - '.$_ctx->categories->cat_title;
           }
@@ -597 +597 @@
                     'post_id' => $post_id,
                     'post_type' => ''));
-                    
+
                $core->callBehavior('publicFeedBeforeGetPosts',$params,$args);
-               
+
                $_ctx->posts = $core->blog->getPosts($params);
-               
+
                if ($_ctx->posts->isEmpty()) {
                     # The specified post does not exist.
@@ -607 +607 @@
                     return;
                }
-               
+
                $subtitle = ' - '.$_ctx->posts->post_title;
           }
-          
+
           $tpl = $type;
           if ($comments) {
@@ -620 +620 @@
           }
           $tpl .= '.xml';
-          
+
           if ($type == 'atom') {
                $mime = 'application/atom+xml';
           }
-          
+
           $_ctx->feed_subtitle = $subtitle;
-          
+
           header('X-Robots-Tag: '.context::robotsPolicy($core->blog->settings->system->robots_policy,''));
           self::serveDocument($tpl,$mime);
@@ -633 +633 @@
           }
      }
-     
+
      public static function trackback($args)
      {
@@ -644 +644 @@
           }
      }
-     
+
      public static function rsd($args)
      {
           $core =& $GLOBALS['core'];
           http::cache($GLOBALS['mod_files'],$GLOBALS['mod_ts']);
-          
+
           header('Content-Type: text/xml; charset=UTF-8');
           echo
@@ -658 +658 @@
           "  <engineLink>http://www.dotclear.org/</engineLink>\n".
           '  <homePageLink>'.html::escapeHTML($core->blog->url)."</homePageLink>\n";
-          
+
           if ($core->blog->settings->system->enable_xmlrpc)
           {
                $u = sprintf(DC_XMLRPC_URL,$core->blog->url,$core->blog->id);
-               
+
                echo
                "  <apis>\n".
@@ -671 +671 @@
                "  </apis>\n";
           }
-          
+
           echo
           "</service>\n".
           "</rsd>\n";
      }
-     
+
      public static function xmlrpc($args)
      {
@@ -685 +685 @@
      }
 }
-?>