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

equal deleted inserted replaced

-:88d4ed0a2898
+:03a60844c7c5
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 global $email;
 global $lang;
-profiler_log("template: starting var init");
 if(!$this->theme || !$this->style)
 {
 $this->load_theme();
 }
 if ( $local_page_id === $this->initted_to_page_id && $local_namespace === $this->initted_to_namespace && $this->theme === $this->initted_to_theme['theme'] && $this->style === $this->initted_to_theme['style'] && !$force_init )
 {
 // we're already initted with this page.
 return true;
 }
+profiler_log("template: starting var init");
 $this->initted_to_page_id = $local_page_id;
 $this->initted_to_namespace = $local_namespace;
 $this->initted_to_theme = array(
 'theme' => $this->theme,
 {
 eval($cmd);
 }
 $ns =& $this->namespace_string;
+//
+// PAGE TOOLBAR (on-page controls/actions)
+//
+profiler_log('template: var init: finished initial setup, starting toolbar');
 // Initialize the toolbar
 $tb = '';
 // Create "xx page" button
 'TEXT'        => $lang->get('onpage_btn_moreoptions')
 ));
 $tb .= $button->run();
 }
+//
+// OTHER SWITCHES
+//
+profiler_log('template: var init: finshed toolbar, starting other switches');
 $is_opera = (isset($_SERVER['HTTP_USER_AGENT']) && strstr($_SERVER['HTTP_USER_AGENT'], 'Opera')) ? true : false;
 $this->tpl_bool = Array(
-'auth_admin'=>$session->user_level >= USER_LEVEL_ADMIN ? true : false,
+'auth_admin' => $session->user_level >= USER_LEVEL_ADMIN ? true : false,
-'user_logged_in'=>$session->user_logged_in,
+'user_logged_in' => $session->user_logged_in,
-'opera'=>$is_opera,
+'opera' => $is_opera,
 );
-if($session->sid_super) { $ash = '&amp;auth='.$session->sid_super; $asq = "?auth=".$session->sid_super; $asa = "&auth=".$session->sid_super; $as2 = htmlspecialchars(urlSeparator).'auth='.$session->sid_super; }
+if ( $session->sid_super )
-else { $asq=''; $asa=''; $as2 = ''; $ash = ''; }
+{
+$ash = '&amp;auth=' . $session->sid_super;
+$asq = "?auth=" . $session->sid_super;
+$asa = "&auth=" . $session->sid_super;
+$as2 = htmlspecialchars(urlSeparator) . 'auth='.$session->sid_super;
+}
+else
+{
+$asq = '';
+$asa = '';
+$as2 = '';
+$ash = '';
+}
 $code = $plugins->setHook('compile_template');
 foreach ( $code as $cmd )
 {
 eval($cmd);
 }
 // Some additional sidebar processing
-if($this->sidebar_extra != '') {
+if ( $this->sidebar_extra != '' )
+{
 $se = $this->sidebar_extra;
 $parser = $this->makeParserText($tplvars['sidebar_section_raw']);
-$parser->assign_vars(Array('TITLE'=>'Links','CONTENT'=>$se));
+$parser->assign_vars(array(
+'TITLE' => 'Links', // FIXME: l10n
+'CONTENT' => $se
+));
 $this->sidebar_extra = $parser->run();
 }
-$this->sidebar_extra = $this->sidebar_extra.$this->sidebar_widgets;
+$this->sidebar_extra = $this->sidebar_extra . $this->sidebar_widgets;
 $this->tpl_bool['fixed_menus'] = false;
-/* if($this->sidebar_extra == '') $this->tpl_bool['right_sidebar'] = false;
+$this->tpl_bool['right_sidebar'] = true;
-else */ $this->tpl_bool['right_sidebar'] = true;
 $this->tpl_bool['auth_rename'] = ( $local_page_exists && $session->check_acl_scope('rename', $local_namespace) && ( $perms->get_permissions('rename') && ( $paths->page_protected && $perms->get_permissions('even_when_protected') || !$paths->page_protected ) ));
 $this->tpl_bool['enable_uploads'] = ( getConfig('enable_uploads') == '1' && $session->get_permissions('upload_files') ) ? true : false;
 $this->tpl_bool['stupid_mode'] = false;
 $this->tpl_bool['in_admin'] = ( ( $local_page_id == 'Administration' && $local_namespace == 'Special' ) || $local_namespace == 'Admin' );
 $p = ( isset($_GET['printable']) ) ? '/printable' : '';
 // Add the e-mail address client code to the header
 'FLAGS'=>'onclick="if ( !KILL_SWITCH ) { void(ajaxStartAdminLogin()); return false; }"',
 'TEXT'=>$lang->get('sidebar_btn_administration'),
 ));
 $admin_link = $parser->run();
