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

equal deleted inserted replaced

-:40105681f495
+:663fcf528726
 <?php
 /*
 * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
-* Version 1.0 release candidate 3 (Druid)
+* Version 1.0 (Banshee)
 * pageprocess.php - intelligent retrieval of pages
 * Copyright (C) 2006-2007 Dan Fuhry
 *
 * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
 var $page_id;
 var $namespace;
 /**
+* The revision ID (history entry) to send. If set to 0 (the default) then the most recent revision will be sent.
+* @var int
+*/
+var $revision_id = 0;
+/**
 * Unsanitized page ID.
 * @var string
 */
 var $page_id_unclean;
 * Debugging information to track errors. You can set enable to false to disable sending debug information.
 * @var array
 */
 var $debug = array(
-'enable' => true,
+'enable' => false,
 'works'  => false
 );
 /**
 * Constructor.
 * @param string The page ID (urlname) of the page
 * @param string The namespace of the page
-*/
+* @param int Optional. The revision ID to send.
+*/
-function __construct( $page_id, $namespace )
+function __construct( $page_id, $namespace, $revision_id = 0 )
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 // See if we can get some debug info
 if ( function_exists('debug_backtrace') && $this->debug['enable'] )
 if ( !isset($paths->nslist[$namespace]) )
 {
 $this->send_error('The namespace "' . htmlspecialchars($namespace) . '" does not exist.');
 }
-$this->_setup( $page_id, $namespace );
+if ( !is_int($revision_id) )
+$revision_id = 0;
+$this->_setup( $page_id, $namespace, $revision_id );
 }
 /**
 * The main method to send the page content. Also responsible for checking permissions.
 }
 }
 else // (disabled for compatibility reasons) if ( in_array($this->namespace, array('Article', 'User', 'Project', 'Help', 'File', 'Category')) && $this->page_exists )
 {
 // Send as regular page
+// die($this->page_id);
 $text = $this->fetch_text();
 if ( $text == 'err_no_text_rows' )
 {
 $this->err_no_rows();
 return false;
 /**
 * Sets internal variables.
 * @access private
 */
-function _setup($page_id, $namespace)
+function _setup($page_id, $namespace, $revision_id)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $page_id_cleaned = sanitize_page_id($page_id);
 $this->page_id = $page_id_cleaned;
 $this->namespace = $namespace;
+$this->revision_id = $revision_id;
 $this->page_id_unclean = dirtify_page_id($page_id);
 $this->perms = $session->fetch_page_acl( $page_id, $namespace );
 // Exception for Admin: pages
 }
 else
 {
 $this->page_exists = true;
 }
