More default values rewritten, UNSIGNED added to many numerical database columns...

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 414cdc5273c908eb66c3593e7b8af5fd6b2aa754..2aa4d8b7715346c749bf9ceb639272b68c16b3be 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -65,7 +65,7 @@ function ADD_MODULE_TITLE($mod) {
        // Still no luck or empty title?
        if (empty($name)) {
                // No name found
-               $name = LANG_UNKNOWN_MODULE." (".$mod.")";
+               $name = sprintf("%s (%s)", LANG_UNKNOWN_MODULE, $mod);
                if (SQL_NUMROWS($result) == 0) {
                        // Add module to database
                        $dummy = CHECK_MODULE($mod);
@@ -77,7 +77,7 @@ function ADD_MODULE_TITLE($mod) {
 }
 
 // Check validity of a given module name (no file extension)
-function CHECK_MODULE($mod) {
+function CHECK_MODULE ($mod) {
        // We need them now here...
        global $cacheArray, $_CONFIG, $cacheInstance;
 
@@ -794,7 +794,7 @@ function SEND_MODE_MAILS($mod, $modes)
 
        // Load hash
        $result_main = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
-        array($GLOBALS['userid']), __FILE__, __LINE__);
+               array($GLOBALS['userid']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_main) == 1) {
                // Load hash from database
                list($hashDB) = SQL_FETCHROW($result_main);
@@ -807,7 +807,7 @@ function SEND_MODE_MAILS($mod, $modes)
                if (($hash == get_session('u_hash')) || ($_POST['pass1'] == $_POST['pass2'])) {
                        // Load user's data
                        $result = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, country, zip, city, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s AND password='%s' LIMIT 1",
-                        array($GLOBALS['userid'], $hashDB), __FILE__, __LINE__);
+                               array($GLOBALS['userid'], $hashDB), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Load the data
                                $DATA = SQL_FETCHROW($result);
@@ -842,13 +842,13 @@ function SEND_MODE_MAILS($mod, $modes)
                                                        DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode));
                                                        $content = MEMBER_UNKNOWN_MODE.": ".$mode."\n\n";
                                                        break;
-                                               }
+                                               } // END - switch
                                        } // END - if
 
                                        if (EXT_IS_ACTIVE("country")) {
                                                // Replace code with description
                                                $DATA[4] = COUNTRY_GENERATE_INFO($_POST['country_code']);
-                                       }
+                                       } // END - if
 
                                        // Load template
                                        $msg = LOAD_EMAIL_TEMPLATE("member_mydata_notify", $content, $GLOBALS['userid']);
@@ -867,32 +867,32 @@ function SEND_MODE_MAILS($mod, $modes)
                                        $sub_mem = MEMBER_CHANGED_DATA;
 
                                        // Output success message
-                                       $content = "<STRONG><SPAN class=\"member_done\">".MYDATA_MAIL_SENT."</SPAN></STRONG>";
+                                       $content = "<SPAN class=\"member_done\">".MYDATA_MAIL_SENT."</SPAN>";
                                        break;
 
                                default:
                                        DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
-                                       $content = "<STRONG><SPAN class=\"member_failed\">".UNKNOWN_MODULE."</SPAN></STRONG>";
+                                       $content = "<SPAN class=\"member_failed\">".UNKNOWN_MODULE."</SPAN>";
                                        break;
-                               }
+                               } // END - switch
                        } else {
                                // Could not load profile data
-                               $content = "<STRONG><SPAN class=\"member_failed\">".MEMBER_CANNOT_LOAD_PROFILE."</SPAN></STRONG>";
+                               $content = "<SPAN class=\"member_failed\">".MEMBER_CANNOT_LOAD_PROFILE."</SPAN>";
                        }
                } else {
                        // Passwords mismatch
-                       $content = "<STRONG><SPAN class=\"member_failed\">".MEMBER_PASSWORD_ERROR."</SPAN></STRONG>";
+                       $content = "<SPAN class=\"member_failed\">".MEMBER_PASSWORD_ERROR."</SPAN>";
                }
        } else {
                // Could not load profile
-               $content = "<STRONG><SPAN class=\"member_failed\">".MEMBER_CANNOT_LOAD_PROFILE."</SPAN></STRONG>";
+               $content = "<SPAN class=\"member_failed\">".MEMBER_CANNOT_LOAD_PROFILE."</SPAN>";
        }
 
        // Send email to user if required
        if ((!empty($sub_mem)) && (!empty($msg))) {
                // Send member mail
                SEND_EMAIL($DATA[7], $sub_mem, $msg);
-       }
+       } // END - if
 
        // Send only if no other error has occured
        if (empty($content)) {
@@ -904,22 +904,20 @@ function SEND_MODE_MAILS($mod, $modes)
                        $content = CANNOT_SEND_ADMIN_MAILS;
                } else {
                        // No mail to admin
-                       $content = "<STRONG><SPAN class=\"member_done\">".MYDATA_MAIL_SENT."</SPAN></STRONG>";
+                       $content = "<SPAN class=\"member_done\">".MYDATA_MAIL_SENT."</SPAN>";
                }
-       }
+       } // END - if
 
        // Load template
        LOAD_TEMPLATE("admin_settings_saved", false, $content);
 }
 // Update module counter
-function COUNT_MODULE($mod)
-{
-       if ($mod != "css")
-       {
+function COUNT_MODULE($mod) {
+       if ($mod != "css") {
                // Do count all other modules but not accesses on CSS file css.php!
                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_mod_reg SET clicks=clicks+1 WHERE module='%s' LIMIT 1",
-                array($mod), __FILE__, __LINE__);
-       }
+                       array($mod), __FILE__, __LINE__);
+       } // END - if
 }
 // Get action value from mode (admin/guest/member) and what-value
 function GET_ACTION ($MODE, &$wht)