Fix in CREATE_EXTENSION_DEACTIVATION_TASK() and coding-style updated

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 7a4e9833adb57d38c63fa226e44989630bb21d61..0e2b0ce593ca410d4351efa5b4a18e00d248c83a 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -160,12 +160,12 @@ function CHECK_MODULE ($mod) {
                        if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
                                // Since 0.3.6 we have a has_menu column, this took me a half hour
                                // to find a loop here... *sigh*
                        if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
                                // Since 0.3.6 we have a has_menu column, this took me a half hour
                                // to find a loop here... *sigh*

-                               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_mod_reg
+                               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_mod_reg

 (module, locked, hidden, mem_only, admin_only, has_menu) VALUES
 ('%s','Y','N','N','N','N')", array($mod_chk), __FILE__, __LINE__);
                        } else {
                                // Wrong/missing sql_patches!
 (module, locked, hidden, mem_only, admin_only, has_menu) VALUES
 ('%s','Y','N','N','N','N')", array($mod_chk), __FILE__, __LINE__);
                        } else {
                                // Wrong/missing sql_patches!

-                               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_mod_reg
+                               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_mod_reg

 (module, locked, hidden, mem_only, admin_only) VALUES
 ('%s','Y','N','N','N')", array($mod_chk), __FILE__, __LINE__);
                        }
 (module, locked, hidden, mem_only, admin_only) VALUES
 ('%s','Y','N','N','N')", array($mod_chk), __FILE__, __LINE__);
                        }


@@ -678,20 +678,20 @@ function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false)
        if (($MODE != "admin") && ($UPDATE))
        {
                // Update guest or member menu
        if (($MODE != "admin") && ($UPDATE))
        {
                // Update guest or member menu

-               $SQL = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_%s_menu SET counter=counter+1 WHERE action='%s' AND what='%s'".$ADD." LIMIT 1",
-                array($MODE, $act, $wht), __FILE__, __LINE__, false);
+               SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_%s_menu SET counter=counter+1 WHERE action='%s' AND what='%s'".$ADD." LIMIT 1",
+                       array($MODE, $act, $wht), __FILE__, __LINE__, false);

        }
         elseif ($wht != "overview")
        {
                // Other actions
                $SQL = SQL_QUERY_ESC("SELECT id, what FROM "._MYSQL_PREFIX."_%s_menu WHERE action='%s'".$ADD." ORDER BY action DESC LIMIT 1",
        }
         elseif ($wht != "overview")
        {
                // Other actions
                $SQL = SQL_QUERY_ESC("SELECT id, what FROM "._MYSQL_PREFIX."_%s_menu WHERE action='%s'".$ADD." ORDER BY action DESC LIMIT 1",

-                array($MODE, $act), __FILE__, __LINE__, false);
+                       array($MODE, $act), __FILE__, __LINE__, false);

        }
         else
        {
                // Admin login overview
                $SQL = SQL_QUERY_ESC("SELECT id, what FROM "._MYSQL_PREFIX."_%s_menu WHERE action='%s' AND (what='' OR what IS NULL)".$ADD." ORDER BY action DESC LIMIT 1",
        }
         else
        {
                // Admin login overview
                $SQL = SQL_QUERY_ESC("SELECT id, what FROM "._MYSQL_PREFIX."_%s_menu WHERE action='%s' AND (what='' OR what IS NULL)".$ADD." ORDER BY action DESC LIMIT 1",

-                array($MODE, $act), __FILE__, __LINE__, false);
+                       array($MODE, $act), __FILE__, __LINE__, false);

        }
 
        // Run SQL command
        }
 
        // Run SQL command


@@ -871,7 +871,7 @@ function SEND_MODE_MAILS($mod, $modes)
 function COUNT_MODULE($mod) {
        if ($mod != "css") {
                // Do count all other modules but not accesses on CSS file css.php!
 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",
+               SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_mod_reg SET clicks=clicks+1 WHERE module='%s' LIMIT 1",

                        array($mod), __FILE__, __LINE__);
        } // END - if
 }
                        array($mod), __FILE__, __LINE__);
        } // END - if
 }


