Changeset 1871 in ExiteCMS

Timestamp:

10/19/08 12:10:12 (3 years ago)

Author:

hverton

Message:

updated the language pack code
fixed not being able to login when in maintenance mode
retro fix for rev1339 due to a bug in the v7.1 setup code
removed the .keys class from wikka.css, now uses the .button theme class

Location:

trunk

Files:

• . (modified) (1 prop)
• administration/tools/language_pack_English.php (modified) (3 diffs)
• administration/tools/language_pack_Nederlands.php (modified) (3 diffs)
• administration/tools/templates/admin.tools.languagepack.tpl (modified) (1 diff)
• administration/upgrade/rev01869.php (added)
• files/locales/en.main.global.php (modified) (1 diff)
• files/locales/en.main.setup.php (modified) (1 diff)
• files/locales/nl.main.global.php (modified) (1 diff)
• files/locales/nl.main.setup.php (modified) (1 diff)
• maintenance.php (modified) (1 diff)
• modules (modified) (1 prop)
• themes/ExiteCMS/wikka.css (modified) (1 diff)

trunk

@@ -1 @@
-Copy of config.php
-config.backup.php
-_revision_.svn
+config.php

@@ -1 @@
-Copy of config.php
-config.backup.php
-_revision_.svn
+config.php

trunk/administration/tools/language_pack_English.php

@@ -3746 +3746 @@
 if (!defined('LP_COUNTRIES')) define('LP_COUNTRIES', "us|gb|ca|au|nz|in|za|ir|mt|hk|pr");
 if (!defined('LP_VERSION')) define('LP_VERSION', "7.20");
-if (!defined('LP_DATE')) define('LP_DATE', "1224253694");
+if (!defined('LP_DATE')) define('LP_DATE', "1224409120");
 $lp_date = LP_DATE;
 
@@ -3818 +3818 @@
                 if (!CMS_CLI) $variables['message'] .= sprintf($locale['307'],LP_LOCALE, LP_LANGUAGE);
             }
+            // update the install timestamp in the config
+            if (isset($settings['LanguagePack.'.LP_LANGUAGE])) {
+                $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".LP_DATE."' WHERE cfg_name = 'LanguagePack.".LP_LANGUAGE."'");
+            } else {
+                $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES ('LanguagePack.".LP_LANGUAGE."', '".LP_DATE."')");
+            }
         }
     }
@@ -3839 +3845 @@
 
         // check the last update of the locale
-        $variables['last_update'] = dbfunction("MAX(locales_datestamp)", "locales", "locales_code = '".LP_LOCALE."' AND locales_name NOT LIKE 'modules%'");
+        $variables['last_update'] = isset($settings['LanguagePack.'.LP_LANGUAGE]) ? $settings['LanguagePack.'.LP_LANGUAGE] : dbfunction("MAX(locales_datestamp)", "locales", "locales_code = '".LP_LOCALE."' AND locales_name NOT LIKE 'modules%'");
         
         // check if this language pack has been installed
         $variables['can_install'] = dbcount("(*)", "locale", "locale_code = '".LP_LOCALE."'") == 0;
-        $variables['can_remove'] = $variables['can_install'] ? FALSE : TRUE;
-        $variables['can_upgrade'] = $variables['can_remove'];
+        $variables['can_remove'] = LP_LOCALE != "en" && $variables['can_install'] == false;
+        $variables['can_upgrade'] = $variables['can_install'] == false && $variables['last_update'] < LP_DATE;
     
         // define the body panel variables

trunk/administration/tools/language_pack_Nederlands.php

@@ -3746 +3746 @@
 if (!defined('LP_COUNTRIES')) define('LP_COUNTRIES', "nl|be|sr|aw|an");
 if (!defined('LP_VERSION')) define('LP_VERSION', "7.20");
-if (!defined('LP_DATE')) define('LP_DATE', "1224253697");
+if (!defined('LP_DATE')) define('LP_DATE', "1224409123");
 $lp_date = LP_DATE;
 
@@ -3818 +3818 @@
                 if (!CMS_CLI) $variables['message'] .= sprintf($locale['307'],LP_LOCALE, LP_LANGUAGE);
             }
