Enano CMS (1.1.x): comparison includes/render.php

equal deleted inserted replaced

-:331e009416d5
+:904fbf10f112
 else
 {
 $p = '<b>Notice:</b> RenderMan::getTemplate(): Parameter '.$m.' is not set';
 }
 $text = str_replace('(_'.$m.'_)', $p, $text);
+$text = str_replace('{{' . ( $m + 1 ) . '}}', $p, $text);
 }
 $text = RenderMan::include_templates($text);
 return $text;
 }
 if ( $paths->namespace == 'Template' )
 {
 $text = preg_replace('/<nodisplay>(.*?)<\/nodisplay>/is', '', $text);
 }
-preg_match_all('/<lang code="([a-z0-9_]+)">([\w\W]+?)<\/lang>/', $text, $langmatch);
+preg_match_all('/<lang code="([a-z0-9_-]+)">([\w\W]+?)<\/lang>/', $text, $langmatch);
 foreach ( $langmatch[0] as $i => $match )
 {
 if ( $langmatch[1][$i] == $lang->lang_code )
 {
 $text = str_replace_once($match, $langmatch[2][$i], $text);
 $code = $plugins->setHook('render_wikiformat_pre');
 foreach ( $code as $cmd )
 {
 eval($cmd);
-}
-if ( !$plaintext )
-{
-// Process images
-$text = RenderMan::process_image_tags($text, $taglist);
-$text = RenderMan::process_imgtags_stage2($text, $taglist);
-}
-if($do_params)
-{
-preg_match_all('#\(_([0-9]+)_\)#', $text, $matchlist);
-foreach($matchlist[1] as $m)
-{
-$text = str_replace('(_'.$m.'_)', $paths->getParam((int)$m), $text);
-}
 }
 //$template_regex = "/\{\{([^\]]+?)((\n([ ]*?)[A-z0-9]+([ ]*?)=([ ]*?)(.+?))*)\}\}/is";
 $template_regex = "/\{\{(.+)((\n|\|[ ]*([A-z0-9]+)[ ]*=[ ]*(.+))*)\}\}/isU";
 $i = 0;
 {
 $i++;
 if ( $i == 5 )
 break;
 $text = RenderMan::include_templates($text);
+}
+if ( !$plaintext )
+{
+// Process images
+$text = RenderMan::process_image_tags($text, $taglist);
+$text = RenderMan::process_imgtags_stage2($text, $taglist);
+}
+if($do_params)
+{
+preg_match_all('#\(_([0-9]+)_\)#', $text, $matchlist);
+foreach($matchlist[1] as $m)
+{
+$text = str_replace('(_'.$m.'_)', $paths->getParam((int)$m), $text);
+}
 }
 // Before shipping it out to the renderer, replace spaces in between headings and paragraphs:
 $text = preg_replace('/<\/(h[0-9]|div|p)>([\s]+)<(h[0-9]|div|p)( .+?)?>/i', '</\\1><\\3\\4>', $text);
 // stage 1 - links with alternate text
 preg_match_all('/\[\[([^\[\]<>\{\}\|]+)\|(.+?)\]\]/', $text, $matches);
 foreach ( $matches[0] as $i => $match )
 {
 list($page_id, $namespace) = RenderMan::strToPageID($matches[1][$i]);
+if ( ($pos = strrpos($page_id, '#')) !== false )
+{
+$hash = substr($page_id, $pos);
+$page_id = substr($page_id, 0, $pos);
+}
+else
+{
+$hash = '';
+}
 $pid_clean = $paths->nslist[$namespace] . sanitize_page_id($page_id);
-$url = makeUrl($pid_clean, false, true);
+$url = makeUrl($pid_clean, false, true) . $hash;
 $inner_text = $matches[2][$i];
 $quot = '"';
 $exists = ( isPage($pid_clean) ) ? '' : ' class="wikilink-nonexistent"';
 if ( $tplcode )
 * @return array Example:
 * [foo] => lorem ipsum
 * [bar] => dolor sit amet
 */
-public static function parse_template_vars($input)
+public static function parse_template_vars($input, $newlinemode = true)
 {
-if ( !preg_match('/^(\|[ ]*([A-z0-9_]+)([ ]*)=([ ]*)(.+?))*$/is', trim($input)) )
+$parms = array();
-{
+$input = trim($input);
-$using_pipes = false;
+if ( $newlinemode )
-$input = explode("\n", trim( $input ));
+{
+$result = preg_match_all('/
+(?:^|[\s]*)\|?    # start of parameter - string start or series of spaces
+[ ]*
+(?:
+([A-z0-9_]+)    # variable name
+[ ]* = [ ]*     # assignment
+)?                # this is optional - if the parameter name is not given, a numerical index is assigned
+(.+)              # value
+/x', trim($input), $matches);
 }
 else
 {
-$using_pipes = true;
+$result = preg_match_all('/
-$input = substr($input, 1);
+(?:^|[ ]*)\|         # start of parameter - string start or series of spaces
-$input = explode("|", trim( $input ));
+[ ]*
-}
+(?:
-$parms = Array();
+([A-z0-9_]+)       # variable name
-$current_line = '';
+[ ]* = [ ]*        # assignment
-$current_parm = '';
+)?                   # name section is optional - if the parameter name is not given, a numerical index is assigned
-foreach ( $input as $num => $line )
+([^\|]+|.+?\n[ ]*\|) # value
-{
+/x', trim($input), $matches);
-if ( preg_match('/^[ ]*([A-z0-9_]+)([ ]*)=([ ]*)(.+?)$/is', $line, $matches) )
+}
-{
+if ( $result )
-$parm =& $matches[1];
+{
-$text =& $matches[4];
+$pi = 0;
-if ( $parm == $current_parm )
+for ( $i = 0; $i < count($matches[0]); $i++ )
 {
-$current_line .= $text;
+$matches[1][$i] = trim($matches[1][$i]);
-}
+$parmname = !empty($matches[1][$i]) ? $matches[1][$i] : strval(++$pi);
-else
+$parms[ $parmname ] = $matches[2][$i];
-{
+}
-// New parameter
-if ( $current_parm != '' )
-$parms[$current_parm] = $current_line;
-$current_line = $text;
-$current_parm = $parm;
-}
-}
-else if ( $num == 0 )
-{
-// Syntax error
-return false;
-}
-else
-{
-$current_line .= "\n$line";
-}
-}
-if ( !empty($current_parm) && !empty($current_line) )
-{
-$parms[$current_parm] = $current_line;
 }
 return $parms;
 }
 /**
 * @param string The text to process
 * @return string Formatted text
 * @example
 * <code>
 $text = '{{Template
-parm1 = Foo
+| parm1 = Foo
-parm2 = Bar
+| parm2 = Bar
 }}';
 $text = RenderMan::include_templates($text);
 * </code>
 */
 public static function include_templates($text)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 // $template_regex = "/\{\{([^\]]+?)((\n([ ]*?)[A-z0-9]+([ ]*?)=([ ]*?)(.+?))*)\}\}/is";
-$template_regex = "/\{\{(.+)(((\n|[ ]*\|)[ ]*([A-z0-9]+)[ ]*=[ ]*(.+))*)\}\}/isU";
+// matches:
+//  1 - template name
+//  2 - parameter section
+$template_regex = "/
+\{\{                     # opening
+([^\n\t\a\r]+)         # template name
+((?:(?:[\s]+\|?)[ ]*(?:[A-z0-9_]+)[ ]*=[ ]*?(?:.+))*) # parameters
+\}\}                     # closing
+/isxU";
 if ( $count = preg_match_all($template_regex, $text, $matches) )
 {
 //die('<pre>' . print_r($matches, true) . '</pre>');
 for ( $i = 0; $i < $count; $i++ )
 {
 $matches[1][$i] = sanitize_page_id($matches[1][$i]);
+$newlinemode = ( substr($matches[2][$i], 0, 1) == "\n" );
 $parmsection = trim($matches[2][$i]);
 if ( !empty($parmsection) )
 {
-$parms = RenderMan::parse_template_vars($parmsection);
+$parms = RenderMan::parse_template_vars($parmsection, $newlinemode);
 if ( !is_array($parms) )
 // Syntax error
 $parms = array();
 }
 else

changeset 734	904fbf10f112
parent 717	236360cf79a0
child 745	0a3866f74faa