@@ -1017,7 +1017,7 @@ function REMOVE_RECEIVER (&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=fa
                        if (SQL_NUMROWS($result) == 0)
                        {
                                // No, so we add one!
                        if (SQL_NUMROWS($result) == 0)
                        {
                                // No, so we add one!

-                               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_links (%s, userid, link_type) VALUES ('%s','%s','%s')",
+                               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_links (%s, userid, link_type) VALUES ('%s','%s','%s')",

                                 array($rowName, $stats_id, bigintval($uid), $type), __FILE__, __LINE__);
                                $ret = "done";
                        }
                                 array($rowName, $stats_id, bigintval($uid), $type), __FILE__, __LINE__);
                                $ret = "done";
                        }


@@ -1190,7 +1190,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
                        // No entry updated?
                        if (SQL_AFFECTEDROWS() < 1) {
                                // First ref in this level! :-)
                        // No entry updated?
                        if (SQL_AFFECTEDROWS() < 1) {
                                // First ref in this level! :-)

-                               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_points (userid,ref_depth,%s) VALUES (%s,'%s',%s)",
+                               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_points (userid,ref_depth,%s) VALUES (%s,'%s',%s)",

                                        array($data, bigintval($uid), bigintval($GLOBALS['ref_level']), $ref_points), __FILE__, __LINE__);
                                //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):data={$data},ref_points={$ref_points},uid={$uid},depth={$GLOBALS['ref_level']},mode={$add_mode} - INSERTED! (".SQL_AFFECTEDROWS().")<br />\n";
                        } // END - if
                                        array($data, bigintval($uid), bigintval($GLOBALS['ref_level']), $ref_points), __FILE__, __LINE__);
                                //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):data={$data},ref_points={$ref_points},uid={$uid},depth={$GLOBALS['ref_level']},mode={$add_mode} - INSERTED! (".SQL_AFFECTEDROWS().")<br />\n";
                        } // END - if


@@ -1255,14 +1255,14 @@ function UPDATE_REF_COUNTER ($uid) {
        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},level={$cacheArray['ref_level'][$uid]}<br />\n";
 
        // Update counter
        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},level={$cacheArray['ref_level'][$uid]}<br />\n";
 
        // Update counter

-       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_refsystem SET counter=counter+1 WHERE userid=%s AND level='%s' LIMIT 1",
+       SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_refsystem SET counter=counter+1 WHERE userid=%s AND level='%s' LIMIT 1",

                array(bigintval($uid), $cacheArray['ref_level'][$uid]), __FILE__, __LINE__);
 
        // When no entry was updated then we have to create it here
        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):updated=".SQL_AFFECTEDROWS()."<br />\n";
        if (SQL_AFFECTEDROWS() < 1) {
                // First count!
                array(bigintval($uid), $cacheArray['ref_level'][$uid]), __FILE__, __LINE__);
 
        // When no entry was updated then we have to create it here
        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):updated=".SQL_AFFECTEDROWS()."<br />\n";
        if (SQL_AFFECTEDROWS() < 1) {
                // First count!

-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_refsystem (userid, level, counter) VALUES (%s,%s,1)",
+               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_refsystem (userid, level, counter) VALUES (%s,%s,1)",

                        array(bigintval($uid), $cacheArray['ref_level'][$uid]), __FILE__, __LINE__);
                //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid}<br />\n";
        } // END - if
                        array(bigintval($uid), $cacheArray['ref_level'][$uid]), __FILE__, __LINE__);
                //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid}<br />\n";
        } // END - if


@@ -1545,7 +1545,7 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
                SQL_FREERESULT($result);
 
                // Delete points entries as well
                SQL_FREERESULT($result);
 
                // Delete points entries as well

