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

equal deleted inserted replaced

-:098e744df928
+:a216e412c439
 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
 */
 class template
 {
-var $tpl_strings, $tpl_bool, $vars_assign_history, $theme, $style, $no_headers, $additional_headers, $sidebar_extra, $sidebar_widgets, $toolbar_menu, $theme_list, $named_theme_list, $default_theme, $default_style, $plugin_blocks, $namespace_string, $style_list, $theme_loaded, $initted_to_page_id, $initted_to_namespace;
+var $tpl_strings, $tpl_bool, $vars_assign_history, $theme, $style, $no_headers, $additional_headers, $sidebar_extra, $sidebar_widgets, $toolbar_menu, $theme_list, $named_theme_list, $default_theme, $default_style, $plugin_blocks, $plugin_blocks_content, $namespace_string, $style_list, $theme_loaded, $initted_to_page_id, $initted_to_namespace;
 var $initted_to_theme = array(
 'theme' => false,
 'style' => false
 );
 $this->tpl_strings = Array();
 $this->sidebar_extra = '';
 $this->toolbar_menu = '';
 $this->additional_headers = '';
 $this->plugin_blocks = Array();
+$this->plugin_blocks_content = array();
 $this->theme_loaded = false;
 $this->theme_list = Array();
 $this->named_theme_list = Array();
 $df_data =& $this->named_theme_list[ $this->default_theme ];
 $this->default_style = ( in_array($df_data['default_style'], $df_data['css']) ) ? $df_data['default_style'] : $df_data['css'][0];
 }
 /**
-* Systematically deletes themes if they're blocked by theme security settings. Called when session->start() finishes.
+* Systematically deletes themes from available list if they're blocked by theme security settings. Called when session->start() finishes.
 */
 function process_theme_acls()
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $parser = $this->makeParserText($tplvars['sidebar_section_raw']);
 }
 $parser->assign_vars(Array('TITLE' => '{TITLE}','CONTENT' => $h));
 $this->plugin_blocks[$t] = $parser->run();
