Enano CMS (1.1.x): comparison index.php

equal deleted inserted replaced

-:474f8be55943
+:ab66d6d1f1f4
 // Set up gzip encoding before any output is sent
 $aggressive_optimize_html = false;
 global $do_gzip;
-$do_gzip = true;
+$do_gzip = false;
 if(isset($_SERVER['PATH_INFO'])) $v = $_SERVER['PATH_INFO'];
 elseif(isset($_GET['title'])) $v = $_GET['title'];
 else $v = '';
 die_friendly('Invalid action', '<p>The action "'.htmlspecialchars($_GET['do']).'" is not defined. Return to <a href="'.makeUrl($paths->page).'">viewing this page\'s text</a>.</p>');
 break;
 case 'view':
 // echo PageUtils::getpage($paths->page, true, ( (isset($_GET['oldid'])) ? $_GET['oldid'] : false ));
 $rev_id = ( (isset($_GET['oldid'])) ? intval($_GET['oldid']) : 0 );
-$page = new PageProcessor( $paths->cpage['urlname_nons'], $paths->namespace, $rev_id );
+$page = new PageProcessor( $paths->page_id, $paths->namespace, $rev_id );
 $page->send_headers = true;
 $pagepass = ( isset($_REQUEST['pagepass']) ) ? sha1($_REQUEST['pagepass']) : '';
 $page->password = $pagepass;
 $page->send(true);
 break;
 {
 case 'admin':
 default:
 $act = ( isset ($_GET['action']) ) ? $_GET['action'] : false;
 $id = ( isset ($_GET['id']) ) ? intval($_GET['id']) : -1;
-echo PageUtils::comments_html($paths->cpage['urlname_nons'], $paths->namespace, $act, Array('id'=>$id));
+echo PageUtils::comments_html($paths->page_id, $paths->namespace, $act, Array('id'=>$id));
 break;
 case 'postcomment':
 if(empty($_POST['name']) ||
 empty($_POST['subj']) ||
 empty($_POST['text'])
 ) { echo 'Invalid request'; break; }
 $cid = ( isset($_POST['captcha_id']) ) ? $_POST['captcha_id'] : false;
 $cin = ( isset($_POST['captcha_input']) ) ? $_POST['captcha_input'] : false;
-PageUtils::addcomment($paths->cpage['urlname_nons'], $paths->namespace, $_POST['name'], $_POST['subj'], $_POST['text'], $cin, $cid); // All filtering, etc. is handled inside this method
+PageUtils::addcomment($paths->page_id, $paths->namespace, $_POST['name'], $_POST['subj'], $_POST['text'], $cin, $cid); // All filtering, etc. is handled inside this method
-echo PageUtils::comments_html($paths->cpage['urlname_nons'], $paths->namespace);
+echo PageUtils::comments_html($paths->page_id, $paths->namespace);
 break;
 case 'editcomment':
 if(!isset($_GET['id']) || ( isset($_GET['id']) && !preg_match('#^([0-9]+)$#', $_GET['id']) )) { echo '<p>Invalid comment ID</p>'; break; }
 $q = $db->sql_query('SELECT subject,comment_data,comment_id FROM '.table_prefix.'comments WHERE comment_id='.$_GET['id']);
 if(!$q) $db->_die('The comment data could not be selected.');
 </table></div>";
 echo '</form>';
 break;
 case 'savecomment':
 if(empty($_POST['subj']) || empty($_POST['text'])) { echo '<p>Invalid request</p>'; break; }
-$r = PageUtils::savecomment_neater($paths->cpage['urlname_nons'], $paths->namespace, $_POST['subj'], $_POST['text'], (int)$_POST['id']);
+$r = PageUtils::savecomment_neater($paths->page_id, $paths->namespace, $_POST['subj'], $_POST['text'], (int)$_POST['id']);
 if($r != 'good') { echo "<pre>$r</pre>"; break; }
-echo PageUtils::comments_html($paths->cpage['urlname_nons'], $paths->namespace);
+echo PageUtils::comments_html($paths->page_id, $paths->namespace);
 break;
 case 'deletecomment':
 if(!empty($_GET['id']))
 {
-PageUtils::deletecomment_neater($paths->cpage['urlname_nons'], $paths->namespace, (int)$_GET['id']);
+PageUtils::deletecomment_neater($paths->page_id, $paths->namespace, (int)$_GET['id']);
 }
-echo PageUtils::comments_html($paths->cpage['urlname_nons'], $paths->namespace);
+echo PageUtils::comments_html($paths->page_id, $paths->namespace);
 break;
 }
 $template->footer();
 break;
 case 'edit':
 redirect(makeUrl($paths->page), '', '', 0);
 break;
 }
 if(isset($_POST['_save']))
 {
-$e = PageUtils::savepage($paths->cpage['urlname_nons'], $paths->namespace, $_POST['page_text'], $_POST['edit_summary'], isset($_POST['minor']));
+$e = PageUtils::savepage($paths->page_id, $paths->namespace, $_POST['page_text'], $_POST['edit_summary'], isset($_POST['minor']));
 if ( $e == 'good' )
 {
 redirect(makeUrl($paths->page), $lang->get('editor_msg_save_success_title'), $lang->get('editor_msg_save_success_body'), 3);
 }
 }
 }
 $template->footer();
 break;
 case 'viewsource':
 $template->header();
