Changeset 2610:a9bc70b5a85d for inc/public

Timestamp:

12/10/13 12:26:54 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

2608:3365c9df16a6 (diff), 2594:e10cf5fd3749 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2.6.2 commits into default branch

File:

• inc/public/class.dc.template.php (modified) (5 diffs)

inc/public/class.dc.template.php

@@ -235 +235 @@
      }
 
-     protected function compileFile($file)
-     {
-          $fc = file_get_contents($file);
-
-          $this->compile_stack[] = $file;
-
-          # Remove every PHP tags
-          if ($this->remove_php)
-          {
-               $fc = preg_replace('/<\?(?=php|=|\s).*?\?>/ms','',$fc);
-          }
-
-          # Transform what could be considered as PHP short tags
-          $fc = preg_replace('/(<\?(?!php|=|\s))(.*?)(\?>)/ms',
-          '<?php echo "$1"; ?>$2<?php echo "$3"; ?>',$fc);
-
-          # Remove template comments <!-- #... -->
-          $fc = preg_replace('/(^\s*)?<!-- #(.*?)-->/ms','',$fc);
-
-          # Lexer part : split file into small pieces
-          # each array entry will be either a tag or plain text
-          $blocks = preg_split(
-               '#(<tpl:\w+[^>]*>)|(</tpl:\w+>)|({{tpl:\w+[^}]*}})#msu',$fc,-1,
-               PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
-
-          # Next : build semantic tree from tokens.
-          $rootNode = new tplNode();
-          $node = $rootNode;
-          $errors = array();
-          foreach ($blocks as $id => $block) {
-               $isblock = preg_match('#<tpl:(\w+)(?:(\s+.*?)>|>)|</tpl:(\w+)>|{{tpl:(\w+)(\s(.*?))?}}#ms',$block,$match);
-               if ($isblock == 1) {
-                    if (substr($match[0],1,1) == '/') {
-                         // Closing tag, check if it matches current opened node
-                         $tag = $match[3];
-                         if (($node instanceof tplNodeBlock) && $node->getTag() == $tag) {
-                              $node->setClosing();
-                              $node = $node->getParent();
-                         } else {
-                              // Closing tag does not match opening tag
-                              // Search if it closes a parent tag
-                              $search = $node;
-                              while($search->getTag() != 'ROOT' && $search->getTag() != $tag) {
-                                   $search = $search->getParent();
-                              }
-                              if ($search->getTag() == $tag) {
-                                   $errors[] = sprintf(
-                                        __('Did not find closing tag for block <tpl:%s>. Content has been ignored.'),
-                                        html::escapeHTML($node->getTag()));
-                                   $search->setClosing();
-                                   $node = $search->getParent();
-                              } else {
-                                   $errors[]=sprintf(
-                                        __('Unexpected closing tag </tpl:%s> found.'),
-                                        $tag);;
-                              }
-                         }
-                    } elseif (substr($match[0],0,1) == '{') {
-                         // Value tag
-                         $tag = $match[4];
-                         $str_attr = '';
-                         $attr = array();
-                         if (isset($match[6])) {
-                              $str_attr = $match[6];
-                              $attr = $this->getAttrs($match[6]);
-                         }
-                         $node->addChild(new tplNodeValue($tag,$attr,$str_attr));
-                    } else {
-                         // Opening tag, create new node and dive into it
-                         $tag = $match[1];
-                         $newnode = new tplNodeBlock($tag,isset($match[2])?$this->getAttrs($match[2]):array());
-                         $node->addChild($newnode);
-                         $node = $newnode;
-                    }
-               } else {
-                    // Simple text
-                    $node->addChild(new tplNodeText($block));
-               }
-          }
-
-          if (($node instanceof tplNodeBlock) && !$node->isClosed()) {
-               $errors[] = sprintf(
-                    __('Did not find closing tag for block <tpl:%s>. Content has been ignored.'),
-                    html::escapeHTML($node->getTag()));
-          }
-
-          $err = "";
-          if (count($errors) > 0) {
-               $err = "\n\n<!-- \n".
-                    __('WARNING: the following errors have been found while parsing template file :').
-                    "\n * ".
-                    join("\n * ",$errors).
-                    "\n -->\n";
-          }
-
-          return $rootNode->compile($this).$err;
-     }
-
      public function compileBlockNode($tag,$attr,$content)
      {
@@ -343 +245 @@
           $this->core->callBehavior('templateInsideBlock',$this->core,$this->current_tag,$attr,array(&$content));
 
-          if (isset($this->blocks[$this->current_tag])) {
-               $res .= call_user_func($this->blocks[$this->current_tag],$attr,$content);
-          } elseif ($this->unknown_block_handler != null) {
-               $res .= call_user_func($this->unknown_block_handler,$this->current_tag,$attr,$content);
-          }
+          $res .= parent::compileBlockNode($this->current_tag,$attr,$content);
 
           # --BEHAVIOR-- templateAfterBlock
@@ -363 +261 @@
           $res = $this->core->callBehavior('templateBeforeValue',$this->core,$this->current_tag,$attr);
 
-          if (isset($this->values[$this->current_tag])) {
-               $res .= call_user_func($this->values[$this->current_tag],$attr,ltrim($str_attr));
-          } elseif ($this->unknown_value_handler != null) {
-               $res .= call_user_func($this->unknown_value_handler,$this->current_tag,$attr,$str_attr);
-          }
+          $res .= parent::compileValueNode($this->current_tag,$attr,$str_attr);
 
           # --BEHAVIOR-- templateAfterValue
@@ -373 +267 @@
 
           return $res;
-     }
-
-     public function setUnknownValueHandler($callback)
-     {
-          if (is_callable($callback)) {
-               $this->unknown_value_handler = $callback;
-          }
-     }
-
-     public function setUnknownBlockHandler($callback)
-     {
-          if (is_callable($callback)) {
-               $this->unknown_block_handler = $callback;
-          }
      }
 
@@ -1173 +1053 @@
 
           if ($lastn != 0) {
+               // Set limit (aka nb of entries needed)
                if ($lastn > 0) {
+                    // nb of entries per page specified in template -> regular pagination
                     $p .= "\$params['limit'] = ".$lastn.";\n";
                } else {
-                    $p .= "\$params['limit'] = \$_ctx->nb_entry_per_page;\n";
+                    // nb of entries per page not specified -> use ctx settings
+                    $p .= "\$params['limit'] = (\$_page_number == 1 ? \$_ctx->nb_entry_first_page : \$_ctx->nb_entry_per_page);\n";
                }
-
+               // Set offset (aka index of first entry)
                if (!isset($attr['ignore_pagination']) || $attr['ignore_pagination'] == "0") {
-                    $p .= "\$params['limit'] = array(((\$_page_number-1)*\$params['limit']),\$params['limit']);\n";
+                    // standard pagination, set offset
+                    $p .= "\$params['limit'] = array((\$_page_number == 1 ? 0 : (\$_page_number - 2) * \$_ctx->nb_entry_per_page + \$_ctx->nb_entry_first_page),\$params['limit']);\n";
                } else {
+                    // no pagination, get all posts from 0 to limit
                     $p .= "\$params['limit'] = array(0, \$params['limit']);\n";
                }