author | Dan |
Mon, 29 Sep 2008 08:25:59 -0400 | |
changeset 713 | 6865705ec8a6 |
parent 708 | 162763d69256 |
child 723 | 78d391d37700 |
permissions | -rw-r--r-- |
1 | 1 |
<?php |
2 |
||
3 |
/* |
|
4 |
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between |
|
685
17ebe24cdf85
Rebranded as 1.1.5 (Caoineag alpha 5) and fixed a couple bugs related to CDN support in template_nodb and installerUI. Updated readme.
Dan
parents:
677
diff
changeset
|
5 |
* Version 1.1.5 (Caoineag alpha 5) |
536 | 6 |
* Copyright (C) 2006-2008 Dan Fuhry |
1 | 7 |
* |
8 |
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License |
|
9 |
* as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. |
|
10 |
* |
|
11 |
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied |
|
12 |
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. |
|
13 |
*/ |
|
14 |
||
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
15 |
class template |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
16 |
{ |
577
5118610ce160
Made template parser remember last initted page_id and namespace to avoid double init; made additional_headers reassign only do so if $template->additional_headers is empty (it's being blanked somehow, need to come up with a backtrace sometime)
Dan
parents:
573
diff
changeset
|
17 |
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; |
30 | 18 |
|
578
02bc119a6dd3
Fixed: init_vars double-init check ignored theme changes/reloads
Dan
parents:
577
diff
changeset
|
19 |
var $initted_to_theme = array( |
02bc119a6dd3
Fixed: init_vars double-init check ignored theme changes/reloads
Dan
parents:
577
diff
changeset
|
20 |
'theme' => false, |
02bc119a6dd3
Fixed: init_vars double-init check ignored theme changes/reloads
Dan
parents:
577
diff
changeset
|
21 |
'style' => false |
02bc119a6dd3
Fixed: init_vars double-init check ignored theme changes/reloads
Dan
parents:
577
diff
changeset
|
22 |
); |
02bc119a6dd3
Fixed: init_vars double-init check ignored theme changes/reloads
Dan
parents:
577
diff
changeset
|
23 |
|
30 | 24 |
/** |
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
25 |
* The list of themes that are critical for Enano operation. This doesn't include oxygen which |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
26 |
* remains a user theme. By default this is admin and printable which have to be loaded on demand. |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
27 |
* @var array |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
28 |
*/ |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
29 |
|
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
30 |
var $system_themes = array('admin', 'printable'); |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
31 |
|
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
32 |
/** |
30 | 33 |
* Set to true if the site is disabled and thus a message needs to be shown. This should ONLY be changed by common.php. |
34 |
* @var bool |
|
35 |
* @access private |
|
36 |
*/ |
|
37 |
||
38 |
var $site_disabled = false; |
|
39 |
||
53 | 40 |
/** |
41 |
* One of the absolute best parts of Enano :-P |
|
42 |
* @var string |
|
43 |
*/ |
|
44 |
||
54
84b56303cab5
Bugfixes: Login system properly handles blank password situation (returns ""); fading button now works right with relative URLs
Dan
parents:
53
diff
changeset
|
45 |
var $fading_button = ''; |
53 | 46 |
|
1 | 47 |
function __construct() |
48 |
{ |
|
49 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
581
5e8fd89c02ea
Initial progress towards converting auto-completion framework to Spry. Not currently in a very working state.
Dan
parents:
579
diff
changeset
|
50 |
|
1 | 51 |
$this->tpl_bool = Array(); |
52 |
$this->tpl_strings = Array(); |
|
53 |
$this->sidebar_extra = ''; |
|
54 |
$this->toolbar_menu = ''; |
|
55 |
$this->additional_headers = ''; |
|
56 |
$this->plugin_blocks = Array(); |
|
57 |
$this->theme_loaded = false; |
|
58 |
||
59 |
$this->theme_list = Array(); |
|
60 |
$this->named_theme_list = Array(); |
|
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
61 |
|
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
62 |
$this->vars_assign_history = array( |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
63 |
'strings' => array(), |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
64 |
'bool' => array() |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
65 |
); |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
66 |
|
488
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
67 |
if ( defined('IN_ENANO_UPGRADE') ) |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
68 |
{ |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
69 |
return $this->construct_compat(); |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
70 |
} |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
71 |
|
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
72 |
$q = $db->sql_query('SELECT theme_id, theme_name, enabled, default_style, group_policy, group_list FROM ' . table_prefix . 'themes;'); |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
73 |
if ( !$q ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
74 |
$db->_die('template.php selecting theme list'); |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
75 |
|
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
76 |
$i = 0; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
77 |
while ( $row = $db->fetchrow() ) |
1 | 78 |
{ |
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
79 |
$this->theme_list[$i] = $row; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
80 |
$i++; |
1 | 81 |
} |
592 | 82 |
unset($theme); |
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
83 |
$this->theme_list = array_values($this->theme_list); |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
84 |
// Create associative array of themes |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
85 |
foreach ( $this->theme_list as $i => &$theme ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
86 |
$this->named_theme_list[ $theme['theme_id'] ] =& $this->theme_list[$i]; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
87 |
|
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
88 |
$this->default_theme = ( $_ = getConfig('theme_default') ) ? $_ : $this->theme_list[0]['theme_id']; |
593
4f9bec0d65c1
More optimization work. Moved special page init functions to common instead of common_post hook. Allowed paths to cache page metadata on filesystem. Phased out the redundancy in $paths->pages that paired a number with every urlname as foreach loops are allowed now (and have been for some time). Fixed missing includes for several functions. Rewrote str_replace_once to be a lot more efficient.
Dan
parents:
592
diff
changeset
|
89 |
$this->named_theme_list[ $this->default_theme ]['css'] = $this->get_theme_css_files($this->default_theme); |
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
90 |
// Come up with the default style. If the CSS file specified in default_style exists, we're good, just |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
91 |
// use that. Otherwise, use the first stylesheet that comes to mind. |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
92 |
$df_data =& $this->named_theme_list[ $this->default_theme ]; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
93 |
$this->default_style = ( in_array($df_data['default_style'], $df_data['css']) ) ? $df_data['default_style'] : $df_data['css'][0]; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
94 |
} |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
95 |
|
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
96 |
/** |
592 | 97 |
* Gets the list of available CSS files (styles) for the specified theme. |
98 |
* @param string Theme ID |
|
99 |
* @return array |
|
100 |
*/ |
|
101 |
||
102 |
function get_theme_css_files($theme_id) |
|
103 |
{ |
|
104 |
$css = array(); |
|
105 |
$dir = ENANO_ROOT . "/themes/{$theme_id}/css"; |
|
106 |
if ( $dh = @opendir($dir) ) |
|
107 |
{ |
|
108 |
while ( ( $file = @readdir($dh) ) !== false ) |
|
109 |
{ |
|
110 |
if ( preg_match('/\.css$/', $file) ) |
|
111 |
$css[] = preg_replace('/\.css$/', '', $file); |
|
112 |
} |
|
113 |
closedir($dh); |
|
114 |
} |
|
115 |
// No CSS files? If so, nuke it. |
|
116 |
if ( count($css) < 1 ) |
|
117 |
{ |
|
118 |
unset($this->theme_list[$theme_id]); |
|
119 |
} |
|
120 |
return $css; |
|
121 |
} |
|
122 |
||
123 |
/** |
|
488
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
124 |
* Failsafe constructor for upgrades. |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
125 |
*/ |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
126 |
|
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
127 |
function construct_compat() |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
128 |
{ |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
129 |
global $db, $session, $paths, $template, $plugins; // Common objects |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
130 |
$this->tpl_bool = Array(); |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
131 |
$this->tpl_strings = Array(); |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
132 |
$this->sidebar_extra = ''; |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
133 |
$this->toolbar_menu = ''; |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
134 |
$this->additional_headers = ''; |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
135 |
$this->plugin_blocks = Array(); |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
136 |
$this->theme_loaded = false; |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
137 |
|
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
138 |
$this->fading_button = '<div style="background-image: url('.scriptPath.'/images/about-powered-enano-hover.png); background-repeat: no-repeat; width: 88px; height: 31px; margin: 0 auto 5px auto;"> |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
139 |
<a style="background-image: none; padding-right: 0;" href="http://enanocms.org/" onclick="window.open(this.href); return false;"><img style="border-width: 0;" alt=" " src="'.scriptPath.'/images/about-powered-enano.png" onmouseover="domOpacity(this, 100, 0, 500);" onmouseout="domOpacity(this, 0, 100, 500);" /></a> |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
140 |
</div>'; |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
141 |
|
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
142 |
$this->theme_list = Array(); |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
143 |
$this->named_theme_list = Array(); |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
144 |
|
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
145 |
$q = $db->sql_query('SELECT theme_id, theme_name, enabled, default_style FROM ' . table_prefix . 'themes;'); |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
146 |
if ( !$q ) |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
147 |
$db->_die('template.php selecting theme list'); |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
148 |
|
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
149 |
$i = 0; |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
150 |
while ( $row = $db->fetchrow() ) |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
151 |
{ |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
152 |
$this->theme_list[$i] = $row; |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
153 |
$i++; |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
154 |
} |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
155 |
// List out all CSS files for this theme |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
156 |
foreach ( $this->theme_list as $i => &$theme ) |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
157 |
{ |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
158 |
$theme['css'] = array(); |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
159 |
$dir = ENANO_ROOT . "/themes/{$theme['theme_id']}/css"; |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
160 |
if ( $dh = @opendir($dir) ) |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
161 |
{ |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
162 |
while ( ( $file = @readdir($dh) ) !== false ) |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
163 |
{ |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
164 |
if ( preg_match('/\.css$/', $file) ) |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
165 |
$theme['css'][] = preg_replace('/\.css$/', '', $file); |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
166 |
} |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
167 |
closedir($dh); |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
168 |
} |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
169 |
// No CSS files? If so, nuke it. |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
170 |
if ( count($theme['css']) < 1 ) |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
171 |
{ |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
172 |
unset($this->theme_list[$i]); |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
173 |
} |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
174 |
} |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
175 |
$this->theme_list = array_values($this->theme_list); |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
176 |
// Create associative array of themes |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
177 |
foreach ( $this->theme_list as $i => &$theme ) |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
178 |
$this->named_theme_list[ $theme['theme_id'] ] =& $this->theme_list[$i]; |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
179 |
|
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
180 |
$this->default_theme = ( $_ = getConfig('theme_default') ) ? $_ : $this->theme_list[0]['theme_id']; |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
181 |
// Come up with the default style. If the CSS file specified in default_style exists, we're good, just |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
182 |
// use that. Otherwise, use the first stylesheet that comes to mind. |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
183 |
$df_data =& $this->named_theme_list[ $this->default_theme ]; |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
184 |
$this->default_style = ( in_array($df_data['default_style'], $df_data['css']) ) ? $df_data['default_style'] : $df_data['css'][0]; |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
185 |
} |
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
186 |
|
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
187 |
/** |
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
188 |
* Systematically deletes themes if they're blocked by theme security settings. Called when session->start() finishes. |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
189 |
*/ |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
190 |
|
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
191 |
function process_theme_acls() |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
192 |
{ |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
193 |
global $db, $session, $paths, $template, $plugins; // Common objects |
655
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
194 |
global $lang; |
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
195 |
|
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
196 |
// generate the fading button - needs to be done after sessions are started |
674
f514dc675f32
Fixed tooltip in Powered By Enano button on the sidebar. It called $lang->get() without checking to see if languages were initted yet.
Dan
parents:
669
diff
changeset
|
197 |
$admintitle = ( $session->user_level >= USER_LEVEL_ADMIN && is_object(@$lang) ) ? ' title="' . $lang->get('sidebar_btn_enanopowered_admin_tip') . '"' : ''; |
655
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
198 |
$this->fading_button = '<div style="background-image: url('.cdnPath.'/images/about-powered-enano-hover.png); background-repeat: no-repeat; width: 88px; height: 31px; margin: 0 auto 5px auto;"> |
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
199 |
<a style="background-image: none; padding-right: 0;" href="http://enanocms.org/" onclick="window.open(this.href); return false;"' . $admintitle . '><img style="border-width: 0;" alt=" " src="'.cdnPath.'/images/about-powered-enano.png" onmouseover="domOpacity(this, 100, 0, 500);" onmouseout="domOpacity(this, 0, 100, 500);" /></a> |
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
200 |
</div>'; |
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
201 |
|
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
202 |
// For each theme, check ACLs and delete from RAM if not authorized |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
203 |
foreach ( $this->theme_list as $i => $theme ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
204 |
{ |
488
5560ff856dd7
Oops: fixed broken template loader in upgrader for 1.0.x and 1.1.1
Dan
parents:
484
diff
changeset
|
205 |
if ( !@$theme['group_list'] ) |
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
206 |
continue; |
472
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
parents:
471
diff
changeset
|
207 |
if ( $theme['theme_id'] === getConfig('theme_default') ) |
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
parents:
471
diff
changeset
|
208 |
continue; |
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
209 |
switch ( $theme['group_policy'] ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
210 |
{ |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
211 |
case 'allow_all': |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
212 |
// Unconditionally allowed |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
213 |
continue; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
214 |
break; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
215 |
case 'whitelist': |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
216 |
// If we're not on the list, off to the left please |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
217 |
$list = enano_json_decode($theme['group_list']); |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
218 |
$allowed = false; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
219 |
foreach ( $list as $acl ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
220 |
{ |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
221 |
if ( !preg_match('/^(u|g):([0-9]+)$/', $acl, $match) ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
222 |
// Invalid list entry, silently allow (maybe not a good idea but |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
223 |
// really, these things are checked before they're inserted) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
224 |
continue 2; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
225 |
$mode = $match[1]; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
226 |
$id = intval($match[2]); |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
227 |
switch ( $mode ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
228 |
{ |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
229 |
case 'u': |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
230 |
$allowed = ( $id == $session->user_id ); |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
231 |
if ( $allowed ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
232 |
break 2; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
233 |
break; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
234 |
case 'g': |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
235 |
$allowed = ( isset($session->groups[$id]) ); |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
236 |
if ( $allowed ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
237 |
break 2; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
238 |
} |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
239 |
} |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
240 |
if ( !$allowed ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
241 |
{ |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
242 |
unset($this->theme_list[$i]); |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
243 |
} |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
244 |
break; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
245 |
case 'blacklist': |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
246 |
// If we're ON the list, off to the left please |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
247 |
$list = enano_json_decode($theme['group_list']); |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
248 |
$allowed = true; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
249 |
foreach ( $list as $acl ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
250 |
{ |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
251 |
if ( !preg_match('/^(u|g):([0-9]+)$/', $acl, $match) ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
252 |
// Invalid list entry, silently allow (maybe not a good idea but |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
253 |
// really, these things are checked before they're inserted) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
254 |
continue 2; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
255 |
$mode = $match[1]; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
256 |
$id = intval($match[2]); |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
257 |
switch ( $mode ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
258 |
{ |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
259 |
case 'u': |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
260 |
$allowed = ( $id != $session->user_id ); |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
261 |
if ( !$allowed ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
262 |
break 2; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
263 |
break; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
264 |
case 'g': |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
265 |
$allowed = ( !isset($session->groups[$id]) ); |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
266 |
if ( !$allowed ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
267 |
break 2; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
268 |
} |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
269 |
} |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
270 |
if ( !$allowed ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
271 |
{ |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
272 |
unset($this->theme_list[$i]); |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
273 |
} |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
274 |
break; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
275 |
} |
1 | 276 |
} |
277 |
||
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
278 |
$this->theme_list = array_values($this->theme_list); |
1 | 279 |
|
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
280 |
// Rebuild associative theme list |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
281 |
$this->named_theme_list = array(); |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
282 |
foreach ( $this->theme_list as $i => &$theme ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
283 |
$this->named_theme_list[ $theme['theme_id'] ] =& $this->theme_list[$i]; |
1 | 284 |
} |
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
285 |
|
419
b8b4e38825db
Unsuccessful attempt at fixing "dismiss"/"close manager" buttons in ACL editor; non-breaking change to template API to allow plugins to add "normal" sidebar widgets in addition to the special "raw" block type, specified as the third parameter to $template->sidebar_widget(). Defaults to false, which is old behavior; new behavior (enabled by passing TRUE as the 3rd param) means that the content of the block is primarily block-level links.
Dan
parents:
413
diff
changeset
|
286 |
function sidebar_widget($t, $h, $use_normal_section = false) |
1 | 287 |
{ |
288 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
289 |
if(!defined('ENANO_TEMPLATE_LOADED')) |
|
290 |
{ |
|
291 |
$this->load_theme($session->theme, $session->style); |
|
292 |
} |
|
293 |
if(!$this->sidebar_widgets) |
|
294 |
$this->sidebar_widgets = ''; |
|
295 |
$tplvars = $this->extract_vars('elements.tpl'); |
|
419
b8b4e38825db
Unsuccessful attempt at fixing "dismiss"/"close manager" buttons in ACL editor; non-breaking change to template API to allow plugins to add "normal" sidebar widgets in addition to the special "raw" block type, specified as the third parameter to $template->sidebar_widget(). Defaults to false, which is old behavior; new behavior (enabled by passing TRUE as the 3rd param) means that the content of the block is primarily block-level links.
Dan
parents:
413
diff
changeset
|
296 |
|
b8b4e38825db
Unsuccessful attempt at fixing "dismiss"/"close manager" buttons in ACL editor; non-breaking change to template API to allow plugins to add "normal" sidebar widgets in addition to the special "raw" block type, specified as the third parameter to $template->sidebar_widget(). Defaults to false, which is old behavior; new behavior (enabled by passing TRUE as the 3rd param) means that the content of the block is primarily block-level links.
Dan
parents:
413
diff
changeset
|
297 |
if ( $use_normal_section ) |
b8b4e38825db
Unsuccessful attempt at fixing "dismiss"/"close manager" buttons in ACL editor; non-breaking change to template API to allow plugins to add "normal" sidebar widgets in addition to the special "raw" block type, specified as the third parameter to $template->sidebar_widget(). Defaults to false, which is old behavior; new behavior (enabled by passing TRUE as the 3rd param) means that the content of the block is primarily block-level links.
Dan
parents:
413
diff
changeset
|
298 |
{ |
b8b4e38825db
Unsuccessful attempt at fixing "dismiss"/"close manager" buttons in ACL editor; non-breaking change to template API to allow plugins to add "normal" sidebar widgets in addition to the special "raw" block type, specified as the third parameter to $template->sidebar_widget(). Defaults to false, which is old behavior; new behavior (enabled by passing TRUE as the 3rd param) means that the content of the block is primarily block-level links.
Dan
parents:
413
diff
changeset
|
299 |
$parser = $this->makeParserText($tplvars['sidebar_section']); |
b8b4e38825db
Unsuccessful attempt at fixing "dismiss"/"close manager" buttons in ACL editor; non-breaking change to template API to allow plugins to add "normal" sidebar widgets in addition to the special "raw" block type, specified as the third parameter to $template->sidebar_widget(). Defaults to false, which is old behavior; new behavior (enabled by passing TRUE as the 3rd param) means that the content of the block is primarily block-level links.
Dan
parents:
413
diff
changeset
|
300 |
} |
b8b4e38825db
Unsuccessful attempt at fixing "dismiss"/"close manager" buttons in ACL editor; non-breaking change to template API to allow plugins to add "normal" sidebar widgets in addition to the special "raw" block type, specified as the third parameter to $template->sidebar_widget(). Defaults to false, which is old behavior; new behavior (enabled by passing TRUE as the 3rd param) means that the content of the block is primarily block-level links.
Dan
parents:
413
diff
changeset
|
301 |
else |
b8b4e38825db
Unsuccessful attempt at fixing "dismiss"/"close manager" buttons in ACL editor; non-breaking change to template API to allow plugins to add "normal" sidebar widgets in addition to the special "raw" block type, specified as the third parameter to $template->sidebar_widget(). Defaults to false, which is old behavior; new behavior (enabled by passing TRUE as the 3rd param) means that the content of the block is primarily block-level links.
Dan
parents:
413
diff
changeset
|
302 |
{ |
b8b4e38825db
Unsuccessful attempt at fixing "dismiss"/"close manager" buttons in ACL editor; non-breaking change to template API to allow plugins to add "normal" sidebar widgets in addition to the special "raw" block type, specified as the third parameter to $template->sidebar_widget(). Defaults to false, which is old behavior; new behavior (enabled by passing TRUE as the 3rd param) means that the content of the block is primarily block-level links.
Dan
parents:
413
diff
changeset
|
303 |
$parser = $this->makeParserText($tplvars['sidebar_section_raw']); |
b8b4e38825db
Unsuccessful attempt at fixing "dismiss"/"close manager" buttons in ACL editor; non-breaking change to template API to allow plugins to add "normal" sidebar widgets in addition to the special "raw" block type, specified as the third parameter to $template->sidebar_widget(). Defaults to false, which is old behavior; new behavior (enabled by passing TRUE as the 3rd param) means that the content of the block is primarily block-level links.
Dan
parents:
413
diff
changeset
|
304 |
} |
b8b4e38825db
Unsuccessful attempt at fixing "dismiss"/"close manager" buttons in ACL editor; non-breaking change to template API to allow plugins to add "normal" sidebar widgets in addition to the special "raw" block type, specified as the third parameter to $template->sidebar_widget(). Defaults to false, which is old behavior; new behavior (enabled by passing TRUE as the 3rd param) means that the content of the block is primarily block-level links.
Dan
parents:
413
diff
changeset
|
305 |
|
b8b4e38825db
Unsuccessful attempt at fixing "dismiss"/"close manager" buttons in ACL editor; non-breaking change to template API to allow plugins to add "normal" sidebar widgets in addition to the special "raw" block type, specified as the third parameter to $template->sidebar_widget(). Defaults to false, which is old behavior; new behavior (enabled by passing TRUE as the 3rd param) means that the content of the block is primarily block-level links.
Dan
parents:
413
diff
changeset
|
306 |
$parser->assign_vars(Array('TITLE' => '{TITLE}','CONTENT' => $h)); |
b8b4e38825db
Unsuccessful attempt at fixing "dismiss"/"close manager" buttons in ACL editor; non-breaking change to template API to allow plugins to add "normal" sidebar widgets in addition to the special "raw" block type, specified as the third parameter to $template->sidebar_widget(). Defaults to false, which is old behavior; new behavior (enabled by passing TRUE as the 3rd param) means that the content of the block is primarily block-level links.
Dan
parents:
413
diff
changeset
|
307 |
$this->plugin_blocks[$t] = $parser->run(); |
1 | 308 |
$this->sidebar_widgets .= $parser->run(); |
309 |
} |
|
310 |
function add_header($html) |
|
311 |
{ |
|
582
a38876c0793c
Majorly reworked Javascript runtime stuff to use on-demand loading.
Dan
parents:
581
diff
changeset
|
312 |
/* debug only ** |
a38876c0793c
Majorly reworked Javascript runtime stuff to use on-demand loading.
Dan
parents:
581
diff
changeset
|
313 |
$bt = debug_backtrace(); |
a38876c0793c
Majorly reworked Javascript runtime stuff to use on-demand loading.
Dan
parents:
581
diff
changeset
|
314 |
$bt = $bt[1]; |
a38876c0793c
Majorly reworked Javascript runtime stuff to use on-demand loading.
Dan
parents:
581
diff
changeset
|
315 |
$this->additional_headers .= "\n <!-- {$bt['file']}:{$bt['line']} -->\n " . $html; |
a38876c0793c
Majorly reworked Javascript runtime stuff to use on-demand loading.
Dan
parents:
581
diff
changeset
|
316 |
*/ |
a38876c0793c
Majorly reworked Javascript runtime stuff to use on-demand loading.
Dan
parents:
581
diff
changeset
|
317 |
$this->additional_headers .= "\n " . $html; |
1 | 318 |
} |
319 |
function get_css($s = false) |
|
320 |
{ |
|
321 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
322 |
if(!defined('ENANO_TEMPLATE_LOADED')) |
|
323 |
$this->load_theme($session->theme, $session->style); |
|
324 |
$path = ( $s ) ? 'css/'.$s : 'css/'.$this->style.'.css'; |
|
325 |
if ( !file_exists(ENANO_ROOT . '/themes/' . $this->theme . '/' . $path) ) |
|
326 |
{ |
|
327 |
echo "/* WARNING: Falling back to default file because file $path does not exist */\n"; |
|
328 |
$path = 'css/' . $this->style_list[0] . '.css'; |
|
329 |
} |
|
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
330 |
return '<enano:no-opt>' . $this->process_template($path) . '</enano:no-opt>'; |
1 | 331 |
} |
332 |
function load_theme($name = false, $css = false) |
|
333 |
{ |
|
334 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
335 |
$this->theme = ( $name ) ? $name : $session->theme; |
|
336 |
$this->style = ( $css ) ? $css : $session->style; |
|
337 |
if ( !$this->theme ) |
|
338 |
{ |
|
339 |
$this->theme = $this->theme_list[0]['theme_id']; |
|
468
194a19711346
Fixed the fact that cron just didn't work at all (brain fart that day or something)
Dan
parents:
458
diff
changeset
|
340 |
$this->style = preg_replace('/\.css$/', '', $this->theme_list[0]['default_style']); |
1 | 341 |
} |
471
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
342 |
// Make sure we're allowed to use this theme. |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
343 |
if ( ( |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
344 |
// If it was removed, it's probably blocked by an ACL, or it was uninstalled |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
345 |
!isset($this->named_theme_list[$this->theme]) || |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
346 |
// Check if the theme is disabled |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
347 |
( isset($this->named_theme_list[$this->theme]) && $this->named_theme_list[$this->theme]['enabled'] == 0 ) ) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
348 |
// Above all, if it's a system theme, don't inhibit the loading process. |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
349 |
&& !in_array($this->theme, $this->system_themes) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
350 |
) |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
351 |
{ |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
352 |
// No, something is preventing it - fall back to site default |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
353 |
$this->theme = $this->default_theme; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
354 |
|
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
355 |
// Come up with the default style. If the CSS file specified in default_style exists, we're good, just |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
356 |
// use that. Otherwise, use the first stylesheet that comes to mind. |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
357 |
$df_data =& $this->named_theme_list[ $this->theme ]; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
358 |
$this->style = ( in_array($df_data['default_style'], $df_data['css']) ) ? $df_data['default_style'] : $df_data['css'][0]; |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
359 |
} |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
360 |
// The list of styles for the currently selected theme |
7906fb190fc1
Implemented all security features on theme disabling and ACLs; added clean_key mode to login API to clean unused encryption keys
Dan
parents:
468
diff
changeset
|
361 |
$this->style_list =& $this->named_theme_list[ $this->theme ]['css']; |
1 | 362 |
$this->theme_loaded = true; |
363 |
} |
|
364 |
||
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
365 |
/** |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
366 |
* Initializes all variables related to on-page content. This includes sidebars and what have you. |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
367 |
* @param object Optional PageProcessor object to use for passing metadata and permissions on. If omitted, uses information from $paths and $session. |
578
02bc119a6dd3
Fixed: init_vars double-init check ignored theme changes/reloads
Dan
parents:
577
diff
changeset
|
368 |
* @param bool If true, re-inits even if already initted with this page_id and namespace |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
369 |
*/ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
370 |
|
578
02bc119a6dd3
Fixed: init_vars double-init check ignored theme changes/reloads
Dan
parents:
577
diff
changeset
|
371 |
function init_vars($page = false, $force_init = false) |
1 | 372 |
{ |
373 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
374 |
global $email; |
|
210
2b283402e4e4
Added language export to JSON page and localization for Javascript using $lang.get(). Localized AJAX login interface.
Dan
parents:
208
diff
changeset
|
375 |
global $lang; |
1 | 376 |
|
377 |
if(!$this->theme || !$this->style) |
|
378 |
{ |
|
379 |
$this->load_theme(); |
|
380 |
} |
|
381 |
||
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
382 |
if ( defined('ENANO_TEMPLATE_LOADED') ) |
1 | 383 |
{ |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
384 |
// trigger_error("\$template->init_vars() called more than once", E_USER_WARNING); |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
385 |
// die_semicritical('Illegal call', '<p>$template->init_vars() was called multiple times, this is not supposed to happen. Exiting with fatal error.</p>'); |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
386 |
} |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
387 |
else |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
388 |
{ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
389 |
@define('ENANO_TEMPLATE_LOADED', ''); |
1 | 390 |
} |
391 |
||
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
392 |
if ( is_object($page) && @get_class($page) == 'PageProcessor' ) |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
393 |
{ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
394 |
$page_append = substr($paths->fullpage, strlen($paths->page)); |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
395 |
if ( isset($paths->nslist[$page->namespace]) ) |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
396 |
{ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
397 |
$local_page = $paths->nslist[$page->namespace] . $page->page_id; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
398 |
} |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
399 |
else |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
400 |
{ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
401 |
$local_page = $page->namespace . substr($paths->nslist['Special'], -1) . $page->page_id . $page_append; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
402 |
} |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
403 |
$local_fullpage = $local_page . $page_append; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
404 |
$local_page_id =& $page->page_id; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
405 |
$local_namespace =& $page->namespace; |
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
406 |
$local_page_exists =& $page->page_exists; |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
407 |
$perms =& $page->perms; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
408 |
} |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
409 |
else |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
410 |
{ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
411 |
$local_page =& $paths->page; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
412 |
$local_page_id =& $paths->page_id; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
413 |
$local_fullpage =& $paths->fullpage; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
414 |
$local_namespace =& $paths->namespace; |
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
415 |
$local_page_exists =& $paths->page_exists; |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
416 |
$local_page_protected =& $paths->page_protected; |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
417 |
$perms =& $session; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
418 |
} |
1 | 419 |
|
578
02bc119a6dd3
Fixed: init_vars double-init check ignored theme changes/reloads
Dan
parents:
577
diff
changeset
|
420 |
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 ) |
577
5118610ce160
Made template parser remember last initted page_id and namespace to avoid double init; made additional_headers reassign only do so if $template->additional_headers is empty (it's being blanked somehow, need to come up with a backtrace sometime)
Dan
parents:
573
diff
changeset
|
421 |
{ |
5118610ce160
Made template parser remember last initted page_id and namespace to avoid double init; made additional_headers reassign only do so if $template->additional_headers is empty (it's being blanked somehow, need to come up with a backtrace sometime)
Dan
parents:
573
diff
changeset
|
422 |
// we're already initted with this page. |
5118610ce160
Made template parser remember last initted page_id and namespace to avoid double init; made additional_headers reassign only do so if $template->additional_headers is empty (it's being blanked somehow, need to come up with a backtrace sometime)
Dan
parents:
573
diff
changeset
|
423 |
return true; |
5118610ce160
Made template parser remember last initted page_id and namespace to avoid double init; made additional_headers reassign only do so if $template->additional_headers is empty (it's being blanked somehow, need to come up with a backtrace sometime)
Dan
parents:
573
diff
changeset
|
424 |
} |
5118610ce160
Made template parser remember last initted page_id and namespace to avoid double init; made additional_headers reassign only do so if $template->additional_headers is empty (it's being blanked somehow, need to come up with a backtrace sometime)
Dan
parents:
573
diff
changeset
|
425 |
|
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
426 |
profiler_log("template: starting var init"); |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
427 |
|
577
5118610ce160
Made template parser remember last initted page_id and namespace to avoid double init; made additional_headers reassign only do so if $template->additional_headers is empty (it's being blanked somehow, need to come up with a backtrace sometime)
Dan
parents:
573
diff
changeset
|
428 |
$this->initted_to_page_id = $local_page_id; |
5118610ce160
Made template parser remember last initted page_id and namespace to avoid double init; made additional_headers reassign only do so if $template->additional_headers is empty (it's being blanked somehow, need to come up with a backtrace sometime)
Dan
parents:
573
diff
changeset
|
429 |
$this->initted_to_namespace = $local_namespace; |
578
02bc119a6dd3
Fixed: init_vars double-init check ignored theme changes/reloads
Dan
parents:
577
diff
changeset
|
430 |
$this->initted_to_theme = array( |
02bc119a6dd3
Fixed: init_vars double-init check ignored theme changes/reloads
Dan
parents:
577
diff
changeset
|
431 |
'theme' => $this->theme, |
02bc119a6dd3
Fixed: init_vars double-init check ignored theme changes/reloads
Dan
parents:
577
diff
changeset
|
432 |
'style' => $this->style |
02bc119a6dd3
Fixed: init_vars double-init check ignored theme changes/reloads
Dan
parents:
577
diff
changeset
|
433 |
); |
577
5118610ce160
Made template parser remember last initted page_id and namespace to avoid double init; made additional_headers reassign only do so if $template->additional_headers is empty (it's being blanked somehow, need to come up with a backtrace sometime)
Dan
parents:
573
diff
changeset
|
434 |
|
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
435 |
if ( $local_page_exists && isset($paths->pages[$local_page]) ) |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
436 |
{ |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
437 |
$local_cdata =& $paths->pages[$local_page]; |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
438 |
} |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
439 |
else |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
440 |
{ |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
441 |
// if the page doesn't exist but we're trying to load it, it was requested manually and $paths->cpage should match it. |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
442 |
if ( $paths->page_id == $local_page_id ) |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
443 |
{ |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
444 |
// load metadata from cpage |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
445 |
$local_cdata =& $paths->cpage; |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
446 |
} |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
447 |
else |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
448 |
{ |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
449 |
// generate our own failsafe metadata |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
450 |
$local_cdata = array( |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
451 |
'urlname' => $local_page, |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
452 |
'urlname_nons' => $local_page_id, |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
453 |
'namespace' => $local_namespace, |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
454 |
'name' => get_page_title_ns($local_page_id, $local_namespace), |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
455 |
'comments_on' => 0, |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
456 |
'protected' => 0, |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
457 |
'wiki_mode' => 2, |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
458 |
'delvotes' => 0, |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
459 |
'delvote_ips' => serialize(array()) |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
460 |
); |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
461 |
} |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
462 |
} |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
463 |
|
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
464 |
// calculate protection |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
465 |
if ( !isset($local_page_protected) ) |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
466 |
{ |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
467 |
if ( $local_cdata['protected'] == 0 ) |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
468 |
{ |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
469 |
$local_page_protected = false; |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
470 |
} |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
471 |
else if ( $local_cdata['protected'] == 1 ) |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
472 |
{ |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
473 |
$local_page_protected = true; |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
474 |
} |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
475 |
else if ( $local_cdata['protected'] == 2 ) |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
476 |
{ |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
477 |
if ( |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
478 |
( !$session->user_logged_in || // Is the user logged in? |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
479 |
( $session->user_logged_in && $session->reg_time + ( 4 * 86400 ) >= time() ) ) // If so, have they been registered for 4 days? |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
480 |
&& !$perms->get_permissions('even_when_protected') ) // And of course, is there an ACL that overrides semi-protection? |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
481 |
{ |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
482 |
$local_page_protected = true; |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
483 |
} |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
484 |
else |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
485 |
{ |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
486 |
$local_page_protected = false; |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
487 |
} |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
488 |
} |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
489 |
} |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
490 |
|
1 | 491 |
$tplvars = $this->extract_vars('elements.tpl'); |
492 |
||
493 |
if(isset($_SERVER['HTTP_USER_AGENT']) && strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE')) |
|
494 |
{ |
|
495 |
$this->add_header(' |
|
496 |
<!--[if lt IE 7]> |
|
497 |
<script language="JavaScript"> |
|
498 |
function correctPNG() // correctly handle PNG transparency in Win IE 5.5 & 6. |
|
499 |
{ |
|
86
c162ca39db8f
Finished pagination code (was incomplete in previous revision) and added a few hacks for an upcoming theme
Dan
parents:
85
diff
changeset
|
500 |
var arVersion = navigator.appVersion.split("MSIE"); |
c162ca39db8f
Finished pagination code (was incomplete in previous revision) and added a few hacks for an upcoming theme
Dan
parents:
85
diff
changeset
|
501 |
var version = parseFloat(arVersion[1]); |
1 | 502 |
if (version >= 5.5 && typeof(document.body.filters) == "object") |
503 |
{ |
|
504 |
for(var i=0; i<document.images.length; i++) |
|
505 |
{ |
|
506 |
var img = document.images[i]; |
|
507 |
continue; |
|
508 |
var imgName = img.src.toUpperCase(); |
|
509 |
if (imgName.substring(imgName.length-3, imgName.length) == "PNG") |
|
510 |
{ |
|
511 |
var imgID = (img.id) ? "id=\'" + img.id + "\' " : ""; |
|
512 |
var imgClass = (img.className) ? "class=\'" + img.className + "\' " : ""; |
|
513 |
var imgTitle = (img.title) ? "title=\'" + img.title + "\' " : "title=\'" + img.alt + "\' "; |
|
514 |
var imgStyle = "display:inline-block;" + img.style.cssText; |
|
515 |
if (img.align == "left") imgStyle = "float:left;" + imgStyle; |
|
516 |
if (img.align == "right") imgStyle = "float:right;" + imgStyle; |
|
517 |
if (img.parentElement.href) imgStyle = "cursor:hand;" + imgStyle; |
|
518 |
var strNewHTML = "<span " + imgID + imgClass + imgTitle + " style=\\"" + "width:" + img.width + "px; height:" + img.height + "px;" + imgStyle + ";" + "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader" + "(src=\\\'" + img.src + "\\\', sizingMethod=\'scale\');\\"></span>"; |
|
519 |
img.outerHTML = strNewHTML; |
|
520 |
i = i-1; |
|
521 |
} |
|
522 |
} |
|
523 |
} |
|
524 |
} |
|
525 |
window.attachEvent("onload", correctPNG); |
|
526 |
</script> |
|
527 |
<![endif]--> |
|
528 |
'); |
|
529 |
} |
|
530 |
||
531 |
// Get the "article" button text (depends on namespace) |
|
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
532 |
switch($local_namespace) { |
1 | 533 |
case "Article": |
534 |
default: |
|
211 | 535 |
$ns = $lang->get('onpage_lbl_page_article'); |
1 | 536 |
break; |
537 |
case "Admin": |
|
211 | 538 |
$ns = $lang->get('onpage_lbl_page_admin'); |
1 | 539 |
break; |
540 |
case "System": |
|
211 | 541 |
$ns = $lang->get('onpage_lbl_page_system'); |
1 | 542 |
break; |
543 |
case "File": |
|
211 | 544 |
$ns = $lang->get('onpage_lbl_page_file'); |
1 | 545 |
break; |
546 |
case "Help": |
|
211 | 547 |
$ns = $lang->get('onpage_lbl_page_help'); |
1 | 548 |
break; |
549 |
case "User": |
|
211 | 550 |
$ns = $lang->get('onpage_lbl_page_user'); |
1 | 551 |
break; |
552 |
case "Special": |
|
211 | 553 |
$ns = $lang->get('onpage_lbl_page_special'); |
1 | 554 |
break; |
555 |
case "Template": |
|
211 | 556 |
$ns = $lang->get('onpage_lbl_page_template'); |
1 | 557 |
break; |
558 |
case "Project": |
|
211 | 559 |
$ns = $lang->get('onpage_lbl_page_project'); |
1 | 560 |
break; |
561 |
case "Category": |
|
211 | 562 |
$ns = $lang->get('onpage_lbl_page_category'); |
1 | 563 |
break; |
692
78473351a6c9
Changed namespace properties (including core identifier) for external pages that load the Enano API to be a uniform "API" namespace and "SystemAPI:" prefix.
Dan
parents:
689
diff
changeset
|
564 |
case "API": |
655
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
565 |
$ns = $lang->get('onpage_lbl_page_external'); |
312
6c7060d36a23
Improved physical pages: they support comments and have their own dedicated namespace now. Still some consistency fixes to make.
Dan
parents:
311
diff
changeset
|
566 |
break; |
1 | 567 |
} |
568 |
$this->namespace_string = $ns; |
|
211 | 569 |
unset($ns); |
1 | 570 |
$code = $plugins->setHook('page_type_string_set'); |
571 |
foreach ( $code as $cmd ) |
|
572 |
{ |
|
573 |
eval($cmd); |
|
574 |
} |
|
575 |
$ns =& $this->namespace_string; |
|
576 |
||
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
577 |
// |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
578 |
// PAGE TOOLBAR (on-page controls/actions) |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
579 |
// |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
580 |
|
1 | 581 |
// Initialize the toolbar |
582 |
$tb = ''; |
|
583 |
||
584 |
// Create "xx page" button |
|
585 |
||
586 |
$btn_selected = ( isset($tplvars['toolbar_button_selected'])) ? $tplvars['toolbar_button_selected'] : $tplvars['toolbar_button']; |
|
587 |
$parser = $this->makeParserText($btn_selected); |
|
588 |
||
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
589 |
$parser->assign_vars(array( |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
590 |
'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxReset()); return false; }" title="' . $lang->get('onpage_tip_article') . '" accesskey="a"', |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
591 |
'PARENTFLAGS' => 'id="mdgToolbar_article"', |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
592 |
'HREF' => makeUrl($local_page, null, true), |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
593 |
'TEXT' => $this->namespace_string |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
594 |
)); |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
595 |
|
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
596 |
$tb .= $parser->run(); |
1 | 597 |
|
598 |
$button = $this->makeParserText($tplvars['toolbar_button']); |
|
599 |
||
600 |
// Page toolbar |
|
601 |
// Comments button |
|
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
602 |
if ( $perms->get_permissions('read') && getConfig('enable_comments')=='1' && $local_cdata['comments_on'] == 1 ) |
1 | 603 |
{ |
604 |
||
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
605 |
$e = $db->sql_query('SELECT approved FROM '.table_prefix.'comments WHERE page_id=\''.$local_page_id.'\' AND namespace=\''.$local_namespace.'\';'); |
1 | 606 |
if ( !$e ) |
607 |
{ |
|
608 |
$db->_die(); |
|
609 |
} |
|
610 |
$nc = $db->numrows(); |
|
611 |
$nu = 0; |
|
612 |
$na = 0; |
|
613 |
||
614 |
while ( $r = $db->fetchrow() ) |
|
615 |
{ |
|
616 |
if ( !$r['approved'] ) |
|
617 |
{ |
|
618 |
$nu++; |
|
619 |
} |
|
620 |
else |
|
621 |
{ |
|
622 |
$na++; |
|
623 |
} |
|
624 |
} |
|
625 |
||
626 |
$db->free_result(); |
|
579
6e23d8a99616
Fixed access type warning in discussion button generation in template
Dan
parents:
578
diff
changeset
|
627 |
$n = ( $session->check_acl_scope('mod_comments', $local_namespace) && $perms->get_permissions('mod_comments') ) ? (string)$nc : (string)$na; |
6e23d8a99616
Fixed access type warning in discussion button generation in template
Dan
parents:
578
diff
changeset
|
628 |
if ( $session->check_acl_scope('mod_comments', $local_namespace) && $perms->get_permissions('mod_comments') && $nu > 0 ) |
1 | 629 |
{ |
211 | 630 |
$subst = array( |
631 |
'num_comments' => $nc, |
|
632 |
'num_unapp' => $nu |
|
633 |
); |
|
634 |
$btn_text = $lang->get('onpage_btn_discussion_unapp', $subst); |
|
635 |
} |
|
636 |
else |
|
637 |
{ |
|
638 |
$subst = array( |
|
639 |
'num_comments' => $nc |
|
640 |
); |
|
641 |
$btn_text = $lang->get('onpage_btn_discussion', $subst); |
|
1 | 642 |
} |
643 |
||
644 |
$button->assign_vars(array( |
|
265
7e0cdf71b1bb
Some (not much) progress with localizing tooltips on the pagebar. Still aways to go and committing so as to merge changes from stable
Dan
parents:
248
diff
changeset
|
645 |
'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxComments()); return false; }" title="' . $lang->get('onpage_tip_comments') . '" accesskey="c"', |
1 | 646 |
'PARENTFLAGS' => 'id="mdgToolbar_discussion"', |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
647 |
'HREF' => makeUrl($local_page, 'do=comments', true), |
211 | 648 |
'TEXT' => $btn_text, |
1 | 649 |
)); |
650 |
||
651 |
$tb .= $button->run(); |
|
652 |
} |
|
653 |
// Edit button |
|
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
654 |
if($perms->get_permissions('read') && $session->check_acl_scope('edit_page', $local_namespace) && ( $perms->get_permissions('edit_page') && ( ( $paths->page_protected && $perms->get_permissions('even_when_protected') ) || !$paths->page_protected ) ) ) |
1 | 655 |
{ |
656 |
$button->assign_vars(array( |
|
265
7e0cdf71b1bb
Some (not much) progress with localizing tooltips on the pagebar. Still aways to go and committing so as to merge changes from stable
Dan
parents:
248
diff
changeset
|
657 |
'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxEditor()); return false; }" title="' . $lang->get('onpage_tip_edit') . '" accesskey="e"', |
1 | 658 |
'PARENTFLAGS' => 'id="mdgToolbar_edit"', |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
659 |
'HREF' => makeUrl($local_page, 'do=edit', true), |
211 | 660 |
'TEXT' => $lang->get('onpage_btn_edit') |
1 | 661 |
)); |
662 |
$tb .= $button->run(); |
|
663 |
// View source button |
|
664 |
} |
|
692
78473351a6c9
Changed namespace properties (including core identifier) for external pages that load the Enano API to be a uniform "API" namespace and "SystemAPI:" prefix.
Dan
parents:
689
diff
changeset
|
665 |
else if ( $session->check_acl_scope('view_source', $local_namespace) && $perms->get_permissions('view_source') && ( !$perms->get_permissions('edit_page') || !$perms->get_permissions('even_when_protected') && $paths->page_protected ) && $local_namespace != 'API') |
1 | 666 |
{ |
667 |
$button->assign_vars(array( |
|
335
67bd3121a12e
Replaced TinyMCE 2.x with 3.0 beta 3. Supports everything but IE. Also rewrote the editor interface completely from the ground up.
Dan
parents:
326
diff
changeset
|
668 |
'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxEditor()); return false; }" title="' . $lang->get('onpage_tip_viewsource') . '" accesskey="e"', |
1 | 669 |
'PARENTFLAGS' => 'id="mdgToolbar_edit"', |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
670 |
'HREF' => makeUrl($local_page, 'do=viewsource', true), |
211 | 671 |
'TEXT' => $lang->get('onpage_btn_viewsource') |
1 | 672 |
)); |
673 |
$tb .= $button->run(); |
|
674 |
} |
|
675 |
// History button |
|
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
676 |
if ( $perms->get_permissions('read') && $session->check_acl_scope('history_view', $local_namespace) && $local_page_exists && $perms->get_permissions('history_view') ) |
1 | 677 |
{ |
678 |
$button->assign_vars(array( |
|
265
7e0cdf71b1bb
Some (not much) progress with localizing tooltips on the pagebar. Still aways to go and committing so as to merge changes from stable
Dan
parents:
248
diff
changeset
|
679 |
'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxHistory()); return false; }" title="' . $lang->get('onpage_tip_history') . '" accesskey="h"', |
1 | 680 |
'PARENTFLAGS' => 'id="mdgToolbar_history"', |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
681 |
'HREF' => makeUrl($local_page, 'do=history', true), |
211 | 682 |
'TEXT' => $lang->get('onpage_btn_history') |
1 | 683 |
)); |
684 |
$tb .= $button->run(); |
|
685 |
} |
|
686 |
||
687 |
$menubtn = $this->makeParserText($tplvars['toolbar_menu_button']); |
|
688 |
||
689 |
// Additional actions menu |
|
690 |
// Rename button |
|
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
691 |
if ( $perms->get_permissions('read') && $session->check_acl_scope('rename', $local_namespace) && $local_page_exists && ( $perms->get_permissions('rename') && ( $paths->page_protected && $perms->get_permissions('even_when_protected') || !$paths->page_protected ) ) ) |
1 | 692 |
{ |
693 |
$menubtn->assign_vars(array( |
|
265
7e0cdf71b1bb
Some (not much) progress with localizing tooltips on the pagebar. Still aways to go and committing so as to merge changes from stable
Dan
parents:
248
diff
changeset
|
694 |
'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxRename()); return false; }" title="' . $lang->get('onpage_tip_rename') . '" accesskey="r"', |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
695 |
'HREF' => makeUrl($local_page, 'do=rename', true), |
211 | 696 |
'TEXT' => $lang->get('onpage_btn_rename'), |
1 | 697 |
)); |
698 |
$this->toolbar_menu .= $menubtn->run(); |
|
699 |
} |
|
700 |
||
701 |
// Vote-to-delete button |
|
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
702 |
if ( $paths->wiki_mode && $session->check_acl_scope('vote_delete', $local_namespace) && $perms->get_permissions('vote_delete') && $local_page_exists) |
1 | 703 |
{ |
704 |
$menubtn->assign_vars(array( |
|
265
7e0cdf71b1bb
Some (not much) progress with localizing tooltips on the pagebar. Still aways to go and committing so as to merge changes from stable
Dan
parents:
248
diff
changeset
|
705 |
'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxDelVote()); return false; }" title="' . $lang->get('onpage_tip_delvote') . '" accesskey="d"', |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
706 |
'HREF' => makeUrl($local_page, 'do=delvote', true), |
211 | 707 |
'TEXT' => $lang->get('onpage_btn_votedelete'), |
1 | 708 |
)); |
709 |
$this->toolbar_menu .= $menubtn->run(); |
|
710 |
} |
|
711 |
||
712 |
// Clear-votes button |
|
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
713 |
if ( $perms->get_permissions('read') && $session->check_acl_scope('vote_reset', $local_namespace) && $paths->wiki_mode && $local_page_exists && $perms->get_permissions('vote_reset') && $local_cdata['delvotes'] > 0) |
1 | 714 |
{ |
715 |
$menubtn->assign_vars(array( |
|
265
7e0cdf71b1bb
Some (not much) progress with localizing tooltips on the pagebar. Still aways to go and committing so as to merge changes from stable
Dan
parents:
248
diff
changeset
|
716 |
'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxResetDelVotes()); return false; }" title="' . $lang->get('onpage_tip_resetvotes') . '" accesskey="y"', |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
717 |
'HREF' => makeUrl($local_page, 'do=resetvotes', true), |
211 | 718 |
'TEXT' => $lang->get('onpage_btn_votedelete_reset'), |
1 | 719 |
)); |
720 |
$this->toolbar_menu .= $menubtn->run(); |
|
721 |
} |
|
722 |
||
723 |
// Printable page button |
|
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
724 |
if ( $local_page_exists ) |
1 | 725 |
{ |
726 |
$menubtn->assign_vars(array( |
|
265
7e0cdf71b1bb
Some (not much) progress with localizing tooltips on the pagebar. Still aways to go and committing so as to merge changes from stable
Dan
parents:
248
diff
changeset
|
727 |
'FLAGS' => 'title="' . $lang->get('onpage_tip_printable') . '"', |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
728 |
'HREF' => makeUrl($local_page, 'printable=yes', true), |
211 | 729 |
'TEXT' => $lang->get('onpage_btn_printable'), |
1 | 730 |
)); |
731 |
$this->toolbar_menu .= $menubtn->run(); |
|
732 |
} |
|
733 |
||
734 |
// Protect button |
|
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
735 |
if($perms->get_permissions('read') && $session->check_acl_scope('protect', $local_namespace) && $paths->wiki_mode && $local_page_exists && $perms->get_permissions('protect')) |
1 | 736 |
{ |
737 |
||
738 |
$label = $this->makeParserText($tplvars['toolbar_label']); |
|
211 | 739 |
$label->assign_vars(array('TEXT' => $lang->get('onpage_lbl_protect'))); |
1 | 740 |
$t0 = $label->run(); |
741 |
||
742 |
$ctmp = ''; |
|
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
743 |
if ( $local_cdata['protected'] == 1 ) |
1 | 744 |
{ |
745 |
$ctmp=' style="text-decoration: underline;"'; |
|
746 |
} |
|
747 |
$menubtn->assign_vars(array( |
|
265
7e0cdf71b1bb
Some (not much) progress with localizing tooltips on the pagebar. Still aways to go and committing so as to merge changes from stable
Dan
parents:
248
diff
changeset
|
748 |
'FLAGS' => 'accesskey="i" onclick="if ( !KILL_SWITCH ) { ajaxProtect(1); return false; }" id="protbtn_1" title="' . $lang->get('onpage_tip_protect_on') . '"'.$ctmp, |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
749 |
'HREF' => makeUrl($local_page, 'do=protect&level=1', true), |
211 | 750 |
'TEXT' => $lang->get('onpage_btn_protect_on') |
1 | 751 |
)); |
752 |
$t1 = $menubtn->run(); |
|
753 |
||
754 |
$ctmp = ''; |
|
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
755 |
if ( $local_cdata['protected'] == 0 ) |
1 | 756 |
{ |
757 |
$ctmp=' style="text-decoration: underline;"'; |
|
758 |
} |
|
759 |
$menubtn->assign_vars(array( |
|
265
7e0cdf71b1bb
Some (not much) progress with localizing tooltips on the pagebar. Still aways to go and committing so as to merge changes from stable
Dan
parents:
248
diff
changeset
|
760 |
'FLAGS' => 'accesskey="o" onclick="if ( !KILL_SWITCH ) { ajaxProtect(0); return false; }" id="protbtn_0" title="' . $lang->get('onpage_tip_protect_off') . '"'.$ctmp, |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
761 |
'HREF' => makeUrl($local_page, 'do=protect&level=0', true), |
211 | 762 |
'TEXT' => $lang->get('onpage_btn_protect_off') |
1 | 763 |
)); |
764 |
$t2 = $menubtn->run(); |
|
765 |
||
766 |
$ctmp = ''; |
|
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
767 |
if ( $local_cdata['protected'] == 2 ) |
1 | 768 |
{ |
769 |
$ctmp = ' style="text-decoration: underline;"'; |
|
770 |
} |
|
771 |
$menubtn->assign_vars(array( |
|
265
7e0cdf71b1bb
Some (not much) progress with localizing tooltips on the pagebar. Still aways to go and committing so as to merge changes from stable
Dan
parents:
248
diff
changeset
|
772 |
'FLAGS' => 'accesskey="p" onclick="if ( !KILL_SWITCH ) { ajaxProtect(2); return false; }" id="protbtn_2" title="' . $lang->get('onpage_tip_protect_semi') . '"'.$ctmp, |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
773 |
'HREF' => makeUrl($local_page, 'do=protect&level=2', true), |
211 | 774 |
'TEXT' => $lang->get('onpage_btn_protect_semi') |
1 | 775 |
)); |
776 |
$t3 = $menubtn->run(); |
|
777 |
||
778 |
$this->toolbar_menu .= ' <table border="0" cellspacing="0" cellpadding="0"> |
|
779 |
<tr> |
|
780 |
<td>'.$t0.'</td> |
|
781 |
<td>'.$t1.'</td> |
|
782 |
<td>'.$t2.'</td> |
|
783 |
<td>'.$t3.'</td> |
|
784 |
</tr> |
|
785 |
</table>'; |
|
786 |
} |
|
787 |
||
788 |
// Wiki mode button |
|
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
789 |
if($perms->get_permissions('read') && $session->check_acl_scope('set_wiki_mode', $local_namespace) && $local_page_exists && $perms->get_permissions('set_wiki_mode')) |
1 | 790 |
{ |
791 |
// label at start |
|
792 |
$label = $this->makeParserText($tplvars['toolbar_label']); |
|
211 | 793 |
$label->assign_vars(array('TEXT' => $lang->get('onpage_lbl_wikimode'))); |
1 | 794 |
$t0 = $label->run(); |
795 |
||
796 |
// on button |
|
797 |
$ctmp = ''; |
|
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
798 |
if ( $local_cdata['wiki_mode'] == 1 ) |
1 | 799 |
{ |
800 |
$ctmp = ' style="text-decoration: underline;"'; |
|
801 |
} |
|
802 |
$menubtn->assign_vars(array( |
|
102
d807dcd7aed7
[comments] fixed edit button (source wasn't getting filled)
Dan
parents:
98
diff
changeset
|
803 |
'FLAGS' => /* 'onclick="if ( !KILL_SWITCH ) { ajaxSetWikiMode(1); return false; }" id="wikibtn_1" title="Forces wiki functions to be allowed on this page."'. */ $ctmp, |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
804 |
'HREF' => makeUrl($local_page, 'do=setwikimode&level=1', true), |
211 | 805 |
'TEXT' => $lang->get('onpage_btn_wikimode_on') |
1 | 806 |
)); |
807 |
$t1 = $menubtn->run(); |
|
808 |
||
809 |
// off button |
|
810 |
$ctmp = ''; |
|
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
811 |
if ( $local_cdata['wiki_mode'] == 0 ) |
1 | 812 |
{ |
813 |
$ctmp=' style="text-decoration: underline;"'; |
|
814 |
} |
|
815 |
$menubtn->assign_vars(array( |
|
102
d807dcd7aed7
[comments] fixed edit button (source wasn't getting filled)
Dan
parents:
98
diff
changeset
|
816 |
'FLAGS' => /* 'onclick="if ( !KILL_SWITCH ) { ajaxSetWikiMode(0); return false; }" id="wikibtn_0" title="Forces wiki functions to be disabled on this page."'. */ $ctmp, |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
817 |
'HREF' => makeUrl($local_page, 'do=setwikimode&level=0', true), |
211 | 818 |
'TEXT' => $lang->get('onpage_btn_wikimode_off') |
1 | 819 |
)); |
820 |
$t2 = $menubtn->run(); |
|
821 |
||
822 |
// global button |
|
823 |
$ctmp = ''; |
|
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
824 |
if ( $local_cdata['wiki_mode'] == 2 ) |
1 | 825 |
{ |
826 |
$ctmp=' style="text-decoration: underline;"'; |
|
827 |
} |
|
828 |
$menubtn->assign_vars(array( |
|
102
d807dcd7aed7
[comments] fixed edit button (source wasn't getting filled)
Dan
parents:
98
diff
changeset
|
829 |
'FLAGS' => /* 'onclick="if ( !KILL_SWITCH ) { ajaxSetWikiMode(2); return false; }" id="wikibtn_2" title="Causes this page to use the global wiki mode setting (default)"'. */ $ctmp, |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
830 |
'HREF' => makeUrl($local_page, 'do=setwikimode&level=2', true), |
211 | 831 |
'TEXT' => $lang->get('onpage_btn_wikimode_global') |
1 | 832 |
)); |
833 |
$t3 = $menubtn->run(); |
|
834 |
||
835 |
// Tack it onto the list of buttons that are already there... |
|
836 |
$this->toolbar_menu .= ' <table border="0" cellspacing="0" cellpadding="0"> |
|
837 |
<tr> |
|
838 |
<td>'.$t0.'</td> |
|
839 |
<td>'.$t1.'</td> |
|
840 |
<td>'.$t2.'</td> |
|
841 |
<td>'.$t3.'</td> |
|
842 |
</tr> |
|
843 |
</table>'; |
|
844 |
} |
|
845 |
||
846 |
// Clear logs button |
|
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
847 |
if ( $perms->get_permissions('read') && $session->check_acl_scope('clear_logs', $local_namespace) && $perms->get_permissions('clear_logs') ) |
1 | 848 |
{ |
849 |
$menubtn->assign_vars(array( |
|
265
7e0cdf71b1bb
Some (not much) progress with localizing tooltips on the pagebar. Still aways to go and committing so as to merge changes from stable
Dan
parents:
248
diff
changeset
|
850 |
'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxClearLogs()); return false; }" title="' . $lang->get('onpage_tip_flushlogs') . '" accesskey="l"', |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
851 |
'HREF' => makeUrl($local_page, 'do=flushlogs', true), |
211 | 852 |
'TEXT' => $lang->get('onpage_btn_clearlogs'), |
1 | 853 |
)); |
854 |
$this->toolbar_menu .= $menubtn->run(); |
|
855 |
} |
|
856 |
||
857 |
// Delete page button |
|
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
858 |
if ( $perms->get_permissions('read') && $session->check_acl_scope('delete_page', $local_namespace) && $perms->get_permissions('delete_page') && $local_page_exists ) |
1 | 859 |
{ |
211 | 860 |
$s = $lang->get('onpage_btn_deletepage'); |
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
861 |
if ( $local_cdata['delvotes'] == 1 ) |
1 | 862 |
{ |
211 | 863 |
$subst = array( |
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
864 |
'num_votes' => $local_cdata['delvotes'], |
211 | 865 |
'plural' => '' |
866 |
); |
|
867 |
$s .= $lang->get('onpage_btn_deletepage_votes', $subst); |
|
1 | 868 |
} |
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
869 |
else if ( $local_cdata['delvotes'] > 1 ) |
1 | 870 |
{ |
211 | 871 |
$subst = array( |
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
872 |
'num_votes' => $local_cdata['delvotes'], |
211 | 873 |
'plural' => $lang->get('meta_plural') |
874 |
); |
|
875 |
$s .= $lang->get('onpage_btn_deletepage_votes', $subst); |
|
1 | 876 |
} |
877 |
||
878 |
$menubtn->assign_vars(array( |
|
314
474f8be55943
Localized remainder of on-page tools and parts of PageProcess
Dan
parents:
313
diff
changeset
|
879 |
'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxDeletePage()); return false; }" title="' . $lang->get('onpage_tip_deletepage') . '" accesskey="k"', |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
880 |
'HREF' => makeUrl($local_page, 'do=deletepage', true), |
1 | 881 |
'TEXT' => $s, |
882 |
)); |
|
883 |
$this->toolbar_menu .= $menubtn->run(); |
|
884 |
||
885 |
} |
|
886 |
||
887 |
// Password-protect button |
|
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
888 |
if(isset($local_cdata['password']) && $session->check_acl_scope('password_set', $local_namespace) && $session->check_acl_scope('password_reset', $local_namespace)) |
1 | 889 |
{ |
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
890 |
if ( $local_cdata['password'] == '' ) |
1 | 891 |
{ |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
892 |
$a = $perms->get_permissions('password_set'); |
1 | 893 |
} |
894 |
else |
|
895 |
{ |
|
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
896 |
$a = $perms->get_permissions('password_reset'); |
1 | 897 |
} |
898 |
} |
|
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
899 |
else if ( $session->check_acl_scope('password_set', $local_namespace) ) |
1 | 900 |
{ |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
901 |
$a = $perms->get_permissions('password_set'); |
1 | 902 |
} |
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
903 |
else |
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
904 |
{ |
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
905 |
$a = false; |
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
906 |
} |
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
907 |
if ( $a && $perms->get_permissions('read') && $local_page_exists ) |
1 | 908 |
{ |
909 |
// label at start |
|
910 |
$label = $this->makeParserText($tplvars['toolbar_label']); |
|
211 | 911 |
$label->assign_vars(array('TEXT' => $lang->get('onpage_lbl_password'))); |
1 | 912 |
$t0 = $label->run(); |
913 |
||
914 |
$menubtn->assign_vars(array( |
|
265
7e0cdf71b1bb
Some (not much) progress with localizing tooltips on the pagebar. Still aways to go and committing so as to merge changes from stable
Dan
parents:
248
diff
changeset
|
915 |
'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxSetPassword()); return false; }" title="' . $lang->get('onpage_tip_password') . '"', |
1 | 916 |
'HREF' => '#', |
211 | 917 |
'TEXT' => $lang->get('onpage_btn_password_set'), |
1 | 918 |
)); |
919 |
$t = $menubtn->run(); |
|
920 |
||
921 |
$this->toolbar_menu .= '<table border="0" cellspacing="0" cellpadding="0"><tr><td>'.$t0.'</td><td><input type="password" id="mdgPassSetField" size="10" /></td><td>'.$t.'</td></tr></table>'; |
|
922 |
} |
|
923 |
||
924 |
// Manage ACLs button |
|
692
78473351a6c9
Changed namespace properties (including core identifier) for external pages that load the Enano API to be a uniform "API" namespace and "SystemAPI:" prefix.
Dan
parents:
689
diff
changeset
|
925 |
if ( !$paths->external_api_page && $session->check_acl_scope('edit_acl', $local_namespace) && ( $perms->get_permissions('edit_acl') || ( defined('ACL_ALWAYS_ALLOW_ADMIN_EDIT_ACL') && $session->user_level >= USER_LEVEL_ADMIN ) ) ) |
1 | 926 |
{ |
927 |
$menubtn->assign_vars(array( |
|
585
35e91d16ecf5
Fixed javascript ACL manager and captcha not showing on ajax login lockout_captcha event
Dan
parents:
582
diff
changeset
|
928 |
'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { var s = ajaxOpenACLManager(); console.debug(s); return false; }" title="' . $lang->get('onpage_tip_aclmanager') . '" accesskey="m"', |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
929 |
'HREF' => makeUrl($local_page, 'do=aclmanager', true), |
211 | 930 |
'TEXT' => $lang->get('onpage_btn_acl'), |
1 | 931 |
)); |
932 |
$this->toolbar_menu .= $menubtn->run(); |
|
933 |
} |
|
934 |
||
935 |
// Administer page button |
|
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
936 |
if ( $session->user_level >= USER_LEVEL_ADMIN && $local_page_exists ) |
1 | 937 |
{ |
938 |
$menubtn->assign_vars(array( |
|
314
474f8be55943
Localized remainder of on-page tools and parts of PageProcess
Dan
parents:
313
diff
changeset
|
939 |
'FLAGS' => 'onclick="if ( !KILL_SWITCH ) { void(ajaxAdminPage()); return false; }" title="' . $lang->get('onpage_tip_adminoptions') . '" accesskey="g"', |
1 | 940 |
'HREF' => makeUrlNS('Special', 'Administration', 'module='.$paths->nslist['Admin'].'PageManager', true), |
211 | 941 |
'TEXT' => $lang->get('onpage_btn_admin'), |
1 | 942 |
)); |
943 |
$this->toolbar_menu .= $menubtn->run(); |
|
944 |
} |
|
945 |
||
946 |
if ( strlen($this->toolbar_menu) > 0 ) |
|
947 |
{ |
|
948 |
$button->assign_vars(array( |
|
314
474f8be55943
Localized remainder of on-page tools and parts of PageProcess
Dan
parents:
313
diff
changeset
|
949 |
'FLAGS' => 'id="mdgToolbar_moreoptions" onclick="if ( !KILL_SWITCH ) { return false; }" title="' . $lang->get('onpage_tip_moreoptions') . '"', |
1 | 950 |
'PARENTFLAGS' => '', |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
951 |
'HREF' => makeUrl($local_page, 'do=moreoptions', true), |
211 | 952 |
'TEXT' => $lang->get('onpage_btn_moreoptions') |
1 | 953 |
)); |
954 |
$tb .= $button->run(); |
|
955 |
} |
|
956 |
||
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
957 |
// |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
958 |
// OTHER SWITCHES |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
959 |
// |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
960 |
|
1 | 961 |
$is_opera = (isset($_SERVER['HTTP_USER_AGENT']) && strstr($_SERVER['HTTP_USER_AGENT'], 'Opera')) ? true : false; |
594
738c61b498a6
A little more optimization work, client-side this time. I lied, no librijnadel2 here, but it's about to be merged in...
Dan
parents:
593
diff
changeset
|
962 |
$is_msie = (isset($_SERVER['HTTP_USER_AGENT']) && strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE')) ? true : false; |
1 | 963 |
|
964 |
$this->tpl_bool = Array( |
|
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
965 |
'auth_admin' => $session->user_level >= USER_LEVEL_ADMIN ? true : false, |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
966 |
'user_logged_in' => $session->user_logged_in, |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
967 |
'opera' => $is_opera, |
594
738c61b498a6
A little more optimization work, client-side this time. I lied, no librijnadel2 here, but it's about to be merged in...
Dan
parents:
593
diff
changeset
|
968 |
'msie' => $is_msie |
1 | 969 |
); |
970 |
||
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
971 |
if ( $session->sid_super ) |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
972 |
{ |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
973 |
$ash = '&auth=' . $session->sid_super; |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
974 |
$asq = "?auth=" . $session->sid_super; |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
975 |
$asa = "&auth=" . $session->sid_super; |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
976 |
$as2 = htmlspecialchars(urlSeparator) . 'auth='.$session->sid_super; |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
977 |
} |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
978 |
else |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
979 |
{ |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
980 |
$asq = ''; |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
981 |
$asa = ''; |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
982 |
$as2 = ''; |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
983 |
$ash = ''; |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
984 |
} |
1 | 985 |
|
650
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
986 |
// Set up javascript includes |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
987 |
// these depend heavily on whether we have a CDN to work with or not |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
988 |
if ( getConfig('cdn_path') ) |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
989 |
{ |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
990 |
// we're on a CDN, point to static includes |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
991 |
// probably should have a way to compress stuff like this before uploading to CDN |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
992 |
$js_head = '<script type="text/javascript" src="' . cdnPath . '/includes/clientside/static/enano-lib-basic.js"></script>'; |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
993 |
$js_foot = <<<JSEOF |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
994 |
<script type="text/javascript"> |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
995 |
// This initializes the Javascript runtime when the DOM is ready - not when the page is |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
996 |
// done loading, because enano-lib-basic still has to load some 15 other script files |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
997 |
// check for the init function - this is a KHTML fix |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
998 |
// This doesn't seem to work properly in IE in 1.1.x - there are some problems with |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
999 |
// tinyMCE and l10n. |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1000 |
if ( typeof ( enano_init ) == 'function' && !IE ) |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1001 |
{ |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1002 |
enano_init(); |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1003 |
window.onload = function(e) { }; |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1004 |
} |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1005 |
</script> |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1006 |
JSEOF; |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1007 |
} |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1008 |
else |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1009 |
{ |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1010 |
$cdnpath = cdnPath; |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1011 |
// point to jsres compressor |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1012 |
$js_head = <<<JSEOF |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1013 |
<!-- Only load a basic set of functions for now. Let the rest of the API load when the page is finished. --> |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1014 |
<script type="text/javascript" src="$cdnpath/includes/clientside/jsres.php?early"></script> |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1015 |
JSEOF; |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1016 |
$js_foot = <<<JSEOF |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1017 |
<!-- jsres.php is a wrapper script that compresses and caches single JS files to minimize requests --> |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1018 |
<script type="text/javascript" src="$cdnpath/includes/clientside/jsres.php"></script> |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1019 |
<script type="text/javascript"> |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1020 |
// This initializes the Javascript runtime when the DOM is ready - not when the page is |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1021 |
// done loading, because enano-lib-basic still has to load some 15 other script files |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1022 |
// check for the init function - this is a KHTML fix |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1023 |
// This doesn't seem to work properly in IE in 1.1.x - there are some problems with |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1024 |
// tinyMCE and l10n. |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1025 |
if ( typeof ( enano_init ) == 'function' && !IE ) |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1026 |
{ |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1027 |
enano_init(); |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1028 |
window.onload = function(e) { }; |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1029 |
} |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1030 |
</script> |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1031 |
JSEOF; |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1032 |
} |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1033 |
|
655
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
1034 |
$code = $plugins->setHook('compile_template'); |
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
1035 |
foreach ( $code as $cmd ) |
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
1036 |
{ |
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
1037 |
eval($cmd); |
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
1038 |
} |
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
1039 |
|
1 | 1040 |
// Some additional sidebar processing |
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1041 |
if ( $this->sidebar_extra != '' ) |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1042 |
{ |
1 | 1043 |
$se = $this->sidebar_extra; |
1044 |
$parser = $this->makeParserText($tplvars['sidebar_section_raw']); |
|
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1045 |
$parser->assign_vars(array( |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1046 |
'TITLE' => 'Links', // FIXME: l10n |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1047 |
'CONTENT' => $se |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1048 |
)); |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1049 |
|
1 | 1050 |
$this->sidebar_extra = $parser->run(); |
1051 |
} |
|
1052 |
||
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1053 |
$this->sidebar_extra = $this->sidebar_extra . $this->sidebar_widgets; |
1 | 1054 |
|
1055 |
$this->tpl_bool['fixed_menus'] = false; |
|
689 | 1056 |
$this->tpl_bool['export'] = false; |
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1057 |
$this->tpl_bool['right_sidebar'] = true; |
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
1058 |
$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 ) )); |
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
1059 |
$this->tpl_bool['enable_uploads'] = ( getConfig('enable_uploads') == '1' && $session->get_permissions('upload_files') ) ? true : false; |
1 | 1060 |
$this->tpl_bool['stupid_mode'] = false; |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1061 |
$this->tpl_bool['in_admin'] = ( ( $local_page_id == 'Administration' && $local_namespace == 'Special' ) || $local_namespace == 'Admin' ); |
1 | 1062 |
|
598
4e5985fffc4d
Added the theme_is_<themeid> template boolean value to allow conditional template code depending on theme ID (in shared templates, sidebar blocks, etc.)
Dan
parents:
597
diff
changeset
|
1063 |
// allows conditional testing of the theme ID (a bit crude, came from my NSIS days) |
4e5985fffc4d
Added the theme_is_<themeid> template boolean value to allow conditional template code depending on theme ID (in shared templates, sidebar blocks, etc.)
Dan
parents:
597
diff
changeset
|
1064 |
$this->tpl_bool["theme_is_{$this->theme}"] = true; |
4e5985fffc4d
Added the theme_is_<themeid> template boolean value to allow conditional template code depending on theme ID (in shared templates, sidebar blocks, etc.)
Dan
parents:
597
diff
changeset
|
1065 |
|
1 | 1066 |
$p = ( isset($_GET['printable']) ) ? '/printable' : ''; |
1067 |
||
1068 |
// Add the e-mail address client code to the header |
|
1069 |
$this->add_header($email->jscode()); |
|
1070 |
||
1071 |
// Generate the code for the Log out and Change theme sidebar buttons |
|
1072 |
// Once again, the new template parsing system can be used here |
|
1073 |
||
1074 |
$parser = $this->makeParserText($tplvars['sidebar_button']); |
|
1075 |
||
1076 |
$parser->assign_vars(Array( |
|
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1077 |
'HREF'=>makeUrlNS('Special', "Logout/{$session->csrf_token}/{$local_page}"), |
57
b354deeaa4c4
Vastly improved compatibility with older versions of IE, particularly 5.0, through the use of a kill switch that turns off all AJAX functions
Dan
parents:
54
diff
changeset
|
1078 |
'FLAGS'=>'onclick="if ( !KILL_SWITCH ) { mb_logout(); return false; }"', |
215 | 1079 |
'TEXT'=>$lang->get('sidebar_btn_logout'), |
1 | 1080 |
)); |
1081 |
||
1082 |
$logout_link = $parser->run(); |
|
1083 |
||
1084 |
$parser->assign_vars(Array( |
|
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1085 |
'HREF'=>makeUrlNS('Special', 'Login/' . $local_page), |
57
b354deeaa4c4
Vastly improved compatibility with older versions of IE, particularly 5.0, through the use of a kill switch that turns off all AJAX functions
Dan
parents:
54
diff
changeset
|
1086 |
'FLAGS'=>'onclick="if ( !KILL_SWITCH ) { ajaxStartLogin(); return false; }"', |
215 | 1087 |
'TEXT'=>$lang->get('sidebar_btn_login'), |
1 | 1088 |
)); |
1089 |
||
1090 |
$login_link = $parser->run(); |
|
1091 |
||
1092 |
$parser->assign_vars(Array( |
|
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1093 |
'HREF'=>makeUrlNS('Special', 'ChangeStyle/'.$local_page), |
57
b354deeaa4c4
Vastly improved compatibility with older versions of IE, particularly 5.0, through the use of a kill switch that turns off all AJAX functions
Dan
parents:
54
diff
changeset
|
1094 |
'FLAGS'=>'onclick="if ( !KILL_SWITCH ) { ajaxChangeStyle(); return false; }"', |
215 | 1095 |
'TEXT'=>$lang->get('sidebar_btn_changestyle'), |
1 | 1096 |
)); |
1097 |
||
1098 |
$theme_link = $parser->run(); |
|
1099 |
||
60
71b50f8c8f85
Changed administration login request to use the AJAX login form; made high-level authentication more apparent in the AJAX box; recompiled Oxygen Mint
Dan
parents:
59
diff
changeset
|
1100 |
$parser->assign_vars(Array( |
71b50f8c8f85
Changed administration login request to use the AJAX login form; made high-level authentication more apparent in the AJAX box; recompiled Oxygen Mint
Dan
parents:
59
diff
changeset
|
1101 |
'HREF'=>makeUrlNS('Special', 'Administration'), |
71b50f8c8f85
Changed administration login request to use the AJAX login form; made high-level authentication more apparent in the AJAX box; recompiled Oxygen Mint
Dan
parents:
59
diff
changeset
|
1102 |
'FLAGS'=>'onclick="if ( !KILL_SWITCH ) { void(ajaxStartAdminLogin()); return false; }"', |
215 | 1103 |
'TEXT'=>$lang->get('sidebar_btn_administration'), |
60
71b50f8c8f85
Changed administration login request to use the AJAX login form; made high-level authentication more apparent in the AJAX box; recompiled Oxygen Mint
Dan
parents:
59
diff
changeset
|
1104 |
)); |
71b50f8c8f85
Changed administration login request to use the AJAX login form; made high-level authentication more apparent in the AJAX box; recompiled Oxygen Mint
Dan
parents:
59
diff
changeset
|
1105 |
|
71b50f8c8f85
Changed administration login request to use the AJAX login form; made high-level authentication more apparent in the AJAX box; recompiled Oxygen Mint
Dan
parents:
59
diff
changeset
|
1106 |
$admin_link = $parser->run(); |
71b50f8c8f85
Changed administration login request to use the AJAX login form; made high-level authentication more apparent in the AJAX box; recompiled Oxygen Mint
Dan
parents:
59
diff
changeset
|
1107 |
|
1 | 1108 |
$SID = ($session->sid_super) ? $session->sid_super : ''; |
1109 |
||
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1110 |
$urlname_clean = str_replace('\'', '\\\'', str_replace('\\', '\\\\', dirtify_page_id($local_fullpage))); |
15
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
parents:
13
diff
changeset
|
1111 |
$urlname_clean = strtr( $urlname_clean, array( '<' => '<', '>' => '>' ) ); |
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
parents:
13
diff
changeset
|
1112 |
|
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1113 |
$urlname_jssafe = sanitize_page_id($local_fullpage); |
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
1114 |
$physical_urlname_jssafe = sanitize_page_id($paths->fullpage); |
22
d0314575e2f0
More preliminary l10n work; userpage portal style basics implemented
Dan
parents:
21
diff
changeset
|
1115 |
|
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
1116 |
if ( $session->check_acl_scope('even_when_protected', $local_namespace) ) |
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
1117 |
{ |
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
1118 |
$protected = $paths->page_protected && !$perms->get_permissions('even_when_protected'); |
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
1119 |
} |
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
1120 |
else |
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
1121 |
{ |
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
1122 |
$protected = false; |
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
1123 |
} |
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
1124 |
|
1 | 1125 |
// Generate the dynamic javascript vars |
1126 |
$js_dynamic = ' <script type="text/javascript">// <![CDATA[ |
|
1127 |
// This section defines some basic and very important variables that are used later in the static Javascript library. |
|
1128 |
// 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. |
|
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
1129 |
var title = \''. $urlname_jssafe .'\'; |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
1130 |
var physical_title = \'' . $physical_urlname_jssafe . '\'; |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
1131 |
var page_exists = '. ( ( $local_page_exists) ? 'true' : 'false' ) .'; |
650
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1132 |
var scriptPath = \'' . addslashes(scriptPath) . '\'; |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1133 |
var contentPath = \'' . addslashes(contentPath) . '\'; |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1134 |
var cdnPath = \'' . addslashes(cdnPath) . '\'; |
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
1135 |
var ENANO_SID = \'' . $SID . '\'; |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
1136 |
var user_level = ' . $session->user_level . '; |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
1137 |
var auth_level = ' . $session->auth_level . '; |
1 | 1138 |
var USER_LEVEL_GUEST = ' . USER_LEVEL_GUEST . '; |
1139 |
var USER_LEVEL_MEMBER = ' . USER_LEVEL_MEMBER . '; |
|
1140 |
var USER_LEVEL_CHPREF = ' . USER_LEVEL_CHPREF . '; |
|
1141 |
var USER_LEVEL_MOD = ' . USER_LEVEL_MOD . '; |
|
1142 |
var USER_LEVEL_ADMIN = ' . USER_LEVEL_ADMIN . '; |
|
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
1143 |
var disable_redirect = ' . ( isset($_GET['redirect']) && $_GET['redirect'] == 'no' ? 'true' : 'false' ) . '; |
677
2a263b598a2b
Improved miniPrompt and fadefilter to properly overlap parent modal windows. MessageBox() is next. Fixed pref_disable_js_fx not working due to wrong type (number instead of boolean).
Dan
parents:
674
diff
changeset
|
1144 |
var pref_disable_js_fx = ' . ( @$session->user_extra['disable_js_fx'] == 1 ? 'true' : 'false' ) . '; |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1145 |
var csrf_token = "' . $session->csrf_token . '"; |
1 | 1146 |
var editNotice = \'' . ( (getConfig('wiki_edit_notice')=='1') ? str_replace("\n", "\\\n", RenderMan::render(getConfig('wiki_edit_notice_text'))) : '' ) . '\'; |
571
66e14e61613e
Got ACL scope logic working again and began enforcing it. Breaking API change: assigning page title with $template->tpl_strings['PAGE_NAME'] will no longer work, use $template->assign_vars(). Workaround may be added later. Test for assign_vars method if compatibility needed. Added namespace processor API (non-breaking change). Several other things tweaked around as well.
Dan
parents:
566
diff
changeset
|
1147 |
var prot = ' . ( ($protected) ? 'true' : 'false' ) .'; // No, hacking this var won\'t work, it\'s re-checked on the server |
1 | 1148 |
var ENANO_SPECIAL_CREATEPAGE = \''. makeUrl($paths->nslist['Special'].'CreatePage') .'\'; |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1149 |
var ENANO_CREATEPAGE_PARAMS = \'_do=&pagename='. $urlname_clean .'&namespace=' . $local_namespace . '\'; |
1 | 1150 |
var ENANO_SPECIAL_CHANGESTYLE = \''. makeUrlNS('Special', 'ChangeStyle') .'\'; |
1151 |
var namespace_list = new Array(); |
|
582
a38876c0793c
Majorly reworked Javascript runtime stuff to use on-demand loading.
Dan
parents:
581
diff
changeset
|
1152 |
var msg_loading_component = \'' . addslashes($lang->get('ajax_msg_loading_component')) . '\'; |
1 | 1153 |
var AES_BITS = '.AES_BITS.'; |
1154 |
var AES_BLOCKSIZE = '.AES_BLOCKSIZE.'; |
|
1155 |
var pagepass = \''. ( ( isset($_REQUEST['pagepass']) ) ? sha1($_REQUEST['pagepass']) : '' ) .'\'; |
|
1156 |
var ENANO_THEME_LIST = \''; |
|
1157 |
foreach($this->theme_list as $t) { |
|
1158 |
if($t['enabled']) |
|
1159 |
{ |
|
1160 |
$js_dynamic .= '<option value="'.$t['theme_id'].'"'; |
|
29
e5484a9e0818
Rewrote change theme dialog; a few minor stability fixes here and there; fixed IE + St Patty background image
Dan
parents:
27
diff
changeset
|
1161 |
// if($t['theme_id'] == $session->theme) $js_dynamic .= ' selected="selected"'; |
1 | 1162 |
$js_dynamic .= '>'.$t['theme_name'].'</option>'; |
1163 |
} |
|
1164 |
} |
|
1165 |
$js_dynamic .= '\'; |
|
210
2b283402e4e4
Added language export to JSON page and localization for Javascript using $lang.get(). Localized AJAX login interface.
Dan
parents:
208
diff
changeset
|
1166 |
var ENANO_CURRENT_THEME = \''. $session->theme .'\'; |
212
30b857a6b811
Reworked comment system to not use HACKISH FIXES; AJAX comment framework is completely localized now
Dan
parents:
211
diff
changeset
|
1167 |
var ENANO_LANG_ID = ' . $lang->lang_id . '; |
30b857a6b811
Reworked comment system to not use HACKISH FIXES; AJAX comment framework is completely localized now
Dan
parents:
211
diff
changeset
|
1168 |
var ENANO_PAGE_TYPE = "' . addslashes($this->namespace_string) . '";'; |
1 | 1169 |
foreach($paths->nslist as $k => $c) |
1170 |
{ |
|
1171 |
$js_dynamic .= "namespace_list['{$k}'] = '$c';"; |
|
1172 |
} |
|
1173 |
$js_dynamic .= "\n //]]>\n </script>"; |
|
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1174 |
|
1 | 1175 |
$tpl_strings = Array( |
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
1176 |
'PAGE_NAME'=>htmlspecialchars($local_cdata['name']), |
15
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
parents:
13
diff
changeset
|
1177 |
'PAGE_URLNAME'=> $urlname_clean, |
40
723bb7acf914
Fixed a lot of bugs with Safari and Konqueror; improved Opera compatibility
Dan
parents:
36
diff
changeset
|
1178 |
'SITE_NAME'=>htmlspecialchars(getConfig('site_name')), |
1 | 1179 |
'USERNAME'=>$session->username, |
40
723bb7acf914
Fixed a lot of bugs with Safari and Konqueror; improved Opera compatibility
Dan
parents:
36
diff
changeset
|
1180 |
'SITE_DESC'=>htmlspecialchars(getConfig('site_desc')), |
1 | 1181 |
'TOOLBAR'=>$tb, |
1182 |
'SCRIPTPATH'=>scriptPath, |
|
1183 |
'CONTENTPATH'=>contentPath, |
|
650
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1184 |
'CDNPATH' => cdnPath, |
1 | 1185 |
'ADMIN_SID_QUES'=>$asq, |
1186 |
'ADMIN_SID_AMP'=>$asa, |
|
1187 |
'ADMIN_SID_AMP_HTML'=>$ash, |
|
1188 |
'ADMIN_SID_AUTO'=>$as2, |
|
114
47393c6619ea
Nothing special, just syncing to Scribus, several bugs have been found with GET forms and a fix is in the works
Dan
parents:
102
diff
changeset
|
1189 |
'ADMIN_SID_RAW'=> ( is_string($session->sid_super) ? $session->sid_super : '' ), |
91 | 1190 |
'COPYRIGHT'=>RenderMan::parse_internal_links(getConfig('copyright_notice')), |
1 | 1191 |
'TOOLBAR_EXTRAS'=>$this->toolbar_menu, |
669
9243d01c0716
Fixed undefined REQUEST_URI/HTTP_HOST in ENANO_CLI mode in template var init
Dan
parents:
655
diff
changeset
|
1192 |
'REQUEST_URI'=>( defined('ENANO_CLI') ? '' : $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'] ), |
1 | 1193 |
'STYLE_LINK'=>makeUrlNS('Special', 'CSS'.$p, null, true), //contentPath.$paths->nslist['Special'].'CSS' . $p, |
1194 |
'LOGIN_LINK'=>$login_link, |
|
1195 |
'LOGOUT_LINK'=>$logout_link, |
|
60
71b50f8c8f85
Changed administration login request to use the AJAX login form; made high-level authentication more apparent in the AJAX box; recompiled Oxygen Mint
Dan
parents:
59
diff
changeset
|
1196 |
'ADMIN_LINK'=>$admin_link, |
1 | 1197 |
'THEME_LINK'=>$theme_link, |
115
261f367623af
Fixed the obnoxious issue with forms using GET and index.php?title=Foo URL scheme (this works a whole lot better than MediaWiki now
Dan
parents:
114
diff
changeset
|
1198 |
'SEARCH_ACTION'=>makeUrlNS('Special', 'Search'), |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1199 |
'INPUT_TITLE'=>( urlSeparator == '&' ? '<input type="hidden" name="title" value="' . htmlspecialchars( $paths->nslist[$local_namespace] . $local_page_id ) . '" />' : ''), |
115
261f367623af
Fixed the obnoxious issue with forms using GET and index.php?title=Foo URL scheme (this works a whole lot better than MediaWiki now
Dan
parents:
114
diff
changeset
|
1200 |
'INPUT_AUTH'=>( $session->sid_super ? '<input type="hidden" name="auth" value="' . $session->sid_super . '" />' : ''), |
1 | 1201 |
'TEMPLATE_DIR'=>scriptPath.'/themes/'.$this->theme, |
1202 |
'THEME_ID'=>$this->theme, |
|
1203 |
'STYLE_ID'=>$this->style, |
|
699
c7d737202d59
Removed Adobe Spry and replaced with jQuery. Please report any new bugs on the forums or via IRC. In a related note, auto-completion should work now at least for usernames. Still hacking away at page name completion...
Dan
parents:
692
diff
changeset
|
1204 |
'MAIN_PAGE' => getConfig('main_page'), |
650
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1205 |
'JS_HEADER' => $js_head, |
e45183014778
Added CDN support: a URL to a CDN can now be specified and Enano will load all images, CSS, and javascript (except TinyMCE) from that server
Dan
parents:
615
diff
changeset
|
1206 |
'JS_FOOTER' => $js_foot, |
1 | 1207 |
'JS_DYNAMIC_VARS'=>$js_dynamic, |
85
7c68a18a27be
AJAX comments are now paginated; plugin manager can now show system plugins; typo in installer corrected; links in oxygen/stpatty/admin footers changed to "About Enano" page; 1.0.1 release candidate
Dan
parents:
73
diff
changeset
|
1208 |
'UNREAD_PMS'=>$session->unread_pms, |
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
parents:
276
diff
changeset
|
1209 |
'URL_ABOUT_ENANO' => makeUrlNS('Special', 'About_Enano', '', true), |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1210 |
'REPORT_URI' => makeUrl($local_fullpage, 'do=sql_report', true) |
1 | 1211 |
); |
1212 |
||
1213 |
foreach ( $paths->nslist as $ns_id => $ns_prefix ) |
|
1214 |
{ |
|
1215 |
$tpl_strings[ 'NS_' . strtoupper($ns_id) ] = $ns_prefix; |
|
1216 |
} |
|
1217 |
||
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1218 |
$this->assign_vars($tpl_strings, true); |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1219 |
|
592 | 1220 |
profiler_log('template: var init: finished toolbar building and initial assign()'); |
1221 |
||
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1222 |
// |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1223 |
// COMPILE THE SIDEBAR |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1224 |
// |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1225 |
|
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1226 |
// This is done after the big assign_vars() so that sidebar code has access to the newly assigned variables |
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1227 |
|
1 | 1228 |
list($this->tpl_strings['SIDEBAR_LEFT'], $this->tpl_strings['SIDEBAR_RIGHT'], $min) = $this->fetch_sidebar(); |
1229 |
$this->tpl_bool['sidebar_left'] = ( $this->tpl_strings['SIDEBAR_LEFT'] != $min) ? true : false; |
|
1230 |
$this->tpl_bool['sidebar_right'] = ( $this->tpl_strings['SIDEBAR_RIGHT'] != $min) ? true : false; |
|
1231 |
$this->tpl_bool['right_sidebar'] = $this->tpl_bool['sidebar_right']; // backward compatibility |
|
118
0c5efda996bf
Added keep-alive function to admin panel (had been planned for some time) and a new hook, template_var_init_end
Dan
parents:
115
diff
changeset
|
1232 |
|
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1233 |
// and finally one string value that needs to be symlinked... |
582
a38876c0793c
Majorly reworked Javascript runtime stuff to use on-demand loading.
Dan
parents:
581
diff
changeset
|
1234 |
if ( !isset($this->tpl_strings['ADDITIONAL_HEADERS']) ) |
a38876c0793c
Majorly reworked Javascript runtime stuff to use on-demand loading.
Dan
parents:
581
diff
changeset
|
1235 |
{ |
a38876c0793c
Majorly reworked Javascript runtime stuff to use on-demand loading.
Dan
parents:
581
diff
changeset
|
1236 |
$this->tpl_strings['ADDITIONAL_HEADERS'] =& $this->additional_headers; |
a38876c0793c
Majorly reworked Javascript runtime stuff to use on-demand loading.
Dan
parents:
581
diff
changeset
|
1237 |
} |
a38876c0793c
Majorly reworked Javascript runtime stuff to use on-demand loading.
Dan
parents:
581
diff
changeset
|
1238 |
|
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
1239 |
// done! |
118
0c5efda996bf
Added keep-alive function to admin panel (had been planned for some time) and a new hook, template_var_init_end
Dan
parents:
115
diff
changeset
|
1240 |
$code = $plugins->setHook('template_var_init_end'); |
0c5efda996bf
Added keep-alive function to admin panel (had been planned for some time) and a new hook, template_var_init_end
Dan
parents:
115
diff
changeset
|
1241 |
foreach ( $code as $cmd ) |
0c5efda996bf
Added keep-alive function to admin panel (had been planned for some time) and a new hook, template_var_init_end
Dan
parents:
115
diff
changeset
|
1242 |
{ |
0c5efda996bf
Added keep-alive function to admin panel (had been planned for some time) and a new hook, template_var_init_end
Dan
parents:
115
diff
changeset
|
1243 |
eval($cmd); |
0c5efda996bf
Added keep-alive function to admin panel (had been planned for some time) and a new hook, template_var_init_end
Dan
parents:
115
diff
changeset
|
1244 |
} |
372
5bd429428101
A number of scattered changes. Profiler added and only enabled in debug mode (currently on), but awfully useful for fixing performance in the future. Started work on Admin:LangManager
Dan
parents:
371
diff
changeset
|
1245 |
|
5bd429428101
A number of scattered changes. Profiler added and only enabled in debug mode (currently on), but awfully useful for fixing performance in the future. Started work on Admin:LangManager
Dan
parents:
371
diff
changeset
|
1246 |
profiler_log("template: finished var init"); |
1 | 1247 |
} |
1248 |
||
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1249 |
/** |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1250 |
* Performs var init that is common to all pages (IOW, called only once) |
699
c7d737202d59
Removed Adobe Spry and replaced with jQuery. Please report any new bugs on the forums or via IRC. In a related note, auto-completion should work now at least for usernames. Still hacking away at page name completion...
Dan
parents:
692
diff
changeset
|
1251 |
* Not used yet because most stuff is either theme-dependent or page-dependent. |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1252 |
* @access private |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1253 |
*/ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1254 |
|
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1255 |
function init_vars_global() |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1256 |
{ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1257 |
|
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1258 |
} |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1259 |
|
1 | 1260 |
function header($simple = false) |
1261 |
{ |
|
1262 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
215 | 1263 |
global $lang; |
1264 |
||
1 | 1265 |
ob_start(); |
1266 |
||
1267 |
if(!$this->theme_loaded) |
|
1268 |
{ |
|
1269 |
$this->load_theme($session->theme, $session->style); |
|
1270 |
} |
|
1271 |
||
526
b2fb50d572c7
New plugin manager half-implemented. Most of the UI/frontend code is done. Moved sql_parse.php to /includes/ to allow use after installation - TODO: check installer, etc. for breakage
Dan
parents:
511
diff
changeset
|
1272 |
// I feel awful doing this. |
b2fb50d572c7
New plugin manager half-implemented. Most of the UI/frontend code is done. Moved sql_parse.php to /includes/ to allow use after installation - TODO: check installer, etc. for breakage
Dan
parents:
511
diff
changeset
|
1273 |
if ( preg_match('/^W3C_Validator/', @$_SERVER['HTTP_USER_AGENT']) ) |
b2fb50d572c7
New plugin manager half-implemented. Most of the UI/frontend code is done. Moved sql_parse.php to /includes/ to allow use after installation - TODO: check installer, etc. for breakage
Dan
parents:
511
diff
changeset
|
1274 |
{ |
b2fb50d572c7
New plugin manager half-implemented. Most of the UI/frontend code is done. Moved sql_parse.php to /includes/ to allow use after installation - TODO: check installer, etc. for breakage
Dan
parents:
511
diff
changeset
|
1275 |
header('Content-type: application/xhtml+xml'); |
b2fb50d572c7
New plugin manager half-implemented. Most of the UI/frontend code is done. Moved sql_parse.php to /includes/ to allow use after installation - TODO: check installer, etc. for breakage
Dan
parents:
511
diff
changeset
|
1276 |
} |
b2fb50d572c7
New plugin manager half-implemented. Most of the UI/frontend code is done. Moved sql_parse.php to /includes/ to allow use after installation - TODO: check installer, etc. for breakage
Dan
parents:
511
diff
changeset
|
1277 |
|
1 | 1278 |
$headers_sent = true; |
1279 |
if(!defined('ENANO_HEADERS_SENT')) |
|
1280 |
define('ENANO_HEADERS_SENT', ''); |
|
174
4c5c2b66a34d
SECURITY: remove debug message in session manager; implemented alternate MediaWiki syntax for template embedding; added Adobe Spry for "shake" effect on unsuccessful login
Dan
parents:
165
diff
changeset
|
1281 |
if ( !$this->no_headers ) |
4c5c2b66a34d
SECURITY: remove debug message in session manager; implemented alternate MediaWiki syntax for template embedding; added Adobe Spry for "shake" effect on unsuccessful login
Dan
parents:
165
diff
changeset
|
1282 |
{ |
4c5c2b66a34d
SECURITY: remove debug message in session manager; implemented alternate MediaWiki syntax for template embedding; added Adobe Spry for "shake" effect on unsuccessful login
Dan
parents:
165
diff
changeset
|
1283 |
$header = ( $simple ) ? |
4c5c2b66a34d
SECURITY: remove debug message in session manager; implemented alternate MediaWiki syntax for template embedding; added Adobe Spry for "shake" effect on unsuccessful login
Dan
parents:
165
diff
changeset
|
1284 |
$this->process_template('simple-header.tpl') : |
4c5c2b66a34d
SECURITY: remove debug message in session manager; implemented alternate MediaWiki syntax for template embedding; added Adobe Spry for "shake" effect on unsuccessful login
Dan
parents:
165
diff
changeset
|
1285 |
$this->process_template('header.tpl'); |
4c5c2b66a34d
SECURITY: remove debug message in session manager; implemented alternate MediaWiki syntax for template embedding; added Adobe Spry for "shake" effect on unsuccessful login
Dan
parents:
165
diff
changeset
|
1286 |
echo $header; |
4c5c2b66a34d
SECURITY: remove debug message in session manager; implemented alternate MediaWiki syntax for template embedding; added Adobe Spry for "shake" effect on unsuccessful login
Dan
parents:
165
diff
changeset
|
1287 |
} |
1 | 1288 |
if ( !$simple && $session->user_logged_in && $session->unread_pms > 0 ) |
1289 |
{ |
|
1290 |
echo $this->notify_unread_pms(); |
|
1291 |
} |
|
1292 |
if ( !$simple && $session->sw_timed_out ) |
|
1293 |
{ |
|
1294 |
$login_link = makeUrlNS('Special', 'Login/' . $paths->fullpage, 'level=' . $session->user_level, true); |
|
1295 |
echo '<div class="usermessage">'; |
|
215 | 1296 |
echo $lang->get('user_msg_elev_timed_out', array( 'login_link' => $login_link )); |
1 | 1297 |
echo '</div>'; |
1298 |
} |
|
30 | 1299 |
if ( $this->site_disabled && $session->user_level >= USER_LEVEL_ADMIN && ( $paths->page != $paths->nslist['Special'] . 'Administration' ) ) |
1300 |
{ |
|
1301 |
$admin_link = makeUrlNS('Special', 'Administration', 'module=' . $paths->nslist['Admin'] . 'GeneralConfig', true); |
|
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1302 |
echo '<div class="usermessage"><b>' . $lang->get('page_sitedisabled_admin_msg_title') . '</b><br /> |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1303 |
' . $lang->get('page_sitedisabled_admin_msg_body', array('admin_link' => $admin_link)) . ' |
30 | 1304 |
</div>'; |
1305 |
} |
|
1 | 1306 |
} |
372
5bd429428101
A number of scattered changes. Profiler added and only enabled in debug mode (currently on), but awfully useful for fixing performance in the future. Started work on Admin:LangManager
Dan
parents:
371
diff
changeset
|
1307 |
|
1 | 1308 |
function footer($simple = false) |
1309 |
{ |
|
396
3289e4dcb4b8
Fixed some stray undefined-variable problems revealed as a result of testing on Windows Server '03, IIS6, PHP/FastCGI, and PostgreSQL 8.2.5.
Dan
parents:
391
diff
changeset
|
1310 |
echo $this->getFooter($simple); |
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1311 |
ob_end_flush(); |
1 | 1312 |
} |
372
5bd429428101
A number of scattered changes. Profiler added and only enabled in debug mode (currently on), but awfully useful for fixing performance in the future. Started work on Admin:LangManager
Dan
parents:
371
diff
changeset
|
1313 |
|
1 | 1314 |
function getHeader() |
1315 |
{ |
|
1316 |
$headers_sent = true; |
|
1317 |
if(!defined('ENANO_HEADERS_SENT')) |
|
1318 |
define('ENANO_HEADERS_SENT', ''); |
|
1319 |
if(!$this->no_headers) return $this->process_template('header.tpl'); |
|
1320 |
} |
|
396
3289e4dcb4b8
Fixed some stray undefined-variable problems revealed as a result of testing on Windows Server '03, IIS6, PHP/FastCGI, and PostgreSQL 8.2.5.
Dan
parents:
391
diff
changeset
|
1321 |
function getFooter($simple = false) |
1 | 1322 |
{ |
1323 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1324 |
global $lang; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1325 |
if ( !$this->no_headers ) |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1326 |
{ |
1 | 1327 |
|
1328 |
if(!defined('ENANO_HEADERS_SENT')) |
|
1329 |
$this->header(); |
|
1330 |
||
1331 |
global $_starttime; |
|
1332 |
if(isset($_GET['sqldbg']) && $session->get_permissions('mod_misc')) |
|
1333 |
{ |
|
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1334 |
echo '<h3>' . $lang->get('page_heading_sql_list') . '</h3><pre style="margin-left: 1em">'; |
272
e0ec986c0af3
Searching sucks, and Enano's search algorithm was complete bullcrap. So I rewrote it. No, it does not use Google search technology. Like they have a patent for using the Arial font on search result pages anyway.
Dan
parents:
256
diff
changeset
|
1335 |
echo htmlspecialchars($db->sql_backtrace()); |
1 | 1336 |
echo '</pre>'; |
1337 |
} |
|
1338 |
||
1339 |
$t = ( $simple ) ? $this->process_template('simple-footer.tpl') : $this->process_template('footer.tpl'); |
|
1340 |
||
1341 |
$f = microtime_float(); |
|
1342 |
$f = $f - $_starttime; |
|
413
6607cd646d6d
Added autosave functionality and resurrected the old toolbar code that was added about a year ago but never uesd.
Dan
parents:
411
diff
changeset
|
1343 |
$f = round($f, 2); |
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1344 |
|
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1345 |
$t_loc = $lang->get('page_msg_stats_gentime_short', array('time' => $f)); |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1346 |
$t_loc_long = $lang->get('page_msg_stats_gentime_long', array('time' => $f)); |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1347 |
$q_loc = '<a href="' . $this->tpl_strings['REPORT_URI'] . '">' . $lang->get('page_msg_stats_sql', array('nq' => $db->num_queries)) . '</a>'; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1348 |
$dbg = $t_loc; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1349 |
$dbg_long = $t_loc_long; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1350 |
if ( $session->user_level >= USER_LEVEL_ADMIN ) |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1351 |
{ |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1352 |
$dbg .= " | $q_loc"; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1353 |
$dbg_long .= " | $q_loc"; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1354 |
} |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1355 |
|
1 | 1356 |
$t = str_replace('[[Stats]]', $dbg, $t); |
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1357 |
$t = str_replace('[[StatsLong]]', $dbg_long, $t); |
1 | 1358 |
$t = str_replace('[[NumQueries]]', (string)$db->num_queries, $t); |
1359 |
$t = str_replace('[[GenTime]]', (string)$f, $t); |
|
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1360 |
$t = str_replace('[[NumQueriesLoc]]', $q_loc, $t); |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1361 |
$t = str_replace('[[GenTimeLoc]]', $t_loc, $t); |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1362 |
$t = str_replace('[[EnanoPoweredLink]]', $lang->get('page_enano_powered', array('about_uri' => $this->tpl_strings['URL_ABOUT_ENANO'])), $t); |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1363 |
$t = str_replace('[[EnanoPoweredLinkLong]]', $lang->get('page_enano_powered_long', array('about_uri' => $this->tpl_strings['URL_ABOUT_ENANO'])), $t); |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1364 |
|
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1365 |
if ( defined('ENANO_DEBUG') ) |
592 | 1366 |
{ |
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1367 |
$t = str_replace('</body>', '<div id="profile" style="margin: 10px;">' . profiler_make_html() . '</div></body>', $t); |
592 | 1368 |
// ob_end_clean(); |
1369 |
// return profiler_make_html(); |
|
1370 |
} |
|
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1371 |
|
1 | 1372 |
return $t; |
1373 |
} |
|
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1374 |
else |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1375 |
{ |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1376 |
return ''; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
1377 |
} |
1 | 1378 |
} |
1379 |
||
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1380 |
/** |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1381 |
* Assigns an array of string values to the template. Strings can be accessed from the template by inserting {KEY_NAME} in the template file. |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1382 |
* @param $vars array |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1383 |
* @param $from_internal bool Internal switch, just omit (@todo document) |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1384 |
*/ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1385 |
|
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1386 |
function assign_vars($vars, $from_internal = false) |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1387 |
{ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1388 |
foreach ( $vars as $key => $value ) |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1389 |
{ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1390 |
$replace = true; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1391 |
if ( isset($this->vars_assign_history['strings'][$key]) ) |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1392 |
{ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1393 |
if ( $this->vars_assign_history['strings'][$key] == 'api' ) |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1394 |
{ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1395 |
$replace = false; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1396 |
} |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1397 |
} |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1398 |
if ( $replace ) |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1399 |
{ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1400 |
$this->tpl_strings[$key] = $value; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1401 |
$this->vars_assign_history['strings'][$key] = ( $from_internal ) ? 'internal' : 'api'; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1402 |
} |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1403 |
} |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1404 |
} |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1405 |
|
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1406 |
/** |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1407 |
* Assigns an array of boolean values to the template. These can be used for <!-- IF ... --> statements. |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1408 |
* @param $vars array |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1409 |
* @param $from_internal bool Internal switch, just omit (@todo document) |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1410 |
*/ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1411 |
|
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1412 |
function assign_bool($vars) |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1413 |
{ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1414 |
foreach ( $vars as $key => $value ) |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1415 |
{ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1416 |
$replace = true; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1417 |
if ( isset($this->vars_assign_history['bool'][$key]) ) |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1418 |
{ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1419 |
if ( $this->vars_assign_history['bool'][$key] == 'api' ) |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1420 |
{ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1421 |
$replace = false; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1422 |
} |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1423 |
} |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1424 |
if ( $replace ) |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1425 |
{ |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1426 |
$this->tpl_bool[$key] = $value; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1427 |
$this->vars_assign_history['bool'][$key] = ( $from_internal ) ? 'internal' : 'api'; |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1428 |
} |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1429 |
} |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1430 |
} |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1431 |
|
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1432 |
# |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1433 |
# COMPILER |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1434 |
# |
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1435 |
|
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
1436 |
/** |
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1437 |
* Compiles and executes a template based on the current variables and booleans. Loads |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1438 |
* the theme and initializes variables if needed. This mostly just calls child functions. |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1439 |
* @param string File to process |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1440 |
* @return string |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1441 |
*/ |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1442 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1443 |
function process_template($file) |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1444 |
{ |
1 | 1445 |
global $db, $session, $paths, $template, $plugins; // Common objects |
1446 |
if(!defined('ENANO_TEMPLATE_LOADED')) |
|
1447 |
{ |
|
1448 |
$this->load_theme(); |
|
1449 |
$this->init_vars(); |
|
1450 |
} |
|
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1451 |
|
592 | 1452 |
$cache_file = ENANO_ROOT . '/cache/' . $this->theme . '-' . str_replace('/', '-', $file) . '.php'; |
1453 |
if ( file_exists($cache_file) ) |
|
1454 |
{ |
|
1455 |
// this is about the time of the breaking change to cache file format |
|
593
4f9bec0d65c1
More optimization work. Moved special page init functions to common instead of common_post hook. Allowed paths to cache page metadata on filesystem. Phased out the redundancy in $paths->pages that paired a number with every urlname as foreach loops are allowed now (and have been for some time). Fixed missing includes for several functions. Rewrote str_replace_once to be a lot more efficient.
Dan
parents:
592
diff
changeset
|
1456 |
if ( ($m = filemtime($cache_file)) > 1215038089 ) |
592 | 1457 |
{ |
1458 |
$result = @include($cache_file); |
|
1459 |
if ( isset($md5) ) |
|
1460 |
{ |
|
593
4f9bec0d65c1
More optimization work. Moved special page init functions to common instead of common_post hook. Allowed paths to cache page metadata on filesystem. Phased out the redundancy in $paths->pages that paired a number with every urlname as foreach loops are allowed now (and have been for some time). Fixed missing includes for several functions. Rewrote str_replace_once to be a lot more efficient.
Dan
parents:
592
diff
changeset
|
1461 |
if ( $m >= filemtime(ENANO_ROOT . "/themes/{$this->theme}/$file") ) |
592 | 1462 |
{ |
1463 |
$result = $this->compile_template_text_post($result); |
|
1464 |
return $result; |
|
1465 |
} |
|
1466 |
} |
|
1467 |
} |
|
1468 |
} |
|
1469 |
||
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1470 |
$compiled = $this->compile_template($file); |
592 | 1471 |
$result = eval($compiled); |
1472 |
||
1473 |
return $result; |
|
1 | 1474 |
} |
1475 |
||
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1476 |
/** |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1477 |
* Loads variables from the specified template file. Returns an associative array containing the variables. |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1478 |
* @param string Template file to process (elements.tpl) |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1479 |
* @return array |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1480 |
*/ |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1481 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1482 |
function extract_vars($file) |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1483 |
{ |
1 | 1484 |
global $db, $session, $paths, $template, $plugins; // Common objects |
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1485 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1486 |
// Sometimes this function gets called before the theme is loaded |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1487 |
// This is a bad coding practice so this function will always be picky. |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1488 |
if ( !$this->theme ) |
1 | 1489 |
{ |
1490 |
die('$template->extract_vars(): theme not yet loaded, so we can\'t open template files yet...this is a bug and should be reported.<br /><br />Backtrace, most recent call first:<pre>'.enano_debug_print_backtrace(true).'</pre>'); |
|
1491 |
} |
|
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1492 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1493 |
// Full pathname of template file |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1494 |
$tpl_file_fullpath = ENANO_ROOT . '/themes/' . $this->theme . '/' . $file; |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1495 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1496 |
// Make sure the template even exists |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1497 |
if ( !is_file($tpl_file_fullpath) ) |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1498 |
{ |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1499 |
die_semicritical('Cannot find template file', |
472
bc4b58034f4d
Implemented password reset (albeit hackishly) into the new login API; added dummy window.console object to hopefully reduce errors when Firebug isn't around; fixed the longstanding ACL dismiss/close button bug; fixed a couple undefined variables in mailer; fixed PHP error on attempted opening of /dev/(u)random in rijndael.php; clarified documentation for PageProcessor::update_page(); fixed some logic problems in theme ACL code; disabled CAPTCHA debug
Dan
parents:
471
diff
changeset
|
1500 |
'<p>The template parser was asked to load the file "' . htmlspecialchars($tpl_file_fullpath) . '", but that file couldn\'t be found in the directory for |
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1501 |
the current theme.</p> |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1502 |
<p>Additional debugging information:<br /> |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1503 |
<b>Theme currently in use: </b>' . $this->theme . '<br /> |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1504 |
<b>Requested file: </b>' . $file . ' |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1505 |
</p>'); |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1506 |
} |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1507 |
// Retrieve file contents |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1508 |
$text = file_get_contents($tpl_file_fullpath); |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1509 |
if ( !$text ) |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1510 |
{ |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1511 |
return false; |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1512 |
} |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1513 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1514 |
// Get variables, regular expressions FTW |
1 | 1515 |
preg_match_all('#<\!-- VAR ([A-z0-9_-]*) -->(.*?)<\!-- ENDVAR \\1 -->#is', $text, $matches); |
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1516 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1517 |
// Initialize return values |
1 | 1518 |
$tplvars = Array(); |
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1519 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1520 |
// Loop through each match, setting $tplvars[ $first_subpattern ] to $second_subpattern |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1521 |
for ( $i = 0; $i < sizeof($matches[1]); $i++ ) |
1 | 1522 |
{ |
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1523 |
$tplvars[ $matches[1][$i] ] = $matches[2][$i]; |
1 | 1524 |
} |
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1525 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1526 |
// All done! |
1 | 1527 |
return $tplvars; |
1528 |
} |
|
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1529 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1530 |
/** |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1531 |
* Compiles a block of template code. |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1532 |
* @param string The text to process |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1533 |
* @return string |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1534 |
*/ |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1535 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1536 |
function compile_tpl_code($text) |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1537 |
{ |
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
1538 |
return template_compiler_core($text); |
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1539 |
} |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1540 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1541 |
/** |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1542 |
* Compiles the contents of a given template file, possibly using a cached copy, and returns the compiled code. |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1543 |
* @param string Filename of template (header.tpl) |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1544 |
* @return string |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1545 |
*/ |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1546 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1547 |
function compile_template($filename) |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1548 |
{ |
1 | 1549 |
global $db, $session, $paths, $template, $plugins; // Common objects |
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1550 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1551 |
// Full path to template file |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1552 |
$tpl_file_fullpath = ENANO_ROOT . '/themes/' . $this->theme . '/' . $filename; |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1553 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1554 |
// Make sure the file exists |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1555 |
if ( !is_file($tpl_file_fullpath) ) |
1 | 1556 |
{ |
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1557 |
die_semicritical('Cannot find template file', |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1558 |
'<p>The template parser was asked to load the file "' . htmlspecialchars($filename) . '", but that file couldn\'t be found in the directory for |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1559 |
the current theme.</p> |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1560 |
<p>Additional debugging information:<br /> |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1561 |
<b>Theme currently in use: </b>' . $this->theme . '<br /> |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1562 |
<b>Requested file: </b>' . $file . ' |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1563 |
</p>'); |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1564 |
} |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1565 |
|
592 | 1566 |
// We won't use the cached copy here. |
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1567 |
$text = file_get_contents($tpl_file_fullpath); |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1568 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1569 |
// This will be used later when writing the cached file |
1 | 1570 |
$md5 = md5($text); |
1571 |
||
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1572 |
// Preprocessing and checks complete - compile the code |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1573 |
$text = $this->compile_tpl_code($text); |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1574 |
|
592 | 1575 |
// Generate cache filename |
1576 |
$cache_file = ENANO_ROOT . '/cache/' . $this->theme . '-' . str_replace('/', '-', $filename) . '.php'; |
|
1577 |
||
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1578 |
// Perhaps caching is enabled and the admin has changed the template? |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1579 |
if ( is_writable( ENANO_ROOT . '/cache/' ) && getConfig('cache_thumbs') == '1' ) |
1 | 1580 |
{ |
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1581 |
$h = fopen($cache_file, 'w'); |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1582 |
if ( !$h ) |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1583 |
{ |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1584 |
// Couldn't open the file - silently ignore and return |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1585 |
return $text; |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1586 |
} |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1587 |
|
592 | 1588 |
// Final contents of cache file |
1589 |
$file_contents = <<<EOF |
|
1590 |
<?php |
|
128
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
parents:
125
diff
changeset
|
1591 |
|
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
parents:
125
diff
changeset
|
1592 |
/* |
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
parents:
125
diff
changeset
|
1593 |
* NOTE: This file was automatically generated by Enano and is based on compiled code. Do not edit this file. |
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
parents:
125
diff
changeset
|
1594 |
* If you edit this file, any changes you make will be lost the next time the associated source template file is edited. |
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
parents:
125
diff
changeset
|
1595 |
*/ |
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
parents:
125
diff
changeset
|
1596 |
|
592 | 1597 |
\$md5 = '$md5'; |
1598 |
||
1599 |
$text |
|
128
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
parents:
125
diff
changeset
|
1600 |
EOF; |
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1601 |
// This is really just a normal PHP file that sets a variable or two and exits. |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1602 |
// $tpl_text actually will contain the compiled code |
592 | 1603 |
fwrite($h, $file_contents); |
1 | 1604 |
fclose($h); |
1605 |
} |
|
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1606 |
|
211 | 1607 |
return $this->compile_template_text_post($text); //('<pre>'.htmlspecialchars($text).'</pre>'); |
1 | 1608 |
} |
1609 |
||
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1610 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1611 |
/** |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1612 |
* Compiles (parses) some template code with the current master set of variables and booleans. |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1613 |
* @param string Text to process |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1614 |
* @return string |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1615 |
*/ |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1616 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1617 |
function compile_template_text($text) |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1618 |
{ |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1619 |
// this might do something else in the future, possibly cache large templates |
211 | 1620 |
return $this->compile_template_text_post($this->compile_tpl_code($text)); |
1 | 1621 |
} |
1622 |
||
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1623 |
/** |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1624 |
* For convenience - compiles AND parses some template code. |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1625 |
* @param string Text to process |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1626 |
* @return string |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1627 |
*/ |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1628 |
|
1 | 1629 |
function parse($text) |
1630 |
{ |
|
1631 |
$text = $this->compile_template_text($text); |
|
211 | 1632 |
$text = $this->compile_template_text_post($text); |
1 | 1633 |
return eval($text); |
1634 |
} |
|
1635 |
||
211 | 1636 |
/** |
1637 |
* Post-processor for template code. Basically what this does is it localizes {lang:foo} blocks. |
|
1638 |
* @param string Mostly-processed TPL code |
|
1639 |
* @return string |
|
1640 |
*/ |
|
1641 |
||
1642 |
function compile_template_text_post($text) |
|
1643 |
{ |
|
1644 |
global $lang; |
|
1645 |
preg_match_all('/\{lang:([a-z0-9]+_[a-z0-9_]+)\}/', $text, $matches); |
|
1646 |
foreach ( $matches[1] as $i => $string_id ) |
|
1647 |
{ |
|
1648 |
$string = $lang->get($string_id); |
|
1649 |
$string = str_replace('\\', '\\\\', $string); |
|
1650 |
$string = str_replace('\'', '\\\'', $string); |
|
1651 |
$text = str_replace_once($matches[0][$i], $string, $text); |
|
1652 |
} |
|
1653 |
return $text; |
|
1654 |
} |
|
1655 |
||
689 | 1656 |
// n00bish comments removed from here. 2008-03-13 @ 12:02AM when I had nothing else to do. |
1 | 1657 |
|
162
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1658 |
/** |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1659 |
* Takes a blob of HTML with the specially formatted template-oriented wikitext and formats it. Does not use eval(). |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1660 |
* This function butchers every coding standard in Enano and should eventually be rewritten. The fact is that the |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1661 |
* code _works_ and does a good job of checking for errors and cleanly complaining about them. |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1662 |
* @param string Text to process |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1663 |
* @param bool Ignored for backwards compatibility |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1664 |
* @param string File to get variables for sidebar data from |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1665 |
* @return string |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1666 |
*/ |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1667 |
|
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1668 |
function tplWikiFormat($message, $filter_links = false, $filename = 'elements.tpl') |
e1a22031b5bd
Major revamps to the template parser. Fixed a few security holes that could allow PHP to be injected in untimely places in TPL code. Improved Ux for XSS attempt in tplWikiFormat. Documented many functions. Backported much cleaner parser from 2.0 branch. Beautified a lot of code in the depths of the template class. Pretty much a small-scale Extreme Makeover.
Dan
parents:
142
diff
changeset
|
1669 |
{ |
1 | 1670 |
global $db, $session, $paths, $template, $plugins; // Common objects |
215 | 1671 |
global $lang; |
1672 |
||
592 | 1673 |
$START = microtime_float(); |
1674 |
||
1675 |
// localize the whole string first |
|
1676 |
preg_match_all('/\{lang:([a-z0-9]+_[a-z0-9_]+)\}/', $message, $matches); |
|
1677 |
foreach ( $matches[1] as $i => $string_id ) |
|
1678 |
{ |
|
1679 |
$string = $lang->get($string_id); |
|
1680 |
$string = str_replace('\\', '\\\\', $string); |
|
1681 |
$string = str_replace('\'', '\\\'', $string); |
|
1682 |
$message = str_replace_once($matches[0][$i], $string, $message); |
|
1683 |
} |
|
1684 |
||
1685 |
// first: the hackish optimization - |
|
1686 |
// if it's only a bunch of letters, numbers and spaces, just skip this sh*t. |
|
1687 |
||
1688 |
if ( preg_match('/^[\w\s\.]*$/i', $message) ) |
|
1689 |
{ |
|
1690 |
return $message; |
|
1691 |
} |
|
1692 |
||
1 | 1693 |
$filter_links = false; |
1694 |
$tplvars = $this->extract_vars($filename); |
|
1695 |
if($session->sid_super) $as = htmlspecialchars(urlSeparator).'auth='.$session->sid_super; |
|
1696 |
else $as = ''; |
|
1697 |
error_reporting(E_ALL); |
|
1698 |
$random_id = sha1(microtime().''); // A temp value |
|
1699 |
||
1700 |
/* |
|
1701 |
* PREPROCESSOR |
|
1702 |
*/ |
|
1703 |
||
1704 |
// Variables |
|
1705 |
||
1706 |
preg_match_all('#\$([A-Z_-]+)\$#', $message, $links); |
|
1707 |
$links = $links[1]; |
|
1708 |
||
1709 |
for($i=0;$i<sizeof($links);$i++) |
|
1710 |
{ |
|
1711 |
$message = str_replace('$'.$links[$i].'$', $this->tpl_strings[$links[$i]], $message); |
|
1712 |
} |
|
1713 |
||
1714 |
// Conditionals |
|
1715 |
||
592 | 1716 |
$message = $this->twf_parse_conditionals($message); |
215 | 1717 |
|
1 | 1718 |
/* |
1719 |
* HTML RENDERER |
|
1720 |
*/ |
|
1721 |
||
1722 |
// Images |
|
592 | 1723 |
$message = RenderMan::process_image_tags($message, $taglist); |
1724 |
$message = RenderMan::process_imgtags_stage2($message, $taglist); |
|
1 | 1725 |
|
1726 |
// Internal links |
|
592 | 1727 |
$message = RenderMan::parse_internal_links($message, $tplvars['sidebar_button']); |
1 | 1728 |
|
1729 |
// External links |
|
59
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1730 |
|
592 | 1731 |
$url_regexp = <<<EOF |
1732 |
( |
|
1733 |
(?:https?|ftp|irc):\/\/ # protocol |
|
1734 |
(?:[^@\s\]"\':]+@)? # username (FTP only but whatever) |
|
1735 |
(?:(?:(?:[a-z0-9-]+\.)*)[a-z0-9-]+) # hostname |
|
1736 |
(?:\/[A-z0-9_%\|~`!\!@#\$\^&?=\*\(\):;\.,\/-]*)? # path |
|
1737 |
) |
|
1738 |
EOF; |
|
1739 |
||
1740 |
$text_parser = $this->makeParserText($tplvars['sidebar_button']); |
|
1741 |
||
1742 |
preg_match_all('/\[' . $url_regexp . '[ ]([^\]]+)\]/isx', $message, $ext_link); |
|
59
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1743 |
|
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1744 |
for ( $i = 0; $i < count($ext_link[0]); $i++ ) |
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1745 |
{ |
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1746 |
$text_parser->assign_vars(Array( |
165
199599eca89e
Fixed external links in tplWikiFormat to use my monster HTTP request regex
Dan
parents:
163
diff
changeset
|
1747 |
'HREF' => $ext_link[1][$i], |
59
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1748 |
'FLAGS' => '', |
592 | 1749 |
'TEXT' => $ext_link[2][$i] |
59
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1750 |
)); |
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1751 |
$message = str_replace($ext_link[0][$i], $text_parser->run(), $message); |
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1752 |
} |
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1753 |
|
592 | 1754 |
preg_match_all('/\[' . $url_regexp . '\]/is', $message, $ext_link); |
59
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1755 |
|
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1756 |
for ( $i = 0; $i < count($ext_link[0]); $i++ ) |
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1757 |
{ |
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1758 |
$text_parser->assign_vars(Array( |
165
199599eca89e
Fixed external links in tplWikiFormat to use my monster HTTP request regex
Dan
parents:
163
diff
changeset
|
1759 |
'HREF' => $ext_link[1][$i], |
59
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1760 |
'FLAGS' => '', |
165
199599eca89e
Fixed external links in tplWikiFormat to use my monster HTTP request regex
Dan
parents:
163
diff
changeset
|
1761 |
'TEXT' => htmlspecialchars($ext_link[1][$i]) |
59
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1762 |
)); |
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1763 |
$message = str_replace($ext_link[0][$i], $text_parser->run(), $message); |
7c4a851fb5c5
Minor IE4 compatibility fix; template parser now properly handles external links in the sidebar
Dan
parents:
57
diff
changeset
|
1764 |
} |
1 | 1765 |
|
592 | 1766 |
$TIME = microtime_float() - $START; |
1 | 1767 |
|
1768 |
/* |
|
592 | 1769 |
if ( $TIME > 0.02 ) |
1770 |
{ |
|
1771 |
echo 'template: tplWikiFormat took a while for this one. string dump:<pre>'; |
|
1772 |
echo htmlspecialchars($message); |
|
1773 |
echo '</pre>'; |
|
1774 |
} |
|
1 | 1775 |
*/ |
1776 |
||
592 | 1777 |
return $message; |
1778 |
} |
|
1779 |
||
1780 |
/** |
|
1781 |
* Parses conditional {if} blocks in sidebars and other tplWikiFormatted things |
|
1782 |
* @param string A string potentially containing conditional blocks |
|
1783 |
* @return string Processed string |
|
1784 |
*/ |
|
1785 |
||
1786 |
function twf_parse_conditionals($message) |
|
1787 |
{ |
|
1788 |
if ( !preg_match_all('/\{(!?)if ([a-z0-9_\(\)\|&! ]+)\}(.*?)(?:\{else\}(.*?))?\{\/if\}/is', $message, $matches) ) |
|
1789 |
{ |
|
1790 |
return $message; |
|
1791 |
} |
|
1792 |
foreach ( $matches[0] as $match_id => $full_block ) |
|
1793 |
{ |
|
1794 |
// 1 = "not" flag |
|
1795 |
// 2 = condition |
|
1796 |
// 3 = if true |
|
1797 |
// 4 = else |
|
1798 |
$condresult = $this->process_condition($matches[2][$match_id]); |
|
1799 |
if ( !empty($matches[1][$match_id]) ) |
|
1800 |
{ |
|
1801 |
if ( $condresult == 1 ) |
|
1802 |
$condresult = 2; |
|
1803 |
else if ( $condresult == 2 ) |
|
1804 |
$condresult = 1; |
|
1805 |
} |
|
1806 |
switch($condresult) |
|
1807 |
{ |
|
1808 |
case 1: |
|
1809 |
// evaluated to false |
|
1810 |
$message = str_replace_once($full_block, $matches[4][$match_id], $message); |
|
1811 |
break; |
|
1812 |
case 2: |
|
1813 |
// evaluated to true |
|
1814 |
$message = str_replace_once($full_block, $matches[3][$match_id], $message); |
|
1815 |
break; |
|
1816 |
case 3: |
|
1817 |
$message = str_replace_once($full_block, "Syntax error: mismatched parentheses (" . htmlspecialchars($matches[2][$match_id]) . ")<br />\n", $message); |
|
1818 |
break; |
|
1819 |
case 4: |
|
1820 |
$message = str_replace_once($full_block, "Syntax error: illegal character (" . htmlspecialchars($matches[2][$match_id]) . ")<br />\n", $message); |
|
1821 |
break; |
|
1822 |
case 5: |
|
1823 |
$message = str_replace_once($full_block, "Syntax error: illegal sequence (" . htmlspecialchars($matches[2][$match_id]) . ")<br />\n", $message); |
|
1824 |
break; |
|
1825 |
} |
|
1826 |
} |
|
1 | 1827 |
return $message; |
1828 |
} |
|
1829 |
||
1830 |
/** |
|
592 | 1831 |
* Inner-loop parser for a conditional block. Verifies a string condition to make sure it's syntactically correct, then returns what it evaluates to. |
1832 |
* Return values: |
|
1833 |
* 1 - string evaluates to true |
|
1834 |
* 2 - string evaluates to false |
|
1835 |
* 3 - Syntax error - mismatched parentheses |
|
1836 |
* 4 - Syntax error - unknown token |
|
1837 |
* 5 - Syntax error - invalid sequence |
|
1838 |
* @param string |
|
1839 |
* @return int |
|
1840 |
* |
|
1841 |
*/ |
|
1842 |
||
1843 |
function process_condition($condition) |
|
1844 |
{ |
|
1845 |
// make sure parentheses are matched |
|
1846 |
$parentheses = preg_replace('/[^\(\)]/', '', $condition); |
|
1847 |
if ( !empty($parentheses) ) |
|
1848 |
{ |
|
1849 |
$i = 0; |
|
1850 |
$parentheses = enano_str_split($parentheses); |
|
1851 |
foreach ( $parentheses as $chr ) |
|
1852 |
{ |
|
1853 |
$inc = ( $chr == '(' ) ? 1 : -1; |
|
1854 |
$i += $inc; |
|
1855 |
} |
|
1856 |
if ( $i != 0 ) |
|
1857 |
{ |
|
1858 |
// mismatched parentheses |
|
1859 |
return 3; |
|
1860 |
} |
|
1861 |
} |
|
1862 |
// sequencer check |
|
1863 |
// first, pad all sequences of characters with spaces |
|
1864 |
$seqcheck = preg_replace('/([a-z0-9_]+)/i', '\\1 ', $condition); |
|
1865 |
$seqcheck = preg_replace('/([&|()!])/i', '\\1 ', $seqcheck); |
|
1866 |
// now shrink all spaces to one space each |
|
1867 |
$seqcheck = preg_replace('/[ ]+/', ' ', $seqcheck); |
|
1868 |
||
1869 |
// explode it. the allowed sequences are: |
|
1870 |
// - TOKEN_NOT + TOKEN_VARIABLE |
|
1871 |
// - TOKEN_NOT + TOKEN_PARENTHLEFT |
|
1872 |
// - TOKEN_BOOLOP + TOKEN_NOT |
|
1873 |
// - TOKEN_PARENTHRIGHT + TOKEN_NOT |
|
1874 |
// - TOKEN_VARIABLE + TOKEN_BOOLOP |
|
1875 |
// - TOKEN_BOOLOP + TOKEN_PARENTHLEFT |
|
1876 |
// - TOKEN_PARENTHLEFT + TOKEN_VARIABLE |
|
1877 |
// - TOKEN_BOOLOP + TOKEN_VARIABLE |
|
1878 |
// - TOKEN_VARIABLE + TOKEN_PARENTHRIGHT |
|
1879 |
// - TOKEN_PARENTHRIGHT + TOKEN_BOOLOP |
|
1880 |
$seqcheck = explode(' ', trim($seqcheck)); |
|
1881 |
$last_item = TOKEN_BOOLOP; |
|
1882 |
foreach ( $seqcheck as $i => $token ) |
|
1883 |
{ |
|
1884 |
// determine type |
|
1885 |
if ( $token == '(' ) |
|
1886 |
{ |
|
1887 |
$type = TOKEN_PARENTHLEFT; |
|
1888 |
} |
|
1889 |
else if ( $token == ')' ) |
|
1890 |
{ |
|
1891 |
$type = TOKEN_PARENTHRIGHT; |
|
1892 |
} |
|
1893 |
else if ( $token == '!' ) |
|
1894 |
{ |
|
1895 |
$type = TOKEN_NOT; |
|
1896 |
} |
|
1897 |
else if ( strtolower($token) == 'and' || strtolower($token) == 'or' || $token == '&&' || $token == '||' ) |
|
1898 |
{ |
|
1899 |
$type = TOKEN_BOOLOP; |
|
1900 |
} |
|
1901 |
else if ( preg_match('/^[a-z0-9_]+$/i', $token) ) |
|
1902 |
{ |
|
1903 |
$type = TOKEN_VARIABLE; |
|
1904 |
// at this point it's considered safe to wrap it |
|
1905 |
$seqcheck[$i] = "( isset(\$this->tpl_bool['$token']) && \$this->tpl_bool['$token'] )"; |
|
1906 |
} |
|
1907 |
else |
|
1908 |
{ |
|
1909 |
// syntax error - doesn't match known token types |
|
1910 |
return 4; |
|
1911 |
} |
|
1912 |
// inner sequence check |
|
1913 |
if ( |
|
1914 |
( $last_item == TOKEN_BOOLOP && $type == TOKEN_NOT ) || |
|
1915 |
( $last_item == TOKEN_PARENTHRIGHT && $type == TOKEN_NOT ) || |
|
1916 |
( $last_item == TOKEN_NOT && $type == TOKEN_VARIABLE ) || |
|
1917 |
( $last_item == TOKEN_NOT && $type == TOKEN_PARENTHLEFT ) || |
|
1918 |
( $last_item == TOKEN_VARIABLE && $type == TOKEN_BOOLOP ) || |
|
1919 |
( $last_item == TOKEN_BOOLOP && $type == TOKEN_PARENTHLEFT ) || |
|
1920 |
( $last_item == TOKEN_PARENTHLEFT && $type == TOKEN_VARIABLE ) || |
|
1921 |
( $last_item == TOKEN_BOOLOP && $type == TOKEN_VARIABLE ) || |
|
1922 |
( $last_item == TOKEN_VARIABLE && $type == TOKEN_PARENTHRIGHT ) || |
|
1923 |
( $last_item == TOKEN_PARENTHRIGHT && $type == TOKEN_BOOLOP ) |
|
1924 |
) |
|
1925 |
{ |
|
1926 |
// sequence is good, continue |
|
1927 |
} |
|
1928 |
else |
|
1929 |
{ |
|
1930 |
// sequence is invalid, break out |
|
1931 |
return 5; |
|
1932 |
} |
|
1933 |
$last_item = $type; |
|
1934 |
} |
|
1935 |
// passed all checks |
|
1936 |
$seqcheck = implode(' ', $seqcheck); |
|
1937 |
$result = eval("return ( $seqcheck ) ? true : false;"); |
|
1938 |
return ( $result ) ? 2 : 1; |
|
1939 |
} |
|
1940 |
||
1941 |
/** |
|
1 | 1942 |
* Print a text field that auto-completes a username entered into it. |
1943 |
* @param string $name - the name of the form field |
|
1944 |
* @return string |
|
1945 |
*/ |
|
1946 |
||
1947 |
function username_field($name, $value = false) |
|
1948 |
{ |
|
1949 |
$randomid = md5( time() . microtime() . mt_rand() ); |
|
704
077887be639d
More work on auto-completion - it auto-scrolls now and limits result divs to 300px height
Dan
parents:
701
diff
changeset
|
1950 |
$text = '<input name="'.$name.'" class="autofill username" onkeyup="new AutofillUsername(this);" type="text" size="30" id="userfield_'.$randomid.'" autocomplete="off"'; |
1 | 1951 |
if($value) $text .= ' value="'.$value.'"'; |
1952 |
$text .= ' />'; |
|
1953 |
return $text; |
|
1954 |
} |
|
1955 |
||
1956 |
/** |
|
1957 |
* Print a text field that auto-completes a page name entered into it. |
|
1958 |
* @param string $name - the name of the form field |
|
1959 |
* @return string |
|
1960 |
*/ |
|
1961 |
||
1962 |
function pagename_field($name, $value = false) |
|
1963 |
{ |
|
1964 |
$randomid = md5( time() . microtime() . mt_rand() ); |
|
704
077887be639d
More work on auto-completion - it auto-scrolls now and limits result divs to 300px height
Dan
parents:
701
diff
changeset
|
1965 |
$text = '<input name="'.$name.'" class="autofill page" onkeyup="new AutofillPage(this);" type="text" size="30" id="pagefield_'.$randomid.'" autocomplete="off"'; |
1 | 1966 |
if($value) $text .= ' value="'.$value.'"'; |
1967 |
$text .= ' />'; |
|
1968 |
return $text; |
|
1969 |
} |
|
1970 |
||
1971 |
/** |
|
1972 |
* Sends a textarea that can be converted to and from a TinyMCE widget on the fly. |
|
1973 |
* @param string The name of the form element |
|
1974 |
* @param string The initial content. Optional, defaults to blank |
|
1975 |
* @param int Rows in textarea |
|
1976 |
* @param int Columns in textarea |
|
1977 |
* @return string HTML and Javascript code. |
|
1978 |
*/ |
|
1979 |
||
1980 |
function tinymce_textarea($name, $content = '', $rows = 20, $cols = 60) |
|
1981 |
{ |
|
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
355
diff
changeset
|
1982 |
global $lang; |
1 | 1983 |
$randomid = md5(microtime() . mt_rand()); |
1984 |
$html = ''; |
|
1985 |
$html .= '<textarea name="' . $name . '" rows="'.$rows.'" cols="'.$cols.'" style="width: 100%;" id="toggleMCEroot_'.$randomid.'">' . $content . '</textarea>'; |
|
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
355
diff
changeset
|
1986 |
$html .= '<div style="float: right; display: table;" id="mceSwitchAgent_' . $randomid . '">' . $lang->get('etc_tinymce_btn_text') . ' | <a href="#" onclick="if ( !KILL_SWITCH ) { toggleMCE_'.$randomid.'(); return false; }">' . $lang->get('etc_tinymce_btn_graphical') . '</a></div>'; |
1 | 1987 |
$html .= '<script type="text/javascript"> |
1988 |
// <![CDATA[ |
|
1989 |
function toggleMCE_'.$randomid.'() |
|
1990 |
{ |
|
1991 |
var the_obj = document.getElementById(\'toggleMCEroot_' . $randomid . '\'); |
|
1992 |
var panel = document.getElementById(\'mceSwitchAgent_' . $randomid . '\'); |
|
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
355
diff
changeset
|
1993 |
var text_editor = $lang.get("etc_tinymce_btn_text"); |
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
355
diff
changeset
|
1994 |
var graphical_editor = $lang.get("etc_tinymce_btn_graphical"); |
1 | 1995 |
if ( the_obj.dnIsMCE == "yes" ) |
1996 |
{ |
|
1997 |
$dynano(the_obj).destroyMCE(); |
|
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
355
diff
changeset
|
1998 |
panel.innerHTML = text_editor + \' | <a href="#" onclick="if ( !KILL_SWITCH ) { toggleMCE_'.$randomid.'(); return false; }">\' + graphical_editor + \'</a>\'; |
1 | 1999 |
} |
2000 |
else |
|
2001 |
{ |
|
2002 |
$dynano(the_obj).switchToMCE(); |
|
370
b251818286b1
Localized registration errors and activation/COPPA e-mails
Dan
parents:
355
diff
changeset
|
2003 |
panel.innerHTML = \'<a href="#" onclick="if ( !KILL_SWITCH ) { toggleMCE_'.$randomid.'(); return false; }">\' + text_editor + \'</a> | \' + graphical_editor; |
1 | 2004 |
} |
2005 |
} |
|
2006 |
// ]]> |
|
2007 |
</script>'; |
|
2008 |
return $html; |
|
2009 |
} |
|
2010 |
||
2011 |
/** |
|
2012 |
* Allows individual parsing of template files. Similar to phpBB but follows the spirit of object-oriented programming ;) |
|
2013 |
* Returns on object of class templateIndividual. Usage instructions can be found in the inline docs for that class. |
|
2014 |
* @param $filename the filename of the template to be parsed |
|
2015 |
* @return object |
|
2016 |
*/ |
|
2017 |
||
2018 |
function makeParser($filename) |
|
2019 |
{ |
|
2020 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
2021 |
$filename = ENANO_ROOT.'/themes/'.$template->theme.'/'.$filename; |
|
2022 |
if(!file_exists($filename)) die('templateIndividual: file '.$filename.' does not exist'); |
|
2023 |
$code = file_get_contents($filename); |
|
2024 |
$parser = new templateIndividual($code); |
|
2025 |
return $parser; |
|
2026 |
} |
|
2027 |
||
2028 |
/** |
|
2029 |
* Same as $template->makeParser(), but takes a string instead of a filename. |
|
2030 |
* @param $text the text to parse |
|
2031 |
* @return object |
|
2032 |
*/ |
|
2033 |
||
2034 |
function makeParserText($code) |
|
2035 |
{ |
|
2036 |
$parser = new templateIndividual($code); |
|
2037 |
return $parser; |
|
2038 |
} |
|
2039 |
||
2040 |
/** |
|
2041 |
* Fetch the HTML for a plugin-added sidebar block |
|
2042 |
* @param $name the plugin name |
|
2043 |
* @return string |
|
2044 |
*/ |
|
2045 |
||
2046 |
function fetch_block($id) |
|
2047 |
{ |
|
2048 |
if(isset($this->plugin_blocks[$id])) return $this->plugin_blocks[$id]; |
|
2049 |
else return false; |
|
2050 |
} |
|
2051 |
||
2052 |
/** |
|
2053 |
* Fetches the contents of both sidebars. |
|
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2054 |
* @return array - key 0 is left, key 1 is right, key 2 is the HTML that makes up an empty sidebar |
1 | 2055 |
* @example list($left, $right) = $template->fetch_sidebar(); |
2056 |
*/ |
|
699
c7d737202d59
Removed Adobe Spry and replaced with jQuery. Please report any new bugs on the forums or via IRC. In a related note, auto-completion should work now at least for usernames. Still hacking away at page name completion...
Dan
parents:
692
diff
changeset
|
2057 |
|
1 | 2058 |
function fetch_sidebar() |
2059 |
{ |
|
2060 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
2061 |
||
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2062 |
// first, check the cache |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2063 |
if ( $result = $this->fetch_cached_sidebar() ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2064 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2065 |
return $result; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2066 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2067 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2068 |
profiler_log('Started sidebar parsing'); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2069 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2070 |
// init our block contents |
1 | 2071 |
$left = ''; |
2072 |
$right = ''; |
|
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2073 |
$min = ''; |
1 | 2074 |
|
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2075 |
// also might want the links block |
1 | 2076 |
if ( !$this->fetch_block('Links') ) |
2077 |
$this->initLinksWidget(); |
|
2078 |
||
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2079 |
// templates to work with |
1 | 2080 |
$vars = $this->extract_vars('elements.tpl'); |
2081 |
||
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2082 |
// sidebar_top and sidebar_bottom are HTML that is prepended/appended to sidebar content. Themes can |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2083 |
// choose whether or not to display a sidebar depending on whether the sidebar is empty ( $left == $min ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2084 |
// or not using the sidebar_left and sidebar_right template booleans (the oxygen theme does this). |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2085 |
if ( isset($vars['sidebar_top']) ) |
1 | 2086 |
{ |
592 | 2087 |
$top = $this->parse($vars['sidebar_top']); |
2088 |
$left .= $top; |
|
2089 |
$right .= $top; |
|
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2090 |
$min .= $top; |
1 | 2091 |
} |
592 | 2092 |
|
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2093 |
// grab the blocks from the DB |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2094 |
$q = $db->sql_query('SELECT item_id,sidebar_id,block_name,block_type,block_content FROM '.table_prefix.'sidebar' . "\n" |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2095 |
. ' WHERE item_enabled=1 ORDER BY sidebar_id ASC, item_order ASC;'); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2096 |
if ( !$q ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2097 |
$db->_die('The sidebar text data could not be selected.'); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2098 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2099 |
// explicitly specify $q in case a plugin or PHP block makes a query |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2100 |
while ( $row = $db->fetchrow($q) ) |
1 | 2101 |
{ |
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2102 |
// format the block |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2103 |
$block_content = $this->format_sidebar_block($row, $vars, $parser); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2104 |
|
597
c4ae0d8e260f
Added ability to hide or show sidebar blocks based on a {restrict} or {hideif} conditional in the sidebar script
Dan
parents:
594
diff
changeset
|
2105 |
// is there a {restrict} or {hideif} block? |
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2106 |
if ( preg_match('/\{(restrict|hideif) ([a-z0-9_\(\)\|&! ]+)\}/', $block_content, $match) ) |
597
c4ae0d8e260f
Added ability to hide or show sidebar blocks based on a {restrict} or {hideif} conditional in the sidebar script
Dan
parents:
594
diff
changeset
|
2107 |
{ |
c4ae0d8e260f
Added ability to hide or show sidebar blocks based on a {restrict} or {hideif} conditional in the sidebar script
Dan
parents:
594
diff
changeset
|
2108 |
// we have one, check the condition |
c4ae0d8e260f
Added ability to hide or show sidebar blocks based on a {restrict} or {hideif} conditional in the sidebar script
Dan
parents:
594
diff
changeset
|
2109 |
$type =& $match[1]; |
c4ae0d8e260f
Added ability to hide or show sidebar blocks based on a {restrict} or {hideif} conditional in the sidebar script
Dan
parents:
594
diff
changeset
|
2110 |
$cond =& $match[2]; |
c4ae0d8e260f
Added ability to hide or show sidebar blocks based on a {restrict} or {hideif} conditional in the sidebar script
Dan
parents:
594
diff
changeset
|
2111 |
$result = $this->process_condition($cond); |
c4ae0d8e260f
Added ability to hide or show sidebar blocks based on a {restrict} or {hideif} conditional in the sidebar script
Dan
parents:
594
diff
changeset
|
2112 |
if ( ( $type == 'restrict' && $result == 1 ) || ( $type == 'hideif' && $result == 2 ) ) |
c4ae0d8e260f
Added ability to hide or show sidebar blocks based on a {restrict} or {hideif} conditional in the sidebar script
Dan
parents:
594
diff
changeset
|
2113 |
{ |
c4ae0d8e260f
Added ability to hide or show sidebar blocks based on a {restrict} or {hideif} conditional in the sidebar script
Dan
parents:
594
diff
changeset
|
2114 |
// throw out this block, it's hidden for whatever reason by the sidebar script |
c4ae0d8e260f
Added ability to hide or show sidebar blocks based on a {restrict} or {hideif} conditional in the sidebar script
Dan
parents:
594
diff
changeset
|
2115 |
continue; |
c4ae0d8e260f
Added ability to hide or show sidebar blocks based on a {restrict} or {hideif} conditional in the sidebar script
Dan
parents:
594
diff
changeset
|
2116 |
} |
c4ae0d8e260f
Added ability to hide or show sidebar blocks based on a {restrict} or {hideif} conditional in the sidebar script
Dan
parents:
594
diff
changeset
|
2117 |
// didn't get a match, so hide the conditional logic |
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2118 |
// FIXME: this needs to be verbose about syntax errors |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2119 |
$block_content = str_replace_once($match[0], '', $block_content); |
597
c4ae0d8e260f
Added ability to hide or show sidebar blocks based on a {restrict} or {hideif} conditional in the sidebar script
Dan
parents:
594
diff
changeset
|
2120 |
} |
c4ae0d8e260f
Added ability to hide or show sidebar blocks based on a {restrict} or {hideif} conditional in the sidebar script
Dan
parents:
594
diff
changeset
|
2121 |
|
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2122 |
// if we made it here, this block definitely needs to be displayed. send it to the |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2123 |
// parser (set by format_sidebar_block) and decide where to append it (but not in that order ;)) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2124 |
$appender = false; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2125 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2126 |
if ( $row['sidebar_id'] == SIDEBAR_LEFT ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2127 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2128 |
$appender =& $left; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2129 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2130 |
else if ( $row['sidebar_id'] == SIDEBAR_RIGHT ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2131 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2132 |
$appender =& $right; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2133 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2134 |
else |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2135 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2136 |
// uhoh, block_id isn't valid. maybe a plugin wants to put this block somewhere else? |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2137 |
$code = $plugins->setHook('sidebar_block_id'); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2138 |
foreach ( $code as $cmd ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2139 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2140 |
eval($cmd); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2141 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2142 |
// if $appender wasn't set by a plugin, don't parse this block to save some CPU cycles |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2143 |
if ( !$appender ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2144 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2145 |
continue; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2146 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2147 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2148 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2149 |
// assign variables to parser |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2150 |
$block_name = $this->tplWikiFormat($row['block_name']); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2151 |
$parser->assign_vars(array( |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2152 |
// be nice and format the title (FIXME, does this use a lot of CPU time? still needs l10n in some cases though) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2153 |
'TITLE' => $block_name, |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2154 |
'CONTENT' => $block_content |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2155 |
)); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2156 |
$parsed = $parser->run(); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2157 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2158 |
// plugins are parsed earlier due to the way disabled/missing plugins that add sidebar blocks are |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2159 |
// handled, so the {TITLE} var won't be replaced until now. this allows completely eliminating a |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2160 |
// block if it's not available |
419
b8b4e38825db
Unsuccessful attempt at fixing "dismiss"/"close manager" buttons in ACL editor; non-breaking change to template API to allow plugins to add "normal" sidebar widgets in addition to the special "raw" block type, specified as the third parameter to $template->sidebar_widget(). Defaults to false, which is old behavior; new behavior (enabled by passing TRUE as the 3rd param) means that the content of the block is primarily block-level links.
Dan
parents:
413
diff
changeset
|
2161 |
if ( $row['block_type'] == BLOCK_PLUGIN ) |
b8b4e38825db
Unsuccessful attempt at fixing "dismiss"/"close manager" buttons in ACL editor; non-breaking change to template API to allow plugins to add "normal" sidebar widgets in addition to the special "raw" block type, specified as the third parameter to $template->sidebar_widget(). Defaults to false, which is old behavior; new behavior (enabled by passing TRUE as the 3rd param) means that the content of the block is primarily block-level links.
Dan
parents:
413
diff
changeset
|
2162 |
{ |
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2163 |
$parsed = str_replace('{TITLE}', $block_name, $parsed); |
419
b8b4e38825db
Unsuccessful attempt at fixing "dismiss"/"close manager" buttons in ACL editor; non-breaking change to template API to allow plugins to add "normal" sidebar widgets in addition to the special "raw" block type, specified as the third parameter to $template->sidebar_widget(). Defaults to false, which is old behavior; new behavior (enabled by passing TRUE as the 3rd param) means that the content of the block is primarily block-level links.
Dan
parents:
413
diff
changeset
|
2164 |
} |
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2165 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2166 |
// done parsing - append and continue |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2167 |
$appender .= $parsed; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2168 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2169 |
// we're done with this - unset it because it's a reference and we don't want it overwritten. |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2170 |
// also free the parser to get some RAM back |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2171 |
unset($appender, $parser); |
1 | 2172 |
} |
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2173 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2174 |
// lastly, append any footer HTML |
1 | 2175 |
if(isset($vars['sidebar_bottom'])) |
2176 |
{ |
|
592 | 2177 |
$bottom = $this->parse($vars['sidebar_bottom']); |
2178 |
$left .= $bottom; |
|
2179 |
$right .= $bottom; |
|
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2180 |
$min .= $bottom; |
1 | 2181 |
} |
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2182 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2183 |
$return = array($left, $right, $min); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2184 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2185 |
// allow any plugins to append what they want to the return |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2186 |
$code = $plugins->setHook('sidebar_fetch_return'); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2187 |
foreach ( $code as $cmd ) |
1 | 2188 |
{ |
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2189 |
eval($cmd); |
1 | 2190 |
} |
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2191 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2192 |
// cache the result if appropriate |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2193 |
$this->cache_compiled_sidebar($return); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2194 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2195 |
profiler_log('Finished sidebar parsing'); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2196 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2197 |
return $return; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2198 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2199 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2200 |
/** |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2201 |
* Runs the appropriate formatting routine on a sidebar row. |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2202 |
* @param array Row in sidebar table |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2203 |
* @param array Template variable set from elements.tpl |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2204 |
* @param null Pass by reference, will be filled with the parser according to the block's type (sidebar_section or sidebar_section_raw) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2205 |
* @return string HTML + directives like {restrict} or {hideif} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2206 |
*/ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2207 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2208 |
function format_sidebar_block($row, $vars, &$parser) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2209 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2210 |
// import globals in case a PHP block wants to call the Enano API |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2211 |
global $db, $session, $paths, $template, $plugins; // Common objects |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2212 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2213 |
$parser = null; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2214 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2215 |
switch($row['block_type']) |
592 | 2216 |
{ |
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2217 |
case BLOCK_WIKIFORMAT: |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2218 |
$parser = $this->makeParserText($vars['sidebar_section']); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2219 |
$c = RenderMan::render($row['block_content']); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2220 |
break; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2221 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2222 |
case BLOCK_TEMPLATEFORMAT: |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2223 |
$parser = $this->makeParserText($vars['sidebar_section']); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2224 |
$c = $this->tplWikiFormat($row['block_content']); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2225 |
break; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2226 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2227 |
case BLOCK_HTML: |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2228 |
$parser = $this->makeParserText($vars['sidebar_section_raw']); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2229 |
$c = $row['block_content']; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2230 |
break; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2231 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2232 |
case BLOCK_PHP: |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2233 |
// PHP blocks need to be sent directly to eval() |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2234 |
$parser = $this->makeParserText($vars['sidebar_section_raw']); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2235 |
ob_start(); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2236 |
@eval($row['block_content']); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2237 |
$c = ob_get_contents(); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2238 |
ob_end_clean(); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2239 |
break; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2240 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2241 |
case BLOCK_PLUGIN: |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2242 |
$parser = $this->makeParserText('{CONTENT}'); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2243 |
$c = '<!-- PLUGIN -->' . (gettype($this->fetch_block($row['block_content'])) == 'string') ? |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2244 |
$this->fetch_block($row['block_content']) : |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2245 |
// This used to say "can't find plugin block" but I think it's more friendly to just silently hide it. |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2246 |
''; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2247 |
break; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2248 |
default: |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2249 |
// unknown block type - can a plugin handle it? |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2250 |
$code = $plugins->setHook('format_sidebar_block'); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2251 |
foreach ( $code as $cmd ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2252 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2253 |
eval($cmd); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2254 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2255 |
if ( !isset($c) ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2256 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2257 |
// default to wiki formatting (this was going to be straight HTML but this is done for backwards compatibility reasons) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2258 |
$c = RenderMan::render($row['block_content']); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2259 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2260 |
if ( !$parser ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2261 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2262 |
// no parser defined, use the "raw" section by default (plugins are more likely to want raw content |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2263 |
// rather than a list of links, and they can set the parser to use sidebar_section if they want) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2264 |
$parser = $this->makeParserText($vars['sidebar_section_raw']); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2265 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2266 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2267 |
break; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2268 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2269 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2270 |
return $c; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2271 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2272 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2273 |
/** |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2274 |
* Returns the list of things that should not be cached (sorry, I was listening to "The Thing That Should Not Be" by Metallica when I |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2275 |
* wrote this routine. You should get a copy of Master of Puppets, it's a damn good album.) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2276 |
* @return array |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2277 |
*/ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2278 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2279 |
function get_cache_replacements() |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2280 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2281 |
global $db, $session, $paths, $template, $plugins; // Common objects |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2282 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2283 |
return array( |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2284 |
'$LOGIN_LINK$' => $this->tpl_strings['LOGIN_LINK'], |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2285 |
'$MAIN_PAGE$' => $this->tpl_strings['MAIN_PAGE'], |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2286 |
'$USERNAME$' => $session->username |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2287 |
); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2288 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2289 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2290 |
/** |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2291 |
* Attempts to load a cached compiled sidebar. |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2292 |
* @return array Same format as fetch_sidebar() |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2293 |
*/ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2294 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2295 |
function fetch_cached_sidebar() |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2296 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2297 |
global $db, $session, $paths, $template, $plugins; // Common objects |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2298 |
global $cache; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2299 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2300 |
$cached = false; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2301 |
if ( ($result = $cache->fetch('anon_sidebar')) && !$session->user_logged_in ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2302 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2303 |
if ( isset($result[$this->theme]) ) |
699
c7d737202d59
Removed Adobe Spry and replaced with jQuery. Please report any new bugs on the forums or via IRC. In a related note, auto-completion should work now at least for usernames. Still hacking away at page name completion...
Dan
parents:
692
diff
changeset
|
2304 |
{ |
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2305 |
$cached = $result[$this->theme]; |
699
c7d737202d59
Removed Adobe Spry and replaced with jQuery. Please report any new bugs on the forums or via IRC. In a related note, auto-completion should work now at least for usernames. Still hacking away at page name completion...
Dan
parents:
692
diff
changeset
|
2306 |
} |
592 | 2307 |
} |
708
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2308 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2309 |
// if we haven't been able to fetch yet, see if a plugin wants to give us something |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2310 |
if ( !$cached ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2311 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2312 |
$code = $plugins->setHook('fetch_cached_sidebar'); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2313 |
foreach ( $code as $cmd ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2314 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2315 |
eval($cmd); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2316 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2317 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2318 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2319 |
if ( is_array($cached) ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2320 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2321 |
// fetch certain variables that can't be stored in the cache and quickly substitute |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2322 |
$replace = $this->get_cache_replacements(); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2323 |
foreach ( $cached as &$val ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2324 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2325 |
$val = strtr($val, $replace); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2326 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2327 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2328 |
// done processing, send it back |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2329 |
return $cached; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2330 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2331 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2332 |
return false; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2333 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2334 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2335 |
/** |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2336 |
* Caches a completely compiled sidebar, if appropriate |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2337 |
* @param array Effectively, return from fetch_sidebar() |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2338 |
*/ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2339 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2340 |
function cache_compiled_sidebar($sidebar) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2341 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2342 |
global $db, $session, $paths, $template, $plugins; // Common objects |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2343 |
global $cache; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2344 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2345 |
// check if conditions are right |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2346 |
if ( !$session->user_logged_in && getConfig('cache_thumbs') === '1' ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2347 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2348 |
// load any existing cache to make sure other themes' cached sidebars aren't discarded |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2349 |
$cached = ( $_ = $cache->fetch('anon_sidebar') ) ? $_ : array(); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2350 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2351 |
// replace variables |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2352 |
$replace = array_flip($this->get_cache_replacements()); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2353 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2354 |
foreach ( $sidebar as &$section ) |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2355 |
{ |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2356 |
$section = strtr($section, $replace); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2357 |
} |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2358 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2359 |
// compile |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2360 |
$cached[$this->theme] = $sidebar; |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2361 |
|
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2362 |
// store |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2363 |
$cache->store('anon_sidebar', $cached, 15); |
162763d69256
Rewrote sidebar compilation code, caching is more stable now and things were cleaned up/separated into more functions/made plugin-expandable. In theory, plugins can add new sidebar block types now. I'd personally like to see a fully plugin-based sidebar editor that completely overhauls what Enano has now sometime now that this framework is in place.
Dan
parents:
704
diff
changeset
|
2364 |
} |
1 | 2365 |
} |
2366 |
||
2367 |
function initLinksWidget() |
|
2368 |
{ |
|
2369 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
655
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
2370 |
|
1 | 2371 |
// SourceForge/W3C buttons |
2372 |
$ob = Array(); |
|
2373 |
if(getConfig('sflogo_enabled')=='1') |
|
2374 |
{ |
|
203 | 2375 |
$sflogo_secure = ( isset($_SERVER['HTTPS']) ) ? 'https' : 'http'; |
2376 |
$ob[] = '<a style="text-align: center;" href="http://sourceforge.net/" onclick="if ( !KILL_SWITCH ) { window.open(this.href);return false; }"><img style="border-width: 0px;" alt="SourceForge.net Logo" src="' . $sflogo_secure . '://sflogo.sourceforge.net/sflogo.php?group_id='.getConfig('sflogo_groupid').'&type='.getConfig('sflogo_type').'" /></a>'; |
|
1 | 2377 |
} |
57
b354deeaa4c4
Vastly improved compatibility with older versions of IE, particularly 5.0, through the use of a kill switch that turns off all AJAX functions
Dan
parents:
54
diff
changeset
|
2378 |
if(getConfig('w3c_v32') =='1') $ob[] = '<a style="text-align: center;" href="http://validator.w3.org/check?uri=referer" onclick="if ( !KILL_SWITCH ) { window.open(this.href);return false; }"><img style="border: 0px solid #FFFFFF;" alt="Valid HTML 3.2" src="http://www.w3.org/Icons/valid-html32" /></a>'; |
b354deeaa4c4
Vastly improved compatibility with older versions of IE, particularly 5.0, through the use of a kill switch that turns off all AJAX functions
Dan
parents:
54
diff
changeset
|
2379 |
if(getConfig('w3c_v40') =='1') $ob[] = '<a style="text-align: center;" href="http://validator.w3.org/check?uri=referer" onclick="if ( !KILL_SWITCH ) { window.open(this.href);return false; }"><img style="border: 0px solid #FFFFFF;" alt="Valid HTML 4.0" src="http://www.w3.org/Icons/valid-html40" /></a>'; |
b354deeaa4c4
Vastly improved compatibility with older versions of IE, particularly 5.0, through the use of a kill switch that turns off all AJAX functions
Dan
parents:
54
diff
changeset
|
2380 |
if(getConfig('w3c_v401') =='1') $ob[] = '<a style="text-align: center;" href="http://validator.w3.org/check?uri=referer" onclick="if ( !KILL_SWITCH ) { window.open(this.href);return false; }"><img style="border: 0px solid #FFFFFF;" alt="Valid HTML 4.01" src="http://www.w3.org/Icons/valid-html401" /></a>'; |
b354deeaa4c4
Vastly improved compatibility with older versions of IE, particularly 5.0, through the use of a kill switch that turns off all AJAX functions
Dan
parents:
54
diff
changeset
|
2381 |
if(getConfig('w3c_vxhtml10')=='1') $ob[] = '<a style="text-align: center;" href="http://validator.w3.org/check?uri=referer" onclick="if ( !KILL_SWITCH ) { window.open(this.href);return false; }"><img style="border: 0px solid #FFFFFF;" alt="Valid XHTML 1.0" src="http://www.w3.org/Icons/valid-xhtml10" /></a>'; |
b354deeaa4c4
Vastly improved compatibility with older versions of IE, particularly 5.0, through the use of a kill switch that turns off all AJAX functions
Dan
parents:
54
diff
changeset
|
2382 |
if(getConfig('w3c_vxhtml11')=='1') $ob[] = '<a style="text-align: center;" href="http://validator.w3.org/check?uri=referer" onclick="if ( !KILL_SWITCH ) { window.open(this.href);return false; }"><img style="border: 0px solid #FFFFFF;" alt="Valid XHTML 1.1" src="http://www.w3.org/Icons/valid-xhtml11" /></a>'; |
b354deeaa4c4
Vastly improved compatibility with older versions of IE, particularly 5.0, through the use of a kill switch that turns off all AJAX functions
Dan
parents:
54
diff
changeset
|
2383 |
if(getConfig('w3c_vcss') =='1') $ob[] = '<a style="text-align: center;" href="http://validator.w3.org/check?uri=referer" onclick="if ( !KILL_SWITCH ) { window.open(this.href);return false; }"><img style="border: 0px solid #FFFFFF;" alt="Valid CSS" src="http://www.w3.org/Icons/valid-css" /></a>'; |
b354deeaa4c4
Vastly improved compatibility with older versions of IE, particularly 5.0, through the use of a kill switch that turns off all AJAX functions
Dan
parents:
54
diff
changeset
|
2384 |
if(getConfig('dbd_button') =='1') $ob[] = '<a style="text-align: center;" href="http://www.defectivebydesign.org/join/button" onclick="if ( !KILL_SWITCH ) { window.open(this.href);return false; }"><img style="border: 0px solid #FFFFFF;" alt="DRM technology restricts what you can do with your computer" src="http://defectivebydesign.org/sites/nodrm.civicactions.net/files/images/dbd_sm_btn.gif" /><br /><small>Protect your freedom >></small></a>'; |
1 | 2385 |
|
2386 |
$code = $plugins->setHook('links_widget'); |
|
2387 |
foreach ( $code as $cmd ) |
|
2388 |
{ |
|
2389 |
eval($cmd); |
|
2390 |
} |
|
2391 |
||
71 | 2392 |
if(count($ob) > 0 || getConfig('powered_btn') == '1') $sb_links = '<div style="text-align: center; padding: 5px 0;">'. ( ( getConfig('powered_btn') == '1' ) ? $this->fading_button : '' ) . implode('<br />', $ob).'</div>'; |
1 | 2393 |
else $sb_links = ''; |
2394 |
||
2395 |
$this->sidebar_widget('Links', $sb_links); |
|
2396 |
} |
|
2397 |
||
2398 |
/** |
|
2399 |
* Builds a box showing unread private messages. |
|
2400 |
*/ |
|
2401 |
||
2402 |
function notify_unread_pms() |
|
2403 |
{ |
|
2404 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
322
5f1cd51bf1be
Many changes. Installer with PostgreSQL is broken badly and will be for some time.
Dan
parents:
320
diff
changeset
|
2405 |
if ( ( $paths->page_id == 'PrivateMessages' || $paths->page_id == 'Preferences' ) && $paths->namespace == 'Special' ) |
1 | 2406 |
{ |
2407 |
return ''; |
|
2408 |
} |
|
2409 |
$ob = '<div class="usermessage">'."\n"; |
|
2410 |
$s = ( $session->unread_pms == 1 ) ? '' : 's'; |
|
2411 |
$ob .= " <b>You have $session->unread_pms <a href=" . '"' . makeUrlNS('Special', 'PrivateMessages' ) . '"' . ">unread private message$s</a>.</b><br />\n Messages: "; |
|
2412 |
$q = $db->sql_query('SELECT message_id,message_from,subject,date FROM '.table_prefix.'privmsgs WHERE message_to=\'' . $session->username . '\' AND message_read=0 ORDER BY date DESC;'); |
|
2413 |
if ( !$q ) |
|
2414 |
$db->_die(); |
|
2415 |
$messages = array(); |
|
2416 |
while ( $row = $db->fetchrow() ) |
|
2417 |
{ |
|
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
parents:
335
diff
changeset
|
2418 |
$messages[] = '<a href="' . makeUrlNS('Special', 'PrivateMessages/View/' . $row['message_id']) . '" title="Sent ' . enano_date('F d, Y h:i a', $row['date']) . ' by ' . $row['message_from'] . '">' . $row['subject'] . '</a>'; |
1 | 2419 |
} |
2420 |
$ob .= implode(",\n " , $messages)."\n"; |
|
2421 |
$ob .= '</div>'."\n"; |
|
2422 |
return $ob; |
|
2423 |
} |
|
2424 |
||
2425 |
} // class template |
|
2426 |
||
2427 |
/** |
|
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2428 |
* The core of the template compilation engine. Independent from the Enano API for failsafe operation. |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2429 |
* @param string text to process |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2430 |
* @return string Compiled PHP code |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2431 |
* @access private |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2432 |
*/ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2433 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2434 |
function template_compiler_core($text) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2435 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2436 |
global $db, $session, $paths, $template, $plugins; // Common objects |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2437 |
// A random seed used to salt tags |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2438 |
$seed = md5 ( microtime() . mt_rand() ); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2439 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2440 |
// Strip out PHP sections |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2441 |
preg_match_all('/<\?php(.+?)\?>/is', $text, $php_matches); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2442 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2443 |
foreach ( $php_matches[0] as $i => $match ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2444 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2445 |
// Substitute the PHP section with a random tag |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2446 |
$tag = "{PHP:$i:$seed}"; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2447 |
$text = str_replace_once($match, $tag, $text); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2448 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2449 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2450 |
// Escape slashes and single quotes in template code |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2451 |
$text = str_replace('\\', '\\\\', $text); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2452 |
$text = str_replace('\'', '\\\'', $text); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2453 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2454 |
// Initialize the PHP compiled code |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2455 |
$text = 'ob_start(); echo \''.$text.'\'; $tpl_code = ob_get_contents(); ob_end_clean(); return $tpl_code;'; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2456 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2457 |
## |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2458 |
## Main rules |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2459 |
## |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2460 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2461 |
// |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2462 |
// Conditionals |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2463 |
// |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2464 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2465 |
$keywords = array('BEGIN', 'BEGINNOT', 'IFSET', 'IFPLUGIN'); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2466 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2467 |
// only do this if the plugins API is loaded |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2468 |
if ( is_object(@$plugins) ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2469 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2470 |
$code = $plugins->setHook('template_compile_logic_keyword'); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2471 |
foreach ( $code as $cmd ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2472 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2473 |
eval($cmd); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2474 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2475 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2476 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2477 |
$keywords = implode('|', $keywords); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2478 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2479 |
// Matches |
534 | 2480 |
// 1 2 3 4 56 7 8 9 |
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
2481 |
$regexp = '/(<!-- ?(' . $keywords . ') ([A-z0-9_-]+) ?-->)([\w\W]*)((<!-- ?BEGINELSE \\3 ?-->)([\w\W]*))?(<!-- ?END(IF)? \\3 ?-->)/isU'; |
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2482 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2483 |
/* |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2484 |
The way this works is: match all blocks using the standard form with a different keyword in the block each time, |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2485 |
and replace them with appropriate PHP logic. Plugin-extensible now. :-) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2486 |
*/ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2487 |
|
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
2488 |
// This is a workaround for what seems like a PCRE bug |
590
03a60844c7c5
Several optimization changes including getting rid of a few eval()s. Added placeholder functions for the theme manager, which should be working now
Dan
parents:
585
diff
changeset
|
2489 |
while ( preg_match_all($regexp, $text, $matches) ) |
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
2490 |
{ |
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
2491 |
|
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2492 |
for ( $i = 0; $i < count($matches[0]); $i++ ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2493 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2494 |
$start_tag =& $matches[1][$i]; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2495 |
$type =& $matches[2][$i]; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2496 |
$test =& $matches[3][$i]; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2497 |
$particle_true =& $matches[4][$i]; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2498 |
$else_tag =& $matches[6][$i]; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2499 |
$particle_else =& $matches[7][$i]; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2500 |
$end_tag =& $matches[8][$i]; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2501 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2502 |
switch($type) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2503 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2504 |
case 'BEGIN': |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2505 |
$cond = "isset(\$this->tpl_bool['$test']) && \$this->tpl_bool['$test']"; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2506 |
break; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2507 |
case 'BEGINNOT': |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2508 |
$cond = "!isset(\$this->tpl_bool['$test']) || ( isset(\$this->tpl_bool['$test']) && !\$this->tpl_bool['$test'] )"; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2509 |
break; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2510 |
case 'IFPLUGIN': |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2511 |
$cond = "getConfig('plugin_$test') == '1'"; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2512 |
break; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2513 |
case 'IFSET': |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2514 |
$cond = "isset(\$this->tpl_strings['$test'])"; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2515 |
break; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2516 |
default: |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2517 |
// only do this if the plugins API is loaded |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2518 |
if ( is_object(@$plugins) ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2519 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2520 |
$code = $plugins->setHook('template_compile_logic_cond'); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2521 |
foreach ( $code as $cmd ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2522 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2523 |
eval($cmd); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2524 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2525 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2526 |
break; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2527 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2528 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2529 |
if ( !isset($cond) || ( isset($cond) && !is_string($cond) ) ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2530 |
continue; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2531 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2532 |
$tag_complete = <<<TPLCODE |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2533 |
'; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2534 |
/* START OF CONDITION: $type ($test) */ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2535 |
if ( $cond ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2536 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2537 |
echo '$particle_true'; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2538 |
/* ELSE OF CONDITION: $type ($test) */ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2539 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2540 |
else |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2541 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2542 |
echo '$particle_else'; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2543 |
/* END OF CONDITION: $type ($test) */ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2544 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2545 |
echo ' |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2546 |
TPLCODE; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2547 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2548 |
$text = str_replace_once($matches[0][$i], $tag_complete, $text); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2549 |
} |
566
06d241de3151
Made ajaxReset() call the actual requested title instead of effective title; fixed (again) template compiler bug not matching certain tags (probably PCRE bug)
Dan
parents:
557
diff
changeset
|
2550 |
} |
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2551 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2552 |
// For debugging ;-) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2553 |
// die("<pre><?php\n" . htmlspecialchars($text."\n\n".print_r($matches,true)) . "\n\n?></pre>"); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2554 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2555 |
// |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2556 |
// Data substitution/variables |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2557 |
// |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2558 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2559 |
// System messages |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2560 |
$text = preg_replace('/<!-- SYSMSG ([A-z0-9\._-]+?) -->/is', '\' . $template->tplWikiFormat($paths->sysMsg(\'\\1\')) . \'', $text); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2561 |
|
534 | 2562 |
// only do this if the plugins API is loaded |
2563 |
if ( is_object(@$plugins) ) |
|
2564 |
{ |
|
2565 |
$code = $plugins->setHook('template_compile_subst'); |
|
2566 |
foreach ( $code as $cmd ) |
|
2567 |
{ |
|
2568 |
eval($cmd); |
|
2569 |
} |
|
2570 |
} |
|
2571 |
||
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2572 |
// Template variables |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2573 |
$text = preg_replace('/\{([A-z0-9_-]+?)\}/is', '\' . $this->tpl_strings[\'\\1\'] . \'', $text); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2574 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2575 |
// Reinsert PHP |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2576 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2577 |
foreach ( $php_matches[1] as $i => $match ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2578 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2579 |
// Substitute the random tag with the "real" PHP code |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2580 |
$tag = "{PHP:$i:$seed}"; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2581 |
$text = str_replace_once($tag, "'; $match echo '", $text); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2582 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2583 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2584 |
// echo('<pre>' . htmlspecialchars($text) . '</pre>'); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2585 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2586 |
return $text; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2587 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2588 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2589 |
/** |
1 | 2590 |
* Handles parsing of an individual template file. Instances should only be created through $template->makeParser(). To use: |
2591 |
* - Call $template->makeParser(template file name) - file name should be something.tpl, css/whatever.css, etc. |
|
2592 |
* - Make an array of strings you want the template to access. $array['STRING'] would be referenced in the template like {STRING} |
|
2593 |
* - Make an array of boolean values. These can be used for conditionals in the template (<!-- IF something --> whatever <!-- ENDIF something -->) |
|
2594 |
* - Call assign_vars() to pass the strings to the template parser. Same thing with assign_bool(). |
|
2595 |
* - Call run() to parse the template and get your fully compiled HTML. |
|
2596 |
* @access private |
|
2597 |
*/ |
|
2598 |
||
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2599 |
class templateIndividual extends template |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2600 |
{ |
1 | 2601 |
var $tpl_strings, $tpl_bool, $tpl_code; |
2602 |
var $compiled = false; |
|
2603 |
/** |
|
2604 |
* Constructor. |
|
2605 |
*/ |
|
2606 |
function __construct($text) |
|
2607 |
{ |
|
2608 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
2609 |
$this->tpl_code = $text; |
|
2610 |
$this->tpl_strings = $template->tpl_strings; |
|
2611 |
$this->tpl_bool = $template->tpl_bool; |
|
2612 |
} |
|
2613 |
/** |
|
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
parents:
335
diff
changeset
|
2614 |
* PHP 4 constructor. Deprecated in 1.1.x. |
1 | 2615 |
*/ |
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
parents:
335
diff
changeset
|
2616 |
/* |
1 | 2617 |
function templateIndividual($text) |
2618 |
{ |
|
2619 |
$this->__construct($text); |
|
2620 |
} |
|
345
4ccdfeee9a11
WiP commit for admin panel localization. All modules up to Admin:UserManager (working down the list) are localized except Admin:ThemeManager, which is due for a rewrite
Dan
parents:
335
diff
changeset
|
2621 |
*/ |
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
2622 |
|
1 | 2623 |
/** |
2624 |
* Assigns an array of string values to the template. Strings can be accessed from the template by inserting {KEY_NAME} in the template file. |
|
2625 |
* @param $vars array |
|
2626 |
*/ |
|
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
2627 |
|
1 | 2628 |
function assign_vars($vars) |
2629 |
{ |
|
2630 |
$this->tpl_strings = array_merge($this->tpl_strings, $vars); |
|
2631 |
} |
|
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
2632 |
|
1 | 2633 |
/** |
2634 |
* Assigns an array of boolean values to the template. These can be used for <!-- IF ... --> statements. |
|
2635 |
* @param $vars array |
|
2636 |
*/ |
|
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
2637 |
|
1 | 2638 |
function assign_bool($vars) |
2639 |
{ |
|
2640 |
$this->tpl_bool = array_merge($this->tpl_bool, $vars); |
|
2641 |
} |
|
557
26479224936a
Modified $template->init_vars() to pivot to local page metadata and permissions from a PageProcessor object instead of global data from $paths and permissions from $session to allow redirects to affect on-page controls as well as the actual content (only partially complete, protection and several other elements still need to be localized)
Dan
parents:
555
diff
changeset
|
2642 |
|
1 | 2643 |
/** |
2644 |
* Compiles and executes the template code. |
|
2645 |
* @return string |
|
2646 |
*/ |
|
2647 |
function run() |
|
2648 |
{ |
|
2649 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
2650 |
if(!$this->compiled) |
|
2651 |
{ |
|
2652 |
$this->tpl_code = $this->compile_template_text($this->tpl_code); |
|
2653 |
$this->compiled = true; |
|
2654 |
} |
|
2655 |
return eval($this->tpl_code); |
|
2656 |
} |
|
2657 |
} |
|
2658 |
||
2659 |
/** |
|
2660 |
* A version of the template compiler that does not rely at all on the other parts of Enano. Used during installation and for showing |
|
2661 |
* "critical error" messages. ** REQUIRES ** the Oxygen theme. |
|
2662 |
*/ |
|
2663 |
||
286
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
parents:
276
diff
changeset
|
2664 |
class template_nodb |
b2f985e4cef3
Fixed a number of issues with SQL query readability and some undefined index-ish errors; consequently the SQL report feature was added
Dan
parents:
276
diff
changeset
|
2665 |
{ |
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2666 |
var $fading_button, $tpl_strings, $tpl_bool, $theme, $style, $no_headers, $additional_headers, $sidebar_extra, $sidebar_widgets, $toolbar_menu, $theme_list, $named_theme_list; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2667 |
function __construct() |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2668 |
{ |
1 | 2669 |
$this->tpl_bool = Array(); |
2670 |
$this->tpl_strings = Array(); |
|
2671 |
$this->sidebar_extra = ''; |
|
2672 |
$this->sidebar_widgets = ''; |
|
2673 |
$this->toolbar_menu = ''; |
|
272
e0ec986c0af3
Searching sucks, and Enano's search algorithm was complete bullcrap. So I rewrote it. No, it does not use Google search technology. Like they have a patent for using the Arial font on search result pages anyway.
Dan
parents:
256
diff
changeset
|
2674 |
$this->additional_headers = '<style type="text/css">div.pagenav { border-top: 1px solid #CCC; padding-top: 7px; margin-top: 10px; }</style>'; |
1 | 2675 |
|
685
17ebe24cdf85
Rebranded as 1.1.5 (Caoineag alpha 5) and fixed a couple bugs related to CDN support in template_nodb and installerUI. Updated readme.
Dan
parents:
677
diff
changeset
|
2676 |
$this->fading_button = '<div style="background-image: url('.scriptPath.'/images/about-powered-enano-hover.png); background-repeat: no-repeat; width: 88px; height: 31px; margin: 0 auto 5px auto;"> |
17ebe24cdf85
Rebranded as 1.1.5 (Caoineag alpha 5) and fixed a couple bugs related to CDN support in template_nodb and installerUI. Updated readme.
Dan
parents:
677
diff
changeset
|
2677 |
<a href="http://enanocms.org/" onclick="window.open(this.href); return false;"><img style="border-width: 0;" alt=" " src="'.scriptPath.'/images/about-powered-enano.png" onmouseover="domOpacity(this, 100, 0, 500);" onmouseout="domOpacity(this, 0, 100, 500);" /></a> |
276
acfdccf7a2bf
Re-sync Oxygen and Mint and Oxygen simple with Oxygen main; a couple improvements to the redirect-on-no-config code
Dan
parents:
272
diff
changeset
|
2678 |
</div>'; |
acfdccf7a2bf
Re-sync Oxygen and Mint and Oxygen simple with Oxygen main; a couple improvements to the redirect-on-no-config code
Dan
parents:
272
diff
changeset
|
2679 |
|
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2680 |
// get list of themes |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2681 |
$this->theme_list = array(); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2682 |
$this->named_theme_list = array(); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2683 |
$order = 0; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2684 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2685 |
if ( $dir = @opendir( ENANO_ROOT . '/themes' ) ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2686 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2687 |
while ( $dh = @readdir($dir) ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2688 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2689 |
if ( $dh == '.' || $dh == '..' || !is_dir( ENANO_ROOT . "/themes/$dh" ) ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2690 |
continue; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2691 |
$theme_dir = ENANO_ROOT . "/themes/$dh"; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2692 |
if ( !file_exists("$theme_dir/theme.cfg") ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2693 |
continue; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2694 |
$data = array( |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2695 |
'theme_id' => $dh, |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2696 |
'theme_name' => ucwords($dh), |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2697 |
'enabled' => 1, |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2698 |
'theme_order' => ++$order, |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2699 |
'default_style' => $this->get_default_style($dh) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2700 |
); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2701 |
$this->named_theme_list[$dh] = $data; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2702 |
$this->theme_list[] =& $this->named_theme_list[$dh]; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2703 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2704 |
@closedir($dir); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2705 |
} |
1 | 2706 |
} |
2707 |
function template() { |
|
2708 |
$this->__construct(); |
|
2709 |
} |
|
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2710 |
function get_default_style($theme_id) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2711 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2712 |
if ( !is_dir( ENANO_ROOT . "/themes/$theme_id/css" ) ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2713 |
return false; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2714 |
$ds = false; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2715 |
if ( $dh = @opendir( ENANO_ROOT . "/themes/$theme_id/css" ) ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2716 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2717 |
while ( $dir = @readdir($dh) ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2718 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2719 |
if ( !preg_match('/\.css$/', $dir) ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2720 |
continue; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2721 |
if ( $dir == '_printable.css' ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2722 |
continue; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2723 |
$ds = preg_replace('/\.css$/', '', $dir); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2724 |
break; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2725 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2726 |
closedir($dh); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2727 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2728 |
else |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2729 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2730 |
return false; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2731 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2732 |
return $ds; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2733 |
} |
1 | 2734 |
function get_css($s = false) { |
2735 |
if($s) |
|
2736 |
return $this->process_template('css/'.$s); |
|
2737 |
else |
|
2738 |
return $this->process_template('css/'.$this->style.'.css'); |
|
2739 |
} |
|
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2740 |
function load_theme($name, $css, $auto_init = true) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2741 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2742 |
if ( !isset($this->named_theme_list[$name]) ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2743 |
$name = $this->theme_list[0]['theme_id']; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2744 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2745 |
if ( !file_exists(ENANO_ROOT . "/themes/$name/css/$css.css") ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2746 |
$css = $this->named_theme_list[$name]['default_style']; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2747 |
|
1 | 2748 |
$this->theme = $name; |
2749 |
$this->style = $css; |
|
2750 |
||
2751 |
$this->tpl_strings['SCRIPTPATH'] = scriptPath; |
|
2752 |
if ( $auto_init ) |
|
2753 |
$this->init_vars(); |
|
2754 |
} |
|
272
e0ec986c0af3
Searching sucks, and Enano's search algorithm was complete bullcrap. So I rewrote it. No, it does not use Google search technology. Like they have a patent for using the Arial font on search result pages anyway.
Dan
parents:
256
diff
changeset
|
2755 |
function add_header($html) |
e0ec986c0af3
Searching sucks, and Enano's search algorithm was complete bullcrap. So I rewrote it. No, it does not use Google search technology. Like they have a patent for using the Arial font on search result pages anyway.
Dan
parents:
256
diff
changeset
|
2756 |
{ |
e0ec986c0af3
Searching sucks, and Enano's search algorithm was complete bullcrap. So I rewrote it. No, it does not use Google search technology. Like they have a patent for using the Arial font on search result pages anyway.
Dan
parents:
256
diff
changeset
|
2757 |
$this->additional_headers .= "\n<!-- ----------------------------------------------------------- -->\n\n " . $html; |
e0ec986c0af3
Searching sucks, and Enano's search algorithm was complete bullcrap. So I rewrote it. No, it does not use Google search technology. Like they have a patent for using the Arial font on search result pages anyway.
Dan
parents:
256
diff
changeset
|
2758 |
} |
1 | 2759 |
function init_vars() |
2760 |
{ |
|
2761 |
global $sideinfo; |
|
2762 |
global $this_page; |
|
243
a7d0f2711df1
Installer localization started. Welcome, License, and SysReqs pages are fully localized.
Dan
parents:
231
diff
changeset
|
2763 |
global $lang; |
1 | 2764 |
global $db, $session, $paths, $template, $plugins; // Common objects |
2765 |
$tplvars = $this->extract_vars('elements.tpl'); |
|
2766 |
$tb = ''; |
|
2767 |
// Get the "article" button text (depends on namespace) |
|
355
d15e4411ef65
Fixed a coupla minor bugs with the template_nodb class wrongly referencing $lang
Dan
parents:
349
diff
changeset
|
2768 |
if(defined('IN_ENANO_INSTALL') && is_object($lang)) $ns = $lang->get('meta_btn_article'); |
1 | 2769 |
else $ns = 'system error page'; |
243
a7d0f2711df1
Installer localization started. Welcome, License, and SysReqs pages are fully localized.
Dan
parents:
231
diff
changeset
|
2770 |
$t = str_replace('{FLAGS}', 'onclick="return false;" title="Hey! A button that doesn\'t do anything. Clever..." accesskey="a"', $tplvars['toolbar_button']); |
1 | 2771 |
$t = str_replace('{HREF}', '#', $t); |
2772 |
$t = str_replace('{TEXT}', $ns, $t); |
|
2773 |
$tb .= $t; |
|
2774 |
||
2775 |
// Page toolbar |
|
2776 |
||
2777 |
$this->tpl_bool = Array( |
|
2778 |
'auth_admin'=>true, |
|
2779 |
'user_logged_in'=>true, |
|
2780 |
'right_sidebar'=>false, |
|
2781 |
); |
|
2782 |
$this->tpl_bool['in_sidebar_admin'] = false; |
|
2783 |
||
2784 |
$this->tpl_bool['auth_rename'] = false; |
|
2785 |
||
2786 |
$asq = $asa = ''; |
|
2787 |
||
2788 |
$this->tpl_bool['fixed_menus'] = false; |
|
2789 |
$slink = defined('IN_ENANO_INSTALL') ? scriptPath.'/install.php?mode=css' : makeUrlNS('Special', 'CSS'); |
|
2790 |
||
2791 |
$title = ( is_object($paths) ) ? $paths->page : 'Critical error'; |
|
2792 |
||
243
a7d0f2711df1
Installer localization started. Welcome, License, and SysReqs pages are fully localized.
Dan
parents:
231
diff
changeset
|
2793 |
$headers = '<style type="text/css">div.pagenav { border-top: 1px solid #CCC; padding-top: 7px; margin-top: 10px; }</style>'; |
244
09f8a9a03ccf
Localized installer database info page and finished localizing sysreqs page
Dan
parents:
243
diff
changeset
|
2794 |
|
09f8a9a03ccf
Localized installer database info page and finished localizing sysreqs page
Dan
parents:
243
diff
changeset
|
2795 |
$js_dynamic = ''; |
243
a7d0f2711df1
Installer localization started. Welcome, License, and SysReqs pages are fully localized.
Dan
parents:
231
diff
changeset
|
2796 |
if ( defined('IN_ENANO_INSTALL') ) |
a7d0f2711df1
Installer localization started. Welcome, License, and SysReqs pages are fully localized.
Dan
parents:
231
diff
changeset
|
2797 |
{ |
244
09f8a9a03ccf
Localized installer database info page and finished localizing sysreqs page
Dan
parents:
243
diff
changeset
|
2798 |
$js_dynamic .= '<script type="text/javascript" src="install.php?mode=langjs"></script>'; |
243
a7d0f2711df1
Installer localization started. Welcome, License, and SysReqs pages are fully localized.
Dan
parents:
231
diff
changeset
|
2799 |
} |
685
17ebe24cdf85
Rebranded as 1.1.5 (Caoineag alpha 5) and fixed a couple bugs related to CDN support in template_nodb and installerUI. Updated readme.
Dan
parents:
677
diff
changeset
|
2800 |
$js_dynamic .= '<script type="text/javascript">var title="'. $title .'"; var scriptPath="'.scriptPath.'"; var cdnPath="'.scriptPath.'"; var ENANO_SID=""; var AES_BITS='.AES_BITS.'; var AES_BLOCKSIZE=' . AES_BLOCKSIZE . '; var pagepass=\'\'; var ENANO_LANG_ID = 1;</script>'; |
243
a7d0f2711df1
Installer localization started. Welcome, License, and SysReqs pages are fully localized.
Dan
parents:
231
diff
changeset
|
2801 |
|
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2802 |
global $site_name, $site_desc; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2803 |
$site_default_name = ( !empty($site_name) ) ? $site_name : 'Critical error'; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2804 |
$site_default_desc = ( !empty($site_desc) ) ? $site_desc : 'This site is experiencing a problem and cannot load.'; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2805 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2806 |
$site_name_final = ( defined('IN_ENANO_INSTALL') && is_object($lang) ) ? $lang->get('meta_site_name') : $site_default_name; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2807 |
$site_desc_final = ( defined('IN_ENANO_INSTALL') && is_object($lang) ) ? $lang->get('meta_site_desc') : $site_default_desc; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2808 |
|
1 | 2809 |
// The rewritten template engine will process all required vars during the load_template stage instead of (cough) re-processing everything each time around. |
2810 |
$tpl_strings = Array( |
|
2811 |
'PAGE_NAME'=>$this_page, |
|
2812 |
'PAGE_URLNAME'=>'Null', |
|
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2813 |
'SITE_NAME' => $site_name_final, |
1 | 2814 |
'USERNAME'=>'admin', |
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2815 |
'SITE_DESC' => $site_desc_final, |
1 | 2816 |
'TOOLBAR'=>$tb, |
2817 |
'SCRIPTPATH'=>scriptPath, |
|
2818 |
'CONTENTPATH'=>contentPath, |
|
655
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
2819 |
'CDNPATH' => scriptPath, |
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
2820 |
'JS_HEADER' => '<script type="text/javascript" src="' . scriptPath . '/includes/clientside/static/enano-lib-basic.js"></script>', |
b2c51a68209b
Fixed unused $admintitle variable in $template->fading_button code generation; fixed missing CDNPATH, JS_HEADER, and JS_FOOTER in template_nodb; localized onpage_lbl_page_external
Dan
parents:
650
diff
changeset
|
2821 |
'JS_FOOTER' => '', |
1 | 2822 |
'ADMIN_SID_QUES'=>$asq, |
2823 |
'ADMIN_SID_AMP'=>$asa, |
|
2824 |
'ADMIN_SID_AMP_HTML'=>'', |
|
272
e0ec986c0af3
Searching sucks, and Enano's search algorithm was complete bullcrap. So I rewrote it. No, it does not use Google search technology. Like they have a patent for using the Arial font on search result pages anyway.
Dan
parents:
256
diff
changeset
|
2825 |
'ADDITIONAL_HEADERS'=>$this->additional_headers, |
1 | 2826 |
'SIDEBAR_EXTRA'=>'', |
355
d15e4411ef65
Fixed a coupla minor bugs with the template_nodb class wrongly referencing $lang
Dan
parents:
349
diff
changeset
|
2827 |
'COPYRIGHT'=>( defined('IN_ENANO_INSTALL') && is_object($lang) ) ? $lang->get('meta_enano_copyright') : ( defined('ENANO_CONFIG_FETCHED') ? getConfig('copyright_notice') : '' ), |
1 | 2828 |
'TOOLBAR_EXTRAS'=>'', |
125
fb31c951d3a2
Fixed some rather major bugs in the registration system, this will need a release followup
Dan
parents:
118
diff
changeset
|
2829 |
'REQUEST_URI'=>( isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '' ).$_SERVER['REQUEST_URI'], |
1 | 2830 |
'STYLE_LINK'=>$slink, |
2831 |
'LOGOUT_LINK'=>'', |
|
2832 |
'THEME_LINK'=>'', |
|
2833 |
'TEMPLATE_DIR'=>scriptPath.'/themes/'.$this->theme, |
|
2834 |
'THEME_ID'=>$this->theme, |
|
2835 |
'STYLE_ID'=>$this->style, |
|
244
09f8a9a03ccf
Localized installer database info page and finished localizing sysreqs page
Dan
parents:
243
diff
changeset
|
2836 |
'JS_DYNAMIC_VARS'=>$js_dynamic, |
1 | 2837 |
'SIDEBAR_RIGHT'=>'', |
377
bb3e6c3bd4f4
Removed stray debugging info from ACL editor success notification; added ability for guests to set language on URI (?lang=eng); added html_in_pages ACL type and separated from php_in_pages so HTML can be embedded but not PHP; rewote portions of the path manager to better abstract URL input; added Zend Framework into list of BSD-licensed libraries; localized some remaining strings; got the migration script working, but just barely; fixed display bug in Special:Contributions; localized Main Page button in admin panel
Dan
parents:
372
diff
changeset
|
2838 |
'REPORT_URI' => '', |
bb3e6c3bd4f4
Removed stray debugging info from ACL editor success notification; added ability for guests to set language on URI (?lang=eng); added html_in_pages ACL type and separated from php_in_pages so HTML can be embedded but not PHP; rewote portions of the path manager to better abstract URL input; added Zend Framework into list of BSD-licensed libraries; localized some remaining strings; got the migration script working, but just barely; fixed display bug in Special:Contributions; localized Main Page button in admin panel
Dan
parents:
372
diff
changeset
|
2839 |
'URL_ABOUT_ENANO' => 'http://enanocms.org/' |
1 | 2840 |
); |
2841 |
$this->tpl_strings = array_merge($tpl_strings, $this->tpl_strings); |
|
2842 |
||
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2843 |
$sidebar = ( is_array(@$sideinfo) ) ? $sideinfo : ''; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2844 |
if ( $sidebar != '' ) |
1 | 2845 |
{ |
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2846 |
if ( isset($tplvars['sidebar_top']) ) |
1 | 2847 |
{ |
2848 |
$text = $this->makeParserText($tplvars['sidebar_top']); |
|
2849 |
$top = $text->run(); |
|
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2850 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2851 |
else |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2852 |
{ |
1 | 2853 |
$top = ''; |
2854 |
} |
|
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2855 |
|
1 | 2856 |
$p = $this->makeParserText($tplvars['sidebar_section']); |
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2857 |
$b = $this->makeParserText($tplvars['sidebar_button']); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2858 |
$sidebar_text = ''; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2859 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2860 |
foreach ( $sidebar as $title => $links ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2861 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2862 |
$p->assign_vars(array( |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2863 |
'TITLE' => $title |
1 | 2864 |
)); |
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2865 |
// build content |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2866 |
$content = ''; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2867 |
foreach ( $links as $link_text => $url ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2868 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2869 |
$b->assign_vars(array( |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2870 |
'HREF' => htmlspecialchars($url), |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2871 |
'FLAGS' => '', |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2872 |
'TEXT' => $link_text |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2873 |
)); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2874 |
$content .= $b->run(); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2875 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2876 |
$p->assign_vars(array( |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2877 |
'CONTENT' => $content |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2878 |
)); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2879 |
$sidebar_text .= $p->run(); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2880 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2881 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2882 |
if ( isset($tplvars['sidebar_bottom']) ) |
1 | 2883 |
{ |
2884 |
$text = $this->makeParserText($tplvars['sidebar_bottom']); |
|
2885 |
$bottom = $text->run(); |
|
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2886 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2887 |
else |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2888 |
{ |
1 | 2889 |
$bottom = ''; |
2890 |
} |
|
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2891 |
$sidebar = $top . $sidebar_text . $bottom; |
1 | 2892 |
} |
2893 |
$this->tpl_strings['SIDEBAR_LEFT'] = $sidebar; |
|
2894 |
||
2895 |
$this->tpl_bool['sidebar_left'] = ( $this->tpl_strings['SIDEBAR_LEFT'] != '') ? true : false; |
|
2896 |
$this->tpl_bool['sidebar_right'] = ( $this->tpl_strings['SIDEBAR_RIGHT'] != '') ? true : false; |
|
2897 |
$this->tpl_bool['right_sidebar'] = $this->tpl_bool['sidebar_right']; // backward compatibility |
|
2898 |
$this->tpl_bool['stupid_mode'] = true; |
|
2899 |
} |
|
272
e0ec986c0af3
Searching sucks, and Enano's search algorithm was complete bullcrap. So I rewrote it. No, it does not use Google search technology. Like they have a patent for using the Arial font on search result pages anyway.
Dan
parents:
256
diff
changeset
|
2900 |
function header($simple = false) |
1 | 2901 |
{ |
272
e0ec986c0af3
Searching sucks, and Enano's search algorithm was complete bullcrap. So I rewrote it. No, it does not use Google search technology. Like they have a patent for using the Arial font on search result pages anyway.
Dan
parents:
256
diff
changeset
|
2902 |
$filename = ( $simple ) ? 'simple-header.tpl' : 'header.tpl'; |
e0ec986c0af3
Searching sucks, and Enano's search algorithm was complete bullcrap. So I rewrote it. No, it does not use Google search technology. Like they have a patent for using the Arial font on search result pages anyway.
Dan
parents:
256
diff
changeset
|
2903 |
if ( !$this->no_headers ) |
e0ec986c0af3
Searching sucks, and Enano's search algorithm was complete bullcrap. So I rewrote it. No, it does not use Google search technology. Like they have a patent for using the Arial font on search result pages anyway.
Dan
parents:
256
diff
changeset
|
2904 |
{ |
e0ec986c0af3
Searching sucks, and Enano's search algorithm was complete bullcrap. So I rewrote it. No, it does not use Google search technology. Like they have a patent for using the Arial font on search result pages anyway.
Dan
parents:
256
diff
changeset
|
2905 |
echo $this->process_template($filename); |
e0ec986c0af3
Searching sucks, and Enano's search algorithm was complete bullcrap. So I rewrote it. No, it does not use Google search technology. Like they have a patent for using the Arial font on search result pages anyway.
Dan
parents:
256
diff
changeset
|
2906 |
} |
1 | 2907 |
} |
272
e0ec986c0af3
Searching sucks, and Enano's search algorithm was complete bullcrap. So I rewrote it. No, it does not use Google search technology. Like they have a patent for using the Arial font on search result pages anyway.
Dan
parents:
256
diff
changeset
|
2908 |
function footer($simple = false) |
1 | 2909 |
{ |
2910 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2911 |
global $lang; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2912 |
|
1 | 2913 |
if(!$this->no_headers) { |
2914 |
global $_starttime; |
|
91 | 2915 |
|
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2916 |
$filename = ( $simple ) ? 'simple-footer.tpl' : 'footer.tpl'; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2917 |
$t = $this->process_template($filename); |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2918 |
|
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2919 |
$f = microtime_float(); |
1 | 2920 |
$f = $f - $_starttime; |
2921 |
$f = round($f, 4); |
|
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2922 |
|
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2923 |
if ( is_object($lang) ) |
98
6457a9b983c6
Fixed non-object reference in databaseless template, added locking for Javascript paginator, made comments on AES key size more clear in constants, and disallowed "anonymous" and IP addresses for admin username in install.php; Loch Ness release candidate
Dan
parents:
91
diff
changeset
|
2924 |
{ |
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2925 |
$t_loc = $lang->get('page_msg_stats_gentime_short', array('time' => $f)); |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2926 |
$t_loc_long = $lang->get('page_msg_stats_gentime_long', array('time' => $f)); |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2927 |
$q_loc = '<a href="' . $this->tpl_strings['REPORT_URI'] . '">' . $lang->get('page_msg_stats_sql', array('nq' => ( is_object($db) ? $db->num_queries : 'N/A' ))) . '</a>'; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2928 |
$dbg = $t_loc; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2929 |
$dbg_long = $t_loc_long; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2930 |
if ( $session->user_level >= USER_LEVEL_ADMIN ) |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2931 |
{ |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2932 |
$dbg .= " | $q_loc"; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2933 |
$dbg_long .= " | $q_loc"; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2934 |
} |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2935 |
$t = str_replace('[[EnanoPoweredLink]]', $lang->get('page_enano_powered', array('about_uri' => $this->tpl_strings['URL_ABOUT_ENANO'])), $t); |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2936 |
$t = str_replace('[[EnanoPoweredLinkLong]]', $lang->get('page_enano_powered_long', array('about_uri' => $this->tpl_strings['URL_ABOUT_ENANO'])), $t); |
98
6457a9b983c6
Fixed non-object reference in databaseless template, added locking for Javascript paginator, made comments on AES key size more clear in constants, and disallowed "anonymous" and IP addresses for admin username in install.php; Loch Ness release candidate
Dan
parents:
91
diff
changeset
|
2937 |
} |
6457a9b983c6
Fixed non-object reference in databaseless template, added locking for Javascript paginator, made comments on AES key size more clear in constants, and disallowed "anonymous" and IP addresses for admin username in install.php; Loch Ness release candidate
Dan
parents:
91
diff
changeset
|
2938 |
else |
6457a9b983c6
Fixed non-object reference in databaseless template, added locking for Javascript paginator, made comments on AES key size more clear in constants, and disallowed "anonymous" and IP addresses for admin username in install.php; Loch Ness release candidate
Dan
parents:
91
diff
changeset
|
2939 |
{ |
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2940 |
$t_loc = "Time: {$f}s"; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2941 |
$t_loc_long = "Generated in {$f}sec"; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2942 |
$q_loc = '<a href="' . $this->tpl_strings['REPORT_URI'] . '">' . ( is_object($db) ? "{$db->num_queries} SQL" : 'Queries: N/A' ) . '</a>'; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2943 |
$dbg = $t_loc; |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2944 |
$dbg_long = $t_loc_long; |
484
340c81fdd350
Fixed session validation bug in upgrade script; fixed non-object reference in template_nodb
Dan
parents:
472
diff
changeset
|
2945 |
if ( is_object($session) ) |
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2946 |
{ |
484
340c81fdd350
Fixed session validation bug in upgrade script; fixed non-object reference in template_nodb
Dan
parents:
472
diff
changeset
|
2947 |
if ( $session->user_level >= USER_LEVEL_ADMIN ) |
340c81fdd350
Fixed session validation bug in upgrade script; fixed non-object reference in template_nodb
Dan
parents:
472
diff
changeset
|
2948 |
{ |
340c81fdd350
Fixed session validation bug in upgrade script; fixed non-object reference in template_nodb
Dan
parents:
472
diff
changeset
|
2949 |
$dbg .= " | $q_loc"; |
340c81fdd350
Fixed session validation bug in upgrade script; fixed non-object reference in template_nodb
Dan
parents:
472
diff
changeset
|
2950 |
$dbg_long .= " | $q_loc"; |
340c81fdd350
Fixed session validation bug in upgrade script; fixed non-object reference in template_nodb
Dan
parents:
472
diff
changeset
|
2951 |
} |
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2952 |
} |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2953 |
$t = str_replace('[[EnanoPoweredLink]]', 'Powered by <a href="http://enanocms.org/" onclick="window.open(this.href); return false;">Enano</a>', $t); |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2954 |
$t = str_replace('[[EnanoPoweredLinkLong]]', 'Website engine powered by <a href="http://enanocms.org/" onclick="window.open(this.href); return false;">Enano</a>', $t); |
98
6457a9b983c6
Fixed non-object reference in databaseless template, added locking for Javascript paginator, made comments on AES key size more clear in constants, and disallowed "anonymous" and IP addresses for admin username in install.php; Loch Ness release candidate
Dan
parents:
91
diff
changeset
|
2955 |
} |
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2956 |
|
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2957 |
$t = str_replace('[[Stats]]', $dbg, $t); |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2958 |
$t = str_replace('[[StatsLong]]', $dbg_long, $t); |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2959 |
$t = str_replace('[[NumQueries]]', ( is_object($db) ? (string)$db->num_queries : '0' ), $t); |
91 | 2960 |
$t = str_replace('[[GenTime]]', (string)$f, $t); |
391
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2961 |
$t = str_replace('[[NumQueriesLoc]]', $q_loc, $t); |
85f91037cd4f
Localization is FINISHED, DAMN IT HELLAH YEAH! OVER WITH! Man, it feels to get that off my chest. Release is in under 48 hours, folks. And we're ready for it.
Dan
parents:
389
diff
changeset
|
2962 |
$t = str_replace('[[GenTimeLoc]]', $t_loc, $t); |
91 | 2963 |
|
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2964 |
if ( defined('ENANO_DEBUG') ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2965 |
$t = str_replace('</body>', '<div id="profile" style="margin: 10px;">' . profiler_make_html() . '</div></body>', $t); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2966 |
|
1 | 2967 |
echo $t; |
2968 |
} |
|
2969 |
else return ''; |
|
2970 |
} |
|
2971 |
function getHeader() |
|
2972 |
{ |
|
2973 |
if(!$this->no_headers) return $this->process_template('header.tpl'); |
|
2974 |
else return ''; |
|
2975 |
} |
|
2976 |
function getFooter() |
|
2977 |
{ |
|
2978 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
2979 |
if(!$this->no_headers) { |
|
2980 |
global $_starttime; |
|
2981 |
$f = microtime(true); |
|
2982 |
$f = $f - $_starttime; |
|
2983 |
$f = round($f, 4); |
|
2984 |
if(defined('IN_ENANO_INSTALL')) $nq = 'N/A'; |
|
2985 |
else $nq = $db->num_queries; |
|
2986 |
if($nq == 0) $nq = 'N/A'; |
|
2987 |
$dbg = 'Time: '.$f.'s | Queries: '.$nq; |
|
2988 |
if($nq == 0) $nq = 'N/A'; |
|
2989 |
$t = $this->process_template('footer.tpl'); |
|
2990 |
$t = str_replace('[[Stats]]', $dbg, $t); |
|
2991 |
return $t; |
|
2992 |
} |
|
2993 |
else return ''; |
|
2994 |
} |
|
2995 |
||
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2996 |
function process_template($file) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2997 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2998 |
$compiled = $this->compile_template($file); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
2999 |
$result = eval($compiled); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3000 |
return $result; |
1 | 3001 |
} |
3002 |
||
3003 |
function extract_vars($file) { |
|
3004 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
3005 |
if(!is_file(ENANO_ROOT . '/themes/'.$this->theme.'/'.$file)) die('Cannot find '.$file.' file for style "'.$this->theme.'", exiting'); |
|
3006 |
$text = file_get_contents(ENANO_ROOT . '/themes/'.$this->theme.'/'.$file); |
|
3007 |
preg_match_all('#<\!-- VAR ([A-z0-9_-]*) -->(.*?)<\!-- ENDVAR \\1 -->#is', $text, $matches); |
|
3008 |
$tplvars = Array(); |
|
3009 |
for($i=0;$i<sizeof($matches[1]);$i++) |
|
3010 |
{ |
|
3011 |
$tplvars[$matches[1][$i]] = $matches[2][$i]; |
|
3012 |
} |
|
3013 |
return $tplvars; |
|
3014 |
} |
|
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3015 |
function compile_template($text) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3016 |
{ |
1 | 3017 |
$text = file_get_contents(ENANO_ROOT . '/themes/'.$this->theme.'/'.$text); |
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3018 |
return $this->compile_template_text_post(template_compiler_core($text)); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3019 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3020 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3021 |
function compile_template_text($text) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3022 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3023 |
return $this->compile_template_text_post(template_compiler_core($text)); |
1 | 3024 |
} |
3025 |
||
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3026 |
/** |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3027 |
* Post-processor for template code. Basically what this does is it localizes {lang:foo} blocks. |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3028 |
* @param string Mostly-processed TPL code |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3029 |
* @return string |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3030 |
*/ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3031 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3032 |
function compile_template_text_post($text) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3033 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3034 |
global $lang; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3035 |
preg_match_all('/\{lang:([a-z0-9]+_[a-z0-9_]+)\}/', $text, $matches); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3036 |
foreach ( $matches[1] as $i => $string_id ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3037 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3038 |
if ( is_object(@$lang) ) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3039 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3040 |
$string = $lang->get($string_id); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3041 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3042 |
else |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3043 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3044 |
$string = '[language not loaded]'; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3045 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3046 |
$string = str_replace('\\', '\\\\', $string); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3047 |
$string = str_replace('\'', '\\\'', $string); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3048 |
$text = str_replace_once($matches[0][$i], $string, $text); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3049 |
} |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3050 |
return $text; |
1 | 3051 |
} |
3052 |
||
3053 |
/** |
|
3054 |
* Allows individual parsing of template files. Similar to phpBB but follows the spirit of object-oriented programming ;) |
|
3055 |
* Returns on object of class templateIndividual. Usage instructions can be found in the inline docs for that class. |
|
3056 |
* @param $filename the filename of the template to be parsed |
|
3057 |
* @return object |
|
3058 |
*/ |
|
3059 |
||
3060 |
function makeParser($filename) |
|
3061 |
{ |
|
3062 |
$filename = ENANO_ROOT.'/themes/'.$this->theme.'/'.$filename; |
|
3063 |
if(!file_exists($filename)) die('templateIndividual: file '.$filename.' does not exist'); |
|
3064 |
$code = file_get_contents($filename); |
|
3065 |
$parser = new templateIndividualSafe($code, $this); |
|
3066 |
return $parser; |
|
3067 |
} |
|
3068 |
||
3069 |
/** |
|
3070 |
* Same as $template->makeParser(), but takes a string instead of a filename. |
|
3071 |
* @param $text the text to parse |
|
3072 |
* @return object |
|
3073 |
*/ |
|
3074 |
||
3075 |
function makeParserText($code) |
|
3076 |
{ |
|
3077 |
$parser = new templateIndividualSafe($code, $this); |
|
3078 |
return $parser; |
|
3079 |
} |
|
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3080 |
|
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3081 |
/** |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3082 |
* Assigns an array of string values to the template. Strings can be accessed from the template by inserting {KEY_NAME} in the template file. |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3083 |
* @param $vars array |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3084 |
*/ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3085 |
function assign_vars($vars) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3086 |
{ |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3087 |
if(is_array($this->tpl_strings)) |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3088 |
$this->tpl_strings = array_merge($this->tpl_strings, $vars); |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3089 |
else |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3090 |
$this->tpl_strings = $vars; |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3091 |
} |
1 | 3092 |
|
3093 |
} // class template_nodb |
|
3094 |
||
3095 |
/** |
|
3096 |
* Identical to templateIndividual, except extends template_nodb instead of template |
|
3097 |
* @see class template |
|
3098 |
*/ |
|
3099 |
||
533
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3100 |
class templateIndividualSafe extends template_nodb |
698a8f04957c
Huge improvements to the template_nodb class and surrounding code; moved template compiler core to its own non-classed function to allow code re-use
Dan
parents:
526
diff
changeset
|
3101 |
{ |
1 | 3102 |
var $tpl_strings, $tpl_bool, $tpl_code; |
3103 |
var $compiled = false; |
|
3104 |
/** |
|
3105 |
* Constructor. |
|
3106 |
*/ |
|
3107 |
function __construct($text, $parent) |
|
3108 |
{ |
|
3109 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
3110 |
$this->tpl_code = $text; |
|
3111 |
$this->tpl_strings = $parent->tpl_strings; |
|
3112 |
$this->tpl_bool = $parent->tpl_bool; |
|
3113 |
} |
|
3114 |
/** |
|
3115 |
* PHP 4 constructor. |
|
3116 |
*/ |
|
3117 |
function templateIndividual($text) |
|
3118 |
{ |
|
3119 |
$this->__construct($text); |
|
3120 |
} |
|
3121 |
/** |
|
3122 |
* Assigns an array of string values to the template. Strings can be accessed from the template by inserting {KEY_NAME} in the template file. |
|
3123 |
* @param $vars array |
|
3124 |
*/ |
|
3125 |
function assign_vars($vars) |
|
3126 |
{ |
|
3127 |
if(is_array($this->tpl_strings)) |
|
3128 |
$this->tpl_strings = array_merge($this->tpl_strings, $vars); |
|
3129 |
else |
|
3130 |
$this->tpl_strings = $vars; |
|
3131 |
} |
|
3132 |
/** |
|
3133 |
* Assigns an array of boolean values to the template. These can be used for <!-- IF ... --> statements. |
|
3134 |
* @param $vars array |
|
3135 |
*/ |
|
3136 |
function assign_bool($vars) |
|
3137 |
{ |
|
3138 |
$this->tpl_bool = array_merge($this->tpl_bool, $vars); |
|
3139 |
} |
|
3140 |
/** |
|
3141 |
* Compiles and executes the template code. |
|
3142 |
* @return string |
|
3143 |
*/ |
|
3144 |
function run() |
|
3145 |
{ |
|
3146 |
global $db, $session, $paths, $template, $plugins; // Common objects |
|
3147 |
if(!$this->compiled) |
|
3148 |
{ |
|
3149 |
$this->tpl_code = $this->compile_template_text($this->tpl_code); |
|
3150 |
$this->compiled = true; |
|
3151 |
} |
|
3152 |
return eval($this->tpl_code); |
|
3153 |
} |
|
3154 |
} |
|
3155 |
||
3156 |
?> |