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

equal deleted inserted replaced

-:d52dfa1f08da
+:323c4cd1aa37
 profiler_log('PageProcessor: send() called');
 if ( !$this->perms->get_permissions('read') )
 {
-if ( $this->send_headers )
-{
-$template->init_vars($this);
-}
 // Permission denied to read page. Is this one of our core pages that must always be allowed?
 // NOTE: Not even the administration panel will work if ACLs deny access to it.
 if ( $this->namespace == 'Special' && in_array($this->page_id, array('Login', 'Logout', 'LangExportJSON', 'CSS')) )
 {
 // Do nothing; allow execution to continue
 $pathskey = $paths->nslist[ $this->namespace ] . $this->page_id;
 $strict_no_headers = false;
 $admin_fail = false;
 if ( $this->namespace == 'Admin' && strstr($this->page_id, '/') )
 {
-if ( $this->send_headers )
-{
-$template->init_vars($this);
-}
 $this->page_id = substr($this->page_id, 0, strpos($this->page_id, '/'));
 $funcname = "page_{$this->namespace}_{$this->page_id}";
 if ( function_exists($funcname) )
 {
 $this->page_exists = true;
 }
 }
 if ( isPage($pathskey) )
 {
-if ( $this->send_headers )
+$cdata = $this->ns->get_cdata();
-{
-$template->init_vars($this);
+if ( $cdata['special'] == 1 )
-}
-if ( $paths->pages[$pathskey]['special'] == 1 )
 {
 $this->send_headers = false;
 $strict_no_headers = true;
 $GLOBALS['output'] = new Output_Naked();
 }
-if ( isset($paths->pages[$pathskey]['password']) )
+if ( isset($cdata['password']) )
 {
-if ( $paths->pages[$pathskey]['password'] != '' && $paths->pages[$pathskey]['password'] != sha1('') )
+if ( $cdata['password'] != '' && $cdata['password'] != sha1('') )
 {
-$password =& $paths->pages[$pathskey]['password'];
+$password =& $cdata['password'];
 if ( $this->password != $password )
 {
 $this->err_wrong_password();
 return false;
 }
 }
 }
-if ( isset($paths->pages[$pathskey]['require_admin']) && $paths->pages[$pathskey]['require_admin'] )
+if ( isset($cdata['require_admin']) && $cdata['require_admin'] )
 {
 if ( $session->auth_level < USER_LEVEL_ADMIN )
 {
 $admin_fail = true;
 }
 doStats($this->page_id, $this->namespace);
 }
 // We are all done. Ship off the page.
-if ( $this->send_headers )
-{
-$template->init_vars($this);
-}
 $this->ns->send();
 }
 /**
 * Sends the page through by fetching it from the database.
 }
 if ( !$this->page_exists )
 {
 return '';
 }
-$pathskey = $paths->nslist[ $this->namespace ] . $this->page_id;
+$cdata = $this->ns->get_cdata();
-if ( isPage($pathskey) )
+if ( isset($cdata['password']) )
 {
-if ( isset($paths->pages[$pathskey]['password']) )
+if ( $cdata['password'] != sha1('') && $cdata['password'] !== $this->password && !empty($cdata['password']) )
 {
-if ( $paths->pages[$pathskey]['password'] != sha1('') && $paths->pages[$pathskey]['password'] !== $this->password && !empty($paths->pages[$pathskey]['password']) )
+return false;
-{
-return false;
-}
 }
 }
 return $this->fetch_text();
 }
 $this->raise_error($db->get_error());
 return false;
 }
 // Set page_format
-$pathskey = $paths->nslist[ $this->namespace ] . $this->page_id;
 // Using @ due to warning thrown when saving new page
-if ( @$paths->pages[ $pathskey ]['page_format'] !== $page_format )
+$cdata = $this->ns->get_cdata();
+if ( @$cdata['page_format'] !== $page_format )
 {
 // Note: no SQL injection to worry about here. Everything that goes into this is sanitized already, barring some rogue plugin.
 // (and if there's a rogue plugin running, we have bigger things to worry about anyway.)
 if ( !$db->sql_query('UPDATE ' . table_prefix . "pages SET page_format = '$page_format' WHERE urlname = '$this->page_id' AND namespace = '$this->namespace';") )
 {
 'error' => 'invalid_parameter'
 );
 }
 // Retrieve page metadata
-$pathskey = $paths->nslist[ $this->namespace ] . $this->page_id;
+$metadata = $this->ns->get_cdata();
-if ( !isPage($pathskey) )
-{
-return array(
-'success' => false,
-'error' => 'page_metadata_not_found'
-);
-}
-$metadata =& $paths->pages[$pathskey];
 // Log the action
 $username = $db->escape($session->username);
 $time = time();
 $existing_protection = intval($metadata['protected']);
 {
 $stack = array_reverse($this->redirect_stack);
 foreach ( $stack as $oldtarget )
 {
 $url = makeUrlNS($oldtarget[1], $oldtarget[0], 'redirect=no', true);
-$page_id_key = $paths->nslist[ $oldtarget[1] ] . $oldtarget[0];
+$page_data = $this->ns->get_cdata();
-$page_data = $paths->pages[$page_id_key];
 $title = ( isset($page_data['name']) ) ? $page_data['name'] : $paths->nslist[$oldtarget[1]] . htmlspecialchars( str_replace('_', ' ', dirtify_page_id( $oldtarget[0] ) ) );
 $a = '<a href="' . $url . '">' . $title . '</a>';
 $output->add_after_header('<small>' . $lang->get('page_msg_redirected_from', array('from' => $a)) . '<br /></small>');
 }
 }
 {
 $stack = array_reverse($this->redirect_stack);
 foreach ( $stack as $oldtarget )
 {
 $url = makeUrlNS($oldtarget[1], $oldtarget[0], 'redirect=no', true);
-$page_id_key = $paths->nslist[ $oldtarget[1] ] . $oldtarget[0];
+$old_page = namespace_factory($oldtarget[0], $oldtarget[1]);
-$page_data = $paths->pages[$page_id_key];
+$page_data = $old_page->get_cdata();
 $title = ( isset($page_data['name']) ) ? $page_data['name'] : $paths->nslist[$oldtarget[1]] . htmlspecialchars( str_replace('_', ' ', dirtify_page_id( $oldtarget[0] ) ) );
 $a = '<a href="' . $url . '">' . $title . '</a>';
 $url = makeUrlNS($this->namespace, $this->page_id, 'redirect=no', true);
-$page_id_key = $paths->nslist[ $this->namespace ] . $this->page_id;
+$page_data = $this->ns->get_cdata();
-$page_data = $paths->pages[$page_id_key];
 $title = ( isset($page_data['name']) ) ? $page_data['name'] : $paths->nslist[$this->namespace] . htmlspecialchars( str_replace('_', ' ', dirtify_page_id( $this->page_id ) ) );
 $b = '<a href="' . $url . '">' . $title . '</a>';
 $ob .= '<small>' . $lang->get('page_msg_redirected_from_to', array('from' => $a, 'to' => $b)) . '<br /></small>';
 }

changeset 953	323c4cd1aa37
parent 935	9e124177c9a4
child 963	b572ce1114f1