+$this->plugin_blocks_content[$t] = $h;
 $this->sidebar_widgets .= $parser->run();
 }
 function add_header($html)
 {
 /* debug only **
 // Make sure we're allowed to use this theme.
 if ( (
 // If it was removed, it's probably blocked by an ACL, or it was uninstalled
 !isset($this->named_theme_list[$this->theme]) ||
 // Check if the theme is disabled
-( isset($this->named_theme_list[$this->theme]) && $this->named_theme_list[$this->theme]['enabled'] == 0 ) )
+( isset($this->named_theme_list[$this->theme]) && isset($this->named_theme_list[$this->theme]['enabled']) && $this->named_theme_list[$this->theme]['enabled'] == 0 ) )
 // Above all, if it's a system theme, don't inhibit the loading process.
 && !in_array($this->theme, $this->system_themes)
 )
 {
 // No, something is preventing it - fall back to site default
 'TEXT'=>$lang->get('sidebar_btn_administration'),
 ));
 $admin_link = $parser->run();
+$parser->assign_vars(Array(
+'HREF'=>makeUrlNS('Special', 'EditSidebar'),
+'FLAGS'=>'onclick="if ( !KILL_SWITCH ) { void(ajaxLoginNavTo(\'Special\', \'EditSidebar\', ' . USER_LEVEL_ADMIN . ')); return false; }"',
+'TEXT'=>$lang->get('sidebar_btn_editsidebar'),
+));
+$sidebar_link = $parser->run();
 $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;' ) );
 $js_dynamic = '    <script type="text/javascript">// <![CDATA[
 // This section defines some basic and very important variables that are used later in the static Javascript library.
 // SKIN DEVELOPERS: The template variable for this code block is {JS_DYNAMIC_VARS}. This MUST be inserted BEFORE the tag that links to the main Javascript lib.
 var title = \''. $urlname_jssafe .'\';
 var physical_title = \'' . $physical_urlname_jssafe . '\';
+var on_main_page = ' . ( $local_page == get_main_page() ? 'true' : 'false' ) . ';
+var main_page_members = \'' . addslashes(get_main_page(true)) . '\';
 var page_exists = '. ( ( $local_page_exists) ? 'true' : 'false' ) .';
 var scriptPath = \'' . addslashes(scriptPath) . '\';
 var contentPath = \'' . addslashes(contentPath) . '\';
 var cdnPath = \'' . addslashes(cdnPath) . '\';
 var ENANO_SID = \'' . $SID . '\';
 $js_dynamic .= "namespace_list['{$k}'] = '$c';";
 }
 $js_dynamic .= "\n    //]]>\n    </script>";
 $tpl_strings = Array(
-'PAGE_NAME'=>htmlspecialchars($local_cdata['name']),
+'PAGE_NAME' => htmlspecialchars($local_cdata['name']),
-'PAGE_URLNAME'=> $urlname_clean,
+'PAGE_URLNAME' =>  $urlname_clean,
-'SITE_NAME'=>htmlspecialchars(getConfig('site_name')),
+'SITE_NAME' => htmlspecialchars(getConfig('site_name')),
-'USERNAME'=>$session->username,
+'USERNAME' => $session->username,
-'SITE_DESC'=>htmlspecialchars(getConfig('site_desc')),
+'SITE_DESC' => htmlspecialchars(getConfig('site_desc')),
-'TOOLBAR'=>$tb,
+'TOOLBAR' => $tb,
-'SCRIPTPATH'=>scriptPath,
+'SCRIPTPATH' => scriptPath,
-'CONTENTPATH'=>contentPath,
+'CONTENTPATH' => contentPath,
 'CDNPATH' => cdnPath,
-'ADMIN_SID_QUES'=>$asq,
+'ADMIN_SID_QUES' => $asq,
-'ADMIN_SID_AMP'=>$asa,
+'ADMIN_SID_AMP' => $asa,
-'ADMIN_SID_AMP_HTML'=>$ash,
+'ADMIN_SID_AMP_HTML' => $ash,
-'ADMIN_SID_AUTO'=>$as2,
+'ADMIN_SID_AUTO' => $as2,
-'ADMIN_SID_RAW'=> ( is_string($session->sid_super) ? $session->sid_super : '' ),
+'ADMIN_SID_RAW' =>  ( is_string($session->sid_super) ? $session->sid_super : '' ),
-'COPYRIGHT'=>RenderMan::parse_internal_links(getConfig('copyright_notice')),
+'COPYRIGHT' => RenderMan::parse_internal_links(getConfig('copyright_notice')),
-'TOOLBAR_EXTRAS'=>$this->toolbar_menu,
+'TOOLBAR_EXTRAS' => $this->toolbar_menu,
-'REQUEST_URI'=>( defined('ENANO_CLI') ? '' : $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'] ),
+'REQUEST_URI' => ( defined('ENANO_CLI') ? '' : $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'] ),
-'STYLE_LINK'=>makeUrlNS('Special', 'CSS'.$p, null, true), //contentPath.$paths->nslist['Special'].'CSS' . $p,
+'STYLE_LINK' => makeUrlNS('Special', 'CSS'.$p, null, true), //contentPath.$paths->nslist['Special'].'CSS' . $p,
-'LOGIN_LINK'=>$login_link,
+'LOGIN_LINK' => $login_link,
-'LOGOUT_LINK'=>$logout_link,
+'LOGOUT_LINK' => $logout_link,
-'ADMIN_LINK'=>$admin_link,
+'ADMIN_LINK' => $admin_link,
-'THEME_LINK'=>$theme_link,
+'THEME_LINK' => $theme_link,
-'SEARCH_ACTION'=>makeUrlNS('Special', 'Search'),
+'SIDEBAR_LINK' => $sidebar_link,
-'INPUT_TITLE'=>( urlSeparator == '&' ? '<input type="hidden" name="title" value="' . htmlspecialchars( $paths->nslist[$local_namespace] . $local_page_id ) . '" />' : ''),
+'SEARCH_ACTION' => makeUrlNS('Special', 'Search'),
-'INPUT_AUTH'=>( $session->sid_super ? '<input type="hidden" name="auth"  value="' . $session->sid_super . '" />' : ''),
+'INPUT_TITLE' => ( urlSeparator == '&' ? '<input type="hidden" name="title" value="' . htmlspecialchars( $paths->nslist[$local_namespace] . $local_page_id ) . '" />' : ''),
-'TEMPLATE_DIR'=>scriptPath.'/themes/'.$this->theme,
+'INPUT_AUTH' => ( $session->sid_super ? '<input type="hidden" name="auth"  value="' . $session->sid_super . '" />' : ''),
-'THEME_ID'=>$this->theme,
+'TEMPLATE_DIR' => scriptPath.'/themes/'.$this->theme,
-'STYLE_ID'=>$this->style,
+'THEME_ID' => $this->theme,
-'MAIN_PAGE' => getConfig('main_page'),
+'STYLE_ID' => $this->style,
+'MAIN_PAGE' => get_main_page(),
 'JS_HEADER' => $js_head,
 'JS_FOOTER' => $js_foot,
-'JS_DYNAMIC_VARS'=>$js_dynamic,
+'JS_DYNAMIC_VARS' => $js_dynamic,
-'UNREAD_PMS'=>$session->unread_pms,
+'UNREAD_PMS' => $session->unread_pms,
 'URL_ABOUT_ENANO' => makeUrlNS('Special', 'About_Enano', '', true),
 'REPORT_URI' => makeUrl($local_fullpage, 'do=sql_report', true)
 );
 foreach ( $paths->nslist as $ns_id => $ns_prefix )
 * Fetch the HTML for a plugin-added sidebar block
 * @param $name the plugin name
 * @return string
 */
-function fetch_block($id)
+function fetch_block($id, $just_the_innards_maam = false)
 {
-if(isset($this->plugin_blocks[$id])) return $this->plugin_blocks[$id];
+if ( $just_the_innards_maam )
-else return false;
+{
+$source =& $this->plugin_blocks_content;
+}
+else
+{
+$source =& $this->plugin_blocks;
+}
+return isset($source[$id]) ? $source[$id] : false;
 }
 /**
 * Fetches the contents of both sidebars.
 * @return array - key 0 is left, key 1 is right, key 2 is the HTML that makes up an empty sidebar

changeset 741	a216e412c439
parent 732	c3752aa881c2
child 760	60c132a5bc8e