New naming convention applied to many functions, see #118 for details

[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 75672cd5f7b533dc7ffd0e4d0b2ccd5d33e18339..994690552338b21372f0b9079b773e94feb578ac 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -301,10 +301,10 @@ case 'update': // Update an extension
                break;
 
        case '0.2.4': // SQL queries for v0.2.4
-               $auto_type = "png"; // PNG image is the default
-               if ((INCLUDE_READABLE("theme/".GET_CURR_THEME()."/images/code_bg.jpg")) && function_exists('imagecreatefromjpeg')) {
+               $auto_type = 'png'; // PNG image is the default
+               if ((isIncludeReadable('theme/'.getCurrentTheme().'/images/code_bg.jpg')) && function_exists('imagecreatefromjpeg')) {
                        // Switch to JPEG format
-                       $auto_type = "jpg";
+                       $auto_type = 'jpg';
                }
                ADD_EXT_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD img_type ENUM('jpg','png') NOT NULL DEFAULT '".$auto_type."'");
 
@@ -697,15 +697,15 @@ default: // Do stuff when extension is loaded
                setConfigEntry('secret_key', '');
 
                // Read key from secret file
-               if ((getConfig('file_hash') == "") || (getConfig('master_salt') == "") || (getConfig('pass_scramble') == "")) {
+               if ((getConfig('file_hash') == '') || (getConfig('master_salt') == '') || (getConfig('pass_scramble') == '')) {
                        // Cache instance
                        // Maybe need setup of secret key!
-                       LOAD_INC_ONCE("inc/gen_sql_patches.php");
+                       loadIncludeOnce('inc/gen_sql_patches.php');
 
                        // @TODO Rewrite this to a filter!
                        if ((GET_EXT_VERSION('cache') >= '0.1.2') && (isCacheInstanceValid())) {
                                // Remove extensions and mod_reg cache file
-                               LOAD_INC_ONCE("inc/libs/cache_functions.php");
+                               loadIncludeOnce('inc/libs/cache_functions.php');
                                require(sprintf("%sinc/extensions/ext-cache.php", constant('PATH')));
                                if ($GLOBALS['cache_instance']->loadCacheFile("extensions", true)) $GLOBALS['cache_instance']->destroyCacheFile();
                                if ($GLOBALS['cache_instance']->loadCacheFile("modreg"))           $GLOBALS['cache_instance']->destroyCacheFile();
@@ -713,15 +713,15 @@ default: // Do stuff when extension is loaded
                } // END - if
 
                // Test again
-               if ((getConfig('file_hash') != "") && (getConfig('master_salt') != "") && (getConfig('pass_scramble') != "")) {
+               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", constant('PATH'), getConfig('file_hash'));
-                       if (FILE_READABLE($hashFile)) {
+                       if (isFileReadable($hashFile)) {
                                // Read file
-                               setConfigEntry('secret_key', READ_FILE($hashFile));
+                               setConfigEntry('secret_key', readFromFile($hashFile));
                        } else {
                                // Remove it from database
-                               UPDATE_CONFIG("file_hash", '');
+                               updateConfiguration('file_hash', '');
 
                                // Cannot read secret file!
                                app_die(__FILE__, __LINE__, "Cannot read secret file! Please try to reload");
@@ -737,10 +737,10 @@ default: // Do stuff when extension is loaded
        } else {
                // Set some lame ( ;-) ) default settings
                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");
+               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' , getMessage('DEFAULT_MT_WORD'));
                define('MT_WORD2', getMessage('DEFAULT_MT_WORD2'));
                define('MT_WORD3', getMessage('DEFAULT_MT_WORD3'));
@@ -750,7 +750,7 @@ default: // Do stuff when extension is loaded
 }
 
 // Keep this extension always active!
-EXT_SET_ALWAYS_ACTIVE("Y");
+EXT_SET_ALWAYS_ACTIVE('Y');
 
 //
 ?>