Fix for inserted codes while registering of extensions, many rewrites/cleanups:

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 1dd3aa1ca361c916a3e33212b50524acba610c66..51e24c8eded41fdbbf2e3cf17bb56d1479ac8a14 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -585,13 +585,13 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
        switch ($mode) {
                case 'guest':
                        // Guests (in the registration form) are not allowed to select 0 mails per day.
-                       $result = SQL_QUERY("SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `value` > 0 ORDER BY `value` ASC",
+                       $result = SQL_QUERY('SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `value` > 0 ORDER BY `value` ASC',
                        __FUNCTION__, __LINE__);
                        break;
 
                case 'member':
                        // Members are allowed to set to zero mails per day (we will change this soon!)
-                       $result = SQL_QUERY("SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC",
+                       $result = SQL_QUERY('SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC',
                        __FUNCTION__, __LINE__);
                        break;
 
@@ -1171,7 +1171,7 @@ function updateReferalCounter ($userid) {
 // because we need it when there is no ext-admins installed
 function sendAdminEmails ($subj, $message) {
        // Load all admin email addresses
-       $result = SQL_QUERY("SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC", __FUNCTION__, __LINE__);
+       $result = SQL_QUERY('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC', __FUNCTION__, __LINE__);
        while ($content = SQL_FETCHARRAY($result)) {
                // Send the email out
                sendEmail($content['email'], $subj, $message);
@@ -1467,15 +1467,15 @@ function deleteUserAccount ($userid, $reason) {
        $data['points'] = '0';
 
        $result = SQL_QUERY_ESC("SELECT
-       (SUM(p.points) - d.used_points) AS points
+       (SUM(p.`points`) - d.`used_points`) AS `points`
 FROM
        `{?_MYSQL_PREFIX?}_user_points` AS p
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_user_data` AS d
 ON
-       p.userid=d.userid
+       p.`userid`=d.`userid`
 WHERE
-       p.userid=%s
+       p.`userid`=%s
 LIMIT 1",
                array(bigintval($userid)), __FUNCTION__, __LINE__);
 
@@ -1602,7 +1602,7 @@ function generateCategoryOptionsList ($mode) {
        );
 
        // Get categories
-       $result = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`".$whereStatement." ORDER BY `sort` ASC",
+       $result = SQL_QUERY('SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`' . $whereStatement . ' ORDER BY `sort` ASC',
                __FUNCTION__, __LINE__);
 
        // Do we have entries?
@@ -1735,8 +1735,8 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
        // Category given?
        if ($cat > 0) {
                // Select category
-               $CAT_TABS  = "LEFT JOIN `{?_MYSQL_PREFIX?}_user_cats` AS c ON d.userid=c.userid";
-               $CAT_WHERE = sprintf(" AND c.cat_id=%s", $cat);
+               $CAT_TABS  = "LEFT JOIN `{?_MYSQL_PREFIX?}_user_cats` AS c ON d.`userid`=c.`userid`";
+               $CAT_WHERE = sprintf(" AND c.`cat_id`=%s", $cat);
        } // END - if
 
        // Exclude users in holiday?