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

equal deleted inserted replaced

-:854eecfada20
+:474f8be55943
 */
 function send( $do_stats = false )
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
+global $lang;
 if ( !$this->perms->get_permissions('read') )
 {
 $this->err_access_denied();
 return false;
 }
 }
 if ( $this->namespace == 'Special' || $this->namespace == 'Admin' )
 {
 if ( !$this->page_exists )
 {
-redirect( makeUrl(getConfig('main_page')), 'Can\'t find special page', 'The special or administration page you requested does not exist. You will now be transferred to the main page.', 2 );
+die_semicritical('Exception in PageProcessor', '<p>Special page not existent but exception not previously caught by path manager.</p>');
 }
 $func_name = "page_{$this->namespace}_{$this->page_id}";
 if ( function_exists($func_name) )
 {
 return @call_user_func($func_name);
 }
 else
 {
-$title = 'Page backend not found';
+$title = $lang->get('page_err_custompage_function_missing_title');
-$message = "The administration page you are looking for was properly registered using the page API, but the backend function
+$message = $lang->get('page_err_custompage_function_missing_body', array( 'function_name' => $fname ));
-(<tt>$fname</tt>) was not found. If this is a plugin page, then this is almost certainly a bug with the plugin.";
 if ( $this->send_headers )
 {
 $template->tpl_strings['PAGE_NAME'] = $title;
 $template->header();
 // Redirect page!
 $page_to = sanitize_page_id($match[1]);
 $page_id_data = RenderMan::strToPageID($page_to);
 if ( count($this->redirect_stack) >= 3 )
 {
-$this->render( (!$strict_no_headers), '<div class="usermessage"><b>The maximum number of internal redirects has been exceeded.</b></div>' );
+$this->render( (!$strict_no_headers), '<div class="usermessage"><b>' . $lang->get('page_err_redirects_exceeded') . '</b></div>' );
 }
 else
 {
 $result = $this->_handle_redirect($page_id_data[0], $page_id_data[1]);
 if ( $result !== true )
 */
 function render($incl_inner_headers = true, $_errormsg = false)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
+global $lang;
 $text = $this->fetch_text();
 $text = preg_replace('/([\s]*)__NOBREADCRUMBS__([\s]*)/', '', $text);
 $text = preg_replace('/([\s]*)__NOTOC__([\s]*)/', '', $text);
 <tr>
 <td valign="top">
 <img alt="Cute wet-floor icon" src="'.scriptPath.'/images/redirector.png" />
 </td>
 <td valign="top" style="padding-left: 10px;">
-<b>This page is a <i>redirector</i>.</b><br />
+' . $lang->get('page_msg_this_is_a_redirector', array( 'redirect_target' => $a )) . '
-This means that this page will not show its own content by default. Instead it will display the contents of the page it redirects to.<br /><br />
-To create a redirect page, make the <i>first characters</i> in the page content <tt>#redirect [[Page_ID]]</tt>. For more information, see the
-Enano <a href="http://enanocms.org/Help:Wiki_formatting" onclick="window.open(this.href); return false;">Wiki formatting guide</a>.<br /><br />
-This page redirects to ' . $a . '.
 </td>
 </tr>
 </table>
 </div>
 <br />
 */
 function _handle_redirect($page_id, $namespace)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
+global $lang;
 $arr_pid = array($this->page_id, $this->namespace);
 if ( $namespace == 'Special' || $namespace == 'Admin' )
 {
-return 'This page redirects to a Special or Administration page, which is not allowed.';
+return $lang->get('page_err_redirect_to_special');
 }
-if ( in_array($this->redirect_stack, $arr_pid) )
+$looped = false;
-{
+foreach ( $this->redirect_stack as $page )
-return 'This page infinitely redirects with another page (or another series of pages), and the infinite redirect was trapped.';
+{
+if ( $page[0] == $arr_pid[0] && $page[1] == $arr_pid[1] )
+{
+$looped = true;
+break;
+}
+}
+if ( $looped )
+{
+return $lang->get('page_err_redirect_infinite_loop');
 }
 $page_id_key = $paths->nslist[ $namespace ] . sanitize_page_id($page_id);
 if ( !isset($paths->pages[$page_id_key]) )
 {
-return 'This page redirects to another page that doesn\'t exist.';
+return $lang->get('page_err_redirect_to_nonexistent');
 }
 $this->redirect_stack[] = $arr_pid;
 // Nuke the text cache to avoid infinite loops, gah...
 */
 function err_access_denied()
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
+global $lang;
+global $email;
 // Log it for crying out loud
 $q = $db->sql_query('INSERT INTO '.table_prefix.'logs(log_type,action,time_id,date_string,author,edit_summary,page_text) VALUES(\'security\', \'illegal_page\', '.time().', \''.date('d M Y h:i a').'\', \''.$db->escape($session->username).'\', \''.$db->escape($_SERVER['REMOTE_ADDR']).'\', \'' . $db->escape(serialize(array($this->page_id, $this->namespace))) . '\')');
 $ob = '';
 $ob .= '<small>(Redirected to ' . $b . ' from ' . $a . ')<br /></small>';
 }
 }
-$ob .= '<div class="error-box"><b>Access to this page is denied.</b><br />This may be because you are not logged in or you have not met certain criteria for viewing this page.</div>';
+$email_link = $email->encryptEmail(getConfig('contact_email'), '', '', $lang->get('page_err_access_denied_siteadmin'));
+$ob .= "<h3>" . $lang->get('page_err_access_denied_title') . "</h3>";
+$ob .= "<p>" . $lang->get('page_err_access_denied_body', array('site_administration' => $email_link)) . "</p>";
 if ( $this->send_headers )
 {
 $ob .= $template->getFooter();
 }

changeset 314	474f8be55943
parent 313	854eecfada20
child 326	ab66d6d1f1f4