Previous fix fixed, a lot constants rewritten (unfinished)

diff --git a/beg.php b/beg.php
index d1c103f6118b75a6bb45700d64df167d561ecb4c..077e3cdcc55bc2d7d689fc2d0b5a87c137b071b0 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -70,7 +70,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                if ("".($_GET['uid'] + 0)."" !== "".$_GET['uid']."") {
                        if (EXT_IS_ACTIVE("nickname")) {
                                // Maybe we have found a nickname?
                if ("".($_GET['uid'] + 0)."" !== "".$_GET['uid']."") {
                        if (EXT_IS_ACTIVE("nickname")) {
                                // Maybe we have found a nickname?

-                               $result = SQL_QUERY_ESC("SELECT userid, beg_clicks, ref_payout, status, last_online FROM `{!MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT userid, beg_clicks, ref_payout, status, last_online FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",

                                        array($_GET['uid']), __FILE__, __LINE__);
                        } else {
                                // Nickname entered but nickname is not active
                                        array($_GET['uid']), __FILE__, __LINE__);
                        } else {
                                // Nickname entered but nickname is not active


@@ -79,7 +79,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        }
                } else {
                        // Direct userid
                        }
                } else {
                        // Direct userid

-                       $result = SQL_QUERY_ESC("SELECT userid, beg_clicks, ref_payout, status, last_online FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT userid, beg_clicks, ref_payout, status, last_online FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                                array(bigintval($_GET['uid'])), __FILE__, __LINE__);
                }
 
                                array(bigintval($_GET['uid'])), __FILE__, __LINE__);
                }
 


@@ -121,11 +121,11 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                // User id valid and not webmaster's id?
                if (($uid > 0) && (getConfig('beg_uid') != $uid)) {
                        // Update counter
                // User id valid and not webmaster's id?
                if (($uid > 0) && (getConfig('beg_uid') != $uid)) {
                        // Update counter

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET beg_clicks=beg_clicks+1 WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET beg_clicks=beg_clicks+1 WHERE userid=%s AND status='CONFIRMED' LIMIT 1",

                                array($uid), __FILE__, __LINE__);
 
                        // Check for last entry for userid w/o IP number
                                array($uid), __FILE__, __LINE__);
 
                        // Check for last entry for userid w/o IP number

-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_beg_ips` WHERE (timeout > (UNIX_TIMESTAMP() - ".getConfig('beg_timeout').") OR (timeout > (UNIX_TIMESTAMP() - ".getConfig('beg_uid_timeout').") AND userid=%s)) AND (remote_ip='%s' OR sid='%s') LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_beg_ips` WHERE (timeout > (UNIX_TIMESTAMP() - ".getConfig('beg_timeout').") OR (timeout > (UNIX_TIMESTAMP() - ".getConfig('beg_uid_timeout').") AND userid=%s)) AND (remote_ip='%s' OR sid='%s') LIMIT 1",

                                array($uid, GET_REMOTE_ADDR(), session_id()), __FILE__, __LINE__);
 
                        // Entry not found, points set and not logged in?
                                array($uid, GET_REMOTE_ADDR(), session_id()), __FILE__, __LINE__);
 
                        // Entry not found, points set and not logged in?


@@ -136,7 +136,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                        // Remember remote address, userid and timestamp for next click
                                        // but only when there is no admin begging.
                                        // Admins shall be able to test it!
                                        // Remember remote address, userid and timestamp for next click
                                        // but only when there is no admin begging.
                                        // Admins shall be able to test it!

-                                       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_beg_ips` (userid, remote_ip,sid, timeout) VALUES ('%s','%s','%s', UNIX_TIMESTAMP())",
+                                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_beg_ips` (userid, remote_ip,sid, timeout) VALUES ('%s','%s','%s', UNIX_TIMESTAMP())",

                                                array($uid, GET_REMOTE_ADDR(), session_id()), __FILE__, __LINE__);
 
                                        // Was is successfull?
                                                array($uid, GET_REMOTE_ADDR(), session_id()), __FILE__, __LINE__);
 
                                        // Was is successfull?


@@ -211,7 +211,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        $msg = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
                } elseif (($uid == "0") || ($status == "failed")) {
                        // Inalid or locked account, so let's find out
                        $msg = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
                } elseif (($uid == "0") || ($status == "failed")) {
                        // Inalid or locked account, so let's find out

-                       $result = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",

                                array($_GET['uid']), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Locked account
                                array($_GET['uid']), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Locked account

diff --git a/birthday_confirm.php b/birthday_confirm.php
index 75ea9aa8460fc5c566d38178b0eabc83815faf6a..a40adc6cef05c95476e4d6a0ef3c026d2071390a 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -60,8 +60,8 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 
        // Check if link is not clicked so far
        $result = SQL_QUERY_ESC("SELECT b.points, d.gender, d.surname, d.family, d.status, d.ref_payout
 
        // Check if link is not clicked so far
        $result = SQL_QUERY_ESC("SELECT b.points, d.gender, d.surname, d.family, d.status, d.ref_payout

-FROM `{!MYSQL_PREFIX!}_user_birthday` AS b
-INNER JOIN `{!MYSQL_PREFIX!}_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_user_birthday` AS b
+INNER JOIN `{!_MYSQL_PREFIX!}_user_data` AS d

 ON b.userid=d.userid
 WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
  array($uid, $chk), __FILE__, __LINE__);
 ON b.userid=d.userid
 WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
  array($uid, $chk), __FILE__, __LINE__);


@@ -83,7 +83,7 @@ WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
                        ADD_POINTS_REFSYSTEM("birthday_confirm", $uid, $data['points'], false, "0", $locked, strtolower(getConfig('birthday_mode')));
 
                        // Remove entry from table
                        ADD_POINTS_REFSYSTEM("birthday_confirm", $uid, $data['points'], false, "0", $locked, strtolower(getConfig('birthday_mode')));
 
                        // Remove entry from table

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_birthday` WHERE userid=%s AND chk_value='%s' LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_birthday` WHERE userid=%s AND chk_value='%s' LIMIT 1",

                                array($uid, $chk), __FILE__, __LINE__);
 
                        // Update mediadata if version is 0.0.4 or newer
                                array($uid, $chk), __FILE__, __LINE__);
 
                        // Update mediadata if version is 0.0.4 or newer

diff --git a/click.php b/click.php
index 2cb035d0827613c5ea317be477ce3bf7f4bcc1a5..ee59e6f82511faf8d6c7812e75b5da6827a77617 100644 (file)
--- a/click.php
+++ b/click.php
@@ -46,7 +46,7 @@ require("inc/config.php");
 
 if (((!empty($_GET['user'])) || (!empty($_GET['reseller']))) && (!empty($_GET['banner']))) {
        // Update clicks counter...
 
 if (((!empty($_GET['user'])) || (!empty($_GET['reseller']))) && (!empty($_GET['banner']))) {
        // Update clicks counter...

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_refbanner` SET clicks=clicks+1 WHERE id=%s LIMIT 1", array(bigintval($_GET['banner'])), __FILE__, __LINE__);
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_refbanner` SET clicks=clicks+1 WHERE id=%s LIMIT 1", array(bigintval($_GET['banner'])), __FILE__, __LINE__);

        if (SQL_AFFECTEDROWS() == 1) {
                if (!empty($_GET['user'])) {
                        LOAD_URL("ref.php?refid=".bigintval($_GET['user']));
        if (SQL_AFFECTEDROWS() == 1) {
                if (!empty($_GET['user'])) {
                        LOAD_URL("ref.php?refid=".bigintval($_GET['user']));

diff --git a/doubler.php b/doubler.php
index 9af55bf61c8fc52c71773e121f8dd79e2a9d0a9b..182b473cbb838430740923d87086f7b4f7491682 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -51,7 +51,7 @@ require("inc/config.php");
 // Is the "doubler" extension active?
 if (!EXT_IS_ACTIVE("doubler")) {
        // Redirect to index
 // Is the "doubler" extension active?
 if (!EXT_IS_ACTIVE("doubler")) {
        // Redirect to index

-       LOAD_URL("modules.php?module=index&msg=".CODE_EXTENSION_PROBLEM."&ext=doubler");
+       LOAD_URL("modules.php?module=index&msg={!CODE_EXTENSION_PROBLEM!}&ext=doubler");

 } // END - if
 
 // Is the script installed?
 } // END - if
 
 // Is the script installed?


@@ -67,11 +67,11 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                // Do we have nickname or userid set?
                if ($probe_nickname) {
                        // Nickname in URL, so load the ID
                // Do we have nickname or userid set?
                if ($probe_nickname) {
                        // Nickname in URL, so load the ID

-                       $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",

                                array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
                } else {
                        // Direct userid entered
                                array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
                } else {
                        // Direct userid entered

-                       $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                                array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
                }
 
                                array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
                }
 


@@ -103,11 +103,11 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        $probe_nickname = ((EXT_IS_ACTIVE("nickname")) && (("".round($_POST['userid'])."") != $_POST['userid']));
                        if ($probe_nickname) {
                                // Nickname in URL, so load the ID
                        $probe_nickname = ((EXT_IS_ACTIVE("nickname")) && (("".round($_POST['userid'])."") != $_POST['userid']));
                        if ($probe_nickname) {
                                // Nickname in URL, so load the ID

-                               $result = SQL_QUERY_ESC("SELECT userid, status, password FROM `{!MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT userid, status, password FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",

                                        array($_POST['userid']), __FILE__, __LINE__);
                        } else {
                                // Direct userid entered
                                        array($_POST['userid']), __FILE__, __LINE__);
                        } else {
                                // Direct userid entered

-                               $result = SQL_QUERY_ESC("SELECT userid, status, password FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT userid, status, password FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                                        array(bigintval($_POST['userid'])), __FILE__, __LINE__);
                        }
 
                                        array(bigintval($_POST['userid'])), __FILE__, __LINE__);
                        }
 


@@ -136,7 +136,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                if (($points - getConfig('doubler_left') - $_POST['points'] * getConfig('doubler_charge')) >= 0) 
                                        // Enough points are left so let's continue with the doubling process
                                        // Create doubling "account" width *DOUBLED* points
                                if (($points - getConfig('doubler_left') - $_POST['points'] * getConfig('doubler_charge')) >= 0) 
                                        // Enough points are left so let's continue with the doubling process
                                        // Create doubling "account" width *DOUBLED* points

-                                       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_doubler` (userid, refid, points, remote_ip, timemark, completed, is_ref) VALUES ('%s','%s','%s','".GET_REMOTE_ADDR()."', UNIX_TIMESTAMP(), 'N','N')",
+                                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_doubler` (userid, refid, points, remote_ip, timemark, completed, is_ref) VALUES ('%s','%s','%s','".GET_REMOTE_ADDR()."', UNIX_TIMESTAMP(), 'N','N')",

                                                array($uid, bigintval($GLOBALS['refid']), bigintval($_POST['points'] * 2)), __FILE__, __LINE__);
 
                                        // Subtract entered points
                                                array($uid, bigintval($GLOBALS['refid']), bigintval($_POST['points'] * 2)), __FILE__, __LINE__);
 
                                        // Subtract entered points


@@ -150,7 +150,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                        // Add second line for the referal but only when uid != refid
                                        if (($GLOBALS['refid'] > 0) && ($GLOBALS['refid'] != $uid)) {
                                                // Okay add a refid line and apply refid percents
                                        // Add second line for the referal but only when uid != refid
                                        if (($GLOBALS['refid'] > 0) && ($GLOBALS['refid'] != $uid)) {
                                                // Okay add a refid line and apply refid percents

-                                               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_doubler` (userid, refid, points, remote_ip, timemark, completed, is_ref) VALUES ('%s',0,'%s','".GET_REMOTE_ADDR()."',UNIX_TIMESTAMP(),'N','Y')",
+                                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_doubler` (userid, refid, points, remote_ip, timemark, completed, is_ref) VALUES ('%s',0,'%s','".GET_REMOTE_ADDR()."',UNIX_TIMESTAMP(),'N','Y')",

                                                        array(
                                                                bigintval($GLOBALS['refid']),
                                                                bigintval($_POST['points'] * 2 * getConfig('doubler_ref'))
                                                        array(
                                                                bigintval($GLOBALS['refid']),
                                                                bigintval($_POST['points'] * 2 * getConfig('doubler_ref'))


@@ -167,39 +167,39 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                        define('__DOUBLER_MSG', LOAD_TEMPLATE("doubler_reflink", true, $_POST['userid']));
                                } else {
                                        // Not enougth points left
                                        define('__DOUBLER_MSG', LOAD_TEMPLATE("doubler_reflink", true, $_POST['userid']));
                                } else {
                                        // Not enougth points left

-                                       define('__ERROR_MSG', DOUBLER_FORM_NO_POINTS_LEFT);
+                                       define('__ERROR_MSG', getMessage('DOUBLER_FORM_NO_POINTS_LEFT'));

                                }
                        } elseif ($status == "CONFIRMED") {
                                // Account is unconfirmed!
                                }
                        } elseif ($status == "CONFIRMED") {
                                // Account is unconfirmed!

-                               define('__ERROR_MSG', DOUBLER_FORM_WRONG_PASS);
+                               define('__ERROR_MSG', getMessage('DOUBLER_FORM_WRONG_PASS'));

                        } elseif ($status == "UNCONFIRMED") {
                                // Account is unconfirmed!
                        } elseif ($status == "UNCONFIRMED") {
                                // Account is unconfirmed!

-                               define('__ERROR_MSG', DOUBLER_FORM_STATUS_UNCONFIRMED);
+                               define('__ERROR_MSG', getMessage('DOUBLER_FORM_STATUS_UNCONFIRMED'));

                        } elseif ($status == "LOCKED") {
                                // Account is locked by admin / holiday!
                        } elseif ($status == "LOCKED") {
                                // Account is locked by admin / holiday!

-                               define('__ERROR_MSG', DOUBLER_FORM_STATUS_LOCKED);
+                               define('__ERROR_MSG', getMessage('DOUBLER_FORM_STATUS_LOCKED'));

                        } elseif ($_POST['points'] < getConfig('doubler_min')) {
                                // Not enougth points entered
                        } elseif ($_POST['points'] < getConfig('doubler_min')) {
                                // Not enougth points entered

-                               define('__ERROR_MSG', DOUBLER_FORM_POINTS_MIN);
+                               define('__ERROR_MSG', getMessage('DOUBLER_FORM_POINTS_MIN'));

                        } elseif ($_POST['points'] > getConfig('doubler_max')) {
                                // Too much points entered
                        } elseif ($_POST['points'] > getConfig('doubler_max')) {
                                // Too much points entered

-                               define('__ERROR_MSG', DOUBLER_FORM_POINTS_MAX);
+                               define('__ERROR_MSG', getMessage('DOUBLER_FORM_POINTS_MAX'));

                        } elseif ($probe_nickname) {
                                // Cannot resolv nickname -> userid
                        } elseif ($probe_nickname) {
                                // Cannot resolv nickname -> userid

-                               define('__ERROR_MSG', DOUBLER_FORM_404_NICKNAME);
+                               define('__ERROR_MSG', getMessage('DOUBLER_FORM_404_NICKNAME'));

                        } else {
                                // Wrong password or account not found
                        } else {
                                // Wrong password or account not found

-                               define('__ERROR_MSG', DOUBLER_FORM_404_MEMBER);
+                               define('__ERROR_MSG', getMessage('DOUBLER_FORM_404_MEMBER'));

                        }
                } elseif (empty($_POST['userid'])) {
                        // Login not entered
                        }
                } elseif (empty($_POST['userid'])) {
                        // Login not entered

-                       define('__ERROR_MSG', DOUBLER_FORM_404_LOGIN);
+                       define('__ERROR_MSG', getMessage('DOUBLER_FORM_404_LOGIN'));

                } elseif (empty($_POST['pass'])) {
                        // Password not entered
                } elseif (empty($_POST['pass'])) {
                        // Password not entered

-                       define('__ERROR_MSG', DOUBLER_FORM_404_PASSWORD);
+                       define('__ERROR_MSG', getMessage('DOUBLER_FORM_404_PASSWORD'));

                } elseif (empty($_POST['points'])) {
                        // points not entered
                } elseif (empty($_POST['points'])) {
                        // points not entered

-                       define('__ERROR_MSG', DOUBLER_FORM_404_POINTS);
+                       define('__ERROR_MSG', getMessage('DOUBLER_FORM_404_POINTS'));

                }
        }
 
                }
        }
 


@@ -238,21 +238,21 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Text "Enter login"
        if (EXT_IS_ACTIVE("nickname")) {
                // Choose login/nickname
        // Text "Enter login"
        if (EXT_IS_ACTIVE("nickname")) {
                // Choose login/nickname

-               define('DOUBLER_ENTER_LOGIN', GUEST_ENTER_LOGIN_NICKNAME);
+               define('DOUBLER_ENTER_LOGIN', getMessage('GUEST_ENTER_LOGIN_NICKNAME'));

        } else {
                // Simple login ID
        } else {
                // Simple login ID

-               define('DOUBLER_ENTER_LOGIN', GUEST_ENTER_LOGIN);
+               define('DOUBLER_ENTER_LOGIN', getMessage('GUEST_ENTER_LOGIN'));

        }
 
        // Which mail-send-mode did the admin setup?
        switch (getConfig('doubler_send_mode'))
        {
        case "DIRECT":
        }
 
        // Which mail-send-mode did the admin setup?
        switch (getConfig('doubler_send_mode'))
        {
        case "DIRECT":

-               define('DOUBLER_PAYOUT_TIME', DOUBLER_PAYOUT_TIME_DIRECT);
+               define('DOUBLER_PAYOUT_TIME', getMessage('DOUBLER_PAYOUT_TIME_DIRECT'));

                break;
 
        case "RESET":
                break;
 
        case "RESET":

-               define('DOUBLER_PAYOUT_TIME', DOUBLER_PAYOUT_TIME_RESET);
+               define('DOUBLER_PAYOUT_TIME', getMessage('DOUBLER_PAYOUT_TIME_RESET'));

                break;
        }
 
                break;
        }
 

diff --git a/inc/autopurge/purge-general.php b/inc/autopurge/purge-general.php
index 8e8f722ffcdc512b98288ba3763d7fa22c45ebb2..a11fc14b333f8b9a65dbe635420900081dd6eaf6 100644 (file)
--- a/inc/autopurge/purge-general.php
+++ b/inc/autopurge/purge-general.php
@@ -53,17 +53,17 @@ if ((getConfig('auto_purge_active') == "Y") && (getConfig('auto_purge') > 0)) {
 
        // Then check for outdated mail order. We don't delete them just the confirmation links will be deleted.
        $result = SQL_QUERY_ESC("SELECT s.id, s.userid, s.pool_id, t.price
 
        // Then check for outdated mail order. We don't delete them just the confirmation links will be deleted.
        $result = SQL_QUERY_ESC("SELECT s.id, s.userid, s.pool_id, t.price

-FROM `{!MYSQL_PREFIX!}_user_stats` AS s
-LEFT JOIN `{!MYSQL_PREFIX!}_payments` AS t
+FROM `{!_MYSQL_PREFIX!}_user_stats` AS s
+LEFT JOIN `{!_MYSQL_PREFIX!}_payments` AS t

 ON s.payment_id=t.id
 WHERE s.timestamp_ordered <= (UNIX_TIMESTAMP() - %s) ORDER BY s.userid",
         array(bigintval($PURGE)), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Start deleting procedure
                $uid = 0; $points = 0;
 ON s.payment_id=t.id
 WHERE s.timestamp_ordered <= (UNIX_TIMESTAMP() - %s) ORDER BY s.userid",
         array(bigintval($PURGE)), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Start deleting procedure
                $uid = 0; $points = 0;

-               while(list($mid, $sender, $pool, $price) = SQL_FETCHROW($result)) {
+               while (list($mid, $sender, $pool, $price) = SQL_FETCHROW($result)) {

                        // Check if confirmation links are purged or not
                        // Check if confirmation links are purged or not

-                       $result_links = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_links` WHERE stats_id=%s LIMIT 1",
+                       $result_links = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_links` WHERE stats_id=%s LIMIT 1",

                         array(bigintval($mid)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result_links) == 1) {
                                // Free memory
                         array(bigintval($mid)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result_links) == 1) {
                                // Free memory


@@ -80,11 +80,11 @@ WHERE s.timestamp_ordered <= (UNIX_TIMESTAMP() - %s) ORDER BY s.userid",
                                $uid = $sender; $points += $price; $admin_points += $price;
 
                                // Remove confirmation links from queue
                                $uid = $sender; $points += $price; $admin_points += $price;
 
                                // Remove confirmation links from queue

-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_links` WHERE stats_id=%s",
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE stats_id=%s",

                                        array(bigintval($mid)), __FILE__, __LINE__);
 
                                // Update status of order
                                        array(bigintval($mid)), __FILE__, __LINE__);
 
                                // Update status of order

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_pool` SET data_type='DELETED' WHERE id=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET data_type='DELETED' WHERE id=%s LIMIT 1",

                                        array(bigintval($pool)), __FILE__, __LINE__);
                        } // END - if
                } // END - while
                                        array(bigintval($pool)), __FILE__, __LINE__);
                        } // END - if
                } // END - while


@@ -99,14 +99,14 @@ WHERE s.timestamp_ordered <= (UNIX_TIMESTAMP() - %s) ORDER BY s.userid",
        // Is the 'bonus' extension installed and activated?
        if (EXT_IS_ACTIVE("bonus", true)) {
                // Check for bonus campaigns
        // Is the 'bonus' extension installed and activated?
        if (EXT_IS_ACTIVE("bonus", true)) {
                // Check for bonus campaigns

-               $result = SQL_QUERY_ESC("SELECT id, points FROM `{!MYSQL_PREFIX!}_bonus` WHERE data_type='SEND' AND timestamp <= %s ORDER BY id",
+               $result = SQL_QUERY_ESC("SELECT id, points FROM `{!_MYSQL_PREFIX!}_bonus` WHERE data_type='SEND' AND timestamp <= %s ORDER BY `id`",

                        array(bigintval($PURGE)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) > 0) {
                        // Start deleting procedure
                        $points = 0;
                        while (list($bid, $price) = SQL_FETCHROW($result)) {
                                // Check if confirmation links are purged or not
                        array(bigintval($PURGE)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) > 0) {
                        // Start deleting procedure
                        $points = 0;
                        while (list($bid, $price) = SQL_FETCHROW($result)) {
                                // Check if confirmation links are purged or not

-                               $result_links = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",
+                               $result_links = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",

                                        array(bigintval($bid)), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result_links) > 0) {
                                        // At least one link was found, enougth to pay back the points
                                        array(bigintval($bid)), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result_links) > 0) {
                                        // At least one link was found, enougth to pay back the points


@@ -116,11 +116,11 @@ WHERE s.timestamp_ordered <= (UNIX_TIMESTAMP() - %s) ORDER BY s.userid",
                                        SQL_FREERESULT($result_links);
 
                                        // Remove confirmation links from queue
                                        SQL_FREERESULT($result_links);
 
                                        // Remove confirmation links from queue

-                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",
+                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",

                                                array(bigintval($bid)), __FILE__, __LINE__);
 
                                        // Update status of order
                                                array(bigintval($bid)), __FILE__, __LINE__);
 
                                        // Update status of order

-                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_bonus` SET data_type='DELETED' WHERE id=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET data_type='DELETED' WHERE id=%s LIMIT 1",

                                                array(bigintval($bid)), __FILE__, __LINE__);
                                } // END - if
                        } // END - while
                                                array(bigintval($bid)), __FILE__, __LINE__);
                                } // END - if
                        } // END - while

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index 65250b8a9d79612788b398b6de1498096a66ef3d..3303cda344627552db4235829dba9b95810bab54 100644 (file)
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -67,7 +67,7 @@ if (getConfig('autopurge_inactive') == "Y") {
 
        // Check for all accounts
        $result_inactive = SQL_QUERY_ESC("SELECT DISTINCT d.userid, d.email, d.last_online
 
        // Check for all accounts
        $result_inactive = SQL_QUERY_ESC("SELECT DISTINCT d.userid, d.email, d.last_online

-FROM `{!MYSQL_PREFIX!}_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_user_data` AS d

 WHERE d.status='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - %s) AND d.last_online < (UNIX_TIMESTAMP() - %s) AND d.ap_notified < (UNIX_TIMESTAMP() - %s)
 ".$EXCLUDE_LIST."
 ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
 WHERE d.status='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - %s) AND d.last_online < (UNIX_TIMESTAMP() - %s) AND d.ap_notified < (UNIX_TIMESTAMP() - %s)
 ".$EXCLUDE_LIST."
 ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);


@@ -79,7 +79,7 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
                define('__INACTIVE_TIME' , (getConfig('ap_in_time')  / 60 / 60));
 
                // Mark found accounts as inactive and send an email
                define('__INACTIVE_TIME' , (getConfig('ap_in_time')  / 60 / 60));
 
                // Mark found accounts as inactive and send an email

-               while(list($uid, $email, $last) = SQL_FETCHROW($result_inactive)) {
+               while (list($uid, $email, $last) = SQL_FETCHROW($result_inactive)) {

                        // Remember userids for the admin
                        $UIDs .= $uid.", ";
 
                        // Remember userids for the admin
                        $UIDs .= $uid.", ";
 


@@ -91,7 +91,7 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
                        SEND_EMAIL($email, AUTOPURGE_MEMBER_INACTIVE_SUBJECT, $msg);
 
                        // Update this account
                        SEND_EMAIL($email, AUTOPURGE_MEMBER_INACTIVE_SUBJECT, $msg);
 
                        // Update this account

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET ap_notified=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ap_notified=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",

                                array(bigintval($uid)), __FILE__, __LINE__);
                } // END - while
 
                                array(bigintval($uid)), __FILE__, __LINE__);
                } // END - while
 


@@ -109,7 +109,7 @@ ORDER BY d.userid", array($since, $since, $since), __FILE__, __LINE__);
        // here for e.g. excluding holiday users
        $time = bigintval(getConfig('ap_in_time'));
        $result_inactive = SQL_QUERY_ESC("SELECT d.userid, d.email, d.last_online
        // here for e.g. excluding holiday users
        $time = bigintval(getConfig('ap_in_time'));
        $result_inactive = SQL_QUERY_ESC("SELECT d.userid, d.email, d.last_online

-FROM `{!MYSQL_PREFIX!}_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_user_data` AS d

 WHERE status='CONFIRMED' AND joined < (UNIX_TIMESTAMP() - %s) AND last_online < (UNIX_TIMESTAMP() - %s) AND ap_notified < (UNIX_TIMESTAMP() - %s)
 ".$EXCLUDE_LIST."
 ORDER BY userid",
 WHERE status='CONFIRMED' AND joined < (UNIX_TIMESTAMP() - %s) AND last_online < (UNIX_TIMESTAMP() - %s) AND ap_notified < (UNIX_TIMESTAMP() - %s)
 ".$EXCLUDE_LIST."
 ORDER BY userid",

diff --git a/inc/autopurge/purge-mails.php b/inc/autopurge/purge-mails.php
index 0adcd3e18726614b0fb2f66d3d89f74b1d50657e..d1aeb1d3de36f150d9e72413f72c97567e9a9241 100644 (file)
--- a/inc/autopurge/purge-mails.php
+++ b/inc/autopurge/purge-mails.php
@@ -48,7 +48,7 @@ if (getConfig('ap_del_mails') == "Y") {
        // Okay, let's check for them...
        $since = bigintval(getConfig('ap_dm_timeout'));
        $result_mails = SQL_QUERY_ESC("SELECT sender\
        // Okay, let's check for them...
        $since = bigintval(getConfig('ap_dm_timeout'));
        $result_mails = SQL_QUERY_ESC("SELECT sender\

-FROM `{!MYSQL_PREFIX!}_pool`
+FROM `{!_MYSQL_PREFIX!}_pool`

 WHERE data_type='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - %s)
 ORDER BY sender ASC",
         array($since), __FILE__, __LINE__);
 WHERE data_type='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - %s)
 ORDER BY sender ASC",
         array($since), __FILE__, __LINE__);


@@ -59,20 +59,20 @@ ORDER BY sender ASC",
        // Do we have "purged" mails?
        if (SQL_NUMROWS($result_mails) > 0) {
                // Okay, check for their sender's
        // Do we have "purged" mails?
        if (SQL_NUMROWS($result_mails) > 0) {
                // Okay, check for their sender's

-               while(list($sender) = SQL_FETCHROW($result_mails)) {
+               while (list($sender) = SQL_FETCHROW($result_mails)) {

                        // Check now...
                        // Check now...

-                       $fount = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                       $fount = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                                array(bigintval($sender)), __FILE__, __LINE__));
                        if ($found == 0) {
                                // Okay we found some mails!
                                array(bigintval($sender)), __FILE__, __LINE__));
                        if ($found == 0) {
                                // Okay we found some mails!

-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_pool` WHERE sender=%s",
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_pool` WHERE sender=%s",

                                        array(bigintval($sender)), __FILE__, __LINE__);
                                $DELETED += SQL_AFFECTEDROWS();
 
                                // Reset query (to prevent possible errors) ...
                                $since = bigintval(getConfig('ap_dm_timeout'));
                                $result_mails = SQL_QUERY_ESC("SELECT sender
                                        array(bigintval($sender)), __FILE__, __LINE__);
                                $DELETED += SQL_AFFECTEDROWS();
 
                                // Reset query (to prevent possible errors) ...
                                $since = bigintval(getConfig('ap_dm_timeout'));
                                $result_mails = SQL_QUERY_ESC("SELECT sender

-FROM `{!MYSQL_PREFIX!}_pool`
+FROM `{!_MYSQL_PREFIX!}_pool`

 WHERE data_type='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - %s)
 ORDER BY sender ASC",
                                        array($since), __FILE__, __LINE__);
 WHERE data_type='DELETED' AND timestamp <= (UNIX_TIMESTAMP() - %s)
 ORDER BY sender ASC",
                                        array($since), __FILE__, __LINE__);


@@ -86,7 +86,7 @@ ORDER BY sender ASC",
        // Now let's check for stats entries as well
        $since = bigintval(getConfig('ap_dm_timeout'));
        $result_mails = SQL_QUERY_ESC("SELECT sender
        // Now let's check for stats entries as well
        $since = bigintval(getConfig('ap_dm_timeout'));
        $result_mails = SQL_QUERY_ESC("SELECT sender

-FROM `{!MYSQL_PREFIX!}_user_stats`
+FROM `{!_MYSQL_PREFIX!}_user_stats`

 WHERE data_type='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - %s)
 ORDER BY sender ASC",
                array($since), __FILE__, __LINE__);
 WHERE data_type='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - %s)
 ORDER BY sender ASC",
                array($since), __FILE__, __LINE__);


@@ -94,18 +94,18 @@ ORDER BY sender ASC",
        // Do we have "purged" mails?
        if (SQL_NUMROWS($result_mails) > 0) {
                // Okay, check for their sender's
        // Do we have "purged" mails?
        if (SQL_NUMROWS($result_mails) > 0) {
                // Okay, check for their sender's

-               while(list($sender) = SQL_FETCHROW($result_mails)) {
+               while (list($sender) = SQL_FETCHROW($result_mails)) {

                        // Check now...
                        // Check now...

-                       $found = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($sender)), __FILE__, __LINE__));
+                       $found = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($sender)), __FILE__, __LINE__));

                        if ($found == 0) {
                                // Okay we found some mails!
                        if ($found == 0) {
                                // Okay we found some mails!

-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_stats` WHERE sender=%s", array(bigintval($sender)), __FILE__, __LINE__);
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE sender=%s", array(bigintval($sender)), __FILE__, __LINE__);

                                $DELETED += SQL_AFFECTEDROWS();
 
                                // Reset query (to prevent possible errors) ...
                                $since = bigintval(getConfig('ap_dm_timeout'));
                                $result_mails = SQL_QUERY_ESC("SELECT sender
                                $DELETED += SQL_AFFECTEDROWS();
 
                                // Reset query (to prevent possible errors) ...
                                $since = bigintval(getConfig('ap_dm_timeout'));
                                $result_mails = SQL_QUERY_ESC("SELECT sender

-FROM `{!MYSQL_PREFIX!}_user_stats`
+FROM `{!_MYSQL_PREFIX!}_user_stats`

 WHERE data_type='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - %s)
 ORDER BY sender ASC",
                                        array($since), __FILE__, __LINE__);
 WHERE data_type='DELETED' AND timestamp_send <= (UNIX_TIMESTAMP() - %s)
 ORDER BY sender ASC",
                                        array($since), __FILE__, __LINE__);

diff --git a/inc/autopurge/purge-tsks.php b/inc/autopurge/purge-tsks.php
index 470c7cb2ea2d9f0783ecd12536c32dc241b8fc2b..7c82489dddd77ea39b34263c5fb79352d255d832 100644 (file)
--- a/inc/autopurge/purge-tsks.php
+++ b/inc/autopurge/purge-tsks.php
@@ -50,7 +50,7 @@ if ((GET_EXT_VERSION("task") > "0.0") && (getConfig('ap_tasks') == "Y")) {
 
        // Purge deleted tasks (no notification to admin)
        SQL_QUERY_ESC("DELETE LOW_PRIORITY
 
        // Purge deleted tasks (no notification to admin)
        SQL_QUERY_ESC("DELETE LOW_PRIORITY

-FROM `{!MYSQL_PREFIX!}_task_system`
+FROM `{!_MYSQL_PREFIX!}_task_system`

 WHERE status='DELETED' AND task_created <= (UNIX_TIMESTAMP() - %s)",
                array($since), __FILE__, __LINE__);
        $DELETED = SQL_AFFECTEDROWS();
 WHERE status='DELETED' AND task_created <= (UNIX_TIMESTAMP() - %s)",
                array($since), __FILE__, __LINE__);
        $DELETED = SQL_AFFECTEDROWS();

diff --git a/inc/autopurge/purge-unconfirmed.php b/inc/autopurge/purge-unconfirmed.php
index 5313b4dd7b5822b8f07dab9b93ddc2b62fa8bc3a..f834a18be52f063486b2f67a05e84ccb374949fb 100644 (file)
--- a/inc/autopurge/purge-unconfirmed.php
+++ b/inc/autopurge/purge-unconfirmed.php
@@ -48,7 +48,7 @@ if (getConfig('autopurge_unconfirmed') == "Y") {
        // Init variables and find unconfirmed accounts which I shall auto-purge
        $time = bigintval(getConfig('ap_un_time'));
        $result_uncon = SQL_QUERY_ESC("SELECT userid, email, joined
        // Init variables and find unconfirmed accounts which I shall auto-purge
        $time = bigintval(getConfig('ap_un_time'));
        $result_uncon = SQL_QUERY_ESC("SELECT userid, email, joined

-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE status='UNCONFIRMED' AND joined < (UNIX_TIMESTAMP() - %s)
 ORDER BY userid ASC",
         array($time), __FILE__, __LINE__);
 WHERE status='UNCONFIRMED' AND joined < (UNIX_TIMESTAMP() - %s)
 ORDER BY userid ASC",
         array($time), __FILE__, __LINE__);

diff --git a/inc/doubler_send.php b/inc/doubler_send.php
index 7bc256c5a17b8be5cba87be4411b1e8850817555..02d7b56d841e949d9d53ecd8780fa8286ad3ce86 100644 (file)
--- a/inc/doubler_send.php
+++ b/inc/doubler_send.php
@@ -56,16 +56,16 @@ if (empty($DOUBLER_UID)) $DOUBLER_UID = 0;
 // Check for doubles which we can pay out
 $min = bigintval(getConfig('doubler_min') * 2);
 $result_total = SQL_QUERY_ESC("SELECT DISTINCT d.id, d.userid, d.points, d.remote_ip, d.timemark
 // Check for doubles which we can pay out
 $min = bigintval(getConfig('doubler_min') * 2);
 $result_total = SQL_QUERY_ESC("SELECT DISTINCT d.id, d.userid, d.points, d.remote_ip, d.timemark

-FROM `{!MYSQL_PREFIX!}_doubler` AS d
-LEFT JOIN `{!MYSQL_PREFIX!}_user_data` AS u
+FROM `{!_MYSQL_PREFIX!}_doubler` AS d
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS u

 ON d.userid=u.userid
 WHERE u.status='CONFIRMED' AND d.points <= %s AND d.points >= %s AND d.completed='N' AND d.is_ref='N'
 ORDER BY d.timemark", array($DOUBLER_POINTS, $min), __FILE__, __LINE__);
 
 // Check for accounts with limitation
 $result_main = SQL_QUERY_ESC("SELECT DISTINCT d.id, d.userid, d.points, d.remote_ip, d.timemark
 ON d.userid=u.userid
 WHERE u.status='CONFIRMED' AND d.points <= %s AND d.points >= %s AND d.completed='N' AND d.is_ref='N'
 ORDER BY d.timemark", array($DOUBLER_POINTS, $min), __FILE__, __LINE__);
 
 // Check for accounts with limitation
 $result_main = SQL_QUERY_ESC("SELECT DISTINCT d.id, d.userid, d.points, d.remote_ip, d.timemark

-FROM `{!MYSQL_PREFIX!}_doubler` AS d
-LEFT JOIN `{!MYSQL_PREFIX!}_user_data` AS u
+FROM `{!_MYSQL_PREFIX!}_doubler` AS d
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS u

 ON d.userid=u.userid
 WHERE u.status='CONFIRMED' AND d.points <= %s AND d.points >= %s AND d.completed='N' AND d.is_ref='N'
 ORDER BY d.timemark
 ON d.userid=u.userid
 WHERE u.status='CONFIRMED' AND d.points <= %s AND d.points >= %s AND d.completed='N' AND d.is_ref='N'
 ORDER BY d.timemark


@@ -78,7 +78,7 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == "Y"))
        if ((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == "Y")) $result_load = $result_total;
 
        // At least one account was found
        if ((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == "Y")) $result_load = $result_total;
 
        // At least one account was found

-       while(list($id, $uid, $points, $ip, $time) = SQL_FETCHROW($result_load)) {
+       while (list($id, $uid, $points, $ip, $time) = SQL_FETCHROW($result_load)) {

                // Only double when points are enougth!
                if ($DOUBLER_POINTS >= $points) {
                        // Check for his ref points
                // Only double when points are enougth!
                if ($DOUBLER_POINTS >= $points) {
                        // Check for his ref points


@@ -89,7 +89,7 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == "Y"))
                        if (($ref > 0) && ($DOUBLER_UID == $uid) && (!empty($ref))) {
                                // Referal points found so add them and set line(s) to completed='Y'
                                $points += $ref;
                        if (($ref > 0) && ($DOUBLER_UID == $uid) && (!empty($ref))) {
                                // Referal points found so add them and set line(s) to completed='Y'
                                $points += $ref;

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_doubler` SET completed='Y' WHERE refid=%s AND completed='N' AND is_ref='Y'",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_doubler` SET completed='Y' WHERE refid=%s AND completed='N' AND is_ref='Y'",

                                        array(bigintval($uid)), __FILE__, __LINE__);
                        } else {
                                // No referal points found
                                        array(bigintval($uid)), __FILE__, __LINE__);
                        } else {
                                // No referal points found


@@ -103,7 +103,7 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == "Y"))
                        } // END - if
 
                        // Set entry as "payed"
                        } // END - if
 
                        // Set entry as "payed"

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_doubler` SET completed='Y' WHERE id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_doubler` SET completed='Y' WHERE id=%s LIMIT 1",

                                array(bigintval($id)), __FILE__, __LINE__);
 
                        $OK = false;
                                array(bigintval($id)), __FILE__, __LINE__);
 
                        $OK = false;

diff --git a/inc/extensions.php b/inc/extensions.php
index c98644a484be119a8a914a01e98b84d38df64b41..91646a16cc79a8a65afc9976cacc9e67042c16b5 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -216,7 +216,7 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
                                RUN_FILTER('pre_extension_installed', array('dry_run' => $dry_run, 'sqls' => $SQLs));
 
                                // Register extension
                                RUN_FILTER('pre_extension_installed', array('dry_run' => $dry_run, 'sqls' => $SQLs));
 
                                // Register extension

-                               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_extensions` (ext_name, ext_active, ext_version) VALUES ('%s','%s','%s')",
+                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_extensions` (ext_name, ext_active, ext_version) VALUES ('%s','%s','%s')",

                                        array($ext_name, $EXT_ALWAYS_ACTIVE, $EXT_VERSION), __FILE__, __LINE__);
 
                                // Remove cache file(s) if extension is active
                                        array($ext_name, $EXT_ALWAYS_ACTIVE, $EXT_VERSION), __FILE__, __LINE__);
 
                                // Remove cache file(s) if extension is active


@@ -243,7 +243,7 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
                }
        } elseif (($task_id > 0) && (!empty($ext_name))) {
                // Remove task from system when id and extension's name is valid
                }
        } elseif (($task_id > 0) && (!empty($ext_name))) {
                // Remove task from system when id and extension's name is valid

-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_task_system` WHERE id=%s AND status='NEW' LIMIT 1",
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_task_system` WHERE id=%s AND status='NEW' LIMIT 1",

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


@@ -296,7 +296,7 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
                // Removal mode?
                if ($load_mode == "remove") {
                        // Delete this extension (remember to remove it from your server *before* you click on welcome!
                // Removal mode?
                if ($load_mode == "remove") {
                        // Delete this extension (remember to remove it from your server *before* you click on welcome!

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",

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


@@ -337,7 +337,7 @@ function EXT_IS_ACTIVE ($ext_name) {
        } elseif (($ext_name == "cache") || (GET_EXT_VERSION("cache") == "")) {
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "DB! ext_name={$ext_name}");
                // Load from database
        } elseif (($ext_name == "cache") || (GET_EXT_VERSION("cache") == "")) {
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "DB! ext_name={$ext_name}");
                // Load from database

-               $result = SQL_QUERY_ESC("SELECT ext_active FROM `{!MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",

                        array($ext_name), __FILE__, __LINE__);
 
                // Entry found?
                        array($ext_name), __FILE__, __LINE__);
 
                // Entry found?


@@ -383,7 +383,7 @@ function GET_EXT_VERSION ($ext_name) {
                incrementConfigEntry('cache_hits');
        } elseif (!is_object($cacheInstance)) {
                // Load from database
                incrementConfigEntry('cache_hits');
        } elseif (!is_object($cacheInstance)) {
                // Load from database

-               $result = SQL_QUERY_ESC("SELECT ext_version FROM `{!MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT ext_version FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",

                        array($ext_name), __FILE__, __LINE__);
 
                // Is the extension there?
                        array($ext_name), __FILE__, __LINE__);
 
                // Is the extension there?


@@ -479,7 +479,7 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
                        CREATE_EXTENSION_UPDATE_TASK(GET_CURRENT_ADMIN_ID(), $ext_name, $cacheArray['update_ver'][$ext_name], addslashes($NOTES));
 
                        // Update extension's version
                        CREATE_EXTENSION_UPDATE_TASK(GET_CURRENT_ADMIN_ID(), $ext_name, $cacheArray['update_ver'][$ext_name], addslashes($NOTES));
 
                        // Update extension's version

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_extensions` SET ext_version='%s' WHERE ext_name='%s' LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_version='%s' WHERE ext_name='%s' LIMIT 1",

                                array($cacheArray['update_ver'][$ext_name], $ext_name), __FILE__, __LINE__);
 
                        // Remove arrays
                                array($cacheArray['update_ver'][$ext_name], $ext_name), __FILE__, __LINE__);
 
                        // Remove arrays


@@ -545,7 +545,7 @@ function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = ADMIN_SQLS_EXECUT
                $OUT = LOAD_TEMPLATE("admin_ext_sql_table", true, $content);
        } elseif ((GET_EXT_VERSION("sql_patches") >= "0.0.7") && (getConfig('verbose_sql') == "Y")) {
                // No addional SQL commands to run
                $OUT = LOAD_TEMPLATE("admin_ext_sql_table", true, $content);
        } elseif ((GET_EXT_VERSION("sql_patches") >= "0.0.7") && (getConfig('verbose_sql') == "Y")) {
                // No addional SQL commands to run

-               $OUT = LOAD_TEMPLATE("admin_settings_saved", true, ADMIN_NO_ADDITIONAL_SQLS);
+               $OUT = LOAD_TEMPLATE("admin_settings_saved", true, getMessage('ADMIN_NO_ADDITIONAL_SQLS'));

        } // END - if
 
        // Return output
        } // END - if
 
        // Return output


@@ -568,7 +568,7 @@ function GET_EXT_NAME ($ext_id) {
                incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database

-               $result = SQL_QUERY_ESC("SELECT ext_name FROM `{!MYSQL_PREFIX!}_extensions` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT ext_name FROM `{!_MYSQL_PREFIX!}_extensions` WHERE id=%s LIMIT 1",

                        array(bigintval($ext_id)), __FILE__, __LINE__);
                list($ret) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                        array(bigintval($ext_id)), __FILE__, __LINE__);
                list($ret) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);


@@ -590,7 +590,7 @@ function GET_EXT_ID ($ext_name) {
                incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database

-               $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",

                        array($ext_name), __FILE__, __LINE__);
                list($ret) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                        array($ext_name), __FILE__, __LINE__);
                list($ret) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);


@@ -603,7 +603,7 @@ function GET_EXT_ID ($ext_name) {
 // Activate given extension
 function ACTIVATE_EXTENSION ($ext_name) {
        // Activate the extension
 // Activate given extension
 function ACTIVATE_EXTENSION ($ext_name) {
        // Activate the extension

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_extensions` SET ext_active='Y' WHERE ext_name='%s' LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='Y' WHERE ext_name='%s' LIMIT 1",

                array($ext_name), __FILE__, __LINE__);
 
        // Extension has been activated?
                array($ext_name), __FILE__, __LINE__);
 
        // Extension has been activated?


@@ -616,7 +616,7 @@ function ACTIVATE_EXTENSION ($ext_name) {
 // Deactivate given extension
 function DEACTIVATE_EXTENSION($ext_name) {
        // Activate the extension
 // Deactivate given extension
 function DEACTIVATE_EXTENSION($ext_name) {
        // Activate the extension

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_extensions` SET ext_active='N' WHERE ext_name='%s' LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='N' WHERE ext_name='%s' LIMIT 1",

                array($ext_name), __FILE__, __LINE__);
 
        // Extension has been activated?
                array($ext_name), __FILE__, __LINE__);
 
        // Extension has been activated?


@@ -655,7 +655,7 @@ function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $ext_name, $ext_ver, $notes) {
                // Check if task is not there
                if (DETERMINE_TASK_ID_BY_SUBJECT($subject) == 0) {
                        // Task not created so it's a brand-new extension which we need to register and create a task for!
                // Check if task is not there
                if (DETERMINE_TASK_ID_BY_SUBJECT($subject) == 0) {
                        // Task not created so it's a brand-new extension which we need to register and create a task for!

-                       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_task_system` (assigned_admin, userid, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','EXTENSION_UPDATE','%s','%s', UNIX_TIMESTAMP())",
+                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (assigned_admin, userid, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','EXTENSION_UPDATE','%s','%s', UNIX_TIMESTAMP())",

                                array($admin_id, $subject, $notes), __FILE__, __LINE__);
                } // END - if
        } // END - if
                                array($admin_id, $subject, $notes), __FILE__, __LINE__);
                } // END - if
        } // END - if


@@ -682,7 +682,7 @@ function CREATE_NEW_EXTENSION_TASK ($admin_id, $subject, $ext) {
                }
 
                // Task not created so it's a brand-new extension which we need to register and create a task for!
                }
 
                // Task not created so it's a brand-new extension which we need to register and create a task for!

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_task_system` (assigned_admin, userid, status, task_type, subject, text, task_created)
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (assigned_admin, userid, status, task_type, subject, text, task_created)

 VALUES (%s,0,'NEW','EXTENSION','%s','%s',UNIX_TIMESTAMP())",
                        array(
                                $admin_id,
 VALUES (%s,0,'NEW','EXTENSION','%s','%s',UNIX_TIMESTAMP())",
                        array(
                                $admin_id,


@@ -701,7 +701,7 @@ function CREATE_EXTENSION_DEACTIVATION_TASK ($ext) {
        // Not installed and do we have created a task for the admin?
        if ((DETERMINE_TASK_ID_BY_SUBJECT($subject) == 0) && (GET_EXT_VERSION($ext) != "")) {
                // Task not created so add it
        // Not installed and do we have created a task for the admin?
        if ((DETERMINE_TASK_ID_BY_SUBJECT($subject) == 0) && (GET_EXT_VERSION($ext) != "")) {
                // Task not created so add it

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_task_system` (assigned_admin, userid, status, task_type, subject, text, task_created)
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (assigned_admin, userid, status, task_type, subject, text, task_created)

 VALUES (0,0,'NEW','EXTENSION_DEACTIVATION','%s','%s',UNIX_TIMESTAMP())",
                        array(
                                $subject,
 VALUES (0,0,'NEW','EXTENSION_DEACTIVATION','%s','%s',UNIX_TIMESTAMP())",
                        array(
                                $subject,


@@ -734,7 +734,7 @@ function MODULE_HAS_MENU ($mod, $forceDb = false) {
                }
        } elseif ((GET_EXT_VERSION("sql_patches") >= "0.3.6") && ((!EXT_IS_ACTIVE("cache")) || ($forceDb === true))) {
                // Check database for entry
                }
        } elseif ((GET_EXT_VERSION("sql_patches") >= "0.3.6") && ((!EXT_IS_ACTIVE("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 = SQL_QUERY_ESC("SELECT has_menu FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE module='%s' LIMIT 1",

                        array($mod), __FILE__, __LINE__);
 
                // Entry found?
                        array($mod), __FILE__, __LINE__);
 
                // Entry found?


@@ -767,7 +767,7 @@ function DETERMINE_EXTENSION_TASK_ID ($ext_name) {
        $task_id = 0;
 
        // Search for extension task's id
        $task_id = 0;
 
        // Search for extension task's id

-       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_task_system` WHERE task_type='EXTENSION' AND subject='[%s:]' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_task_system` WHERE task_type='EXTENSION' AND subject='[%s:]' LIMIT 1",

                array($ext_name), __FILE__, __LINE__);
 
        // Entry found?
                array($ext_name), __FILE__, __LINE__);
 
        // Entry found?


@@ -789,7 +789,7 @@ function DETERMINE_TASK_ID_BY_SUBJECT ($subject) {
        $task_id = 0;
 
        // Search for task id
        $task_id = 0;
 
        // Search for task id

-       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_task_system` WHERE subject LIKE '%s%%' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_task_system` WHERE subject LIKE '%s%%' LIMIT 1",

                array($subject), __FILE__, __LINE__);
 
        // Entry found?
                array($subject), __FILE__, __LINE__);
 
        // Entry found?

diff --git a/inc/extensions/ext-active.php b/inc/extensions/ext-active.php
index 6939a6199c04254077005785601ad651f3fd2cbc..9cf42e08189f3e813d4585750f6ba03d84fe1672 100644 (file)
--- a/inc/extensions/ext-active.php
+++ b/inc/extensions/ext-active.php
@@ -50,7 +50,7 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','active','Heute Online', 10, 'N','Y')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','active','Heute Online', 10, 'N','Y')";

 
        // Load CSS file?
        $EXT_CSS = "Y";
 
        // Load CSS file?
        $EXT_CSS = "Y";


@@ -58,8 +58,8 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE what='active' LIMIT 1";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='config_active' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE what='active' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='config_active' LIMIT 1";

 
        // Unregister filter
        UNREGISTER_FILTER('online_extra_links', 'ADD_LINK_ACTIVE_LIST', true, $dry_run);
 
        // Unregister filter
        UNREGISTER_FILTER('online_extra_links', 'ADD_LINK_ACTIVE_LIST', true, $dry_run);


@@ -67,12 +67,12 @@ case "remove": // Do stuff when removing extension
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='N', locked='N' WHERE what='active' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='N', `locked`='N' WHERE what='active' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='N', locked='Y' WHERE what='active' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='N', `locked`='Y' WHERE what='active' LIMIT 1";

        break;
 
 case "update": // Update an extension
        break;
 
 case "update": // Update an extension


@@ -99,8 +99,8 @@ case "update": // Update an extension
                break;
 
        case "0.0.5": // SQL queries for v0.0.5
                break;
 
        case "0.0.5": // SQL queries for v0.0.5

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD active_limit BIGINT(20) UNSIGNED NOT NULL DEFAULT 10";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_active','Aktiv-Liste','Einstellungen an der Aktiv-Liste (<strong>Heute Online</strong> im Gastbereich) vornehmen.', 8)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD active_limit BIGINT(20) UNSIGNED NOT NULL DEFAULT 10";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_active','Aktiv-Liste','Einstellungen an der Aktiv-Liste (<strong>Heute Online</strong> im Gastbereich) vornehmen.', 8)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Aktiven-Liste im Gastbereich ist nun einschr&auml;nkbar.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Aktiven-Liste im Gastbereich ist nun einschr&auml;nkbar.";

diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php
index a3624c8c1e2a2b048d7f397883dd0bfd6ca3c636..6d02c75fae4e5c8b34d35ea98c1c36a8202f7aa9 100644 (file)
--- a/inc/extensions/ext-admins.php
+++ b/inc/extensions/ext-admins.php
@@ -50,17 +50,17 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins', NULL, 'Admin-Management','Administratoren anlegen, löschen oder Passwort/E-Mail Adresse ändern.','1')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','admins_add','Admin hinzufügen','Neuen Admin-Account anlegen','0')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','admins_edit','Admin-Account ändern','Bestehende Admin-Accounts bearbeiten: E-Mail-Adresse, Passwort und/oder Login-Name ändern.','1')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins', NULL, 'Admin-Management','Administratoren anlegen, löschen oder Passwort/E-Mail Adresse ändern.','1')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','admins_add','Admin hinzufügen','Neuen Admin-Account anlegen','0')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','admins_edit','Admin-Account ändern','Bestehende Admin-Accounts bearbeiten: E-Mail-Adresse, Passwort und/oder Login-Name ändern.','1')";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='admins' LIMIT 6";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_admins_acls`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_admins_mails`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admins` DROP default_acl";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='admins' LIMIT 6";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_admins_acls`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_admins_mails`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admins` DROP default_acl";

 
        // Remove filters
        UNREGISTER_FILTER('sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', true, $dry_run);
 
        // Remove filters
        UNREGISTER_FILTER('sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', true, $dry_run);


@@ -80,7 +80,7 @@ case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.2": // SQL queries for v0.2
        switch ($EXT_VER)
        {
        case "0.2": // SQL queries for v0.2

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','admins_contact','Admin kontaktieren','Kontaktiert einen Admin per Mail oder Nachricht (nur wenn messaging-Erweiterung installiert ist).','2')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','admins_contact','Admin kontaktieren','Kontaktiert einen Admin per Mail oder Nachricht (nur wenn messaging-Erweiterung installiert ist).','2')";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Fügt den Menüpunkt "Admin kontaktieren" hinzu.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Fügt den Menüpunkt "Admin kontaktieren" hinzu.";


@@ -88,18 +88,18 @@ case "update": // Update an extension
 
        case "0.3": // SQL queries for v0.3
                // Add admin menu
 
        case "0.3": // SQL queries for v0.3
                // Add admin menu

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','config_admins','ACL einstellen','Richten Sie Zugriffskontrollzeilen für jeden Admin individuell ein, um ihm nur bestimmte Bereiche des Admin-Bereiches zugänglich zu machen oder zu sperren.','4')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','config_admins','ACL einstellen','Richten Sie Zugriffskontrollzeilen für jeden Admin individuell ein, um ihm nur bestimmte Bereiche des Admin-Bereiches zugänglich zu machen oder zu sperren.','4')";

 
                // Which is the default setting when you create a new admin login?
 
                // Which is the default setting when you create a new admin login?

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD admins_default_acl ENUM('deny','allow') NOT NULL DEFAULT 'deny'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD admins_default_acl ENUM('deny','allow') NOT NULL DEFAULT 'deny'";

 
                // Default is deny everything
 
                // Default is deny everything

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admins` ADD default_acl ENUM('deny','allow') NOT NULL DEFAULT 'deny'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admins` ADD default_acl ENUM('deny','allow') NOT NULL DEFAULT 'deny'";

 
                // But allow current admin everything (THIS SHALL BE YOU!)
 
                // But allow current admin everything (THIS SHALL BE YOU!)

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admins` SET default_acl='allow' WHERE login='".get_session('admin_login')."' LIMIT 1";
-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_admins_acls`";
-               $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_admins_acls` (
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admins` SET default_acl='allow' WHERE login='".get_session('admin_login')."' LIMIT 1";
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_admins_acls`";
+               $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_admins_acls` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 admin_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 action_menu VARCHAR(255) NOT NULL DEFAULT '',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 admin_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 action_menu VARCHAR(255) NOT NULL DEFAULT '',


@@ -114,26 +114,26 @@ PRIMARY KEY (id)
                break;
 
        case "0.3.1": // SQL queries for v0.3.1
                break;
 
        case "0.3.1": // SQL queries for v0.3.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admins_acls` MODIFY id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admins_acls` MODIFY id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT";

                break;
 
        case "0.4.0": // SQL queries for v0.4.0
                break;
 
        case "0.4.0": // SQL queries for v0.4.0

-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_admins_mails`";
-               $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_admins_mails` (
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_admins_mails`";
+               $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_admins_mails` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 admin_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 mail_template VARCHAR(255) NOT NULL,
 KEY (admin_id),
 PRIMARY KEY (id)
 ) TYPE=MyISAM";
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 admin_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 mail_template VARCHAR(255) NOT NULL,
 KEY (admin_id),
 PRIMARY KEY (id)
 ) TYPE=MyISAM";

-               $SQLs[] = "INSERT INTO  `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','admins_mails','Admin-Mails','Stellen Sie hier ein, welcher Admin welche Mail erhalten soll. Sie können dies (derzeit) jedoch erst, wenn einmal die Mail versendet wurde!','5')";
+               $SQLs[] = "INSERT INTO  `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','admins_mails','Admin-Mails','Stellen Sie hier ein, welcher Admin welche Mail erhalten soll. Sie können dies (derzeit) jedoch erst, wenn einmal die Mail versendet wurde!','5')";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Kontrollieren Sie, welche Mails welcher Admin oder alle (admin_id=0) bekommen soll oder im UserLog (admin_id=-1) verzeichnet werden soll. Standartmässig wird weiter an alle versendet.";
                break;
 
        case "0.4.1": // SQL queries for v0.4.1
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Kontrollieren Sie, welche Mails welcher Admin oder alle (admin_id=0) bekommen soll oder im UserLog (admin_id=-1) verzeichnet werden soll. Standartmässig wird weiter an alle versendet.";
                break;
 
        case "0.4.1": // SQL queries for v0.4.1

-               $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admins_mails` WHERE mail_template LIKE '% %'";
+               $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template LIKE '% %'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Admins-Mails-Tabelle geleert.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Admins-Mails-Tabelle geleert.";


@@ -199,7 +199,7 @@ PRIMARY KEY (id)
                break;
 
        case "0.5.6": // SQL queries for v0.5.6
                break;
 
        case "0.5.6": // SQL queries for v0.5.6

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET what='admins_contct' WHERE what='admins_contact' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET what='admins_contct' WHERE what='admins_contact' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Namenskonflikt zwischen den Erweiterungen <strong>admins</strong> und (kommender) <strong>contact</strong>.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Namenskonflikt zwischen den Erweiterungen <strong>admins</strong> und (kommender) <strong>contact</strong>.";


@@ -211,7 +211,7 @@ PRIMARY KEY (id)
                break;
 
        case "0.5.8": // SQL queries for v0.5.8
                break;
 
        case "0.5.8": // SQL queries for v0.5.8

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET what='admins_contct' WHERE what='admins_contact' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET what='admins_contct' WHERE what='admins_contact' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Ein Punkt in der Versionsnummernliste verhinderte das 0.5.6-Update.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Ein Punkt in der Versionsnummernliste verhinderte das 0.5.6-Update.";


@@ -253,14 +253,14 @@ PRIMARY KEY (id)
                break;
 
        case "0.6.6": // SQL queries for v0.5.6
                break;
 
        case "0.6.6": // SQL queries for v0.5.6

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET what='admins_contct' WHERE what='admins_contact' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET what='admins_contct' WHERE what='admins_contact' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Namenskonflikt zwischen den Erweiterungen <strong>admins</strong> und (kommender) <strong>contact</strong>.";
                break;
 
        case "0.6.7": // SQL queries for v0.6.7
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Namenskonflikt zwischen den Erweiterungen <strong>admins</strong> und (kommender) <strong>contact</strong>.";
                break;
 
        case "0.6.7": // SQL queries for v0.6.7

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admins` ADD la_mode ENUM('global','OLD','NEW') NOT NULL DEFAULT 'global'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admins` ADD la_mode ENUM('global','OLD','NEW') NOT NULL DEFAULT 'global'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Namenskonflikt zwischen den Erweiterungen <strong>admins</strong> und (kommender) <strong>contact</strong>. Beseitigung eines Fehlers <strong>HTTP_POSR_VARS</strong> beim &Auml;ndern von Administratoren.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Namenskonflikt zwischen den Erweiterungen <strong>admins</strong> und (kommender) <strong>contact</strong>. Beseitigung eines Fehlers <strong>HTTP_POSR_VARS</strong> beim &Auml;ndern von Administratoren.";


@@ -272,7 +272,7 @@ PRIMARY KEY (id)
                break;
 
        case "0.6.9": // SQL queries for v0.6.9
                break;
 
        case "0.6.9": // SQL queries for v0.6.9

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET title = 'Admin-Management' WHERE action = 'admins' AND (what='' OR what IS NULL) LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET title = 'Admin-Management' WHERE action = 'admins' AND (what='' OR `what` IS NULL) LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Verwaltung nach Management umbenannt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Verwaltung nach Management umbenannt.";


@@ -295,10 +295,10 @@ PRIMARY KEY (id)
                break;
 
        case "0.7.2": // SQL queries for v0.7.2
                break;
 
        case "0.7.2": // SQL queries for v0.7.2

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admins` DROP login_failtures";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admins` DROP last_failture";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admins` ADD login_failures BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admins` ADD last_failure TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admins` DROP login_failtures";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admins` DROP last_failture";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admins` ADD login_failures BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admins` ADD last_failure TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Schreibweise korregiert.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Schreibweise korregiert.";

diff --git a/inc/extensions/ext-admintheme1.php b/inc/extensions/ext-admintheme1.php
index 00957bdff4594848a5dfecaa42e2ca7ffcc94f0c..3b42449509377dbe267e52c3f89643ec4051fc24 100644 (file)
--- a/inc/extensions/ext-admintheme1.php
+++ b/inc/extensions/ext-admintheme1.php
@@ -50,10 +50,10 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // Remove all other themes
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // Remove all other themes

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_extensions` WHERE ext_name LIKE 'admintheme%'";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET action='stats' WHERE what='usr_online' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET action='stats' WHERE what='email_stats' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET action='misc' WHERE what='maintenance' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name LIKE 'admintheme%'";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET action='stats' WHERE what='usr_online' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET action='stats' WHERE what='email_stats' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET action='misc' WHERE what='maintenance' LIMIT 1";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension

diff --git a/inc/extensions/ext-admintheme_default.php b/inc/extensions/ext-admintheme_default.php
index ceaf384697db4cdb2480380e4633efd872739b91..bb9e45ccad7884cde1feaf4d5a2ad870672cc618 100644 (file)
--- a/inc/extensions/ext-admintheme_default.php
+++ b/inc/extensions/ext-admintheme_default.php
@@ -50,10 +50,10 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // Remove all other menu themes
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // Remove all other menu themes

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_extensions` WHERE ext_name LIKE 'admintheme%'";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET action='misc' WHERE what='usr_online' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET action='stats' WHERE what='email' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET action='setup' WHERE what='maintenance' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name LIKE 'admintheme%'";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET action='misc' WHERE what='usr_online' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET action='stats' WHERE what='email' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET action='setup' WHERE what='maintenance' LIMIT 1";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension

diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php
index 095d4b38bc9b9dcb47a85e147b1970053a94cffa..ff66f2cb1f5059f6173072ad6cf7e52dd9061139 100644 (file)
--- a/inc/extensions/ext-autopurge.php
+++ b/inc/extensions/ext-autopurge.php
@@ -50,22 +50,22 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_pool` MODIFY data_type ENUM('TEMP','SEND','NEW','ADMIN','ACTIVE','DELETED') NOT NULL DEFAULT 'TEMP'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_pool` MODIFY data_type ENUM('TEMP','SEND','NEW','ADMIN','ACTIVE','DELETED') NOT NULL DEFAULT 'TEMP'";

        if (EXT_IS_ACTIVE("bonus"))
        {
        if (EXT_IS_ACTIVE("bonus"))
        {

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_bonus` MODIFY data_type ENUM('NEW','QUEUE','SEND','DELETED') NOT NULL DEFAULT 'NEW'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_bonus` MODIFY data_type ENUM('NEW','QUEUE','SEND','DELETED') NOT NULL DEFAULT 'NEW'";

        }
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        }
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_pool` MODIFY data_type ENUM('TEMP','SEND','NEW','ADMIN','ACTIVE') NOT NULL DEFAULT 'TEMP'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_pool` MODIFY data_type ENUM('TEMP','SEND','NEW','ADMIN','ACTIVE') NOT NULL DEFAULT 'TEMP'";

        if (EXT_IS_ACTIVE("bonus"))
        {
        if (EXT_IS_ACTIVE("bonus"))
        {

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_bonus` MODIFY data_type ENUM('NEW','QUEUE','SEND') NOT NULL DEFAULT 'NEW'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_bonus` MODIFY data_type ENUM('NEW','QUEUE','SEND') NOT NULL DEFAULT 'NEW'";

        }
        }

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what IN('config_autopurge','list_autopurge') LIMIT 2";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` DROP ap_notified";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what IN('config_autopurge','list_autopurge') LIMIT 2";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP ap_notified";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension


@@ -82,14 +82,14 @@ case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.1": // SQL queries for v0.1
        switch ($EXT_VER)
        {
        case "0.1": // SQL queries for v0.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD autopurge_inactive ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD autopurge_unconfirmed ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD ap_inactive_since BIGINT(20) UNSIGNED NOT NULL DEFAULT '2592000'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD ap_inactive_time BIGINT(20) UNSIGNED NOT NULL DEFAULT '25200'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD ap_unconfirmed_time BIGINT(20) UNSIGNED NOT NULL DEFAULT '432000'";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_autopurge','Auto-Löschung','Automatisch inaktive oder nicht bestätigte Accounts löschen.','12')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_autopurge','Inaktive finden','Lassen Sie sich vor dem täglichen Reset anzeigen, welche Mitglieder als inaktiv erkannt werden und welche gelöscht werden.','10')";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD ap_notified BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD autopurge_inactive ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD autopurge_unconfirmed ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD ap_inactive_since BIGINT(20) UNSIGNED NOT NULL DEFAULT '2592000'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD ap_inactive_time BIGINT(20) UNSIGNED NOT NULL DEFAULT '25200'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD ap_unconfirmed_time BIGINT(20) UNSIGNED NOT NULL DEFAULT '432000'";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_autopurge','Auto-Löschung','Automatisch inaktive oder nicht bestätigte Accounts löschen.','12')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_autopurge','Inaktive finden','Lassen Sie sich vor dem täglichen Reset anzeigen, welche Mitglieder als inaktiv erkannt werden und welche gelöscht werden.','10')";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD ap_notified BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Automatisches L&ouml:schen von inaktiven bzw. nicht bestätigten Accounts hinzugefügt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Automatisches L&ouml:schen von inaktiven bzw. nicht bestätigten Accounts hinzugefügt.";


@@ -127,17 +127,17 @@ case "update": // Update an extension
                break;
 
        case "0.1.9": // SQL queries for v0.1.9
                break;
 
        case "0.1.9": // SQL queries for v0.1.9

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD autopurge_tasks ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD ap_tasks_time BIGINT(20) UNSIGNED NOT NULL DEFAULT '".(getConfig('one_day')*7)."'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD autopurge_tasks ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD ap_tasks_time BIGINT(20) UNSIGNED NOT NULL DEFAULT '".(getConfig('one_day')*7)."'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bereinigung von zu l&ouml;schenden Aufgaben klappt wieder. Zeitlimit f&uuml;r genanntes kann eingestellt werden (Default = 7 Tage).<br /><br /><u>Bitte aktualisieren Sie auch die Admin-Templates!</u>";
                break;
 
        case "0.2.0": // SQL queries for v0.2.0
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bereinigung von zu l&ouml;schenden Aufgaben klappt wieder. Zeitlimit f&uuml;r genanntes kann eingestellt werden (Default = 7 Tage).<br /><br /><u>Bitte aktualisieren Sie auch die Admin-Templates!</u>";
                break;
 
        case "0.2.0": // SQL queries for v0.2.0

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD ap_in_notify ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD ap_un_notify ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD ap_tasks_notify ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD ap_in_notify ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD ap_un_notify ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD ap_tasks_notify ENUM('Y','N') NOT NULL DEFAULT 'Y'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mail wird bei L&ouml;schung von Aufgaben ausgesendet.<br /><br /><u>Bitte aktualisieren Sie auch die Admin-Templates!</u>";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mail wird bei L&ouml;schung von Aufgaben ausgesendet.<br /><br /><u>Bitte aktualisieren Sie auch die Admin-Templates!</u>";


@@ -204,9 +204,9 @@ case "update": // Update an extension
                break;
 
        case "0.3.3": // SQL queries for v0.3.3
                break;
 
        case "0.3.3": // SQL queries for v0.3.3

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD ap_del_mails ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD ap_dm_notify ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD ap_dm_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT '86400'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD ap_del_mails ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD ap_dm_notify ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD ap_dm_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT '86400'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Von bereits gel&ouml;schten Mitgliedern die Mails l&ouml;schen integriert.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Von bereits gel&ouml;schten Mitgliedern die Mails l&ouml;schen integriert.";

diff --git a/inc/extensions/ext-bank.php b/inc/extensions/ext-bank.php
index f34653cd4a50dc38b4b3b6742f78d0df6544f45a..b571558af65ff655effb64f3f0638cc7ff990e14 100644 (file)
--- a/inc/extensions/ext-bank.php
+++ b/inc/extensions/ext-bank.php
@@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_bank_accounts`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_bank_accounts` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bank_accounts`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_bank_accounts` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 uid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 account_created BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 uid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 account_created BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -77,8 +77,8 @@ INDEX (account_created),
 INDEX (account_locked),
 INDEX (last_tan_stamp)
 ) TYPE=MyISAM";
 INDEX (account_locked),
 INDEX (last_tan_stamp)
 ) TYPE=MyISAM";

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_bank_transfers`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_bank_transfers` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bank_transfers`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_bank_transfers` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 to_account_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 from_account_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 to_account_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 from_account_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -90,8 +90,8 @@ PRIMARY KEY (id),
 INDEX (to_account_id, from_account_id),
 INDEX (day_bookkeeping, day_available)
 ) TYPE=MyISAM";
 INDEX (to_account_id, from_account_id),
 INDEX (day_bookkeeping, day_available)
 ) TYPE=MyISAM";

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_bank_packages`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_bank_packages` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bank_packages`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_bank_packages` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 title VARCHAR(255) NOT NULL DEFAULT '',
 description TINYTEXT,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 title VARCHAR(255) NOT NULL DEFAULT '',
 description TINYTEXT,


@@ -114,8 +114,8 @@ PRIMARY KEY (id)
        // what the member shall get for the specified income. output_system_mode
        // must be extended with the mode you get for free: output_system_mode:LOGIN
        // should be fine. More than one entry and not DISABLED ;) are not supported.
        // what the member shall get for the specified income. output_system_mode
        // must be extended with the mode you get for free: output_system_mode:LOGIN
        // should be fine. More than one entry and not DISABLED ;) are not supported.

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_bank_tanlist`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_bank_tanlist` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bank_tanlist`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_bank_tanlist` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 idx TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
 account_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 idx TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
 account_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -126,50 +126,50 @@ UNIQUE (account_id, tan)
 ) TYPE=MyISAM";
 
        // Admin menu queries
 ) TYPE=MyISAM";
 
        // Admin menu queries

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank', NULL, 'Bank-Accounts','Verwalten Sie hier alle Bank-Accounts Ihrer Mitglieder, sowie Angebotspakete und Überweisungen.', 6)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','add_bank_package','Angebotspaket hinzufügen','Neues Angebotspaket erstellen.', 1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','list_bank_package','Angebotspakete auflisten','Listet alle erstellten Angebotspakete auf.', 2)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','edit_bank_package','Angebotspaket ändern','Nach Auswahl eines Angebotspaketes können Sie dieses hier verändern. Bitte beachten Sie, dass Ihre Mitglieder keine Mail dabei erhalten!', 3)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','lock_bank_package','Angebotspaket ent-/sperren','Nehmen Sie Angebotspakete zur temporären Überarbeitung zuvor heraus, dann können Sie in Ruhe drüber nachdenken und Berechnungen anstellen. Freigabe ist hier auch möglich.', 4)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','del_bank_package','Angebotspaket löschen','Nach Auswahl eines Angebotspaketes können Sie mit abschliessender Bestätigung Angebotspakete ganz löschen. Bitte beachten Sie, dass dies nur möglich ist, wenn auch alle Accounts dieses nicht mehr nutzen!', 5)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','add_bank_account','Konto anlegen','Legen Sie hier Konten für die Mitglieder an (falls Ihre Mitglieder nicht zurecht kommen).', 6)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','list_bank_account','Konten auflisten','Auflistung aller Konto oder eines auswählbaren Mitglieds.', 7)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','edit_bank_account','Konto ändern','Ändern Sie hier bestehende Konten, z.B. den Dispositionskredit usw. PINs und TANs sind hier nicht änderbar! Bestätigungsmails sind optional versendbar.', 8)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','lock_bank_account','Konto ent-/sperren','Sperren Sie hier Konten bei Bedarf. Auch das Freischalten ist hier möglich. Eine Benachrichtigung per Mail wird dann an das Mitglied ausgesendet.', 9)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','del_bank_account','Konto löschen','Löschen von Konten mit Bestätigungsmail. Wenn Sie ein Mitglieder-Account löschen, so müssen Sie derzeit seine angelegten Konten auch löschen!', 10)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','send_bank_tanlist','TAN-Liste aussenden','Listet zuerst Anfragen von Mitgliedern auf, die eine neue (i)TAN-Liste benötigen, anschliessend kann die Liste dann ausgesendet werden.', 11)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','lock_bank_tanlist','TAN-Liste ent-/sperren','Bestehende TAN-Listen können auf Kundenwunsch hin gesperrt und wieder entsperrt werden. Dies passiert auch, wenn der Kunde x-mal (siehe Angebotspakete) eine verkehrte TAN eingegeben hat. Einzelne TANs sind nicht ent-/sperrbar.', 12)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','list_bank_trans','Überweisungen auflisten','Nach Auswahl eines Mitgliedes und einem Konto (benötgt JavaScript!) können Sie seitenweise die Überweisungen durchschauen.', 13)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank', NULL, 'Bank-Accounts','Verwalten Sie hier alle Bank-Accounts Ihrer Mitglieder, sowie Angebotspakete und Überweisungen.', 6)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','add_bank_package','Angebotspaket hinzufügen','Neues Angebotspaket erstellen.', 1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','list_bank_package','Angebotspakete auflisten','Listet alle erstellten Angebotspakete auf.', 2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','edit_bank_package','Angebotspaket ändern','Nach Auswahl eines Angebotspaketes können Sie dieses hier verändern. Bitte beachten Sie, dass Ihre Mitglieder keine Mail dabei erhalten!', 3)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','lock_bank_package','Angebotspaket ent-/sperren','Nehmen Sie Angebotspakete zur temporären Überarbeitung zuvor heraus, dann können Sie in Ruhe drüber nachdenken und Berechnungen anstellen. Freigabe ist hier auch möglich.', 4)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','del_bank_package','Angebotspaket löschen','Nach Auswahl eines Angebotspaketes können Sie mit abschliessender Bestätigung Angebotspakete ganz löschen. Bitte beachten Sie, dass dies nur möglich ist, wenn auch alle Accounts dieses nicht mehr nutzen!', 5)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','add_bank_account','Konto anlegen','Legen Sie hier Konten für die Mitglieder an (falls Ihre Mitglieder nicht zurecht kommen).', 6)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','list_bank_account','Konten auflisten','Auflistung aller Konto oder eines auswählbaren Mitglieds.', 7)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','edit_bank_account','Konto ändern','Ändern Sie hier bestehende Konten, z.B. den Dispositionskredit usw. PINs und TANs sind hier nicht änderbar! Bestätigungsmails sind optional versendbar.', 8)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','lock_bank_account','Konto ent-/sperren','Sperren Sie hier Konten bei Bedarf. Auch das Freischalten ist hier möglich. Eine Benachrichtigung per Mail wird dann an das Mitglied ausgesendet.', 9)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','del_bank_account','Konto löschen','Löschen von Konten mit Bestätigungsmail. Wenn Sie ein Mitglieder-Account löschen, so müssen Sie derzeit seine angelegten Konten auch löschen!', 10)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','send_bank_tanlist','TAN-Liste aussenden','Listet zuerst Anfragen von Mitgliedern auf, die eine neue (i)TAN-Liste benötigen, anschliessend kann die Liste dann ausgesendet werden.', 11)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','lock_bank_tanlist','TAN-Liste ent-/sperren','Bestehende TAN-Listen können auf Kundenwunsch hin gesperrt und wieder entsperrt werden. Dies passiert auch, wenn der Kunde x-mal (siehe Angebotspakete) eine verkehrte TAN eingegeben hat. Einzelne TANs sind nicht ent-/sperrbar.', 12)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank','list_bank_trans','Überweisungen auflisten','Nach Auswahl eines Mitgliedes und einem Konto (benötgt JavaScript!) können Sie seitenweise die Überweisungen durchschauen.', 13)";

 
        // Member menu
 
        // Member menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank', NULL, 'Bank-Account','N','Y', 3)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_infos','Angebotspakete','N','Y', 1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_create','Konto anlegen','N','Y', 2)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_deposit','Auf Konto einzahlen','N','Y', 3)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_withdraw','Vom Konto abheben','N','Y', 4)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_output','Kontoauszug','N','Y', 5)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_change','Paket wechseln','N','Y', 6)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_remove','Konto Kündigen','N','Y', 7)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank', NULL, 'Bank-Account','N','Y', 3)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_infos','Angebotspakete','N','Y', 1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_create','Konto anlegen','N','Y', 2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_deposit','Auf Konto einzahlen','N','Y', 3)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_withdraw','Vom Konto abheben','N','Y', 4)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_output','Kontoauszug','N','Y', 5)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_change','Paket wechseln','N','Y', 6)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('bank','bank_remove','Konto Kündigen','N','Y', 7)";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_bank_accounts`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_bank_transfers`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_bank_packages`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_bank_tanlist`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='bank' LIMIT 14";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE action='bank' LIMIT 8";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bank_accounts`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bank_transfers`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bank_packages`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bank_tanlist`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='bank' LIMIT 14";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE action='bank' LIMIT 8";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE action='bank' LIMIT 8";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE action='bank' LIMIT 8";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='N', locked='Y' WHERE action='bank' LIMIT 8";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE action='bank' LIMIT 8";

        break;
 
 case "update": // Update an extension
        break;
 
 case "update": // Update an extension

diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php
index 4b209a3c9305b37fcd7acc96c0150a4c3f5591b9..846ad3177f35cb08465625f50969f4da101bc3f7 100644 (file)
--- a/inc/extensions/ext-beg.php
+++ b/inc/extensions/ext-beg.php
@@ -50,15 +50,15 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_beg','Bettel-Link','IP-Sperre, {!POINTS!}-Vergütung usw. können Sie hier einstellen.', 10)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','beg','{!POINTS!} erbetteln!',4,'Y','Y')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','beg','Ihr Bettel-Link',6,'Y','Y')";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD beg_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT '600'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD beg_uid_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT 1800";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD beg_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00100";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD beg_clicks BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_beg_ips`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_beg_ips` (
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_beg','Bettel-Link','IP-Sperre, {!POINTS!}-Vergütung usw. können Sie hier einstellen.', 10)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','beg','{!POINTS!} erbetteln!',4,'Y','Y')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','beg','Ihr Bettel-Link',6,'Y','Y')";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD beg_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT '600'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD beg_uid_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT 1800";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD beg_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00100";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD beg_clicks BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_beg_ips`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_beg_ips` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 remote_ip VARCHAR(15) NOT NULL DEFAULT '0.0.0.0',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 remote_ip VARCHAR(15) NOT NULL DEFAULT '0.0.0.0',


@@ -73,24 +73,24 @@ PRIMARY KEY(id)
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='config_beg' OR what='list_beg' LIMIT 2";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE what='beg' LIMIT 1";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE what='beg' OR what='beg2' LIMIT 2";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_beg_ips`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='config_beg' OR what='list_beg' LIMIT 2";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE what='beg' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE what='beg' OR what='beg2' LIMIT 2";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_beg_ips`";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='Y', locked='N' WHERE what='beg' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='beg' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_mod_reg` SET locked='N', hidden='N', admin_only='N', mem_only='N' WHERE module='beg' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='Y', `locked`='N' WHERE what='beg' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='beg' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='N', hidden='N', admin_only='N', mem_only='N' WHERE module='beg' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='N', locked='Y' WHERE what='beg' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='N', locked='Y' WHERE what IN('beg','beg2') LIMIT 2";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_mod_reg` SET locked='Y' WHERE module='beg' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='N', `locked`='Y' WHERE what='beg' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE what IN('beg','beg2') LIMIT 2";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='Y' WHERE module='beg' LIMIT 1";

        break;
 
 case "update": // Update an extension
        break;
 
 case "update": // Update an extension


@@ -107,7 +107,7 @@ case "update": // Update an extension
                break;
 
        case "0.0.3": // SQL queries for v0.0.3
                break;
 
        case "0.0.3": // SQL queries for v0.0.3

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD beg_points_max FLOAT(20,5) UNSIGNED NOT NULL DEFAULT '0.10000'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD beg_points_max FLOAT(20,5) UNSIGNED NOT NULL DEFAULT '0.10000'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Maximale Obergrenze an {!POINTS!} einstellbar (Standart: 0,1 {!POINTS!})";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Maximale Obergrenze an {!POINTS!} einstellbar (Standart: 0,1 {!POINTS!})";


@@ -124,14 +124,14 @@ case "update": // Update an extension
                break;
 
        case "0.0.6": // SQL queries for v0.0.6
                break;
 
        case "0.0.6": // SQL queries for v0.0.6

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD beg_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD beg_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Ein Mitgliedsaccount (empfehlenswert ist Ihr eigenes!) kann zum Abbuchen der {!POINTS!} verwendet werden. Template <u>admin_config_beg.tpl</u> (und pro!) nicht vergessen, zu aktualisieren.";
                break;
 
        case "0.0.8": // SQL queries for v0.0.8
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Ein Mitgliedsaccount (empfehlenswert ist Ihr eigenes!) kann zum Abbuchen der {!POINTS!} verwendet werden. Template <u>admin_config_beg.tpl</u> (und pro!) nicht vergessen, zu aktualisieren.";
                break;
 
        case "0.0.8": // SQL queries for v0.0.8

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD beg_ip_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT 1800";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD beg_ip_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT 1800";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Zeitsperre gegen die selbe IP-Nummer hinzugef&uuml;gt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Zeitsperre gegen die selbe IP-Nummer hinzugef&uuml;gt.";


@@ -154,15 +154,15 @@ case "update": // Update an extension
 
        case "0.1.2":
                // SQL queries for v0.1.2
 
        case "0.1.2":
                // SQL queries for v0.1.2

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD beg_mode ENUM('DIRECT','REF') NOT NULL DEFAULT 'REF'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD beg_ranks TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD beg_active ENUM('Y','N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD beg_rallye ENUM('Y','N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD beg_points FLOAT(21,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD beg_mode ENUM('DIRECT','REF') NOT NULL DEFAULT 'REF'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD beg_ranks TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD beg_active ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD beg_rallye ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD beg_points FLOAT(21,5) UNSIGNED NOT NULL DEFAULT 0.00000";

                $VIS = "N"; $LOCKED = "Y";
                if (EXT_IS_ACTIVE("beg")) { $VIS = "Y"; $LOCKED = "N"; }
                $VIS = "N"; $LOCKED = "Y";
                if (EXT_IS_ACTIVE("beg")) { $VIS = "Y"; $LOCKED = "N"; }

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','beg2','Bettel-Rallye','".$VIS."','".$LOCKED."','7')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_beg','Bettel-Rallye','Listet alle Teilnehmer der monatlichen Bettel-Rallye auf.','12')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','beg2','Bettel-Rallye','".$VIS."','".$LOCKED."','7')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_beg','Bettel-Rallye','Listet alle Teilnehmer der monatlichen Bettel-Rallye auf.','12')";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Optionale Bettel-Rallye m&ouml;glich. Und die erbettelten {!POINTS!} k&ouml;nnen entweder nur dem bettelndem Mitglied direkt oder auch seinem Werber gutgeschrieben werden k&ouml;nnen.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Optionale Bettel-Rallye m&ouml;glich. Und die erbettelten {!POINTS!} k&ouml;nnen entweder nur dem bettelndem Mitglied direkt oder auch seinem Werber gutgeschrieben werden k&ouml;nnen.";


@@ -179,7 +179,7 @@ case "update": // Update an extension
                break;
 
        case "0.1.5": // SQL queries for v0.1.5
                break;
 
        case "0.1.5": // SQL queries for v0.1.5

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET title='Bettellink/-rallye', descr='IP-Sperre, {!POINTS!}-Verg&uuml;tung und auch die Bettel-Rallye k&ouml;nnen Sie hier einstellen.' WHERE what='config_beg' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET title='Bettellink/-rallye', descr='IP-Sperre, {!POINTS!}-Verg&uuml;tung und auch die Bettel-Rallye k&ouml;nnen Sie hier einstellen.' WHERE what='config_beg' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Fehlendes Template im Admin-Bereich hinzugef&uuml;gt. Im Admin-Bereich Hinweis hinzugef&uuml;gt, wenn Bettel-Rallye inaktiv ist. Bitte Script inc/monthly_beg.php l&ouml;schen!";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Fehlendes Template im Admin-Bereich hinzugef&uuml;gt. Im Admin-Bereich Hinweis hinzugef&uuml;gt, wenn Bettel-Rallye inaktiv ist. Bitte Script inc/monthly_beg.php l&ouml;schen!";


@@ -191,14 +191,14 @@ case "update": // Update an extension
                break;
 
        case "0.1.7": // SQL queries for v0.1.7
                break;
 
        case "0.1.7": // SQL queries for v0.1.7

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD beg_ral_en_notify ENUM('Y','N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD beg_ral_di_notify ENUM('Y','N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD beg_new_mem_notify ENUM('Y','N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD beg_notify_bonus  FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD beg_notify_wait BIGINT(20) UNSIGNED NOT NULL DEFAULT '30'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD beg_ral_notify BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD beg_ral_en_notify BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD beg_ral_di_notify BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD beg_ral_en_notify ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD beg_ral_di_notify ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD beg_new_mem_notify ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD beg_notify_bonus  FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD beg_notify_wait BIGINT(20) UNSIGNED NOT NULL DEFAULT '30'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD beg_ral_notify BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD beg_ral_en_notify BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD beg_ral_di_notify BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Die Mitglieder k&ouml;nnen nun optional automatisch &uuml;ber eine aktivierte und/oder deaktivierte Bettel-Rallye informiert werden. Beide Benachrichtigungen k&ouml;nnen Sie unter <strong>Einstellungen --&gt; Bettel-Link/-rallye</strong> seperat ein- und ausschalten! Zudem ist eine Sperre gegen eingeloggte Mitglieder eingebaut, die das Klicken auf den eigenen Bettel-Link etwas erschweren soll.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Die Mitglieder k&ouml;nnen nun optional automatisch &uuml;ber eine aktivierte und/oder deaktivierte Bettel-Rallye informiert werden. Beide Benachrichtigungen k&ouml;nnen Sie unter <strong>Einstellungen --&gt; Bettel-Link/-rallye</strong> seperat ein- und ausschalten! Zudem ist eine Sperre gegen eingeloggte Mitglieder eingebaut, die das Klicken auf den eigenen Bettel-Link etwas erschweren soll.";


@@ -225,7 +225,7 @@ case "update": // Update an extension
                break;
 
        case "0.2.2": // SQL queries for v0.2.2
                break;
 
        case "0.2.2": // SQL queries for v0.2.2

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD beg_include_own ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD beg_include_own ENUM('Y','N') NOT NULL DEFAULT 'N'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Eigene User-ID von Bettel-Rallye ausschliessbar.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Eigene User-ID von Bettel-Rallye ausschliessbar.";


@@ -237,8 +237,8 @@ case "update": // Update an extension
                break;
 
        case "0.2.4": // SQL queries for v0.2.4
                break;
 
        case "0.2.4": // SQL queries for v0.2.4

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET action='extras', sort='1' WHERE what='beg' LIMIT 1";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET action='rals', sort='3', title='Bettel-Rallye' WHERE what='beg2' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET action='extras', sort='1' WHERE what='beg' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET action='rals', sort='3', title='Bettel-Rallye' WHERE what='beg2' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett umgebaut.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett umgebaut.";


@@ -250,8 +250,8 @@ case "update": // Update an extension
                break;
 
        case "0.2.6": // SQL queries for v0.2.6
                break;
 
        case "0.2.6": // SQL queries for v0.2.6

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_beg_ips` ADD sid VARCHAR(255) NOT NULL DEFAULT ''";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `beg_pay_mode` ENUM('IMG','JS','BOTH','NONE') DEFAULT 'NONE' NOT NULL ;";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_beg_ips` ADD sid VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `beg_pay_mode` ENUM('IMG','JS','BOTH','NONE') DEFAULT 'NONE' NOT NULL ;";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "IP-Lock mit Session-ID erweitert. Tracker-Script eingef&uuml;gt, dass das Einbinden des Bettel-Links als Bild/Script/CSS verhindern soll.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "IP-Lock mit Session-ID erweitert. Tracker-Script eingef&uuml;gt, dass das Einbinden des Bettel-Links als Bild/Script/CSS verhindern soll.";


@@ -266,7 +266,7 @@ default: // Do stuff when extension is loaded
        // Remove old entries
        $OLD = getConfig('beg_timeout');
        if (getConfig('beg_uid_timeout') > $OLD) $OLD = getConfig('beg_uid_timeout');
        // Remove old entries
        $OLD = getConfig('beg_timeout');
        if (getConfig('beg_uid_timeout') > $OLD) $OLD = getConfig('beg_uid_timeout');

-       $result_ext = SQL_QUERY("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_beg_ips` WHERE timeout < (UNIX_TIMESTAMP() -".($OLD + 60*60).")", __FILE__, __LINE__);
+       $result_ext = SQL_QUERY("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_beg_ips` WHERE timeout < (UNIX_TIMESTAMP() -".($OLD + 60*60).")", __FILE__, __LINE__);

 
        // Check for beg rallye is active and send mails out
        if ((getConfig('beg_rallye') == "Y") && (getConfig('beg_new_mem_notify') == "Y")) {
 
        // Check for beg rallye is active and send mails out
        if ((getConfig('beg_rallye') == "Y") && (getConfig('beg_new_mem_notify') == "Y")) {

diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php
index fd74abf307ccde116b54e69f36860284ad18a830..15664c8d132ce927f1a03f18e9adeed9cf804769 100644 (file)
--- a/inc/extensions/ext-birthday.php
+++ b/inc/extensions/ext-birthday.php
@@ -50,14 +50,14 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD birthday_sent VARCHAR(10) NOT NULL DEFAULT 0";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD birthday_sent VARCHAR(10) NOT NULL DEFAULT 0";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` DROP birthday_sent";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_birthday`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='config_birthday' LIMIT 1";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP birthday_sent";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_birthday`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='config_birthday' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension


@@ -79,9 +79,9 @@ case "update": // Update an extension
                break;
 
        case "0.2": // SQL queries for v0.2
                break;
 
        case "0.2": // SQL queries for v0.2

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD birthday_points BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_birthday`";
-               $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_user_birthday` (
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD birthday_points BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_birthday`";
+               $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_user_birthday` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 points BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 points BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -89,7 +89,7 @@ chk_value VARCHAR(255) NOT NULL DEFAULT '',
 KEY(userid),
 PRIMARY KEY(id)
 ) Type=MyISAM";
 KEY(userid),
 PRIMARY KEY(id)
 ) Type=MyISAM";

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_birthday','Geburtstagsmails','Stellen Sie hier ein, ob die Mitglieder {!POINTS!} (nicht automatisch) gutgeschrieben kommen sollen oder nicht.', 9)";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_birthday','Geburtstagsmails','Stellen Sie hier ein, ob die Mitglieder {!POINTS!} (nicht automatisch) gutgeschrieben kommen sollen oder nicht.', 9)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Es kann nun eine Gutschrift an die Geburtstagmail angehängt werden. Diese wird erst beim Klick auf einen Bestätigungslink gutgeschrieben.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Es kann nun eine Gutschrift an die Geburtstagmail angehängt werden. Diese wird erst beim Klick auf einen Bestätigungslink gutgeschrieben.";


@@ -161,8 +161,8 @@ PRIMARY KEY(id)
                break;
 
        case "0.3.6": // SQL queries for v0.3.6
                break;
 
        case "0.3.6": // SQL queries for v0.3.6

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD birthday_mode ENUM('DIRECT','REF') NOT NULL DEFAULT 'DIRECT'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD birthday_active ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD birthday_mode ENUM('DIRECT','REF') NOT NULL DEFAULT 'DIRECT'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD birthday_active ENUM('Y','N') NOT NULL DEFAULT 'N'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Vergütungsmodus des Geburtstagsbonus einstellbar.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Vergütungsmodus des Geburtstagsbonus einstellbar.";


@@ -179,7 +179,7 @@ PRIMARY KEY(id)
                break;
 
        case "0.3.9": // SQL queries for v0.3.9
                break;
 
        case "0.3.9": // SQL queries for v0.3.9

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` CHANGE `birth_day` `birth_day` SMALLINT(2) UNSIGNED ZEROFILL NOT NULL DEFAULT '01',
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` CHANGE `birth_day` `birth_day` SMALLINT(2) UNSIGNED ZEROFILL NOT NULL DEFAULT '01',

 CHANGE `birth_month` `birth_month` SMALLINT(2) UNSIGNED ZEROFILL NOT NULL DEFAULT '01',
 CHANGE `birth_year` `birth_year` SMALLINT(4) UNSIGNED ZEROFILL NOT NULL DEFAULT 1970";
 
 CHANGE `birth_month` `birth_month` SMALLINT(2) UNSIGNED ZEROFILL NOT NULL DEFAULT '01',
 CHANGE `birth_year` `birth_year` SMALLINT(4) UNSIGNED ZEROFILL NOT NULL DEFAULT 1970";
 

diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php
index 44133ab88a0586634abdb7182ee79f2e02391ede..70e8151cd8751136fb9a3396412f3a1e87d73983 100644 (file)
--- a/inc/extensions/ext-bonus.php
+++ b/inc/extensions/ext-bonus.php
@@ -50,10 +50,10 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`sort`,`descr`) VALUES ('email','send_bonus','Bonusmail senden',5,'Versenden Sie hier Bonus-Mails an alle Mitglieder oder nur an alle aus einer Kategorie. Es spielt keine Rolle, wie viele Mails bereits versendet worden, Sie können hier immer senden.')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`, `counter`) VALUES ('main','bonus','Bonuspunkte',7,'Y','Y', 0)";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_bonus`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_bonus` (
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`sort`,`descr`) VALUES ('email','send_bonus','Bonusmail senden',5,'Versenden Sie hier Bonus-Mails an alle Mitglieder oder nur an alle aus einer Kategorie. Es spielt keine Rolle, wie viele Mails bereits versendet worden, Sie können hier immer senden.')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`, `counter`) VALUES ('main','bonus','Bonuspunkte',7,'Y','Y', 0)";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bonus`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_bonus` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 cat_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 subject VARCHAR(255) NOT NULL DEFAULT '',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 cat_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 subject VARCHAR(255) NOT NULL DEFAULT '',


@@ -70,39 +70,39 @@ mails_sent BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 KEY(cat_id),
 PRIMARY KEY  (id)
 )TYPE=MyISAM";
 KEY(cat_id),
 PRIMARY KEY  (id)
 )TYPE=MyISAM";

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_links` MODIFY link_type ENUM('NORMAL','BONUS') NOT NULL DEFAULT 'NORMAL'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_links` ADD bonus_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_links` ADD INDEX (bonus_id)";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_links` MODIFY link_type ENUM('NORMAL','BONUS') NOT NULL DEFAULT 'NORMAL'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_links` ADD bonus_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_links` ADD INDEX (bonus_id)";

 
        // Run this SQL when html or html_mail extension is installed
 
        // Run this SQL when html or html_mail extension is installed

-       if (EXT_IS_ACTIVE("html_mail")) $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_bonus` add html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'";
+       if (EXT_IS_ACTIVE("html_mail")) $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_bonus` add html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what IN ('bonus','config_bonus','send_bonus','list_bonus','list_notifications') LIMIT 5";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE what='bonus' LIMIT 1";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE action='bonus' LIMIT 1";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_links` MODIFY link_type ENUM('NORMAL') NOT NULL DEFAULT 'NORMAL'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_links` DROP bonus_id";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_bonus`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_bonus_urls`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_bonus_customer`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_bonus_turbo`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what IN ('bonus','config_bonus','send_bonus','list_bonus','list_notifications') LIMIT 5";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE what='bonus' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE action='bonus' LIMIT 1";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_links` MODIFY link_type ENUM('NORMAL') NOT NULL DEFAULT 'NORMAL'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_links` DROP bonus_id";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bonus`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bonus_urls`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bonus_customer`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bonus_turbo`";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='bonus' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='Y', locked='N' WHERE action='bonus' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_mod_reg` SET locked='N', hidden='N', admin_only='N', mem_only='N' WHERE module='show_bonus' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='bonus' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='Y', `locked`='N' WHERE action='bonus' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='N', hidden='N', admin_only='N', mem_only='N' WHERE module='show_bonus' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='N', locked='Y' WHERE what='bonus' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='N', locked='Y' WHERE action='bonus' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_mod_reg` SET locked='Y' WHERE module='show_bonus' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE what='bonus' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='N', `locked`='Y' WHERE action='bonus' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='Y' WHERE module='show_bonus' LIMIT 1";

        break;
 
 case "update": // Update an extension
        break;
 
 case "update": // Update an extension


@@ -114,32 +114,32 @@ case "update": // Update an extension
                break;
 
        case "0.2.0": // SQL queries for v0.2.0
                break;
 
        case "0.2.0": // SQL queries for v0.2.0

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_bonus` SET target_send=mails_sent WHERE target_send='0' AND mails_sent>0 AND receivers != ''";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_bonus` SET target_send=mails_sent WHERE target_send='0' AND mails_sent>0 AND receivers != ''";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Behebt ein Versand-Problem mit den Bonus-Mails. Es wurde die Spalte target_send nicht beim Einf&uuml;gen der Buchung gessetzt. Bitte laden Sie sich dazu - wenn nicht bereits geschehen - alle Patches bis mindestens Patch 240 unter <a href=\"{!URL!}/modules.php?module=admin&amp;what=updates\">Updates pr&uuml;fen</a> herunter.";
                break;
 
        case "0.2.1": // SQL queries for v0.2.1
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Behebt ein Versand-Problem mit den Bonus-Mails. Es wurde die Spalte target_send nicht beim Einf&uuml;gen der Buchung gessetzt. Bitte laden Sie sich dazu - wenn nicht bereits geschehen - alle Patches bis mindestens Patch 240 unter <a href=\"{!URL!}/modules.php?module=admin&amp;what=updates\">Updates pr&uuml;fen</a> herunter.";
                break;
 
        case "0.2.1": // SQL queries for v0.2.1

-               $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='config_bonus' LIMIT 1";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`sort`,`descr`) VALUES ('setup','config_bonus','Bonus-{!POINTS!}',8,'Richten Sie Bonus-{!POINTS!} ein, die beim x&#39;ten Klick auf die Mail verbucht werden sollen. Beispiele: Der 1. Klick sollte mehr {!POINTS!} zus&auml;tzlich bekommen, als der 10. Klick.')";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD login_bonus FLOAT(20,3) NOT NULL DEFAULT 10.000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD turbo_bonus FLOAT(20,3) NOT NULL DEFAULT 100.000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD login_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT ".getConfig('one_day')."";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD turbo_rates VARCHAR(255) NOT NULL DEFAULT '50;20;10'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_ranks TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";
+               $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='config_bonus' LIMIT 1";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`sort`,`descr`) VALUES ('setup','config_bonus','Bonus-{!POINTS!}',8,'Richten Sie Bonus-{!POINTS!} ein, die beim x&#39;ten Klick auf die Mail verbucht werden sollen. Beispiele: Der 1. Klick sollte mehr {!POINTS!} zus&auml;tzlich bekommen, als der 10. Klick.')";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD login_bonus FLOAT(20,3) NOT NULL DEFAULT 10.000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD turbo_bonus FLOAT(20,3) NOT NULL DEFAULT 100.000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD login_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT ".getConfig('one_day')."";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD turbo_rates VARCHAR(255) NOT NULL DEFAULT '50;20;10'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_ranks TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";

                // Use actual month for this update
                // Use actual month for this update

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD login_bonus FLOAT(20,3) NOT NULL DEFAULT 0.000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD turbo_bonus FLOAT(20,3) NOT NULL DEFAULT 0.000";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_extensions` SET ext_has_css='Y' WHERE ext_name='bonus' AND ext_has_css='N' LIMIT 1";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD login_bonus FLOAT(20,3) NOT NULL DEFAULT 0.000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD turbo_bonus FLOAT(20,3) NOT NULL DEFAULT 0.000";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_has_css='Y' WHERE ext_name='bonus' AND ext_has_css='N' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Login-Bonus und Turbo-Klick-Bonus intergriert.";
                break;
 
        case "0.2.2": // SQL queries for v0.2.2
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Login-Bonus und Turbo-Klick-Bonus intergriert.";
                break;
 
        case "0.2.2": // SQL queries for v0.2.2

-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_bonus_turbo`";
-               $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_bonus_turbo` (
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bonus_turbo`";
+               $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_bonus_turbo` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 mail_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 mail_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -158,8 +158,8 @@ KEY userid (userid)
                break;
 
        case "0.2.3": // SQL queries for v0.2.3
                break;
 
        case "0.2.3": // SQL queries for v0.2.3

-               $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE what='bonus' LIMIT 1";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`, `counter`) VALUES ('main','bonus','Aktiv-Rallye',7,'Y','Y', 0)";
+               $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE what='bonus' LIMIT 1";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`, `what`, `title`, `sort`, `visible`, `locked`, `counter`) VALUES ('main','bonus','Aktiv-Rallye',7,'Y','Y', 0)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Aktiv-Rallye mit Klick-Verg&uuml;tung hinzugef&uuml;gt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Aktiv-Rallye mit Klick-Verg&uuml;tung hinzugef&uuml;gt.";


@@ -171,8 +171,8 @@ KEY userid (userid)
                break;
 
        case "0.2.5": // SQL queries for v0.2.5
                break;
 
        case "0.2.5": // SQL queries for v0.2.5

-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_bonus_urls`";
-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_bonus_customer`";
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bonus_urls`";
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bonus_customer`";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Tabellen <u>{!MYSQL_PREFIX!}_bonus_urls</u> und <u>{!MYSQL_PREFIX!}_bonus_customer</u> entfernt, da dies bald von der Erweiterung <u>paidlinks</u> erledigt wird.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Tabellen <u>{!MYSQL_PREFIX!}_bonus_urls</u> und <u>{!MYSQL_PREFIX!}_bonus_customer</u> entfernt, da dies bald von der Erweiterung <u>paidlinks</u> erledigt wird.";


@@ -189,12 +189,12 @@ KEY userid (userid)
                break;
 
        case "0.2.8": // SQL queries for v0.2.8
                break;
 
        case "0.2.8": // SQL queries for v0.2.8

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_bonus` SET timestamp='0' WHERE timestamp='0000000000'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_bonus_turbo` CHANGE points points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` CHANGE turbo_bonus turbo_bonus FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` CHANGE login_bonus login_bonus FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` CHANGE turbo_bonus turbo_bonus FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` CHANGE login_bonus login_bonus FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_bonus` SET timestamp='0' WHERE timestamp='0000000000'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_bonus_turbo` CHANGE points points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` CHANGE turbo_bonus turbo_bonus FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` CHANGE login_bonus login_bonus FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` CHANGE turbo_bonus turbo_bonus FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` CHANGE login_bonus login_bonus FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "5 Nachkommastellen implementiert";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "5 Nachkommastellen implementiert";


@@ -226,15 +226,15 @@ KEY userid (userid)
                break;
 
        case "0.3.4": // SQL queries for v0.3.4
                break;
 
        case "0.3.4": // SQL queries for v0.3.4

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_bonus','Aktiv-Rallye-Teilnehmer','Listet alle Mitglieder auf, die einen Aktiv-Bonus haben und zeigt die derzeit m&ouml;glichen Gewinner an.', 10)";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_bonus','Aktiv-Rallye-Teilnehmer','Listet alle Mitglieder auf, die einen Aktiv-Bonus haben und zeigt die derzeit m&ouml;glichen Gewinner an.', 10)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Link <u>Aktiv-Rallye-Teilnehmer</u> hinzugef&uuml;gt, inklusive manuelle Vorbereitung der Verg&uuml;tung.";
                break;
 
        case "0.3.5": // SQL queries for v0.3.5
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Link <u>Aktiv-Rallye-Teilnehmer</u> hinzugef&uuml;gt, inklusive manuelle Vorbereitung der Verg&uuml;tung.";
                break;
 
        case "0.3.5": // SQL queries for v0.3.5

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_mode ENUM('UID','JACKPOT','ADD') NOT NULL DEFAULT 'ADD'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_mode ENUM('UID','JACKPOT','ADD') NOT NULL DEFAULT 'ADD'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Der Login-Bonus Aktiv-Bonus (= Klick-Bonus) k&ouml;nnen nun zuerst von einem Mitgliederaccount (das sollte Ihres sein!), vom Jackpot abgezogen oder einfach dazuadiert werden.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Der Login-Bonus Aktiv-Bonus (= Klick-Bonus) k&ouml;nnen nun zuerst von einem Mitgliederaccount (das sollte Ihres sein!), vom Jackpot abgezogen oder einfach dazuadiert werden.";


@@ -261,8 +261,8 @@ KEY userid (userid)
                break;
 
        case "0.4.0": // SQL queries for v0.4.0
                break;
 
        case "0.4.0": // SQL queries for v0.4.0

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day')*7)."";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_lines BIGINT(20) UNSIGNED NOT NULL DEFAULT 10";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day')*7)."";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_lines BIGINT(20) UNSIGNED NOT NULL DEFAULT 10";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Automatisches L&ouml;schen von Turbo-Bonus-Zeilen ({!MYSQL_PREFIX!}_bonus_turbo) und begrenzte Anzahl von Eintr&auml;gen hinzugef&uuml;gt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Automatisches L&ouml;schen von Turbo-Bonus-Zeilen ({!MYSQL_PREFIX!}_bonus_turbo) und begrenzte Anzahl von Eintr&auml;gen hinzugef&uuml;gt.";


@@ -284,14 +284,14 @@ KEY userid (userid)
                break;
 
        case "0.4.4": // SQL queries for v0.4.4
                break;
 
        case "0.4.4": // SQL queries for v0.4.4

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_order FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 15.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_ref FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 100.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_stats FLOAT(20,5) UNSIGNED NOT NULL DEFAULT '5.00000'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_active ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD bonus_order FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD bonus_ref FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD bonus_stats FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_stats` ADD is_stats ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_order FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 15.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_ref FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 100.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_stats FLOAT(20,5) UNSIGNED NOT NULL DEFAULT '5.00000'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_active ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD bonus_order FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD bonus_ref FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD bonus_stats FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_stats` ADD is_stats ENUM('Y','N') NOT NULL DEFAULT 'N'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bonus-{!POINTS!} f&uuml;r: Mailbestellung, Referal-Werbung (bei Best. der EMail-Adresse) und wenn 100% Klickrate jeder Mailbuchung erreicht wurde.<br />Template <u>admin_config_bonus_pro.tpl</u> ist &uuml;berfl&uuml;ssig geworden. Bitte l&ouml;schen Sie dies!<br />Eingestellte Bonus-{!POINTS!} f&uuml;r Rank 2 war um eins verschoben.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bonus-{!POINTS!} f&uuml;r: Mailbestellung, Referal-Werbung (bei Best. der EMail-Adresse) und wenn 100% Klickrate jeder Mailbuchung erreicht wurde.<br />Template <u>admin_config_bonus_pro.tpl</u> ist &uuml;berfl&uuml;ssig geworden. Bitte l&ouml;schen Sie dies!<br />Eingestellte Bonus-{!POINTS!} f&uuml;r Rank 2 war um eins verschoben.";


@@ -308,7 +308,7 @@ KEY userid (userid)
                break;
 
        case "0.4.7": // SQL queries for v0.4.7
                break;
 
        case "0.4.7": // SQL queries for v0.4.7

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_user_data` SET login_bonus=0, turbo_bonus=0,bonus_ref=0,bonus_order=0,bonus_stats=0";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_user_data` SET login_bonus=0, turbo_bonus=0,bonus_ref=0,bonus_order=0,bonus_stats=0";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Die Aktiv-Rallye wurde nicht auf 0 {!POINTS!} gesetzt. Dieser Fehler ist nun behoben. Allerdings ist mit diesem Update auch die Aktiv-Rallye zur&uuml;ckgesetzt worden.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Die Aktiv-Rallye wurde nicht auf 0 {!POINTS!} gesetzt. Dieser Fehler ist nun behoben. Allerdings ist mit diesem Update auch die Aktiv-Rallye zur&uuml;ckgesetzt worden.";


@@ -364,7 +364,7 @@ KEY userid (userid)
                $mark = mktime(0, 0, 0, $curr, 1, date('Y', time()));
 
                // Update accounts which are not active last months
                $mark = mktime(0, 0, 0, $curr, 1, date('Y', time()));
 
                // Update accounts which are not active last months

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_user_data`
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_user_data`

 SET turbo_bonus=0, login_bonus=0, bonus_order=0, bonus_stats=0, bonus_ref=0
 WHERE last_online < ".$mark." ORDER BY userid";
 
 SET turbo_bonus=0, login_bonus=0, bonus_order=0, bonus_stats=0, bonus_ref=0
 WHERE last_online < ".$mark." ORDER BY userid";
 


@@ -401,14 +401,14 @@ WHERE last_online < ".$mark." ORDER BY userid";
                break;
 
        case "0.6.4": // SQL queries for v0.6.4
                break;
 
        case "0.6.4": // SQL queries for v0.6.4

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET title='Aktiv-Rallye' WHERE what='config_bonus' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET title='Aktiv-Rallye' WHERE what='config_bonus' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Der Men&uuml;punkt &quot;Bonus-{!POINTS!}&quot; unter Einstellungen wird nach &quot;Aktiv-Rallye umbenannt. Und die Aktiv-Rallye konnte aufgrund eines Template-Fehlers nicht gespeichert werden.";
                break;
 
        case "0.6.5": // SQL queries for v0.6.5
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Der Men&uuml;punkt &quot;Bonus-{!POINTS!}&quot; unter Einstellungen wird nach &quot;Aktiv-Rallye umbenannt. Und die Aktiv-Rallye konnte aufgrund eines Template-Fehlers nicht gespeichert werden.";
                break;
 
        case "0.6.5": // SQL queries for v0.6.5

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_stats` ADD bonus_stats ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_stats` ADD bonus_stats ENUM('Y','N') NOT NULL DEFAULT 'N'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Fehler mit bonus_stats beseitigt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Fehler mit bonus_stats beseitigt.";


@@ -423,18 +423,18 @@ WHERE last_online < ".$mark." ORDER BY userid";
                break;
 
        case "0.6.8": // SQL queries for v0.6.8
                break;
 
        case "0.6.8": // SQL queries for v0.6.8

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_bonus` SET data_type='SEND' WHERE data_type != 'SEND' AND data_type != 'DELETED' AND receivers='' AND target_send='0'";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_bonus` SET data_type='SEND' WHERE data_type != 'SEND' AND data_type != 'DELETED' AND receivers='' AND target_send='0'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Eingegebene Anzahl auszusendener Bonus-Mails wurde bei der Empf&auml;nderauswahl nicht ber&uuml;cksichtigt. Zudem wird jetzt das eingestellte Auswahlverfahren mitber&uuml;cksichtigt.";
                break;
 
        case "0.6.9": // SQL queries for v0.6.9
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Eingegebene Anzahl auszusendener Bonus-Mails wurde bei der Empf&auml;nderauswahl nicht ber&uuml;cksichtigt. Zudem wird jetzt das eingestellte Auswahlverfahren mitber&uuml;cksichtigt.";
                break;
 
        case "0.6.9": // SQL queries for v0.6.9

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_order_yn ENUM('Y','N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_ref_yn ENUM('Y','N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_stats_yn ENUM('Y','N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_login_yn ENUM('Y','N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_click_yn ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_order_yn ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_ref_yn ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_stats_yn ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_login_yn ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_click_yn ENUM('Y','N') NOT NULL DEFAULT 'Y'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Es k&ouml;nnen nun auch die folgenden Verg&uuml;tungen bei der Auswertung der monatlichen Aktiv-Rallye mit ber&uuml;cksichtigt werden: Mailbest&auml;tigung (war vorher schon), Login-, Mailbuchung, Referal und Statistik-Bonus (100% Klickrate erreicht).";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Es k&ouml;nnen nun auch die folgenden Verg&uuml;tungen bei der Auswertung der monatlichen Aktiv-Rallye mit ber&uuml;cksichtigt werden: Mailbest&auml;tigung (war vorher schon), Login-, Mailbuchung, Referal und Statistik-Bonus (100% Klickrate erreicht).";


@@ -469,14 +469,14 @@ WHERE last_online < ".$mark." ORDER BY userid";
                break;
 
        case "0.7.7": // SQL queries for v0.7.7
                break;
 
        case "0.7.7": // SQL queries for v0.7.7

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_en_notify ENUM('Y','N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_di_notify ENUM('Y','N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_new_mem_notify ENUM('Y','N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_notify_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_notify_wait BIGINT(20) UNSIGNED NOT NULL DEFAULT '30'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD bonus_ral_notify BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD bonus_ral_en_notify BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD bonus_ral_di_notify BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_en_notify ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_di_notify ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_new_mem_notify ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_notify_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_notify_wait BIGINT(20) UNSIGNED NOT NULL DEFAULT '30'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD bonus_ral_notify BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD bonus_ral_en_notify BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD bonus_ral_di_notify BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Optionale automatische Benachrichtigung &uuml;ber aktivierte und/oder deaktivierte Aktiv-Rallye einstellbar.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Optionale automatische Benachrichtigung &uuml;ber aktivierte und/oder deaktivierte Aktiv-Rallye einstellbar.";


@@ -500,15 +500,15 @@ WHERE last_online < ".$mark." ORDER BY userid";
                break;
 
        case "0.8.2": // SQL queries for v0.8.2
                break;
 
        case "0.8.2": // SQL queries for v0.8.2

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD bonus_include_own ENUM('Y','N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_bonus` ADD is_notify ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD bonus_include_own ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_bonus` ADD is_notify ENUM('Y','N') NOT NULL DEFAULT 'N'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Eigene User-ID von Aktiv-Rallye ausschliessbar. Benachrichtigungsmails sind von Aktiv-Rallye ausgeschlossen.";
                break;
 
        case "0.8.3": // SQL queries for v0.8.3
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Eigene User-ID von Aktiv-Rallye ausschliessbar. Benachrichtigungsmails sind von Aktiv-Rallye ausgeschlossen.";
                break;
 
        case "0.8.3": // SQL queries for v0.8.3

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET action='rals', sort='2', title='Aktiv-Rallye' WHERE what='bonus' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET action='rals', sort='2', title='Aktiv-Rallye' WHERE what='bonus' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett umgebaut.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett umgebaut.";


@@ -527,14 +527,14 @@ WHERE last_online < ".$mark." ORDER BY userid";
                break;
 
        case "0.8.7": // SQL queries for v0.8.7
                break;
 
        case "0.8.7": // SQL queries for v0.8.7

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','list_notifications','Benachrichtigungen','Listet alle an die Mitglieder ausgesandten Benachrichtigungen auf.', 10)";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','list_notifications','Benachrichtigungen','Listet alle an die Mitglieder ausgesandten Benachrichtigungen auf.', 10)";

 
                // Update notes
                $UPDATE_NOTES = "Benachrichtigungsmails f&uuml;r z.B. Bettel- oder Aktiv-Rallye werden nun angezeigt.";
                break;
 
        case "0.8.8": // SQL queries for v0.8.8
 
                // Update notes
                $UPDATE_NOTES = "Benachrichtigungsmails f&uuml;r z.B. Bettel- oder Aktiv-Rallye werden nun angezeigt.";
                break;
 
        case "0.8.8": // SQL queries for v0.8.8

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_stats` ADD bonus_stats_active ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_stats` ADD bonus_stats_active ENUM('Y','N') NOT NULL DEFAULT 'N'";

 
                // Update notes
                $UPDATE_NOTES = "Benachrichtigungsmails f&uuml;r z.B. Bettel- oder Aktiv-Rallye werden nun angezeigt.";
 
                // Update notes
                $UPDATE_NOTES = "Benachrichtigungsmails f&uuml;r z.B. Bettel- oder Aktiv-Rallye werden nun angezeigt.";

diff --git a/inc/extensions/ext-booking.php b/inc/extensions/ext-booking.php
index 821f70b15032adc9effeaf46915c0c034e5d2afc..54a3eb205ccd988d1f89ccd742d3884118a827f5 100644 (file)
--- a/inc/extensions/ext-booking.php
+++ b/inc/extensions/ext-booking.php
@@ -50,12 +50,12 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // Configuration entries
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // Configuration entries

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `booking_per_page` TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `booking_purge` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day') * 3)."";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `booking_per_page` TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `booking_purge` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day') * 3)."";

 
        // Drop/create table for user bookings
 
        // Drop/create table for user bookings

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_book`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_user_book`(
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_book`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_user_book`(

 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `subject` VARCHAR(255) NOT NULL DEFAULT 'missing',
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `subject` VARCHAR(255) NOT NULL DEFAULT 'missing',


@@ -66,27 +66,27 @@ PRIMARY KEY(`id`)
 ) TYPE=MyISAM COMMENT='Member points booking table'";
 
        // Admin menu
 ) TYPE=MyISAM COMMENT='Member points booking table'";
 
        // Admin menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_booking','Kontoauszug','Einstellungen am Kontoauszug für Mitglieder vornehmen.', 14)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_booking','Kontoauszug','Kontoauszüge aller Ihrer Mitglieder oder eines einzelnen Mitgliedes anzeigen.',10)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_booking','Kontoauszug','Einstellungen am Kontoauszug für Mitglieder vornehmen.', 14)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_booking','Kontoauszug','Kontoauszüge aller Ihrer Mitglieder oder eines einzelnen Mitgliedes anzeigen.',10)";

 
        // Member menu
 
        // Member menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','booking','{!POINTS!}-Kontoauszug',5,'Y','Y')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','booking','{!POINTS!}-Kontoauszug',5,'Y','Y')";

        break;
 
 case "remove": // Do stuff when removing extension
        break;
 
 case "remove": // Do stuff when removing extension

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_book`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE `what` IN ('config_booking','list_booking') LIMIT 2";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE `what`='booking' LIMIT 1";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_book`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what` IN ('config_booking','list_booking') LIMIT 2";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='booking' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='booking' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='booking' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='N', locked='Y' WHERE what='booking' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE what='booking' LIMIT 1";

        break;
 
 case "update": // Update an extension
        break;
 
 case "update": // Update an extension

diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php
index edf26ee9006ef149e55f3670eaefe8ac0636aee3..5a0dc15e6d0fd2bfa1b96329a607096d06b1454c 100644 (file)
--- a/inc/extensions/ext-cache.php
+++ b/inc/extensions/ext-cache.php
@@ -51,15 +51,15 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD cache_update BIGINT(20) UNSIGNED NOT NULL DEFAULT 3600";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD cache_path VARCHAR(255) NOT NULL DEFAULT 'cache/'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD cache_tested TINYINT(1) UNSIGNED NOT NULL DEFAULT 0";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_cache','Cache-Einstellungen','Update-Interval des Caches usw. können Sie hier ändern.', 9)";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD cache_update BIGINT(20) UNSIGNED NOT NULL DEFAULT 3600";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD cache_path VARCHAR(255) NOT NULL DEFAULT 'cache/'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD cache_tested TINYINT(1) UNSIGNED NOT NULL DEFAULT 0";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_cache','Cache-Einstellungen','Update-Interval des Caches usw. können Sie hier ändern.', 9)";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='config_cache' OR what='cache_stats' LIMIT 2";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='config_cache' OR what='cache_stats' LIMIT 2";

 
        // Unregister all filters
        UNREGISTER_FILTER('extension_update', 'CACHE_DESTROY_ON_EXT_CHANGE', true, $dry_run);
 
        // Unregister all filters
        UNREGISTER_FILTER('extension_update', 'CACHE_DESTROY_ON_EXT_CHANGE', true, $dry_run);


@@ -124,9 +124,9 @@ case "update": // Update an extension
                break;
 
        case "0.0.7": // SQL queries for v0.0.7
                break;
 
        case "0.0.7": // SQL queries for v0.0.7

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD db_hits BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD cache_hits BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('stats','cache_stats','DB-Cache','Auf Cache und gesamte Datenbank registrierte Anfragen anzeigen.', 4)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD db_hits BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD cache_hits BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('stats','cache_stats','DB-Cache','Auf Cache und gesamte Datenbank registrierte Anfragen anzeigen.', 4)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Hits auf den Cache werden gezählt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Hits auf den Cache werden gezählt.";


@@ -158,13 +158,13 @@ case "update": // Update an extension
                break;
 
        case "0.1.3": // SQL queries for v0.1.3
                break;
 
        case "0.1.3": // SQL queries for v0.1.3

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD cache_admins ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD cache_acls ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD cache_exts ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD cache_config ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD cache_modreg ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD cache_refdepth ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD cache_refsys ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD cache_admins ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD cache_acls ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD cache_exts ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD cache_config ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD cache_modreg ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD cache_refdepth ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD cache_refsys ENUM('Y','N') NOT NULL DEFAULT 'Y'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Alle cache-baren Tabellen sind nun einzelnt ein- bzw. ausschaltbar. Falls die eine oder andere ausgelagerte Tabelle also Fehler verursachen sollte, so können Sie diese hier abschalten. Beachten Sie aber bitte, dass dann mehr Abfragen an die Datenbank gestellt wird und dies bedeutend mehr Zeit braucht, als nur die Daten aus einem Datenfeld zu laden, das sich im Speicher aufhält.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Alle cache-baren Tabellen sind nun einzelnt ein- bzw. ausschaltbar. Falls die eine oder andere ausgelagerte Tabelle also Fehler verursachen sollte, so können Sie diese hier abschalten. Beachten Sie aber bitte, dass dann mehr Abfragen an die Datenbank gestellt wird und dies bedeutend mehr Zeit braucht, als nur die Daten aus einem Datenfeld zu laden, das sich im Speicher aufhält.";


@@ -191,14 +191,14 @@ case "update": // Update an extension
                break;
 
        case "0.1.8": // SQL queries for v0.1.8
                break;
 
        case "0.1.8": // SQL queries for v0.1.8

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD cache_themes ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD cache_themes ENUM('Y','N') NOT NULL DEFAULT 'Y'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Daten von installierten Themes werden nun gecacht.";
                break;
 
        case "0.1.9": // SQL queries for v0.1.9
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Daten von installierten Themes werden nun gecacht.";
                break;
 
        case "0.1.9": // SQL queries for v0.1.9

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD cache_admin_menu ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD cache_admin_menu ENUM('Y','N') NOT NULL DEFAULT 'N'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Administratormenü experimentell gecacht.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Administratormenü experimentell gecacht.";

diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php
index 5bed3a3d1e7e7ca7cb41ba8a6f9d7bccfa5e97e7..cb4012117377d65e4e8c39c7c6327215e1e863d8 100644 (file)
--- a/inc/extensions/ext-country.php
+++ b/inc/extensions/ext-country.php
@@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_countries`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_countries` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_countries`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_countries` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 code CHAR(2) NOT NULL DEFAULT 'DE',
 descr VARCHAR(255) NOT NULL DEFAULT 'Deutschland',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 code CHAR(2) NOT NULL DEFAULT 'DE',
 descr VARCHAR(255) NOT NULL DEFAULT 'Deutschland',


@@ -59,20 +59,20 @@ is_active ENUM('Y','N') NOT NULL DEFAULT 'N',
 KEY(code),
 PRIMARY KEY(id)
 ) TYPE=MyISAM";
 KEY(code),
 PRIMARY KEY(id)
 ) TYPE=MyISAM";

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_countries` (code, descr, is_active) VALUES ('DE','Deutschland','Y')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_countries` (code, descr, is_active) VALUES ('DE','Deutschland','Y')";

 
        // Admin menu
 
        // Admin menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('country', NULL, 'Ländercodes verwalten','Stellen Sie hier Ländercodes ein, damit auch internationale Mitglieder sich zu Ihrem {!MT_WORD!} anmelden können.', 8)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('country','list_country','Verwalten','Hinzufügen, Ändern und Löschen von Ländercodes.', 1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('country', NULL, 'Ländercodes verwalten','Stellen Sie hier Ländercodes ein, damit auch internationale Mitglieder sich zu Ihrem {!MT_WORD!} anmelden können.', 8)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('country','list_country','Verwalten','Hinzufügen, Ändern und Löschen von Ländercodes.', 1)";

 
        // Add entry to user table
 
        // Add entry to user table

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD country_code BIGINT(20) UNSIGNED NOT NULL DEFAULT 1";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD country_code BIGINT(20) UNSIGNED NOT NULL DEFAULT 1";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_countries`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='country' LIMIT 2";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_countries`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='country' LIMIT 2";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-debug.php b/inc/extensions/ext-debug.php
index f8e51a88ef5196bc7e50b9b24e06e9b120d1707b..17ca9c85c60845aa5e2b97c3c488880fcf786aea 100644 (file)
--- a/inc/extensions/ext-debug.php
+++ b/inc/extensions/ext-debug.php
@@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // Table for debug log entries
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // Table for debug log entries

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_debug_log`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_debug_log` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_debug_log`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_debug_log` (

 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `sender_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `timestamp` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00',
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `sender_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `timestamp` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00',


@@ -66,8 +66,8 @@ PRIMARY KEY (`id`)
 ) TYPE=MyISAM COMMENT='Debug log data'";
 
        // Table against debug log abuse
 ) TYPE=MyISAM COMMENT='Debug log data'";
 
        // Table against debug log abuse

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_debug_log_abuse`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_debug_log_abuse` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_debug_log_abuse`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_debug_log_abuse` (

 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `client_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `timestamp` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00',
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `client_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `timestamp` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00',


@@ -78,8 +78,8 @@ PRIMARY KEY (`id`)
 ) TYPE=MyISAM COMMENT='Debug log abuse'";
 
        // Table on relay/server for client exchanges
 ) TYPE=MyISAM COMMENT='Debug log abuse'";
 
        // Table on relay/server for client exchanges

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_debug_client`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_debug_client` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_debug_client`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_debug_client` (

 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `key` VARCHAR(255) NOT NULL DEFAULT 'SELF',
 `url` VARCHAR(255) NOT NULL DEFAULT '',
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `key` VARCHAR(255) NOT NULL DEFAULT 'SELF',
 `url` VARCHAR(255) NOT NULL DEFAULT '',


@@ -95,11 +95,11 @@ PRIMARY KEY (`id`)
 ) TYPE=MyISAM COMMENT='Debug clients'";
 
        // Add this exchange as first client
 ) TYPE=MyISAM COMMENT='Debug clients'";
 
        // Add this exchange as first client

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_debug_client` (`url`,`title`,`webmaster`,`status`) VALUES ('{!URL!}','{!MAIN_TITLE!}','{!WEBMASTER!}','ACTIVE')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_debug_client` (`url`,`title`,`webmaster`,`status`) VALUES ('{!URL!}','{!MAIN_TITLE!}','{!WEBMASTER!}','ACTIVE')";

 
        // Table for debug log <-> client connection
 
        // Table for debug log <-> client connection

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_debug_client_log`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_debug_client_log` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_debug_client_log`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_debug_client_log` (

 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `client_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 1,
 `log_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `client_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 1,
 `log_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -109,48 +109,48 @@ PRIMARY KEY (`id`)
 ) TYPE=MyISAM COMMENT='Debug client <-> log connection'";
 
        // Guest menus
 ) TYPE=MyISAM COMMENT='Debug client <-> log connection'";
 
        // Guest menus

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('debug',NULL,'Debug-System','Y','Y',2)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('debug','debug_info','Informationen','Y','Y',1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('debug','debug_reg','Anmeldung','Y','Y',2)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('debug','debug_unreg','Abmeldung','Y','Y',3)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('debug','debug_pilory','Spam-Pranger','Y','Y',4)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('debug',NULL,'Debug-System','Y','Y',2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('debug','debug_info','Informationen','Y','Y',1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('debug','debug_reg','Anmeldung','Y','Y',2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('debug','debug_unreg','Abmeldung','Y','Y',3)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('debug','debug_pilory','Spam-Pranger','Y','Y',4)";

 
        // Admin menu
 
        // Admin menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug',NULL,'Debug-System','Verwalten Sie hier komfortabel das debug.log, welches sich im Verzeichnis <strong>inc/cache/</strong> befindet.',10)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug','import_debug','debug.log importieren','Importieren Sie hier manuell die debug.log, damit neue Eintr&auml;ge mit bestehenden abgeglichen werden k&ouml;nnen und dann evtl. hinzugef&uuml;gt werden. Die <em>debug.log</em> wird nach dem Import automatisch vom Server entfernt. Dieser Vorgang wird f&uuml;r Sie nachts automatisch erledigt!',1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug','list_debug','Eintr&auml;ge anzeigen','Listet alle bereits importierten Eintr&auml;ge auf. Von hier aus versenden Sie noch nicht gemeldete Fehler an das Relay-Netzwerk, damt diese vom MXChange-Team gepr&uuml;ft werden k&ouml;nnen.',2)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug','reg_debug','Am Server anmelden','Sie m&uuml;ssen zuerst Ihren Debug-Client (Ihr {!MT_WORD!} ist dies) oder Relay am Server von MXChange.org anmelden. Dies geschieht f&uuml;r Sie nicht automatisch, da Sie Ihre Daten zuvor &uuml;berpr&uuml;fen m&uuml;ssen, wie z.B. URL, eMail-Adresse und {!MT_WORD!}-Titel.',3)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug','unreg_debug','Vom Server abmelden','Melden Sie bitte Ihren {!MT_WORD!} wieder vom MXChange-Server ab, damit das Team von MXChange.org weiss, welche Keys nicht mehr genutzt werden.',4)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug','config_debug','Einstellungen','&Auml;ndern Sie hier alle Einstellungen, wie auch den Debug-Modus - ob Client, Hub oder selber Server sein. Lesen Sie dazu die Anleitung unter DOCs/de/debug/README.txt durch! Oder kommen Sie in&#39;s Forum. Das Team von MXChange.org hilft Ihnen gerne weiter.',5)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug',NULL,'Debug-System','Verwalten Sie hier komfortabel das debug.log, welches sich im Verzeichnis <strong>inc/cache/</strong> befindet.',10)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug','import_debug','debug.log importieren','Importieren Sie hier manuell die debug.log, damit neue Eintr&auml;ge mit bestehenden abgeglichen werden k&ouml;nnen und dann evtl. hinzugef&uuml;gt werden. Die <em>debug.log</em> wird nach dem Import automatisch vom Server entfernt. Dieser Vorgang wird f&uuml;r Sie nachts automatisch erledigt!',1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug','list_debug','Eintr&auml;ge anzeigen','Listet alle bereits importierten Eintr&auml;ge auf. Von hier aus versenden Sie noch nicht gemeldete Fehler an das Relay-Netzwerk, damt diese vom MXChange-Team gepr&uuml;ft werden k&ouml;nnen.',2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug','reg_debug','Am Server anmelden','Sie m&uuml;ssen zuerst Ihren Debug-Client (Ihr {!MT_WORD!} ist dies) oder Relay am Server von MXChange.org anmelden. Dies geschieht f&uuml;r Sie nicht automatisch, da Sie Ihre Daten zuvor &uuml;berpr&uuml;fen m&uuml;ssen, wie z.B. URL, eMail-Adresse und {!MT_WORD!}-Titel.',3)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug','unreg_debug','Vom Server abmelden','Melden Sie bitte Ihren {!MT_WORD!} wieder vom MXChange-Server ab, damit das Team von MXChange.org weiss, welche Keys nicht mehr genutzt werden.',4)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('debug','config_debug','Einstellungen','&Auml;ndern Sie hier alle Einstellungen, wie auch den Debug-Modus - ob Client, Hub oder selber Server sein. Lesen Sie dazu die Anleitung unter DOCs/de/debug/README.txt durch! Oder kommen Sie in&#39;s Forum. Das Team von MXChange.org hilft Ihnen gerne weiter.',5)";

 
        // Config entries
 
        // Config entries

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `debug_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `debug_key` VARCHAR(255) NOT NULL DEFAULT ''";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `debug_mode` ENUM('CLIENT','RELAY','SERVER') NOT NULL DEFAULT 'CLIENT'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `debug_new_log` ENUM('ACCEPT','FIRST','REG') NOT NULL DEFAULT 'FIRST'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `debug_new_client` ENUM('ACTIVE','NEW','REG') NOT NULL DEFAULT 'NEW'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `debug_reject_log` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day') * 30)."";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `debug_master_url` VARCHAR(255) NOT NULL DEFAULT '{!SERVER_URL!}'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `debug_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `debug_key` VARCHAR(255) NOT NULL DEFAULT ''";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `debug_mode` ENUM('CLIENT','RELAY','SERVER') NOT NULL DEFAULT 'CLIENT'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `debug_new_log` ENUM('ACCEPT','FIRST','REG') NOT NULL DEFAULT 'FIRST'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `debug_new_client` ENUM('ACTIVE','NEW','REG') NOT NULL DEFAULT 'NEW'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `debug_reject_log` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day') * 30)."";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `debug_master_url` VARCHAR(255) NOT NULL DEFAULT '{!SERVER_URL!}'";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_debug_client_log`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_debug_client`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_debug_log`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_debug_log_abuse`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE `action`='debug' LIMIT 5";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE `action`='debug' LIMIT 6";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_debug_client_log`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_debug_client`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_debug_log`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_debug_log_abuse`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='debug' LIMIT 5";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='debug' LIMIT 6";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET `visible`='Y',`locked`='N' WHERE `action`='debug' LIMIT 5";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='Y',`locked`='N' WHERE `action`='debug' LIMIT 5";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET `locked`='Y' WHERE `action`='debug' LIMIT 5";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `locked`='Y' WHERE `action`='debug' LIMIT 5";

        break;
 
 case "update": // Update an extension
        break;
 
 case "update": // Update an extension

diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php
index 08e70872497bf14ec08e1d48835b3f38d0600882..2a9dac417f79c421a992c6ae37a9deb5201304fb 100644 (file)
--- a/inc/extensions/ext-doubler.php
+++ b/inc/extensions/ext-doubler.php
@@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // Doubler table
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // Doubler table

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_doubler`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_doubler` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_doubler`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_doubler` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 refid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 refid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -69,72 +69,72 @@ PRIMARY KEY(id)
        // --- SETTINGS ---
        //
        // Minimum points to double
        // --- SETTINGS ---
        //
        // Minimum points to double

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_min FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 100.00000";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_min FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 100.00000";

        // Maximum points to double
        // Maximum points to double

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_max FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 10000.00000";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_max FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 10000.00000";

        // Points left on users account after doubling
        // Points left on users account after doubling

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_left BIGINT(20) UNSIGNED NOT NULL DEFAULT 1000";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_left BIGINT(20) UNSIGNED NOT NULL DEFAULT 1000";

        // Charge for doubling points which goes to the webmaster (shreddered in fact!)
        // Charge for doubling points which goes to the webmaster (shreddered in fact!)

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_charge FLOAT(7,5) UNSIGNED NOT NULL DEFAULT 0.03000";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_charge FLOAT(7,5) UNSIGNED NOT NULL DEFAULT 0.03000";

        // Referal percents
        // Referal percents

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_ref FLOAT(7,5) UNSIGNED NOT NULL DEFAULT 0.02000";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_ref FLOAT(7,5) UNSIGNED NOT NULL DEFAULT 0.02000";

        // Shall I use the jackpot to take points from? (Y/N, default=Y)
        // Shall I use the jackpot to take points from? (Y/N, default=Y)

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_jackpot ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_jackpot ENUM('Y','N') NOT NULL DEFAULT 'Y'";

        // A user account to take points from (default: 0->none)
        // A user account to take points from (default: 0->none)

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";

        // Total payed out points from your doublers
        // Total payed out points from your doublers

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";

        // Sending mode of mails (immediately/daily reset)
        // --> This also means who fast the doubled points will be payed out!
        // Sending mode of mails (immediately/daily reset)
        // --> This also means who fast the doubled points will be payed out!

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_send_mode ENUM('DIRECT','RESET') NOT NULL DEFAULT 'DIRECT'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_send_mode ENUM('DIRECT','RESET') NOT NULL DEFAULT 'DIRECT'";

        // Timeout for entries to be purged (default: one week)
        // Timeout for entries to be purged (default: one week)

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day')*7)."";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day')*7)."";

        // Number of newest entries to display
        // Number of newest entries to display

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_display_new TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_display_new TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";

        // Number of entries which will be payed out soon
        // Number of entries which will be payed out soon

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_display_pay TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_display_pay TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";

        // Number of entries which are already payed out
        // Number of entries which are already payed out

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_display_old TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_display_old TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";

        // Points used by every member
        // Points used by every member

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD doubler_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD doubler_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";

        // Counter for usage of the doubler
        // Counter for usage of the doubler

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_counter BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_counter BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";

 
        //
        // --- MENU SYSTEMS ---
        //
        // Admin menu
 
        //
        // --- MENU SYSTEMS ---
        //
        // Admin menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('doubler', NULL, '{!POINTS!}-Verdoppler','Einstellungen und Einträge auflisten.', 4)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('doubler','list_doubler','Auflisten','Einträge aus der Verdiensttabelle auflisten', 1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('doubler','config_doubler','Einstellungen','Prozentuale Gebühr usw. einstellen.', 2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('doubler', NULL, '{!POINTS!}-Verdoppler','Einstellungen und Einträge auflisten.', 4)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('doubler','list_doubler','Auflisten','Einträge aus der Verdiensttabelle auflisten', 1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('doubler','config_doubler','Einstellungen','Prozentuale Gebühr usw. einstellen.', 2)";

 
        // Guest menu (informations / default doubler link)
 
        // Guest menu (informations / default doubler link)

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','doubler','Verdoppeln!',3,'Y','Y')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','doubler','Verdoppeln!',3,'Y','Y')";

 
        // Member menu
 
        // Member menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','doubler','Verdoppeln!','Y','Y',7)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','doubler','Verdoppeln!','Y','Y',7)";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_doubler`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='doubler' LIMIT 3";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE what='doubler' LIMIT 1";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE what='doubler' LIMIT 1";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_doubler`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='doubler' LIMIT 3";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE what='doubler' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE what='doubler' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='doubler' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='Y', locked='N' WHERE what='doubler' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_mod_reg` SET locked='N', hidden='N', admin_only='N', mem_only='N' WHERE module='doubler' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='doubler' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='Y', `locked`='N' WHERE what='doubler' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='N', hidden='N', admin_only='N', mem_only='N' WHERE module='doubler' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='N', locked='Y' WHERE what='doubler' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='N', locked='Y' WHERE what='doubler' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_mod_reg` SET locked='Y' WHERE module='doubler' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE what='doubler' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='N', `locked`='Y' WHERE what='doubler' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='Y' WHERE module='doubler' LIMIT 1";

        break;
 
 case "update": // Update an extension
        break;
 
 case "update": // Update an extension


@@ -147,7 +147,7 @@ case "update": // Update an extension
 
        case "0.0.2": // SQL queries for v0.0.2
                // Total used points
 
        case "0.0.2": // SQL queries for v0.0.2
                // Total used points

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_used FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_used FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Gebühr wird vom Verdoppler-Pott abgezogen.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Gebühr wird vom Verdoppler-Pott abgezogen.";


@@ -160,7 +160,7 @@ case "update": // Update an extension
 
        case "0.0.4": // SQL queries for v0.0.4
                // Shall I use the doubler's account to take points from? (Y/N, default=Y)
 
        case "0.0.4": // SQL queries for v0.0.4
                // Shall I use the doubler's account to take points from? (Y/N, default=Y)

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_own ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_own ENUM('Y','N') NOT NULL DEFAULT 'Y'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = POINTS."-Guthaben des Verdopplers kann optional nicht mit einbezogen werden.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = POINTS."-Guthaben des Verdopplers kann optional nicht mit einbezogen werden.";


@@ -172,9 +172,9 @@ case "update": // Update an extension
                break;
 
        case "0.0.6": // SQL queries for v0.0.6
                break;
 
        case "0.0.6": // SQL queries for v0.0.6

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_max_sent TINYINT(3) UNSIGNED NOT NULL DEFAULT 1";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_group_sent TINYINT(3) UNSIGNED NOT NULL DEFAULT 1";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD doubler_sent_all ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_max_sent TINYINT(3) UNSIGNED NOT NULL DEFAULT 1";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_group_sent TINYINT(3) UNSIGNED NOT NULL DEFAULT 1";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD doubler_sent_all ENUM('Y','N') NOT NULL DEFAULT 'Y'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Geb&uuml;hrenabzug wird beim Einzahlen abgezogen (wurde von Auszahlung abgezogen) und maximal bei Auszahlung zu kontrollierende Accounts einstellbar.<br />Template <u>admin_config_doubler_pro.tpl</u> ist &uuml;berfl&uuml;ssig geworden. Bitte l&ouml;schen Sie dies!";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Geb&uuml;hrenabzug wird beim Einzahlen abgezogen (wurde von Auszahlung abgezogen) und maximal bei Auszahlung zu kontrollierende Accounts einstellbar.<br />Template <u>admin_config_doubler_pro.tpl</u> ist &uuml;berfl&uuml;ssig geworden. Bitte l&ouml;schen Sie dies!";


@@ -216,7 +216,7 @@ case "update": // Update an extension
                break;
 
        case "0.1.4": // SQL queries for v0.1.4
                break;
 
        case "0.1.4": // SQL queries for v0.1.4

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET action='extras', sort='4' WHERE what='doubler' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET action='extras', sort='4' WHERE what='doubler' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett umgebaut.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett umgebaut.";

diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php
index 62e9b2c3e01ea9c17fa5b0b726e6f99536e14f37..bdcaca17671a5b04529ff75b5fe720109c97ecde 100644 (file)
--- a/inc/extensions/ext-holiday.php
+++ b/inc/extensions/ext-holiday.php
@@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // Create database
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // Create database

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_holidays`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_user_holidays` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_holidays`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_user_holidays` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 holiday_start VARCHAR(10) NOT NULL DEFAULT 0,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 holiday_start VARCHAR(10) NOT NULL DEFAULT 0,


@@ -62,38 +62,38 @@ PRIMARY KEY(id)
 ) TYPE=MyISAM";
 
        // Add default values to config
 ) TYPE=MyISAM";
 
        // Add default values to config

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD holiday_max BIGINT(20) UNSIGNED NOT NULL DEFAULT '30'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD holiday_max BIGINT(20) UNSIGNED NOT NULL DEFAULT '30'";

 
        // Add member menu
 
        // Add member menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','holiday','Urlaubsschaltung','4','Y','Y')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','holiday','Urlaubsschaltung','4','Y','Y')";

 
        // Add admin menus
 
        // Add admin menus

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('holiday', NULL, 'Urlaubsmanagement','4','Hier können Sie Urlaubsschaltungen Ihrer Mitglieder auflisten oder auch wieder aufheben.')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('holiday','list_holiday','Auflisten','1','Alle Urlaubsschaltungen auflisten.')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('holiday','del_holiday','Urlaub beenden','2','Urlaubsschaltungen aufheben. Geben Sie bitte mehr als nur "Verstoss gegen unsere AGBs" ein!')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('holiday','config_holiday','Einstellungen','3','Maximale Tage für Urlaub usw. einstellen.')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('holiday', NULL, 'Urlaubsmanagement','4','Hier können Sie Urlaubsschaltungen Ihrer Mitglieder auflisten oder auch wieder aufheben.')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('holiday','list_holiday','Auflisten','1','Alle Urlaubsschaltungen auflisten.')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('holiday','del_holiday','Urlaub beenden','2','Urlaubsschaltungen aufheben. Geben Sie bitte mehr als nur "Verstoss gegen unsere AGBs" ein!')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('holiday','config_holiday','Einstellungen','3','Maximale Tage für Urlaub usw. einstellen.')";

 
        // Remove 0 max mails per day
 
        // Remove 0 max mails per day

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_max_receive` WHERE value='0' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE value='0' LIMIT 1";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_holidays`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE what='holiday' LIMIT 1";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='holiday' LIMIT 4";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_max_receive` WHERE value='0' LIMIT 1";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_max_receive` (value, comment) VALUES ('0','Urlaub')";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_holidays`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE what='holiday' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='holiday' LIMIT 4";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE value='0' LIMIT 1";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_max_receive` (value, comment) VALUES ('0','Urlaub')";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='holiday' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='holiday' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='N', locked='Y' WHERE what='holiday' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE what='holiday' LIMIT 1";

        break;
 
 case "update": // Update an extension
        break;
 
 case "update": // Update an extension


@@ -155,30 +155,30 @@ case "update": // Update an extension
                break;
 
        case "0.1.3": // SQL queries for v0.1.3
                break;
 
        case "0.1.3": // SQL queries for v0.1.3

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD holiday_active ENUM('Y','N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_max_receive` WHERE value='0' LIMIT 1";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD holiday_lock BIGINT(20) UNSIGNED NOT NULL DEFAULT '".(getConfig('one_day')*2)."'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD holiday_active ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE value='0' LIMIT 1";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD holiday_lock BIGINT(20) UNSIGNED NOT NULL DEFAULT '".(getConfig('one_day')*2)."'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Die Mitglieder-Accounts werden nicht mehr gesperrt, sondern nur auf <strong>Urlaub</strong> geschaltet. Lassen Sie sich nicht davon verwirren, dass sie &quot;freigegeben&quot; sind!";
                break;
 
        case "0.1.4": // SQL queries for v0.1.4
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Die Mitglieder-Accounts werden nicht mehr gesperrt, sondern nur auf <strong>Urlaub</strong> geschaltet. Lassen Sie sich nicht davon verwirren, dass sie &quot;freigegeben&quot; sind!";
                break;
 
        case "0.1.4": // SQL queries for v0.1.4

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD holiday_mode ENUM('DIRECT','RESET') NOT NULL DEFAULT 'RESET'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD holiday_mode ENUM('DIRECT','RESET') NOT NULL DEFAULT 'RESET'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Urlaubsschaltung wird erst Abends um 00:00 Uhr aktiv und nicht durch die Beantragung. Dies kann nun auch auf direkte Umstellung eingestellt werden.";
                break;
 
        case "0.1.5": // SQL queries for v0.1.5
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Urlaubsschaltung wird erst Abends um 00:00 Uhr aktiv und nicht durch die Beantragung. Dies kann nun auch auf direkte Umstellung eingestellt werden.";
                break;
 
        case "0.1.5": // SQL queries for v0.1.5

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD holiday_mode ENUM('DIRECT','RESET') NOT NULL DEFAULT 'RESET'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD holiday_mode ENUM('DIRECT','RESET') NOT NULL DEFAULT 'RESET'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Sicherheitsupdate f&uuml;r die Include-Befehle.";
                break;
 
        case "0.1.6": // SQL queries for v0.1.6
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Sicherheitsupdate f&uuml;r die Include-Befehle.";
                break;
 
        case "0.1.6": // SQL queries for v0.1.6

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD holiday_activated BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD holiday_activated BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Fehlende Tabellenspalte hinzugef&uuml;gt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Fehlende Tabellenspalte hinzugef&uuml;gt.";


@@ -190,9 +190,9 @@ case "update": // Update an extension
                break;
 
        case "0.1.8": // SQL queries for v0.1.8
                break;
 
        case "0.1.8": // SQL queries for v0.1.8

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu_las` (la_id, la_action, la_what) VALUES ('member', '', 'list_holiday')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu_las` (la_id, la_action, la_what) VALUES ('member', '', 'del_holiday')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu_las` (la_id, la_action, la_what) VALUES ('config', '', 'config_holiday')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu_las` (la_id, la_action, la_what) VALUES ('member', '', 'list_holiday')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu_las` (la_id, la_action, la_what) VALUES ('member', '', 'del_holiday')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu_las` (la_id, la_action, la_what) VALUES ('config', '', 'config_holiday')";

 
                // Depends on sql_patches (or you have to execute these both SQL statements by phpMyAdmin
                $EXT_UPDATE_DEPENDS = "sql_patches";
 
                // Depends on sql_patches (or you have to execute these both SQL statements by phpMyAdmin
                $EXT_UPDATE_DEPENDS = "sql_patches";


@@ -202,14 +202,14 @@ case "update": // Update an extension
                break;
 
        case "0.1.9": // SQL queries for v0.1.9
                break;
 
        case "0.1.9": // SQL queries for v0.1.9

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET action='account', sort='2', title='In Urlaub' WHERE what='holiday' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET action='account', sort='2', title='In Urlaub' WHERE what='holiday' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett umgebaut.";
                break;
 
        case "0.2.0": // SQL queries for v0.2.0
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett umgebaut.";
                break;
 
        case "0.2.0": // SQL queries for v0.2.0

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET title = 'Urlaubsmanagement' WHERE action = 'holiday' AND (what='' OR what IS NULL) LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET title = 'Urlaubsmanagement' WHERE action = 'holiday' AND (what='' OR `what` IS NULL) LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett umgebaut.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett umgebaut.";

diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php
index 7b9d75e805d08b8f85678ecb9a8de39adfdff41b..e2e80cdf578dceb0332b19b24e54fe3f5512dfa8 100644 (file)
--- a/inc/extensions/ext-html_mail.php
+++ b/inc/extensions/ext-html_mail.php
@@ -50,28 +50,28 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD html ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_bonus` ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_pool` ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','html_mail','HTML-Empfang','3','Y','Y')";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD html ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_bonus` ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_pool` ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','html_mail','HTML-Empfang','3','Y','Y')";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` DROP html";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_bonus` DROP html_msg";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_pool` DROP html_msg";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE what='html_mail' LIMIT 1";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP html";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_bonus` DROP html_msg";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_pool` DROP html_msg";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE what='html_mail' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='html_mail' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='html_mail' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='N', locked='Y' WHERE what='html_mail' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE what='html_mail' LIMIT 1";

        break;
 
 case "update": // Update an extension
        break;
 
 case "update": // Update an extension

diff --git a/inc/extensions/ext-iso3166.php b/inc/extensions/ext-iso3166.php
index c323d115093d4704da0ae1f05ac0465d2fb3599c..b905f277c8ae92d5f626a92790585d96832c0231 100644 (file)
--- a/inc/extensions/ext-iso3166.php
+++ b/inc/extensions/ext-iso3166.php
@@ -53,26 +53,26 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE FROM `{!MYSQL_PREFIX!}_countries` WHERE provider = 'ext-iso3166';";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_countries` DROP `provider`;";
+       $SQLs[] = "DELETE FROM `{!_MYSQL_PREFIX!}_countries` WHERE provider = 'ext-iso3166';";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_countries` DROP `provider`;";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_countries` SET is_active = 'Y' WHERE provider = 'ext-iso3166';";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_countries` SET is_active = 'Y' WHERE provider = 'ext-iso3166';";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_countries` SET is_active='N' WHERE provider = 'ext-iso3166';";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_countries` SET is_active='N' WHERE provider = 'ext-iso3166';";

        break;
 
 case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.2
        break;
 
 case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.2

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_countries` ADD `provider` ENUM( 'user', 'ext-iso3166' ) NOT NULL DEFAULT 'user';";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_countries` (`code` , `descr`, `provider`)
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_countries` ADD `provider` ENUM( 'user', 'ext-iso3166' ) NOT NULL DEFAULT 'user';";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_countries` (`code` , `descr`, `provider`)

 VALUES ('AD', 'Andorra', 'ext-iso3166'),
 ('AE', 'Vereinigte Arabische Emirate', 'ext-iso3166'),
 ('AF', 'Afghanistan', 'ext-iso3166'),
 VALUES ('AD', 'Andorra', 'ext-iso3166'),
 ('AE', 'Vereinigte Arabische Emirate', 'ext-iso3166'),
 ('AF', 'Afghanistan', 'ext-iso3166'),

diff --git a/inc/extensions/ext-logs.php b/inc/extensions/ext-logs.php
index d2a985499c58c2b08b221856ef3264163b77f9db..51702da9e91c38e60dba0d050d593228d68d92fb 100644 (file)
--- a/inc/extensions/ext-logs.php
+++ b/inc/extensions/ext-logs.php
@@ -50,13 +50,13 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('stats','logs','Aufruflogbücher','Verwalten Sie Ihre Aufruflogbücher mit diesem Admin-Bereich! (Derzeit nur Download!)',8)";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `logs_base` VARCHAR(255) NOT NULL DEFAULT 'logs'";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('stats','logs','Aufruflogbücher','Verwalten Sie Ihre Aufruflogbücher mit diesem Admin-Bereich! (Derzeit nur Download!)',8)";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `logs_base` VARCHAR(255) NOT NULL DEFAULT 'logs'";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='logs' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='logs' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-mailid.php b/inc/extensions/ext-mailid.php
index 5bd1ebe1ba3fbfdd958ba709159010226e34aab8..a8a387f083afdb2547d891f91ec0837e7e300343 100644 (file)
--- a/inc/extensions/ext-mailid.php
+++ b/inc/extensions/ext-mailid.php
@@ -60,12 +60,12 @@ case "remove": // Do stuff when removing extension
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_mod_reg` SET locked='N', hidden='N', admin_only='N', mem_only='N' WHERE module='mailid' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='N', hidden='N', admin_only='N', mem_only='N' WHERE module='mailid' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_mod_reg` SET locked='Y' WHERE module='mailid' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='Y' WHERE module='mailid' LIMIT 1";

        break;
 
 case "update": // Update an extension
        break;
 
 case "update": // Update an extension

diff --git a/inc/extensions/ext-maintenance.php b/inc/extensions/ext-maintenance.php
index aceafbfcb4aa1bd000dfd24b565f1975105cafdd..e8990bd30329b7172e407490d819314284d95217 100644 (file)
--- a/inc/extensions/ext-maintenance.php
+++ b/inc/extensions/ext-maintenance.php
@@ -50,13 +50,13 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD maintenance ENUM('Y','N') NOT NULL DEFAULT 'N';";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','maintenance','Wartungsmodus','Schalten Sie den Wartungsmodus ein, nur wenn sehr schwerwiegende Fehler vorliegen, die Sie oder mxchange.org nicht schenll genug beheben können.','10')";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD maintenance ENUM('Y','N') NOT NULL DEFAULT 'N';";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','maintenance','Wartungsmodus','Schalten Sie den Wartungsmodus ein, nur wenn sehr schwerwiegende Fehler vorliegen, die Sie oder mxchange.org nicht schenll genug beheben können.','10')";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='maintenance' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='maintenance' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php
index 7eb9b594c0cd39fcc8fec64a0dab2bb90397341b..bc23dc9c41021db51a334dbad3411fddaa7bd384 100644 (file)
--- a/inc/extensions/ext-mediadata.php
+++ b/inc/extensions/ext-mediadata.php
@@ -55,9 +55,9 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_mediadata`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='config_mediadata' LIMIT 1";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE what='mediadata' LIMIT 1";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_mediadata`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='config_mediadata' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE what='mediadata' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension


@@ -90,8 +90,8 @@ case "update": // Update an extension
 
        case "0.0.4": // SQL queries for v0.0.4
                // SQL commands to run
 
        case "0.0.4": // SQL queries for v0.0.4
                // SQL commands to run

-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_mediadata`";
-               $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_mediadata` (
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_mediadata`";
+               $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_mediadata` (

 media_key VARCHAR(255) NOT NULL DEFAULT '',
 media_value VARCHAR(255) NOT NULL DEFAULT '',
 PRIMARY KEY(media_key)
 media_key VARCHAR(255) NOT NULL DEFAULT '',
 media_value VARCHAR(255) NOT NULL DEFAULT '',
 PRIMARY KEY(media_key)


@@ -112,9 +112,9 @@ PRIMARY KEY(media_key)
                break;
 
        case "0.0.7": // SQL queries for v0.0.7
                break;
 
        case "0.0.7": // SQL queries for v0.0.7

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD mt_start BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD mt_stage BIGINT(20) UNSIGNED NOT NULL DEFAULT '500'";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_mediadata','Mediendaten','Stellen Sie allgemeine Einstellungen zu den Mediendaten ein.', 10)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD mt_start BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD mt_stage BIGINT(20) UNSIGNED NOT NULL DEFAULT '500'";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_mediadata','Mediendaten','Stellen Sie allgemeine Einstellungen zu den Mediendaten ein.', 10)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Start des {!MT_WORD2!} und Anzahl Anmeldungen aufgenommen. (Task #13)<br />
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Start des {!MT_WORD2!} und Anzahl Anmeldungen aufgenommen. (Task #13)<br />


@@ -127,7 +127,7 @@ Bitte stellen Sie diesen derzeit manuell unter <a href=\"{!URL!}/modules.php?mod
                break;
 
        case "0.0.9": // SQL queries for v0.0.9
                break;
 
        case "0.0.9": // SQL queries for v0.0.9

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','mediadata','Mediendaten',3,'Y','N')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','mediadata','Mediendaten',3,'Y','N')";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Men&uuml;punkt wird durch diese Erweiterung generiert.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Men&uuml;punkt wird durch diese Erweiterung generiert.";

diff --git a/inc/extensions/ext-mods.php b/inc/extensions/ext-mods.php
index 79adf648ac6debade46f9afeb7ae9657279962f4..69023ee1de00023e38193d07abb53856b467f3d6 100644 (file)
--- a/inc/extensions/ext-mods.php
+++ b/inc/extensions/ext-mods.php
@@ -50,14 +50,14 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('mods', NULL, 'Modul-Management','Verwalten Sie die Basis-Module index, login, admin usw.', 4)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('mods','config_mods','Module ändern','Ändern Sie hier die Zugtiffsrechte auf die Module. Was dennoch nicht geht: Mitglied- oder Gastzugriffsrtechte auf Admin-Module bzw. Gastzugriffsrechte auf Mitglieder-Module. Diese sind extra abgesichert.', 1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('mods','stats_mods','Modul-Statistiken','Sehen Sie sich hier die Statistiken der Module und die damit verknüpften action- und what-Dateien an. Bei einigen Modulen gibt es allerdings keine verknüpften Dateien und somit keine Extra-Statistik.', 2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('mods', NULL, 'Modul-Management','Verwalten Sie die Basis-Module index, login, admin usw.', 4)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('mods','config_mods','Module ändern','Ändern Sie hier die Zugtiffsrechte auf die Module. Was dennoch nicht geht: Mitglied- oder Gastzugriffsrtechte auf Admin-Module bzw. Gastzugriffsrechte auf Mitglieder-Module. Diese sind extra abgesichert.', 1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('mods','stats_mods','Modul-Statistiken','Sehen Sie sich hier die Statistiken der Module und die damit verknüpften action- und what-Dateien an. Bei einigen Modulen gibt es allerdings keine verknüpften Dateien und somit keine Extra-Statistik.', 2)";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='mods' LIMIT 3";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='mods' LIMIT 3";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension


@@ -104,7 +104,7 @@ case "update": // Update an extension
                break;
 
        case "0.0.8": // SQL queries for v0.0.8
                break;
 
        case "0.0.8": // SQL queries for v0.0.8

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET title = 'Modul-Management' WHERE action = 'mods' AND (what='' OR what IS NULL) LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET title = 'Modul-Management' WHERE action = 'mods' AND (what='' OR `what` IS NULL) LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Verwaltung auf Management umgestellt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Verwaltung auf Management umgestellt.";

diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php
index 82c998416e25719e9d1166f2da847be9f33264bc..fd5f2f560efe3b4a854e2f54ff556fb9db39d480 100644 (file)
--- a/inc/extensions/ext-newsletter.php
+++ b/inc/extensions/ext-newsletter.php
@@ -55,33 +55,33 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='newsletter' AND what != 'send_newsletter' LIMIT 3";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE what='newsletter' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='newsletter' AND what != 'send_newsletter' LIMIT 3";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE what='newsletter' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET locked='N', visible='Y' WHERE what='newsletter' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `locked`='N', `visible`='Y' WHERE what='newsletter' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET locked='Y', visible='N' WHERE what='newsletter' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `locked`='Y', `visible`='N' WHERE what='newsletter' LIMIT 1";

        break;
 
 case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.1
        break;
 
 case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.1

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('newsletter', NULL, 'Newsletter','Einstellungen am Newsletter, Newsletter versenden, Abbestellungen auflisten usw.', 3)";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('newsletter','list_newsletter','Abbestellungen','Alle Abbestellungen auflisten und bearbeiten.', 2)";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('newsletter','config_newsletter','Einstellungen','Gebühr zum Abbestellen des Newsletters usw. sind hier einstellbar.', 3)";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET action='newsletter', what='send_newsletter', title='Versenden', sort='1' WHERE what='newsletter' LIMIT 1";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','newsletter','Newsletter-Empfang','N','Y', 10)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD nl_charge FLOAT(10,2) UNSIGNED NOT NULL DEFAULT '5.00'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD nl_receive ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD nl_until VARCHAR(10) NOT NULL DEFAULT 0";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD nl_timespan VARCHAR(10) NOT NULL DEFAULT 0";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('newsletter', NULL, 'Newsletter','Einstellungen am Newsletter, Newsletter versenden, Abbestellungen auflisten usw.', 3)";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('newsletter','list_newsletter','Abbestellungen','Alle Abbestellungen auflisten und bearbeiten.', 2)";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('newsletter','config_newsletter','Einstellungen','Gebühr zum Abbestellen des Newsletters usw. sind hier einstellbar.', 3)";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET action='newsletter', what='send_newsletter', title='Versenden', sort='1' WHERE what='newsletter' LIMIT 1";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','newsletter','Newsletter-Empfang','N','Y', 10)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD nl_charge FLOAT(10,2) UNSIGNED NOT NULL DEFAULT '5.00'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD nl_receive ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD nl_until VARCHAR(10) NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD nl_timespan VARCHAR(10) NOT NULL DEFAULT 0";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Vor der eigentlichen Freigabe dieser Erweiterungen habe ich sie versehendlich im Archiv mit auf den Server hochgeladen. Diese Version fügt die bereits angekündigte Funktionalitäten, wie zum Beispiel das Einstellen der Abschaltgebühr.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Vor der eigentlichen Freigabe dieser Erweiterungen habe ich sie versehendlich im Archiv mit auf den Server hochgeladen. Diese Version fügt die bereits angekündigte Funktionalitäten, wie zum Beispiel das Einstellen der Abschaltgebühr.";

diff --git a/inc/extensions/ext-nickname.php b/inc/extensions/ext-nickname.php
index 88be5c2ba4240a56ca44dc9929fa8d9b553cae63..01a6f8f03144b281ab2f73dd1d5abf85b2ee6453 100644 (file)
--- a/inc/extensions/ext-nickname.php
+++ b/inc/extensions/ext-nickname.php
@@ -50,9 +50,9 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD nickname VARCHAR(255) NOT NULL DEFAULT ''";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD nick_uid ENUM ('nick','uid') NOT NULL DEFAULT 'uid'";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','nickname','Nicknamen','5','Y','Y')";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD nickname VARCHAR(255) NOT NULL DEFAULT ''";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD nick_uid ENUM ('nick','uid') NOT NULL DEFAULT 'uid'";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','nickname','Nicknamen','5','Y','Y')";

 
        // Load CSS file?
        $EXT_CSS = "Y";
 
        // Load CSS file?
        $EXT_CSS = "Y";


@@ -60,26 +60,26 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE what='nickname' LIMIT 1";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what IN ('config_nickname','list_nickname') LIMIT 2";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_nickname_history`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE what='nickname' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what IN ('config_nickname','list_nickname') LIMIT 2";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_nickname_history`";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='nickname' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='nickname' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='N', locked='Y' WHERE what='nickname' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE what='nickname' LIMIT 1";

        break;
 
 case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.1
        break;
 
 case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.1

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_extensions` SET ext_has_css='Y' WHERE ext_name='nickname' AND ext_has_css='N' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_has_css='Y' WHERE ext_name='nickname' AND ext_has_css='N' LIMIT 1";

 
                // This update depends on sql_patches update!
                $EXT_UPDATE_DEPENDS = "sql_patches";
 
                // This update depends on sql_patches update!
                $EXT_UPDATE_DEPENDS = "sql_patches";


@@ -104,10 +104,10 @@ case "update": // Update an extension
                break;
 
        case "0.0.6": // SQL queries for v0.0.6
                break;
 
        case "0.0.6": // SQL queries for v0.0.6

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD nickname_len TINYINT(3) UNSIGNED NOT NULL DEFAULT '5'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD nickname_pattern VARCHAR(255) NOT NULL DEFAULT 'a-zA-Z0-9_'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD nickname_chars VARCHAR(255) NOT NULL DEFAULT 'a-z, A-Z, 0-9, _'";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_nickname','Nicknamen','Stellen Sie minimale Nicknamenlänge, sowie erlaubte Zeichen hier ein.', 12)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD nickname_len TINYINT(3) UNSIGNED NOT NULL DEFAULT '5'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD nickname_pattern VARCHAR(255) NOT NULL DEFAULT 'a-zA-Z0-9_'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD nickname_chars VARCHAR(255) NOT NULL DEFAULT 'a-z, A-Z, 0-9, _'";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_nickname','Nicknamen','Stellen Sie minimale Nicknamenlänge, sowie erlaubte Zeichen hier ein.', 12)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Minimale Länge, sowie erlaubte Zeichen sind per Adminbereich änderbar. Setzen Sie als erlaubte Zeichen nur URL-konforme Zeichen ein!";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Minimale Länge, sowie erlaubte Zeichen sind per Adminbereich änderbar. Setzen Sie als erlaubte Zeichen nur URL-konforme Zeichen ein!";


@@ -134,7 +134,7 @@ case "update": // Update an extension
                break;
 
        case "0.1.1": // SQL queries for v0.1.1
                break;
 
        case "0.1.1": // SQL queries for v0.1.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` DROP nick_uid";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP nick_uid";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Auswahlfür Mitglied ob mit Nickname oder User-ID einloggen entfernt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Auswahlfür Mitglied ob mit Nickname oder User-ID einloggen entfernt.";


@@ -161,7 +161,7 @@ case "update": // Update an extension
                break;
 
        case "0.1.6": // SQL queries for v0.1.6
                break;
 
        case "0.1.6": // SQL queries for v0.1.6

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET action='extras', sort='2' WHERE what='nickname' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET action='extras', sort='2' WHERE what='nickname' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmenü komplett umgebaut.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmenü komplett umgebaut.";


@@ -178,9 +178,9 @@ case "update": // Update an extension
                break;
 
        case "0.1.9": // SQL queries for v0.1.9
                break;
 
        case "0.1.9": // SQL queries for v0.1.9

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_nickname','Nickname-Historie','Listet alle verwendeten Nicknames der Mitglieder auf.', 12)";
-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_nickname_history`";
-               $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_nickname_history` (
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_nickname','Nickname-Historie','Listet alle verwendeten Nicknames der Mitglieder auf.', 12)";
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_nickname_history`";
+               $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_nickname_history` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 nickname VARCHAR(255) NOT NULL DEFAULT '',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 nickname VARCHAR(255) NOT NULL DEFAULT '',

diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php
index 29ca0c9acd624fb181e01b064330d5fc23cc199d..1c2104683b7a0ecdf6c0d0cd6d1da3867cc7fe2d 100644 (file)
--- a/inc/extensions/ext-online.php
+++ b/inc/extensions/ext-online.php
@@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_online`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_online` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_online`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_online` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sid VARCHAR(32) NOT NULL DEFAULT '',
 ip VARCHAR(15) NOT NULL DEFAULT '',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sid VARCHAR(32) NOT NULL DEFAULT '',
 ip VARCHAR(15) NOT NULL DEFAULT '',


@@ -67,14 +67,14 @@ PRIMARY KEY(id),
 KEY(userid),
 KEY(refid)
 ) TYPE=MyISAM";
 KEY(userid),
 KEY(refid)
 ) TYPE=MyISAM";

-       $SQLs[]="INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','usr_online','Online-Statistik','Eine Liste von derzeit "Online" Usern. Doppelte Einträge könnte auf mangelnden Cookie-Support des Browsers oder auf einen Spider hindeuten.', 1)";
+       $SQLs[]="INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','usr_online','Online-Statistik','Eine Liste von derzeit "Online" Usern. Doppelte Einträge könnte auf mangelnden Cookie-Support des Browsers oder auf einen Spider hindeuten.', 1)";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_online`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='usr_online' LIMIT 1";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE action='online' LIMIT 1";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_online`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='usr_online' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE action='online' LIMIT 1";

 
        // Unregister filter
        UNREGISTER_FILTER('init', 'UPDATE_ONLINE_LIST', true, $dry_run);
 
        // Unregister filter
        UNREGISTER_FILTER('init', 'UPDATE_ONLINE_LIST', true, $dry_run);


@@ -82,12 +82,12 @@ case "remove": // Do stuff when removing extension
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='Y', locked='N' WHERE action='online' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='Y', `locked`='N' WHERE action='online' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='N', locked='Y' WHERE action='online' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='N', `locked`='Y' WHERE action='online' LIMIT 1";

        break;
 
 case "update": // Update an extension
        break;
 
 case "update": // Update an extension


@@ -110,11 +110,11 @@ case "update": // Update an extension
 
        case "0.0.4": // SQL queries for v0.0.4
                // Update notes (these will be set as task text!)
 
        case "0.0.4": // SQL queries for v0.0.4
                // Update notes (these will be set as task text!)

-               $UPDATE_NOTES = "Erstellung der Datenbanktabelle `{!MYSQL_PREFIX!}_online` in diese Erweiterung ausgelagert.";
+               $UPDATE_NOTES = "Erstellung der Datenbanktabelle `{!_MYSQL_PREFIX!}_online` in diese Erweiterung ausgelagert.";

                break;
 
        case "0.0.5": // SQL queries for v0.0.5
                break;
 
        case "0.0.5": // SQL queries for v0.0.5

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('online',NULL,'Jetzt Online','2','Y','N')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('online',NULL,'Jetzt Online','2','Y','N')";

 
                // Register filter
                REGISTER_FILTER('init', 'UPDATE_ONLINE_LIST', false, true, $dry_run);
 
                // Register filter
                REGISTER_FILTER('init', 'UPDATE_ONLINE_LIST', false, true, $dry_run);

diff --git a/inc/extensions/ext-optimize.php b/inc/extensions/ext-optimize.php
index b0c13ba3903ab11de095c3cdd9746d078d77f2eb..b65fe34d1ca448201d242848aec1eeb9aff529bf 100644 (file)
--- a/inc/extensions/ext-optimize.php
+++ b/inc/extensions/ext-optimize.php
@@ -50,18 +50,18 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_optimize_gain`(
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_optimize_gain`(

   id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
   gain decimal(10,3) NOT NULL DEFAULT '0.000',
   PRIMARY KEY(id)
 ) TYPE=MyISAM";
   id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
   gain decimal(10,3) NOT NULL DEFAULT '0.000',
   PRIMARY KEY(id)
 ) TYPE=MyISAM";

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','optimize','DB optimieren','Führen Sie dies ab und an aus, damit überflüssige Daten aus der Datenbank entfernt werden.','5')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','optimize','DB optimieren','Führen Sie dies ab und an aus, damit überflüssige Daten aus der Datenbank entfernt werden.','5')";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_optimize_gain`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='optimize' LIMIT 1";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_optimize_gain`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='optimize' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php
index e0beaf8ba03c454bc05f2ebfc0a8e26edb338b41..1201a78662424a848e639644a0db3dbe0050a10a 100644 (file)
--- a/inc/extensions/ext-order.php
+++ b/inc/extensions/ext-order.php
@@ -55,36 +55,36 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='config_order' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='config_order' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='order' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_mod_reg` SET locked='N', hidden='N', admin_only='N', mem_only='Y' WHERE module='order' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='order' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='N', hidden='N', admin_only='N', mem_only='Y' WHERE module='order' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='N', locked='Y' WHERE what='order' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_mod_reg` SET visible='N', locked='Y' WHERE module='order' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE what='order' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `visible`='N', `locked`='Y' WHERE module='order' LIMIT 1";

        break;
 
 case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.1": // SQL queries for v0.1
        break;
 
 case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.1": // SQL queries for v0.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD order_max_full ENUM('ORDER','MAX') NOT NULL DEFAULT 'MAX'";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('setup','config_order','Mailbuchungsseite','7','Einstellungen am Mailbuchungsformular.')";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD order_max_full ENUM('ORDER','MAX') NOT NULL DEFAULT 'MAX'";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('setup','config_order','Mailbuchungsseite','7','Einstellungen am Mailbuchungsformular.')";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Maximale Mailbuchungen sind nun vom maximalen Empfang abhägig.";
                break;
 
        case "0.1.1": // SQL queries for v0.1.1
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Maximale Mailbuchungen sind nun vom maximalen Empfang abhägig.";
                break;
 
        case "0.1.1": // SQL queries for v0.1.1

-               $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='config_order' LIMIT 1";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('setup','config_order','Mailbuchungsseite','7','Einstellungen am Mailbuchungsformular.')";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD mail_orders BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='config_order' LIMIT 1";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('setup','config_order','Mailbuchungsseite','7','Einstellungen am Mailbuchungsformular.')";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD mail_orders BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Maximale Mailbuchung vervollständigt (Admin-Bereich und im Buchungsformular selber).";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Maximale Mailbuchung vervollständigt (Admin-Bereich und im Buchungsformular selber).";


@@ -141,7 +141,7 @@ case "update": // Update an extension
                break;
 
        case "0.2.3": // SQL queries for v0.2.3
                break;
 
        case "0.2.3": // SQL queries for v0.2.3

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD order_min BIGINT(20) UNSIGNED NOT NULL DEFAULT 10";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD order_min BIGINT(20) UNSIGNED NOT NULL DEFAULT 10";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Minimum an Empfänger pro Mailbuchung einstellbar. Standart: 10 Empfänger";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Minimum an Empfänger pro Mailbuchung einstellbar. Standart: 10 Empfänger";


@@ -193,8 +193,8 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us
                break;
 
        case "0.3.1": // SQL queries for v0.3.1
                break;
 
        case "0.3.1": // SQL queries for v0.3.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD order_select VARCHAR(255) NOT NULL DEFAULT 'userid'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD order_mode ENUM('ASC','DESC') NOT NULL DEFAULT 'DESC'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD order_select VARCHAR(255) NOT NULL DEFAULT 'userid'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD order_mode ENUM('ASC','DESC') NOT NULL DEFAULT 'DESC'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Beworbene URL wird nun getestet.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Beworbene URL wird nun getestet.";


@@ -271,9 +271,9 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us
                break;
 
        case "0.4.6": // SQL queries for v0.4.6
                break;
 
        case "0.4.6": // SQL queries for v0.4.6

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('order',NULL,'Mailbuchungen',3,'Y','N')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('order','order2','Framekiller-Mails',2,'Y','N')";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET action='order', sort='1', title='Klick-Mails' WHERE what='order' LIMIT 1";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('order',NULL,'Mailbuchungen',3,'Y','N')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('order','order2','Framekiller-Mails',2,'Y','N')";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET action='order', sort='1', title='Klick-Mails' WHERE what='order' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmenü komplett umgebaut.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmenü komplett umgebaut.";


@@ -285,22 +285,22 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us
                break;
 
        case "0.4.8": // SQL queries for v0.4.8
                break;
 
        case "0.4.8": // SQL queries for v0.4.8

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET title='Mailbuchung' WHERE what='config_order' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET title='Mailbuchung' WHERE what='config_order' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Menüpunkt "Mailbuchungsseite" nach "Mailbuchung" umbenannt und weitere Einstellungen aus Sonstige Einstellungen verschoben.";
                break;
 
        case "0.4.9": // SQL queries for v0.4.9
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Menüpunkt "Mailbuchungsseite" nach "Mailbuchung" umbenannt und weitere Einstellungen aus Sonstige Einstellungen verschoben.";
                break;
 
        case "0.4.9": // SQL queries for v0.4.9

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD repay_deleted_mails ENUM('REPAY','JACKPOT','SHRED') NOT NULL DEFAULT 'REPAY'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD repay_deleted_mails ENUM('REPAY','JACKPOT','SHRED') NOT NULL DEFAULT 'REPAY'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bei Löschung von Mailbuchungen kann nun global entschieden werden (Einstellungen also), ob die verbliebenen {!POINTS!} wieder gutgeschrieben werden sollen oder in den Jackpot landen.";
                break;
 
        case "0.5.0": // SQL queries for v0.5.0
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bei Löschung von Mailbuchungen kann nun global entschieden werden (Einstellungen also), ob die verbliebenen {!POINTS!} wieder gutgeschrieben werden sollen oder in den Jackpot landen.";
                break;
 
        case "0.5.0": // SQL queries for v0.5.0

-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_url_blacklist`";
-               $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_url_blacklist` (
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_url_blacklist`";
+               $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_url_blacklist` (

 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `url` VARCHAR(255) NOT NULL DEFAULT '',
 `pool_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `url` VARCHAR(255) NOT NULL DEFAULT '',
 `pool_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -322,7 +322,7 @@ default: // Do stuff when extension is loaded
        // Do daily reset only when installed and extension version is at least 0.1.1
        if ((isBooleanConstantAndTrue('__DAILY_RESET')) && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (GET_EXT_VERSION("order") >= "0.1.1")) {
                // Reset mail order values
        // Do daily reset only when installed and extension version is at least 0.1.1
        if ((isBooleanConstantAndTrue('__DAILY_RESET')) && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (GET_EXT_VERSION("order") >= "0.1.1")) {
                // Reset mail order values

-               $result_ext = SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_user_data` SET mail_orders=0 WHERE mail_orders > 0", __FILE__, __LINE__);
+               $result_ext = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET mail_orders=0 WHERE mail_orders > 0", __FILE__, __LINE__);

        } // END - if
        break;
 }
        } // END - if
        break;
 }

diff --git a/inc/extensions/ext-other.php b/inc/extensions/ext-other.php
index ff80bba0f5bde348a000d7609b6d8d309b3b2c89..dc2a09b86563be88a4a3e4f07e1d2e92cc618dd3 100644 (file)
--- a/inc/extensions/ext-other.php
+++ b/inc/extensions/ext-other.php
@@ -50,12 +50,12 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_other','Sonstige Einstellungen','Sonstige Einstellungen an Ihrem Mailtausch.',13)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_other','Sonstige Einstellungen','Sonstige Einstellungen an Ihrem Mailtausch.',13)";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='config_other' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='config_other' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension


@@ -87,7 +87,7 @@ case "update": // Update an extension
                break;
 
        case "0.0.4": // SQL queries for v0.0.4
                break;
 
        case "0.0.4": // SQL queries for v0.0.4

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD max_comma TINYINT(3) UNSIGNED NOT NULL DEFAULT '3'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD max_comma TINYINT(3) UNSIGNED NOT NULL DEFAULT '3'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Angezeigte Kommastellen können zwischen 0 und 5 eingestellt werden.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Angezeigte Kommastellen können zwischen 0 und 5 eingestellt werden.";


@@ -156,14 +156,14 @@ case "update": // Update an extension
                break;
 
        case "0.1.6": // SQL queries for v0.1.6
                break;
 
        case "0.1.6": // SQL queries for v0.1.6

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD reject_url VARCHAR(255) NOT NULL DEFAULT '{!URL!}'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD reject_url VARCHAR(255) NOT NULL DEFAULT '{!URL!}'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bei Ablehnung der URL wird jetzt endlich eine Standart-URL eingesetzt, die konfigurierbar ist. Fehler beim Laden der Konfiguration gefunden.";
                break;
 
        case "0.1.7": // SQL queries for v0.1.7
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bei Ablehnung der URL wird jetzt endlich eine Standart-URL eingesetzt, die konfigurierbar ist. Fehler beim Laden der Konfiguration gefunden.";
                break;
 
        case "0.1.7": // SQL queries for v0.1.7

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD currency VARCHAR(255) NOT NULL DEFAULT '€'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD currency VARCHAR(255) NOT NULL DEFAULT '€'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Standart-Währung der Gebühren für alle Erweiterungen geltend hinzugefügt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Standart-Währung der Gebühren für alle Erweiterungen geltend hinzugefügt.";


@@ -175,21 +175,21 @@ case "update": // Update an extension
                break;
 
        case "0.1.9": // SQL queries for v0.1.9
                break;
 
        case "0.1.9": // SQL queries for v0.1.9

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD mailid_error_redirect ENUM('index','reject') NOT NULL DEFAULT 'index'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD mailid_error_redirect ENUM('index','reject') NOT NULL DEFAULT 'index'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bei fehlerhafter Mail während der Bestätigung kann wahlweise zur Hauptseite weitergeleitet oder auf die eingestellte Ablehnungsseite umgeleitet werden.";
                break;
 
        case "0.2.0": // SQL queries for v0.2.0
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bei fehlerhafter Mail während der Bestätigung kann wahlweise zur Hauptseite weitergeleitet oder auf die eingestellte Ablehnungsseite umgeleitet werden.";
                break;
 
        case "0.2.0": // SQL queries for v0.2.0

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` CHANGE `mailid_error_redirect` `mailid_error_redirect` ENUM('INDEX','REJECT') NOT NULL DEFAULT 'INDEX'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` CHANGE `mailid_error_redirect` `mailid_error_redirect` ENUM('INDEX','REJECT') NOT NULL DEFAULT 'INDEX'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bei fehlerhafter Mail während der Bestätigung kann wahlweise zur Hauptseite weitergeleitet oder auf die eingestellte Ablehnungsseite umgeleitet werden.";
                break;
 
        case "0.2.1": // SQL queries for v0.2.1
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bei fehlerhafter Mail während der Bestätigung kann wahlweise zur Hauptseite weitergeleitet oder auf die eingestellte Ablehnungsseite umgeleitet werden.";
                break;
 
        case "0.2.1": // SQL queries for v0.2.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `min_age` TINYINT(3) UNSIGNED NOT NULL DEFAULT 16";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `min_age` TINYINT(3) UNSIGNED NOT NULL DEFAULT 16";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Minimumalter ist nun konfigurierbar.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Minimumalter ist nun konfigurierbar.";

diff --git a/inc/extensions/ext-payout.php b/inc/extensions/ext-payout.php
index d84d34ea74ef5eaf1558c1b04978b1ab3a77c9ca..fc3e0669649fc8c8ded41c135d4ac6ed537ae06f 100644 (file)
--- a/inc/extensions/ext-payout.php
+++ b/inc/extensions/ext-payout.php
@@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_payouts`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_user_payouts` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_payouts`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_user_payouts` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 payout_total FLOAT(22,3) UNSIGNED NOT NULL DEFAULT '0.000',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 payout_total FLOAT(22,3) UNSIGNED NOT NULL DEFAULT '0.000',


@@ -64,67 +64,67 @@ KEY(userid),
 KEY(payout_id),
 PRIMARY KEY(id)
 ) TYPE=MyISAM";
 KEY(payout_id),
 PRIMARY KEY(id)
 ) TYPE=MyISAM";

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_payout_types`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_payout_types` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_payout_types`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_payout_types` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 type VARCHAR(255) NOT NULL DEFAULT '',
 rate FLOAT(22,3) UNSIGNED NOT NULL DEFAULT '0.000',
 min_points BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 PRIMARY KEY(id)
 ) TYPE=MyISAM";
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 type VARCHAR(255) NOT NULL DEFAULT '',
 rate FLOAT(22,3) UNSIGNED NOT NULL DEFAULT '0.000',
 min_points BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 PRIMARY KEY(id)
 ) TYPE=MyISAM";

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_payouts','Auszahlungen','Auszahlungsarten einstellen, neu anlegen oder löschen.','15')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('payouts','list_payouts','Anfragen auflisten','Listet alle Auszahlungsanfragen Ihrer Mitglieder auf.','16')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','payout','Auszahlungen','N','N','11')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_payouts','Auszahlungen','Auszahlungsarten einstellen, neu anlegen oder löschen.','15')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('payouts','list_payouts','Anfragen auflisten','Listet alle Auszahlungsanfragen Ihrer Mitglieder auf.','16')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','payout','Auszahlungen','N','N','11')";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_payouts`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_payout_types`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='payouts'";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE what='payout' LIMIT 1";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_payouts`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_payout_types`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='payouts'";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE what='payout' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='payout' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='payout' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='N', locked='Y' WHERE what='payout' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE what='payout' LIMIT 1";

        break;
 
 case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.1.2": // SQL queries for v0.1.2
        break;
 
 case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.1.2": // SQL queries for v0.1.2

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('payouts', NULL, 'Auszahlungsmanagement','Management der Auszahlungsarten.','8')";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET action='payouts', title='Einstellungen' WHERE action='setup' AND what='config_payouts' LIMIT 1";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('payouts', NULL, 'Auszahlungsmanagement','Management der Auszahlungsarten.','8')";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET action='payouts', title='Einstellungen' WHERE action='setup' AND what='config_payouts' LIMIT 1";

                break;
 
        case "0.1.3": // SQL queries for v0.1.3
                break;
 
        case "0.1.3": // SQL queries for v0.1.3

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_payout_types` ADD from_account VARCHAR(255) NOT NULL DEFAULT ''";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_payout_types` ADD from_pass VARCHAR(255) NOT NULL DEFAULT ''";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_payout_types` ADD engine_url VARCHAR(255) NOT NULL DEFAULT ''";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_payout_types` ADD engine_ret_ok VARCHAR(255) NOT NULL DEFAULT ''";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_payout_types` ADD engine_ret_failed VARCHAR(255) NOT NULL DEFAULT ''";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_payout_types` ADD pass_enc ENUM('md5','base64','none') NOT NULL DEFAULT 'md5'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_payout_types` ADD from_account VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_payout_types` ADD from_pass VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_payout_types` ADD engine_url VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_payout_types` ADD engine_ret_ok VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_payout_types` ADD engine_ret_failed VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_payout_types` ADD pass_enc ENUM('md5','base64','none') NOT NULL DEFAULT 'md5'";

                break;
 
        case "0.1.4": // SQL queries for v0.1.4
                break;
 
        case "0.1.4": // SQL queries for v0.1.4

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_payouts` ADD password VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_payouts` ADD password VARCHAR(255) NOT NULL DEFAULT ''";

                break;
 
        case "0.1.5": // SQL queries for v0.1.5
                break;
 
        case "0.1.5": // SQL queries for v0.1.5

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_payouts` ADD target_url LONGBLOB NOT NULL";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_payouts` ADD banner_url LONGBLOB NOT NULL";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_payouts` ADD link_text VARCHAR(30) NOT NULL DEFAULT ''";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_payout_types` ADD allow_url ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_payouts` ADD target_url LONGBLOB NOT NULL";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_payouts` ADD banner_url LONGBLOB NOT NULL";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_payouts` ADD link_text VARCHAR(30) NOT NULL DEFAULT ''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_payout_types` ADD allow_url ENUM('Y','N') NOT NULL DEFAULT 'N'";

                break;
 
        case "0.1.6": // SQL queries for v0.1.6
                break;
 
        case "0.1.6": // SQL queries for v0.1.6

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_payout_types` CHANGE pass_enc pass_enc ENUM('md5','base64','xxx') NOT NULL DEFAULT 'xxx'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_payout_types` CHANGE pass_enc pass_enc ENUM('md5','base64','xxx') NOT NULL DEFAULT 'xxx'";

                break;
 
        case "0.1.8": // SQL queries for v0.1.8
                break;
 
        case "0.1.8": // SQL queries for v0.1.8


@@ -143,8 +143,8 @@ case "update": // Update an extension
                break;
 
        case "0.2.1": // SQL queries for v0.2.1
                break;
 
        case "0.2.1": // SQL queries for v0.2.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_payouts` CHANGE payout_total payout_total FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_payout_types` CHANGE rate rate FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_payouts` CHANGE payout_total payout_total FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_payout_types` CHANGE rate rate FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Problem mit Speicherung der Einstellungen beseitigt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Problem mit Speicherung der Einstellungen beseitigt.";


@@ -225,7 +225,7 @@ case "update": // Update an extension
                break;
 
        case "0.3.7": // SQL queries for v0.3.7
                break;
 
        case "0.3.7": // SQL queries for v0.3.7

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET title = 'Auszahlungsmanagement' WHERE action = 'payouts' AND (what='' OR what IS NULL) LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET title = 'Auszahlungsmanagement' WHERE action = 'payouts' AND (what='' OR `what` IS NULL) LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Verwaltung nach Management umgestellt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Verwaltung nach Management umgestellt.";

diff --git a/inc/extensions/ext-primera.php b/inc/extensions/ext-primera.php
index 04be3e09734fdfd0e410927926c691633379987a..430e2e4a44dbb05ee3cf8d6ca95e27120cca19e9 100644 (file)
--- a/inc/extensions/ext-primera.php
+++ b/inc/extensions/ext-primera.php
@@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_primera`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_user_primera` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_primera`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_user_primera` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 primera_account VARCHAR(255) NOT NULL DEFAULT '',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 primera_account VARCHAR(255) NOT NULL DEFAULT '',


@@ -65,39 +65,39 @@ PRIMARY KEY(id)
 ) TYPE=MyISAM";
 
        // Confiuration
 ) TYPE=MyISAM";
 
        // Confiuration

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD primera_min_payout BIGINT(20) UNSIGNED NOT NULL DEFAULT 40000";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD primera_min_withdraw BIGINT(20) UNSIGNED NOT NULL DEFAULT 5000";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD primera_api_name VARCHAR(255) NOT NULL DEFAULT ''";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD primera_api_md5 VARCHAR(32) NOT NULL DEFAULT ''";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD primera_refid VARCHAR(255) NOT NULL DEFAULT ''";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD primera_min_payout BIGINT(20) UNSIGNED NOT NULL DEFAULT 40000";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD primera_min_withdraw BIGINT(20) UNSIGNED NOT NULL DEFAULT 5000";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD primera_api_name VARCHAR(255) NOT NULL DEFAULT ''";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD primera_api_md5 VARCHAR(32) NOT NULL DEFAULT ''";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD primera_refid VARCHAR(255) NOT NULL DEFAULT ''";

 
        // User data
 
        // User data

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD primera_userid VARCHAR(255) NOT NULL DEFAULT ''";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD primera_userid VARCHAR(255) NOT NULL DEFAULT ''";

 
        // Admin menu
 
        // Admin menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('primera', NULL, 'Primera-Management','Konfiguration zur Primera-API einstellen, Auszahlungen auflisten usw..', 15)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('primera','config_primera','Primera-API-Einstellungen','Konfiguration zur Primera-API einstellen.', 1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('primera','list_primera','Primera-Anfragen auflisten','Listet alle Primera-Auszahlungsanfragen Ihrer Mitglieder auf.', 2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('primera', NULL, 'Primera-Management','Konfiguration zur Primera-API einstellen, Auszahlungen auflisten usw..', 15)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('primera','config_primera','Primera-API-Einstellungen','Konfiguration zur Primera-API einstellen.', 1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('primera','list_primera','Primera-Anfragen auflisten','Listet alle Primera-Auszahlungsanfragen Ihrer Mitglieder auf.', 2)";

 
        // Member menu
 
        // Member menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','primera','Primera-Ein-/Auszahlungen','N','N','11')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','primera','Primera-Ein-/Auszahlungen','N','N','11')";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_primera`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='primera'";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE what='primera' LIMIT 1";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_primera`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='primera'";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE what='primera' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='primera' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='primera' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='N', locked='Y' WHERE what='primera' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE what='primera' LIMIT 1";

        break;
 
 case "update": // Update an extension
        break;
 
 case "update": // Update an extension

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index c310d3ae250e64c25901c452ee30b03a778de496..f563aa4936f1dcf702f353cada99e6b4dbafcb09 100644 (file)
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -50,10 +50,10 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_rallye_data`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_rallye_prices`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_rallye_users`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_rallye_data` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_rallye_data`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_rallye_prices`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_rallye_users`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_rallye_data` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 admin_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 title VARCHAR(255) NOT NULL DEFAULT '',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 admin_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 title VARCHAR(255) NOT NULL DEFAULT '',


@@ -68,7 +68,7 @@ notified ENUM('Y','N') NOT NULL DEFAULT 'N',
 KEY (admin_id),
 PRIMARY KEY (id)
 ) TYPE=MyISAM";
 KEY (admin_id),
 PRIMARY KEY (id)
 ) TYPE=MyISAM";

-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_rallye_prices` (
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_rallye_prices` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 rallye_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 price_level BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 rallye_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 price_level BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -77,7 +77,7 @@ info LONGBLOB NOT NULL,
 KEY (rallye_id),
 PRIMARY KEY(id)
 ) TYPE=MyISAM";
 KEY (rallye_id),
 PRIMARY KEY(id)
 ) TYPE=MyISAM";

-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_rallye_users` (
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_rallye_users` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 rallye_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 rallye_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -88,28 +88,28 @@ PRIMARY KEY(id)
 ) TYPE=MyISAM";
 
        // Admin menu
 ) TYPE=MyISAM";
 
        // Admin menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye', NULL, 'Rallye-Management','Richten Sie neue Ref-Rallyes ein, die zeitgesteuert anfangen und aufhöhren. Dabei wird alles weitere automatisch geregelt.','9')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye','add_rallye','Neue Rallye hinzufügen','Neue Ref-Rallye hinzufügen.','1')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye','config_rallye_prices','Preise einrichten','Richten Sie Preise zu den Rallyes ein.','2')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye','list_rallyes','Rallyes verwalten','Alle bestehenden Ref-Rallyes auflisten, bearbeiten, stoppen, löschen usw.','3')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye', NULL, 'Rallye-Management','Richten Sie neue Ref-Rallyes ein, die zeitgesteuert anfangen und aufhöhren. Dabei wird alles weitere automatisch geregelt.','9')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye','add_rallye','Neue Rallye hinzufügen','Neue Ref-Rallye hinzufügen.','1')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye','config_rallye_prices','Preise einrichten','Richten Sie Preise zu den Rallyes ein.','2')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye','list_rallyes','Rallyes verwalten','Alle bestehenden Ref-Rallyes auflisten, bearbeiten, stoppen, löschen usw.','3')";

 
        // Guest menu
 
        // Guest menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','rallyes','Ref-Rallyes','Y','Y','9')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','rallyes','Ref-Rallyes','Y','Y','9')";

 
        // Member menu
 
        // Member menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','rallyes','Ref-Rallyes','Y','Y','9')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','rallyes','Ref-Rallyes','Y','Y','9')";

        break;
 
 case "remove": // Do stuff when removing extension
        // Drop tables
        break;
 
 case "remove": // Do stuff when removing extension
        // Drop tables

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_rallye_data`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_rallye_prices`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_rallye_users`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_rallye_data`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_rallye_prices`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_rallye_users`";

 
        // Remove menus
 
        // Remove menus

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='rallye' LIMIT 4";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE what='rallyes' LIMIT 1";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE what='rallyes' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='rallye' LIMIT 4";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE what='rallyes' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE what='rallyes' LIMIT 1";

 
        // Unregister filter
        UNREGISTER_FILTER('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, $dry_run);
 
        // Unregister filter
        UNREGISTER_FILTER('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, $dry_run);


@@ -117,28 +117,28 @@ case "remove": // Do stuff when removing extension
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='Y', locked='N' WHERE what='rallyes' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='rallyes' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='Y', `locked`='N' WHERE what='rallyes' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='rallyes' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='N', locked='Y' WHERE what='rallyes' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='N', locked='Y' WHERE what='rallyes' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='N', `locked`='Y' WHERE what='rallyes' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE what='rallyes' LIMIT 1";

        break;
 
 case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.1
        break;
 
 case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_rallye_data` ADD expired ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_rallye_data` ADD expired ENUM('Y','N') NOT NULL DEFAULT 'N'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Ablaufen der Rallyes intergriert.";
                break;
 
        case "0.0.2": // SQL queries for v0.0.2
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Ablaufen der Rallyes intergriert.";
                break;
 
        case "0.0.2": // SQL queries for v0.0.2

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_rallye_users` ADD curr_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_rallye_users` ADD curr_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Aktueller {!POINTS!}-Stand wird beachtet.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Aktueller {!POINTS!}-Stand wird beachtet.";


@@ -165,7 +165,7 @@ case "update": // Update an extension
                break;
 
        case "0.1.0": // SQL queries for v0.2.1
                break;
 
        case "0.1.0": // SQL queries for v0.2.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_rallye_users` CHANGE curr_points curr_points FLOAT(23,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_rallye_users` CHANGE curr_points curr_points FLOAT(23,5) UNSIGNED NOT NULL DEFAULT 0.00000";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "5 Nachkommastellen implementiert.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "5 Nachkommastellen implementiert.";


@@ -217,8 +217,8 @@ case "update": // Update an extension
                break;
 
        case "0.2.0": // SQL queries for v0.2.0
                break;
 
        case "0.2.0": // SQL queries for v0.2.0

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_rallye_data` ADD min_users BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_rallye_data` ADD min_prices BIGINT(20) UNSIGNED NOT NULL DEFAULT '3'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_rallye_data` ADD min_users BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_rallye_data` ADD min_prices BIGINT(20) UNSIGNED NOT NULL DEFAULT '3'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Ablaufen der Rallyes intergriert. Bauen Sie in Ihr Template <strong>templates/de/emails/member/member_rallye_notify.tpl</strong> folgende zwei Zeilen ein:<br />
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Ablaufen der Rallyes intergriert. Bauen Sie in Ihr Template <strong>templates/de/emails/member/member_rallye_notify.tpl</strong> folgende zwei Zeilen ein:<br />


@@ -290,7 +290,7 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".GET_LANG
                break;
 
        case "0.3.2": // SQL queries for v0.3.2
                break;
 
        case "0.3.2": // SQL queries for v0.3.2

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET action='rals', sort='1', title='Referal-Rallye' WHERE what='rallyes' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET action='rals', sort='1', title='Referal-Rallye' WHERE what='rallyes' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett umgebaut.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett umgebaut.";


@@ -338,7 +338,7 @@ default: // Do stuff when extension is loaded
 
                // Check for new started but not notified rallyes
                $result = SQL_QUERY("SELECT SQL_SMALL_RESULT id, title, start_time, end_time, send_notify".$ADD1."
 
                // Check for new started but not notified rallyes
                $result = SQL_QUERY("SELECT SQL_SMALL_RESULT id, title, start_time, end_time, send_notify".$ADD1."

-FROM `{!MYSQL_PREFIX!}_rallye_data`
+FROM `{!_MYSQL_PREFIX!}_rallye_data`

 WHERE is_active='Y' AND notified='N' AND expired='N' AND start_time <= UNIX_TIMESTAMP() AND end_time > UNIX_TIMESTAMP()
 LIMIT 1", __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
 WHERE is_active='Y' AND notified='N' AND expired='N' AND start_time <= UNIX_TIMESTAMP() AND end_time > UNIX_TIMESTAMP()
 LIMIT 1", __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {


@@ -351,7 +351,7 @@ LIMIT 1", __FILE__, __LINE__);
 
                // Check for expired rallyes
                $result = SQL_QUERY("SELECT SQL_SMALL_RESULT d.id, d.title, d.start_time, d.end_time, d.send_notify".$ADD2."
 
                // Check for expired rallyes
                $result = SQL_QUERY("SELECT SQL_SMALL_RESULT d.id, d.title, d.start_time, d.end_time, d.send_notify".$ADD2."

-FROM `{!MYSQL_PREFIX!}_rallye_data` AS d
+FROM `{!_MYSQL_PREFIX!}_rallye_data` AS d

 WHERE d.is_active='Y' AND d.notified='Y' AND d.expired='N' AND (d.end_time <= UNIX_TIMESTAMP()".$OR.")
 LIMIT 1", __FILE__, __LINE__);
                if ((SQL_NUMROWS($result) == 1) && (EXT_IS_ACTIVE("autopurge"))) {
 WHERE d.is_active='Y' AND d.notified='Y' AND d.expired='N' AND (d.end_time <= UNIX_TIMESTAMP()".$OR.")
 LIMIT 1", __FILE__, __LINE__);
                if ((SQL_NUMROWS($result) == 1) && (EXT_IS_ACTIVE("autopurge"))) {

diff --git a/inc/extensions/ext-refback.php b/inc/extensions/ext-refback.php
index 855e1f52f45f2f2257b72b207a1879163c0e32cd..e1e165ce7d576f31e22401787d3190ebf25c7a57 100644 (file)
--- a/inc/extensions/ext-refback.php
+++ b/inc/extensions/ext-refback.php
@@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_refs`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_user_refs` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_refs`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_user_refs` (

 `id` BIGINT(20) UNSIGNED NOT NULL auto_increment,
 `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `level` smallINT(6) UNSIGNED NOT NULL DEFAULT 0,
 `id` BIGINT(20) UNSIGNED NOT NULL auto_increment,
 `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `level` smallINT(6) UNSIGNED NOT NULL DEFAULT 0,


@@ -63,36 +63,36 @@ UNIQUE `user_refid` (`userid`,`level`,`refid`),
 KEY (`level`),
 KEY (`refid`)
 ) ENGINE=MyISAM COMMENT='User Referals With Refback'";
 KEY (`level`),
 KEY (`refid`)
 ) ENGINE=MyISAM COMMENT='User Referals With Refback'";

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','refback','Ref-Back einstellen',4,'N','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','refback','Ref-Back einstellen',4,'N','N')";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_refs`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE what='refback' LIMIT 1";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what IN('config_refback','list_refback') LIMIT 2";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_refsystem` SET level=level-1";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_refs`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE what='refback' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what IN('config_refback','list_refback') LIMIT 2";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_refsystem` SET level=level-1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='refback' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='refback' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='N', locked='Y' WHERE what='refback' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE what='refback' LIMIT 1";

        break;
 
 case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.1
        break;
 
 case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD refback_enabled ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD refback_min_perc TINYINT(3) NOT NULL DEFAULT 0";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD refback_max_perc TINYINT(3) NOT NULL DEFAULT 100";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_refback','Refback','Ändern Sie Einstellungen zum Refback, wie z.B. Minium- und Maximum-Prozente, was die Mitglieder einstellen dürfen.',15)";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_refback','Refback auflisten','Refback aller Mitglieder auflisten.',15)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD refback_enabled ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD refback_min_perc TINYINT(3) NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD refback_max_perc TINYINT(3) NOT NULL DEFAULT 100";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_refback','Refback','Ändern Sie Einstellungen zum Refback, wie z.B. Minium- und Maximum-Prozente, was die Mitglieder einstellen dürfen.',15)";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_refback','Refback auflisten','Refback aller Mitglieder auflisten.',15)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Refback-System ist nun ein-/ausschaltbar und minimale/maximale Refback-Prozente sind festlegbar.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Refback-System ist nun ein-/ausschaltbar und minimale/maximale Refback-Prozente sind festlegbar.";

diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php
index bf9310eee882cd468d5fc357c34e74bfdab962cf..622557095a317622e9836f59d36407c89041015b 100644 (file)
--- a/inc/extensions/ext-register.php
+++ b/inc/extensions/ext-register.php
@@ -58,7 +58,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='config_register' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='config_register' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension


@@ -75,8 +75,8 @@ case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.1": // SQL queries for v0.1
        switch ($EXT_VER)
        {
        case "0.1": // SQL queries for v0.1

-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_must_register`";
-               $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_must_register` (
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_must_register`";
+               $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_must_register` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 field_name VARCHAR(255) NOT NULL DEFAULT '',
 field_required ENUM('Y','N') NOT NULL DEFAULT 'Y',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 field_name VARCHAR(255) NOT NULL DEFAULT '',
 field_required ENUM('Y','N') NOT NULL DEFAULT 'Y',


@@ -84,22 +84,22 @@ PRIMARY KEY(id)
 ) TYPE=MyISAM";
 
                // Add all entries as required (DO NOT DELETE THEM FROM DATABASE!)
 ) TYPE=MyISAM";
 
                // Add all entries as required (DO NOT DELETE THEM FROM DATABASE!)

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_must_register` (field_name, field_required) VALUES ('surname','Y')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_must_register` (field_name, field_required) VALUES ('family_name','Y')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_must_register` (field_name, field_required) VALUES ('street_nr','Y')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_must_register` (field_name, field_required) VALUES ('cntry','Y')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_must_register` (field_name, field_required) VALUES ('zip','Y')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_must_register` (field_name, field_required) VALUES ('city','Y')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_must_register` (field_name, field_required) VALUES ('surname','Y')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_must_register` (field_name, field_required) VALUES ('family_name','Y')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_must_register` (field_name, field_required) VALUES ('street_nr','Y')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_must_register` (field_name, field_required) VALUES ('cntry','Y')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_must_register` (field_name, field_required) VALUES ('zip','Y')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_must_register` (field_name, field_required) VALUES ('city','Y')";

 
                // Add admin menu
 
                // Add admin menu

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_register','Pflichtfelder','Stellen Sie hier die Pflichtfelder sowohl im Anmeldeformular, als auch im Mitgliedsbereich unter <strong>Profildaten &auml;ndern</strong> ein.', 12)";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_register','Pflichtfelder','Stellen Sie hier die Pflichtfelder sowohl im Anmeldeformular, als auch im Mitgliedsbereich unter <strong>Profildaten &auml;ndern</strong> ein.', 12)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Einstellbare Pflichtfelder hinzugef&uuml;gt.";
                break;
 
        case "0.1.1": // SQL queries for v0.1.1
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Einstellbare Pflichtfelder hinzugef&uuml;gt.";
                break;
 
        case "0.1.1": // SQL queries for v0.1.1

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_extensions` SET ext_has_css='Y' WHERE ext_name='register' AND ext_has_css='N' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_has_css='Y' WHERE ext_name='register' AND ext_has_css='N' LIMIT 1";

 
                // This update depends on sql_patches update!
                $EXT_UPDATE_DEPENDS = "sql_patches";
 
                // This update depends on sql_patches update!
                $EXT_UPDATE_DEPENDS = "sql_patches";


@@ -262,8 +262,8 @@ PRIMARY KEY(id)
                break;
 
        case "0.4.2": // SQL queries for v0.4.2
                break;
 
        case "0.4.2": // SQL queries for v0.4.2

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD register_default ENUM('Y','N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET what='config_register2' WHERE what='config_reg' LIMIT 1";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD register_default ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET what='config_register2' WHERE what='config_reg' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bei der Anmeldung kann die Standart-Auswahl zwischen Ja/Nein umgeschaltet werden. Das &Auml;ndern des Templates <strong>templates/".GET_LANGUAGE()."/html/guest/guest_register.tpl</strong> ist nicht mehr n&ouml;tig.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bei der Anmeldung kann die Standart-Auswahl zwischen Ja/Nein umgeschaltet werden. Das &Auml;ndern des Templates <strong>templates/".GET_LANGUAGE()."/html/guest/guest_register.tpl</strong> ist nicht mehr n&ouml;tig.";

diff --git a/inc/extensions/ext-removeip.php b/inc/extensions/ext-removeip.php
index f1c5523fbd63538300fd0579eb8f8945b29748de..bb6004716ee73358ecae12c72a95f72fd53cf7a6 100644 (file)
--- a/inc/extensions/ext-removeip.php
+++ b/inc/extensions/ext-removeip.php
@@ -50,21 +50,21 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `removeip_anon_ip` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `removeip_anon_host` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `removeip_anon_ua` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `removeip_anon_ref` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `removeip_admin_show` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `removeip_guest_show` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `removeip_member_show` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `removeip_sponsor_show` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `anonymous_ip` ENUM('127.0.0.1','0.0.0.0','RANDOM') NOT NULL DEFAULT '127.0.0.1'";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_removeip','Anonymität/Privatsphähre','Stellen Sie hier ein, ob die IP-Nummer, User-Agent und/oder Referer-Adresse anonymisiert im gesamten Script verwendet werden soll.',15)";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `removeip_anon_ip` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `removeip_anon_host` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `removeip_anon_ua` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `removeip_anon_ref` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `removeip_admin_show` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `removeip_guest_show` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `removeip_member_show` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `removeip_sponsor_show` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `anonymous_ip` ENUM('127.0.0.1','0.0.0.0','RANDOM') NOT NULL DEFAULT '127.0.0.1'";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_removeip','Anonymität/Privatsphähre','Stellen Sie hier ein, ob die IP-Nummer, User-Agent und/oder Referer-Adresse anonymisiert im gesamten Script verwendet werden soll.',15)";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='config_removeip' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='config_removeip' LIMIT 1";

 
        // Remove filters
        UNREGISTER_FILTER('post_youhere_line', 'ADD_ANONYMITY_NOTICE', true, $dry_run);
 
        // Remove filters
        UNREGISTER_FILTER('post_youhere_line', 'ADD_ANONYMITY_NOTICE', true, $dry_run);

diff --git a/inc/extensions/ext-repair.php b/inc/extensions/ext-repair.php
index b2172e4c5305f36a5648023f752962254c51ca99..d3afb2ba9a1ead61972f25f3c7d2467d2474c5ab 100644 (file)
--- a/inc/extensions/ext-repair.php
+++ b/inc/extensions/ext-repair.php
@@ -50,13 +50,13 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('repair', NULL, 'Reperaturen','7','Repariert u.a. die Kategorie-Auswahlen der Mitglieder usw.')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('repair','repair_cats','Kategorieauswahlen','1','Repariert die Kategorieauswahlen Ihrer Mitglieder.')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('repair', NULL, 'Reperaturen','7','Repariert u.a. die Kategorie-Auswahlen der Mitglieder usw.')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('repair','repair_cats','Kategorieauswahlen','1','Repariert die Kategorieauswahlen Ihrer Mitglieder.')";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='repair' LIMIT 5";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='repair' LIMIT 5";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension


@@ -73,9 +73,9 @@ case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.1": // SQL queries for v0.1
        switch ($EXT_VER)
        {
        case "0.1": // SQL queries for v0.1

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('repair','repair_amenu','Admin-Menü', 2, 'Repariert die Gewichtung des Admin-Menü-Systems')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('repair','repair_gmenu','Gast-Menü', 3, 'Repariert die Gewichtung des Gäste-Menü-Systems')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('repair','repair_mmenu','Mitglied-Menü', 4, 'Repariert die Gewichtung des Mitglieder-Menü-Systems')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('repair','repair_amenu','Admin-Menü', 2, 'Repariert die Gewichtung des Admin-Menü-Systems')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('repair','repair_gmenu','Gast-Menü', 3, 'Repariert die Gewichtung des Gäste-Menü-Systems')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('repair','repair_mmenu','Mitglied-Menü', 4, 'Repariert die Gewichtung des Mitglieder-Menü-Systems')";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Fügt ein Menüpunkt zur Reperatur der Gewichtung des Admin-Menüs hinzu.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Fügt ein Menüpunkt zur Reperatur der Gewichtung des Admin-Menüs hinzu.";

diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php
index 09b7c485e6d3dbdf0e092165df59a40beb507321..0ef248cc22506be1bee52cf671284f6c307678bc 100644 (file)
--- a/inc/extensions/ext-rewrite.php
+++ b/inc/extensions/ext-rewrite.php
@@ -61,13 +61,13 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='config_rewrite' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='config_rewrite' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // Check if mod_rewrite is loadeded
        if (!IF_APACHE_MODULE_LOADED('mod_rewrite')) {
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // Check if mod_rewrite is loadeded
        if (!IF_APACHE_MODULE_LOADED('mod_rewrite')) {

-               SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_extensions` SET ext_active='N' WHERE ext_name='rewrite' LIMIT 1", __FILE__, __LINE__);
+               SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='N' WHERE ext_name='rewrite' LIMIT 1", __FILE__, __LINE__);

                $EXT_REPORTS_FAILURE = true;
                addFatalMessage(MOD_REWRITE_ERROR);
         } // END - if
                $EXT_REPORTS_FAILURE = true;
                addFatalMessage(MOD_REWRITE_ERROR);
         } // END - if


@@ -123,8 +123,8 @@ case "update": // Update an extension
                break;
 
        case "0.0.9": // SQL queries for v0.0.9
                break;
 
        case "0.0.9": // SQL queries for v0.0.9

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD rewrite_skip VARCHAR(255) NOT NULL DEFAULT 'login:admin:frametester:mailid'";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_rewrite','Rewrite-Engine','Stellen Sie hier ein, welche Module übersprungen werden sollen, in denen also kein Umschreiben des HTML-Codes stattfinden soll.', 8)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD rewrite_skip VARCHAR(255) NOT NULL DEFAULT 'login:admin:frametester:mailid'";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_rewrite','Rewrite-Engine','Stellen Sie hier ein, welche Module übersprungen werden sollen, in denen also kein Umschreiben des HTML-Codes stattfinden soll.', 8)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Zu überspringende Module können per Admin-Bereich eingestellt werden.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Zu überspringende Module können per Admin-Bereich eingestellt werden.";


@@ -162,7 +162,7 @@ default: // Do stuff when extension is loaded
        // Check if mod_rewrite is loadeded
        if (!IF_APACHE_MODULE_LOADED('mod_rewrite')){
                $EXT_REPORTS_FAILURE = true;
        // Check if mod_rewrite is loadeded
        if (!IF_APACHE_MODULE_LOADED('mod_rewrite')){
                $EXT_REPORTS_FAILURE = true;

-               SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_extensions` SET ext_active='N' WHERE ext_name='rewrite' LIMIT 1", __FILE__, __LINE__);
+               SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='N' WHERE ext_name='rewrite' LIMIT 1", __FILE__, __LINE__);

                if (!IS_ADMIN())addFatalMessage(MOD_REWRITE_ERROR);
         } // END - if
        break;
                if (!IS_ADMIN())addFatalMessage(MOD_REWRITE_ERROR);
         } // END - if
        break;

diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php
index 43bd0e16776580f5d396300e3f97ac1c1223586b..e4c155e8725efdd281d4346f5e0ebbaad3c1f996 100644 (file)
--- a/inc/extensions/ext-sponsor.php
+++ b/inc/extensions/ext-sponsor.php
@@ -57,8 +57,8 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
        //
        // Sponsor data
        //
        //
        // Sponsor data
        //

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_data`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_sponsor_data` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_data`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_sponsor_data` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 company VARCHAR(255) NOT NULL DEFAULT '',
 position VARCHAR(255) NOT NULL DEFAULT '',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 company VARCHAR(255) NOT NULL DEFAULT '',
 position VARCHAR(255) NOT NULL DEFAULT '',


@@ -98,8 +98,8 @@ PRIMARY KEY(id)
        //
        // Sponsor orders
        //
        //
        // Sponsor orders
        //

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_orders`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_sponsor_orders` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_orders`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_sponsor_orders` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 aid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 aid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -118,8 +118,8 @@ PRIMARY KEY(id)
        //
        // Pay-types
        //
        //
        // Pay-types
        //

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_paytypes`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_sponsor_paytypes` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_paytypes`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_sponsor_paytypes` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 pay_name VARCHAR(255) NOT NULL DEFAULT '',
 pay_rate FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 pay_name VARCHAR(255) NOT NULL DEFAULT '',
 pay_rate FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,


@@ -130,8 +130,8 @@ PRIMARY KEY(id)
        //
        // Points-to-action converting
        //
        //
        // Points-to-action converting
        //

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_action_convert`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_sponsor_action_convert` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_action_convert`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_sponsor_action_convert` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 ext_name VARCHAR(255) NOT NULL DEFAULT 'sponsor',
 conv_rate BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 ext_name VARCHAR(255) NOT NULL DEFAULT 'sponsor',
 conv_rate BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -142,8 +142,8 @@ PRIMARY KEY(id)
        //
        // Sponsor menu system (default)
        //
        //
        // Sponsor menu system (default)
        //

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_menu`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_sponsor_menu` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_menu`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_sponsor_menu` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 action VARCHAR(255) NOT NULL DEFAULT '',
 what  VARCHAR(255) NULL DEFAULT NULL,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 action VARCHAR(255) NOT NULL DEFAULT '',
 what  VARCHAR(255) NULL DEFAULT NULL,


@@ -157,8 +157,8 @@ PRIMARY KEY(id)
        //
        // Registry for performable actions by your sponsors
        //
        //
        // Registry for performable actions by your sponsors
        //

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_registry`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_sponsor_registry` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_registry`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_sponsor_registry` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 aid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 ext_name VARCHAR(255) NOT NULL DEFAULT 'sponsor',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 aid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 ext_name VARCHAR(255) NOT NULL DEFAULT 'sponsor',


@@ -171,8 +171,8 @@ PRIMARY KEY(id)
        //
        // URLs from the sponsors
        //
        //
        // URLs from the sponsors
        //

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_urls`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_sponsor_urls` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_urls`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_sponsor_urls` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 url VARCHAR(255) NOT NULL DEFAULT 'http://',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 url VARCHAR(255) NOT NULL DEFAULT 'http://',


@@ -185,8 +185,8 @@ PRIMARY KEY(id)
        //
        // Banners of any size from the sponsors
        //
        //
        // Banners of any size from the sponsors
        //

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_banner`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_sponsor_banner` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_banner`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_sponsor_banner` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 url VARCHAR(255) NOT NULL DEFAULT 'http://',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 url VARCHAR(255) NOT NULL DEFAULT 'http://',


@@ -201,8 +201,8 @@ PRIMARY KEY(id)
        //
        // Campaigns
        //
        //
        // Campaigns
        //

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_campaigns`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_sponsor_campaigns` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_campaigns`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_sponsor_campaigns` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 aid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 aid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -223,8 +223,8 @@ PRIMARY KEY(id)
        //
        // Campaigns + URLs + Banner
        //
        //
        // Campaigns + URLs + Banner
        //

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_campaign_assigns`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_sponsor_campaign_assigns` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_campaign_assigns`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_sponsor_campaign_assigns` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 campaignid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 urlid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 campaignid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 urlid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -239,8 +239,8 @@ PRIMARY KEY(id)
        //
        // Allowed data to display (administrative)
        //
        //
        // Allowed data to display (administrative)
        //

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_admin_data`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_sponsor_admin_data` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_admin_data`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_sponsor_admin_data` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 data_row VARCHAR(255) NOT NULL DEFAULT '',
 display ENUM('Y','N') NOT NULL DEFAULT 'N',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 data_row VARCHAR(255) NOT NULL DEFAULT '',
 display ENUM('Y','N') NOT NULL DEFAULT 'N',


@@ -249,8 +249,8 @@ PRIMARY KEY(id)
        //
        // Allowed data to display (sponsor-side)
        //
        //
        // Allowed data to display (sponsor-side)
        //

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_display_data`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_sponsor_display_data` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_display_data`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_sponsor_display_data` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 data_row VARCHAR(255) NOT NULL DEFAULT '',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 sponsorid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 data_row VARCHAR(255) NOT NULL DEFAULT '',


@@ -261,110 +261,110 @@ PRIMARY KEY(id)
        //
        // Default allowed data to display
        //
        //
        // Default allowed data to display
        //

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('id','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('company','Y')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('position','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('tax_ident','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('gender','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('surname','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('family','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('street_nr1','Y')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('street_nr2','Y')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('zip','Y')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('city','Y')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('country','Y')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('phone','Y')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('fax','Y')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('email','Y')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('url','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('password','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('remote_addr','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('sponsor_created','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('last_online','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('last_change','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('status','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('receive_warnings','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('warning_interval','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('points_amount','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('points_used','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('refid','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('ref_count','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('hash','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('last_pay','N')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('last_curr','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('id','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('company','Y')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('position','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('tax_ident','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('gender','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('surname','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('family','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('street_nr1','Y')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('street_nr2','Y')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('zip','Y')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('city','Y')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('country','Y')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('phone','Y')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('fax','Y')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('email','Y')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('url','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('password','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('remote_addr','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('sponsor_created','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('last_online','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('last_change','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('status','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('receive_warnings','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('warning_interval','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('points_amount','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('points_used','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('refid','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('ref_count','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('hash','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('last_pay','N')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_admin_data` (data_row, display) VALUES ('last_curr','N')";

        //
        // Add default entries
        //
        //
        // Add default entries
        //

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_registry` (ext_name, is_active, aid, stamp_added) VALUES ('sponsor','N',".GET_CURRENT_ADMIN_ID().",UNIX_TIMESTAMP())";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_action_convert` (ext_name, conv_rate, conv_name) VALUES ('sponsor','10','Mails')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_paytypes` (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Standart-Paket', 5, 1000.00000, '€')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_paytypes` (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Spar-Paket', 1, 200.00000, '€')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_paytypes` (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Power-Paket', 10, 2000.00000, '€')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_paytypes` (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Sponsor-Paket', 20, 4000.00000, '€')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_registry` (ext_name, is_active, aid, stamp_added) VALUES ('sponsor','N',".GET_CURRENT_ADMIN_ID().",UNIX_TIMESTAMP())";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_action_convert` (ext_name, conv_rate, conv_name) VALUES ('sponsor','10','Mails')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_paytypes` (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Standart-Paket', 5, 1000.00000, '€')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_paytypes` (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Spar-Paket', 1, 200.00000, '€')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_paytypes` (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Power-Paket', 10, 2000.00000, '€')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_paytypes` (pay_name, pay_min_count, pay_rate, pay_currency) VALUES ('Sponsor-Paket', 20, 4000.00000, '€')";

        //
        // Admin menu
        //
        //
        // Admin menu
        //

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor', NULL, 'Sponsorenbereich','Den Sponsorenbereich verwalten. Hier können Sie auch Sonderaktionen seperat deakvieren oder wieder aktivieren, Sponsorenaccounts verwalten usw.', 7)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','add_sponsor','Neuer Sponsor','Neues Sponsorenaccount hinzufügen.', 1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','unlock_sponsor','Sponsor freischalten','Sponsorenaccounts freigeben / sperren.', 2)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor','Sponsoren auflisten','Listet alle verfügbaren Sponsorenaccounts auf.', 3)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','edit_sponsor','Sponsor ändern','Sponsorenaccount ändern (Grundaten, nicht Freigabe!).', 4)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','lock_sponsor','Sponsor ent-/sperren','Sponsorenaccount sperren und entsperren.', 5)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','del_sponsor','Sponsor löschen','Sponsorenaccount löschen.', 6)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','allow_sponsor_data','Datenverwaltung','Stellen Sie hier ein, welche Daten der Sponsor im Mitgliedsbereich über sicht anzeigen darf und welche nicht.', 7)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_pays','Bestellungen...','Bestellungen der Sponsoren auflisten / bearbeiten.', 8)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_menu','Sponsorenmenü','Das Sponsorenmenü kann hier geändert werden.', 9)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_campaigns','Kampagnen...','Verwaltung aller von Ihren Sponsoren eingerichteten Kampagnen.', 10)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_urls','URL-Verwaltung','Verwaltung (freischalten, sperren, löschen, testen, bearbeiten usw.) von gebuchten URLs.', 11)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_banner','Banner-Verwaltung','Verwaltung (freischalten, sperren, löschen, testen, bearbeiten usw.) von gebuchten Bannern.', 12)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_reg','Sponsor-Aktionen','Alle Sponsor-Aktionen auflisten und verwalten.', 13)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_pay','Buchungspakete','Die Sponsoren können sich {!POINTS!}-Pakete kaufen. Hier können Sie diese verwalten.', 14)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_conv','{!POINTS!} umwandeln...','Mit den vom Sponsor gekauften {!POINTS!} kann er Aktionen buchen. Hier stellen Sie die Umrechnungsrate von {!POINTS!} nach Sponsoraktionen um. Beispiel: 1 {!POINTS!} = 10 Mails.', 15)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','config_sponsor','Einstellungen','Allgemeine Einstellungen am Sponsoring-System.', 16)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('repair','repr_sponsor','Sponsormenü','Gewichtung des Sponsormenüs reparieren.', 5)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor', NULL, 'Sponsorenbereich','Den Sponsorenbereich verwalten. Hier können Sie auch Sonderaktionen seperat deakvieren oder wieder aktivieren, Sponsorenaccounts verwalten usw.', 7)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','add_sponsor','Neuer Sponsor','Neues Sponsorenaccount hinzufügen.', 1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','unlock_sponsor','Sponsor freischalten','Sponsorenaccounts freigeben / sperren.', 2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor','Sponsoren auflisten','Listet alle verfügbaren Sponsorenaccounts auf.', 3)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','edit_sponsor','Sponsor ändern','Sponsorenaccount ändern (Grundaten, nicht Freigabe!).', 4)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','lock_sponsor','Sponsor ent-/sperren','Sponsorenaccount sperren und entsperren.', 5)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','del_sponsor','Sponsor löschen','Sponsorenaccount löschen.', 6)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','allow_sponsor_data','Datenverwaltung','Stellen Sie hier ein, welche Daten der Sponsor im Mitgliedsbereich über sicht anzeigen darf und welche nicht.', 7)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_pays','Bestellungen...','Bestellungen der Sponsoren auflisten / bearbeiten.', 8)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_menu','Sponsorenmenü','Das Sponsorenmenü kann hier geändert werden.', 9)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_campaigns','Kampagnen...','Verwaltung aller von Ihren Sponsoren eingerichteten Kampagnen.', 10)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_urls','URL-Verwaltung','Verwaltung (freischalten, sperren, löschen, testen, bearbeiten usw.) von gebuchten URLs.', 11)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_banner','Banner-Verwaltung','Verwaltung (freischalten, sperren, löschen, testen, bearbeiten usw.) von gebuchten Bannern.', 12)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_reg','Sponsor-Aktionen','Alle Sponsor-Aktionen auflisten und verwalten.', 13)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_pay','Buchungspakete','Die Sponsoren können sich {!POINTS!}-Pakete kaufen. Hier können Sie diese verwalten.', 14)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','list_sponsor_conv','{!POINTS!} umwandeln...','Mit den vom Sponsor gekauften {!POINTS!} kann er Aktionen buchen. Hier stellen Sie die Umrechnungsrate von {!POINTS!} nach Sponsoraktionen um. Beispiel: 1 {!POINTS!} = 10 Mails.', 15)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('sponsor','config_sponsor','Einstellungen','Allgemeine Einstellungen am Sponsoring-System.', 16)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('repair','repr_sponsor','Sponsormenü','Gewichtung des Sponsormenüs reparieren.', 5)";

        //
        // Menu system (still admin menu)
        //
        //
        // Menu system (still admin menu)
        //

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','sponsor_medit','Sponsor-Menü editieren','Hier können Sie das Sponsorenmenü verändern: Positionen verändern, Menütitel ändern usw.', 7)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','sponsor_madd','Sponsor-Menü hinzufügen','Hier können Sie einen neuen Menüpunkt hinzufügen (falls Sie z.B. eigene Sponsoraktionen entwickelt haben oder welche versehendlich gelöscht haben.', 8)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','sponsor_medit','Sponsor-Menü editieren','Hier können Sie das Sponsorenmenü verändern: Positionen verändern, Menütitel ändern usw.', 7)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('menu','sponsor_madd','Sponsor-Menü hinzufügen','Hier können Sie einen neuen Menüpunkt hinzufügen (falls Sie z.B. eigene Sponsoraktionen entwickelt haben oder welche versehendlich gelöscht haben.', 8)";

        //
        // Guest menu
        //
        //
        // Guest menu
        //

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`, `what`, `title`, `sort`) VALUES ('sponsor', NULL, 'Sponsoren', 2)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`, `what`, `title`, `sort`) VALUES ('sponsor','sponsor_reg','Anmeldung', 1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`, `what`, `title`, `sort`) VALUES ('sponsor','sponsor_login','Einloggen', 2)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`, `what`, `title`, `sort`) VALUES ('sponsor','sponsor_infos','Infos/Preise', 3)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`, `what`, `title`, `sort`) VALUES ('sponsor','sponsor_agb','AGBs', 4)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`, `what`, `title`, `sort`) VALUES ('sponsor', NULL, 'Sponsoren', 2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`, `what`, `title`, `sort`) VALUES ('sponsor','sponsor_reg','Anmeldung', 1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`, `what`, `title`, `sort`) VALUES ('sponsor','sponsor_login','Einloggen', 2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`, `what`, `title`, `sort`) VALUES ('sponsor','sponsor_infos','Infos/Preise', 3)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`, `what`, `title`, `sort`) VALUES ('sponsor','sponsor_agb','AGBs', 4)";

        //
        // Member menu
        //
        //
        // Member menu
        //

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`, `what`, `title`, `sort`) VALUES ('main','sponsor','Unsere Sponsoren', 8)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`, `what`, `title`, `sort`) VALUES ('main','sponsor','Unsere Sponsoren', 8)";

        //
        // Add default menus to sponsor menu
        //
        //
        // Add default menus to sponsor menu
        //

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main', NULL, 'Hauptauswahl','N', 1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','welcome','Willkommen','N', 1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','account','Ihr Account','N', 2)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','campaigns','Kampagnen','N', 3)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','list_urls','URL-Verwaltung','N', 4)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','list_banner','Banner-Verwaltung','N', 5)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','settings','Einstellungen','N', 6)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','fillup','Konto auffüllen','N', 7)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','stats','Statistiken','N', 8)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','inquiry','Kontaktanfrage','N', 9)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','refid','Referal-Link','N', 10)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('actions', NULL, 'Sponsorenaktionen','N', 2)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('actions','mail','Sponsor-Mail','N', 1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('actions','banner','Banner buchen','N', 2)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('actions','text','Textlink buchen','N', 3)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('logout', NULL, 'Ausloggen','N', 3)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('logout','logout','Ausloggen','N', 1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('logout','guest','Zum Gastbereich','N', 2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main', NULL, 'Hauptauswahl','N', 1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','welcome','Willkommen','N', 1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','account','Ihr Account','N', 2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','campaigns','Kampagnen','N', 3)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','list_urls','URL-Verwaltung','N', 4)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','list_banner','Banner-Verwaltung','N', 5)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','settings','Einstellungen','N', 6)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','fillup','Konto auffüllen','N', 7)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','stats','Statistiken','N', 8)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','inquiry','Kontaktanfrage','N', 9)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('main','refid','Referal-Link','N', 10)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('actions', NULL, 'Sponsorenaktionen','N', 2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('actions','mail','Sponsor-Mail','N', 1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('actions','banner','Banner buchen','N', 2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('actions','text','Textlink buchen','N', 3)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('logout', NULL, 'Ausloggen','N', 3)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('logout','logout','Ausloggen','N', 1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_menu` (`action`, `what`, `title`, `active`, `sort`) VALUES ('logout','guest','Zum Gastbereich','N', 2)";

        //
        // General configuration stuff
        //
        //
        // General configuration stuff
        //

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD sponsor_ref_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 100.00000";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD sponsor_min_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 1000.00000";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD sponsor_ref_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 100.00000";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD sponsor_min_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 1000.00000";

 
        // Load CSS file
        $EXT_CSS = "Y";
 
        // Load CSS file
        $EXT_CSS = "Y";


@@ -372,37 +372,37 @@ PRIMARY KEY(id)
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_data`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_orders`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_action_convert`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_paytypes`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_menu`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_registry`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_urls`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_banner`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_campaigns`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_campaign_assigns`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_admin_data`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_sponsor_display_data`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='sponsor' OR what IN('repr_sponsor','sponsor_medit','sponsor_madd') LIMIT 20";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE action='sponsor' LIMIT 5";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE what='sponsor' LIMIT 1";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_data`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_orders`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_action_convert`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_paytypes`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_menu`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_registry`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_urls`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_banner`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_campaigns`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_campaign_assigns`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_admin_data`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_sponsor_display_data`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='sponsor' OR what IN('repr_sponsor','sponsor_medit','sponsor_madd') LIMIT 20";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE action='sponsor' LIMIT 5";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE what='sponsor' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='Y', locked='N' WHERE action='sponsor' LIMIT 4";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='sponsor' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_sponsor_menu` SET active='Y' WHERE active='N'";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_sponsor_registry` SET is_active='Y' WHERE is_active='N'";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='Y', `locked`='N' WHERE action='sponsor' LIMIT 4";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='sponsor' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_sponsor_menu` SET active='Y' WHERE active='N'";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_sponsor_registry` SET is_active='Y' WHERE is_active='N'";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='N', locked='Y' WHERE action='sponsor' LIMIT 4";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='N', locked='Y' WHERE what='sponsor' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_sponsor_menu` SET active='N' WHERE active='Y'";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_sponsor_registry` SET is_active='N' WHERE is_active='Y'";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='N', `locked`='Y' WHERE action='sponsor' LIMIT 4";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE what='sponsor' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_sponsor_menu` SET active='N' WHERE active='Y'";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_sponsor_registry` SET is_active='N' WHERE is_active='Y'";

        break;
 
 case "update": // Update an extension
        break;
 
 case "update": // Update an extension

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index f0d2b0c90dc83a3f97a4a19ad42072f6d621d796..8da3cde53aa679453f82e5455cd28920c27341cf 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -55,15 +55,15 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // Drop tables
 
 case "remove": // Do stuff when removing extension
        // Drop tables

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_admin_menu_las`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_admin_menu_las`_data";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_admin_menu_stats`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_stats_data`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_book`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_filters`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_admin_menu_las`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_admin_menu_las`_data";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_admin_menu_stats`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_stats_data`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_book`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_filters`";

 
        // Delete admin menu entries
 
        // Delete admin menu entries

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE

 `what`='config_extensions' OR
 `what`='config_home' OR
 `what`='list_unconfirmed' OR
 `what`='config_extensions' OR
 `what`='config_home' OR
 `what`='list_unconfirmed' OR


@@ -77,51 +77,51 @@ case "remove": // Do stuff when removing extension
 LIMIT 10";
 
        // Delete/update member menu entries
 LIMIT 10";
 
        // Delete/update member menu entries

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE

 `what`='stats2' OR
 `what`='reflist' OR
 `what`='stats2' OR
 `what`='reflist' OR

-(action='stats' AND (`what`='' OR what IS NULL)) OR
-(action='extras' AND (`what`='' OR what IS NULL)) OR
-(action='rals' AND (`what`='' OR what IS NULL)) OR
-(action='account' AND (`what`='' OR what IS NULL))";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET action='main' WHERE
+(action='stats' AND (`what`='' OR `what` IS NULL)) OR
+(action='extras' AND (`what`='' OR `what` IS NULL)) OR
+(action='rals' AND (`what`='' OR `what` IS NULL)) OR
+(action='account' AND (`what`='' OR `what` IS NULL))";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET action='main' WHERE

 action='stats' OR
 action='extras' OR
 action='rals' OR
 action='account'";
 
        // Drop indexes
 action='stats' OR
 action='extras' OR
 action='rals' OR
 action='account'";
 
        // Drop indexes

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_extensions` DROP UNIQUE KEY `ext_name`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admins` DROP UNIQUE KEY `login`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` DROP INDEX `status`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_refbanner` DROP INDEX `visible`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_refdepths` DROP UNIQUE KEY `level`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_refsystem` DROP INDEX `level`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_pool` DROP INDEX `data_type`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_mod_reg` DROP UNIQUE KEY `module`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admin_menu` DROP INDEX `action`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admin_menu` DROP INDEX `what`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_task_system` DROP INDEX `task_type`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_task_system` DROP INDEX `status`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_task_system` DROP INDEX `task_created`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_task_system` DROP FULLTEXT `subject`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_task_system` DROP INDEX `subject`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_extensions` DROP INDEX `ext_active`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` DROP INDEX `status`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` DROP FULLTEXT `family`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` DROP INDEX `max_mails`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` DROP INDEX `password`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_guest_menu` DROP INDEX `action`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_guest_menu` DROP INDEX `what`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_guest_menu` DROP INDEX `sort`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_guest_menu` DROP INDEX `visible`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_guest_menu` DROP INDEX `locked`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_member_menu` DROP INDEX `what`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_member_menu` DROP INDEX `sort`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_member_menu` DROP INDEX `visible`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_member_menu` DROP INDEX `locked`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_cats` DROP INDEX `visible`";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_cats` DROP INDEX `sort`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_extensions` DROP UNIQUE KEY `ext_name`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admins` DROP UNIQUE KEY `login`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP INDEX `status`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_refbanner` DROP INDEX `visible`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_refdepths` DROP UNIQUE KEY `level`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_refsystem` DROP INDEX `level`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_pool` DROP INDEX `data_type`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_mod_reg` DROP UNIQUE KEY `module`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admin_menu` DROP INDEX `action`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admin_menu` DROP INDEX `what`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_task_system` DROP INDEX `task_type`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_task_system` DROP INDEX `status`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_task_system` DROP INDEX `task_created`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_task_system` DROP FULLTEXT `subject`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_task_system` DROP INDEX `subject`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_extensions` DROP INDEX `ext_active`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP INDEX `status`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP FULLTEXT `family`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP INDEX `max_mails`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP INDEX `password`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_guest_menu` DROP INDEX `action`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_guest_menu` DROP INDEX `what`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_guest_menu` DROP INDEX `sort`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_guest_menu` DROP INDEX `visible`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_guest_menu` DROP INDEX `locked`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_member_menu` DROP INDEX `what`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_member_menu` DROP INDEX `sort`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_member_menu` DROP INDEX `visible`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_member_menu` DROP INDEX `locked`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_cats` DROP INDEX `visible`";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_cats` DROP INDEX `sort`";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension


@@ -138,96 +138,96 @@ case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.1
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD ext_autopurge ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_extensions','Erweitungsmanagement','Alle Einstellungen am Erweiterungsmanagement.', 10)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD ext_autopurge ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_extensions','Erweitungsmanagement','Alle Einstellungen am Erweiterungsmanagement.', 10)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Es kann nun bestimmt werden, ob vom Server gelöschte ext-xxx.php erkannt werden sollen und die verknüpften Daten auch aus der Datenbank entfernt werden sollen.";
                break;
 
        case "0.0.2": // SQL queries for v0.0.2
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Es kann nun bestimmt werden, ob vom Server gelöschte ext-xxx.php erkannt werden sollen und die verknüpften Daten auch aus der Datenbank entfernt werden sollen.";
                break;
 
        case "0.0.2": // SQL queries for v0.0.2

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` CHANGE auto_purge auto_purge BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day')*14)."";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` CHANGE auto_purge auto_purge BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day')*14)."";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "In der Tabelle <strong>{!MYSQL_PREFIX!}_config</strong> musste die Spalte <strong>auto_purge</strong> (autom. L&ouml;schen von Best&auml;tigungsmails angepasst werden (war auf dem Testsystem auf TINYINT(4) gesetzt.)";
                break;
 
        case "0.0.3": // SQL queries for v0.0.3
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "In der Tabelle <strong>{!MYSQL_PREFIX!}_config</strong> musste die Spalte <strong>auto_purge</strong> (autom. L&ouml;schen von Best&auml;tigungsmails angepasst werden (war auf dem Testsystem auf TINYINT(4) gesetzt.)";
                break;
 
        case "0.0.3": // SQL queries for v0.0.3

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD points_word VARCHAR(255) NOT NULL DEFAULT 'Punkte'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD points_word VARCHAR(255) NOT NULL DEFAULT 'Punkte'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Das Wort &quot;Punkte&quot; kann nun per Datenbank ge&auml;ndert werden. Damit k&ouml;nnen Sie anstelle des Wortes Punkte auch Klammlose oder &euro; schreiben.";
                break;
 
        case "0.0.4": // SQL queries for v0.0.4
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Das Wort &quot;Punkte&quot; kann nun per Datenbank ge&auml;ndert werden. Damit k&ouml;nnen Sie anstelle des Wortes Punkte auch Klammlose oder &euro; schreiben.";
                break;
 
        case "0.0.4": // SQL queries for v0.0.4

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD mails_page BIGINT(20) UNSIGNED NOT NULL DEFAULT 10";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD mails_page BIGINT(20) UNSIGNED NOT NULL DEFAULT 10";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Anzahl Mails pro Seite in <strong>EMail-Details ansehen</strong> und <strong>EMail-Archiv</strong> hinzugef&uuml;gt.";
                break;
 
        case "0.0.5": // SQL queries for v0.0.5
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Anzahl Mails pro Seite in <strong>EMail-Details ansehen</strong> und <strong>EMail-Archiv</strong> hinzugef&uuml;gt.";
                break;
 
        case "0.0.5": // SQL queries for v0.0.5

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD index_home VARCHAR(255) NOT NULL DEFAULT 'welcome'";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_home','Home-Seite festlegen','Stellen Sie hier ein, welcher Men&uuml;punkt (what-welcome ist Standart) als Einstiegspunkt in das Men&uuml;system genutzt werden soll.', 5)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD index_home VARCHAR(255) NOT NULL DEFAULT 'welcome'";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_home','Home-Seite festlegen','Stellen Sie hier ein, welcher Men&uuml;punkt (what-welcome ist Standart) als Einstiegspunkt in das Men&uuml;system genutzt werden soll.', 5)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Die what-welcome.php ist derzeit die &quot;Home&quot;-Seite (Eingangsseite). Dies kann nun per Datenbank ge&auml;ndert werden.";
                break;
 
        case "0.0.6": // SQL queries for v0.0.6
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Die what-welcome.php ist derzeit die &quot;Home&quot;-Seite (Eingangsseite). Dies kann nun per Datenbank ge&auml;ndert werden.";
                break;
 
        case "0.0.6": // SQL queries for v0.0.6

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_extensions` ADD ext_has_css ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_extensions` ADD ext_has_css ENUM('Y','N') NOT NULL DEFAULT 'N'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Es k&ouml;nnen nun SQL-Updates von einander abh&auml;ngig gemacht werden und die CSS-Datei kann per Admin-Bereich (wegen Debuggings) ein- bzw. ausgeschaltet werden.";
                break;
 
        case "0.0.7": // SQL queries for v0.0.7
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Es k&ouml;nnen nun SQL-Updates von einander abh&auml;ngig gemacht werden und die CSS-Datei kann per Admin-Bereich (wegen Debuggings) ein- bzw. ausgeschaltet werden.";
                break;
 
        case "0.0.7": // SQL queries for v0.0.7

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD verbose_sql ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD verbose_sql ENUM('Y','N') NOT NULL DEFAULT 'Y'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Die SQL-Anweisungen werden bei eingeschalteter Verbose-Funktion detailiert angezeigt.";
                break;
 
        case "0.0.8": // SQL queries for v0.0.8
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Die SQL-Anweisungen werden bei eingeschalteter Verbose-Funktion detailiert angezeigt.";
                break;
 
        case "0.0.8": // SQL queries for v0.0.8

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD menu_blur_spacer VARCHAR(255) NOT NULL DEFAULT '&nbsp;<strong><big>&middot;</big></strong>&nbsp;'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD menu_blur_spacer VARCHAR(255) NOT NULL DEFAULT '&nbsp;<strong><big>&middot;</big></strong>&nbsp;'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Nette Mouse-Hover-Effekte eingebaut (Anleitung <strong>MENUE_HOVER.txt</strong> zum Patchen der general.css bitte lesen!)";
                break;
 
        case "0.0.9": // SQL queries for v0.0.9
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Nette Mouse-Hover-Effekte eingebaut (Anleitung <strong>MENUE_HOVER.txt</strong> zum Patchen der general.css bitte lesen!)";
                break;
 
        case "0.0.9": // SQL queries for v0.0.9

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','list_unconfirmed','Unbest. Mails auflisten','Schauen Sie sich hier unbest&auml;tigte Maillinks an. Bitte diesen Link nur &uuml;ber dem EMail-Archiv oder EMail-Details aufrufen, direkt aufgerufen bekommen Sie eine Fehlermeldung.', 8)";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','list_unconfirmed','Unbest. Mails auflisten','Schauen Sie sich hier unbest&auml;tigte Maillinks an. Bitte diesen Link nur &uuml;ber dem EMail-Archiv oder EMail-Details aufrufen, direkt aufgerufen bekommen Sie eine Fehlermeldung.', 8)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Unbest&auml;tigte Maillinks k&ouml;nnen unter Email-Management -&gt; Unbest. Mails auflisten aufgelistet werden.";
                break;
 
        case "0.1.0": // SQL queries for v0.2.1
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Unbest&auml;tigte Maillinks k&ouml;nnen unter Email-Management -&gt; Unbest. Mails auflisten aufgelistet werden.";
                break;
 
        case "0.1.0": // SQL queries for v0.2.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD reg_points_mode ENUM('ref','direct') NOT NULL DEFAULT 'ref'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD reg_points_mode ENUM('ref','direct') NOT NULL DEFAULT 'ref'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Soll der einmalige Ref-Bonus &uuml;ber das Referal-System (also alle oberen Refs bekommen auch etwas davon ab) oder direkt dem Werber aufgebucht werden?";
                break;
 
        case "0.1.1": // SQL queries for v0.1.1
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Soll der einmalige Ref-Bonus &uuml;ber das Referal-System (also alle oberen Refs bekommen auch etwas davon ab) oder direkt dem Werber aufgebucht werden?";
                break;
 
        case "0.1.1": // SQL queries for v0.1.1

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET title='Home-/Eingangsseite', descr='Stellen Sie hier ein, welcher Men&uuml;punkt (what-welcome ist Standart) als Einstiegspunkt in das Men&uuml;system genutzt werden soll und wie die automatische Weiterleitung in der Eingangsseite funktionieren soll.' WHERE `what`='config_home' LIMIT 1";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD index_delay TINYINT(3) UNSIGNED NOT NULL DEFAULT '-1'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD index_cookie BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day')*365)."";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET title='Home-/Eingangsseite', descr='Stellen Sie hier ein, welcher Men&uuml;punkt (what-welcome ist Standart) als Einstiegspunkt in das Men&uuml;system genutzt werden soll und wie die automatische Weiterleitung in der Eingangsseite funktionieren soll.' WHERE `what`='config_home' LIMIT 1";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD index_delay TINYINT(3) UNSIGNED NOT NULL DEFAULT '-1'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD index_cookie BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day')*365)."";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Sie k&ouml;nnen nun <a href=\"{!URL!}/modules.php?module=admin&amp;`what`=config_home\">hier</a> die Verz&ouml;gerungszeit in der <a href=\"{!URL!}/index.php\">Eingangsseite</a> einstellen.";
                break;
 
        case "0.1.2": // SQL queries for v0.1.2
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Sie k&ouml;nnen nun <a href=\"{!URL!}/modules.php?module=admin&amp;`what`=config_home\">hier</a> die Verz&ouml;gerungszeit in der <a href=\"{!URL!}/index.php\">Eingangsseite</a> einstellen.";
                break;
 
        case "0.1.2": // SQL queries for v0.1.2

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_refid','Standart-Ref-ID','Stellen Sie hier die User-ID ein, die genommen werden soll, wenn der Gast n icht per Referal-Link Ihren Mailtausch aufgerufen hat.', 7)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD def_refid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_refid','Standart-Ref-ID','Stellen Sie hier die User-ID ein, die genommen werden soll, wenn der Gast n icht per Referal-Link Ihren Mailtausch aufgerufen hat.', 7)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD def_refid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Standart Referal-ID kann per Admin-Bereich eingestellt werden (war vorher nur in modules.php und index.php direkt eingebbar.)";
                break;
 
        case "0.1.3": // SQL queries for v0.1.3
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Standart Referal-ID kann per Admin-Bereich eingestellt werden (war vorher nur in modules.php und index.php direkt eingebbar.)";
                break;
 
        case "0.1.3": // SQL queries for v0.1.3

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD refid_target ENUM('register','index') NOT NULL DEFAULT 'register'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD refid_target ENUM('register','index') NOT NULL DEFAULT 'register'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Auf welche Seite soll der Ref-Link zeigen? Eingangsseite oder Anmeldeformular?";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Auf welche Seite soll der Ref-Link zeigen? Eingangsseite oder Anmeldeformular?";


@@ -239,20 +239,20 @@ case "update": // Update an extension
                break;
 
        case "0.1.5": // SQL queries for v0.1.5
                break;
 
        case "0.1.5": // SQL queries for v0.1.5

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_extensions` DROP ext_has_admin";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_extensions` DROP ext_has_admin";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Spalte <u>ext_has_admin</u> aus der Tabelle <u>{!MYSQL_PREFIX!}_extensions</u> entfernt, da sie keinen Sinn mehr macht.";
                break;
 
        case "0.1.6": // SQL queries for v0.1.6
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Spalte <u>ext_has_admin</u> aus der Tabelle <u>{!MYSQL_PREFIX!}_extensions</u> entfernt, da sie keinen Sinn mehr macht.";
                break;
 
        case "0.1.6": // SQL queries for v0.1.6

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD enable_title_deco ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD title_left VARCHAR(10) NOT NULL DEFAULT '[--'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD title_middle VARCHAR(10) NOT NULL DEFAULT '-'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD title_right VARCHAR(10) NOT NULL DEFAULT '--]'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD enable_mod_title ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD enable_what_title ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_title','Seitentitel &auml;ndern','De-/aktivieren Sie hier die Dekorationen, sowie Modul-Titel und what-Titel im Seitentitel.', 8)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD enable_title_deco ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD title_left VARCHAR(10) NOT NULL DEFAULT '[--'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD title_middle VARCHAR(10) NOT NULL DEFAULT '-'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD title_right VARCHAR(10) NOT NULL DEFAULT '--]'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD enable_mod_title ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD enable_what_title ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_title','Seitentitel &auml;ndern','De-/aktivieren Sie hier die Dekorationen, sowie Modul-Titel und what-Titel im Seitentitel.', 8)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Dekorationen des Seitentiteles lassen sich ein- und ausschalten und selber definieren; Modul-Titel und Titel der <strong>what</strong>-Dateien kann hinzugef&uuml;gt werden.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Dekorationen des Seitentiteles lassen sich ein- und ausschalten und selber definieren; Modul-Titel und Titel der <strong>what</strong>-Dateien kann hinzugef&uuml;gt werden.";


@@ -274,21 +274,21 @@ case "update": // Update an extension
                break;
 
        case "0.2.0": // SQL queries for v0.2.0
                break;
 
        case "0.2.0": // SQL queries for v0.2.0

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_jackpot` CHANGE points points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_jackpot` CHANGE points points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";

 
 

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_payments` CHANGE payment payment FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_payments` CHANGE price price FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_payments` CHANGE payment payment FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_payments` CHANGE price price FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";

 
 

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` CHANGE used_points used_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_points` CHANGE points points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_points` CHANGE locked_points locked_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` CHANGE used_points used_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_points` CHANGE points points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_points` CHANGE locked_points locked_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "5 Nachkommastellen implementiert";
                break;
 
        case "0.2.1": // SQL queries for v0.2.1
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "5 Nachkommastellen implementiert";
                break;
 
        case "0.2.1": // SQL queries for v0.2.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD css_php ENUM('DIRECT','FILE') NOT NULL DEFAULT 'FILE'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD css_php ENUM('DIRECT','FILE') NOT NULL DEFAULT 'FILE'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Ausgabe der CSS-Dateien entweder per css.php oder sie sind direkt eingebunden.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Ausgabe der CSS-Dateien entweder per css.php oder sie sind direkt eingebunden.";


@@ -300,9 +300,9 @@ case "update": // Update an extension
                break;
 
        case "0.2.3": // SQL queries for v0.2.3
                break;
 
        case "0.2.3": // SQL queries for v0.2.3

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD guest_menu ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD member_menu ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD youre_here ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD guest_menu ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD member_menu ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD youre_here ENUM('Y','N') NOT NULL DEFAULT 'Y'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Gast- und Mitgliedsmen&uuml;s lassen sich getrennt voneinander abschalten.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Gast- und Mitgliedsmen&uuml;s lassen sich getrennt voneinander abschalten.";


@@ -314,30 +314,30 @@ case "update": // Update an extension
                        // Switch to JPEG format
                        $auto_type = "jpg";
                }
                        // Switch to JPEG format
                        $auto_type = "jpg";
                }

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD img_type ENUM('jpg','png') NOT NULL DEFAULT '".$auto_type."'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD img_type ENUM('jpg','png') NOT NULL DEFAULT '".$auto_type."'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Generierung des Mailbest&auml;tigungscodes h&auml;ngt davon ab, ob die PHP-Funktion <u>imagecreatefromjpeg()</u> und das JPEG-Bild vorhanden sind oder nicht.";
                break;
 
        case "0.2.5": // SQL queries for v0.2.5
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Generierung des Mailbest&auml;tigungscodes h&auml;ngt davon ab, ob die PHP-Funktion <u>imagecreatefromjpeg()</u> und das JPEG-Bild vorhanden sind oder nicht.";
                break;
 
        case "0.2.5": // SQL queries for v0.2.5

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` CHANGE receive_mails receive_mails BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` CHANGE max_mails max_mails BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` CHANGE receive_mails receive_mails BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` CHANGE max_mails max_mails BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Spalten <u>max_mails</u> und <u>receive_mails</u> auf BIGINT(20) gesetzt.";
                break;
 
        case "0.2.6": // SQL queries for v0.2.6
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Spalten <u>max_mails</u> und <u>receive_mails</u> auf BIGINT(20) gesetzt.";
                break;
 
        case "0.2.6": // SQL queries for v0.2.6

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','sub_points','{!POINTS!} abziehen','Allen oder einem Mitglied {!POINTS!} abziehen.', 8)";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','sub_points','{!POINTS!} abziehen','Allen oder einem Mitglied {!POINTS!} abziehen.', 8)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Abzug von {!POINTS!} nun m&ouml;glich.";
                break;
 
        case "0.2.7": // SQL queries for v0.2.7
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Abzug von {!POINTS!} nun m&ouml;glich.";
                break;
 
        case "0.2.7": // SQL queries for v0.2.7

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD stats_limit BIGINT(20) UNSIGNED NOT NULL DEFAULT 10";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET `what`='config_stats' WHERE `what`='stats' LIMIT 1";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD stats_limit BIGINT(20) UNSIGNED NOT NULL DEFAULT 10";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET `what`='config_stats' WHERE `what`='stats' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "<ol>
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "<ol>


@@ -347,61 +347,61 @@ case "update": // Update an extension
                break;
 
        case "0.2.8": // SQL queries for v0.2.8
                break;
 
        case "0.2.8": // SQL queries for v0.2.8

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD last_login VARCHAR(10) NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD last_login VARCHAR(10) NOT NULL DEFAULT 0";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Letzter Login wird gespeichert, Cache wird bei installierter Cache-Erweiterung bei Sprachen&auml;nderung aufgefrischt.";
                break;
 
        case "0.2.9": // SQL queries for v0.2.9
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Letzter Login wird gespeichert, Cache wird bei installierter Cache-Erweiterung bei Sprachen&auml;nderung aufgefrischt.";
                break;
 
        case "0.2.9": // SQL queries for v0.2.9

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD mt_word VARCHAR(255) NOT NULL DEFAULT 'Mailtausch'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD mt_word2 VARCHAR(255) NOT NULL DEFAULT 'Mailtausches'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD mt_word3 VARCHAR(255) NOT NULL DEFAULT 'Mailtauscher'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD mt_word VARCHAR(255) NOT NULL DEFAULT 'Mailtausch'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD mt_word2 VARCHAR(255) NOT NULL DEFAULT 'Mailtausches'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD mt_word3 VARCHAR(255) NOT NULL DEFAULT 'Mailtauscher'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
                break;
 
        case "0.3.0": // SQL queries for v0.3.0
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
                break;
 
        case "0.3.0": // SQL queries for v0.3.0

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET title='{!POINTS!}/Referal-Ebenen' WHERE `what`='config_points' LIMIT 1";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET title='Mailverg&uuml;tungen...' WHERE `what`='payments' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET title='{!POINTS!}/Referal-Ebenen' WHERE `what`='config_points' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET title='Mailverg&uuml;tungen...' WHERE `what`='payments' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Zwei Men&uuml;punkte umbenannt.";
                break;
 
        case "0.3.1": // SQL queries for v0.3.1
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Zwei Men&uuml;punkte umbenannt.";
                break;
 
        case "0.3.1": // SQL queries for v0.3.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_extensions` ADD UNIQUE KEY (ext_name)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admins` ADD UNIQUE KEY (login)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD INDEX (status)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_refbanner` ADD INDEX (visible)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_refdepths` ADD UNIQUE KEY (level)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_refsystem` ADD INDEX (level)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_pool` ADD INDEX (data_type)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_mod_reg` ADD UNIQUE KEY (module)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admin_menu` ADD INDEX (action)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admin_menu` ADD INDEX (what)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_task_system` ADD INDEX (task_type)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_task_system` ADD INDEX (status)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_task_system` ADD INDEX (task_created)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_task_system` ADD FULLTEXT (subject)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_task_system` ADD INDEX (subject)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_extensions` ADD INDEX (ext_active)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD INDEX (status)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD FULLTEXT (family)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD INDEX (max_mails)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD INDEX (password)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_guest_menu` ADD INDEX (action)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_guest_menu` ADD INDEX (what)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_guest_menu` ADD INDEX (sort)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_guest_menu` ADD INDEX (visible)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_guest_menu` ADD INDEX (locked)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_member_menu` ADD INDEX (what)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_member_menu` ADD INDEX (sort)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_member_menu` ADD INDEX (visible)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_member_menu` ADD INDEX (locked)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_cats` ADD INDEX (visible)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_cats` ADD INDEX (sort)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_extensions` ADD UNIQUE KEY (ext_name)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admins` ADD UNIQUE KEY (login)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD INDEX (status)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_refbanner` ADD INDEX (visible)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_refdepths` ADD UNIQUE KEY (level)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_refsystem` ADD INDEX (level)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_pool` ADD INDEX (data_type)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_mod_reg` ADD UNIQUE KEY (module)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admin_menu` ADD INDEX (action)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admin_menu` ADD INDEX (what)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_task_system` ADD INDEX (task_type)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_task_system` ADD INDEX (status)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_task_system` ADD INDEX (task_created)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_task_system` ADD FULLTEXT (subject)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_task_system` ADD INDEX (subject)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_extensions` ADD INDEX (ext_active)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD INDEX (status)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD FULLTEXT (family)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD INDEX (max_mails)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD INDEX (password)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_guest_menu` ADD INDEX (action)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_guest_menu` ADD INDEX (what)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_guest_menu` ADD INDEX (sort)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_guest_menu` ADD INDEX (visible)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_guest_menu` ADD INDEX (locked)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_member_menu` ADD INDEX (what)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_member_menu` ADD INDEX (sort)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_member_menu` ADD INDEX (visible)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_member_menu` ADD INDEX (locked)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_cats` ADD INDEX (visible)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_cats` ADD INDEX (sort)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Eindeutige Schl&uuml;ssel (UNIQUE KEY) und normale Schl&uuml;ssel (INDEX) gesetzt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Eindeutige Schl&uuml;ssel (UNIQUE KEY) und normale Schl&uuml;ssel (INDEX) gesetzt.";


@@ -409,8 +409,8 @@ case "update": // Update an extension
 
        case "0.3.2": // SQL queries for v0.3.2
                // Connection table between the menu system and the "logical area" system
 
        case "0.3.2": // SQL queries for v0.3.2
                // Connection table between the menu system and the "logical area" system

-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_admin_menu_las`";
-               $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_admin_menu_las` (
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_admin_menu_las`";
+               $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_admin_menu_las` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 la_id VARCHAR(255) NOT NULL DEFAULT '',
 la_action VARCHAR(255) NOT NULL DEFAULT '',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 la_id VARCHAR(255) NOT NULL DEFAULT '',
 la_action VARCHAR(255) NOT NULL DEFAULT '',


@@ -421,8 +421,8 @@ INDEX (la_what),
 PRIMARY KEY(id)
 ) TYPE=MyISAM";
                // All "logical areas" together
 PRIMARY KEY(id)
 ) TYPE=MyISAM";
                // All "logical areas" together

-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_admin_menu_las`_data";
-               $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_admin_menu_las`_data (
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_admin_menu_las`_data";
+               $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_admin_menu_las`_data (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 la_id VARCHAR(255) NOT NULL DEFAULT '',
 la_title VARCHAR(255) NOT NULL DEFAULT '',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 la_id VARCHAR(255) NOT NULL DEFAULT '',
 la_title VARCHAR(255) NOT NULL DEFAULT '',


@@ -434,10 +434,10 @@ INDEX (la_posy),
 PRIMARY KEY(id)
 ) TYPE=MyISAM";
                // Which menu do you like?
 PRIMARY KEY(id)
 ) TYPE=MyISAM";
                // Which menu do you like?

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD admin_menu ENUM('NEW','OLD') NOT NULL DEFAULT 'OLD'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD admin_menu ENUM('NEW','OLD') NOT NULL DEFAULT 'OLD'";

 
                // Insert menus
 
                // Insert menus

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_admin','Adminmen&uuml;','Diverse Einstellungen am Adminmen&uuml; vornehmen.', 9)";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_admin','Adminmen&uuml;','Diverse Einstellungen am Adminmen&uuml; vornehmen.', 9)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Logische Bereiche (Logical Areas = LAs) eingef&uuml;hrt. Dadurch wird das immer st&auml;rker anwachsende Admin-Men&uuml; in grosse Hauptgruppen unterteilt, wodurch ein Auffinden von Men&uuml;punkten verbessert wird.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Logische Bereiche (Logical Areas = LAs) eingef&uuml;hrt. Dadurch wird das immer st&auml;rker anwachsende Admin-Men&uuml; in grosse Hauptgruppen unterteilt, wodurch ein Auffinden von Men&uuml;punkten verbessert wird.";


@@ -445,11 +445,11 @@ PRIMARY KEY(id)
 
        case "0.3.3": // SQL queries for v0.3.3
                // Switch of the "intelligent menu sorter" when you want to have a fixed menu structure...
 
        case "0.3.3": // SQL queries for v0.3.3
                // Switch of the "intelligent menu sorter" when you want to have a fixed menu structure...

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD admin_menu_sorter ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD admin_menu_sorter ENUM('Y','N') NOT NULL DEFAULT 'Y'";

 
                // The statistics table
 
                // The statistics table

-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_admin_menu_stats`";
-               $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_admin_menu_stats` (
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_admin_menu_stats`";
+               $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_admin_menu_stats` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 aid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 type ENUM('la','action','what') NOT NULL DEFAULT 'what',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 aid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 type ENUM('la','action','what') NOT NULL DEFAULT 'what',


@@ -469,30 +469,30 @@ PRIMARY KEY (id)
 
        case "0.3.5": // SQL queries for v0.3.5
                // List accounts with no referal
 
        case "0.3.5": // SQL queries for v0.3.5
                // List accounts with no referal

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('stats',NULL,'Statistiken',4,'Y','N')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('stats','stats2','Framekiller-Mails',2,'Y','N')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('extras',NULL,'Extras',5,'Y','N')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('rals',NULL,'Rallyes',6,'Y','N')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('account',NULL,'Ihr Account',7,'Y','N')";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET action='stats', sort='1', title='Klick-Mails' WHERE `what`='stats' LIMIT 1";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET action='extras', sort='3' WHERE `what`='reflinks' LIMIT 1";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('stats',NULL,'Statistiken',4,'Y','N')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('stats','stats2','Framekiller-Mails',2,'Y','N')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('extras',NULL,'Extras',5,'Y','N')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('rals',NULL,'Rallyes',6,'Y','N')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('account',NULL,'Ihr Account',7,'Y','N')";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET action='stats', sort='1', title='Klick-Mails' WHERE `what`='stats' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET action='extras', sort='3' WHERE `what`='reflinks' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett umgebaut.";
                break;
 
        case "0.3.6": // SQL queries for v0.3.6
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett umgebaut.";
                break;
 
        case "0.3.6": // SQL queries for v0.3.6

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD salt_length TINYINT(3) UNSIGNED NOT NULL DEFAULT '9'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD pass_scramble VARCHAR(255) NOT NULL DEFAULT ''";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` MODIFY password VARCHAR(255) NOT NULL DEFAULT ''";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` MODIFY user_hash VARCHAR(255) NOT NULL DEFAULT ''";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admins` MODIFY password VARCHAR(255) NOT NULL DEFAULT ''";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD rand_no BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD file_hash VARCHAR(255) NOT NULL DEFAULT ''";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD master_salt VARCHAR(255) NOT NULL DEFAULT ''";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_config` SET rand_no=(ROUND(RAND() * 99999) + 100000) WHERE config=0 LIMIT 1";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_mod_reg` ADD has_menu ENUM('Y','N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_mod_reg` SET has_menu='Y' WHERE module='admin' OR module='index' OR module='login' LIMIT 3";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD salt_length TINYINT(3) UNSIGNED NOT NULL DEFAULT '9'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD pass_scramble VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` MODIFY password VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` MODIFY user_hash VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admins` MODIFY password VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD rand_no BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD file_hash VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD master_salt VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_config` SET rand_no=(ROUND(RAND() * 99999) + 100000) WHERE config=0 LIMIT 1";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_mod_reg` ADD has_menu ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET has_menu='Y' WHERE module='admin' OR module='index' OR module='login' LIMIT 3";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Passwort-System mit Zufallshash erweitert (Schutzt gegen Dictionary-Attacks!)";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Passwort-System mit Zufallshash erweitert (Schutzt gegen Dictionary-Attacks!)";


@@ -503,84 +503,84 @@ PRIMARY KEY (id)
                break;
 
        case "0.3.8": // SQL queries for v0.3.8
                break;
 
        case "0.3.8": // SQL queries for v0.3.8

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admin_menu` CHANGE descr descr MEDIUMTEXT NULL";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_pool` CHANGE `text` `text` LONGTEXT NOT NULL";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admin_menu` CHANGE descr descr MEDIUMTEXT NULL";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_pool` CHANGE `text` `text` LONGTEXT NOT NULL";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Beschreibungstexte f&uuml;r Admin-Men&uuml;s k&ouml;nnen l&auml;nger sein. Diverse Fixes.";
                break;
 
        case "0.3.9": // SQL queries for v0.3.9
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Beschreibungstexte f&uuml;r Admin-Men&uuml;s k&ouml;nnen l&auml;nger sein. Diverse Fixes.";
                break;
 
        case "0.3.9": // SQL queries for v0.3.9

-               $SQLs[] = "UPDATE  `{!MYSQL_PREFIX!}_admin_menu` SET title = REPLACE(title, '--POINTS--','!POINTS!') WHERE title LIKE '%--POINTS--%'";
-               $SQLs[] = "UPDATE  `{!MYSQL_PREFIX!}_admin_menu` SET descr = REPLACE(descr, '--POINTS--','!POINTS!') WHERE descr LIKE '%--POINTS--%'";
-               $SQLs[] = "UPDATE  `{!MYSQL_PREFIX!}_guest_menu` SET title = REPLACE(title, '--POINTS--','!POINTS!') WHERE title LIKE '%--POINTS--%'";
-               $SQLs[] = "UPDATE  `{!MYSQL_PREFIX!}_member_menu` SET title = REPLACE(title, '--POINTS--','!POINTS!') WHERE title LIKE '%--POINTS--%'";
+               $SQLs[] = "UPDATE  `{!_MYSQL_PREFIX!}_admin_menu` SET title = REPLACE(title, '--POINTS--','!POINTS!') WHERE title LIKE '%--POINTS--%'";
+               $SQLs[] = "UPDATE  `{!_MYSQL_PREFIX!}_admin_menu` SET descr = REPLACE(descr, '--POINTS--','!POINTS!') WHERE descr LIKE '%--POINTS--%'";
+               $SQLs[] = "UPDATE  `{!_MYSQL_PREFIX!}_guest_menu` SET title = REPLACE(title, '--POINTS--','!POINTS!') WHERE title LIKE '%--POINTS--%'";
+               $SQLs[] = "UPDATE  `{!_MYSQL_PREFIX!}_member_menu` SET title = REPLACE(title, '--POINTS--','!POINTS!') WHERE title LIKE '%--POINTS--%'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Beschreibungstexte f&uuml;r Admin-Men&uuml;s k&ouml;nnen l&auml;nger sein. Diverse Fixes.";
                break;
 
        case "0.4.0": // SQL queries for v0.4.0
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Beschreibungstexte f&uuml;r Admin-Men&uuml;s k&ouml;nnen l&auml;nger sein. Diverse Fixes.";
                break;
 
        case "0.4.0": // SQL queries for v0.4.0

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET title = 'Email-Management' WHERE action = 'email' AND (`what`='' OR what IS NULL) LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET title = 'Email-Management' WHERE action = 'email' AND (`what`='' OR `what` IS NULL) LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Email-Verwaltung nach Email-Management umbenannt.";
                break;
 
        case "0.4.1": // SQL queries for v0.4.1
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Email-Verwaltung nach Email-Management umbenannt.";
                break;
 
        case "0.4.1": // SQL queries for v0.4.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` DROP INDEX `status` , ADD INDEX `status` ( `status` , `max_mails` )";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `show_timings` ENUM ('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP INDEX `status` , ADD INDEX `status` ( `status` , `max_mails` )";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `show_timings` ENUM ('Y','N') NOT NULL DEFAULT 'Y'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Tabellen-Schl&uuml;ssel neu gesetzt und Parsing-Zeit im Footer eingeblendet.";
                break;
 
        case "0.4.2": // SQL queries for v0.4.2
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Tabellen-Schl&uuml;ssel neu gesetzt und Parsing-Zeit im Footer eingeblendet.";
                break;
 
        case "0.4.2": // SQL queries for v0.4.2

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_online` ADD INDEX `admin_member` (`is_admin`,`is_member`)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_online` ADD INDEX `admin_member` (`is_admin`,`is_member`)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Neuen Schl&uuml;ssel zur Online-Tabelle hinzugef&uuml;gt.";
                break;
 
        case "0.4.3": // SQL queries for v0.4.3
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Neuen Schl&uuml;ssel zur Online-Tabelle hinzugef&uuml;gt.";
                break;
 
        case "0.4.3": // SQL queries for v0.4.3

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `proxy_host` VARCHAR(255) NOT NULL DEFAULT ''";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `proxy_port` INT(5) UNSIGNED NOT NULL DEFAULT 0";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `proxy_username` VARCHAR(255) NOT NULL DEFAULT ''";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `proxy_password` VARCHAR(255) NOT NULL DEFAULT ''";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_proxy','Proxy-Einstellungen','Sollte Ihr Webserver sich hinter einem Proxy befinden, so k&ouml;nnen Sie hier MXChange so konfigurieren, dass es Updates durch diesen hindurch sucht!', 15)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `proxy_host` VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `proxy_port` INT(5) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `proxy_username` VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `proxy_password` VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_proxy','Proxy-Einstellungen','Sollte Ihr Webserver sich hinter einem Proxy befinden, so k&ouml;nnen Sie hier MXChange so konfigurieren, dass es Updates durch diesen hindurch sucht!', 15)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Proxy-Einstellungen hinzugef&uuml;gt.";
                break;
 
        case "0.4.4": // SQL queries for v0.4.4
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Proxy-Einstellungen hinzugef&uuml;gt.";
                break;
 
        case "0.4.4": // SQL queries for v0.4.4

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admin_menu` CHANGE `what` `what` VARCHAR(255) NULL DEFAULT NULL";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_guest_menu` CHANGE `what` `what` VARCHAR(255) NULL DEFAULT NULL";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_member_menu` CHANGE `what` `what` VARCHAR(255) NULL DEFAULT NULL";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET `what`=NULL WHERE `what`=''";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET `what`=NULL WHERE `what`=''";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET `what`=NULL WHERE `what`=''";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_admin_menu` DROP INDEX `what`, ADD UNIQUE (`what`)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_guest_menu` DROP INDEX `what`, ADD UNIQUE (`what`)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_member_menu` ADD INDEX `action` (`action`)";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_member_menu` DROP INDEX `what`, ADD UNIQUE (`what`)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admin_menu` CHANGE `what` `what` VARCHAR(255) NULL DEFAULT NULL";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_guest_menu` CHANGE `what` `what` VARCHAR(255) NULL DEFAULT NULL";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_member_menu` CHANGE `what` `what` VARCHAR(255) NULL DEFAULT NULL";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET `what`=NULL WHERE `what`=''";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `what`=NULL WHERE `what`=''";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `what`=NULL WHERE `what`=''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_admin_menu` DROP INDEX `what`, ADD UNIQUE (`what`)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_guest_menu` DROP INDEX `what`, ADD UNIQUE (`what`)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_member_menu` ADD INDEX `action` (`action`)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_member_menu` DROP INDEX `what`, ADD UNIQUE (`what`)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Schl&uuml;ssel in Admin-, Gast- und Mitgliedsmen&uuml; verbessert.";
                break;
 
        case "0.4.5": // SQL queries for v0.4.5
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Schl&uuml;ssel in Admin-, Gast- und Mitgliedsmen&uuml; verbessert.";
                break;
 
        case "0.4.5": // SQL queries for v0.4.5

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD last_month CHAR(2) NOT NULL DEFAULT '00'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD last_week CHAR(2) NOT NULL DEFAULT '00'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD last_month CHAR(2) NOT NULL DEFAULT '00'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD last_week CHAR(2) NOT NULL DEFAULT '00'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "T&auml;glichen/w&ouml;chentlichen/monatlichen Reset verbessert.";
                break;
 
        case "0.4.6": // SQL queries for v0.4.6
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "T&auml;glichen/w&ouml;chentlichen/monatlichen Reset verbessert.";
                break;
 
        case "0.4.6": // SQL queries for v0.4.6

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD gender ENUM ('M','F') NOT NULL DEFAULT 'M'";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_user_data` SET gender=sex WHERE sex != 'M'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` DROP sex";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD gender ENUM ('M','F') NOT NULL DEFAULT 'M'";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_user_data` SET gender=sex WHERE sex != 'M'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP sex";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Offensives Wort &quot;Sex&quot; gegen &quot;Gender&quot; ausgetauscht.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Offensives Wort &quot;Sex&quot; gegen &quot;Gender&quot; ausgetauscht.";


@@ -592,53 +592,53 @@ PRIMARY KEY (id)
                break;
 
        case "0.4.8": // SQL queries for v0.4.8
                break;
 
        case "0.4.8": // SQL queries for v0.4.8

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_task_system` ADD INDEX (subject)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_task_system` ADD INDEX (subject)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Index f&uuml;r Betreff eingef&uuml;gt.";
                break;
 
        case "0.4.9": // SQL queries for v0.4.9
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Index f&uuml;r Betreff eingef&uuml;gt.";
                break;
 
        case "0.4.9": // SQL queries for v0.4.9

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` CHANGE `user_hash` `user_hash` VARCHAR(255) NULL DEFAULT NULL";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_user_data` SET user_hash=NULL WHERE user_hash IS NOT NULL AND status='CONFIRMED'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD UNIQUE (`user_hash`)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` CHANGE `user_hash` `user_hash` VARCHAR(255) NULL DEFAULT NULL";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_user_data` SET user_hash=NULL WHERE user_hash IS NOT NULL AND status='CONFIRMED'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD UNIQUE (`user_hash`)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "User-Hash zum Best&auml;tigen wird auf NULL gesetzt, wenn Account best&auml;tigt wird.";
                break;
 
        case "0.5.0": // SQL queries for v0.5.0
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "User-Hash zum Best&auml;tigen wird auf NULL gesetzt, wenn Account best&auml;tigt wird.";
                break;
 
        case "0.5.0": // SQL queries for v0.5.0

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_refsystem` DROP INDEX `level`";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_refsystem` DROP INDEX `userid`, ADD UNIQUE `userid_level` (`userid`,`level`)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_refsystem` DROP INDEX `level`";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_refsystem` DROP INDEX `userid`, ADD UNIQUE `userid_level` (`userid`,`level`)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Referal-System unterst&uuml;tzt nun detailierte Referal-&Uuml;bersicht und vieles mehr.";
                break;
 
        case "0.5.1": // SQL queries for v0.5.1
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Referal-System unterst&uuml;tzt nun detailierte Referal-&Uuml;bersicht und vieles mehr.";
                break;
 
        case "0.5.1": // SQL queries for v0.5.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_member_menu` DROP `descr`";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_member_menu` DROP `descr`";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Beschreibungsspalte von Mitgliedsmen&uuml; entfernt, welche ohnehin nicht genutzt wird.";
                break;
 
        case "0.5.2": // SQL queries for v0.5.2
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Beschreibungsspalte von Mitgliedsmen&uuml; entfernt, welche ohnehin nicht genutzt wird.";
                break;
 
        case "0.5.2": // SQL queries for v0.5.2

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_refdepths` CHANGE `percents` `percents` FLOAT(8,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_refdepths` CHANGE `percents` `percents` FLOAT(8,5) UNSIGNED NOT NULL DEFAULT 0.00000";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Prozents&aum;tze k&ouml;nnen nun f&uuml;nf Stelle hinter dem Komma sein.";
                break;
 
        case "0.5.3": // SQL queries for v0.5.3
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Prozents&aum;tze k&ouml;nnen nun f&uuml;nf Stelle hinter dem Komma sein.";
                break;
 
        case "0.5.3": // SQL queries for v0.5.3

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD session_save_path VARCHAR(255) NOT NULL DEFAULT ''";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_session','Session-Einstellungen','&Auml;ndern Sie hier den Speicherpfad f&uuml;r Sessiondateien (Sitzungsdateien) ab, falls die Standart-Einstellung bei Ihrem Hoster zu Problem f&uuml;hren sollte.', 16)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD session_save_path VARCHAR(255) NOT NULL DEFAULT ''";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_session','Session-Einstellungen','&Auml;ndern Sie hier den Speicherpfad f&uuml;r Sessiondateien (Sitzungsdateien) ab, falls die Standart-Einstellung bei Ihrem Hoster zu Problem f&uuml;hren sollte.', 16)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Session-Speicherpfad konfigurierbar. Beispielsweise ist dies bei all-inkl.com n&ouml;tig.";
                break;
 
        case "0.5.4": // SQL queries for v0.5.4
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Session-Speicherpfad konfigurierbar. Beispielsweise ist dies bei all-inkl.com n&ouml;tig.";
                break;
 
        case "0.5.4": // SQL queries for v0.5.4

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','reflist','Ref-&Uuml;bersicht',5,'Y','N')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','reflist','Ref-&Uuml;bersicht',5,'Y','N')";

 
                // Depends on refback extension
                $EXT_UPDATE_DEPENDS = "refback";
 
                // Depends on refback extension
                $EXT_UPDATE_DEPENDS = "refback";


@@ -648,15 +648,15 @@ PRIMARY KEY (id)
                break;
 
        case "0.5.5": // SQL queries for v0.5.5
                break;
 
        case "0.5.5": // SQL queries for v0.5.5

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD show_points_unconfirmed ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD show_points_unconfirmed ENUM('Y','N') NOT NULL DEFAULT 'Y'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Anzeige der {!POINTS!} unter den unbest&auml;tigten Mails kann nun optional abgeschaltet werden.";
                break;
 
        case "0.5.6": // SQL queries for v0.5.6
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Anzeige der {!POINTS!} unter den unbest&auml;tigten Mails kann nun optional abgeschaltet werden.";
                break;
 
        case "0.5.6": // SQL queries for v0.5.6

-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_stats_data`";
-               $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_user_stats_data` (
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_stats_data`";
+               $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_user_stats_data` (

 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `stats_type` VARCHAR(255) NOT NULL DEFAULT 'unknown',
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `stats_type` VARCHAR(255) NOT NULL DEFAULT 'unknown',


@@ -672,47 +672,47 @@ INDEX (`stats_type`)
                break;
 
        case "0.5.7": // SQL queries for v0.5.7
                break;
 
        case "0.5.7": // SQL queries for v0.5.7

-               $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='list_norefs' LIMIT 1";
+               $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='list_norefs' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Auflistung der Mitglieder ohne Werber nach what=list_user&amp;mode=norefs verschoben.";
                break;
 
        case "0.5.8": // SQL queries for v0.5.8
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Auflistung der Mitglieder ohne Werber nach what=list_user&amp;mode=norefs verschoben.";
                break;
 
        case "0.5.8": // SQL queries for v0.5.8

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_extensions` DROP `ext_lang_file`";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_extensions` DROP `ext_lang_file`";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Sprachdateinamen werden nicht mehr in der Datenbank behalten.";
                break;
 
        case "0.5.9": // SQL queries for v0.5.9
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Sprachdateinamen werden nicht mehr in der Datenbank behalten.";
                break;
 
        case "0.5.9": // SQL queries for v0.5.9

-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_filters`";
-               $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_filters` (
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_filters`";
+               $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_filters` (

 `filter_id` BIGINT(20) UNSIGNED AUTO_INCREMENT,
 `filter_name` VARCHAR(255) NOT NULL DEFAULT '',
 `filter_function` VARCHAR(255) NOT NULL DEFAULT '',
 `filter_active` ENUM('N','Y') NOT NULL DEFAULT 'Y',
 PRIMARY KEY (`filter_id`)
 ) TYPE=MyISAM COMMENT='Filter system'";
 `filter_id` BIGINT(20) UNSIGNED AUTO_INCREMENT,
 `filter_name` VARCHAR(255) NOT NULL DEFAULT '',
 `filter_function` VARCHAR(255) NOT NULL DEFAULT '',
 `filter_active` ENUM('N','Y') NOT NULL DEFAULT 'Y',
 PRIMARY KEY (`filter_id`)
 ) TYPE=MyISAM COMMENT='Filter system'";

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','list_filter','Filter-Management', 'Zeigt alle im System registrierten Filter an und l&auml;sst diese de- bzw. wieder aktivieren.', 17)";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','list_filter','Filter-Management', 'Zeigt alle im System registrierten Filter an und l&auml;sst diese de- bzw. wieder aktivieren.', 17)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Tabellen f&uuml;r Filter-System hinzugef&uuml;gt.";
                break;
 
        case "0.6.0": // SQL queries for v0.6.0
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Tabellen f&uuml;r Filter-System hinzugef&uuml;gt.";
                break;
 
        case "0.6.0": // SQL queries for v0.6.0

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_filters` ADD `filter_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `update_filter_usage` ENUM('N','Y') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_filters` ADD `filter_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `update_filter_usage` ENUM('N','Y') NOT NULL DEFAULT 'N'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Benutzungsstatistik eingebaut. Das Z&auml;hlen der Filterverwendungen sollte <strong>ausschliesslich</strong> zu Debugging-Zwecken eingesetzt werden.";
                break;
 
        case "0.6.1": // SQL queries for v0.6.1
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Benutzungsstatistik eingebaut. Das Z&auml;hlen der Filterverwendungen sollte <strong>ausschliesslich</strong> zu Debugging-Zwecken eingesetzt werden.";
                break;
 
        case "0.6.1": // SQL queries for v0.6.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` DROP login_failtures";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` DROP last_failture";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD login_failures BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD last_failure TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP login_failtures";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP last_failture";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD login_failures BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD last_failure TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Falsche Schreibweise korregiert.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Falsche Schreibweise korregiert.";

diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php
index 6b596810eede1bd7a6913caf76379f4c298f41c0..f8a31f8729f0ad18c96001bded9a5c80f1da18e9 100644 (file)
--- a/inc/extensions/ext-surfbar.php
+++ b/inc/extensions/ext-surfbar.php
@@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run (surfbar URLs)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run (surfbar URLs)

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_surfbar_urls`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_surfbar_urls` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_urls`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_surfbar_urls` (

 `id` BIGINT(20) UNSIGNED  NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `url` VARCHAR(255) NOT NULL DEFAULT '',
 `id` BIGINT(20) UNSIGNED  NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `url` VARCHAR(255) NOT NULL DEFAULT '',


@@ -71,8 +71,8 @@ INDEX `status_userid` (`status`,`userid`)
 ) TYPE=MyISAM COMMENT='Surfbar URLs'";
 
        // Reload locks
 ) TYPE=MyISAM COMMENT='Surfbar URLs'";
 
        // Reload locks

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_surfbar_locks`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_surfbar_locks` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_locks`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_surfbar_locks` (

 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `url_id` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `url_id` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,


@@ -83,8 +83,8 @@ INDEX (`url_id`)
 ) TYPE=MyISAM COMMENT='Surfbar reload locks'";
 
        // Surfbar salts
 ) TYPE=MyISAM COMMENT='Surfbar reload locks'";
 
        // Surfbar salts

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_surfbar_salts`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_surfbar_salts` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_salts`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_surfbar_salts` (

 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `url_id` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,
 `url_id` BIGINT(20) UNSIGNED  NOT NULL DEFAULT 0,


@@ -95,8 +95,8 @@ INDEX (`url_id`)
 ) TYPE=MyISAM COMMENT='Surfbar last used salts'";
 
        // Statistics
 ) TYPE=MyISAM COMMENT='Surfbar last used salts'";
 
        // Statistics

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_surfbar_stats`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_surfbar_stats` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_stats`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_surfbar_stats` (

 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `url_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `url_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -108,8 +108,8 @@ INDEX (`url_id`)
 ) TYPE=MyISAM COMMENT='Surfbar Statistics'";
 
        // Member actions pending on status
 ) TYPE=MyISAM COMMENT='Surfbar Statistics'";
 
        // Member actions pending on status

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_surfbar_actions`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_surfbar_actions` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_actions`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_surfbar_actions` (

 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `status` ENUM('PENDING','ACTIVE','LOCKED','STOPPED','REJECTED','DELETED','MIGRATED','DEPLETED') NULL DEFAULT NULL,
 `action` ENUM('EDIT','DELETE','PAUSE','UNPAUSE','FRAMETEST','RETREAT','RESUBMIT','BOOKNOW') NULL DEFAULT NULL,
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `status` ENUM('PENDING','ACTIVE','LOCKED','STOPPED','REJECTED','DELETED','MIGRATED','DEPLETED') NULL DEFAULT NULL,
 `action` ENUM('EDIT','DELETE','PAUSE','UNPAUSE','FRAMETEST','RETREAT','RESUBMIT','BOOKNOW') NULL DEFAULT NULL,


@@ -119,76 +119,76 @@ UNIQUE KEY `status_action` (`status`,`action`)
 ) TYPE=MyISAM COMMENT='Surfbar Member Actions'";
 
        // Member actions
 ) TYPE=MyISAM COMMENT='Surfbar Member Actions'";
 
        // Member actions

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('PENDING','RETREAT','DELETED')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('PENDING','FRAMETEST',NULL)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('PENDING','EDIT',NULL)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('ACTIVE','EDIT','PENDING')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('ACTIVE','DELETE','DELETED')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('ACTIVE','PAUSE','STOPPED')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('ACTIVE','FRAMETEST',NULL)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('LOCKED','DELETE','DELETED')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('LOCKED','FRAMETEST',NULL)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('LOCKED','RESUBMIT','PENDING')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('STOPPED','EDIT','PENDING')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('STOPPED','DELETE','DELETED')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('STOPPED','UNPAUSE','PENDING')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('DEPLETED','EDIT','PENDING')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('DEPLETED','DELETE','DELETED')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('REJECTED','EDIT','PENDING')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('REJECTED','DELETE','DELETED')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('REJECTED','FRAMETEST',NULL)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('REJECTED','RESUBMIT','PENDING')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','EDIT','MIGRATED')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','DELETE','DELETED')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','FRAMETEST',NULL)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','BOOKNOW','PENDING')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('PENDING','RETREAT','DELETED')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('PENDING','FRAMETEST',NULL)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('PENDING','EDIT',NULL)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('ACTIVE','EDIT','PENDING')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('ACTIVE','DELETE','DELETED')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('ACTIVE','PAUSE','STOPPED')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('ACTIVE','FRAMETEST',NULL)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('LOCKED','DELETE','DELETED')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('LOCKED','FRAMETEST',NULL)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('LOCKED','RESUBMIT','PENDING')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('STOPPED','EDIT','PENDING')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('STOPPED','DELETE','DELETED')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('STOPPED','UNPAUSE','PENDING')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('DEPLETED','EDIT','PENDING')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('DEPLETED','DELETE','DELETED')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('REJECTED','EDIT','PENDING')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('REJECTED','DELETE','DELETED')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('REJECTED','FRAMETEST',NULL)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('REJECTED','RESUBMIT','PENDING')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','EDIT','MIGRATED')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','DELETE','DELETED')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','FRAMETEST',NULL)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','BOOKNOW','PENDING')";

 
        // Config entries
 
        // Config entries

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_pay_model` ENUM('STATIC','DYNAMIC') NOT NULL DEFAULT 'STATIC'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_static_reward` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.25000";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_static_costs` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 1.00000";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_static_time` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 60";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_static_lock` SMALLINT(6) UNSIGNED NOT NULL DEFAULT ".(60*5)."";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_dynamic_percent` FLOAT(10,5) UNSIGNED NOT NULL DEFAULT 10.00000";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_max_order` INT(7) UNSIGNED NOT NULL DEFAULT 10";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_restart_time` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(60*6)."";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_autostart` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_migrate_urls` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_total_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_daily_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_yester_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_weekly_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_monthly_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_stats_reload` BIGINT(20) UNSIGNED NOT NULL DEFAULT 30";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_purge_deleted` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day')*7)."";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_purge_migrated` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day')*3)."";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_pause_mode` ENUM('INTERNAL','EXERNAL') NOT NULL DEFAULT 'INTERNAL'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_pause_url` VARCHAR(255) NOT NULL DEFAULT ''";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_notify_limits` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_notify_admin_unlock` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_warn_low_points` BIGINT(20) UNSIGNED NOT NULL DEFAULT 100";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_low_interval` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".getConfig('one_day')."";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_migrate_order` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `surfbar_notification_mode` ENUM('INSTANT','RESET') NOT NULL DEFAULT 'INSTANT'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_pay_model` ENUM('STATIC','DYNAMIC') NOT NULL DEFAULT 'STATIC'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_static_reward` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.25000";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_static_costs` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 1.00000";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_static_time` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 60";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_static_lock` SMALLINT(6) UNSIGNED NOT NULL DEFAULT ".(60*5)."";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_dynamic_percent` FLOAT(10,5) UNSIGNED NOT NULL DEFAULT 10.00000";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_max_order` INT(7) UNSIGNED NOT NULL DEFAULT 10";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_restart_time` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(60*6)."";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_autostart` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_migrate_urls` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_total_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_daily_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_yester_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_weekly_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_monthly_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_stats_reload` BIGINT(20) UNSIGNED NOT NULL DEFAULT 30";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_purge_deleted` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day')*7)."";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_purge_migrated` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day')*3)."";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_pause_mode` ENUM('INTERNAL','EXERNAL') NOT NULL DEFAULT 'INTERNAL'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_pause_url` VARCHAR(255) NOT NULL DEFAULT ''";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_notify_limits` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_notify_admin_unlock` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_warn_low_points` BIGINT(20) UNSIGNED NOT NULL DEFAULT 100";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_low_interval` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".getConfig('one_day')."";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_migrate_order` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `surfbar_notification_mode` ENUM('INSTANT','RESET') NOT NULL DEFAULT 'INSTANT'";

 
        // Extend user data
 
        // Extend user data

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD `surfbar_low_notified` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD `surfbar_low_notified` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00'";

 
        // Member menus
 
        // Member menus

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('surfbar',NULL,'Surfbar','Y','Y',4)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('surfbar','surfbar_start','Surfbar starten','Y','Y',1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('surfbar','surfbar_book','URL buchen','Y','Y',2)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('surfbar','surfbar_list','URL-Verwaltung','Y','Y',3)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('surfbar','surfbar_stats','URL-Statistiken','Y','Y',4)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('surfbar',NULL,'Surfbar','Y','Y',4)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('surfbar','surfbar_start','Surfbar starten','Y','Y',1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('surfbar','surfbar_book','URL buchen','Y','Y',2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('surfbar','surfbar_list','URL-Verwaltung','Y','Y',3)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('surfbar','surfbar_stats','URL-Statistiken','Y','Y',4)";

 
        // Admin menus
 
        // Admin menus

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('surfbar',NULL,'Surfbar','URLs in der Surfbar verwalten, Einstellungen ändern und vieles mehr.',7)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('surfbar','add_surfbar_url','URL hinzuf&uuml;gen','F&uuml;gen Sie URLs z.B. von Werbenetzwerken hinzu, oder Ihre eigenen Projekte. <strong>Vorsicht!</strong> Ihnen muss es auch gestattet sein, URLs aus dem Werbenetzwerk in die Surfbar einzuf&uuml;gen.',1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('surfbar','list_surfbar_urls','URLs verwalten','Verwalten Sie hier alle in der Surfbar befindlichen URLs mit nur wenigen Klicks.',2)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('surfbar','unlock_surfbar_urls','Wartende URLs freigeben','Geben Sie hier nur direkt in der Surfbar gebuchte URLs frei.',3)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('surfbar','config_surfbar','Einstellungen','Einstellungen an der Surfbar &auml;ndern, wie Festverg&uuml;tung, prozentuale Ref-Verg&uuml;tung und vieles mehr.',4)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('surfbar','surfbar_stats','Statistiken','Detailierte Statistiken zu einer ausgew&auml;hlten URL anzeigen.',5)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('surfbar','list_surfbar_actions','Mitgliederaktionen','Listet alle Mitgliederaktionen auf.',6)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('surfbar',NULL,'Surfbar','URLs in der Surfbar verwalten, Einstellungen &auml;ndern und vieles mehr.',7)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('surfbar','add_surfbar_url','URL hinzuf&uuml;gen','F&uuml;gen Sie URLs z.B. von Werbenetzwerken hinzu, oder Ihre eigenen Projekte. <strong>Vorsicht!</strong> Ihnen muss es auch gestattet sein, URLs aus dem Werbenetzwerk in die Surfbar einzuf&uuml;gen.',1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('surfbar','list_surfbar_urls','URLs verwalten','Verwalten Sie hier alle in der Surfbar befindlichen URLs mit nur wenigen Klicks.',2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('surfbar','unlock_surfbar_urls','Wartende URLs freigeben','Geben Sie hier nur direkt in der Surfbar gebuchte URLs frei.',3)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('surfbar','config_surfbar','Einstellungen','Einstellungen an der Surfbar &auml;ndern, wie Festverg&uuml;tung, prozentuale Ref-Verg&uuml;tung und vieles mehr.',4)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('surfbar','surfbar_stats','Statistiken','Detailierte Statistiken zu einer ausgew&auml;hlten URL anzeigen.',5)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('surfbar','list_surfbar_actions','Mitgliederaktionen','Listet alle Mitgliederaktionen auf.',6)";

 
        // Load CSS?
        $EXT_CSS = "Y";
 
        // Load CSS?
        $EXT_CSS = "Y";


@@ -196,25 +196,25 @@ UNIQUE KEY `status_action` (`status`,`action`)
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_surfbar_actions`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_surfbar_locks`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_surfbar_salts`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_surfbar_stats`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_surfbar_urls`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE `action`='surfbar' LIMIT 5";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE `action`='surfbar' LIMIT 7";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_actions`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_locks`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_salts`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_stats`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_urls`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `action`='surfbar' LIMIT 5";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='surfbar' LIMIT 7";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE `action`='surfbar' LIMIT 5";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_mod_reg` SET locked='N', hidden='N', admin_only='N', mem_only='Y' WHERE module='surfbar' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE `action`='surfbar' LIMIT 5";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='N', hidden='N', admin_only='N', mem_only='Y' WHERE module='surfbar' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='N', `locked`='Y' WHERE `action` = 'surfbar' LIMIT 5";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_mod_reg` SET locked='Y' WHERE module='surfbar' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE `action` = 'surfbar' LIMIT 5";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='Y' WHERE module='surfbar' LIMIT 1";

        break;
 
 case "update": // Update an extension
        break;
 
 case "update": // Update an extension

diff --git a/inc/extensions/ext-task.php b/inc/extensions/ext-task.php
index 618f4966344926b3d3436b4e9bc46af442e22fc2..0c718ad2388f0d5a5e8e2928a68db54f8e6ef064 100644 (file)
--- a/inc/extensions/ext-task.php
+++ b/inc/extensions/ext-task.php
@@ -50,9 +50,9 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('task', NULL, 'Aufgaben-Management','1','Erweitertes Aufgaben-Management zur leichten verwaltung der vom System erzeugten Aufgaben.')";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('task','list_task','Aufgaben auflisten','1','Alle Ihnen zugewiesenen Aufgaben auflisten (keine Updates).')";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_task_system` SET status='SOLVED' WHERE status='CLOSED'";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('task', NULL, 'Aufgaben-Management','1','Erweitertes Aufgaben-Management zur leichten verwaltung der vom System erzeugten Aufgaben.')";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`, `what`, `title`, `sort`, `descr`) VALUES ('task','list_task','Aufgaben auflisten','1','Alle Ihnen zugewiesenen Aufgaben auflisten (keine Updates).')";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_task_system` SET status='SOLVED' WHERE status='CLOSED'";

 
        // Enable CSS file?
        $EXT_CSS = "Y";
 
        // Enable CSS file?
        $EXT_CSS = "Y";


@@ -60,7 +60,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='task' LIMIT 2";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='task' LIMIT 2";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension


@@ -77,7 +77,7 @@ case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.1
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.1

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_extensions` SET ext_has_css='Y' WHERE ext_name='task' AND ext_has_css='N' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_has_css='Y' WHERE ext_name='task' AND ext_has_css='N' LIMIT 1";

 
                // This update depends on sql_patches update!
                $EXT_UPDATE_DEPENDS = "sql_patches";
 
                // This update depends on sql_patches update!
                $EXT_UPDATE_DEPENDS = "sql_patches";

diff --git a/inc/extensions/ext-theme.php b/inc/extensions/ext-theme.php
index 08ead8333d6744d6d76b69b3ed10a76c8775b523..15610a5b73e49975d54e76a21e69547f9e647d67 100644 (file)
--- a/inc/extensions/ext-theme.php
+++ b/inc/extensions/ext-theme.php
@@ -54,16 +54,16 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // Drop theme table
 
 case "remove": // Do stuff when removing extension
        // Drop theme table

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_themes`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_themes`";

 
        // Delete admin menu
 
        // Delete admin menu

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE `action`='theme' LIMIT 4";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='theme' LIMIT 4";

 
        // Delete guest menu entries
 
        // Delete guest menu entries

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE action='themes' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE action='themes' LIMIT 1";

 
        // Delete member menu entries
 
        // Delete member menu entries

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE action='themes' OR `what`='themes' LIMIT 2";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE action='themes' OR `what`='themes' LIMIT 2";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension


@@ -116,8 +116,8 @@ case "update": // Update an extension
 
        case "0.0.8": // SQL queries for v0.0.8
                // Theme table
 
        case "0.0.8": // SQL queries for v0.0.8
                // Theme table

-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_themes`";
-               $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_themes` (
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_themes`";
+               $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_themes` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 theme_path VARCHAR(255) NOT NULL DEFAULT '',
 theme_name VARCHAR(255) NOT NULL DEFAULT '',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 theme_path VARCHAR(255) NOT NULL DEFAULT '',
 theme_name VARCHAR(255) NOT NULL DEFAULT '',


@@ -129,22 +129,22 @@ INDEX (`theme_active`)
 ) TYPE=MyISAM COMMENT='Themes'";
 
                // Admin menu
 ) TYPE=MyISAM COMMENT='Themes'";
 
                // Admin menu

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('theme', NULL, 'Themes','Verwalten Sie hier alle Designs (Themes) Ihres Mailtausch-Scriptes.', 8)";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('theme','theme_import','Importieren','Es wird das Verzeichnis "theme" nach neuen Ordnern durchsucht und anschliessend in die Datenbank gesperrt aufgenommen.', 1)";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('theme','theme_edit','Modifizieren','Ändern Sie Titel, Freigaben usw. an den Themes. Sie können bis auf das Standart-Theme "default" auch Themes aus der Datenbank entfernen. Vorher sollten Sie es jedoch vom Server löschen, damit es niht erneut importiert werden kann.', 2)";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('theme','theme_check','Prüfen','Nach neuen Themes suchen bzw. nach Updates zu den Themes suchen.', 3)";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('theme', NULL, 'Themes','Verwalten Sie hier alle Designs (Themes) Ihres Mailtausch-Scriptes.', 8)";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('theme','theme_import','Importieren','Es wird das Verzeichnis "theme" nach neuen Ordnern durchsucht und anschliessend in die Datenbank gesperrt aufgenommen.', 1)";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('theme','theme_edit','Modifizieren','Ändern Sie Titel, Freigaben usw. an den Themes. Sie können bis auf das Standart-Theme "default" auch Themes aus der Datenbank entfernen. Vorher sollten Sie es jedoch vom Server löschen, damit es niht erneut importiert werden kann.', 2)";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('theme','theme_check','Prüfen','Nach neuen Themes suchen bzw. nach Updates zu den Themes suchen.', 3)";

 
                // Guest menu
 
                // Guest menu

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('themes',NULL,'Design-Auswahl',4,'Y','N')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('themes',NULL,'Design-Auswahl',4,'Y','N')";

 
                // Memember menu
 
                // Memember menu

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('themes',NULL,'Design-Auswahl',3,'Y','N')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','themes','Designs', 6,'Y','N')";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET sort='8' WHERE action='themes' LIMIT 1";
-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET action='account', sort='1', title='Designs' WHERE `what`='themes' LIMIT 1";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('themes',NULL,'Design-Auswahl',3,'Y','N')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','themes','Designs', 6,'Y','N')";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET sort='8' WHERE action='themes' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET action='account', sort='1', title='Designs' WHERE `what`='themes' LIMIT 1";

 
                // User data
 
                // User data

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD curr_theme VARCHAR(255) NOT NULL DEFAULT 'default'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD curr_theme VARCHAR(255) NOT NULL DEFAULT 'default'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Update von <u>sql_patches</u> &uuml;bertragen. (Kann Fehlermeldungen verursacht haben!)";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Update von <u>sql_patches</u> &uuml;bertragen. (Kann Fehlermeldungen verursacht haben!)";

diff --git a/inc/extensions/ext-top10.php b/inc/extensions/ext-top10.php
index cdb0cf93f14b2e3fb207a273a4befc7904f1fa8b..9acd5d9105ebfc31046b7c865e472aeb81221f99 100644 (file)
--- a/inc/extensions/ext-top10.php
+++ b/inc/extensions/ext-top10.php
@@ -50,9 +50,9 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','top10','TOP-10','Y','Y', 7)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_top10','TOP-10 Listen','Stellen Sie hier ein, wie lang die TOP-Listen sein sollen, also wie viele Plätze angezeigt werden sollen.', 8)";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD top10_max TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','top10','TOP-10','Y','Y', 7)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_top10','TOP-10 Listen','Stellen Sie hier ein, wie lang die TOP-Listen sein sollen, also wie viele Plätze angezeigt werden sollen.', 8)";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD top10_max TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";

 
        // Load CSS file?
        $EXT_CSS = "Y";
 
        // Load CSS file?
        $EXT_CSS = "Y";


@@ -60,18 +60,18 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE what='top10' LIMIT 1";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='config_top10' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE what='top10' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='config_top10' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='Y', locked='N' WHERE what='top10' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='Y', `locked`='N' WHERE what='top10' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='N', locked='Y' WHERE what='top10' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='N', `locked`='Y' WHERE what='top10' LIMIT 1";

        break;
 
 case "update": // Update an extension
        break;
 
 case "update": // Update an extension

diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php
index 5dc29b801040076cf36ec04fcfe1a10276ca3f91..6b89ad4da8405ebd3e0c8506548fd11c3e349dcd 100644 (file)
--- a/inc/extensions/ext-transfer.php
+++ b/inc/extensions/ext-transfer.php
@@ -50,11 +50,11 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_transfers_in`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_transfers_out`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_transfers_in`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_transfers_out`";

 
        // Transfer from a member
 
        // Transfer from a member

-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_user_transfers_in` (
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_user_transfers_in` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 from_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 from_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -68,7 +68,7 @@ PRIMARY KEY(id)
 ) Type=MyISAM";
 
        // Transfers to a member
 ) Type=MyISAM";
 
        // Transfers to a member

-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_user_transfers_out` (
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_user_transfers_out` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 to_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 to_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -82,42 +82,42 @@ PRIMARY KEY(id)
 ) Type=MyISAM";
 
        // Admin menu
 ) Type=MyISAM";
 
        // Admin menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('transfer', NULL, '{!POINTS!}-Transfer','Verwalten Sie hier die {!POINTS!}-Transaktionen zwischen Ihren Mitgliedern.', 7)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('transfer','list_transfer','Auflisten','Hier bekommen Sie alle ein- und ausgehende Transaktionen aufgelistet.', 1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('transfer','config_transfer','Einstellungen','Stellen Sie ein, wie viele Transaktionen aufgelistet werden sollen und wie alt diese werden dürfen. Die evtl. installierte autopurge-Erweiterung kann dann automatisch die veralteten Transktionen löschen.', 2)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('transfer','del_transfer','Manuell löschen','Hier können Sie - abgesehen von der automatischen Löschung - Transaktionen selber löschen. Bitte beachten Sie, dass immer aus- und eingehende Transaktionen gleichzeitig gelöscht werden.', 3)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('transfer', NULL, '{!POINTS!}-Transfer','Verwalten Sie hier die {!POINTS!}-Transaktionen zwischen Ihren Mitgliedern.', 7)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('transfer','list_transfer','Auflisten','Hier bekommen Sie alle ein- und ausgehende Transaktionen aufgelistet.', 1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('transfer','config_transfer','Einstellungen','Stellen Sie ein, wie viele Transaktionen aufgelistet werden sollen und wie alt diese werden dürfen. Die evtl. installierte autopurge-Erweiterung kann dann automatisch die veralteten Transktionen löschen.', 2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('transfer','del_transfer','Manuell löschen','Hier können Sie - abgesehen von der automatischen Löschung - Transaktionen selber löschen. Bitte beachten Sie, dass immer aus- und eingehende Transaktionen gleichzeitig gelöscht werden.', 3)";

 
        // Member menu
 
        // Member menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','transfer','{!POINTS!}-Transfer','Y','Y', 5)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','transfer','{!POINTS!}-Transfer','Y','Y', 5)";

 
        // Add config values
 
        // Add config values

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD transfer_max BIGINT(20) UNSIGNED NOT NULL DEFAULT '50'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD transfer_age BIGINT(20) UNSIGNED NOT NULL DEFAULT '".(getConfig('one_day')*28)."'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD transfer_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT '".getConfig('one_day')."'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD transfer_balance BIGINT(20) UNSIGNED NOT NULL DEFAULT 100";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD transfer_code BIGINT(20) UNSIGNED NOT NULL DEFAULT 5";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD transfer_max BIGINT(20) UNSIGNED NOT NULL DEFAULT '50'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD transfer_age BIGINT(20) UNSIGNED NOT NULL DEFAULT '".(getConfig('one_day')*28)."'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD transfer_timeout BIGINT(20) UNSIGNED NOT NULL DEFAULT '".getConfig('one_day')."'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD transfer_balance BIGINT(20) UNSIGNED NOT NULL DEFAULT 100";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD transfer_code BIGINT(20) UNSIGNED NOT NULL DEFAULT 5";

 
        // Add row(s) to user's data
 
        // Add row(s) to user's data

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD opt_in ENUM('Y','N') NOT NULL DEFAULT 'N'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD opt_in ENUM('Y','N') NOT NULL DEFAULT 'N'";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_transfers_in`";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_transfers_out`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='transfer' LIMIT 4";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE what='transfer' LIMIT 1";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` DROP opt_in";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_transfers_in`";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_transfers_out`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='transfer' LIMIT 4";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE what='transfer' LIMIT 1";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP opt_in";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='transfer' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='transfer' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='transfer' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='transfer' LIMIT 1";

        break;
 
 case "update": // Update an extension
        break;
 
 case "update": // Update an extension


@@ -139,7 +139,7 @@ case "update": // Update an extension
                break;
 
        case "0.0.5": // SQL queries for v0.0.5
                break;
 
        case "0.0.5": // SQL queries for v0.0.5

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD ap_transfer ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD ap_transfer ENUM('Y','N') NOT NULL DEFAULT 'Y'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Link <em>Auflisten</em> im Admin-Bereich hatte das eingeloggte Mitglied und nicht den eingeloggten Admin abgefragt. Automatisches L&ouml;schen von veraltete Eintr&auml;gen kann unabh&auml;ngig von der autopurge-Erweiterung de-/aktiviert werden. Bitte aktualisieren Sie auch die beiden Admin-Templates!";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Link <em>Auflisten</em> im Admin-Bereich hatte das eingeloggte Mitglied und nicht den eingeloggten Admin abgefragt. Automatisches L&ouml;schen von veraltete Eintr&auml;gen kann unabh&auml;ngig von der autopurge-Erweiterung de-/aktiviert werden. Bitte aktualisieren Sie auch die beiden Admin-Templates!";


@@ -231,9 +231,9 @@ case "update": // Update an extension
                break;
 
        case "0.2.3": // SQL queries for v0.2.3
                break;
 
        case "0.2.3": // SQL queries for v0.2.3

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu_las` (la_id, la_action, la_what) VALUES ('member', '', 'list_transfer')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu_las` (la_id, la_action, la_what) VALUES ('member', '', 'del_transfer')";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu_las` (la_id, la_action, la_what) VALUES ('config', '', 'config_transfer')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu_las` (la_id, la_action, la_what) VALUES ('member', '', 'list_transfer')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu_las` (la_id, la_action, la_what) VALUES ('member', '', 'del_transfer')";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu_las` (la_id, la_action, la_what) VALUES ('config', '', 'config_transfer')";

 
                // Depends on sql_patches (or you have to execute these both SQL statements by phpMyAdmin
                $EXT_UPDATE_DEPENDS = "sql_patches";
 
                // Depends on sql_patches (or you have to execute these both SQL statements by phpMyAdmin
                $EXT_UPDATE_DEPENDS = "sql_patches";


@@ -248,7 +248,7 @@ case "update": // Update an extension
                break;
 
        case "0.2.5": // SQL queries for v0.2.5
                break;
 
        case "0.2.5": // SQL queries for v0.2.5

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET action='extras', sort='5' WHERE what='transfer' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET action='extras', sort='5' WHERE what='transfer' LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett ge&auml;ndert.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitgliedsmen&uuml; komplett ge&auml;ndert.";

diff --git a/inc/extensions/ext-usage.php b/inc/extensions/ext-usage.php
index d782e3b99e3b08aeaa96b9cc9b0ae6a4ad68db71..301c92abe894fc230ff20e0a9a364d9fec24856c 100644 (file)
--- a/inc/extensions/ext-usage.php
+++ b/inc/extensions/ext-usage.php
@@ -50,13 +50,13 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('stats','usage','Aufrufstatistik','Erkennt automatisch Ihre Aufrufstatisiken und bindet diese in das Admin-Interface ein. (Derzeit nur Webalizer!)',9)";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `usage_base` VARCHAR(255) NOT NULL DEFAULT 'usage'";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('stats','usage','Aufrufstatistik','Erkennt automatisch Ihre Aufrufstatisiken und bindet diese in das Admin-Interface ein. (Derzeit nur Webalizer!)',9)";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `usage_base` VARCHAR(255) NOT NULL DEFAULT 'usage'";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE what='usage' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE what='usage' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php
index cc7f2a1e61c8a35fa53bf00951812994c9da1157..479ab03e6617a0ffb10c4b39146399edf3084a65 100644 (file)
--- a/inc/extensions/ext-user.php
+++ b/inc/extensions/ext-user.php
@@ -47,16 +47,16 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user',NULL,'Mitglieder-Management','Mitglieder freischalten, sperren, Accounts editieren, Neuanmeldungen verwalten, {!POINTS!} gutschreiben und abziehen und und und...',3)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','del_user','Mitglied löschen','Löschen Sie hier Mitglied, die gegen die AGBs mehrmals verstossen haben. Bitte seien Sie nett zu Ihren Mitgliedern und löschen Sie nicht gleich.',1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','chk_regs','Anmeldungen prüfen','Prüfen Sie hier neue Anmeldungen zu Ihrem System. Hier können Sie im Falle einer Fehler-Mail den Mitglied gleich wieder löschen!',2)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','lock_user','Mitglied sperren / entsperren','Sperren Sie Mitglied, die zu viele unbestätigte Mails haben oder gegen Ihre AGBs verstossen haben über diesen Menüpunkt.',3)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_user','Mitglied auflisten','Listen Sie alle Mitglied oder eingeschränkt nach Suchkritieren Ihre Userdatenbank auf. Sie könen per Klick auf die Usernummer sich Details zum Mitglied ansehen.',4)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','add_points','{!POINTS!} gutschreiben','Buchen Sie einem Mitglied direkt {!POINTS!} auf. Sie können dazu auch einen Kommentar mitsenden.',5)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','edit_user','Account editieren','Daten eines Mitglieder-Accountes ändern.',6)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_refs','Referals anzeigen','Mit diesem Menüpunkt können Sie die generierten Referals eines Mitgliedes auflisten.',7)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_links','Unbestätigte Mails','Mit diesem Menüpunkt können Sie die vom Mitglied nicht bestätigten Mails anzeigen.',8)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_cats','Kategorien anzeigen','Listet die ausgewählten Kategorien eines Mitgliedes auf.',9)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user',NULL,'Mitglieder-Management','Mitglieder freischalten, sperren, Accounts editieren, Neuanmeldungen verwalten, {!POINTS!} gutschreiben und abziehen und und und...',3)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','del_user','Mitglied löschen','Löschen Sie hier Mitglied, die gegen die AGBs mehrmals verstossen haben. Bitte seien Sie nett zu Ihren Mitgliedern und löschen Sie nicht gleich.',1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','chk_regs','Anmeldungen prüfen','Prüfen Sie hier neue Anmeldungen zu Ihrem System. Hier können Sie im Falle einer Fehler-Mail den Mitglied gleich wieder löschen!',2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','lock_user','Mitglied sperren / entsperren','Sperren Sie Mitglied, die zu viele unbestätigte Mails haben oder gegen Ihre AGBs verstossen haben über diesen Menüpunkt.',3)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_user','Mitglied auflisten','Listen Sie alle Mitglied oder eingeschränkt nach Suchkritieren Ihre Userdatenbank auf. Sie könen per Klick auf die Usernummer sich Details zum Mitglied ansehen.',4)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','add_points','{!POINTS!} gutschreiben','Buchen Sie einem Mitglied direkt {!POINTS!} auf. Sie können dazu auch einen Kommentar mitsenden.',5)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','edit_user','Account editieren','Daten eines Mitglieder-Accountes ändern.',6)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_refs','Referals anzeigen','Mit diesem Menüpunkt können Sie die generierten Referals eines Mitgliedes auflisten.',7)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_links','Unbestätigte Mails','Mit diesem Menüpunkt können Sie die vom Mitglied nicht bestätigten Mails anzeigen.',8)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_cats','Kategorien anzeigen','Listet die ausgewählten Kategorien eines Mitgliedes auf.',9)";

 
        // Load CSS-File?
        $EXT_CSS = "Y";
 
        // Load CSS-File?
        $EXT_CSS = "Y";


@@ -64,8 +64,8 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE `what` IN('config_user','user_contct','list_user_del') LIMIT 3";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_del`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what` IN('config_user','user_contct','list_user_del') LIMIT 3";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_del`";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension


@@ -82,14 +82,14 @@ case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.1": // SQL queries for v0.1
        switch ($EXT_VER)
        {
        case "0.1": // SQL queries for v0.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `user_limit` INT(7) UNSIGNED NOT NULL DEFAULT 20";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `user_limit` INT(7) UNSIGNED NOT NULL DEFAULT 20";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Seitenweises Anzeigen der User-Liste ist nun möglich.";
                break;
 
        case "0.1.1": // SQL queries for v0.1.1
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Seitenweises Anzeigen der User-Liste ist nun möglich.";
                break;
 
        case "0.1.1": // SQL queries for v0.1.1

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_extensions` SET `ext_has_css`='Y' WHERE `ext_name`='user' AND `ext_has_css`='N' LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_extensions` SET `ext_has_css`='Y' WHERE `ext_name`='user' AND `ext_has_css`='N' LIMIT 1";

 
                // This update depends on sql_patches update!
                $EXT_UPDATE_DEPENDS = "sql_patches";
 
                // This update depends on sql_patches update!
                $EXT_UPDATE_DEPENDS = "sql_patches";


@@ -98,7 +98,7 @@ case "update": // Update an extension
                $UPDATE_NOTES = "CSS-Datei kann per Admin-Bereich ein- und ausgeschaltet werden.";
 
        case "0.1.2": // SQL queries for v0.1.2
                $UPDATE_NOTES = "CSS-Datei kann per Admin-Bereich ein- und ausgeschaltet werden.";
 
        case "0.1.2": // SQL queries for v0.1.2

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD `mails_confirmed` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD `mails_confirmed` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Dem Mitglied wird nun angezeigt, wie viele Mails er bestätigt hat. Alle vor dieser Version best. Mails werden leider nicht mehr berücksichtigt! Bitte teilen Sie dies Ihren Mitgliedern mit.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Dem Mitglied wird nun angezeigt, wie viele Mails er bestätigt hat. Alle vor dieser Version best. Mails werden leider nicht mehr berücksichtigt! Bitte teilen Sie dies Ihren Mitgliedern mit.";


@@ -110,7 +110,7 @@ case "update": // Update an extension
                break;
 
        case "0.1.4": // SQL queries for v0.1.4
                break;
 
        case "0.1.4": // SQL queries for v0.1.4

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD `emails_received` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD `emails_received` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Anzahl empfangener Mails wird angezeigt. <big>Diese Anzeige kann fehlerhaft sein, wenn Sie bereits Mitglieder in Ihrem {!MT_WORD!} haben sollen!</big>";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Anzahl empfangener Mails wird angezeigt. <big>Diese Anzeige kann fehlerhaft sein, wenn Sie bereits Mitglieder in Ihrem {!MT_WORD!} haben sollen!</big>";


@@ -147,15 +147,15 @@ case "update": // Update an extension
                break;
 
        case "0.2.1": // SQL queries for v0.2.1
                break;
 
        case "0.2.1": // SQL queries for v0.2.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `user_alpha` TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_user','Mitgliederliste','Anzahl Mitglieder pro Seite, Anzahl Buchstaben pro Zeile usw.', 8)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `user_alpha` TINYINT(3) UNSIGNED NOT NULL DEFAULT 10";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_user','Mitgliederliste','Anzahl Mitglieder pro Seite, Anzahl Buchstaben pro Zeile usw.', 8)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "User-Liste ist konfigurierbar: Anzahl Mitglieder pro Seite und Anzahl Buchstaben pro Zeile; Template-Fehler beseitigt.";
                break;
 
        case "0.2.2": // SQL queries for v0.2.2
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "User-Liste ist konfigurierbar: Anzahl Mitglieder pro Seite und Anzahl Buchstaben pro Zeile; Template-Fehler beseitigt.";
                break;
 
        case "0.2.2": // SQL queries for v0.2.2

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` CHANGE `gender` `gender` ENUM('M','F','C') NOT NULL DEFAULT 'M'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` CHANGE `gender` `gender` ENUM('M','F','C') NOT NULL DEFAULT 'M'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Anrede &quot;Firma&quot; hinzugef&uuml;gt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Anrede &quot;Firma&quot; hinzugef&uuml;gt.";


@@ -192,7 +192,7 @@ case "update": // Update an extension
                break;
 
        case "0.2.9": // SQL queries for v0.2.9
                break;
 
        case "0.2.9": // SQL queries for v0.2.9

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','user_contct','Mitglied kontaktieren','Kontaktieren Sie hier Ihre Mitglieder ganz direkt &uuml;ber ein Webformular. Sie brauchen somit kein EMail-Programm mehr starten!', 8)";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','user_contct','Mitglied kontaktieren','Kontaktieren Sie hier Ihre Mitglieder ganz direkt &uuml;ber ein Webformular. Sie brauchen somit kein EMail-Programm mehr starten!', 8)";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Admin-Kontaktformular hinzugef&uuml;gt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Admin-Kontaktformular hinzugef&uuml;gt.";


@@ -204,7 +204,7 @@ case "update": // Update an extension
                break;
 
        case "0.3.1": // SQL queries for v0.3.1
                break;
 
        case "0.3.1": // SQL queries for v0.3.1

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET `title` = 'Mitglieder-Management' WHERE `action`='user' AND (`what`='' OR `what` IS NULL) LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET `title` = 'Mitglieder-Management' WHERE `action`='user' AND (`what`='' OR `what` IS NULL) LIMIT 1";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Verwaltung auf Management umgestellt";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Verwaltung auf Management umgestellt";


@@ -221,21 +221,21 @@ case "update": // Update an extension
                break;
 
        case "0.3.4": // SQL queries for v0.3.4
                break;
 
        case "0.3.4": // SQL queries for v0.3.4

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `select_user_zero_refid` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `user_min_confirmed` SMALLINT(5) UNSIGNED NOT NULL DEFAULT 10";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD `rand_confirmed` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `select_user_zero_refid` ENUM('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `user_min_confirmed` SMALLINT(5) UNSIGNED NOT NULL DEFAULT 10";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD `rand_confirmed` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitglieder werden per Zufall als Referal-ID ausgew&auml;hlt, die eine Mindestanzahl an best&auml;tigten Mails haben, wenn die Ref-Id 0 ist.";
                break;
 
        case "0.3.5": // SQL queries for v0.3.5
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Mitglieder werden per Zufall als Referal-ID ausgew&auml;hlt, die eine Mindestanzahl an best&auml;tigten Mails haben, wenn die Ref-Id 0 ist.";
                break;
 
        case "0.3.5": // SQL queries for v0.3.5

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD `lock_reason` TINYTEXT";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD `lock_timestamp` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `user_delete_purge` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day') * 30)."";
-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_user_del','L&ouml;schungen auflisten','Listet die L&ouml;schungen von Usern auf.', 9)";
-               $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_del`";
-               $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_user_del` (
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD `lock_reason` TINYTEXT";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD `lock_timestamp` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `user_delete_purge` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day') * 30)."";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('user','list_user_del','L&ouml;schungen auflisten','Listet die L&ouml;schungen von Usern auf.', 9)";
+               $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_del`";
+               $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_user_del` (

 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `email` VARCHAR(255) NOT NULL DEFAULT '',
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `email` VARCHAR(255) NOT NULL DEFAULT '',

diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php
index 85268bee8bf53acc5a09966bab0e6f789d9e56e2..5d3ac30fbcb092e306d6e35874c1d0fd4dcef358 100644 (file)
--- a/inc/extensions/ext-wernis.php
+++ b/inc/extensions/ext-wernis.php
@@ -50,8 +50,8 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_wernis`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_user_wernis` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_wernis`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_user_wernis` (

 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 wernis_account VARCHAR(255) NOT NULL DEFAULT '',
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 wernis_account VARCHAR(255) NOT NULL DEFAULT '',


@@ -65,80 +65,80 @@ PRIMARY KEY(id)
 ) TYPE=MyISAM";
 
        // Confiuration
 ) TYPE=MyISAM";
 
        // Confiuration

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD wernis_min_payout BIGINT(20) UNSIGNED NOT NULL DEFAULT '40000'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD wernis_min_withdraw BIGINT(20) UNSIGNED NOT NULL DEFAULT '5000'";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD wernis_api_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD wernis_api_md5 VARCHAR(32) NOT NULL DEFAULT ''";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD wernis_api_url VARCHAR(255) NOT NULL DEFAULT 'http://www.wds66.com/api/'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD wernis_min_payout BIGINT(20) UNSIGNED NOT NULL DEFAULT '40000'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD wernis_min_withdraw BIGINT(20) UNSIGNED NOT NULL DEFAULT '5000'";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD wernis_api_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD wernis_api_md5 VARCHAR(32) NOT NULL DEFAULT ''";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD wernis_api_url VARCHAR(255) NOT NULL DEFAULT 'http://www.wds66.com/api/'";

 
        // User data
 
        // User data

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_user_data` ADD wernis_userid VARCHAR(6) NOT NULL DEFAULT ''";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD wernis_userid VARCHAR(6) NOT NULL DEFAULT ''";

 
        // Admin menu
 
        // Admin menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('wernis', NULL, 'Wernis-Management','Konfiguration zur WDS66-API einstellen, Auszahlungen auflisten usw..', 15)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('wernis','config_wernis','WDS66-API-Einstellungen','Konfiguration zur WDS66-API einstellen.', 1)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('wernis','list_wernis','Wernis-Anfragen auflisten','Listet alle Wernis-Auszahlungsanfragen Ihrer Mitglieder auf.', 2)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('wernis', NULL, 'Wernis-Management','Konfiguration zur WDS66-API einstellen, Auszahlungen auflisten usw..', 15)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('wernis','config_wernis','WDS66-API-Einstellungen','Konfiguration zur WDS66-API einstellen.', 1)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('wernis','list_wernis','Wernis-Anfragen auflisten','Listet alle Wernis-Auszahlungsanfragen Ihrer Mitglieder auf.', 2)";

 
        // Member menu
 
        // Member menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','wernis','Wernis-Ein-/Auszahlungen','N','N', 11)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','wernis','Wernis-Ein-/Auszahlungen','N','N', 11)";

 
        // Guest menu
 
        // Guest menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','wernis_portal','WDS66-News','N','N', 7)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','wernis_portal','WDS66-News','N','N', 7)";

        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        break;
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_user_wernis`";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='wernis'";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE what='wernis' LIMIT 1";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE what='wernis_portal' LIMIT 1";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_user_wernis`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='wernis'";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE what='wernis' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE what='wernis_portal' LIMIT 1";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='Y', locked='N' WHERE what='wernis_portal' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='wernis' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='Y', `locked`='N' WHERE what='wernis_portal' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='wernis' LIMIT 1";

        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run

-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='N', locked='Y' WHERE what='wernis_portal' LIMIT 1";
-       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='N', locked='Y' WHERE what='wernis' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='N', `locked`='Y' WHERE what='wernis_portal' LIMIT 1";
+       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE what='wernis' LIMIT 1";

        break;
 
 case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.1
        break;
 
 case "update": // Update an extension
        switch ($EXT_VER)
        {
        case "0.0.1": // SQL queries for v0.0.1

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD wernis_payout_active ENUM ('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD wernis_withdraw_active ENUM ('Y','N') NOT NULL DEFAULT 'Y'";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD wernis_payout_factor FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 1.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD wernis_withdraw_factor FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 1.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD wernis_payout_fee_percent FLOAT(8,5) UNSIGNED NOT NULL DEFAULT 0.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD wernis_withdraw_fee_percent FLOAT(8,5) UNSIGNED NOT NULL DEFAULT 0.00000";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD wernis_payout_fee_fix BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD wernis_withdraw_fee_fix BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD wernis_payout_active ENUM ('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD wernis_withdraw_active ENUM ('Y','N') NOT NULL DEFAULT 'Y'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD wernis_payout_factor FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 1.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD wernis_withdraw_factor FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 1.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD wernis_payout_fee_percent FLOAT(8,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD wernis_withdraw_fee_percent FLOAT(8,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD wernis_payout_fee_fix BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD wernis_withdraw_fee_fix BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Ein-/Auszahlungsfunktion getrennt ein- und ausschaltbar, sowie mit Umrechungsfaktoren {!POINTS!}->Wernis versehen. Prozentualer Abzug als "Betreibergebühr hinzugefügt, was z.B. für Wechselstuben interessant ist.";
                break;
 
        case "0.0.2": // SQL queries for v0.0.2
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Ein-/Auszahlungsfunktion getrennt ein- und ausschaltbar, sowie mit Umrechungsfaktoren {!POINTS!}->Wernis versehen. Prozentualer Abzug als "Betreibergebühr hinzugefügt, was z.B. für Wechselstuben interessant ist.";
                break;
 
        case "0.0.2": // SQL queries for v0.0.2

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD wernis_pass_md5 VARCHAR(32) NOT NULL DEFAULT ''";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD wernis_pass_md5 VARCHAR(32) NOT NULL DEFAULT ''";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Auszahlunsfunktion an die neue API 0.2-BETA angepasst. Demnach muss Ihr Wernis-Passwort beim Auszahlen benutzt werden und in Ihrem {!MT_WORD!} als MD5-Hash gespeichert werden.";
                break;
 
        case "0.0.3": // SQL queries for v0.0.3
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Auszahlunsfunktion an die neue API 0.2-BETA angepasst. Demnach muss Ihr Wernis-Passwort beim Auszahlen benutzt werden und in Ihrem {!MT_WORD!} als MD5-Hash gespeichert werden.";
                break;
 
        case "0.0.3": // SQL queries for v0.0.3

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` CHANGE `wernis_refid` `wernis_refid` INT(5) UNSIGNED ZEROFILL NOT NULL DEFAULT '00000'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` CHANGE `wernis_refid` `wernis_refid` INT(5) UNSIGNED ZEROFILL NOT NULL DEFAULT '00000'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Spaltentyp von VARCHAR(6) auf BIGINT(5) geändert.";
                break;
 
        case "0.0.4": // SQL queries for v0.0.4
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Spaltentyp von VARCHAR(6) auf BIGINT(5) geändert.";
                break;
 
        case "0.0.4": // SQL queries for v0.0.4

-               $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `wernis_refid` INT(5) UNSIGNED ZEROFILL NOT NULL DEFAULT '00000'";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `wernis_refid` INT(5) UNSIGNED ZEROFILL NOT NULL DEFAULT '00000'";

 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Fehlende Ref-Id hinzugetan.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Fehlende Ref-Id hinzugetan.";

diff --git a/inc/extensions/ext-yoomedia.php b/inc/extensions/ext-yoomedia.php
index 4b31cda013a18d51072267c1896fa53bde2797d6..fd51d9974ec3a7fbd9ce147656ec883a3e239ed8 100644 (file)
--- a/inc/extensions/ext-yoomedia.php
+++ b/inc/extensions/ext-yoomedia.php
@@ -54,24 +54,24 @@ switch ($EXT_LOAD_MODE)
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
 {
 case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run

-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `yoomedia_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `yoomedia_sid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `yoomedia_passwd` VARCHAR(255) NOT NULL DEFAULT ''";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `yoomedia_erotic_allowed` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `yoomedia_tm_max_reload` SMALLINT(6) UNSIGNED NOT NULL DEFAULT ".(24 * 8)."";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `yoomedia_tm_min_wait` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 60";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `yoomedia_tm_clicks_remain` INT(7) UNSIGNED NOT NULL DEFAULT 1000";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `yoomedia_tm_min_pay` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `yoomedia_requests_total` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 200";
-       $SQLs[] = "ALTER TABLE `{!MYSQL_PREFIX!}_config` ADD `yoomedia_requests_remain` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 200";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `yoomedia_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `yoomedia_sid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `yoomedia_passwd` VARCHAR(255) NOT NULL DEFAULT ''";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `yoomedia_erotic_allowed` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `yoomedia_tm_max_reload` SMALLINT(6) UNSIGNED NOT NULL DEFAULT ".(24 * 8)."";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `yoomedia_tm_min_wait` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 60";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `yoomedia_tm_clicks_remain` INT(7) UNSIGNED NOT NULL DEFAULT 1000";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `yoomedia_tm_min_pay` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `yoomedia_requests_total` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 200";
+       $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD `yoomedia_requests_remain` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 200";

 
        // Admin menu
 
        // Admin menu

-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_yoomedia','Yoo!Media Interface 2.0','Einstellungen zum Yoo!Media Interface 2.0, wie User-ID, Interface-Passwort und vieles mehr.',17)";
-       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','list_yoomedia_tm','Yoo!Media Textmails','Listet Textmail-Buchungen &uuml;ber das Interface 2.0 von Yoo!Media nach Ihren eingestellten Kriterien auf. <strong>Vorsicht:</strong> Jede Aktualisierung dieser Liste kostet Ihnen eine Abfrage!',10)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_yoomedia','Yoo!Media Interface 2.0','Einstellungen zum Yoo!Media Interface 2.0, wie User-ID, Interface-Passwort und vieles mehr.',17)";
+       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('email','list_yoomedia_tm','Yoo!Media Textmails','Listet Textmail-Buchungen &uuml;ber das Interface 2.0 von Yoo!Media nach Ihren eingestellten Kriterien auf. <strong>Vorsicht:</strong> Jede Aktualisierung dieser Liste kostet Ihnen eine Abfrage!',10)";

 
        // Reload lock table
 
        // Reload lock table

-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_yoomedia_reload`";
-       $SQLs[] = "CREATE TABLE `{!MYSQL_PREFIX!}_yoomedia_reload` (
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_yoomedia_reload`";
+       $SQLs[] = "CREATE TABLE `{!_MYSQL_PREFIX!}_yoomedia_reload` (

 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `type` VARCHAR(255) NOT NULL DEFAULT 'general',
 `y_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `type` VARCHAR(255) NOT NULL DEFAULT 'general',
 `y_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,


@@ -84,8 +84,8 @@ UNIQUE `y_type` (`type`,`y_id`)
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run

-       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE `what` IN('config_yoomedia','list_yoomedia_tm') LIMIT 2";
-       $SQLs[] = "DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_yoomedia_reload`";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what` IN('config_yoomedia','list_yoomedia_tm') LIMIT 2";
+       $SQLs[] = "DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_yoomedia_reload`";

        break;
 
 case "activate": // Do stuff when admin activates this extension
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/filters.php b/inc/filters.php
index 6da430d5da5094f1e0c9c5a869f5e00552c8b8e7..3ef321ce3234673aef4bbefeb043c8c86e51c0e2 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -70,7 +70,7 @@ function INIT_FILTER_SYSTEM () {
 
                // Load all active filers
                $result = SQL_QUERY("SELECT `filter_name`, `filter_function`, `filter_active`".$ADD."
 
                // Load all active filers
                $result = SQL_QUERY("SELECT `filter_name`, `filter_function`, `filter_active`".$ADD."

-FROM `{!MYSQL_PREFIX!}_filters`
+FROM `{!_MYSQL_PREFIX!}_filters`

 ORDER BY `filter_id` ASC", __FILE__, __LINE__);
 
                // Are there entries?
 ORDER BY `filter_id` ASC", __FILE__, __LINE__);
 
                // Are there entries?


@@ -264,8 +264,8 @@ function FILTER_FLUSH_FILTERS () {
        $inserted = 0; $removed = 0;
 
        // Prepare SQL queries
        $inserted = 0; $removed = 0;
 
        // Prepare SQL queries

-       $insertSQL = "INSERT INTO `{!MYSQL_PREFIX!}_filters` (`filter_name`,`filter_function`,`filter_active`) VALUES";
-       $removeSQL = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_filters` WHERE";
+       $insertSQL = "INSERT INTO `{!_MYSQL_PREFIX!}_filters` (`filter_name`,`filter_function`,`filter_active`) VALUES";
+       $removeSQL = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_filters` WHERE";

 
        // Write all filters to database
        foreach ($filters as $filterName => $filterArray) {
 
        // Write all filters to database
        foreach ($filters as $filterName => $filterArray) {


@@ -309,7 +309,7 @@ function FILTER_FLUSH_FILTERS () {
                        // Walk through all filters
                        foreach ($filterArray as $filterFunction => $cnt) {
                                // Construct and add the query
                        // Walk through all filters
                        foreach ($filterArray as $filterFunction => $cnt) {
                                // Construct and add the query

-                               $SQLs[] = sprintf("UPDATE `{!MYSQL_PREFIX!}_filters` SET `filter_counter`=%s WHERE `filter_name`='%s' AND `filter_function`='%s' LIMIT 1",
+                               $SQLs[] = sprintf("UPDATE `{!_MYSQL_PREFIX!}_filters` SET `filter_counter`=%s WHERE `filter_name`='%s' AND `filter_function`='%s' LIMIT 1",

                                        bigintval($cnt),
                                        $filterName,
                                        $filterFunction
                                        bigintval($cnt),
                                        $filterName,
                                        $filterFunction


@@ -451,7 +451,7 @@ function FILTER_UPDATE_LOGIN_DATA () {
        $GLOBALS['userid'] = bigintval(get_session('userid'));
 
        // Load last module and last online time
        $GLOBALS['userid'] = bigintval(get_session('userid'));
 
        // Load last module and last online time

-       $result = SQL_QUERY_ESC("SELECT last_module, last_online FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT last_module, last_online FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Entry found?
                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Entry found?


@@ -475,7 +475,7 @@ function FILTER_UPDATE_LOGIN_DATA () {
                } // END - if
 
                // Update last module / online time
                } // END - if
 
                // Update last module / online time

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET last_module='%s', last_online=UNIX_TIMESTAMP(), REMOTE_ADDR='%s' WHERE userid=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET last_module='%s', last_online=UNIX_TIMESTAMP(), REMOTE_ADDR='%s' WHERE userid=%s LIMIT 1",

                        array($GLOBALS['what'], GET_REMOTE_ADDR(), $GLOBALS['userid']), __FILE__, __LINE__);
        }  else {
                // Destroy session, we cannot update!
                        array($GLOBALS['what'], GET_REMOTE_ADDR(), $GLOBALS['userid']), __FILE__, __LINE__);
        }  else {
                // Destroy session, we cannot update!

diff --git a/inc/functions.php b/inc/functions.php
index d293cc048aa7b2118497949cfa206ec0970357f7..e545aa0d6e731f2e2007ac7927149bf1059aad45 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -238,7 +238,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
        // @DEPRECATED Try to rewrite the if() condition
        if ($template == "member_support_form") {
                // Support request of a member
        // @DEPRECATED Try to rewrite the if() condition
        if ($template == "member_support_form") {
                // Support request of a member

-               $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                        array($GLOBALS['userid']), __FILE__, __LINE__);
 
                // Is content an array?
                        array($GLOBALS['userid']), __FILE__, __LINE__);
 
                // Is content an array?


@@ -392,7 +392,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") {
                        return;
                } else {
                        // Load email address
                        return;
                } else {
                        // Load email address

-                       $result_email = SQL_QUERY_ESC("SELECT email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($TO)), __FILE__, __LINE__);
+                       $result_email = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($TO)), __FILE__, __LINE__);

                        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):numRows=".SQL_NUMROWS($result_email)."<br />\n";
 
                        // Does the user exist?
                        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):numRows=".SQL_NUMROWS($result_email)."<br />\n";
 
                        // Does the user exist?


@@ -401,7 +401,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") {
                                list($TO) = SQL_FETCHROW($result_email);
                        } else {
                                // Set webmaster
                                list($TO) = SQL_FETCHROW($result_email);
                        } else {
                                // Set webmaster

-                               $TO = WEBMASTER;
+                               $TO = constant('WEBMASTER');

                        }
 
                        // Free result
                        }
 
                        // Free result


@@ -409,7 +409,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") {
                }
        } elseif ("$TO" == "0") {
                // Is the webmaster!
                }
        } elseif ("$TO" == "0") {
                // Is the webmaster!

-               $TO = WEBMASTER;
+               $TO = constant('WEBMASTER');

        }
        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):TO={$TO}<br />\n";
 
        }
        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):TO={$TO}<br />\n";
 


@@ -490,7 +490,7 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
                $mail->Username   = SMTP_USER;
                $mail->Password   = SMTP_PASSWORD;
                if (empty($from)) {
                $mail->Username   = SMTP_USER;
                $mail->Password   = SMTP_PASSWORD;
                if (empty($from)) {

-                       $mail->From = WEBMASTER;
+                       $mail->From = constant('WEBMASTER');

                } else {
                        $mail->From = $from;
                }
                } else {
                        $mail->From = $from;
                }


@@ -666,7 +666,7 @@ function SELECTION_COUNT($array) {
 }
 //
 function IMG_CODE ($code, $type, $DATA, $uid) {
 }
 //
 function IMG_CODE ($code, $type, $DATA, $uid) {

-       return "<IMG border=\"0\" alt=\"Code\" src=\"".URL."/mailid_top.php?uid=".$uid."&amp;".$type."=".$DATA."&amp;mode=img&amp;code=".$code."\">";
+       return "<IMG border=\"0\" alt=\"Code\" src=\"{!URL!}/mailid_top.php?uid=".$uid."&amp;".$type."=".$DATA."&amp;mode=img&amp;code=".$code."\">";

 }
 //
 function TRANSLATE_STATUS($status) {
 }
 //
 function TRANSLATE_STATUS($status) {


@@ -752,7 +752,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
        $nick = "---";
 
        // Keept for backward-compatiblity (please replace these variables against our new {!CONST!} syntax!)
        $nick = "---";
 
        // Keept for backward-compatiblity (please replace these variables against our new {!CONST!} syntax!)

-       // No longer used: $MAIN_TITLE = MAIN_TITLE; $URL = URL; $WEBMASTER = WEBMASTER;
+       // No longer used: $MAIN_TITLE = MAIN_TITLE; $URL = constant('URL'); $WEBMASTER = constant('WEBMASTER');

 
        // Prepare IP number and User Agent
        $REMOTE_ADDR     = GET_REMOTE_ADDR();
 
        // Prepare IP number and User Agent
        $REMOTE_ADDR     = GET_REMOTE_ADDR();


@@ -771,7 +771,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
        } // END - if
 
        // Neutral email address is default
        } // END - if
 
        // Neutral email address is default

-       $email = WEBMASTER;
+       $email = constant('WEBMASTER');

 
        // Expiration in a nice output format
        if (getConfig('auto_purge') == 0) {
 
        // Expiration in a nice output format
        if (getConfig('auto_purge') == 0) {


@@ -795,12 +795,12 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
                if (EXT_IS_ACTIVE("nickname")) {
                        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NICKNAME!<br />\n";
                        // Load nickname
                if (EXT_IS_ACTIVE("nickname")) {
                        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NICKNAME!<br />\n";
                        // Load nickname

-                       $result = SQL_QUERY_ESC("SELECT surname, family, gender, email, nickname FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT surname, family, gender, email, nickname FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                                array(bigintval($UID)), __FILE__, __LINE__);
                } else {
                        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NO-NICK!<br />\n";
                        /// Load normal data
                                array(bigintval($UID)), __FILE__, __LINE__);
                } else {
                        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NO-NICK!<br />\n";
                        /// Load normal data

-                       $result = SQL_QUERY_ESC("SELECT surname, family, gender, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT surname, family, gender, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

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


@@ -1315,7 +1315,7 @@ function GENERATE_IMAGE($img_code, $header=true) {
                return;
        } elseif (!$header) {
                // Return in an HTML code code
                return;
        } elseif (!$header) {
                // Return in an HTML code code

-               return "<IMG src=\"".URL."/img.php?code=".$img_code."\">\n";
+               return "<IMG src=\"{!URL!}/img.php?code=".$img_code."\">\n";

        }
 
        // Load image
        }
 
        // Load image


@@ -1592,16 +1592,16 @@ function SEND_ADMIN_EMAILS_PRO($subj, $template, $content, $UID) {
        } // END - if
 
        // Check which admin shall receive this mail
        } // END - if
 
        // Check which admin shall receive this mail

-       $result = SQL_QUERY_ESC("SELECT DISTINCT admin_id FROM `{!MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' ORDER BY admin_id",
+       $result = SQL_QUERY_ESC("SELECT DISTINCT admin_id FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' ORDER BY admin_id",

                array($template), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Create new entry (to all admins)
                array($template), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Create new entry (to all admins)

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_admins_mails` (admin_id, mail_template) VALUES (0, '%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins_mails` (admin_id, mail_template) VALUES (0, '%s')",

                        array($template), __FILE__, __LINE__);
        } else {
                // Load admin IDs...
                $aids = array();
                        array($template), __FILE__, __LINE__);
        } else {
                // Load admin IDs...
                $aids = array();

-               while(list($aid) = SQL_FETCHROW($result)) {
+               while (list($aid) = SQL_FETCHROW($result)) {

                        $aids[] = $aid;
                }
 
                        $aids[] = $aid;
                }
 


@@ -1616,10 +1616,10 @@ function SEND_ADMIN_EMAILS_PRO($subj, $template, $content, $UID) {
                        return;
                } elseif ($aid == "0") {
                        // Select all email adresses
                        return;
                } elseif ($aid == "0") {
                        // Select all email adresses

-                       $result = SQL_QUERY("SELECT email FROM `{!MYSQL_PREFIX!}_admins` ORDER BY id", __FILE__, __LINE__);
+                       $result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id`", __FILE__, __LINE__);

                } else {
                        // If Admin-ID is not "to-all" select
                } else {
                        // If Admin-ID is not "to-all" select

-                       $result = SQL_QUERY_ESC("SELECT email FROM `{!MYSQL_PREFIX!}_admins` WHERE id IN (%s) ORDER BY id", array($aid), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` WHERE id IN (%s) ORDER BY `id`", array($aid), __FILE__, __LINE__);

                }
        }
 
                }
        }
 


@@ -1673,7 +1673,7 @@ function ADD_EMAIL_NAV($PAGES, $offset, $show_form, $colspan, $return=false) {
                        $NAV .= "<strong>-";
                } else {
                        // Open anchor tag and add base URL
                        $NAV .= "<strong>-";
                } else {
                        // Open anchor tag and add base URL

-                       $NAV .= "<a href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what']."&amp;page=".$page."&amp;offset=".$offset;
+                       $NAV .= "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what']."&amp;page=".$page."&amp;offset=".$offset;

 
                        // Add userid when we shall show all mails from a single member
                        if ((isset($_GET['u_id'])) && (bigintval($_GET['u_id']) > 0)) $NAV .= "&amp;u_id=".bigintval($_GET['u_id']);
 
                        // Add userid when we shall show all mails from a single member
                        if ((isset($_GET['u_id'])) && (bigintval($_GET['u_id']) > 0)) $NAV .= "&amp;u_id=".bigintval($_GET['u_id']);


@@ -2775,10 +2775,10 @@ function ADD_NEW_BONUS_MAIL ($data, $mode="", $output=true) {
                );
 
                // Mail inserted into bonus pool
                );
 
                // Mail inserted into bonus pool

-               if ($output) LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_SEND);
+               if ($output) LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_SEND'));

        } elseif ($output) {
                // More entered than can be reached!
        } elseif ($output) {
                // More entered than can be reached!

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MORE_SELECTED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_MORE_SELECTED'));

        } else {
                // Debug log
                DEBUG_LOG(__FUNCTION__, __LINE__, " cat={$data['cat']},receiver={$data['receiver']},data=".base64_encode(serialize($data))." More selected, than available!");
        } else {
                // Debug log
                DEBUG_LOG(__FUNCTION__, __LINE__, " cat={$data['cat']},receiver={$data['receiver']},data=".base64_encode(serialize($data))." More selected, than available!");


@@ -2872,10 +2872,13 @@ function getMessage ($messageId) {
        $return = "!".$messageId."!";
 
        // Is the language string found?
        $return = "!".$messageId."!";
 
        // Is the language string found?

-       if (isset($GLOBALS['msg'][$messageId])) {
-               // Language array element found
+       if (isset($GLOBALS['msg'][strtolower($messageId)])) {
+               // Language array element found in small_letters

                $return = $GLOBALS['msg'][$messageId];
                $return = $GLOBALS['msg'][$messageId];

-       } elseif (defined($messageId)) {
+       } elseif (isset($GLOBALS['msg'][strtoupper($messageId)])) {
+               // @DEPRECATED Language array element found in BIG_LETTERS
+               $return = $GLOBALS['msg'][$messageId];
+       } elseif (defined(strtoupper($messageId))) {

                // @DEPRECATED Deprecated constant found
                $return = constant($messageId);
        } else {
                // @DEPRECATED Deprecated constant found
                $return = constant($messageId);
        } else {


@@ -2962,7 +2965,7 @@ function THEME_GET_ID ($name) {
                incrementConfigEntry('cache_hits');
        } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
                // Check if current theme is already imported or not
                incrementConfigEntry('cache_hits');
        } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
                // Check if current theme is already imported or not

-               $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_themes` WHERE theme_path='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' LIMIT 1",

                        array($name), __FILE__, __LINE__);
 
                // Entry found?
                        array($name), __FILE__, __LINE__);
 
                // Entry found?

diff --git a/inc/gen_mediadata.php b/inc/gen_mediadata.php
index a7bd796574616cec67391fb8a7519a40fb5c3a16..bdf11b032080ee1ca2e172b9f66176796160c8e7 100644 (file)
--- a/inc/gen_mediadata.php
+++ b/inc/gen_mediadata.php
@@ -42,7 +42,7 @@ $bsent = 0; $bclicks = 0; $bcount = 0;
 
 // Check for normal mails
 $result_media = SQL_QUERY("SELECT SUM(max_rec) AS max_rec, SUM(clicks) AS clicks
 
 // Check for normal mails
 $result_media = SQL_QUERY("SELECT SUM(max_rec) AS max_rec, SUM(clicks) AS clicks

-FROM `{!MYSQL_PREFIX!}_user_stats`", __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_user_stats`", __FILE__, __LINE__);

 list($nsent, $nclicks) = SQL_FETCHROW($result_media);
 if (empty($nsent))   $nsent   = 0;
 if (empty($nclicks)) $nclicks = 0;
 list($nsent, $nclicks) = SQL_FETCHROW($result_media);
 if (empty($nsent))   $nsent   = 0;
 if (empty($nclicks)) $nclicks = 0;


@@ -51,20 +51,20 @@ if (empty($nclicks)) $nclicks = 0;
 SQL_FREERESULT($result_media);
 
 // Count mail orders
 SQL_FREERESULT($result_media);
 
 // Count mail orders

-$result_media = SQL_QUERY("SELECT COUNT(id) FROM `{!MYSQL_PREFIX!}_user_stats`", __FILE__, __LINE__);
+$result_media = SQL_QUERY("SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_user_stats`", __FILE__, __LINE__);

 list($ncount) = SQL_FETCHROW($result_media);
 SQL_FREERESULT($result_media);
 
 // Check for bonus extension
 if (EXT_IS_ACTIVE("bonus")) {
        // Count bonus mails
 list($ncount) = SQL_FETCHROW($result_media);
 SQL_FREERESULT($result_media);
 
 // Check for bonus extension
 if (EXT_IS_ACTIVE("bonus")) {
        // Count bonus mails

-       $result_media = SQL_QUERY("SELECT COUNT(id) FROM `{!MYSQL_PREFIX!}_bonus`", __FILE__, __LINE__);
+       $result_media = SQL_QUERY("SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_bonus`", __FILE__, __LINE__);

        list($bcount) = SQL_FETCHROW($result_media);
        SQL_FREERESULT($result_media);
 
        // Check for bonus mails
        $result_media = SQL_QUERY("SELECT SUM(mails_sent) AS bonus_sent, SUM(clicks) AS bonus_clicks
        list($bcount) = SQL_FETCHROW($result_media);
        SQL_FREERESULT($result_media);
 
        // Check for bonus mails
        $result_media = SQL_QUERY("SELECT SUM(mails_sent) AS bonus_sent, SUM(clicks) AS bonus_clicks

-FROM `{!MYSQL_PREFIX!}_bonus`", __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_bonus`", __FILE__, __LINE__);

        list($bsent, $bclicks) = SQL_FETCHROW($result_media);
        if (empty($bsent))   $bsent   = 0;
        if (empty($bclicks)) $bclicks = 0;
        list($bsent, $bclicks) = SQL_FETCHROW($result_media);
        if (empty($bsent))   $bsent   = 0;
        if (empty($bclicks)) $bclicks = 0;


@@ -82,12 +82,12 @@ MEDIA_UPDATE_ENTRY(array("total_clicks", "bonus_clicks") , "init", $bclicks);
 MEDIA_UPDATE_ENTRY(array("total_orders", "bonus_orders") , "init", $bcount);
 
 // Aquire total used points
 MEDIA_UPDATE_ENTRY(array("total_orders", "bonus_orders") , "init", $bcount);
 
 // Aquire total used points

-$result = SQL_QUERY("SELECT SUM(used_points) AS used_points FROM `{!MYSQL_PREFIX!}_user_data`", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT SUM(used_points) AS used_points FROM `{!_MYSQL_PREFIX!}_user_data`", __FILE__, __LINE__);

 list($used) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
 // ... and total points
 list($used) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
 // ... and total points

-$result = SQL_QUERY("SELECT SUM(points) AS points FROM `{!MYSQL_PREFIX!}_user_points`", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT SUM(points) AS points FROM `{!_MYSQL_PREFIX!}_user_points`", __FILE__, __LINE__);

 list($points) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
 list($points) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 

diff --git a/inc/gen_refback.php b/inc/gen_refback.php
index 766f315d39e70365418cf2ff9f72eac84a973402..6aa3729e891b7e4b1d23b565ad9805e94c8a92ff 100644 (file)
--- a/inc/gen_refback.php
+++ b/inc/gen_refback.php
@@ -41,16 +41,16 @@ if (!defined('__SECURITY')) {
 require_once(PATH."inc/libs/refback_functions.php");
 
 // Sanity-check: Do we have ref level 0?
 require_once(PATH."inc/libs/refback_functions.php");
 
 // Sanity-check: Do we have ref level 0?

-$result = SQL_QUERY("SELECT id FROM `{!MYSQL_PREFIX!}_refsystem` WHERE level=0", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_refsystem` WHERE level=0", __FILE__, __LINE__);

 if (SQL_NUMROWS($result) > 0) {
        // Remove index temporaly
 if (SQL_NUMROWS($result) > 0) {
        // Remove index temporaly

-       SQL_ALTER_TABLE("ALTER TABLE `{!MYSQL_PREFIX!}_refsystem` DROP INDEX `userid_level`", __FILE__, __LINE__);
+       SQL_ALTER_TABLE("ALTER TABLE `{!_MYSQL_PREFIX!}_refsystem` DROP INDEX `userid_level`", __FILE__, __LINE__);

 
        // Upgrade refsystem, ref-level 0 is silly here
 
        // Upgrade refsystem, ref-level 0 is silly here

-       SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_refsystem` SET level=level+1", __FILE__, __LINE__);
+       SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_refsystem` SET level=level+1", __FILE__, __LINE__);

 
        // Add it again
 
        // Add it again

-       SQL_ALTER_TABLE("ALTER TABLE `{!MYSQL_PREFIX!}_refsystem` ADD UNIQUE `userid_level` ( `userid` , `level` )", __FILE__, __LINE__);
+       SQL_ALTER_TABLE("ALTER TABLE `{!_MYSQL_PREFIX!}_refsystem` ADD UNIQUE `userid_level` ( `userid` , `level` )", __FILE__, __LINE__);

 
        // Rebuild cache
        REBUILD_CACHE("refsystem", "refsystem");
 
        // Rebuild cache
        REBUILD_CACHE("refsystem", "refsystem");


@@ -60,11 +60,11 @@ if (SQL_NUMROWS($result) > 0) {
 SQL_FREERESULT($result);
 
 // Reset the table
 SQL_FREERESULT($result);
 
 // Reset the table

-SQL_QUERY("TRUNCATE TABLE `{!MYSQL_PREFIX!}_user_refs`", __FILE__, __LINE__);
+SQL_QUERY("TRUNCATE TABLE `{!_MYSQL_PREFIX!}_user_refs`", __FILE__, __LINE__);

 
 // Begin with all users in level one
 $result_direct = SQL_QUERY("SELECT u.userid
 
 // Begin with all users in level one
 $result_direct = SQL_QUERY("SELECT u.userid

-FROM `{!MYSQL_PREFIX!}_user_data` AS u
+FROM `{!_MYSQL_PREFIX!}_user_data` AS u

 WHERE u.refid=0
 ORDER BY u.userid ASC", __FILE__, __LINE__);
 
 WHERE u.refid=0
 ORDER BY u.userid ASC", __FILE__, __LINE__);
 

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index a12ead7b731adc15a87cdaaddf8577eee7b0209b..efa794120113073c89f18c3ce3ff78c718046348 100644 (file)
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -46,7 +46,7 @@ if (getConfig('pass_scramble') == "") {
        $scrambleString = genScrambleString(40);
 
        // ... and store it there for future usage
        $scrambleString = genScrambleString(40);
 
        // ... and store it there for future usage

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_config` SET pass_scramble='%s' WHERE config=0 LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET pass_scramble='%s' WHERE config=0 LIMIT 1",

                array($scrambleString), __FILE__, __LINE__);
 
        // Also remember it in config
                array($scrambleString), __FILE__, __LINE__);
 
        // Also remember it in config


@@ -61,7 +61,7 @@ if (getConfig('master_salt') == "") {
        $masterSalt = scrambleString(substr(sha1(GEN_PASS(mt_rand(128, 256))), 0, -40));
 
        // ... and store it there for future usage
        $masterSalt = scrambleString(substr(sha1(GEN_PASS(mt_rand(128, 256))), 0, -40));
 
        // ... and store it there for future usage

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_config` SET master_salt='%s' WHERE config=0 LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET master_salt='%s' WHERE config=0 LIMIT 1",

                array($masterSalt), __FILE__, __LINE__);
 
        // Also remember it in config
                array($masterSalt), __FILE__, __LINE__);
 
        // Also remember it in config


@@ -91,7 +91,7 @@ if (getConfig('file_hash') == "") {
                //* DEBUG: */ die("Secret-Key: ".$secretKey."<br />Cookie: ".get_session('u_hash')."<br />Test: ".$test);
 
                // Write $file_hash to database
                //* DEBUG: */ die("Secret-Key: ".$secretKey."<br />Cookie: ".get_session('u_hash')."<br />Test: ".$test);
 
                // Write $file_hash to database

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET file_hash='%s' WHERE config=0 LIMIT 1",

                        array($file_hash), __FILE__, __LINE__);
 
                // Generate FQFN for .htaccess file
                        array($file_hash), __FILE__, __LINE__);
 
                // Generate FQFN for .htaccess file

diff --git a/inc/header.php b/inc/header.php
index e262bfa16e9395b46e9b6fc3cedf369979eabef6..6c85f0bfaf70fb095a381cc5dabc69d53aa65c4a 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -86,13 +86,13 @@ if (($header != "1") && ($header != "2")) {
                                ));
 
                                // Installation mode
                                ));
 
                                // Installation mode

-                               define('__PAGE_TITLE', INSTALLATION_OF_MXCHANGE);
+                               define('__PAGE_TITLE', getMessage('INSTALLATION_OF_MXCHANGE'));

                        } else {
                                // Configuration not found!
                        } else {
                                // Configuration not found!

-                               define('__PAGE_TITLE', NO_CONFIG_FOUND_TITLE);
+                               define('__PAGE_TITLE', getMessage('NO_CONFIG_FOUND_TITLE'));

 
                                // Do not add the fatal message in installation mode
 
                                // Do not add the fatal message in installation mode

-                               if (basename($_SERVER['PHP_SELF']) != "install.php") addFatalMessage(NO_CONFIG_FOUND);
+                               if (basename($_SERVER['PHP_SELF']) != "install.php") addFatalMessage(getMessage('NO_CONFIG_FOUND'));

                        }
                } // END - if
 
                        }
                } // END - if
 


@@ -118,7 +118,7 @@ if (($header != "1") && ($header != "2")) {
                LOAD_TEMPLATE("header");
 
                // Include stylesheet
                LOAD_TEMPLATE("header");
 
                // Include stylesheet

-               include (PATH."inc/stylesheet.php");
+               require_once(PATH."inc/stylesheet.php");

        } // END - if
 
        // Closing HEAD tag
        } // END - if
 
        // Closing HEAD tag

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 6229a2b45c1e2ee66bc8b1298bc3778a7e60cb3f..3a7422e0ae73377bea5edebe449e60abf01b870b 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -103,7 +103,7 @@ if (isset($_POST['mysql']) && is_array($_POST['mysql'])) $mysql = $_POST['mysql'
 
 if (URL != "http://your-server.com") {
        // Already installed???
 
 if (URL != "http://your-server.com") {
        // Already installed???

-       $burl = URL;
+       $burl = constant('URL');

 } elseif (empty($burl)) {
        // Auto-detect URL
        $burl = "http://".$SERVER_NAME.$_SERVER['PHP_SELF'];
 } elseif (empty($burl)) {
        // Auto-detect URL
        $burl = "http://".$SERVER_NAME.$_SERVER['PHP_SELF'];

diff --git a/inc/language/de.php b/inc/language/de.php
index 9d03964ad25f85b42d365130bcc7d8c0c76ce374..c71ee82fe33b3e268ade1b57bd06ebb607896b46 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -154,8 +154,6 @@ define('SUBMIT_CHANGES', "Änderungen durchführen");
 define('ENTRY_404_1', "Eintrag <em>");
 define('ENTRY_404_2', "</em> wurde nicht gefunden!");
 define('EDIT_UNKNOWN_OKAY', "Es wurde eine unbekannte Aktion durchgef&uuml;hrt!");
 define('ENTRY_404_1', "Eintrag <em>");
 define('ENTRY_404_2', "</em> wurde nicht gefunden!");
 define('EDIT_UNKNOWN_OKAY', "Es wurde eine unbekannte Aktion durchgef&uuml;hrt!");

-define('SAVING_DATA', "Speichere Daten ab");
-define('SAVING_DONE', "Speicherung beendet!");

 define('DEL_ADMIN_MENU', "Admin-Men&uuml;eintr&auml;ge l&ouml;schen");
 define('DEL_MENU_1', "Es soll/sollen <strong>");
 define('DEL_MENU_2', "</strong> Men&uuml;eintrag/-eintr&auml;ge gel&ouml;scht werden:");
 define('DEL_ADMIN_MENU', "Admin-Men&uuml;eintr&auml;ge l&ouml;schen");
 define('DEL_MENU_1', "Es soll/sollen <strong>");
 define('DEL_MENU_2', "</strong> Men&uuml;eintrag/-eintr&auml;ge gel&ouml;scht werden:");

diff --git a/inc/language/en.php b/inc/language/en.php
index 4aa1c904814d8c2ae258660744d1f8bde149a6d5..6833a5764da6be8ebe54703ff60941cebb52955b 100644 (file)
--- a/inc/language/en.php
+++ b/inc/language/en.php
@@ -159,8 +159,6 @@ define('SUBMIT_CHANGES', "Submit changes");
 define('ENTRY_404_1', "Entry <em>");
 define('ENTRY_404_2', "</em> was not found!");
 define('EDIT_UNKNOWN_OKAY', "An unknown action was performed.");
 define('ENTRY_404_1', "Entry <em>");
 define('ENTRY_404_2', "</em> was not found!");
 define('EDIT_UNKNOWN_OKAY', "An unknown action was performed.");

-define('SAVING_DATA', "Saving data");
-define('SAVING_DONE', "finished!");

 define('DEL_ADMIN_MENU', "Admin-Men&uuml;eintr&auml;ge l&ouml;schen");
 define('DEL_MENU_1', "<strong>");
 define('DEL_MENU_2', "</strong> menu entr(y/ies) shall be deleted:");
 define('DEL_ADMIN_MENU', "Admin-Men&uuml;eintr&auml;ge l&ouml;schen");
 define('DEL_MENU_1', "<strong>");
 define('DEL_MENU_2', "</strong> menu entr(y/ies) shall be deleted:");

diff --git a/inc/libs/active_functions.php b/inc/libs/active_functions.php
index aa893f93d9a0b75809ef8f21433af4f41ed62e01..eec102ab87c9d9ffdac83c54b2d6ca2c34a6de2c 100644 (file)
--- a/inc/libs/active_functions.php
+++ b/inc/libs/active_functions.php
@@ -43,7 +43,7 @@ function FILTER_ADD_LINK_ACTIVE_LIST () {
        if ((EXT_IS_ACTIVE("active")) && (EXT_IS_ACTIVE("online"))) {
                // Init content
                $content = array(
        if ((EXT_IS_ACTIVE("active")) && (EXT_IS_ACTIVE("online"))) {
                // Init content
                $content = array(

-                       'menu' => "<a class=\"menu_blur\" href=\"".URL."/modules.php?module=index&amp;what=active\">".getConfig('menu_blur_spacer').GUEST_ACTIVE_LINK."</a>",
+                       'menu' => "<a class=\"menu_blur\" href=\"{!URL!}/modules.php?module=index&amp;what=active\">".getConfig('menu_blur_spacer').GUEST_ACTIVE_LINK."</a>",

                        'what' => "active"
                );
 
                        'what' => "active"
                );
 

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 3b777cab73c7914fabb9cee5162e883062bf2406..47bb4712c1c64a6bd4486fe4deefe345bc814699 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -106,11 +106,11 @@ function ADMINS_CHECK_ACL($act, $wht) {
                if (!empty($act))
                {
                        // Main menu
                if (!empty($act))
                {
                        // Main menu

-                       $result = SQL_QUERY_ESC("SELECT access_mode FROM `{!MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND action_menu='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND action_menu='%s' LIMIT 1",

                         array(bigintval($aid), $act), __FILE__, __LINE__);
                } elseif (!empty($wht)) {
                        // Sub menu
                         array(bigintval($aid), $act), __FILE__, __LINE__);
                } elseif (!empty($wht)) {
                        // Sub menu

-                       $result = SQL_QUERY_ESC("SELECT access_mode FROM `{!MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND what_menu='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND what_menu='%s' LIMIT 1",

                         array(bigintval($aid), $wht), __FILE__, __LINE__);
                }
 
                         array(bigintval($aid), $wht), __FILE__, __LINE__);
                }
 


@@ -136,7 +136,7 @@ function ADMINS_CREATE_EMAIL_LINK($email, $mod="admin") {
        if (strpos("@", $email) > 0) {
                // Create email link
                $result = SQL_QUERY_ESC("SELECT id
        if (strpos("@", $email) > 0) {
                // Create email link
                $result = SQL_QUERY_ESC("SELECT id

-FROM `{!MYSQL_PREFIX!}_admins`
+FROM `{!_MYSQL_PREFIX!}_admins`

 WHERE email='%s'".$locked." LIMIT 1",
  array($email), __FILE__, __LINE__);
 
 WHERE email='%s'".$locked." LIMIT 1",
  array($email), __FILE__, __LINE__);
 


@@ -146,14 +146,14 @@ WHERE email='%s'".$locked." LIMIT 1",
                        list($uid) = SQL_FETCHROW($result);
 
                        // Rewrite email address to contact link
                        list($uid) = SQL_FETCHROW($result);
 
                        // Rewrite email address to contact link

-                       $email = URL."/modules.php?module=".$mod."&what=user_contct&u_id=".bigintval($uid);
+                       $email = "{!URL!}/modules.php?module=".$mod."&what=user_contct&u_id=".bigintval($uid);

                }
 
                // Free memory
                SQL_FREERESULT($result);
        } elseif (bigintval($email) > 0) {
                // Direct ID given
                }
 
                // Free memory
                SQL_FREERESULT($result);
        } elseif (bigintval($email) > 0) {
                // Direct ID given

-               $email = URL."/modules.php?module=".$mod."&what=admins_contct&admin=".bigintval($email);
+               $email = "{!URL!}/modules.php?module=".$mod."&what=admins_contct&admin=".bigintval($email);

        }
 
        // Return rewritten (?) email address
        }
 
        // Return rewritten (?) email address


@@ -208,7 +208,7 @@ function ADMINS_CHANGE_ADMIN_ACCOUNT($POST) {
                        // Update admin account
                        if ($default == "allow") {
                                // Allow changing default ACL
                        // Update admin account
                        if ($default == "allow") {
                                // Allow changing default ACL

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_admins` SET
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET

 login='%s'".$ADD.",
 email='%s',
 default_acl='%s',
 login='%s'".$ADD.",
 email='%s',
 default_acl='%s',


@@ -223,7 +223,7 @@ WHERE id=%s LIMIT 1",
                                        ), __FILE__, __LINE__);
                        } else {
                                // Do not allow it here
                                        ), __FILE__, __LINE__);
                        } else {
                                // Do not allow it here

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_admins` SET
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET

 login='%s'".$ADD.",
 email='%s',
 la_mode='%s'
 login='%s'".$ADD.",
 email='%s',
 la_mode='%s'


@@ -268,7 +268,7 @@ function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
                $id = bigintval($id);
 
                // Get the admin's data
                $id = bigintval($id);
 
                // Get the admin's data

-               $result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM `{!MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",

                        array($id), __FILE__, __LINE__);
                if ((SQL_NUMROWS($result) == 1) && ($sel == 1)) {
                        // Entry found
                        array($id), __FILE__, __LINE__);
                if ((SQL_NUMROWS($result) == 1) && ($sel == 1)) {
                        // Entry found


@@ -282,7 +282,7 @@ function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
                        // Shall we allow changing default ACL?
                        if ($currMode == "allow") {
                                // Allow chaning it
                        // Shall we allow changing default ACL?
                        if ($currMode == "allow") {
                                // Allow chaning it

-                               $content['mode']    = ADD_OPTION_LINES("/ARRAY/", array("allow", "deny"), array(ADMINS_ALLOW_MODE, ADMINS_DENY_MODE), $content['mode']);
+                               $content['mode']    = ADD_OPTION_LINES("/ARRAY/", array("allow", "deny"), array(constant('ADMINS_ALLOW_MODE'), constant('ADMINS_DENY_MODE')), $content['mode']);

                        } else {
                                // Don't allow it
                                $content['mode'] = " ";
                        } else {
                                // Don't allow it
                                $content['mode'] = " ";


@@ -303,7 +303,7 @@ function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
 // Delete given admin accounts
 function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
        // Check if this account is the last one which cannot be deleted...
 // Delete given admin accounts
 function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
        // Check if this account is the last one which cannot be deleted...

-       $result_main = SQL_QUERY("SELECT id FROM `{!MYSQL_PREFIX!}_admins`", __FILE__, __LINE__);
+       $result_main = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_admins`", __FILE__, __LINE__);

        $accounts = SQL_NUMROWS($result_main);
        SQL_FREERESULT($result_main);
        if ($accounts > 1) {
        $accounts = SQL_NUMROWS($result_main);
        SQL_FREERESULT($result_main);
        if ($accounts > 1) {


@@ -314,7 +314,7 @@ function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
                        $id = bigintval($id);
 
                        // Get the admin's data
                        $id = bigintval($id);
 
                        // Get the admin's data

-                       $result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM `{!MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",

                         array($id), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found
                         array($id), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found


@@ -338,7 +338,7 @@ function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
                LOAD_TEMPLATE("admin_del_admins");
        } else {
                // Cannot delete last account!
                LOAD_TEMPLATE("admin_del_admins");
        } else {
                // Cannot delete last account!

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ADMINS_CANNOT_DELETE_LAST);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_CANNOT_DELETE_LAST'));

        }
 }
 
        }
 }
 


@@ -353,11 +353,11 @@ function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
                // Delete only when it's not your own account!
                if (($del == 1) && (GET_CURRENT_ADMIN_ID() != $id)) {
                        // Rewrite his tasks to all admins
                // Delete only when it's not your own account!
                if (($del == 1) && (GET_CURRENT_ADMIN_ID() != $id)) {
                        // Rewrite his tasks to all admins

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_task_system` SET assigned_admin=0 WHERE assigned_admin=%s",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET assigned_admin=0 WHERE assigned_admin=%s",

                         array($id), __FILE__, __LINE__);
 
                        // Remove account
                         array($id), __FILE__, __LINE__);
 
                        // Remove account

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",

                                array($id), __FILE__, __LINE__);
 
                        // Purge cache
                                array($id), __FILE__, __LINE__);
 
                        // Purge cache


@@ -373,7 +373,7 @@ function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
 // List all admin accounts
 function ADMINS_LIST_ADMIN_ACCOUNTS() {
        // Select all admin accounts
 // List all admin accounts
 function ADMINS_LIST_ADMIN_ACCOUNTS() {
        // Select all admin accounts

-       $result = SQL_QUERY("SELECT id, login, email, default_acl AS mode, la_mode FROM `{!MYSQL_PREFIX!}_admins` ORDER BY login ASC", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY login ASC", __FILE__, __LINE__);

        $SW = 2; $OUT = "";
        while ($content = SQL_FETCHARRAY($result)) {
                // Compile some variables
        $SW = 2; $OUT = "";
        while ($content = SQL_FETCHARRAY($result)) {
                // Compile some variables

diff --git a/inc/libs/autopurge_functions.php b/inc/libs/autopurge_functions.php
index 89abcf3deef75c61a67fe436968b9e9dc5b844ee..31a1c82e22edf3d4bbb886101f39db895ff3cbdd 100644 (file)
--- a/inc/libs/autopurge_functions.php
+++ b/inc/libs/autopurge_functions.php
@@ -41,7 +41,7 @@ function AUTOPURGE_ADD_POINTS($uid, $points) {
        global $jackpot;
 
        // Check if he has locked points or not
        global $jackpot;
 
        // Check if he has locked points or not

-       $result = SQL_QUERY_ESC("SELECT ref_payout FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT ref_payout FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                array(bigintval($uid)), __FILE__, __LINE__);
        list($payout) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
                array(bigintval($uid)), __FILE__, __LINE__);
        list($payout) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);


@@ -62,7 +62,7 @@ function AUTOPURGE_ADD_POINTS($uid, $points) {
                $jackpot += $points;
        } else {
                // .. to user's account
                $jackpot += $points;
        } else {
                // .. to user's account

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_points` SET %s=%s+%s WHERE userid=%s AND ref_depth=0 LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_points` SET %s=%s+%s WHERE userid=%s AND ref_depth=0 LIMIT 1",

                        array($target, $target, $points, bigintval($uid)), __FILE__, __LINE__);
 
                // Update mediadata as well
                        array($target, $target, $points, bigintval($uid)), __FILE__, __LINE__);
 
                // Update mediadata as well

diff --git a/inc/libs/beg_functions.php b/inc/libs/beg_functions.php
index e6c17e9004950918ae22b7220eba8e5476e87838..fdadd1a1164620d25ca16d5324379d3f0ae65627 100644 (file)
--- a/inc/libs/beg_functions.php
+++ b/inc/libs/beg_functions.php
@@ -48,7 +48,7 @@ function BEG_ADD_POINTS ($uid, $points) {
        // Is begging rallye active?
        if (getConfig('beg_rallye') == "Y") {
                // Add points to rallye account
        // Is begging rallye active?
        if (getConfig('beg_rallye') == "Y") {
                // Add points to rallye account

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET beg_points=beg_points+%s WHERE userid=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET beg_points=beg_points+%s WHERE userid=%s LIMIT 1",

                        array($points, $uid), __FILE__, __LINE__);
        } else {
                // Add points to account
                        array($points, $uid), __FILE__, __LINE__);
        } else {
                // Add points to account

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index c428208c1192a99e4055a3c5d97f22d01e994f70..68ac09ada8360a0b6dbe58180dbe8ba14a1b9716 100644 (file)
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -72,7 +72,7 @@ function BONUS_ADD_TURBO_POINTS($mid, $uid, $type) {
        } // END - if
 
        // Check for entry
        } // END - if
 
        // Check for entry

-       $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt FROM  `{!MYSQL_PREFIX!}_bonus_turbo` WHERE userid=%s AND %s=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt FROM  `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE userid=%s AND %s=%s LIMIT 1",

                array($uid, $column, $mid), __FILE__, __LINE__);
 
        // Load clicks from table as current rank
                array($uid, $column, $mid), __FILE__, __LINE__);
 
        // Load clicks from table as current rank


@@ -101,11 +101,11 @@ function BONUS_ADD_TURBO_POINTS($mid, $uid, $type) {
        }
 
        // Add points to his account directly
        }
 
        // Add points to his account directly

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET turbo_bonus=turbo_bonus+".$points." WHERE userid=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET turbo_bonus=turbo_bonus+".$points." WHERE userid=%s LIMIT 1",

                array(bigintval($uid)), __FILE__, __LINE__);
 
        // Rember this whole data for displaying ranking list
                array(bigintval($uid)), __FILE__, __LINE__);
 
        // Rember this whole data for displaying ranking list

-       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_bonus_turbo` (userid, mail_id, bonus_id, level, points, timemark) VALUES ('%s', '%s', '%s', '%s', '%s', UNIX_TIMESTAMP())",
+       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_bonus_turbo` (userid, mail_id, bonus_id, level, points, timemark) VALUES ('%s', '%s', '%s', '%s', '%s', UNIX_TIMESTAMP())",

                array(bigintval($uid), bigintval($mail), bigintval($bonus), $rank, $points), __FILE__, __LINE__);
 
        if ((GET_EXT_VERSION("bonus") >= "0.3.5") && (getConfig('bonus_mode') != "ADD") && ($points > 0)) BONUS_POINTS_HANDLER($points);
                array(bigintval($uid), bigintval($mail), bigintval($bonus), $rank, $points), __FILE__, __LINE__);
 
        if ((GET_EXT_VERSION("bonus") >= "0.3.5") && (getConfig('bonus_mode') != "ADD") && ($points > 0)) BONUS_POINTS_HANDLER($points);


@@ -119,7 +119,7 @@ function BONUS_MAKE_RANK_ROWS ($data, $type, $uid) {
        $ranks = sizeof(explode(";", getConfig('turbo_rates'))) + 1;
 
        // Load current user's data
        $ranks = sizeof(explode(";", getConfig('turbo_rates'))) + 1;
 
        // Load current user's data

-       $result = SQL_QUERY_ESC("SELECT level, points, timemark FROM `{!MYSQL_PREFIX!}_bonus_turbo` WHERE %s=%s AND userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT level, points, timemark FROM `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE %s=%s AND userid=%s LIMIT 1",

                array($type, $data, $uid), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load data
                array($type, $data, $uid), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load data


@@ -138,7 +138,7 @@ function BONUS_MAKE_RANK_ROWS ($data, $type, $uid) {
        } // END - if
 
        // Load rankings
        } // END - if
 
        // Load rankings

-       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_bonus_turbo` WHERE %s=%s ORDER BY level LIMIT %s",
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE %s=%s ORDER BY level LIMIT %s",

                array($type, $data, getConfig('bonus_lines')), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Start generating the ranking list
                array($type, $data, getConfig('bonus_lines')), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Start generating the ranking list


@@ -147,7 +147,7 @@ function BONUS_MAKE_RANK_ROWS ($data, $type, $uid) {
                $SW = 2;
                for ($rank = 1; $rank <= $max; $rank++) {
                        // Load data
                $SW = 2;
                for ($rank = 1; $rank <= $max; $rank++) {
                        // Load data

-                       $result_users = SQL_QUERY_ESC("SELECT userid, points, timemark FROM `{!MYSQL_PREFIX!}_bonus_turbo` WHERE %s=%s AND level=%s LIMIT 1",
+                       $result_users = SQL_QUERY_ESC("SELECT userid, points, timemark FROM `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE %s=%s AND level=%s LIMIT 1",

                                array($type, $data, $rank), __FILE__, __LINE__);
 
                        // Nothing found by default
                                array($type, $data, $rank), __FILE__, __LINE__);
 
                        // Nothing found by default


@@ -243,7 +243,7 @@ function BONUS_PURGE_EXPIRED_TURBO_BONUS()
        global $_CONFIG;
 
        // Remove entries
        global $_CONFIG;
 
        // Remove entries

-       $result = SQL_QUERY("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_bonus_turbo` WHERE timemark < (UNIX_TIMESTAMP() - ".getConfig('bonus_timeout').")", __FILE__, __LINE__);
+       $result = SQL_QUERY("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE timemark < (UNIX_TIMESTAMP() - ".getConfig('bonus_timeout').")", __FILE__, __LINE__);

        if (SQL_AFFECTEDROWS() > 0) {
                // Send out email to admin
                SEND_ADMIN_NOTIFICATION(AUTOPURGE_ADMIN_TURBO_SUBJECT, "admin_autopurge_turbo", SQL_AFFECTEDROWS(), "");
        if (SQL_AFFECTEDROWS() > 0) {
                // Send out email to admin
                SEND_ADMIN_NOTIFICATION(AUTOPURGE_ADMIN_TURBO_SUBJECT, "admin_autopurge_turbo", SQL_AFFECTEDROWS(), "");

diff --git a/inc/libs/booking_functions.php b/inc/libs/booking_functions.php
index 78252fb5c85cde0b6b7fabacc7746530d5b3eb02..bb3aac762f669b191edf327e5766669d51263e93 100644 (file)
--- a/inc/libs/booking_functions.php
+++ b/inc/libs/booking_functions.php
@@ -47,7 +47,7 @@ function ADD_BOOKING_RECORD ($subject, $uid, $points, $mode) {
        } // END - if
 
        // Add record entry here
        } // END - if
 
        // Add record entry here

-       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_book` (`userid`,`subject`,`mode`,`points`) VALUES(%s,'%s','%s',%s)",
+       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_book` (`userid`,`subject`,`mode`,`points`) VALUES(%s,'%s','%s',%s)",

                array($uid, $subject, $mode, $points), __FILE__, __LINE__);
 }
 
                array($uid, $subject, $mode, $points), __FILE__, __LINE__);
 }
 

diff --git a/inc/libs/country_functions.php b/inc/libs/country_functions.php
index fa6694c3dc7533ab8e37c0d188ae8ceb0b7992da..30b1cfec4f6937f0ccf302e95344d3d83c2d8d8c 100644 (file)
--- a/inc/libs/country_functions.php
+++ b/inc/libs/country_functions.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
 // Generate a human-readable country description with code
 function COUNTRY_GENERATE_INFO ($id) {
        // Load code and description
 // Generate a human-readable country description with code
 function COUNTRY_GENERATE_INFO ($id) {
        // Load code and description

-       $result = SQL_QUERY_ESC("SELECT code, descr FROM `{!MYSQL_PREFIX!}_countries` WHERE id=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT code, descr FROM `{!_MYSQL_PREFIX!}_countries` WHERE id=%s LIMIT 1",

                array(bigintval($id)), __FILE__, __LINE__);
 
        // Is there an entry?
                array(bigintval($id)), __FILE__, __LINE__);
 
        // Is there an entry?

diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index f80d13630d12a2324943b70e3ece7a4307debcf2..be2f18c129327382f249c9cd55a6f0165523c759 100644 (file)
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -67,7 +67,7 @@ function DOUBLER_GENERATE_TABLE ($uid="0", $done='N', $ref='N', $sort="ASC") {
 
        // List entries
        $result = SQL_QUERY("SELECT userid, refid, points, timemark
 
        // List entries
        $result = SQL_QUERY("SELECT userid, refid, points, timemark

-FROM `{!MYSQL_PREFIX!}_doubler`
+FROM `{!_MYSQL_PREFIX!}_doubler`

 WHERE completed='".$done."' AND is_ref='".$ref."'".$ADD."
 ORDER BY timemark ".$sort."
 LIMIT ".$limit, __FILE__, __LINE__);
 WHERE completed='".$done."' AND is_ref='".$ref."'".$ADD."
 ORDER BY timemark ".$sort."
 LIMIT ".$limit, __FILE__, __LINE__);


@@ -75,7 +75,7 @@ LIMIT ".$limit, __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // List entries
                $OUT = ""; $SW = 2;
        if (SQL_NUMROWS($result) > 0) {
                // List entries
                $OUT = ""; $SW = 2;

-               while(list($uid, $rid, $points, $time) = SQL_FETCHROW($result)) {
+               while (list($uid, $rid, $points, $time) = SQL_FETCHROW($result)) {

                        if (IS_ADMIN()) {
                                // Set links to admin area
                                if ($uid > 0) { $uid = ADMIN_USER_PROFILE_LINK($uid); } else { $uid = "---"; }
                        if (IS_ADMIN()) {
                                // Set links to admin area
                                if ($uid > 0) { $uid = ADMIN_USER_PROFILE_LINK($uid); } else { $uid = "---"; }


@@ -123,7 +123,7 @@ function DOUBLER_GET_TOTAL_POINTS_LEFT() {
 
        if (getConfig('doubler_jackpot') == "Y") {
                // Load jackpot
 
        if (getConfig('doubler_jackpot') == "Y") {
                // Load jackpot

-               $result = SQL_QUERY("SELECT points FROM `{!MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);

                list($jackpot) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
                list($jackpot) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index 079e99af891b2ba58f97a42be5c4edc1d581b474..1e74c62d324b27603ebcc0f0f805e48c9a448161 100644 (file)
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 function HOLIDAY_STOP_HOLIDAYS () {
        // Let's find some expired holiday requests...
        $result_stop = SQL_QUERY("SELECT userid, holiday_start, holiday_end, comments
 function HOLIDAY_STOP_HOLIDAYS () {
        // Let's find some expired holiday requests...
        $result_stop = SQL_QUERY("SELECT userid, holiday_start, holiday_end, comments

-FROM `{!MYSQL_PREFIX!}_user_holidays`
+FROM `{!_MYSQL_PREFIX!}_user_holidays`

 WHERE holiday_end <= UNIX_TIMESTAMP()
 ORDER BY userid", __FILE__, __LINE__);
        if (SQL_NUMROWS($result_stop) > 0) {
 WHERE holiday_end <= UNIX_TIMESTAMP()
 ORDER BY userid", __FILE__, __LINE__);
        if (SQL_NUMROWS($result_stop) > 0) {


@@ -49,11 +49,11 @@ ORDER BY userid", __FILE__, __LINE__);
                $admin = "";
                while (list($uid, $start, $end, $comments) = SQL_FETCHROW($result_stop)) {
                        // Stop holiday
                $admin = "";
                while (list($uid, $start, $end, $comments) = SQL_FETCHROW($result_stop)) {
                        // Stop holiday

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_holidays` WHERE userid=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_holidays` WHERE userid=%s LIMIT 1",

                                array(bigintval($uid)), __FILE__, __LINE__);
 
                        // Unlock account
                                array(bigintval($uid)), __FILE__, __LINE__);
 
                        // Unlock account

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data`
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`

 SET holiday_active='N', holiday_activated='0'
 WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 
 SET holiday_active='N', holiday_activated='0'
 WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 

diff --git a/inc/libs/mediadata_functions.php b/inc/libs/mediadata_functions.php
index 48eaa195519d3c4f7f488d0e6800d59f61c7b5ec..50f921272a629b1feac4b19f67fe275f0e249517 100644 (file)
--- a/inc/libs/mediadata_functions.php
+++ b/inc/libs/mediadata_functions.php
@@ -46,12 +46,12 @@ function MEDIA_UPDATE_ENTRY($keys_array, $mode, $value)
                foreach ($keys_array as $key)
                {
                        // First check if it does exist
                foreach ($keys_array as $key)
                {
                        // First check if it does exist

-                       $result_media = SQL_QUERY_ESC("SELECT media_key FROM `{!MYSQL_PREFIX!}_mediadata`
+                       $result_media = SQL_QUERY_ESC("SELECT media_key FROM `{!_MYSQL_PREFIX!}_mediadata`

 WHERE media_key = '%s' LIMIT 1", array($key), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result_media) == 0)
                        {
                                // Not found so we create it (mode will be ignored here!)
 WHERE media_key = '%s' LIMIT 1", array($key), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result_media) == 0)
                        {
                                // Not found so we create it (mode will be ignored here!)

-                               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_mediadata` (media_key, media_value) VALUES ('%s', '%s')",
+                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_mediadata` (media_key, media_value) VALUES ('%s', '%s')",

                                        array($key, $value), __FILE__, __LINE__);
                        }
                         else
                                        array($key, $value), __FILE__, __LINE__);
                        }
                         else


@@ -65,13 +65,13 @@ WHERE media_key = '%s' LIMIT 1", array($key), __FILE__, __LINE__);
                                if ($mode == "init")
                                {
                                        // Initialize entry
                                if ($mode == "init")
                                {
                                        // Initialize entry

-                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_mediadata` SET media_value=%s WHERE media_key='%s' LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_mediadata` SET media_value=%s WHERE media_key='%s' LIMIT 1",

                                                array($value, $key), __FILE__, __LINE__);
                                }
                                 else
                                {
                                        // Update entry
                                                array($value, $key), __FILE__, __LINE__);
                                }
                                 else
                                {
                                        // Update entry

-                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_mediadata` SET media_value=media_value".$mode."%s WHERE media_key='%s' LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_mediadata` SET media_value=media_value".$mode."%s WHERE media_key='%s' LIMIT 1",

                                                array($value, $key), __FILE__, __LINE__);
                                }
                        }
                                                array($value, $key), __FILE__, __LINE__);
                                }
                        }


@@ -85,7 +85,7 @@ function MEDIA_GET_ENTRY($key)
        $value = "";
 
        // Check for entry
        $value = "";
 
        // Check for entry

-       $result = SQL_QUERY_ESC("SELECT media_value FROM `{!MYSQL_PREFIX!}_mediadata` WHERE media_key='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT media_value FROM `{!_MYSQL_PREFIX!}_mediadata` WHERE media_key='%s' LIMIT 1",

                array($key), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load data
                array($key), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load data

diff --git a/inc/libs/nickname_functions.php b/inc/libs/nickname_functions.php
index c9a44dec6bca6f9b899c0fd8e591ea119b67017b..d218289fd562dc5105cb00cac1b524ceee126da9 100644 (file)
--- a/inc/libs/nickname_functions.php
+++ b/inc/libs/nickname_functions.php
@@ -54,7 +54,7 @@ function NICKNAME_IS_ACTIVE ($uidNick) {
        } else {
                // Search in database
                // @TODO Can we replace this with GET_TOTAL_DATA() ?
        } else {
                // Search in database
                // @TODO Can we replace this with GET_TOTAL_DATA() ?

-               $result = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s OR nickname='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s OR nickname='%s' LIMIT 1",

                        array(bigintval($uidNick), $uidNick), __FILE__, __LINE__);
 
                // Check existence of nickname
                        array(bigintval($uidNick), $uidNick), __FILE__, __LINE__);
 
                // Check existence of nickname


@@ -87,7 +87,7 @@ function NICKNAME_GET_NICK ($userid) {
                incrementConfigEntry('cache_hits');
        } elseif (NICKNAME_IS_ACTIVE($userid)) {
                // Search for non-empty nickname
                incrementConfigEntry('cache_hits');
        } elseif (NICKNAME_IS_ACTIVE($userid)) {
                // Search for non-empty nickname

-               $result = SQL_QUERY_ESC("SELECT nickname FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s AND nickname != '' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT nickname FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND nickname != '' LIMIT 1",

                        array(bigintval($userid)), __FILE__, __LINE__);
 
                // Found?
                        array(bigintval($userid)), __FILE__, __LINE__);
 
                // Found?

diff --git a/inc/libs/online_functions.php b/inc/libs/online_functions.php
index 9b8fcbe9d1fc9a943564d8892faf963d35dbbf69..4e43875e37ba39023023ebd862532f89f6a7d915 100644 (file)
--- a/inc/libs/online_functions.php
+++ b/inc/libs/online_functions.php
@@ -73,13 +73,13 @@ function FILTER_UPDATE_ONLINE_LIST () {
        } // END - if
 
        // Now search for the user
        } // END - if
 
        // Now search for the user

-       $result = SQL_QUERY_ESC("SELECT timestamp FROM `{!MYSQL_PREFIX!}_online` WHERE sid='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT timestamp FROM `{!_MYSQL_PREFIX!}_online` WHERE sid='%s' LIMIT 1",

                array($PHPSESSID), __FILE__, __LINE__);
 
        // Entry found?
        if (SQL_NUMROWS($result) == 1) {
                // Then update it
                array($PHPSESSID), __FILE__, __LINE__);
 
        // Entry found?
        if (SQL_NUMROWS($result) == 1) {
                // Then update it

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_online` SET
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_online` SET

 module='%s',
 action='%s',
 what='%s',
 module='%s',
 action='%s',
 what='%s',


@@ -104,7 +104,7 @@ WHERE sid='%s' LIMIT 1",
                );
        } else {
                // No entry does exists so we simply add it!
                );
        } else {
                // No entry does exists so we simply add it!

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_online` (module, action, what, userid, refid, is_member, is_admin, timestamp, sid, ip) VALUES ('%s','%s','%s', %s, %s, '%s','%s', UNIX_TIMESTAMP(), '%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_online` (module, action, what, userid, refid, is_member, is_admin, timestamp, sid, ip) VALUES ('%s','%s','%s', %s, %s, '%s','%s', UNIX_TIMESTAMP(), '%s','%s')",

                        array(
                                $GLOBALS['module'],
                                $GLOBALS['action'],
                        array(
                                $GLOBALS['module'],
                                $GLOBALS['action'],


@@ -123,7 +123,7 @@ WHERE sid='%s' LIMIT 1",
        SQL_FREERESULT($result);
 
        // Purge old entries
        SQL_FREERESULT($result);
 
        // Purge old entries

-       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_online` WHERE timestamp <= (UNIX_TIMESTAMP() - %s)",
+       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_online` WHERE timestamp <= (UNIX_TIMESTAMP() - %s)",

                array(getConfig('online_timeout')), __FILE__, __LINE__);
 }
 
                array(getConfig('online_timeout')), __FILE__, __LINE__);
 }
 

diff --git a/inc/libs/optimize_functions.php b/inc/libs/optimize_functions.php
index e6f2101f9219f1795c57753ee91037da9bc9d662..5c953dd061b2d4b95862af4e6aa38d448610777e 100644 (file)
--- a/inc/libs/optimize_functions.php
+++ b/inc/libs/optimize_functions.php
@@ -85,10 +85,10 @@ function REPAIR_OPTIMIZE_DB()
        $ret['total_gain'] = $total_gain;
 
        // Insert new row
        $ret['total_gain'] = $total_gain;
 
        // Insert new row

-       $result = SQL_QUERY("INSERT INTO `{!MYSQL_PREFIX!}_optimize_gain` (gain) VALUES ('".$total_gain."')", __FILE__, __LINE__);
+       $result = SQL_QUERY("INSERT INTO `{!_MYSQL_PREFIX!}_optimize_gain` (gain) VALUES ('".$total_gain."')", __FILE__, __LINE__);

 
        // Get total runs and total optimization count
 
        // Get total runs and total optimization count

-       $result = SQL_QUERY("SELECT COUNT(id) AS rows, SUM(gain) AS opti FROM `{!MYSQL_PREFIX!}_optimize_gain`", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT COUNT(id) AS rows, SUM(gain) AS opti FROM `{!_MYSQL_PREFIX!}_optimize_gain`", __FILE__, __LINE__);

        list($total_rows, $total_opti) = SQL_FETCHROW($result);
 
        // Free memory
        list($total_rows, $total_opti) = SQL_FETCHROW($result);
 
        // Free memory

diff --git a/inc/libs/payout_functions.php b/inc/libs/payout_functions.php
index 088a0b4eed8503819fc61d060377735bf6bc0a49..ae0c105121c57e651421e65b277e81d82444b4fc 100644 (file)
--- a/inc/libs/payout_functions.php
+++ b/inc/libs/payout_functions.php
@@ -44,12 +44,12 @@ function PAYOUT_OUTPUT_PAYOUT_LIST ($points) {
        if ($points > 0) {
                // Pay this out!
                $result = SQL_QUERY_ESC("SELECT id, type, rate, min_points
        if ($points > 0) {
                // Pay this out!
                $result = SQL_QUERY_ESC("SELECT id, type, rate, min_points

-FROM `{!MYSQL_PREFIX!}_payout_types`
+FROM `{!_MYSQL_PREFIX!}_payout_types`

 WHERE %s >= min_points
 ORDER BY type", array($points), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) > 0) {
                        OUTPUT_HTML("<br /><div align=\"center\">
 WHERE %s >= min_points
 ORDER BY type", array($points), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) > 0) {
                        OUTPUT_HTML("<br /><div align=\"center\">

-<div align=\"center\"><strong>".PAYOUT_NOW.":</strong></div><br />
+<div align=\"center\"><strong>{!PAYOUT_NOW!}:</strong></div><br />

 <ul>");
                        // Now let's check
                        while (list($id, $type, $rate, $mpoi) = SQL_FETCHROW($result)) {
 <ul>");
                        // Now let's check
                        while (list($id, $type, $rate, $mpoi) = SQL_FETCHROW($result)) {


@@ -57,20 +57,21 @@ ORDER BY type", array($points), __FILE__, __LINE__);
                                if ($points >= $mpoi) {
                                        // Ok we found one
                                        $P = $points * $rate - 0.5;
                                if ($points >= $mpoi) {
                                        // Ok we found one
                                        $P = $points * $rate - 0.5;

-                                       OUTPUT_HTML("<li>".PAYOUT_IN.": <strong><a href=\"".URL."/modules.php?module=login&amp;what=payout&amp;payout=".$id."\">".$type." (".PAYOUT_MAX." ".round($P)." ".$type.")</a></strong></li>");
+                                       OUTPUT_HTML("<li>{!PAYOUT_IN!}: <strong><a href=\"{!URL!}/modules.php?module=login&amp;what=payout&amp;payout=".$id."\">".$type." (".PAYOUT_MAX." ".round($P)." ".$type.")</a></strong></li>");

                                }
                        }
 
                                }
                        }
 

-                       // Free memory
-                       SQL_FREERESULT($result);

                        OUTPUT_HTML("</ul></div>");
                } else {
                        // No payout types setup so far
                        OUTPUT_HTML("</ul></div>");
                } else {
                        // No payout types setup so far

-                       LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"guest_failed\">".PAYOUT_NO_PAYOUT_TYPES."</div");
+                       LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"guest_failed\">{!PAYOUT_NO_PAYOUT_TYPES!}</div");

                }
                }

+
+               // Free memory
+               SQL_FREERESULT($result);

        } else {
                // Points is empty
        } else {
                // Points is empty

-               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"guest_failed\">".PAYOUT_NO_POINTS_ENTERED."</div");
+               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"guest_failed\">{!PAYOUT_NO_POINTS_ENTERED!}</div");

        }
 }
 
        }
 }
 

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 7d41947db686ab0b5247993c97662f7b78ed6d27..4389864886a7960d21cee430ff6d6e713bb377d1 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -49,11 +49,11 @@ function RALLYE_AUTOSTART_RALLYES($result)
        SQL_FREERESULT($result);
 
        // Set notified to Y
        SQL_FREERESULT($result);
 
        // Set notified to Y

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_rallye_data` SET notified='Y' WHERE id=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET notified='Y' WHERE id=%s LIMIT 1",

                array(bigintval($id)), __FILE__, __LINE__);
 
        // Do a snapshot off all user refs
                array(bigintval($id)), __FILE__, __LINE__);
 
        // Do a snapshot off all user refs

-       $result_user = SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
+       $result_user = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);

 
        // Transfer all neccessary data to the global $DATA array
        $DATA['uid_cnt']    = SQL_NUMROWS($result_user);
 
        // Transfer all neccessary data to the global $DATA array
        $DATA['uid_cnt']    = SQL_NUMROWS($result_user);


@@ -91,7 +91,7 @@ function RALLYE_AUTOSTART_RALLYES($result)
                if (empty($cnt)) $cnt = 0; // Added prevent some unknown troubles... :-?
 
                // Check if line is already included...
                if (empty($cnt)) $cnt = 0; // Added prevent some unknown troubles... :-?
 
                // Check if line is already included...

-               $result_ref = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s AND userid=%s LIMIT 1",
+               $result_ref = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s AND userid=%s LIMIT 1",

                        array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result_ref) == 0) {
                        // Free memory
                        array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result_ref) == 0) {
                        // Free memory


@@ -99,8 +99,8 @@ function RALLYE_AUTOSTART_RALLYES($result)
 
                        // Add userid and his ref count to table
                        $result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(p.points)
 
                        // Add userid and his ref count to table
                        $result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(p.points)

-FROM `{!MYSQL_PREFIX!}_user_points` AS p
-LEFT JOIN `{!MYSQL_PREFIX!}_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_user_points` AS p
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d

 ON p.userid=d.userid
 WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
  array(getConfig('ref_payout'), bigintval($uid)), __FILE__, __LINE__);
 ON p.userid=d.userid
 WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
  array(getConfig('ref_payout'), bigintval($uid)), __FILE__, __LINE__);


@@ -110,7 +110,7 @@ WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p
                        if (empty($cpoints)) $cpoints = "0.00000";
 
                        // Add info line
                        if (empty($cpoints)) $cpoints = "0.00000";
 
                        // Add info line

-                       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_rallye_users` (rallye_id, userid, refs, curr_points)
+                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_rallye_users` (rallye_id, userid, refs, curr_points)

 VALUES ('%s','%s','%s','%s')",
                                array(bigintval($id), bigintval($uid), bigintval($cnt), $cpoints), __FILE__, __LINE__);
                        $un = true;
 VALUES ('%s','%s','%s','%s')",
                                array(bigintval($id), bigintval($uid), bigintval($cnt), $cpoints), __FILE__, __LINE__);
                        $un = true;


@@ -147,7 +147,7 @@ function RALLYE_ADD_PRICES($rallye,$mode="email")
        }
 
        // Load prices
        }
 
        // Load prices

-       $result_prices = SQL_QUERY("SELECT price_level, points, info FROM `{!MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id='".$rallye."' ORDER BY price_level", __FILE__, __LINE__);
+       $result_prices = SQL_QUERY("SELECT price_level, points, info FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id='".$rallye."' ORDER BY price_level", __FILE__, __LINE__);

        if (SQL_NUMROWS($result_prices) > 0)
        {
                // Load prices
        if (SQL_NUMROWS($result_prices) > 0)
        {
                // Load prices


@@ -185,14 +185,14 @@ function RALLYE_ADD_PRICES($rallye,$mode="email")
 function RALLYE_ADD_TOPUSERS($rallye,$default=0)
 {
        // First check how many prices are set
 function RALLYE_ADD_TOPUSERS($rallye,$default=0)
 {
        // First check how many prices are set

-       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s ORDER BY price_level",
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s ORDER BY price_level",

         array(bigintval($rallye)), __FILE__, __LINE__);
        $prices = SQL_NUMROWS($result);
        SQL_FREERESULT($result);
 
        // And load only limited users
         array(bigintval($rallye)), __FILE__, __LINE__);
        $prices = SQL_NUMROWS($result);
        SQL_FREERESULT($result);
 
        // And load only limited users

-       $result = SQL_QUERY_ESC("SELECT DISTINCT u.userid, u.refs, u.curr_points FROM `{!MYSQL_PREFIX!}_rallye_users` AS u
-LEFT JOIN `{!MYSQL_PREFIX!}_refsystem` AS r
+       $result = SQL_QUERY_ESC("SELECT DISTINCT u.userid, u.refs, u.curr_points FROM `{!_MYSQL_PREFIX!}_rallye_users` AS u
+LEFT JOIN `{!_MYSQL_PREFIX!}_refsystem` AS r

 ON u.userid=r.userid
 WHERE u.rallye_id=%s AND r.counter > 0 ORDER BY u.refs DESC",
  array(bigintval($rallye)), __FILE__, __LINE__);
 ON u.userid=r.userid
 WHERE u.rallye_id=%s AND r.counter > 0 ORDER BY u.refs DESC",
  array(bigintval($rallye)), __FILE__, __LINE__);


@@ -204,14 +204,14 @@ WHERE u.rallye_id=%s AND r.counter > 0 ORDER BY u.refs DESC",
                'cpoints'  => array()
        );
 
                'cpoints'  => array()
        );
 

-       while(list($uid, $refs, $cpoints) = SQL_FETCHROW($result))
+       while (list($uid, $refs, $cpoints) = SQL_FETCHROW($result))

        {
                // Get current refs
                $cnt = RALLYE_GET_REFCOUNT($uid, $refs);
 
                // Points of ref's
        {
                // Get current refs
                $cnt = RALLYE_GET_REFCOUNT($uid, $refs);
 
                // Points of ref's

-               $result_ref = SQL_QUERY_ESC("SELECT DISTINCT p.points FROM `{!MYSQL_PREFIX!}_user_points` AS p
-LEFT JOIN `{!MYSQL_PREFIX!}_user_data` AS d
+               $result_ref = SQL_QUERY_ESC("SELECT DISTINCT p.points FROM `{!_MYSQL_PREFIX!}_user_points` AS p
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d

 ON p.userid=d.userid
 WHERE d.userid=%s AND d.status='CONFIRMED' AND p.ref_depth=1 AND d.max_mails > 0 AND d.mails_confirmed >= %s
 LIMIT 1", array(bigintval($uid), getConfig('ref_payout')), __FILE__, __LINE__);
 ON p.userid=d.userid
 WHERE d.userid=%s AND d.status='CONFIRMED' AND p.ref_depth=1 AND d.max_mails > 0 AND d.mails_confirmed >= %s
 LIMIT 1", array(bigintval($uid), getConfig('ref_payout')), __FILE__, __LINE__);


@@ -279,7 +279,7 @@ function RALLYE_AUTOADD_USER($uid)
        } // END - if
 
        // Check for an auto-add rallye
        } // END - if
 
        // Check for an auto-add rallye

-       $result = SQL_QUERY("SELECT id, title, start_time, end_time, send_notify".$ADD." FROM `{!MYSQL_PREFIX!}_rallye_data` WHERE is_active='Y' AND notified='Y' AND auto_add_new_user='Y' AND expired='N' LIMIT 1", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, title, start_time, end_time, send_notify".$ADD." FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE is_active='Y' AND notified='Y' AND auto_add_new_user='Y' AND expired='N' LIMIT 1", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) == 1) {
                // Init variables
                $min_users = 0; $min_prices = 0;
        if (SQL_NUMROWS($result) == 1) {
                // Init variables
                $min_users = 0; $min_prices = 0;


@@ -294,13 +294,13 @@ function RALLYE_AUTOADD_USER($uid)
                SQL_FREERESULT($result);
 
                // Check if line is already included...
                SQL_FREERESULT($result);
 
                // Check if line is already included...

-               $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s AND userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s AND userid=%s LIMIT 1",

                        array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
 
                // Is this user added?
                if (SQL_NUMROWS($result) == 0) {
                        // Add userid and his ref count to table
                        array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
 
                // Is this user added?
                if (SQL_NUMROWS($result) == 0) {
                        // Add userid and his ref count to table

-                       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_rallye_users` (rallye_id, userid, refs)
+                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_rallye_users` (rallye_id, userid, refs)

 VALUES ('%s','%s','0')",
  array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
                } else {
 VALUES ('%s','%s','0')",
  array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
                } else {


@@ -370,7 +370,7 @@ function RALLYE_EXPIRE_RALLYES($result)
                //   active = 1: account is still confirmed
                //   active = 0: account is deleted or locked
                $result = SQL_QUERY_ESC("SELECT COUNT(userid) AS active
                //   active = 1: account is still confirmed
                //   active = 0: account is deleted or locked
                $result = SQL_QUERY_ESC("SELECT COUNT(userid) AS active

-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE userid=%s AND status='CONFIRMED'
 LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
                list($active) = SQL_FETCHROW($result);
 WHERE userid=%s AND status='CONFIRMED'
 LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
                list($active) = SQL_FETCHROW($result);


@@ -391,7 +391,7 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
        } // END - if
 
        // Expire rallye
        } // END - if
 
        // Expire rallye

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_rallye_data` SET expired='Y' WHERE id=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET expired='Y' WHERE id=%s LIMIT 1",

                array(bigintval($id)), __FILE__, __LINE__);
 
        // Run array through (by uid is the most important 2nd-level-array)
                array(bigintval($id)), __FILE__, __LINE__);
 
        // Run array through (by uid is the most important 2nd-level-array)


@@ -461,7 +461,7 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
        SEND_ADMIN_NOTIFICATION(RALLYE_ADMIN_EXPIRED.": ".$title, $templ, $cnt, 0);
 
        // Add task
        SEND_ADMIN_NOTIFICATION(RALLYE_ADMIN_EXPIRED.": ".$title, $templ, $cnt, 0);
 
        // Add task

-       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_task_system` (status, task_type, subject, text, task_created)
+       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (status, task_type, subject, text, task_created)

 VALUES ('NEW','RALLYE_EXPIRED','".RALLYE_ADMIN_EXPIRED.": %s','".RALLYE_ADMIN_EXPIRED_TEXT."',UNIX_TIMESTAMP())",
  array($title), __FILE__, __LINE__);
 
 VALUES ('NEW','RALLYE_EXPIRED','".RALLYE_ADMIN_EXPIRED.": %s','".RALLYE_ADMIN_EXPIRED_TEXT."',UNIX_TIMESTAMP())",
  array($title), __FILE__, __LINE__);
 


@@ -474,7 +474,7 @@ function RALLYE_LOAD_USER_DATA($uids_array)
        $uid_string = implode(",", $uids_array['uid']);
 
        // Load users
        $uid_string = implode(",", $uids_array['uid']);
 
        // Load users

-       $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid IN(%s) AND status='CONFIRMED' ORDER BY userid LIMIT %s",
+       $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid IN(%s) AND status='CONFIRMED' ORDER BY userid LIMIT %s",

         array($uid_string, count($uids_array)), __FILE__, __LINE__);
        $ret = "";
        while (list($u, $gender, $surname, $family, $email) = SQL_FETCHROW($result))
         array($uid_string, count($uids_array)), __FILE__, __LINE__);
        $ret = "";
        while (list($u, $gender, $surname, $family, $email) = SQL_FETCHROW($result))


@@ -496,9 +496,9 @@ function RALLYE_LOAD_PRICES_ARRAY($rallye)
        );
 
        // Load prices
        );
 
        // Load prices

-       $result = SQL_QUERY_ESC("SELECT price_level, points, info FROM `{!MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s ORDER BY price_level",
+       $result = SQL_QUERY_ESC("SELECT price_level, points, info FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s ORDER BY price_level",

         array(bigintval($rallye)), __FILE__, __LINE__);
         array(bigintval($rallye)), __FILE__, __LINE__);

-       while(list($level, $points, $info) = SQL_FETCHROW($result))
+       while (list($level, $points, $info) = SQL_FETCHROW($result))

        {
                $prices['level'][]  = $level;
                $prices['points'][] = $points;
        {
                $prices['level'][]  = $level;
                $prices['points'][] = $points;


@@ -527,7 +527,7 @@ function RALLYE_LOAD_USERS_ARRAY ($rallye) {
        );
 
        // Load users                          uid    old  points earned
        );
 
        // Load users                          uid    old  points earned

-       $result_user = SQL_QUERY_ESC("SELECT userid, refs, curr_points FROM `{!MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s ORDER BY userid",
+       $result_user = SQL_QUERY_ESC("SELECT userid, refs, curr_points FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s ORDER BY userid",

                array(bigintval($rallye)), __FILE__, __LINE__);
        while (list($uid, $refs, $cpoints) = SQL_FETCHROW($result_user)) {
                // Load current ref count
                array(bigintval($rallye)), __FILE__, __LINE__);
        while (list($uid, $refs, $cpoints) = SQL_FETCHROW($result_user)) {
                // Load current ref count


@@ -535,8 +535,8 @@ function RALLYE_LOAD_USERS_ARRAY ($rallye) {
 
                // Points of ref's
                $result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(p.points)
 
                // Points of ref's
                $result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(p.points)

-FROM `{!MYSQL_PREFIX!}_user_points` AS p
-LEFT JOIN `{!MYSQL_PREFIX!}_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_user_points` AS p
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d

 ON p.userid=d.userid
 WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
                        array(getConfig('ref_payout'), bigintval($uid)), __FILE__, __LINE__);
 ON p.userid=d.userid
 WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
                        array(getConfig('ref_payout'), bigintval($uid)), __FILE__, __LINE__);


@@ -579,7 +579,7 @@ WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p
 //
 function RALLYE_LIST_WINNERS ($rallye, $default=0) {
        // First check how many prices are set
 //
 function RALLYE_LIST_WINNERS ($rallye, $default=0) {
        // First check how many prices are set

-       $result_prices = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s ORDER BY price_level",
+       $result_prices = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s ORDER BY price_level",

         array(bigintval($rallye)), __FILE__, __LINE__);
        $prices = SQL_NUMROWS($result_prices);
        SQL_FREERESULT($result_prices);
         array(bigintval($rallye)), __FILE__, __LINE__);
        $prices = SQL_NUMROWS($result_prices);
        SQL_FREERESULT($result_prices);


@@ -595,7 +595,7 @@ function RALLYE_LIST_WINNERS ($rallye, $default=0) {
                // Check status
                //   active = 1: account is still confirmed
                //   active = 0: account is deleted or locked
                // Check status
                //   active = 1: account is still confirmed
                //   active = 0: account is deleted or locked

-               $result_active = SQL_QUERY_ESC("SELECT COUNT(userid) FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+               $result_active = SQL_QUERY_ESC("SELECT COUNT(userid) FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",

                 array(bigintval($DATA['uid'][$idx])), __FILE__, __LINE__);
                list($active) = SQL_FETCHROW($result_active);
                SQL_FREERESULT($result_active);
                 array(bigintval($DATA['uid'][$idx])), __FILE__, __LINE__);
                list($active) = SQL_FETCHROW($result_active);
                SQL_FREERESULT($result_active);


@@ -654,14 +654,14 @@ function RALLYE_DELETE_EXPIRED_RALLYES()
        // Check for expired rallyes
        $EXPIRE = getConfig('one_day') * 3; // @TODO The hard-coded value...
        $result_rallye = SQL_QUERY_ESC("SELECT id, title, start_time, end_time
        // Check for expired rallyes
        $EXPIRE = getConfig('one_day') * 3; // @TODO The hard-coded value...
        $result_rallye = SQL_QUERY_ESC("SELECT id, title, start_time, end_time

-FROM `{!MYSQL_PREFIX!}_rallye_data`
+FROM `{!_MYSQL_PREFIX!}_rallye_data`

 WHERE end_time <= (UNIX_TIMESTAMP() - %s) AND expired='Y'",
                array($EXPIRE), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result_rallye) > 0)
        {
                // Expire found rallyes and notify admin
 WHERE end_time <= (UNIX_TIMESTAMP() - %s) AND expired='Y'",
                array($EXPIRE), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result_rallye) > 0)
        {
                // Expire found rallyes and notify admin

-               while(list($id, $title, $start, $end) = SQL_FETCHROW($result_rallye))
+               while (list($id, $title, $start, $end) = SQL_FETCHROW($result_rallye))

                {
                        // Prepare data for mail template
                        $DATA['title']  = $title;
                {
                        // Prepare data for mail template
                        $DATA['title']  = $title;


@@ -673,16 +673,16 @@ WHERE end_time <= (UNIX_TIMESTAMP() - %s) AND expired='Y'",
                        SEND_ADMIN_NOTIFICATION(RALLYE_ADMIN_PURGED.": ".$title, "admin_rallye_purged", "", 0);
 
                        // Purge whole rallye
                        SEND_ADMIN_NOTIFICATION(RALLYE_ADMIN_PURGED.": ".$title, "admin_rallye_purged", "", 0);
 
                        // Purge whole rallye

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_rallye_data` WHERE id=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE id=%s LIMIT 1",

                                array(bigintval($id)), __FILE__, __LINE__);
                                array(bigintval($id)), __FILE__, __LINE__);

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s LIMIT 1",

                                array(bigintval($id)), __FILE__, __LINE__);
                                array(bigintval($id)), __FILE__, __LINE__);

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s LIMIT 1",

                                array(bigintval($id)), __FILE__, __LINE__);
                }
 
                // Add task
                                array(bigintval($id)), __FILE__, __LINE__);
                }
 
                // Add task

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_task_system` (status, task_type, subject, text, task_created)
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (status, task_type, subject, text, task_created)

 VALUES ('NEW','RALLYE_PURGED','".RALLYE_ADMIN_PURGED.": %s','".RALLYE_ADMIN_PURGED_TEXT."',UNIX_TIMESTAMP())",
                        array($title), __FILE__, __LINE__);
        }
 VALUES ('NEW','RALLYE_PURGED','".RALLYE_ADMIN_PURGED.": %s','".RALLYE_ADMIN_PURGED_TEXT."',UNIX_TIMESTAMP())",
                        array($title), __FILE__, __LINE__);
        }


@@ -781,8 +781,8 @@ function RALLYE_GET_REFCOUNT($uid, $old=0) {
        } else {
                // Load current refs from database
                $result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(s.counter) AS cnt
        } else {
                // Load current refs from database
                $result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(s.counter) AS cnt

-FROM `{!MYSQL_PREFIX!}_refsystem` AS s
-LEFT JOIN `{!MYSQL_PREFIX!}_refdepths` AS d
+FROM `{!_MYSQL_PREFIX!}_refsystem` AS s
+LEFT JOIN `{!_MYSQL_PREFIX!}_refdepths` AS d

 ON s.level=d.level
 WHERE s.userid=%s AND s.level=1", array(bigintval($uid)), __FILE__, __LINE__);
                list($cnt) = SQL_FETCHROW($result_ref);
 ON s.level=d.level
 WHERE s.userid=%s AND s.level=1", array(bigintval($uid)), __FILE__, __LINE__);
                list($cnt) = SQL_FETCHROW($result_ref);

diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php
index 2c7c17b3a0e1ccabc866b1ad84ffc2c93b6d305b..8dd3c2267189897f332aba1bc7011fc1ff5d7493 100644 (file)
--- a/inc/libs/refback_functions.php
+++ b/inc/libs/refback_functions.php
@@ -49,7 +49,7 @@ function ADD_REFBACK_POINTS ($uid, $ref, $points, $ref_points) {
        $return = $points;
 
        // Get all ref levels
        $return = $points;
 
        // Get all ref levels

-       $result_refs = SQL_QUERY("SELECT level, percents FROM `{!MYSQL_PREFIX!}_refdepths` WHERE level > 0 ORDER BY level ASC", __FILE__, __LINE__);
+       $result_refs = SQL_QUERY("SELECT level, percents FROM `{!_MYSQL_PREFIX!}_refdepths` WHERE level > 0 ORDER BY level ASC", __FILE__, __LINE__);

 
        // "Walk" through all level
        while (list($level, $perc) = SQL_FETCHROW($result_refs)) {
 
        // "Walk" through all level
        while (list($level, $perc) = SQL_FETCHROW($result_refs)) {


@@ -73,7 +73,7 @@ function ADD_REFBACK_POINTS ($uid, $ref, $points, $ref_points) {
                                $refback = $points * ($perc / 100) * ($percents / 100);
 
                                // Update refback table ("refid" and "uid" must be exchanged!)
                                $refback = $points * ($perc / 100) * ($percents / 100);
 
                                // Update refback table ("refid" and "uid" must be exchanged!)

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_refs` SET points=points+%s WHERE userid=%s AND refid=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_refs` SET points=points+%s WHERE userid=%s AND refid=%s LIMIT 1",

                                        array($refback, $refid, $uid), __FILE__, __LINE__);
                                //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):refback={$refback},uid={$uid},refid={$refid} - UPDATE! (".SQL_AFFECTEDROWS().")<br />\n";
 
                                        array($refback, $refid, $uid), __FILE__, __LINE__);
                                //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):refback={$refback},uid={$uid},refid={$refid} - UPDATE! (".SQL_AFFECTEDROWS().")<br />\n";
 


@@ -112,7 +112,7 @@ function GET_REFBACK_PERCENTS ($uid, $ref) {
        $percents = 0;
 
        // Get percents from database
        $percents = 0;
 
        // Get percents from database

-       $result = SQL_QUERY_ESC("SELECT refback FROM `{!MYSQL_PREFIX!}_user_refs` WHERE userid=%s AND refid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT refback FROM `{!_MYSQL_PREFIX!}_user_refs` WHERE userid=%s AND refid=%s LIMIT 1",

                array($ref, $uid), __FILE__, __LINE__);
 
        // Entry found? (Should be!)
                array($ref, $uid), __FILE__, __LINE__);
 
        // Entry found? (Should be!)


@@ -142,7 +142,7 @@ function GET_REFBACK_USERID_ARRAY ($rid, $level) {
 
        // Look for all
        $result = SQL_QUERY_ESC("SELECT userid
 
        // Look for all
        $result = SQL_QUERY_ESC("SELECT userid

-FROM `{!MYSQL_PREFIX!}_user_refs`
+FROM `{!_MYSQL_PREFIX!}_user_refs`

 WHERE refid=%s AND level=%s
 ORDER BY userid ASC",
                array($rid,$level), __FILE__, __LINE__);
 WHERE refid=%s AND level=%s
 ORDER BY userid ASC",
                array($rid,$level), __FILE__, __LINE__);


@@ -179,14 +179,14 @@ function UPDATE_REFBACK_TABLE($uid) {
        $old = 0; $minus = 0;
 
        // Check for his referal
        $old = 0; $minus = 0;
 
        // Check for his referal

-       $result_refid = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE refid=%s ORDER BY userid ASC",
+       $result_refid = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE refid=%s ORDER BY userid ASC",

                array(bigintval($uid)), __FILE__, __LINE__);
 
        // When no entry was updated then we have to create it here
        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):found=".SQL_NUMROWS($result_refid)."<br />\n";
        if (SQL_NUMROWS($result_refid) > 0) {
                // Load all refids
                array(bigintval($uid)), __FILE__, __LINE__);
 
        // When no entry was updated then we have to create it here
        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):found=".SQL_NUMROWS($result_refid)."<br />\n";
        if (SQL_NUMROWS($result_refid) > 0) {
                // Load all refids

-               while(list($cacheArray['up_refid'][$cacheArray['back_level']]) = SQL_FETCHROW($result_refid)) {
+               while (list($cacheArray['up_refid'][$cacheArray['back_level']]) = SQL_FETCHROW($result_refid)) {

                        // Remmber userid
                        $cacheArray['up_userid'][$cacheArray['up_refid'][$cacheArray['back_level']]] = $uid;
 
                        // Remmber userid
                        $cacheArray['up_userid'][$cacheArray['up_refid'][$cacheArray['back_level']]] = $uid;
 


@@ -203,7 +203,7 @@ function UPDATE_REFBACK_TABLE($uid) {
                                } // END - if
 
                                // Check existence
                                } // END - if
 
                                // Check existence

-                               $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_refs` WHERE userid=%s AND level='%s' AND refid=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_refs` WHERE userid=%s AND level='%s' AND refid=%s LIMIT 1",

                                        array(bigintval($uid), $cacheArray['back_level'], bigintval($cacheArray['up_refid'][$cacheArray['back_level']])), __FILE__, __LINE__);
 
                                // Do we have no entry?
                                        array(bigintval($uid), $cacheArray['back_level'], bigintval($cacheArray['up_refid'][$cacheArray['back_level']])), __FILE__, __LINE__);
 
                                // Do we have no entry?


@@ -211,7 +211,7 @@ function UPDATE_REFBACK_TABLE($uid) {
                                if (SQL_NUMROWS($result) == 0) {
                                        // Insert this level
                                        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},level={$cacheArray['back_level']},ref={$cacheArray['up_refid'][$cacheArray['back_level']]} - ADD!<br />\n";
                                if (SQL_NUMROWS($result) == 0) {
                                        // Insert this level
                                        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},level={$cacheArray['back_level']},ref={$cacheArray['up_refid'][$cacheArray['back_level']]} - ADD!<br />\n";

-                                       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_refs` (userid,level,refid) VALUES (%s,%s,%s)",
+                                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_refs` (userid,level,refid) VALUES (%s,%s,%s)",

                                                array(bigintval($uid), $cacheArray['back_level'], bigintval($cacheArray['up_refid'][$cacheArray['back_level']])), __FILE__, __LINE__);
 
                                        // Move to next referal level and count his counter one up!
                                                array(bigintval($uid), $cacheArray['back_level'], bigintval($cacheArray['up_refid'][$cacheArray['back_level']])), __FILE__, __LINE__);
 
                                        // Move to next referal level and count his counter one up!


@@ -224,14 +224,14 @@ function UPDATE_REFBACK_TABLE($uid) {
                                        $uid = $old;
 
                                        // Shall we add this as well?
                                        $uid = $old;
 
                                        // Shall we add this as well?

-                                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_refs` WHERE userid=%s AND level='%s' AND refid=%s LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_refs` WHERE userid=%s AND level='%s' AND refid=%s LIMIT 1",

                                                array(bigintval($uid), ($cacheArray['back_level']-$minus), bigintval($cacheArray['up_refid'][$cacheArray['back_level']])), __FILE__, __LINE__);
 
                                        // Do we have no entry?
                                        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},level=".($cacheArray['back_level']-$minus).",ref={$cacheArray['up_refid'][$cacheArray['back_level']]},numRows=".SQL_NUMROWS($result)." - BACK!<br />\n";
                                        if (SQL_NUMROWS($result) == 0) {
                                                // Insert this level
                                                array(bigintval($uid), ($cacheArray['back_level']-$minus), bigintval($cacheArray['up_refid'][$cacheArray['back_level']])), __FILE__, __LINE__);
 
                                        // Do we have no entry?
                                        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},level=".($cacheArray['back_level']-$minus).",ref={$cacheArray['up_refid'][$cacheArray['back_level']]},numRows=".SQL_NUMROWS($result)." - BACK!<br />\n";
                                        if (SQL_NUMROWS($result) == 0) {
                                                // Insert this level

-                                               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_refs` (userid,level,refid) VALUES (%s,%s,%s)",
+                                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_refs` (userid,level,refid) VALUES (%s,%s,%s)",

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


@@ -274,8 +274,8 @@ function GET_USER_REFS ($uid, $level) {
 
        // Get refs from database
        $result = SQL_QUERY_ESC("SELECT r.id, r.refid, r.refback, r.points, d.status".$ADD."
 
        // Get refs from database
        $result = SQL_QUERY_ESC("SELECT r.id, r.refid, r.refback, r.points, d.status".$ADD."

-FROM `{!MYSQL_PREFIX!}_user_refs` AS r
-LEFT JOIN `{!MYSQL_PREFIX!}_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_user_refs` AS r
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d

 ON r.refid=d.userid
 WHERE r.userid=%s AND r.level=%s
 ORDER BY r.refid ASC",
 ON r.refid=d.userid
 WHERE r.userid=%s AND r.level=%s
 ORDER BY r.refid ASC",


@@ -307,7 +307,7 @@ function GET_USER_REF_ENTRY ($id) {
        $id = bigintval($id);
 
        // Get entry from database
        $id = bigintval($id);
 
        // Get entry from database

-       $result = SQL_QUERY_ESC("SELECT id, refid, refback, level FROM `{!MYSQL_PREFIX!}_user_refs` WHERE id=%s AND userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id, refid, refback, level FROM `{!_MYSQL_PREFIX!}_user_refs` WHERE id=%s AND userid=%s LIMIT 1",

                array($id, $GLOBALS['userid']), __FILE__, __LINE__);
 
        // Is there an entry?
                array($id, $GLOBALS['userid']), __FILE__, __LINE__);
 
        // Is there an entry?


@@ -358,7 +358,7 @@ function REFBACK_CHANGE_MEMBER_PERCENTS ($id, $percents) {
        $percents = REVERT_COMMA($percents);
 
        // Update entry
        $percents = REVERT_COMMA($percents);
 
        // Update entry

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_refs` SET refback='%s' WHERE id=%s AND userid=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_refs` SET refback='%s' WHERE id=%s AND userid=%s LIMIT 1",

                array($percents, $id, $GLOBALS['userid']), __FILE__, __LINE__);
 
        // Entry updated?
                array($percents, $id, $GLOBALS['userid']), __FILE__, __LINE__);
 
        // Entry updated?

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 0564fb375ecc7713599f1523905c5fbc1c5b9ce6..042ed73134df4c3254d764034aef68745b2d7ad2 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -40,8 +40,8 @@ if (!defined('__SECURITY')) {
 //
 function REGISTER_FILL_MUST_CONSTANTS()
 {
 //
 function REGISTER_FILL_MUST_CONSTANTS()
 {

-       $result = SQL_QUERY("SELECT field_name, field_required FROM `{!MYSQL_PREFIX!}_must_register` ORDER BY id", __FILE__, __LINE__);
-       while(list($name, $required) = SQL_FETCHROW($result)) {
+       $result = SQL_QUERY("SELECT field_name, field_required FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`", __FILE__, __LINE__);
+       while (list($name, $required) = SQL_FETCHROW($result)) {

                $value = "";
                if ($required == "Y") $value = "<div class=\\\"guest_failed\\\">&nbsp;(*)</div>";
                $eval = "define('MUST_".strtoupper($name)."', \"".$value."\");";
                $value = "";
                if ($required == "Y") $value = "<div class=\\\"guest_failed\\\">&nbsp;(*)</div>";
                $eval = "define('MUST_".strtoupper($name)."', \"".$value."\");";


@@ -63,7 +63,7 @@ function REGISTER_CHECK_REQUIRED_FIELDS(&$array)
        $ret = false;
        foreach ($array as $key => $value)
        {
        $ret = false;
        foreach ($array as $key => $value)
        {

-               $result = SQL_QUERY("SELECT field_required FROM `{!MYSQL_PREFIX!}_must_register` WHERE field_name='".$key."' LIMIT 1", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT field_required FROM `{!_MYSQL_PREFIX!}_must_register` WHERE field_name='".$key."' LIMIT 1", __FILE__, __LINE__);

                if (SQL_NUMROWS($result) == 1)
                {
                        // "Must-line" found
                if (SQL_NUMROWS($result) == 1)
                {
                        // "Must-line" found


@@ -87,8 +87,8 @@ function REGISTER_CHECK_REQUIRED_FIELDS(&$array)
 //
 function REGISTER_OUTPUT_REQUIRE_CHECK(&$array)
 {
 //
 function REGISTER_OUTPUT_REQUIRE_CHECK(&$array)
 {

-       $result = SQL_QUERY("SELECT field_name, field_required FROM `{!MYSQL_PREFIX!}_must_register` ORDER BY id", __FILE__, __LINE__);
-       while(list($name, $required) = SQL_FETCHROW($result))
+       $result = SQL_QUERY("SELECT field_name, field_required FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`", __FILE__, __LINE__);
+       while (list($name, $required) = SQL_FETCHROW($result))

        {
                if (($array[$name] == "!") && ($required == "Y")) {
                        // Empty entry found
        {
                if (($array[$name] == "!") && ($required == "Y")) {
                        // Empty entry found


@@ -109,11 +109,11 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false)
 
        // Guests are mostly not interested in how many members has
        // choosen an individual category
 
        // Guests are mostly not interested in how many members has
        // choosen an individual category

-       $AND = "WHERE visible='Y' ";
+       $AND = "WHERE `visible`='Y' ";

 
        // Admins are allowed to see every category...
        if (IS_ADMIN()) $AND = "";
 
        // Admins are allowed to see every category...
        if (IS_ADMIN()) $AND = "";

-       $result = SQL_QUERY("SELECT id, cat, visible FROM `{!MYSQL_PREFIX!}_cats` ".$AND." ORDER BY sort", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, cat, visible FROM `{!_MYSQL_PREFIX!}_cats` ".$AND." ORDER BY `sort`", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) > 0)
        {
                // List alle visible modules (or all to the admin)
        if (SQL_NUMROWS($result) > 0)
        {
                // List alle visible modules (or all to the admin)

diff --git a/inc/libs/rewrite_functions.php b/inc/libs/rewrite_functions.php
index 5a1929e6a2bd25f80e2b48a0441f192389980628..8a8d6f01fcf023e3c41b33677df8a7fd4b211bf1 100644 (file)
--- a/inc/libs/rewrite_functions.php
+++ b/inc/libs/rewrite_functions.php
@@ -45,18 +45,18 @@ function REWRITE_LINKS ($HTML) {
        if (ereg($GLOBALS['module'], getConfig('rewrite_skip'))) return $HTML;
 
        // Strip slashes with double-backslashes for the preg_replace() function
        if (ereg($GLOBALS['module'], getConfig('rewrite_skip'))) return $HTML;
 
        // Strip slashes with double-backslashes for the preg_replace() function

-       $URL = str_replace("/", "\\/", URL);
+       $URL = str_replace("/", "\\/", constant('URL'));

 
        // Generate target URL
 
        // Generate target URL

-       $target = URL."/cms/";
+       $target = constant('URL')."/cms/";

 
        // Convert modules.php?module=...
        $test = preg_replace("/".$URL."\\/modules.php\\?module=/i", $target, $HTML);
 
        if (eregi(SERVER_URL, $test)) {
                // Konvert URLs from my server
 
        // Convert modules.php?module=...
        $test = preg_replace("/".$URL."\\/modules.php\\?module=/i", $target, $HTML);
 
        if (eregi(SERVER_URL, $test)) {
                // Konvert URLs from my server

-               $URL = str_replace("/", "\\/", SERVER_URL);
-               $test = preg_replace("/".$URL."\\/modules.php\\?module=/i", SERVER_URL."/cms/", $test);
+               $URL = str_replace("/", "\\/", constant('SERVER_URL'));
+               $test = preg_replace("/".$URL."\\/modules.php\\?module=/i", constant('SERVER_URL')."/cms/", $test);

        } // END - if
 
        // Strip slashes as above for the main URL
        } // END - if
 
        // Strip slashes as above for the main URL

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 50b0d509cb9896b501c14b6f45798c40ec0a7525..1bc1c7ed7f589048c1932df62c4f9c763ae72ffc 100644 (file)
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -69,7 +69,7 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $MSGs=array(), $RET_S
                                        $SAVE = false;
                                } else {
                                        // Do we want to add a new sponsor or update his data?
                                        $SAVE = false;
                                } else {
                                        // Do we want to add a new sponsor or update his data?

-                                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_sponsor_data` WHERE email='%s' LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE email='%s' LIMIT 1",

                                                array($POST['email']), __FILE__, __LINE__);
 
                                        // Is a sponsor alread in the db?
                                                array($POST['email']), __FILE__, __LINE__);
 
                                        // Is a sponsor alread in the db?


@@ -125,7 +125,7 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $MSGs=array(), $RET_S
                // Update?
                if ($UPDATE) {
                        // Update his data
                // Update?
                if ($UPDATE) {
                        // Update his data

-                       $SQL = "UPDATE `{!MYSQL_PREFIX!}_sponsor_data` SET ";
+                       $SQL = "UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET ";

                        foreach ($DATA['keys'] as $k => $v) {
                                $SQL .= $v."='%s', ";
                        }
                        foreach ($DATA['keys'] as $k => $v) {
                                $SQL .= $v."='%s', ";
                        }


@@ -160,7 +160,7 @@ function SPONSOR_HANDLE_SPONSOR (&$POST, $NO_UPDATE=false, $MSGs=array(), $RET_S
                        $VALUES = str_repeat("%s', '", count($DATA['values']) - 1);
 
                        // Generate string
                        $VALUES = str_repeat("%s', '", count($DATA['values']) - 1);
 
                        // Generate string

-                       $SQL = "INSERT INTO `{!MYSQL_PREFIX!}_sponsor_data` (".$KEYS.") VALUES ('".$VALUES."%s')";
+                       $SQL = "INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_data` (".$KEYS.") VALUES ('".$VALUES."%s')";

 
                        // Generate message
                        $MSG = SPONSOR_GET_MESSAGE(ADMIN_SPONSOR_ADDED, "added", $MSGs);
 
                        // Generate message
                        $MSG = SPONSOR_GET_MESSAGE(ADMIN_SPONSOR_ADDED, "added", $MSGs);


@@ -264,7 +264,7 @@ function IS_SPONSOR () {
        $ret = false;
        if ((isSessionVariableSet('sponsorid'))) && (isSessionVariableSet('sponsorpass')))) {
                // Check cookies against database records...
        $ret = false;
        if ((isSessionVariableSet('sponsorid'))) && (isSessionVariableSet('sponsorpass')))) {
                // Check cookies against database records...

-               $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_sponsor_data`
+               $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data`

 WHERE id='%s' AND password='%s' AND status='CONFIRMED' LIMIT 1",
                        array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
 WHERE id='%s' AND password='%s' AND status='CONFIRMED' LIMIT 1",
                        array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {


@@ -287,23 +287,23 @@ function GENERATE_SPONSOR_MENU($current)
        if (IS_ADMIN()) $WHERE = "";
 
        // Load main menu entries
        if (IS_ADMIN()) $WHERE = "";
 
        // Load main menu entries

-       $result_main = SQL_QUERY("SELECT action, title FROM `{!MYSQL_PREFIX!}_sponsor_menu`
-WHERE (what='' OR what IS NULL) ".$WHERE."
-ORDER BY sort", __FILE__, __LINE__);
+       $result_main = SQL_QUERY("SELECT action, title FROM `{!_MYSQL_PREFIX!}_sponsor_menu`
+WHERE (what='' OR `what` IS NULL) ".$WHERE."
+ORDER BY `sort`", __FILE__, __LINE__);

        if (SQL_NUMROWS($result_main) > 0)
        {
                // Load every menu and it's sub menus
        if (SQL_NUMROWS($result_main) > 0)
        {
                // Load every menu and it's sub menus

-               while(list($action, $title_main) = SQL_FETCHROW($result_main))
+               while (list($action, $title_main) = SQL_FETCHROW($result_main))

                {
                        // Load sub menus
                {
                        // Load sub menus

-                       $result_sub = SQL_QUERY_ESC("SELECT what, title FROM `{!MYSQL_PREFIX!}_sponsor_menu`
-WHERE action='%s' AND what != '' AND what IS NOT NULL ".$WHERE."
-ORDER BY sort", array($action), __FILE__, __LINE__);
+                       $result_sub = SQL_QUERY_ESC("SELECT what, title FROM `{!_MYSQL_PREFIX!}_sponsor_menu`
+WHERE action='%s' AND `what` != '' AND `what` IS NOT NULL ".$WHERE."
+ORDER BY `sort`", array($action), __FILE__, __LINE__);

                        if (SQL_NUMROWS($result_sub) > 0)
                        {
                                // Load sub menus
                                $SUB = "";
                        if (SQL_NUMROWS($result_sub) > 0)
                        {
                                // Load sub menus
                                $SUB = "";

-                               while(list($what, $title_sub) = SQL_FETCHROW($result_sub))
+                               while (list($what, $title_sub) = SQL_FETCHROW($result_sub))

                                {
                                        // Check if current selected menu is matching the loaded one
                                        if ($current == $what) $title_sub = "<strong>".$title_sub."</strong>";
                                {
                                        // Check if current selected menu is matching the loaded one
                                        if ($current == $what) $title_sub = "<strong>".$title_sub."</strong>";


@@ -374,7 +374,7 @@ function UPDATE_SPONSOR_LOGIN () {
        // Is sponsor?
        if (IS_SPONSOR()) {
                // Update last online timestamp
        // Is sponsor?
        if (IS_SPONSOR()) {
                // Update last online timestamp

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_sponsor_data`
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data`

 SET last_online=UNIX_TIMESTAMP()
 WHERE id='%s' AND password='%s' LIMIT 1",
                        array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
 SET last_online=UNIX_TIMESTAMP()
 WHERE id='%s' AND password='%s' LIMIT 1",
                        array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);


@@ -417,7 +417,7 @@ function SPONSOR_SAVE_DATA ($POST, $content) {
        $DATA = array();
 
        // Prepare SQL string
        $DATA = array();
 
        // Prepare SQL string

-       $SQL = "UPDATE `{!MYSQL_PREFIX!}_sponsor_data` SET";
+       $SQL = "UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET";

        foreach ($POST as $key => $value) {
                // Mmmmm, too less security here???
                $SQL   .= " ".strip_tags($key)."='%s',";
        foreach ($POST as $key => $value) {
                // Mmmmm, too less security here???
                $SQL   .= " ".strip_tags($key)."='%s',";

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 914494b3680dd1f52d4dc171c1b833bed0213428..a20d2f8e108f912df1b3ba16fdd9588f753850a1 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -185,7 +185,7 @@ function SURFBAR_MEMBER_ACTIONS ($urlId, $status) {
        foreach ($actionArray as $actionId=>$action) {
                // Add form for this action
                $OUT .= sprintf("       <td align=\"center\" width=\"%d%%\">
        foreach ($actionArray as $actionId=>$action) {
                // Add form for this action
                $OUT .= sprintf("       <td align=\"center\" width=\"%d%%\">

-               <form action=\"".URL."/modules.php?module=login&amp;what=surfbar_list\" method=\"post\" style=\"padding-bottom:0px\">
+               <form action=\"{!URL!}/modules.php?module=login&amp;what=surfbar_list\" method=\"post\" style=\"padding-bottom:0px\">

                        <input type=\"hidden\" name=\"id\" value=\"%s\" />
                        <input type=\"hidden\" name=\"action\" value=\"%s\" />
                        <input type=\"submit\" class=\"member_submit\" name=\"ok\" title=\"{--MEMBER_SURFBAR_ACTION_%s_TITLE--}\" value=\"{--MEMBER_SURFBAR_ACTION_%s_SUBMIT--}\" />
                        <input type=\"hidden\" name=\"id\" value=\"%s\" />
                        <input type=\"hidden\" name=\"action\" value=\"%s\" />
                        <input type=\"submit\" class=\"member_submit\" name=\"ok\" title=\"{--MEMBER_SURFBAR_ACTION_%s_TITLE--}\" value=\"{--MEMBER_SURFBAR_ACTION_%s_SUBMIT--}\" />


@@ -264,7 +264,7 @@ function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) {
        global $SURFBAR_CACHE;
 
        // Search for the requested action/status combination in database
        global $SURFBAR_CACHE;
 
        // Search for the requested action/status combination in database

-       $result = SQL_QUERY_ESC("SELECT new_status FROM `{!MYSQL_PREFIX!}_surfbar_actions` WHERE action='%s' AND status='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT new_status FROM `{!_MYSQL_PREFIX!}_surfbar_actions` WHERE action='%s' AND status='%s' LIMIT 1",

                array($action, $status), __FILE__, __LINE__);
 
        // Is the entry there?
                array($action, $status), __FILE__, __LINE__);
 
        // Is the entry there?


@@ -432,7 +432,7 @@ function SURFBAR_MEMBER_EXECUTE_EDIT_ACTION ($urlData) {
        if (true) {
        //if (($urlData['views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) {
                // Run the query
        if (true) {
        //if (($urlData['views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) {
                // Run the query

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_surfbar_urls` SET url='%s', views_allowed=%s, views_max=%s WHERE id=%s AND status='%s' LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET url='%s', views_allowed=%s, views_max=%s WHERE id=%s AND status='%s' LIMIT 1",

                        array($urlData['url'], $urlData['edit']['limit'], $urlData['edit']['limit'], $urlData['id'], $urlData['status']), __FILE__, __LINE__);
 
                // All fine
                        array($urlData['url'], $urlData['edit']['limit'], $urlData['edit']['limit'], $urlData['id'], $urlData['status']), __FILE__, __LINE__);
 
                // All fine


@@ -504,7 +504,7 @@ function SURFBAR_HANDLE_LOW_POINTS () {
                        SURFBAR_NOTIFY_USER("low_points", $content);
 
                        // Update last notified
                        SURFBAR_NOTIFY_USER("low_points", $content);
 
                        // Update last notified

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET surfbar_low_notified=NOW() WHERE userid=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET surfbar_low_notified=NOW() WHERE userid=%s LIMIT 1",

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


@@ -543,7 +543,7 @@ function SURFBAR_GET_URL_DATA ($searchTerm, $column="id", $order="id", $sort="AS
 
        // Look up the record
        $result = SQL_QUERY_ESC("SELECT id, userid, url, views_total, views_max, views_allowed, status, registered, last_locked, lock_reason, views_max, views_allowed, fixed_reload
 
        // Look up the record
        $result = SQL_QUERY_ESC("SELECT id, userid, url, views_total, views_max, views_allowed, status, registered, last_locked, lock_reason, views_max, views_allowed, fixed_reload

-FROM `{!MYSQL_PREFIX!}_surfbar_urls`
+FROM `{!_MYSQL_PREFIX!}_surfbar_urls`

 WHERE %s='%s'".$add."
 ORDER BY %s %s
 %s",
 WHERE %s='%s'".$add."
 ORDER BY %s %s
 %s",


@@ -622,7 +622,7 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
        if (empty($uid)) $uid = 0;
 
        // Just run the insert query for now
        if (empty($uid)) $uid = 0;
 
        // Just run the insert query for now

-       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_surfbar_urls` (userid,url,status,views_max,views_allowed,fixed_reload) VALUES (%s,'%s','%s',%s,%s,%s)",
+       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_urls` (userid,url,status,views_max,views_allowed,fixed_reload) VALUES (%s,'%s','%s',%s,%s,%s)",

                array(
                        $uid,
                        $urlData['url'],
                array(
                        $uid,
                        $urlData['url'],


@@ -821,8 +821,8 @@ function SURFBAR_CHECK_RELOAD_FULL() {
        } // END - if
 
        // Ask the database
        } // END - if
 
        // Ask the database

-       $result = SQL_QUERY_ESC("SELECT COUNT(l.id) AS cnt FROM `{!MYSQL_PREFIX!}_surfbar_locks` AS l
-INNER JOIN `{!MYSQL_PREFIX!}_surfbar_urls` AS u
+       $result = SQL_QUERY_ESC("SELECT COUNT(l.id) AS cnt FROM `{!_MYSQL_PREFIX!}_surfbar_locks` AS l
+INNER JOIN `{!_MYSQL_PREFIX!}_surfbar_urls` AS u

 ON u.id=l.url_id
 WHERE l.userid=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(l.last_surfed) AND (((UNIX_TIMESTAMP(l.last_surfed) - u.fixed_reload) < 0 AND u.fixed_reload > 0) OR u.fixed_reload = 0)
 LIMIT 1",
 ON u.id=l.url_id
 WHERE l.userid=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(l.last_surfed) AND (((UNIX_TIMESTAMP(l.last_surfed) - u.fixed_reload) < 0 AND u.fixed_reload > 0) OR u.fixed_reload = 0)
 LIMIT 1",


@@ -864,7 +864,7 @@ function SURFBAR_GET_TOTAL_URLS ($status="ACTIVE", $excludeUserId=0) {
 
        // Get amount from database
        $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt
 
        // Get amount from database
        $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt

-FROM `{!MYSQL_PREFIX!}_surfbar_urls`
+FROM `{!_MYSQL_PREFIX!}_surfbar_urls`

 WHERE userid NOT IN (".implode(",", $UIDs['uid']).") AND status='%s'",
                array($status), __FILE__, __LINE__
        );
 WHERE userid NOT IN (".implode(",", $UIDs['uid']).") AND status='%s'",
                array($status), __FILE__, __LINE__
        );


@@ -918,7 +918,7 @@ function SURFBAR_GET_TOTAL_USER_URLS ($uid=0, $status="",$exclude="") {
 
        // Get amount from database
        $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt
 
        // Get amount from database
        $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt

-FROM `{!MYSQL_PREFIX!}_surfbar_urls`
+FROM `{!_MYSQL_PREFIX!}_surfbar_urls`

 WHERE userid=%s".$ADD."
 LIMIT %s",
                array($uid, getConfig('surfbar_max_order')), __FILE__, __LINE__
 WHERE userid=%s".$ADD."
 LIMIT %s",
                array($uid, getConfig('surfbar_max_order')), __FILE__, __LINE__


@@ -995,11 +995,11 @@ function SURFBAR_LOCKDOWN_ID ($urlId) {
        //* DEBUG: */ print "LOCK!");
        ///* DEBUG: */ return;
        // Just add it to the database
        //* DEBUG: */ print "LOCK!");
        ///* DEBUG: */ return;
        // Just add it to the database

-       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_surfbar_locks` (userid, url_id) VALUES (%s, %s)",
+       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_locks` (userid, url_id) VALUES (%s, %s)",

                array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __LINE__);
 
        // Remove the salt from database
                array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __LINE__);
 
        // Remove the salt from database

-       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_surfbar_salts` WHERE url_id=%s AND userid=%s LIMIT 1",
+       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_surfbar_salts` WHERE url_id=%s AND userid=%s LIMIT 1",

                array(bigintval($urlId), $GLOBALS['userid']), __FILE__, __LINE__);
 }
 // Pay points to the user and remove it from the sender if userid is given else it is a "sponsored surf"
                array(bigintval($urlId), $GLOBALS['userid']), __FILE__, __LINE__);
 }
 // Pay points to the user and remove it from the sender if userid is given else it is a "sponsored surf"


@@ -1033,17 +1033,17 @@ function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
        } // END - if
 
        // Update URL stats
        } // END - if
 
        // Update URL stats

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_surfbar_urls` SET views_total=views_total+1".$ADD." WHERE id=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET views_total=views_total+1".$ADD." WHERE id=%s LIMIT 1",

                array(SURFBAR_GET_ID()), __FILE__, __LINE__);
 
        // Update the stats entry
                array(SURFBAR_GET_ID()), __FILE__, __LINE__);
 
        // Update the stats entry

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_surfbar_stats` SET count=count+1 WHERE userid=%s AND url_id=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_stats` SET count=count+1 WHERE userid=%s AND url_id=%s LIMIT 1",

                array($GLOBALS['userid'], SURFBAR_GET_ID()), __FILE__, __LINE__);
 
        // Was that update okay?
        if (SQL_AFFECTEDROWS() < 1) {
                // No, then insert entry
                array($GLOBALS['userid'], SURFBAR_GET_ID()), __FILE__, __LINE__);
 
        // Was that update okay?
        if (SQL_AFFECTEDROWS() < 1) {
                // No, then insert entry

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_surfbar_stats` (userid,url_id,count) VALUES (%s,%s,1)",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_stats` (userid,url_id,count) VALUES (%s,%s,1)",

                        array($GLOBALS['userid'], SURFBAR_GET_ID()), __FILE__, __LINE__);
        } // END - if
 
                        array($GLOBALS['userid'], SURFBAR_GET_ID()), __FILE__, __LINE__);
        } // END - if
 


@@ -1062,7 +1062,7 @@ function SURFBAR_UPDATE_SALT_STATS () {
        SURFBAR_UPDATE_INSERT_STATS_RECORD();
 
        // Simply store the salt from cache away in database...
        SURFBAR_UPDATE_INSERT_STATS_RECORD();
 
        // Simply store the salt from cache away in database...

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_surfbar_salts` SET last_salt='%s' WHERE url_id=%s AND userid=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_salts` SET last_salt='%s' WHERE url_id=%s AND userid=%s LIMIT 1",

                array(SURFBAR_GET_SALT(), SURFBAR_GET_ID(), $GLOBALS['userid']), __FILE__, __LINE__);
 
        // Debug message
                array(SURFBAR_GET_SALT(), SURFBAR_GET_ID(), $GLOBALS['userid']), __FILE__, __LINE__);
 
        // Debug message


@@ -1071,7 +1071,7 @@ function SURFBAR_UPDATE_SALT_STATS () {
        // Was that okay?
        if (SQL_AFFECTEDROWS() < 1) {
                // Insert missing entry!
        // Was that okay?
        if (SQL_AFFECTEDROWS() < 1) {
                // Insert missing entry!

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_surfbar_salts` (url_id,userid,last_salt) VALUES (%s, %s, '%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_salts` (url_id,userid,last_salt) VALUES (%s, %s, '%s')",

                        array(SURFBAR_GET_ID(), $GLOBALS['userid'], SURFBAR_GET_SALT()), __FILE__, __LINE__);
        } // END - if
 
                        array(SURFBAR_GET_ID(), $GLOBALS['userid'], SURFBAR_GET_SALT()), __FILE__, __LINE__);
        } // END - if
 


@@ -1086,7 +1086,7 @@ function SURFBAR_CHECK_RELOAD_LOCK ($urlId) {
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "id={$urlId}", false);
        // Ask the database
        $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "id={$urlId}", false);
        // Ask the database
        $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt

-FROM `{!MYSQL_PREFIX!}_surfbar_locks`
+FROM `{!_MYSQL_PREFIX!}_surfbar_locks`

 WHERE userid=%s AND url_id=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(last_surfed)
 ORDER BY last_surfed ASC
 LIMIT 1",
 WHERE userid=%s AND url_id=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(last_surfed)
 ORDER BY last_surfed ASC
 LIMIT 1",


@@ -1121,8 +1121,8 @@ function SURFBAR_DETERMINE_DEPLETED_USERIDS ($limit=0) {
 
                // Get all userid except logged in one
                $result = SQL_QUERY_ESC("SELECT u.userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified
 
                // Get all userid except logged in one
                $result = SQL_QUERY_ESC("SELECT u.userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified

-FROM `{!MYSQL_PREFIX!}_surfbar_urls` AS u
-INNER JOIN `{!MYSQL_PREFIX!}_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS u
+INNER JOIN `{!_MYSQL_PREFIX!}_user_data` AS d

 ON u.userid=d.userid
 WHERE u.userid NOT IN (%s,0) AND u.status='ACTIVE'
 GROUP BY u.userid
 ON u.userid=d.userid
 WHERE u.userid NOT IN (%s,0) AND u.status='ACTIVE'
 GROUP BY u.userid


@@ -1131,8 +1131,8 @@ ORDER BY u.userid ASC",
        } else {
                // Get all userid
                $result = SQL_QUERY("SELECT u.userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified
        } else {
                // Get all userid
                $result = SQL_QUERY("SELECT u.userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified

-FROM `{!MYSQL_PREFIX!}_surfbar_urls` AS u
-INNER JOIN `{!MYSQL_PREFIX!}_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS u
+INNER JOIN `{!_MYSQL_PREFIX!}_user_data` AS d

 ON u.userid=d.userid
 WHERE u.status='ACTIVE'
 GROUP BY u.userid
 ON u.userid=d.userid
 WHERE u.status='ACTIVE'
 GROUP BY u.userid


@@ -1170,7 +1170,7 @@ function SURFBAR_DETERMINE_TOTAL_ONLINE () {
 
        // Count all users in surfbar modue and return the value
        $result = SQL_QUERY_ESC("SELECT id
 
        // Count all users in surfbar modue and return the value
        $result = SQL_QUERY_ESC("SELECT id

-FROM `{!MYSQL_PREFIX!}_surfbar_stats`
+FROM `{!_MYSQL_PREFIX!}_surfbar_stats`

 WHERE (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(last_online)) <= %s
 GROUP BY userid",
                array(getConfig('online_timeout')), __FILE__, __LINE__);
 WHERE (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(last_online)) <= %s
 GROUP BY userid",
                array(getConfig('online_timeout')), __FILE__, __LINE__);


@@ -1235,7 +1235,7 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array())
 
        // Update the status now
        // ---------- Comment out for debugging/developing member actions! ---------
 
        // Update the status now
        // ---------- Comment out for debugging/developing member actions! ---------

-       //SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_surfbar_urls` SET status='%s' WHERE id=%s LIMIT 1",
+       //SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET status='%s' WHERE id=%s LIMIT 1",

        //      array($newStatus, bigintval($urlId)), __FILE__, __LINE__);
        // ---------- Comment out for debugging/developing member actions! ---------
 
        //      array($newStatus, bigintval($urlId)), __FILE__, __LINE__);
        // ---------- Comment out for debugging/developing member actions! ---------
 


@@ -1403,10 +1403,10 @@ function SURFBAR_GET_MAX_RANDOM ($UIDs, $ADD) {
        global $_CONFIG;
        // Count max availabe entries
        $result = SQL_QUERY("SELECT sbu.id AS cnt
        global $_CONFIG;
        // Count max availabe entries
        $result = SQL_QUERY("SELECT sbu.id AS cnt

-FROM `{!MYSQL_PREFIX!}_surfbar_urls` AS sbu
-LEFT JOIN `{!MYSQL_PREFIX!}_surfbar_salts` AS sbs
+FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS sbu
+LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_salts` AS sbs

 ON sbu.id=sbs.url_id
 ON sbu.id=sbs.url_id

-LEFT JOIN `{!MYSQL_PREFIX!}_surfbar_locks` AS l
+LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_locks` AS l

 ON sbu.id=l.url_id
 WHERE sbu.userid NOT IN (".implode(",", $UIDs).") AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND sbu.status='ACTIVE'".$ADD."
 GROUP BY sbu.id", __FILE__, __LINE__);
 ON sbu.id=l.url_id
 WHERE sbu.userid NOT IN (".implode(",", $UIDs).") AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND sbu.status='ACTIVE'".$ADD."
 GROUP BY sbu.id", __FILE__, __LINE__);


@@ -1430,7 +1430,7 @@ function SURFBAR_GET_USER_URLS () {
 
        // Begin the query
        $result = SQL_QUERY_ESC("SELECT u.id, u.userid, u.url, u.views_total, u.views_max, u.views_allowed, u.status, UNIX_TIMESTAMP(u.registered) AS registered, UNIX_TIMESTAMP(u.last_locked) AS last_locked, u.lock_reason AS lock_reason
 
        // Begin the query
        $result = SQL_QUERY_ESC("SELECT u.id, u.userid, u.url, u.views_total, u.views_max, u.views_allowed, u.status, UNIX_TIMESTAMP(u.registered) AS registered, UNIX_TIMESTAMP(u.last_locked) AS last_locked, u.lock_reason AS lock_reason

-FROM `{!MYSQL_PREFIX!}_surfbar_urls` AS u
+FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS u

 WHERE u.userid=%s AND u.status != 'DELETED'
 ORDER BY u.id ASC",
                array($GLOBALS['userid']), __FILE__, __LINE__);
 WHERE u.userid=%s AND u.status != 'DELETED'
 ORDER BY u.id ASC",
                array($GLOBALS['userid']), __FILE__, __LINE__);


@@ -1456,7 +1456,7 @@ function SURFBAR_GET_ACTION_ARRAY ($status) {
        $returnArray = array();
 
        // Get all assigned actions
        $returnArray = array();
 
        // Get all assigned actions

-       $result = SQL_QUERY_ESC("SELECT action FROM `{!MYSQL_PREFIX!}_surfbar_actions` WHERE status='%s' ORDER BY id ASC",
+       $result = SQL_QUERY_ESC("SELECT action FROM `{!_MYSQL_PREFIX!}_surfbar_actions` WHERE status='%s' ORDER BY `id` ASC",

                array($status), __FILE__, __LINE__);
 
        // Some entries there?
                array($status), __FILE__, __LINE__);
 
        // Some entries there?


@@ -1528,10 +1528,10 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = 0) {
                // And query the database
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "randNum={$randNum},maxRand={$maxRand},surfLock=".SURFBAR_GET_SURF_LOCK()."", false);
                $result = SQL_QUERY_ESC("SELECT sbu.id, sbu.userid, sbu.url, sbs.last_salt, sbu.views_total, sbu.views_max, sbu.views_allowed, UNIX_TIMESTAMP(l.last_surfed) AS last_surfed, sbu.fixed_reload
                // And query the database
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "randNum={$randNum},maxRand={$maxRand},surfLock=".SURFBAR_GET_SURF_LOCK()."", false);
                $result = SQL_QUERY_ESC("SELECT sbu.id, sbu.userid, sbu.url, sbs.last_salt, sbu.views_total, sbu.views_max, sbu.views_allowed, UNIX_TIMESTAMP(l.last_surfed) AS last_surfed, sbu.fixed_reload

-FROM `{!MYSQL_PREFIX!}_surfbar_urls` AS sbu
-LEFT JOIN `{!MYSQL_PREFIX!}_surfbar_salts` AS sbs
+FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS sbu
+LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_salts` AS sbs

 ON sbu.id=sbs.url_id
 ON sbu.id=sbs.url_id

-LEFT JOIN `{!MYSQL_PREFIX!}_surfbar_locks` AS l
+LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_locks` AS l

 ON sbu.id=l.url_id
 WHERE sbu.userid NOT IN (".implode(",", $UIDs['uid']).") AND sbu.status='ACTIVE' AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))".$ADD."
 GROUP BY sbu.id
 ON sbu.id=l.url_id
 WHERE sbu.userid NOT IN (".implode(",", $UIDs['uid']).") AND sbu.status='ACTIVE' AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))".$ADD."
 GROUP BY sbu.id


@@ -1542,10 +1542,10 @@ LIMIT %s,1",
        } else {
                // Get data from specified id number
                $result = SQL_QUERY_ESC("SELECT sbu.id, sbu.userid, sbu.url, sbs.last_salt, sbu.views_total, sbu.views_max, sbu.views_allowed, UNIX_TIMESTAMP(l.last_surfed) AS last_surfed, sbu.fixed_reload
        } else {
                // Get data from specified id number
                $result = SQL_QUERY_ESC("SELECT sbu.id, sbu.userid, sbu.url, sbs.last_salt, sbu.views_total, sbu.views_max, sbu.views_allowed, UNIX_TIMESTAMP(l.last_surfed) AS last_surfed, sbu.fixed_reload

-FROM `{!MYSQL_PREFIX!}_surfbar_urls` AS sbu
-LEFT JOIN `{!MYSQL_PREFIX!}_surfbar_salts` AS sbs
+FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS sbu
+LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_salts` AS sbs

 ON sbu.id=sbs.url_id
 ON sbu.id=sbs.url_id

-LEFT JOIN `{!MYSQL_PREFIX!}_surfbar_locks` AS l
+LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_locks` AS l

 ON sbu.id=l.url_id
 WHERE sbu.userid != %s AND sbu.status='ACTIVE' AND sbu.id=%s AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))
 LIMIT 1",
 ON sbu.id=l.url_id
 WHERE sbu.userid != %s AND sbu.status='ACTIVE' AND sbu.id=%s AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))
 LIMIT 1",

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 59f30ec08e6e85ce6572340f40df621c3bb63304..4b7dc98d3bcb3703e6c9ee75499fbb19f3d2cba3 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -66,7 +66,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
                $value = GET_TOTAL_DATA(GET_CURRENT_ADMIN_ID(), "task_system", "id", "assigned_admin", true, " AND status='NEW' AND task_type='EXTENSION_UPDATE'");
 
                if ($value > 0) {
                $value = GET_TOTAL_DATA(GET_CURRENT_ADMIN_ID(), "task_system", "id", "assigned_admin", true, " AND status='NEW' AND task_type='EXTENSION_UPDATE'");
 
                if ($value > 0) {

-                       define('__TASK_UPDATE_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=updates\">".$value."</a>");
+                       define('__TASK_UPDATE_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_task&amp;type=updates\">".$value."</a>");

                } else {
                        define('__TASK_UPDATE_VALUE', "0");
                }
                } else {
                        define('__TASK_UPDATE_VALUE', "0");
                }


@@ -81,7 +81,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        $value = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true);
 
        if ($value > 0) {
        $value = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true);
 
        if ($value > 0) {

-               define('__CONFIRMED_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;status=confirmed\">".$value."</a>");
+               define('__CONFIRMED_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_user&amp;status=confirmed\">".$value."</a>");

        } else {
                define('__CONFIRMED_VALUE', "0");
        }
        } else {
                define('__CONFIRMED_VALUE', "0");
        }


@@ -90,7 +90,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        $value = GET_TOTAL_DATA("UNCONFIRMED", "user_data", "userid", "status", true);
 
        if ($value > 0) {
        $value = GET_TOTAL_DATA("UNCONFIRMED", "user_data", "userid", "status", true);
 
        if ($value > 0) {

-               define('__UNCONFIRMED_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=chk_regs\">".$value."</a>");
+               define('__UNCONFIRMED_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=chk_regs\">".$value."</a>");

        } else {
                define('__UNCONFIRMED_VALUE', "0");
        }
        } else {
                define('__UNCONFIRMED_VALUE', "0");
        }


@@ -99,7 +99,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        $value = GET_TOTAL_DATA("LOCKED", "user_data", "userid", "status", true);
 
        if ($value > 0) {
        $value = GET_TOTAL_DATA("LOCKED", "user_data", "userid", "status", true);
 
        if ($value > 0) {

-               define('__LOCKED_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;status=locked\">".$value."</a>");
+               define('__LOCKED_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_user&amp;status=locked\">".$value."</a>");

        } else {
                define('__LOCKED_VALUE', "0");
        }
        } else {
                define('__LOCKED_VALUE', "0");
        }


@@ -110,7 +110,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        $value = GET_TOTAL_DATA("0", "task_system", "id", "assigned_admin", true, " AND `status` != 'DELETED'");
 
        if ($value > 0) {
        $value = GET_TOTAL_DATA("0", "task_system", "id", "assigned_admin", true, " AND `status` != 'DELETED'");
 
        if ($value > 0) {

-               define('__TASK_NEW_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=unassigned\">".$value."</a>");
+               define('__TASK_NEW_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_task&amp;type=unassigned\">".$value."</a>");

        } else {
                define('__TASK_NEW_VALUE', "0");
        }
        } else {
                define('__TASK_NEW_VALUE', "0");
        }


@@ -121,7 +121,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        $value = GET_TOTAL_DATA("CLOSED", "task_system", "id", "status", true);
 
        if ($value > 0) {
        $value = GET_TOTAL_DATA("CLOSED", "task_system", "id", "status", true);
 
        if ($value > 0) {

-               define('__TASK_CLOSED_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=closed\">".$value."</a>");
+               define('__TASK_CLOSED_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_task&amp;type=closed\">".$value."</a>");

        } else {
                define('__TASK_CLOSED_VALUE', "0");
        }
        } else {
                define('__TASK_CLOSED_VALUE', "0");
        }


@@ -132,7 +132,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        $value = GET_TOTAL_DATA("DELETED", "task_system", "id", "status", true);
 
        if ($value > 0) {
        $value = GET_TOTAL_DATA("DELETED", "task_system", "id", "status", true);
 
        if ($value > 0) {

-               define('__TASK_DELETED_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=deleted\">".$value."</a>");
+               define('__TASK_DELETED_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_task&amp;type=deleted\">".$value."</a>");

        } else {
                define('__TASK_DELETED_VALUE', "0");
        }
        } else {
                define('__TASK_DELETED_VALUE', "0");
        }


@@ -143,7 +143,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        $value = GET_TOTAL_DATA("SOLVED", "task_system", "id", "status", true, sprintf(" AND assigned_admin=%s", GET_CURRENT_ADMIN_ID()));
 
        if ($value > 0) {
        $value = GET_TOTAL_DATA("SOLVED", "task_system", "id", "status", true, sprintf(" AND assigned_admin=%s", GET_CURRENT_ADMIN_ID()));
 
        if ($value > 0) {

-               define('__TASK_SOLVED_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_task&amp;type=solved\">".$value."</a>");
+               define('__TASK_SOLVED_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_task&amp;type=solved\">".$value."</a>");

        } else {
                define('__TASK_SOLVED_VALUE', "0");
        }
        } else {
                define('__TASK_SOLVED_VALUE', "0");
        }


@@ -154,7 +154,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        $value = GET_TOTAL_DATA(GET_CURRENT_ADMIN_ID(), "task_system", "id", "assigned_admin", true, " AND status = 'NEW' AND task_type != 'EXTENSION_UPDATE'");
 
        if ($value > 0) {
        $value = GET_TOTAL_DATA(GET_CURRENT_ADMIN_ID(), "task_system", "id", "assigned_admin", true, " AND status = 'NEW' AND task_type != 'EXTENSION_UPDATE'");
 
        if ($value > 0) {

-               define('__TASK_YOUR_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_task\">".$value."</a>");
+               define('__TASK_YOUR_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_task\">".$value."</a>");

        } else {
                define('__TASK_YOUR_VALUE', "0");
        }
        } else {
                define('__TASK_YOUR_VALUE', "0");
        }


@@ -165,7 +165,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        $value = GET_TOTAL_DATA("ADMIN", "pool", "id", "data_type", true);
 
        if ($value > 0) {
        $value = GET_TOTAL_DATA("ADMIN", "pool", "id", "data_type", true);
 
        if ($value > 0) {

-               define('__MAIL_ADMIN_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=unlock_emails\">".$value."</a>");
+               define('__MAIL_ADMIN_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=unlock_emails\">".$value."</a>");

        } else {
                define('__MAIL_ADMIN_VALUE', "0");
        }
        } else {
                define('__MAIL_ADMIN_VALUE', "0");
        }


@@ -176,7 +176,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        $value = GET_TOTAL_DATA("TEMP", "pool", "id", "data_type", true);
 
        if ($value > 0) {
        $value = GET_TOTAL_DATA("TEMP", "pool", "id", "data_type", true);
 
        if ($value > 0) {

-               define('__MAIL_TEMP_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=email_details\">".$value."</a>");
+               define('__MAIL_TEMP_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=email_details\">".$value."</a>");

        } else {
                define('__MAIL_TEMP_VALUE', "0");
        }
        } else {
                define('__MAIL_TEMP_VALUE', "0");
        }


@@ -187,7 +187,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        $value = GET_TOTAL_DATA("SEND", "pool", "id", "data_type", true);
 
        if ($value > 0) {
        $value = GET_TOTAL_DATA("SEND", "pool", "id", "data_type", true);
 
        if ($value > 0) {

-               define('__MAIL_SEND_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=email_archiv\">".$value."</a>");
+               define('__MAIL_SEND_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=email_archiv\">".$value."</a>");

        } else {
                define('__MAIL_SEND_VALUE', "0");
        }
        } else {
                define('__MAIL_SEND_VALUE', "0");
        }


@@ -200,7 +200,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
                $value = GET_TOTAL_DATA("DELETED", "pool", "id", "data_type", true);
 
                if ($value > 0) {
                $value = GET_TOTAL_DATA("DELETED", "pool", "id", "data_type", true);
 
                if ($value > 0) {

-                       define('__MAIL_DELETED_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=email_details\">".$value."</a>");
+                       define('__MAIL_DELETED_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=email_details\">".$value."</a>");

                } else {
                        define('__MAIL_DELETED_VALUE', "0");
                }
                } else {
                        define('__MAIL_DELETED_VALUE', "0");
                }


@@ -213,18 +213,18 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
                        $value = GET_TOTAL_DATA("DELETED", "bonus", "id", "data_type", true);
 
                        if ($value > 0) {
                        $value = GET_TOTAL_DATA("DELETED", "bonus", "id", "data_type", true);
 
                        if ($value > 0) {

-                               define('__MAIL_BONUS_AP_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=email_details\">".$value."</a>");
+                               define('__MAIL_BONUS_AP_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=email_details\">".$value."</a>");

                        } else {
                                define('__MAIL_BONUS_AP_VALUE', "0");
                        }
                } elseif (EXT_IS_ACTIVE("bonus")) {
                        define('__MAIL_BONUS_AP_VALUE', ADMIN_EXT_BONUS_OUTDATED_1."0.1.8".ADMIN_EXT_BONUS_OUTDATED_2);
                } else {
                        } else {
                                define('__MAIL_BONUS_AP_VALUE', "0");
                        }
                } elseif (EXT_IS_ACTIVE("bonus")) {
                        define('__MAIL_BONUS_AP_VALUE', ADMIN_EXT_BONUS_OUTDATED_1."0.1.8".ADMIN_EXT_BONUS_OUTDATED_2);
                } else {

-                       define('__MAIL_BONUS_AP_VALUE', "<div class=\"admin_note\">".ADMIN_EXT_BONUS_404."</div>");
+                       define('__MAIL_BONUS_AP_VALUE', "<div class=\"admin_note\">{!ADMIN_EXT_BONUS_404!}</div>");

                }
        } else {
                }
        } else {

-               define('__MAIL_BONUS_AP_VALUE', "<div class=\"admin_note\">".ADMIN_EXT_AUTOPURGE_404."</div>");
-               define('__MAIL_DELETED_VALUE', "<div class=\"admin_note\">".ADMIN_EXT_AUTOPURGE_404."</div>");
+               define('__MAIL_BONUS_AP_VALUE', "<div class=\"admin_note\">{!ADMIN_EXT_AUTOPURGE_404!}</div>");
+               define('__MAIL_DELETED_VALUE', "<div class=\"admin_note\">{!ADMIN_EXT_AUTOPURGE_404!}</div>");

        }
 
        //
        }
 
        //


@@ -235,14 +235,14 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
                $value = GET_TOTAL_DATA("SEND", "bonus", "id", "data_type", true, " AND is_notify='N'");
 
                if ($value > 0) {
                $value = GET_TOTAL_DATA("SEND", "bonus", "id", "data_type", true, " AND is_notify='N'");
 
                if ($value > 0) {

-                       define('__MAIL_BONUS_SEND_VALUE', "<a href=\"".URL."/modules.php?module=admin&amp;what=email_details\">".$value."</a>");
+                       define('__MAIL_BONUS_SEND_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=email_details\">".$value."</a>");

                } else {
                        define('__MAIL_BONUS_SEND_VALUE', "0");
                }
        } elseif (EXT_IS_ACTIVE("bonus")) {
                define('__MAIL_BONUS_SEND_VALUE', ADMIN_EXT_BONUS_OUTDATED_1."0.1.8".ADMIN_EXT_BONUS_OUTDATED_2);
        } else {
                } else {
                        define('__MAIL_BONUS_SEND_VALUE', "0");
                }
        } elseif (EXT_IS_ACTIVE("bonus")) {
                define('__MAIL_BONUS_SEND_VALUE', ADMIN_EXT_BONUS_OUTDATED_1."0.1.8".ADMIN_EXT_BONUS_OUTDATED_2);
        } else {

-               define('__MAIL_BONUS_SEND_VALUE', ADMIN_EXT_BONUS_404);
+               define('__MAIL_BONUS_SEND_VALUE', getMessage('ADMIN_EXT_BONUS_404'));

        }
 
        if (EXT_IS_ACTIVE("autopurge")) {
        }
 
        if (EXT_IS_ACTIVE("autopurge")) {


@@ -261,65 +261,65 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 
                // Check for all accounts
                $SQLs[] = "SELECT DISTINCT d.userid, d.email, d.last_online
 
                // Check for all accounts
                $SQLs[] = "SELECT DISTINCT d.userid, d.email, d.last_online

-FROM `{!MYSQL_PREFIX!}_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_user_data` AS d

 WHERE d.status='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - ".$since.") AND d.last_online < (UNIX_TIMESTAMP() - ".$since.") AND d.ap_notified < (UNIX_TIMESTAMP() - ".$since.")
 ".$EXCLUDE_LIST."
 ORDER BY d.userid";
                $WHATs[]  = "list_autopurge";
 WHERE d.status='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - ".$since.") AND d.last_online < (UNIX_TIMESTAMP() - ".$since.") AND d.ap_notified < (UNIX_TIMESTAMP() - ".$since.")
 ".$EXCLUDE_LIST."
 ORDER BY d.userid";
                $WHATs[]  = "list_autopurge";

-               $DESCRs[] = TASK_ADMIN_INACTIVE_AUTOPURGE;
-               $TITLEs[] = TASK_ADMIN_INACTIVE_AUTOPURGE_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_INACTIVE_AUTOPURGE');
+               $TITLEs[] = getMessage('TASK_ADMIN_INACTIVE_AUTOPURGE_TITLE');

        }
 
        if (GET_EXT_VERSION("sql_patches") >= "0.3.4") {
                // Check for accounts without referal
        }
 
        if (GET_EXT_VERSION("sql_patches") >= "0.3.4") {
                // Check for accounts without referal

-               $SQLs[]   = "SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE refid='0' ORDER BY userid";
-               $DESCRs[] = TASK_ADMIN_LIST_ACCOUNT_NOREF;
-               $TITLEs[] = TASK_ADMIN_LIST_ACCOUNT_NOREF_TITLE;
+               $SQLs[]   = "SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE refid='0' ORDER BY userid";
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_ACCOUNT_NOREF');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_ACCOUNT_NOREF_TITLE');

                $WHATs[]  = "list_user&amp;mode=norefs";
        }
 
        if (EXT_IS_ACTIVE("payout")) {
                // List new payout requests
                $WHATs[]  = "list_user&amp;mode=norefs";
        }
 
        if (EXT_IS_ACTIVE("payout")) {
                // List new payout requests

-               $SQLs[]   = "SELECT userid FROM `{!MYSQL_PREFIX!}_user_payouts` WHERE status='NEW' ORDER BY userid";
+               $SQLs[]   = "SELECT userid FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE status='NEW' ORDER BY userid";

                $WHATs[]  = "list_payouts";
                $WHATs[]  = "list_payouts";

-               $DESCRs[] = TASK_ADMIN_LIST_PAYOUTS_WAITING;
-               $TITLEs[] = TASK_ADMIN_LIST_PAYOUTS_WAITING_TITLE;
-               $SQLs[]   = "SELECT userid FROM `{!MYSQL_PREFIX!}_user_payouts` ORDER BY userid";
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_PAYOUTS_WAITING');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_PAYOUTS_WAITING_TITLE');
+               $SQLs[]   = "SELECT userid FROM `{!_MYSQL_PREFIX!}_user_payouts` ORDER BY userid";

                $WHATs[]  = "list_payouts";
                $WHATs[]  = "list_payouts";

-               $DESCRs[] = TASK_ADMIN_LIST_PAYOUTS_ALL;
-               $TITLEs[] = TASK_ADMIN_LIST_PAYOUTS_ALL_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_PAYOUTS_ALL');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_PAYOUTS_ALL_TITLE');

        }
 
        if (EXT_IS_ACTIVE("wernis")) {
                // List new wernis requests
        }
 
        if (EXT_IS_ACTIVE("wernis")) {
                // List new wernis requests

-               $SQLs[]   = "SELECT userid FROM `{!MYSQL_PREFIX!}_user_wernis` ORDER BY userid";
+               $SQLs[]   = "SELECT userid FROM `{!_MYSQL_PREFIX!}_user_wernis` ORDER BY userid";

                $WHATs[]  = "list_wernis";
                $WHATs[]  = "list_wernis";

-               $DESCRs[] = TASK_ADMIN_LIST_WERNIS_ALL;
-               $TITLEs[] = TASK_ADMIN_LIST_WERNIS_ALL_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_WERNIS_ALL');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_WERNIS_ALL_TITLE');

        }
 
        if (EXT_IS_ACTIVE("primera")) {
                // List new primera requests
        }
 
        if (EXT_IS_ACTIVE("primera")) {
                // List new primera requests

-               $SQLs[]   = "SELECT userid FROM `{!MYSQL_PREFIX!}_user_primera` ORDER BY userid";
+               $SQLs[]   = "SELECT userid FROM `{!_MYSQL_PREFIX!}_user_primera` ORDER BY userid";

                $WHATs[]  = "list_primera";
                $WHATs[]  = "list_primera";

-               $DESCRs[] = TASK_ADMIN_LIST_PRIMERA_ALL;
-               $TITLEs[] = TASK_ADMIN_LIST_PRIMERA_ALL_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_PRIMERA_ALL');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_PRIMERA_ALL_TITLE');

        }
 
        if (EXT_IS_ACTIVE("holiday")) {
                // List holiday requests
        }
 
        if (EXT_IS_ACTIVE("holiday")) {
                // List holiday requests

-               $SQLs[]   = "SELECT userid FROM `{!MYSQL_PREFIX!}_user_holidays` ORDER BY userid";
+               $SQLs[]   = "SELECT userid FROM `{!_MYSQL_PREFIX!}_user_holidays` ORDER BY userid";

                $WHATs[]  = "list_holiday";
                $WHATs[]  = "list_holiday";

-               $DESCRs[] = TASK_ADMIN_LIST_HOLIDAYS;
-               $TITLEs[] = TASK_ADMIN_LIST_HOLIDAYS_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_HOLIDAYS');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_HOLIDAYS_TITLE');

        }
 
        if (GET_EXT_VERSION("bonus") >= "0.8.7") {
                // List all notifications
        }
 
        if (GET_EXT_VERSION("bonus") >= "0.8.7") {
                // List all notifications

-               $SQLs[]   = "SELECT id FROM `{!MYSQL_PREFIX!}_bonus` WHERE is_notify='Y' ORDER BY timestamp DESC";
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_bonus` WHERE is_notify='Y' ORDER BY timestamp DESC";

                $WHATs[]  = "list_notifications";
                $WHATs[]  = "list_notifications";

-               $DESCRs[] = TASK_ADMIN_LIST_NOTIFICATIONS;
-               $TITLEs[] = TASK_ADMIN_LIST_NOTIFICATIONS_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_NOTIFICATIONS');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_NOTIFICATIONS_TITLE');

        } // END - if
 
        if (GET_EXT_VERSION("bonus") >= "0.2.3") {
        } // END - if
 
        if (GET_EXT_VERSION("bonus") >= "0.2.3") {


@@ -346,12 +346,12 @@ ORDER BY d.userid";
                }
 
                $SQLs[]   = "SELECT ".$USE." AS points
                }
 
                $SQLs[]   = "SELECT ".$USE." AS points

-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE status='CONFIRMED' AND ".$USE.">0".$LAST."
 ORDER BY points DESC, userid";
                $WHATs[]  = "list_bonus";
 WHERE status='CONFIRMED' AND ".$USE.">0".$LAST."
 ORDER BY points DESC, userid";
                $WHATs[]  = "list_bonus";

-               $DESCRs[] = TASK_ADMIN_LIST_BONUS;
-               $TITLEs[] = TASK_ADMIN_LIST_BONUS_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_BONUS');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_BONUS_TITLE');

        }
 
        if (GET_EXT_VERSION("beg") >= "0.1.2") {
        }
 
        if (GET_EXT_VERSION("beg") >= "0.1.2") {


@@ -364,160 +364,164 @@ ORDER BY points DESC, userid";
                        $LAST   = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", getConfig('ap_inactive_since'));
                }
 
                        $LAST   = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", getConfig('ap_inactive_since'));
                }
 

-               $SQLs[]   = "SELECT userid FROM `{!MYSQL_PREFIX!}_user_data`
+               $SQLs[]   = "SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE status='CONFIRMED' AND beg_points>0".$LAST."
 ORDER BY beg_points DESC, userid";
                $WHATs[]  = "list_beg";
 WHERE status='CONFIRMED' AND beg_points>0".$LAST."
 ORDER BY beg_points DESC, userid";
                $WHATs[]  = "list_beg";

-               $DESCRs[] = TASK_ADMIN_LIST_BEG;
-               $TITLEs[] = TASK_ADMIN_LIST_BEG_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_BEG');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_BEG_TITLE');

        }
 
        if (EXT_IS_ACTIVE("doubler")) {
                // List waiting payouts
        }
 
        if (EXT_IS_ACTIVE("doubler")) {
                // List waiting payouts

-               $SQLs[]   = "SELECT id FROM `{!MYSQL_PREFIX!}_doubler` WHERE completed='N' ORDER BY id";
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_doubler` WHERE completed='N' ORDER BY `id`";

                $WHATs[]  = "list_doubler&amp;mode=waiting&amp;select=all";
                $WHATs[]  = "list_doubler&amp;mode=waiting&amp;select=all";

-               $DESCRs[] = TASK_ADMIN_LIST_DOUBLER_WAITING;
-               $TITLEs[] = TASK_ADMIN_LIST_DOUBLER_WAITING_TITLE;
-               $SQLs[]   = "SELECT id FROM `{!MYSQL_PREFIX!}_doubler` ORDER BY id";
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_DOUBLER_WAITING');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_DOUBLER_WAITING_TITLE');
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_doubler` ORDER BY `id`";

                $WHATs[]  = "list_doubler";
                $WHATs[]  = "list_doubler";

-               $DESCRs[] = TASK_ADMIN_LIST_DOUBLER_ALL;
-               $TITLEs[] = TASK_ADMIN_LIST_DOUBLER_ALL_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_DOUBLER_ALL');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_DOUBLER_ALL_TITLE');

        }
 
        //
        // All referal banner
        //
        }
 
        //
        // All referal banner
        //

-       $SQLs[] = "SELECT id FROM `{!MYSQL_PREFIX!}_refbanner` ORDER BY id";
+       $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_refbanner` ORDER BY `id`";

        $WHATs[] = "refbanner";
        $WHATs[] = "refbanner";

-       $DESCRs[] = TASK_ADMIN_LIST_REFBANNER_ALL;
-       $TITLEs[] = TASK_ADMIN_LIST_REFBANNER_ALL_TITLE;
+       $DESCRs[] = getMessage('TASK_ADMIN_LIST_REFBANNER_ALL');
+       $TITLEs[] = getMessage('TASK_ADMIN_LIST_REFBANNER_ALL_TITLE');

 
        //
        // All activated referal banner
        //
 
        //
        // All activated referal banner
        //

-       $SQLs[] = "SELECT id FROM `{!MYSQL_PREFIX!}_refbanner` WHERE visible='Y' ORDER BY id";
+       $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_refbanner` WHERE `visible`='Y' ORDER BY `id`";

        $WHATs[] = "refbanner";
        $WHATs[] = "refbanner";

-       $DESCRs[] = TASK_ADMIN_LIST_REFBANNER_ACTIVE;
-       $TITLEs[] = TASK_ADMIN_LIST_REFBANNER_ACTIVE_TITLE;
+       $DESCRs[] = getMessage('TASK_ADMIN_LIST_REFBANNER_ACTIVE');
+       $TITLEs[] = getMessage('TASK_ADMIN_LIST_REFBANNER_ACTIVE_TITLE');

 
        //
        // All extensions
        //
 
        //
        // All extensions
        //

-       $SQLs[] = "SELECT id FROM `{!MYSQL_PREFIX!}_extensions` ORDER BY id";
+       $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_extensions` ORDER BY `id`";

        $WHATs[] = "extensions";
        $WHATs[] = "extensions";

-       $DESCRs[] = TASK_ADMIN_LIST_EXTENSIONS_ALL;
-       $TITLEs[] = TASK_ADMIN_LIST_EXTENSIONS_ALL_TITLE;
+       $DESCRs[] = getMessage('TASK_ADMIN_LIST_EXTENSIONS_ALL');
+       $TITLEs[] = getMessage('TASK_ADMIN_LIST_EXTENSIONS_ALL_TITLE');

 
        //
        // All activated extensions
        //
 
        //
        // All activated extensions
        //

-       $SQLs[] = "SELECT id FROM `{!MYSQL_PREFIX!}_extensions` WHERE ext_active='Y' ORDER BY id";
-       $WHATs[] = "extensions&amp;active=Y";
-       $DESCRs[] = TASK_ADMIN_LIST_EXTENSIONS_ACTIVE;
-       $TITLEs[] = TASK_ADMIN_LIST_EXTENSIONS_ACTIVE_TITLE;
+       $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_active='Y' ORDER BY `id`";
+       $WHATs[]  = "extensions&amp;active=Y";
+       $DESCRs[] = getMessage('TASK_ADMIN_LIST_EXTENSIONS_ACTIVE');
+       $TITLEs[] = getMessage('TASK_ADMIN_LIST_EXTENSIONS_ACTIVE_TITLE');

 
        if (EXT_IS_ACTIVE("engine")) {
                // List all export accounts
 
        if (EXT_IS_ACTIVE("engine")) {
                // List all export accounts

-               $SQLs[] = "SELECT id FROM `{!MYSQL_PREFIX!}_engine_accounts` ORDER BY id";
-               $WHATs[] = "list_engine";
-               $DESCRs[] = TASK_ADMIN_LIST_ENGINE;
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_engine_accounts` ORDER BY `id`";
+               $WHATs[]  = "list_engine";
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_ENGINE');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_ENGINE_TITLE');

 
                // List all pending accounts
 
                // List all pending accounts

-               $SQLs[] = "SELECT id FROM `{!MYSQL_PREFIX!}_engine_accounts` WHERE status='UNCONFIRMED' ORDER BY id";
-               $WHATs[] = "unlock_engine";
-               $DESCRs[] = TASK_ADMIN_UNLOCK_ENGINE;
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_engine_accounts` WHERE status='UNCONFIRMED' ORDER BY `id`";
+               $WHATs[]  = "unlock_engine";
+               $DESCRs[] = getMessage('TASK_ADMIN_UNLOCK_ENGINE');
+               $TITLEs[] = getMessage('TASK_ADMIN_UNLOCK_ENGINE_TITLE');

 
                // List all safes
 
                // List all safes

-               $SQLs[] = "SELECT id FROM `{!MYSQL_PREFIX!}_engine_safe` ORDER BY id";
-               $WHATs[] = "list_engine&amp;mode=safe";
-               $DESCRs[] = TASK_ADMIN_LIST_ENGINE_SAFES;
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_engine_safe` ORDER BY `id`";
+               $WHATs[]  = "list_engine&amp;mode=safe";
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_ENGINE_SAFES');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_ENGINE_SAFES_TITLE');

 
                // List all export URLs
 
                // List all export URLs

-               $SQLs[] = "SELECT id FROM `{!MYSQL_PREFIX!}_engine_urls` ORDER BY id";
-               $WHATs[] = "engine_urls";
-               $DESCRs[] = TASK_ADMIN_LIST_ENGINE_URLS;
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_engine_urls` ORDER BY `id`";
+               $WHATs[]  = "engine_urls";
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_ENGINE_URLS');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_ENGINE_URLS_TITLE');

        }
 
        if (EXT_IS_ACTIVE("sponsor")) {
                // List all sponsors
        }
 
        if (EXT_IS_ACTIVE("sponsor")) {
                // List all sponsors

-               $SQLs[]   = "SELECT id FROM `{!MYSQL_PREFIX!}_sponsor_data` ORDER BY id";
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` ORDER BY `id`";

                $WHATs[]  = "list_sponsor";
                $WHATs[]  = "list_sponsor";

-               $DESCRs[] = TASK_ADMIN_LIST_SPONSOR;
-               $TITLEs[] = TASK_ADMIN_LIST_SPONSOR_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_SPONSOR');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_TITLE');

 
                // List confirmed sponsor accounts
 
                // List confirmed sponsor accounts

-               $SQLs[]   = "SELECT id FROM `{!MYSQL_PREFIX!}_sponsor_data` WHERE status='CONFIRMED' ORDER BY id";
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE status='CONFIRMED' ORDER BY `id`";

                $WHATs[]  = "list_sponsor";
                $WHATs[]  = "list_sponsor";

-               $DESCRs[] = TASK_ADMIN_LIST_SPONSOR_CONFIRMED;
-               $TITLEs[] = TASK_ADMIN_LIST_SPONSOR_CONFIRMED_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_CONFIRMED');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_CONFIRMED_TITLE');

 
                // List unconfirmed sponsor accounts
 
                // List unconfirmed sponsor accounts

-               $SQLs[]   = "SELECT id FROM `{!MYSQL_PREFIX!}_sponsor_data` WHERE status='UNCONFIRMED' ORDER BY id";
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE status='UNCONFIRMED' ORDER BY `id`";

                $WHATs[]  = "list_sponsor";
                $WHATs[]  = "list_sponsor";

-               $DESCRs[] = TASK_ADMIN_LIST_SPONSOR_UNCONFIRMED;
-               $TITLEs[] = TASK_ADMIN_LIST_SPONSOR_UNCONFIRMED_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_UNCONFIRMED');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_UNCONFIRMED_TITLE');

 
                // List locked sponsor accounts
 
                // List locked sponsor accounts

-               $SQLs[]   = "SELECT id FROM `{!MYSQL_PREFIX!}_sponsor_data` WHERE status='LOCKED' ORDER BY id";
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE status='LOCKED' ORDER BY `id`";

                $WHATs[]  = "list_sponsor";
                $WHATs[]  = "list_sponsor";

-               $DESCRs[] = TASK_ADMIN_LIST_SPONSOR_LOCKED;
-               $TITLEs[] = TASK_ADMIN_LIST_SPONSOR_LOCKED_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_LOCKED');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_LOCKED_TITLE');

 
                // List waiting sponsor accounts to be approved
 
                // List waiting sponsor accounts to be approved

-               $SQLs[]   = "SELECT id FROM `{!MYSQL_PREFIX!}_sponsor_data` WHERE status='PENDING' ORDER BY id";
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE status='PENDING' ORDER BY `id`";

                $WHATs[]  = "unlock_sponsor";
                $WHATs[]  = "unlock_sponsor";

-               $DESCRs[] = TASK_ADMIN_LIST_SPONSOR_PENDING;
-               $TITLEs[] = TASK_ADMIN_LIST_SPONSOR_PENDING_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_PENDING');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_PENDING_TITLE');

 
                // Waiting payments
 
                // Waiting payments

-               $SQLs[]   = "SELECT id FROM `{!MYSQL_PREFIX!}_sponsor_orders` WHERE pay_status='PENDING' ORDER BY id";
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_orders` WHERE pay_status='PENDING' ORDER BY `id`";

                $WHATs[]  = "list_sponsor_pays";
                $WHATs[]  = "list_sponsor_pays";

-               $DESCRs[] = TASK_ADMIN_LIST_SPONSOR_ORDERS;
-               $TITLEs[] = TASK_ADMIN_LIST_SPONSOR_ORDERS_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_ORDERS');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_ORDERS_TITLE');

        }
 
        if (EXT_IS_ACTIVE("country")) {
                // List country codes
        }
 
        if (EXT_IS_ACTIVE("country")) {
                // List country codes

-               $SQLs[]   = "SELECT id FROM `{!MYSQL_PREFIX!}_countries` ORDER BY id";
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_countries` ORDER BY `id`";

                $WHATs[]  = "list_country";
                $WHATs[]  = "list_country";

-               $DESCRs[] = TASK_ADMIN_LIST_COUNTRY;
-               $TITLEs[] = TASK_ADMIN_LIST_COUNTRY_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_COUNTRY');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_COUNTRY_TITLE');

        }
 
        if (EXT_IS_ACTIVE("theme")) {
                // List all themes
        }
 
        if (EXT_IS_ACTIVE("theme")) {
                // List all themes

-               $SQLs[]   = "SELECT id FROM `{!MYSQL_PREFIX!}_themes` ORDER BY id";
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_themes` ORDER BY `id`";

                $WHATs[]  = "theme_edit";
                $WHATs[]  = "theme_edit";

-               $DESCRs[] = TASK_ADMIN_LIST_THEME_ALL;
-               $TITLEs[] = TASK_ADMIN_LIST_THEME_ALL_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_THEME_ALL');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_THEME_ALL_TITLE');

 
                // List active themes
 
                // List active themes

-               $SQLs[]   = "SELECT id FROM `{!MYSQL_PREFIX!}_themes` WHERE theme_active='Y' ORDER BY id";
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_active='Y' ORDER BY `id`";

                $WHATs[]  = "theme_edit";
                $WHATs[]  = "theme_edit";

-               $DESCRs[] = TASK_ADMIN_LIST_THEME_ACTIVE;
-               $TITLEs[] = TASK_ADMIN_LIST_THEME_ACTIVE_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_THEME_ACTIVE');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_THEME_ACTIVE_TITLE');

        }
 
        if (EXT_IS_ACTIVE("admins")) {
                // List all administrator logins
        }
 
        if (EXT_IS_ACTIVE("admins")) {
                // List all administrator logins

-               $SQLs[]   = "SELECT id FROM `{!MYSQL_PREFIX!}_admins` ORDER BY id";
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id`";

                $WHATs[]  = "admins_edit";
                $WHATs[]  = "admins_edit";

-               $DESCRs[] = TASK_ADMIN_LIST_ADMINS_ALL;
-               $TITLEs[] = TASK_ADMIN_LIST_ADMINS_ALL_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_ADMINS_ALL');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_ADMINS_ALL_TITLE');

        }
 
        if (EXT_IS_ACTIVE("surfbar")) {
                // List all URLs in surfbar
        }
 
        if (EXT_IS_ACTIVE("surfbar")) {
                // List all URLs in surfbar

-               $SQLs[]   = "SELECT id FROM `{!MYSQL_PREFIX!}_surfbar_urls` ORDER BY id";
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_surfbar_urls` ORDER BY `id`";

                $WHATs[]  = "list_surfbar_urls";
                $WHATs[]  = "list_surfbar_urls";

-               $DESCRs[] = TASK_ADMIN_LIST_SURFBAR_URLS_ALL;
-               $TITLEs[] = TASK_ADMIN_LIST_SURFBAR_URLS_ALL_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_SURFBAR_URLS_ALL');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_SURFBAR_URLS_ALL_TITLE');

 
                // List all pending URLs in surfbar
 
                // List all pending URLs in surfbar

-               $SQLs[]   = "SELECT id FROM `{!MYSQL_PREFIX!}_surfbar_urls` WHERE status='PENDING' ORDER BY id";
+               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_surfbar_urls` WHERE status='PENDING' ORDER BY `id`";

                $WHATs[]  = "unlock_surfbar_urls";
                $WHATs[]  = "unlock_surfbar_urls";

-               $DESCRs[] = TASK_ADMIN_LIST_SURFBAR_URLS_PENDING;
-               $TITLEs[] = TASK_ADMIN_LIST_SURFBAR_URLS_PENDING_TITLE;
+               $DESCRs[] = getMessage('TASK_ADMIN_LIST_SURFBAR_URLS_PENDING');
+               $TITLEs[] = getMessage('TASK_ADMIN_LIST_SURFBAR_URLS_PENDING_TITLE');

        }
 
        // Generate extra overview rows
        }
 
        // Generate extra overview rows


@@ -534,7 +538,7 @@ ORDER BY beg_points DESC, userid";
 }
 
 //
 }
 
 //

-function TASK_CREATE_EXTRA_ROWS($SQLs, $WHATs, $DESCRs, $TITLEs){
+function TASK_CREATE_EXTRA_ROWS ($SQLs, $WHATs, $DESCRs, $TITLEs) {

        // Init
        $OUT = ""; $SW = 2; $MAX = sizeof($SQLs) - 1;
        foreach ($SQLs as $key => $sql) {
        // Init
        $OUT = ""; $SW = 2; $MAX = sizeof($SQLs) - 1;
        foreach ($SQLs as $key => $sql) {


@@ -555,8 +559,8 @@ function TASK_CREATE_EXTRA_ROWS($SQLs, $WHATs, $DESCRs, $TITLEs){
 
                if ($key < $MAX) $content['bottom'] = "bottom2";
                if (($value > 0) && (!empty($WHATs[$key]))) {
 
                if ($key < $MAX) $content['bottom'] = "bottom2";
                if (($value > 0) && (!empty($WHATs[$key]))) {

-                       if (empty($TITLEs[$key])) $TITLEs[$key] = TASK_ADMIN_UNKNOWN_LIST_TITLE;
-                       $content['row_link'] = "<a href=\"".URL."/modules.php?module=admin&amp;what=".$WHATs[$key]."\" title=\"".$TITLEs[$key]."\">".$value."</a>";
+                       if (empty($TITLEs[$key])) $TITLEs[$key] = getMessage('TASK_ADMIN_UNKNOWN_LIST_TITLE');
+                       $content['row_link'] = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$WHATs[$key]."\" title=\"".$TITLEs[$key]."\">".$value."</a>";

                } else {
                        $content['row_link'] = 0;
                }
                } else {
                        $content['row_link'] = 0;
                }

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 92a2a47ac49e215c9fa14b71f8e864c4acea331f..61b32431eb70db851ccbce21dd3ed178810e5b67 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -39,7 +39,7 @@ if (!defined('__SECURITY')) {
 
 function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
        // Construction URL
 
 function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
        // Construction URL

-       $FORM = URL."/modules.php?module=".$mod;
+       $FORM = "{!URL!}/modules.php?module=".$mod;

        if (!empty($act)) $FORM .= "&action=".$act;
        if (!empty($wht))   $FORM .= "&what=".$wht;
        define('__FORM_VALUE', $FORM);
        if (!empty($act)) $FORM .= "&action=".$act;
        if (!empty($wht))   $FORM .= "&what=".$wht;
        define('__FORM_VALUE', $FORM);


@@ -51,7 +51,7 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
        );
 
        // Load all themes
        );
 
        // Load all themes

-       while(list($theme) = SQL_FETCHROW($result)) {
+       while (list($theme) = SQL_FETCHROW($result)) {

                // Load it's theme.php file
                $INC = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($theme));
                if (FILE_READABLE($INC)) {
                // Load it's theme.php file
                $INC = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($theme));
                if (FILE_READABLE($INC)) {


@@ -101,7 +101,7 @@ function THEME_GET_VERSION ($name) {
                incrementConfigEntry('cache_hits');
        } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
                // Load version from database
                incrementConfigEntry('cache_hits');
        } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
                // Load version from database

-               $result = SQL_QUERY_ESC("SELECT theme_ver FROM `{!MYSQL_PREFIX!}_themes` WHERE theme_path='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT theme_ver FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' LIMIT 1",

                        array($name), __FILE__, __LINE__);
 
                // Entry found?
                        array($name), __FILE__, __LINE__);
 
                // Entry found?


@@ -146,7 +146,7 @@ function THEME_IS_ACTIVE ($name) {
                incrementConfigEntry('cache_hits');
        } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
                // Check if current theme is already imported or not
                incrementConfigEntry('cache_hits');
        } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
                // Check if current theme is already imported or not

-               $result = SQL_QUERY_ESC("SELECT theme_active FROM `{!MYSQL_PREFIX!}_themes` WHERE theme_path='%s' AND theme_active='Y' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT theme_active FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' AND theme_active='Y' LIMIT 1",

                        array($name), __FILE__, __LINE__);
 
                // Is the theme active and installed?
                        array($name), __FILE__, __LINE__);
 
                // Is the theme active and installed?


@@ -182,7 +182,7 @@ function GET_CURR_THEME_NAME () {
                incrementConfigEntry('cache_hits');
        } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
                // Check if current theme is already imported or not
                incrementConfigEntry('cache_hits');
        } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
                // Check if current theme is already imported or not

-               $result = SQL_QUERY_ESC("SELECT theme_name FROM `{!MYSQL_PREFIX!}_themes` WHERE theme_path='%s' AND theme_active='Y' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT theme_name FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' AND theme_active='Y' LIMIT 1",

                        array($name), __FILE__, __LINE__);
 
                // Load theme name
                        array($name), __FILE__, __LINE__);
 
                // Load theme name

diff --git a/inc/libs/transfer_functions.php b/inc/libs/transfer_functions.php
index ce94a3524685b00dedbf03fffc1c15968f2f47d7..48fccd8de31a16b3963410312d3c039f4949a363 100644 (file)
--- a/inc/libs/transfer_functions.php
+++ b/inc/libs/transfer_functions.php
@@ -40,31 +40,31 @@ if (!defined('__SECURITY')) {
 //
 function TRANSFER_AUTPPURGE($max, $age) {
        // First get total in-going lines
 //
 function TRANSFER_AUTPPURGE($max, $age) {
        // First get total in-going lines

-       $result = SQL_QUERY("SELECT id FROM `{!MYSQL_PREFIX!}_user_transfers_in` ORDER BY id", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_user_transfers_in` ORDER BY `id`", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) > $max) {
                // Update overdue transfers
                $remove = SQL_NUMROWS($result) - $max;
 
                // This will make it really old, so the final removal query will find it
        if (SQL_NUMROWS($result) > $max) {
                // Update overdue transfers
                $remove = SQL_NUMROWS($result) - $max;
 
                // This will make it really old, so the final removal query will find it

-               $result = SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_user_transfers_in` SET time_trans='0' ORDER BY id LIMIT ".$remove, __FILE__, __LINE__);
+               $result = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_user_transfers_in` SET time_trans='0' ORDER BY `id` LIMIT ".$remove, __FILE__, __LINE__);

        }
 
        // Second get total out-going lines
        }
 
        // Second get total out-going lines

-       $result = SQL_QUERY("SELECT id FROM `{!MYSQL_PREFIX!}_user_transfers_out` ORDER BY id", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_user_transfers_out` ORDER BY `id`", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) > $max) {
                // Update overdue transfers
                $remove = SQL_NUMROWS($result) - $max;
 
                // This will make it really old, so the final removal query will find it
        if (SQL_NUMROWS($result) > $max) {
                // Update overdue transfers
                $remove = SQL_NUMROWS($result) - $max;
 
                // This will make it really old, so the final removal query will find it

-               $result = SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_user_transfers_out` SET time_trans='0' ORDER BY id LIMIT ".$remove, __FILE__, __LINE__);
+               $result = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_user_transfers_out` SET time_trans='0' ORDER BY `id` LIMIT ".$remove, __FILE__, __LINE__);

        }
 
        // Remove old in-going transfers
        }
 
        // Remove old in-going transfers

-       $result = SQL_QUERY("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_transfers_in` WHERE time_trans < (UNIX_TIMESTAMP() - ".$age.")", __FILE__, __LINE__);
+       $result = SQL_QUERY("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_transfers_in` WHERE time_trans < (UNIX_TIMESTAMP() - ".$age.")", __FILE__, __LINE__);

        $REMOVE = SQL_AFFECTEDROWS();
 
        // Remove old out-going transfers
        $REMOVE = SQL_AFFECTEDROWS();
 
        // Remove old out-going transfers

-       $result = SQL_QUERY("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_transfers_out` WHERE time_trans < (UNIX_TIMESTAMP() - ".$age.")", __FILE__, __LINE__);
+       $result = SQL_QUERY("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_transfers_out` WHERE time_trans < (UNIX_TIMESTAMP() - ".$age.")", __FILE__, __LINE__);

        $REMOVE += SQL_AFFECTEDROWS();
 
        // Only send email to admin(s) when we have removed entries
        $REMOVE += SQL_AFFECTEDROWS();
 
        // Only send email to admin(s) when we have removed entries

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index c1b19229e7be187d24f6046d4aeb7a178b02bf20..0e37d985be35d1d6357ad1cd3ce094eca47c0bb7 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -54,7 +54,7 @@ function alpha ($sortby, $colspan, $return=false) {
                        $OUT .= "<strong>".$ltr."</strong>";
                } else {
                        // Output link to letter
                        $OUT .= "<strong>".$ltr."</strong>";
                } else {
                        // Output link to letter

-                       $OUT .= "<a href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what'];
+                       $OUT .= "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what'];

                        if (!empty($_GET['mode'])) $OUT .= "&amp;mode=".SQL_ESCAPE($_GET['mode']);
                        $OUT .= "&amp;letter=".$ltr."&amp;sortby=".$sortby.$ADD."\">".$ltr."</a>";
                }
                        if (!empty($_GET['mode'])) $OUT .= "&amp;mode=".SQL_ESCAPE($_GET['mode']);
                        $OUT .= "&amp;letter=".$ltr."&amp;sortby=".$sortby.$ADD."\">".$ltr."</a>";
                }


@@ -112,7 +112,7 @@ function SortLinks($letter, $sortby, $colspan, $return=false) {
                if ($sortby == $sort) {
                        $OUT .= "<strong>".$title."</strong>&nbsp;|&nbsp;";
                } else {
                if ($sortby == $sort) {
                        $OUT .= "<strong>".$title."</strong>&nbsp;|&nbsp;";
                } else {

-                       $OUT .= "<a href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;letter=".$letter."&amp;sortby=".$sort.$ADD."\">".$title."</a>&nbsp;|&nbsp;";
+                       $OUT .= "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_user&amp;letter=".$letter."&amp;sortby=".$sort.$ADD."\">".$title."</a>&nbsp;|&nbsp;";

                }
        } // END - foreach
 
                }
        } // END - foreach
 


@@ -156,7 +156,7 @@ function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) {
                        if (empty($_GET['sortby'])) $_GET['sortby'] = "userid";
 
                        // Base link
                        if (empty($_GET['sortby'])) $_GET['sortby'] = "userid";
 
                        // Base link

-                       $OUT .= "<a href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what'];
+                       $OUT .= "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what'];

 
                        // Add status or mode
                        if (!empty($_GET['status'])) $OUT .= "&amp;mode=".SQL_ESCAPE($_GET['status']);
 
                        // Add status or mode
                        if (!empty($_GET['status'])) $OUT .= "&amp;mode=".SQL_ESCAPE($_GET['status']);


@@ -199,7 +199,7 @@ function USER_CREATE_EMAIL_LINK($email, $mod="admin") {
        if (IS_ADMIN()) $locked = "";
 
        $result = SQL_QUERY_ESC("SELECT userid
        if (IS_ADMIN()) $locked = "";
 
        $result = SQL_QUERY_ESC("SELECT userid

-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE email='%s'".$locked." LIMIT 1",
         array($email), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
 WHERE email='%s'".$locked." LIMIT 1",
         array($email), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {


@@ -207,7 +207,7 @@ WHERE email='%s'".$locked." LIMIT 1",
                list($uid) = SQL_FETCHROW($result);
 
                // Rewrite email address to contact link
                list($uid) = SQL_FETCHROW($result);
 
                // Rewrite email address to contact link

-               $email = URL."/modules.php?module=".$mod."&amp;what=user_contct&amp;u_id=".bigintval($uid);
+               $email = "{!URL!}/modules.php?module=".$mod."&amp;what=user_contct&amp;u_id=".bigintval($uid);

        } // END - if
 
        // Free memory
        } // END - if
 
        // Free memory


@@ -235,7 +235,7 @@ function SELECT_RANDOM_REFID () {
                        $randNum = mt_rand(0, ($totalUsers - 1));
 
                        // Look for random user
                        $randNum = mt_rand(0, ($totalUsers - 1));
 
                        // Look for random user

-                       $result = SQL_QUERY_ESC("SELECT `userid` FROM `{!MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' AND `rand_confirmed` >= %s ORDER BY `rand_confirmed` DESC LIMIT %s, 1",
+                       $result = SQL_QUERY_ESC("SELECT `userid` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' AND `rand_confirmed` >= %s ORDER BY `rand_confirmed` DESC LIMIT %s, 1",

                                array(getConfig('user_min_confirmed'), $randNum), __FILE__, __LINE__);
 
                        // Do we have one entry there?
                                array(getConfig('user_min_confirmed'), $randNum), __FILE__, __LINE__);
 
                        // Do we have one entry there?


@@ -244,7 +244,7 @@ function SELECT_RANDOM_REFID () {
                                list($refid) = SQL_FETCHROW($result);
 
                                // Reset this user's counter
                                list($refid) = SQL_FETCHROW($result);
 
                                // Reset this user's counter

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET `rand_confirmed`=0 WHERE userid=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `rand_confirmed`=0 WHERE userid=%s LIMIT 1",

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


@@ -269,13 +269,13 @@ function USER_DO_LOGIN ($uid, $passwd) {
        $password = ""; $uid2 = ""; $dmy = ""; $online = 0; $login = 0;
        if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID($uid))) {
                // Nickname entered
        $password = ""; $uid2 = ""; $dmy = ""; $online = 0; $login = 0;
        if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID($uid))) {
                // Nickname entered

-               $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$LAST." FROM `{!MYSQL_PREFIX!}_user_data` WHERE nickname='%s' AND status='CONFIRMED' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$LAST." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' AND status='CONFIRMED' LIMIT 1",

                        array($uid), __FILE__, __LINE__);
                list($uid2, $password, $online, $login) = SQL_FETCHROW($result);
                if (!empty($uid2)) $uid = bigintval($uid2);
        } else {
                // Direct userid entered
                        array($uid), __FILE__, __LINE__);
                list($uid2, $password, $online, $login) = SQL_FETCHROW($result);
                if (!empty($uid2)) $uid = bigintval($uid2);
        } else {
                // Direct userid entered

-               $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$LAST." FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$LAST." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",

                        array($uid, $hash), __FILE__, __LINE__);
                list($uid2, $password, $online, $login) = SQL_FETCHROW($result);
        }
                        array($uid, $hash), __FILE__, __LINE__);
                list($uid2, $password, $online, $login) = SQL_FETCHROW($result);
        }


@@ -302,7 +302,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
                        $hash = generateHash($passwd);
 
                        // ... and update database
                        $hash = generateHash($passwd);
 
                        // ... and update database

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET password='%s' WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET password='%s' WHERE userid=%s AND status='CONFIRMED' LIMIT 1",

                                array($hash, $uid), __FILE__, __LINE__);
 
                        // No login bonus by default
                                array($hash, $uid), __FILE__, __LINE__);
 
                        // No login bonus by default


@@ -336,7 +336,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
                        // Try to set session data (which shall normally always work!)
                        if ((set_session('userid', $uid )) && (set_session('u_hash', $hash))) {
                                // Update database records
                        // Try to set session data (which shall normally always work!)
                        if ((set_session('userid', $uid )) && (set_session('u_hash', $hash))) {
                                // Update database records

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET total_logins=total_logins+1".$ADD." WHERE userid=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET total_logins=total_logins+1".$ADD." WHERE userid=%s LIMIT 1",

                                        array($uid), __FILE__, __LINE__);
                                if (SQL_AFFECTEDROWS() == 1) {
                                        // Procedure to checking for login data
                                        array($uid), __FILE__, __LINE__);
                                if (SQL_AFFECTEDROWS() == 1) {
                                        // Procedure to checking for login data


@@ -357,7 +357,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
                        }
                } elseif (GET_EXT_VERSION("sql_patches") >= "0.6.1") {
                        // Update failture counter
                        }
                } elseif (GET_EXT_VERSION("sql_patches") >= "0.6.1") {
                        // Update failture counter

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET login_failures=login_failures+1,last_failure=NOW() WHERE userid=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET login_failures=login_failures+1,last_failure=NOW() WHERE userid=%s LIMIT 1",

                                array($uid), __FILE__, __LINE__);
 
                        // Wrong password!
                                array($uid), __FILE__, __LINE__);
 
                        // Wrong password!


@@ -366,7 +366,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
        } elseif ((($probe_nickname) && (!empty($uid2))) || ($uid2 == $uid)) {
                // Other account status?
                // @TODO Can this query be merged with above query?
        } elseif ((($probe_nickname) && (!empty($uid2))) || ($uid2 == $uid)) {
                // Other account status?
                // @TODO Can this query be merged with above query?

-               $result = SQL_QUERY_ESC("SELECT status FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                        array($uid), __FILE__, __LINE__);
 
                // Entry found?
                        array($uid), __FILE__, __LINE__);
 
                // Entry found?


@@ -404,15 +404,15 @@ function USER_DO_NEW_PASSWORD ($email, $uid) {
        // Probe userid/nickname
        if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID($uid))) {
                // Nickname entered
        // Probe userid/nickname
        if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID($uid))) {
                // Nickname entered

-               $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!MYSQL_PREFIX!}_user_data` WHERE nickname='%s' OR email='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' OR email='%s' LIMIT 1",

                        array($uid, $email), __FILE__, __LINE__);
        } elseif (($uid > 0) && (empty($email))) {
                // Direct userid entered
                        array($uid, $email), __FILE__, __LINE__);
        } elseif (($uid > 0) && (empty($email))) {
                // Direct userid entered

-               $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                        array(bigintval($uid)), __FILE__, __LINE__);
        } elseif (!empty($email)) {
                // Email entered
                        array(bigintval($uid)), __FILE__, __LINE__);
        } elseif (!empty($email)) {
                // Email entered

-               $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!MYSQL_PREFIX!}_user_data` WHERE email='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE email='%s' LIMIT 1",

                        array($email), __FILE__, __LINE__);
        } else {
                // Userid not set!
                        array($email), __FILE__, __LINE__);
        } else {
                // Userid not set!


@@ -428,17 +428,17 @@ function USER_DO_NEW_PASSWORD ($email, $uid) {
                if ($status == "CONFIRMED") {
                        // Ooppps, this was missing! ;-) We should update the database...
                        $NEW_PASS = GEN_PASS();
                if ($status == "CONFIRMED") {
                        // Ooppps, this was missing! ;-) We should update the database...
                        $NEW_PASS = GEN_PASS();

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET password='%s' WHERE userid=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET password='%s' WHERE userid=%s LIMIT 1",

                                array(generateHash($NEW_PASS), $uid), __FILE__, __LINE__);
 
                        // Prepare data and message for email
                        $msg = LOAD_EMAIL_TEMPLATE("new-pass", array('new_pass' => $NEW_PASS), $uid);
 
                        // ... and send it away
                                array(generateHash($NEW_PASS), $uid), __FILE__, __LINE__);
 
                        // Prepare data and message for email
                        $msg = LOAD_EMAIL_TEMPLATE("new-pass", array('new_pass' => $NEW_PASS), $uid);
 
                        // ... and send it away

-                       SEND_EMAIL($uid, GUEST_NEW_PASSWORD, $msg);
+                       SEND_EMAIL($uid, getMessage('GUEST_NEW_PASSWORD'), $msg);

 
                        // Output note to user
 
                        // Output note to user

-                       LOAD_TEMPLATE("admin_settings_saved", false, GUEST_NEW_PASSWORD_SEND);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('GUEST_NEW_PASSWORD_SEND'));

                } else {
                        // Account is locked or unconfirmed
                        $ERROR = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
                } else {
                        // Account is locked or unconfirmed
                        $ERROR = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index ee1bb275ca8d61c510cafc25cc63a66a2fd9f966..0fbc50f3fa04b276a8137997d1d771029e036298 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -326,7 +326,7 @@ function WERNIS_TRANSFER_STATUS ($status) {
 // Log the transfer
 function WERNIS_LOG_TRANSFER ($wdsId, $amount, $type = 'FAILED', $message = "", $status = "") {
        // Register this wernis movement
 // Log the transfer
 function WERNIS_LOG_TRANSFER ($wdsId, $amount, $type = 'FAILED', $message = "", $status = "") {
        // Register this wernis movement

-       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_wernis` (`userid`, `wernis_account`, `wernis_amount`, `wernis_timestamp`, `wernis_type`, `wernis_api_message`, `wernis_api_status`) VALUES (%d, %d, %d, UNIX_TIMESTAMP(), '%s', '%s', '%s')",
+       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_wernis` (`userid`, `wernis_account`, `wernis_amount`, `wernis_timestamp`, `wernis_type`, `wernis_api_message`, `wernis_api_status`) VALUES (%d, %d, %d, UNIX_TIMESTAMP(), '%s', '%s', '%s')",

                array($GLOBALS['userid'], bigintval($wdsId), bigintval($amount), $type, $message, $status), __FILE__, __LINE__);
 }
 
                array($GLOBALS['userid'], bigintval($wdsId), bigintval($amount), $type, $message, $status), __FILE__, __LINE__);
 }
 

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 49a45d16fa0365f31d95099576439a8080de60ce..08334e4ef3e0604f3b9ea1cc96636b0451cee1b9 100644 (file)
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -242,7 +242,7 @@ function YOOMEDIA_EXCLUDE_MAIL ($data, $mode) {
                $mode = YOOMEDIA_CONVERT_MODE($mode);
 
                // Add the entry
                $mode = YOOMEDIA_CONVERT_MODE($mode);
 
                // Add the entry

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_yoomedia_reload` (`type`,`y_id`,`y_reload`,`inserted`) VALUES ('%s',%s,%s,'0000-00-00 00:00')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_yoomedia_reload` (`type`,`y_id`,`y_reload`,`inserted`) VALUES ('%s',%s,%s,'0000-00-00 00:00')",

                        array($mode, bigintval($data['id']), bigintval($data['reload'])), __FILE__, __LINE__);
        } // END - if
 }
                        array($mode, bigintval($data['id']), bigintval($data['reload'])), __FILE__, __LINE__);
        } // END - if
 }


@@ -253,7 +253,7 @@ function YOOMEDIA_UNLIST_MAIL ($data, $mode) {
        $mode = YOOMEDIA_CONVERT_MODE($mode);
 
        // Add the entry
        $mode = YOOMEDIA_CONVERT_MODE($mode);
 
        // Add the entry

-       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
+       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",

                array($mode, bigintval($data['id'])), __FILE__, __LINE__);
 }
 
                array($mode, bigintval($data['id'])), __FILE__, __LINE__);
 }
 


@@ -303,7 +303,7 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
        $reloaded = false;
 
        // Query database
        $reloaded = false;
 
        // Query database

-       $result = SQL_QUERY_ESC("SELECT `id`, UNIX_TIMESTAMP(`inserted`) AS inserted FROM `{!MYSQL_PREFIX!}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `id`, UNIX_TIMESTAMP(`inserted`) AS inserted FROM `{!_MYSQL_PREFIX!}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",

                array($type, bigintval($id)), __FILE__, __LINE__);
 
        // Entry found?
                array($type, bigintval($id)), __FILE__, __LINE__);
 
        // Entry found?


@@ -314,7 +314,7 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
                // Are we ready to sent again?
                if (((time() - $time) >= ($reload * 60*60)) && ($time > 0)) {
                        // Remove entry
                // Are we ready to sent again?
                if (((time() - $time) >= ($reload * 60*60)) && ($time > 0)) {
                        // Remove entry

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_yoomedia_reload` WHERE id=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_yoomedia_reload` WHERE id=%s LIMIT 1",

                                array($id), __FILE__, __LINE__);
                } else {
                        // Dont' sent again this mail
                                array($id), __FILE__, __LINE__);
                } else {
                        // Dont' sent again this mail


@@ -337,7 +337,7 @@ function YOOMEDIA_RELOAD_LOCK ($data, $mode) {
                $mode = YOOMEDIA_CONVERT_MODE($mode);
 
                // Add the entry
                $mode = YOOMEDIA_CONVERT_MODE($mode);
 
                // Add the entry

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_yoomedia_reload` (`type`,`y_id`,`y_reload`) VALUES ('%s',%s,%s)",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_yoomedia_reload` (`type`,`y_id`,`y_reload`) VALUES ('%s',%s,%s)",

                        array($mode, bigintval($data['id']), bigintval($data['reload'])), __FILE__, __LINE__);
        } // END - if
 }
                        array($mode, bigintval($data['id']), bigintval($data['reload'])), __FILE__, __LINE__);
        } // END - if
 }

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index 4830affddfafccfd6d7044de6c3d1f6bac4514c3..c033051562e8d1ea0cdbf7136c0cb7143599f676 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -176,12 +176,12 @@ if ($cacheMode == "load") {
        if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
                // Query with CSS file from DB
                $res_ext_crt = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_has_css AS ext_css, ext_active, ext_version
        if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
                // Query with CSS file from DB
                $res_ext_crt = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_has_css AS ext_css, ext_active, ext_version

-FROM `{!MYSQL_PREFIX!}_extensions`".$ADD."
+FROM `{!_MYSQL_PREFIX!}_extensions`".$ADD."

 ORDER BY ext_name", __FILE__, __LINE__);
        } else {
                // Old obsolete query string
                $res_ext_crt = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_name, ext_active, ext_version
 ORDER BY ext_name", __FILE__, __LINE__);
        } else {
                // Old obsolete query string
                $res_ext_crt = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_name, ext_active, ext_version

-FROM `{!MYSQL_PREFIX!}_extensions`".$ADD."
+FROM `{!_MYSQL_PREFIX!}_extensions`".$ADD."

 ORDER BY ext_name", __FILE__, __LINE__);
        }
 }
 ORDER BY ext_name", __FILE__, __LINE__);
        }
 }


@@ -278,11 +278,11 @@ if (!empty($DEL[0])) {
        // Remove extensions from two tables: extension registry and tasks table
        foreach ($DEL as $del_ext) {
                // First remove entry from extensions table
        // Remove extensions from two tables: extension registry and tasks table
        foreach ($DEL as $del_ext) {
                // First remove entry from extensions table

-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",

                        array($del_ext), __FILE__, __LINE__);
 
                // Remove (maybe?) found tasks (main task and possible updates
                        array($del_ext), __FILE__, __LINE__);
 
                // Remove (maybe?) found tasks (main task and possible updates

-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_task_system` WHERE subject='[%s:]' AND (task_type='EXTENSION' OR task_type='EXTENSION_UPDATE')",
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_task_system` WHERE subject='[%s:]' AND (task_type='EXTENSION' OR task_type='EXTENSION_UPDATE')",

                        array($del_ext), __FILE__, __LINE__);
        } // END - foreach
 
                        array($del_ext), __FILE__, __LINE__);
        } // END - foreach
 

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index 7e2a91bafffe1da15e7e067790ebb60ec7071b45..5f240f552632a7ca7b4d2065ec024cba0657c0f9 100644 (file)
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -93,7 +93,7 @@ if (($cacheInstance->loadCacheFile("admins")) && ($cacheInstance->extensionVersi
 
        // Query the database about this
        $result_admins = SQL_QUERY("SELECT id AS aid, login, password, email".$ADD."
 
        // Query the database about this
        $result_admins = SQL_QUERY("SELECT id AS aid, login, password, email".$ADD."

-FROM `{!MYSQL_PREFIX!}_admins`
+FROM `{!_MYSQL_PREFIX!}_admins`

 ORDER BY login", __FILE__, __LINE__);
        while($dummy = SQL_FETCHARRAY($result_admins)) {
                // Save row
 ORDER BY login", __FILE__, __LINE__);
        while($dummy = SQL_FETCHARRAY($result_admins)) {
                // Save row


@@ -123,7 +123,7 @@ if (GET_EXT_VERSION("admins") >= "0.3") {
                $cacheInstance->storeExtensionVersion("admins");
 
                // Load all modules and their data
                $cacheInstance->storeExtensionVersion("admins");
 
                // Load all modules and their data

-               $result = SQL_QUERY("SELECT id, admin_id, action_menu, what_menu, access_mode FROM `{!MYSQL_PREFIX!}_admins_acls` ORDER BY admin_id, action_menu, what_menu", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT id, admin_id, action_menu, what_menu, access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` ORDER BY admin_id, action_menu, what_menu", __FILE__, __LINE__);

 
                // Add all rows
                while ($data = SQL_FETCHARRAY($result)) {
 
                // Add all rows
                while ($data = SQL_FETCHARRAY($result)) {

diff --git a/inc/loader/load_cache-config.php b/inc/loader/load_cache-config.php
index 97668f2444fab251c7932e57ce2d055c98e53069..133a6dcbefdc0d41170646af8d5d4d800315c416 100644 (file)
--- a/inc/loader/load_cache-config.php
+++ b/inc/loader/load_cache-config.php
@@ -53,7 +53,7 @@ if (($cacheInstance->loadCacheFile("config", true)) && ($cacheInstance->extensio
        $cacheInstance->storeExtensionVersion("sql_patches");
 
        // Load all modules and their data
        $cacheInstance->storeExtensionVersion("sql_patches");
 
        // Load all modules and their data

-       $result = SQL_QUERY("SELECT * FROM `{!MYSQL_PREFIX!}_config` ORDER BY config ASC", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT * FROM `{!_MYSQL_PREFIX!}_config` ORDER BY config ASC", __FILE__, __LINE__);

        while ($data = SQL_FETCHARRAY($result)) {
                // Add row to cache file
                $cacheInstance->addRow($data);
        while ($data = SQL_FETCHARRAY($result)) {
                // Add row to cache file
                $cacheInstance->addRow($data);

diff --git a/inc/loader/load_cache-modreg.php b/inc/loader/load_cache-modreg.php
index 351550fee58cb6b8571e4a51f9aa279a54c60add..b6eb02a2da1e333de70c742ccdbec0f5166d025f 100644 (file)
--- a/inc/loader/load_cache-modreg.php
+++ b/inc/loader/load_cache-modreg.php
@@ -76,11 +76,11 @@ if (($cacheInstance->loadCacheFile("mod_reg")) && ($cacheInstance->extensionVers
        if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
                // Load has_menu
                $result = SQL_QUERY("SELECT id, module, title, locked, hidden, admin_only, title, mem_only, has_menu
        if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
                // Load has_menu
                $result = SQL_QUERY("SELECT id, module, title, locked, hidden, admin_only, title, mem_only, has_menu

-FROM `{!MYSQL_PREFIX!}_mod_reg` ORDER BY id", __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_mod_reg` ORDER BY `id`", __FILE__, __LINE__);

        } else {
                // Don't load has_menu
                $result = SQL_QUERY("SELECT id, module, title, locked, hidden, admin_only, title, mem_only
        } else {
                // Don't load has_menu
                $result = SQL_QUERY("SELECT id, module, title, locked, hidden, admin_only, title, mem_only

-FROM `{!MYSQL_PREFIX!}_mod_reg` ORDER BY id", __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_mod_reg` ORDER BY `id`", __FILE__, __LINE__);

        }
 
        // Cache all data
        }
 
        // Cache all data

diff --git a/inc/loader/load_cache-refdepths.php b/inc/loader/load_cache-refdepths.php
index f6bcbd0cbc505c847c6b611d3d1aec86d966a984..208d8825ad0c69ea33ca00369c15410d54820512 100644 (file)
--- a/inc/loader/load_cache-refdepths.php
+++ b/inc/loader/load_cache-refdepths.php
@@ -51,7 +51,7 @@ if (($cacheInstance->loadCacheFile("refdepths")) && ($cacheInstance->extensionVe
        $cacheInstance->storeExtensionVersion("sql_patches");
 
        // Load all modules and their data
        $cacheInstance->storeExtensionVersion("sql_patches");
 
        // Load all modules and their data

-       $result = SQL_QUERY("SELECT id, level, percents FROM `{!MYSQL_PREFIX!}_refdepths` ORDER BY level", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, level, percents FROM `{!_MYSQL_PREFIX!}_refdepths` ORDER BY level", __FILE__, __LINE__);

        while ($data = SQL_FETCHARRAY($result)) {
                // Add row to cache file
                $cacheInstance->addRow($data);
        while ($data = SQL_FETCHARRAY($result)) {
                // Add row to cache file
                $cacheInstance->addRow($data);

diff --git a/inc/loader/load_cache-refsystem.php b/inc/loader/load_cache-refsystem.php
index 5a34d05e76c50bf1ba73ed4d96a017a93dca3ca8..87dce53986d84d01e9070d0fd802957f7914b853 100644 (file)
--- a/inc/loader/load_cache-refsystem.php
+++ b/inc/loader/load_cache-refsystem.php
@@ -51,7 +51,7 @@ if (($cacheInstance->loadCacheFile("refsystem")) && ($cacheInstance->extensionVe
        $cacheInstance->storeExtensionVersion("sql_patches");
 
        // Load all modules and their data
        $cacheInstance->storeExtensionVersion("sql_patches");
 
        // Load all modules and their data

-       $result = SQL_QUERY("SELECT id, userid, level, counter FROM `{!MYSQL_PREFIX!}_refsystem` ORDER BY userid, level", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, userid, level, counter FROM `{!_MYSQL_PREFIX!}_refsystem` ORDER BY userid, level", __FILE__, __LINE__);

        while ($data = SQL_FETCHARRAY($result)) {
                // Add row to cache file
                $cacheInstance->addRow($data);
        while ($data = SQL_FETCHARRAY($result)) {
                // Add row to cache file
                $cacheInstance->addRow($data);

diff --git a/inc/loader/load_cache-them.php b/inc/loader/load_cache-them.php
index 18781a48e4174dd85647480e1410a434130f80bb..c516fe9c9dcf1da30351b8028d0a8c8a3ac44374 100644 (file)
--- a/inc/loader/load_cache-them.php
+++ b/inc/loader/load_cache-them.php
@@ -75,9 +75,9 @@ if (($cacheInstance->loadCacheFile("themes")) && ($cacheInstance->extensionVersi
 
        // Load all themes and their data
        if (GET_EXT_VERSION("theme") >= "0.0.7") {
 
        // Load all themes and their data
        if (GET_EXT_VERSION("theme") >= "0.0.7") {

-               $result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver, theme_name FROM `{!MYSQL_PREFIX!}_themes` ORDER BY id", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver, theme_name FROM `{!_MYSQL_PREFIX!}_themes` ORDER BY `id`", __FILE__, __LINE__);

        } else {
        } else {

-               $result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver FROM `{!MYSQL_PREFIX!}_themes` ORDER BY id", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver FROM `{!_MYSQL_PREFIX!}_themes` ORDER BY `id`", __FILE__, __LINE__);

        }
        while ($data = SQL_FETCHARRAY($result)) {
                // Add row to cache file
        }
        while ($data = SQL_FETCHARRAY($result)) {
                // Add row to cache file

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index defa215d4489986915d322c99fac2725af98b2e8..f0aa99ed6715e0c6f54638b357748433761992d4 100644 (file)
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -48,7 +48,7 @@ $mark = mktime(0, 0, 0, getConfig('last_month'), date("d", time()), date('Y', ti
 $SQL = ""; $MODE = "";
 
 // Shall I sent activation or deactivation mail?
 $SQL = ""; $MODE = "";
 
 // Shall I sent activation or deactivation mail?

-$SQL = "SELECT userid, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE (beg_ral_notify ";
+$SQL = "SELECT userid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE (beg_ral_notify ";

 switch (getConfig('beg_rallye'))
 {
 case "Y": // Begging rallye is activated
 switch (getConfig('beg_rallye'))
 {
 case "Y": // Begging rallye is activated


@@ -113,9 +113,9 @@ if (!empty($SQL)) {
                $RECEIVER = ""; $UIDs = array();
 
                // Okay lets notify all users!
                $RECEIVER = ""; $UIDs = array();
 
                // Okay lets notify all users!

-               while(list($uid, $email) = SQL_FETCHROW($result_main)) {
+               while (list($uid, $email) = SQL_FETCHROW($result_main)) {

                        // Update account
                        // Update account

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data`
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`

 SET beg_ral_notify='%s', beg_ral_%s_notify='%s'
 WHERE userid=%s
 LIMIT 1",
 SET beg_ral_notify='%s', beg_ral_%s_notify='%s'
 WHERE userid=%s
 LIMIT 1",

diff --git a/inc/mails/birthday_mails.php b/inc/mails/birthday_mails.php
index 0a69e1c09ed01ac7e256086bee540e18f3fe7885..be67b650fd7b89fc5d547f34d8899fb128031ab2 100644 (file)
--- a/inc/mails/birthday_mails.php
+++ b/inc/mails/birthday_mails.php
@@ -57,7 +57,7 @@ if ((getConfig('birthday_active')) && (EXT_IS_ACTIVE("autopurge")) && (getConfig
 
 // Only confirmed members shall receive birthday mails...
 $result_birthday = SQL_QUERY_ESC("SELECT userid, email, birth_year
 
 // Only confirmed members shall receive birthday mails...
 $result_birthday = SQL_QUERY_ESC("SELECT userid, email, birth_year

-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE status='CONFIRMED' AND birth_day=%s AND birth_month=%s AND birthday_sent < (UNIX_TIMESTAMP() - ".(getConfig('one_day') * 364).")".$ADD."
 ORDER BY userid",
  array($DAY, $MONTH, $VALUE), __FILE__, __LINE__);
 WHERE status='CONFIRMED' AND birth_day=%s AND birth_month=%s AND birthday_sent < (UNIX_TIMESTAMP() - ".(getConfig('one_day') * 364).")".$ADD."
 ORDER BY userid",
  array($DAY, $MONTH, $VALUE), __FILE__, __LINE__);


@@ -85,7 +85,7 @@ if (SQL_NUMROWS($result_birthday) > 0) {
                        }
 
                        // Insert row into database
                        }
 
                        // Insert row into database

-                       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_birthday` (userid, points, chk_value) VALUES ('%s','%s','%s' )",
+                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_birthday` (userid, points, chk_value) VALUES ('%s','%s','%s' )",

                                array(bigintval($uid), getConfig('birthday_points'), $content['check']), __FILE__, __LINE__);
 
                        // Load email template with confirmation link
                                array(bigintval($uid), getConfig('birthday_points'), $content['check']), __FILE__, __LINE__);
 
                        // Load email template with confirmation link


@@ -99,7 +99,7 @@ if (SQL_NUMROWS($result_birthday) > 0) {
                SEND_EMAIL($uid, HAPPY_BIRTHDAY, $msg);
 
                // Remember him that he has received a birthday mail
                SEND_EMAIL($uid, HAPPY_BIRTHDAY, $msg);
 
                // Remember him that he has received a birthday mail

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET birthday_sent=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET birthday_sent=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",

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

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index e565d624e502a451807e199a1a2b6de55841fa83..48590a115c17b9a6aaa97a1287e5bb82aff20327 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -48,7 +48,7 @@ $mark = mktime(0, 0, 0, getConfig('last_month'), date("d", time()), date('Y', ti
 $SQL = ""; $MODE = "";
 
 // Shall I sent activation or deactivation mail?
 $SQL = ""; $MODE = "";
 
 // Shall I sent activation or deactivation mail?

-$SQL = "SELECT userid, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE (bonus_ral_notify ";
+$SQL = "SELECT userid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE (bonus_ral_notify ";

 switch (getConfig('bonus_active'))
 {
 case "Y": // Active rallye is activated
 switch (getConfig('bonus_active'))
 {
 case "Y": // Active rallye is activated


@@ -92,9 +92,9 @@ if (!empty($SQL)) {
        $result_main = SQL_QUERY($SQL, __FILE__, __LINE__);
        if (SQL_NUMROWS($result_main) > 0) {
                // Okay lets notify all users!
        $result_main = SQL_QUERY($SQL, __FILE__, __LINE__);
        if (SQL_NUMROWS($result_main) > 0) {
                // Okay lets notify all users!

-               while(list($uid, $email) = SQL_FETCHROW($result_main)) {
+               while (list($uid, $email) = SQL_FETCHROW($result_main)) {

                        // Update account
                        // Update account

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data`
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`

 SET bonus_ral_notify='%s', bonus_ral_%s_notify='%s'
 WHERE userid=%s
 LIMIT 1",
 SET bonus_ral_notify='%s', bonus_ral_%s_notify='%s'
 WHERE userid=%s
 LIMIT 1",

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 0635460a527b70722322ff871033e0d6fa1fdafd..fec5cc9fc509d9f6748aa08f012c61600bb5014d 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -170,7 +170,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                        LOAD_TEMPLATE("admin_reset_password_form", false, $content);
                } else {
                        // Cannot validate the login data and hash
                        LOAD_TEMPLATE("admin_reset_password_form", false, $content);
                } else {
                        // Cannot validate the login data and hash

-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED'));

                }
        } elseif ((isset($_POST['reset_pass'])) && (!empty($_POST['hash'])) && (!empty($_POST['login'])) && (!empty($_POST['pass1'])) && ($_POST['pass1'] == $_POST['pass2'])) {
                // Okay, we shall the admin password here. So first revalidate the hash
                }
        } elseif ((isset($_POST['reset_pass'])) && (!empty($_POST['hash'])) && (!empty($_POST['login'])) && (!empty($_POST['pass1'])) && ($_POST['pass1'] == $_POST['pass2'])) {
                // Okay, we shall the admin password here. So first revalidate the hash


@@ -182,7 +182,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                        LOAD_TEMPLATE("admin_reset_pass_done", false, $OUT);
                } else {
                        // Validation failed
                        LOAD_TEMPLATE("admin_reset_pass_done", false, $OUT);
                } else {
                        // Validation failed

-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2'));

                }
        } else {
                // Output reset password form
                }
        } else {
                // Output reset password form


@@ -197,7 +197,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
        if (!empty($_GET['register'])) {
                // Registration of first admin is done
 
        if (!empty($_GET['register'])) {
                // Registration of first admin is done

-               if ($_GET['register'] == "done") LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin\">".ADMIN_REGISTER_DONE."</div>");
+               if ($_GET['register'] == "done") LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REGISTER_DONE'));

        } // END - if
 
        // Check if the admin has submitted data or not
        } // END - if
 
        // Check if the admin has submitted data or not


@@ -229,13 +229,13 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
                case "404": // Administrator login not found
                        $_POST['ok'] = $ret;
 
                case "404": // Administrator login not found
                        $_POST['ok'] = $ret;

-                       $ret = ADMIN_NOT_FOUND;
+                       $ret = getMessage('ADMIN_NOT_FOUND');

                        DESTROY_ADMIN_SESSION();
                        break;
 
                case "pass": // Wrong password
                        $_POST['ok'] = $ret;
                        DESTROY_ADMIN_SESSION();
                        break;
 
                case "pass": // Wrong password
                        $_POST['ok'] = $ret;

-                       $ret = WRONG_PASS." [<a href=\"".URL."/modules.php?module=admin&amp;reset_pass=1\">".ADMIN_RESET_PASS."</a>]\n";
+                       $ret = "{!WRONG_PASS!} [<a href=\"{!URL!}/modules.php?module=admin&amp;reset_pass=1\">{!ADMIN_RESET_PASS!}</a>]\n";

                        DESTROY_ADMIN_SESSION();
                        break;
 
                        DESTROY_ADMIN_SESSION();
                        break;
 

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 39e47d68e661ffa96d9a37ff29fc3a358f3b0ee1..75f66ff5b26bf0958b128a3c6fffe0e38f0768c7 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -43,13 +43,13 @@ function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER) {
        $ret = "already";
 
        // Lookup the user
        $ret = "already";
 
        // Lookup the user

-       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",

                array($user), __FILE__, __LINE__);
 
        // Is the entry there?
        if (SQL_NUMROWS($result) == 0) {
                // Ok, let's create the admin login
                array($user), __FILE__, __LINE__);
 
        // Is the entry there?
        if (SQL_NUMROWS($result) == 0) {
                // Ok, let's create the admin login

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_admins` (login, password, email) VALUES ('%s', '%s', '%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins` (login, password, email) VALUES ('%s', '%s', '%s')",

                        array($user, $md5, $email), __FILE__, __LINE__);
                $ret = "done";
        } // END - if
                        array($user, $md5, $email), __FILE__, __LINE__);
                $ret = "done";
        } // END - if


@@ -91,7 +91,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
                $ADD = RUN_FILTER('sql_admin_extra_data');
 
                // Get password from DB
                $ADD = RUN_FILTER('sql_admin_extra_data');
 
                // Get password from DB

-               $result = SQL_QUERY_ESC("SELECT password".$ADD." FROM `{!MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT password".$ADD." FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",

                        array($aid), __FILE__, __LINE__);
 
                // Entry found?
                        array($aid), __FILE__, __LINE__);
 
                // Entry found?


@@ -140,11 +140,11 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
                        set_session('mxchange_admin_last_fail', $data['last_failure']);
 
                        // Update password and reset login failures
                        set_session('mxchange_admin_last_fail', $data['last_failure']);
 
                        // Update password and reset login failures

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_admins` SET password='%s',login_failures=0,last_failure='0000-00-00 00:00:00' WHERE id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s',login_failures=0,last_failure='0000-00-00 00:00:00' WHERE id=%s LIMIT 1",

                                array($data['password'], $aid), __FILE__, __LINE__);
                } else {
                        // Update password
                                array($data['password'], $aid), __FILE__, __LINE__);
                } else {
                        // Update password

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_admins` SET password='%s' WHERE id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE id=%s LIMIT 1",

                                array($data['password'], $aid), __FILE__, __LINE__);
                }
 
                                array($data['password'], $aid), __FILE__, __LINE__);
                }
 


@@ -173,7 +173,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
        // Count login failure if admins extension version is 0.7.0+
        if (($ret == "pass") && (GET_EXT_VERSION("admins") >= "0.7.0")) {
                // Update counter
        // Count login failure if admins extension version is 0.7.0+
        if (($ret == "pass") && (GET_EXT_VERSION("admins") >= "0.7.0")) {
                // Update counter

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_admins` SET login_failures=login_failures+1,last_failure=NOW() WHERE id=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET login_failures=login_failures+1,last_failure=NOW() WHERE id=%s LIMIT 1",

                        array($aid), __FILE__, __LINE__);
 
                // Rebuild cache
                        array($aid), __FILE__, __LINE__);
 
                // Rebuild cache


@@ -192,7 +192,7 @@ function LOGIN_ADMIN ($adminLogin, $passHash) {
        // Reset failure counter on matching admins version
        if ((GET_EXT_VERSION("admins") >= "0.7.0") && ((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("sql_patches") == ""))) {
                // Reset counter on out-dated sql_patches version
        // Reset failure counter on matching admins version
        if ((GET_EXT_VERSION("admins") >= "0.7.0") && ((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("sql_patches") == ""))) {
                // Reset counter on out-dated sql_patches version

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_admins` SET login_failures=0,last_failure='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET login_failures=0,last_failure='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1",

                        array($adminLogin), __FILE__, __LINE__);
 
                // Rebuild cache
                        array($adminLogin), __FILE__, __LINE__);
 
                // Rebuild cache


@@ -343,8 +343,8 @@ function ADMIN_DO_ACTION($wht) {
        LOAD_TEMPLATE("admin_main_header");
 
        // Check if action/what pair is valid
        LOAD_TEMPLATE("admin_main_header");
 
        // Check if action/what pair is valid

-       $result_action = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_admin_menu`
-WHERE action='%s' AND ((what='%s' AND what != 'overview') OR ((what='' OR what IS NULL) AND '%s'='overview'))
+       $result_action = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu`
+WHERE action='%s' AND ((what='%s' AND what != 'overview') OR ((what='' OR `what` IS NULL) AND '%s'='overview'))

 LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_action) == 1) {
 
 LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_action) == 1) {
 


@@ -355,16 +355,16 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
                        require($INC);
                } elseif (__ACL_ALLOW == false) {
                        // Access denied
                        require($INC);
                } elseif (__ACL_ALLOW == false) {
                        // Access denied

-                       LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_ACCESS_DENIED);
-                       addFatalMessage(ADMIN_ACCESS_DENIED);
+                       LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_ACCESS_DENIED'));
+                       addFatalMessage(getMessage('ADMIN_ACCESS_DENIED'));

                } else {
                        // Include file not found! :-(
                } else {
                        // Include file not found! :-(

-                       LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_404_ACTION);
+                       LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_404_ACTION'));

                        addFatalMessage(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2);
                }
        } else {
                // Invalid action/what pair found!
                        addFatalMessage(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2);
                }
        } else {
                // Invalid action/what pair found!

-               LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_INVALID_ACTION);
+               LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_INVALID_ACTION'));

                addFatalMessage(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2);
        }
 
                addFatalMessage(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2);
        }
 


@@ -411,7 +411,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
        } // END - if
 
        // Build main menu
        } // END - if
 
        // Build main menu

-       $result_main = SQL_QUERY("SELECT action, title, descr FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR what IS NULL) ORDER BY sort, id DESC", __FILE__, __LINE__);
+       $result_main = SQL_QUERY("SELECT action, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort`, id DESC", __FILE__, __LINE__);

        if (SQL_NUMROWS($result_main) > 0)
        {
                $OUT = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_main\">
        if (SQL_NUMROWS($result_main) > 0)
        {
                $OUT = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_main\">


@@ -444,7 +444,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                }
                                 else
                                {
                                }
                                 else
                                {

-                                       $OUT .= "[<a href=\"".URL."/modules.php?module=admin&amp;action=".$menu."\">";
+                                       $OUT .= "[<a href=\"{!URL!}/modules.php?module=admin&amp;action=".$menu."\">";

                                }
                                $OUT .= $title;
                                if (($menu == $act) && (empty($wht)))
                                }
                                $OUT .= $title;
                                if (($menu == $act) && (empty($wht)))


@@ -457,8 +457,8 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                }
                                $OUT .= "</NOBR></td>
 </tr>\n";
                                }
                                $OUT .= "</NOBR></td>
 </tr>\n";

-                               $result_what = SQL_QUERY_ESC("SELECT what, title, descr FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort, id DESC",
-                                array($menu), __FILE__, __LINE__);
+                               $result_what = SQL_QUERY_ESC("SELECT what, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`, id DESC",
+                                       array($menu), __FILE__, __LINE__);

                                if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu))
                                {
                                        $menuDesription = array();
                                if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu))
                                {
                                        $menuDesription = array();


@@ -492,7 +492,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                                                }
                                                                 else
                                                                {
                                                                }
                                                                 else
                                                                {

-                                                                       $OUT .= "[<a href=\"".URL."/modules.php?module=admin&amp;what=".$wht_sub."\">";
+                                                                       $OUT .= "[<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$wht_sub."\">";

                                                                }
                                                        }
                                                         else
                                                                }
                                                        }
                                                         else


@@ -570,7 +570,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
 function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $none=false, $field="userid")
 {
        // Output selection form with all confirmed user accounts listed
 function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $none=false, $field="userid")
 {
        // Output selection form with all confirmed user accounts listed

-       $result = SQL_QUERY("SELECT userid, surname, family FROM `{!MYSQL_PREFIX!}_user_data` ORDER BY userid", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT userid, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` ORDER BY userid", __FILE__, __LINE__);

        $OUT = "";
 
        // USe this only for adding points (e.g. adding refs really makes no sence ;-) )
        $OUT = "";
 
        // USe this only for adding points (e.g. adding refs really makes no sence ;-) )


@@ -602,9 +602,9 @@ function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $non
 }
 //
 function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") {
 }
 //
 function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") {

-       $wht = "what != ''";
-       if ($MODE == "action") $wht = "(what='' OR what IS NULL) AND action !='login'";
-       $result = SQL_QUERY_ESC("SELECT %s, title FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE ".$wht." ORDER BY sort",
+       $wht = "`what` != ''";
+       if ($MODE == "action") $wht = "(what='' OR `what` IS NULL) AND action !='login'";
+       $result = SQL_QUERY_ESC("SELECT %s, title FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$wht." ORDER BY `sort`",

         array($MODE), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Load menu as selection
         array($MODE), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Load menu as selection


@@ -676,9 +676,9 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
        $result = false;
        if (!$alwaysAdd) {
                if (!empty($whereStatement)) {
        $result = false;
        if (!$alwaysAdd) {
                if (!empty($whereStatement)) {

-                       $result = SQL_QUERY("SELECT * FROM `"._MYSQL_PREFIX.$tableName."` WHERE ".$whereStatement." LIMIT 1", __FILE__, __LINE__);
+                       $result = SQL_QUERY("SELECT * FROM `{!_MYSQL_PREFIX!}".$tableName."` WHERE ".$whereStatement." LIMIT 1", __FILE__, __LINE__);

                } else {
                } else {

-                       $result = SQL_QUERY("SELECT * FROM `"._MYSQL_PREFIX.$tableName."` LIMIT 1", __FILE__, __LINE__);
+                       $result = SQL_QUERY("SELECT * FROM `{!_MYSQL_PREFIX!}".$tableName."` LIMIT 1", __FILE__, __LINE__);

                }
        } // END - if
 
                }
        } // END - if
 


@@ -687,7 +687,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
                $DATA_UPDATE = implode(", ", $DATA);
 
                // Generate SQL string
                $DATA_UPDATE = implode(", ", $DATA);
 
                // Generate SQL string

-               $SQL = sprintf("UPDATE `"._MYSQL_PREFIX."%s` SET %s WHERE %s LIMIT 1",
+               $SQL = sprintf("UPDATE `{!_MYSQL_PREFIX!}%s` SET %s WHERE %s LIMIT 1",

                        $tableName,
                        $DATA_UPDATE,
                        $whereStatement
                        $tableName,
                        $DATA_UPDATE,
                        $whereStatement


@@ -706,7 +706,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
                $VALUEs = implode(", ", $VALUEs);
 
                // Generate SQL string
                $VALUEs = implode(", ", $VALUEs);
 
                // Generate SQL string

-               $SQL = sprintf("INSERT INTO "._MYSQL_PREFIX."%s (%s) VALUES (%s)",
+               $SQL = sprintf("INSERT INTO {!_MYSQL_PREFIX!}%s (%s) VALUES (%s)",

                        $tableName,
                        $KEYs,
                        $VALUEs
                        $tableName,
                        $KEYs,
                        $VALUEs


@@ -723,7 +723,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
        REBUILD_CACHE("config", "config");
 
        // Settings saved
        REBUILD_CACHE("config", "config");
 
        // Settings saved

-       LOAD_TEMPLATE("admin_settings_saved", false, SETTINGS_SAVED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));

 }
 
 // Generate a selection box
 }
 
 // Generate a selection box


@@ -778,10 +778,11 @@ function ADMIN_USER_PROFILE_LINK ($uid, $title="", $wht="list_user") {
 
        //* DEBUG: */ echo "a:".$title."<br />";
        // Return link
 
        //* DEBUG: */ echo "a:".$title."<br />";
        // Return link

-       return "<a href=\"".URL."/modules.php?module=admin&amp;what=".$wht."&amp;u_id=".$uid."\" title=\"".ADMIN_USER_PROFILE_TITLE."\">".$title."</a>";
+       return "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$wht."&amp;u_id=".$uid."\" title=\"".ADMIN_USER_PROFILE_TITLE."\">".$title."</a>";

 }
 }

-//
-function ADMIN_CHECK_MENU_MODE() {
+
+// Check "logical-area-mode"
+function ADMIN_CHECK_MENU_MODE () {

        global $cacheArray;
 
        // Set the global mode as the mode for all admins
        global $cacheArray;
 
        // Set the global mode as the mode for all admins


@@ -798,7 +799,7 @@ function ADMIN_CHECK_MENU_MODE() {
                incrementConfigEntry('cache_hits');
        } elseif (GET_EXT_VERSION("admins") >= "0.6.7") {
                // Load from database when version of "admins" is enough
                incrementConfigEntry('cache_hits');
        } elseif (GET_EXT_VERSION("admins") >= "0.6.7") {
                // Load from database when version of "admins" is enough

-               $result = SQL_QUERY_ESC("SELECT la_mode FROM `{!MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT la_mode FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",

                        array($aid), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Load data
                        array($aid), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Load data


@@ -828,7 +829,7 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
                        // Should always be set... ;-)
                        if (!empty($selected)) {
                                // Determine new status
                        // Should always be set... ;-)
                        if (!empty($selected)) {
                                // Determine new status

-                               $result = SQL_QUERY_ESC("SELECT %s FROM `{!MYSQL_PREFIX!}_%s` WHERE %s=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT %s FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s=%s LIMIT 1",

                                        array($row, $table, $idRow, $id), __FILE__, __LINE__);
 
                                // Row found?
                                        array($row, $table, $idRow, $id), __FILE__, __LINE__);
 
                                // Row found?


@@ -840,7 +841,7 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
                                        if ($currStatus == "Y") $newStatus = "N"; else $newStatus = "Y";
 
                                        // Change this status
                                        if ($currStatus == "Y") $newStatus = "N"; else $newStatus = "Y";
 
                                        // Change this status

-                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_%s` SET %s='%s' WHERE %s=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_%s` SET %s='%s' WHERE %s=%s LIMIT 1",

                                                array($table, $row, $newStatus, $idRow, $id), __FILE__, __LINE__);
 
                                        // Count up affected rows
                                                array($table, $row, $newStatus, $idRow, $id), __FILE__, __LINE__);
 
                                        // Count up affected rows


@@ -856,9 +857,10 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
                LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_STATUS_CHANGED_1.$cnt.ADMIN_STATUS_CHANGED_2.count($IDs).ADMIN_STATUS_CHANGED_3);
        } else {
                // Nothing selected!
                LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_STATUS_CHANGED_1.$cnt.ADMIN_STATUS_CHANGED_2.count($IDs).ADMIN_STATUS_CHANGED_3);
        } else {
                // Nothing selected!

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NOTHING_SELECTED_CHANGE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NOTHING_SELECTED_CHANGE'));

        }
 }
        }
 }

+

 // Send mails for del/edit/lock build modes
 function ADMIN_SEND_BUILD_MAILS ($mode, $table, $content, $id, $subjectPart="") {
        // Default subject is the subject part
 // Send mails for del/edit/lock build modes
 function ADMIN_SEND_BUILD_MAILS ($mode, $table, $content, $id, $subjectPart="") {
        // Default subject is the subject part


@@ -896,6 +898,7 @@ function ADMIN_SEND_BUILD_MAILS ($mode, $table, $content, $id, $subjectPart="")
                SEND_ADMIN_NOTIFICATION($subjectLine, "admin_".$mode."_".$table, $content, $_POST['uid_raw'][$id]);
        }
 }
                SEND_ADMIN_NOTIFICATION($subjectLine, "admin_".$mode."_".$table, $content, $_POST['uid_raw'][$id]);
        }
 }

+

 // Build a special template list
 function ADMIN_BUILD_LIST ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn) {
        $OUT = ""; $SW = 2;
 // Build a special template list
 function ADMIN_BUILD_LIST ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn) {
        $OUT = ""; $SW = 2;


@@ -953,6 +956,7 @@ function ADMIN_BUILD_LIST ($listType, $IDs, $table, $columns, $filterFunctions,
                ), false, $OUT
        );
 }
                ), false, $OUT
        );
 }

+

 // Change status of "build" list
 function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray) {
        // All valid entries? (We hope so here!)
 // Change status of "build" list
 function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray) {
        // All valid entries? (We hope so here!)


@@ -965,7 +969,7 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
                        );
 
                        // Load data of entry
                        );
 
                        // Load data of entry

-                       $result = SQL_QUERY_ESC("SELECT * FROM `{!MYSQL_PREFIX!}_%s` WHERE %s=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s=%s LIMIT 1",

                                array($table, $idColumn, $id), __FILE__, __LINE__);
 
                        // Fetch the data
                                array($table, $idColumn, $id), __FILE__, __LINE__);
 
                        // Fetch the data


@@ -1037,6 +1041,7 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
                } // END - foreach
        } // END - if
 }
                } // END - foreach
        } // END - if
 }

+

 // Delete rows by given ID numbers
 function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $deleteNow=false, $idColumn="id", $userIdColumn="userid") {
        // All valid entries? (We hope so here!)
 // Delete rows by given ID numbers
 function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $deleteNow=false, $idColumn="id", $userIdColumn="userid") {
        // All valid entries? (We hope so here!)


@@ -1044,7 +1049,7 @@ function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFu
                // Shall we delete here or list for deletion?
                if ($deleteNow) {
                        // The base SQL command:
                // Shall we delete here or list for deletion?
                if ($deleteNow) {
                        // The base SQL command:

-                       $SQL = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_%s` WHERE %s IN (%s)";
+                       $SQL = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s IN (%s)";

 
                        // Delete them all
                        $idList = "";
 
                        // Delete them all
                        $idList = "";


@@ -1052,7 +1057,7 @@ function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFu
                                // Is there a userid?
                                if (isset($_POST['uid_raw'][$id])) {
                                        // Load all data from that id
                                // Is there a userid?
                                if (isset($_POST['uid_raw'][$id])) {
                                        // Load all data from that id

-                                       $result = SQL_QUERY_ESC("SELECT * FROM `{!MYSQL_PREFIX!}_%s` WHERE %s=%s LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s=%s LIMIT 1",

                                                array($table, $idColumn, $id), __FILE__, __LINE__);
 
                                        // Fetch the data
                                                array($table, $idColumn, $id), __FILE__, __LINE__);
 
                                        // Fetch the data


@@ -1075,7 +1080,7 @@ function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFu
                        // Was this fine?
                        if (SQL_AFFECTEDROWS() == count($IDs)) {
                                // All deleted
                        // Was this fine?
                        if (SQL_AFFECTEDROWS() == count($IDs)) {
                                // All deleted

-                               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ALL_ENTRIES_REMOVED);
+                               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ALL_ENTRIES_REMOVED'));

                        } else {
                                // Some are still there :(
                                LOAD_TEMPLATE("admin_settings_saved", false, sprintf(ADMIN_SOME_ENTRIES_NOT_DELETED, SQL_AFFECTEDROWS(), count($IDs)));
                        } else {
                                // Some are still there :(
                                LOAD_TEMPLATE("admin_settings_saved", false, sprintf(ADMIN_SOME_ENTRIES_NOT_DELETED, SQL_AFFECTEDROWS(), count($IDs)));


@@ -1086,6 +1091,7 @@ function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFu
                }
        } // END - if
 }
                }
        } // END - if
 }

+

 // Edit rows by given ID numbers
 function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $editNow=false, $idColumn="id", $userIdColumn="userid") {
        // All valid entries? (We hope so here!)
 // Edit rows by given ID numbers
 function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $editNow=false, $idColumn="id", $userIdColumn="userid") {
        // All valid entries? (We hope so here!)


@@ -1147,7 +1153,7 @@ function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc
                                $affected += SQL_AFFECTEDROWS();
 
                                // Load all data from that id
                                $affected += SQL_AFFECTEDROWS();
 
                                // Load all data from that id

-                               $result = SQL_QUERY_ESC("SELECT * FROM `{!MYSQL_PREFIX!}_%s` WHERE %s=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s=%s LIMIT 1",

                                        array($table, $idColumn, $id), __FILE__, __LINE__);
 
                                // Fetch the data
                                        array($table, $idColumn, $id), __FILE__, __LINE__);
 
                                // Fetch the data


@@ -1164,7 +1170,7 @@ function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc
                        // Was this fine?
                        if ($affected == count($IDs)) {
                                // All deleted
                        // Was this fine?
                        if ($affected == count($IDs)) {
                                // All deleted

-                               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ALL_ENTRIES_EDITED);
+                               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ALL_ENTRIES_EDITED'));

                        } else {
                                // Some are still there :(
                                LOAD_TEMPLATE("admin_settings_saved", false, sprintf(ADMIN_SOME_ENTRIES_NOT_EDITED, $affected, count($IDs)));
                        } else {
                                // Some are still there :(
                                LOAD_TEMPLATE("admin_settings_saved", false, sprintf(ADMIN_SOME_ENTRIES_NOT_EDITED, $affected, count($IDs)));


@@ -1175,6 +1181,7 @@ function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc
                }
        } // END - if
 }
                }
        } // END - if
 }

+

 // Un-/lock rows by given ID numbers
 function ADMIN_LOCK_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn="id", $userIdColumn="userid") {
        // All valid entries? (We hope so here!)
 // Un-/lock rows by given ID numbers
 function ADMIN_LOCK_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn="id", $userIdColumn="userid") {
        // All valid entries? (We hope so here!)


@@ -1189,6 +1196,7 @@ function ADMIN_LOCK_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc
                }
        } // END - if
 }
                }
        } // END - if
 }

+

 // Undelete rows by given ID numbers
 function ADMIN_UNDELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn="id", $userIdColumn="userid") {
        // All valid entries? (We hope so here!)
 // Undelete rows by given ID numbers
 function ADMIN_UNDELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn="id", $userIdColumn="userid") {
        // All valid entries? (We hope so here!)


@@ -1203,6 +1211,7 @@ function ADMIN_UNDELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filter
                }
        } // END - if
 }
                }
        } // END - if
 }

+

 // Checks proxy settins by fetching check-updates3.php from www.mxchange.org
 function ADMIN_TEST_PROXY_SETTINGS ($settingsArray) {
        global $_CONFIG;
 // Checks proxy settins by fetching check-updates3.php from www.mxchange.org
 function ADMIN_TEST_PROXY_SETTINGS ($settingsArray) {
        global $_CONFIG;


@@ -1219,6 +1228,7 @@ function ADMIN_TEST_PROXY_SETTINGS ($settingsArray) {
        // Return result
        return $valid;
 }
        // Return result
        return $valid;
 }

+

 // Sends out a link to the given email adress so the admin can reset his/her password
 function ADMIN_SEND_PASSWORD_RESET_LINK ($email) {
        // Init output
 // Sends out a link to the given email adress so the admin can reset his/her password
 function ADMIN_SEND_PASSWORD_RESET_LINK ($email) {
        // Init output


@@ -1228,13 +1238,13 @@ function ADMIN_SEND_PASSWORD_RESET_LINK ($email) {
        $email = COMPILE_CODE($email);
 
        // Look up administator login
        $email = COMPILE_CODE($email);
 
        // Look up administator login

-       $result = SQL_QUERY_ESC("SELECT id, login, password FROM `{!MYSQL_PREFIX!}_admins` WHERE email='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id, login, password FROM `{!_MYSQL_PREFIX!}_admins` WHERE email='%s' LIMIT 1",

                array($email), __FILE__, __LINE__);
 
        // Is there an account?
        if (SQL_NUMROWS($result) == 0) {
                // No account found!
                array($email), __FILE__, __LINE__);
 
        // Is there an account?
        if (SQL_NUMROWS($result) == 0) {
                // No account found!

-               return ADMIN_NO_LOGIN_WITH_EMAIL;
+               return getMessage('ADMIN_NO_LOGIN_WITH_EMAIL');

        } // END - if
 
        // Load all data
        } // END - if
 
        // Load all data


@@ -1254,11 +1264,12 @@ function ADMIN_SEND_PASSWORD_RESET_LINK ($email) {
        $mailText = LOAD_EMAIL_TEMPLATE("admin_reset_password", $content);
 
        // Send it out
        $mailText = LOAD_EMAIL_TEMPLATE("admin_reset_password", $content);
 
        // Send it out

-       SEND_EMAIL($email, ADMIN_RESET_PASS_LINK_SUBJ, $mailText);
+       SEND_EMAIL($email, getMessage('ADMIN_RESET_PASS_LINK_SUBJ'), $mailText);

 
        // Prepare output
 
        // Prepare output

-       return ADMIN_RESET_LINK_SENT;
+       return getMessage('ADMIN_RESET_LINK_SENT');

 }
 }

+

 // Validate hash and login for password reset
 function ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN ($hash, $login) {
        // By default nothing validates... ;)
 // Validate hash and login for password reset
 function ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN ($hash, $login) {
        // By default nothing validates... ;)


@@ -1268,7 +1279,7 @@ function ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN ($hash, $login) {
        $login = COMPILE_CODE($login);
 
        // Then try to find that user
        $login = COMPILE_CODE($login);
 
        // Then try to find that user

-       $result = SQL_QUERY_ESC("SELECT id, password, email FROM `{!MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id, password, email FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",

                array($login), __FILE__, __LINE__);
 
        // Is an account here?
                array($login), __FILE__, __LINE__);
 
        // Is an account here?


@@ -1304,7 +1315,7 @@ function ADMIN_RESET_PASSWORD ($login, $password) {
        }
 
        // Update database
        }
 
        // Update database

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_admins` SET password='%s' WHERE login='%s' LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE login='%s' LIMIT 1",

                array($passHash, $login), __FILE__, __LINE__);
 
        // Run filters
                array($passHash, $login), __FILE__, __LINE__);
 
        // Run filters


@@ -1326,7 +1337,7 @@ function ADMIN_DELETE_TASK ($id) {
 // Function to update task data
 function ADMIN_UPDATE_TASK_DATA ($id, $row, $data) {
        // Update the task
 // Function to update task data
 function ADMIN_UPDATE_TASK_DATA ($id, $row, $data) {
        // Update the task

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_task_system` SET %s='%s' WHERE id=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET %s='%s' WHERE id=%s LIMIT 1",

                array($row, $data, bigintval($id)), __FILE__, __LINE__);
 }
 //
                array($row, $data, bigintval($id)), __FILE__, __LINE__);
 }
 //

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 840a4ffb7ecf99107f5de887d14076b6a8d7a80b..188f07abe2d1b4e8f7736cad9a20dee8546c2362 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -41,7 +41,7 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
        global $cacheArray, $_CONFIG;
 
        // First check for solved and not assigned tasks and assign them to current admin
        global $cacheArray, $_CONFIG;
 
        // First check for solved and not assigned tasks and assign them to current admin

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_task_system` SET assigned_admin='%s' WHERE assigned_admin < 1 AND status != 'NEW'",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET assigned_admin='%s' WHERE assigned_admin < 1 AND status != 'NEW'",

                array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
 
        // We currently don't want to install an extension so let's find out if we need...
                array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
 
        // We currently don't want to install an extension so let's find out if we need...


@@ -100,7 +100,7 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
 
        // At last - but not least - check for own and new unassigned tasks...
        $result_tasks = SQL_QUERY_ESC("SELECT id, assigned_admin, userid, task_type, subject, text, task_created
 
        // At last - but not least - check for own and new unassigned tasks...
        $result_tasks = SQL_QUERY_ESC("SELECT id, assigned_admin, userid, task_type, subject, text, task_created

-FROM `{!MYSQL_PREFIX!}_task_system`
+FROM `{!_MYSQL_PREFIX!}_task_system`

 WHERE assigned_admin='%s' OR (assigned_admin='0' AND status='NEW')
 ORDER BY userid DESC, task_type DESC, subject, task_created DESC",
                array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
 WHERE assigned_admin='%s' OR (assigned_admin='0' AND status='NEW')
 ORDER BY userid DESC, task_type DESC, subject, task_created DESC",
                array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);


@@ -124,7 +124,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                // Assign / do tasks
                $OUT = ""; $SW = 2;
                foreach ($POST['task'] as $id => $sel) {
                // Assign / do tasks
                $OUT = ""; $SW = 2;
                foreach ($POST['task'] as $id => $sel) {

-                       $result_task = SQL_QUERY_ESC("SELECT id, userid, task_type, subject, text, task_created, status, assigned_admin FROM `{!MYSQL_PREFIX!}_task_system` WHERE id=%s AND (assigned_admin='%s' OR (assigned_admin='0' AND status='NEW')) LIMIT 1",
+                       $result_task = SQL_QUERY_ESC("SELECT id, userid, task_type, subject, text, task_created, status, assigned_admin FROM `{!_MYSQL_PREFIX!}_task_system` WHERE id=%s AND (assigned_admin='%s' OR (assigned_admin='0' AND status='NEW')) LIMIT 1",

                                array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result_task) == 1) {
                                // Task is valid...
                                array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result_task) == 1) {
                                // Task is valid...


@@ -133,7 +133,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 
                                if ($aid == "0") {
                                        // Assgin current admin to unassgigned task
 
                                if ($aid == "0") {
                                        // Assgin current admin to unassgigned task

-                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_task_system` SET assigned_admin='%s' WHERE id=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET assigned_admin='%s' WHERE id=%s LIMIT 1",

                                                array(GET_CURRENT_ADMIN_ID(), bigintval($tid)), __FILE__, __LINE__);
                                } // END - if
 
                                                array(GET_CURRENT_ADMIN_ID(), bigintval($tid)), __FILE__, __LINE__);
                                } // END - if
 


@@ -145,7 +145,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                                } // END - if
 
                                if ($uid > 0) {
                                } // END - if
 
                                if ($uid > 0) {

-                                       $result_user = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                                       $result_user = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                                         array(bigintval($uid)), __FILE__, __LINE__);
                                        if (SQL_NUMROWS($result_user) == 1) {
                                                list($gender, $sname, $fname, $email) = SQL_FETCHROW($result_user);
                                         array(bigintval($uid)), __FILE__, __LINE__);
                                        if (SQL_NUMROWS($result_user) == 1) {
                                                list($gender, $sname, $fname, $email) = SQL_FETCHROW($result_user);


@@ -229,7 +229,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                                {
                                case "EXTENSION": // Install new extensions
                                        $ext_name = substr($subj, 1, strpos($subj, ":") - 1);
                                {
                                case "EXTENSION": // Install new extensions
                                        $ext_name = substr($subj, 1, strpos($subj, ":") - 1);

-                                       $result_lines = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
+                                       $result_lines = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",

                                         array($ext_name), __FILE__, __LINE__);
                                        $lines = SQL_NUMROWS($result_lines);
                                        SQL_FREERESULT($result_lines);
                                         array($ext_name), __FILE__, __LINE__);
                                        $lines = SQL_NUMROWS($result_lines);
                                        SQL_FREERESULT($result_lines);


@@ -275,7 +275,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                                case "PAYOUT_REQUEST": // Payout requests
                                        if (EXT_IS_ACTIVE("payout")) {
                                                // Extension is installed so let him send a notification to the user
                                case "PAYOUT_REQUEST": // Payout requests
                                        if (EXT_IS_ACTIVE("payout")) {
                                                // Extension is installed so let him send a notification to the user

-                                               $result_pay = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_payouts` WHERE userid=%s AND payout_timestamp=%s LIMIT 1",
+                                               $result_pay = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE userid=%s AND payout_timestamp=%s LIMIT 1",

                                                        array(bigintval($uid), bigintval($created)), __FILE__, __LINE__);
                                                list($pid) = SQL_FETCHROW($result_pay);
                                                SQL_FREERESULT($result_pay);
                                                        array(bigintval($uid), bigintval($created)), __FILE__, __LINE__);
                                                list($pid) = SQL_FETCHROW($result_pay);
                                                SQL_FREERESULT($result_pay);


@@ -300,7 +300,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                                case "WERNIS_REQUEST": // Wernis requests
                                        if (EXT_IS_ACTIVE("wernis")) {
                                                // Extension is installed so let him send a notification to the user
                                case "WERNIS_REQUEST": // Wernis requests
                                        if (EXT_IS_ACTIVE("wernis")) {
                                                // Extension is installed so let him send a notification to the user

-                                               $result_pay = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_wernis` WHERE userid=%s AND wernis_timestamp=%s LIMIT 1",
+                                               $result_pay = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_wernis` WHERE userid=%s AND wernis_timestamp=%s LIMIT 1",

                                                        array(bigintval($uid), bigintval($created)), __FILE__, __LINE__);
                                                list($pid) = SQL_FETCHROW($result_pay);
                                                SQL_FREERESULT($result_pay);
                                                        array(bigintval($uid), bigintval($created)), __FILE__, __LINE__);
                                                list($pid) = SQL_FETCHROW($result_pay);
                                                SQL_FREERESULT($result_pay);


@@ -327,7 +327,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                                        break;
 
                                case "NL_UNSUBSCRIBE": // Newsletter unsubscriptions
                                        break;
 
                                case "NL_UNSUBSCRIBE": // Newsletter unsubscriptions

-                                       $result = SQL_QUERY_ESC("SELECT nl_timespan FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT nl_timespan FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                                                array(bigintval($uid)), __FILE__, __LINE__);
                                        list($span) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
                                                array(bigintval($uid)), __FILE__, __LINE__);
                                        list($span) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);


@@ -366,19 +366,19 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                        if (!empty($POST['unassign'])) {
                                // Unassign from tasks
                                foreach ($POST['task'] as $id => $sel) {
                        if (!empty($POST['unassign'])) {
                                // Unassign from tasks
                                foreach ($POST['task'] as $id => $sel) {

-                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_task_system` SET assigned_admin=0 WHERE id=%s AND assigned_admin=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET assigned_admin=0 WHERE id=%s AND assigned_admin=%s LIMIT 1",

                                                array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
                                }
                        } elseif (isset($POST['del'])) {
                                // Delete tasks
                                foreach ($POST['task'] as $id => $sel) {
                                                array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
                                }
                        } elseif (isset($POST['del'])) {
                                // Delete tasks
                                foreach ($POST['task'] as $id => $sel) {

-                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_task_system` WHERE id=%s AND assigned_admin IN (%s,0) LIMIT 1",
+                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_task_system` WHERE id=%s AND assigned_admin IN (%s,0) LIMIT 1",

                                                array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
                                }
                        }
 
                        // Update query
                                                array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
                                }
                        }
 
                        // Update query

-                       $result_tasks = SQL_QUERY_ESC("SELECT id, assigned_admin, userid, task_type, subject, text, task_created FROM `{!MYSQL_PREFIX!}_task_system` WHERE assigned_admin=%s OR (assigned_admin=0 AND status='NEW') ORDER BY task_created DESC",
+                       $result_tasks = SQL_QUERY_ESC("SELECT id, assigned_admin, userid, task_type, subject, text, task_created FROM `{!_MYSQL_PREFIX!}_task_system` WHERE assigned_admin=%s OR (assigned_admin=0 AND status='NEW') ORDER BY task_created DESC",

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


@@ -395,7 +395,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                                $login = GET_ADMIN_LOGIN($admin);
                                if ($login != "***") {
                                        // Admin found
                                $login = GET_ADMIN_LOGIN($admin);
                                if ($login != "***") {
                                        // Admin found

-                                       $admin = "<a href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
+                                       $admin = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";

                                } else {
                                        // Maybe deleted?
                                        $admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";
                                } else {
                                        // Maybe deleted?
                                        $admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";

diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php
index fafd094a5f99039cf7fe0c5c5174f04bad167c5d..81ddb82b783bb272136241d19487f51fdca99be1 100644 (file)
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_points.php
@@ -47,7 +47,7 @@ if ($_GET['u_id'] == "all") {
        // Add points to all accounts
        if ((isset($_POST['ok'])) && ($_POST['points'] > 0)) {
                define('__POINTS_VALUE', $_POST['points']);
        // Add points to all accounts
        if ((isset($_POST['ok'])) && ($_POST['points'] > 0)) {
                define('__POINTS_VALUE', $_POST['points']);

-               $result_main = SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
+               $result_main = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);

                while (list($uid) = SQL_FETCHROW($result_main)) {
                        // Remove depth to prevent booking errors. This is a bad coding
                        // practice, thats also why we need to write this project from
                while (list($uid) = SQL_FETCHROW($result_main)) {
                        // Remove depth to prevent booking errors. This is a bad coding
                        // practice, thats also why we need to write this project from


@@ -65,21 +65,21 @@ if ($_GET['u_id'] == "all") {
 
                        // Load email template and send email away
                        $msg = LOAD_EMAIL_TEMPLATE("add-points", $content, bigintval($uid));
 
                        // Load email template and send email away
                        $msg = LOAD_EMAIL_TEMPLATE("add-points", $content, bigintval($uid));

-                       SEND_EMAIL(bigintval($uid), ADMIN_ADD_SUBJ, $msg);
+                       SEND_EMAIL(bigintval($uid), getMessage('ADMIN_ADD_SUBJ'), $msg);

                } // END - while
 
                // Free memory
                SQL_FREERESULT($result_main);
 
                // Output message
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result_main);
 
                // Output message

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ALL_POINTS_ADDED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ALL_POINTS_ADDED'));

        } else {
                // Display form add points
                LOAD_TEMPLATE("admin_add_points_all");
        }
 } elseif (!empty($_GET['u_id'])) {
        // User ID found in URL so we use this give him some credits
        } else {
                // Display form add points
                LOAD_TEMPLATE("admin_add_points_all");
        }
 } elseif (!empty($_GET['u_id'])) {
        // User ID found in URL so we use this give him some credits

-       $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",

                array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Selected user does exist
                array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Selected user does exist


@@ -104,8 +104,8 @@ if ($_GET['u_id'] == "all") {
                        // Message laden
                        $msg = LOAD_EMAIL_TEMPLATE("add-points", $content, bigintval($_GET['u_id']));
 
                        // Message laden
                        $msg = LOAD_EMAIL_TEMPLATE("add-points", $content, bigintval($_GET['u_id']));
 

-                       SEND_EMAIL(bigintval($_GET['u_id']), ADMIN_ADD_SUBJ, $msg);
-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_POINTS_ADDED);
+                       SEND_EMAIL(bigintval($_GET['u_id']), getMessage('ADMIN_ADD_SUBJ'), $msg);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_POINTS_ADDED'));

                } else {
                        // Opps, missing form here
                        define('__USER_VALUE', "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</a>");
                } else {
                        // Opps, missing form here
                        define('__USER_VALUE', "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</a>");

diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php
index b57a28389d4fc79a9d08231b160bf3d03f45f065..3f32393e1036bb9626339166142d7a854d9d1300 100644 (file)
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -47,13 +47,13 @@ if (isset($_POST['ok']))
        $END   = mktime($_POST['end_hour']  , $_POST['end_min']  , $_POST['end_sec']  , $_POST['end_month']  , $_POST['end_day']  , $_POST['end_year']  );
 
        // Is there already a rallye running?
        $END   = mktime($_POST['end_hour']  , $_POST['end_min']  , $_POST['end_sec']  , $_POST['end_month']  , $_POST['end_day']  , $_POST['end_year']  );
 
        // Is there already a rallye running?

-       $result = SQL_QUERY_ESC("SELECT id, admin_id FROM `{!MYSQL_PREFIX!}_rallye_data` WHERE (start_time <= %s AND end_time >= %s) OR (start_time >= %s AND start_time <= %s) LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id, admin_id FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE (start_time <= %s AND end_time >= %s) OR (start_time >= %s AND start_time <= %s) LIMIT 1",

         array($START, $START, $START, $END), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result) == 0)
        {
                // Ok, start and end time did not overlap
         array($START, $START, $START, $END), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result) == 0)
        {
                // Ok, start and end time did not overlap

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_rallye_data` (admin_id, title, descr, template, start_time, end_time, auto_add_new_user, is_active, send_notify)
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_rallye_data` (admin_id, title, descr, template, start_time, end_time, auto_add_new_user, is_active, send_notify)

 VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s')",
  array(
        GET_CURRENT_ADMIN_ID(),
 VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s')",
  array(
        GET_CURRENT_ADMIN_ID(),


@@ -68,7 +68,7 @@ VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s')",
 ), __FILE__, __LINE__);
 
                // Load ID
 ), __FILE__, __LINE__);
 
                // Load ID

-               $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_rallye_data` WHERE start_time='%s' AND end_time='%s' AND title='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE start_time='%s' AND end_time='%s' AND title='%s' LIMIT 1",

                 array($START, $END, $_POST['title']), __FILE__, __LINE__);
                list($id) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                 array($START, $END, $_POST['title']), __FILE__, __LINE__);
                list($id) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);

diff --git a/inc/modules/admin/what-add_surfbar_url.php b/inc/modules/admin/what-add_surfbar_url.php
index d60a9d8602b34ca6055788a7c0857be7f0d87cd2..21268b0bcdb62f893d6ff8b51c4cfe1062556f8a 100644 (file)
--- a/inc/modules/admin/what-add_surfbar_url.php
+++ b/inc/modules/admin/what-add_surfbar_url.php
@@ -51,10 +51,10 @@ if ((isset($_POST['add'])) && (!empty($_POST['url']))) {
        // Then add this URL
        if (SURFBAR_ADMIN_ADD_URL($_POST['url'], $_POST['limit'], $_POST['reload'])) {
                // URL was added
        // Then add this URL
        if (SURFBAR_ADMIN_ADD_URL($_POST['url'], $_POST['limit'], $_POST['reload'])) {
                // URL was added

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_URL_ADDED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_URL_ADDED'));

        } else {
                // Not added
        } else {
                // Not added

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_URL_NOT_ADDED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_URL_NOT_ADDED'));

        }
 } // END - if
 
        }
 } // END - if
 

diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php
index 6320112d63f4b962f6f2a5e33e47a67cab9d5e8e..23849f3a724e80faafad53bf03db475ea6974f99 100644 (file)
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -51,7 +51,7 @@ if (!isset($_POST['ok']))
        $menus = array(); $titles = array(); $below = array();
 
        // Get all available main menus
        $menus = array(); $titles = array(); $below = array();
 
        // Get all available main menus

-       $result = SQL_QUERY("SELECT action, title, sort FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR what IS NULL) ORDER BY sort", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT action, title, sort FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort`", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) > 0)
        {
                // Read menu structure
        if (SQL_NUMROWS($result) > 0)
        {
                // Read menu structure


@@ -89,7 +89,7 @@ if (!isset($_POST['ok']))
                // Load sub menus :)
                foreach ($menus as $key_main => $value_main)
                {
                // Load sub menus :)
                foreach ($menus as $key_main => $value_main)
                {

-                       $result = SQL_QUERY_ESC("SELECT what, title, sort FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
+                       $result = SQL_QUERY_ESC("SELECT what, title, sort FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",

                         array($value_main), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) > 0)
                        {
                         array($value_main), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) > 0)
                        {


@@ -170,7 +170,7 @@ if (!isset($_POST['ok']))
        if (!empty($_POST['menu']))
        {
                // Add sub menu
        if (!empty($_POST['menu']))
        {
                // Add sub menu

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('%s','%s','%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('%s','%s','%s','%s','%s')",

                        array(
                                $_POST['menu'],
                                $_POST['name'],
                        array(
                                $_POST['menu'],
                                $_POST['name'],


@@ -184,7 +184,7 @@ if (!isset($_POST['ok']))
         else
        {
                // Add main menu
         else
        {
                // Add main menu

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_admin_menu` (action, title, descr, sort) VALUES ('%s','%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (action, title, descr, sort) VALUES ('%s','%s','%s','%s')",

                        array(
                                $_POST['name'],
                                $_POST['title'],
                        array(
                                $_POST['name'],
                                $_POST['title'],


@@ -194,12 +194,12 @@ if (!isset($_POST['ok']))
                );
                CACHE_PURGE_ADMIN_MENU(0, $_POST['name']);
        }
                );
                CACHE_PURGE_ADMIN_MENU(0, $_POST['name']);
        }

-       LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));

 }
  else
 {
        // Is demo login!
 }
  else
 {
        // Is demo login!

-       LOAD_TEMPLATE("admin_settings_saved", false, SETTINGS_NOT_SAVED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_NOT_SAVED'));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 7bf1bff4a27e9f7301dea2c95d168beb8b624b9e..609f3761c3d13479d6b61cfbe80478adab9d3d84 100644 (file)
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -41,10 +41,10 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?
 ADD_DESCR("admin", __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?

-$AND = "(what = '' OR what IS NULL)"; $SUB = "";
+$AND = "(`what` = '' OR `what` IS NULL)"; $SUB = "";

 if (!empty($_GET['sub']))
 {
 if (!empty($_GET['sub']))
 {

-       $AND = sprintf("action='%s' AND what IS NOT NULL", SQL_ESCAPE($_GET['sub']));
+       $AND = sprintf("action='%s' AND `what` IS NOT NULL", SQL_ESCAPE($_GET['sub']));

        $SUB = SQL_ESCAPE($_GET['sub']);
 }
 
        $SUB = SQL_ESCAPE($_GET['sub']);
 }
 


@@ -63,7 +63,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) {
                if ($confirm == 1)
                {
                        $cnt++;
                if ($confirm == 1)
                {
                        $cnt++;

-                       $result = SQL_QUERY_ESC("SELECT title, action, what, descr FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT title, action, what, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",

                         array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {
                         array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {


@@ -112,7 +112,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) {
                if ($confirm == 1)
                {
                        $cnt++;
                if ($confirm == 1)
                {
                        $cnt++;

-                       $result = SQL_QUERY_ESC("SELECT title FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",

                         array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {
                         array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {


@@ -156,7 +156,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) {
                        $sel = bigintval($sel);
 
                        // Update entry
                        $sel = bigintval($sel);
 
                        // Update entry

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET

 title='%s',
 action='%s',
 what='%s',
 title='%s',
 action='%s',
 what='%s',


@@ -175,18 +175,18 @@ WHERE ".$AND." AND id=%s LIMIT 1",
                CACHE_PURGE_ADMIN_MENU(0, $_POST['sel_action'][$sel], $_POST['sel_what'][$sel]);
 
                // Load template
                CACHE_PURGE_ADMIN_MENU(0, $_POST['sel_action'][$sel], $_POST['sel_what'][$sel]);
 
                // Load template

-               LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));

                break;
 
        case "del": // Delete menu
                foreach ($_POST['sel'] as $sel => $menu) {
                break;
 
        case "del": // Delete menu
                foreach ($_POST['sel'] as $sel => $menu) {

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",

                                array(bigintval($sel)), __FILE__, __LINE__);
                        CACHE_PURGE_ADMIN_MENU(0, "", "", $AND);
                } // END - foreach
 
                // Load template
                                array(bigintval($sel)), __FILE__, __LINE__);
                        CACHE_PURGE_ADMIN_MENU(0, "", "", $AND);
                } // END - foreach
 
                // Load template

-               LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));

                break;
 
        default: // Unexpected action
                break;
 
        default: // Unexpected action


@@ -200,11 +200,11 @@ WHERE ".$AND." AND id=%s LIMIT 1",
                // Get IDs
                if (!empty($_GET['w'])) {
                        // Sub menus selected
                // Get IDs
                if (!empty($_GET['w'])) {
                        // Sub menus selected

-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='%s' AND sort='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='%s' AND sort='%s' LIMIT 1",

                         array($_GET['act'], bigintval($_GET['tid'])), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                         array($_GET['act'], bigintval($_GET['tid'])), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);

-                       $result = SQL_QUERY("SELECT id FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='%s' AND sort='%s' LIMIT 1",
+                       $result = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='%s' AND sort='%s' LIMIT 1",

                         array($_GET['act'], bigintval($_GET['fid'])), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                         array($_GET['act'], bigintval($_GET['fid'])), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);


@@ -212,11 +212,11 @@ WHERE ".$AND." AND id=%s LIMIT 1",
                 else
                {
                        // Main menu selected
                 else
                {
                        // Main menu selected

-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR what IS NULL) AND sort='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) AND sort='%s' LIMIT 1",

                         array(bigintval($_GET['tid'])), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                         array(bigintval($_GET['tid'])), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);

-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR what IS NULL) AND sort='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) AND sort='%s' LIMIT 1",

                         array(bigintval($_GET['fid'])), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                         array(bigintval($_GET['fid'])), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);


@@ -225,9 +225,9 @@ WHERE ".$AND." AND id=%s LIMIT 1",
                if ((!empty($tid)) && (!empty($fid)))
                {
                        // Sort menu
                if ((!empty($tid)) && (!empty($fid)))
                {
                        // Sort menu

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",

                                array(bigintval($_GET['tid']), bigintval($fid)), __FILE__, __LINE__);
                                array(bigintval($_GET['tid']), bigintval($fid)), __FILE__, __LINE__);

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",

                                array(bigintval($_GET['fid']), bigintval($tid)), __FILE__, __LINE__);
                        CACHE_PURGE_ADMIN_MENU(0, "", "", $AND);
                }
                                array(bigintval($_GET['fid']), bigintval($tid)), __FILE__, __LINE__);
                        CACHE_PURGE_ADMIN_MENU(0, "", "", $AND);
                }


@@ -237,13 +237,13 @@ WHERE ".$AND." AND id=%s LIMIT 1",
        if (!empty($SUB))
        {
                // Sub menus of a main menu
        if (!empty($SUB))
        {
                // Sub menus of a main menu

-               $result = SQL_QUERY_ESC("SELECT id, action, what, title, sort FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort ASC",
+               $result = SQL_QUERY_ESC("SELECT id, action, what, title, sort FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",

                 array($SUB), __FILE__, __LINE__);
        }
         else
        {
                // Main menus
                 array($SUB), __FILE__, __LINE__);
        }
         else
        {
                // Main menus

-               $result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR what IS NULL) ORDER BY sort ASC", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);

        }
        $max = SQL_NUMROWS($result);
        if ($max > 0)
        }
        $max = SQL_NUMROWS($result);
        if ($max > 0)


@@ -256,17 +256,17 @@ WHERE ".$AND." AND id=%s LIMIT 1",
                        if (($sort == 0) || (($sort == 1) && (!empty($SUB))))
                        {
                                // Is highest position
                        if (($sort == 0) || (($sort == 1) && (!empty($SUB))))
                        {
                                // Is highest position

-                               $NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</a>";
+                               $NAVI = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">{!LOWER!}</a>";

                        }
                         elseif ($cnt == $max)
                        {
                                // Is lowest position
                        }
                         elseif ($cnt == $max)
                        {
                                // Is lowest position

-                               $NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</a>";
+                               $NAVI = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">{!HIGHER!}</a>";

                        }
                         elseif ($sort > 0)
                        {
                                // Anything else between highest and lowest
                        }
                         elseif ($sort > 0)
                        {
                                // Anything else between highest and lowest

-                               $NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</a>/<a href=\"".URL."/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</a>";
+                               $NAVI = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">{!HIGHER!}</a>/<a href=\"{!URL!}/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">{!LOWER!}</a>";

                        }
 
                        if (empty($act)) $act = "&nbsp;";
                        }
 
                        if (empty($act)) $act = "&nbsp;";


@@ -296,7 +296,7 @@ WHERE ".$AND." AND id=%s LIMIT 1",
         else
        {
                // Menu entries are missing... (???)
         else
        {
                // Menu entries are missing... (???)

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_MENUS_FOUND'));

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-admins_add.php b/inc/modules/admin/what-admins_add.php
index 6fb997102e6caa9cb429cd468a92798c49a650ff..5adb87dde1db5a3cbfea40da1400c3a7f118a78d 100644 (file)
--- a/inc/modules/admin/what-admins_add.php
+++ b/inc/modules/admin/what-admins_add.php
@@ -52,7 +52,7 @@ if ((isset($_POST['add'])) && (!empty($_POST['login'])) && (!empty($_POST['email
                $FORM = false;
 
                // Admin login saved
                $FORM = false;
 
                // Admin login saved

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ADMINS_ADD_DONE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ADD_DONE'));

 
                // Run filter chain
                RUN_FILTER('post_admin_added', $_POST);
 
                // Run filter chain
                RUN_FILTER('post_admin_added', $_POST);

diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 71c09abaa73b3a97e596e81bec7d7e2007b85b95..45ad9068406ab4a4b41e92b8b5a5b90f11f5467b 100644 (file)
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -52,7 +52,7 @@ if (isset($_POST['edit']))
                foreach ($_POST['sel'] as $template => $sel)
                {
                        // First of all load data from DB
                foreach ($_POST['sel'] as $template => $sel)
                {
                        // First of all load data from DB

-                       $result = SQL_QUERY_ESC("SELECT admin_id, id FROM `{!MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' ORDER BY id",
+                       $result = SQL_QUERY_ESC("SELECT admin_id, id FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' ORDER BY `id`",

                         array($template), __FILE__, __LINE__);
                        $OUT = ""; $aid = 0; $aid2 = 0;
                        while (list($aid, $id) = SQL_FETCHROW($result))
                         array($template), __FILE__, __LINE__);
                        $OUT = ""; $aid = 0; $aid2 = 0;
                        while (list($aid, $id) = SQL_FETCHROW($result))


@@ -110,8 +110,8 @@ if (isset($_POST['edit']))
 {
        // Load all assigned mails
        $result = SQL_QUERY("SELECT DISTINCT m.id, m.admin_id, a.login, m.mail_template
 {
        // Load all assigned mails
        $result = SQL_QUERY("SELECT DISTINCT m.id, m.admin_id, a.login, m.mail_template

-FROM `{!MYSQL_PREFIX!}_admins_mails` AS m
-LEFT JOIN `{!MYSQL_PREFIX!}_admins` AS a
+FROM `{!_MYSQL_PREFIX!}_admins_mails` AS m
+LEFT JOIN `{!_MYSQL_PREFIX!}_admins` AS a

 ON m.admin_id=a.id
 WHERE (m.admin_id=a.id OR m.admin_id < 1) AND m.mail_template != ''
 ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
 ON m.admin_id=a.id
 WHERE (m.admin_id=a.id OR m.admin_id < 1) AND m.mail_template != ''
 ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);


@@ -129,35 +129,35 @@ ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
                                $aid = bigintval($aid);
 
                                // Update entry
                                $aid = bigintval($aid);
 
                                // Update entry

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_admins_mails` SET admin_id=%s WHERE id=%s ORDER BY id LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins_mails` SET admin_id=%s WHERE id=%s ORDER BY `id` LIMIT 1",

                                        array($aid, $id), __FILE__, __LINE__);
 
                                if (($aid < 1) && (!empty($_POST['template'][$id])))
                                {
                                        // Remove any other admin entries
                                        array($aid, $id), __FILE__, __LINE__);
 
                                if (($aid < 1) && (!empty($_POST['template'][$id])))
                                {
                                        // Remove any other admin entries

-                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' AND id != '%s'",
+                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' AND id != '%s'",

                                                array($_POST['template'][$id], $id), __FILE__, __LINE__);
                                }
                                if ($_POST['admin_new'][$_POST['template'][$id]] > 0)
                                {
                                        // Add new admin
                                                array($_POST['template'][$id], $id), __FILE__, __LINE__);
                                }
                                if ($_POST['admin_new'][$_POST['template'][$id]] > 0)
                                {
                                        // Add new admin

-                                       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_admins_mails` (admin_id, mail_template) VALUES ('%s','%s')",
+                                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins_mails` (admin_id, mail_template) VALUES ('%s','%s')",

                                                array($aid, $_POST['template'][$id]), __FILE__, __LINE__);
                                }
                        }
 
                        // Query again...
                                                array($aid, $_POST['template'][$id]), __FILE__, __LINE__);
                                }
                        }
 
                        // Query again...

-                       $result = SQL_QUERY("SELECT DISTINCT m.id, m.admin_id, a.login, m.mail_template FROM `{!MYSQL_PREFIX!}_admins_mails` AS m, `{!MYSQL_PREFIX!}_admins` AS a WHERE m.admin_id=a.id OR m.admin_id < 1 ORDER BY m.admin_id", __FILE__, __LINE__);
+                       $result = SQL_QUERY("SELECT DISTINCT m.id, m.admin_id, a.login, m.mail_template FROM `{!_MYSQL_PREFIX!}_admins_mails` AS m, `{!_MYSQL_PREFIX!}_admins` AS a WHERE m.admin_id=a.id OR m.admin_id < 1 ORDER BY m.admin_id", __FILE__, __LINE__);

                }
 
                // List found entries
                $SW = 2; $OUT = "";
                }
 
                // List found entries
                $SW = 2; $OUT = "";

-               while(list($id, $aid, $admin, $templ) = SQL_FETCHROW($result))
+               while (list($id, $aid, $admin, $templ) = SQL_FETCHROW($result))

                {
                        if ($aid > 0)
                        {
                                // Admin assigned
                {
                        if ($aid > 0)
                        {
                                // Admin assigned

-                               $admin_link = "<a href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$aid."\">".$admin."</a>";
+                               $admin_link = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$aid."\">".$admin."</a>";

                        }
                         elseif ($aid == 0)
                        {
                        }
                         elseif ($aid == 0)
                        {

diff --git a/inc/modules/admin/what-chk_regs.php b/inc/modules/admin/what-chk_regs.php
index 28999a763e17cc2ddb84fb229fd2b92704555153..93e8b41697b663a4fb67ba4f643b4cff02479980 100644 (file)
--- a/inc/modules/admin/what-chk_regs.php
+++ b/inc/modules/admin/what-chk_regs.php
@@ -42,7 +42,7 @@ ADD_DESCR ("admin", basename(__FILE__));
 
 // Check for accounts
 $result = SQL_QUERY("SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, user_hash
 
 // Check for accounts
 $result = SQL_QUERY("SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, user_hash

-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE status='UNCONFIRMED'
 ORDER BY userid ASC", __FILE__, __LINE__);
 
 WHERE status='UNCONFIRMED'
 ORDER BY userid ASC", __FILE__, __LINE__);
 


@@ -76,7 +76,7 @@ if (SQL_NUMROWS($result) > 0) {
        LOAD_TEMPLATE("admin_reg");
 } else {
        // No registrations left - or all has confirmed their email address... :-)
        LOAD_TEMPLATE("admin_reg");
 } else {
        // No registrations left - or all has confirmed their email address... :-)

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ALL_CONFIRMED_EMAIL);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ALL_CONFIRMED_EMAIL'));

 }
 
 // Free memory
 }
 
 // Free memory

diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php
index 8f3db7d3fce7b93b3b182bf0c0020b04fe83e570..6c646830e709b9a5784175862524825234a1821b 100644 (file)
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -48,7 +48,7 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
        $SW = 2; $OUT = "";
        foreach ($_POST['sel'] as $id => $sel) {
                // Load data for the ID
        $SW = 2; $OUT = "";
        foreach ($_POST['sel'] as $id => $sel) {
                // Load data for the ID

-               $result = SQL_QUERY_ESC("SELECT admin_id, action_menu, what_menu, access_mode FROM `{!MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT admin_id, action_menu, what_menu, access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",

                 array(bigintval($id)), __FILE__, __LINE__);
                list($aid, $act, $wht, $mode) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                 array(bigintval($id)), __FILE__, __LINE__);
                list($aid, $act, $wht, $mode) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);


@@ -63,7 +63,7 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
                        'mode_options'     => ADD_OPTION_LINES(
                                "/ARRAY/",
                                array("allow", "deny"),
                        'mode_options'     => ADD_OPTION_LINES(
                                "/ARRAY/",
                                array("allow", "deny"),

-                               array(ADMINS_ALLOW_MODE, ADMINS_DENY_MODE),
+                               array(constant('ADMINS_ALLOW_MODE'), constant('ADMINS_DENY_MODE')),

                                $mode
                        ),
                );
                                $mode
                        ),
                );


@@ -83,7 +83,7 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
                $id = bigintval($id);
 
                // Update entries
                $id = bigintval($id);
 
                // Update entries

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_admins_acls` SET admin_id=%s, action_menu='%s', what_menu='%s', access_mode='%s' WHERE id=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins_acls` SET admin_id=%s, action_menu='%s', what_menu='%s', access_mode='%s' WHERE id=%s LIMIT 1",

                        array($_POST['admin'][$id], $_POST['action_menu'][$id], $_POST['what_menu'][$id], $_POST['mode'][$id], $id),__FILE__, __LINE__);
        }
 
                        array($_POST['admin'][$id], $_POST['action_menu'][$id], $_POST['what_menu'][$id], $_POST['mode'][$id], $id),__FILE__, __LINE__);
        }
 


@@ -96,13 +96,13 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
        }
 
        // Entries changed
        }
 
        // Entries changed

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ADMINS_ENTRIES_CHANGED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ENTRIES_CHANGED'));

 } elseif ((isset($_POST['del'])) && ($SEL > 0)) {
        // Delete ACLs
        $SW = 2; $OUT = "";
        foreach ($_POST['sel'] as $id => $sel) {
                // Load data for the ID
 } elseif ((isset($_POST['del'])) && ($SEL > 0)) {
        // Delete ACLs
        $SW = 2; $OUT = "";
        foreach ($_POST['sel'] as $id => $sel) {
                // Load data for the ID

-               $result = SQL_QUERY_ESC("SELECT admin_id, action_menu, what_menu, access_mode FROM `{!MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT admin_id, action_menu, what_menu, access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",

                        array(bigintval($id)), __FILE__, __LINE__);
                list($admin, $act, $wht, $mode) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                        array(bigintval($id)), __FILE__, __LINE__);
                list($admin, $act, $wht, $mode) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);


@@ -118,7 +118,7 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
                $login = GET_ADMIN_LOGIN($admin);
                if ($login != "***") {
                        // Admin found
                $login = GET_ADMIN_LOGIN($admin);
                if ($login != "***") {
                        // Admin found

-                       $admin = "<a href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
+                       $admin = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";

                } else {
                        // Maybe deleted?
                        $admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";
                } else {
                        // Maybe deleted?
                        $admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";


@@ -145,7 +145,7 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
 } elseif ((isset($_POST['remove'])) && ($SEL > 0)) {
        // Remove entries
        foreach ($_POST['sel'] as $id => $sel) {
 } elseif ((isset($_POST['remove'])) && ($SEL > 0)) {
        // Remove entries
        foreach ($_POST['sel'] as $id => $sel) {

-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE id=%s LIMIT 1",

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


@@ -158,7 +158,7 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
        }
 
        // Entries deleted
        }
 
        // Entries deleted

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ADMINS_ENTRIES_DELETED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ENTRIES_DELETED'));

 } elseif (isset($_POST['add'])) {
        // Check if everything is fine...
        $mode = GET_ADMIN_DEFAULT_ACL(bigintval($_POST['admin_id']));
 } elseif (isset($_POST['add'])) {
        // Check if everything is fine...
        $mode = GET_ADMIN_DEFAULT_ACL(bigintval($_POST['admin_id']));


@@ -175,11 +175,11 @@ if ((isset($_POST['edit'])) && ($SEL > 0)) {
                $BOTH = ((!empty($_POST['action_menu'])) && (!empty($_POST['what_menu'])));
                if (((!empty($_POST['action_menu'])) || (!empty($_POST['what_menu']))) && (!$BOTH)) {
                        // Main or sub menu selected
                $BOTH = ((!empty($_POST['action_menu'])) && (!empty($_POST['what_menu'])));
                if (((!empty($_POST['action_menu'])) || (!empty($_POST['what_menu']))) && (!$BOTH)) {
                        // Main or sub menu selected

-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND action_menu='%s' AND what_menu='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND action_menu='%s' AND what_menu='%s' LIMIT 1",

                         array(bigintval($_POST['admin_id']), $_POST['action_menu'], $_POST['what_menu']), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 0) {
                                // Finally add the new ACL
                         array(bigintval($_POST['admin_id']), $_POST['action_menu'], $_POST['what_menu']), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 0) {
                                // Finally add the new ACL

-                               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_admins_acls` (admin_id, action_menu, what_menu, access_mode)
+                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins_acls` (admin_id, action_menu, what_menu, access_mode)

 VALUES ('%s','%s','%s','%s')",
  array(
        bigintval($_POST['admin_id']),
 VALUES ('%s','%s','%s','%s')",
  array(
        bigintval($_POST['admin_id']),


@@ -216,12 +216,12 @@ VALUES ('%s','%s','%s','%s')",
        LOAD_TEMPLATE("admin_settings_saved", false, $content);
 } else {
        // List all ACLs
        LOAD_TEMPLATE("admin_settings_saved", false, $content);
 } else {
        // List all ACLs

-       $result_acls = SQL_QUERY("SELECT id, admin_id, action_menu, what_menu, access_mode FROM `{!MYSQL_PREFIX!}_admins_acls` ORDER BY admin_id, id", __FILE__, __LINE__);
+       $result_acls = SQL_QUERY("SELECT id, admin_id, action_menu, what_menu, access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` ORDER BY admin_id, id", __FILE__, __LINE__);

        if (SQL_NUMROWS($result_acls) > 0)
        {
                // List ACLs
                $SW = 2; $OUT = "";
        if (SQL_NUMROWS($result_acls) > 0)
        {
                // List ACLs
                $SW = 2; $OUT = "";

-               while(list($id, $admin, $act, $wht, $mode) = SQL_FETCHROW($result_acls))
+               while (list($id, $admin, $act, $wht, $mode) = SQL_FETCHROW($result_acls))

                {
                        // Prepare variables
                        if (empty($act)) $act = "---";
                {
                        // Prepare variables
                        if (empty($act)) $act = "---";


@@ -232,13 +232,10 @@ VALUES ('%s','%s','%s','%s')",
 
                        // Load admin's data
                        $login = GET_ADMIN_LOGIN($admin);
 
                        // Load admin's data
                        $login = GET_ADMIN_LOGIN($admin);

-                       if ($login != "***")
-                       {
+                       if ($login != "***") {

                                // Admin found
                                // Admin found

-                               $admin = "<a href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
-                       }
-                        else
-                       {
+                               $admin = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
+                       } else {

                                // Maybe deleted?
                                $admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";
                        }
                                // Maybe deleted?
                                $admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";
                        }

diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index d3533af3f7dc95512bfb23793a8d07d787d5d5e1..5bda6c5df8fd3929021bb2b36ef1c478b30a6d4f 100644 (file)
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -46,11 +46,11 @@ $CATS = "";
 
 if (isset($_POST['add'])) {
        // Add a new category
 
 if (isset($_POST['add'])) {
        // Add a new category

-       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_cats` WHERE cat='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_cats` WHERE cat='%s' LIMIT 1",

                array($_POST['catname']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Category does not exists, we simply add it...
                array($_POST['catname']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Category does not exists, we simply add it...

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_cats` (cat, visible, sort) VALUES ('%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_cats` (cat, visible, sort) VALUES ('%s','%s','%s')",

                        array($_POST['catname'], $_POST['visible'], bigintval($_POST['parent'] + 1)), __FILE__, __LINE__);
                $content = CATEGORY_ADDED;
        } else {
                        array($_POST['catname'], $_POST['visible'], bigintval($_POST['parent'] + 1)), __FILE__, __LINE__);
                $content = CATEGORY_ADDED;
        } else {


@@ -75,15 +75,15 @@ if (isset($_POST['add'])) {
                        switch ($_GET['do'])
                        {
                        case "edit": // Change categories
                        switch ($_GET['do'])
                        {
                        case "edit": // Change categories

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_cats` SET cat='%s', visible='%s', sort=%s WHERE id=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_cats` SET cat='%s', `visible`='%s', sort=%s WHERE id=%s LIMIT 1",

                                        array($cat, $_POST['vis'][$id], $_POST['sort'][$id], $id), __FILE__, __LINE__);
                                $TEXT = CATEGORIES_SAVED;
                                break;
 
                        case "del": // Delete categories
                                        array($cat, $_POST['vis'][$id], $_POST['sort'][$id], $id), __FILE__, __LINE__);
                                $TEXT = CATEGORIES_SAVED;
                                break;
 
                        case "del": // Delete categories

-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_cats` WHERE id=%s LIMIT 1",
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_cats` WHERE id=%s LIMIT 1",

                                        array($id), __FILE__, __LINE__);
                                        array($id), __FILE__, __LINE__);

-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s",
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s",

                                        array($id), __FILE__, __LINE__);
                                $TEXT = CATEGORIES_DELETED;
                                break;
                                        array($id), __FILE__, __LINE__);
                                $TEXT = CATEGORIES_DELETED;
                                break;


@@ -103,7 +103,7 @@ if (isset($_POST['add'])) {
        $SW = 2; $OUT = "";
        foreach ($_POST['sel'] as $id => $value) {
                // Load data of category
        $SW = 2; $OUT = "";
        foreach ($_POST['sel'] as $id => $value) {
                // Load data of category

-               $result = SQL_QUERY_ESC("SELECT cat FROM `{!MYSQL_PREFIX!}_cats` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT cat FROM `{!_MYSQL_PREFIX!}_cats` WHERE id=%s LIMIT 1",

                        array(bigintval($id)), __FILE__, __LINE__);
                list($cat) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                        array(bigintval($id)), __FILE__, __LINE__);
                list($cat) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);


@@ -129,7 +129,7 @@ if (isset($_POST['add'])) {
        foreach ($_POST['sel'] as $id => $value)
        {
                // Load data from the category
        foreach ($_POST['sel'] as $id => $value)
        {
                // Load data from the category

-               $result = SQL_QUERY_ESC("SELECT cat, visible, sort FROM `{!MYSQL_PREFIX!}_cats` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT cat, visible, sort FROM `{!_MYSQL_PREFIX!}_cats` WHERE id=%s LIMIT 1",

                 array(bigintval($id)), __FILE__, __LINE__);
                list($cat, $vis, $sort) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                 array(bigintval($id)), __FILE__, __LINE__);
                list($cat, $vis, $sort) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);


@@ -155,7 +155,7 @@ if (isset($_POST['add'])) {
  else
 {
        // Load all categories
  else
 {
        // Load all categories

-       $result = SQL_QUERY("SELECT id, cat, visible, sort FROM `{!MYSQL_PREFIX!}_cats` ORDER BY sort", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, cat, visible, sort FROM `{!_MYSQL_PREFIX!}_cats` ORDER BY `sort`", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) > 0)
        {
                // List already existing categories for editing
        if (SQL_NUMROWS($result) > 0)
        {
                // List already existing categories for editing

diff --git a/inc/modules/admin/what-config_email.php b/inc/modules/admin/what-config_email.php
index fd443e1f95769b7e66175e38c1af7d82228b9880..754f36912f8fb3a297293f1ae253cd83d0eea341 100644 (file)
--- a/inc/modules/admin/what-config_email.php
+++ b/inc/modules/admin/what-config_email.php
@@ -45,11 +45,11 @@ if (empty($_POST['max'])) unset($_POST['add_max']);
 
 if (isset($_POST['add_max'])) {
        // Save all settings
 
 if (isset($_POST['add_max'])) {
        // Save all settings

-       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_max_receive` WHERE value='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE value='%s' LIMIT 1",

         array(bigintval($_POST['max'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Add this value (including comment)
         array(bigintval($_POST['max'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Add this value (including comment)

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_max_receive` (value, comment) VALUES ('%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_max_receive` (value, comment) VALUES ('%s','%s')",

                        array(bigintval($_POST['max']), $_POST['comment']),__FILE__, __LINE__);
                $content = MAX_VALUE_SAVED;
        } else {
                        array(bigintval($_POST['max']), $_POST['comment']),__FILE__, __LINE__);
                $content = MAX_VALUE_SAVED;
        } else {


@@ -72,13 +72,13 @@ if (isset($_POST['add_max'])) {
                switch ($_GET['do'])
                {
                case "edit": // Change entries
                switch ($_GET['do'])
                {
                case "edit": // Change entries

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_max_receive` SET value='%s', comment='%s' WHERE id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_max_receive` SET value='%s', comment='%s' WHERE id=%s LIMIT 1",

                                array(bigintval($_POST['val'][$id]), $_POST['comm'][$id], $id),__FILE__, __LINE__);
                        $TEXT = MRECEIVE_SAVED;
                        break;
 
                case "del":
                                array(bigintval($_POST['val'][$id]), $_POST['comm'][$id], $id),__FILE__, __LINE__);
                        $TEXT = MRECEIVE_SAVED;
                        break;
 
                case "del":

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_max_receive` WHERE id=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE id=%s LIMIT 1",

                                array($id), __FILE__, __LINE__);
                        $TEXT = MRECEIVE_DELETED;
                        break;
                                array($id), __FILE__, __LINE__);
                        $TEXT = MRECEIVE_DELETED;
                        break;


@@ -95,7 +95,7 @@ if (isset($_POST['add_max'])) {
        foreach ($_POST['sel'] as $id => $value)
        {
                // Load data
        foreach ($_POST['sel'] as $id => $value)
        {
                // Load data

-               $result = SQL_QUERY_ESC("SELECT value, comment FROM `{!MYSQL_PREFIX!}_max_receive` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE id=%s LIMIT 1",

                 array(bigintval($id)), __FILE__, __LINE__);
                list($value, $comment) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                 array(bigintval($id)), __FILE__, __LINE__);
                list($value, $comment) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);


@@ -121,7 +121,7 @@ if (isset($_POST['add_max'])) {
        $SW = 2; $OUT = "";
        foreach ($_POST['sel'] as $id => $value) {
                // Load data
        $SW = 2; $OUT = "";
        foreach ($_POST['sel'] as $id => $value) {
                // Load data

-               $result = SQL_QUERY_ESC("SELECT value, comment FROM `{!MYSQL_PREFIX!}_max_receive` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE id=%s LIMIT 1",

                 array(bigintval($id)), __FILE__, __LINE__);
                list($value, $comment) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                 array(bigintval($id)), __FILE__, __LINE__);
                list($value, $comment) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);


@@ -143,7 +143,7 @@ if (isset($_POST['add_max'])) {
        // Load main template
        LOAD_TEMPLATE("admin_config_email_edit");
 } else {
        // Load main template
        LOAD_TEMPLATE("admin_config_email_edit");
 } else {

-       $result = SQL_QUERY("SELECT id, value, comment FROM `{!MYSQL_PREFIX!}_max_receive` ORDER BY value", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` ORDER BY value", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) > 0) {
                // List already existing entries for editing
                $SW = 2; $OUT = "";
        if (SQL_NUMROWS($result) > 0) {
                // List already existing entries for editing
                $SW = 2; $OUT = "";

diff --git a/inc/modules/admin/what-config_home.php b/inc/modules/admin/what-config_home.php
index 5185bfb4ba34cf4e1225fc8d0d4db4b36e1f052e..3a9c3ae627bc7120311c361b30a4ca60a20a590d 100644 (file)
--- a/inc/modules/admin/what-config_home.php
+++ b/inc/modules/admin/what-config_home.php
@@ -53,7 +53,7 @@ case "settings": // Settings related to the index page
        if (isset($_POST['ok'])) {
                // Save settings
                ADMIN_SAVE_SETTINGS($_POST);
        if (isset($_POST['ok'])) {
                // Save settings
                ADMIN_SAVE_SETTINGS($_POST);

-               OUTPUT_HTML("<a href=\"".URL."/modules.php?module=admin&amp;what=config_home&amp;sub=settings\">".ADMIN_CONTINUE_TO_CONFIG."</a>");
+               OUTPUT_HTML("<a href=\"{!URL!}/modules.php?module=admin&amp;what=config_home&amp;sub=settings\">".ADMIN_CONTINUE_TO_CONFIG."</a>");

        } else {
                // Prepare data for the template
                $content = array_fill(-1, 60, "");
        } else {
                // Prepare data for the template
                $content = array_fill(-1, 60, "");


@@ -72,16 +72,16 @@ case "target": // Set which what-file will be placed in home-page (only modules.
 
        // Load all what menu points
        $result = SQL_QUERY("SELECT id, what, title
 
        // Load all what menu points
        $result = SQL_QUERY("SELECT id, what, title

-FROM `{!MYSQL_PREFIX!}_guest_menu`
-WHERE action='main' AND what != '' AND what IS NOT NULL AND locked='N'
-ORDER BY sort ASC", __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_guest_menu`
+WHERE action='main' AND `what` != '' AND `what` IS NOT NULL AND `locked`='N'
+ORDER BY `sort` ASC", __FILE__, __LINE__);

 
        $SW = 2; $OUT = ""; $atitle = "";
        while (list($id, $wht, $wtitle) = SQL_FETCHROW($result)) {
 
        $SW = 2; $OUT = ""; $atitle = "";
        while (list($id, $wht, $wtitle) = SQL_FETCHROW($result)) {

-               $LINK = "<a href=\"".URL."/modules.php?module=admin&amp;what=config_home&amp;sub=target&amp;home=".$wht."\">"._IS_NEW_HOME."</a>";
+               $LINK = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=config_home&amp;sub=target&amp;home=".$wht."\">"._IS_NEW_HOME."</a>";

                if ($wht == getConfig('index_home')) {
                        // Is current home
                if ($wht == getConfig('index_home')) {
                        // Is current home

-                       $LINK   = "<div class=\"admin_note\">"._IS_CURRENT_HOME."</div>";
+                       $LINK   = "<div class=\"admin_note\">{!_IS_CURRENT_HOME!}</div>";

                        $atitle = "<div class=\"admin_note\">".$atitle."</div>";
                        $wtitle = "<div class=\"admin_note\">".$wtitle."</div>";
                }
                        $atitle = "<div class=\"admin_note\">".$atitle."</div>";
                        $wtitle = "<div class=\"admin_note\">".$wtitle."</div>";
                }

diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php
index 424121c8f7a3a47cbb01c48ba67d5c580e538545..ffdecb854a7597321d48bb510d0481c72644d3a6 100644 (file)
--- a/inc/modules/admin/what-config_mods.php
+++ b/inc/modules/admin/what-config_mods.php
@@ -54,7 +54,7 @@ if (isset($_POST['edit']))
                foreach ($_POST['sel'] as $id => $sel)
                {
                        // Load module data
                foreach ($_POST['sel'] as $id => $sel)
                {
                        // Load module data

-                       $result = SQL_QUERY_ESC("SELECT module, title, locked, hidden, admin_only, mem_only FROM `{!MYSQL_PREFIX!}_mod_reg` WHERE id=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT module, title, locked, hidden, admin_only, mem_only FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE id=%s LIMIT 1",

                         array(bigintval($id)), __FILE__, __LINE__);
                        list($mod, $title, $locked, $hidden, $admin, $mem) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                         array(bigintval($id)), __FILE__, __LINE__);
                        list($mod, $title, $locked, $hidden, $admin, $mem) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);


@@ -99,7 +99,7 @@ if (isset($_POST['edit']))
                $id = bigintval($id);
 
                // Update module
                $id = bigintval($id);
 
                // Update module

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_mod_reg` SET title='%s', locked='%s', hidden='%s', admin_only='%s', mem_only='%s' WHERE id=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET title='%s', `locked`='%s', hidden='%s', admin_only='%s', mem_only='%s' WHERE id=%s LIMIT 1",

                        array($_POST['title'][$id], $_POST['locked'][$id], $_POST['hidden'][$id], $_POST['admin'][$id], $_POST['member'][$id], $id),  __FILE__, __LINE__);
        }
 
                        array($_POST['title'][$id], $_POST['locked'][$id], $_POST['hidden'][$id], $_POST['admin'][$id], $_POST['member'][$id], $id),  __FILE__, __LINE__);
        }
 


@@ -118,7 +118,7 @@ if ($SEL == 0)
 {
        // Load module data (We do not need to check if there's at least one...)
        $result = SQL_QUERY("SELECT id, module, locked, hidden, admin_only, title, mem_only, clicks
 {
        // Load module data (We do not need to check if there's at least one...)
        $result = SQL_QUERY("SELECT id, module, locked, hidden, admin_only, title, mem_only, clicks

-FROM `{!MYSQL_PREFIX!}_mod_reg`
+FROM `{!_MYSQL_PREFIX!}_mod_reg`

 ORDER BY module", __FILE__, __LINE__);
        $OUT = ""; $SW = 2;
        while (list($id, $mod, $locked, $hidden, $admin, $title, $mem) = SQL_FETCHROW($result))
 ORDER BY module", __FILE__, __LINE__);
        $OUT = ""; $SW = 2;
        while (list($id, $mod, $locked, $hidden, $admin, $title, $mem) = SQL_FETCHROW($result))


@@ -128,7 +128,7 @@ ORDER BY module", __FILE__, __LINE__);
                if (($mod == "index") || ($mod == "login"))
                {
                        // Add link to detail statistics
                if (($mod == "index") || ($mod == "login"))
                {
                        // Add link to detail statistics

-                       $mod = "<strong><a href=\"".URL."/modules.php?module=admin&amp;what=stats_mods&amp;mod=".$mod."\">".$mod."</a></strong>";
+                       $mod = "<strong><a href=\"{!URL!}/modules.php?module=admin&amp;what=stats_mods&amp;mod=".$mod."\">".$mod."</a></strong>";

                }
 
                // Prepare array for the template
                }
 
                // Prepare array for the template

diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php
index 9bd9591c4692a389ce50599e9ae61f0888fa6f21..fd1e6faf1e10589da3c2c6a1b1180f5d394340e6 100644 (file)
--- a/inc/modules/admin/what-config_payouts.php
+++ b/inc/modules/admin/what-config_payouts.php
@@ -44,11 +44,11 @@ if (!empty($_POST['rate'])) $_POST['rate'] = REVERT_COMMA($_POST['rate']);
 
 if ((isset($_POST['add'])) && (!empty($_POST['title'])) && ($_POST['rate'] > 0)) {
        // Add new payout type
 
 if ((isset($_POST['add'])) && (!empty($_POST['title'])) && ($_POST['rate'] > 0)) {
        // Add new payout type

-       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_payout_types` WHERE type='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_payout_types` WHERE type='%s' LIMIT 1",

                array($_POST['title']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Add now
                array($_POST['title']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Add now

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_payout_types`
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_payout_types`

 (type, rate, min_points, from_account, from_pass, engine_url, engine_ret_ok, engine_ret_failed, pass_enc, allow_url)
 VALUES ('%s', %d, %d,'%s','%s','%s','%s','%s','%s','%s')",
  array(
 (type, rate, min_points, from_account, from_pass, engine_url, engine_ret_ok, engine_ret_failed, pass_enc, allow_url)
 VALUES ('%s', %d, %d,'%s','%s','%s','%s','%s','%s','%s')",
  array(


@@ -74,7 +74,7 @@ VALUES ('%s', %d, %d,'%s','%s','%s','%s','%s','%s','%s')",
 }
 
 // Payout requests by your members
 }
 
 // Payout requests by your members

-$result_mem = SQL_QUERY("SELECT id FROM `{!MYSQL_PREFIX!}_user_payouts` WHERE status='NEW' ORDER BY payout_timestamp DESC", __FILE__, __LINE__);
+$result_mem = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE status='NEW' ORDER BY payout_timestamp DESC", __FILE__, __LINE__);

 
 $display = true;
 if ((isset($_POST['edit'])) && (SELECTION_COUNT($_POST['sel']) > 0)) {
 
 $display = true;
 if ((isset($_POST['edit'])) && (SELECTION_COUNT($_POST['sel']) > 0)) {


@@ -88,7 +88,7 @@ if ((isset($_POST['edit'])) && (SELECTION_COUNT($_POST['sel']) > 0)) {
                        // Edit only if something is entered
                        if ((!empty($_POST['title'][$id])) && ($_POST['rate'][$id] > 0)) {
                                // Update entry
                        // Edit only if something is entered
                        if ((!empty($_POST['title'][$id])) && ($_POST['rate'][$id] > 0)) {
                                // Update entry

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_payout_types` SET
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_payout_types` SET

 type='%s',
 rate=%s,
 min_points=%s,
 type='%s',
 rate=%s,
 min_points=%s,


@@ -108,7 +108,7 @@ WHERE id='".$id."' LIMIT 1",
                $SW = 2; $OUT = "";
                foreach ($_POST['sel'] as $id => $sel) {
                        // Load data
                $SW = 2; $OUT = "";
                foreach ($_POST['sel'] as $id => $sel) {
                        // Load data

-                       $result = SQL_QUERY_ESC("SELECT type, rate, min_points, allow_url FROM `{!MYSQL_PREFIX!}_payout_types` WHERE id=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT type, rate, min_points, allow_url FROM `{!_MYSQL_PREFIX!}_payout_types` WHERE id=%s LIMIT 1",

                         array(bigintval($id)), __FILE__, __LINE__);
                        list($title, $rate, $mpoi, $allow) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                         array(bigintval($id)), __FILE__, __LINE__);
                        list($title, $rate, $mpoi, $allow) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);


@@ -137,7 +137,7 @@ WHERE id='".$id."' LIMIT 1",
        if ((isset($_GET['ok'])) && ($_GET['ok'] == "ok")) {
                // Delete entries
                foreach ($_POST['sel'] as $id => $sel) {
        if ((isset($_GET['ok'])) && ($_GET['ok'] == "ok")) {
                // Delete entries
                foreach ($_POST['sel'] as $id => $sel) {

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_payout_types` WHERE id=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_payout_types` WHERE id=%s LIMIT 1",

                                array(bigintval($id)), __FILE__, __LINE__);
                }
                $msg = ADMIN_PAYOUT_ENTRIES_DELETED;
                                array(bigintval($id)), __FILE__, __LINE__);
                }
                $msg = ADMIN_PAYOUT_ENTRIES_DELETED;


@@ -149,7 +149,7 @@ WHERE id='".$id."' LIMIT 1",
                        $id = bigintval($id);
 
                        // Load data
                        $id = bigintval($id);
 
                        // Load data

-                       $result = SQL_QUERY_ESC("SELECT type, rate, min_points FROM `{!MYSQL_PREFIX!}_payout_types` WHERE id=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT type, rate, min_points FROM `{!_MYSQL_PREFIX!}_payout_types` WHERE id=%s LIMIT 1",

                         array($id), __FILE__, __LINE__);
                        list($title, $rate, $mpoi) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                         array($id), __FILE__, __LINE__);
                        list($title, $rate, $mpoi) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);


@@ -180,7 +180,7 @@ if (!empty($msg)) {
 }
 
 // Payout types
 }
 
 // Payout types

-$result_type = SQL_QUERY("SELECT id, type, rate, min_points, from_account FROM `{!MYSQL_PREFIX!}_payout_types` ORDER BY type", __FILE__, __LINE__);
+$result_type = SQL_QUERY("SELECT id, type, rate, min_points, from_account FROM `{!_MYSQL_PREFIX!}_payout_types` ORDER BY type", __FILE__, __LINE__);

 
 if ((SQL_NUMROWS($result_type) > 0) && ($display)) {
        // List all payout types
 
 if ((SQL_NUMROWS($result_type) > 0) && ($display)) {
        // List all payout types


@@ -212,10 +212,10 @@ if ((SQL_NUMROWS($result_type) > 0) && ($display)) {
 // Does your members request payouts?
 if ((SQL_NUMROWS($result_mem) > 0) && ($display)) {
        // Members has requested payouts
 // Does your members request payouts?
 if ((SQL_NUMROWS($result_mem) > 0) && ($display)) {
        // Members has requested payouts

-       LOAD_TEMPLATE("admin_settings_saved", false, "<a href=\"".URL."/modules.php?module=admin&amp;what=list_payouts\">".ADMIN_PAYOUT_LIST_REQUESTS."</a></P>");
+       LOAD_TEMPLATE("admin_settings_saved", false, "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_payouts\">".ADMIN_PAYOUT_LIST_REQUESTS."</a></P>");

 } elseif ($display) {
        // No member requests so far
 } elseif ($display) {
        // No member requests so far

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_PAYOUT_NO_MEMBER_REQUESTS);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_PAYOUT_NO_MEMBER_REQUESTS'));

 }
 
 // Free result
 }
 
 // Free result

diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index 357d1222048eae0738aa16607e9e3f6d1944e133..07698bc9c0a5f08f572e2c88d9494f35f825aa02 100644 (file)
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -72,14 +72,14 @@ if (isset($_POST['ok'])) {
        switch ($_GET['sub'])
        {
        case "points":
        switch ($_GET['sub'])
        {
        case "points":

-               $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_config` SET points_register='".$_POST['points_register']."', points_ref='".$_POST['points_ref']."' WHERE config=0 LIMIT 1";
+               $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_config` SET points_register='".$_POST['points_register']."', points_ref='".$_POST['points_ref']."' WHERE config=0 LIMIT 1";

                break;
 
        case "ref":
                switch ($_GET['do'])
                {
                case "add":
                break;
 
        case "ref":
                switch ($_GET['do'])
                {
                case "add":

-                       $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_refdepths` (level, percents) VALUES ('".$_POST['lvl']."','".$_POST['perc']."')";
+                       $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_refdepths` (level, percents) VALUES ('".$_POST['lvl']."','".$_POST['perc']."')";

                        break;
 
                case "edit": // Change entries
                        break;
 
                case "edit": // Change entries


@@ -91,7 +91,7 @@ if (isset($_POST['ok'])) {
                                $_POST['perc'][$id] = REVERT_COMMA($_POST['perc'][$id]);
 
                                // Update entry
                                $_POST['perc'][$id] = REVERT_COMMA($_POST['perc'][$id]);
 
                                // Update entry

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_refdepths` SET level='%s', percents='%s' WHERE id=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_refdepths` SET level='%s', percents='%s' WHERE id=%s LIMIT 1",

                                        array(bigintval($value), $_POST['perc'][$id], $id), __FILE__, __LINE__);
                        }
                        $message = REF_DEPTHS_SAVED;
                                        array(bigintval($value), $_POST['perc'][$id], $id), __FILE__, __LINE__);
                        }
                        $message = REF_DEPTHS_SAVED;


@@ -99,7 +99,7 @@ if (isset($_POST['ok'])) {
 
                case "del":
                        foreach ($_POST['id'] as $id => $value) {
 
                case "del":
                        foreach ($_POST['id'] as $id => $value) {

-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_refdepths` WHERE id=%s LIMIT 1",
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_refdepths` WHERE id=%s LIMIT 1",

                                        array(bigintval($id)), __FILE__, __LINE__);
                        }
                        $message = REF_DEPTHS_DELETED;
                                        array(bigintval($id)), __FILE__, __LINE__);
                        }
                        $message = REF_DEPTHS_DELETED;


@@ -114,7 +114,7 @@ if (isset($_POST['ok'])) {
 
        case "settings":
                $REF = bigintval($_POST['ref_payout']);
 
        case "settings":
                $REF = bigintval($_POST['ref_payout']);

-               $SQLs[] = sprintf("UPDATE `{!MYSQL_PREFIX!}_config` SET
+               $SQLs[] = sprintf("UPDATE `{!_MYSQL_PREFIX!}_config` SET

 allow_direct_pay='%s',
 reg_points_mode='%s',
 ref_payout='%s'
 allow_direct_pay='%s',
 reg_points_mode='%s',
 ref_payout='%s'


@@ -125,20 +125,20 @@ WHERE config=0 LIMIT 1",
                );
                if ((getConfig('ref_payout') == 0) && ($_POST['ref_payout'] > 0)) {
                        // Update account's ref_payout for "must-confirm"
                );
                if ((getConfig('ref_payout') == 0) && ($_POST['ref_payout'] > 0)) {
                        // Update account's ref_payout for "must-confirm"

-                       $SQLs[] = sprintf("UPDATE `{!MYSQL_PREFIX!}_user_data` SET ref_payout=(%s - mails_confirmed)
+                       $SQLs[] = sprintf("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ref_payout=(%s - mails_confirmed)

 WHERE mails_confirmed < %s", $REF, $REF);
                } elseif ((getConfig('ref_payout') > 0) && ($_POST['ref_payout'] == 0)) {
                        // Update account's ref_payout for "not-must-confirm"
 WHERE mails_confirmed < %s", $REF, $REF);
                } elseif ((getConfig('ref_payout') > 0) && ($_POST['ref_payout'] == 0)) {
                        // Update account's ref_payout for "not-must-confirm"

-                       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_user_data` SET ref_payout=0 WHERE ref_payout > 0";
-                       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_user_points` SET points=points+locked_points WHERE locked_points>0";
-                       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_user_points` SET locked_points=0 WHERE locked_points>0";
+                       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ref_payout=0 WHERE ref_payout > 0";
+                       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_user_points` SET points=points+locked_points WHERE locked_points>0";
+                       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_user_points` SET locked_points=0 WHERE locked_points>0";

                }
                break;
        }
 
        if ((isset($SQLs)) && (is_array($SQLs)) && (!empty($SQLs[0]))) {
                if (strpos($SQLs[0], "INSERT") > -1) {
                }
                break;
        }
 
        if ((isset($SQLs)) && (is_array($SQLs)) && (!empty($SQLs[0]))) {
                if (strpos($SQLs[0], "INSERT") > -1) {

-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_refdepths` WHERE level='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_refdepths` WHERE level='%s' LIMIT 1",

                                array(bigintval($_POST['lvl'])), __FILE__, __LINE__);
                        SQL_FREERESULT($result);
                } // END - if
                                array(bigintval($_POST['lvl'])), __FILE__, __LINE__);
                        SQL_FREERESULT($result);
                } // END - if


@@ -197,7 +197,7 @@ WHERE mails_confirmed < %s", $REF, $REF);
                // Delete entries
                $SW = 2; $OUT = "";
                foreach ($_POST['sel'] as $id => $value) {
                // Delete entries
                $SW = 2; $OUT = "";
                foreach ($_POST['sel'] as $id => $value) {

-                       $result = SQL_QUERY_ESC("SELECT level, percents FROM `{!MYSQL_PREFIX!}_refdepths` WHERE id=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT level, percents FROM `{!_MYSQL_PREFIX!}_refdepths` WHERE id=%s LIMIT 1",

                                array(bigintval($id)), __FILE__, __LINE__);
                        list($lvl, $perc) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                                array(bigintval($id)), __FILE__, __LINE__);
                        list($lvl, $perc) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);


@@ -222,7 +222,7 @@ WHERE mails_confirmed < %s", $REF, $REF);
                // Edit entries
                $SW = 2; $OUT = "";
                foreach ($_POST['sel'] as $id => $value) {
                // Edit entries
                $SW = 2; $OUT = "";
                foreach ($_POST['sel'] as $id => $value) {

-                       $result = SQL_QUERY_ESC("SELECT level, percents FROM `{!MYSQL_PREFIX!}_refdepths` WHERE id=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT level, percents FROM `{!_MYSQL_PREFIX!}_refdepths` WHERE id=%s LIMIT 1",

                         array(bigintval($id)), __FILE__, __LINE__);
                        list($lvl, $perc) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                         array(bigintval($id)), __FILE__, __LINE__);
                        list($lvl, $perc) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);


@@ -245,7 +245,7 @@ WHERE mails_confirmed < %s", $REF, $REF);
                LOAD_TEMPLATE("admin_points_edit");
        } else {
                // Referal levels
                LOAD_TEMPLATE("admin_points_edit");
        } else {
                // Referal levels

-               $result = SQL_QUERY("SELECT id, level, percents FROM `{!MYSQL_PREFIX!}_refdepths` ORDER BY level", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT id, level, percents FROM `{!_MYSQL_PREFIX!}_refdepths` ORDER BY level", __FILE__, __LINE__);

                if (SQL_NUMROWS($result) > 0) {
                        // Make referal levels editable and deletable
                        $SW = 2; $OUT = "";
                if (SQL_NUMROWS($result) > 0) {
                        // Make referal levels editable and deletable
                        $SW = 2; $OUT = "";

diff --git a/inc/modules/admin/what-config_proxy.php b/inc/modules/admin/what-config_proxy.php
index 3a2f37ec3188c38e2d5239418bf8b3dfd62e6da5..9d74c9bf7a70d73ba57725e5d974da5228c90a59 100644 (file)
--- a/inc/modules/admin/what-config_proxy.php
+++ b/inc/modules/admin/what-config_proxy.php
@@ -47,7 +47,7 @@ if (isset($_POST['ok'])) {
                ADMIN_SAVE_SETTINGS($_POST);
        } else {
                // Invalid!
                ADMIN_SAVE_SETTINGS($_POST);
        } else {
                // Invalid!

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_PROXY_SETTINGS_INVALID);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_PROXY_SETTINGS_INVALID'));

        }
 } else {
        // Prepare content
        }
 } else {
        // Prepare content

diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index fea6546b9bfc0d46df2ec5142cd73c39c30b123a..33f53536c65ea0fcf0828c98fe5ed92a4187020e 100644 (file)
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -48,13 +48,13 @@ if (!empty($_GET['rallye']))
                if ((!empty($_POST['level'])) && ((!empty($_POST['points'])) || (!empty($_POST['info']))))
                {
                        // Submitted data is valid, but maybe we already have this price level?
                if ((!empty($_POST['level'])) && ((!empty($_POST['points'])) || (!empty($_POST['info']))))
                {
                        // Submitted data is valid, but maybe we already have this price level?

-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s AND price_level='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s AND price_level='%s' LIMIT 1",

                         array(bigintval($_GET['rallye']), bigintval($_POST['level'])), __FILE__, __LINE__);
 
                        if (SQL_NUMROWS($result) == 0)
                        {
                                // Ok, new price level entered!
                         array(bigintval($_GET['rallye']), bigintval($_POST['level'])), __FILE__, __LINE__);
 
                        if (SQL_NUMROWS($result) == 0)
                        {
                                // Ok, new price level entered!

-                               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_rallye_prices` (rallye_id, price_level, points, info)
+                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_rallye_prices` (rallye_id, price_level, points, info)

 VALUES ('%s','%s','%s','%s')",
  array(
        bigintval($_GET['rallye']),
 VALUES ('%s','%s','%s','%s')",
  array(
        bigintval($_GET['rallye']),


@@ -79,7 +79,7 @@ VALUES ('%s','%s','%s','%s')",
                if ($SEL > 0) {
                        // Delete selected entries
                        foreach ($_POST['sel'] as $id => $sel) {
                if ($SEL > 0) {
                        // Delete selected entries
                        foreach ($_POST['sel'] as $id => $sel) {

-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_rallye_prices` WHERE id=%s LIMIT 1",
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE id=%s LIMIT 1",

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


@@ -95,7 +95,7 @@ VALUES ('%s','%s','%s','%s')",
                        $id = bigintval($id);
 
                        // Update entry
                        $id = bigintval($id);
 
                        // Update entry

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_rallye_prices` SET rallye_id=%s, price_level='%s', points='%s', info='%s' WHERE id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_rallye_prices` SET rallye_id=%s, price_level='%s', points='%s', info='%s' WHERE id=%s LIMIT 1",

                                array($_POST['rallye_id'][$id], bigintval($level), $_POST['points'][$id], $_POST['infos'][$id], $id), __FILE__, __LINE__);
                }
 
                                array($_POST['rallye_id'][$id], bigintval($level), $_POST['points'][$id], $_POST['infos'][$id], $id), __FILE__, __LINE__);
                }
 


@@ -113,7 +113,7 @@ VALUES ('%s','%s','%s','%s')",
                        foreach ($_POST['sel'] as $id => $sel)
                        {
                                // Load data to selected rallye
                        foreach ($_POST['sel'] as $id => $sel)
                        {
                                // Load data to selected rallye

-                               $result = SQL_QUERY_ESC("SELECT rallye_id, price_level, points, info FROM `{!MYSQL_PREFIX!}_rallye_prices` WHERE id=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT rallye_id, price_level, points, info FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE id=%s LIMIT 1",

                                 array(bigintval($id)), __FILE__, __LINE__);
                                list($rallye, $level, $points, $infos) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);
                                 array(bigintval($id)), __FILE__, __LINE__);
                                list($rallye, $level, $points, $infos) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);


@@ -143,7 +143,7 @@ VALUES ('%s','%s','%s','%s')",
                 else
                {
                        // Nothing selected
                 else
                {
                        // Nothing selected

-                       $content = RALLYE_NO_PRICES_SELECTED_1."<a href=\"".URL."/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=".$_GET['rallye']."\">".RALLYE_NO_PRICES_SELECTED_2."</a>".RALLYE_NO_PRICES_SELECTED_3;
+                       $content = RALLYE_NO_PRICES_SELECTED_1."<a href=\"{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=".$_GET['rallye']."\">".RALLYE_NO_PRICES_SELECTED_2."</a>".RALLYE_NO_PRICES_SELECTED_3;

                        LOAD_TEMPLATE("admin_settings_saved", false, $content);
                }
        }
                        LOAD_TEMPLATE("admin_settings_saved", false, $content);
                }
        }


@@ -158,7 +158,7 @@ VALUES ('%s','%s','%s','%s')",
                        foreach ($_POST['sel'] as $id => $sel)
                        {
                                // Load data to selected rallye
                        foreach ($_POST['sel'] as $id => $sel)
                        {
                                // Load data to selected rallye

-                               $result = SQL_QUERY_ESC("SELECT rallye_id, price_level, points, info FROM `{!MYSQL_PREFIX!}_rallye_prices` WHERE id=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT rallye_id, price_level, points, info FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE id=%s LIMIT 1",

                                 array(bigintval($id)), __FILE__, __LINE__);
                                list($rallye, $level, $points, $infos) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);
                                 array(bigintval($id)), __FILE__, __LINE__);
                                list($rallye, $level, $points, $infos) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);


@@ -189,21 +189,21 @@ VALUES ('%s','%s','%s','%s')",
                 else
                {
                        // Nothing selected
                 else
                {
                        // Nothing selected

-                       $content = RALLYE_NO_PRICES_SELECTED_1."<a href=\"".URL."/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=".$_GET['rallye']."\">".RALLYE_NO_PRICES_SELECTED_2."</a>".RALLYE_NO_PRICES_SELECTED_3;
+                       $content = RALLYE_NO_PRICES_SELECTED_1."<a href=\"{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=".$_GET['rallye']."\">".RALLYE_NO_PRICES_SELECTED_2."</a>".RALLYE_NO_PRICES_SELECTED_3;

                        LOAD_TEMPLATE("admin_settings_saved", false, $content);
                }
        }
         else
        {
                // a rallye was selected, so check if there are already prices assigned...
                        LOAD_TEMPLATE("admin_settings_saved", false, $content);
                }
        }
         else
        {
                // a rallye was selected, so check if there are already prices assigned...

-               $result = SQL_QUERY_ESC("SELECT id, price_level, points, info FROM `{!MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s ORDER BY price_level",
+               $result = SQL_QUERY_ESC("SELECT id, price_level, points, info FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s ORDER BY price_level",

                 array(bigintval($_GET['rallye'])), __FILE__, __LINE__);
 
                if (SQL_NUMROWS($result) > 0)
                {
                        // Load all prices for the selected rallye
                        $SW = 2; $OUT = "";
                 array(bigintval($_GET['rallye'])), __FILE__, __LINE__);
 
                if (SQL_NUMROWS($result) > 0)
                {
                        // Load all prices for the selected rallye
                        $SW = 2; $OUT = "";

-                       while(list($id, $level, $points, $infos) = SQL_FETCHROW($result))
+                       while (list($id, $level, $points, $infos) = SQL_FETCHROW($result))

                        {
                                if (empty($infos)) $infos = "---";
 
                        {
                                if (empty($infos)) $infos = "---";
 


@@ -243,7 +243,7 @@ VALUES ('%s','%s','%s','%s')",
 {
        // No rallye selected so display all available without prices
        $result = SQL_QUERY("SELECT d.id, d.admin_id, d.start_time, d.end_time, d.title, a.login, d.is_active
 {
        // No rallye selected so display all available without prices
        $result = SQL_QUERY("SELECT d.id, d.admin_id, d.start_time, d.end_time, d.title, a.login, d.is_active

-FROM `{!MYSQL_PREFIX!}_rallye_data` AS d, `{!MYSQL_PREFIX!}_admins` AS a
+FROM `{!_MYSQL_PREFIX!}_rallye_data` AS d, `{!_MYSQL_PREFIX!}_admins` AS a

 WHERE d.admin_id=a.id ORDER BY start_time DESC", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0)
        {
 WHERE d.admin_id=a.id ORDER BY start_time DESC", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0)
        {

diff --git a/inc/modules/admin/what-config_register.php b/inc/modules/admin/what-config_register.php
index 8814b810aedbb924077cbd58f83d044e13a31bf5..21e4c6d53a4ed3142cbf5f359c13b3d4706f2e57 100644 (file)
--- a/inc/modules/admin/what-config_register.php
+++ b/inc/modules/admin/what-config_register.php
@@ -43,14 +43,14 @@ ADD_DESCR("admin", __FILE__);
 // Do we want to save changes?
 if (isset($_POST['ok'])) {
        foreach ($_POST['sel'] as $id => $value) {
 // Do we want to save changes?
 if (isset($_POST['ok'])) {
        foreach ($_POST['sel'] as $id => $value) {

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_must_register` SET field_required='%s' WHERE id=%s AND field_required != '%s' LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_must_register` SET field_required='%s' WHERE id=%s AND field_required != '%s' LIMIT 1",

                        array($value, bigintval($id), $value),__FILE__, __LINE__);
        }
        LOAD_TEMPLATE("admin_settings_saved", false, REGISTER_ADMIN_CHANGES_SAVED);
 }
 
 // List all register values
                        array($value, bigintval($id), $value),__FILE__, __LINE__);
        }
        LOAD_TEMPLATE("admin_settings_saved", false, REGISTER_ADMIN_CHANGES_SAVED);
 }
 
 // List all register values

-$result = SQL_QUERY("SELECT id, field_name, field_required FROM `{!MYSQL_PREFIX!}_must_register` ORDER BY id", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT id, field_name, field_required FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`", __FILE__, __LINE__);

 $SW = 2; $OUT = "";
 while (list($id, $name, $required) = SQL_FETCHROW($result)) {
        // Get constant value
 $SW = 2; $OUT = "";
 while (list($id, $name, $required) = SQL_FETCHROW($result)) {
        // Get constant value

diff --git a/inc/modules/admin/what-config_rewrite.php b/inc/modules/admin/what-config_rewrite.php
index 0fa42eae8440e643b9b3a301fff7633a262ec265..ed73ec998f56756b47a4105b3aec3ca4d444b8b3 100644 (file)
--- a/inc/modules/admin/what-config_rewrite.php
+++ b/inc/modules/admin/what-config_rewrite.php
@@ -59,9 +59,9 @@ if (isset($_POST['ok'])) {
        ADMIN_SAVE_SETTINGS($_POST);
 } else {
        // Load existing modules and generate TR rows for the template
        ADMIN_SAVE_SETTINGS($_POST);
 } else {
        // Load existing modules and generate TR rows for the template

-       $result = SQL_QUERY("SELECT module, title FROM `{!MYSQL_PREFIX!}_mod_reg` ORDER BY module", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT module, title FROM `{!_MYSQL_PREFIX!}_mod_reg` ORDER BY module", __FILE__, __LINE__);

        $SW = 2; $OUT = "";
        $SW = 2; $OUT = "";

-       while(list($mod, $title) = SQL_FETCHROW($result)) {
+       while (list($mod, $title) = SQL_FETCHROW($result)) {

                // Set title to three dashes when no title is supplied
                if (empty($title)) $title = "---";
 
                // Set title to three dashes when no title is supplied
                if (empty($title)) $title = "---";
 

diff --git a/inc/modules/admin/what-config_session.php b/inc/modules/admin/what-config_session.php
index 79f9dd96665bb5a958727e084a09641831699289..9da34ffb187ad9b21c2cc99ab36af73650879f38 100644 (file)
--- a/inc/modules/admin/what-config_session.php
+++ b/inc/modules/admin/what-config_session.php
@@ -47,7 +47,7 @@ if (isset($_POST['ok'])) {
                ADMIN_SAVE_SETTINGS($_POST);
        } else {
                // Invalid!
                ADMIN_SAVE_SETTINGS($_POST);
        } else {
                // Invalid!

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SESSION_SAVE_PATH_INVALID);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SESSION_SAVE_PATH_INVALID'));

        }
 } else {
        // Prepare content
        }
 } else {
        // Prepare content

diff --git a/inc/modules/admin/what-config_yoomedia.php b/inc/modules/admin/what-config_yoomedia.php
index f196a2838c0c4dc4c1da2ee55feb62e2ba141f04..5171c0a622f570ba6ff2970d805c03ff72fdd735 100644 (file)
--- a/inc/modules/admin/what-config_yoomedia.php
+++ b/inc/modules/admin/what-config_yoomedia.php
@@ -51,7 +51,7 @@ if (isset($_POST['ok'])) {
                ADMIN_SAVE_SETTINGS($_POST);
        } else {
                // Config not saved
                ADMIN_SAVE_SETTINGS($_POST);
        } else {
                // Config not saved

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_CONFIG_YOOMEDIA_TEST_FAILED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_CONFIG_YOOMEDIA_TEST_FAILED'));

        }
 } else {
        // Prepare content
        }
 } else {
        // Prepare content

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index 5d6784c96390f84f6fe7f5d8a1c398612865cb82..a1ed1b1c45afc91781daa2be323929ef6792631c 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -48,7 +48,7 @@ $cnt = 0;
 
 if (!empty($_GET['mid'])) {
        // Load email data
 
 if (!empty($_GET['mid'])) {
        // Load email data

-       $result = SQL_QUERY_ESC("SELECT id, sender, subject, url, timestamp, payment_id FROM `{!MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id, sender, subject, url, timestamp, payment_id FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",

                array(bigintval($_GET['mid'])), __FILE__, __LINE__);
 
        // Delete mail only once
                array(bigintval($_GET['mid'])), __FILE__, __LINE__);
 
        // Delete mail only once


@@ -75,11 +75,11 @@ if (!empty($_GET['mid'])) {
 
                // Load email template and send the email away
                $msg_user = LOAD_EMAIL_TEMPLATE("order-deleted", array(), $sender);
 
                // Load email template and send the email away
                $msg_user = LOAD_EMAIL_TEMPLATE("order-deleted", array(), $sender);

-               SEND_EMAIL($sender, MEMBER_ORDER_DELETED, $msg_user);
+               SEND_EMAIL($sender, getMessage('MEMBER_ORDER_DELETED'), $msg_user);

 
                // Fetch right stats_id from pool
 
                // Fetch right stats_id from pool

-               $result_pool = SQL_QUERY_ESC("SELECT s.id FROM `{!MYSQL_PREFIX!}_user_stats` AS s
-LEFT JOIN `{!MYSQL_PREFIX!}_pool` AS p
+               $result_pool = SQL_QUERY_ESC("SELECT s.id FROM `{!_MYSQL_PREFIX!}_user_stats` AS s
+LEFT JOIN `{!_MYSQL_PREFIX!}_pool` AS p

 ON s.pool_id=p.id
 WHERE s.pool_id=%s LIMIT 1",
  array(bigintval($_GET['mid'])), __FILE__, __LINE__);
 ON s.pool_id=p.id
 WHERE s.pool_id=%s LIMIT 1",
  array(bigintval($_GET['mid'])), __FILE__, __LINE__);


@@ -124,7 +124,7 @@ WHERE s.pool_id=%s LIMIT 1",
                                        }
                                } else {
                                        // No points repayed!
                                        }
                                } else {
                                        // No points repayed!

-                                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_POINTS_REPAYED);
+                                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_POINTS_REPAYED'));

                                }
                        } else {
                                // Points shredded!
                                }
                        } else {
                                // Points shredded!


@@ -132,19 +132,19 @@ WHERE s.pool_id=%s LIMIT 1",
                        }
 
                        // Remove links from DB
                        }
 
                        // Remove links from DB

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_links` WHERE stats_id=%s",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE stats_id=%s",

                                array(bigintval($stats_id)), __FILE__, __LINE__);
                        $cnt += SQL_AFFECTEDROWS();
 
                        // Load template for link
                                array(bigintval($stats_id)), __FILE__, __LINE__);
                        $cnt += SQL_AFFECTEDROWS();
 
                        // Load template for link

-                       LOAD_TEMPLATE("admin_settings_saved", false, "<a href=\"".URL."/modules.php?module=admin&amp;what=del_email&amp;pid=".bigintval($_GET['mid'])."\">".ADMIN_REMOVE_STATS_ENTRY."</a>");
+                       LOAD_TEMPLATE("admin_settings_saved", false, "<a href=\"{!URL!}/modules.php?module=admin&amp;what=del_email&amp;pid=".bigintval($_GET['mid'])."\">".ADMIN_REMOVE_STATS_ENTRY."</a>");

                } // END - if
 
                // Free the result
                SQL_FREERESULT($result_pool);
 
                // Delete mail from queue
                } // END - if
 
                // Free the result
                SQL_FREERESULT($result_pool);
 
                // Delete mail from queue

-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",

                        array(bigintval($_GET['mid'])), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 
                        array(bigintval($_GET['mid'])), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 


@@ -152,18 +152,18 @@ WHERE s.pool_id=%s LIMIT 1",
                OUTPUT_HTML(sprintf(ADMIN_DELETED_MAILS_COUNT, $cnt));
        } else {
                // Mail already deleted!
                OUTPUT_HTML(sprintf(ADMIN_DELETED_MAILS_COUNT, $cnt));
        } else {
                // Mail already deleted!

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NORMAL_MAIL_ALREADY_DELETED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NORMAL_MAIL_ALREADY_DELETED'));

        }
 } elseif (!empty($_GET['pid'])) {
        // Remove stats entries
        }
 } elseif (!empty($_GET['pid'])) {
        // Remove stats entries

-       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
+       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",

                array(bigintval($_GET['pid'])), __FILE__, __LINE__);
 
        // Output message
                array(bigintval($_GET['pid'])), __FILE__, __LINE__);
 
        // Output message

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_USER_STATS_REMOVED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_USER_STATS_REMOVED'));

 } elseif ((!empty($_GET['bid'])) && (EXT_IS_ACTIVE("bonus"))) {
        // Load data from bonus mail
 } elseif ((!empty($_GET['bid'])) && (EXT_IS_ACTIVE("bonus"))) {
        // Load data from bonus mail

-       $result = SQL_QUERY_ESC("SELECT id, subject, url, timestamp, mails_sent FROM `{!MYSQL_PREFIX!}_bonus` WHERE id=%s",
+       $result = SQL_QUERY_ESC("SELECT id, subject, url, timestamp, mails_sent FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s",

                array(bigintval($_GET['bid'])), __FILE__, __LINE__);
 
        // Delete mail only once
                array(bigintval($_GET['bid'])), __FILE__, __LINE__);
 
        // Delete mail only once


@@ -178,10 +178,10 @@ WHERE s.pool_id=%s LIMIT 1",
                $cnt = 0;
 
                // Delete bonus mail entirely from database
                $cnt = 0;
 
                // Delete bonus mail entirely from database

-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",

                        array(bigintval($_GET['bid'])), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
                        array(bigintval($_GET['bid'])), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();

-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",

                        array(bigintval($_GET['bid'])), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 
                        array(bigintval($_GET['bid'])), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 


@@ -196,14 +196,14 @@ WHERE s.pool_id=%s LIMIT 1",
                LOAD_TEMPLATE("admin_del_email_bonus");
        } else {
                // Mail already deleted!
                LOAD_TEMPLATE("admin_del_email_bonus");
        } else {
                // Mail already deleted!

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_MAIL_ALREADY_DELETED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_MAIL_ALREADY_DELETED'));

        }
 
        // Free result
        SQL_FREERESULT($result);
 } elseif ((!empty($_GET['nid'])) && (GET_EXT_VERSION("bonus") >= "0.8.7")) {
        // Load data from bonus mail
        }
 
        // Free result
        SQL_FREERESULT($result);
 } elseif ((!empty($_GET['nid'])) && (GET_EXT_VERSION("bonus") >= "0.8.7")) {
        // Load data from bonus mail

-       $result = SQL_QUERY_ESC("SELECT id, subject, url, timestamp FROM `{!MYSQL_PREFIX!}_bonus` WHERE id=%s",
+       $result = SQL_QUERY_ESC("SELECT id, subject, url, timestamp FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s",

                array(bigintval($_GET['nid'])), __FILE__, __LINE__);
 
        // Delete mail only once
                array(bigintval($_GET['nid'])), __FILE__, __LINE__);
 
        // Delete mail only once


@@ -216,10 +216,10 @@ WHERE s.pool_id=%s LIMIT 1",
                $cnt = 0;
 
                // Delete bonus mail entirely from database
                $cnt = 0;
 
                // Delete bonus mail entirely from database

-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",

                        array(bigintval($_GET['nid'])), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
                        array(bigintval($_GET['nid'])), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();

-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",

                        array(bigintval($_GET['nid'])), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 
                        array(bigintval($_GET['nid'])), __FILE__, __LINE__);
                $cnt += SQL_AFFECTEDROWS();
 


@@ -234,11 +234,11 @@ WHERE s.pool_id=%s LIMIT 1",
                LOAD_TEMPLATE("admin_del_email_notify");
        } else {
                // Mail already deleted!
                LOAD_TEMPLATE("admin_del_email_notify");
        } else {
                // Mail already deleted!

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NOTIFY_MAIL_ALREADY_DELETED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NOTIFY_MAIL_ALREADY_DELETED'));

        }
 } else {
        // No mail orders fond
        }
 } else {
        // No mail orders fond

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_WRONG_CALL);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_WRONG_CALL'));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php
index 3295a77753529fa27af02c35f9eab3abef851d12..2e4bc33e4ad4ddc2c929d6f7bad9844fce012d1b 100644 (file)
--- a/inc/modules/admin/what-del_holiday.php
+++ b/inc/modules/admin/what-del_holiday.php
@@ -53,7 +53,7 @@ if ($SUM > 0)
        {
                // Get the userid
                $result = SQL_QUERY_ESC("SELECT userid, holiday_start, holiday_end
        {
                // Get the userid
                $result = SQL_QUERY_ESC("SELECT userid, holiday_start, holiday_end

-FROM `{!MYSQL_PREFIX!}_user_holidays`
+FROM `{!_MYSQL_PREFIX!}_user_holidays`

 WHERE id=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1)
                {
 WHERE id=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1)
                {


@@ -62,12 +62,12 @@ WHERE id=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
                        SQL_FREERESULT($result);
 
                        // Update user's account
                        SQL_FREERESULT($result);
 
                        // Update user's account

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data`
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`

 SET holiday_active='N', holiday_activated='0'
 WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 
                        // Remove holiday
 SET holiday_active='N', holiday_activated='0'
 WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 
                        // Remove holiday

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_holidays`
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_holidays`

 WHERE id=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
 
                        // Prepare loaded data for the
 WHERE id=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
 
                        // Prepare loaded data for the


@@ -91,7 +91,7 @@ WHERE id=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
 
        // Fetch data
        $result_load = SQL_QUERY_ESC("SELECT holiday_start AS start, holiday_end AS end
 
        // Fetch data
        $result_load = SQL_QUERY_ESC("SELECT holiday_start AS start, holiday_end AS end

-FROM `{!MYSQL_PREFIX!}_user_holidays`
+FROM `{!_MYSQL_PREFIX!}_user_holidays`

 WHERE userid=%s LIMIT 1", array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_load) == 1)
        {
 WHERE userid=%s LIMIT 1", array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_load) == 1)
        {


@@ -103,7 +103,7 @@ WHERE userid=%s LIMIT 1", array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                unset($content[1]);
 
                // Delete one holiday request (for task)
                unset($content[1]);
 
                // Delete one holiday request (for task)

-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_holidays`
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_holidays`

 WHERE userid=%s LIMIT 1", array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 
                // Send email to user
 WHERE userid=%s LIMIT 1", array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 
                // Send email to user

diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php
index 5f01a8358c5e80d7c7b71630ef7b73bbe7872165..fb7df510b6c1d13e30a8c425f5446d300e9d2540 100644 (file)
--- a/inc/modules/admin/what-del_sponsor.php
+++ b/inc/modules/admin/what-del_sponsor.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 if (!empty($_GET['id'])) {
        // Check for selected sponsor
 
 if (!empty($_GET['id'])) {
        // Check for selected sponsor

-       $result = SQL_QUERY_ESC("SELECT email, gender, surname, family FROM `{!MYSQL_PREFIX!}_sponsor_data` WHERE id='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT email, gender, surname, family FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE id='%s' LIMIT 1",

                array(bigintval($_GET['id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Remove sponsor
                array(bigintval($_GET['id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Remove sponsor


@@ -60,14 +60,14 @@ if (!empty($_GET['id'])) {
 
                        // Prepare message and send it away
                        $msg = LOAD_EMAIL_TEMPLATE("del_sponsor", $_POST['reason'], bigintval($_GET['id']));
 
                        // Prepare message and send it away
                        $msg = LOAD_EMAIL_TEMPLATE("del_sponsor", $_POST['reason'], bigintval($_GET['id']));

-                       SEND_EMAIL($email, SPONSOR_ADMIN_DEL_SUBJECT, $msg);
+                       SEND_EMAIL($email, getMessage('SPONSOR_ADMIN_DEL_SUBJECT'), $msg);

 
                        // Remove account
 
                        // Remove account

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_sponsor_data` WHERE id='%s' LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE id='%s' LIMIT 1",

                                array(bigintval($_GET['id'])), __FILE__, __LINE__);
 
                        // Remove orders
                                array(bigintval($_GET['id'])), __FILE__, __LINE__);
 
                        // Remove orders

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_sponsor_orders` WHERE sponsorid='%s' LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_sponsor_orders` WHERE sponsorid='%s' LIMIT 1",

                                array(bigintval($_GET['id'])), __FILE__, __LINE__);
 
                        // Output message
                                array(bigintval($_GET['id'])), __FILE__, __LINE__);
 
                        // Output message


@@ -80,11 +80,11 @@ if (!empty($_GET['id'])) {
                        list ($email, $gender, $sname, $fname) = SQL_FETCHROW($result);
 
                        // Transfer data to constants for the template
                        list ($email, $gender, $sname, $fname) = SQL_FETCHROW($result);
 
                        // Transfer data to constants for the template

-                       define('__EMAIL', $email);
-                       define('__SNAME', $sname);
-                       define('__FNAME', $fname);
+                       define('__EMAIL' , $email);
+                       define('__SNAME' , $sname);
+                       define('__FNAME' , $fname);

                        define('__GENDER', TRANSLATE_GENDER($gender));
                        define('__GENDER', TRANSLATE_GENDER($gender));

-                       define('__UID'  , bigintval($_GET['id']));
+                       define('__UID'   , bigintval($_GET['id']));

 
                        // Display form
                        LOAD_TEMPLATE("admin_del_sponsor");
 
                        // Display form
                        LOAD_TEMPLATE("admin_del_sponsor");


@@ -95,7 +95,7 @@ if (!empty($_GET['id'])) {
        }
 } else {
        // Not called by what-list_sponsor.php
        }
 } else {
        // Not called by what-list_sponsor.php

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_CALL_NOT_DIRECTLY);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_CALL_NOT_DIRECTLY'));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/what-del_transfer.php b/inc/modules/admin/what-del_transfer.php
index 15d931d39f1fce29f02ab5f8d38546b24060cf74..8183fef0fc1e9a37142ddd91264d7bce3987ebf9 100644 (file)
--- a/inc/modules/admin/what-del_transfer.php
+++ b/inc/modules/admin/what-del_transfer.php
@@ -50,22 +50,22 @@ if (isset($_POST['del']))
                // Delete entries...
                foreach ($_POST['sel'] as $id => $sel)
                {
                // Delete entries...
                foreach ($_POST['sel'] as $id => $sel)
                {

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_transfers_in` WHERE trans_id=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_transfers_in` WHERE trans_id=%s LIMIT 1",

                                array(bigintval($id)), __FILE__, __LINE__);
                                array(bigintval($id)), __FILE__, __LINE__);

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_transfers_out` WHERE trans_id=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_transfers_out` WHERE trans_id=%s LIMIT 1",

                                array(bigintval($id)), __FILE__, __LINE__);
                }
        }
 }
 
 // We only need outgoing transfers
                                array(bigintval($id)), __FILE__, __LINE__);
                }
        }
 }
 
 // We only need outgoing transfers

-$result = SQL_QUERY("SELECT userid, to_uid, trans_id, points, reason, time_trans FROM `{!MYSQL_PREFIX!}_user_transfers_out` ORDER BY trans_id", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT userid, to_uid, trans_id, points, reason, time_trans FROM `{!_MYSQL_PREFIX!}_user_transfers_out` ORDER BY trans_id", __FILE__, __LINE__);

 $total = 0;
 if (SQL_NUMROWS($result) > 0)
 {
        // Output rows
        $OUT = ""; $SW = 2;
 $total = 0;
 if (SQL_NUMROWS($result) > 0)
 {
        // Output rows
        $OUT = ""; $SW = 2;

-       while(list($uid1, $uid2, $idx, $points, $reason, $stamp) = SQL_FETCHROW($result))
+       while (list($uid1, $uid2, $idx, $points, $reason, $stamp) = SQL_FETCHROW($result))

        {
                // Prepare data for the row template
                $content = array(
        {
                // Prepare data for the row template
                $content = array(

diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php
index 732416e9236738cdaf449a1f6725b6ea6d1c7af9..f3b27c75ff65e2960bd3dbe3ff7dc8240c51f357 100644 (file)
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -43,7 +43,7 @@ ADD_DESCR("admin", __FILE__);
 // User exists..
 if ((isset($_POST['ok'])) || ((isset($_POST['del'])) && (!empty($_POST['reason'])))) {
        // Delete users account
 // User exists..
 if ((isset($_POST['ok'])) || ((isset($_POST['del'])) && (!empty($_POST['reason'])))) {
        // Delete users account

-       $result_user = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result_user = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_user) == 1) {
                // Free memory
                array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_user) == 1) {
                // Free memory


@@ -64,7 +64,7 @@ if ((isset($_POST['ok'])) || ((isset($_POST['del'])) && (!empty($_POST['reason']
        ADD_MEMBER_SELECTION_BOX();
 } else {
        // Realy want to delete?
        ADD_MEMBER_SELECTION_BOX();
 } else {
        // Realy want to delete?

-       $result = SQL_QUERY_ESC("SELECT email, surname, family FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT email, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load data
                array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load data

diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index a31f7777cf87ba0b9dfa58f74f192f1977b64e07..a02228e75abf5693ae70f2b1cd3a3f1b7c4e7d1a 100644 (file)
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -44,11 +44,11 @@ if ((isset($_POST['ok'])) && (empty($_POST['id']))) {
        unset($_POST['ok']);
 }
 
        unset($_POST['ok']);
 }
 

-$result = SQL_QUERY("SELECT id, sender, subject, payment_id, cat_id FROM `{!MYSQL_PREFIX!}_pool` ORDER BY timestamp", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT id, sender, subject, payment_id, cat_id FROM `{!_MYSQL_PREFIX!}_pool` ORDER BY timestamp", __FILE__, __LINE__);

 if (SQL_NUMROWS($result) > 0) {
        if (isset($_POST['ok'])) {
                // Make mail editable...
 if (SQL_NUMROWS($result) > 0) {
        if (isset($_POST['ok'])) {
                // Make mail editable...

-               $result = SQL_QUERY_ESC("SELECT subject, text, url FROM `{!MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT subject, text, url FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",

                 array(bigintval($_POST['id'])), __FILE__, __LINE__);
                list($subj, $text, $url) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                 array(bigintval($_POST['id'])), __FILE__, __LINE__);
                list($subj, $text, $url) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);


@@ -61,7 +61,7 @@ if (SQL_NUMROWS($result) > 0) {
                LOAD_TEMPLATE("admin_edit_email");
        } elseif (!empty($_POST['save'])) {
                // Save changes
                LOAD_TEMPLATE("admin_edit_email");
        } elseif (!empty($_POST['save'])) {
                // Save changes

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_pool` SET
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET

 subject='%s',
 text='%s',
 url='%s'
 subject='%s',
 text='%s',
 url='%s'

diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php
index 2d122ace4885cd8a13a80e9254dcb2484f1a4d6e..73b5ab035f42d6f366b92c0c537cee303d395487 100644 (file)
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
        // Check for selected sponsor
 
 if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
        // Check for selected sponsor

-       $result = SQL_QUERY_ESC("SELECT company, position, gender, surname, family, street_nr1, street_nr2, zip, city, country, phone, fax, cell, email, url, tax_ident, receive_warnings, warning_interval FROM `{!MYSQL_PREFIX!}_sponsor_data` WHERE id='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT company, position, gender, surname, family, street_nr1, street_nr2, zip, city, country, phone, fax, cell, email, url, tax_ident, receive_warnings, warning_interval FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE id='%s' LIMIT 1",

         array(bigintval($_GET['id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load sponsor details
         array(bigintval($_GET['id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load sponsor details


@@ -109,7 +109,7 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
                                        $POINTS = strval(REVERT_COMMA($_POST['points']));
 
                                        // Add points to account
                                        $POINTS = strval(REVERT_COMMA($_POST['points']));
 
                                        // Add points to account

-                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_sponsor_data` SET points_amount=points_amount+%s WHERE id='%s' LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET points_amount=points_amount+%s WHERE id='%s' LIMIT 1",

                                                array($POINTS, bigintval($_GET['id'])), __FILE__, __LINE__);
 
                                        // Remember points /reason for the template
                                                array($POINTS, bigintval($_GET['id'])), __FILE__, __LINE__);
 
                                        // Remember points /reason for the template


@@ -132,7 +132,7 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
                                        $POINTS = strval(REVERT_COMMA($_POST['points']));
 
                                        // Add points to account
                                        $POINTS = strval(REVERT_COMMA($_POST['points']));
 
                                        // Add points to account

-                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_sponsor_data` SET points_used=points_used+%s WHERE id='%s' LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET points_used=points_used+%s WHERE id='%s' LIMIT 1",

                                                array($POINTS, bigintval($_GET['id'])), __FILE__, __LINE__);
 
                                        // Remember points /reason for the template
                                                array($POINTS, bigintval($_GET['id'])), __FILE__, __LINE__);
 
                                        // Remember points /reason for the template


@@ -187,7 +187,7 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
                        } // END - if
                } elseif (FILE_READABLE(sprintf("%stemplates/%s/html/admin/%s.tpl", PATH, GET_LANGUAGE(), $TPL))) {
                        // Create mailto link
                        } // END - if
                } elseif (FILE_READABLE(sprintf("%stemplates/%s/html/admin/%s.tpl", PATH, GET_LANGUAGE(), $TPL))) {
                        // Create mailto link

-                       define('__SPONSOR_VALUE', "<a href=\"mailto:".__EMAIL."\">".__SURNAME." ".__FAMILY."</a>");
+                       define('__SPONSOR_VALUE', "<a href=\"mailto:{!__EMAIL!}\">{!__SURNAME!} {!__FAMILY!}</a>");

 
                        // Load mode template
                        LOAD_TEMPLATE($TPL);
 
                        // Load mode template
                        LOAD_TEMPLATE($TPL);


@@ -201,7 +201,7 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
        }
 } else {
        // Not called by what-list_sponsor.php
        }
 } else {
        // Not called by what-list_sponsor.php

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_CALL_NOT_DIRECTLY);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_CALL_NOT_DIRECTLY'));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php
index 32d8a67535651c7c919b32f6ae42fa0e6f1e777d..f3d58632667a2c336cc8e16451ad628f085e7f56 100644 (file)
--- a/inc/modules/admin/what-edit_user.php
+++ b/inc/modules/admin/what-edit_user.php
@@ -45,7 +45,7 @@ $result_main = false;
 if (isset($_GET['u_id'])) {
        //                                    0      1        2         3      4     5      6       7         8          9           10         11
        $result_main = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, zip, city, country, email, birth_day, birth_month, birth_year, max_mails
 if (isset($_GET['u_id'])) {
        //                                    0      1        2         3      4     5      6       7         8          9           10         11
        $result_main = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, zip, city, country, email, birth_day, birth_month, birth_year, max_mails

-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE userid=%s
 LIMIT 1",
                array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 WHERE userid=%s
 LIMIT 1",
                array(bigintval($_GET['u_id'])), __FILE__, __LINE__);


@@ -77,7 +77,7 @@ if ((SQL_NUMROWS($result_main) == 1) || (empty($_GET['u_id'])))
                if ($PASS)
                {
                        // We have to add the following things: birthday and max receive mails
                if ($PASS)
                {
                        // We have to add the following things: birthday and max receive mails

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET

 gender='%s',
 surname='%s',
 family='%s',
 gender='%s',
 surname='%s',
 family='%s',

diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php
index 6f660da7ed28802dcd63c29c23c3337c54239b63..5aa4d53081f958332b250e741ee6f2513745d760 100644 (file)
--- a/inc/modules/admin/what-email_archiv.php
+++ b/inc/modules/admin/what-email_archiv.php
@@ -45,7 +45,7 @@ ADD_DESCR("admin", __FILE__);
 
 //             0     1        2      3        4          5           6          7      8         9        10
 $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
 
 //             0     1        2      3        4          5           6          7      8         9        10
 $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id

- FROM `{!MYSQL_PREFIX!}_pool`
+ FROM `{!_MYSQL_PREFIX!}_pool`

  WHERE data_type='SEND' OR data_type='DELETED'
  ORDER BY timestamp DESC";
 
  WHERE data_type='SEND' OR data_type='DELETED'
  ORDER BY timestamp DESC";
 


@@ -86,7 +86,7 @@ if (SQL_NUMROWS($result) > 0)
        while ($pool = SQL_FETCHROW($result))
        {
                // Check sent mails and clicks
        while ($pool = SQL_FETCHROW($result))
        {
                // Check sent mails and clicks

-               $result_mails = SQL_QUERY_ESC("SELECT max_rec, clicks FROM `{!MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
+               $result_mails = SQL_QUERY_ESC("SELECT max_rec, clicks FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",

                 array(bigintval($pool[0])), __FILE__, __LINE__);
                list($sent, $clicks) = SQL_FETCHROW($result_mails);
                SQL_FREERESULT($result_mails);
                 array(bigintval($pool[0])), __FILE__, __LINE__);
                list($sent, $clicks) = SQL_FETCHROW($result_mails);
                SQL_FREERESULT($result_mails);


@@ -96,7 +96,7 @@ if (SQL_NUMROWS($result) > 0)
                if ($unconfirmed > 0)
                {
                        // Add link to list_unconfirmed what-file
                if ($unconfirmed > 0)
                {
                        // Add link to list_unconfirmed what-file

-                       $unconfirmed = "<strong><a href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool[0]."\">".$unconfirmed."</a></strong>";
+                       $unconfirmed = "<strong><a href=\"{!URL!}/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool[0]."\">".$unconfirmed."</a></strong>";

                }
 
                // Prepare data for the row template
                }
 
                // Prepare data for the row template


@@ -131,7 +131,7 @@ if (SQL_NUMROWS($result) > 0)
        LOAD_TEMPLATE("admin_email_archiv");
 } else {
        // No mail orders fond
        LOAD_TEMPLATE("admin_email_archiv");
 } else {
        // No mail orders fond

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MAILS_IN_POOL);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_MAILS_IN_POOL'));

 }
 //
 ?>
 }
 //
 ?>

diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 5f90d77c1d21d66be3e61d265a945313a57764eb..a2193ec131550c4fa45cd7ebe5fe8a60d7fe8de4 100644 (file)
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -53,7 +53,7 @@ ADD_DESCR("admin", __FILE__);
 // Normal mails ordered by your members
 //              0     1       2       3       4           5          6          7       8        9          10
 $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
 // Normal mails ordered by your members
 //              0     1       2       3       4           5          6          7       8        9          10
 $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id

-FROM `{!MYSQL_PREFIX!}_pool`
+FROM `{!_MYSQL_PREFIX!}_pool`

 WHERE data_type IN('ADMIN','TEMP','NEW','ACTIVE')
 ORDER BY timestamp DESC";
 
 WHERE data_type IN('ADMIN','TEMP','NEW','ACTIVE')
 ORDER BY timestamp DESC";
 


@@ -64,7 +64,7 @@ if (!empty($_GET['mid'])) {
        // Only a specific mail shall be displayed
        //              0     1       2       3       4           5          6          7       8        9          10
        $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
        // Only a specific mail shall be displayed
        //              0     1       2       3       4           5          6          7       8        9          10
        $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id

-        FROM `{!MYSQL_PREFIX!}_pool`
+        FROM `{!_MYSQL_PREFIX!}_pool`

         WHERE id='".bigintval($_GET['mid'])."'
         LIMIT 1";
        $WHO = MAIL_ID.": ".$_GET['mid'];
         WHERE id='".bigintval($_GET['mid'])."'
         LIMIT 1";
        $WHO = MAIL_ID.": ".$_GET['mid'];


@@ -72,7 +72,7 @@ if (!empty($_GET['mid'])) {
        // All mails by a specific member shall be displayed
        //              0     1       2       3       4           5          6          7       8        9          10
        $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id
        // All mails by a specific member shall be displayed
        //              0     1       2       3       4           5          6          7       8        9          10
        $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id

-FROM `{!MYSQL_PREFIX!}_pool`
+FROM `{!_MYSQL_PREFIX!}_pool`

 WHERE sender='".bigintval($_GET['u_id'])."'
 ORDER by timestamp DESC";
        $WHO = USER_ID.": ".$_GET['u_id'];
 WHERE sender='".bigintval($_GET['u_id'])."'
 ORDER by timestamp DESC";
        $WHO = USER_ID.": ".$_GET['u_id'];


@@ -82,7 +82,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
        // Bonus mails sent by you
        //               0     1       2        3        4      5       6          7       8      9         10          11        12
        $SQL2 = "SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, clicks
        // Bonus mails sent by you
        //               0     1       2        3        4      5       6          7       8      9         10          11        12
        $SQL2 = "SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, clicks

-FROM `{!MYSQL_PREFIX!}_bonus`
+FROM `{!_MYSQL_PREFIX!}_bonus`

 WHERE is_notify='N'
 ORDER BY timestamp DESC";
 
 WHERE is_notify='N'
 ORDER BY timestamp DESC";
 


@@ -125,7 +125,7 @@ if (SQL_NUMROWS($result_list) > 0) {
        // Walk through all entries
        while ($pool = SQL_FETCHARRAY($result_list)) {
                // Unconfirmed mails and sent mails
        // Walk through all entries
        while ($pool = SQL_FETCHARRAY($result_list)) {
                // Unconfirmed mails and sent mails

-               $result_uncon = SQL_QUERY_ESC("SELECT max_rec, clicks FROM `{!MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
+               $result_uncon = SQL_QUERY_ESC("SELECT max_rec, clicks FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",

                 array(bigintval($pool['id'])), __FILE__, __LINE__);
                list($pool['sent_email'], $pool['clicks']) = SQL_FETCHROW($result_uncon);
                SQL_FREERESULT($result_uncon);
                 array(bigintval($pool['id'])), __FILE__, __LINE__);
                list($pool['sent_email'], $pool['clicks']) = SQL_FETCHROW($result_uncon);
                SQL_FREERESULT($result_uncon);


@@ -134,7 +134,7 @@ if (SQL_NUMROWS($result_list) > 0) {
                $pool['unconfirmed'] = $pool['sent_email'] - $pool['clicks'];
                if ($pool['unconfirmed'] > 0) {
                        // Add link to list_unconfirmed what-file
                $pool['unconfirmed'] = $pool['sent_email'] - $pool['clicks'];
                if ($pool['unconfirmed'] > 0) {
                        // Add link to list_unconfirmed what-file

-                       $pool['unconfirmed'] = "<strong><a href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool['id']."\">".$pool['unconfirmed']."</a></strong>";
+                       $pool['unconfirmed'] = "<strong><a href=\"{!URL!}/modules.php?module=admin&amp;what=list_unconfirmed&amp;mid=".$pool['id']."\">".$pool['unconfirmed']."</a></strong>";

                } elseif ($pool['unconfirmed'] < 0) {
                        // Sometimes rarely displayed minus values will be "fixed" to zero
                        $pool['unconfirmed'] = 0;
                } elseif ($pool['unconfirmed'] < 0) {
                        // Sometimes rarely displayed minus values will be "fixed" to zero
                        $pool['unconfirmed'] = 0;


@@ -193,7 +193,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
                        // Add link?
                        if ($bonus['unconfirmed'] > 0) {
                                // Add link to list_unconfirmed what-file
                        // Add link?
                        if ($bonus['unconfirmed'] > 0) {
                                // Add link to list_unconfirmed what-file

-                               $bonus['unconfirmed'] = "<strong><a href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</a></strong>";
+                               $bonus['unconfirmed'] = "<strong><a href=\"{!URL!}/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</a></strong>";

                        } // END - if
 
                        // Prepare content
                        } // END - if
 
                        // Prepare content


@@ -224,7 +224,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
 
 if (!$MAIL) {
        // No mail orders fond
 
 if (!$MAIL) {
        // No mail orders fond

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MAILS_IN_POOL);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_MAILS_IN_POOL'));

 } // END - if
 
 //
 } // END - if
 
 //

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index a3216622976010ec316cf6413902c8542841fea8..494b122cc5354bb4d9283bc14d058b65f1730f5e 100644 (file)
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -61,7 +61,7 @@ if (!empty($_GET['reg_ext'])) {
                        // De/activate extension
                        $ACT = "N"; $EXT_LOAD_MODE = "deactivate";
                        if ($active == "N") { $ACT = "Y"; $EXT_LOAD_MODE = "activate"; }
                        // De/activate extension
                        $ACT = "N"; $EXT_LOAD_MODE = "deactivate";
                        if ($active == "N") { $ACT = "Y"; $EXT_LOAD_MODE = "activate"; }

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_extensions` SET ext_active='".$ACT."' WHERE id=%s AND ext_active='%s' LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='".$ACT."' WHERE id=%s AND ext_active='%s' LIMIT 1",

                                array(bigintval($ext_id), $active), __FILE__, __LINE__);
 
                        // Run embeded SQL commands
                                array(bigintval($ext_id), $active), __FILE__, __LINE__);
 
                        // Run embeded SQL commands


@@ -83,11 +83,11 @@ if (!empty($_GET['reg_ext'])) {
                                $active = $_POST['active'][$ext_id];
                                if (GET_EXT_VERSION("sql_patches") >= "0.0.6")  {
                                        // Update also CSS column when extensions sql_patches is newer or exact v0.0.6
                                $active = $_POST['active'][$ext_id];
                                if (GET_EXT_VERSION("sql_patches") >= "0.0.6")  {
                                        // Update also CSS column when extensions sql_patches is newer or exact v0.0.6

-                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_extensions` SET ext_has_css='%s', ext_active='%s' WHERE id=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_has_css='%s', ext_active='%s' WHERE id=%s LIMIT 1",

                                                array($_POST['css'][$ext_id], $active, $ext_id), __FILE__, __LINE__);
                                } else {
                                        // When extension is older than v0.0.6 there is no column for the CSS information
                                                array($_POST['css'][$ext_id], $active, $ext_id), __FILE__, __LINE__);
                                } else {
                                        // When extension is older than v0.0.6 there is no column for the CSS information

-                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_extensions` SET ext_active='%s' WHERE id=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='%s' WHERE id=%s LIMIT 1",

                                                array($active, $ext_id), __FILE__, __LINE__);
                                }
 
                                                array($active, $ext_id), __FILE__, __LINE__);
                                }
 


@@ -103,9 +103,7 @@ if (!empty($_GET['reg_ext'])) {
                }
 
                // Extensions changed
                }
 
                // Extensions changed

-               OUTPUT_HTML("<P align=\"center\">");
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_EXT_CHANGED);
-               OUTPUT_HTML("</P>");
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_EXT_CHANGED'));

        } else {
                // Edit selected entries
                $SW = "2"; $OUT = "";
        } else {
                // Edit selected entries
                $SW = "2"; $OUT = "";


@@ -114,12 +112,12 @@ if (!empty($_GET['reg_ext'])) {
                        if (($sel == "Y") || ($sel == "N")) {
                                // Load required data
                                if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
                        if (($sel == "Y") || ($sel == "N")) {
                                // Load required data
                                if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {

-                                       $result = SQL_QUERY_ESC("SELECT ext_name, ext_has_css, ext_active FROM `{!MYSQL_PREFIX!}_extensions` WHERE id=%s LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT ext_name, ext_has_css, ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE id=%s LIMIT 1",

                                         array(bigintval($ext_id)), __FILE__, __LINE__);
                                        list($name, $css, $active) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
                                } else {
                                         array(bigintval($ext_id)), __FILE__, __LINE__);
                                        list($name, $css, $active) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
                                } else {

-                                       $result = SQL_QUERY_ESC("SELECT ext_name, ext_active FROM `{!MYSQL_PREFIX!}_extensions` WHERE id=%s LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT ext_name, ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE id=%s LIMIT 1",

                                         array(bigintval($ext_id)), __FILE__, __LINE__);
                                        list($name, $active) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
                                         array(bigintval($ext_id)), __FILE__, __LINE__);
                                        list($name, $active) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);


@@ -225,13 +223,13 @@ case "overview": // List all registered extensions
        if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
                // Load extension data with CSS informations
                $result = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_active, ext_has_css AS ext_css, ext_version
        if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
                // Load extension data with CSS informations
                $result = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_active, ext_has_css AS ext_css, ext_version

-FROM `{!MYSQL_PREFIX!}_extensions`
+FROM `{!_MYSQL_PREFIX!}_extensions`

 ".$where."
 ORDER BY ext_name", __FILE__, __LINE__);
        } else {
                // Load extension data without CSS informations
                $result = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_active, id, ext_version
 ".$where."
 ORDER BY ext_name", __FILE__, __LINE__);
        } else {
                // Load extension data without CSS informations
                $result = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_active, id, ext_version

-FROM `{!MYSQL_PREFIX!}_extensions`
+FROM `{!_MYSQL_PREFIX!}_extensions`

 ".$where."
 ORDER BY ext_name", __FILE__, __LINE__);
        }
 ".$where."
 ORDER BY ext_name", __FILE__, __LINE__);
        }


@@ -270,12 +268,12 @@ ORDER BY ext_name", __FILE__, __LINE__);
                LOAD_TEMPLATE("admin_extensions");
        } else {
                // No extensions are registered
                LOAD_TEMPLATE("admin_extensions");
        } else {
                // No extensions are registered

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_EXTENSION_REGISTERED."</div>");
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_EXTENSION_REGISTERED'));

        }
        break;
 
 case "register": // Register new extension
        }
        break;
 
 case "register": // Register new extension

-       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_task_system` WHERE assigned_admin=%s AND task_type='EXTENSION' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_task_system` WHERE assigned_admin=%s AND task_type='EXTENSION' LIMIT 1",

                array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
        $task_found = SQL_NUMROWS($result);
 
                array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
        $task_found = SQL_NUMROWS($result);
 


@@ -285,7 +283,7 @@ case "register": // Register new extension
        // Is the ID number valid and the task was found?
        if (($ext_id > 0) && ($task_found == 1)) {
                // ID is valid so begin with registration, we first want to it's real name from task management (subject column)
        // Is the ID number valid and the task was found?
        if (($ext_id > 0) && ($task_found == 1)) {
                // ID is valid so begin with registration, we first want to it's real name from task management (subject column)

-               $result = SQL_QUERY_ESC("SELECT subject FROM `{!MYSQL_PREFIX!}_task_system` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT subject FROM `{!_MYSQL_PREFIX!}_task_system` WHERE id=%s LIMIT 1",

                        array(bigintval($ext_id)), __FILE__, __LINE__);
                list($subj) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                        array(bigintval($ext_id)), __FILE__, __LINE__);
                list($subj) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);


@@ -306,7 +304,7 @@ case "register": // Register new extension
                                $status = EXTENSION_REGISTER($ext_name, $ext_id);
                                if ($status == true) {
                                        // Extension was found and successfully registered
                                $status = EXTENSION_REGISTER($ext_name, $ext_id);
                                if ($status == true) {
                                        // Extension was found and successfully registered

-                                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_EXTENSION_REGISTERED);
+                                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_EXTENSION_REGISTERED'));

 
                                        // Do we need to update cache file?
                                        if ((EXT_IS_ACTIVE("cache")) && ($cacheMode != "no")) {
 
                                        // Do we need to update cache file?
                                        if ((EXT_IS_ACTIVE("cache")) && ($cacheMode != "no")) {


@@ -317,30 +315,30 @@ case "register": // Register new extension
                                        } // END - if
                                } elseif (GET_EXT_VERSION($ext_name) != "") {
                                        // Notify the admin that we have a problem here...
                                        } // END - if
                                } elseif (GET_EXT_VERSION($ext_name) != "") {
                                        // Notify the admin that we have a problem here...

-                                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_ALREADY);
+                                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_ALREADY'));

                                } else {
                                        // Notify the admin that we have a problem here...
                                } else {
                                        // Notify the admin that we have a problem here...

-                                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_404);
+                                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_404'));

                                }
                        } else {
                                // Motify the admin that we have a problem here...
                                }
                        } else {
                                // Motify the admin that we have a problem here...

-                               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_DEPRECATED);
+                               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_DEPRECATED'));

                        }
                } else {
                        // Extension was not found in task management
                        }
                } else {
                        // Extension was not found in task management

-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_ID_404);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_ID_404'));

                }
        } elseif ($task_found == "0") {
                // No longer assigned or old task
                }
        } elseif ($task_found == "0") {
                // No longer assigned or old task

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_ASSIGED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_ASSIGED'));

        } else {
                // ID is invalid
        } else {
                // ID is invalid

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_INVALID);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_INVALID'));

        }
        break;
 
 case "demo":
        }
        break;
 
 case "demo":

-       LOAD_TEMPLATE("admin_settings_saved", false, SETTINGS_NOT_SAVED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_NOT_SAVED'));

        break;
 }
 //
        break;
 }
 //

diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index c32ed7b60c69e4f325659d1f951b967a632e626e..8e063e7757b24ef4cb2bd0653bc21814ad6a9623 100644 (file)
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -51,7 +51,7 @@ if (!isset($_POST['ok'])) {
        $menus = array(); $titles = array(); $below = array();
 
        // Get all available main menus
        $menus = array(); $titles = array(); $below = array();
 
        // Get all available main menus

-       $result = SQL_QUERY("SELECT action, title, sort FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE (what='' OR what IS NULL) ORDER BY sort", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT action, title, sort FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort`", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) > 0) {
                // Read menu structure
                while (list($act, $title, $sort) = SQL_FETCHROW($result)) {
        if (SQL_NUMROWS($result) > 0) {
                // Read menu structure
                while (list($act, $title, $sort) = SQL_FETCHROW($result)) {


@@ -88,8 +88,8 @@ if (!isset($_POST['ok'])) {
                // Load sub menus :)
                foreach ($menus as $key_main => $value_main) {
                        $result = SQL_QUERY_ESC("SELECT what, title, sort
                // Load sub menus :)
                foreach ($menus as $key_main => $value_main) {
                        $result = SQL_QUERY_ESC("SELECT what, title, sort

-FROM `{!MYSQL_PREFIX!}_guest_menu`
-WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
+FROM `{!_MYSQL_PREFIX!}_guest_menu`
+WHERE action='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",

  array($value_main), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) > 0)
                        {
  array($value_main), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) > 0)
                        {


@@ -172,7 +172,7 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
        // Insert new menu entry
        if (!empty($_POST['menu']))
        {
        // Insert new menu entry
        if (!empty($_POST['menu']))
        {

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('%s','%s','%s','%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('%s','%s','%s','%s','%s','%s')",

  array(
        $_POST['menu'],
        $_POST['name'],
  array(
        $_POST['menu'],
        $_POST['name'],


@@ -184,7 +184,7 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
        }
         else
        {
        }
         else
        {

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_guest_menu` (action, title, sort, visible, locked) VALUES ('%s','%s','%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (action, title, sort, visible, locked) VALUES ('%s','%s','%s','%s','%s')",

  array(
        $_POST['name'],
        $_POST['title'],
  array(
        $_POST['name'],
        $_POST['title'],


@@ -193,12 +193,12 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
        $_POST['active'],
 ), __FILE__, __LINE__);
        }
        $_POST['active'],
 ), __FILE__, __LINE__);
        }

-       LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));

 }
  else
 {
        // Demo mode!
 }
  else
 {
        // Demo mode!

-       LOAD_TEMPLATE("admin_settings_saved", false, SETTINGS_NOT_SAVED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_NOT_SAVED'));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index 34d8a5b12e42b75836b24c751261a9a2c9781af8..79bad064141795e2d70f7dd72fe9a739d79f0216 100644 (file)
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -41,10 +41,10 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?
 ADD_DESCR("admin", __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?

-$AND = "(what = '' OR what IS NULL)"; $SUB = "";
+$AND = "(`what` = '' OR `what` IS NULL)"; $SUB = "";

 
 if (!empty($_GET['sub'])) {
 
 if (!empty($_GET['sub'])) {

-       $AND = sprintf("action='%s' AND what IS NOT NULL", SQL_ESCAPE($_GET['sub']));
+       $AND = sprintf("action='%s' AND `what` IS NOT NULL", SQL_ESCAPE($_GET['sub']));

        $SUB = SQL_ESCAPE($_GET['sub']);
 } // END - if
 
        $SUB = SQL_ESCAPE($_GET['sub']);
 } // END - if
 


@@ -65,7 +65,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                if ($confirm == 1)
                {
                        $cnt++;
                if ($confirm == 1)
                {
                        $cnt++;

-                       $result = SQL_QUERY_ESC("SELECT title, action, what FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT title, action, what FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE ".$AND." AND id=%s LIMIT 1",

                         array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {
                         array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {


@@ -112,7 +112,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                if ($confirm == 1)
                {
                        $cnt++;
                if ($confirm == 1)
                {
                        $cnt++;

-                       $result = SQL_QUERY_ESC("SELECT title FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE ".$AND." AND id=%s LIMIT 1",

                         array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {
                         array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {


@@ -157,20 +157,20 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                        $sel = bigintval($sel);
 
                        // Update entry
                        $sel = bigintval($sel);
 
                        // Update entry

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET title='%s', action='%s', what='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET title='%s', action='%s', what='%s' WHERE ".$AND." AND id=%s LIMIT 1",

                                array($menu, $_POST['sel_action'][$sel], $_POST['sel_what'][$sel], $sel),__FILE__, __LINE__);
                }
                                array($menu, $_POST['sel_action'][$sel], $_POST['sel_what'][$sel], $sel),__FILE__, __LINE__);
                }

-               LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));

                break;
 
        case "del": // Delete menu
                foreach ($_POST['sel'] as $sel => $menu)
                {
                        // Delete enty
                break;
 
        case "del": // Delete menu
                foreach ($_POST['sel'] as $sel => $menu)
                {
                        // Delete enty

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE ".$AND." AND id=%s LIMIT 1",

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

-               LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));

                break;
 
        case "status": // Change access levels
                break;
 
        case "status": // Change access levels


@@ -180,10 +180,10 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                        $sel = bigintval($sel);
 
                        // Update entry
                        $sel = bigintval($sel);
 
                        // Update entry

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET visible='%s', locked='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND id=%s LIMIT 1",

                                array($_POST['visible'][$sel], $_POST['locked'][$sel], $sel), __FILE__, __LINE__);
                }
                                array($_POST['visible'][$sel], $_POST['locked'][$sel], $sel), __FILE__, __LINE__);
                }

-               LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));

                break;
 
        default: // Unexpected action
                break;
 
        default: // Unexpected action


@@ -206,7 +206,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                if ($confirm == 1)
                {
                        $cnt++;
                if ($confirm == 1)
                {
                        $cnt++;

-                       $result = SQL_QUERY_ESC("SELECT title, visible, locked FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT title, visible, locked FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE ".$AND." AND id=%s LIMIT 1",

                         array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {
                         array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {


@@ -247,21 +247,21 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                // Get IDs
                if (!empty($_GET['w'])) {
                        // Sub menus selected
                // Get IDs
                if (!empty($_GET['w'])) {
                        // Sub menus selected

-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE action='%s' AND sort='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE action='%s' AND sort='%s' LIMIT 1",

                         array($_GET['act'], bigintval($_GET['tid'])), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                         array($_GET['act'], bigintval($_GET['tid'])), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);

-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE action='%s' AND sort='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE action='%s' AND sort='%s' LIMIT 1",

                         array($_GET['act'], bigintval($_GET['fid'])), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                } else {
                        // Main menu selected
                         array($_GET['act'], bigintval($_GET['fid'])), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                } else {
                        // Main menu selected

-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE (what='' OR what IS NULL) AND sort='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE (what='' OR `what` IS NULL) AND sort='%s' LIMIT 1",

                         array(bigintval($_GET['tid'])), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                         array(bigintval($_GET['tid'])), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);

-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE (what='' OR what IS NULL) AND sort='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE (what='' OR `what` IS NULL) AND sort='%s' LIMIT 1",

                         array(bigintval($_GET['fid'])), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                         array(bigintval($_GET['fid'])), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);


@@ -269,9 +269,9 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 
                if ((!empty($tid)) && (!empty($fid))) {
                        // Sort menu
 
                if ((!empty($tid)) && (!empty($fid))) {
                        // Sort menu

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",

                                array(bigintval($_GET['tid']), bigintval($fid)), __FILE__, __LINE__);
                                array(bigintval($_GET['tid']), bigintval($fid)), __FILE__, __LINE__);

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",

                                array(bigintval($_GET['fid']), bigintval($tid)), __FILE__, __LINE__);
                } // END - if
        } // END - if
                                array(bigintval($_GET['fid']), bigintval($tid)), __FILE__, __LINE__);
                } // END - if
        } // END - if


@@ -279,10 +279,10 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
        // By default list menus
        if (empty($SUB)) {
                // List only main menus
        // By default list menus
        if (empty($SUB)) {
                // List only main menus

-               $result = SQL_QUERY("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);

        } else {
                // List sub menus
        } else {
                // List sub menus

-               $result = SQL_QUERY_ESC("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",
+               $result = SQL_QUERY_ESC("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",

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


@@ -297,21 +297,17 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                while (list($id, $act, $wht, $title, $sort) = SQL_FETCHROW($result))
                {
                        $cnt++;
                while (list($id, $act, $wht, $title, $sort) = SQL_FETCHROW($result))
                {
                        $cnt++;

-                       if (($sort == 0) || (($sort == 1) && (!empty($SUB))))
-                       {
+                       if (($sort == 0) || (($sort == 1) && (!empty($SUB)))) {

                                // Is highest position
                                // Is highest position

-                               $NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</a>";
-                       }
-                        elseif ($cnt == $max)
-                       {
+                               $NAVI = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">{!LOWER!}</a>";
+                       } elseif ($cnt == $max) {

                                // Is lowest position
                                // Is lowest position

-                               $NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</a>";
-                       }
-                        elseif ($sort > 0)
-                       {
+                               $NAVI = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">{!HIGHER!}</a>";
+                       } elseif ($sort > 0) {

                                // Anything else between highest and lowest
                                // Anything else between highest and lowest

-                               $NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</a>/<a href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</a>";
+                               $NAVI = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">{!HIGHER!}</a>/<a href=\"{!URL!}/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">{!LOWER!}</a>";

                        }
                        }

+

                        if (empty($act)) $act = "&nbsp;";
                        if (empty($wht))   $wht   = "&nbsp;";
                        if (empty($title))  $title  = "&nbsp;";
                        if (empty($act)) $act = "&nbsp;";
                        if (empty($wht))   $wht   = "&nbsp;";
                        if (empty($title))  $title  = "&nbsp;";


@@ -334,11 +330,9 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 
                // Load template
                LOAD_TEMPLATE("admin_gmenu_edit");
 
                // Load template
                LOAD_TEMPLATE("admin_gmenu_edit");

-       }
-        else
-       {
+       } else {

                // Menu entries are missing... (???)
                // Menu entries are missing... (???)

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_MENUS_FOUND'));

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index 51fc477553e9d85071c782cee60551cf7a1f1313..cafee4597d750e724ab44f25cbd7f33829cc88ad 100644 (file)
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -54,7 +54,7 @@ if (GET_EXT_VERSION("holiday") >= "0.1.3") $EXCLUDE_LIST .= " AND d.holiday_acti
 
 // Check for all accounts
 $result = SQL_QUERY_ESC("SELECT DISTINCT d.userid, d.gender, d.surname, d.family, d.email, d.joined, d.last_online, d.ap_notified
 
 // Check for all accounts
 $result = SQL_QUERY_ESC("SELECT DISTINCT d.userid, d.gender, d.surname, d.family, d.email, d.joined, d.last_online, d.ap_notified

-FROM `{!MYSQL_PREFIX!}_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_user_data` AS d

 WHERE d.status='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - %s) AND d.last_online < (UNIX_TIMESTAMP() - %s) AND d.ap_notified < (UNIX_TIMESTAMP() - %s)
 ".$EXCLUDE_LIST."
 ORDER BY d.userid", array(getConfig('ap_inactive_since'), getConfig('ap_inactive_since'), getConfig('ap_inactive_since')), __FILE__, __LINE__);
 WHERE d.status='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - %s) AND d.last_online < (UNIX_TIMESTAMP() - %s) AND d.ap_notified < (UNIX_TIMESTAMP() - %s)
 ".$EXCLUDE_LIST."
 ORDER BY d.userid", array(getConfig('ap_inactive_since'), getConfig('ap_inactive_since'), getConfig('ap_inactive_since')), __FILE__, __LINE__);


@@ -63,7 +63,7 @@ if (SQL_NUMROWS($result) > 0)
 {
        // Ok, we have found some inactive accounts
        $SW = 2; $OUT = "";
 {
        // Ok, we have found some inactive accounts
        $SW = 2; $OUT = "";

-       while(list($uid, $gender, $sname, $fname, $email, $joined, $last, $notified) = SQL_FETCHROW($result))
+       while (list($uid, $gender, $sname, $fname, $email, $joined, $last, $notified) = SQL_FETCHROW($result))

        {
                // Prepare data for the row template
                $content = array(
        {
                // Prepare data for the row template
                $content = array(


@@ -93,7 +93,7 @@ if (SQL_NUMROWS($result) > 0)
  else
 {
        // All members are active or you don't have any registered
  else
 {
        // All members are active or you don't have any registered

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_AUTOPURGE_ALL_ACTIVE);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_AUTOPURGE_ALL_ACTIVE'));

 }
 //
 ?>
 }
 //
 ?>

diff --git a/inc/modules/admin/what-list_bank_package.php b/inc/modules/admin/what-list_bank_package.php
index 1ca2d5a9746aba93ad01e6468d4c49b54b21587f..413c3cba795dd91815730e7db6a61aa2fa383501 100644 (file)
--- a/inc/modules/admin/what-list_bank_package.php
+++ b/inc/modules/admin/what-list_bank_package.php
@@ -75,8 +75,8 @@ if (!$show) return;
 
 // Load all banking packages from DB
 $result = SQL_QUERY("SELECT id, title, description, account_fee AS 'fee', package_active AS 'active', interest_plus AS 'plus', interest_minus AS 'minus'
 
 // Load all banking packages from DB
 $result = SQL_QUERY("SELECT id, title, description, account_fee AS 'fee', package_active AS 'active', interest_plus AS 'plus', interest_minus AS 'minus'

-FROM `{!MYSQL_PREFIX!}_bank_packages`
-ORDER BY id", __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_bank_packages`
+ORDER BY `id`", __FILE__, __LINE__);

 
 // Is there at lease one package?
 if (SQL_NUMROWS($result) > 0) {
 
 // Is there at lease one package?
 if (SQL_NUMROWS($result) > 0) {


@@ -102,7 +102,7 @@ if (SQL_NUMROWS($result) > 0) {
        LOAD_TEMPLATE("admin_list_bank_package");
 } else {
        // No packages found!
        LOAD_TEMPLATE("admin_list_bank_package");
 } else {
        // No packages found!

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BANK_NO_PACKAGES_FOUND);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BANK_NO_PACKAGES_FOUND'));

 }
 
 // Free the result
 }
 
 // Free the result

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index af0d7d96fb6fe80cfd2ff4670d6e621a506fc332..8619711604e6cafba1ebd79332a98b1ccc4ff1a8 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -46,8 +46,7 @@ if (getConfig('beg_rallye') == "Y") {
                $curr = date("m", time()) - 1;
                if (strlen($curr) == 1) $curr = "0".$curr;
                UPDATE_CONFIG("last_month", $curr);
                $curr = date("m", time()) - 1;
                if (strlen($curr) == 1) $curr = "0".$curr;
                UPDATE_CONFIG("last_month", $curr);

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BEG_WITHDRAW_PREPARED);
-               OUTPUT_HTML("<br />");
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BEG_WITHDRAW_PREPARED'));

        } // END - if
 
        // Autopurge installed?
        } // END - if
 
        // Autopurge installed?


@@ -60,7 +59,7 @@ if (getConfig('beg_rallye') == "Y") {
 
        // Check if at least one is in the active rallye
        $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, beg_points, last_online
 
        // Check if at least one is in the active rallye
        $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, beg_points, last_online

-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE status='CONFIRMED' AND beg_points > 0".$LAST."
 ORDER BY beg_points DESC, last_online DESC, userid",
         array($ONLINE), __FILE__, __LINE__);
 WHERE status='CONFIRMED' AND beg_points > 0".$LAST."
 ORDER BY beg_points DESC, last_online DESC, userid",
         array($ONLINE), __FILE__, __LINE__);


@@ -68,7 +67,7 @@ ORDER BY beg_points DESC, last_online DESC, userid",
        if (SQL_NUMROWS($result) > 0) {
                // List users
                $OUT = "";$SW = 2; $cnt = 1; $total = 0;
        if (SQL_NUMROWS($result) > 0) {
                // List users
                $OUT = "";$SW = 2; $cnt = 1; $total = 0;

-               while(list($uid, $email, $gender, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result)) {
+               while (list($uid, $email, $gender, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result)) {

                        // Init variables
                        $WIN1 = ""; $WIN2 = "";
                        if ($cnt <= getConfig('beg_ranks')) {
                        // Init variables
                        $WIN1 = ""; $WIN2 = "";
                        if ($cnt <= getConfig('beg_ranks')) {


@@ -105,7 +104,7 @@ ORDER BY beg_points DESC, last_online DESC, userid",
                        define('__BEG_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_beg_form", true));
                } else {
                        // Display message "no manual withdraw possible"
                        define('__BEG_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_beg_form", true));
                } else {
                        // Display message "no manual withdraw possible"

-                       define('__BEG_WITHDRAW_FORM', "<div class=\"admin_failed\">".ADMIN_BEG_ALREADY_WITHDRAW."</div>");
+                       define('__BEG_WITHDRAW_FORM', "<div class=\"admin_failed\">{!ADMIN_BEG_ALREADY_WITHDRAW!}</div>");

                }
 
                // Prepare constant for timemark
                }
 
                // Prepare constant for timemark


@@ -119,11 +118,11 @@ ORDER BY beg_points DESC, last_online DESC, userid",
                LOAD_TEMPLATE("admin_list_beg");
        } else {
                // No one has joined the begging rallye...
                LOAD_TEMPLATE("admin_list_beg");
        } else {
                // No one has joined the begging rallye...

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BEG_NO_RALLYE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BEG_NO_RALLYE'));

        }
 } else {
        // Rallye deactivated
        }
 } else {
        // Rallye deactivated

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BEG_RALLYE_DEACTIVATED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BEG_RALLYE_DEACTIVATED'));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index c99cb1b254315523ae4ea8efabde335152a0f5fe..e170f50333859ca94218d0d84a3b7602d429842d 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -47,8 +47,7 @@ if (getConfig('bonus_active') == "Y") {
                $curr = date("m", time()) - 1;
                if (strlen($curr) == 1) $curr = "0".$curr;
                UPDATE_CONFIG("last_month", $curr);
                $curr = date("m", time()) - 1;
                if (strlen($curr) == 1) $curr = "0".$curr;
                UPDATE_CONFIG("last_month", $curr);

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_WITHDRAW_PREPARED);
-               OUTPUT_HTML("<br />");
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_WITHDRAW_PREPARED'));

        }
 
        if (GET_EXT_VERSION("bonus") >= "0.6.9") {
        }
 
        if (GET_EXT_VERSION("bonus") >= "0.6.9") {


@@ -75,7 +74,7 @@ if (getConfig('bonus_active') == "Y") {
 
        // Check if at least one is in the active rallye
        $result = SQL_QUERY_ESC("SELECT userid AS uid, email, gender, surname, family, ".$USE." AS points, last_online AS last
 
        // Check if at least one is in the active rallye
        $result = SQL_QUERY_ESC("SELECT userid AS uid, email, gender, surname, family, ".$USE." AS points, last_online AS last

-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE status='CONFIRMED' AND ".$USE." > 0".$LAST."
 ORDER BY points DESC, last_online DESC, userid",
         array($ONLINE), __FILE__, __LINE__);
 WHERE status='CONFIRMED' AND ".$USE." > 0".$LAST."
 ORDER BY points DESC, last_online DESC, userid",
         array($ONLINE), __FILE__, __LINE__);


@@ -119,25 +118,25 @@ ORDER BY points DESC, last_online DESC, userid",
                        define('__BONUS_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_bonus_form", true));
                } else {
                        // Display message "no manual withdraw possible"
                        define('__BONUS_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_bonus_form", true));
                } else {
                        // Display message "no manual withdraw possible"

-                       define('__BONUS_WITHDRAW_FORM', "<div class=\"admin_failed\">".ADMIN_BONUS_ALREADY_WITHDRAW."</div>");
+                       define('__BONUS_WITHDRAW_FORM', "<div class=\"admin_failed\">{!ADMIN_BONUS_ALREADY_WITHDRAW!}</div>");

                }
 
                // Prepare constant for timemark
                if (EXT_IS_ACTIVE("autopurge")) {
                        define('__AUTOPURGE_TIMEOUT', MAKE_DATETIME(time() - getConfig('ap_inactive_since'), "2"));
                } else {
                }
 
                // Prepare constant for timemark
                if (EXT_IS_ACTIVE("autopurge")) {
                        define('__AUTOPURGE_TIMEOUT', MAKE_DATETIME(time() - getConfig('ap_inactive_since'), "2"));
                } else {

-                       define('__AUTOPURGE_TIMEOUT', sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "autopurge"));
+                       define('__AUTOPURGE_TIMEOUT', sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "autopurge"));

                }
 
                // Load final template
                LOAD_TEMPLATE("admin_list_bonus");
        } else {
                // No one has become an "activity bonus"...
                }
 
                // Load final template
                LOAD_TEMPLATE("admin_list_bonus");
        } else {
                // No one has become an "activity bonus"...

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_NO_ACTIVE_RALLYE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_NO_ACTIVE_RALLYE'));

        }
 } else {
        // Aktive-Rallye not activated
        }
 } else {
        // Aktive-Rallye not activated

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_RALLYE_DEACTIVATED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_RALLYE_DEACTIVATED'));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php
index 6575e661635e68506c98c1d335ea7e5bb927d43a..3307e2762f78c19c6efb17c795f81d01d1cbf544 100644 (file)
--- a/inc/modules/admin/what-list_cats.php
+++ b/inc/modules/admin/what-list_cats.php
@@ -43,7 +43,7 @@ ADD_DESCR("admin", __FILE__);
 
 if (!empty($_GET['u_id'])) {
        // Check if the user already exists
 
 if (!empty($_GET['u_id'])) {
        // Check if the user already exists

-       $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Loads surname, family's name and the email address
         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Loads surname, family's name and the email address


@@ -51,20 +51,20 @@ if (!empty($_GET['u_id'])) {
                SQL_FREERESULT($result);
 
                // Prepare constants
                SQL_FREERESULT($result);
 
                // Prepare constants

-               define('__CATS_BASE'   , "<a href=\"".URL."/modules.php?module=admin&amp;u_id=");
+               define('__CATS_BASE'   , "<a href=\"{!URL!}/modules.php?module=admin&amp;u_id=");

                define('__UID'         , bigintval($_GET['u_id']));
                define('__MEMBER_LINKS', MEMBER_ACTION_LINKS(__UID));
                define('__EMAIL'       , "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</a>");
 
                // Ok, list categories of this user
                define('__UID'         , bigintval($_GET['u_id']));
                define('__MEMBER_LINKS', MEMBER_ACTION_LINKS(__UID));
                define('__EMAIL'       , "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</a>");
 
                // Ok, list categories of this user

-               $result_cats = SQL_QUERY("SELECT id, cat FROM `{!MYSQL_PREFIX!}_cats` ORDER BY sort", __FILE__, __LINE__);
+               $result_cats = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats` ORDER BY `sort`", __FILE__, __LINE__);

 
                if (SQL_NUMROWS($result_cats) > 0) {
                        // List categories
                        $cnt = "1"; $SW = 2; $OUT = "";
                        while (list($cid, $cat) = SQL_FETCHROW($result_cats)) {
                                // Check user's selection
 
                if (SQL_NUMROWS($result_cats) > 0) {
                        // List categories
                        $cnt = "1"; $SW = 2; $OUT = "";
                        while (list($cid, $cat) = SQL_FETCHROW($result_cats)) {
                                // Check user's selection

-                               $result_user = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1",
+                               $result_user = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1",

                                 array(bigintval($_GET['u_id']), bigintval($cid)), __FILE__, __LINE__);
 
                                // Set selection
                                 array(bigintval($_GET['u_id']), bigintval($cid)), __FILE__, __LINE__);
 
                                // Set selection

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index fc8fe7fbdb5c439b003f9a9c9f4d389dff8e9462..8dbb524de22c70ff8740c51d520a88cfc5d0b25d 100644 (file)
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -43,11 +43,11 @@ ADD_DESCR("admin", __FILE__);
 // Add new code?
 if ((isset($_POST['add'])) && (!empty($_POST['code'])) && (!empty($_POST['descr']))) {
        // Check if country code does already exist
 // Add new code?
 if ((isset($_POST['add'])) && (!empty($_POST['code'])) && (!empty($_POST['descr']))) {
        // Check if country code does already exist

-       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_countries` WHERE code='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_countries` WHERE code='%s' LIMIT 1",

         array(strtoupper($_POST['code'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Save entry
         array(strtoupper($_POST['code'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Save entry

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_countries` (code, descr, is_active) VALUES ('%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_countries` (code, descr, is_active) VALUES ('%s','%s','%s')",

  array(strtoupper(substr($_POST['code'], 0, 2)), $_POST['descr'], $_POST['is_active']), __FILE__, __LINE__);
 
                // Country added
  array(strtoupper(substr($_POST['code'], 0, 2)), $_POST['descr'], $_POST['is_active']), __FILE__, __LINE__);
 
                // Country added


@@ -90,7 +90,7 @@ if ((isset($_POST['add'])) && (!empty($_POST['code'])) && (!empty($_POST['descr'
                $OUT = ""; $SW = 2;
                foreach ($_POST['id'] as $id => $status) {
                        // Load data from DB
                $OUT = ""; $SW = 2;
                foreach ($_POST['id'] as $id => $status) {
                        // Load data from DB

-                       $result = SQL_QUERY_ESC("SELECT code, descr FROM `{!MYSQL_PREFIX!}_countries` WHERE id=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT code, descr FROM `{!_MYSQL_PREFIX!}_countries` WHERE id=%s LIMIT 1",

                                array(bigintval($id)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Load data
                                array(bigintval($id)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Load data


@@ -134,7 +134,7 @@ if ((isset($_POST['add'])) && (!empty($_POST['code'])) && (!empty($_POST['descr'
        if ((isset($_POST['modify'])) && (!empty($_POST['id']))) {
                // Modify
                foreach ($_POST['id'] as $id => $sel) {
        if ((isset($_POST['modify'])) && (!empty($_POST['id']))) {
                // Modify
                foreach ($_POST['id'] as $id => $sel) {

-                       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_countries` SET code='".$_POST['code'][$id]."', descr='".$_POST['descr'][$id]."', is_active='".$_POST['is_active'][$id]."' WHERE id='".$id."' LIMIT 1";
+                       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_countries` SET code='".$_POST['code'][$id]."', descr='".$_POST['descr'][$id]."', is_active='".$_POST['is_active'][$id]."' WHERE id='".$id."' LIMIT 1";

                }
 
                // Create message
                }
 
                // Create message


@@ -142,7 +142,7 @@ if ((isset($_POST['add'])) && (!empty($_POST['code'])) && (!empty($_POST['descr'
        } elseif ((isset($_POST['remove'])) && (!empty($_POST['id']))) {
                // Remove
                $IDs = implode(",", array_keys($_POST['id']));
        } elseif ((isset($_POST['remove'])) && (!empty($_POST['id']))) {
                // Remove
                $IDs = implode(",", array_keys($_POST['id']));

-               $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_countries` WHERE id IN (".$IDs.") LIMIT ".count($_POST['id'])."";
+               $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_countries` WHERE id IN (".$IDs.") LIMIT ".count($_POST['id'])."";

 
                // Create message
                $MSG = ADMIN_COUNTRIES_REMOVED;
 
                // Create message
                $MSG = ADMIN_COUNTRIES_REMOVED;


@@ -160,11 +160,11 @@ if ((isset($_POST['add'])) && (!empty($_POST['code'])) && (!empty($_POST['descr'
        }
 
        // Load currenty setup country codes to list
        }
 
        // Load currenty setup country codes to list

-       $result = SQL_QUERY("SELECT id, code, descr, is_active FROM `{!MYSQL_PREFIX!}_countries` ORDER BY code", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, code, descr, is_active FROM `{!_MYSQL_PREFIX!}_countries` ORDER BY code", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) > 0) {
                // List all countries
                $OUT = ""; $SW = 2;
        if (SQL_NUMROWS($result) > 0) {
                // List all countries
                $OUT = ""; $SW = 2;

-               while(list($id, $code, $descr, $active) = SQL_FETCHROW($result)) {
+               while (list($id, $code, $descr, $active) = SQL_FETCHROW($result)) {

                        // Prepare array for the template
                        $content = array(
                                'id'     => $id,
                        // Prepare array for the template
                        $content = array(
                                'id'     => $id,

diff --git a/inc/modules/admin/what-list_doubler.php b/inc/modules/admin/what-list_doubler.php
index 867a408900926205f540df789a8c4011ffe8e0b2..2ad42035d9d96e45cbb06d1b9c77f5addad1092d 100644 (file)
--- a/inc/modules/admin/what-list_doubler.php
+++ b/inc/modules/admin/what-list_doubler.php
@@ -46,7 +46,7 @@ if (empty($_GET['mode'])) {
 } else {
        // Set table title automatically
        if (empty($_GET['select'])) $_GET['select'] = "all";
 } else {
        // Set table title automatically
        if (empty($_GET['select'])) $_GET['select'] = "all";

-       $eval = "define('__ADMIN_DOUBLER_LIST_".strtoupper($_GET['mode'])."', ADMIN_DOUBLER_LIST_".strtoupper($_GET['mode'])."_".strtoupper($_GET['select']).");";
+       $eval = "define('__ADMIN_DOUBLER_LIST_".strtoupper($_GET['mode'])."', getMessage('ADMIN_DOUBLER_LIST_".strtoupper($_GET['mode'])."_".strtoupper($_GET['select'])."'));";

        eval($eval);
 }
 
        eval($eval);
 }
 


@@ -59,7 +59,7 @@ case "already":  // Already payed out points
 case "overview": // General overview page
        $SUM_ALREADY = 0; $SUM_WAITING = 0;
        // Number of direct already payouts and referal
 case "overview": // General overview page
        $SUM_ALREADY = 0; $SUM_WAITING = 0;
        // Number of direct already payouts and referal

-       $result = SQL_QUERY("SELECT COUNT(id) FROM `{!MYSQL_PREFIX!}_doubler` WHERE completed='Y' AND is_ref='N'", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_doubler` WHERE completed='Y' AND is_ref='N'", __FILE__, __LINE__);

        list($cnt) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
        list($cnt) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 


@@ -72,9 +72,9 @@ case "overview": // General overview page
        {
                // Something was payed out
                $SUM_ALREADY += $cnt;
        {
                // Something was payed out
                $SUM_ALREADY += $cnt;

-               define('__DOUBLER_ALREADY_DIRECT_LINK', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=direct\">".$cnt."</a>");
+               define('__DOUBLER_ALREADY_DIRECT_LINK', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=direct\">".$cnt."</a>");

        }
        }

-       $result = SQL_QUERY("SELECT COUNT(id) FROM `{!MYSQL_PREFIX!}_doubler` WHERE completed='Y' AND is_ref='Y'", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_doubler` WHERE completed='Y' AND is_ref='Y'", __FILE__, __LINE__);

        list($cnt) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
        list($cnt) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 


@@ -87,12 +87,12 @@ case "overview": // General overview page
        {
                // Something was payed out
                $SUM_ALREADY += $cnt;
        {
                // Something was payed out
                $SUM_ALREADY += $cnt;

-               define('__DOUBLER_ALREADY_REF_LINK', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=ref\">".$cnt."</a>");
+               define('__DOUBLER_ALREADY_REF_LINK', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=ref\">".$cnt."</a>");

        }
        }

-       define('__DOUBLER_ALREADY_ALL_LINK', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=all\">".$SUM_ALREADY."</a>");
+       define('__DOUBLER_ALREADY_ALL_LINK', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_doubler&amp;mode=already&amp;select=all\">".$SUM_ALREADY."</a>");

 
        // And the same for waiting pouts (direct and referal)
 
        // And the same for waiting pouts (direct and referal)

-       $result = SQL_QUERY("SELECT COUNT(id) FROM `{!MYSQL_PREFIX!}_doubler` WHERE completed='N' AND is_ref='N'", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_doubler` WHERE completed='N' AND is_ref='N'", __FILE__, __LINE__);

        list($cnt) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
        list($cnt) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 


@@ -105,9 +105,9 @@ case "overview": // General overview page
        {
                // Something was payed out
                $SUM_WAITING += $cnt;
        {
                // Something was payed out
                $SUM_WAITING += $cnt;

-               define('__DOUBLER_WAITING_DIRECT_LINK', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=direct\">".$cnt."</a>");
+               define('__DOUBLER_WAITING_DIRECT_LINK', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=direct\">".$cnt."</a>");

        }
        }

-       $result = SQL_QUERY("SELECT COUNT(id) FROM `{!MYSQL_PREFIX!}_doubler` WHERE completed='N' AND is_ref='Y'", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_doubler` WHERE completed='N' AND is_ref='Y'", __FILE__, __LINE__);

        list($cnt) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
        list($cnt) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 


@@ -120,9 +120,9 @@ case "overview": // General overview page
        {
                // Something was payed out
                $SUM_WAITING += $cnt;
        {
                // Something was payed out
                $SUM_WAITING += $cnt;

-               define('__DOUBLER_WAITING_REF_LINK', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=ref\">".$cnt."</a>");
+               define('__DOUBLER_WAITING_REF_LINK', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=ref\">".$cnt."</a>");

        }
        }

-       define('__DOUBLER_WAITING_ALL_LINK', "<a href=\"".URL."/modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=all\">".$SUM_WAITING."</a>");
+       define('__DOUBLER_WAITING_ALL_LINK', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_doubler&amp;mode=waiting&amp;select=all\">".$SUM_WAITING."</a>");

 
        // All data is loaded here...
        break;
 
        // All data is loaded here...
        break;

diff --git a/inc/modules/admin/what-list_holiday.php b/inc/modules/admin/what-list_holiday.php
index 26907e3aea9d926b1040258af0b56c5593d39079..4db1e7553ffcba80d4bed4c31deb4a854a0e78b9 100644 (file)
--- a/inc/modules/admin/what-list_holiday.php
+++ b/inc/modules/admin/what-list_holiday.php
@@ -42,8 +42,8 @@ ADD_DESCR("admin", __FILE__);
 
 // Start listing holiday requests
 $result = SQL_QUERY("SELECT h.id, h.userid, h.holiday_start, h.holiday_end, h.comments, d.status, d.last_online
 
 // Start listing holiday requests
 $result = SQL_QUERY("SELECT h.id, h.userid, h.holiday_start, h.holiday_end, h.comments, d.status, d.last_online

-FROM `{!MYSQL_PREFIX!}_user_holidays` AS h
-LEFT JOIN `{!MYSQL_PREFIX!}_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_user_holidays` AS h
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d

 ON h.userid=d.userid
 ORDER BY h.userid", __FILE__, __LINE__);
 
 ON h.userid=d.userid
 ORDER BY h.userid", __FILE__, __LINE__);
 

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 8f9831e34dfd8abf96fd981b1b7f237e48c941d5..e082040a1374417d2b72d5b11bdf304e647e362e 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -47,7 +47,7 @@ if (empty($_GET['del'])) $_GET['del'] = "";
 
 if (!empty($_GET['u_id'])) {
        // Check if the user already exists
 
 if (!empty($_GET['u_id'])) {
        // Check if the user already exists

-       $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 
         // Is there an entry?
         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 
         // Is there an entry?


@@ -59,11 +59,11 @@ if (!empty($_GET['u_id'])) {
                // Grab user's all unconfirmed mails
                if (EXT_IS_ACTIVE("bonus")) {
                        // Load bonus ID
                // Grab user's all unconfirmed mails
                if (EXT_IS_ACTIVE("bonus")) {
                        // Load bonus ID

-                       $result = SQL_QUERY_ESC("SELECT stats_id, bonus_id, link_type FROM `{!MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY id",
+                       $result = SQL_QUERY_ESC("SELECT stats_id, bonus_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY `id`",

                         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                } else {
                        // Load stats ID (2nd will be ignored later! But it is needed for the same fetchrow command)
                         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                } else {
                        // Load stats ID (2nd will be ignored later! But it is needed for the same fetchrow command)

-                       $result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM `{!MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY id",
+                       $result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY `id`",

                         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                }
 
                         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                }
 


@@ -74,15 +74,15 @@ if (!empty($_GET['u_id'])) {
                        // Some unconfirmed mails left
                        if ($_GET['del'] == "all") {
                                // Delete all unconfirmed mails by this user
                        // Some unconfirmed mails left
                        if ($_GET['del'] == "all") {
                                // Delete all unconfirmed mails by this user

-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_links` WHERE userid=%s LIMIT %s",
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s LIMIT %s",

                                        array(bigintval($_GET['u_id']), $nums), __FILE__, __LINE__);
 
                                // Prepare mail and send it away
                                $msg = LOAD_EMAIL_TEMPLATE("admin-del_links", $nums, bigintval($_GET['u_id']));
                                        array(bigintval($_GET['u_id']), $nums), __FILE__, __LINE__);
 
                                // Prepare mail and send it away
                                $msg = LOAD_EMAIL_TEMPLATE("admin-del_links", $nums, bigintval($_GET['u_id']));

-                               SEND_EMAIL($email, ADMIN_DEL_LINK_SUBJ, $msg);
+                               SEND_EMAIL($email, getMessage('ADMIN_DEL_LINK_SUBJ'), $msg);

 
                                // Display message
 
                                // Display message

-                               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_LINKS_DELETED);
+                               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_LINKS_DELETED'));

                        } else {
                                // List all unconfirmed mails
                                $SW = 2; $OUT = "";
                        } else {
                                // List all unconfirmed mails
                                $SW = 2; $OUT = "";


@@ -97,17 +97,17 @@ if (!empty($_GET['u_id'])) {
                                        switch ($type)
                                        {
                                        case "NORMAL":
                                        switch ($type)
                                        {
                                        case "NORMAL":

-                                               $result_data = SQL_QUERY_ESC("SELECT subject, timestamp_ordered, cat_id FROM `{!MYSQL_PREFIX!}_user_stats` WHERE id=%s LIMIT 1",
+                                               $result_data = SQL_QUERY_ESC("SELECT subject, timestamp_ordered, cat_id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE id=%s LIMIT 1",

                                                        array(bigintval($id)), __FILE__, __LINE__);
                                                $type = "mailid"; $DATA = $id; $PROBLEM = NORMAL_MAIL_PROBLEM;
                                                        array(bigintval($id)), __FILE__, __LINE__);
                                                $type = "mailid"; $DATA = $id; $PROBLEM = NORMAL_MAIL_PROBLEM;

-                                               $LINK = "<a href=\"".URL."/mailid.php?uid=".$_GET['u_id']."&amp;mailid=".$id."\" target=\"_blank\">".$id."</a>";
+                                               $LINK = "<a href=\"{!URL!}/mailid.php?uid=".$_GET['u_id']."&amp;mailid=".$id."\" target=\"_blank\">".$id."</a>";

                                                break;
 
                                        case "BONUS":
                                                break;
 
                                        case "BONUS":

-                                               $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id FROM `{!MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
+                                               $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",

                                                        array(bigintval($id2)), __FILE__, __LINE__);
                                                $type = "bonusid"; $DATA = $id2; $PROBLEM = BONUS_MAIL_PROBLEM;
                                                        array(bigintval($id2)), __FILE__, __LINE__);
                                                $type = "bonusid"; $DATA = $id2; $PROBLEM = BONUS_MAIL_PROBLEM;

-                                               $LINK = "<a href=\"".URL."/mailid.php?uid=".$_GET['u_id']."&amp;bonusid=".$id2."\" target=\"_blank\">".$id2."</a>";
+                                               $LINK = "<a href=\"{!URL!}/mailid.php?uid=".$_GET['u_id']."&amp;bonusid=".$id2."\" target=\"_blank\">".$id2."</a>";

                                                break;
 
                                        default: // Problem in application detected!
                                                break;
 
                                        default: // Problem in application detected!


@@ -120,7 +120,7 @@ if (!empty($_GET['u_id'])) {
                                                // Mail was found!
                                                list($subject, $timestamp, $cat) = SQL_FETCHROW($result_data);
                                                SQL_FREERESULT($result_data);
                                                // Mail was found!
                                                list($subject, $timestamp, $cat) = SQL_FETCHROW($result_data);
                                                SQL_FREERESULT($result_data);

-                                               if (empty($subject)) $subject = DEFAULT_SUBJECT_LINE;
+                                               if (empty($subject)) $subject = getMessage('DEFAULT_SUBJECT_LINE');

 
                                                // Prepare data for the row template
                                                $content = array(
 
                                                // Prepare data for the row template
                                                $content = array(

diff --git a/inc/modules/admin/what-list_newsletter.php b/inc/modules/admin/what-list_newsletter.php
index f073a6d4a58ea51b4f7bd3bc08aca3613f50f4b5..201c52a67e4eb0025c1ce306a94865825fc6d744 100644 (file)
--- a/inc/modules/admin/what-list_newsletter.php
+++ b/inc/modules/admin/what-list_newsletter.php
@@ -43,7 +43,7 @@ ADD_DESCR("admin", __FILE__);
 if ((!empty($_POST['uid'])) && (!empty($_POST['id']))) {
        // Update database...
        // First user's account
 if ((!empty($_POST['uid'])) && (!empty($_POST['id']))) {
        // Update database...
        // First user's account

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET nl_until=(UNIX_TIMESTAMP() + nl_timespan), nl_receive='N', nl_timespan=0 WHERE userid=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET nl_until=(UNIX_TIMESTAMP() + nl_timespan), nl_receive='N', nl_timespan=0 WHERE userid=%s LIMIT 1",

                array(bigintval($_POST['uid'])), __FILE__, __LINE__);
 
        // Next the task system...
                array(bigintval($_POST['uid'])), __FILE__, __LINE__);
 
        // Next the task system...


@@ -54,10 +54,10 @@ if ((!empty($_POST['uid'])) && (!empty($_POST['id']))) {
        SEND_EMAIL(bigintval($_POST['uid']), NL_MEMBER_DONE_SUBJECT, $msg);
 
        // Output message to admin
        SEND_EMAIL(bigintval($_POST['uid']), NL_MEMBER_DONE_SUBJECT, $msg);
 
        // Output message to admin

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NL_MEMBER_DONE);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NL_MEMBER_DONE'));

 } else {
        // @TODO Currently under construction!
 } else {
        // @TODO Currently under construction!

-       LOAD_TEMPLATE("admin_settings_saved", false, UNDER_CONSTRUCTION);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('UNDER_CONSTRUCTION'));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php
index f049c28509aa5065a455a0b6fbe9af9d661808c5..253a8d647c6c7dae5fa7df9fc5f2306c34a63ea1 100644 (file)
--- a/inc/modules/admin/what-list_notifications.php
+++ b/inc/modules/admin/what-list_notifications.php
@@ -52,7 +52,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) {
        // Bonus mails sent by you
        //               0     1       2        3        4      5       6          7       8      9         10          11        12
        $SQL2 = "SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, clicks
        // Bonus mails sent by you
        //               0     1       2        3        4      5       6          7       8      9         10          11        12
        $SQL2 = "SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, clicks

-FROM `{!MYSQL_PREFIX!}_bonus`
+FROM `{!_MYSQL_PREFIX!}_bonus`

 WHERE is_notify='Y'
 ORDER BY timestamp DESC";
 
 WHERE is_notify='Y'
 ORDER BY timestamp DESC";
 


@@ -86,7 +86,7 @@ if ((EXT_IS_ACTIVE("bonus")) && (SQL_NUMROWS($result_max) > 0) && (!empty($SQL2)
                        // Add link?
                        if ($bonus['unconfirmed'] > 0) {
                                // Add link to list_unconfirmed what-file
                        // Add link?
                        if ($bonus['unconfirmed'] > 0) {
                                // Add link to list_unconfirmed what-file

-                               $bonus['unconfirmed'] = "<strong><a href=\"".URL."/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</a></strong>";
+                               $bonus['unconfirmed'] = "<strong><a href=\"{!URL!}/modules.php?module=admin&amp;what=list_unconfirmed&amp;bid=".$bonus['id']."\">".$bonus['unconfirmed']."</a></strong>";

                        } // END - if
 
                        // Prepare content
                        } // END - if
 
                        // Prepare content

diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index 40a7ec0f3cbb84f0434c069c42ab340c675b7a3a..c8a623047f5b0333b82a9718d830b0df0c1c46bf 100644 (file)
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 if (!empty($_GET['pid'])) {
        // First let's get the member's ID
 
 if (!empty($_GET['pid'])) {
        // First let's get the member's ID

-       $result = SQL_QUERY_ESC("SELECT userid, target_account, payout_total, payout_timestamp, password FROM `{!MYSQL_PREFIX!}_user_payouts` WHERE id=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT userid, target_account, payout_total, payout_timestamp, password FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE id=%s LIMIT 1",

                array($_GET['pid']), __FILE__, __LINE__);
        list($uid, $tuid, $points, $tstamp, $tpass) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
                array($_GET['pid']), __FILE__, __LINE__);
        list($uid, $tuid, $points, $tstamp, $tpass) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);


@@ -50,7 +50,7 @@ if (!empty($_GET['pid'])) {
        // Obtain some data
        if (empty($_GET['task']) && (!empty($uid)) && ($uid > 0)) {
                // Get task ID from database
        // Obtain some data
        if (empty($_GET['task']) && (!empty($uid)) && ($uid > 0)) {
                // Get task ID from database

-               $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_task_system` WHERE userid=%s AND task_type='PAYOUT_REQUEST' AND task_created='".$tstamp."' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_task_system` WHERE userid=%s AND task_type='PAYOUT_REQUEST' AND task_created='".$tstamp."' LIMIT 1",

                        array(bigintval($uid)), __FILE__, __LINE__);
                list($task) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                        array(bigintval($uid)), __FILE__, __LINE__);
                list($task) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);


@@ -65,7 +65,7 @@ if (!empty($_GET['pid'])) {
 
        if ((!empty($task)) && (!empty($uid)) && ($uid > 0)) {
                // Load user's data
 
        if ((!empty($task)) && (!empty($uid)) && ($uid > 0)) {
                // Load user's data

-               $result = SQL_QUERY_ESC("SELECT email, gender, surname, family FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT email, gender, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                        array(bigintval($uid)), __FILE__, __LINE__);
                list($email, $gender, $surname, $family) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                        array(bigintval($uid)), __FILE__, __LINE__);
                list($email, $gender, $surname, $family) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);


@@ -77,14 +77,14 @@ if (!empty($_GET['pid'])) {
                        // Ok, now we can output the form or execute accepting
                        if (isset($_POST['ok'])) {
                                // Obtain payout type and other data
                        // Ok, now we can output the form or execute accepting
                        if (isset($_POST['ok'])) {
                                // Obtain payout type and other data

-                               $result = SQL_QUERY_ESC("SELECT payout_id FROM `{!MYSQL_PREFIX!}_user_payouts` WHERE id=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT payout_id FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE id=%s LIMIT 1",

                                 array(bigintval($_GET['pid'])), __FILE__, __LINE__);
                                list($ptype) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);
 
                                if (!empty($ptype)) {
                                        // Obtain data from payout type
                                 array(bigintval($_GET['pid'])), __FILE__, __LINE__);
                                list($ptype) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);
 
                                if (!empty($ptype)) {
                                        // Obtain data from payout type

-                                       $result = SQL_QUERY_ESC("SELECT from_account, from_pass, engine_url, engine_ret_ok, engine_ret_failed, pass_enc, allow_url FROM `{!MYSQL_PREFIX!}_payout_types` WHERE id=%s LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT from_account, from_pass, engine_url, engine_ret_ok, engine_ret_failed, pass_enc, allow_url FROM `{!_MYSQL_PREFIX!}_payout_types` WHERE id=%s LIMIT 1",

                                         array(bigintval($ptype)), __FILE__, __LINE__);
                                        list($fuid, $fpass, $eurl, $eok, $failed, $eenc, $allow) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
                                         array(bigintval($ptype)), __FILE__, __LINE__);
                                        list($fuid, $fpass, $eurl, $eok, $failed, $eenc, $allow) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);


@@ -126,7 +126,7 @@ if (!empty($_GET['pid'])) {
                                                }
 
                                                // Clear payout request
                                                }
 
                                                // Clear payout request

-                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_payouts` SET status='ACCEPTED' WHERE id=%s LIMIT 1",
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_payouts` SET status='ACCEPTED' WHERE id=%s LIMIT 1",

                                                        array(bigintval($_GET['pid'])), __FILE__, __LINE__);
 
                                                // Send out mail
                                                        array(bigintval($_GET['pid'])), __FILE__, __LINE__);
 
                                                // Send out mail


@@ -165,7 +165,7 @@ if (!empty($_GET['pid'])) {
                                }
 
                                // Clear payout request
                                }
 
                                // Clear payout request

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_payouts` SET status='REJECTED' WHERE id=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_payouts` SET status='REJECTED' WHERE id=%s LIMIT 1",

                                 array(bigintval($_GET['pid'])), __FILE__, __LINE__);
 
                                // Send out mail
                                 array(bigintval($_GET['pid'])), __FILE__, __LINE__);
 
                                // Send out mail


@@ -192,12 +192,12 @@ if (!empty($_GET['pid'])) {
        if (empty($_GET['do'])) $_GET['do'] = "";
        if ($_GET['do'] == "delete") {
                // Delete all requests
        if (empty($_GET['do'])) $_GET['do'] = "";
        if ($_GET['do'] == "delete") {
                // Delete all requests

-               $result = SQL_QUERY("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_payouts`", __FILE__, __LINE__);
+               $result = SQL_QUERY("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_payouts`", __FILE__, __LINE__);

        }
 
        // Search for payouts
        $result = SQL_QUERY("SELECT p.id, p.userid AS uid, p.payout_total, p.target_account, p.target_bank, t.type, p.payout_timestamp, p.status, t.allow_url AS allow, p.target_url AS url, p.link_text AS alt, p.banner_url AS banner
        }
 
        // Search for payouts
        $result = SQL_QUERY("SELECT p.id, p.userid AS uid, p.payout_total, p.target_account, p.target_bank, t.type, p.payout_timestamp, p.status, t.allow_url AS allow, p.target_url AS url, p.link_text AS alt, p.banner_url AS banner

-FROM `{!MYSQL_PREFIX!}_user_payouts` AS p, `{!MYSQL_PREFIX!}_payout_types` AS t
+FROM `{!_MYSQL_PREFIX!}_user_payouts` AS p, `{!_MYSQL_PREFIX!}_payout_types` AS t

 WHERE p.payout_id=t.id
 ORDER BY p.payout_timestamp DESC", __FILE__, __LINE__);
 
 WHERE p.payout_id=t.id
 ORDER BY p.payout_timestamp DESC", __FILE__, __LINE__);
 


@@ -207,7 +207,7 @@ ORDER BY p.payout_timestamp DESC", __FILE__, __LINE__);
                while (list($pid, $uid, $total, $account, $bank, $type, $tstamp, $status, $allow, $url, $alt, $banner) = SQL_FETCHROW($result)) {
                        if ($status == "NEW") {
                                // Generate links for direct accepting and rejecting
                while (list($pid, $uid, $total, $account, $bank, $type, $tstamp, $status, $allow, $url, $alt, $banner) = SQL_FETCHROW($result)) {
                        if ($status == "NEW") {
                                // Generate links for direct accepting and rejecting

-                               $status = "<a href=\"".URL."/modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=".$pid."\">".PAYOUT_ACCEPT_PAYOUT."</a>&nbsp;|&nbsp;<a href=\"".URL."/modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=".$pid."\">".PAYOUT_REJECT_PAYOUT."</a>";
+                               $status = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_payouts&amp;do=accept&amp;pid=".$pid."\">".PAYOUT_ACCEPT_PAYOUT."</a>&nbsp;|&nbsp;<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_payouts&amp;do=reject&amp;pid=".$pid."\">".PAYOUT_REJECT_PAYOUT."</a>";

                        } else {
                                // Translate status
                                $status = constant('PAYOUT_STATUS_'.strtoupper($status).'');
                        } else {
                                // Translate status
                                $status = constant('PAYOUT_STATUS_'.strtoupper($status).'');

diff --git a/inc/modules/admin/what-list_primera.php b/inc/modules/admin/what-list_primera.php
index a416d9ca8926dea6f04caf41c07bc43208d96fab..93dd36b03ca5c46a1d3c302d59be46525210b8c0 100644 (file)
--- a/inc/modules/admin/what-list_primera.php
+++ b/inc/modules/admin/what-list_primera.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Check for entries
 ADD_DESCR("admin", __FILE__);
 
 // Check for entries

-$result = SQL_QUERY("SELECT id, userid, primera_account, primera_amount, primera_timestamp, primera_type, primera_api_message, primera_api_status FROM `{!MYSQL_PREFIX!}_user_primera` ORDER BY primera_timestamp DESC, id DESC",
+$result = SQL_QUERY("SELECT id, userid, primera_account, primera_amount, primera_timestamp, primera_type, primera_api_message, primera_api_status FROM `{!_MYSQL_PREFIX!}_user_primera` ORDER BY primera_timestamp DESC, id DESC",

        __FILE__, __LINE__);
 
 // Are there some entries to display?
        __FILE__, __LINE__);
 
 // Are there some entries to display?

diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 18be1d8cc0d04711072bad6c963dcbe24e7a89d2..44b4be1d7ad8f867f54c6196198a5446999b91ad 100644 (file)
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -53,11 +53,11 @@ if (isset($_GET['rallye']))
                switch ($_GET['activate'])
                {
                case "1": // Activate
                switch ($_GET['activate'])
                {
                case "1": // Activate

-                       $SQL = "UPDATE `{!MYSQL_PREFIX!}_rallye_data` SET is_active='Y' WHERE id=%s AND is_active='N' LIMIT 1";
+                       $SQL = "UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET is_active='Y' WHERE id=%s AND is_active='N' LIMIT 1";

                        break;
 
                case "0": // Deactivate
                        break;
 
                case "0": // Deactivate

-                       $SQL = "UPDATE `{!MYSQL_PREFIX!}_rallye_data` SET is_active='N' WHERE id=%s AND is_active='Y' LIMIT 1";
+                       $SQL = "UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET is_active='N' WHERE id=%s AND is_active='Y' LIMIT 1";

                        break;
                }
        }
                        break;
                }
        }


@@ -68,11 +68,11 @@ if (isset($_GET['rallye']))
                switch ($_GET['notify'])
                {
                case "1": // Activate
                switch ($_GET['notify'])
                {
                case "1": // Activate

-                       $SQL = "UPDATE `{!MYSQL_PREFIX!}_rallye_data` SET send_notify='Y' WHERE id=%s AND send_notify='N' LIMIT 1";
+                       $SQL = "UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET send_notify='Y' WHERE id=%s AND send_notify='N' LIMIT 1";

                        break;
 
                case "0": // Deactivate
                        break;
 
                case "0": // Deactivate

-                       $SQL = "UPDATE `{!MYSQL_PREFIX!}_rallye_data` SET send_notify='N' WHERE id=%s AND send_notify='Y' LIMIT 1";
+                       $SQL = "UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET send_notify='N' WHERE id=%s AND send_notify='Y' LIMIT 1";

                        break;
                }
        }
                        break;
                }
        }


@@ -83,11 +83,11 @@ if (isset($_GET['rallye']))
                switch ($_GET['auto'])
                {
                case "1": // Activate
                switch ($_GET['auto'])
                {
                case "1": // Activate

-                       $SQL = "UPDATE `{!MYSQL_PREFIX!}_rallye_data` SET auto_add_new_user='Y' WHERE id=%s AND auto_add_new_user='N' LIMIT 1";
+                       $SQL = "UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET auto_add_new_user='Y' WHERE id=%s AND auto_add_new_user='N' LIMIT 1";

                        break;
 
                case "0": // Deactivate
                        break;
 
                case "0": // Deactivate

-                       $SQL = "UPDATE `{!MYSQL_PREFIX!}_rallye_data` SET auto_add_new_user='N' WHERE id=%s AND auto_add_new_user='Y' LIMIT 1";
+                       $SQL = "UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET auto_add_new_user='N' WHERE id=%s AND auto_add_new_user='Y' LIMIT 1";

                        break;
                }
        }
                        break;
                }
        }


@@ -108,11 +108,11 @@ if (isset($_GET['rallye']))
                foreach ($_POST['sel'] as $id => $sel)
                {
                        // Remove selected rallye entirely...
                foreach ($_POST['sel'] as $id => $sel)
                {
                        // Remove selected rallye entirely...

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_rallye_data` WHERE id=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE id=%s LIMIT 1",

                                array(bigintval($id)), __FILE__, __LINE__);
                                array(bigintval($id)), __FILE__, __LINE__);

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s",

                                array(bigintval($id)), __FILE__, __LINE__);
                                array(bigintval($id)), __FILE__, __LINE__);

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s",

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


@@ -142,7 +142,7 @@ if (isset($_GET['rallye']))
                        $END   = mktime($_POST['end_hour'][$id]  , $_POST['end_min'][$id]  , $_POST['end_sec'][$id]  , $_POST['end_month'][$id]  , $_POST['end_day'][$id]  , $_POST['end_year'][$id]  );
 
                        // Update entry
                        $END   = mktime($_POST['end_hour'][$id]  , $_POST['end_min'][$id]  , $_POST['end_sec'][$id]  , $_POST['end_month'][$id]  , $_POST['end_day'][$id]  , $_POST['end_year'][$id]  );
 
                        // Update entry

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_rallye_data` SET
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET

 title='%s',
 descr='%s',
 template='%s',
 title='%s',
 descr='%s',
 template='%s',


@@ -171,7 +171,7 @@ if (isset($_POST['edit']))
                foreach ($_POST['sel'] as $id => $sel)
                {
                        // Load rallye basic data
                foreach ($_POST['sel'] as $id => $sel)
                {
                        // Load rallye basic data

-                       $result = SQL_QUERY_ESC("SELECT title, descr, template, start_time, end_time, min_users, min_prices FROM `{!MYSQL_PREFIX!}_rallye_data` WHERE id=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT title, descr, template, start_time, end_time, min_users, min_prices FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE id=%s LIMIT 1",

                         array(bigintval($id)), __FILE__, __LINE__);
                        list($title, $descr, $templ, $start, $end, $min_users, $min_prices) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                         array(bigintval($id)), __FILE__, __LINE__);
                        list($title, $descr, $templ, $start, $end, $min_users, $min_prices) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);


@@ -220,7 +220,7 @@ if (isset($_POST['edit']))
        }
 } elseif (($_GET['sub'] == "users") && ($_GET['rallye'] > 0)) {
        // List users and their refs before start and current
        }
 } elseif (($_GET['sub'] == "users") && ($_GET['rallye'] > 0)) {
        // List users and their refs before start and current

-       $result = SQL_QUERY_ESC("SELECT userid, refs, curr_points FROM `{!MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s ORDER BY userid",
+       $result = SQL_QUERY_ESC("SELECT userid, refs, curr_points FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s ORDER BY userid",

         array(bigintval($_GET['rallye'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0)
        {
         array(bigintval($_GET['rallye'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0)
        {


@@ -275,7 +275,7 @@ if (isset($_POST['edit']))
 {
        // Start listing rallyes
        $result = SQL_QUERY("SELECT id, admin_id, title, descr, template, start_time, end_time, auto_add_new_user, is_active, send_notify, notified, min_users, min_prices
 {
        // Start listing rallyes
        $result = SQL_QUERY("SELECT id, admin_id, title, descr, template, start_time, end_time, auto_add_new_user, is_active, send_notify, notified, min_users, min_prices

-FROM `{!MYSQL_PREFIX!}_rallye_data`
+FROM `{!_MYSQL_PREFIX!}_rallye_data`

 ORDER BY start_time DESC",
  __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0)
 ORDER BY start_time DESC",
  __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0)


@@ -288,11 +288,11 @@ ORDER BY start_time DESC",
                        $alogin = GET_ADMIN_LOGIN($aid);
 
                        // Count assigned prices
                        $alogin = GET_ADMIN_LOGIN($aid);
 
                        // Count assigned prices

-                       $result_prices = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s",
+                       $result_prices = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s",

                         array(bigintval($id)), __FILE__, __LINE__);
 
                        // Count joined userids
                         array(bigintval($id)), __FILE__, __LINE__);
 
                        // Count joined userids

-                       $result_user = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s",
+                       $result_user = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s",

                         array($id), __FILE__, __LINE__);
                        $joined = SQL_NUMROWS($result_user);
 
                         array($id), __FILE__, __LINE__);
                        $joined = SQL_NUMROWS($result_user);
 


@@ -300,7 +300,7 @@ ORDER BY start_time DESC",
                        if ($joined > 0)
                        {
                                // List joined users
                        if ($joined > 0)
                        {
                                // List joined users

-                               $joined = "<a href=\"".URL."/modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=".$id."\" title=\"".RALLYE_LIST_USERS."\">".$joined."</a>";
+                               $joined = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=".$id."\" title=\"".RALLYE_LIST_USERS."\">".$joined."</a>";

                        }
 
                        // Alter some variables
                        }
 
                        // Alter some variables

diff --git a/inc/modules/admin/what-list_refs.php b/inc/modules/admin/what-list_refs.php
index a1de804b17b5bb09875d460802d02a2195127529..02431f9d58f1dde3b2b3ac4029a1219029af97c5 100644 (file)
--- a/inc/modules/admin/what-list_refs.php
+++ b/inc/modules/admin/what-list_refs.php
@@ -51,7 +51,7 @@ if (!empty($_GET['u_id'])) {
        $uid = bigintval($_GET['u_id']);
 
        // Check if the user already exists
        $uid = bigintval($_GET['u_id']);
 
        // Check if the user already exists

-       $result_user = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result_user = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                array($uid), __FILE__, __LINE__);
 
        // User found?
                array($uid), __FILE__, __LINE__);
 
        // User found?


@@ -60,14 +60,14 @@ if (!empty($_GET['u_id'])) {
                if (EXT_IS_ACTIVE("refback")) {
                        // Load all referal levels
                        $result_levels = SQL_QUERY("SELECT level, percents
                if (EXT_IS_ACTIVE("refback")) {
                        // Load all referal levels
                        $result_levels = SQL_QUERY("SELECT level, percents

-FROM `{!MYSQL_PREFIX!}_refdepths`
+FROM `{!_MYSQL_PREFIX!}_refdepths`

 WHERE level > 0
 ORDER BY level ASC", __FILE__, __LINE__);
                } else {
                        // Loads surname, family's name and the email address
 WHERE level > 0
 ORDER BY level ASC", __FILE__, __LINE__);
                } else {
                        // Loads surname, family's name and the email address

-                       $result     = SQL_QUERY_ESC("SELECT COUNT(*) FROM `{!MYSQL_PREFIX!}_user_data` WHERE refid=%s",
+                       $result     = SQL_QUERY_ESC("SELECT COUNT(*) FROM `{!_MYSQL_PREFIX!}_user_data` WHERE refid=%s",

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

-                       $result_lck = SQL_QUERY_ESC("SELECT COUNT(*) FROM `{!MYSQL_PREFIX!}_user_data` WHERE refid=%s AND status != 'CONFIRMED' ORDER BY userid",
+                       $result_lck = SQL_QUERY_ESC("SELECT COUNT(*) FROM `{!_MYSQL_PREFIX!}_user_data` WHERE refid=%s AND status != 'CONFIRMED' ORDER BY userid",

                                array($uid), __FILE__, __LINE__);
                        $menge      = SQL_RESULT($result    , 0, 0);
                        $menge_lck  = SQL_RESULT($result_lck, 0, 0);
                                array($uid), __FILE__, __LINE__);
                        $menge      = SQL_RESULT($result    , 0, 0);
                        $menge_lck  = SQL_RESULT($result_lck, 0, 0);


@@ -77,7 +77,7 @@ ORDER BY level ASC", __FILE__, __LINE__);
                        SQL_FREERESULT($result_lck);
 
                        // Query for refs
                        SQL_FREERESULT($result_lck);
 
                        // Query for refs

-                       $result_levels = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email, status, joined FROM `{!MYSQL_PREFIX!}_user_data` WHERE refid=%s ORDER BY userid ASC",
+                       $result_levels = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email, status, joined FROM `{!_MYSQL_PREFIX!}_user_data` WHERE refid=%s ORDER BY userid ASC",

                                array($uid), __FILE__, __LINE__);
 
                        // Output info message
                                array($uid), __FILE__, __LINE__);
 
                        // Output info message


@@ -95,16 +95,16 @@ ORDER BY level ASC", __FILE__, __LINE__);
                                // Is the refback still active? ;-)
                                if (EXT_IS_ACTIVE("refback")) {
                                        // Load all refs of this user
                                // Is the refback still active? ;-)
                                if (EXT_IS_ACTIVE("refback")) {
                                        // Load all refs of this user

-                                       $result_refs = SQL_QUERY_ESC("SELECT refid FROM `{!MYSQL_PREFIX!}_user_refs` WHERE userid=%s AND level='%s' ORDER BY refid ASC",
+                                       $result_refs = SQL_QUERY_ESC("SELECT refid FROM `{!_MYSQL_PREFIX!}_user_refs` WHERE userid=%s AND level='%s' ORDER BY refid ASC",

                                                array($uid, $levels['level']), __FILE__, __LINE__);
                                        //* DEBUG: */ echo $uid."/".$levels['level']."/".SQL_NUMROWS($result_refs)."<br />\n";
 
                                        // Do we have levels?
                                        if (SQL_NUMROWS($result_refs) > 0) {
                                                // Loads surname, family's name and the email address
                                                array($uid, $levels['level']), __FILE__, __LINE__);
                                        //* DEBUG: */ echo $uid."/".$levels['level']."/".SQL_NUMROWS($result_refs)."<br />\n";
 
                                        // Do we have levels?
                                        if (SQL_NUMROWS($result_refs) > 0) {
                                                // Loads surname, family's name and the email address

-                                               $result     = SQL_QUERY_ESC("SELECT COUNT(*) FROM `{!MYSQL_PREFIX!}_user_data` WHERE refid=%s",
+                                               $result     = SQL_QUERY_ESC("SELECT COUNT(*) FROM `{!_MYSQL_PREFIX!}_user_data` WHERE refid=%s",

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

-                                               $result_lck = SQL_QUERY_ESC("SELECT COUNT(*) FROM `{!MYSQL_PREFIX!}_user_data` WHERE refid=%s AND status != 'CONFIRMED' ORDER BY userid",
+                                               $result_lck = SQL_QUERY_ESC("SELECT COUNT(*) FROM `{!_MYSQL_PREFIX!}_user_data` WHERE refid=%s AND status != 'CONFIRMED' ORDER BY userid",

                                                        array($uid), __FILE__, __LINE__);
                                                $menge      = SQL_RESULT($result    , 0, 0);
                                                $menge_lck  = SQL_RESULT($result_lck, 0, 0);
                                                        array($uid), __FILE__, __LINE__);
                                                $menge      = SQL_RESULT($result    , 0, 0);
                                                $menge_lck  = SQL_RESULT($result_lck, 0, 0);


@@ -120,7 +120,7 @@ ORDER BY level ASC", __FILE__, __LINE__);
                                                $OUT_REFS = ""; $SW = 2;
                                                while (list($refid) = SQL_FETCHROW($result_refs)) {
                                                        // Query for data
                                                $OUT_REFS = ""; $SW = 2;
                                                while (list($refid) = SQL_FETCHROW($result_refs)) {
                                                        // Query for data

-                                                       $result_user = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email, status, joined FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                                                       $result_user = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email, status, joined FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                                                                array($refid), __FILE__, __LINE__);
 
                                                        // Is the data there?
                                                                array($refid), __FILE__, __LINE__);
 
                                                        // Is the data there?


@@ -129,7 +129,7 @@ ORDER BY level ASC", __FILE__, __LINE__);
                                                                $data = SQL_FETCHARRAY($result_user);
 
                                                                // Check for referals
                                                                $data = SQL_FETCHARRAY($result_user);
 
                                                                // Check for referals

-                                                               $result_cnt = SQL_QUERY_ESC("SELECT COUNT(userid) FROM `{!MYSQL_PREFIX!}_user_data` WHERE refid=%s",
+                                                               $result_cnt = SQL_QUERY_ESC("SELECT COUNT(userid) FROM `{!_MYSQL_PREFIX!}_user_data` WHERE refid=%s",

                                                                        array($refid), __FILE__, __LINE__);
 
                                                                // Load refs
                                                                        array($refid), __FILE__, __LINE__);
 
                                                                // Load refs


@@ -185,7 +185,7 @@ ORDER BY level ASC", __FILE__, __LINE__);
                                        $OUT .= LOAD_TEMPLATE("admin_list_refs_level", true, $levels);
                                } else {
                                        // Check for referals
                                        $OUT .= LOAD_TEMPLATE("admin_list_refs_level", true, $levels);
                                } else {
                                        // Check for referals

-                                       $result_refs = SQL_QUERY_ESC("SELECT COUNT(userid) FROM `{!MYSQL_PREFIX!}_user_data` WHERE refid=%s",
+                                       $result_refs = SQL_QUERY_ESC("SELECT COUNT(userid) FROM `{!_MYSQL_PREFIX!}_user_data` WHERE refid=%s",

                                         array(bigintval($levels['userid'])), __FILE__, __LINE__);
                                        $refs_cnt = SQL_RESULT($result_refs, 0, 0);
                                        SQL_FREERESULT($result_refs);
                                         array(bigintval($levels['userid'])), __FILE__, __LINE__);
                                        $refs_cnt = SQL_RESULT($result_refs, 0, 0);
                                        SQL_FREERESULT($result_refs);


@@ -228,10 +228,10 @@ ORDER BY level ASC", __FILE__, __LINE__);
                        }
                } elseif (EXT_IS_ACTIVE("refback")) {
                        // No levels found, very bad!
                        }
                } elseif (EXT_IS_ACTIVE("refback")) {
                        // No levels found, very bad!

-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_REF_LEVELS);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_REF_LEVELS'));

                } else {
                        // No refs made so far
                } else {
                        // No refs made so far

-                       LOAD_TEMPLATE("admin_settings_saved", false, USER_REF_404);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('USER_REF_404'));

                }
 
                // Free result
                }
 
                // Free result

diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php
index 9d10f75b9a62b43fde8181759d0092c313fa16b5..55d8a954dbb22737c95ec1ed795ff14b163e78ca 100644 (file)
--- a/inc/modules/admin/what-list_sponsor.php
+++ b/inc/modules/admin/what-list_sponsor.php
@@ -43,7 +43,7 @@ ADD_DESCR("admin", __FILE__);
 if (!empty($_GET['id'])) {
        // Show detailed informations to a sponsor
        $result = SQL_QUERY_ESC("SELECT company, position, gender, surname, family, street_nr1, street_nr2, zip, city, country, phone, fax, cell, email, url, tax_ident, status, sponsor_created, last_online, last_change, receive_warnings, points_amount, points_used, remote_addr, warning_interval, refid, ref_count
 if (!empty($_GET['id'])) {
        // Show detailed informations to a sponsor
        $result = SQL_QUERY_ESC("SELECT company, position, gender, surname, family, street_nr1, street_nr2, zip, city, country, phone, fax, cell, email, url, tax_ident, status, sponsor_created, last_online, last_change, receive_warnings, points_amount, points_used, remote_addr, warning_interval, refid, ref_count

-FROM `{!MYSQL_PREFIX!}_sponsor_data`
+FROM `{!_MYSQL_PREFIX!}_sponsor_data`

 WHERE id='%s' LIMIT 1",
  array(bigintval($_GET['id'])), __FILE__, __LINE__);
 
 WHERE id='%s' LIMIT 1",
  array(bigintval($_GET['id'])), __FILE__, __LINE__);
 


@@ -58,7 +58,7 @@ WHERE id='%s' LIMIT 1",
                }
 
                // Check for sponsor's orders (only count)
                }
 
                // Check for sponsor's orders (only count)

-               $result_orders = SQL_QUERY_ESC("SELECT COUNT(id) FROM `{!MYSQL_PREFIX!}_sponsor_orders` WHERE sponsorid='%s'",
+               $result_orders = SQL_QUERY_ESC("SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_sponsor_orders` WHERE sponsorid='%s'",

                 array(bigintval($_GET['id'])), __FILE__, __LINE__);
                list($orders) = SQL_FETCHROW($result_orders);
                SQL_FREERESULT($result_orders);
                 array(bigintval($_GET['id'])), __FILE__, __LINE__);
                list($orders) = SQL_FETCHROW($result_orders);
                SQL_FREERESULT($result_orders);


@@ -113,7 +113,7 @@ WHERE id='%s' LIMIT 1",
        }
 } elseif (!empty($_GET['rid'])) {
        // Search for sponsor
        }
 } elseif (!empty($_GET['rid'])) {
        // Search for sponsor

-       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_sponsor_data` WHERE id='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE id='%s' LIMIT 1",

         array(bigintval($_GET['rid'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Free memory
         array(bigintval($_GET['rid'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Free memory


@@ -121,8 +121,8 @@ WHERE id='%s' LIMIT 1",
 
                // Sponsor found so let's list all his referals
                $result = SQL_QUERY_ESC("SELECT id, gender, surname, family, email, status, sponsor_created, last_online, points_amount, points_used, remote_addr, ref_count
 
                // Sponsor found so let's list all his referals
                $result = SQL_QUERY_ESC("SELECT id, gender, surname, family, email, status, sponsor_created, last_online, points_amount, points_used, remote_addr, ref_count

-FROM `{!MYSQL_PREFIX!}_sponsor_data`
-WHERE refid='%s' ORDER BY id",
+FROM `{!_MYSQL_PREFIX!}_sponsor_data`
+WHERE refid='%s' ORDER BY `id`",

  array(bigintval($_GET['rid'])), __FILE__, __LINE__);
 
                if (SQL_NUMROWS($result) > 0) {
  array(bigintval($_GET['rid'])), __FILE__, __LINE__);
 
                if (SQL_NUMROWS($result) > 0) {


@@ -131,7 +131,7 @@ WHERE refid='%s' ORDER BY id",
                        SQL_FREERESULT($result);
                } else {
                        // No refs made so far
                        SQL_FREERESULT($result);
                } else {
                        // No refs made so far

-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SPONSOR_REFS_404_1."<a href=\"".URL."/modules.php?module=admin&amp;what=list_sponsor&amp;id=".bigintval($_GET['rid'])."\">".bigintval($_GET['rid'])."</a>".ADMIN_SPONSOR_REFS_404_2);
+                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SPONSOR_REFS_404_1."<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_sponsor&amp;id=".bigintval($_GET['rid'])."\">".bigintval($_GET['rid'])."</a>".ADMIN_SPONSOR_REFS_404_2);

                }
        } else {
                // Sponsor not found
                }
        } else {
                // Sponsor not found


@@ -140,11 +140,11 @@ WHERE refid='%s' ORDER BY id",
 } else {
        // List all sponsors
        $result_main = SQL_QUERY("SELECT id, gender, surname, family, email, status, sponsor_created, last_online, points_amount, points_used, remote_addr
 } else {
        // List all sponsors
        $result_main = SQL_QUERY("SELECT id, gender, surname, family, email, status, sponsor_created, last_online, points_amount, points_used, remote_addr

-FROM `{!MYSQL_PREFIX!}_sponsor_data` ORDER BY id", __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_sponsor_data` ORDER BY `id`", __FILE__, __LINE__);

        if (SQL_NUMROWS($result_main) > 0) {
                // At least one sponsor found!
                $OUT = ""; $SW = 2;
        if (SQL_NUMROWS($result_main) > 0) {
                // At least one sponsor found!
                $OUT = ""; $SW = 2;

-               while(list($id, $gender, $sname, $fname, $email, $status, $created, $last, $amount, $used, $ip) = SQL_FETCHROW($result_main)) {
+               while (list($id, $gender, $sname, $fname, $email, $status, $created, $last, $amount, $used, $ip) = SQL_FETCHROW($result_main)) {

                        // Transfer data to array
                        $content = array(
                                'id'      => $id,
                        // Transfer data to array
                        $content = array(
                                'id'      => $id,


@@ -173,7 +173,7 @@ FROM `{!MYSQL_PREFIX!}_sponsor_data` ORDER BY id", __FILE__, __LINE__);
                LOAD_TEMPLATE("admin_list_sponsor");
        } else {
                // No sponsors registered so far
                LOAD_TEMPLATE("admin_list_sponsor");
        } else {
                // No sponsors registered so far

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SPONSOR_NONE_REGISTERED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SPONSOR_NONE_REGISTERED'));

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php
index a274160dea49e1226071baff364b778bb8369d6e..669457c5b264636873467e6abf2f209a30bdb797 100644 (file)
--- a/inc/modules/admin/what-list_sponsor_pay.php
+++ b/inc/modules/admin/what-list_sponsor_pay.php
@@ -64,7 +64,7 @@ if (isset($_POST['add'])) {
                        $id = bigintval($id);
 
                        // Save entry
                        $id = bigintval($id);
 
                        // Save entry

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_sponsor_paytypes`
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_paytypes`

 SET pay_name='%s', pay_rate='%s', pay_min_count='%s', pay_currency='%s' WHERE id='%s' LIMIT 1",
  array($_POST['name'][$id], $_POST['rate'][$id], bigintval($_POST['min'][$id]), $_POST['curr'][$id], $id),
  __FILE__, __LINE__);
 SET pay_name='%s', pay_rate='%s', pay_min_count='%s', pay_currency='%s' WHERE id='%s' LIMIT 1",
  array($_POST['name'][$id], $_POST['rate'][$id], bigintval($_POST['min'][$id]), $_POST['curr'][$id], $id),
  __FILE__, __LINE__);


@@ -76,7 +76,7 @@ SET pay_name='%s', pay_rate='%s', pay_min_count='%s', pay_currency='%s' WHERE id
                // Remove entries here...
                foreach ($_POST['id'] as $id => $sel) {
                        // Remove entry
                // Remove entries here...
                foreach ($_POST['id'] as $id => $sel) {
                        // Remove entry

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_sponsor_paytypes` WHERE id='%s' LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes` WHERE id='%s' LIMIT 1",

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


@@ -93,11 +93,11 @@ SET pay_name='%s', pay_rate='%s', pay_min_count='%s', pay_currency='%s' WHERE id
 
 if (isset($_POST['add'])) {
        // Check if entry with same name does exists
 
 if (isset($_POST['add'])) {
        // Check if entry with same name does exists

-       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_sponsor_paytypes` WHERE pay_name='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes` WHERE pay_name='%s' LIMIT 1",

         array($_POST['pay_name']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // No entry found so add this line
         array($_POST['pay_name']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // No entry found so add this line

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_sponsor_paytypes` (pay_name, pay_rate, pay_min_count, pay_currency)
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_sponsor_paytypes` (pay_name, pay_rate, pay_min_count, pay_currency)

  VALUES ('%s','%s','%s','%s')",
  array(htmlspecialchars($_POST['pay_name']), REVERT_COMMA($_POST['pay_rate']), bigintval($_POST['pay_min_count']), htmlspecialchars($_POST['pay_currency'])),
  __FILE__, __LINE__);
  VALUES ('%s','%s','%s','%s')",
  array(htmlspecialchars($_POST['pay_name']), REVERT_COMMA($_POST['pay_rate']), bigintval($_POST['pay_min_count']), htmlspecialchars($_POST['pay_currency'])),
  __FILE__, __LINE__);


@@ -120,7 +120,7 @@ if (isset($_POST['add'])) {
        $OUT = ""; $SW = 2;
        foreach ($_POST['id'] as $id => $sel) {
                // Load entry
        $OUT = ""; $SW = 2;
        foreach ($_POST['id'] as $id => $sel) {
                // Load entry

-               $result = SQL_QUERY_ESC("SELECT pay_name, pay_rate, pay_min_count, pay_currency FROM `{!MYSQL_PREFIX!}_sponsor_paytypes` WHERE id='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT pay_name, pay_rate, pay_min_count, pay_currency FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes` WHERE id='%s' LIMIT 1",

                 array(bigintval($id)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Load data
                 array(bigintval($id)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Load data


@@ -166,7 +166,7 @@ if (isset($_POST['add'])) {
        }
 } else {
        // Load all payment types
        }
 } else {
        // Load all payment types

-       $result = SQL_QUERY("SELECT id, pay_name, pay_rate, pay_min_count, pay_currency FROM `{!MYSQL_PREFIX!}_sponsor_paytypes` ORDER BY pay_name",
+       $result = SQL_QUERY("SELECT id, pay_name, pay_rate, pay_min_count, pay_currency FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes` ORDER BY pay_name",

         __FILE__, __LINE__);
 
        // Do we have some paytypes setup?
         __FILE__, __LINE__);
 
        // Do we have some paytypes setup?


@@ -175,7 +175,7 @@ if (isset($_POST['add'])) {
                $SW = 2; $OUT = "";
 
                // List alle found payment types
                $SW = 2; $OUT = "";
 
                // List alle found payment types

-               while(list($id, $name, $rate, $min, $currency) = SQL_FETCHROW($result)) {
+               while (list($id, $name, $rate, $min, $currency) = SQL_FETCHROW($result)) {

                        // Remember data in array
                        $content = array(
                                'sw'       => $SW,
                        // Remember data in array
                        $content = array(
                                'sw'       => $SW,

diff --git a/inc/modules/admin/what-list_sponsor_pays.php b/inc/modules/admin/what-list_sponsor_pays.php
index 56222cd12b23032b923c9209d13acd26b6b877eb..c5ff14875383e57f38ba62bb0880c8fe55d1a976 100644 (file)
--- a/inc/modules/admin/what-list_sponsor_pays.php
+++ b/inc/modules/admin/what-list_sponsor_pays.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 if (!empty($_GET['id'])) {
        // Check for selected sponsor
 
 if (!empty($_GET['id'])) {
        // Check for selected sponsor

-       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_sponsor_data` WHERE id='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE id='%s' LIMIT 1",

         array(bigintval($_GET['id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // ...
         array(bigintval($_GET['id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // ...


@@ -54,7 +54,7 @@ if (!empty($_GET['id'])) {
        }
 } else {
        // Not called by what-list_sponsor.php
        }
 } else {
        // Not called by what-list_sponsor.php

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_CALL_NOT_DIRECTLY);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_CALL_NOT_DIRECTLY'));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/what-list_surfbar_actions.php b/inc/modules/admin/what-list_surfbar_actions.php
index 95d4d87a3925164dc99448acf560fa05679be432..3790586d9ff0f3a762592fee148dddfa5feef453 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_actions.php
+++ b/inc/modules/admin/what-list_surfbar_actions.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 // Load all actions
 $result = SQL_QUERY("SELECT `id`, `status`, `action`, `new_status`
 
 // Load all actions
 $result = SQL_QUERY("SELECT `id`, `status`, `action`, `new_status`

-FROM `{!MYSQL_PREFIX!}_surfbar_actions`
+FROM `{!_MYSQL_PREFIX!}_surfbar_actions`

 ORDER BY `status` ASC, `action` ASC", __FILE__, __LINE__);
 
 // Entries found?
 ORDER BY `status` ASC, `action` ASC", __FILE__, __LINE__);
 
 // Entries found?


@@ -77,7 +77,7 @@ if (SQL_NUMROWS($result) > 0) {
        LOAD_TEMPLATE("admin_list_surfbar_actions", false, $OUT);
 } else {
        // No entries found, very bad!
        LOAD_TEMPLATE("admin_list_surfbar_actions", false, $OUT);
 } else {
        // No entries found, very bad!

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_NO_ACTIONS);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_NO_ACTIONS'));

 }
 
 // Free result
 }
 
 // Free result

diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php
index 73058d30cb8cb35c6adb5f80edcac6ddcb41f784..aabef21732e367c6f4b07136340aa6ef129ef9e0 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -46,7 +46,7 @@ $show = true;
 // Check for 'id' element
 if ((count($_POST) > 0) && ((!isset($_POST['id'])) || (!is_array($_POST['id'])) || (count($_POST['id']) == 0))) {
        // Not found so output message
 // Check for 'id' element
 if ((count($_POST) > 0) && ((!isset($_POST['id'])) || (!is_array($_POST['id'])) || (count($_POST['id']) == 0))) {
        // Not found so output message

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_NO_SELECTIONS);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_NO_SELECTIONS'));

 
        // Abort here
        return;
 
        // Abort here
        return;


@@ -135,8 +135,8 @@ if (!$show) return false;
 
 // List all URLs
 $result = SQL_QUERY("SELECT id, userid, url, views_total, status, UNIX_TIMESTAMP(registered) AS registered, UNIX_TIMESTAMP(last_locked) AS last_locked, lock_reason
 
 // List all URLs
 $result = SQL_QUERY("SELECT id, userid, url, views_total, status, UNIX_TIMESTAMP(registered) AS registered, UNIX_TIMESTAMP(last_locked) AS last_locked, lock_reason

-FROM `{!MYSQL_PREFIX!}_surfbar_urls`
-ORDER BY id ASC", __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_surfbar_urls`
+ORDER BY `id` ASC", __FILE__, __LINE__);

 
 // Do we have some URLs left?
 if (SQL_NUMROWS($result) > 0) {
 
 // Do we have some URLs left?
 if (SQL_NUMROWS($result) > 0) {


@@ -164,7 +164,7 @@ if (SQL_NUMROWS($result) > 0) {
        LOAD_TEMPLATE("admin_list_surfbar_urls", false, $OUT);
 } else {
        // No URLs in surfbar
        LOAD_TEMPLATE("admin_list_surfbar_urls", false, $OUT);
 } else {
        // No URLs in surfbar

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_NO_URLS_FOUND);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_NO_URLS_FOUND'));

 }
 
 // Free result
 }
 
 // Free result

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index ff48e0d633ec6837c6445744a00db329141c7fb0..d30d5072ec84628631b76163cd86a314ebd8bf42 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -90,7 +90,7 @@ if (!empty($whereStatement))
        } else {
                // Start listing tasks matching selected filter
                $result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created
        } else {
                // Start listing tasks matching selected filter
                $result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created

-FROM `{!MYSQL_PREFIX!}_task_system`
+FROM `{!_MYSQL_PREFIX!}_task_system`

 WHERE ".$whereStatement."
 ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __LINE__);
                if (($SEL > 0) && (!IS_DEMO())) {
 WHERE ".$whereStatement."
 ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __LINE__);
                if (($SEL > 0) && (!IS_DEMO())) {


@@ -98,7 +98,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
                        if (isset($_POST['unassign'])) {
                                // Unassign from tasks
                                foreach ($_POST['task'] as $id => $sel) {
                        if (isset($_POST['unassign'])) {
                                // Unassign from tasks
                                foreach ($_POST['task'] as $id => $sel) {

-                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_task_system` SET assigned_admin=0 WHERE id=%s AND assigned_admin=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET assigned_admin=0 WHERE id=%s AND assigned_admin=%s LIMIT 1",

                                                array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
                                }
                        } elseif (isset($_POST['del'])) {
                                                array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
                                }
                        } elseif (isset($_POST['del'])) {


@@ -106,7 +106,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
                                foreach ($_POST['task'] as $id => $sel) {
                                        if ($_GET['type'] == "deleted") {
                                                // Delete task immediately
                                foreach ($_POST['task'] as $id => $sel) {
                                        if ($_GET['type'] == "deleted") {
                                                // Delete task immediately

-                                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_task_system` WHERE id=%s LIMIT 1",
+                                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_task_system` WHERE id=%s LIMIT 1",

                                                        array(bigintval($id)),__FILE__, __LINE__);
                                        } else {
                                                // Mark task as to be deleted (purged by autppurge extension)
                                                        array(bigintval($id)),__FILE__, __LINE__);
                                        } else {
                                                // Mark task as to be deleted (purged by autppurge extension)


@@ -116,7 +116,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
                        }
 
                        // Update query
                        }
 
                        // Update query

-                       $result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created FROM `{!MYSQL_PREFIX!}_task_system` WHERE ".$whereStatement." ORDER BY subject, task_created DESC", __FILE__, __LINE__);
+                       $result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created FROM `{!_MYSQL_PREFIX!}_task_system` WHERE ".$whereStatement." ORDER BY subject, task_created DESC", __FILE__, __LINE__);

                }
 
                // There are uncompleted jobs!
                }
 
                // There are uncompleted jobs!


@@ -132,7 +132,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
                        if ($admin == "0")
                        {
                                // No admin currently is assigned
                        if ($admin == "0")
                        {
                                // No admin currently is assigned

-                               $admin = "<div class=\"admin_note\">".ADMIN_NO_ADMIN_ASSIGNED."</div>";
+                               $admin = "<div class=\"admin_note\">{!ADMIN_NO_ADMIN_ASSIGNED!}</div>";

                        }
                         else
                        {
                        }
                         else
                        {


@@ -141,7 +141,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
                                if ($login != "***")
                                {
                                        // Admin found
                                if ($login != "***")
                                {
                                        // Admin found

-                                       $admin = "<a href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
+                                       $admin = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";

                                }
                                 else
                                {
                                }
                                 else
                                {

diff --git a/inc/modules/admin/what-list_transfer.php b/inc/modules/admin/what-list_transfer.php
index ee8319497dc649caac2177ddaedb9e446134e161..c2a1d56268ed9af912082ecbccfc7828e2dbf698 100644 (file)
--- a/inc/modules/admin/what-list_transfer.php
+++ b/inc/modules/admin/what-list_transfer.php
@@ -41,13 +41,13 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // We only need outgoing transfers
 ADD_DESCR("admin", __FILE__);
 
 // We only need outgoing transfers

-$result = SQL_QUERY("SELECT userid, to_uid, trans_id, points, reason, time_trans FROM `{!MYSQL_PREFIX!}_user_transfers_out` ORDER BY trans_id", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT userid, to_uid, trans_id, points, reason, time_trans FROM `{!_MYSQL_PREFIX!}_user_transfers_out` ORDER BY trans_id", __FILE__, __LINE__);

 $total = 0;
 if (SQL_NUMROWS($result) > 0)
 {
        // Output rows
        $OUT = ""; $SW = 2;
 $total = 0;
 if (SQL_NUMROWS($result) > 0)
 {
        // Output rows
        $OUT = ""; $SW = 2;

-       while(list($uid1, $uid2, $idx, $points, $reason, $stamp) = SQL_FETCHROW($result))
+       while (list($uid1, $uid2, $idx, $points, $reason, $stamp) = SQL_FETCHROW($result))

        {
                // Prepare data for the row template
                $content = array(
        {
                // Prepare data for the row template
                $content = array(

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index fb32ef6874a285843f8ec41fd19b33e83783ce77..60b67f7a80d53de7a34421306eaf14aac94fc161 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -46,14 +46,13 @@ ADD_DESCR("admin", __FILE__);
 // Don't load the admin_list_unconfirmed template by default
 $listed = false;
 
 // Don't load the admin_list_unconfirmed template by default
 $listed = false;
 

-if (!empty($_GET['mid']))
-{
+if (!empty($_GET['mid'])) {

        // List confirmation links from your member's mail orders
        define('__LIST_UNCON_TITLE', LIST_UNCONFIRMED_MEMBER_LINKS);
 
        // SQL query for mail data
        // List confirmation links from your member's mail orders
        define('__LIST_UNCON_TITLE', LIST_UNCONFIRMED_MEMBER_LINKS);
 
        // SQL query for mail data

-       $SQL = "SELECT DISTINCT s.id, p.sender, p.subject, p.text, p.url, p.timestamp, s.max_rec  FROM `{!MYSQL_PREFIX!}_pool` AS p
-LEFT JOIN `{!MYSQL_PREFIX!}_user_stats` AS s
+       $SQL = "SELECT DISTINCT s.id, p.sender, p.subject, p.text, p.url, p.timestamp, s.max_rec  FROM `{!_MYSQL_PREFIX!}_pool` AS p
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_stats` AS s

 ON p.id=s.pool_id
 WHERE p.id='".$_GET['mid']."' LIMIT 1";
 
 ON p.id=s.pool_id
 WHERE p.id='".$_GET['mid']."' LIMIT 1";
 


@@ -62,34 +61,28 @@ WHERE p.id='".$_GET['mid']."' LIMIT 1";
 
        // Load admin_list_unconfirmed template
        $listed = true; $DATA = $_GET['mid']; $LINK = "mailid";
 
        // Load admin_list_unconfirmed template
        $listed = true; $DATA = $_GET['mid']; $LINK = "mailid";

-}
- elseif ((!empty($_GET['bid'])) && (EXT_IS_ACTIVE("bonus")))
-{
+} elseif ((!empty($_GET['bid'])) && (EXT_IS_ACTIVE("bonus"))) {

        // List confirmation links from bonus mails
        define('__LIST_UNCON_TITLE', LIST_UNCONFIRMED_BONUS_LINKS);
 
        // SQL query for mail data (both ids are required for compatiblity to above normal mail
        // List confirmation links from bonus mails
        define('__LIST_UNCON_TITLE', LIST_UNCONFIRMED_BONUS_LINKS);
 
        // SQL query for mail data (both ids are required for compatiblity to above normal mail

-       $SQL = "SELECT id, id, subject, text, url, timestamp, mails_sent FROM `{!MYSQL_PREFIX!}_bonus` WHERE id='".$_GET['bid']."' LIMIT 1";
+       $SQL = "SELECT id, id, subject, text, url, timestamp, mails_sent FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id='".$_GET['bid']."' LIMIT 1";

 
        // Column, type and ID for member's mail
        $col = "bonus_id"; $type = "BONUS"; $ID = $_GET['bid'];
 
        // Load admin_list_unconfirmed template
        $listed = true; $DATA = $ID; $LINK = "bonusid";
 
        // Column, type and ID for member's mail
        $col = "bonus_id"; $type = "BONUS"; $ID = $_GET['bid'];
 
        // Load admin_list_unconfirmed template
        $listed = true; $DATA = $ID; $LINK = "bonusid";

-}
- else
-{
+} else {

        // "Please do not call me directly."
        // "Please do not call me directly."

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_CALL_NOT_DIRECTLY);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_CALL_NOT_DIRECTLY'));

 }
 
 // Shall I display links or not?
 }
 
 // Shall I display links or not?

-if ($listed)
-{
+if ($listed) {

        // Load mail data
        $result = SQL_QUERY($SQL, __FILE__, __LINE__);
        // Load mail data
        $result = SQL_QUERY($SQL, __FILE__, __LINE__);

-       if (SQL_NUMROWS($result) == 1)
-       {
+       if (SQL_NUMROWS($result) == 1) {

                // Mail order / bonus mail found!
                list($stats_id, $sender, $subj, $text, $url, $stamp, $max) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                // Mail order / bonus mail found!
                list($stats_id, $sender, $subj, $text, $url, $stamp, $max) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);


@@ -108,21 +101,19 @@ if ($listed)
                // accounts. So if you have delete one you did not see those links
                //
                $result = SQL_QUERY_ESC("SELECT DISTINCT l.userid, u.status, u.surname, u.family, u.gender, u.email
                // accounts. So if you have delete one you did not see those links
                //
                $result = SQL_QUERY_ESC("SELECT DISTINCT l.userid, u.status, u.surname, u.family, u.gender, u.email

-FROM `{!MYSQL_PREFIX!}_user_links` AS l
-LEFT JOIN `{!MYSQL_PREFIX!}_user_data` AS u
+FROM `{!_MYSQL_PREFIX!}_user_links` AS l
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS u

 ON l.userid=u.userid
 WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
                        array($col, $ID, bigintval($max)),__FILE__, __LINE__);
                $unconfirmed = SQL_NUMROWS($result);
                define('__LIST_UNCO_UNCONFIRMED', $unconfirmed);
 
 ON l.userid=u.userid
 WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
                        array($col, $ID, bigintval($max)),__FILE__, __LINE__);
                $unconfirmed = SQL_NUMROWS($result);
                define('__LIST_UNCO_UNCONFIRMED', $unconfirmed);
 

-               if ($unconfirmed > 0)
-               {
+               if ($unconfirmed > 0) {

                        // At least one link left to confirm
                        $OUT = LOAD_TEMPLATE("admin_list_unconfirmed_header", true);
                        $SW = 2;
                        // At least one link left to confirm
                        $OUT = LOAD_TEMPLATE("admin_list_unconfirmed_header", true);
                        $SW = 2;

-                       while(list($uid, $status, $sname, $fname, $gender, $email) = SQL_FETCHROW($result))
-                       {
+                       while (list($uid, $status, $sname, $fname, $gender, $email) = SQL_FETCHROW($result)) {

                                // Prepare data for the row template
                                $content = array(
                                        'sw'     => $SW,
                                // Prepare data for the row template
                                $content = array(
                                        'sw'     => $SW,


@@ -145,47 +136,36 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
 
                        // Store table rows in a constant
                        define('__LIST_UNCON_LISTING', $OUT);
 
                        // Store table rows in a constant
                        define('__LIST_UNCON_LISTING', $OUT);

-               }
-                else
-               {
+               } else {

                        // All links are confirmed... strange, you shall normally not get a link to this place in this scenario... hmmm.
                        // All links are confirmed... strange, you shall normally not get a link to this place in this scenario... hmmm.

-                       define('__LIST_UNCON_LISTING', LOAD_TEMPLATE("admin_settings_saved", true, ADMIN_UNCONFIRMED_NO_LINK_LEFT));
+                       define('__LIST_UNCON_LISTING', LOAD_TEMPLATE("admin_settings_saved", true, getMessage('ADMIN_UNCONFIRMED_NO_LINK_LEFT')));

                }
 
                // Load final template
                LOAD_TEMPLATE("admin_list_unconfirmed");
                }
 
                // Load final template
                LOAD_TEMPLATE("admin_list_unconfirmed");

-       }
-        elseif ($_GET['mid'] > 0)
-       {
+       } elseif ($_GET['mid'] > 0) {

                // Data in pool or in user_stats not found, so let's find out where data is missing
                // Data in pool or in user_stats not found, so let's find out where data is missing

-               $result1 = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
+               $result1 = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",

                 array(bigintval($ID)), __FILE__, __LINE__);
                 array(bigintval($ID)), __FILE__, __LINE__);

-               $result2 = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
+               $result2 = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",

                 array(bigintval($ID)), __FILE__, __LINE__);
                 array(bigintval($ID)), __FILE__, __LINE__);

-               if (SQL_NUMROWS($result1) == 1)
-               {
+               if (SQL_NUMROWS($result1) == 1) {

                        // pool table
                        LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_UNCONFIRMED_POOL_MISSING_1.$ID.ADMIN_UNCONFIRMED_POOL_MISSING_2);
                        // pool table
                        LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_UNCONFIRMED_POOL_MISSING_1.$ID.ADMIN_UNCONFIRMED_POOL_MISSING_2);

-               }
-                elseif (SQL_NUMROWS($result2) == 1)
-               {
+               } elseif (SQL_NUMROWS($result2) == 1) {

                        // user_stats table
                        LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_UNCONFIRMED_STATS_MISSING_1.$ID.ADMIN_UNCONFIRMED_STATS_MISSING_2);
                        // user_stats table
                        LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_UNCONFIRMED_STATS_MISSING_1.$ID.ADMIN_UNCONFIRMED_STATS_MISSING_2);

-               }
-                else
-               {
+               } else {

                        // both or link is invalid
                        // both or link is invalid

-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_UNCONFIRMED_INVALID_LINK);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));

                }
 
                // Free memory
                SQL_FREERESULT($result1);
                SQL_FREERESULT($result2);
                }
 
                // Free memory
                SQL_FREERESULT($result1);
                SQL_FREERESULT($result2);

-       }
-        elseif (!empty($_GET['bid']))
-       {
+       } elseif (!empty($_GET['bid'])) {

                // Data in bonus table not found
                // Data in bonus table not found

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_UNCONFIRMED_INVALID_LINK);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));

        }
 }
 //
        }
 }
 //

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 68399a678d5a7993e8abc610e92fa44f91a1be50..ca6a77dbd33eeb682b3f506013c01e5b74612b93 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -90,7 +90,7 @@ if (empty($_GET['sortby'])) { $_GET['sortby'] = "userid"; }
 if (empty($_GET['page']))   { $_GET['page']   = "1";      }
 
 // Set base URL
 if (empty($_GET['page']))   { $_GET['page']   = "1";      }
 
 // Set base URL

-$BASE = "[<a href=\"".URL."/modules.php?module=admin";
+$BASE = "[<a href=\"{!URL!}/modules.php?module=admin";

 
 if (!empty($_GET['u_id'])) {
        // Secure the user ID
 
 if (!empty($_GET['u_id'])) {
        // Secure the user ID


@@ -98,7 +98,7 @@ if (!empty($_GET['u_id'])) {
 
        // Does the account exists?
        $result_user = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, zip, city, country, email, birth_day, birth_month, birth_year, max_mails, receive_mails, refid, status, REMOTE_ADDR, last_online, last_module, ref_clicks, total_logins, used_points, emails_sent, joined, last_update, last_profile_sent, notified, ref_payout, emails_received, mails_confirmed".$MORE."
 
        // Does the account exists?
        $result_user = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, zip, city, country, email, birth_day, birth_month, birth_year, max_mails, receive_mails, refid, status, REMOTE_ADDR, last_online, last_module, ref_clicks, total_logins, used_points, emails_sent, joined, last_update, last_profile_sent, notified, ref_payout, emails_received, mails_confirmed".$MORE."

-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE userid=%s
 LIMIT 1",
                array($uid), __FILE__, __LINE__);
 WHERE userid=%s
 LIMIT 1",
                array($uid), __FILE__, __LINE__);


@@ -196,7 +196,7 @@ LIMIT 1",
        SQL_FREERESULT($result_user);
 } else {
        $whereStatement = "";
        SQL_FREERESULT($result_user);
 } else {
        $whereStatement = "";

-       if (($_GET['letter'] != _ALL2) && ($_GET['letter'] != _OTHERS) && (!empty($_GET['letter']))) {
+       if (($_GET['letter'] != getMessage('_ALL2')) && ($_GET['letter'] != getMessage('_OTHERS')) && (!empty($_GET['letter']))) {

                // List only persons w
                $whereStatement = " WHERE family LIKE '".$_GET['letter']."%'";
        } // END - if
                // List only persons w
                $whereStatement = " WHERE family LIKE '".$_GET['letter']."%'";
        } // END - if


@@ -232,7 +232,7 @@ LIMIT 1",
        } // END = if
 
        // Prepare SQL and run it
        } // END = if
 
        // Prepare SQL and run it

-       $SQL = "SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, status, emails_sent, mails_confirmed, emails_received".$MORE." FROM `{!MYSQL_PREFIX!}_user_data`".$whereStatement." ORDER BY ".SQL_ESCAPE($_GET['sortby']);
+       $SQL = "SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, status, emails_sent, mails_confirmed, emails_received".$MORE." FROM `{!_MYSQL_PREFIX!}_user_data`".$whereStatement." ORDER BY ".SQL_ESCAPE($_GET['sortby']);

        $result_master = SQL_QUERY($SQL, __FILE__, __LINE__);
 
        // Calculate page count (0.5 fixes a bug with page count)
        $result_master = SQL_QUERY($SQL, __FILE__, __LINE__);
 
        // Calculate page count (0.5 fixes a bug with page count)


@@ -251,7 +251,7 @@ LIMIT 1",
        $SQL .= " LIMIT ".($_GET['offset'] * $_GET['page'] - $_GET['offset']).", ".$_GET['offset'];
        $result = SQL_QUERY($SQL, __FILE__, __LINE__);
 
        $SQL .= " LIMIT ".($_GET['offset'] * $_GET['page'] - $_GET['offset']).", ".$_GET['offset'];
        $result = SQL_QUERY($SQL, __FILE__, __LINE__);
 

-       $result_user = SQL_QUERY("SELECT emails_sent FROM `{!MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED'", __FILE__, __LINE__);
+       $result_user = SQL_QUERY("SELECT emails_sent FROM `{!_MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED'", __FILE__, __LINE__);

        $user_count = SQL_NUMROWS($result_user);
        SQL_FREERESULT($result_user);
 
        $user_count = SQL_NUMROWS($result_user);
        SQL_FREERESULT($result_user);
 


@@ -355,7 +355,7 @@ LIMIT 1",
                SQL_FREERESULT($result_master);
        } else {
                // No one as registered so far! :-(
                SQL_FREERESULT($result_master);
        } else {
                // No one as registered so far! :-(

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_NONE_REGISTERED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_NONE_REGISTERED'));

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-list_wernis.php b/inc/modules/admin/what-list_wernis.php
index b3dc996db108c9b47d3279dd82ce9867a37bae6c..99066dc9e8883c4e43755d98e9f64e34e3341547 100644 (file)
--- a/inc/modules/admin/what-list_wernis.php
+++ b/inc/modules/admin/what-list_wernis.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Check for entries
 ADD_DESCR("admin", __FILE__);
 
 // Check for entries

-$result = SQL_QUERY("SELECT id, userid, wernis_account, wernis_amount, wernis_timestamp, wernis_type, wernis_api_message, wernis_api_status FROM `{!MYSQL_PREFIX!}_user_wernis` ORDER BY wernis_timestamp DESC, id DESC",
+$result = SQL_QUERY("SELECT id, userid, wernis_account, wernis_amount, wernis_timestamp, wernis_type, wernis_api_message, wernis_api_status FROM `{!_MYSQL_PREFIX!}_user_wernis` ORDER BY wernis_timestamp DESC, id DESC",

        __FILE__, __LINE__);
 
 // Are there some entries to display?
        __FILE__, __LINE__);
 
 // Are there some entries to display?

diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php
index f6e5c99c8266b3aeed1efdc914df4219c4bebc61..ff3afc65f7c51c31b9c871538acdd93b840b698d 100644 (file)
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -64,7 +64,7 @@ if (isset($_POST['ok'])) {
 // Enougth queries left?
 if (getConfig('yoomedia_requests_remain') == 0) {
        // Output message
 // Enougth queries left?
 if (getConfig('yoomedia_requests_remain') == 0) {
        // Output message

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_YOOMEDIA_REQUESTS_DEPLETED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_YOOMEDIA_REQUESTS_DEPLETED'));

 
        // Abort here!
        return false;
 
        // Abort here!
        return false;


@@ -76,7 +76,7 @@ $result = YOOMEDIA_GET_PARSED_RESULT_TEXTMAILS();
 // Sanity-check on result array
 if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id']))) {
        // Invalid result
 // Sanity-check on result array
 if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id']))) {
        // Invalid result

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_YOOMEDIA_INVALID_RESULT);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_YOOMEDIA_INVALID_RESULT'));

        return false;
 } elseif (count($result[0]) < 7) {
        // Error received so prepare error code
        return false;
 } elseif (count($result[0]) < 7) {
        // Error received so prepare error code

diff --git a/inc/modules/admin/what-lock_sponsor.php b/inc/modules/admin/what-lock_sponsor.php
index 834aab41f51a630c7fc84b4e7358ee48bc07011c..2cfe38d92fed4f353e9f9efdd7e1a979dc9e4701 100644 (file)
--- a/inc/modules/admin/what-lock_sponsor.php
+++ b/inc/modules/admin/what-lock_sponsor.php
@@ -43,7 +43,7 @@ $MSG = "";
 
 if (!empty($_GET['id'])) {
        // Check for selected sponsor
 
 if (!empty($_GET['id'])) {
        // Check for selected sponsor

-       $result = SQL_QUERY_ESC("SELECT gender, surname, family, email, status FROM `{!MYSQL_PREFIX!}_sponsor_data` WHERE id='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT gender, surname, family, email, status FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE id='%s' LIMIT 1",

         array(bigintval($_GET['id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Get sponsor's current status and let only confirmed and locked status pass
         array(bigintval($_GET['id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Get sponsor's current status and let only confirmed and locked status pass


@@ -78,7 +78,7 @@ if (!empty($_GET['id'])) {
                                SEND_EMAIL($email, $subject, $msg);
 
                                // Update sponsor's account
                                SEND_EMAIL($email, $subject, $msg);
 
                                // Update sponsor's account

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_sponsor_data` SET status='".$status."' WHERE id='%s' LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET status='".$status."' WHERE id='%s' LIMIT 1",

                                        array(bigintval($_GET['id'])), __FILE__, __LINE__);
                        } elseif (!empty($_POST['no'])) {
                                // No don't lock / unlock now!
                                        array(bigintval($_GET['id'])), __FILE__, __LINE__);
                        } elseif (!empty($_POST['no'])) {
                                // No don't lock / unlock now!

diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php
index 2191cef1ceca9748965e3971ab8bd3d3d4a00bae..435ab833435081418fbe8ad9d65c89bdb542b702 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -43,7 +43,7 @@ ADD_DESCR("admin", __FILE__);
 // Is a userid set?
 if (!empty($_GET['u_id'])) {
        // Load user's data
 // Is a userid set?
 if (!empty($_GET['u_id'])) {
        // Load user's data

-       $result_user = SQL_QUERY_ESC("SELECT status, gender, surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result_user = SQL_QUERY_ESC("SELECT status, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        $ACT = false;
        if (SQL_NUMROWS($result_user) == 1) {
         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        $ACT = false;
        if (SQL_NUMROWS($result_user) == 1) {


@@ -58,11 +58,11 @@ if (!empty($_GET['u_id'])) {
                        // Ok, lock the account!
                        if (GET_EXT_VERSION("user") >= "0.3.5") {
                                // Lock with reason
                        // Ok, lock the account!
                        if (GET_EXT_VERSION("user") >= "0.3.5") {
                                // Lock with reason

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET status='LOCKED',lock_reason='%s',lock_timestamp=NOW() WHERE userid=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET status='LOCKED',lock_reason='%s',lock_timestamp=NOW() WHERE userid=%s LIMIT 1",

                                        array($_POST['reason'], bigintval($_GET['u_id'])), __FILE__, __LINE__);
                        } else {
                                // Lock with no lock reason saved
                                        array($_POST['reason'], bigintval($_GET['u_id'])), __FILE__, __LINE__);
                        } else {
                                // Lock with no lock reason saved

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET status='LOCKED' WHERE userid=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET status='LOCKED' WHERE userid=%s LIMIT 1",

                                        array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                        }
 
                                        array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                        }
 


@@ -82,11 +82,11 @@ if (!empty($_GET['u_id'])) {
                        // Ok, unlock the account!
                        if (GET_EXT_VERSION("user") >= "0.3.5") {
                                // Reset lock reason as well
                        // Ok, unlock the account!
                        if (GET_EXT_VERSION("user") >= "0.3.5") {
                                // Reset lock reason as well

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET status='CONFIRMED',lock_reason='',lock_timestamp='0000-00-00 00:00' WHERE userid=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET status='CONFIRMED',lock_reason='',lock_timestamp='0000-00-00 00:00' WHERE userid=%s LIMIT 1",

                                        array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                        } else {
                                // No lock reason to reset
                                        array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                        } else {
                                // No lock reason to reset

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET status='CONFIRMED' WHERE userid=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET status='CONFIRMED' WHERE userid=%s LIMIT 1",

                                        array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                        }
 
                                        array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                        }
 


@@ -96,7 +96,7 @@ if (!empty($_GET['u_id'])) {
                                $msg = LOAD_EMAIL_TEMPLATE("unlock-user", array('text' => $_POST['reason']), bigintval($_GET['u_id']));
 
                                // Send away...
                                $msg = LOAD_EMAIL_TEMPLATE("unlock-user", array('text' => $_POST['reason']), bigintval($_GET['u_id']));
 
                                // Send away...

-                               SEND_EMAIL(bigintval($_GET['u_id']), ADMIN_UNLOCKED_SUBJ, $msg);
+                               SEND_EMAIL(bigintval($_GET['u_id']), getMessage('ADMIN_UNLOCKED_SUBJ'), $msg);

                                if (EXT_IS_ACTIVE("rallye")) {
                                        RALLYE_AUTOADD_USER($_GET['u_id']);
                                } // END - if
                                if (EXT_IS_ACTIVE("rallye")) {
                                        RALLYE_AUTOADD_USER($_GET['u_id']);
                                } // END - if


@@ -113,7 +113,7 @@ if (!empty($_GET['u_id'])) {
                        // Do not lock him...
                        $URL = "modules.php?module=admin&what=list_user&u_id=".bigintval($_GET['u_id']);
                } else {
                        // Do not lock him...
                        $URL = "modules.php?module=admin&what=list_user&u_id=".bigintval($_GET['u_id']);
                } else {

-                       $result = SQL_QUERY_ESC("SELECT email, surname, family FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT email, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                                array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 
                        // Entry found?
                                array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 
                        // Entry found?


@@ -169,7 +169,7 @@ if (!empty($_GET['u_id'])) {
                        if (!empty($MSG)) {
                                LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_green\">".$MSG."</div>");
                        } else {
                        if (!empty($MSG)) {
                                LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_green\">".$MSG."</div>");
                        } else {

-                               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_green\">".ADMIN_USER_UPDATED."</div>");
+                               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_green\">".getMessage('ADMIN_USER_UPDATED')."</div>");

                        }
                }
        } else {
                        }
                }
        } else {

diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php
index b8d50bfbc748e2ae949c5863f09837757660985a..a4ab2a11677a368f0f2deb8cc697a4eec34217b8 100644 (file)
--- a/inc/modules/admin/what-logs.php
+++ b/inc/modules/admin/what-logs.php
@@ -93,7 +93,7 @@ if (!empty($_GET['access'])) {
                        // We currenly only like files with "access" as prefix, should be more flexible!
                        if (substr($file, 0, 6) == "access") {
                                // Okay, let us print it out
                        // We currenly only like files with "access" as prefix, should be more flexible!
                        if (substr($file, 0, 6) == "access") {
                                // Okay, let us print it out

-                               OUTPUT_HTML("<li><a href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what']."&access=".urlencode($file)."\">".$file."</a></li>");
+                               OUTPUT_HTML("<li><a href=\"{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what']."&access=".urlencode($file)."\">".$file."</a></li>");

                        }
                }
                closedir($handle);
                        }
                }
                closedir($handle);

diff --git a/inc/modules/admin/what-maintenance.php b/inc/modules/admin/what-maintenance.php
index 282e6c679ea9e1ff70ef15ff0e520c6f3f7c9878..6ae59ecbd90c6d1d8b0da658ed866face9e3a3f9 100644 (file)
--- a/inc/modules/admin/what-maintenance.php
+++ b/inc/modules/admin/what-maintenance.php
@@ -40,19 +40,18 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR("admin", __FILE__);
 
 // Add description as navigation point
 ADD_DESCR("admin", __FILE__);
 

-if (isset($_POST['ok']))
-{
+if (isset($_POST['ok'])) {

        // De- or activate maintenance mode
        switch (getConfig('maintenance'))
        {
        case "Y":
                $target_mode = "N";
        // De- or activate maintenance mode
        switch (getConfig('maintenance'))
        {
        case "Y":
                $target_mode = "N";

-               $out = ADMIN_MAINTENANCE_DEACTIVATED;
+               $out = getMessage('ADMIN_MAINTENANCE_DEACTIVATED');

                break;
 
        case "N":
                $target_mode = "Y";
                break;
 
        case "N":
                $target_mode = "Y";

-               $out = ADMIN_MAINTENANCE_ACTIVATED;
+               $out = getMessage('ADMIN_MAINTENANCE_ACTIVATED');

                break;
        }
 
                break;
        }
 


@@ -65,11 +64,11 @@ if (isset($_POST['ok']))
        switch (getConfig('maintenance'))
        {
        case "Y": // Maintenance mode is active
        switch (getConfig('maintenance'))
        {
        case "Y": // Maintenance mode is active

-               define('ADMIN_MAINTENANCE_MODE', ADMIN_MAINTENANCE_MODE_IS_ACTIVE);
+               define('ADMIN_MAINTENANCE_MODE', getMessage('ADMIN_MAINTENANCE_MODE_IS_ACTIVE'));

                break;
 
        case "N": // Maintenance mode is inactive
                break;
 
        case "N": // Maintenance mode is inactive

-               define('ADMIN_MAINTENANCE_MODE', ADMIN_MAINTENANCE_MODE_IS_INACTIVE);
+               define('ADMIN_MAINTENANCE_MODE', getMessage('ADMIN_MAINTENANCE_MODE_IS_INACTIVE'));

                break;
        }
        // Display form
                break;
        }
        // Display form

diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index 0e543a4f7e902bf9d2233c2acc8d30152b3875ee..c075449cb7f81de4b1eeb1be5a5bc84c1f12c12a 100644 (file)
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -42,23 +42,19 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Check if the admin has entered title and what-php file name...
 ADD_DESCR("admin", __FILE__);
 
 // Check if the admin has entered title and what-php file name...

-if ((empty($_POST['title'])) && (isset($_POST['ok'])))
-{
+if ((empty($_POST['title'])) && (isset($_POST['ok']))) {

        unset($_POST['ok']);
 }
 
        unset($_POST['ok']);
 }
 

-if (!isset($_POST['ok']))
-{
+if (!isset($_POST['ok'])) {

        // Create arrays
        $menus = array(); $titles = array(); $below = array();
 
        // Get all available main menus
        // Create arrays
        $menus = array(); $titles = array(); $below = array();
 
        // Get all available main menus

-       $result = SQL_QUERY("SELECT action, title, sort FROM `{!MYSQL_PREFIX!}_member_menu` WHERE (what='' OR what IS NULL) ORDER BY sort", __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) > 0)
-       {
+       $result = SQL_QUERY("SELECT action, title, sort FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort`", __FILE__, __LINE__);
+       if (SQL_NUMROWS($result) > 0) {

                // Read menu structure
                // Read menu structure

-               while (list($act, $title, $sort) = SQL_FETCHROW($result))
-               {
+               while (list($act, $title, $sort) = SQL_FETCHROW($result)) {

                        // Menu actions
                        $menus[] = $act;
 
                        // Menu actions
                        $menus[] = $act;
 


@@ -74,36 +70,32 @@ if (!isset($_POST['ok']))
 
                // Remove double eintries
                $prev = ""; $dmy = $menus; $dmy2 = $titles; $dmy3 = $below;
 
                // Remove double eintries
                $prev = ""; $dmy = $menus; $dmy2 = $titles; $dmy3 = $below;

-               foreach ($menus as $key => $value)
-               {
-                       if ($value == $prev)
-                       {
+               foreach ($menus as $key => $value) {
+                       if ($value == $prev) {

                                // Remove entries
                                unset($dmy[$key]);
                                unset($dmy2[$key]);
                                unset($dmy3[$key]);
                                // Remove entries
                                unset($dmy[$key]);
                                unset($dmy2[$key]);
                                unset($dmy3[$key]);

-                       }
-                        else
-                       {
+                       } else {

                                $prev = $value;
                        }
                }
                                $prev = $value;
                        }
                }

+
+               // Prepare variables

                $menus = $dmy; $titles = $dmy2; $below = $dmy3;
                $menus = $dmy; $titles = $dmy2; $below = $dmy3;

+

                // Load sub menus :)
                // Load sub menus :)

-               foreach ($menus as $key_main => $value_main)
-               {
-                       $result = SQL_QUERY_ESC("SELECT what, title, sort FROM `{!MYSQL_PREFIX!}_member_menu` WHERE action='%s' AND what != '' ORDER BY sort",
-                        array($value_main), __FILE__, __LINE__);
-                       if (SQL_NUMROWS($result) > 0)
-                       {
+               foreach ($menus as $key_main => $value_main) {
+                       $result = SQL_QUERY_ESC("SELECT what, title, sort FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE action='%s' AND `what` != '' ORDER BY `sort`",
+                               array($value_main), __FILE__, __LINE__);
+                       if (SQL_NUMROWS($result) > 0) {

                                // Initialize arrays
                                $menus[$value_main] = array();
                                $titles[$value_main] = array();
                                $below[$value_main] = array();
 
                                // Read menu structure
                                // Initialize arrays
                                $menus[$value_main] = array();
                                $titles[$value_main] = array();
                                $below[$value_main] = array();
 
                                // Read menu structure

-                               while (list($act, $title, $sort) = SQL_FETCHROW($result))
-                               {
+                               while (list($act, $title, $sort) = SQL_FETCHROW($result)) {

                                        // Menu actions
                                        $menus[$value_main][] = $act;
 
                                        // Menu actions
                                        $menus[$value_main][] = $act;
 


@@ -119,16 +111,12 @@ if (!isset($_POST['ok']))
 
                                // Remove double eintries
                                $prev = ""; $dmy = $menus[$value_main]; $dmy2 = $titles[$value_main]; $dmy3 = $below[$value_main];
 
                                // Remove double eintries
                                $prev = ""; $dmy = $menus[$value_main]; $dmy2 = $titles[$value_main]; $dmy3 = $below[$value_main];

-                               foreach ($menus[$value_main] as $key => $value)
-                               {
-                                       if ($value == $prev)
-                                       {
+                               foreach ($menus[$value_main] as $key => $value) {
+                                       if ($value == $prev) {

                                                unset($dmy[$key]);
                                                unset($dmy2[$key]);
                                                unset($dmy3[$key]);
                                                unset($dmy[$key]);
                                                unset($dmy2[$key]);
                                                unset($dmy3[$key]);

-                                       }
-                                        else
-                                       {
+                                       } else {

                                                $prev = $value;
                                        }
                                }
                                                $prev = $value;
                                        }
                                }


@@ -139,25 +127,18 @@ if (!isset($_POST['ok']))
 
        $OUT = "<select class=\"admin_select\" name=\"sort\" size=\"1\">
       <option value=\"\">".IS_FIRST_MENU."</option>";
 
        $OUT = "<select class=\"admin_select\" name=\"sort\" size=\"1\">
       <option value=\"\">".IS_FIRST_MENU."</option>";

-       foreach ($below as $key => $m)
-       {
-               if (is_array($m))
-               {
-                       foreach ($m as $key2 => $m2)
-                       {
+       foreach ($below as $key => $m) {
+               if (is_array($m)) {
+                       foreach ($m as $key2 => $m2) {

                                $OUT .= "      <option value=\"".$m2."\">".$titles[$key][$key2];
                                $OUT .= "      <option value=\"".$m2."\">".$titles[$key][$key2];

-                               foreach ($menus as $k => $v)
-                               {
-                                       if (($v == $key) && (!is_array($v)))
-                                       {
+                               foreach ($menus as $k => $v) {
+                                       if (($v == $key) && (!is_array($v))) {

                                                $OUT .= " (".$titles[$k].")";
                                        }
                                }
                                $OUT .= "</option>\n";
                        }
                                                $OUT .= " (".$titles[$k].")";
                                        }
                                }
                                $OUT .= "</option>\n";
                        }

-               }
-                else
-               {
+               } else {

                        $OUT .= "      <option value=\"".$m."\">".$titles[$key]."</option>\n";
                }
        }
                        $OUT .= "      <option value=\"".$m."\">".$titles[$key]."</option>\n";
                }
        }


@@ -169,13 +150,11 @@ if (!isset($_POST['ok']))
 
        // Display form
        LOAD_TEMPLATE("admin_member_add");
 
        // Display form
        LOAD_TEMPLATE("admin_member_add");

-}
- elseif (!IS_DEMO())
-{
+} elseif (!IS_DEMO()) {

        // Insert new menu entry
        if (!empty($_POST['menu']))
        {
        // Insert new menu entry
        if (!empty($_POST['menu']))
        {

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s','%s')",

  array(
        $_POST['menu'],
        $_POST['name'],
  array(
        $_POST['menu'],
        $_POST['name'],


@@ -184,10 +163,8 @@ if (!isset($_POST['ok']))
        $_POST['active'],
        bigintval($_POST['sort']),
 ), __FILE__, __LINE__);
        $_POST['active'],
        bigintval($_POST['sort']),
 ), __FILE__, __LINE__);

-       }
-        else
-       {
-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_member_menu` (`action`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s')",
+       } else {
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s')",

  array(
        $_POST['name'],
        $_POST['title'],
  array(
        $_POST['name'],
        $_POST['title'],


@@ -196,12 +173,10 @@ if (!isset($_POST['ok']))
        bigintval($_POST['sort']),
 ), __FILE__, __LINE__);
        }
        bigintval($_POST['sort']),
 ), __FILE__, __LINE__);
        }

-       LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
-}
- else
-{
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
+} else {

        // Demo mode!
        // Demo mode!

-       LOAD_TEMPLATE("admin_settings_saved", false, SETTINGS_NOT_SAVED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_NOT_SAVED'));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index f243e0ebe7d57a6c471608b52d82e8b2fc1770a7..d464f246adb4afd68b82b48f326634c0a274d291 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -41,10 +41,10 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?
 ADD_DESCR("admin", __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?

-$AND = "(what = '' OR what IS NULL)"; $SUB = "";
+$AND = "(`what` = '' OR `what` IS NULL)"; $SUB = "";

 
 if (!empty($_GET['sub'])) {
 
 if (!empty($_GET['sub'])) {

-       $AND = sprintf("action='%s' AND what IS NOT NULL", SQL_ESCAPE($_GET['sub']));
+       $AND = sprintf("action='%s' AND `what` IS NOT NULL", SQL_ESCAPE($_GET['sub']));

        $SUB = SQL_ESCAPE($_GET['sub']);
 }
 
        $SUB = SQL_ESCAPE($_GET['sub']);
 }
 


@@ -53,21 +53,17 @@ $chk = 0;
 if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']);
 
 // List all menu points and make them editable
 if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']);
 
 // List all menu points and make them editable

-if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
-{
+if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) {

        // Edit menu entries
        define('__SUB_VALUE', $SUB);
        define('__CHK_VALUE', $chk);
        $SW = 2; $cnt = 0; $OUT = "";
        // Edit menu entries
        define('__SUB_VALUE', $SUB);
        define('__CHK_VALUE', $chk);
        $SW = 2; $cnt = 0; $OUT = "";

-       foreach ($_POST['sel'] as $sel => $confirm)
-       {
-               if ($confirm == 1)
-               {
+       foreach ($_POST['sel'] as $sel => $confirm) {
+               if ($confirm == 1) {

                        $cnt++;
                        $cnt++;

-                       $result = SQL_QUERY_ESC("SELECT title, action, what FROM `{!MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
-                        array(bigintval($sel)), __FILE__, __LINE__);
-                       if (SQL_NUMROWS($result) == 1)
-                       {
+                       $result = SQL_QUERY_ESC("SELECT title, action, what FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+                               array(bigintval($sel)), __FILE__, __LINE__);
+                       if (SQL_NUMROWS($result) == 1) {

                                // Entry found so we load the stuff...
                                list($menu, $act, $wht, $descr) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);
                                // Entry found so we load the stuff...
                                list($menu, $act, $wht, $descr) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);


@@ -81,9 +77,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                                );
                                // Load template
                                $OUT .= LOAD_TEMPLATE("admin_mmenu_edit_row", true, $content);
                                );
                                // Load template
                                $OUT .= LOAD_TEMPLATE("admin_mmenu_edit_row", true, $content);

-                       }
-                        else
-                       {
+                       } else {

                                // Entry not found?
                                $content = array(
                                        'sw'  => $SW,
                                // Entry not found?
                                $content = array(
                                        'sw'  => $SW,


@@ -99,19 +93,15 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 
        // Load template
        LOAD_TEMPLATE("admin_mmenu_edit");
 
        // Load template
        LOAD_TEMPLATE("admin_mmenu_edit");

-}
- elseif ((isset($_POST['del'])) && ($chk > 0) && (!IS_DEMO()))
-{
+} elseif ((isset($_POST['del'])) && ($chk > 0) && (!IS_DEMO())) {

        // Del menu entries with or without confirmation
        define('__SUB_VALUE', $SUB);
        define('__CHK_VALUE', $chk);
        $SW = 2; $cnt = 0; $OUT = "";
        // Del menu entries with or without confirmation
        define('__SUB_VALUE', $SUB);
        define('__CHK_VALUE', $chk);
        $SW = 2; $cnt = 0; $OUT = "";

-       foreach ($_POST['sel'] as $sel => $confirm)
-       {
-               if ($confirm == 1)
-               {
+       foreach ($_POST['sel'] as $sel => $confirm) {
+               if ($confirm == 1) {

                        $cnt++;
                        $cnt++;

-                       $result = SQL_QUERY_ESC("SELECT title FROM `{!MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",

                         array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {
                         array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {


@@ -141,22 +131,17 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 
        // Load template
        LOAD_TEMPLATE("admin_mmenu_delete");
 
        // Load template
        LOAD_TEMPLATE("admin_mmenu_delete");

-}
- elseif ((isset($_POST['status'])) && ($chk > 0) && (!IS_DEMO()))
-{
+} elseif ((isset($_POST['status'])) && ($chk > 0) && (!IS_DEMO())) {

        // Change status (visible / locked)
        define('__SUB_VALUE', $SUB);
        define('__CHK_VALUE', $chk);
        $SW = 2; $cnt = 0; $OUT = "";
        // Change status (visible / locked)
        define('__SUB_VALUE', $SUB);
        define('__CHK_VALUE', $chk);
        $SW = 2; $cnt = 0; $OUT = "";

-       foreach ($_POST['sel'] as $sel => $confirm)
-       {
-               if ($confirm == 1)
-               {
+       foreach ($_POST['sel'] as $sel => $confirm) {
+               if ($confirm == 1) {

                        $cnt++;
                        $cnt++;

-                       $result = SQL_QUERY_ESC("SELECT title, visible, locked FROM `{!MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
-                        array(bigintval($sel)), __FILE__, __LINE__);
-                       if (SQL_NUMROWS($result) == 1)
-                       {
+                       $result = SQL_QUERY_ESC("SELECT title, visible, locked FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+                               array(bigintval($sel)), __FILE__, __LINE__);
+                       if (SQL_NUMROWS($result) == 1) {

                                // Entry found so we load the stuff...
                                list($menu, $vis, $locked) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);
                                // Entry found so we load the stuff...
                                list($menu, $vis, $locked) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);


@@ -188,29 +173,26 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
        define('__CNT_VALUE', $cnt);
        //
        LOAD_TEMPLATE("admin_mmenu_status");
        define('__CNT_VALUE', $cnt);
        //
        LOAD_TEMPLATE("admin_mmenu_status");

-}
- elseif ((isset($_POST['ok'])) && (!IS_DEMO()))
-{
+} elseif ((isset($_POST['ok'])) && (!IS_DEMO())) {

        // An act is done...
        // An act is done...

-       foreach ($_POST['sel'] as $sel => $menu)
-       {
-               $AND = "(what = '' OR what IS NULL)";
+       foreach ($_POST['sel'] as $sel => $menu) {
+               $AND = "(`what` = '' OR `what` IS NULL)";

                $sel = bigintval($sel);
                if (!empty($SUB)) $AND = "action='".$SUB."'";
                switch ($_POST['ok'])
                {
                case "edit": // Edit menu
                $sel = bigintval($sel);
                if (!empty($SUB)) $AND = "action='".$SUB."'";
                switch ($_POST['ok'])
                {
                case "edit": // Edit menu

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_member_menu` SET title='%s', action='%s', what='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET title='%s', action='%s', what='%s' WHERE ".$AND." AND id=%s LIMIT 1",

                                array($menu, $_POST['sel_act'][$sel], $_POST['sel_what'][$sel], $sel), __FILE__, __LINE__);
                        break;
 
                case "del": // Delete menu
                                array($menu, $_POST['sel_act'][$sel], $_POST['sel_what'][$sel], $sel), __FILE__, __LINE__);
                        break;
 
                case "del": // Delete menu

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",

                                array($sel), __FILE__, __LINE__);
                        break;
 
                case "status": // Change status of menus
                                array($sel), __FILE__, __LINE__);
                        break;
 
                case "status": // Change status of menus

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='%s', locked='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND id=%s LIMIT 1",

                                array($_POST['visible'][$sel], $_POST['locked'][$sel], $sel), __FILE__, __LINE__);
                        break;
                }
                                array($_POST['visible'][$sel], $_POST['locked'][$sel], $sel), __FILE__, __LINE__);
                        break;
                }


@@ -218,7 +200,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
        }
 
        // Load template
        }
 
        // Load template

-       LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));

 } else {
        if ((!empty($_GET['act'])) && (!empty($_GET['tid'])) && (!empty($_GET['fid']))) {
                // Init
 } else {
        if ((!empty($_GET['act'])) && (!empty($_GET['tid'])) && (!empty($_GET['fid']))) {
                // Init


@@ -227,68 +209,60 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                // Get IDs
                if (!empty($_GET['w'])) {
                        // Sub menus selected
                // Get IDs
                if (!empty($_GET['w'])) {
                        // Sub menus selected

-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_member_menu` WHERE action='%s' AND sort='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE action='%s' AND sort='%s' LIMIT 1",

                         array(bigintval($_GET['act']), bigintval($_GET['tid'])), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                         array(bigintval($_GET['act']), bigintval($_GET['tid'])), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);

-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_member_menu` WHERE action='%s' AND sort='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE action='%s' AND sort='%s' LIMIT 1",

                         array(bigintval($_GET['act']), bigintval($_GET['fid'])), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                } else {
                        // Main menu selected
                         array(bigintval($_GET['act']), bigintval($_GET['fid'])), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                } else {
                        // Main menu selected

-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_member_menu` WHERE (what='' OR what IS NULL) AND sort='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (what='' OR `what` IS NULL) AND sort='%s' LIMIT 1",

                         array(bigintval($_GET['tid'])), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                         array(bigintval($_GET['tid'])), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);

-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_member_menu` WHERE (what='' OR what IS NULL) AND sort='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (what='' OR `what` IS NULL) AND sort='%s' LIMIT 1",

                         array(bigintval($_GET['fid'])), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                }
 
                if ((!empty($tid)) && (!empty($fid))) {
                        // Sort menu
                         array(bigintval($_GET['fid'])), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                }
 
                if ((!empty($tid)) && (!empty($fid))) {
                        // Sort menu

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_member_menu` SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",

                                array(bigintval($_GET['tid']), bigintval($fid)), __FILE__, __LINE__);
                                array(bigintval($_GET['tid']), bigintval($fid)), __FILE__, __LINE__);

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_member_menu` SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",

                                array(bigintval($_GET['fid']), bigintval($tid)), __FILE__, __LINE__);
                } // END - -fi
        }
 
                                array(bigintval($_GET['fid']), bigintval($tid)), __FILE__, __LINE__);
                } // END - -fi
        }
 

-       if (!empty($SUB))
-       {
+       if (!empty($SUB)) {

                // Edit sub menus
                // Edit sub menus

-               $result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{!MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND what != '' AND what IS NOT NULL ORDER BY sort ASC", __FILE__, __LINE__);
-       }
-        else
-       {
+               $result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC", __FILE__, __LINE__);
+       } else {

                // Edit main menus
                // Edit main menus

-               $result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{!MYSQL_PREFIX!}_member_menu` WHERE (what='' OR what IS NULL) ORDER BY sort ASC", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);

        }
        }

+

        $max = SQL_NUMROWS($result);
        $max = SQL_NUMROWS($result);

-       if ($max > 0)
-       {
+       if ($max > 0) {

                // Set sub value
                define('__SUB_VALUE', $SUB);
 
                $SW = 2; $cnt = 0; $OUT = "";
                // Set sub value
                define('__SUB_VALUE', $SUB);
 
                $SW = 2; $cnt = 0; $OUT = "";

-               while (list($id, $act, $wht, $title, $sort) = SQL_FETCHROW($result))
-               {
+               while (list($id, $act, $wht, $title, $sort) = SQL_FETCHROW($result)) {

                        $cnt++;
                        $cnt++;

-                       if (($sort == 0) || (($sort == 1) && (!empty($SUB))))
-                       {
+                       if (($sort == 0) || (($sort == 1) && (!empty($SUB)))) {

                                // Is highest position
                                // Is highest position

-                               $NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</a>";
-                       }
-                        elseif ($cnt == $max)
-                       {
+                               $NAVI = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">{!LOWER!}</a>";
+                       } elseif ($cnt == $max) {

                                // Is lowest position
                                // Is lowest position

-                               $NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</a>";
-                       }
-                        elseif ($sort > 0)
-                       {
+                               $NAVI = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">{!HIGHER!}</a>";
+                       } elseif ($sort > 0) {

                                // Anything else between highest and lowest
                                // Anything else between highest and lowest

-                               $NAVI = "<a href=\"".URL."/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</a>/<a href=\"".URL."/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</a>";
+                               $NAVI = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">{!HIGHER!}</a>/<a href=\"{!URL!}/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">{!LOWER!}</a>";

                        }
                        }

+

                        if (empty($act))   $act   = "&nbsp;";
                        if (empty($wht))   $wht   = "&nbsp;";
                        if (empty($title)) $title = "&nbsp;";
                        if (empty($act))   $act   = "&nbsp;";
                        if (empty($wht))   $wht   = "&nbsp;";
                        if (empty($title)) $title = "&nbsp;";


@@ -309,11 +283,9 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                SQL_FREERESULT($result);
                define('__MENU_ROWS', $OUT);
                LOAD_TEMPLATE("admin_mmenu_overview");
                SQL_FREERESULT($result);
                define('__MENU_ROWS', $OUT);
                LOAD_TEMPLATE("admin_mmenu_overview");

-       }
-        else
-       {
+       } else {

                // Menu entries are missing... (???)
                // Menu entries are missing... (???)

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_MENUS_FOUND'));

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php
index 81cfb28433ca1ee3fb1907e69a9bea3c74556e52..b5c2d140f892ba473e78a85aa0fcaf4e50d40b78 100644 (file)
--- a/inc/modules/admin/what-payments.php
+++ b/inc/modules/admin/what-payments.php
@@ -50,8 +50,8 @@ if (isset($_POST['ok'])) {
        $SQL = array();
        switch ($_GET['do']) {
        case "add":
        $SQL = array();
        switch ($_GET['do']) {
        case "add":

-               $SQLs[] = "INSERT INTO `{!MYSQL_PREFIX!}_payments` (time, payment, mail_title, price) VALUES ('".$_POST['t_wait']."','".$_POST['payment']."','".$_POST['title']."','".$_POST['price']."')";
-               $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_payments` WHERE time='%s' LIMIT 1",
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_payments` (time, payment, mail_title, price) VALUES ('".$_POST['t_wait']."','".$_POST['payment']."','".$_POST['title']."','".$_POST['price']."')";
+               $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_payments` WHERE time='%s' LIMIT 1",

                 array($_POST['t_wait']), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Free memory
                 array($_POST['t_wait']), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Free memory


@@ -62,13 +62,13 @@ if (isset($_POST['ok'])) {
 
        case "edit":
                foreach ($_POST['time'] as $id => $value) {
 
        case "edit":
                foreach ($_POST['time'] as $id => $value) {

-                       $SQLs[] = "UPDATE `{!MYSQL_PREFIX!}_payments` SET time='".$value."', payment='".$_POST['pay'][$id]."', price='".$_POST['price'][$id]."', mail_title='".$_POST['title'][$id]."' WHERE id='".$id."' LIMIT 1";
+                       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_payments` SET time='".$value."', payment='".$_POST['pay'][$id]."', price='".$_POST['price'][$id]."', mail_title='".$_POST['title'][$id]."' WHERE id='".$id."' LIMIT 1";

                }
                break;
 
        case "del":
                foreach ($_POST['id'] as $id => $value) {
                }
                break;
 
        case "del":
                foreach ($_POST['id'] as $id => $value) {

-                       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_payments` WHERE id='".$id."' LIMIT 1";
+                       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_payments` WHERE id='".$id."' LIMIT 1";

                }
                break;
        }
                }
                break;
        }


@@ -89,7 +89,7 @@ if (isset($_POST['ok'])) {
        // Delete entries here
        $SW = 2; $OUT = "";
        foreach ($_POST['sel'] as $id => $value) {
        // Delete entries here
        $SW = 2; $OUT = "";
        foreach ($_POST['sel'] as $id => $value) {

-               $result = SQL_QUERY_ESC("SELECT time, mail_title FROM `{!MYSQL_PREFIX!}_payments` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT time, mail_title FROM `{!_MYSQL_PREFIX!}_payments` WHERE id=%s LIMIT 1",

                        array(bigintval($id)), __FILE__, __LINE__);
                list($time, $title) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                        array(bigintval($id)), __FILE__, __LINE__);
                list($time, $title) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);


@@ -114,7 +114,7 @@ if (isset($_POST['ok'])) {
        // Edit entries
        $SW = 2; $OUT = "";
        foreach ($_POST['sel'] as $id => $value) {
        // Edit entries
        $SW = 2; $OUT = "";
        foreach ($_POST['sel'] as $id => $value) {

-               $result = SQL_QUERY_ESC("SELECT time, payment, mail_title, price FROM `{!MYSQL_PREFIX!}_payments` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT time, payment, mail_title, price FROM `{!_MYSQL_PREFIX!}_payments` WHERE id=%s LIMIT 1",

                 array(bigintval($id)), __FILE__, __LINE__);
                list($time, $pay, $title, $price) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                 array(bigintval($id)), __FILE__, __LINE__);
                list($time, $pay, $title, $price) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);


@@ -139,7 +139,7 @@ if (isset($_POST['ok'])) {
        LOAD_TEMPLATE("admin_edit_payments");
 } else {
        // Referal levels
        LOAD_TEMPLATE("admin_edit_payments");
 } else {
        // Referal levels

-       $result = SQL_QUERY("SELECT id, time, payment, mail_title, price FROM `{!MYSQL_PREFIX!}_payments` ORDER BY time", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, time, payment, mail_title, price FROM `{!_MYSQL_PREFIX!}_payments` ORDER BY time", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) > 0) {
                // Make referal levels editable and deletable
                $SW = 2; $OUT = "";
        if (SQL_NUMROWS($result) > 0) {
                // Make referal levels editable and deletable
                $SW = 2; $OUT = "";

diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php
index d9a27694f23dc92b498567cb4bd787eff9d2f220..7b73f1148b2a79b192d6053b4e5193a45ccd6883 100644 (file)
--- a/inc/modules/admin/what-refbanner.php
+++ b/inc/modules/admin/what-refbanner.php
@@ -59,11 +59,11 @@ if (isset($_POST['ok'])) {
        {
        case "add":
                // Check if banner is already added
        {
        case "add":
                // Check if banner is already added

-               $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_refbanner` WHERE url='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_refbanner` WHERE url='%s' LIMIT 1",

                        array($_POST['url']), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 0) {
                        // Add banner
                        array($_POST['url']), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 0) {
                        // Add banner

-                       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_refbanner` (url, alternate, visible)
+                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_refbanner` (url, alternate, visible)

 VALUES ('%s','%s','%s')",
                                array($_POST['url'], $_POST['alternate'], $_POST['visible']), __FILE__, __LINE__);
                } else {
 VALUES ('%s','%s','%s')",
                                array($_POST['url'], $_POST['alternate'], $_POST['visible']), __FILE__, __LINE__);
                } else {


@@ -78,7 +78,7 @@ VALUES ('%s','%s','%s')",
                        $id = bigintval($id);
 
                        // Update entry
                        $id = bigintval($id);
 
                        // Update entry

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_refbanner` SET url='%s', alternate='%s', visible='%s' WHERE id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_refbanner` SET url='%s', alternate='%s', `visible`='%s' WHERE id=%s LIMIT 1",

                                array($_POST['url'][$id], $_POST['alternate'][$id], $_POST['visible'], $id), __FILE__, __LINE__);
                }
                break;
                                array($_POST['url'][$id], $_POST['alternate'][$id], $_POST['visible'], $id), __FILE__, __LINE__);
                }
                break;


@@ -95,7 +95,7 @@ VALUES ('%s','%s','%s')",
        $SW = ""; $OUT = "";
        foreach ($_POST['sel'] as $id => $sel) {
                // Load data
        $SW = ""; $OUT = "";
        foreach ($_POST['sel'] as $id => $sel) {
                // Load data

-               $result = SQL_QUERY_ESC("SELECT url, alternate, visible FROM `{!MYSQL_PREFIX!}_refbanner` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT url, alternate, visible FROM `{!_MYSQL_PREFIX!}_refbanner` WHERE id=%s LIMIT 1",

                 array(bigintval($id)), __FILE__, __LINE__);
                list($url, $alt, $vis) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                 array(bigintval($id)), __FILE__, __LINE__);
                list($url, $alt, $vis) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);


@@ -122,13 +122,13 @@ VALUES ('%s','%s','%s')",
        {
                // Delete banner
                foreach ($_POST['sel'] as $id => $sel) {
        {
                // Delete banner
                foreach ($_POST['sel'] as $id => $sel) {

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_refbanner` WHERE id=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_refbanner` WHERE id=%s LIMIT 1",

                                array(bigintval($id)), __FILE__, __LINE__);
                }
        }
 
        // Referal levels
                                array(bigintval($id)), __FILE__, __LINE__);
                }
        }
 
        // Referal levels

-       $result = SQL_QUERY("SELECT id, url, alternate, visible, counter, clicks FROM `{!MYSQL_PREFIX!}_refbanner` ORDER BY url", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, url, alternate, visible, counter, clicks FROM `{!_MYSQL_PREFIX!}_refbanner` ORDER BY url", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) > 0)
        {
                // Make referal banner editable and deletable
        if (SQL_NUMROWS($result) > 0)
        {
                // Make referal banner editable and deletable

diff --git a/inc/modules/admin/what-repair_amenu.php b/inc/modules/admin/what-repair_amenu.php
index 65df8b2005f956d41f66bd1c42b076f68928892b..e17ad5ad9ed9895a0ac54557b56d3dc9bfaab410 100644 (file)
--- a/inc/modules/admin/what-repair_amenu.php
+++ b/inc/modules/admin/what-repair_amenu.php
@@ -42,14 +42,14 @@ ADD_DESCR("admin", __FILE__);
 
 $ACTIONS = array();
 // First fix all main menus (what="")...
 
 $ACTIONS = array();
 // First fix all main menus (what="")...

-$result_fix = SQL_QUERY("SELECT id, action FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR what IS NULL) AND action != 'logout' ORDER BY sort ASC", __FILE__, __LINE__);
+$result_fix = SQL_QUERY("SELECT id, action FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) AND action != 'logout' ORDER BY `sort` ASC", __FILE__, __LINE__);

 $cnt = 0; $REP = 0;
 $cnt = 0; $REP = 0;

-while(list($id, $act) = SQL_FETCHROW($result_fix)) {
+while (list($id, $act) = SQL_FETCHROW($result_fix)) {

        // Store act value for later usage in sorting sub menus
        $ACTIONS[] = $act;
 
        // Fix weight
        // Store act value for later usage in sorting sub menus
        $ACTIONS[] = $act;
 
        // Fix weight

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET sort=%s WHERE id=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET sort=%s WHERE id=%s LIMIT 1",

                array($cnt, $id), __FILE__, __LINE__);
        $REP += SQL_AFFECTEDROWS();
 
                array($cnt, $id), __FILE__, __LINE__);
        $REP += SQL_AFFECTEDROWS();
 


@@ -58,16 +58,16 @@ while(list($id, $act) = SQL_FETCHROW($result_fix)) {
 }
 
 // Set logout weight to 999
 }
 
 // Set logout weight to 999

-SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET sort='999' WHERE action='logout' AND (what='' OR what IS NULL) LIMIT 1", __FILE__, __LINE__);
+SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET sort='999' WHERE action='logout' AND (what='' OR `what` IS NULL) LIMIT 1", __FILE__, __LINE__);

 
 // Now sort every each menu
 foreach ($ACTIONS as $act) {
 
 // Now sort every each menu
 foreach ($ACTIONS as $act) {

-       $result_fix = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_admin_menu` WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
+       $result_fix = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",

                array($act), __FILE__, __LINE__);
        $cnt = 1;
        while (list($id) = SQL_FETCHROW($result_fix)) {
                // Fix weight
                array($act), __FILE__, __LINE__);
        $cnt = 1;
        while (list($id) = SQL_FETCHROW($result_fix)) {
                // Fix weight

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_admin_menu` SET sort=%s WHERE id=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET sort=%s WHERE id=%s LIMIT 1",

                        array($cnt, $id), __FILE__, __LINE__);
                $REP += SQL_AFFECTEDROWS();
 
                        array($cnt, $id), __FILE__, __LINE__);
                $REP += SQL_AFFECTEDROWS();
 

diff --git a/inc/modules/admin/what-repair_cats.php b/inc/modules/admin/what-repair_cats.php
index f74cf27bf4ee6b5044f8045ec239c093528526e2..1d21c495f21159485aceab34d0bab2742452f288 100644 (file)
--- a/inc/modules/admin/what-repair_cats.php
+++ b/inc/modules/admin/what-repair_cats.php
@@ -40,16 +40,16 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR("admin", __FILE__);
 
 // Add description as navigation point
 ADD_DESCR("admin", __FILE__);
 

-$result = SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_cats` ORDER BY userid", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_cats` ORDER BY userid", __FILE__, __LINE__);

 if (SQL_NUMROWS($result) > 0) {
        // Check if found userid is also found in user_data table
        $REMOVED = 0; // Nothing is removed for now... ;-)
        while (list($uid) = SQL_FETCHROW($result)) {
 if (SQL_NUMROWS($result) > 0) {
        // Check if found userid is also found in user_data table
        $REMOVED = 0; // Nothing is removed for now... ;-)
        while (list($uid) = SQL_FETCHROW($result)) {

-               $result_user = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+               $result_user = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                        array(bigintval($uid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result_user) == 0) {
                        // Ok, we found something to remove
                        array(bigintval($uid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result_user) == 0) {
                        // Ok, we found something to remove

-                       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__);
                        $REMOVED += SQL_AFFECTEDROWS();
                } else {
                                array(bigintval($uid)), __FILE__, __LINE__);
                        $REMOVED += SQL_AFFECTEDROWS();
                } else {

diff --git a/inc/modules/admin/what-repair_gmenu.php b/inc/modules/admin/what-repair_gmenu.php
index b5fa87deb9db75a5a851a06807a5d03a53604470..0215024dfab911f1b23263eb9f390e69cc1f41f8 100644 (file)
--- a/inc/modules/admin/what-repair_gmenu.php
+++ b/inc/modules/admin/what-repair_gmenu.php
@@ -42,31 +42,31 @@ ADD_DESCR("admin", __FILE__);
 
 $ACTIONS = array();
 // First fix all main menus (what="")...
 
 $ACTIONS = array();
 // First fix all main menus (what="")...

-$result_fix = SQL_QUERY("SELECT id, action FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE (what='' OR what IS NULL) AND action != 'logout' ORDER BY sort ASC", __FILE__, __LINE__);
+$result_fix = SQL_QUERY("SELECT id, action FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE (what='' OR `what` IS NULL) AND action != 'logout' ORDER BY `sort` ASC", __FILE__, __LINE__);

 $cnt = 0; $REP = 0;
 $cnt = 0; $REP = 0;

-while(list($id, $act) = SQL_FETCHROW($result_fix))
+while (list($id, $act) = SQL_FETCHROW($result_fix))

 {
        // Store act value for later usage in sorting sub menus
        $ACTIONS[] = $act;
 
        // Fix weight
 {
        // Store act value for later usage in sorting sub menus
        $ACTIONS[] = $act;
 
        // Fix weight

-       $result_sort = SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET sort='".$cnt."' WHERE id='".$id."' LIMIT 1", __FILE__, __LINE__);
+       $result_sort = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET sort='".$cnt."' WHERE id='".$id."' LIMIT 1", __FILE__, __LINE__);

        $REP += SQL_AFFECTEDROWS();
 
        // Count one up
        $cnt++;
 }
 // Set logout weight to 999
        $REP += SQL_AFFECTEDROWS();
 
        // Count one up
        $cnt++;
 }
 // Set logout weight to 999

-$result_sort = SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET sort='999' WHERE action='logout' AND (what='' OR what IS NULL) LIMIT 1", __FILE__, __LINE__);
+$result_sort = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET sort='999' WHERE action='logout' AND (what='' OR `what` IS NULL) LIMIT 1", __FILE__, __LINE__);

 
 // Now sort every each menu
 foreach ($ACTIONS as $act) {
 
 // Now sort every each menu
 foreach ($ACTIONS as $act) {

-       $result_fix = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
+       $result_fix = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE action='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",

                array($act), __FILE__, __LINE__);
        $cnt = 1;
        while (list($id) = SQL_FETCHROW($result_fix)) {
                // Fix weight
                array($act), __FILE__, __LINE__);
        $cnt = 1;
        while (list($id) = SQL_FETCHROW($result_fix)) {
                // Fix weight

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_guest_menu` SET sort=%s WHERE id=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET sort=%s WHERE id=%s LIMIT 1",

                        array($cnt, $id), __FILE__, __LINE__);
                $REP += SQL_AFFECTEDROWS();
 
                        array($cnt, $id), __FILE__, __LINE__);
                $REP += SQL_AFFECTEDROWS();
 

diff --git a/inc/modules/admin/what-repair_mmenu.php b/inc/modules/admin/what-repair_mmenu.php
index 3383d01bcbd75259ae9598d9507bb2e407093baf..0e8b32f4049054dda805b4970b13eeed7cf3c816 100644 (file)
--- a/inc/modules/admin/what-repair_mmenu.php
+++ b/inc/modules/admin/what-repair_mmenu.php
@@ -42,14 +42,14 @@ ADD_DESCR("admin", __FILE__);
 
 $ACTIONS = array();
 // First fix all main menus (what="")...
 
 $ACTIONS = array();
 // First fix all main menus (what="")...

-$result_fix = SQL_QUERY("SELECT id, action FROM `{!MYSQL_PREFIX!}_member_menu` WHERE (what='' OR what IS NULL) AND action != 'logout' ORDER BY sort ASC", __FILE__, __LINE__);
+$result_fix = SQL_QUERY("SELECT id, action FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (what='' OR `what` IS NULL) AND action != 'logout' ORDER BY `sort` ASC", __FILE__, __LINE__);

 $cnt = 0; $REP = 0;
 $cnt = 0; $REP = 0;

-while(list($id, $act) = SQL_FETCHROW($result_fix)) {
+while (list($id, $act) = SQL_FETCHROW($result_fix)) {

        // Store action value for later usage in sorting sub menus
        $ACTIONS[] = $act;
 
        // Fix weight
        // Store action value for later usage in sorting sub menus
        $ACTIONS[] = $act;
 
        // Fix weight

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_member_menu` SET sort=%s WHERE id=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET sort=%s WHERE id=%s LIMIT 1",

                array($cnt, $id), __FILE__, __LINE__);
        $REP += SQL_AFFECTEDROWS();
 
                array($cnt, $id), __FILE__, __LINE__);
        $REP += SQL_AFFECTEDROWS();
 


@@ -57,16 +57,16 @@ while(list($id, $act) = SQL_FETCHROW($result_fix)) {
        $cnt++;
 }
 // Set logout weight to 999
        $cnt++;
 }
 // Set logout weight to 999

-SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_member_menu` SET sort='999' WHERE action='logout' AND (what='' OR what IS NULL) LIMIT 1", __FILE__, __LINE__);
+SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET sort='999' WHERE action='logout' AND (what='' OR `what` IS NULL) LIMIT 1", __FILE__, __LINE__);

 
 // Now sort every each menu
 foreach ($ACTIONS as $act) {
 
 // Now sort every each menu
 foreach ($ACTIONS as $act) {

-       $result_fix = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_member_menu` WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
+       $result_fix = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE action='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",

                array($act), __FILE__, __LINE__);
        $cnt = 1;
        while (list($id) = SQL_FETCHROW($result_fix)) {
                // Fix weight
                array($act), __FILE__, __LINE__);
        $cnt = 1;
        while (list($id) = SQL_FETCHROW($result_fix)) {
                // Fix weight

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_member_menu` SET sort=%s WHERE id=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET sort=%s WHERE id=%s LIMIT 1",

                        array($cnt, $id), __FILE__, __LINE__);
                $REP += SQL_AFFECTEDROWS();
 
                        array($cnt, $id), __FILE__, __LINE__);
                $REP += SQL_AFFECTEDROWS();
 

diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index 3ad19859d797c08be5b8ea751d4014c219ce19f4..2db5f51889357fdc7fc4b8853c01bf37b744939e 100644 (file)
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -42,7 +42,7 @@ ADD_DESCR("admin", __FILE__);
 
 if (isset($_POST['ok'])) {
        $result = SQL_QUERY("SELECT userid, email
 
 if (isset($_POST['ok'])) {
        $result = SQL_QUERY("SELECT userid, email

-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE status='CONFIRMED' AND nl_receive='Y'
 ORDER BY userid ASC", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
 WHERE status='CONFIRMED' AND nl_receive='Y'
 ORDER BY userid ASC", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {


@@ -74,7 +74,7 @@ ORDER BY userid ASC", __FILE__, __LINE__);
                SQL_FREERESULT($result);
 
                // Output message
                SQL_FREERESULT($result);
 
                // Output message

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NL_SEND_DONE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NL_SEND_DONE'));

        }
 } else {
        // Copy data into constants for the template and load it
        }
 } else {
        // Copy data into constants for the template and load it

diff --git a/inc/modules/admin/what-stats_mods.php b/inc/modules/admin/what-stats_mods.php
index 9d9fc055063be13c1e9bdb375c7965379edcf23d..59a1c99fa3d6c45f4edab75a510998519b6a793d 100644 (file)
--- a/inc/modules/admin/what-stats_mods.php
+++ b/inc/modules/admin/what-stats_mods.php
@@ -55,10 +55,10 @@ if (($_GET['mod'] == "index") || ($_GET['mod'] == "login"))
        }
 
        // Load module's detail statistic
        }
 
        // Load module's detail statistic

-       $result = SQL_QUERY_ESC("SELECT action, title, counter FROM `{!MYSQL_PREFIX!}_%s_menu` WHERE what != '' AND what IS NOT NULL ORDER BY counter DESC",
+       $result = SQL_QUERY_ESC("SELECT action, title, counter FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `what` != '' AND `what` IS NOT NULL ORDER BY counter DESC",

                array($mod), __FILE__, __LINE__);
        $SW = 2; $OUT = "";
                array($mod), __FILE__, __LINE__);
        $SW = 2; $OUT = "";

-       while(list($act, $title, $clicks) = SQL_FETCHROW($result))
+       while (list($act, $title, $clicks) = SQL_FETCHROW($result))

        {
                // Prepare array for the template
                $content = array(
        {
                // Prepare array for the template
                $content = array(


@@ -81,19 +81,16 @@ if (($_GET['mod'] == "index") || ($_GET['mod'] == "login"))
 
        // Load final template
        LOAD_TEMPLATE("admin_mods_stats2");
 
        // Load final template
        LOAD_TEMPLATE("admin_mods_stats2");

-}
- else
-{
+} else {

        // Load module statics
        // Load module statics

-       $result = SQL_QUERY("SELECT module, title, clicks FROM `{!MYSQL_PREFIX!}_mod_reg` ORDER BY clicks DESC, module", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT module, title, clicks FROM `{!_MYSQL_PREFIX!}_mod_reg` ORDER BY clicks DESC, module", __FILE__, __LINE__);

        $SW = 2; $OUT = "";
        $SW = 2; $OUT = "";

-       while(list($mod, $title, $clicks) = SQL_FETCHROW($result))
-       {
+       while (list($mod, $title, $clicks) = SQL_FETCHROW($result)) {

                if (empty($title)) $title = "---";
                if (($mod == "index") || ($mod == "login"))
                {
                        // Add link to detail statistics
                if (empty($title)) $title = "---";
                if (($mod == "index") || ($mod == "login"))
                {
                        // Add link to detail statistics

-                       $mod = "<strong><a href=\"".URL."/modules.php?module=admin&amp;what=stats_mods&amp;mod=".$mod."\">".$mod."</a></strong>";
+                       $mod = "<strong><a href=\"{!URL!}/modules.php?module=admin&amp;what=stats_mods&amp;mod=".$mod."\">".$mod."</a></strong>";

                }
                // Prepare array for the template
                $content = array(
                }
                // Prepare array for the template
                $content = array(

diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php
index 04f1fd51de30a7b657eea6edb2344fd74d5734cf..4a2f0269567bffa248738897bbb61c5fb0524845 100644 (file)
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -43,26 +43,25 @@ ADD_DESCR("admin", __FILE__);
 // Fix a notice
 if (!isset($_GET['u_id'])) $_GET['u_id'] = "";
 
 // Fix a notice
 if (!isset($_GET['u_id'])) $_GET['u_id'] = "";
 

-if ($_GET['u_id'] == "all")
-{
+if ($_GET['u_id'] == "all") {

        // Add points to all accounts
        define('__POINTS_VALUE', $_POST['points']);
        // Add points to all accounts
        define('__POINTS_VALUE', $_POST['points']);

-       if ((isset($_POST['ok'])) && ($_POST['points'] > 0))
-       {
-               $result_main = SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
-               while (list($uid) = SQL_FETCHROW($result_main))
-               {
+       if ((isset($_POST['ok'])) && ($_POST['points'] > 0)) {
+               $result_main = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
+               while (list($uid) = SQL_FETCHROW($result_main)) {

                        // User ID found in URL so we use this give him some credits
                        // User ID found in URL so we use this give him some credits

-                       $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
-                        array(bigintval($uid)), __FILE__, __LINE__);
-                       if (SQL_NUMROWS($result) == 1)
-                       {
+                       $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+                               array(bigintval($uid)), __FILE__, __LINE__);
+
+                       // Entry found?
+                       if (SQL_NUMROWS($result) == 1) {

                                // Selected user does exist
                                list($sname, $fname, $email) = SQL_FETCHROW($result);
                                // Selected user does exist
                                list($sname, $fname, $email) = SQL_FETCHROW($result);

+
+                               // Free result

                                SQL_FREERESULT($result);
 
                                SQL_FREERESULT($result);
 

-                               if ((isset($_POST['ok'])) && (!empty($_POST['points'])))
-                               {
+                               if ((isset($_POST['ok'])) && (!empty($_POST['points']))) {

                                        // Ok, add points to used points and send an email to him...
                                        SUB_POINTS("admin_all", $uid, $_POST['points']);
 
                                        // Ok, add points to used points and send an email to him...
                                        SUB_POINTS("admin_all", $uid, $_POST['points']);
 


@@ -74,7 +73,7 @@ if ($_GET['u_id'] == "all")
 
                                        // Load message and send it away
                                        $msg = LOAD_EMAIL_TEMPLATE("sub-points", $content, bigintval($uid));
 
                                        // Load message and send it away
                                        $msg = LOAD_EMAIL_TEMPLATE("sub-points", $content, bigintval($uid));

-                                       SEND_EMAIL(bigintval($uid), ADMIN_SUB_SUBJ, $msg);
+                                       SEND_EMAIL(bigintval($uid), getMessage('ADMIN_SUB_SUBJ'), $msg);

                                }
                        }
                }
                                }
                        }
                }


@@ -82,19 +81,15 @@ if ($_GET['u_id'] == "all")
                SQL_FREERESULT($result_main);
 
                // Output message
                SQL_FREERESULT($result_main);
 
                // Output message

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ALL_POINTS_SUBTRACTED);
-       }
-        else
-       {
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ALL_POINTS_SUBTRACTED'));
+       } else {

                // Display form add points
                LOAD_TEMPLATE("admin_sub_points_all");
        }
                // Display form add points
                LOAD_TEMPLATE("admin_sub_points_all");
        }

-}
- elseif (!empty($_GET['u_id']))
-{
+} elseif (!empty($_GET['u_id'])) {

        // User ID found in URL so we use this give him some credits
        // User ID found in URL so we use this give him some credits

-       $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
-        array(bigintval($_GET['u_id'])),__FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+               array(bigintval($_GET['u_id'])),__FILE__, __LINE__);

        if (SQL_NUMROWS($result) == 1) {
                // Selected user does exist
                list($sname, $fname, $email) = SQL_FETCHROW($result);
        if (SQL_NUMROWS($result) == 1) {
                // Selected user does exist
                list($sname, $fname, $email) = SQL_FETCHROW($result);


@@ -112,10 +107,10 @@ if ($_GET['u_id'] == "all")
 
                        // Load email and send it away
                        $msg = LOAD_EMAIL_TEMPLATE("sub-points", $content, bigintval($_GET['u_id']));
 
                        // Load email and send it away
                        $msg = LOAD_EMAIL_TEMPLATE("sub-points", $content, bigintval($_GET['u_id']));

-                       SEND_EMAIL(bigintval($_GET['u_id']), ADMIN_SUB_SUBJ, $msg);
+                       SEND_EMAIL(bigintval($_GET['u_id']), getMessage('ADMIN_SUB_SUBJ'), $msg);

 
                        // Output message
 
                        // Output message

-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_POINTS_SUBTRACTED);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_POINTS_SUBTRACTED'));

                } else {
                        // Opps, missing form here
                        define('__USER_VALUE', "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</a>");
                } else {
                        // Opps, missing form here
                        define('__USER_VALUE', "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</a>");

diff --git a/inc/modules/admin/what-surfbar_stats.php b/inc/modules/admin/what-surfbar_stats.php
index ea53ffdfe925ff44d8e18e694cfe2982a549ee7e..2696de21fae58a7ca0f4ffc0bb2ab0c7fd39ba7a 100644 (file)
--- a/inc/modules/admin/what-surfbar_stats.php
+++ b/inc/modules/admin/what-surfbar_stats.php
@@ -44,7 +44,7 @@ ADD_DESCR("admin", __FILE__);
 if (isset($_GET['url_id'])) {
        // Generate general statistics
        $result = SQL_QUERY_ESC("SELECT `userid`, `count` AS `total_visits`, UNIX_TIMESTAMP(`last_online`) AS `last_online`
 if (isset($_GET['url_id'])) {
        // Generate general statistics
        $result = SQL_QUERY_ESC("SELECT `userid`, `count` AS `total_visits`, UNIX_TIMESTAMP(`last_online`) AS `last_online`

-FROM `{!MYSQL_PREFIX!}_surfbar_stats`
+FROM `{!_MYSQL_PREFIX!}_surfbar_stats`

 WHERE `url_id`=%s
 ORDER BY `userid` ASC",
                array(bigintval($_GET['url_id'])), __FILE__, __LINE__);
 WHERE `url_id`=%s
 ORDER BY `userid` ASC",
                array(bigintval($_GET['url_id'])), __FILE__, __LINE__);


@@ -80,12 +80,12 @@ ORDER BY `userid` ASC",
                LOAD_TEMPLATE("admin_surfbar_url_stats", false, $content);
        } else {
                // No statistics so far
                LOAD_TEMPLATE("admin_surfbar_url_stats", false, $content);
        } else {
                // No statistics so far

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_NO_URL_STATS);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_NO_URL_STATS'));

        }
 } else {
        // Generate general statistics
        $result = SQL_QUERY("SELECT `userid`, COUNT(`url_id`) AS `visited_urls`, SUM(`count`) AS `total_visits`
        }
 } else {
        // Generate general statistics
        $result = SQL_QUERY("SELECT `userid`, COUNT(`url_id`) AS `visited_urls`, SUM(`count`) AS `total_visits`

-FROM `{!MYSQL_PREFIX!}_surfbar_stats`
+FROM `{!_MYSQL_PREFIX!}_surfbar_stats`

 GROUP BY `userid`
 ORDER BY `userid` ASC", __FILE__, __LINE__);
 
 GROUP BY `userid`
 ORDER BY `userid` ASC", __FILE__, __LINE__);
 


@@ -121,7 +121,7 @@ ORDER BY `userid` ASC", __FILE__, __LINE__);
                LOAD_TEMPLATE("admin_surfbar_stats", false, $content);
        } else {
                // No statistics so far
                LOAD_TEMPLATE("admin_surfbar_stats", false, $content);
        } else {
                // No statistics so far

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_NO_STATS);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_NO_STATS'));

        }
 }
 
        }
 }
 

diff --git a/inc/modules/admin/what-theme_check.php b/inc/modules/admin/what-theme_check.php
index 3e2bc146dea399b19ec577fc876c31016da76059..9cff81bebef0cdcabed9858d75f960f9972ac0be 100644 (file)
--- a/inc/modules/admin/what-theme_check.php
+++ b/inc/modules/admin/what-theme_check.php
@@ -149,7 +149,7 @@ if (($response[sizeof($response) - 1] == "[EOF]") && ($response[0] != "[EOF]"))
        }
 } else {
        // No theme where found
        }
 } else {
        // No theme where found

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_THEME_NOTHING_FOUND);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_THEME_NOTHING_FOUND'));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index 826b650a27feece5e1058ae1abd5d22ab7c1cb30..5eff513dc6484302b448c3c749cba54fdcbc229d 100644 (file)
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -54,14 +54,14 @@ if ($SEL > 0) {
                if (isset($_POST['status'])) {
                        // Change status
                        if ($_POST['active'][$id] == "Y") {
                if (isset($_POST['status'])) {
                        // Change status
                        if ($_POST['active'][$id] == "Y") {

-                               $SQL = "UPDATE `{!MYSQL_PREFIX!}_themes` SET theme_active='N' WHERE id='".$id."' LIMIT 1";
+                               $SQL = "UPDATE `{!_MYSQL_PREFIX!}_themes` SET theme_active='N' WHERE id='".$id."' LIMIT 1";

                        } else {
                        } else {

-                               $SQL = "UPDATE `{!MYSQL_PREFIX!}_themes` SET theme_active='Y' WHERE id='".$id."' LIMIT 1";
+                               $SQL = "UPDATE `{!_MYSQL_PREFIX!}_themes` SET theme_active='Y' WHERE id='".$id."' LIMIT 1";

                        }
                        $OUT = ADMIN_THEMES_UPDATED;
                } elseif (isset($_POST['del'])) {
                        // Delete themes
                        }
                        $OUT = ADMIN_THEMES_UPDATED;
                } elseif (isset($_POST['del'])) {
                        // Delete themes

-                       $SQL = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_themes` WHERE id='".$id."' LIMIT 1";
+                       $SQL = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_themes` WHERE id='".$id."' LIMIT 1";

                        $OUT = ADMIN_THEMES_DELETED;
                }
 
                        $OUT = ADMIN_THEMES_DELETED;
                }
 


@@ -98,15 +98,15 @@ $THEME_MODE = "test";
 
 // Generate output lines for the template
 $OUT = ""; $SW = 2;
 
 // Generate output lines for the template
 $OUT = ""; $SW = 2;

-$result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver, theme_name FROM `{!MYSQL_PREFIX!}_themes` ORDER BY theme_path", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver, theme_name FROM `{!_MYSQL_PREFIX!}_themes` ORDER BY theme_path", __FILE__, __LINE__);

 if (SQL_NUMROWS($result) > 0) {
 if (SQL_NUMROWS($result) > 0) {

-       while(list($id, $unix, $active, $ver, $name) = SQL_FETCHROW($result)) {
+       while (list($id, $unix, $active, $ver, $name) = SQL_FETCHROW($result)) {

                // Load theme in test mode
                require(PATH."theme/".$unix."/theme.php");
 
                // Is the loaded theme name != current theme name?
                $LINK = $unix;
                // Load theme in test mode
                require(PATH."theme/".$unix."/theme.php");
 
                // Is the loaded theme name != current theme name?
                $LINK = $unix;

-               if ($unix != GET_CURR_THEME()) $LINK = "<a href=\"".URL."/modules.php?module=admin&amp;what=theme_edit&amp;default_theme=".$unix."\" title=\"".ADMIN_SET_AS_NEW_THEME."\">".$unix."</a>";
+               if ($unix != GET_CURR_THEME()) $LINK = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=theme_edit&amp;default_theme=".$unix."\" title=\"".ADMIN_SET_AS_NEW_THEME."\">".$unix."</a>";

 
                // Prepare data for the row template
                $content = array(
 
                // Prepare data for the row template
                $content = array(


@@ -133,7 +133,7 @@ if (SQL_NUMROWS($result) > 0) {
                // No themes found???
        $OUT .= "<tr>
   <td colspan=\"7\" class=\"bottom2\" height=\"60\">
                // No themes found???
        $OUT .= "<tr>
   <td colspan=\"7\" class=\"bottom2\" height=\"60\">

-    ".LOAD_TEMPLATE("admin_settings_saved", true, ADMIN_NO_THEMES_FOUND)."
+    ".LOAD_TEMPLATE("admin_settings_saved", true, getMessage('ADMIN_NO_THEMES_FOUND'))."

   </td>
 </tr>\n";
 }
   </td>
 </tr>\n";
 }

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index cc1cc05f9edc4b1fd40dac9208ecc9f0d577f6e6..d8ab90b5c82cd0871ac3e16754cf609c56638bb9 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -57,7 +57,7 @@ if (!empty($_POST['theme'])) {
                        require($file);
 
                        // Register it ith the exchange
                        require($file);
 
                        // Register it ith the exchange

-                       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_themes` (`theme_path`, `theme_active`, `theme_ver`, `theme_name`)
+                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_themes` (`theme_path`, `theme_active`, `theme_ver`, `theme_name`)

 VALUES ('%s','N','%s','%s')",
                                array($_POST['theme'], $THEME_VERSION, $THEME_NAME), __FILE__, __LINE__);
 
 VALUES ('%s','N','%s','%s')",
                                array($_POST['theme'], $THEME_VERSION, $THEME_NAME), __FILE__, __LINE__);
 


@@ -123,10 +123,10 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
        // Check if current theme is already imported or not
        if (THEME_CHECK_EXIST($unix)) {
                // Already installed
        // Check if current theme is already imported or not
        if (THEME_CHECK_EXIST($unix)) {
                // Already installed

-               $FOUND = "<div class=\"admin_note\">".ADMIN_THEME_ALREADY_INSTALLED."</div>";
+               $FOUND = "<div class=\"admin_note\">{!ADMIN_THEME_ALREADY_INSTALLED!}</div>";

        } else {
                // Theme not installed
        } else {
                // Theme not installed

-               $FOUND = "<form action=\"".URL."/modules.php?module=admin&amp;what=theme_import\" method=\"POST\">
+               $FOUND = "<form action=\"{!URL!}/modules.php?module=admin&amp;what=theme_import\" method=\"POST\">

   <input type=\"submit\" name=\"ok\" class=\"admin_submit\" value=\"{!ADMIN_INSTALL_THEME!}\" />
   <input type=\"hidden\" name=\"theme\" value=\"".$unix."\" />
 </form>";
   <input type=\"submit\" name=\"ok\" class=\"admin_submit\" value=\"{!ADMIN_INSTALL_THEME!}\" />
   <input type=\"hidden\" name=\"theme\" value=\"".$unix."\" />
 </form>";


@@ -156,7 +156,7 @@ if (empty($OUT)) {
        // No themes found???
        $OUT .= "<tr>
   <td colspan=\"6\" class=\"bottom2\" height=\"80\">
        // No themes found???
        $OUT .= "<tr>
   <td colspan=\"6\" class=\"bottom2\" height=\"80\">

-    ".LOAD_TEMPLATE("admin_settings_saved", true, ADMIN_NO_THEMES_FOUND)."
+    ".LOAD_TEMPLATE("admin_settings_saved", true, getMessage('ADMIN_NO_THEMES_FOUND'))."

   </td>
 </tr>\n";
 } // END - if
   </td>
 </tr>\n";
 } // END - if

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index 45ccd127bad3578c62710afbd1144cce2d233411..b47c51cf42c863998fbcaf26e84d4edb4481fd1b 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -45,7 +45,7 @@ global $DATA;
 
 // Check for mails
 $result_main = SQL_QUERY("SELECT `id`, `sender`, `subject`, `payment_id` AS `payment`, `timestamp`, `url`, `target_send`, `cat_id` AS `category`
 
 // Check for mails
 $result_main = SQL_QUERY("SELECT `id`, `sender`, `subject`, `payment_id` AS `payment`, `timestamp`, `url`, `target_send`, `cat_id` AS `category`

-FROM `{!MYSQL_PREFIX!}_pool`
+FROM `{!_MYSQL_PREFIX!}_pool`

 WHERE `data_type`='ADMIN'
 ORDER BY `timestamp` ASC", __FILE__, __LINE__);
 
 WHERE `data_type`='ADMIN'
 ORDER BY `timestamp` ASC", __FILE__, __LINE__);
 


@@ -69,8 +69,8 @@ if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock']))) {
 
                                // Order placed in queue...
                                $result = SQL_QUERY_ESC("SELECT po.url, po.subject, po.sender, pay.payment, po.payment_id
 
                                // Order placed in queue...
                                $result = SQL_QUERY_ESC("SELECT po.url, po.subject, po.sender, pay.payment, po.payment_id

-FROM `{!MYSQL_PREFIX!}_pool` AS po
-INNER JOIN `{!MYSQL_PREFIX!}_payments` AS pay
+FROM `{!_MYSQL_PREFIX!}_pool` AS po
+INNER JOIN `{!_MYSQL_PREFIX!}_payments` AS pay

 ON po.payment_id=pay.id
 WHERE po.id=%s
 LIMIT 1",
 ON po.payment_id=pay.id
 WHERE po.id=%s
 LIMIT 1",


@@ -93,7 +93,7 @@ LIMIT 1",
                                        // Check for bonus extension version >= 0.4.4 for the order bonus
                                        if ((GET_EXT_VERSION("bonus") >= "0.4.4") && (getConfig('bonus_active') == "Y")) {
                                                // Add points directly
                                        // Check for bonus extension version >= 0.4.4 for the order bonus
                                        if ((GET_EXT_VERSION("bonus") >= "0.4.4") && (getConfig('bonus_active') == "Y")) {
                                                // Add points directly

-                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET bonus_order=bonus_order+".getConfig('bonus_order')." WHERE userid=%s LIMIT 1",
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET bonus_order=bonus_order+".getConfig('bonus_order')." WHERE userid=%s LIMIT 1",

                                                        array(bigintval($DATA['sender'])), __FILE__, __LINE__);
 
                                                // Subtract bonus points from system
                                                        array(bigintval($DATA['sender'])), __FILE__, __LINE__);
 
                                                // Subtract bonus points from system


@@ -107,7 +107,7 @@ LIMIT 1",
                                        SEND_EMAIL($DATA['sender'], MEMBER_ORDER_ACCEPTED, $msg_user);
 
                                        // Unlock selected email
                                        SEND_EMAIL($DATA['sender'], MEMBER_ORDER_ACCEPTED, $msg_user);
 
                                        // Unlock selected email

-                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_pool` SET data_type='NEW' WHERE id=%s AND data_type='ADMIN' LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET data_type='NEW' WHERE id=%s AND data_type='ADMIN' LIMIT 1",

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


@@ -130,7 +130,7 @@ LIMIT 1",
                                $id = bigintval($id);
 
                                // Load URL and subject from pool
                                $id = bigintval($id);
 
                                // Load URL and subject from pool

-                               $result = SQL_QUERY_ESC("SELECT url, subject, sender FROM `{!MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT url, subject, sender FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",

                                        array($id), __FILE__, __LINE__);
 
                                // Load data
                                        array($id), __FILE__, __LINE__);
 
                                // Load data


@@ -144,10 +144,10 @@ LIMIT 1",
                                SEND_EMAIL($DATA['sender'], MEMBER_ORDER_REJECTED, $msg_user);
 
                                // If you do not enter an URL to redirect to, your URL will be set!
                                SEND_EMAIL($DATA['sender'], MEMBER_ORDER_REJECTED, $msg_user);
 
                                // If you do not enter an URL to redirect to, your URL will be set!

-                               if ((empty($_POST['redirect'])) || ($_POST['redirect'] == "http://")) $_POST['redirect'] = URL;
+                               if ((empty($_POST['redirect'])) || ($_POST['redirect'] == "http://")) $_POST['redirect'] = constant('URL');

 
                                // Redirect URL
 
                                // Redirect URL

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_pool` SET url='%s', data_type='NEW' WHERE id=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET url='%s', data_type='NEW' WHERE id=%s LIMIT 1",

                                        array($_POST['redirect'], $id),__FILE__, __LINE__);
 
                                // Prepare data for the row template
                                        array($_POST['redirect'], $id),__FILE__, __LINE__);
 
                                // Prepare data for the row template


@@ -167,7 +167,7 @@ LIMIT 1",
                        LOAD_TEMPLATE("admin_unlock_emails_redir");
                } else {
                        // Nothing selected
                        LOAD_TEMPLATE("admin_unlock_emails_redir");
                } else {
                        // Nothing selected

-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MAILS_NOTHING_CHECKED);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_MAILS_NOTHING_CHECKED'));

                }
        } elseif ((isset($_POST['lock'])) && ($SEL > 0) && (getConfig('url_blacklist') == "Y")) {
                // Lock URLs
                }
        } elseif ((isset($_POST['lock'])) && ($SEL > 0) && (getConfig('url_blacklist') == "Y")) {
                // Lock URLs


@@ -176,11 +176,11 @@ LIMIT 1",
                        $id = bigintval($id);
 
                        // Lookup in blacklist
                        $id = bigintval($id);
 
                        // Lookup in blacklist

-                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{!MYSQL_PREFIX!}_url_blacklist` WHERE `url`='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_url_blacklist` WHERE `url`='%s' LIMIT 1",

                                array($url), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 0) {
                                // Did not find a record so we can add it... :)
                                array($url), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 0) {
                                // Did not find a record so we can add it... :)

-                               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_url_blacklist` (`url`,`pool_id`) VALUES ('%s',%s)",
+                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_url_blacklist` (`url`,`pool_id`) VALUES ('%s',%s)",

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


@@ -189,7 +189,7 @@ LIMIT 1",
                } // END - foreach
 
                // Output message
                } // END - foreach
 
                // Output message

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_URLS_BLOCKED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_URLS_BLOCKED'));

        } elseif ((empty($_POST['lock'])) && (empty($_POST['accept'])) && (empty($_POST['reject'])) && (getConfig('url_blacklist') == "Y")) {
                // Mail orders are in pool so we can display them
                $SW = 2; $OUT = "";
        } elseif ((empty($_POST['lock'])) && (empty($_POST['accept'])) && (empty($_POST['reject'])) && (getConfig('url_blacklist') == "Y")) {
                // Mail orders are in pool so we can display them
                $SW = 2; $OUT = "";


@@ -229,14 +229,14 @@ LIMIT 1",
                LOAD_TEMPLATE("admin_unlock_emails");
        } elseif ((isset($_POST['lock'])) && (getConfig('url_blacklist') == "N")) {
                // URL blacklist not activated
                LOAD_TEMPLATE("admin_unlock_emails");
        } elseif ((isset($_POST['lock'])) && (getConfig('url_blacklist') == "N")) {
                // URL blacklist not activated

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_URL_BLACKLIST_DISABLED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_URL_BLACKLIST_DISABLED'));

        } else {
                // Wrong call!
        } else {
                // Wrong call!

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_WRONG_CALL);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_WRONG_CALL'));

        }
 } else {
        // No mail orders fond
        }
 } else {
        // No mail orders fond

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MAILS_IN_POOL);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_MAILS_IN_POOL'));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php
index 76f9303867972232d5b964cbc4fbad93fdc54d13..ae866f7c9cf08a61a3815287ab2993537d0d0a06 100644 (file)
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_sponsor.php
@@ -51,7 +51,7 @@ if (isset($_POST['ok'])) {
 
                        // Load his personal data
                        $result_main = SQL_QUERY_ESC("SELECT gender, surname, family, email, remote_addr, sponsor_created, points_amount, refid
 
                        // Load his personal data
                        $result_main = SQL_QUERY_ESC("SELECT gender, surname, family, email, remote_addr, sponsor_created, points_amount, refid

-FROM `{!MYSQL_PREFIX!}_sponsor_data`
+FROM `{!_MYSQL_PREFIX!}_sponsor_data`

 WHERE status='PENDING' AND id='%s' LIMIT 1",
  array($id), __FILE__, __LINE__);
                        $refid = 0;
 WHERE status='PENDING' AND id='%s' LIMIT 1",
  array($id), __FILE__, __LINE__);
                        $refid = 0;


@@ -62,15 +62,15 @@ WHERE status='PENDING' AND id='%s' LIMIT 1",
                                // Check for open payments and close them
                                $result = SQL_QUERY_ESC("SELECT DISTINCT so.aid, so.pay_count, so.pay_ordered, so.pay_status,
 sp.pay_name, sp.pay_rate, sp.pay_currency
                                // Check for open payments and close them
                                $result = SQL_QUERY_ESC("SELECT DISTINCT so.aid, so.pay_count, so.pay_ordered, so.pay_status,
 sp.pay_name, sp.pay_rate, sp.pay_currency

-FROM `{!MYSQL_PREFIX!}_sponsor_orders` AS so
-LEFT JOIN `{!MYSQL_PREFIX!}_sponsor_paytypes` AS sp
+FROM `{!_MYSQL_PREFIX!}_sponsor_orders` AS so
+LEFT JOIN `{!_MYSQL_PREFIX!}_sponsor_paytypes` AS sp

 ON sp.id=so.payid
 WHERE so.sponsorid='%s'
 ORDER BY sp.pay_name",
  array($id), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) > 0) {
                                        // Payment does exist
 ON sp.id=so.payid
 WHERE so.sponsorid='%s'
 ORDER BY sp.pay_name",
  array($id), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) > 0) {
                                        // Payment does exist

-                                       while(list($aid, $count, $ordered, $status, $pname, $prate, $pcurr) = SQL_FETCHROW($result))
+                                       while (list($aid, $count, $ordered, $status, $pname, $prate, $pcurr) = SQL_FETCHROW($result))

                                        {
                                                // Set default email
                                                $email = SPONSOR_NO_ADMIN;
                                        {
                                                // Set default email
                                                $email = SPONSOR_NO_ADMIN;


@@ -103,14 +103,14 @@ ORDER BY sp.pay_name",
                        SQL_FREERESULT($result_main);
 
                        // Unlock sponsor account
                        SQL_FREERESULT($result_main);
 
                        // Unlock sponsor account

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_sponsor_data` SET status='CONFIRMED'
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET status='CONFIRMED'

 WHERE id='%s' AND status='PENDING' LIMIT 1",
  array($id), __FILE__, __LINE__);
 
                        // Update, if applyable, referal count and points
                        if (($refid > 0) && ($refid != $id)) {
                                // Update referal account
 WHERE id='%s' AND status='PENDING' LIMIT 1",
  array($id), __FILE__, __LINE__);
 
                        // Update, if applyable, referal count and points
                        if (($refid > 0) && ($refid != $id)) {
                                // Update referal account

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_sponsor_data`
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data`

 SET points_amount=points_amount+%s, ref_count=ref_count+1
 WHERE id='%s' LIMIT 1",
  array(getConfig('sponsor_ref_points'), bigintval($refid)), __FILE__, __LINE__);
 SET points_amount=points_amount+%s, ref_count=ref_count+1
 WHERE id='%s' LIMIT 1",
  array(getConfig('sponsor_ref_points'), bigintval($refid)), __FILE__, __LINE__);


@@ -120,7 +120,7 @@ WHERE id='%s' LIMIT 1",
                                        // Load referal's data
                                        $result = SQL_QUERY_ESC("SELECT id, gender, surname, family, email,
 (points_amount - points_used) AS points, receive_warnings, ref_count AS refs
                                        // Load referal's data
                                        $result = SQL_QUERY_ESC("SELECT id, gender, surname, family, email,
 (points_amount - points_used) AS points, receive_warnings, ref_count AS refs

-FROM `{!MYSQL_PREFIX!}_sponsor_data`
+FROM `{!_MYSQL_PREFIX!}_sponsor_data`

 WHERE id='%s' LIMIT 1",
  array(bigintval($refid)), __FILE__, __LINE__);
                                        $REFERRAL = SQL_FETCHARRAY($result);
 WHERE id='%s' LIMIT 1",
  array(bigintval($refid)), __FILE__, __LINE__);
                                        $REFERRAL = SQL_FETCHARRAY($result);


@@ -155,7 +155,7 @@ WHERE id='%s' LIMIT 1",
                }
        } else {
                // Nothing selected
                }
        } else {
                // Nothing selected

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SPONSOR_NONE_SELECTED_UNLOCK);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SPONSOR_NONE_SELECTED_UNLOCK'));

        }
 
        // Add seperator
        }
 
        // Add seperator


@@ -164,13 +164,13 @@ WHERE id='%s' LIMIT 1",
 
 // Begin listing of all pending sponsor accounts
 $result = SQL_QUERY("SELECT id, gender, surname, family, email, remote_addr, sponsor_created
 
 // Begin listing of all pending sponsor accounts
 $result = SQL_QUERY("SELECT id, gender, surname, family, email, remote_addr, sponsor_created

-FROM `{!MYSQL_PREFIX!}_sponsor_data`
-WHERE status='PENDING' ORDER BY id", __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_sponsor_data`
+WHERE status='PENDING' ORDER BY `id`", __FILE__, __LINE__);

 
 if (SQL_NUMROWS($result) > 0) {
        // Entries found so let's list them!
        $OUT = ""; $SW = 2;
 
 if (SQL_NUMROWS($result) > 0) {
        // Entries found so let's list them!
        $OUT = ""; $SW = 2;

-       while(list($id, $gender, $sname, $fname, $email, $ip, $created) = SQL_FETCHROW($result)) {
+       while (list($id, $gender, $sname, $fname, $email, $ip, $created) = SQL_FETCHROW($result)) {

                // Transfer data to array
                $content = array(
                        'sw'      => $SW,
                // Transfer data to array
                $content = array(
                        'sw'      => $SW,


@@ -193,7 +193,7 @@ if (SQL_NUMROWS($result) > 0) {
        LOAD_TEMPLATE("admin_unlock_sponsor");
 } else {
        // No pending accounts found
        LOAD_TEMPLATE("admin_unlock_sponsor");
 } else {
        // No pending accounts found

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SPONSOR_NONE_PENDING);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SPONSOR_NONE_PENDING'));

 }
 
 // Free memory
 }
 
 // Free memory

diff --git a/inc/modules/admin/what-unlock_surfbar_urls.php b/inc/modules/admin/what-unlock_surfbar_urls.php
index a01b3c8446aedb0aee7269038e939416083263b4..78af53c22b9b0aba767bcfeb83eb03760b4770a5 100644 (file)
--- a/inc/modules/admin/what-unlock_surfbar_urls.php
+++ b/inc/modules/admin/what-unlock_surfbar_urls.php
@@ -45,27 +45,27 @@ if ((isset($_POST['unlock'])) && (is_array($_POST['id'])) && (count($_POST['id']
        // Unlock selected URLs
        if (SURFBAR_ADMIN_UNLOCK_URL_IDS($_POST['id'])) {
                // Unlock done! :-)
        // Unlock selected URLs
        if (SURFBAR_ADMIN_UNLOCK_URL_IDS($_POST['id'])) {
                // Unlock done! :-)

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_UNLOCK_DONE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_UNLOCK_DONE'));

        } else {
                // Unlock failed!
        } else {
                // Unlock failed!

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_UNLOCK_FAILED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_UNLOCK_FAILED'));

        }
 } elseif ((isset($_POST['reject'])) && (is_array($_POST['id'])) && (count($_POST['id']) > 0)) {
        // Reject selected URLs
        if (SURFBAR_ADMIN_REJECT_URL_IDS($_POST['id'])) {
                // Unlock done! :-)
        }
 } elseif ((isset($_POST['reject'])) && (is_array($_POST['id'])) && (count($_POST['id']) > 0)) {
        // Reject selected URLs
        if (SURFBAR_ADMIN_REJECT_URL_IDS($_POST['id'])) {
                // Unlock done! :-)

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_UNLOCK_DONE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_UNLOCK_DONE'));

        } else {
                // Unlock failed!
        } else {
                // Unlock failed!

-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_UNLOCK_FAILED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_UNLOCK_FAILED'));

        }
 }
 
 // List all URLs
 $result = SQL_QUERY("SELECT id, userid, url, UNIX_TIMESTAMP(registered) AS registered
        }
 }
 
 // List all URLs
 $result = SQL_QUERY("SELECT id, userid, url, UNIX_TIMESTAMP(registered) AS registered

-FROM `{!MYSQL_PREFIX!}_surfbar_urls`
+FROM `{!_MYSQL_PREFIX!}_surfbar_urls`

 WHERE status='PENDING'
 WHERE status='PENDING'

-ORDER BY id ASC", __FILE__, __LINE__);
+ORDER BY `id` ASC", __FILE__, __LINE__);

 
 // Do we have some URLs left?
 if (SQL_NUMROWS($result) > 0) {
 
 // Do we have some URLs left?
 if (SQL_NUMROWS($result) > 0) {


@@ -89,7 +89,7 @@ if (SQL_NUMROWS($result) > 0) {
        LOAD_TEMPLATE("admin_unlock_surfbar_urls", false, $OUT);
 } else {
        // No URLs in surfbar
        LOAD_TEMPLATE("admin_unlock_surfbar_urls", false, $OUT);
 } else {
        // No URLs in surfbar

-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_SURFBAR_NO_URLS_FOUND);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_SURFBAR_NO_URLS_FOUND'));

 }
 
 // Free result
 }
 
 // Free result

diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php
index fb3bd33282d10f34a546ba848698092971b72dea..e9d28dfe4efba08f16bc71253f0a423350915309 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -82,14 +82,14 @@ if ((!empty($file)) && (FILE_READABLE($file) {
        // Until here...
 
        // Replace URLs
        // Until here...
 
        // Replace URLs

-       $content = str_replace("usage.png", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&type=usage&image=usage", $content);
-       $content = str_replace("daily_usage_", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&type=daily&image=", $content);
-       $content = str_replace("hourly_usage_", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&type=hourly&image=", $content);
-       $content = str_replace("ctry_usage_", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&type=ctry&image=", $content);
-       $content = str_replace("usage_", URL."/modules.php?module=admin&what=".$GLOBALS['what']."&usage=", str_replace(".html", "", $content));
+       $content = str_replace("usage.png", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&type=usage&image=usage", $content);
+       $content = str_replace("daily_usage_", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&type=daily&image=", $content);
+       $content = str_replace("hourly_usage_", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&type=hourly&image=", $content);
+       $content = str_replace("ctry_usage_", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&type=ctry&image=", $content);
+       $content = str_replace("usage_", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&usage=", str_replace(".html", "", $content));

 
        // Disabled due to too much trouble
 
        // Disabled due to too much trouble

-       //$content = str_replace("HREF=\"http://", "href=\"".URL."/modules.php?module=loader&url=http://", $content);
+       //$content = str_replace("HREF=\"http://", "href=\"{!URL!}/modules.php?module=loader&url=http://", $content);

        $test = strtolower($content);
 
        // Do we need to strip out above and including <body> plus trailing </html> tag?
        $test = strtolower($content);
 
        // Do we need to strip out above and including <body> plus trailing </html> tag?

diff --git a/inc/modules/admin/what-user_contct.php b/inc/modules/admin/what-user_contct.php
index 33bdd57b2410377457fdd595c5135a3dbcc8b04f..99f50fc35f3b72b26584140b2f84dc72e9d5f815 100644 (file)
--- a/inc/modules/admin/what-user_contct.php
+++ b/inc/modules/admin/what-user_contct.php
@@ -43,7 +43,7 @@ ADD_DESCR("admin", __FILE__);
 // Is a user id given?
 if ((isset($_GET['u_id'])) && (bigintval($_GET['u_id']) > 0)) {
        // Load user data and display it
 // Is a user id given?
 if ((isset($_GET['u_id'])) && (bigintval($_GET['u_id']) > 0)) {
        // Load user data and display it

-       $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 
        // Is a user account found?
                array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 
        // Is a user account found?


@@ -61,8 +61,8 @@ if ((isset($_GET['u_id'])) && (bigintval($_GET['u_id']) > 0)) {
 
                        // Send contact form out
                        $msg = LOAD_EMAIL_TEMPLATE("member_contct", $content);
 
                        // Send contact form out
                        $msg = LOAD_EMAIL_TEMPLATE("member_contct", $content);

-                       SEND_EMAIL($content['email'], ADMIN_CONTACT_USER_SUBJECT, $msg);
-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_USER_CONTACTED);
+                       SEND_EMAIL($content['email'], getMessage('ADMIN_CONTACT_USER_SUBJECT'), $msg);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_USER_CONTACTED'));

                } else {
                        // Load contact form template
                        LOAD_TEMPLATE("admin_contct_user_form", false, $content);
                } else {
                        // Load contact form template
                        LOAD_TEMPLATE("admin_contct_user_form", false, $content);

diff --git a/inc/modules/admin/what-usr_online.php b/inc/modules/admin/what-usr_online.php
index a548abdf12c489003196d10c2851e4a86667e859..d1a676b52ece97d80573d0864c9554b0eef007f9 100644 (file)
--- a/inc/modules/admin/what-usr_online.php
+++ b/inc/modules/admin/what-usr_online.php
@@ -43,9 +43,9 @@ ADD_DESCR("admin", __FILE__);
 if (EXT_IS_ACTIVE("online", true))
 {
        // Count guests, members and admins
 if (EXT_IS_ACTIVE("online", true))
 {
        // Count guests, members and admins

-       $result_guests  = SQL_QUERY("SELECT id FROM `{!MYSQL_PREFIX!}_online` WHERE is_admin='N' AND is_member='N'", __FILE__, __LINE__);
-       $result_members = SQL_QUERY("SELECT id FROM `{!MYSQL_PREFIX!}_online` WHERE is_admin='N' AND is_member='Y'", __FILE__, __LINE__);
-       $result_admins  = SQL_QUERY("SELECT id FROM `{!MYSQL_PREFIX!}_online` WHERE is_admin='Y'", __FILE__, __LINE__);
+       $result_guests  = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_online` WHERE is_admin='N' AND is_member='N'", __FILE__, __LINE__);
+       $result_members = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_online` WHERE is_admin='N' AND is_member='Y'", __FILE__, __LINE__);
+       $result_admins  = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_online` WHERE is_admin='Y'", __FILE__, __LINE__);

 
        // Remember values for the template
        define('_GUESTS_ONLINE' , SQL_NUMROWS($result_guests));
 
        // Remember values for the template
        define('_GUESTS_ONLINE' , SQL_NUMROWS($result_guests));


@@ -61,7 +61,7 @@ if (EXT_IS_ACTIVE("online", true))
        LOAD_TEMPLATE("admin_mini_online");
 
        // Check for online users
        LOAD_TEMPLATE("admin_mini_online");
 
        // Check for online users

-       $result = SQL_QUERY("SELECT id, ip, userid, refid, module, action, what, is_member, is_admin, timestamp FROM `{!MYSQL_PREFIX!}_online` ORDER by timestamp DESC", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, ip, userid, refid, module, action, what, is_member, is_admin, timestamp FROM `{!_MYSQL_PREFIX!}_online` ORDER by timestamp DESC", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) > 0)
        {
                // Load header template
        if (SQL_NUMROWS($result) > 0)
        {
                // Load header template

diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index 2146f9838594bae271688fe877712e7f88f825f5..25d6a4b8ff04878cec535617c8e5ffea1b0b3dcf 100644 (file)
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -50,7 +50,7 @@ if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash'))) {
        } // END - if
 
        // Get theme from profile
        } // END - if
 
        // Get theme from profile

-       $result = SQL_QUERY_ESC("SELECT curr_theme".$ADD." FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT curr_theme".$ADD." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Load data
                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Load data


@@ -65,7 +65,7 @@ if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash'))) {
        // Remmeber login failures if available
        if (GET_EXT_VERSION("sql_patches") >= "0.6.1") {
                // Reset login failures
        // Remmeber login failures if available
        if (GET_EXT_VERSION("sql_patches") >= "0.6.1") {
                // Reset login failures

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data`
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`

 SET login_failures=0, last_failure='0000-00-00 00:00:00'
 WHERE userid=%s
 LIMIT 1",
 SET login_failures=0, last_failure='0000-00-00 00:00:00'
 WHERE userid=%s
 LIMIT 1",


@@ -80,7 +80,7 @@ LIMIT 1",
        $bonus = false;
        if ((GET_EXT_VERSION("sql_patches") >= "0.2.8") && (GET_EXT_VERSION("bonus") >= "0.2.1") && (getConfig('bonus_login_yn') == "Y")) {
                // Update last login if far enougth away
        $bonus = false;
        if ((GET_EXT_VERSION("sql_patches") >= "0.2.8") && (GET_EXT_VERSION("bonus") >= "0.2.1") && (getConfig('bonus_login_yn') == "Y")) {
                // Update last login if far enougth away

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data`
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`

 SET last_login=UNIX_TIMESTAMP()
 WHERE userid=%s AND last_login < (UNIX_TIMESTAMP() - %s)
 LIMIT 1",
 SET last_login=UNIX_TIMESTAMP()
 WHERE userid=%s AND last_login < (UNIX_TIMESTAMP() - %s)
 LIMIT 1",

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 3cbe638599cffb51934c7910f461724408b323b4..9a0dd6c95fb55bf9136b84fad8b9971228d78609 100644 (file)
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -43,7 +43,7 @@ if (!empty($_GET['order'])) {
        // Order number placed, is he also logged in?
        if (IS_MEMBER()) {
                // Ok, test passed... :)
        // Order number placed, is he also logged in?
        if (IS_MEMBER()) {
                // Ok, test passed... :)

-               $result = SQL_QUERY_ESC("SELECT subject, url FROM `{!MYSQL_PREFIX!}_pool` WHERE id=%s AND sender=%s AND data_type='TEMP' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT subject, url FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s AND sender=%s AND data_type='TEMP' LIMIT 1",

                 array(bigintval($_GET['order']), $GLOBALS['userid']), __FILE__, __LINE__);
 
                // Finally is the entry valid?
                 array(bigintval($_GET['order']), $GLOBALS['userid']), __FILE__, __LINE__);
 
                // Finally is the entry valid?


@@ -71,7 +71,7 @@ if (!empty($_GET['order'])) {
 
 if ((!empty($_POST['url'])) || (!empty($_GET['url'])) || (!empty($_GET['frame']))) {
        // Default URL is ours
 
 if ((!empty($_POST['url'])) || (!empty($_GET['url'])) || (!empty($_GET['frame']))) {
        // Default URL is ours

-       $url = URL;
+       $url = constant('URL');

 
        // Decode URL if set in GET parameters
        if (!empty($_GET['url']))  $url = gzuncompress(base64_decode(str_replace(" ", "+", COMPILE_CODE(urldecode($_GET['url'])))));
 
        // Decode URL if set in GET parameters
        if (!empty($_GET['url']))  $url = gzuncompress(base64_decode(str_replace(" ", "+", COMPILE_CODE(urldecode($_GET['url'])))));

diff --git a/inc/modules/guest/action-online.php b/inc/modules/guest/action-online.php
index a1c0135b6e19b228a6d4ce61551fc5398c80eea9..3cc337bc613b37701b086369c0b58c85920edbd6 100644 (file)
--- a/inc/modules/guest/action-online.php
+++ b/inc/modules/guest/action-online.php
@@ -43,9 +43,9 @@ if (!defined('__SECURITY')) {
        return;
 }
 
        return;
 }
 

-$result_guests  = SQL_QUERY("SELECT id FROM `{!MYSQL_PREFIX!}_online` WHERE is_admin='N' AND is_member='N'", __FILE__, __LINE__);
-$result_members = SQL_QUERY("SELECT id FROM `{!MYSQL_PREFIX!}_online` WHERE is_admin='N' AND is_member='Y'", __FILE__, __LINE__);
-$result_admins  = SQL_QUERY("SELECT id FROM `{!MYSQL_PREFIX!}_online` WHERE is_admin='Y'", __FILE__, __LINE__);
+$result_guests  = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_online` WHERE is_admin='N' AND is_member='N'", __FILE__, __LINE__);
+$result_members = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_online` WHERE is_admin='N' AND is_member='Y'", __FILE__, __LINE__);
+$result_admins  = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_online` WHERE is_admin='Y'", __FILE__, __LINE__);

 
 // Total visitors online
 $total      = SQL_NUMROWS($result_guests) + SQL_NUMROWS($result_members) + SQL_NUMROWS($result_admins);
 
 // Total visitors online
 $total      = SQL_NUMROWS($result_guests) + SQL_NUMROWS($result_members) + SQL_NUMROWS($result_admins);

diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php
index ba848fad1599fef11ba87cb57cde68c47517ef8b..096a60bc6a5307f8ee76fe6807b23482fcf3b4b3 100644 (file)
--- a/inc/modules/guest/action-themes.php
+++ b/inc/modules/guest/action-themes.php
@@ -46,7 +46,7 @@ if (defined('__THEME_SELECTION_CONTENT')) return false;
 // Load all active designs (or all if admin)
 $whereStatement = ""; $OUT = "";
 if (!IS_ADMIN()) $whereStatement = " WHERE theme_active='Y'";
 // Load all active designs (or all if admin)
 $whereStatement = ""; $OUT = "";
 if (!IS_ADMIN()) $whereStatement = " WHERE theme_active='Y'";

-$result_themes = SQL_QUERY("SELECT theme_path FROM `{!MYSQL_PREFIX!}_themes`".$whereStatement, __FILE__, __LINE__);
+$result_themes = SQL_QUERY("SELECT theme_path FROM `{!_MYSQL_PREFIX!}_themes`".$whereStatement, __FILE__, __LINE__);

 $num_themes = SQL_NUMROWS($result_themes);
 
 if ($num_themes > 1) {
 $num_themes = SQL_NUMROWS($result_themes);
 
 if ($num_themes > 1) {

diff --git a/inc/modules/guest/what-active.php b/inc/modules/guest/what-active.php
index 990a16b09387c80303f4b7cc3d188a16364c2d11..2a6845808d880dd7eadf53f8dd00bdab720e5923 100644 (file)
--- a/inc/modules/guest/what-active.php
+++ b/inc/modules/guest/what-active.php
@@ -51,7 +51,7 @@ if (EXT_IS_ACTIVE("nickname")) $ADD = "nickname";
 
 // Check for members who were active only this day
 $result = SQL_QUERY_ESC("SELECT userid, ".$ADD.", last_online
 
 // Check for members who were active only this day
 $result = SQL_QUERY_ESC("SELECT userid, ".$ADD.", last_online

-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE last_online >= %s AND status='CONFIRMED'
 ORDER BY last_online DESC LIMIT %s",
        array(START_TDAY, getConfig('active_limit')), __FILE__, __LINE__);
 WHERE last_online >= %s AND status='CONFIRMED'
 ORDER BY last_online DESC LIMIT %s",
        array(START_TDAY, getConfig('active_limit')), __FILE__, __LINE__);


@@ -60,7 +60,7 @@ ORDER BY last_online DESC LIMIT %s",
 if (SQL_NUMROWS($result) > 0) {
        // At least one member was online so let's load them all
        $OUT = ""; $SW = 2;
 if (SQL_NUMROWS($result) > 0) {
        // At least one member was online so let's load them all
        $OUT = ""; $SW = 2;

-       while(list($uid, $nick, $last) = SQL_FETCHROW($result)) {
+       while (list($uid, $nick, $last) = SQL_FETCHROW($result)) {

                $nick2 = "---";
                if (($nick != $uid) && (!empty($nick))) $nick2 = $nick;
 
                $nick2 = "---";
                if (($nick != $uid) && (!empty($nick))) $nick2 = $nick;
 

diff --git a/inc/modules/guest/what-admin.php b/inc/modules/guest/what-admin.php
index f8a4af57699633cc8e0cfe2623586e0ad8ea77d3..266203e0f16d6137029f9bdcae8f1461c35906f1 100644 (file)
--- a/inc/modules/guest/what-admin.php
+++ b/inc/modules/guest/what-admin.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Redirect...
 }
 
 // Redirect...

-LOAD_URL (URL."/modules.php?module=admin&action=login");
+LOAD_URL("modules.php?module=admin&action=login");

 
 //
 ?>
 
 //
 ?>

diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php
index 9f3120e7496ba8e98ffb026ad58d5c843a71067a..33ebc71eb2b9f2613788925fd3dc827dad69ee35 100644 (file)
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -45,25 +45,25 @@ if (!empty($_GET['hash'])) {
        $uid = 0;
 
        // Search for an unconfirmed or confirmed account
        $uid = 0;
 
        // Search for an unconfirmed or confirmed account

-       $result = SQL_QUERY_ESC("SELECT userid, email, refid FROM `{!MYSQL_PREFIX!}_user_data` WHERE user_hash='%s' AND (status='UNCONFIRMED' OR status='CONFIRMED') LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT userid, email, refid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE user_hash='%s' AND (status='UNCONFIRMED' OR status='CONFIRMED') LIMIT 1",

                array($_GET['hash']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Ok, he want's to confirm now so we load some data
                list ($uid, $email, $rid) = SQL_FETCHROW($result);
 
                // Unlock his account (but only when it is on UNCONFIRMED!)
                array($_GET['hash']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Ok, he want's to confirm now so we load some data
                list ($uid, $email, $rid) = SQL_FETCHROW($result);
 
                // Unlock his account (but only when it is on UNCONFIRMED!)

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET status='CONFIRMED', ref_payout=%s, user_hash=NULL WHERE user_hash='%s' AND status='UNCONFIRMED' LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET status='CONFIRMED', ref_payout=%s, user_hash=NULL WHERE user_hash='%s' AND status='UNCONFIRMED' LIMIT 1",

                        array(getConfig('ref_payout'), $_GET['hash']), __FILE__, __LINE__);
                if (SQL_AFFECTEDROWS() == 1) {
                        $msg = LOAD_EMAIL_TEMPLATE("confirm-member", array('points' => getConfig('points_register')), bigintval($uid));
 
                        // And send him right away the confirmation mail
                        array(getConfig('ref_payout'), $_GET['hash']), __FILE__, __LINE__);
                if (SQL_AFFECTEDROWS() == 1) {
                        $msg = LOAD_EMAIL_TEMPLATE("confirm-member", array('points' => getConfig('points_register')), bigintval($uid));
 
                        // And send him right away the confirmation mail

-                       SEND_EMAIL($email, GUEST_THANX_CONFIRM, $msg);
+                       SEND_EMAIL($email, getMessage('GUEST_THANX_CONFIRM'), $msg);

 
                        // Maybe he got "referaled"?
                        if (($rid > 0) && ($rid != $uid)) {
                                // Select the referal userid
 
                        // Maybe he got "referaled"?
                        if (($rid > 0) && ($rid != $uid)) {
                                // Select the referal userid

-                               $result = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                                        array(bigintval($rid)), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) == 1) {
                                        // Update ref counter...
                                        array(bigintval($rid)), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) == 1) {
                                        // Update ref counter...


@@ -84,7 +84,7 @@ if (!empty($_GET['hash'])) {
                                        // If version matches add ref bonus to refid's account
                                        if ((GET_EXT_VERSION("bonus") >= "0.4.4") && (getConfig('bonus_active') == "Y")) {
                                                // Add points (directly only!)
                                        // If version matches add ref bonus to refid's account
                                        if ((GET_EXT_VERSION("bonus") >= "0.4.4") && (getConfig('bonus_active') == "Y")) {
                                                // Add points (directly only!)

-                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET bonus_ref=bonus_ref+%s WHERE userid=%s LIMIT 1",
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET bonus_ref=bonus_ref+%s WHERE userid=%s LIMIT 1",

                                                        array(getConfig('bonus_ref'), bigintval($rid)), __FILE__, __LINE__);
 
                                                // Subtract points from system
                                                        array(getConfig('bonus_ref'), bigintval($rid)), __FILE__, __LINE__);
 
                                                // Subtract points from system


@@ -110,7 +110,7 @@ if (!empty($_GET['hash'])) {
                                // Lead-Code mode enabled
                                LOAD_URL("lead-confirm.php");
                        } else {
                                // Lead-Code mode enabled
                                LOAD_URL("lead-confirm.php");
                        } else {

-                               define('__CONFIRM_MSG', GUEST_CONFIRMED_DONE);
+                               define('__CONFIRM_MSG', getMessage('GUEST_CONFIRMED_DONE'));

                                define('__UID', bigintval($uid));
                                LOAD_TEMPLATE("guest_confirm_table");
                        }
                                define('__UID', bigintval($uid));
                                LOAD_TEMPLATE("guest_confirm_table");
                        }


@@ -122,19 +122,19 @@ if (!empty($_GET['hash'])) {
                        LOAD_URL("lead-confirm.php");
                } else {
                        // Nobody was found unter this hash key... or our new member want's to confirm twice?
                        LOAD_URL("lead-confirm.php");
                } else {
                        // Nobody was found unter this hash key... or our new member want's to confirm twice?

-                       define('__CONFIRM_MSG', GUEST_CONFIRMED_TWICE);
+                       define('__CONFIRM_MSG', getMessage('GUEST_CONFIRMED_TWICE'));

                        define('__UID', "0");
                        LOAD_TEMPLATE("guest_confirm_table");
                }
        } else {
                // Nobody was found unter this hash key... or our new member want's to confirm twice?
                        define('__UID', "0");
                        LOAD_TEMPLATE("guest_confirm_table");
                }
        } else {
                // Nobody was found unter this hash key... or our new member want's to confirm twice?

-               define('__CONFIRM_MSG', GUEST_CONFIRMED_TWICE);
+               define('__CONFIRM_MSG', getMessage('GUEST_CONFIRMED_TWICE'));

                define('__UID', "0");
                LOAD_TEMPLATE("guest_confirm_table");
        }
 } elseif ((isset($_POST['ok'])) && (!empty($_POST['email']))) {
        // Confirmation link requested      0     1         2
                define('__UID', "0");
                LOAD_TEMPLATE("guest_confirm_table");
        }
 } elseif ((isset($_POST['ok'])) && (!empty($_POST['email']))) {
        // Confirmation link requested      0     1         2

-       $result = SQL_QUERY_ESC("SELECT userid, status, user_hash FROM `{!MYSQL_PREFIX!}_user_data` WHERE email='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT userid, status, user_hash FROM `{!_MYSQL_PREFIX!}_user_data` WHERE email='%s' LIMIT 1",

                array($_POST['email']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Email address found
                array($_POST['email']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Email address found


@@ -143,30 +143,26 @@ if (!empty($_GET['hash'])) {
                {
                case "UNCONFIRMED": // Account not confirmed
                        $msg = LOAD_EMAIL_TEMPLATE("guest_request_confirm", array('hash' => $DATA[2]), $DATA[0]);
                {
                case "UNCONFIRMED": // Account not confirmed
                        $msg = LOAD_EMAIL_TEMPLATE("guest_request_confirm", array('hash' => $DATA[2]), $DATA[0]);

-                       SEND_EMAIL($_POST['email'], REQUEST_CONFIRM_LINK_SUBJ, $msg);
-                       $content = CONFIRM_LINK_SENT;
+                       SEND_EMAIL($_POST['email'], getMessage('REQUEST_CONFIRM_LINK_SUBJ'), $msg);
+                       $content = getMessage('CONFIRM_LINK_SENT');

                        break;
 
                case "CONFIRMED": // Account already confirmed
                        break;
 
                case "CONFIRMED": // Account already confirmed

-                       $content = LOGIN_ID_CONFIRMED;
+                       $content = getMessage('LOGIN_ID_CONFIRMED');

                        break;
 
                case "LOCKED": // Account is locked
                        break;
 
                case "LOCKED": // Account is locked

-                       $content = LOGIN_ID_LOCKED;
+                       $content = getMessage('LOGIN_ID_LOCKED');

                        break;
                }
                        break;
                }

-       }
-        else
-       {
+       } else {

                // Email address not registered
                // Email address not registered

-               $content = EMAIL_ADDY_404;
+               $content = getMessage('EMAIL_ADDY_404');

        }
 
        define('__CONFIRM_MSG', $content);
        LOAD_TEMPLATE("guest_confirm_table");
        }
 
        define('__CONFIRM_MSG', $content);
        LOAD_TEMPLATE("guest_confirm_table");

-}
- else
-{
+} else {

        // No hash found, the guest may want to enter his email address to re-get his confirmation link?
        LOAD_TEMPLATE("guest_confirm_link");
 }
        // No hash found, the guest may want to enter his email address to re-get his confirmation link?
        LOAD_TEMPLATE("guest_confirm_link");
 }

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index d4c813f489d553fba24ac0b623ea4f6a31f2cad8..5fa8585278e029cd3139d90bb888a85c4f7797bd 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -77,13 +77,13 @@ if ($TEST > time()) {
 }
 
 // User who can receive mails
 }
 
 // User who can receive mails

-$result_max = SQL_QUERY("SELECT COUNT(max_mails) FROM `{!MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' AND max_mails > 0", __FILE__, __LINE__);
+$result_max = SQL_QUERY("SELECT COUNT(max_mails) FROM `{!_MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' AND max_mails > 0", __FILE__, __LINE__);

 list($dummy) = SQL_FETCHROW($result_max);
 SQL_FREERESULT($result_max);
 define('user_max_mails', $dummy);
 
 // Users who can receive mails today
 list($dummy) = SQL_FETCHROW($result_max);
 SQL_FREERESULT($result_max);
 define('user_max_mails', $dummy);
 
 // Users who can receive mails today

-$result_rec = SQL_QUERY("SELECT COUNT(receive_mails) FROM `{!MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' AND receive_mails > 0", __FILE__, __LINE__);
+$result_rec = SQL_QUERY("SELECT COUNT(receive_mails) FROM `{!_MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' AND receive_mails > 0", __FILE__, __LINE__);

 list($dummy) = SQL_FETCHROW($result_rec);
 SQL_FREERESULT($result_rec);
 define('user_max_rec', $dummy);
 list($dummy) = SQL_FETCHROW($result_rec);
 SQL_FREERESULT($result_rec);
 define('user_max_rec', $dummy);


@@ -131,7 +131,7 @@ if ($sent > 0) $clr = $clicks / $sent * 100;
 define('_clr', TRANSLATE_COMMA($clr)."%");
 
 // Load jackpot
 define('_clr', TRANSLATE_COMMA($clr)."%");
 
 // Load jackpot

-$result = SQL_QUERY("SELECT points FROM `{!MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);

 list($jackpot) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 if (empty($jackpot)) $jackpot = 0;
 list($jackpot) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 if (empty($jackpot)) $jackpot = 0;


@@ -139,7 +139,7 @@ define('jackpot', TRANSLATE_COMMA($jackpot));
 
 // Total referal link clicks, total logins
 $result = SQL_QUERY("SELECT DISTINCT SUM(d.ref_clicks), SUM(d.total_logins)
 
 // Total referal link clicks, total logins
 $result = SQL_QUERY("SELECT DISTINCT SUM(d.ref_clicks), SUM(d.total_logins)

-FROM `{!MYSQL_PREFIX!}_user_data` AS d", __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_user_data` AS d", __FILE__, __LINE__);

 list($ref, $logins) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
 list($ref, $logins) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 


@@ -155,10 +155,10 @@ define('__TOTAL_REFCLICKS', $ref);
 define('__TOTAL_LOGINS'   , $logins);
 
 // Referal banner
 define('__TOTAL_LOGINS'   , $logins);
 
 // Referal banner

-$result = SQL_QUERY("SELECT COUNT(id) FROM `{!MYSQL_PREFIX!}_refbanner` WHERE visible='Y'", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_refbanner` WHERE `visible`='Y'", __FILE__, __LINE__);

 list($total) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 list($total) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);

-$result = SQL_QUERY("SELECT SUM(counter), SUM(clicks) FROM `{!MYSQL_PREFIX!}_refbanner` WHERE visible='Y'", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT SUM(counter), SUM(clicks) FROM `{!_MYSQL_PREFIX!}_refbanner` WHERE `visible`='Y'", __FILE__, __LINE__);

 list($views, $clicks) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
 list($views, $clicks) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 


@@ -182,7 +182,7 @@ $OUT_SPECIAL = ""; // We don't need row count here
 
 if (EXT_IS_ACTIVE("beg")) {
        // Clicks on beg links
 
 if (EXT_IS_ACTIVE("beg")) {
        // Clicks on beg links

-       $result = SQL_QUERY("SELECT SUM(beg_clicks) FROM `{!MYSQL_PREFIX!}_user_data` WHERE beg_clicks>0", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT SUM(beg_clicks) FROM `{!_MYSQL_PREFIX!}_user_data` WHERE beg_clicks>0", __FILE__, __LINE__);

        list($extra) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
        if (empty($extra)) $extra = 0;
        list($extra) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
        if (empty($extra)) $extra = 0;


@@ -196,10 +196,10 @@ if (EXT_IS_ACTIVE("beg")) {
 
 if (EXT_IS_ACTIVE("doubler")) {
        // Total payed points
 
 if (EXT_IS_ACTIVE("doubler")) {
        // Total payed points

-       $result = SQL_QUERY("SELECT COUNT(id), SUM(points) FROM `{!MYSQL_PREFIX!}_doubler` WHERE completed='Y' AND points > 0", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT COUNT(id), SUM(points) FROM `{!_MYSQL_PREFIX!}_doubler` WHERE completed='Y' AND points > 0", __FILE__, __LINE__);

        list($count1, $points1) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
        list($count1, $points1) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);

-       $result = SQL_QUERY("SELECT COUNT(id), SUM(points) FROM `{!MYSQL_PREFIX!}_doubler` WHERE completed='N' AND points > 0", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT COUNT(id), SUM(points) FROM `{!_MYSQL_PREFIX!}_doubler` WHERE completed='N' AND points > 0", __FILE__, __LINE__);

        list($count2, $points2) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
        list($count2, $points2) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 


@@ -239,8 +239,8 @@ if (EXT_IS_ACTIVE("doubler")) {
 if (EXT_IS_ACTIVE("holiday")) {
        // Total holiday requests
        $result = SQL_QUERY("SELECT DISTINCT COUNT(h.userid)
 if (EXT_IS_ACTIVE("holiday")) {
        // Total holiday requests
        $result = SQL_QUERY("SELECT DISTINCT COUNT(h.userid)

-FROM `{!MYSQL_PREFIX!}_user_holidays` AS h
-LEFT JOIN `{!MYSQL_PREFIX!}_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_user_holidays` AS h
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d

 ON h.userid=d.userid
 WHERE d.holiday_active='Y'",
  __FILE__, __LINE__);
 ON h.userid=d.userid
 WHERE d.holiday_active='Y'",
  __FILE__, __LINE__);


@@ -257,8 +257,8 @@ WHERE d.holiday_active='Y'",
 if (EXT_IS_ACTIVE("transfer")) {
        // Statistics for points transfers
        $result = SQL_QUERY("SELECT DISTINCT COUNT(t.id), SUM(t.points)
 if (EXT_IS_ACTIVE("transfer")) {
        // Statistics for points transfers
        $result = SQL_QUERY("SELECT DISTINCT COUNT(t.id), SUM(t.points)

-FROM `{!MYSQL_PREFIX!}_user_transfers_in` AS t
-LEFT JOIN `{!MYSQL_PREFIX!}_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_user_transfers_in` AS t
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d

 ON t.userid=d.userid",
  __FILE__, __LINE__);
        list($count_in, $points_in) = SQL_FETCHROW($result);
 ON t.userid=d.userid",
  __FILE__, __LINE__);
        list($count_in, $points_in) = SQL_FETCHROW($result);


@@ -266,8 +266,8 @@ ON t.userid=d.userid",
        if (empty($points_in)) $points_in = 0;
 
        $result = SQL_QUERY("SELECT DISTINCT COUNT(t.id), SUM(t.points)
        if (empty($points_in)) $points_in = 0;
 
        $result = SQL_QUERY("SELECT DISTINCT COUNT(t.id), SUM(t.points)

-FROM `{!MYSQL_PREFIX!}_user_transfers_out` AS t
-LEFT JOIN `{!MYSQL_PREFIX!}_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_user_transfers_out` AS t
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d

 ON t.userid=d.userid",
  __FILE__, __LINE__);
        list($count_out, $points_out) = SQL_FETCHROW($result);
 ON t.userid=d.userid",
  __FILE__, __LINE__);
        list($count_out, $points_out) = SQL_FETCHROW($result);

diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index 7186f388e77abf21e719175b6847b01902a689da..64f76c58813f042797232aba7b359d0f1f9266bd 100644 (file)
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -50,7 +50,7 @@ $ADMIN = " AND d.is_active='Y'";
 if (IS_ADMIN()) $ADMIN = "";
 
 $result = SQL_QUERY("SELECT DISTINCT d.id, d.admin_id, a.login, d.title, d.descr, d.template, d.start_time, d.end_time, d.min_users, d.min_prices
 if (IS_ADMIN()) $ADMIN = "";
 
 $result = SQL_QUERY("SELECT DISTINCT d.id, d.admin_id, a.login, d.title, d.descr, d.template, d.start_time, d.end_time, d.min_users, d.min_prices

-FROM `{!MYSQL_PREFIX!}_rallye_data` AS d, `{!MYSQL_PREFIX!}_admins` AS a
+FROM `{!_MYSQL_PREFIX!}_rallye_data` AS d, `{!_MYSQL_PREFIX!}_admins` AS a

 WHERE d.admin_id=a.id".$ADMIN." AND d.notified='Y'
 ORDER BY d.end_time LIMIT 1", __FILE__, __LINE__);
 
 WHERE d.admin_id=a.id".$ADMIN." AND d.notified='Y'
 ORDER BY d.end_time LIMIT 1", __FILE__, __LINE__);
 


@@ -73,10 +73,10 @@ if (SQL_NUMROWS($result) == 1)
        }
         else
        {
        }
         else
        {

-               define('__RALLYE_EXTRAS', "<a href=\"".URL."/modules.php?module=index&amp;what=register\">".RALLYE_REGISTER_NOW."</a>");
+               define('__RALLYE_EXTRAS', "<a href=\"{!URL!}/modules.php?module=index&amp;what=register\">".RALLYE_REGISTER_NOW."</a>");

        }
        // Set admin line (currently set to impressum, later to contact form)
        }
        // Set admin line (currently set to impressum, later to contact form)

-       define('__RALLYE_ADMIN', "<a href=\"".URL."/modules.php?module=index&amp;what=impressum&amp;admin=".$aid."\">".$login."</a>");
+       define('__RALLYE_ADMIN', "<a href=\"{!URL!}/modules.php?module=index&amp;what=impressum&amp;admin=".$aid."\">".$login."</a>");

 
        // Set title
        define('__RALLYE_TITLE', COMPILE_CODE($title));
 
        // Set title
        define('__RALLYE_TITLE', COMPILE_CODE($title));

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 56c347f2d15f8c9d00b4bf825dfcefdc3b76a3ac..07be03e56d9c709fb446f50ebb890234cc157f21 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -72,7 +72,7 @@ if (empty($_POST['country_code'])) $_POST['country_code'] = "1";
 $_POST['refid'] = 0;
 if ($GLOBALS['refid'] > 0) {
        // Test if the refid is valid
 $_POST['refid'] = 0;
 if ($GLOBALS['refid'] > 0) {
        // Test if the refid is valid

-       $result = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
 
        // Userid found?
                array(bigintval($GLOBALS['refid'])), __FILE__, __LINE__);
 
        // Userid found?


@@ -156,7 +156,7 @@ if (isset($_POST['ok'])) {
        // Check for IP timeout?
        if (getConfig('ip_timeout') > 0) {
                // Check his IP number
        // Check for IP timeout?
        if (getConfig('ip_timeout') > 0) {
                // Check his IP number

-               $result = SQL_QUERY_ESC("SELECT joined, last_update FROM `{!MYSQL_PREFIX!}_user_data` WHERE REMOTE_ADDR='%s' AND (joined > (UNIX_TIMESTAMP() - %s) OR last_update > (UNIX_TIMESTAMP() - %s)) LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT joined, last_update FROM `{!_MYSQL_PREFIX!}_user_data` WHERE REMOTE_ADDR='%s' AND (joined > (UNIX_TIMESTAMP() - %s) OR last_update > (UNIX_TIMESTAMP() - %s)) LIMIT 1",

                        array(GET_REMOTE_ADDR(), getConfig('ip_timeout'), getConfig('ip_timeout')), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Same IP in timeout range and different email address entered... Eat this, faker! ;-)
                        array(GET_REMOTE_ADDR(), getConfig('ip_timeout'), getConfig('ip_timeout')), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Same IP in timeout range and different email address entered... Eat this, faker! ;-)


@@ -229,7 +229,7 @@ if ((isset($_POST['ok'])) && ((!$FAILED) || (IS_ADMIN()))) {
        // Create user's account... //
        //////////////////////////////
        //
        // Create user's account... //
        //////////////////////////////
        //

-       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_data` (gender, surname, family, street_nr,%s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$ADD1.")
+       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_data` (gender, surname, family, street_nr,%s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$ADD1.")

 VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$ADD2.")",
        array(
                $countryRow,
 VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$ADD2.")",
        array(
                $countryRow,


@@ -269,13 +269,13 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        } // END - if
 
        // Write his welcome-points
        } // END - if
 
        // Write his welcome-points

-       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_points` WHERE userid=%s AND ref_depth=0 LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_points` WHERE userid=%s AND ref_depth=0 LIMIT 1",

         array(bigintval($userid)), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Add only when the line was not found (maybe some more secure?)
                $locked = "points";
                if (getConfig('ref_payout') > 0) $locked = "locked_points"; // Pay him later. First he has to confirm some mails!
         array(bigintval($userid)), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Add only when the line was not found (maybe some more secure?)
                $locked = "points";
                if (getConfig('ref_payout') > 0) $locked = "locked_points"; // Pay him later. First he has to confirm some mails!

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_points` (userid, ref_depth, ".$locked.") VALUES (%s,0,'%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_points` (userid, ref_depth, ".$locked.") VALUES (%s,0,'%s')",

                 array(bigintval($userid), getConfig('points_register')), __FILE__, __LINE__);
 
                // Update mediadata as well
                 array(bigintval($userid), getConfig('points_register')), __FILE__, __LINE__);
 
                // Update mediadata as well


@@ -290,7 +290,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
                foreach ($_POST['cat'] as $cat => $joined) {
                        if ($joined == "Y") {
                                // Insert category entry
                foreach ($_POST['cat'] as $cat => $joined) {
                        if ($joined == "Y") {
                                // Insert category entry

-                               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_cats` (userid, cat_id) VALUES (%s, %s)",
+                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_cats` (userid, cat_id) VALUES (%s, %s)",

                                 array(bigintval($userid), bigintval($cat)), __FILE__, __LINE__);
                        } // END - if
                } // END - foreach
                                 array(bigintval($userid), bigintval($cat)), __FILE__, __LINE__);
                        } // END - if
                } // END - foreach


@@ -355,11 +355,11 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 
        // Send mail to user (confirmation link!)
        $EMAIL = $DATA['email'];
 
        // Send mail to user (confirmation link!)
        $EMAIL = $DATA['email'];

-       SEND_EMAIL ($DATA['email'], GUEST_CONFIRM_LINK, $msg_guest);
+       SEND_EMAIL ($DATA['email'], getMessage('GUEST_CONFIRM_LINK'), $msg_guest);

        $DATA['email'] = $EMAIL;
 
        // Send mail to admin
        $DATA['email'] = $EMAIL;
 
        // Send mail to admin

-       SEND_ADMIN_NOTIFICATION(ADMIN_NEW_ACCOUNT, "register-admin", $DATA, $userid);
+       SEND_ADMIN_NOTIFICATION(getMessage('ADMIN_NEW_ACCOUNT'), "register-admin", $DATA, $userid);

 
        // Output success registration
        LOAD_TEMPLATE("admin_settings_saved", false, REGISTRATION_DONE);
 
        // Output success registration
        LOAD_TEMPLATE("admin_settings_saved", false, REGISTRATION_DONE);


@@ -395,15 +395,15 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        }
 
        if ($SHORT_PASS) {
        }
 
        if ($SHORT_PASS) {

-               OUTPUT_HTML("<div class=\"register_failed\">".SHORT_PASS.": ".getConfig('pass_len')."</div>");
+               OUTPUT_HTML("<div class=\"register_failed\">{!SHORT_PASS!}: ".getConfig('pass_len')."</div>");

        } // END - if
 
        if ($IP_TIMEOUT) {
        } // END - if
 
        if ($IP_TIMEOUT) {

-               OUTPUT_HTML("<div class=\"register_failed\">".REMOTE_ADDR_TIMEOUT."</div>");
+               OUTPUT_HTML("<div class=\"register_failed\">{!REMOTE_ADDR_TIMEOUT!}</div>");

        } // END - if
 
        if ((!empty($cats)) && ($cats < getConfig('least_cats'))) {
        } // END - if
 
        if ((!empty($cats)) && ($cats < getConfig('least_cats'))) {

-               OUTPUT_HTML("<div class=\"register_failed\">".CATS_LEAST.": ".getConfig('least_cats')."</div>");
+               OUTPUT_HTML("<div class=\"register_failed\">{!CATS_LEAST!}: ".getConfig('least_cats')."</div>");

        } // END - if
 
        // Generate birthday selection
        } // END - if
 
        // Generate birthday selection

diff --git a/inc/modules/guest/what-sponsor_infos.php b/inc/modules/guest/what-sponsor_infos.php
index 2fd1cc4d8ea86ea9bd47a014d62626fe41443c8c..c51e462205261aff8ec5e7fc587e43ce512b0d64 100644 (file)
--- a/inc/modules/guest/what-sponsor_infos.php
+++ b/inc/modules/guest/what-sponsor_infos.php
@@ -51,9 +51,9 @@ unset($result_act);
 
 // Load all sponsor actions
 $result_act = SQL_QUERY("SELECT DISTINCT m.title, c.conv_rate, c.conv_name
 
 // Load all sponsor actions
 $result_act = SQL_QUERY("SELECT DISTINCT m.title, c.conv_rate, c.conv_name

-FROM `{!MYSQL_PREFIX!}_sponsor_menu` AS m
-LEFT JOIN `{!MYSQL_PREFIX!}_sponsor_action_convert` AS c ON m.what=c.ext_name
-LEFT JOIN `{!MYSQL_PREFIX!}_sponsor_registry` AS r ON m.what=r.ext_name
+FROM `{!_MYSQL_PREFIX!}_sponsor_menu` AS m
+LEFT JOIN `{!_MYSQL_PREFIX!}_sponsor_action_convert` AS c ON m.what=c.ext_name
+LEFT JOIN `{!_MYSQL_PREFIX!}_sponsor_registry` AS r ON m.what=r.ext_name

 WHERE m.action='actions' AND r.is_active='Y'
 ORDER BY m.sort ASC", __FILE__, __LINE__);
 $num_act = SQL_NUMROWS($result_act);
 WHERE m.action='actions' AND r.is_active='Y'
 ORDER BY m.sort ASC", __FILE__, __LINE__);
 $num_act = SQL_NUMROWS($result_act);


@@ -76,7 +76,7 @@ if ($num_act > 0) {
        } // END - while
 
        // Check for pay types
        } // END - while
 
        // Check for pay types

-       $result_pay = SQL_QUERY("SELECT pay_name, pay_rate, pay_min_count, pay_currency FROM `{!MYSQL_PREFIX!}_sponsor_paytypes` ORDER BY pay_name", __FILE__, __LINE__);
+       $result_pay = SQL_QUERY("SELECT pay_name, pay_rate, pay_min_count, pay_currency FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes` ORDER BY pay_name", __FILE__, __LINE__);

        if (SQL_NUMROWS($result_pay) > 0) {
                // Load all pay types
                $OUT_PAY = ""; $SW = 2;
        if (SQL_NUMROWS($result_pay) > 0) {
                // Load all pay types
                $OUT_PAY = ""; $SW = 2;

diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index 6b4b5a934163dc8ff81aa97b784f010d8c1fea90..87f1adfd7e992e6b6b9875880fa6d5215219704e 100644 (file)
--- a/inc/modules/guest/what-sponsor_login.php
+++ b/inc/modules/guest/what-sponsor_login.php
@@ -63,7 +63,7 @@ if (!empty($_GET['hash'])) {
 company, position, tax_ident,
 street_nr1, street_nr2, country, zip, city, email, phone, fax, cell,
 points_amount AS points, last_pay AS pay, last_curr AS curr
 company, position, tax_ident,
 street_nr1, street_nr2, country, zip, city, email, phone, fax, cell,
 points_amount AS points, last_pay AS pay, last_curr AS curr

-FROM `{!MYSQL_PREFIX!}_sponsor_data`
+FROM `{!_MYSQL_PREFIX!}_sponsor_data`

 WHERE hash='%s' AND (status='UNCONFIRMED' OR status='EMAIL')
 LIMIT 1", array($_GET['hash']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
 WHERE hash='%s' AND (status='UNCONFIRMED' OR status='EMAIL')
 LIMIT 1", array($_GET['hash']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {


@@ -78,7 +78,7 @@ LIMIT 1", array($_GET['hash']), __FILE__, __LINE__);
                // Unconfirmed account or changed email address?
                if ($SPONSOR['status'] == "UNCONFIRMED") {
                        // Set account to pending
                // Unconfirmed account or changed email address?
                if ($SPONSOR['status'] == "UNCONFIRMED") {
                        // Set account to pending

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_sponsor_data` SET status='PENDING'
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET status='PENDING'

 WHERE id='%s' AND hash='%s' AND status='UNCONFIRMED' LIMIT 1",
  array(bigintval($SPONSOR['id']), $_GET['hash']), __FILE__, __LINE__);
 
 WHERE id='%s' AND hash='%s' AND status='UNCONFIRMED' LIMIT 1",
  array(bigintval($SPONSOR['id']), $_GET['hash']), __FILE__, __LINE__);
 


@@ -99,7 +99,7 @@ WHERE id='%s' AND hash='%s' AND status='UNCONFIRMED' LIMIT 1",
                        }
                } elseif ($SPONSOR['status'] == "EMAIL") {
                        // Changed email adress need to be confirmed
                        }
                } elseif ($SPONSOR['status'] == "EMAIL") {
                        // Changed email adress need to be confirmed

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_sponsor_data` SET status='CONFIRMED'
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET status='CONFIRMED'

 WHERE id='%s' AND hash='%s' AND status='EMAIL' LIMIT 1",
  array(bigintval($SPONSOR['id']), $_GET['hash']), __FILE__, __LINE__);
 
 WHERE id='%s' AND hash='%s' AND status='EMAIL' LIMIT 1",
  array(bigintval($SPONSOR['id']), $_GET['hash']), __FILE__, __LINE__);
 


@@ -132,7 +132,7 @@ WHERE id='%s' AND hash='%s' AND status='EMAIL' LIMIT 1",
        if (isset($_POST['ok'])) {
                // Check email
                $result = SQL_QUERY_ESC("SELECT id, hash, status, remote_addr, gender, surname, family, sponsor_created
        if (isset($_POST['ok'])) {
                // Check email
                $result = SQL_QUERY_ESC("SELECT id, hash, status, remote_addr, gender, surname, family, sponsor_created

-FROM `{!MYSQL_PREFIX!}_sponsor_data`
+FROM `{!_MYSQL_PREFIX!}_sponsor_data`

 WHERE email='%s' AND (status='UNCONFIRMED' OR status='EMAIL') LIMIT 1",
                        array($_POST['email']), __FILE__, __LINE__);
 
 WHERE email='%s' AND (status='UNCONFIRMED' OR status='EMAIL') LIMIT 1",
                        array($_POST['email']), __FILE__, __LINE__);
 


@@ -178,7 +178,7 @@ WHERE email='%s' AND (status='UNCONFIRMED' OR status='EMAIL') LIMIT 1",
        if (isset($_POST['ok'])) {
                // Check email
                $result = SQL_QUERY_ESC("SELECT id, hash, remote_addr, gender, surname, family, sponsor_created
        if (isset($_POST['ok'])) {
                // Check email
                $result = SQL_QUERY_ESC("SELECT id, hash, remote_addr, gender, surname, family, sponsor_created

-FROM `{!MYSQL_PREFIX!}_sponsor_data`
+FROM `{!_MYSQL_PREFIX!}_sponsor_data`

 WHERE email='%s' AND id='%s' AND status='CONFIRMED' LIMIT 1",
                        array($_POST['email'], bigintval($_POST['id'])), __FILE__, __LINE__);
                // Entry found?
 WHERE email='%s' AND id='%s' AND status='CONFIRMED' LIMIT 1",
                        array($_POST['email'], bigintval($_POST['id'])), __FILE__, __LINE__);
                // Entry found?


@@ -198,7 +198,7 @@ WHERE email='%s' AND id='%s' AND status='CONFIRMED' LIMIT 1",
                        SEND_EMAIL($_POST['email'], SPONSOR_LOST_PASSWORD_SUBJ, $msg_sponsor);
 
                        // Update password
                        SEND_EMAIL($_POST['email'], SPONSOR_LOST_PASSWORD_SUBJ, $msg_sponsor);
 
                        // Update password

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_sponsor_data` SET password='%s'
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET password='%s'

 WHERE id='%s' LIMIT 1",
  array(md5($SPONSOR['password']), bigintval($SPONSOR['id'])), __FILE__, __LINE__);
 
 WHERE id='%s' LIMIT 1",
  array(md5($SPONSOR['password']), bigintval($SPONSOR['id'])), __FILE__, __LINE__);
 


@@ -217,7 +217,7 @@ WHERE id='%s' LIMIT 1",
        }
 } elseif (isset($_POST['ok'])) {
        // Check status and login data ...
        }
 } elseif (isset($_POST['ok'])) {
        // Check status and login data ...

-       $result = SQL_QUERY_ESC("SELECT status FROM `{!MYSQL_PREFIX!}_sponsor_data`
+       $result = SQL_QUERY_ESC("SELECT status FROM `{!_MYSQL_PREFIX!}_sponsor_data`

 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval($_POST['sponsorid']), md5($_POST['pass'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval($_POST['sponsorid']), md5($_POST['pass'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {

diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index acce2dacdf18f93c43ae49feb740dedc1028bb76..268962da75b3f253e4402300690b0c29d5ae0756 100644 (file)
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -211,7 +211,7 @@ if ((isset($_POST['ok'])) && (count($FORM_ERRORS) == 0)) {
 
        // Calulate points
        $result = SQL_QUERY_ESC("SELECT (pay_rate * pay_min_count) AS points, pay_min_count AS pay, pay_currency AS curr
 
        // Calulate points
        $result = SQL_QUERY_ESC("SELECT (pay_rate * pay_min_count) AS points, pay_min_count AS pay, pay_currency AS curr

-FROM `{!MYSQL_PREFIX!}_sponsor_paytypes`
+FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes`

 WHERE id='%s' LIMIT 1", array($_POST['pay_type']), __FILE__, __LINE__);
        list($points, $pay, $curr) = SQL_FETCHROW($result);
 
 WHERE id='%s' LIMIT 1", array($_POST['pay_type']), __FILE__, __LINE__);
        list($points, $pay, $curr) = SQL_FETCHROW($result);
 


@@ -232,7 +232,7 @@ WHERE id='%s' LIMIT 1", array($_POST['pay_type']), __FILE__, __LINE__);
        {
        case "added": // Sponsor successfully added with account status = UNCONFIRMED!
                // Check for his ID number
        {
        case "added": // Sponsor successfully added with account status = UNCONFIRMED!
                // Check for his ID number

-               $result = SQL_QUERY_ESC("SELECT id, hash FROM `{!MYSQL_PREFIX!}_sponsor_data` WHERE email='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT id, hash FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE email='%s' LIMIT 1",

                 array($_POST['email']), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1)
                {
                 array($_POST['email']), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1)
                {


@@ -286,13 +286,13 @@ WHERE id='%s' LIMIT 1", array($_POST['pay_type']), __FILE__, __LINE__);
 } else {
        // Check for payment types
        $result = SQL_QUERY("SELECT id, pay_name, pay_rate, pay_currency, pay_min_count
 } else {
        // Check for payment types
        $result = SQL_QUERY("SELECT id, pay_name, pay_rate, pay_currency, pay_min_count

-FROM `{!MYSQL_PREFIX!}_sponsor_paytypes`
+FROM `{!_MYSQL_PREFIX!}_sponsor_paytypes`

 ORDER BY pay_name", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Load all types...
                $OUT = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"300\" class=\"left2 right2 top2\">\n";
                $SW = 2;
 ORDER BY pay_name", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Load all types...
                $OUT = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"300\" class=\"left2 right2 top2\">\n";
                $SW = 2;

-               while(list($id, $name, $rate, $curr, $min) = SQL_FETCHROW($result))
+               while (list($id, $name, $rate, $curr, $min) = SQL_FETCHROW($result))

                {
                        $OUT .= "<tr>
   <td class=\"bottom2 switch_sw".$SW."\" height=\"50\" style=\"padding-left: 2px; padding-right: 2px\">
                {
                        $OUT .= "<tr>
   <td class=\"bottom2 switch_sw".$SW."\" height=\"50\" style=\"padding-left: 2px; padding-right: 2px\">

diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index 9628f98de05a770814f9d8a75588eb66273ca5e0..7fa594a0dfc4cf7d4082989f1aedb59b5ff6aa24 100644 (file)
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -52,19 +52,19 @@ switch (getConfig('guest_stats'))
 {
 case "MEMBERS": // Statistics about your members
        // Members yesterday / today online
 {
 case "MEMBERS": // Statistics about your members
        // Members yesterday / today online

-       $ymem = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE last_online >= ".START_YDAY." AND last_online < ".START_TDAY." AND status='CONFIRMED'", __FILE__, __LINE__));
-       $tmem = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE last_online >= ".START_TDAY." AND status='CONFIRMED'", __FILE__, __LINE__));
+       $ymem = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE last_online >= ".START_YDAY." AND last_online < ".START_TDAY." AND status='CONFIRMED'", __FILE__, __LINE__));
+       $tmem = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE last_online >= ".START_TDAY." AND status='CONFIRMED'", __FILE__, __LINE__));

 
        // Yesterday / today registered
 
        // Yesterday / today registered

-       $yreg = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE joined >= ".START_YDAY." AND joined < ".START_TDAY, __FILE__, __LINE__));
-       $treg = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE joined >= ".START_TDAY, __FILE__, __LINE__));
+       $yreg = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE joined >= ".START_YDAY." AND joined < ".START_TDAY, __FILE__, __LINE__));
+       $treg = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE joined >= ".START_TDAY, __FILE__, __LINE__));

 
        // Only males / females
 
        // Only males / females

-       $male   = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE gender='M' AND status='CONFIRMED'", __FILE__, __LINE__));
-       $female = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE gender='F' AND status='CONFIRMED'", __FILE__, __LINE__));
+       $male   = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE gender='M' AND status='CONFIRMED'", __FILE__, __LINE__));
+       $female = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE gender='F' AND status='CONFIRMED'", __FILE__, __LINE__));

 
        // Unconfirmed accounts
 
        // Unconfirmed accounts

-       $unconfirmed = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE status != 'CONFIRMED'", __FILE__, __LINE__));
+       $unconfirmed = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE status != 'CONFIRMED'", __FILE__, __LINE__));

 
        // Total members
        $total = $male + $female;
 
        // Total members
        $total = $male + $female;


@@ -74,12 +74,12 @@ case "MEMBERS": // Statistics about your members
        for ($idx = 1; $idx < 13; $idx++)
        {
                $month = $idx; if ($idx < 10) $month = "0".$idx;
        for ($idx = 1; $idx < 13; $idx++)
        {
                $month = $idx; if ($idx < 10) $month = "0".$idx;

-               $months[$month] = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE birth_month=%s AND status='CONFIRMED'",
+               $months[$month] = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE birth_month=%s AND status='CONFIRMED'",

                 array(bigintval($month)), __FILE__, __LINE__));
        }
 
        // Members in categories
                 array(bigintval($month)), __FILE__, __LINE__));
        }
 
        // Members in categories

-       $result = SQL_QUERY("SELECT id, cat FROM `{!MYSQL_PREFIX!}_cats` WHERE visible='Y' ORDER BY id", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats` WHERE `visible`='Y' ORDER BY `id`", __FILE__, __LINE__);

 
        // Load categories first
        $cats = array(); $cat_cnt = array();
 
        // Load categories first
        $cats = array(); $cat_cnt = array();


@@ -91,7 +91,7 @@ case "MEMBERS": // Statistics about your members
        // Now we have all categories loaded, count members
        foreach ($cats as $id => $dummy) {
                // We only need id and nothing more to count...
        // Now we have all categories loaded, count members
        foreach ($cats as $id => $dummy) {
                // We only need id and nothing more to count...

-               $cat_cnt[$id] = SQL_NUMROWS(SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s",
+               $cat_cnt[$id] = SQL_NUMROWS(SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s",

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


@@ -163,27 +163,24 @@ case "MEMBERS": // Statistics about your members
 
 case "MODULES": // TOP10 module clicks
        $AND = "";
 
 case "MODULES": // TOP10 module clicks
        $AND = "";

-       if (!IS_ADMIN()) $AND = " AND locked='N' AND visible='Y'";
-       $guest_t10 = SQL_QUERY("SELECT counter, title FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE counter > 0".$AND." ORDER BY counter DESC LIMIT 0,10", __FILE__, __LINE__);
-       $mem_t10   = SQL_QUERY("SELECT counter, title FROM `{!MYSQL_PREFIX!}_member_menu` WHERE counter > 0".$AND." ORDER BY counter DESC LIMIT 0,10", __FILE__, __LINE__);
-       if ((SQL_NUMROWS($guest_t10) > 0) || (SQL_NUMROWS($mem_t10) > 0))
-       {
+       if (!IS_ADMIN()) $AND = " AND `locked`='N' AND `visible`='Y'";
+       $guest_t10 = SQL_QUERY("SELECT counter, title FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE counter > 0".$AND." ORDER BY counter DESC LIMIT 0,10", __FILE__, __LINE__);
+       $mem_t10   = SQL_QUERY("SELECT counter, title FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE counter > 0".$AND." ORDER BY counter DESC LIMIT 0,10", __FILE__, __LINE__);
+       if ((SQL_NUMROWS($guest_t10) > 0) || (SQL_NUMROWS($mem_t10) > 0)) {

                // Output header
                OUTPUT_HTML("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"guest_table dashed\" width=\"310\">
 <tr>
                // Output header
                OUTPUT_HTML("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"guest_table dashed\" width=\"310\">
 <tr>

-  <td align=\"center\" class=\"guest_stats_title bottom2\" colspan=\"2\"><strong>".GUEST_TOPTEN_STATS."</strong></td>
+  <td align=\"center\" class=\"guest_stats_title bottom2\" colspan=\"2\"><strong>{!GUEST_TOPTEN_STATS!}</strong></td>

 </tr>");
        }
 
 </tr>");
        }
 

-       if (SQL_NUMROWS($guest_t10) > 0)
-       {
+       if (SQL_NUMROWS($guest_t10) > 0) {

                // Guest clicks
                OUTPUT_HTML("<tr>
   <td align=\"center\" class=\"guest_title2 bottom2\" colspan=\"2\">".GUEST_TOP_GUEST_STATS."</td>
 </tr>");
                $SW = 2;
                // Guest clicks
                OUTPUT_HTML("<tr>
   <td align=\"center\" class=\"guest_title2 bottom2\" colspan=\"2\">".GUEST_TOP_GUEST_STATS."</td>
 </tr>");
                $SW = 2;

-               while (list($clicks, $title) = SQL_FETCHROW($guest_t10))
-               {
+               while (list($clicks, $title) = SQL_FETCHROW($guest_t10)) {

                        OUTPUT_HTML("<tr>
   <td class=\"switch_sw".$SW." bottom2 right2\" align=\"right\" width=\"250\">".$title."&nbsp;</td>
   <td class=\"switch_sw".$SW." bottom2\" width=\"50\">&nbsp;".$clicks."</td>
                        OUTPUT_HTML("<tr>
   <td class=\"switch_sw".$SW." bottom2 right2\" align=\"right\" width=\"250\">".$title."&nbsp;</td>
   <td class=\"switch_sw".$SW." bottom2\" width=\"50\">&nbsp;".$clicks."</td>


@@ -191,15 +188,14 @@ case "MODULES": // TOP10 module clicks
                        $SW = 3 - $SW;
                }
        }
                        $SW = 3 - $SW;
                }
        }

-       if (SQL_NUMROWS($guest_t10) > 0)
-       {
+
+       if (SQL_NUMROWS($guest_t10) > 0) {

                // Guest clicks
                OUTPUT_HTML("<tr>
   <td align=\"center\" class=\"guest_title2 bottom2\" colspan=\"2\">".GUEST_TOP_MEMBER_STATS."</td>
 </tr>");
                $SW = 2;
                // Guest clicks
                OUTPUT_HTML("<tr>
   <td align=\"center\" class=\"guest_title2 bottom2\" colspan=\"2\">".GUEST_TOP_MEMBER_STATS."</td>
 </tr>");
                $SW = 2;

-               while (list($clicks, $title) = SQL_FETCHROW($mem_t10))
-               {
+               while (list($clicks, $title) = SQL_FETCHROW($mem_t10)) {

                        OUTPUT_HTML("<tr>
   <td class=\"switch_sw".$SW." bottom2 right2\" align=\"right\" width=\"250\">".$title."&nbsp;</td>
   <td class=\"switch_sw".$SW." bottom2\" width=\"50\">&nbsp;".$clicks."</td>
                        OUTPUT_HTML("<tr>
   <td class=\"switch_sw".$SW." bottom2 right2\" align=\"right\" width=\"250\">".$title."&nbsp;</td>
   <td class=\"switch_sw".$SW." bottom2\" width=\"50\">&nbsp;".$clicks."</td>


@@ -207,11 +203,11 @@ case "MODULES": // TOP10 module clicks
                        $SW = 3 - $SW;
                }
        }
                        $SW = 3 - $SW;
                }
        }

-       if ((SQL_NUMROWS($guest_t10) > 0) || (SQL_NUMROWS($mem_t10) > 0))
-       {
+
+       if ((SQL_NUMROWS($guest_t10) > 0) || (SQL_NUMROWS($mem_t10) > 0)) {

                // Output footer
                OUTPUT_HTML("<tr>
                // Output footer
                OUTPUT_HTML("<tr>

-  <td align=\"center\" class=\"guest_stats_footer\" colspan=\"2\"><a href=\"".URL."/modules.php?module=index&amp;what=stats&amp;mode=".$lmode."\">".$ltitle."</a></td>
+  <td align=\"center\" class=\"guest_stats_footer\" colspan=\"2\"><a href=\"{!URL!}/modules.php?module=index&amp;what=stats&amp;mode=".$lmode."\">".$ltitle."</a></td>

 </tr>
 </table>");
        }
 </tr>
 </table>");
        }

diff --git a/inc/modules/guest/what-top10.php b/inc/modules/guest/what-top10.php
index 151f60057fc50c797dac9f5b8c302dc6eb279d3c..f6bc1f06a1d74a18a03dbf5d4d364335277f406f 100644 (file)
--- a/inc/modules/guest/what-top10.php
+++ b/inc/modules/guest/what-top10.php
@@ -48,7 +48,7 @@ $result = SQL_QUERY_ESC("
 SELECT
        userid, total_logins, last_online
 FROM
 SELECT
        userid, total_logins, last_online
 FROM

-       "._MYSQL_PREFIX."_user_data
+       {!_MYSQL_PREFIX!}_user_data

 WHERE
        total_logins > 0 AND
        status='CONFIRMED'
 WHERE
        total_logins > 0 AND
        status='CONFIRMED'


@@ -108,7 +108,7 @@ SELECT DISTINCT
        (SUM(p.points) - d.used_points) AS tpoints,
        d.last_online
 FROM
        (SUM(p.points) - d.used_points) AS tpoints,
        d.last_online
 FROM

-       `{!MYSQL_PREFIX!}_user_data` AS d
+       `{!_MYSQL_PREFIX!}_user_data` AS d

 LEFT JOIN
        {!MYSQL_PREFIX!}_user_points AS p
 ON
 LEFT JOIN
        {!MYSQL_PREFIX!}_user_points AS p
 ON


@@ -174,7 +174,7 @@ SELECT DISTINCT
        SUM(r.counter) AS refs,
        d.last_online
 FROM
        SUM(r.counter) AS refs,
        d.last_online
 FROM

-       `{!MYSQL_PREFIX!}_user_data` AS d
+       `{!_MYSQL_PREFIX!}_user_data` AS d

 LEFT JOIN
        {!MYSQL_PREFIX!}_refsystem AS r
 ON
 LEFT JOIN
        {!MYSQL_PREFIX!}_refsystem AS r
 ON

diff --git a/inc/modules/guest/what-welcome.php b/inc/modules/guest/what-welcome.php
index 99c81229dd60a5143427c14a1f4e982db05407c2..c4a5c2fe2cf6f897e3c47e1fdae46cd598af8502 100644 (file)
--- a/inc/modules/guest/what-welcome.php
+++ b/inc/modules/guest/what-welcome.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("guest", __FILE__);
 
 // Count referal levels
 ADD_DESCR("guest", __FILE__);
 
 // Count referal levels

-$result = SQL_QUERY("SELECT COUNT(id) FROM `{!MYSQL_PREFIX!}_refdepths` WHERE level>0", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_refdepths` WHERE level>0", __FILE__, __LINE__);

 
 // Fetch rows
 list($cnt) = SQL_FETCHROW($result);
 
 // Fetch rows
 list($cnt) = SQL_FETCHROW($result);

diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index 0eecb59927f9f128fd37af1138fa0c0ad5305e72..4c2dcb6b926ca2f165929e76113e9743941bcc93 100644 (file)
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -48,7 +48,7 @@ if (defined('__THEME_SELECTION_CONTENT')) return false;
 // Load all active designs (or all if admin)
 $whereStatement = ""; $OUT = "";
 if (!IS_ADMIN()) $whereStatement = " WHERE theme_active='Y'";
 // Load all active designs (or all if admin)
 $whereStatement = ""; $OUT = "";
 if (!IS_ADMIN()) $whereStatement = " WHERE theme_active='Y'";

-$result_themes = SQL_QUERY("SELECT theme_path FROM `{!MYSQL_PREFIX!}_themes`".$whereStatement, __FILE__, __LINE__);
+$result_themes = SQL_QUERY("SELECT theme_path FROM `{!_MYSQL_PREFIX!}_themes`".$whereStatement, __FILE__, __LINE__);

 $num_themes = SQL_NUMROWS($result_themes);
 
 if ($num_themes > 1) {
 $num_themes = SQL_NUMROWS($result_themes);
 
 if ($num_themes > 1) {

diff --git a/inc/modules/member/what-beg.php b/inc/modules/member/what-beg.php
index 16df22b6d3b947692ffebeac463fc05a9fdd2ad9..c2cfac4d099332ebccc35baafbcd60480fc7c85a 100644 (file)
--- a/inc/modules/member/what-beg.php
+++ b/inc/modules/member/what-beg.php
@@ -59,7 +59,7 @@ if (EXT_IS_ACTIVE("nickname"))
 
 // Run SQL command
 $result = SQL_QUERY_ESC("SELECT ".$data.", beg_clicks
 
 // Run SQL command
 $result = SQL_QUERY_ESC("SELECT ".$data.", beg_clicks

-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE userid=%s
 LIMIT 1", array($uid), __FILE__, __LINE__);
 list($uid, $clicks) = SQL_FETCHROW($result);
 WHERE userid=%s
 LIMIT 1", array($uid), __FILE__, __LINE__);
 list($uid, $clicks) = SQL_FETCHROW($result);

diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php
index d1da6a6af201db2f723bd52dc7a4b8fc0b7b03e2..81237f37b7cc35ec1dbc2a1e13444c54bb772fa8 100644 (file)
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -54,7 +54,7 @@ if (EXT_IS_ACTIVE("autopurge")) {
 }
 
 // Let's check if there are some points left we can "pay"...
 }
 
 // Let's check if there are some points left we can "pay"...

-$result = SQL_QUERY_ESC("SELECT userid, beg_points AS beg, last_online FROM `{!MYSQL_PREFIX!}_user_data`
+$result = SQL_QUERY_ESC("SELECT userid, beg_points AS beg, last_online FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE beg_points > 0 AND status='CONFIRMED'".$LAST."
 ORDER BY beg_points DESC, last_online DESC, userid LIMIT %s",
        array($ONLINE, getConfig('beg_ranks')), __FILE__, __LINE__);
 WHERE beg_points > 0 AND status='CONFIRMED'".$LAST."
 ORDER BY beg_points DESC, last_online DESC, userid LIMIT %s",
        array($ONLINE, getConfig('beg_ranks')), __FILE__, __LINE__);


@@ -64,7 +64,7 @@ $OUT = "";
 if (SQL_NUMROWS($result) > 0) {
        // Load our winners...
        $SW = 2; $cnt = 1;
 if (SQL_NUMROWS($result) > 0) {
        // Load our winners...
        $SW = 2; $cnt = 1;

-       while(list($uid, $turbo, $last) = SQL_FETCHROW($result)) {
+       while (list($uid, $turbo, $last) = SQL_FETCHROW($result)) {

                // Prepare data for the template
                $content = array(
                        'sw'     => $SW,
                // Prepare data for the template
                $content = array(
                        'sw'     => $SW,

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index 2b133c5ebc15161790cefdd35a96bbb4d1e710d4..3b01a6f21027d39a9d6dd016b82c64afddfc7a03 100644 (file)
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -71,7 +71,7 @@ if (EXT_IS_ACTIVE("autopurge")) {
 }
 
 // Let's check if there are some points left we can "pay"...
 }
 
 // Let's check if there are some points left we can "pay"...

-$result = SQL_QUERY_ESC("SELECT userid, ".$USE." AS points, last_online FROM `{!MYSQL_PREFIX!}_user_data`
+$result = SQL_QUERY_ESC("SELECT userid, ".$USE." AS points, last_online FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE ".$USE." > 0 AND status='CONFIRMED'".$LAST."
 ORDER BY points DESC, last_online DESC, userid
 LIMIT %s",
 WHERE ".$USE." > 0 AND status='CONFIRMED'".$LAST."
 ORDER BY points DESC, last_online DESC, userid
 LIMIT %s",

diff --git a/inc/modules/member/what-categories.php b/inc/modules/member/what-categories.php
index e62396e54b540ec0ddfe3acd664156aefdc3ad04..ab5fc444b6288c50b8b73178bc40d2493adc789b 100644 (file)
--- a/inc/modules/member/what-categories.php
+++ b/inc/modules/member/what-categories.php
@@ -43,10 +43,10 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 $UID = $GLOBALS['userid'];
 ADD_DESCR("member", __FILE__);
 
 $UID = $GLOBALS['userid'];

-$whereStatement = " WHERE visible='Y'";
+$whereStatement = " WHERE `visible`='Y'";

 if (IS_ADMIN()) $whereStatement = "";
 
 if (IS_ADMIN()) $whereStatement = "";
 

-$result = SQL_QUERY("SELECT id, cat FROM `{!MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY sort", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY `sort`", __FILE__, __LINE__);

 $cats = SQL_NUMROWS($result);
 
 if ($cats > 0)
 $cats = SQL_NUMROWS($result);
 
 if ($cats > 0)


@@ -73,12 +73,12 @@ if ($cats > 0)
                        {
                                case "Y":
                                        $sql = "";
                        {
                                case "Y":
                                        $sql = "";

-                                       $result_user = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1",
+                                       $result_user = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1",

                                         array($UID, bigintval($cat)), __FILE__, __LINE__);
 
                                        if (SQL_NUMROWS($result_user) == 0)
                                        {
                                         array($UID, bigintval($cat)), __FILE__, __LINE__);
 
                                        if (SQL_NUMROWS($result_user) == 0)
                                        {

-                                               $sql = "INSERT INTO `{!MYSQL_PREFIX!}_user_cats` (userid, cat_id) VALUES ('%s','%s')";
+                                               $sql = "INSERT INTO `{!_MYSQL_PREFIX!}_user_cats` (userid, cat_id) VALUES ('%s','%s')";

                                        }
                                         else
                                        {
                                        }
                                         else
                                        {


@@ -88,7 +88,7 @@ if ($cats > 0)
                                        break;
 
                                case "N":
                                        break;
 
                                case "N":

-                                       $sql = "DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1";
+                                       $sql = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1";

                                        break;
                        }
                        if (!empty($sql))
                                        break;
                        }
                        if (!empty($sql))


@@ -98,7 +98,7 @@ if ($cats > 0)
                        }
                }
                // Categories saved...
                        }
                }
                // Categories saved...

-               LOAD_TEMPLATE("admin_settings_saved", true, MEMBER_CATS_SAVED);
+               LOAD_TEMPLATE("admin_settings_saved", true, getMessage('MEMBER_CATS_SAVED'));

        }
         else
        {
        }
         else
        {


@@ -121,7 +121,7 @@ if ($cats > 0)
                        $JOINED_N = " checked=\"checked\""; $JOINED_Y = "";
 
                        // Check category selection
                        $JOINED_N = " checked=\"checked\""; $JOINED_Y = "";
 
                        // Check category selection

-                       $result_user = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1",
+                       $result_user = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1",

                         array($UID, bigintval($id)), __FILE__, __LINE__);
 
                        // When we found an entry don't read it, just change the JOINED_x variables
                         array($UID, bigintval($id)), __FILE__, __LINE__);
 
                        // When we found an entry don't read it, just change the JOINED_x variables


@@ -161,7 +161,7 @@ if ($cats > 0)
  else
 {
        // No cateogries are defined yet
  else
 {
        // No cateogries are defined yet

-       LOAD_TEMPLATE("admin_settings_saved", true, MEMBER_NO_CATS);
+       LOAD_TEMPLATE("admin_settings_saved", true, getMessage('MEMBER_NO_CATS'));

 }
 
 SQL_FREERESULT($result);
 }
 
 SQL_FREERESULT($result);

diff --git a/inc/modules/member/what-guest.php b/inc/modules/member/what-guest.php
index adbb1e5d3fff3c0a2339b6fc2045c9e6c2a4c3dc..f8be32e85b7f40d60676eb55ceef4f3ba93ac03b 100644 (file)
--- a/inc/modules/member/what-guest.php
+++ b/inc/modules/member/what-guest.php
@@ -43,6 +43,6 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Simply redirect...
 ADD_DESCR("member", __FILE__);
 
 // Simply redirect...

-LOAD_URL (URL."/modules.php?module=index");
+LOAD_URL("modules.php?module=index");

 //
 ?>
 //
 ?>

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index d616a78fde233dae81be4d4d0b64720b21db8564..c6ef6c2e9f99d57bd26e800d580ea467a2dd5fb3 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -46,11 +46,11 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Check for running mail orders in pool
 ADD_DESCR("member", __FILE__);
 
 // Check for running mail orders in pool

-$result1 = SQL_QUERY_ESC("SELECT timestamp FROM `{!MYSQL_PREFIX!}_pool`
+$result1 = SQL_QUERY_ESC("SELECT timestamp FROM `{!_MYSQL_PREFIX!}_pool`

 WHERE sender=%s ORDER BY timestamp DESC LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
 // Check for sent mail orders in stats
 WHERE sender=%s ORDER BY timestamp DESC LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
 // Check for sent mail orders in stats

-$result2 = SQL_QUERY_ESC("SELECT timestamp_ordered FROM `{!MYSQL_PREFIX!}_user_stats`
+$result2 = SQL_QUERY_ESC("SELECT timestamp_ordered FROM `{!_MYSQL_PREFIX!}_user_stats`

 WHERE userid=%s ORDER BY timestamp_ordered DESC LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
 if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1))
 WHERE userid=%s ORDER BY timestamp_ordered DESC LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
 if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1))


@@ -104,11 +104,11 @@ if (isset($_POST['ok']))
         else
        {
                // Everything went okay so let's store his request and send mails
         else
        {
                // Everything went okay so let's store his request and send mails

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_holidays` (userid, holiday_start, holiday_end, comments) VALUES ('%s','%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_holidays` (userid, holiday_start, holiday_end, comments) VALUES ('%s','%s','%s','%s')",

                 array($GLOBALS['userid'], $START, $END, $_POST['comments']), __FILE__, __LINE__);
 
                // Activate holiday system
                 array($GLOBALS['userid'], $START, $END, $_POST['comments']), __FILE__, __LINE__);
 
                // Activate holiday system

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data`
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`

 SET holiday_active='N', holiday_activated=UNIX_TIMESTAMP()
 WHERE userid=%s LIMIT 1",
                 array($GLOBALS['userid']), __FILE__, __LINE__);
 SET holiday_active='N', holiday_activated=UNIX_TIMESTAMP()
 WHERE userid=%s LIMIT 1",
                 array($GLOBALS['userid']), __FILE__, __LINE__);


@@ -129,7 +129,7 @@ WHERE userid=%s LIMIT 1",
                SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_SUBJECT, "admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
 
                // Create task
                SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_SUBJECT, "admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
 
                // Create task

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_task_system` (userid, assigned_admin, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','HOLIDAY_REQUEST','%s','%s', UNIX_TIMESTAMP())",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (userid, assigned_admin, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','HOLIDAY_REQUEST','%s','%s', UNIX_TIMESTAMP())",

                 array($GLOBALS['userid'], HOLIDAY_ADMIN_SUBJECT, $msg), __FILE__, __LINE__);
 
                // Display message
                 array($GLOBALS['userid'], HOLIDAY_ADMIN_SUBJECT, $msg), __FILE__, __LINE__);
 
                // Display message


@@ -141,7 +141,7 @@ WHERE userid=%s LIMIT 1",
 if (isset($_POST['stop']))
 {
        // Okay, end the holiday here...
 if (isset($_POST['stop']))
 {
        // Okay, end the holiday here...

-       $result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM `{!MYSQL_PREFIX!}_user_data`
+       $result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
        list($active, $locked) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
        list($active, $locked) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);


@@ -149,7 +149,7 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
        if (($active == "Y") && (($locked + getConfig('holiday_lock')) < time()))
        {
                // Load data
        if (($active == "Y") && (($locked + getConfig('holiday_lock')) < time()))
        {
                // Load data

-               $result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM `{!MYSQL_PREFIX!}_user_holidays`
+               $result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM `{!_MYSQL_PREFIX!}_user_holidays`

 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1)
                {
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1)
                {


@@ -162,12 +162,12 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
                        define('__HOLIDAY_END'  , MAKE_DATETIME($end  , "3"));
 
                        // Deactivate it now
                        define('__HOLIDAY_END'  , MAKE_DATETIME($end  , "3"));
 
                        // Deactivate it now

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data`
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`

 SET holiday_active='N', holiday_activated='0'
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
                        // Remove entry
 SET holiday_active='N', holiday_activated='0'
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
                        // Remove entry

-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_holidays`
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_holidays`

 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
                        // Send email to admin
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
                        // Send email to admin


@@ -193,7 +193,7 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 if ((!isset($_POST['ok'])) && (!isset($_POST['stop'])))
 {
        // Check if user is in holiday...
 if ((!isset($_POST['ok'])) && (!isset($_POST['stop'])))
 {
        // Check if user is in holiday...

-       $result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM `{!MYSQL_PREFIX!}_user_data`
+       $result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
        list($active, $locked) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
        list($active, $locked) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);


@@ -206,7 +206,7 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
                {
                case "Y": // Display deactivation form
                        // Load starting and ending date
                {
                case "Y": // Display deactivation form
                        // Load starting and ending date

-                       $result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM `{!MYSQL_PREFIX!}_user_holidays`
+                       $result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM `{!_MYSQL_PREFIX!}_user_holidays`

 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {


@@ -228,7 +228,7 @@ WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
                                SQL_FREERESULT($result);
 
                                // Remove entry and reload URL
                                SQL_FREERESULT($result);
 
                                // Remove entry and reload URL

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data`
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`

 SET holiday_active='N'
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
                                LOAD_URL("modules.php?module=login&amp;what=holiday");
 SET holiday_active='N'
 WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
                                LOAD_URL("modules.php?module=login&amp;what=holiday");

diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php
index e82f71705e8a5a48af5770d68629f3054d2efda1..8343af91d07f12de65f6ff28f7c7b5fdc4849c7a 100644 (file)
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -49,14 +49,14 @@ ADD_DESCR("member", __FILE__);
 if (isset($_POST['ok']))
 {
        // Save settings
 if (isset($_POST['ok']))
 {
        // Save settings

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET html='%s' WHERE userid=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET html='%s' WHERE userid=%s LIMIT 1",

                array($_POST['html'], $GLOBALS['userid']), __FILE__, __LINE__);
                array($_POST['html'], $GLOBALS['userid']), __FILE__, __LINE__);

-       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_SETTINGS_SAVED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_SETTINGS_SAVED'));

 }
  else
 {
        // Load template for changing settings
 }
  else
 {
        // Load template for changing settings

-       $result = SQL_QUERY_ESC("SELECT html FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT html FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

         array($GLOBALS['userid']), __FILE__, __LINE__);
        list($mode) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
         array($GLOBALS['userid']), __FILE__, __LINE__);
        list($mode) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 64d7f856794cd1c384b1053e7a1e10db4a2a0e7e..35ff349b5e7df5b3fd568e551742e7485d19be2a 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -59,13 +59,13 @@ case "show": // Show his data
        if (EXT_IS_ACTIVE("country", true))
        {
                // New way                         0        1         2          3         4     5     6        7           8            9       10      11           12           13
        if (EXT_IS_ACTIVE("country", true))
        {
                // New way                         0        1         2          3         4     5     6        7           8            9       10      11           12           13

-               $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country_code, zip, city, email, birth_day, birth_month, birth_year, gender, max_mails, receive_mails, last_update FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country_code, zip, city, email, birth_day, birth_month, birth_year, gender, max_mails, receive_mails, last_update FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                 array(UID_VALUE), __FILE__, __LINE__);
        }
         else
        {
                // Old way                         0        1         2        3      4     5     6        7           8            9       10      11           12           13
                 array(UID_VALUE), __FILE__, __LINE__);
        }
         else
        {
                // Old way                         0        1         2        3      4     5     6        7           8            9       10      11           12           13

-               $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country, zip, city, email, birth_day, birth_month, birth_year, gender, max_mails, receive_mails, last_update FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country, zip, city, email, birth_day, birth_month, birth_year, gender, max_mails, receive_mails, last_update FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                 array(UID_VALUE), __FILE__, __LINE__);
        }
        $DATA = SQL_FETCHROW($result);
                 array(UID_VALUE), __FILE__, __LINE__);
        }
        $DATA = SQL_FETCHROW($result);


@@ -108,12 +108,12 @@ case "edit": // Edit data
        if (EXT_IS_ACTIVE("country", true)) {
                // New way                         0        1         2          3         4     5     6        7           8            9       10      11           12           13
                $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country_code, zip, city, email, birth_day, birth_month, birth_year, gender, max_mails, receive_mails, last_update
        if (EXT_IS_ACTIVE("country", true)) {
                // New way                         0        1         2          3         4     5     6        7           8            9       10      11           12           13
                $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country_code, zip, city, email, birth_day, birth_month, birth_year, gender, max_mails, receive_mails, last_update

-FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                 array(UID_VALUE), __FILE__, __LINE__);
        } else {
                // Old way                         0        1         2        3      4     5     6        7           8            9       10      11           12           13
                $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country, zip, city, email, birth_day, birth_month, birth_year, gender, max_mails, receive_mails, last_update
                 array(UID_VALUE), __FILE__, __LINE__);
        } else {
                // Old way                         0        1         2        3      4     5     6        7           8            9       10      11           12           13
                $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country, zip, city, email, birth_day, birth_month, birth_year, gender, max_mails, receive_mails, last_update

-FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                 array(UID_VALUE), __FILE__, __LINE__);
        }
 
                 array(UID_VALUE), __FILE__, __LINE__);
        }
 


@@ -192,7 +192,7 @@ FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 
 case "save": // Save entered data
        // Load old email / password:      0        1          2
 
 case "save": // Save entered data
        // Load old email / password:      0        1          2

-       $result = SQL_QUERY_ESC("SELECT email, password, last_update FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT email, password, last_update FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

         array(UID_VALUE), __FILE__, __LINE__);
        $DATA = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
         array(UID_VALUE), __FILE__, __LINE__);
        $DATA = SQL_FETCHROW($result);
        SQL_FREERESULT($result);


@@ -229,7 +229,7 @@ case "save": // Save entered data
                        if (EXT_IS_ACTIVE("country"))
                        {
                                // New way
                        if (EXT_IS_ACTIVE("country"))
                        {
                                // New way

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET

 gender='%s', surname='%s', family='%s',
 street_nr='%s',
 country_code=%s, zip=%s, city='%s',
 gender='%s', surname='%s', family='%s',
 street_nr='%s',
 country_code=%s, zip=%s, city='%s',


@@ -260,7 +260,7 @@ array(
                         else
                        {
                                // Old way
                         else
                        {
                                // Old way

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET

 gender='%s', surname='%s', family='%s',
 street_nr='%s',
 country='%s', zip=%s, city='%s',
 gender='%s', surname='%s', family='%s',
 street_nr='%s',
 country='%s', zip=%s, city='%s',


@@ -304,7 +304,7 @@ array(
        break;
 
 case "notify": // Switch off notfication
        break;
 
 case "notify": // Switch off notfication

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET notified='N', last_update=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET notified='N', last_update=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",

         array($GLOBALS['userid']), __FILE__, __LINE__);
        $URL = "modules.php?module=login&what=welcome&msg=".urlencode(PROFILE_UPDATED);
        break;
         array($GLOBALS['userid']), __FILE__, __LINE__);
        $URL = "modules.php?module=login&what=welcome&msg=".urlencode(PROFILE_UPDATED);
        break;

diff --git a/inc/modules/member/what-newsletter.php b/inc/modules/member/what-newsletter.php
index 77899418139c9f8d73d53809656f2ea123e81f8f..1b31672422d2a1a8b0abe87be0f71f7fbf4e4fbe 100644 (file)
--- a/inc/modules/member/what-newsletter.php
+++ b/inc/modules/member/what-newsletter.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Load status
 ADD_DESCR("member", __FILE__);
 
 // Load status

-$result = SQL_QUERY_ESC("SELECT nl_receive, nl_until, nl_timespan FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+$result = SQL_QUERY_ESC("SELECT nl_receive, nl_until, nl_timespan FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

  array($GLOBALS['userid']), __FILE__, __LINE__);
 list($status, $until, $span) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
  array($GLOBALS['userid']), __FILE__, __LINE__);
 list($status, $until, $span) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);


@@ -57,14 +57,14 @@ define('__CHARGE_VALUE', TRANSLATE_COMMA(getConfig('nl_charge')));
 if ((isset($_POST['ok'])) && ($status == "Y") && ($span == "0"))
 {
        // Save request
 if ((isset($_POST['ok'])) && ($status == "Y") && ($span == "0"))
 {
        // Save request

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET nl_timespan='".(getConfig('one_day') * 30)."' WHERE userid=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET nl_timespan='".(getConfig('one_day') * 30)."' WHERE userid=%s LIMIT 1",

                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Load admin message
        $admin_msg = LOAD_EMAIL_TEMPLATE("admin_newsletter_request", array(), $GLOBALS['userid']);
 
        // Add task
                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Load admin message
        $admin_msg = LOAD_EMAIL_TEMPLATE("admin_newsletter_request", array(), $GLOBALS['userid']);
 
        // Add task

-       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_task_system` (assigned_admin, status, task_type, subject, text, task_created, userid)
+       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (assigned_admin, status, task_type, subject, text, task_created, userid)

 VALUES ('0','NEW','NL_UNSUBSCRIBE','".ADMIN_NL_SUBJECT."','".$admin_msg."', UNIX_TIMESTAMP(),'%s')", array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Send mail to member
 VALUES ('0','NEW','NL_UNSUBSCRIBE','".ADMIN_NL_SUBJECT."','".$admin_msg."', UNIX_TIMESTAMP(),'%s')", array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Send mail to member

diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php
index 5297de5ad17e3c3bdfd954e8308dca27e243bd1c..6fee3818c2cca39907a0dcc40783e216a7ec78a1 100644 (file)
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -60,11 +60,11 @@ if (isset($_POST['ok'])) {
 
 if ($VALID) {
        // Look for nickname in database (we only need just one entry so don't worry about the "LIMIT 1" !
 
 if ($VALID) {
        // Look for nickname in database (we only need just one entry so don't worry about the "LIMIT 1" !

-       $result = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE nickname='%s' AND userid != '%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' AND userid != '%s' LIMIT 1",

                array($_POST['nickname'], $GLOBALS['userid']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Nickname not in use, so set it now
                array($_POST['nickname'], $GLOBALS['userid']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Nickname not in use, so set it now

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET nickname='%s' WHERE userid=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET nickname='%s' WHERE userid=%s LIMIT 1",

                        array($_POST['nickname'], $GLOBALS['userid']), __FILE__, __LINE__);
                $content = NICKNAME_SAVED;
        } else {
                        array($_POST['nickname'], $GLOBALS['userid']), __FILE__, __LINE__);
                $content = NICKNAME_SAVED;
        } else {

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 5cf3a25becb20bcffce43281341a74a254c1f4dc..f1627a9584533e4d15b66977e978bce25aeac4a1 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 $URL = ""; $id = 0;
 ADD_DESCR("member", __FILE__);
 
 $URL = ""; $id = 0;

-$whereStatement = " WHERE visible='Y'";
+$whereStatement = " WHERE `visible`='Y'";

 
 // Set undefined array elements
 if (empty($_GET['msg']))       $_GET['msg']       = "";
 
 // Set undefined array elements
 if (empty($_GET['msg']))       $_GET['msg']       = "";


@@ -69,7 +69,7 @@ if (GET_EXT_VERSION("holiday") >= "0.1.3") {
 } // END - if
 
 $result_mmails = SQL_QUERY_ESC("SELECT userid, receive_mails, mail_orders, ".$HOLIDAY."
 } // END - if
 
 $result_mmails = SQL_QUERY_ESC("SELECT userid, receive_mails, mail_orders, ".$HOLIDAY."

-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE userid=%s AND max_mails > 0 LIMIT 1",
        array($GLOBALS['userid']), __FILE__, __LINE__);
 
 WHERE userid=%s AND max_mails > 0 LIMIT 1",
        array($GLOBALS['userid']), __FILE__, __LINE__);
 


@@ -92,7 +92,7 @@ if (($HOLIDAY == "Y") && (GET_EXT_VERSION("holiday") >= "0.1.3")) {
        //
        // First we would like to store the data and get it's pool position back...
        $result = SQL_QUERY_ESC("SELECT id, data_type
        //
        // First we would like to store the data and get it's pool position back...
        $result = SQL_QUERY_ESC("SELECT id, data_type

-FROM `{!MYSQL_PREFIX!}_pool`
+FROM `{!_MYSQL_PREFIX!}_pool`

 WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
                array($GLOBALS['userid'], $_POST['url'], getConfig('url_tlock')), __FILE__, __LINE__);
 
 WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
                array($GLOBALS['userid'], $_POST['url'], getConfig('url_tlock')), __FILE__, __LINE__);
 


@@ -139,7 +139,7 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
                // And shall I check that his URL is not in the black list?
                if (getConfig('url_blacklist') == "Y") {
                        // Ok, I do that for you know...
                // And shall I check that his URL is not in the black list?
                if (getConfig('url_blacklist') == "Y") {
                        // Ok, I do that for you know...

-                       $result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`timestamp`) AS tstamp FROM `{!MYSQL_PREFIX!}_url_blacklist` WHERE `url`='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`timestamp`) AS tstamp FROM `{!_MYSQL_PREFIX!}_url_blacklist` WHERE `url`='%s' LIMIT 1",

                                array($_POST['url']), __FILE__, __LINE__);
 
                        if (SQL_NUMROWS($result) == 1) {
                                array($_POST['url']), __FILE__, __LINE__);
 
                        if (SQL_NUMROWS($result) == 1) {


@@ -195,8 +195,8 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
                } // END - if
 
                // Check for userids
                } // END - if
 
                // Check for userids

-               $result = SQL_QUERY_ESC("SELECT DISTINCT c.userid FROM `{!MYSQL_PREFIX!}_user_cats` AS c
-LEFT JOIN `{!MYSQL_PREFIX!}_user_data` AS d
+               $result = SQL_QUERY_ESC("SELECT DISTINCT c.userid FROM `{!_MYSQL_PREFIX!}_user_cats` AS c
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d

 ON c.userid=d.userid
 WHERE c.cat_id=%s AND c.userid != '%s' AND d.status='CONFIRMED' AND d.receive_mails > 0".$ADD."
 ORDER BY d.%s %s",
 ON c.userid=d.userid
 WHERE c.cat_id=%s AND c.userid != '%s' AND d.status='CONFIRMED' AND d.receive_mails > 0".$ADD."
 ORDER BY d.%s %s",


@@ -221,7 +221,7 @@ ORDER BY d.%s %s",
                        while (list($REC) = SQL_FETCHROW($result)) {
                                if ($HOLIDAY) {
                                        // Check for his holiday status
                        while (list($REC) = SQL_FETCHROW($result)) {
                                if ($HOLIDAY) {
                                        // Check for his holiday status

-                                       $result_holiday = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_holidays`
+                                       $result_holiday = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_holidays`

 WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIMESTAMP() LIMIT 1",
  array(bigintval($REC)), __FILE__, __LINE__);
                                        if (SQL_NUMROWS($result_holiday) == 1) $REC = 0; // Exclude user who are in holiday
 WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIMESTAMP() LIMIT 1",
  array(bigintval($REC)), __FILE__, __LINE__);
                                        if (SQL_NUMROWS($result_holiday) == 1) $REC = 0; // Exclude user who are in holiday


@@ -247,7 +247,7 @@ WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIME
                        $MAX_SEND = count($TEST);
 
                        // Update receiver list
                        $MAX_SEND = count($TEST);
 
                        // Update receiver list

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET receive_mails=receive_mails-1 WHERE userid IN (%s) LIMIT %s",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET receive_mails=receive_mails-1 WHERE userid IN (%s) LIMIT %s",

                                array(str_replace(";", ", ", $RECEIVER), $MAX_SEND), __FILE__, __LINE__);
 
                        // Is calculated max receivers larger than wanted receivers then reset it
                                array(str_replace(";", ", ", $RECEIVER), $MAX_SEND), __FILE__, __LINE__);
 
                        // Is calculated max receivers larger than wanted receivers then reset it


@@ -268,7 +268,7 @@ WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIME
                                        $id = 0;
                                        if (EXT_IS_ACTIVE("html_mail")) {
                                                // HTML extension is active
                                        $id = 0;
                                        if (EXT_IS_ACTIVE("html_mail")) {
                                                // HTML extension is active

-                                               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_pool` (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip, html_msg)
+                                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_pool` (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip, html_msg)

  VALUES ('%s','%s','%s','%s','%s','TEMP','%s','%s','%s','%s','%s','%s')",
 array(
        $GLOBALS['userid'],
  VALUES ('%s','%s','%s','%s','%s','TEMP','%s','%s','%s','%s','%s','%s')",
 array(
        $GLOBALS['userid'],


@@ -285,7 +285,7 @@ array(
 ), __FILE__, __LINE__);
                                        } else {
                                                // No HTML extension is active
 ), __FILE__, __LINE__);
                                        } else {
                                                // No HTML extension is active

-                                               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_pool` (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip)
+                                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_pool` (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip)

  VALUES ('%s','%s','%s','%s','%s','TEMP','%s','%s','%s','%s','%s')",
 array(
        $GLOBALS['userid'],
  VALUES ('%s','%s','%s','%s','%s','TEMP','%s','%s','%s','%s','%s')",
 array(
        $GLOBALS['userid'],


@@ -304,7 +304,7 @@ array(
                                        // Change current order
                                        if (EXT_IS_ACTIVE("html_mail")) {
                                                // HTML extension is active
                                        // Change current order
                                        if (EXT_IS_ACTIVE("html_mail")) {
                                                // HTML extension is active

-                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_pool` SET
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET

 subject='%s',
 text='%s',
 receivers='%s',
 subject='%s',
 text='%s',
 receivers='%s',


@@ -330,7 +330,7 @@ array(
 ), __FILE__, __LINE__);
                                        } else {
                                                // No HTML extension is active
 ), __FILE__, __LINE__);
                                        } else {
                                                // No HTML extension is active

-                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_pool` SET
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET

 subject='%s',
 text='%s',
 receivers='%s',
 subject='%s',
 text='%s',
 receivers='%s',


@@ -358,7 +358,7 @@ array(
                                // Do we need to get the ID number?
                                if ($id == 0) {
                                        // Order is placed as temporary. We need to get it's id for the frametester
                                // Do we need to get the ID number?
                                if ($id == 0) {
                                        // Order is placed as temporary. We need to get it's id for the frametester

-                                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_pool` WHERE sender=%s AND subject='%s' AND payment_id=%s AND data_type='TEMP' AND timestamp=%s LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_pool` WHERE sender=%s AND subject='%s' AND payment_id=%s AND data_type='TEMP' AND timestamp=%s LIMIT 1",

                                        array(
                                                $GLOBALS['userid'],
                                                $_POST['subject'],
                                        array(
                                                $GLOBALS['userid'],
                                                $_POST['subject'],


@@ -389,10 +389,10 @@ array(
        $URL = "modules.php?module=login&amp;what=order&amp;msg=".CODE_MORE_RECEIVERS1;
 } elseif (($ALLOWED == 0) && (getConfig('order_max_full') == "ORDER")) {
        // No more mail orders allowed
        $URL = "modules.php?module=login&amp;what=order&amp;msg=".CODE_MORE_RECEIVERS1;
 } elseif (($ALLOWED == 0) && (getConfig('order_max_full') == "ORDER")) {
        // No more mail orders allowed

-       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_ORDER_ALLOWED_EXHAUSTED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_ORDER_ALLOWED_EXHAUSTED'));

 } elseif (($links < getConfig('unconfirmed')) && ($mmails == "1")) {
        // Display order form
 } elseif (($links < getConfig('unconfirmed')) && ($mmails == "1")) {
        // Display order form

-       $result_cats = SQL_QUERY("SELECT id, cat FROM `{!MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY sort", __FILE__, __LINE__);
+       $result_cats = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY `sort`", __FILE__, __LINE__);

        if (SQL_NUMROWS($result_cats) > 0) {
                if ($TOTAL > 0) {
                        // Initialize array...
        if (SQL_NUMROWS($result_cats) > 0) {
                if ($TOTAL > 0) {
                        // Initialize array...


@@ -416,7 +416,7 @@ array(
                                $CATS['name'][] = $cat;
 
                                // Select users in current category
                                $CATS['name'][] = $cat;
 
                                // Select users in current category

-                               $result_uids = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s AND userid != '%s' ORDER BY userid",
+                               $result_uids = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s AND userid != '%s' ORDER BY userid",

                                 array(bigintval($id), $GLOBALS['userid']), __FILE__, __LINE__);
 
                                $uid_cnt = 0;
                                 array(bigintval($id), $GLOBALS['userid']), __FILE__, __LINE__);
 
                                $uid_cnt = 0;


@@ -425,8 +425,8 @@ array(
                                        $HOL_ACTIVE = false;
                                        if ($HOLIDAY) {
                                                // Check user's holiday status
                                        $HOL_ACTIVE = false;
                                        if ($HOLIDAY) {
                                                // Check user's holiday status

-                                               $result_holiday = SQL_QUERY_ESC("SELECT DISTINCT d.userid FROM `{!MYSQL_PREFIX!}_user_data` AS d
-LEFT JOIN `{!MYSQL_PREFIX!}_user_holidays` AS h
+                                               $result_holiday = SQL_QUERY_ESC("SELECT DISTINCT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_holidays` AS h

 ON d.userid=h.userid
 WHERE d.userid=%s AND d.receive_mails > 0 AND d.status='CONFIRMED' AND d.holiday_active='Y'
 AND h.holiday_start < UNIX_TIMESTAMP() AND h.holiday_end > UNIX_TIMESTAMP()
 ON d.userid=h.userid
 WHERE d.userid=%s AND d.receive_mails > 0 AND d.status='CONFIRMED' AND d.holiday_active='Y'
 AND h.holiday_start < UNIX_TIMESTAMP() AND h.holiday_end > UNIX_TIMESTAMP()


@@ -442,8 +442,8 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 
                                        if (!$HOL_ACTIVE) {
                                                // Check if the user want's to receive mails?
 
                                        if (!$HOL_ACTIVE) {
                                                // Check if the user want's to receive mails?

-                                               $result_ver = SQL_QUERY_ESC("SELECT zip FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s".$HTML." AND receive_mails > 0 AND status='CONFIRMED' LIMIT 1",
-                                                array(bigintval($ucat)), __FILE__, __LINE__);
+                                               $result_ver = SQL_QUERY_ESC("SELECT zip FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s".$HTML." AND receive_mails > 0 AND status='CONFIRMED' LIMIT 1",
+                                                       array(bigintval($ucat)), __FILE__, __LINE__);

 
                                                if ((SQL_NUMROWS($result_ver) == 1) && (!empty($_POST['zip'])) && (getConfig('order_multi_page') == "Y")) {
                                                        list($zip) = SQL_FETCHROW($result_ver);
 
                                                if ((SQL_NUMROWS($result_ver) == 1) && (!empty($_POST['zip'])) && (getConfig('order_multi_page') == "Y")) {
                                                        list($zip) = SQL_FETCHROW($result_ver);


@@ -468,7 +468,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                        SQL_FREERESULT($result_cats);
 
                        // Now we need to load the mail types...
                        SQL_FREERESULT($result_cats);
 
                        // Now we need to load the mail types...

-                       $result = SQL_QUERY("SELECT id, price, payment, mail_title FROM `{!MYSQL_PREFIX!}_payments` ORDER BY payment", __FILE__, __LINE__);
+                       $result = SQL_QUERY("SELECT id, price, payment, mail_title FROM `{!_MYSQL_PREFIX!}_payments` ORDER BY payment", __FILE__, __LINE__);

 
                        $typeS = array();
                        if (SQL_NUMROWS($result) > 0) {
 
                        $typeS = array();
                        if (SQL_NUMROWS($result) > 0) {


@@ -477,7 +477,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                switch ($_GET['msg'])
                                {
                                case CODE_URL_TLOCK:
                                switch ($_GET['msg'])
                                {
                                case CODE_URL_TLOCK:

-                                       $result = SQL_QUERY_ESC("SELECT timestamp FROM `{!MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT timestamp FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",

                                         array(bigintval($_GET['id'])), __FILE__, __LINE__);
 
                                        // Load timestamp from last order
                                         array(bigintval($_GET['id'])), __FILE__, __LINE__);
 
                                        // Load timestamp from last order


@@ -595,7 +595,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                $OLD_ORDER = false; $subject = ""; $text = ""; $target = "";
 
                                // Check if we already have an order placed and make it editable
                                $OLD_ORDER = false; $subject = ""; $text = ""; $target = "";
 
                                // Check if we already have an order placed and make it editable

-                               $result = SQL_QUERY_ESC("SELECT subject, text, payment_id, timestamp, url, target_send, cat_id, zip FROM `{!MYSQL_PREFIX!}_pool` WHERE sender=%s AND data_type='TEMP' LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT subject, text, payment_id, timestamp, url, target_send, cat_id, zip FROM `{!_MYSQL_PREFIX!}_pool` WHERE sender=%s AND data_type='TEMP' LIMIT 1",

                                 array($GLOBALS['userid']), __FILE__, __LINE__);
 
                                if (SQL_NUMROWS($result) == 1) {
                                 array($GLOBALS['userid']), __FILE__, __LINE__);
 
                                if (SQL_NUMROWS($result) == 1) {


@@ -700,19 +700,19 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                }
                        } else {
                                // No mail types defined
                                }
                        } else {
                                // No mail types defined

-                               LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">".MEMBER_NO_PAYMENTS."</span>");
+                               LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">{!MEMBER_NO_PAYMENTS!}</span>");

                        }
                } else {
                        // No points left!
                        }
                } else {
                        // No points left!

-                       LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">".MEMBER_NO_POINTS."</span>");
+                       LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">{!MEMBER_NO_POINTS!}</span>");

                }
        } else {
                // No cateogries are defined yet
                }
        } else {
                // No cateogries are defined yet

-               LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">".MEMBER_NO_CATS."</span>");
+               LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">{!MEMBER_NO_CATS!}</span>");

        }
 } elseif ($mmails == "0") {
        // Please set more than 0 mails per day!
        }
 } elseif ($mmails == "0") {
        // Please set more than 0 mails per day!

-       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_HAS_ZERO_MMAILS);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_HAS_ZERO_MMAILS'));

 } else {
        // Please confirm some mails first!
        LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_LINKS_LEFT_1.$links.MEMBER_LINKS_LEFT_2.getConfig('unconfirmed').MEMBER_LINKS_LEFT_3);
 } else {
        // Please confirm some mails first!
        LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_LINKS_LEFT_1.$links.MEMBER_LINKS_LEFT_2.getConfig('unconfirmed').MEMBER_LINKS_LEFT_3);

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index d8d9af536942a36e600ee834af5b08fb12a98e86..451ab749012e1ffc2a1c23fea4a57aefff474eb7 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -47,7 +47,7 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 ADD_DESCR("member", __FILE__);
 
 // Add description as navigation point
 ADD_DESCR("member", __FILE__);
 

-$result_depths = SQL_QUERY("SELECT level, percents FROM `{!MYSQL_PREFIX!}_refdepths` ORDER BY level", __FILE__, __LINE__);
+$result_depths = SQL_QUERY("SELECT level, percents FROM `{!_MYSQL_PREFIX!}_refdepths` ORDER BY level", __FILE__, __LINE__);

 $TPTS = 0;
 while (list($lvl, $per) = SQL_FETCHROW($result_depths)) {
        // Load referal points
 $TPTS = 0;
 while (list($lvl, $per) = SQL_FETCHROW($result_depths)) {
        // Load referal points


@@ -83,7 +83,7 @@ if (empty($_GET['payout']))
 {
        // Load payout types
        $result = SQL_QUERY_ESC("SELECT id, type, rate, min_points, allow_url
 {
        // Load payout types
        $result = SQL_QUERY_ESC("SELECT id, type, rate, min_points, allow_url

-FROM `{!MYSQL_PREFIX!}_payout_types`
+FROM `{!_MYSQL_PREFIX!}_payout_types`

 WHERE %s >= min_points
 ORDER BY type", array(REVERT_COMMA($TPTS)), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0)
 WHERE %s >= min_points
 ORDER BY type", array(REVERT_COMMA($TPTS)), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0)


@@ -93,8 +93,8 @@ ORDER BY type", array(REVERT_COMMA($TPTS)), __FILE__, __LINE__);
 
                // Check for his payouts
                $result_payouts = SQL_QUERY_ESC("SELECT DISTINCT p.id, p.payout_total, p.target_account, p.target_bank, t.type, p.payout_timestamp, p.status, t.allow_url AS allow, p.target_url AS url, p.link_text AS alt, p.banner_url AS bannerm
 
                // Check for his payouts
                $result_payouts = SQL_QUERY_ESC("SELECT DISTINCT p.id, p.payout_total, p.target_account, p.target_bank, t.type, p.payout_timestamp, p.status, t.allow_url AS allow, p.target_url AS url, p.link_text AS alt, p.banner_url AS bannerm

-FROM `{!MYSQL_PREFIX!}_user_payouts` AS p
-LEFT JOIN `{!MYSQL_PREFIX!}_payout_types` AS t
+FROM `{!_MYSQL_PREFIX!}_user_payouts` AS p
+LEFT JOIN `{!_MYSQL_PREFIX!}_payout_types` AS t

 ON p.payout_id = t.id
 WHERE p.userid = %s
 ORDER BY p.payout_timestamp DESC",
 ON p.payout_id = t.id
 WHERE p.userid = %s
 ORDER BY p.payout_timestamp DESC",


@@ -163,7 +163,7 @@ ORDER BY p.payout_timestamp DESC",
  else
 {
        // Chedk if he can get paid by selected type
  else
 {
        // Chedk if he can get paid by selected type

-       $result = SQL_QUERY_ESC("SELECT type, rate, min_points, allow_url FROM `{!MYSQL_PREFIX!}_payout_types` WHERE id=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT type, rate, min_points, allow_url FROM `{!_MYSQL_PREFIX!}_payout_types` WHERE id=%s LIMIT 1",

         array(bigintval($_GET['payout'])), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result) == 1)
         array(bigintval($_GET['payout'])), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result) == 1)


@@ -202,7 +202,7 @@ ORDER BY p.payout_timestamp DESC",
                                if ($allow == "Y")
                                {
                                        // Banner/textlink ordered
                                if ($allow == "Y")
                                {
                                        // Banner/textlink ordered

-                                       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_payouts` (userid, payout_total, payout_id, payout_timestamp, status, target_url, link_text, banner_url)
+                                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_payouts` (userid, payout_total, payout_id, payout_timestamp, status, target_url, link_text, banner_url)

 VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
  array(
        $GLOBALS['userid'],
 VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
  array(
        $GLOBALS['userid'],


@@ -227,7 +227,7 @@ VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
                                 else
                                {
                                        // e-currency payout requested
                                 else
                                {
                                        // e-currency payout requested

-                                       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_payouts` (userid, payout_total, target_account, target_bank, payout_id, payout_timestamp, status, password)
+                                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_payouts` (userid, payout_total, target_account, target_bank, payout_id, payout_timestamp, status, password)

 VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
  array(
        $GLOBALS['userid'],
 VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
  array(
        $GLOBALS['userid'],


@@ -249,7 +249,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                                }
 
                                // Generate task
                                }
 
                                // Generate task

-                               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_task_system` (assigned_admin, status, task_type, subject, text, task_created, userid)
+                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (assigned_admin, status, task_type, subject, text, task_created, userid)

 VALUES (0, 'NEW','PAYOUT_REQUEST','[payout:] ".PAYOUT_REQUEST_ADMIN."','%s', UNIX_TIMESTAMP(), %s)",
  array(
        $msg_adm,
 VALUES (0, 'NEW','PAYOUT_REQUEST','[payout:] ".PAYOUT_REQUEST_ADMIN."','%s', UNIX_TIMESTAMP(), %s)",
  array(
        $msg_adm,

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index 648116e4db0a592631b93a20307c8f5fb28ef539..8480ee81b9497e4e1c0398181f36143bd040e053 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 ADD_DESCR("member", __FILE__);
 
 // Add description as navigation point
 ADD_DESCR("member", __FILE__);
 

-$result_depths = SQL_QUERY("SELECT level, percents FROM `{!MYSQL_PREFIX!}_refdepths` ORDER BY level", __FILE__, __LINE__);
+$result_depths = SQL_QUERY("SELECT level, percents FROM `{!_MYSQL_PREFIX!}_refdepths` ORDER BY level", __FILE__, __LINE__);

 $depths = SQL_NUMROWS($result_depths);
 
 // Add many more rows for the login/turbo/ref/order bonus
 $depths = SQL_NUMROWS($result_depths);
 
 // Add many more rows for the login/turbo/ref/order bonus


@@ -62,7 +62,7 @@ while (list($lvl, $per) = SQL_FETCHROW($result_depths)) {
        $REFS = 0;
 
        // Load referal points
        $REFS = 0;
 
        // Load referal points

-       $result_points = SQL_QUERY_ESC("SELECT points, locked_points FROM `{!MYSQL_PREFIX!}_user_points` WHERE userid=%s AND ref_depth=%d LIMIT 1", array($GLOBALS['userid'], bigintval($lvl)), __FILE__, __LINE__);
+       $result_points = SQL_QUERY_ESC("SELECT points, locked_points FROM `{!_MYSQL_PREFIX!}_user_points` WHERE userid=%s AND ref_depth=%d LIMIT 1", array($GLOBALS['userid'], bigintval($lvl)), __FILE__, __LINE__);

        if (SQL_NUMROWS($result_points) == 1) {
                list($points, $locked) = SQL_FETCHROW($result_points);
                SQL_FREERESULT($result_points);
        if (SQL_NUMROWS($result_points) == 1) {
                list($points, $locked) = SQL_FETCHROW($result_points);
                SQL_FREERESULT($result_points);


@@ -73,7 +73,7 @@ while (list($lvl, $per) = SQL_FETCHROW($result_depths)) {
        }
 
        // Load referal counts
        }
 
        // Load referal counts

-       $result_refs = SQL_QUERY_ESC("SELECT counter FROM `{!MYSQL_PREFIX!}_refsystem` WHERE userid=%s AND level='%s' LIMIT 1",
+       $result_refs = SQL_QUERY_ESC("SELECT counter FROM `{!_MYSQL_PREFIX!}_refsystem` WHERE userid=%s AND level='%s' LIMIT 1",

                array($GLOBALS['userid'], bigintval($lvl)), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_refs) == 1) {
                list($REFS) = SQL_FETCHROW($result_refs);
                array($GLOBALS['userid'], bigintval($lvl)), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_refs) == 1) {
                list($REFS) = SQL_FETCHROW($result_refs);


@@ -101,7 +101,7 @@ SQL_FREERESULT($result_depths);
 // Put rows to constant for the main template
 define('__REF_LEVEL_ROWS', $OUT);
 
 // Put rows to constant for the main template
 define('__REF_LEVEL_ROWS', $OUT);
 

-$result = SQL_QUERY_ESC("SELECT used_points, ref_payout FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+$result = SQL_QUERY_ESC("SELECT used_points, ref_payout FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

        array($GLOBALS['userid']), __FILE__, __LINE__);
 list($USED, $PAY) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
        array($GLOBALS['userid']), __FILE__, __LINE__);
 list($USED, $PAY) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);


@@ -115,7 +115,7 @@ if (GET_EXT_VERSION("user") >= "0.1.2") {
        if (GET_EXT_VERSION("user") >= "0.1.4") {
                $ADD = ", emails_sent, emails_received";
        }
        if (GET_EXT_VERSION("user") >= "0.1.4") {
                $ADD = ", emails_sent, emails_received";
        }

-       $result = SQL_QUERY_ESC("SELECT mails_confirmed".$ADD." FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT mails_confirmed".$ADD." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);

        list($CONFIRMED, $SENT, $RECEIVED) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
        list($CONFIRMED, $SENT, $RECEIVED) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 


@@ -145,7 +145,7 @@ if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (EXT_IS_ACTIVE("bonus")) && (getCon
        if (GET_EXT_VERSION("bonus") >= "0.4.4") $ADD = ", bonus_ref, bonus_order, bonus_stats";
 
        // Load data
        if (GET_EXT_VERSION("bonus") >= "0.4.4") $ADD = ", bonus_ref, bonus_order, bonus_stats";
 
        // Load data

-       $result = SQL_QUERY_ESC("SELECT login_bonus, turbo_bonus".$ADD." FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT login_bonus, turbo_bonus".$ADD." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // We don't add this points now. This will be done after each month
                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // We don't add this points now. This will be done after each month

diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php
index 38c4e95ba7e880b307e1dcb0af3f3a37299815f0..4219cca7ff65cd62d41bcde809a62e4470f61781 100644 (file)
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -63,7 +63,7 @@ if (!isset($_GET['mode'])) {
        $content['refid'] = bigintval(getConfig('primera_refid'));
 
        // Get Primus id
        $content['refid'] = bigintval(getConfig('primera_refid'));
 
        // Get Primus id

-       $result = SQL_QUERY_ESC("SELECT primera_userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT primera_userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Are there some entries?
                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Are there some entries?


@@ -81,7 +81,7 @@ if (!isset($_GET['mode'])) {
                $_GET['mode'] = "list";
 
                // And load all rows!
                $_GET['mode'] = "list";
 
                // And load all rows!

-               $result = SQL_QUERY_ESC("SELECT `id`, `primera_account`, `primera_amount`, `primera_timestamp`, `primera_type` FROM `{!MYSQL_PREFIX!}_user_primera` WHERE `userid` = %s ORDER BY `primera_timestamp` DESC",
+               $result = SQL_QUERY_ESC("SELECT `id`, `primera_account`, `primera_amount`, `primera_timestamp`, `primera_type` FROM `{!_MYSQL_PREFIX!}_user_primera` WHERE `userid` = %s ORDER BY `primera_timestamp` DESC",

                        array($GLOBALS['userid']), __FILE__, __LINE__);
 
                // Load all rows
                        array($GLOBALS['userid']), __FILE__, __LINE__);
 
                // Load all rows


@@ -133,7 +133,7 @@ if ($_GET['mode'] == "pay") {
 
        // Get Primera id
        $content['primera_nickname'] = "";
 
        // Get Primera id
        $content['primera_nickname'] = "";

-       $result = SQL_QUERY_ESC("SELECT primera_userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT primera_userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Are there some entries?
                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Are there some entries?


@@ -197,7 +197,7 @@ if ((isset($_POST['ok'])) && (isset($_GET['mode']))) {
                                        SUB_POINTS("primera_payout", $GLOBALS['userid'], $_POST['amount']);
 
                                        // Update primera nickname
                                        SUB_POINTS("primera_payout", $GLOBALS['userid'], $_POST['amount']);
 
                                        // Update primera nickname

-                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET `primera_userid`=%s WHERE userid=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `primera_userid`=%s WHERE userid=%s LIMIT 1",

                                                array($_POST['primera_nickname'], $GLOBALS['userid']), __FILE__, __LINE__);
 
                                        // All done!
                                                array($_POST['primera_nickname'], $GLOBALS['userid']), __FILE__, __LINE__);
 
                                        // All done!

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index 47f67fc61fe3e2b0d1b79fe81d764c171d0e952b..49683289523d0ea76f7822a7dca633f5a0f0381a 100644 (file)
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -51,7 +51,7 @@ OUTPUT_HTML("<div align=\"center\">");
 $ADMIN = " AND d.is_active='Y'";
 if (IS_ADMIN()) $ADMIN = "";
 $result = SQL_QUERY("SELECT DISTINCT d.id, d.admin_id, a.login, d.title, d.descr, d.template, d.start_time, d.end_time, d.min_users, d.min_prices
 $ADMIN = " AND d.is_active='Y'";
 if (IS_ADMIN()) $ADMIN = "";
 $result = SQL_QUERY("SELECT DISTINCT d.id, d.admin_id, a.login, d.title, d.descr, d.template, d.start_time, d.end_time, d.min_users, d.min_prices

- FROM `{!MYSQL_PREFIX!}_rallye_data` AS d, `{!MYSQL_PREFIX!}_admins` AS a
+ FROM `{!_MYSQL_PREFIX!}_rallye_data` AS d, `{!_MYSQL_PREFIX!}_admins` AS a

  WHERE d.admin_id=a.id".$ADMIN." AND d.notified='Y'
  ORDER BY d.end_time LIMIT 1", __FILE__, __LINE__);
 
  WHERE d.admin_id=a.id".$ADMIN." AND d.notified='Y'
  ORDER BY d.end_time LIMIT 1", __FILE__, __LINE__);
 


@@ -75,10 +75,10 @@ if (SQL_NUMROWS($result) == 1)
        }
         else
        {
        }
         else
        {

-               define('__RALLYE_EXTRAS', "<a href=\"".URL."/modules.php?module=login&amp;what=reflinks\">".RALLYE_GET_REFLINK."</a>");
+               define('__RALLYE_EXTRAS', "<a href=\"{!URL!}/modules.php?module=login&amp;what=reflinks\">".RALLYE_GET_REFLINK."</a>");

        }
        // Set admin line (currently set to impressum, later to contact form)
        }
        // Set admin line (currently set to impressum, later to contact form)

-       define('__RALLYE_ADMIN', "<a href=\"".URL."/modules.php?module=index&amp;what=impressum&amp;admin=".$aid."\">".$login."</a>");
+       define('__RALLYE_ADMIN', "<a href=\"{!URL!}/modules.php?module=index&amp;what=impressum&amp;admin=".$aid."\">".$login."</a>");

 
        // Set title
        define('__RALLYE_TITLE', COMPILE_CODE($title));
 
        // Set title
        define('__RALLYE_TITLE', COMPILE_CODE($title));

diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php
index 014e8f5f0fed2893fdeca68e4ff7bbe80053cfea..7bd83a4acded1617c7fd3e09689043ee9533d292 100644 (file)
--- a/inc/modules/member/what-refback.php
+++ b/inc/modules/member/what-refback.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 // Is the refback system enabled?
 if (getConfig('refback_enabled') == "N") {
        // Output message
 // Is the refback system enabled?
 if (getConfig('refback_enabled') == "N") {
        // Output message

-       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_REFBACK_DISABLED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_REFBACK_DISABLED'));

        // Abort here
        return false;
 } // END - if
        // Abort here
        return false;
 } // END - if


@@ -69,13 +69,13 @@ if ((isset($_POST['edit'])) && (isset($_POST['id']))) {
                        // Check status
                        if (isset($status['ok'])) {
                                // No message found
                        // Check status
                        if (isset($status['ok'])) {
                                // No message found

-                               LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_REFBACK_DONE);
+                               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_REFBACK_DONE'));

                        } elseif (isset($status['message'])) {
                                // Something went wrong with error message
                                LOAD_TEMPLATE("admin_settings_saved", false, sprintf(MEMBER_REFBACK_ERROR_MESSAGE, $status['message']));
                        } else {
                                // No message found
                        } elseif (isset($status['message'])) {
                                // Something went wrong with error message
                                LOAD_TEMPLATE("admin_settings_saved", false, sprintf(MEMBER_REFBACK_ERROR_MESSAGE, $status['message']));
                        } else {
                                // No message found

-                               LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_REFBACK_ERROR_EMPTY_MESSAGE);
+                               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_REFBACK_ERROR_EMPTY_MESSAGE);

                        }
                } else {
                        // Percents out-of-bounds ;-)
                        }
                } else {
                        // Percents out-of-bounds ;-)


@@ -100,7 +100,7 @@ if ((isset($_POST['edit'])) && (isset($_POST['id']))) {
 
 // Load all referal levels
 $result = SQL_QUERY_ESC("SELECT r.level, r.percents
 
 // Load all referal levels
 $result = SQL_QUERY_ESC("SELECT r.level, r.percents

-FROM `{!MYSQL_PREFIX!}_refdepths` AS r
+FROM `{!_MYSQL_PREFIX!}_refdepths` AS r

 WHERE r.level > 0
 ORDER BY r.level ASC",
        array($GLOBALS['userid']), __FILE__, __LINE__);
 WHERE r.level > 0
 ORDER BY r.level ASC",
        array($GLOBALS['userid']), __FILE__, __LINE__);


@@ -153,7 +153,7 @@ if (SQL_NUMROWS($result) > 0) {
        LOAD_TEMPLATE("member_refback_list", false, $OUT);
 } else {
        // No entries
        LOAD_TEMPLATE("member_refback_list", false, $OUT);
 } else {
        // No entries

-       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_REFBACK_NO_ENTRIES);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_REFBACK_NO_ENTRIES'));

 }
 
 // Free result
 }
 
 // Free result

diff --git a/inc/modules/member/what-reflinks.php b/inc/modules/member/what-reflinks.php
index f597c457fddfe9e16ae48cfe835bd4386b2c7cce..8b400c254c3efcd9c36ce6d99a1c1b59e1d7cdfa 100644 (file)
--- a/inc/modules/member/what-reflinks.php
+++ b/inc/modules/member/what-reflinks.php
@@ -43,13 +43,13 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Load current referal clicks
 ADD_DESCR("member", __FILE__);
 
 // Load current referal clicks

-$result = SQL_QUERY_ESC("SELECT ref_clicks FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+$result = SQL_QUERY_ESC("SELECT ref_clicks FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

        array($GLOBALS['userid']), __FILE__, __LINE__);
 list($c) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
 OUTPUT_HTML("<div class=\"tiny\">".YOUR_PERSONAL_REFLINK.":<br />
        array($GLOBALS['userid']), __FILE__, __LINE__);
 list($c) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
 OUTPUT_HTML("<div class=\"tiny\">".YOUR_PERSONAL_REFLINK.":<br />

-<strong><a href=\"".URL."/ref.php?refid=".$GLOBALS['userid']."\" target=\"_blank\">".URL."/ref.php?ref=".$GLOBALS['userid']."</a></strong><br />
+<strong><a href=\"{!URL!}/ref.php?refid=".$GLOBALS['userid']."\" target=\"_blank\">{!URL!}/ref.php?ref=".$GLOBALS['userid']."</a></strong><br />

 <br />");
 
 if (EXT_IS_ACTIVE("nickname")) {
 <br />");
 
 if (EXT_IS_ACTIVE("nickname")) {


@@ -59,20 +59,20 @@ if (EXT_IS_ACTIVE("nickname")) {
        if (!empty($nick)) {
                // Display nickname link
                OUTPUT_HTML(NICKNAME_YOUR_REFLINK.":<br />
        if (!empty($nick)) {
                // Display nickname link
                OUTPUT_HTML(NICKNAME_YOUR_REFLINK.":<br />

-<strong><a href=\"".URL."/ref.php?ref=".$nick."\" target=\"_blank\">".URL."/ref.php?ref=".$nick."</a></strong><br />
+<strong><a href=\"{!URL!}/ref.php?ref=".$nick."\" target=\"_blank\">{!URL!}/ref.php?ref=".$nick."</a></strong><br />

 <br />");
        } else {
                // Display link to nickname form
                OUTPUT_HTML("<div class=\"guest_note\">".NO_NICKNAME_SET."</strong><br />
 <br />");
        } else {
                // Display link to nickname form
                OUTPUT_HTML("<div class=\"guest_note\">".NO_NICKNAME_SET."</strong><br />

-<a class=\"tiny\" href=\"".URL."/modules.php?module=login&amp;what=nickname\">".PLEASE_CLICK_NICKNAME_FORM."</a>");
+<a class=\"tiny\" href=\"{!URL!}/modules.php?module=login&amp;what=nickname\">".PLEASE_CLICK_NICKNAME_FORM."</a>");

        }
 }
 
 // Clicks on your reflink
 OUTPUT_HTML(YOUR_REFCLICKS.": <strong>".$c."</strong> ".CLICKS."</div><br /><br />");
        }
 }
 
 // Clicks on your reflink
 OUTPUT_HTML(YOUR_REFCLICKS.": <strong>".$c."</strong> ".CLICKS."</div><br /><br />");

-$whereStatement = " WHERE visible='Y'";
+$whereStatement = " WHERE `visible`='Y'";

 if (IS_ADMIN()) $whereStatement = "";
 if (IS_ADMIN()) $whereStatement = "";

-$result = SQL_QUERY("SELECT id, url, alternate, counter, clicks FROM `{!MYSQL_PREFIX!}_refbanner`", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT id, url, alternate, counter, clicks FROM `{!_MYSQL_PREFIX!}_refbanner`", __FILE__, __LINE__);

 
 if (SQL_NUMROWS($result) > 0) {
        // List available ref banners
 
 if (SQL_NUMROWS($result) > 0) {
        // List available ref banners


@@ -119,7 +119,7 @@ if (SQL_NUMROWS($result) > 0) {
        LOAD_TEMPLATE("member_reflinks_table", false, $GLOBALS['userid']);
 } else {
        // No refbanner found!
        LOAD_TEMPLATE("member_reflinks_table", false, $GLOBALS['userid']);
 } else {
        // No refbanner found!

-       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_NO_REFBANNER_FOUND);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_NO_REFBANNER_FOUND'));

 }
 
 // Free result
 }
 
 // Free result

diff --git a/inc/modules/member/what-reflist.php b/inc/modules/member/what-reflist.php
index dbede43df8b6e780ebfbb893ff10a0a13da9e48e..adec5a282a76fd7164325eb72f540e571c467ee6 100644 (file)
--- a/inc/modules/member/what-reflist.php
+++ b/inc/modules/member/what-reflist.php
@@ -45,7 +45,7 @@ ADD_DESCR("member", __FILE__);
 
 // Load all referal levels
 $result = SQL_QUERY_ESC("SELECT r.level, r.percents
 
 // Load all referal levels
 $result = SQL_QUERY_ESC("SELECT r.level, r.percents

-FROM `{!MYSQL_PREFIX!}_refdepths` AS r
+FROM `{!_MYSQL_PREFIX!}_refdepths` AS r

 WHERE r.level > 0
 ORDER BY r.level ASC",
        array($GLOBALS['userid']), __FILE__, __LINE__);
 WHERE r.level > 0
 ORDER BY r.level ASC",
        array($GLOBALS['userid']), __FILE__, __LINE__);


@@ -91,7 +91,7 @@ if (SQL_NUMROWS($result) > 0) {
        LOAD_TEMPLATE("member_ref_list", false, $OUT);
 } else {
        // No entries
        LOAD_TEMPLATE("member_ref_list", false, $OUT);
 } else {
        // No entries

-       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_REFBACK_NO_ENTRIES);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_REFBACK_NO_ENTRIES'));

 }
 
 // Free result
 }
 
 // Free result

diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php
index 1b76b8fd27e08e045e5b481fef060f7151c9777f..2c000bc97910e0b5ccbead4381d725a21c8f2518 100644 (file)
--- a/inc/modules/member/what-stats.php
+++ b/inc/modules/member/what-stats.php
@@ -47,7 +47,7 @@ $main_content = array();
 
 // Load waiting/pending orders
 $result = SQL_QUERY_ESC("SELECT id, cat_id, payment_id, subject, url, timestamp, target_send, data_type, zip
 
 // Load waiting/pending orders
 $result = SQL_QUERY_ESC("SELECT id, cat_id, payment_id, subject, url, timestamp, target_send, data_type, zip

-FROM `{!MYSQL_PREFIX!}_pool`
+FROM `{!_MYSQL_PREFIX!}_pool`

 WHERE sender=%s AND data_type != 'SEND'
 ORDER BY timestamp DESC",
        array($GLOBALS['userid']), __FILE__, __LINE__);
 WHERE sender=%s AND data_type != 'SEND'
 ORDER BY timestamp DESC",
        array($GLOBALS['userid']), __FILE__, __LINE__);


@@ -85,7 +85,7 @@ if (SQL_NUMROWS($result) > 0) {
        $main_content['pool'] = LOAD_TEMPLATE("member_pool_table", true, $OUT);
 } else {
        // No mails in pool!
        $main_content['pool'] = LOAD_TEMPLATE("member_pool_table", true, $OUT);
 } else {
        // No mails in pool!

-       $main_content['pool'] = LOAD_TEMPLATE("admin_settings_saved", true, MEMBER_NO_MAILS_IN_POOL);
+       $main_content['pool'] = LOAD_TEMPLATE("admin_settings_saved", true, getMessage('MEMBER_NO_MAILS_IN_POOL'));

 }
 
 // Free result
 }
 
 // Free result


@@ -94,7 +94,7 @@ SQL_FREERESULT($result);
 // Load sent orders
 //                               0     1         2         3      4            5            6            7           8
 $result = SQL_QUERY_ESC("SELECT id, cat_id, payment_id, subject, url, timestamp_ordered, max_rec, timestamp_send, clicks
 // Load sent orders
 //                               0     1         2         3      4            5            6            7           8
 $result = SQL_QUERY_ESC("SELECT id, cat_id, payment_id, subject, url, timestamp_ordered, max_rec, timestamp_send, clicks

-FROM `{!MYSQL_PREFIX!}_user_stats`
+FROM `{!_MYSQL_PREFIX!}_user_stats`

 WHERE userid=%s
 ORDER BY timestamp_ordered DESC",
        array($GLOBALS['userid']), __FILE__, __LINE__);
 WHERE userid=%s
 ORDER BY timestamp_ordered DESC",
        array($GLOBALS['userid']), __FILE__, __LINE__);


@@ -126,7 +126,7 @@ if (SQL_NUMROWS($result) > 0) {
        $main_content['stats'] = LOAD_TEMPLATE("member_stats_table", true, $OUT);
 } else {
        // No mail orders fond
        $main_content['stats'] = LOAD_TEMPLATE("member_stats_table", true, $OUT);
 } else {
        // No mail orders fond

-       $main_content['stats'] = LOAD_TEMPLATE("admin_settings_saved", true, MEMBER_NO_MAILS_IN_STATS);
+       $main_content['stats'] = LOAD_TEMPLATE("admin_settings_saved", true, getMessage('MEMBER_NO_MAILS_IN_STATS'));

 }
 
 // Free result
 }
 
 // Free result

diff --git a/inc/modules/member/what-support.php b/inc/modules/member/what-support.php
index f4bb2318f0837b458a5be964b8589e6c52e2cc8f..0e977d5bb958b19ca39fa70d55bfee31ff5c38ff 100644 (file)
--- a/inc/modules/member/what-support.php
+++ b/inc/modules/member/what-support.php
@@ -71,7 +71,7 @@ if ((!isset($_POST['ok'])) || (empty($_POST['qsummary']))) {
        SEND_EMAIL($GLOBALS['userid'], $subj_m, $msg_m);
 
        // Drop a message in the admin's area
        SEND_EMAIL($GLOBALS['userid'], $subj_m, $msg_m);
 
        // Drop a message in the admin's area

-       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_task_system` (userid, assigned_admin, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','SUPPORT_MEMBER','%s','%s', UNIX_TIMESTAMP())",
+       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (userid, assigned_admin, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','SUPPORT_MEMBER','%s','%s', UNIX_TIMESTAMP())",

                array($GLOBALS['userid'], $subj_a, $_POST['qsummary'].":".array('text' => $_POST['qdetails'])), __FILE__, __LINE__);
 
        // Form sent
                array($GLOBALS['userid'], $subj_a, $_POST['qsummary'].":".array('text' => $_POST['qdetails'])), __FILE__, __LINE__);
 
        // Form sent

diff --git a/inc/modules/member/what-surfbar_book.php b/inc/modules/member/what-surfbar_book.php
index c1d861aecaa2b9b912423ef9ae5ade382031caaa..e44abfdbf6e66ec9f939a72631b786c70800e2ad 100644 (file)
--- a/inc/modules/member/what-surfbar_book.php
+++ b/inc/modules/member/what-surfbar_book.php
@@ -49,7 +49,7 @@ ADD_DESCR("member", __FILE__);
 // Still allowed to book more URLs?
 if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) {
        // No more URLs allowed to book!
 // Still allowed to book more URLs?
 if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) {
        // No more URLs allowed to book!

-       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_SURFBAR_NO_MORE_ALLOWED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_SURFBAR_NO_MORE_ALLOWED'));

 } elseif ((isset($_POST['ok'])) && (isset($_POST['limited']))) {
        // Is limitation "no" and "limit" is > 0?
        if (($_POST['limited'] == "N") && ((isset($_POST['limit'])) && ($_POST['limit'] > 0)) || (!isset($_POST['limit']))) {
 } elseif ((isset($_POST['ok'])) && (isset($_POST['limited']))) {
        // Is limitation "no" and "limit" is > 0?
        if (($_POST['limited'] == "N") && ((isset($_POST['limit'])) && ($_POST['limit'] > 0)) || (!isset($_POST['limit']))) {

diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php
index d3754e6c13d6a507aa280e5461d09f0c3720de5a..53851627638c08ff9d32d9670b37b7f9af2ec736 100644 (file)
--- a/inc/modules/member/what-surfbar_list.php
+++ b/inc/modules/member/what-surfbar_list.php
@@ -55,11 +55,11 @@ if ((isset($_POST['ok'])) && (isset($_POST['action'])) && (isset($_POST['id'])))
                // Action performed but shall we display it?
                if ((($_POST['action'] != "edit") && ($_POST['action'] != "delete")) || (isset($_POST['execute']))) {
                        // Display "action done" message if action is wether 'edit' nor 'delete' or has been executed
                // Action performed but shall we display it?
                if ((($_POST['action'] != "edit") && ($_POST['action'] != "delete")) || (isset($_POST['execute']))) {
                        // Display "action done" message if action is wether 'edit' nor 'delete' or has been executed

-                       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_SURFBAR_ACTION_DONE);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_SURFBAR_ACTION_DONE'));

                } // END - if
        } else {
                // Something went wrong
                } // END - if
        } else {
                // Something went wrong

-               LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_SURFBAR_ACTION_FAILED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_SURFBAR_ACTION_FAILED'));

        }
 } elseif (count($URLs) > 0) {
        // List all URLs
        }
 } elseif (count($URLs) > 0) {
        // List all URLs


@@ -70,7 +70,7 @@ if ((isset($_POST['ok'])) && (isset($_POST['action'])) && (isset($_POST['id'])))
                $content['url'] = DEREFERER($content['url']);
                if ($content['views_total'] > 0) {
                        // Include link to stats
                $content['url'] = DEREFERER($content['url']);
                if ($content['views_total'] > 0) {
                        // Include link to stats

-                       $content['views_total'] = "[<a href=\"".URL."/modules.php?module=login&amp;what=surfbar_list\">".TRANSLATE_COMMA($content['views_total'])."</a>]";
+                       $content['views_total'] = "[<a href=\"{!URL!}/modules.php?module=login&amp;what=surfbar_list\">".TRANSLATE_COMMA($content['views_total'])."</a>]";

                } // END - if
                $content['registered']  = MAKE_DATETIME($content['registered'], "2");
                $content['last_locked'] = MAKE_DATETIME($content['last_locked'], "2");
                } // END - if
                $content['registered']  = MAKE_DATETIME($content['registered'], "2");
                $content['last_locked'] = MAKE_DATETIME($content['last_locked'], "2");


@@ -92,7 +92,7 @@ if ((isset($_POST['ok'])) && (isset($_POST['action'])) && (isset($_POST['id'])))
        LOAD_TEMPLATE("member_surfbar_list", false, $OUT);
 } else {
        // No URLs booked so far
        LOAD_TEMPLATE("member_surfbar_list", false, $OUT);
 } else {
        // No URLs booked so far

-       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_SURFBAR_NO_URLS_FOUND);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_SURFBAR_NO_URLS_FOUND'));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php
index 6abebb41fdd6c61512610d9e156d00e0457b0dc3..2034e6e63bd77765b192c3d8ad80b79a4e820715 100644 (file)
--- a/inc/modules/member/what-themes.php
+++ b/inc/modules/member/what-themes.php
@@ -47,7 +47,7 @@ ADD_DESCR("member", __FILE__);
 
 if (!empty($_POST['member_theme'])) {
        // Save theme to member's profile
 
 if (!empty($_POST['member_theme'])) {
        // Save theme to member's profile

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET curr_theme='%s' WHERE userid=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET curr_theme='%s' WHERE userid=%s LIMIT 1",

                array($_POST['member_theme'], $GLOBALS['userid']), __FILE__, __LINE__);
 
        // Set new theme for guests
                array($_POST['member_theme'], $GLOBALS['userid']), __FILE__, __LINE__);
 
        // Set new theme for guests


@@ -57,7 +57,7 @@ if (!empty($_POST['member_theme'])) {
        set_session('mxchange_theme', $newTheme);
 
        // Theme saved!
        set_session('mxchange_theme', $newTheme);
 
        // Theme saved!

-       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_THEME_SAVED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_THEME_SAVED'));

 }
 
 // Initialize array
 }
 
 // Initialize array


@@ -123,7 +123,7 @@ if (empty($OUT)) {
        // No themes found???
        $OUT = "<tr>
   <td colspan=\"5\" class=\"bottom2\" height=\"80\">
        // No themes found???
        $OUT = "<tr>
   <td colspan=\"5\" class=\"bottom2\" height=\"80\">

-    ".LOAD_TEMPLATE("admin_settings_saved", true, MEMBER_NO_THEMES_FOUND)."
+    ".LOAD_TEMPLATE("admin_settings_saved", true, getMessage('MEMBER_NO_THEMES_FOUND'))."

   </td>
 </tr>\n";
 }
   </td>
 </tr>\n";
 }

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index b40a8b33007ff7b50ac6d2c95c72033cb020fd42..8c9abb01dbab5c422b24962c80a11feb8a66fcfc 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Load data
 ADD_DESCR("member", __FILE__);
 
 // Load data

-$result = SQL_QUERY_ESC("SELECT opt_in FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+$result = SQL_QUERY_ESC("SELECT opt_in FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

        array($GLOBALS['userid']), __FILE__, __LINE__);
 list($opt_in) = SQL_FETCHROW($result);
 
        array($GLOBALS['userid']), __FILE__, __LINE__);
 list($opt_in) = SQL_FETCHROW($result);
 


@@ -99,7 +99,7 @@ case "new": // Start new transfer
                }
 
                // Re-check receivers and own personal data
                }
 
                // Re-check receivers and own personal data

-               $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email".$ADD." FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid IN ('%s','%s') AND status='CONFIRMED' ORDER BY userid LIMIT 2",
+               $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email".$ADD." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid IN ('%s','%s') AND status='CONFIRMED' ORDER BY userid LIMIT 2",

                        array($GLOBALS['userid'], bigintval($_POST['to_uid'])), __FILE__, __LINE__);
                $valid_data = (SQL_NUMROWS($result) == 2);
 
                        array($GLOBALS['userid'], bigintval($_POST['to_uid'])), __FILE__, __LINE__);
                $valid_data = (SQL_NUMROWS($result) == 2);
 


@@ -168,10 +168,10 @@ case "new": // Start new transfer
                        define('__TRANS_ID', bigintval(GEN_RANDOM_CODE("10", mt_rand(0, 99999), $GLOBALS['userid'], $_POST['reason'])));
 
                        // Add entries to both tables
                        define('__TRANS_ID', bigintval(GEN_RANDOM_CODE("10", mt_rand(0, 99999), $GLOBALS['userid'], $_POST['reason'])));
 
                        // Add entries to both tables

-                       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_transfers_in` (userid, from_uid, points, reason, time_trans, trans_id) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",
+                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_transfers_in` (userid, from_uid, points, reason, time_trans, trans_id) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",

                                array(bigintval($_POST['to_uid']), $GLOBALS['userid'], bigintval($_POST['points']), $_POST['reason'], __TRANS_ID),
                                __FILE__, __LINE__);
                                array(bigintval($_POST['to_uid']), $GLOBALS['userid'], bigintval($_POST['points']), $_POST['reason'], __TRANS_ID),
                                __FILE__, __LINE__);

-                       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_transfers_out` (userid, to_uid, points, reason, time_trans, trans_id) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",
+                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_transfers_out` (userid, to_uid, points, reason, time_trans, trans_id) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",

                                array($GLOBALS['userid'], bigintval($_POST['to_uid']), bigintval($_POST['points']), $_POST['reason'], __TRANS_ID),
                                __FILE__, __LINE__);
 
                                array($GLOBALS['userid'], bigintval($_POST['to_uid']), bigintval($_POST['points']), $_POST['reason'], __TRANS_ID),
                                __FILE__, __LINE__);
 


@@ -194,7 +194,7 @@ case "new": // Start new transfer
                        SEND_ADMIN_NOTIFICATION($ADMIN_SUBJ, "admin_transfer_points");
 
                        // Transfer is completed
                        SEND_ADMIN_NOTIFICATION($ADMIN_SUBJ, "admin_transfer_points");
 
                        // Transfer is completed

-                       LOAD_TEMPLATE("admin_settings_saved", false, TRANSFER_COMPLETED."<br /><a href=\"".URL."/modules.php?module=login&amp;what=transfer\">".TRANSFER_CONTINUE_OVERVIEW."</a>");
+                       LOAD_TEMPLATE("admin_settings_saved", false, TRANSFER_COMPLETED."<br /><a href=\"{!URL!}/modules.php?module=login&amp;what=transfer\">".TRANSFER_CONTINUE_OVERVIEW."</a>");

                } elseif (!$valid_code) {
                        // Invalid Touring code!
                        LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_note\">".TRANSFER_INVALID_CODE."</div>");
                } elseif (!$valid_code) {
                        // Invalid Touring code!
                        LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_note\">".TRANSFER_INVALID_CODE."</div>");


@@ -226,11 +226,11 @@ case "new": // Start new transfer
                // Load member list
                if (EXT_IS_ACTIVE("nickname")) {
                        // Load userid and nickname
                // Load member list
                if (EXT_IS_ACTIVE("nickname")) {
                        // Load userid and nickname

-                       $result = SQL_QUERY_ESC("SELECT userid, nickname FROM `{!MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' AND opt_in='Y' AND userid != '%s' ORDER BY userid",
+                       $result = SQL_QUERY_ESC("SELECT userid, nickname FROM `{!_MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' AND opt_in='Y' AND userid != '%s' ORDER BY userid",

                         array($GLOBALS['userid']), __FILE__, __LINE__);
                } else {
                        // Load only userid
                         array($GLOBALS['userid']), __FILE__, __LINE__);
                } else {
                        // Load only userid

-                       $result = SQL_QUERY_ESC("SELECT userid, userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' AND opt_in='Y' AND userid != '%s' ORDER BY userid",
+                       $result = SQL_QUERY_ESC("SELECT userid, userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' AND opt_in='Y' AND userid != '%s' ORDER BY userid",

                         array($GLOBALS['userid']), __FILE__, __LINE__);
                }
 
                         array($GLOBALS['userid']), __FILE__, __LINE__);
                }
 


@@ -298,14 +298,14 @@ case "list_out": // List only outgoing transactions
        switch ($MODE)
        {
        case "list_in":
        switch ($MODE)
        {
        case "list_in":

-               $SQL = "SELECT trans_id, from_uid, points, reason, time_trans FROM `{!MYSQL_PREFIX!}_user_transfers_in` WHERE userid=%s ORDER BY time_trans DESC LIMIT ".getConfig('transfer_max');
+               $SQL = "SELECT trans_id, from_uid, points, reason, time_trans FROM `{!_MYSQL_PREFIX!}_user_transfers_in` WHERE userid=%s ORDER BY time_trans DESC LIMIT ".getConfig('transfer_max');

                $NOTHING = TRANSFER_NO_INCOMING_TRANSFERS;
                define('__TRANSFER_SUM', TRANSFER_TOTAL_INCOMING);
                define('__TRANSFER_TITLE', TRANSFER_LIST_INCOMING);
                break;
 
        case "list_out":
                $NOTHING = TRANSFER_NO_INCOMING_TRANSFERS;
                define('__TRANSFER_SUM', TRANSFER_TOTAL_INCOMING);
                define('__TRANSFER_TITLE', TRANSFER_LIST_INCOMING);
                break;
 
        case "list_out":

-               $SQL = "SELECT trans_id, to_uid, points, reason, time_trans FROM `{!MYSQL_PREFIX!}_user_transfers_out` WHERE userid=%s ORDER BY time_trans DESC LIMIT ".getConfig('transfer_max');
+               $SQL = "SELECT trans_id, to_uid, points, reason, time_trans FROM `{!_MYSQL_PREFIX!}_user_transfers_out` WHERE userid=%s ORDER BY time_trans DESC LIMIT ".getConfig('transfer_max');

                $NOTHING = TRANSFER_NO_OUTGOING_TRANSFERS;
                define('__TRANSFER_SUM', TRANSFER_TOTAL_OUTGOING);
                define('__TRANSFER_TITLE', TRANSFER_LIST_OUTGOING);
                $NOTHING = TRANSFER_NO_OUTGOING_TRANSFERS;
                define('__TRANSFER_SUM', TRANSFER_TOTAL_OUTGOING);
                define('__TRANSFER_TITLE', TRANSFER_LIST_OUTGOING);


@@ -367,7 +367,7 @@ case "list_all": // List all transactions
        // fastest way but it shall be fine for now.
        //
        // First of all create the temporary table
        // fastest way but it shall be fine for now.
        //
        // First of all create the temporary table

-       $result = SQL_QUERY("CREATE TEMPORARY TABLE `{!MYSQL_PREFIX!}_transfers_tmp` (
+       $result = SQL_QUERY("CREATE TEMPORARY TABLE `{!_MYSQL_PREFIX!}_transfers_tmp` (

 trans_id VARCHAR(12) NOT NULL DEFAULT '',
 party_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
 points BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
 trans_id VARCHAR(12) NOT NULL DEFAULT '',
 party_uid BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
 points BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',


@@ -378,24 +378,24 @@ KEY(party_uid)
 ) TYPE=HEAP", __FILE__, __LINE__);
 
        // Let's begin with the incoming list
 ) TYPE=HEAP", __FILE__, __LINE__);
 
        // Let's begin with the incoming list

-       $result = SQL_QUERY_ESC("SELECT trans_id, from_uid, points, reason, time_trans FROM `{!MYSQL_PREFIX!}_user_transfers_in` WHERE userid=%s ORDER BY id LIMIT %s",
+       $result = SQL_QUERY_ESC("SELECT trans_id, from_uid, points, reason, time_trans FROM `{!_MYSQL_PREFIX!}_user_transfers_in` WHERE userid=%s ORDER BY `id` LIMIT %s",

 array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
        while ($DATA = SQL_FETCHROW($result)) {
                $DATA[] = "IN";
                $DATA = implode("','", $DATA);
 array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
        while ($DATA = SQL_FETCHROW($result)) {
                $DATA[] = "IN";
                $DATA = implode("','", $DATA);

-               $res_temp = SQL_QUERY("INSERT INTO `{!MYSQL_PREFIX!}_transfers_tmp` (trans_id, party_uid, points, reason, time_trans, trans_type) VALUES ('".$DATA."')", __FILE__, __LINE__);
+               $res_temp = SQL_QUERY("INSERT INTO `{!_MYSQL_PREFIX!}_transfers_tmp` (trans_id, party_uid, points, reason, time_trans, trans_type) VALUES ('".$DATA."')", __FILE__, __LINE__);

        }
 
        // Free memory
        SQL_FREERESULT($result);
 
        // As the last table transfer data from outgoing table to temporary
        }
 
        // Free memory
        SQL_FREERESULT($result);
 
        // As the last table transfer data from outgoing table to temporary

-       $result = SQL_QUERY_ESC("SELECT trans_id, to_uid, points, reason, time_trans FROM `{!MYSQL_PREFIX!}_user_transfers_out` WHERE userid=%s ORDER BY id LIMIT %s",
+       $result = SQL_QUERY_ESC("SELECT trans_id, to_uid, points, reason, time_trans FROM `{!_MYSQL_PREFIX!}_user_transfers_out` WHERE userid=%s ORDER BY `id` LIMIT %s",

 array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
        while ($DATA = SQL_FETCHROW($result)) {
                $DATA[] = "OUT";
                $DATA = implode("','", $DATA);
 array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
        while ($DATA = SQL_FETCHROW($result)) {
                $DATA[] = "OUT";
                $DATA = implode("','", $DATA);

-               $res_temp = SQL_QUERY("INSERT INTO `{!MYSQL_PREFIX!}_transfers_tmp` (trans_id, party_uid, points, reason, time_trans, trans_type) VALUES ('".$DATA."')", __FILE__, __LINE__);
+               $res_temp = SQL_QUERY("INSERT INTO `{!_MYSQL_PREFIX!}_transfers_tmp` (trans_id, party_uid, points, reason, time_trans, trans_type) VALUES ('".$DATA."')", __FILE__, __LINE__);

        }
 
        // Free memory
        }
 
        // Free memory


@@ -405,8 +405,8 @@ array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Output rows
                $OUT = ""; $SW = 2;
        if (SQL_NUMROWS($result) > 0) {
                // Output rows
                $OUT = ""; $SW = 2;

-               $result = SQL_QUERY("SELECT party_uid, trans_id, points, reason, time_trans, trans_type FROM `{!MYSQL_PREFIX!}_transfers_tmp` ORDER BY time_trans DESC", __FILE__, __LINE__);
-               while(list($uid, $idx, $points, $reason, $stamp, $type) = SQL_FETCHROW($result)) {
+               $result = SQL_QUERY("SELECT party_uid, trans_id, points, reason, time_trans, trans_type FROM `{!_MYSQL_PREFIX!}_transfers_tmp` ORDER BY time_trans DESC", __FILE__, __LINE__);
+               while (list($uid, $idx, $points, $reason, $stamp, $type) = SQL_FETCHROW($result)) {

                        if ($type == "OUT") $points = "-$points";
                        $OUT .= "<tr>
   <td class=\"transfer_row1 switch_sw".$SW." bottom2 right2\">
                        if ($type == "OUT") $points = "-$points";
                        $OUT .= "<tr>
   <td class=\"transfer_row1 switch_sw".$SW." bottom2 right2\">


@@ -456,7 +456,7 @@ array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
        LOAD_TEMPLATE("member_transfer_list");
 
        // At the end we don't need a temporary table in memory
        LOAD_TEMPLATE("member_transfer_list");
 
        // At the end we don't need a temporary table in memory

-       $result = SQL_QUERY("DROP TABLE IF EXISTS `{!MYSQL_PREFIX!}_transfers_tmp`", __FILE__, __LINE__);
+       $result = SQL_QUERY("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_transfers_tmp`", __FILE__, __LINE__);

 
        // Free some memory...
        SQL_FREERESULT($result);
 
        // Free some memory...
        SQL_FREERESULT($result);


@@ -464,39 +464,39 @@ array($GLOBALS['userid'], getConfig('transfer_max')), __FILE__, __LINE__);
 
 case "": // Overview page
        // Check incoming transfers
 
 case "": // Overview page
        // Check incoming transfers

-       $result = SQL_QUERY_ESC("SELECT COUNT(id) FROM `{!MYSQL_PREFIX!}_user_transfers_in` WHERE userid=%s", array($GLOBALS['userid']), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_user_transfers_in` WHERE userid=%s", array($GLOBALS['userid']), __FILE__, __LINE__);

        list($dmy) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
        $total=$dmy;
        if ($dmy > 0) {
        list($dmy) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
        $total=$dmy;
        if ($dmy > 0) {

-               define('__TRANSFER_IN_LINK', "<a href=\"".URL."/modules.php?module=login&amp;what=transfer&amp;mode=list_in\">".$dmy."</a>");
+               define('__TRANSFER_IN_LINK', "<a href=\"{!URL!}/modules.php?module=login&amp;what=transfer&amp;mode=list_in\">".$dmy."</a>");

        } else {
                define('__TRANSFER_IN_LINK', $dmy);
        }
 
        // Check outgoing transfers
        } else {
                define('__TRANSFER_IN_LINK', $dmy);
        }
 
        // Check outgoing transfers

-       $result = SQL_QUERY_ESC("SELECT COUNT(id) FROM `{!MYSQL_PREFIX!}_user_transfers_out` WHERE userid=%s", array($GLOBALS['userid']), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT COUNT(id) FROM `{!_MYSQL_PREFIX!}_user_transfers_out` WHERE userid=%s", array($GLOBALS['userid']), __FILE__, __LINE__);

        list($dmy) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
        $total+=$dmy;
        if ($dmy > 0) {
        list($dmy) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
        $total+=$dmy;
        if ($dmy > 0) {

-               define('__TRANSFER_OUT_LINK', "<a href=\"".URL."/modules.php?module=login&amp;what=transfer&amp;mode=list_out\">".$dmy."</a>");
+               define('__TRANSFER_OUT_LINK', "<a href=\"{!URL!}/modules.php?module=login&amp;what=transfer&amp;mode=list_out\">".$dmy."</a>");

        } else {
                define('__TRANSFER_OUT_LINK', $dmy);
        }
 
        // Total transactions
        if ($total > 0) {
        } else {
                define('__TRANSFER_OUT_LINK', $dmy);
        }
 
        // Total transactions
        if ($total > 0) {

-               define('__TRANSFER_ALL_LINK', "<a href=\"".URL."/modules.php?module=login&amp;what=transfer&amp;mode=list_all\">".$total."</a>");
+               define('__TRANSFER_ALL_LINK', "<a href=\"{!URL!}/modules.php?module=login&amp;what=transfer&amp;mode=list_all\">".$total."</a>");

        } else {
                define('__TRANSFER_ALL_LINK', $total);
        }
 
        if (isset($_POST['ok'])) {
                // Save settings
        } else {
                define('__TRANSFER_ALL_LINK', $total);
        }
 
        if (isset($_POST['ok'])) {
                // Save settings

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET opt_in='%s' WHERE userid=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET opt_in='%s' WHERE userid=%s LIMIT 1",

                        array($_POST['opt_in'], $GLOBALS['userid']), __FILE__, __LINE__);
 
                // Rember for next switch() command
                        array($_POST['opt_in'], $GLOBALS['userid']), __FILE__, __LINE__);
 
                // Rember for next switch() command


@@ -511,7 +511,7 @@ case "": // Overview page
        case "Y":
                define('__TRANSFER_ALLOW_Y', " checked=\"checked\"");
                define('__TRANSFER_ALLOW_N', "");
        case "Y":
                define('__TRANSFER_ALLOW_Y', " checked=\"checked\"");
                define('__TRANSFER_ALLOW_N', "");

-               define('__TRANSFER_NEW_LINK', "<a href=\"".URL."/modules.php?module=login&amp;what=transfer&amp;mode=new\">".TRANSFER_NOW_LINK."</a>");
+               define('__TRANSFER_NEW_LINK', "<a href=\"{!URL!}/modules.php?module=login&amp;what=transfer&amp;mode=new\">".TRANSFER_NOW_LINK."</a>");

                break;
 
        case "N":
                break;
 
        case "N":


@@ -523,7 +523,7 @@ case "": // Overview page
 
        // Check for latest out-transfers
        $result = SQL_QUERY_ESC("SELECT time_trans
 
        // Check for latest out-transfers
        $result = SQL_QUERY_ESC("SELECT time_trans

-FROM `{!MYSQL_PREFIX!}_user_transfers_out`
+FROM `{!_MYSQL_PREFIX!}_user_transfers_out`

 WHERE time_trans > (UNIX_TIMESTAMP() - %s) AND userid=%s
 ORDER BY time_trans DESC
 LIMIT 1", array(getConfig('transfer_timeout'), $GLOBALS['userid']), __FILE__, __LINE__);
 WHERE time_trans > (UNIX_TIMESTAMP() - %s) AND userid=%s
 ORDER BY time_trans DESC
 LIMIT 1", array(getConfig('transfer_timeout'), $GLOBALS['userid']), __FILE__, __LINE__);

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 3728a410aa0ddfd70c88522334518682734b3095..2ea5c6d34a34f602e48c76e20a8df721a0861f2f 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -48,7 +48,7 @@ ADD_DESCR("member", __FILE__);
 if ((isset($_GET['bonusid'])) && (EXT_IS_ACTIVE("bonus"))) {
        // Display bonus mail by loading it's full data
        $result_data = SQL_QUERY_ESC("SELECT id, subject, timestamp, cat_id, points, text, is_notify, data_type, time, url
 if ((isset($_GET['bonusid'])) && (EXT_IS_ACTIVE("bonus"))) {
        // Display bonus mail by loading it's full data
        $result_data = SQL_QUERY_ESC("SELECT id, subject, timestamp, cat_id, points, text, is_notify, data_type, time, url

-FROM `{!MYSQL_PREFIX!}_bonus`
+FROM `{!_MYSQL_PREFIX!}_bonus`

 WHERE id=%s LIMIT 1",
                array(bigintval($_GET['bonusid'])), __FILE__, __LINE__);
 
 WHERE id=%s LIMIT 1",
                array(bigintval($_GET['bonusid'])), __FILE__, __LINE__);
 


@@ -79,10 +79,10 @@ WHERE id=%s LIMIT 1",
 } elseif (isset($_GET['mailid'])) {
        // Display regular member mail by loading its full data
        $result_data = SQL_QUERY_ESC("SELECT s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`, s.cat_id, pay.price AS points, p.sender, pay.time, p.data_type
 } elseif (isset($_GET['mailid'])) {
        // Display regular member mail by loading its full data
        $result_data = SQL_QUERY_ESC("SELECT s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`, s.cat_id, pay.price AS points, p.sender, pay.time, p.data_type

-FROM `{!MYSQL_PREFIX!}_user_stats` AS s
-LEFT JOIN `{!MYSQL_PREFIX!}_pool` AS p
+FROM `{!_MYSQL_PREFIX!}_user_stats` AS s
+LEFT JOIN `{!_MYSQL_PREFIX!}_pool` AS p

 ON s.pool_id=p.id
 ON s.pool_id=p.id

-LEFT JOIN `{!MYSQL_PREFIX!}_payments` AS pay
+LEFT JOIN `{!_MYSQL_PREFIX!}_payments` AS pay

 ON p.payment_id=pay.id
 WHERE s.id=%s LIMIT 1",
                array(bigintval($_GET['mailid'])), __FILE__, __LINE__);
 ON p.payment_id=pay.id
 WHERE s.id=%s LIMIT 1",
                array(bigintval($_GET['mailid'])), __FILE__, __LINE__);


@@ -113,11 +113,11 @@ WHERE s.id=%s LIMIT 1",
 
 if (EXT_IS_ACTIVE("bonus")) {
        // Load bonus ID
 
 if (EXT_IS_ACTIVE("bonus")) {
        // Load bonus ID

-       $result = SQL_QUERY_ESC("SELECT stats_id, bonus_id, link_type FROM `{!MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY bonus_id DESC, stats_id DESC",
+       $result = SQL_QUERY_ESC("SELECT stats_id, bonus_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY bonus_id DESC, stats_id DESC",

                array($GLOBALS['userid']), __FILE__, __LINE__);
 } else {
        // Don't load bonus ID
                array($GLOBALS['userid']), __FILE__, __LINE__);
 } else {
        // Don't load bonus ID

-       $result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM `{!MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY stats_id DESC",
+       $result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY stats_id DESC",

                array($GLOBALS['userid']), __FILE__, __LINE__);
 }
 
                array($GLOBALS['userid']), __FILE__, __LINE__);
 }
 


@@ -132,8 +132,8 @@ if (SQL_NUMROWS($result) > 0) {
                {
                case "NORMAL":
                        $result_data = SQL_QUERY_ESC("SELECT s.subject, s.timestamp_ordered, s.cat_id, s.payment_id, p.sender
                {
                case "NORMAL":
                        $result_data = SQL_QUERY_ESC("SELECT s.subject, s.timestamp_ordered, s.cat_id, s.payment_id, p.sender

-FROM `{!MYSQL_PREFIX!}_user_stats` AS s
-LEFT JOIN `{!MYSQL_PREFIX!}_pool` AS p
+FROM `{!_MYSQL_PREFIX!}_user_stats` AS s
+LEFT JOIN `{!_MYSQL_PREFIX!}_pool` AS p

 ON s.pool_id=p.id
 WHERE s.id=%s
 LIMIT 1",
 ON s.pool_id=p.id
 WHERE s.id=%s
 LIMIT 1",


@@ -142,7 +142,7 @@ LIMIT 1",
                        break;
 
                case "BONUS":
                        break;
 
                case "BONUS":

-                       $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id, points, 0 FROM `{!MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
+                       $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id, points, 0 FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",

                         array(bigintval($id2)), __FILE__, __LINE__);
                        $type = "bonusid"; $DATA = $id2; $PROBLEM = BONUS_MAIL_PROBLEM;
                        break;
                         array(bigintval($id2)), __FILE__, __LINE__);
                        $type = "bonusid"; $DATA = $id2; $PROBLEM = BONUS_MAIL_PROBLEM;
                        break;


@@ -240,7 +240,7 @@ LIMIT 1",
        }
 } else {
        // No mails left to confirm... :)
        }
 } else {
        // No mails left to confirm... :)

-       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_NO_MAILS_TO_CONFIRM);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_NO_MAILS_TO_CONFIRM'));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/member/what-welcome.php b/inc/modules/member/what-welcome.php
index 127da07de613e2d966840053129b01f4de707094..c52971a46e55614298bd980fff497607f2cc13f1 100644 (file)
--- a/inc/modules/member/what-welcome.php
+++ b/inc/modules/member/what-welcome.php
@@ -50,7 +50,7 @@ define('_LAST_MODULE_VALUE', GET_MOD_DESCR("member", $LAST['module']));
 LOAD_TEMPLATE("member_welcome_header");
 
 // Chedk if he is returning from a profile update notification
 LOAD_TEMPLATE("member_welcome_header");
 
 // Chedk if he is returning from a profile update notification

-$result = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE notified='Y' AND userid=%s LIMIT 1",
+$result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE notified='Y' AND userid=%s LIMIT 1",

        array($GLOBALS['userid']), __FILE__, __LINE__);
 
 if ((SQL_NUMROWS($result) == 1) && (EXT_IS_ACTIVE("profile"))) {
        array($GLOBALS['userid']), __FILE__, __LINE__);
 
 if ((SQL_NUMROWS($result) == 1) && (EXT_IS_ACTIVE("profile"))) {

diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php
index d9ead54bdfe17181352c6b7ff63ca32802d614f6..b5f4913e6d101925f93cd14872dee936468b17a5 100644 (file)
--- a/inc/modules/member/what-wernis.php
+++ b/inc/modules/member/what-wernis.php
@@ -63,7 +63,7 @@ if ((!isset($_GET['mode'])) || ($_GET['mode'] == "choose")) {
        $content['wds66_id'] = 0;
 
        // Get WDS66 id
        $content['wds66_id'] = 0;
 
        // Get WDS66 id

-       $result = SQL_QUERY_ESC("SELECT wernis_userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT wernis_userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Are there some entries?
                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Are there some entries?


@@ -81,7 +81,7 @@ if ((!isset($_GET['mode'])) || ($_GET['mode'] == "choose")) {
                $_GET['mode'] = "list";
 
                // And load all rows!
                $_GET['mode'] = "list";
 
                // And load all rows!

-               $result = SQL_QUERY_ESC("SELECT `id`, `wernis_account`, `wernis_amount`, `wernis_timestamp`, `wernis_type` FROM `{!MYSQL_PREFIX!}_user_wernis` WHERE `userid` = %s ORDER BY `wernis_timestamp` DESC",
+               $result = SQL_QUERY_ESC("SELECT `id`, `wernis_account`, `wernis_amount`, `wernis_timestamp`, `wernis_type` FROM `{!_MYSQL_PREFIX!}_user_wernis` WHERE `userid` = %s ORDER BY `wernis_timestamp` DESC",

                        array($GLOBALS['userid']), __FILE__, __LINE__);
 
                // Load all rows
                        array($GLOBALS['userid']), __FILE__, __LINE__);
 
                // Load all rows


@@ -112,13 +112,13 @@ if ((!isset($_GET['mode'])) || ($_GET['mode'] == "choose")) {
                // Is the payout mode active?
                if (getConfig('wernis_payout_active') == "Y") {
                        // Add link
                // Is the payout mode active?
                if (getConfig('wernis_payout_active') == "Y") {
                        // Add link

-                       $content['payout_link'] = "<a class=\"menu_blur\" style=\"height: 40px\" href=\"".URL."/modules.php?module=login&amp;what=wernis&amp;mode=payout\"><div style=\"padding-top: 10px\">".MEMBER_WERNIS_MODE_PAYOUT."</div></a>";
+                       $content['payout_link'] = "<a class=\"menu_blur\" style=\"height: 40px\" href=\"{!URL!}/modules.php?module=login&amp;what=wernis&amp;mode=payout\"><div style=\"padding-top: 10px\">".MEMBER_WERNIS_MODE_PAYOUT."</div></a>";

                } // END - if
 
                // Is the withdraw mode active?
                if (getConfig('wernis_withdraw_active') == "Y") {
                        // Add link
                } // END - if
 
                // Is the withdraw mode active?
                if (getConfig('wernis_withdraw_active') == "Y") {
                        // Add link

-                       $content['withdraw_link'] = "<a class=\"menu_blur\" style=\"height: 40px\" href=\"".URL."/modules.php?module=login&amp;what=wernis&amp;mode=withdraw\"><div style=\"padding-top: 10px\">".MEMBER_WERNIS_MODE_WITHDRAW."</div></a>";
+                       $content['withdraw_link'] = "<a class=\"menu_blur\" style=\"height: 40px\" href=\"{!URL!}/modules.php?module=login&amp;what=wernis&amp;mode=withdraw\"><div style=\"padding-top: 10px\">".MEMBER_WERNIS_MODE_WITHDRAW."</div></a>";

                } // END - if
 
                // Mode chooser! ;-)
                } // END - if
 
                // Mode chooser! ;-)


@@ -154,7 +154,7 @@ if ((!isset($_GET['mode'])) || ($_GET['mode'] == "choose")) {
 
        // Get WDS66 id
        $content['wds66_id'] = "";
 
        // Get WDS66 id
        $content['wds66_id'] = "";

-       $result = SQL_QUERY_ESC("SELECT wernis_userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT wernis_userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Are there some entries?
                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Are there some entries?


@@ -178,7 +178,7 @@ if ((!isset($_GET['mode'])) || ($_GET['mode'] == "choose")) {
        WERNIS_ADD_FEES_TO_ARRAY($content);
 
        // Get WDS66 id
        WERNIS_ADD_FEES_TO_ARRAY($content);
 
        // Get WDS66 id

-       $result = SQL_QUERY_ESC("SELECT wernis_userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT wernis_userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Are there some entries?
                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Are there some entries?


@@ -235,7 +235,7 @@ if ((isset($_POST['ok'])) && (isset($_GET['mode']))) {
                                                ADD_POINTS_REFSYSTEM("wernis_withdraw", $GLOBALS['userid'], bigintval($_POST['amount']), false, 0, false, "direct");
 
                                                // Update the user data as well..
                                                ADD_POINTS_REFSYSTEM("wernis_withdraw", $GLOBALS['userid'], bigintval($_POST['amount']), false, 0, false, "direct");
 
                                                // Update the user data as well..

-                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET `wernis_userid`=%s WHERE userid=%s LIMIT 1",
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `wernis_userid`=%s WHERE userid=%s LIMIT 1",

                                                        array(bigintval($_POST['wds66_id']), $GLOBALS['userid']), __FILE__, __LINE__);
 
                                                // All done!
                                                        array(bigintval($_POST['wds66_id']), $GLOBALS['userid']), __FILE__, __LINE__);
 
                                                // All done!


@@ -270,7 +270,7 @@ if ((isset($_POST['ok'])) && (isset($_GET['mode']))) {
                                                SUB_POINTS("wernis_payout", $GLOBALS['userid'], $_POST['amount']);
 
                                                // Update WDS66 id
                                                SUB_POINTS("wernis_payout", $GLOBALS['userid'], $_POST['amount']);
 
                                                // Update WDS66 id

-                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET `wernis_userid`=%s WHERE userid=%s LIMIT 1",
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `wernis_userid`=%s WHERE userid=%s LIMIT 1",

                                                        array(bigintval($_POST['wds66_id']), $GLOBALS['userid']), __FILE__, __LINE__);
 
                                                // All done!
                                                        array(bigintval($_POST['wds66_id']), $GLOBALS['userid']), __FILE__, __LINE__);
 
                                                // All done!

diff --git a/inc/modules/order.php b/inc/modules/order.php
index 399efd48a4b02d983949944eaac1aaddbea29a69..9082cb50ecd58a5d1ca1e6613099004c0ea7525d 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -63,19 +63,19 @@ if (empty($URL)) {
        }
 
        // Update sending pool
        }
 
        // Update sending pool

-       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_pool` SET data_type='%s' WHERE id=%s AND sender=%s AND data_type='TEMP' LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET data_type='%s' WHERE id=%s AND sender=%s AND data_type='TEMP' LIMIT 1",

                array($type, bigintval($_GET['order']), $GLOBALS['userid']), __FILE__, __LINE__);
 
        // Finally is the entry valid?
        if (SQL_AFFECTEDROWS() == 1) {
                // Load personal data...
                array($type, bigintval($_GET['order']), $GLOBALS['userid']), __FILE__, __LINE__);
 
        // Finally is the entry valid?
        if (SQL_AFFECTEDROWS() == 1) {
                // Load personal data...

-               $result = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                        array($GLOBALS['userid']), __FILE__, __LINE__);
                list($gender, $sname, $fname, $email) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
                // Load mail again...              0       1        2           3          4      5      6         7
                        array($GLOBALS['userid']), __FILE__, __LINE__);
                list($gender, $sname, $fname, $email) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
                // Load mail again...              0       1        2           3          4      5      6         7

-               $result = SQL_QUERY_ESC("SELECT subject, text, receivers, payment_id, timestamp, url, cat_id, target_send FROM `{!MYSQL_PREFIX!}_pool` WHERE id=%s AND sender=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT subject, text, receivers, payment_id, timestamp, url, cat_id, target_send FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s AND sender=%s LIMIT 1",

                        array(bigintval($_GET['order']), $GLOBALS['userid']), __FILE__, __LINE__);
                $DATA = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                        array(bigintval($_GET['order']), $GLOBALS['userid']), __FILE__, __LINE__);
                $DATA = SQL_FETCHROW($result);
                SQL_FREERESULT($result);

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index 35bbe9b8c4c19174a5195fd98cdf7d1de64d6be8..a228a9aef92cfec6bbd93d02ad328cc2ace43225 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -48,7 +48,7 @@ $result = SQL_QUERY_ESC("SELECT company, position, tax_ident,
 gender, surname, family, street_nr1, street_nr2, zip, city, country,
 phone, fax, cell, email, url,
 status, receive_warnings
 gender, surname, family, street_nr1, street_nr2, zip, city, country,
 phone, fax, cell, email, url,
 status, receive_warnings

-FROM `{!MYSQL_PREFIX!}_sponsor_data`
+FROM `{!_MYSQL_PREFIX!}_sponsor_data`

 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
 if (SQL_NUMROWS($result) == 1) {
 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
 if (SQL_NUMROWS($result) == 1) {

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index 79db1ecb61249e4a24e2738da8d9950e74c379ca..cb6c64f12fa8727dd5c429e2329335907456c05f 100644 (file)
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 
 // Data for the formular
 $result = SQL_QUERY_ESC("SELECT status, receive_warnings, warning_interval, email, surname, family, gender
 
 // Data for the formular
 $result = SQL_QUERY_ESC("SELECT status, receive_warnings, warning_interval, email, surname, family, gender

-FROM `{!MYSQL_PREFIX!}_sponsor_data`
+FROM `{!_MYSQL_PREFIX!}_sponsor_data`

 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
 if (SQL_NUMROWS($result) == 1) {
 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
 if (SQL_NUMROWS($result) == 1) {

diff --git a/inc/modules/sponsor/welcome.php b/inc/modules/sponsor/welcome.php
index fc4db713f5d637e00136f8f16d35c71aeb3870f2..304593ecbf243661c22f2cde2c279c5eea582c93 100644 (file)
--- a/inc/modules/sponsor/welcome.php
+++ b/inc/modules/sponsor/welcome.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 
 // Load some data
 $result = SQL_QUERY_ESC("SELECT gender, surname, family, (points_amount - points_used) AS points
 
 // Load some data
 $result = SQL_QUERY_ESC("SELECT gender, surname, family, (points_amount - points_used) AS points

-FROM `{!MYSQL_PREFIX!}_sponsor_data`
+FROM `{!_MYSQL_PREFIX!}_sponsor_data`

 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
 list($gender, $surname, $family, $points) = SQL_FETCHROW($result);
 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
 list($gender, $surname, $family, $points) = SQL_FETCHROW($result);

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index c11b477238a04065d7510df981283424824be59e..6f659675d45b654bc05eb8c3e3c81c75777a2b8a 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -69,7 +69,7 @@ if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getC
 
        // SQL string to check for accounts
        $result_main = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, beg_points AS points
 
        // SQL string to check for accounts
        $result_main = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, beg_points AS points

-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE status='CONFIRMED'".$whereStatement1." AND beg_points > 0
 ORDER BY beg_points DESC, userid
 LIMIT %s",
 WHERE status='CONFIRMED'".$whereStatement1." AND beg_points > 0
 ORDER BY beg_points DESC, userid
 LIMIT %s",


@@ -91,7 +91,7 @@ LIMIT %s",
                } // END - while
 
                // Reset accounts
                } // END - while
 
                // Reset accounts

-               $result = SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_user_data` SET beg_points=0.00000 WHERE beg_points > 0", __FILE__, __LINE__);
+               $result = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET beg_points=0.00000 WHERE beg_points > 0", __FILE__, __LINE__);

        } // END - if
 
        // Free memory
        } // END - if
 
        // Free memory

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index db93b58aee4e150372a6def2bd37038a9fbd7de1..3f2cfe959a4a5d198229520cc92636e75f9afa6c 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -76,7 +76,7 @@ if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && ($CS
 
        // Run SQL string to check for accounts
        $result_main = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, (0".$ADD.") AS points
 
        // Run SQL string to check for accounts
        $result_main = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, (0".$ADD.") AS points

-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`

 ".$whereStatement1."".$ADD."
 ORDER BY points DESC, userid
 LIMIT %s",
 ".$whereStatement1."".$ADD."
 ORDER BY points DESC, userid
 LIMIT %s",


@@ -102,7 +102,7 @@ LIMIT %s",
                } // END - while
 
                // Reset accounts
                } // END - while
 
                // Reset accounts

-               $result = SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_user_data`
+               $result = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_user_data`

 SET turbo_bonus=0, login_bonus=0, bonus_order=0, bonus_stats=0, bonus_ref=0", __FILE__, __LINE__);
        } // END - if
 
 SET turbo_bonus=0, login_bonus=0, bonus_order=0, bonus_stats=0, bonus_ref=0", __FILE__, __LINE__);
        } // END - if
 

diff --git a/inc/monthly/monthly_newsletter.php b/inc/monthly/monthly_newsletter.php
index 8b88763479af2b717ed93195d446e5185f2270d9..b71659c451c4637292e1c811b74b7ce9880a1275 100644 (file)
--- a/inc/monthly/monthly_newsletter.php
+++ b/inc/monthly/monthly_newsletter.php
@@ -48,12 +48,12 @@ $curr = date("m", time());
 
 if (getConfig('last_month') != $curr) {
        // Check for unsubscribed members
 
 if (getConfig('last_month') != $curr) {
        // Check for unsubscribed members

-       $result = SQL_QUERY("SELECT userid, nl_until FROM `{!MYSQL_PREFIX!}_user_data` WHERE nl_receive='N' ORDER BY userid", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT userid, nl_until FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nl_receive='N' ORDER BY userid", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) > 0) {
                // Some unsubscriptions are found so we reset them to receive newsletters
        if (SQL_NUMROWS($result) > 0) {
                // Some unsubscriptions are found so we reset them to receive newsletters

-               while(list($uid, $until) = SQL_FETCHROW($result)) {
+               while (list($uid, $until) = SQL_FETCHROW($result)) {

                        // Update account
                        // Update account

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET nl_receive='Y', nl_until='0' WHERE userid=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET nl_receive='Y', nl_until='0' WHERE userid=%s LIMIT 1",

                                array(bigintval($uid)), __FILE__, __LINE__);
 
                        // Send email to him
                                array(bigintval($uid)), __FILE__, __LINE__);
 
                        // Send email to him

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index ef247614edc166e47acd83f2935969433e190deb..c9e95630ec82e0f7b68ea34c882fa7fcae3862de 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -107,17 +107,17 @@ register_shutdown_function('__SHUTDOWN_HOOK');
 // Check if the user setups his MySQL stuff...
 if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (isBooleanConstantAndTrue('mxchange_installed'))) {
        // No login entered and outside installation mode
 // Check if the user setups his MySQL stuff...
 if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (isBooleanConstantAndTrue('mxchange_installed'))) {
        // No login entered and outside installation mode

-       echo "<strong>".LANG_WARNING.":</strong> ";
+       OUTPUT_HTML("<strong>{!LANG_WARNING!}:</strong> ");

        if (isBooleanConstantAndTrue('mxchange_installed')) {
                // You have changed my configuration file!
        if (isBooleanConstantAndTrue('mxchange_installed')) {
                // You have changed my configuration file!

-               die(DIE_CONFIG_CHANGED_YOU);
+               mxchange_die("{!DIE_CONFIG_CHANGED_YOU!}");

        } else {
                // Please run the installation script (maybe again)
        } else {
                // Please run the installation script (maybe again)

-               die(DIE_RUN_INSTALL_MYSQL);
+               mxchange_die("{!DIE_RUN_INSTALL_MYSQL!}");

        }
 } elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
        // No database password entered!!!
        }
 } elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
        // No database password entered!!!

-       echo "<div>".LANG_WARNING.":</div> ".WARN_NULL_PASSWORD;
+       OUTPUT_HTML("<div>{!LANG_WARNING!}:</div> {!WARN_NULL_PASSWORD!}");

 }
 
 // Set dummy $_CONFIG array
 }
 
 // Set dummy $_CONFIG array


@@ -200,7 +200,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                RUN_FILTER('init');
 
                                // Set default 'what' value
                                RUN_FILTER('init');
 
                                // Set default 'what' value

-                               //* DEBUG: */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />\n";
+                               //* DEBUG: */ OUTPUT_HTML("-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />");

                                if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($CSS != 1) && ($CSS != -1)) {
                                        if ($GLOBALS['module'] == "admin") {
                                                // Set 'action' value to 'login' in admin menu
                                if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($CSS != 1) && ($CSS != -1)) {
                                        if ($GLOBALS['module'] == "admin") {
                                                // Set 'action' value to 'login' in admin menu


@@ -241,25 +241,25 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                }
                        } else {
                                // Add language system
                                }
                        } else {
                                // Add language system

-                               include (PATH."inc/language.php");
+                               require_once(PATH."inc/language.php");

 
                                // Wrong database?
 
                                // Wrong database?

-                               addFatalMessage(WRONG_DB_SELECTED);
+                               addFatalMessage(getMessage('WRONG_DB_SELECTED'));

                        }
                } else {
                        // Add language system
                        }
                } else {
                        // Add language system

-                       include (PATH."inc/language.php");
+                       require_once(PATH."inc/language.php");

 
                        // No link to database!
 
                        // No link to database!

-                       addFatalMessage(NO_DB_LINK);
+                       addFatalMessage(getMessage('NO_DB_LINK'));

                        $db = false;
                }
        } else {
                // Add language system
                        $db = false;
                }
        } else {
                // Add language system

-               include (PATH."inc/language.php");
+               require_once(PATH."inc/language.php");

 
                // Maybe you forgot to enter your MySQL data?
 
                // Maybe you forgot to enter your MySQL data?

-               addFatalMessage(MYSQL_DATA_MISSING);
+               addFatalMessage(getMessage('MYSQL_DATA_MISSING'));

        }
 } else {
        ///////////////////////////////////////////////////
        }
 } else {
        ///////////////////////////////////////////////////


@@ -284,22 +284,22 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
                // Check for file permissions
                if (!IS_INC_WRITEABLE("config")) {
        if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
                // Check for file permissions
                if (!IS_INC_WRITEABLE("config")) {

-                       addFatalMessage(CONFIG_IS_WRITE_PROTECTED);
+                       addFatalMessage(getMessage('CONFIG_IS_WRITE_PROTECTED'));

                } // END - if
                if (!IS_INC_WRITEABLE("dummy")) {
                } // END - if
                if (!IS_INC_WRITEABLE("dummy")) {

-                       addFatalMessage(DUMMY_IS_WRITE_PROTECTED);
+                       addFatalMessage(getMessage('DUMMY_IS_WRITE_PROTECTED'));

                } // END - if
                if (!IS_INC_WRITEABLE(".secret/dummy")) {
                } // END - if
                if (!IS_INC_WRITEABLE(".secret/dummy")) {

-                       addFatalMessage(SECRET_IS_WRITE_PROTECTED);
+                       addFatalMessage(getMessage('SECRET_IS_WRITE_PROTECTED'));

                } // END - if
        } // END - if
 }
 
 if ((getTotalFatalErrors() > 0) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {
        // One or more fatal error(s) occur during connect...
                } // END - if
        } // END - if
 }
 
 if ((getTotalFatalErrors() > 0) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {
        // One or more fatal error(s) occur during connect...

-       include (PATH."inc/header.php");
-       include (PATH."inc/fatal_errors.php");
-       include (PATH."inc/footer.php");
+       require_once(PATH."inc/header.php");
+       require_once(PATH."inc/fatal_errors.php");
+       require_once(PATH."inc/footer.php");

 } // END - if
 
 //
 } // END - if
 
 //

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 119fcc7ed5e98b16eef5a4e06e6093ebdd6e4dcd..9e82899320d6fc47a5ed41c1364f7b03d1a9006b 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -53,7 +53,7 @@ function ADD_MODULE_TITLE($mod) {
                        incrementConfigEntry('cache_hits');
                } elseif (!EXT_IS_ACTIVE("cache")) {
                        // Load from database
                        incrementConfigEntry('cache_hits');
                } elseif (!EXT_IS_ACTIVE("cache")) {
                        // Load from database

-                       $result = SQL_QUERY_ESC("SELECT title FROM `{!MYSQL_PREFIX!}_mod_reg` WHERE module='%s' LIMIT 1", array($mod), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE module='%s' LIMIT 1", array($mod), __FILE__, __LINE__);

                        list($name) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                }
                        list($name) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                }


@@ -123,7 +123,7 @@ function CHECK_MODULE ($mod) {
                }
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Check for module in database
                }
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Check for module in database

-               $result = SQL_QUERY_ESC("SELECT locked, hidden, admin_only, mem_only FROM `{!MYSQL_PREFIX!}_mod_reg` WHERE module='%s' LIMIT 1", array($mod_chk), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT locked, hidden, admin_only, mem_only FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE module='%s' LIMIT 1", array($mod_chk), __FILE__, __LINE__);

                if (SQL_NUMROWS($result) == 1) {
                        // Read data
                        list($locked, $hidden, $admin, $mem) = SQL_FETCHROW($result);
                if (SQL_NUMROWS($result) == 1) {
                        // Read data
                        list($locked, $hidden, $admin, $mem) = SQL_FETCHROW($result);


@@ -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*

-                               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!

-                               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__);
                        }


@@ -227,7 +227,7 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
                        $modCheck = $GLOBALS['module'];
                        break;
                }
                        $modCheck = $GLOBALS['module'];
                        break;
                }

-               $AND = " AND (what='' OR what IS NULL)";
+               $AND = " AND (what='' OR `what` IS NULL)";

        } elseif (substr($file, 0, 5) == "what-") {
                // This is an admin what file!
                $type = "what";
        } elseif (substr($file, 0, 5) == "what-") {
                // This is an admin what file!
                $type = "what";


@@ -243,7 +243,7 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
                case "member":
                        $modCheck = $GLOBALS['module'];
                        if (!IS_ADMIN()) {
                case "member":
                        $modCheck = $GLOBALS['module'];
                        if (!IS_ADMIN()) {

-                               $AND = " AND visible='Y' AND locked='N'";
+                               $AND = " AND `visible`='Y' AND `locked`='N'";

                        }
                        break;
                }
                        }
                        break;
                }


@@ -264,7 +264,7 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
        }
        if ((!isset($NAV_DEPTH)) && (!$return)) {
                $NAV_DEPTH = 0;
        }
        if ((!isset($NAV_DEPTH)) && (!$return)) {
                $NAV_DEPTH = 0;

-               $prefix = "<div class=\"you_are_here\">".YOU_ARE_HERE."&nbsp;<strong><a class=\"you_are_here\" href=\"".URL."/modules.php?module=".$GLOBALS['module'].$LINK_ADD."\">Home</a></strong>";
+               $prefix = "<div class=\"you_are_here\">{!YOU_ARE_HERE!}&nbsp;<strong><a class=\"you_are_here\" href=\"{!URL!}/modules.php?module=".$GLOBALS['module'].$LINK_ADD."\">Home</a></strong>";

        } else {
                if (!$return) $NAV_DEPTH++;
                $prefix = "";
        } else {
                if (!$return) $NAV_DEPTH++;
                $prefix = "";


@@ -279,7 +279,7 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
        } // END - i
 
        // Get the title from menu
        } // END - i
 
        // Get the title from menu

-       $result = SQL_QUERY_ESC("SELECT title FROM `{!MYSQL_PREFIX!}_%s_menu` WHERE %s='%s' ".$AND." LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE %s='%s' ".$AND." LIMIT 1",

                array($ACC_LVL, $type, $search), __FILE__, __LINE__);
 
        // Menu found?
                array($ACC_LVL, $type, $search), __FILE__, __LINE__);
 
        // Menu found?


@@ -293,7 +293,7 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
                        return $ret;
                } elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && (getConfig('youre_here') == "Y")) || ((IS_ADMIN()) && ($modCheck == "admin"))) {
                        // Output HTML code
                        return $ret;
                } elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && (getConfig('youre_here') == "Y")) || ((IS_ADMIN()) && ($modCheck == "admin"))) {
                        // Output HTML code

-                       $OUT = $prefix."<strong><a class=\"you_are_here\" href=\"".URL."/modules.php?module=".$modCheck."&amp;".$type."=".$search.$LINK_ADD."\">".$ret."</a></strong>\n";
+                       $OUT = $prefix."<strong><a class=\"you_are_here\" href=\"{!URL!}/modules.php?module=".$modCheck."&amp;".$type."=".$search.$LINK_ADD."\">".$ret."</a></strong>\n";

 
                        // Can we close the you-are-here navigation?
                        //* DEBUG: */ echo __LINE__."*".$type."/".$GLOBALS['what']."*<br />\n";
 
                        // Can we close the you-are-here navigation?
                        //* DEBUG: */ echo __LINE__."*".$type."/".$GLOBALS['what']."*<br />\n";


@@ -330,16 +330,16 @@ function ADD_MENU ($MODE, $act, $wht) {
        $main_action = "";
        $sub_what = "";
 
        $main_action = "";
        $sub_what = "";
 

-       if (!VALIDATE_MENU_ACTION($MODE, $act, $wht, true)) return CODE_MENU_NOT_VALID;
+       if (!VALIDATE_MENU_ACTION($MODE, $act, $wht, true)) return getMessage('CODE_MENU_NOT_VALID');

 
        // Non-admin shall not see all menus
        if (!IS_ADMIN()) {
 
        // Non-admin shall not see all menus
        if (!IS_ADMIN()) {

-               $AND = " AND visible='Y' AND locked='N'";
+               $AND = " AND `visible`='Y' AND `locked`='N'";

        }
 
        // Load SQL data and add the menu to the output stream...
        }
 
        // Load SQL data and add the menu to the output stream...

-       $result_main = SQL_QUERY_ESC("SELECT title, action FROM `{!MYSQL_PREFIX!}_%s_menu` WHERE (what='' OR what IS NULL)".$AND." ORDER BY sort",
-        array($MODE), __FILE__, __LINE__);
+       $result_main = SQL_QUERY_ESC("SELECT title, action FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE (what='' OR `what` IS NULL)".$AND." ORDER BY `sort`",
+               array($MODE), __FILE__, __LINE__);

        //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
        if (SQL_NUMROWS($result_main) > 0) {
                OUTPUT_HTML("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"".$MODE."_menu\">");
        //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
        if (SQL_NUMROWS($result_main) > 0) {
                OUTPUT_HTML("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"".$MODE."_menu\">");


@@ -358,7 +358,7 @@ function ADD_MENU ($MODE, $act, $wht) {
                        // Load menu header template
                        LOAD_TEMPLATE($MODE."_menu_title", false, $content);
 
                        // Load menu header template
                        LOAD_TEMPLATE($MODE."_menu_title", false, $content);
 

-                       $result_sub = SQL_QUERY_ESC("SELECT title, what FROM `{!MYSQL_PREFIX!}_%s_menu` WHERE action='%s' AND what != '' AND what IS NOT NULL ".$AND." ORDER BY sort",
+                       $result_sub = SQL_QUERY_ESC("SELECT title, what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE action='%s' AND `what` != '' AND `what` IS NOT NULL ".$AND." ORDER BY `sort`",

                         array($MODE, $main_action), __FILE__, __LINE__);
                        $ctl = SQL_NUMROWS($result_sub);
                        if ($ctl > 0) {
                         array($MODE, $main_action), __FILE__, __LINE__);
                        $ctl = SQL_NUMROWS($result_sub);
                        if ($ctl > 0) {


@@ -377,7 +377,7 @@ function ADD_MENU ($MODE, $act, $wht) {
                                                }
 
                                                // Navigation link
                                                }
 
                                                // Navigation link

-                                               $content .= "<a name=\"menu\" class=\"menu_blur\" href=\"".URL."/modules.php?module=".$GLOBALS['module']."&amp;what=".$sub_what.ADD_URL_DATA("")."\" target=\"_self\">";
+                                               $content .= "<a name=\"menu\" class=\"menu_blur\" href=\"{!URL!}/modules.php?module=".$GLOBALS['module']."&amp;what=".$sub_what.ADD_URL_DATA("")."\" target=\"_self\">";

                                        } else {
                                                $content .= "<em>";
                                        }
                                        } else {
                                                $content .= "<em>";
                                        }


@@ -469,7 +469,7 @@ function IS_ADMIN ($admin="") {
                $cacheArray['admin_hash'] = $valPass;
        } elseif ((!empty($admin)) && ((!EXT_IS_ACTIVE("cache"))) || (!isset($cacheArray['admins']['password'][$admin]))) {
                // Search for admin
                $cacheArray['admin_hash'] = $valPass;
        } elseif ((!empty($admin)) && ((!EXT_IS_ACTIVE("cache"))) || (!isset($cacheArray['admins']['password'][$admin]))) {
                // Search for admin

-               $result = SQL_QUERY_ESC("SELECT HIGH_PRIORITY password FROM `{!MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT HIGH_PRIORITY password FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",

                        array($admin), __FILE__, __LINE__);
 
                // Is he admin?
                        array($admin), __FILE__, __LINE__);
 
                // Is he admin?


@@ -508,7 +508,7 @@ function ADD_MAX_RECEIVE_LIST($MODE, $default="", $return=false)
        {
        case "guest":
                // Guests (in the registration form) are not allowed to select 0 mails per day.
        {
        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", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE value > 0 ORDER BY value", __FILE__, __LINE__);

                if (SQL_NUMROWS($result) > 0)
                {
                        $OUT = "";
                if (SQL_NUMROWS($result) > 0)
                {
                        $OUT = "";


@@ -534,7 +534,7 @@ function ADD_MAX_RECEIVE_LIST($MODE, $default="", $return=false)
 
        case "member":
                // Members are allowed to set to zero mails per day (we will change this soon!)
 
        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", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` ORDER BY value", __FILE__, __LINE__);

                if (SQL_NUMROWS($result) > 0)
                {
                        $OUT = "";
                if (SQL_NUMROWS($result) > 0)
                {
                        $OUT = "";


@@ -572,7 +572,7 @@ function ADD_MAX_RECEIVE_LIST($MODE, $default="", $return=false)
 function SEARCH_EMAIL_USERTAB($email)
 {
        $ret = false;
 function SEARCH_EMAIL_USERTAB($email)
 {
        $ret = false;

-       $result = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE email LIKE '{PER}%s{PER}' LIMIT 1", array($email), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE email LIKE '{PER}%s{PER}' LIMIT 1", array($email), __FILE__, __LINE__);

        if (SQL_NUMROWS($result) == 1) $ret = true;
        SQL_FREERESULT($result);
        return $ret;
        if (SQL_NUMROWS($result) == 1) $ret = true;
        SQL_FREERESULT($result);
        return $ret;


@@ -588,7 +588,7 @@ function WHAT_IS_VALID($act, $wht, $type="guest")
         else
        {
                $ret = false;
         else
        {
                $ret = false;

-               $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_%s_menu` WHERE action='%s' AND what='%s' AND locked='N' LIMIT 1", array($type, $act, $wht), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE action='%s' AND what='%s' AND `locked`='N' LIMIT 1", array($type, $act, $wht), __FILE__, __LINE__);

                // Is "what" valid?
                if (SQL_NUMROWS($result) == 1) $ret = true;
                SQL_FREERESULT($result);
                // Is "what" valid?
                if (SQL_NUMROWS($result) == 1) $ret = true;
                SQL_FREERESULT($result);


@@ -613,7 +613,7 @@ function IS_MEMBER () {
        // Are cookies set?
        if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash'))) {
                // Cookies are set with values, but are they valid?
        // Are cookies set?
        if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash'))) {
                // Cookies are set with values, but are they valid?

-               $result = SQL_QUERY_ESC("SELECT password, status, last_module, last_online FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT password, status, last_module, last_online FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                        array($GLOBALS['userid']), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Load data from cookies
                        array($GLOBALS['userid']), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Load data from cookies


@@ -663,19 +663,19 @@ function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false)
 {
        $ret = false;
        $ADD = "";
 {
        $ret = false;
        $ADD = "";

-       if ((!IS_ADMIN()) && ($MODE != "admin")) $ADD = " AND locked='N'";
+       if ((!IS_ADMIN()) && ($MODE != "admin")) $ADD = " AND `locked`='N'";

        //* DEBUG: */ echo __LINE__.":".$MODE."/".$act."/".$wht."*<br />\n";
        if (($MODE != "admin") && ($UPDATE)) {
                // Update guest or member menu
        //* DEBUG: */ echo __LINE__.":".$MODE."/".$act."/".$wht."*<br />\n";
        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",
+               $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);
        } elseif ($wht != "overview") {
                // Other actions
                        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",
+               $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);
        } else {
                // Admin login overview
                        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",
+               $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);
        }
 


@@ -711,7 +711,7 @@ function GET_MOD_DESCR($MODE, $wht, $column="what")
        $ret = "??? (".$wht.")";
 
        // Look for title
        $ret = "??? (".$wht.")";
 
        // Look for title

-       $result = SQL_QUERY_ESC("SELECT title FROM `{!MYSQL_PREFIX!}_%s_menu` WHERE %s='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE %s='%s' LIMIT 1",

                array($MODE, $column, $wht), __FILE__, __LINE__);
 
        // Is there an entry?
                array($MODE, $column, $wht), __FILE__, __LINE__);
 
        // Is there an entry?


@@ -729,7 +729,7 @@ function SEND_MODE_MAILS($mod, $modes) {
        global $DATA;
 
        // Load hash
        global $DATA;
 
        // Load hash

-       $result_main = SQL_QUERY_ESC("SELECT password FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+       $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__);
        if (SQL_NUMROWS($result_main) == 1) {
                // Load hash from database
                array($GLOBALS['userid']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_main) == 1) {
                // Load hash from database


@@ -742,7 +742,7 @@ function SEND_MODE_MAILS($mod, $modes) {
                $hash = generatePassString($hashDB);
                if (($hash == get_session('u_hash')) || ($_POST['pass1'] == $_POST['pass2'])) {
                        // Load user's data
                $hash = generatePassString($hashDB);
                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",
+                       $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__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Load the data
                                array($GLOBALS['userid'], $hashDB), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Load the data


@@ -851,7 +851,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!

-               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
 }


@@ -895,7 +895,7 @@ function GET_ACTION ($MODE, &$wht) {
                if (empty($ret)) $ret = "main";
 
                // Load from database
                if (empty($ret)) $ret = "main";
 
                // Load from database

-               $result = SQL_QUERY_ESC("SELECT action FROM `{!MYSQL_PREFIX!}_%s_menu` WHERE what='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT action FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE what='%s' LIMIT 1",

                        array($MODE, $wht), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Load action value and pray that this one is the right you want... ;-)
                        array($MODE, $wht), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Load action value and pray that this one is the right you want... ;-)


@@ -924,7 +924,7 @@ function GET_CATEGORY ($cid) {
                $ret = _CATEGORY_NONE;
        } elseif ($cid > 0) {
                // Lookup the category in database
                $ret = _CATEGORY_NONE;
        } elseif ($cid > 0) {
                // Lookup the category in database

-               $result = SQL_QUERY_ESC("SELECT cat FROM `{!MYSQL_PREFIX!}_cats` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT cat FROM `{!_MYSQL_PREFIX!}_cats` WHERE id=%s LIMIT 1",

                        array(bigintval($cid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Category found... :-)
                        array(bigintval($cid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Category found... :-)


@@ -945,7 +945,7 @@ function GET_PAYMENT ($pid, $full=false) {
        $ret = _PAYMENT_404;
 
        // Load payment data
        $ret = _PAYMENT_404;
 
        // Load payment data

-       $result = SQL_QUERY_ESC("SELECT mail_title, price FROM `{!MYSQL_PREFIX!}_payments` WHERE id=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT mail_title, price FROM `{!_MYSQL_PREFIX!}_payments` WHERE id=%s LIMIT 1",

                array(bigintval($pid)), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Payment type found... :-)
                array(bigintval($pid)), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Payment type found... :-)


@@ -970,7 +970,7 @@ function GET_PAYMENT ($pid, $full=false) {
 function GET_PAY_POINTS($pid, $lookFor="price")
 {
        $ret = "-1";
 function GET_PAY_POINTS($pid, $lookFor="price")
 {
        $ret = "-1";

-       $result = SQL_QUERY_ESC("SELECT %s FROM `{!MYSQL_PREFIX!}_payments` WHERE id=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT %s FROM `{!_MYSQL_PREFIX!}_payments` WHERE id=%s LIMIT 1",

                array($lookFor, $pid), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1)
        {
                array($lookFor, $pid), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1)
        {


@@ -996,12 +996,12 @@ function REMOVE_RECEIVER (&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=fa
                        // Only when we got a real stats ID continue searching for the entry
                        $type = "NORMAL"; $rowName = "stats_id";
                        if ($bonus) { $type = "BONUS"; $rowName = "bonus_id"; }
                        // Only when we got a real stats ID continue searching for the entry
                        $type = "NORMAL"; $rowName = "stats_id";
                        if ($bonus) { $type = "BONUS"; $rowName = "bonus_id"; }

-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_links` WHERE %s='%s' AND userid=%s AND link_type='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_links` WHERE %s='%s' AND userid=%s AND link_type='%s' LIMIT 1",

                         array($rowName, $stats_id, bigintval($uid), $type), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 0)
                        {
                                // No, so we add one!
                         array($rowName, $stats_id, bigintval($uid), $type), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 0)
                        {
                                // No, so we add one!

-                               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";
                        }


@@ -1026,12 +1026,12 @@ function GET_TOTAL_DATA ($search, $tableName, $lookFor, $whereStatement="userid"
        if (($onlyRows) || ($lookFor == "userid")) {
                // Count rows
                //* DEBUG: */ echo "COUNT!<br />\n";
        if (($onlyRows) || ($lookFor == "userid")) {
                // Count rows
                //* DEBUG: */ echo "COUNT!<br />\n";

-               $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) FROM `{!MYSQL_PREFIX!}_%s` WHERE `%s`='%s'".$add,
+               $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) FROM `{!_MYSQL_PREFIX!}_%s` WHERE `%s`='%s'".$add,

                        array($lookFor, $tableName, $whereStatement, $search), __FILE__, __LINE__);
        } else {
                // Add all rows
                //* DEBUG: */ echo "SUM!<br />\n";
                        array($lookFor, $tableName, $whereStatement, $search), __FILE__, __LINE__);
        } else {
                // Add all rows
                //* DEBUG: */ echo "SUM!<br />\n";

-               $result = SQL_QUERY_ESC("SELECT SUM(`%s`) FROM `{!MYSQL_PREFIX!}_%s` WHERE `%s`='%s'".$add,
+               $result = SQL_QUERY_ESC("SELECT SUM(`%s`) FROM `{!_MYSQL_PREFIX!}_%s` WHERE `%s`='%s'".$add,

                        array($lookFor, $tableName, $whereStatement, $search), __FILE__, __LINE__);
        }
 
                        array($lookFor, $tableName, $whereStatement, $search), __FILE__, __LINE__);
        }
 


@@ -1073,7 +1073,7 @@ function GET_REF_LEVEL_PERCENTS ($level) {
                }
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Get referal data
                }
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Get referal data

-               $result_lvl = SQL_QUERY_ESC("SELECT percents FROM `{!MYSQL_PREFIX!}_refdepths` WHERE level='%s' LIMIT 1",
+               $result_lvl = SQL_QUERY_ESC("SELECT percents FROM `{!_MYSQL_PREFIX!}_refdepths` WHERE level='%s' LIMIT 1",

                        array(bigintval($level)), __FILE__, __LINE__);
 
                // Entry found?
                        array(bigintval($level)), __FILE__, __LINE__);
 
                // Entry found?


@@ -1140,7 +1140,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
        if ($locked) $data = "locked_points";
 
        // Check user account
        if ($locked) $data = "locked_points";
 
        // Check user account

-       $result_user = SQL_QUERY_ESC("SELECT refid, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+       $result_user = SQL_QUERY_ESC("SELECT refid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",

                array(bigintval($uid)), __FILE__, __LINE__);
 
        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},numRows=".SQL_NUMROWS($result_user).",points={$points}<br />\n";
                array(bigintval($uid)), __FILE__, __LINE__);
 
        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):uid={$uid},numRows=".SQL_NUMROWS($result_user).",points={$points}<br />\n";


@@ -1167,14 +1167,14 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
                        } // END - if
 
                        // Update points...
                        } // END - if
 
                        // Update points...

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_points` SET %s=%s+%s WHERE userid=%s AND ref_depth='%s' LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_points` SET %s=%s+%s WHERE userid=%s AND ref_depth='%s' LIMIT 1",

                                array($data, $data, $ref_points, bigintval($uid), bigintval($GLOBALS['ref_level'])), __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} - UPDATE! (".SQL_AFFECTEDROWS().")<br />\n";
 
                        // No entry updated?
                        if (SQL_AFFECTEDROWS() < 1) {
                                // First ref in this level! :-)
                                array($data, $data, $ref_points, bigintval($uid), bigintval($GLOBALS['ref_level'])), __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} - UPDATE! (".SQL_AFFECTEDROWS().")<br />\n";
 
                        // No entry updated?
                        if (SQL_AFFECTEDROWS() < 1) {
                                // First ref in this level! :-)

-                               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


@@ -1214,7 +1214,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
 
                                // And sent it away
                                SEND_EMAIL($email, SUBJECT_DIRECT_PAYMENT, $msg);
 
                                // And sent it away
                                SEND_EMAIL($email, SUBJECT_DIRECT_PAYMENT, $msg);

-                               if (!isset($_GET['mid'])) LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_POINTS_ADDED);
+                               if (!isset($_GET['mid'])) LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_POINTS_ADDED'));

                        }
 
                        // Maybe there's another ref?
                        }
 
                        // Maybe there's another ref?


@@ -1239,20 +1239,20 @@ 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

-       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!

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

-       $result = SQL_QUERY_ESC("SELECT refid FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT refid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                array(bigintval($uid)), __FILE__, __LINE__);
 
        // Load refid
                array(bigintval($uid)), __FILE__, __LINE__);
 
        // Load refid


@@ -1285,7 +1285,7 @@ function UPDATE_REF_COUNTER ($uid) {
 // OBSOLETE: Sends out mail to all administrators
 function SEND_ADMIN_EMAILS ($subj, $msg) {
        // Load all admin email addresses
 // OBSOLETE: Sends out mail to all administrators
 function SEND_ADMIN_EMAILS ($subj, $msg) {
        // Load all admin email addresses

-       $result = SQL_QUERY("SELECT email FROM `{!MYSQL_PREFIX!}_admins` ORDER BY id ASC", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id` ASC", __FILE__, __LINE__);

        while (list($email) = SQL_FETCHROW($result)) {
                // Send the email out
                SEND_EMAIL($email, $subj, $msg);
        while (list($email) = SQL_FETCHROW($result)) {
                // Send the email out
                SEND_EMAIL($email, $subj, $msg);


@@ -1309,7 +1309,7 @@ function GET_ADMIN_ID ($login) {
                incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database

-               $result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",

                 array($login), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        list($ret) = SQL_FETCHROW($result);
                 array($login), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        list($ret) = SQL_FETCHROW($result);


@@ -1346,7 +1346,7 @@ function GET_ADMIN_HASH ($aid)
                incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database

-               $result = SQL_QUERY_ESC("SELECT password FROM `{!MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT password FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",

                 array($aid), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Fetch data
                 array($aid), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Fetch data


@@ -1373,7 +1373,7 @@ function GET_ADMIN_LOGIN ($aid) {
                incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database

-               $result = SQL_QUERY_ESC("SELECT login FROM `{!MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT login FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",

                        array(bigintval($aid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Fetch data
                        array(bigintval($aid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Fetch data


@@ -1401,7 +1401,7 @@ function GET_ADMIN_EMAIL ($aid) {
                incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database

-               $result_aid = SQL_QUERY_ESC("SELECT email FROM `{!MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
+               $result_aid = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",

                        array(bigintval($aid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result_aid) == 1) {
                        // Get data
                        array(bigintval($aid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result_aid) == 1) {
                        // Get data


@@ -1431,7 +1431,7 @@ function GET_ADMIN_DEFAULT_ACL ($aid) {
                incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                incrementConfigEntry('cache_hits');
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database

-               $result_aid = SQL_QUERY_ESC("SELECT default_acl FROM `{!MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
+               $result_aid = SQL_QUERY_ESC("SELECT default_acl FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",

                        array(bigintval($aid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result_aid) == 1) {
                        // Fetch data
                        array(bigintval($aid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result_aid) == 1) {
                        // Fetch data


@@ -1498,9 +1498,9 @@ function activateExchange() {
        if ($totalUsers >= getConfig('activate_xchange')) {
                // Activate System
                $SQLs = array(
        if ($totalUsers >= getConfig('activate_xchange')) {
                // Activate System
                $SQLs = array(

-                       "UPDATE `{!MYSQL_PREFIX!}_mod_reg` SET locked='N', hidden='N', mem_only='Y' WHERE module='order' LIMIT 1",
-                       "UPDATE `{!MYSQL_PREFIX!}_member_menu` SET visible='Y', locked='N' WHERE what='order' OR what='unconfirmed' LIMIT 2",
-                       "UPDATE `{!MYSQL_PREFIX!}_config` SET activate_xchange='0' WHERE config=0 LIMIT 1"
+                       "UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='N', hidden='N', mem_only='Y' WHERE module='order' LIMIT 1",
+                       "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE what='order' OR what='unconfirmed' LIMIT 2",
+                       "UPDATE `{!_MYSQL_PREFIX!}_config` SET activate_xchange='0' WHERE config=0 LIMIT 1"

                );
 
                // Run SQLs
                );
 
                // Run SQLs


@@ -1515,8 +1515,8 @@ function DELETE_USER_ACCOUNT($uid, $reason)
 {
        $points = 0;
        $result = SQL_QUERY_ESC("SELECT (SUM(p.points) - d.used_points) AS points
 {
        $points = 0;
        $result = SQL_QUERY_ESC("SELECT (SUM(p.points) - d.used_points) AS points

-FROM `{!MYSQL_PREFIX!}_user_points` AS p
-LEFT JOIN `{!MYSQL_PREFIX!}_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_user_points` AS p
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d

 ON p.userid=d.userid
 WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
 ON p.userid=d.userid
 WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {


@@ -1525,7 +1525,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

-               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") {


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

-       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")) {

-               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__);
        }
 
        // Now a mail to the user and that's all...
        $msg = LOAD_EMAIL_TEMPLATE("del-user", array('text' => $reason), $uid);
                        array(bigintval($uid)), __FILE__, __LINE__);
        }
 
        // Now a mail to the user and that's all...
        $msg = LOAD_EMAIL_TEMPLATE("del-user", array('text' => $reason), $uid);

-       SEND_EMAIL($uid, ADMIN_DEL_ACCOUNT, $msg);
+       SEND_EMAIL($uid, getMessage('ADMIN_DEL_ACCOUNT'), $msg);

 
        // Ok, delete the account!
 
        // Ok, delete the account!

-       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__);

 }
 
 //
 }
 
 //


@@ -1571,16 +1571,16 @@ function META_DESCRIPTION ($mod, $wht) {
 }
 //
 function ADD_JACKPOT($points) {
 }
 //
 function ADD_JACKPOT($points) {

-       $result = SQL_QUERY("SELECT points FROM `{!MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) == 0) {
                // Create line
        if (SQL_NUMROWS($result) == 0) {
                // Create line

-               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

-               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__);
        }
 }


@@ -1590,16 +1590,16 @@ function SUB_JACKPOT($points) {
        $ret = "-1";
 
        // Get current points
        $ret = "-1";
 
        // Get current points

-       $result = SQL_QUERY("SELECT points FROM `{!MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) == 0) {
                // Create line
        if (SQL_NUMROWS($result) == 0) {
                // Create line

-               SQL_QUERY("INSERT INTO `{!MYSQL_PREFIX!}_jackpot` (ok, points) VALUES ('ok', 0.00000)", __FILE__, __LINE__);
+               SQL_QUERY("INSERT INTO `{!_MYSQL_PREFIX!}_jackpot` (ok, points) VALUES ('ok', 0.00000)", __FILE__, __LINE__);

        } else {
                // Read points
                list($jackpot) = SQL_FETCHROW($result);
                if ($jackpot >= $points) {
                        // Update points when there are enougth points in jackpot
        } else {
                // Read points
                list($jackpot) = SQL_FETCHROW($result);
                if ($jackpot >= $points) {
                        // Update points when there are enougth points in jackpot

-                       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__);
                        $ret = $jackpot - $points;
                } // END - if
                                array($points), __FILE__, __LINE__);
                        $ret = $jackpot - $points;
                } // END - if


@@ -1631,7 +1631,7 @@ function LOAD_CONFIG ($no="0") {
                } // END - if
        } elseif ((!EXT_IS_ACTIVE("cache")) || (!isset($cacheArray['config'][$no]))) {
                // Load config from DB
                } // END - if
        } elseif ((!EXT_IS_ACTIVE("cache")) || (!isset($cacheArray['config'][$no]))) {
                // Load config from DB

-               $result_config = SQL_QUERY_ESC("SELECT * FROM `{!MYSQL_PREFIX!}_config` WHERE config=%d LIMIT 1",
+               $result_config = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_config` WHERE config=%d LIMIT 1",

                        array(bigintval($no)), __FILE__, __LINE__);
 
                // Get config from database
                        array(bigintval($no)), __FILE__, __LINE__);
 
                // Get config from database


@@ -1675,7 +1675,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

-       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


@@ -1736,7 +1736,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
 
        // Run database update
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "entries={$entries}");
 
        // Run database update
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "entries={$entries}");

-       SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_config` SET ".$entries." WHERE config=0 LIMIT 1", __FILE__, __LINE__);
+       SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_config` SET ".$entries." WHERE config=0 LIMIT 1", __FILE__, __LINE__);

 
        // Get affected rows
        $affectedRows = SQL_AFFECTEDROWS();
 
        // Get affected rows
        $affectedRows = SQL_AFFECTEDROWS();


@@ -1766,8 +1766,8 @@ function PREPARE_SQL_HTML_HOLIDAY ($mode) {
 function GET_TOTAL_RECEIVERS ($mode="normal") {
        // Query database
        $result_all = SQL_QUERY("SELECT userid
 function GET_TOTAL_RECEIVERS ($mode="normal") {
        // Query database
        $result_all = SQL_QUERY("SELECT userid

-FROM `{!MYSQL_PREFIX!}_user_data`
-WHERE status='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML_HOLIDAY($mode),
+FROM `{!_MYSQL_PREFIX!}_user_data`
+WHERE status='CONFIRMED' AND receive_mails > 0 ".PREPARE_SQL_HTML_HOLIDAY($mode),

                __FILE__, __LINE__);
 
        // Get num rows
                __FILE__, __LINE__);
 
        // Get num rows


@@ -1783,7 +1783,7 @@ WHERE status='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML_HOLIDAY($mode),
 // Returns HTML code with an "<option> list" of all categories
 function ADD_CATEGORY_OPTIONS ($mode) {
        // Prepare WHERE statement
 // Returns HTML code with an "<option> list" of all categories
 function ADD_CATEGORY_OPTIONS ($mode) {
        // Prepare WHERE statement

-       $whereStatement = " WHERE visible='Y'";
+       $whereStatement = " WHERE `visible`='Y'";

        if (IS_ADMIN()) $whereStatement = "";
 
        // Initialize array...
        if (IS_ADMIN()) $whereStatement = "";
 
        // Initialize array...


@@ -1794,7 +1794,7 @@ function ADD_CATEGORY_OPTIONS ($mode) {
        );
 
        // Get categories
        );
 
        // Get categories

-       $result = SQL_QUERY("SELECT id, cat FROM `{!MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY sort", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY `sort`", __FILE__, __LINE__);

        if (SQL_NUMROWS($result) > 0) {
                // ... and begin loading stuff
                while (list($id, $cat) = SQL_FETCHROW($result)) {
        if (SQL_NUMROWS($result) > 0) {
                // ... and begin loading stuff
                while (list($id, $cat) = SQL_FETCHROW($result)) {


@@ -1803,13 +1803,13 @@ function ADD_CATEGORY_OPTIONS ($mode) {
                        $CATS['name'][] = $cat;
 
                        // Check which users are in this category
                        $CATS['name'][] = $cat;
 
                        // Check which users are in this category

-                       $result_uids = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s",
+                       $result_uids = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s",

                         array(bigintval($id)), __FILE__, __LINE__);
 
                        // Start adding all
                        $uid_cnt = 0;
                        while (list($ucat) = SQL_FETCHROW($result_uids)) {
                         array(bigintval($id)), __FILE__, __LINE__);
 
                        // Start adding all
                        $uid_cnt = 0;
                        while (list($ucat) = SQL_FETCHROW($result_uids)) {

-                               $result_ver = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data`
+                               $result_ver = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE userid=%s AND status='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML_HOLIDAY($mode)." LIMIT 1",
  array(bigintval($ucat)), __FILE__, __LINE__);
                                $uid_cnt += SQL_NUMROWS($result_ver);
 WHERE userid=%s AND status='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML_HOLIDAY($mode)." LIMIT 1",
  array(bigintval($ucat)), __FILE__, __LINE__);
                                $uid_cnt += SQL_NUMROWS($result_ver);


@@ -1872,7 +1872,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

-               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(


@@ -1889,7 +1889,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

-               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(


@@ -1926,7 +1926,7 @@ function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") {
        // Category given?
        if ($cat > 0) {
                // Select category
        // Category given?
        if ($cat > 0) {
                // Select category

-               $CAT_TABS  = "LEFT JOIN `{!MYSQL_PREFIX!}_user_cats` AS c ON d.userid=c.userid";
+               $CAT_TABS  = "LEFT JOIN `{!_MYSQL_PREFIX!}_user_cats` AS c ON d.userid=c.userid";

                $CAT_WHERE = " AND c.cat_id=%s";
        } // END - if
 
                $CAT_WHERE = " AND c.cat_id=%s";
        } // END - if
 


@@ -1938,11 +1938,11 @@ function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") {
 
        if ((EXT_IS_ACTIVE("html_mail")) && ($mode == "html")) {
                // Only include HTML receivers
 
        if ((EXT_IS_ACTIVE("html_mail")) && ($mode == "html")) {
                // Only include HTML receivers

-               $result = SQL_QUERY_ESC("SELECT d.userid FROM `{!MYSQL_PREFIX!}_user_data` AS d ".$CAT_TABS." WHERE d.status='CONFIRMED' AND d.html='Y'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",
+               $result = SQL_QUERY_ESC("SELECT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d ".$CAT_TABS." WHERE d.status='CONFIRMED' AND d.html='Y'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",

                 array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FILE__, __LINE__);
        } else {
                // Include all
                 array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FILE__, __LINE__);
        } else {
                // Include all

-               $result = SQL_QUERY_ESC("SELECT d.userid FROM `{!MYSQL_PREFIX!}_user_data` AS d ".$CAT_TABS." WHERE d.status='CONFIRMED'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",
+               $result = SQL_QUERY_ESC("SELECT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d ".$CAT_TABS." WHERE d.status='CONFIRMED'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s",

                 array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FILE__, __LINE__);
        }
 
                 array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FILE__, __LINE__);
        }
 


@@ -1983,7 +1983,7 @@ function USER_STATS_GET_TIMESTAMP ($type, $data, $uid = 0) {
 
        // Try to find the entry
        $result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`inserted`) AS `stamp`
 
        // Try to find the entry
        $result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`inserted`) AS `stamp`

-FROM `{!MYSQL_PREFIX!}_user_stats_data`
+FROM `{!_MYSQL_PREFIX!}_user_stats_data`

 WHERE userid=%s AND stats_type='%s' AND stats_data='%s'
 LIMIT 1",
                array(bigintval($uid), $type, $data), __FILE__, __LINE__);
 WHERE userid=%s AND stats_type='%s' AND stats_data='%s'
 LIMIT 1",
                array(bigintval($uid), $type, $data), __FILE__, __LINE__);


@@ -2012,7 +2012,7 @@ function USER_STATS_INSERT_RECORD ($uid, $type, $data) {
        // Does it exist?
        if ((!USER_STATS_GET_TIMESTAMP($type, $data, $uid)) && (!is_array($data))) {
                // Then insert it!
        // Does it exist?
        if ((!USER_STATS_GET_TIMESTAMP($type, $data, $uid)) && (!is_array($data))) {
                // Then insert it!

-               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_stats_data` (`userid`,`stats_type`,`stats_data`) VALUES (%s,'%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_stats_data` (`userid`,`stats_type`,`stats_data`) VALUES (%s,'%s','%s')",

                        array(bigintval($uid), $type, $data), __FILE__, __LINE__);
        } elseif (is_array($data)) {
                // Invalid data!
                        array(bigintval($uid), $type, $data), __FILE__, __LINE__);
        } elseif (is_array($data)) {
                // Invalid data!


@@ -2034,10 +2034,10 @@ function GET_USER_REF_POINTS ($uid, $level) {
 
        // Get refs from database
        $result = SQL_QUERY_ESC("SELECT ur.id, ur.refid, ud.status, ud.last_online, ud.mails_confirmed, ud.emails_received".$ADD."
 
        // Get refs from database
        $result = SQL_QUERY_ESC("SELECT ur.id, ur.refid, ud.status, ud.last_online, ud.mails_confirmed, ud.emails_received".$ADD."

-FROM `{!MYSQL_PREFIX!}_user_refs` AS ur
-LEFT JOIN `{!MYSQL_PREFIX!}_user_points` AS up
+FROM `{!_MYSQL_PREFIX!}_user_refs` AS ur
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_points` AS up

 ON ur.refid=up.userid AND ur.level=0
 ON ur.refid=up.userid AND ur.level=0

-LEFT JOIN `{!MYSQL_PREFIX!}_user_data` AS ud
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS ud

 ON ur.refid=ud.userid
 WHERE ur.userid=%s AND ur.level=%s
 ORDER BY ur.refid ASC",
 ON ur.refid=ud.userid
 WHERE ur.userid=%s AND ur.level=%s
 ORDER BY ur.refid ASC",


@@ -2092,7 +2092,7 @@ ORDER BY ur.refid ASC",
 // Recuced the amount of received emails for the receipients for given email
 function REDUCT_RECIPIENT_RECEIVED_MAILS ($column, $id, $count) {
        // Search for mail in database
 // Recuced the amount of received emails for the receipients for given email
 function REDUCT_RECIPIENT_RECEIVED_MAILS ($column, $id, $count) {
        // Search for mail in database

-       $result = SQL_QUERY_ESC("SELECT `userid` FROM `{!MYSQL_PREFIX!}_user_links` WHERE `%s`=%s ORDER BY `userid` ASC LIMIT %s",
+       $result = SQL_QUERY_ESC("SELECT `userid` FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `%s`=%s ORDER BY `userid` ASC LIMIT %s",

                array($column, bigintval($id), $count), __FILE__, __LINE__);
 
        // Are there entries?
                array($column, bigintval($id), $count), __FILE__, __LINE__);
 
        // Are there entries?


@@ -2104,7 +2104,7 @@ function REDUCT_RECIPIENT_RECEIVED_MAILS ($column, $id, $count) {
                } // END - while
 
                // Now update all user accounts
                } // END - while
 
                // Now update all user accounts

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET `emails_received`=`emails_received`-1 WHERE `userid` IN (%s) LIMIT %s",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `emails_received`=`emails_received`-1 WHERE `userid` IN (%s) LIMIT %s",

                        array(implode(",", $UIDs), count($UIDs)), __FILE__, __LINE__);
        } // END - if
 
                        array(implode(",", $UIDs), count($UIDs)), __FILE__, __LINE__);
        } // END - if
 

diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php
index ea789c3df0da02eae619609ae0b5772d29c5a61b..7c295b2f340003af05a8499a766fb426cf1b2d42 100644 (file)
--- a/inc/pool/pool-bonus.php
+++ b/inc/pool/pool-bonus.php
@@ -54,10 +54,10 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
        // Do we need to send out bonus mails?
        if (EXT_IS_ACTIVE("html_mail")) {
                //                                 0     1       2        3        4      5       6          7       8      9         10         11
        // Do we need to send out bonus mails?
        if (EXT_IS_ACTIVE("html_mail")) {
                //                                 0     1       2        3        4      5       6          7       8      9         10         11

-               $result_bonus = SQL_QUERY("SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, html_msg FROM `{!MYSQL_PREFIX!}_bonus` WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
+               $result_bonus = SQL_QUERY("SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, html_msg FROM `{!_MYSQL_PREFIX!}_bonus` WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);

        } else {
                //                                 0     1       2        3        4      5       6          7       8      9         10
        } else {
                //                                 0     1       2        3        4      5       6          7       8      9         10

-               $result_bonus = SQL_QUERY("SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send FROM `{!MYSQL_PREFIX!}_bonus` WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
+               $result_bonus = SQL_QUERY("SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send FROM `{!_MYSQL_PREFIX!}_bonus` WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);

        }
 
        if (SQL_NUMROWS($result_bonus) > 0) {
        }
 
        if (SQL_NUMROWS($result_bonus) > 0) {


@@ -68,7 +68,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                        $DATA['url'] = COMPILE_CODE($DATA['url']);
 
                        // Message is active in queue
                        $DATA['url'] = COMPILE_CODE($DATA['url']);
 
                        // Message is active in queue

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_bonus` SET data_type='QUEUE' WHERE id=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET data_type='QUEUE' WHERE id=%s LIMIT 1",

                                array(bigintval($DATA['id'])), __FILE__, __LINE__);
 
                        // "Explode" all receivers into an array
                                array(bigintval($DATA['id'])), __FILE__, __LINE__);
 
                        // "Explode" all receivers into an array


@@ -89,7 +89,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                        foreach ($RECEIVERS as $key => $uid) {
                                // Load personal data
                                //* DEBUG: */ echo "*L:".__LINE__."/".$uid."*<br />";
                        foreach ($RECEIVERS as $key => $uid) {
                                // Load personal data
                                //* DEBUG: */ echo "*L:".__LINE__."/".$uid."*<br />";

-                               $result_user = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                               $result_user = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                                        array(bigintval($uid)), __FILE__, __LINE__);
 
                                // Is his data available?
                                        array(bigintval($uid)), __FILE__, __LINE__);
 
                                // Is his data available?


@@ -132,7 +132,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
 
                                                if (GET_EXT_VERSION("user") >= "0.1.4") {
                                                        // Update mails received for receiver
 
                                                if (GET_EXT_VERSION("user") >= "0.1.4") {
                                                        // Update mails received for receiver

-                                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET emails_received=emails_received+1 WHERE userid=%s LIMIT 1",
+                                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET emails_received=emails_received+1 WHERE userid=%s LIMIT 1",

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


@@ -162,7 +162,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                        //* DEBUG: */ echo "-L:".__LINE__."/".SELECTION_COUNT($dummy)."-<br />";
                        if (SELECTION_COUNT($dummy) == 0) {
                                // Queue reached!
                        //* DEBUG: */ echo "-L:".__LINE__."/".SELECTION_COUNT($dummy)."-<br />";
                        if (SELECTION_COUNT($dummy) == 0) {
                                // Queue reached!

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_bonus` SET data_type='SEND', target_send='0', receivers='' WHERE id=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET data_type='SEND', target_send='0', receivers='' WHERE id=%s LIMIT 1",

                                        array(bigintval($DATA['id'])), __FILE__, __LINE__);
                                //* DEBUG: */ echo "*L:".__LINE__."*<br />";
 
                                        array(bigintval($DATA['id'])), __FILE__, __LINE__);
                                //* DEBUG: */ echo "*L:".__LINE__."*<br />";
 


@@ -174,7 +174,7 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) {
                                } // END - if
                        } elseif ($GLOBALS['pool_cnt'] >= getConfig('max_send')) {
                                // Update bonus pool
                                } // END - if
                        } elseif ($GLOBALS['pool_cnt'] >= getConfig('max_send')) {
                                // Update bonus pool

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_bonus` SET data_type='NEW', target_send=%s, receivers='%s' WHERE id=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET data_type='NEW', target_send=%s, receivers='%s' WHERE id=%s LIMIT 1",

                                        array(SELECTION_COUNT($dummy), implode(";", $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
                                //* DEBUG: */ echo "*L:".__LINE__."<pre>";
                                //* DEBUG: */ print_r($dummy);
                                        array(SELECTION_COUNT($dummy), implode(";", $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
                                //* DEBUG: */ echo "*L:".__LINE__."<pre>";
                                //* DEBUG: */ print_r($dummy);

diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index d39b3b89c8af5fa772cece759f9935c94b8e75f5..99e50f68452af90ff99e01cee3ab282f571615e6 100644 (file)
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -52,10 +52,10 @@ global $REPLACER;
 // Check for freed mail orders to send out
 if (EXT_IS_ACTIVE("html_mail")) {
        //                                0     1        2      3       4          5            6      7        8          9       10
 // Check for freed mail orders to send out
 if (EXT_IS_ACTIVE("html_mail")) {
        //                                0     1        2      3       4          5            6      7        8          9       10

-       $result_main = SQL_QUERY("SELECT id, sender, subject, text, receivers, payment_id, timestamp, url, target_send, cat_id, html_msg FROM `{!MYSQL_PREFIX!}_pool` WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
+       $result_main = SQL_QUERY("SELECT id, sender, subject, text, receivers, payment_id, timestamp, url, target_send, cat_id, html_msg FROM `{!_MYSQL_PREFIX!}_pool` WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);

 } else {
        //                                0     1        2      3       4          5            6      7        8          9    10
 } else {
        //                                0     1        2      3       4          5            6      7        8          9    10

-       $result_main = SQL_QUERY("SELECT id, sender, subject, text, receivers, payment_id, timestamp, url, target_send, cat_id, id FROM `{!MYSQL_PREFIX!}_pool` WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
+       $result_main = SQL_QUERY("SELECT id, sender, subject, text, receivers, payment_id, timestamp, url, target_send, cat_id, id FROM `{!_MYSQL_PREFIX!}_pool` WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);

 }
 
 // Reset variables
 }
 
 // Reset variables


@@ -64,7 +64,7 @@ if (SQL_NUMROWS($result_main) > 0) {
        // Parse all mails
        while ($DATA = SQL_FETCHROW($result_main)) {
                // Set mail order as "active". That means it will be sent out
        // Parse all mails
        while ($DATA = SQL_FETCHROW($result_main)) {
                // Set mail order as "active". That means it will be sent out

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_pool` SET data_type='ACTIVE' WHERE id=%s AND data_type='NEW' LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET data_type='ACTIVE' WHERE id=%s AND data_type='NEW' LIMIT 1",

                        array($DATA[0]), __FILE__, __LINE__);
 
                // Check fetched data for HTML
                        array($DATA[0]), __FILE__, __LINE__);
 
                // Check fetched data for HTML


@@ -92,7 +92,7 @@ if (SQL_NUMROWS($result_main) > 0) {
                        // We can now send mails to them...
                        foreach ($RECEIVERS as $key => $uid) {
                                // Lookup user ID
                        // We can now send mails to them...
                        foreach ($RECEIVERS as $key => $uid) {
                                // Lookup user ID

-                               $result_user = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                               $result_user = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                                        array(bigintval($uid)), __FILE__, __LINE__);
 
                                // Is his data available?
                                        array(bigintval($uid)), __FILE__, __LINE__);
 
                                // Is his data available?


@@ -105,18 +105,18 @@ if (SQL_NUMROWS($result_main) > 0) {
                                        SQL_FREERESULT($result_user);
 
                                        // Do we have a stats entry?
                                        SQL_FREERESULT($result_user);
 
                                        // Do we have a stats entry?

-                                       $result_stats = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s AND userid=%s AND timestamp_ordered='%s' LIMIT 1",
+                                       $result_stats = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s AND userid=%s AND timestamp_ordered='%s' LIMIT 1",

                                                array($DATA[0], $DATA[1], $DATA[6]), __FILE__, __LINE__);
 
                                        // If there's no stats entry add it!
                                        //* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!<br />";
                                        if (SQL_NUMROWS($result_stats) == 0) {
                                                // No entry was found, so we add him!
                                                array($DATA[0], $DATA[1], $DATA[6]), __FILE__, __LINE__);
 
                                        // If there's no stats entry add it!
                                        //* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!<br />";
                                        if (SQL_NUMROWS($result_stats) == 0) {
                                                // No entry was found, so we add him!

-                                               SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_stats` (pool_id , userid, cat_id, payment_id, subject, url , max_rec , timestamp_ordered, timestamp_sstart) VALUES ('%s','%s','%s','%s','%s','%s','%s','%s' , UNIX_TIMESTAMP())",
+                                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_stats` (pool_id , userid, cat_id, payment_id, subject, url , max_rec , timestamp_ordered, timestamp_sstart) VALUES ('%s','%s','%s','%s','%s','%s','%s','%s' , UNIX_TIMESTAMP())",

                                                        array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[9]), bigintval($DATA[5]), $DATA[2], $DATA[7], $DATA[8], bigintval($DATA[6])), __FILE__, __LINE__);
 
                                                // Receive it's ID for the links table
                                                        array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[9]), bigintval($DATA[5]), $DATA[2], $DATA[7], $DATA[8], bigintval($DATA[6])), __FILE__, __LINE__);
 
                                                // Receive it's ID for the links table

-                                               $result_stats = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s AND userid=%s AND timestamp_ordered='%s' LIMIT 1",
+                                               $result_stats = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s AND userid=%s AND timestamp_ordered='%s' LIMIT 1",

                                                        array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[6])), __FILE__, __LINE__);
                                        } // END - if
 
                                                        array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[6])), __FILE__, __LINE__);
                                        } // END - if
 


@@ -159,12 +159,12 @@ if (SQL_NUMROWS($result_main) > 0) {
                                                        SEND_EMAIL($email, $DATA[2], $mailText, $HTML);
 
                                                        // Count sent mails...
                                                        SEND_EMAIL($email, $DATA[2], $mailText, $HTML);
 
                                                        // Count sent mails...

-                                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET emails_sent=emails_sent+1 WHERE userid=%s LIMIT 1",
+                                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET emails_sent=emails_sent+1 WHERE userid=%s LIMIT 1",

                                                                array(bigintval($DATA[1])), __FILE__, __LINE__);
 
                                                        if (GET_EXT_VERSION("user") >= "0.1.4") {
                                                                // Update mails received for receiver
                                                                array(bigintval($DATA[1])), __FILE__, __LINE__);
 
                                                        if (GET_EXT_VERSION("user") >= "0.1.4") {
                                                                // Update mails received for receiver

-                                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET emails_received=emails_received+1 WHERE userid=%s LIMIT 1",
+                                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET emails_received=emails_received+1 WHERE userid=%s LIMIT 1",

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


@@ -204,7 +204,7 @@ if (SQL_NUMROWS($result_main) > 0) {
                                                SEND_ADMIN_NOTIFICATION(ADMIN_SUBJ_SEND_DONE, "done-admin", $content, $uid);
 
                                                // Get sender's data
                                                SEND_ADMIN_NOTIFICATION(ADMIN_SUBJ_SEND_DONE, "done-admin", $content, $uid);
 
                                                // Get sender's data

-                                               $result_sender = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                                               $result_sender = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                                                        array(bigintval($DATA[1])), __FILE__, __LINE__);
 
                                                // Is the sender found?
                                                        array(bigintval($DATA[1])), __FILE__, __LINE__);
 
                                                // Is the sender found?


@@ -223,11 +223,11 @@ if (SQL_NUMROWS($result_main) > 0) {
                                                SQL_FREERESULT($result_sender);
 
                                                // Set status to SEND because we completely send it away
                                                SQL_FREERESULT($result_sender);
 
                                                // Set status to SEND because we completely send it away

-                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_pool` SET data_type='SEND', target_send='0', receivers='' WHERE id=%s LIMIT 1",
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET data_type='SEND', target_send='0', receivers='' WHERE id=%s LIMIT 1",

                                                        array(bigintval($DATA[0])), __FILE__, __LINE__);
 
                                                // Update send-completed-time
                                                        array(bigintval($DATA[0])), __FILE__, __LINE__);
 
                                                // Update send-completed-time

-                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_stats` SET timestamp_send=UNIX_TIMESTAMP() WHERE pool_id=%s LIMIT 1",
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_stats` SET timestamp_send=UNIX_TIMESTAMP() WHERE pool_id=%s LIMIT 1",

                                                        array(bigintval($DATA[0])), __FILE__, __LINE__);
 
                                                $LAST_SENT_ID = $DATA[0]; $GLOBALS['pool_cnt'] = 0;
                                                        array(bigintval($DATA[0])), __FILE__, __LINE__);
 
                                                $LAST_SENT_ID = $DATA[0]; $GLOBALS['pool_cnt'] = 0;


@@ -248,7 +248,7 @@ if (SQL_NUMROWS($result_main) > 0) {
                                                // There are some mails left to send for next round, so we reset the status back to NEW (=still not fully delivered)
                                                $ADD = "";
                                                if ($GLOBALS['pool_cnt'] <= $DATA[8]) $ADD = ", target_send=target_send-".$GLOBALS['pool_cnt'];
                                                // There are some mails left to send for next round, so we reset the status back to NEW (=still not fully delivered)
                                                $ADD = "";
                                                if ($GLOBALS['pool_cnt'] <= $DATA[8]) $ADD = ", target_send=target_send-".$GLOBALS['pool_cnt'];

-                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_pool` SET data_type='NEW', receivers='%s'".$ADD." WHERE id=%s LIMIT 1",
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET data_type='NEW', receivers='%s'".$ADD." WHERE id=%s LIMIT 1",

                                                 array(implode(";", $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
 
                                                //* DEBUG: */ echo"*EXIT/L:".__LINE__."*<br />";
                                                 array(implode(";", $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
 
                                                //* DEBUG: */ echo"*EXIT/L:".__LINE__."*<br />";


@@ -261,7 +261,7 @@ if (SQL_NUMROWS($result_main) > 0) {
                                        // User does not exists so we have add the sender's points back to sender's account
                                        if (($RECEIVERS[0] == "0") || (empty($RECEIVERS[0]))) {
                                                // List was empty
                                        // User does not exists so we have add the sender's points back to sender's account
                                        if (($RECEIVERS[0] == "0") || (empty($RECEIVERS[0]))) {
                                                // List was empty

-                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_pool` SET data_type='SEND' WHERE id=%s LIMIT 1",
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET data_type='SEND' WHERE id=%s LIMIT 1",

                                                 array(bigintval($DATA[0])), __FILE__, __LINE__);
                                        } else {
                                                // Is the userid set?
                                                 array(bigintval($DATA[0])), __FILE__, __LINE__);
                                        } else {
                                                // Is the userid set?


@@ -282,7 +282,7 @@ if (SQL_NUMROWS($result_main) > 0) {
                                        unset($dummy[$key]);
 
                                        // Update receivers
                                        unset($dummy[$key]);
 
                                        // Update receivers

-                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_pool` SET receivers='%s' WHERE id=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET receivers='%s' WHERE id=%s LIMIT 1",

                                                array(implode(";", $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
                                }
                        }
                                                array(implode(";", $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
                                }
                        }


@@ -301,7 +301,7 @@ if (SQL_NUMROWS($result_main) > 0) {
                                );
 
                                // We have to pay back some points to the sender (we add them directly :-P)
                                );
 
                                // We have to pay back some points to the sender (we add them directly :-P)

-                               $result = SQL_QUERY_ESC("SELECT email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",

                                        array(bigintval($uid)), __FILE__, __LINE__);
                                $DATA[10] = $PB; $DATA[11] = $cnt_back[$uid];
 
                                        array(bigintval($uid)), __FILE__, __LINE__);
                                $DATA[10] = $PB; $DATA[11] = $cnt_back[$uid];
 

diff --git a/inc/profile-updte.php b/inc/profile-updte.php
index b28953ef852278b3cb40863033ca7bc6d65579b4..05ce24ce5bcc07494b7f11e1d27a681a1f09a250 100644 (file)
--- a/inc/profile-updte.php
+++ b/inc/profile-updte.php
@@ -42,7 +42,7 @@ if ((getConfig('send_prof_update') == "Y") && (getConfig('profile_update') > 0)
        // Load personal data              0      1     2      3        4          5         6
        $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, last_update, joined
 FROM
        // Load personal data              0      1     2      3        4          5         6
        $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, last_update, joined
 FROM

-       "._MYSQL_PREFIX."_user_data
+       {!MYSQL_PREFIX!}_user_data

 WHERE
        (last_update < (UNIX_TIMESTAMP() - %s) AND last_update != 0 AND last_profile_sent < (UNIX_TIMESTAMP() - %s))
 OR
 WHERE
        (last_update < (UNIX_TIMESTAMP() - %s) AND last_update != 0 AND last_profile_sent < (UNIX_TIMESTAMP() - %s))
 OR


@@ -70,7 +70,7 @@ ORDER BY userid", array(getConfig('profile_update'), getConfig('resend_profile_u
                        SEND_EMAIL($DATA[1], PROFILE_OUTDATED, $msg);
 
                        // Update profile data
                        SEND_EMAIL($DATA[1], PROFILE_OUTDATED, $msg);
 
                        // Update profile data

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET last_profile_sent=UNIX_TIMESTAMP(), notified='Y' WHERE userid=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET last_profile_sent=UNIX_TIMESTAMP(), notified='Y' WHERE userid=%s LIMIT 1",

                                array(bigintval($DATA[0])), __FILE__, __LINE__);
                }
        }
                                array(bigintval($DATA[0])), __FILE__, __LINE__);
                }
        }

diff --git a/inc/reset/reset_beg.php b/inc/reset/reset_beg.php
index 93ef330ddb820d9d015d057ade7d00ed5d0bf772..4413658faae072e962d6eaae7395d0f2d8598090 100644 (file)
--- a/inc/reset/reset_beg.php
+++ b/inc/reset/reset_beg.php
@@ -44,7 +44,7 @@ if (($CSS == 1) || (!defined('__DAILY_RESET')) || (getConfig('beg_rallye') == "Y
 //* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Reset accounts
 //* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Reset accounts

-$result = SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_user_data` SET beg_points=0.00000 WHERE beg_points > 0",
+$result = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET beg_points=0.00000 WHERE beg_points > 0",

  __FILE__, __LINE__);
 
 //
  __FILE__, __LINE__);
 
 //

diff --git a/inc/reset/reset_bonus.php b/inc/reset/reset_bonus.php
index cf503317dee32e4cc7ec5194c6d79b5eca7915d1..58e1e19f0d71727b415d69fa0f95bcc891f6b773 100644 (file)
--- a/inc/reset/reset_bonus.php
+++ b/inc/reset/reset_bonus.php
@@ -47,7 +47,7 @@ if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
 BONUS_PURGE_EXPIRED_TURBO_BONUS();
 
 // Reset accounts
 BONUS_PURGE_EXPIRED_TURBO_BONUS();
 
 // Reset accounts

-$result = SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_user_data` SET turbo_bonus=0, login_bonus=0, bonus_order=0, bonus_stats=0, bonus_ref=0",
+$result = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET turbo_bonus=0, login_bonus=0, bonus_order=0, bonus_stats=0, bonus_ref=0",

  __FILE__, __LINE__);
 
 //
  __FILE__, __LINE__);
 
 //

diff --git a/inc/reset/reset_daily.php b/inc/reset/reset_daily.php
index 0b5d3c7208f6bf35bc3f1f3cf80ee07bbf259f74..03451375feb8febf5900bd990c5b363144dde7e9 100644 (file)
--- a/inc/reset/reset_daily.php
+++ b/inc/reset/reset_daily.php
@@ -46,14 +46,14 @@ if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
 // Update user profiles
 if (GET_EXT_VERSION("order") >= "0.1.1") {
        // Latest version
 // Update user profiles
 if (GET_EXT_VERSION("order") >= "0.1.1") {
        // Latest version

-       $result_daily = SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_user_data` SET receive_mails=max_mails, mail_orders=0 WHERE receive_mails != max_mails", __FILE__, __LINE__);
+       $result_daily = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET receive_mails=max_mails, mail_orders=0 WHERE receive_mails != max_mails", __FILE__, __LINE__);

 } else {
        // Obsolete version
 } else {
        // Obsolete version

-       $result_daily = SQL_QUERY("UPDATE `{!MYSQL_PREFIX!}_user_data` SET receive_mails=max_mails WHERE receive_mails != max_mails", __FILE__, __LINE__);
+       $result_daily = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET receive_mails=max_mails WHERE receive_mails != max_mails", __FILE__, __LINE__);

 }
 
 // Transfer points from locked_points to points
 }
 
 // Transfer points from locked_points to points

-$result_daily = SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE ref_payout=0 AND status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
+$result_daily = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE ref_payout=0 AND status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);

 
 //* DEBUG: */ echo basename(__FILE__).":payout=0;daily|numRows=".SQL_NUMROWS($result_daily)."<br />\n";
 if (SQL_NUMROWS($result_daily) > 0)
 
 //* DEBUG: */ echo basename(__FILE__).":payout=0;daily|numRows=".SQL_NUMROWS($result_daily)."<br />\n";
 if (SQL_NUMROWS($result_daily) > 0)


@@ -62,7 +62,7 @@ if (SQL_NUMROWS($result_daily) > 0)
        while (list($uid) = SQL_FETCHROW($result_daily))
        {
                //* DEBUG: */ echo basename(__FILE__).":uid={$uid}<br />\n";
        while (list($uid) = SQL_FETCHROW($result_daily))
        {
                //* DEBUG: */ echo basename(__FILE__).":uid={$uid}<br />\n";

-               $result_points = SQL_QUERY_ESC("SELECT ref_depth, locked_points FROM `{!MYSQL_PREFIX!}_user_points`
+               $result_points = SQL_QUERY_ESC("SELECT ref_depth, locked_points FROM `{!_MYSQL_PREFIX!}_user_points`

 WHERE userid=%s AND locked_points != 0.00000 ORDER BY ref_depth",
                 array(bigintval($uid)), __FILE__, __LINE__);
                //* DEBUG: */ echo basename(__FILE__).":payout=0;points|numRows=".SQL_NUMROWS($result_points)."<br />\n";
 WHERE userid=%s AND locked_points != 0.00000 ORDER BY ref_depth",
                 array(bigintval($uid)), __FILE__, __LINE__);
                //* DEBUG: */ echo basename(__FILE__).":payout=0;points|numRows=".SQL_NUMROWS($result_points)."<br />\n";


@@ -72,7 +72,7 @@ WHERE userid=%s AND locked_points != 0.00000 ORDER BY ref_depth",
                        while (list($dep, $locked) = SQL_FETCHROW($result_points))
                        {
                                //* DEBUG: */ echo basename(__FILE__).":uid={$uid},depth={$dep},locked={$locked}<br />\n";
                        while (list($dep, $locked) = SQL_FETCHROW($result_points))
                        {
                                //* DEBUG: */ echo basename(__FILE__).":uid={$uid},depth={$dep},locked={$locked}<br />\n";

-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_points` SET points=points+%s, locked_points=0.00000
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_points` SET points=points+%s, locked_points=0.00000

 WHERE userid=%s AND ref_depth=%d
 LIMIT 1",
                                 array($locked, bigintval($uid), $dep), __FILE__, __LINE__);
 WHERE userid=%s AND ref_depth=%d
 LIMIT 1",
                                 array($locked, bigintval($uid), $dep), __FILE__, __LINE__);

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index 2f2da2e11b0c6863a36454dc4491664e5a694f10..ec2db88bd8e097f861d2592869dfd7a68aa40531 100644 (file)
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -44,14 +44,14 @@ if (($CSS == 1) || ((!defined('__DAILY_RESET')) && (getConfig('holiday_mode') ==
 //* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Check for holidays we need to enable and send email to user
 //* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Check for holidays we need to enable and send email to user

-$result_main = SQL_QUERY("SELECT userid, holiday_activated FROM `{!MYSQL_PREFIX!}_user_data`
+$result_main = SQL_QUERY("SELECT userid, holiday_activated FROM `{!_MYSQL_PREFIX!}_user_data`

 WHERE holiday_activated > 0 AND holiday_activated < UNIX_TIMESTAMP() AND holiday_active='N'
 ORDER BY holiday_activated", __FILE__, __LINE__);
 if (SQL_NUMROWS($result_main) > 0) {
        // We have found at least one useraccount so let's check it...
 WHERE holiday_activated > 0 AND holiday_activated < UNIX_TIMESTAMP() AND holiday_active='N'
 ORDER BY holiday_activated", __FILE__, __LINE__);
 if (SQL_NUMROWS($result_main) > 0) {
        // We have found at least one useraccount so let's check it...

-       while(list($uid, $activated) = SQL_FETCHROW($result_main)) {
+       while (list($uid, $activated) = SQL_FETCHROW($result_main)) {

                // Check if his holiday can be activated
                // Check if his holiday can be activated

-               $result_holiday = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM `{!MYSQL_PREFIX!}_user_holidays`
+               $result_holiday = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM `{!_MYSQL_PREFIX!}_user_holidays`

 WHERE userid=%s AND holiday_start <= UNIX_TIMESTAMP() AND holiday_end > UNIX_TIMESTAMP() LIMIT 1",
  array(bigintval($uid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result_holiday) == 1)
 WHERE userid=%s AND holiday_start <= UNIX_TIMESTAMP() AND holiday_end > UNIX_TIMESTAMP() LIMIT 1",
  array(bigintval($uid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result_holiday) == 1)


@@ -71,7 +71,7 @@ WHERE userid=%s AND holiday_start <= UNIX_TIMESTAMP() AND holiday_end > UNIX_TIM
                        SEND_EMAIL($uid, HOLIDAY_MEMBER_ACTIVATED, $msg);
 
                        // Update account
                        SEND_EMAIL($uid, HOLIDAY_MEMBER_ACTIVATED, $msg);
 
                        // Update account

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET holiday_active='Y'
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET holiday_active='Y'

 WHERE userid=%s
 LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
                }
 WHERE userid=%s
 LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
                }

diff --git a/inc/stats_bonus.php b/inc/stats_bonus.php
index ec90206560c0e84b4d2abbe68bcbfc2ef2cecd00..fd9e7a3e403a9cea18351bb360162379d7d18b72 100644 (file)
--- a/inc/stats_bonus.php
+++ b/inc/stats_bonus.php
@@ -39,7 +39,7 @@ if (!defined('__SECURITY')) {
 
 // Check for 100% klickrate mails
 $result_bonus = SQL_QUERY("SELECT id, userid, subject, timestamp_ordered, clicks, url
 
 // Check for 100% klickrate mails
 $result_bonus = SQL_QUERY("SELECT id, userid, subject, timestamp_ordered, clicks, url

-FROM `{!MYSQL_PREFIX!}_user_stats`
+FROM `{!_MYSQL_PREFIX!}_user_stats`

 WHERE max_rec=clicks AND clicks>0 AND bonus_stats_active='N'
 ORDER BY userid", __FILE__, __LINE__);
 
 WHERE max_rec=clicks AND clicks>0 AND bonus_stats_active='N'
 ORDER BY userid", __FILE__, __LINE__);
 


@@ -48,9 +48,9 @@ if (SQL_NUMROWS($result_bonus) > 0) {
        define('__STATS_BONUS', TRANSLATE_COMMA(getConfig('bonus_stats')));
 
        // We found some mail orders...
        define('__STATS_BONUS', TRANSLATE_COMMA(getConfig('bonus_stats')));
 
        // We found some mail orders...

-       while(list($id, $uid, $subj, $stamp, $clicks, $url) = SQL_FETCHROW($result_bonus)) {
+       while (list($id, $uid, $subj, $stamp, $clicks, $url) = SQL_FETCHROW($result_bonus)) {

                // Add points
                // Add points

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET bonus_stats=bonus_stats+%s WHERE userid=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET bonus_stats=bonus_stats+%s WHERE userid=%s LIMIT 1",

                        array(getConfig('bonus_stats'), bigintval($uid)), __FILE__, __LINE__);
 
                // Prepare array
                        array(getConfig('bonus_stats'), bigintval($uid)), __FILE__, __LINE__);
 
                // Prepare array


@@ -66,7 +66,7 @@ if (SQL_NUMROWS($result_bonus) > 0) {
                SEND_EMAIL($uid, BONUS_MEMBER_STATS_SUBJECT, $msg);
 
                // Update database
                SEND_EMAIL($uid, BONUS_MEMBER_STATS_SUBJECT, $msg);
 
                // Update database

-               $result_update =  SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_stats` SET bonus_stats_active='Y' WHERE id=%s LIMIT 1",
+               $result_update =  SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_stats` SET bonus_stats_active='Y' WHERE id=%s LIMIT 1",

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

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 73dda5cde74ca8adaeec550287c8a02faae785b2..c93b50b02cd6f3b1195aa455de879d467b749a21 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -66,7 +66,7 @@ if (($CSS == "1") || (getConfig('css_php') == "DIRECT")) {
                if ((FILE_READABLE($file)) && (filesize($file) > 0)) {
                        switch (getConfig('css_php')) {
                                case "DIRECT":
                if ((FILE_READABLE($file)) && (filesize($file) > 0)) {
                        switch (getConfig('css_php')) {
                                case "DIRECT":

-                                       OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"".URL."/theme/".GET_CURR_THEME()."/".$value."\" />");
+                                       OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"{!URL!}/theme/".GET_CURR_THEME()."/".$value."\" />");

                                        break;
 
                                case "FILE":
                                        break;
 
                                case "FILE":


@@ -77,7 +77,7 @@ if (($CSS == "1") || (getConfig('css_php') == "DIRECT")) {
        }
 } else {
        // Now we load all CSS files from css.php!
        }
 } else {
        // Now we load all CSS files from css.php!

-       OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"".URL."/css.php", false);
+       OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"{!URL!}/css.php", false);

        if (isBooleanConstantAndTrue('mxchange_installing')) {
                // Default theme first
                $NEW_THEME = "default";
        if (isBooleanConstantAndTrue('mxchange_installing')) {
                // Default theme first
                $NEW_THEME = "default";

diff --git a/lead-confirm.php b/lead-confirm.php
index 4ba44b42b6073d4a923750fd45792cf587e10342..f014f2d754de3bfc861b9195d000508a91be729c 100644 (file)
--- a/lead-confirm.php
+++ b/lead-confirm.php
@@ -59,7 +59,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Is the cookie set?
        if (isSessionVariableSet('lead_uid')) {
                // Is the user-account unlocked and valid?
        // Is the cookie set?
        if (isSessionVariableSet('lead_uid')) {
                // Is the user-account unlocked and valid?

-               $result = SQL_QUERY_ESC("SELECT email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",

                        array(bigintval(get_session('lead_uid'))), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Secure the ID number
                        array(bigintval(get_session('lead_uid'))), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Secure the ID number


@@ -76,7 +76,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                }
        } else {
                // Maybe spider?
                }
        } else {
                // Maybe spider?

-               $content['lead_email'] = WEBMASTER;
+               $content['lead_email'] = constant('WEBMASTER');

        }
 
        // Load the lead template
        }
 
        // Load the lead template

diff --git a/mailid.php b/mailid.php
index b877c10f19b9d172b4a7d61ecf21268762f2c226..4778ba91301b7975b4b28e092ed4bf2b5a5c74ba 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -64,12 +64,12 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                // Maybe he wants to confirm an email?
                if ($url_mid > 0) {
                        // Normal-Mails
                // Maybe he wants to confirm an email?
                if ($url_mid > 0) {
                        // Normal-Mails

-                       $result = SQL_QUERY_ESC("SELECT link_type FROM `{!MYSQL_PREFIX!}_user_links` WHERE stats_id=%s AND userid=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE stats_id=%s AND userid=%s LIMIT 1",

                                array($url_mid, $url_uid), __FILE__, __LINE__);
                        $type = "mailid"; $DATA = $url_mid;
                } elseif ($url_bid > 0) {
                        // Bonus-Mail
                                array($url_mid, $url_uid), __FILE__, __LINE__);
                        $type = "mailid"; $DATA = $url_mid;
                } elseif ($url_bid > 0) {
                        // Bonus-Mail

-                       $result = SQL_QUERY_ESC("SELECT link_type FROM `{!MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s AND userid=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s AND userid=%s LIMIT 1",

                                array($url_bid, $url_uid), __FILE__, __LINE__);
                        $type = "bonusid"; $DATA = $url_bid;
                } else {
                                array($url_bid, $url_uid), __FILE__, __LINE__);
                        $type = "bonusid"; $DATA = $url_bid;
                } else {


@@ -88,7 +88,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        {
                        case "NORMAL":
                                // Is the stats ID valid?
                        {
                        case "NORMAL":
                                // Is the stats ID valid?

-                               $result = SQL_QUERY_ESC("SELECT pool_id, url, subject FROM `{!MYSQL_PREFIX!}_user_stats` WHERE id=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT pool_id, url, subject FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE id=%s LIMIT 1",

                                        array($url_mid), __FILE__, __LINE__);
                                break;
 
                                        array($url_mid), __FILE__, __LINE__);
                                break;
 


@@ -100,7 +100,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                } // END - if
 
                                // Bonus-Mails
                                } // END - if
 
                                // Bonus-Mails

-                               $result = SQL_QUERY_ESC("SELECT id, url, subject FROM `{!MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT id, url, subject FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",

                                        array($url_bid), __FILE__, __LINE__);
                                break;
                        }
                                        array($url_bid), __FILE__, __LINE__);
                                break;
                        }


@@ -116,7 +116,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                $EXTRA_TITLE = COMPILE_CODE($EXTRA_TITLE);
 
                                // Is the user's ID unlocked?
                                $EXTRA_TITLE = COMPILE_CODE($EXTRA_TITLE);
 
                                // Is the user's ID unlocked?

-                               $result = SQL_QUERY_ESC("SELECT status, gender, surname, family FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT status, gender, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                                        array($url_uid), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) == 1) {
                                        list($status, $gender, $sname, $fname) = SQL_FETCHROW($result);
                                        array($url_uid), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) == 1) {
                                        list($status, $gender, $sname, $fname) = SQL_FETCHROW($result);


@@ -126,7 +126,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                switch ($ltype)
                                                {
                                                case "NORMAL":
                                                switch ($ltype)
                                                {
                                                case "NORMAL":

-                                                       $result = SQL_QUERY_ESC("SELECT payment_id FROM `{!MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
+                                                       $result = SQL_QUERY_ESC("SELECT payment_id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",

                                                                array(bigintval($pool)), __FILE__, __LINE__);
                                                        if (SQL_NUMROWS($result) == 1)
                                                        {
                                                                array(bigintval($pool)), __FILE__, __LINE__);
                                                        if (SQL_NUMROWS($result) == 1)
                                                        {


@@ -141,7 +141,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                        break;
 
                                                case "BONUS":
                                                        break;
 
                                                case "BONUS":

-                                                       $result = SQL_QUERY_ESC("SELECT points, time FROM `{!MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
+                                                       $result = SQL_QUERY_ESC("SELECT points, time FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",

                                                                array($url_bid), __FILE__, __LINE__);
                                                        if (SQL_NUMROWS($result) == 1)
                                                        {
                                                                array($url_bid), __FILE__, __LINE__);
                                                        if (SQL_NUMROWS($result) == 1)
                                                        {


@@ -161,7 +161,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                // Was that mail a valid one?
                                                if ($VALID) {
                                                        // If time is zero seconds we have a sponsor mail. 1 Second shall be set to avoid problems
                                                // Was that mail a valid one?
                                                if ($VALID) {
                                                        // If time is zero seconds we have a sponsor mail. 1 Second shall be set to avoid problems

-                                                       if (($time == "0") && ($payment > 0)) { $URL = URL; $time = "1"; }
+                                                       if (($time == "0") && ($payment > 0)) { $URL = constant('URL'); $time = "1"; }

                                                        if (($time > 0) && (($payment > 0) || ($points > 0))) {
                                                                // He can confirm this mail!
                                                                // Export data into constants for the template
                                                        if (($time > 0) && (($payment > 0) || ($points > 0))) {
                                                                // He can confirm this mail!
                                                                // Export data into constants for the template

diff --git a/mailid_top.php b/mailid_top.php
index b477247c6df7431a4ece9534310432a8241d612b..1c9405aa35e33954a29f2f39ba1002091c8cabf8 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -66,11 +66,11 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 
                // Maybe he wants to confirm an email?
                if ($url_mid > 0) {
 
                // Maybe he wants to confirm an email?
                if ($url_mid > 0) {

-                       $result = SQL_QUERY_ESC("SELECT id, link_type FROM `{!MYSQL_PREFIX!}_user_links` WHERE stats_id=%s AND userid=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE stats_id=%s AND userid=%s LIMIT 1",

                         array($url_mid, $url_uid), __FILE__, __LINE__);
                        $type = "mailid"; $DATA = $url_mid;
                } elseif ($url_bid > 0)         {
                         array($url_mid, $url_uid), __FILE__, __LINE__);
                        $type = "mailid"; $DATA = $url_mid;
                } elseif ($url_bid > 0)         {

-                       $result = SQL_QUERY_ESC("SELECT id, link_type FROM `{!MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s AND userid=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s AND userid=%s LIMIT 1",

                         array($url_bid, $url_uid), __FILE__, __LINE__);
                        $type = "bonusid"; $DATA = $url_bid;
                }
                         array($url_bid, $url_uid), __FILE__, __LINE__);
                        $type = "bonusid"; $DATA = $url_bid;
                }


@@ -82,12 +82,12 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        switch ($ltype)
                        {
                        case "NORMAL":
                        switch ($ltype)
                        {
                        case "NORMAL":

-                               $result_mailid = SQL_QUERY_ESC("SELECT pool_id, userid, id FROM `{!MYSQL_PREFIX!}_user_stats` WHERE id=%s LIMIT 1",
+                               $result_mailid = SQL_QUERY_ESC("SELECT pool_id, userid, id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE id=%s LIMIT 1",

                                        array($url_mid), __FILE__, __LINE__);
                                break;
 
                        case "BONUS":
                                        array($url_mid), __FILE__, __LINE__);
                                break;
 
                        case "BONUS":

-                               $result_mailid = SQL_QUERY_ESC("SELECT id, id, is_notify FROM `{!MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
+                               $result_mailid = SQL_QUERY_ESC("SELECT id, id, is_notify FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",

                                        array($url_bid), __FILE__, __LINE__);
                                break;
                        }
                                        array($url_bid), __FILE__, __LINE__);
                                break;
                        }


@@ -107,7 +107,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                if ($ltype == "BONUS") $sender = 0;
 
                                // Is the user's ID unlocked?
                                if ($ltype == "BONUS") $sender = 0;
 
                                // Is the user's ID unlocked?

-                               $result = SQL_QUERY_ESC("SELECT status, gender, surname, family, ref_payout FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT status, gender, surname, family, ref_payout FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

                                        array($url_uid), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) == 1) {
                                        // Load data
                                        array($url_uid), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) == 1) {
                                        // Load data


@@ -118,14 +118,14 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 
                                        if ($status == "CONFIRMED") {
                                                // Update last activity
 
                                        if ($status == "CONFIRMED") {
                                                // Update last activity

-                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET last_online=UNIX_TIMESTAMP(), last_module='mailid_top' WHERE userid=%s LIMIT 1",
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET last_online=UNIX_TIMESTAMP(), last_module='mailid_top' WHERE userid=%s LIMIT 1",

                                                        array($url_uid), __FILE__, __LINE__);
 
                                                // User has confirmed his account so we can procede...
                                                switch ($ltype)
                                                {
                                                case "NORMAL":
                                                        array($url_uid), __FILE__, __LINE__);
 
                                                // User has confirmed his account so we can procede...
                                                switch ($ltype)
                                                {
                                                case "NORMAL":

-                                                       $result = SQL_QUERY_ESC("SELECT payment_id FROM `{!MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
+                                                       $result = SQL_QUERY_ESC("SELECT payment_id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",

                                                                array(bigintval($pool)), __FILE__, __LINE__);
 
                                                        // Entry found?
                                                                array(bigintval($pool)), __FILE__, __LINE__);
 
                                                        // Entry found?


@@ -141,7 +141,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                        break;
 
                                                case "BONUS":
                                                        break;
 
                                                case "BONUS":

-                                                       $result = SQL_QUERY_ESC("SELECT time, points FROM `{!MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
+                                                       $result = SQL_QUERY_ESC("SELECT time, points FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",

                                                                array(bigintval($pool)), __FILE__, __LINE__);
 
                                                        // Entry found?
                                                                array(bigintval($pool)), __FILE__, __LINE__);
 
                                                        // Entry found?


@@ -173,7 +173,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                                        switch ($ltype)
                                                                        {
                                                                        case "NORMAL":
                                                                        switch ($ltype)
                                                                        {
                                                                        case "NORMAL":

-                                                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_stats` SET clicks=clicks + 1 WHERE id=%s LIMIT 1",
+                                                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_stats` SET clicks=clicks + 1 WHERE id=%s LIMIT 1",

                                                                                        array($url_mid), __FILE__, __LINE__);
 
                                                                                // Update mediadata as well
                                                                                        array($url_mid), __FILE__, __LINE__);
 
                                                                                // Update mediadata as well


@@ -185,7 +185,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                                                break;
 
                                                                        case "BONUS":
                                                                                break;
 
                                                                        case "BONUS":

-                                                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_bonus` SET clicks=clicks + 1 WHERE id=%s LIMIT 1",
+                                                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_bonus` SET clicks=clicks + 1 WHERE id=%s LIMIT 1",

                                                                                        array($url_bid), __FILE__, __LINE__);
 
                                                                                // Update mediadata as well
                                                                                        array($url_bid), __FILE__, __LINE__);
 
                                                                                // Update mediadata as well


@@ -204,13 +204,13 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                                        // Only when user extension = v0.1.2: Update mails-confirmed counter
                                                                        if (GET_EXT_VERSION("user") >= "0.1.2") {
                                                                                // Update counter
                                                                        // Only when user extension = v0.1.2: Update mails-confirmed counter
                                                                        if (GET_EXT_VERSION("user") >= "0.1.2") {
                                                                                // Update counter

-                                                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET mails_confirmed=mails_confirmed + 1 WHERE userid=%s LIMIT 1",
+                                                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET mails_confirmed=mails_confirmed + 1 WHERE userid=%s LIMIT 1",

                                                                                        array($url_uid), __FILE__, __LINE__);
 
                                                                                // Update random confirmed as well?
                                                                                if (GET_EXT_VERSION("user") >= "0.3.4") {
                                                                                        // Update second counter
                                                                                        array($url_uid), __FILE__, __LINE__);
 
                                                                                // Update random confirmed as well?
                                                                                if (GET_EXT_VERSION("user") >= "0.3.4") {
                                                                                        // Update second counter

-                                                                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET rand_confirmed=rand_confirmed + 1 WHERE userid=%s LIMIT 1",
+                                                                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET rand_confirmed=rand_confirmed + 1 WHERE userid=%s LIMIT 1",

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


@@ -232,7 +232,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                                                } // END - if
 
                                                                                // Count down ref_payout value
                                                                                } // END - if
 
                                                                                // Count down ref_payout value

-                                                                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET ref_payout=ref_payout-1 WHERE userid=%s AND ref_payout > 0 LIMIT 1",
+                                                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ref_payout=ref_payout-1 WHERE userid=%s AND ref_payout > 0 LIMIT 1",

                                                                                        array($url_uid), __FILE__, __LINE__);
 
                                                                                // Add points
                                                                                        array($url_uid), __FILE__, __LINE__);
 
                                                                                // Add points


@@ -276,7 +276,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                                        }
 
                                                                        // Remove link from table
                                                                        }
 
                                                                        // Remove link from table

-                                                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_links` WHERE id=%s LIMIT 1",
+                                                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE id=%s LIMIT 1",

                                                                                array(bigintval($lid)), __FILE__, __LINE__);
                                                                        break;
 
                                                                                array(bigintval($lid)), __FILE__, __LINE__);
                                                                        break;
 

diff --git a/modules.php b/modules.php
index 913b66e169e4638c212fcad7ed3ccca62c397ea7..4215f5c97c175d4d0b288aaf0730e0a2baac330d 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -60,7 +60,7 @@ require("inc/config.php");
 // Check if logged in
 if (IS_MEMBER()) {
        // Is still logged in so we welcome him with his name
 // Check if logged in
 if (IS_MEMBER()) {
        // Is still logged in so we welcome him with his name

-       $result = SQL_QUERY_ESC("SELECT surname, family FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

         array($GLOBALS['userid']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load surname and family's name and build the username
         array($GLOBALS['userid']), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load surname and family's name and build the username


@@ -94,13 +94,13 @@ if (IS_MEMBER()) {
 }
 
 // The header file
 }
 
 // The header file

-include (PATH."inc/header.php");
+require_once(PATH."inc/header.php");

 
 // Modules are by default not valid!
 $MOD_VALID = false; $check = "failed";
 if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin")) {
        // Maintain mode is active and you are no admin
 
 // Modules are by default not valid!
 $MOD_VALID = false; $check = "failed";
 if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin")) {
        // Maintain mode is active and you are no admin

-       addFatalMessage(LANG_DOWN_MAINTAINCE);
+       addFatalMessage(getMessage('LANG_DOWN_MAINTAINCE'));

 } elseif (($link) && ($db) && (getTotalFatalErrors() == 0)) {
        // Did we found the module listed in allowed modules and are we successfully connected?
        $check = CHECK_MODULE($GLOBALS['module']);
 } elseif (($link) && ($db) && (getTotalFatalErrors() == 0)) {
        // Did we found the module listed in allowed modules and are we successfully connected?
        $check = CHECK_MODULE($GLOBALS['module']);


@@ -145,7 +145,7 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] !=
        }
 } elseif (getTotalFatalErrors() == 0) {
        // MySQL problems!
        }
 } elseif (getTotalFatalErrors() == 0) {
        // MySQL problems!

-       addFatalMessage(MYSQL_ERRORS);
+       addFatalMessage(getMessage('MYSQL_ERRORS'));

 }
 
 if (($MOD_VALID) && (defined('__MODULE'))) {
 }
 
 if (($MOD_VALID) && (defined('__MODULE'))) {


@@ -158,7 +158,7 @@ if (($MOD_VALID) && (defined('__MODULE'))) {
 } // END - if
 
 // Next-to-end add the footer
 } // END - if
 
 // Next-to-end add the footer

-include (PATH."inc/footer.php");
+require_once(PATH."inc/footer.php");

 
 //
 ?>
 
 //
 ?>

diff --git a/ref.php b/ref.php
index 5b46f1778aeb065d08d5eca7235af786bbc83f77..604a86d189cedafd1f07750b50f0f20bd5bdfb3d 100644 (file)
--- a/ref.php
+++ b/ref.php
@@ -67,7 +67,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                if ($ref != "".($ref + 0)."") {
                        if (EXT_IS_ACTIVE("nickname")) {
                                // Nickname in URL, so load the ID
                if ($ref != "".($ref + 0)."") {
                        if (EXT_IS_ACTIVE("nickname")) {
                                // Nickname in URL, so load the ID

-                               $result = SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",

                                        array($ref), __FILE__, __LINE__);
 
                                // Load userid
                                        array($ref), __FILE__, __LINE__);
 
                                // Load userid


@@ -93,7 +93,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                // Is the refid valid?
                if ($ref > 0) {
                        // Update ref counter
                // Is the refid valid?
                if ($ref > 0) {
                        // Update ref counter

-                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET ref_clicks=ref_clicks+1 WHERE userid=%s LIMIT 1",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ref_clicks=ref_clicks+1 WHERE userid=%s LIMIT 1",

                                array(bigintval($ref)), __FILE__, __LINE__);
                } // END - if
        } else {
                                array(bigintval($ref)), __FILE__, __LINE__);
                } // END - if
        } else {

diff --git a/show_bonus.php b/show_bonus.php
index a71eee78e1637d77f3c725090f565327e48477a8..ddff568683de07c84eee4200f642eac11961bd8e 100644 (file)
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -78,8 +78,8 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                if (!empty($t)) {
                        // Check for data
                        $result = SQL_QUERY_ESC("SELECT DISTINCT d.gender, d.surname, d.family, b.level, b.points
                if (!empty($t)) {
                        // Check for data
                        $result = SQL_QUERY_ESC("SELECT DISTINCT d.gender, d.surname, d.family, b.level, b.points

-FROM `{!MYSQL_PREFIX!}_user_data` AS d
-RIGHT JOIN `{!MYSQL_PREFIX!}_bonus_turbo` AS b
+FROM `{!_MYSQL_PREFIX!}_user_data` AS d
+RIGHT JOIN `{!_MYSQL_PREFIX!}_bonus_turbo` AS b

 ON d.userid=b.userid
 WHERE d.status='CONFIRMED' AND d.userid=%s AND b.%s=%s
 LIMIT 1",
 ON d.userid=b.userid
 WHERE d.status='CONFIRMED' AND d.userid=%s AND b.%s=%s
 LIMIT 1",

diff --git a/view.php b/view.php
index e6ed28fa25b27879b664e538b66c0fc46f0f6a80..a22e83582c555b0b8226fc406004e3133b41da0a 100644 (file)
--- a/view.php
+++ b/view.php
@@ -49,12 +49,12 @@ if (((!empty($_GET['user'])) || (!empty($_GET['reseller']))) && (!empty($_GET['b
        $VIEW = 1;
 
        // for later things... ;-)
        $VIEW = 1;
 
        // for later things... ;-)

-       $result = SQL_QUERY_ESC("SELECT url FROM `{!MYSQL_PREFIX!}_refbanner` WHERE id=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT url FROM `{!_MYSQL_PREFIX!}_refbanner` WHERE id=%s LIMIT 1",

                array(bigintval($_GET['banner'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1)  {
                list($url) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                array(bigintval($_GET['banner'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1)  {
                list($url) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);

-               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_refbanner` SET counter=counter+1 WHERE id=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_refbanner` SET counter=counter+1 WHERE id=%s LIMIT 1",

                        array(bigintval($_GET['banner'])), __FILE__, __LINE__);
 
                $type = substr($url, -3);
                        array(bigintval($_GET['banner'])), __FILE__, __LINE__);
 
                $type = substr($url, -3);