-               $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_points WHERE userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_points WHERE userid=%s", array(bigintval($uid)), __FILE__, __LINE__);

 
                // Update mediadata as well
                if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
 
                // Update mediadata as well
                if (GET_EXT_VERSION("mediadata") >= "0.0.4") {


@@ -1558,12 +1558,12 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
        }
 
        // Delete category selections as well...
        }
 
        // Delete category selections as well...

-       $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_cats WHERE userid=%s",
+       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_cats WHERE userid=%s",

         array(bigintval($uid)), __FILE__, __LINE__);
 
        // Remove from rallye if found
        if (EXT_IS_ACTIVE("rallye")) {
         array(bigintval($uid)), __FILE__, __LINE__);
 
        // Remove from rallye if found
        if (EXT_IS_ACTIVE("rallye")) {

-               $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_users WHERE userid=%s",
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_users WHERE userid=%s",

                 array(bigintval($uid)), __FILE__, __LINE__);
        }
 
                 array(bigintval($uid)), __FILE__, __LINE__);
        }
 


@@ -1572,7 +1572,7 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
        SEND_EMAIL($uid, ADMIN_DEL_ACCOUNT, $msg);
 
        // Ok, delete the account!
        SEND_EMAIL($uid, ADMIN_DEL_ACCOUNT, $msg);
 
        // Ok, delete the account!

-       $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
+       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);

 }
 //
 function META_DESCRIPTION ($mod, $wht) {
 }
 //
 function META_DESCRIPTION ($mod, $wht) {


@@ -1595,13 +1595,13 @@ function ADD_JACKPOT($points) {
        $result = SQL_QUERY("SELECT points FROM "._MYSQL_PREFIX."_jackpot WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Create line
        $result = SQL_QUERY("SELECT points FROM "._MYSQL_PREFIX."_jackpot WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Create line

-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_jackpot (ok, points) VALUES ('ok','%s')", array($points), __FILE__, __LINE__);
+               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_jackpot (ok, points) VALUES ('ok','%s')", array($points), __FILE__, __LINE__);

        } else {
                // Free memory
                SQL_FREERESULT($result);
 
                // Update points
        } else {
                // Free memory
                SQL_FREERESULT($result);
 
                // Update points

-               $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_jackpot SET points=points+%s WHERE ok='ok' LIMIT 1",
+               SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_jackpot SET points=points+%s WHERE ok='ok' LIMIT 1",

                        array($points), __FILE__, __LINE__);
        }
 }
                        array($points), __FILE__, __LINE__);
        }
 }


@@ -1698,7 +1698,7 @@ function GET_WHAT($modCheck) {
 // Subtract points from database and mediadata cache
 function SUB_POINTS ($subject, $uid, $points) {
        // Add points to used points
 // Subtract points from database and mediadata cache
 function SUB_POINTS ($subject, $uid, $points) {
        // Add points to used points

-       $result = SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET `used_points`=`used_points`+%s WHERE userid=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET `used_points`=`used_points`+%s WHERE userid=%s LIMIT 1",

         array($points, bigintval($uid)), __FILE__, __LINE__);
 
        // Insert booking record
         array($points, bigintval($uid)), __FILE__, __LINE__);
 
        // Insert booking record


@@ -1895,7 +1895,7 @@ function ADD_BONUS_MAIL_TO_QUEUE ($subject, $text, $receiverList, $points, $seco
                if ($mode == "html") $HTML = "Y";
 
                // Add HTML mail
                if ($mode == "html") $HTML = "Y";
 
                // Add HTML mail

-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
+               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus

 (subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, html_msg)
 VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s')",
  array(
 (subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, html_msg)
 VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s')",
  array(


@@ -1912,7 +1912,7 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s
 ), __FILE__, __LINE__);
        } else {
                // Add regular mail
 ), __FILE__, __LINE__);
        } else {
                // Add regular mail

-               $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
+               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus

 (subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent)
 VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
  array(
 (subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent)
 VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
  array(