+profiler_log('template: var init: finished sidebar/misc processing, starting dynamic vars and finalization');
 $SID = ($session->sid_super) ? $session->sid_super : '';
 $urlname_clean = str_replace('\'', '\\\'', str_replace('\\', '\\\\', dirtify_page_id($local_fullpage)));
 $urlname_clean = strtr( $urlname_clean, array( '<' => '&lt;', '>' => '&gt;' ) );
 foreach($paths->nslist as $k => $c)
 {
 $js_dynamic .= "namespace_list['{$k}'] = '$c';";
 }
 $js_dynamic .= "\n    //]]>\n    </script>";
+profiler_log('template: var init: finished JS dynamic vars and assigning final var set');
 $tpl_strings = Array(
 'PAGE_NAME'=>htmlspecialchars($local_cdata['name']),
 'PAGE_URLNAME'=> $urlname_clean,
 'SITE_NAME'=>htmlspecialchars(getConfig('site_name')),
 $tpl_strings[ 'NS_' . strtoupper($ns_id) ] = $ns_prefix;
 }
 $this->assign_vars($tpl_strings, true);
+//
+// COMPILE THE SIDEBAR
+//
+// This is done after the big assign_vars() so that sidebar code has access to the newly assigned variables
+profiler_log('template: var init: finished final var set, executing and applying sidebar templates');
 list($this->tpl_strings['SIDEBAR_LEFT'], $this->tpl_strings['SIDEBAR_RIGHT'], $min) = $this->fetch_sidebar();
 $this->tpl_bool['sidebar_left']  = ( $this->tpl_strings['SIDEBAR_LEFT']  != $min) ? true : false;
 $this->tpl_bool['sidebar_right'] = ( $this->tpl_strings['SIDEBAR_RIGHT'] != $min) ? true : false;
 $this->tpl_bool['right_sidebar'] = $this->tpl_bool['sidebar_right']; // backward compatibility
-// and finally one that needs to be symlinked...
+// and finally one string value that needs to be symlinked...
 if ( !isset($this->tpl_strings['ADDITIONAL_HEADERS']) )
 {
 $this->tpl_strings['ADDITIONAL_HEADERS'] =& $this->additional_headers;
 }
+// done!
 $code = $plugins->setHook('template_var_init_end');
 foreach ( $code as $cmd )
 {
 eval($cmd);
 }
 The way this works is: match all blocks using the standard form with a different keyword in the block each time,
 and replace them with appropriate PHP logic. Plugin-extensible now. :-)
 */
 // This is a workaround for what seems like a PCRE bug
-while ( ( profiler_log("[template] compiler matchout start") || true ) && preg_match_all($regexp, $text, $matches) )
+while ( preg_match_all($regexp, $text, $matches) )
 {
-profiler_log("[template] compiler core loop start");
 for ( $i = 0; $i < count($matches[0]); $i++ )
 {
 $start_tag =& $matches[1][$i];
 $type =& $matches[2][$i];
 $test =& $matches[3][$i];
 $text = str_replace_once($matches[0][$i], $tag_complete, $text);
 }
 }
-profiler_log("[template] compiler core loop end");
 // For debugging ;-)
 // die("<pre>&lt;?php\n" . htmlspecialchars($text."\n\n".print_r($matches,true)) . "\n\n?&gt;</pre>");
 //
 // Data substitution/variables
 $tag = "{PHP:$i:$seed}";
 $text = str_replace_once($tag, "'; $match echo '", $text);
 }
 // echo('<pre>' . htmlspecialchars($text) . '</pre>');
-profiler_log("[template] compiler subst end");
 return $text;
 }
 /**

changeset 590	03a60844c7c5
parent 585	35e91d16ecf5
child 592	27377179fe58