Renamed all SQL-related functions to camel-case notation

[mailer.git] / inc / module-functions.php

diff --git a/inc/module-functions.php b/inc/module-functions.php
index 39fab38c7ae6e8e2885eb1a9ed7623f745028c4b..ba6ba895cfa513c7b96615e04f9b0262907d662f 100644 (file)
--- a/inc/module-functions.php
+++ b/inc/module-functions.php
@@ -59,17 +59,17 @@ function getModuleTitle ($module) {
                                incrementStatsEntry('cache_hits');
                        } elseif (!isExtensionActive('cache')) {
                                // Load from database
-                               $result = SQL_QUERY_ESC("SELECT `title` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='%s' LIMIT 1",
+                               $result = sqlQueryEscaped("SELECT `title` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='%s' LIMIT 1",
                                        array($module), __FUNCTION__, __LINE__);
 
                                // Is the entry there?
-                               if (SQL_NUMROWS($result) == 1) {
+                               if (sqlNumRows($result) == 1) {
                                        // Get the title from database
-                                       $data = SQL_FETCHARRAY($result);
+                                       $data = sqlFetchArray($result);
                                } // END - if
 
                                // Free the result
-                               SQL_FREERESULT($result);
+                               sqlFreeResult($result);
                        }
                } // END - if
 
@@ -85,7 +85,7 @@ function getModuleTitle ($module) {
                        }  else {
                                // No name found
                                $data['title'] = '{%message,UNKNOWN_MODULE_DETECTED_TITLE=' . $module . '%}';
-                               if ((is_resource($result)) && (SQL_HASZERONUMS($result))) {
+                               if ((is_resource($result)) && (ifSqlHasZeroNums($result))) {
                                        // Add module to database and ignore return value
                                        checkModulePermissions($module);
                                } // END - if
@@ -145,11 +145,11 @@ function isModuleRegistered ($module) {
        } elseif (!isExtensionActive('cache')) {
                // Check for module in database
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using database.');
-               $result = SQL_QUERY_ESC("SELECT `locked`, `hidden`, `admin_only`, `mem_only` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='%s' LIMIT 1",
+               $result = sqlQueryEscaped("SELECT `locked`, `hidden`, `admin_only`, `mem_only` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='%s' LIMIT 1",
                        array($module), __FUNCTION__, __LINE__);
-               if (SQL_NUMROWS($result) == 1) {
+               if (sqlNumRows($result) == 1) {
                        // Read data
-                       $data = SQL_FETCHARRAY($result);
+                       $data = sqlFetchArray($result);
 
                        // Set all entries
                        foreach ($data as $key => $value) {
@@ -164,7 +164,7 @@ function isModuleRegistered ($module) {
                }
 
                // Free result
-               SQL_FREERESULT($result);
+               sqlFreeResult($result);
        }
 
        // Return status
@@ -291,20 +291,20 @@ function checkModulePermissions ($module = '') {
                                 * Since 0.3.6 there is a has_menu column, this took me a half
                                 * hour to find a loop here... *sigh*
                                 */
-                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg`
+                               sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg`
 (`module`, `locked`, `hidden`, `mem_only`, `admin_only`, `has_menu`)
 VALUES
 ('%s','Y','N','N','N','N')", array($module_chk), __FUNCTION__, __LINE__);
                        } else {
                                // Wrong/missing sql_patches!
-                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg`
+                               sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg`
 (`module`, `locked`, `hidden`, `mem_only`, `admin_only`)
 VALUES
 ('%s','Y','N','N','N')", array($module_chk), __FUNCTION__, __LINE__);
                        }
 
                        // Everthing is fine?
-                       if (SQL_HASZEROAFFECTED()) {
+                       if (ifSqlHasZeroAffectedRows()) {
                                // Something bad happend!
                                setModuleStatus($module_chk, 'major');
                                return 'major';
@@ -368,13 +368,13 @@ function ifModuleHasMenu ($module, $forceDb = FALSE) {
                }
        } elseif ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && ((!isExtensionActive('cache')) || ($forceDb === TRUE))) {
                // Check database for entry
-               $result = SQL_QUERY_ESC("SELECT `has_menu` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='%s' LIMIT 1",
+               $result = sqlQueryEscaped("SELECT `has_menu` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='%s' LIMIT 1",
                        array($module), __FUNCTION__, __LINE__);
 
                // Entry found?
-               if (SQL_NUMROWS($result) == 1) {
+               if (sqlNumRows($result) == 1) {
                        // Load "has_menu" column
-                       $data = SQL_FETCHARRAY($result);
+                       $data = sqlFetchArray($result);
 
                        // Fake cache... ;-)
                        $GLOBALS['cache_array']['extension']['ext_menu'][$module] = $data['has_menu'];
@@ -384,7 +384,7 @@ function ifModuleHasMenu ($module, $forceDb = FALSE) {
                } // END  - if
 
                // Free memory
-               SQL_FREERESULT($result);
+               sqlFreeResult($result);
        } elseif (!isExtensionInstalled('sql_patches')) {
                // No ext-sql_patches installed, so maybe in admin/guest/member/sponsor area or no admin registered?
                $ret = in_array($module, array('admin', 'index', 'login', 'sponsor')); // Then there is a menu!
@@ -501,7 +501,7 @@ function doIncludeModule () {
        if ((isExtensionActive('maintenance')) && (isMaintenanceEnabled()) && (!isAdmin()) && (getModule() != 'admin')) {
                // Maintain mode is active and you are no admin
                addFatalMessage(__FUNCTION__, __LINE__, '{--MAILER_DOWN_FOR_MAINTENANCE--}');
-       } elseif ((SQL_IS_LINK_UP()) && (!ifFatalErrorsDetected())) {
+       } elseif ((isSqlLinkUp()) && (!ifFatalErrorsDetected())) {
                // Do the small "load module" call
                $isModuleValid = loadModule();
        } elseif (!ifFatalErrorsDetected()) {