-$text = RenderMan::getPage($paths->cpage['urlname_nons'], $paths->namespace, 0, false, false, false, false);
+$text = RenderMan::getPage($paths->page_id, $paths->namespace, 0, false, false, false, false);
 echo '
 <form action="'.makeUrl($paths->page, 'do=edit').'" method="post">
 <br />
 <textarea readonly="readonly" name="page_text" rows="20" cols="60" style="width: 97%;">'.$text.'</textarea>';
 echo '<br />
 </form>
 ';
 $template->footer();
 break;
 case 'history':
-$hist = PageUtils::histlist($paths->cpage['urlname_nons'], $paths->namespace);
+$hist = PageUtils::histlist($paths->page_id, $paths->namespace);
 $template->header();
 echo $hist;
 $template->footer();
 break;
 case 'rollback':
 break;
 case 'catedit':
 if(isset($_POST['__enanoSaveButton']))
 {
 unset($_POST['__enanoSaveButton']);
-$val = PageUtils::catsave($paths->cpage['urlname_nons'], $paths->namespace, $_POST);
+$val = PageUtils::catsave($paths->page_id, $paths->namespace, $_POST);
 if($val == 'GOOD')
 {
 header('Location: '.makeUrl($paths->page)); echo '<html><head><title>Redirecting...</title></head><body>If you haven\'t been redirected yet, <a href="'.makeUrl($paths->page).'">click here</a>.'; break;
 } else {
 die_friendly('Error saving category information', '<p>'.$val.'</p>');
 elseif(isset($_POST['__enanoCatCancel']))
 {
 header('Location: '.makeUrl($paths->page)); echo '<html><head><title>Redirecting...</title></head><body>If you haven\'t been redirected yet, <a href="'.makeUrl($paths->page).'">click here</a>.'; break;
 }
 $template->header();
-$c = PageUtils::catedit_raw($paths->cpage['urlname_nons'], $paths->namespace);
+$c = PageUtils::catedit_raw($paths->page_id, $paths->namespace);
 echo $c[1];
 $template->footer();
 break;
 case 'moreoptions':
 $template->header();
 case 'protect':
 if (!isset($_REQUEST['level'])) die_friendly('Invalid request', '<p>No protection level specified</p>');
 if(!empty($_POST['reason']))
 {
 if(!preg_match('#^([0-2]*){1}$#', $_POST['level'])) die_friendly('Error protecting page', '<p>Request validation failed</p>');
-PageUtils::protect($paths->cpage['urlname_nons'], $paths->namespace, intval($_POST['level']), $_POST['reason']);
+PageUtils::protect($paths->page_id, $paths->namespace, intval($_POST['level']), $_POST['reason']);
 die_friendly($lang->get('page_protect_lbl_success_title'), '<p>' . $lang->get('page_protect_lbl_success_body', array( 'page_link' => makeUrl($paths->page) )) . '</p>');
 }
 $template->header();
 ?>
 $template->footer();
 break;
 case 'rename':
 if(!empty($_POST['newname']))
 {
-$r = PageUtils::rename($paths->cpage['urlname_nons'], $paths->namespace, $_POST['newname']);
+$r = PageUtils::rename($paths->page_id, $paths->namespace, $_POST['newname']);
 die_friendly($lang->get('page_rename_success_title'), '<p>'.nl2br($r).' <a href="'.makeUrl($paths->page).'">' . $lang->get('etc_return_to_page') . '</a>.</p>');
 }
 $template->header();
 ?>
 <form action="<?php echo makeUrl($paths->page, 'do=rename'); ?>" method="post">
 die_friendly($lang->get('etc_access_denied_short'), '<p>' . $lang->get('etc_access_denied') . '</p>');
 }
 if(isset($_POST['_downthejohn']))
 {
 $template->header();
-$result = PageUtils::flushlogs($paths->cpage['urlname_nons'], $paths->namespace);
+$result = PageUtils::flushlogs($paths->page_id, $paths->namespace);
 echo '<p>'.$result.' <a href="'.makeUrl($paths->page).'">' . $lang->get('etc_return_to_page') . '</a>.</p>';
 $template->footer();
 break;
 }
 $template->header();
 break;
 case 'delvote':
 if(isset($_POST['_ballotbox']))
 {
 $template->header();
-$result = PageUtils::delvote($paths->cpage['urlname_nons'], $paths->namespace);
+$result = PageUtils::delvote($paths->page_id, $paths->namespace);
 echo '<p>'.$result.' <a href="'.makeUrl($paths->page).'">' . $lang->get('etc_return_to_page') . '</a>.</p>';
 $template->footer();
 break;
 }
 $template->header();
 die_friendly($lang->get('etc_access_denied_short'), '<p>' . $lang->get('etc_access_denied') . '</p>');
 }
 if(isset($_POST['_youmaylivealittlelonger']))
 {
 $template->header();
-$result = PageUtils::resetdelvotes($paths->cpage['urlname_nons'], $paths->namespace);
+$result = PageUtils::resetdelvotes($paths->page_id, $paths->namespace);
 echo '<p>'.$result.' <a href="'.makeUrl($paths->page).'">' . $lang->get('etc_return_to_page') . '</a>.</p>';
 $template->footer();
 break;
 }
 $template->header();
 if ( empty($reason) )
 $error = $lang->get('ajax_delete_prompt_reason');
 else
 {
 $template->header();
-$result = PageUtils::deletepage($paths->cpage['urlname_nons'], $paths->namespace, $reason);
+$result = PageUtils::deletepage($paths->page_id, $paths->namespace, $reason);
 echo '<p>'.$result.' <a href="'.makeUrl($paths->page).'">' . $lang->get('etc_return_to_page') . '</a>.</p>';
 $template->footer();
 break;
 }
 }
 $level = intval($_POST['level']);
 if ( !in_array($level, array(0, 1, 2) ) )
 {
 die_friendly('Invalid request', '<p>Level not specified</p>');
 }
