Changeset 1295 in ExiteCMS

Timestamp:

02/20/08 23:47:36 (4 years ago)

Author:

hverton

Message:

added an admin module to edit the 404 pages
fixed error in viewthread.php that caused the country flag of the superadmin to be displayed for every post author
fixed calculation error in datediff() when displaying the time difference within 24 hours
fixed HTML error in admin.custom_pages.tpl

Location:

trunk

Files:

• administration/404pages.php (added)
• administration/images/404pages.gif (modified) (previous)
• administration/tools/language_pack_English.php (modified) (2 diffs)
• administration/upgrade/rev01294.php (added)
• files/locales/en.main.global.php (modified) (1 diff)
• forum/viewthread.php (modified) (1 diff)
• includes/core_functions.php (modified) (2 diffs)
• includes/templates/admin.404pages.tpl (added)
• includes/templates/admin.custom_pages.tpl (modified) (1 diff)

trunk/administration/tools/language_pack_English.php

@@ -23 +23 @@
         $localestrings['404page'] = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"5\" width=\"100%\" align=\"center\"> <tbody><tr><td width=\"10\"> </td><td><div align=\"center\"><font size=\"6\"><span class=\"shoutboxname\"><br />404 - Page Not Found</span><br /></font></div><br /><br /><hr width=\"90%\" size=\"2\" /><br /><br /><div align=\"center\">We are sorry, but the document you requested cannot be found on this server.<br /></div><br /><div align=\"center\">Most likely, this is a result of yet another reorganization of this Website to reflect our constant evolution and ongoing development, coupled with a transition from an old server with lots of legacy files to a shiny new server.<br /></div><br /><div align=\"center\">But then again, it might just be a completely random event and the result of too many cosmic rays. Who knows?<br /></div><br /><br /><hr width=\"90%\" size=\"2\" /><br /><br /><div align=\"center\">Your best bet for finding what you seek is to start at our home page (<a href=\"/\">click here to jump to the home page</a>), check out our menu, or use the search menu option.<br /></div><br /><div align=\"center\">If that doesn't work, and you think it's a document that should be here, please send a PM to the webmaster and let us know about it (registered users only).</div></td><td width=\"10\"> </td></tr></tbody></table><br />";
         load_localestrings($localestrings, LP_LOCALE, "404page", $step);
+
+        $localestrings = array();
+        $localestrings['400'] = "Edit 404 Page";
+        $localestrings['401'] = "404 page for the locale '%s' is updated";
+        $localestrings['402'] = "Error saving the 404 Page";
+        $localestrings['403'] = "Current 404 Pages";
+        $localestrings['404'] = "Edit";
+        $localestrings['405'] = "Page Content:";
+        $localestrings['406'] = "Preview Page";
+        $localestrings['407'] = "Save Page";
+        load_localestrings($localestrings, LP_LOCALE, "admin.404pages", $step);
 
         $localestrings = array();
@@ -469 +480 @@
         $localestrings['225'] = "User Groups";
         $localestrings['226'] = "Blogs";
-        $localestrings['227'] = "x";
+        $localestrings['227'] = "404 Pages";
         $localestrings['228'] = "Main Settings";
         $localestrings['229'] = "Time and Date Settings";

trunk/files/locales/en.main.global.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.global
-// generated on : Mon Feb 18 2008, 14:35:18 CET
+// generated on : Wed Feb 20 2008, 23:43:29 CET
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/forum/viewthread.php

@@ -292 +292 @@
         // country flag
         if ($settings['forum_flags']) {
-            if ($settings['hide_webmaster'] && iSUPERADMIN) {
+            // swap flags if we're hiding the webmasters true country of origin
+            if ($settings['hide_webmaster'] && $post['user_level'] == 103) {
                 $data['cc_flag'] = GeoIP_Code2Flag($settings['country']);
             } else {

trunk/includes/core_functions.php

@@ -762 +762 @@
     if ($difference < 60) {
         // if difference is less than 60 seconds, seconds is a good interval of choice
-        $interval = "h";
+        $interval = "s";
     } elseif ($difference >= 60 && $difference<60*60) {
         // if difference is between 60 seconds and 60 minutes, minutes is a good interval
@@ -824 +824 @@
         case "h":
             $datediff = floor($difference / 60 / 60);
+            $difference =  $difference - $datediff * 60 * 60;
             $res .= sprintf("%02d:", $datediff);
 
         case "n":
             $datediff = floor($difference / 60);
+            $difference =  $difference - $datediff * 60;
             $res .= sprintf("%02d:", $datediff);
 

trunk/includes/templates/admin.custom_pages.tpl

@@ -21 +21 @@
         <select name='page_id' class='textbox' style='width:250px;'>
         {section name=id loop=$pages}
-            <option value='{$pages[id].page_id}{if $pages[id].selected} selected{/if}'>{$pages[id].page_title}</option>
+            <option value='{$pages[id].page_id}'{if $pages[id].selected} selected='selected'{/if}>{$pages[id].page_title}</option>
         {/section}
         </select>