diff -r 4629ad98ee88 -r 9cdfe82c56cd includes/functions.php
--- a/includes/functions.php Sat Jan 03 17:54:26 2009 -0500
+++ b/includes/functions.php Sat Jan 03 18:11:18 2009 -0500
@@ -277,7 +277,7 @@
{
$logged_in = true;
}
- return $logged_in ? getConfig('main_page_alt', getConfig('main_page')) : getConfig('main_page');
+ return $logged_in && getConfig('main_page_alt_enable', '0') == '1' ? getConfig('main_page_alt', getConfig('main_page')) : getConfig('main_page');
}
/**
@@ -523,10 +523,10 @@
function csrf_request_confirm()
{
global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
+ global $lang, $output;
// If the token was overridden with the correct one, the user confirmed the action using this form. Continue exec.
- if ( isset($_POST['cstok']) || isset($_GET ['cstok']) )
+ if ( isset($_POST['cstok']) || isset($_GET['cstok']) )
{
// using the if() check makes sure that the token isn't in a cookie, since $_REQUEST includes $_COOKIE.
$token_check =& $_REQUEST['cstok'];
@@ -537,8 +537,8 @@
}
}
- $template->tpl_strings['PAGE_NAME'] = htmlspecialchars($lang->get('user_csrf_confirm_title'));
- $template->header();
+ $output->set_title($lang->get('user_csrf_confirm_title'));
+ $output->header();
// initial info
echo '
' . $lang->get('user_csrf_confirm_body') . '
';
@@ -564,9 +564,9 @@
// insert the right CSRF token
echo '';
echo '';
- echo '';
+ echo '';
- $template->footer();
+ $output->footer();
exit;
}
@@ -638,6 +638,35 @@
}
/**
+ * Returns the appropriate Namespace_* object for a page.
+ * @param string Page ID
+ * @param string Namespace
+ * @param int Revision ID
+ */
+
+function namespace_factory($page_id, $namespace, $revision_id = 0)
+{
+ if ( !class_exists("Namespace_$namespace") )
+ {
+ if ( file_exists(ENANO_ROOT . "/includes/namespaces/" . strtolower($namespace) . ".php") )
+ {
+ require(ENANO_ROOT . "/includes/namespaces/" . strtolower($namespace) . ".php");
+ }
+ }
+ if ( class_exists("Namespace_$namespace") )
+ {
+ $class = "Namespace_$namespace";
+ $ns = new $class($page_id, $namespace, $revision_id);
+ return $ns;
+ }
+ else
+ {
+ $ns = new Namespace_Default($page_id, $namespace, $revision_id);
+ return $ns;
+ }
+}
+
+/**
* These are some old functions that were used with the Midget codebase. They are deprecated and should not be used any more.
*/
@@ -683,22 +712,10 @@
}
function arrayItemBottom($arr, $keyname) {
- $keylist = array_keys($arr);
- $keyflop = array_flip($keylist);
- $idx = $keyflop[$keyname];
- $sz = sizeof($arr); $sz--;
- while( $orig != $arr[$keylist[$sz]] ) {
- // echo 'Keyname: '.$keylist[$idx] . ' '; flush(); ob_flush(); // Debugger
- if($idx > $sz) return $arr;
- if($keylist[$idx] == '' || $keylist[$idx] < 0 || !$keylist[$idx]) {
- echo 'Infinite loop caught in arrayItemBottom(
';
- print_r($arr);
- echo '
, '.$keyname.');
EnanoCMS: Critical error during function call, exiting to prevent excessive server load.';
- exit;
- }
- $arr = arrayItemDown($arr, $keylist[$idx]);
- $idx++;
- }
+ $b = $arr[$keyname];
+ unset($arr[$keyname]);
+ $arr[$keyname] = $b;
+ unset($b);
return $arr;
}
@@ -822,18 +839,11 @@
exit;
}
- $theme = ( defined('ENANO_CONFIG_FETCHED') ) ? getConfig('theme_default') : 'oxygen';
- $style = ( defined('ENANO_CONFIG_FETCHED') ) ? '__foo__' : 'bleu';
-
- $tpl = new template_nodb();
- $tpl->load_theme($theme, $style);
- $tpl->tpl_strings['SITE_NAME'] = getConfig('site_name');
- $tpl->tpl_strings['SITE_DESC'] = getConfig('site_desc');
- $tpl->tpl_strings['COPYRIGHT'] = getConfig('copyright_notice');
- $tpl->tpl_strings['PAGE_NAME'] = $t;
- $tpl->header();
+ $output = new Output_Safe();
+ $output->set_title($t);
+ $output->header();
echo $p;
- $tpl->footer();
+ $output->footer();
exit;
}
@@ -918,169 +928,7 @@
function show_category_info()
{
- global $db, $session, $paths, $template, $plugins; // Common objects
- global $lang;
-
- if ( $paths->namespace == 'Category' )
- {
- // Show member pages and subcategories
- $q = $db->sql_query('SELECT p.urlname, p.namespace, p.name, p.namespace=\'Category\' AS is_category FROM '.table_prefix.'categories AS c
- LEFT JOIN '.table_prefix.'pages AS p
- ON ( p.urlname = c.page_id AND p.namespace = c.namespace )
- WHERE c.category_id=\'' . $db->escape($paths->page_id) . '\'
- ORDER BY is_category DESC, p.name ASC;');
- if ( !$q )
- {
- $db->_die();
- }
- echo '