Script rewritten to setConfigEntry(), getConfig() and incrementConfigEntry()

[mailer.git] / inc / extensions / ext-sql_patches.php

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index 8da3cde53aa679453f82e5455cd28920c27341cf..80a91853bf4ced8f99e8ae5e484cc3600b088b45 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -600,7 +600,7 @@ PRIMARY KEY (id)
 
        case "0.4.9": // SQL queries for v0.4.9
                $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` CHANGE `user_hash` `user_hash` VARCHAR(255) NULL DEFAULT NULL";
-               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_user_data` SET user_hash=NULL WHERE user_hash IS NOT NULL AND status='CONFIRMED'";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_user_data` SET user_hash=NULL WHERE user_hash IS NOT NULL AND `status`='CONFIRMED'";
                $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD UNIQUE (`user_hash`)";
 
                // Update notes (these will be set as task text!)
@@ -727,7 +727,7 @@ default: // Do stuff when extension is loaded
        // When the sql_patches is not installed we cannot load it's configuration... *sigh*
        if (GET_EXT_VERSION("sql_patches") != '') {
                // Init key
-               $_CONFIG['secret_key'] = "";
+               setConfigEntry('secret_key', "");
 
                // Read key from secret file
                if ((getConfig('file_hash') == "") || (getConfig('master_salt') == "") || (getConfig('pass_scramble') == "")) {
@@ -735,13 +735,13 @@ default: // Do stuff when extension is loaded
                        global $cacheInstance;
 
                        // Maybe need setup of secret key!
-                       require_once(PATH."inc/gen_sql_patches.php");
+                       LOAD_INC_ONCE("inc/gen_sql_patches.php");
 
                        // @TODO Rewrite this to a filter!
                        if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($cacheInstance)) && (is_object($cacheInstance))) {
                                // Remove extensions and mod_reg cache file
-                               require_once(PATH."inc/libs/cache_functions.php");
-                               require_once(PATH."inc/extensions/ext-cache.php");
+                               LOAD_INC_ONCE("inc/libs/cache_functions.php");
+                               require(sprintf("%sinc/extensions/ext-cache.php", constant('PATH')));
                                if ($cacheInstance->loadCacheFile("extensions", true)) $cacheInstance->destroyCacheFile();
                                if ($cacheInstance->loadCacheFile("mod_reg"))          $cacheInstance->destroyCacheFile();
                        } // END - if
@@ -750,10 +750,10 @@ default: // Do stuff when extension is loaded
                // Test again
                if ((getConfig('file_hash') != "") && (getConfig('master_salt') != "") && (getConfig('pass_scramble') != "")) {
                        // File hash fas generated so we can also file the secret file... hopefully.
-                       $hashFile = sprintf("%sinc/.secret/.%s", PATH, getConfig('file_hash'));
+                       $hashFile = sprintf("%sinc/.secret/.%s", constant('PATH'), getConfig('file_hash'));
                        if (FILE_READABLE($hashFile)) {
                                // Read file
-                               $_CONFIG['secret_key'] = READ_FILE($hashFile);
+                               setConfigEntry('secret_key', READ_FILE($hashFile));
                        } else {
                                // Remove it from database
                                UPDATE_CONFIG("file_hash", "");
@@ -771,11 +771,11 @@ default: // Do stuff when extension is loaded
                define('_MAX'    , getConfig('rand_no'));
        } else {
                // Set some lame ( ;-) ) default settings
-               $_CONFIG['def_refid'] = 0;
-               $_CONFIG['enable_title_deco'] = "N";
-               $_CONFIG['title_mod_show']    = "Y";
-               $_CONFIG['title_middle']      = "-";
-               // @TODO Can we remove this? $_CONFIG['verbose_sql']       = "N";
+               setConfigEntry('def_refid'] = 0;
+               setConfigEntry('enable_title_deco', = "N");
+               setConfigEntry('title_mod_show'   , = "Y");
+               setConfigEntry('title_middle'     , = "-");
+               // @TODO Can we remove this? setConfigEntry('verbose_sql'        , "N");
                define('MT_WORD' , DEFAULT_MT_WORD );
                define('MT_WORD2', DEFAULT_MT_WORD2);
                define('MT_WORD3', DEFAULT_MT_WORD3);