+// Compatibility with older databases
+if ( strstr($this->page_id, '.2e') && !$this->page_exists )
+{
+$page_id = str_replace('.2e', '.', $page_id);
+if ( $paths->cpage['urlname_nons'] == $page_id && $paths->namespace == $namespace && !$paths->page_exists && ( $this->namespace != 'Admin' || ($this->namespace == 'Admin' && !function_exists($fname) ) ) )
+{
+$this->page_exists = false;
+}
+else if ( !isset( $paths->pages[ $paths->nslist[$namespace] . $page_id ] ) && ( $this->namespace == 'Admin' && !function_exists($fname) ) )
+{
+$this->page_exists = false;
+}
+else
+{
+$this->page_exists = true;
+}
+}
 }
 /**
 * Renders it all in one go, and echoes it out. This assumes that the text is in the DB.
 * @access private
 function render()
 {
 $text = $this->fetch_text();
 $this->header();
-if ( $this->send_headers )
+// if ( $this->send_headers )
-{
+// {
 display_page_headers();
+// }
+if ( $this->revision_id )
+{
+echo '<div class="info-box" style="margin-left: 0; margin-top: 5px;"><b>Notice:</b><br />The page you are viewing was archived on '.date('F d, Y \a\t h:i a', $this->revision_id).'.<br /><a href="'.makeUrlNS($this->namespace, $this->page_id).'" onclick="ajaxReset(); return false;">View current version</a>  |  <a href="'.makeUrlNS($this->namespace, $this->pageid, 'do=rollback&amp;id='.$this->revision_id).'" onclick="ajaxRollback(\''.$this->revision_id.'\')">Restore this version</a></div><br />';
 }
 $text = '?>' . RenderMan::render($text);
 // echo('<pre>'.htmlspecialchars($text).'</pre>');
 eval ( $text );
-if ( $this->send_headers )
+// if ( $this->send_headers )
-{
+// {
 display_page_footers();
-}
+// }
 $this->footer();
 }
 /**
 if ( !empty($this->text_cache) )
 {
 return $this->text_cache;
 }
-$q = $db->sql_query('SELECT page_text, char_tag FROM '.table_prefix.'page_text WHERE page_id=\'' . $this->page_id . '\' AND namespace=\'' . $this->namespace . '\';');
+if ( $this->revision_id > 0 && is_int($this->revision_id) )
-if ( !$q )
+{
-{
-$this->send_error('Error during SQL query.', true);
+$q = $db->sql_query('SELECT page_text, char_tag, date_string FROM '.table_prefix.'logs WHERE page_id=\'' . $this->page_id . '\' AND namespace=\'' . $this->namespace . '\' AND time_id=' . $this->revision_id . ';');
-}
+if ( !$q )
-if ( $db->numrows() < 1 )
+{
-{
+$this->send_error('Error during SQL query.', true);
-$this->page_exists = false;
+}
-return 'err_no_text_rows';
+if ( $db->numrows() < 1 )
-}
+{
+// Compatibility fix for old pages with dots in the page ID
-$row = $db->fetchrow();
+if ( strstr($this->page_id, '.2e') )
-$db->free_result();
+{
+$db->free_result();
+$page_id = str_replace('.2e', '.', $this->page_id);
+$q = $db->sql_query('SELECT page_text, char_tag, date_string FROM '.table_prefix.'logs WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $this->namespace . '\' AND time_id=' . $this->revision_id . ';');
+if ( !$q )
+{
+$this->send_error('Error during SQL query.', true);
+}
+if ( $db->numrows() < 1 )
+{
+$this->page_exists = false;
+return 'err_no_text_rows';
+}
+}
+else
+{
+$this->page_exists = false;
+return 'err_no_text_rows';
+}
+}
+else
+{
+$row = $db->fetchrow();
+}
+$db->free_result();
+}
+else
+{
+$q = $db->sql_query('SELECT page_text, char_tag FROM '.table_prefix.'page_text WHERE page_id=\'' . $this->page_id . '\' AND namespace=\'' . $this->namespace . '\';');
+if ( !$q )
+{
+$this->send_error('Error during SQL query.', true);
+}
+if ( $db->numrows() < 1 )
+{
+// Compatibility fix for old pages with dots in the page ID
+if ( strstr($this->page_id, '.2e') )
+{
+$db->free_result();
+$page_id = str_replace('.2e', '.', $this->page_id);
+$q = $db->sql_query('SELECT page_text, char_tag FROM '.table_prefix.'page_text WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $this->namespace . '\';');
+if ( !$q )
+{
+$this->send_error('Error during SQL query.', true);
+}
+if ( $db->numrows() < 1 )
+{
+$this->page_exists = false;
+return 'err_no_text_rows';
+}
+}
+else
+{
+$this->page_exists = false;
+return 'err_no_text_rows';
+}
+}
+$row = $db->fetchrow();
+$db->free_result();
+}
 if ( !empty($row['char_tag']) )
 {
 // This page text entry uses the old text-escaping format
 $from = array(
 $template->tpl_strings['PAGE_NAME'] = htmlspecialchars($page_name);
 $this->header();
-if ( $send_headers )
+// if ( $send_headers )
-{
+// {
 display_page_headers();
-}
+// }
-/*
 // Start left sidebar: basic user info, latest comments
 echo '<table border="0" cellspacing="4" cellpadding="0" style="width: 100%;">';
 echo '<tr><td style="width: 150px;">';
 echo '  </table>
 </div>';
 echo '</td><td>';
-*/
 // User's own content
 $send_headers = $this->send_headers;
 $this->send_headers = false;
 }
 else
 {
 $this->err_page_not_existent();
 }
-/*
 // Right sidebar
 echo '</td><td style="width: 150px;">';
 echo '  </table>
 </div>';
 echo '</tr></table>';
-if ( $send_headers )
+// if ( $send_headers )
-{
+// {
 display_page_footers();
-}
+// }
-*/
 $this->send_headers = $send_headers;
 unset($send_headers);
 $this->footer();
 /**
 * PHP 4 constructor.
 * @see PageProcessor::__construct()
 */
-function PageProcessor( $page_id, $namespace )
+function PageProcessor( $page_id, $namespace, $revision_id = 0 )
 {
-$this->__construct($page_id, $namespace);
+$this->__construct($page_id, $namespace, $revision_id);
 }
 /**
-* Send an error message and die
+* Send an error message and die. For debugging or critical technical errors only - nothing that would under normal circumstances be shown to the user.
 * @var string Error message
 * @var bool If true, send DBAL's debugging information as well
 */
 function send_error($message, $sql = false)

changeset 21	663fcf528726
parent 16	64e0d3d4cf14
child 22	d0314575e2f0