+            // update the install timestamp in the config
+            if (isset($settings['LanguagePack.'.LP_LANGUAGE])) {
+                $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".LP_DATE."' WHERE cfg_name = 'LanguagePack.".LP_LANGUAGE."'");
+            } else {
+                $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES ('LanguagePack.".LP_LANGUAGE."', '".LP_DATE."')");
+            }
         }
     }
@@ -3839 +3845 @@
 
         // check the last update of the locale
-        $variables['last_update'] = dbfunction("MAX(locales_datestamp)", "locales", "locales_code = '".LP_LOCALE."' AND locales_name NOT LIKE 'modules%'");
+        $variables['last_update'] = isset($settings['LanguagePack.'.LP_LANGUAGE]) ? $settings['LanguagePack.'.LP_LANGUAGE] : dbfunction("MAX(locales_datestamp)", "locales", "locales_code = '".LP_LOCALE."' AND locales_name NOT LIKE 'modules%'");
         
         // check if this language pack has been installed
         $variables['can_install'] = dbcount("(*)", "locale", "locale_code = '".LP_LOCALE."'") == 0;
-        $variables['can_remove'] = $variables['can_install'] ? FALSE : TRUE;
-        $variables['can_upgrade'] = $variables['can_remove'];
+        $variables['can_remove'] = LP_LOCALE != "en" && $variables['can_install'] == false;
+        $variables['can_upgrade'] = $variables['can_install'] == false && $variables['last_update'] < LP_DATE;
     
         // define the body panel variables

trunk/administration/tools/templates/admin.tools.languagepack.tpl

@@ -92 +92 @@
                             {buttonlink name=$locale.302 link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&step=install"} 
                         {/if}
-                        {if $settings.sitename == "ExiteCMS Development Site" || ($can_upgrade && $last_update != $smarty.const.LP_DATE)}
+                        {if $settings.sitename == "ExiteCMS Development Site" || $can_upgrade}
                         {buttonlink name=$locale.304 link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&step=upgrade"} 
                         {/if}
-                        {if $can_remove && $smarty.const.LP_LOCALE != "en"}
+                        {if $can_remove}
                         {buttonlink name=$locale.303 link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&step=remove"}   
                         {/if}

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

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.global
-// generated on : Fri Oct 17 2008, 16:28:20 CEST
+// generated on : Sun Oct 19 2008, 11:35:26 CEST
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

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

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.setup
-// generated on : Fri Oct 17 2008, 16:28:14 CEST
+// generated on : Sun Oct 19 2008, 11:35:14 CEST
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

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

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.global
-// generated on : Fri Oct 17 2008, 16:28:17 CEST
+// generated on : Sun Oct 19 2008, 11:35:17 CEST
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/files/locales/nl.main.setup.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.setup
-// generated on : Fri Oct 17 2008, 16:28:17 CEST
+// generated on : Sun Oct 19 2008, 11:35:17 CEST
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/maintenance.php

@@ -16 +16 @@
 require_once dirname(__FILE__)."/includes/theme_functions.php";
 
+// login requested, switch to setuser to perform the login
+if (isset($_POST['login'])) {
+    $_GET['login'] = "yes";
+    include PATH_ROOT."setuser.php";
+    exit;
+}
+
 // logout requested, switch to setuser to perform the logout
 if (isset($_POST['logout'])) {
-    $_REQUEST['logout'] = "yes";
+    $_GET['logout'] = "yes";
     include PATH_ROOT."setuser.php";
     exit;

trunk/themes/ExiteCMS/wikka.css

@@ -363 +363 @@
 
 .center, .center p {text-align: center;}
-
-.keys {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 12px;
-    color:#FFF;
-    font-weight: bold;
-    background-color: #33A;
-    border-top: 2px solid #FFF;
-    border-left: 2px solid #FFF;
-    border-right: 2px solid #336;
-    border-bottom: 2px solid #336;
-    text-align: center;
-    padding: 0.1em 0.3em;
-    line-height: 1.6em;
-    vertical-align: top;
-}
-
-.keys:hover {
-    background-color: #66C;
-    border-right: 2px solid #668;
-    border-bottom: 2px solid #668;
-}
 
 acronym {

@@ -1 @@
-Copy of config.php
-config.backup.php
-_revision_.svn
+config.php