-$q = $db->sql_query('UPDATE '.table_prefix.'pages SET wiki_mode=' . $level . ' WHERE urlname=\'' . $db->escape($paths->cpage['urlname_nons']) . '\' AND namespace=\'' . $paths->namespace . '\';');
+$q = $db->sql_query('UPDATE '.table_prefix.'pages SET wiki_mode=' . $level . ' WHERE urlname=\'' . $db->escape($paths->page_id) . '\' AND namespace=\'' . $paths->namespace . '\';');
 if ( !$q )
 $db->_die();
 redirect(makeUrl($paths->page), htmlspecialchars($paths->cpage['name']), $lang->get('page_wikimode_success_redirect'), 2);
 }
 else
 $id1 = ( isset($_GET['diff1']) ) ? (int)$_GET['diff1'] : false;
 $id2 = ( isset($_GET['diff2']) ) ? (int)$_GET['diff2'] : false;
 if(!$id1 || !$id2) { echo '<p>Invalid request.</p>'; $template->footer(); break; }
 if(!preg_match('#^([0-9]+)$#', (string)$_GET['diff1']) ||
 !preg_match('#^([0-9]+)$#', (string)$_GET['diff2']  )) { echo '<p>SQL injection attempt</p>'; $template->footer(); break; }
-echo PageUtils::pagediff($paths->cpage['urlname_nons'], $paths->namespace, $id1, $id2);
+echo PageUtils::pagediff($paths->page_id, $paths->namespace, $id1, $id2);
 $template->footer();
 break;
 case 'detag':
 if ( $session->user_level < USER_LEVEL_ADMIN )
 {
 }
 if ( $paths->page_exists )
 {
 die_friendly($lang->get('etc_invalid_request_short'), '<p>' . $lang->get('page_detag_err_page_exists') . '</p>');
 }
-$q = $db->sql_query('DELETE FROM '.table_prefix.'tags WHERE page_id=\'' . $db->escape($paths->cpage['urlname_nons']) . '\' AND namespace=\'' . $paths->namespace . '\';');
+$q = $db->sql_query('DELETE FROM '.table_prefix.'tags WHERE page_id=\'' . $db->escape($paths->page_id) . '\' AND namespace=\'' . $paths->namespace . '\';');
 if ( !$q )
 $db->_die('Detag query, index.php:'.__LINE__);
 die_friendly($lang->get('page_detag_success_title'), '<p>' . $lang->get('page_detag_success_body') . '</p>');
 break;
 case 'aclmanager':
 $data = ( isset($_POST['data']) ) ? $_POST['data'] : Array('mode' => 'listgroups');
 PageUtils::aclmanager($data);
 break;
 case 'sql_report':
 $rev_id = ( (isset($_GET['oldid'])) ? intval($_GET['oldid']) : 0 );
-$page = new PageProcessor( $paths->cpage['urlname_nons'], $paths->namespace, $rev_id );
+$page = new PageProcessor( $paths->page_id, $paths->namespace, $rev_id );
 $page->send_headers = true;
 $pagepass = ( isset($_REQUEST['pagepass']) ) ? sha1($_REQUEST['pagepass']) : '';
 $page->password = $pagepass;
 $page->send(true);
 ob_end_clean();

changeset 326	ab66d6d1f1f4
parent 313	854eecfada20
parent 322	5f1cd51bf1be
child 334	c72b545f1304