X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=6b244371c278f309b049efa4f6221b62aade5e79;hb=439a544d74b0f34908b8524777c8c50294c03073;hp=504e0ebb11d4f4e3de64293675cbbf1e0546f3fb;hpb=4bd12d7c844163f67cca3489aa0b6c9af61d8adb;p=mailer.git
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 504e0ebb11..6b244371c2 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -37,23 +37,25 @@ if (!defined('__SECURITY')) {
require($INC);
}
-//
-function ADD_MODULE_TITLE($mod) {
- global $cacheArray;
- $name = ""; $result = false;
+// Returns the title for given module
+function ADD_MODULE_TITLE ($mod) {
+ // Init variables
+ $name = "";
+ $result = false;
// Is the script installed?
if (isBooleanConstantAndTrue('mxchange_installed')) {
// Check if cache is valid
- if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($cacheArray['modules']['module'])) && (in_array($mod, $cacheArray['modules']['module']))) {
+ if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($GLOBALS['cache_array']['modules']['module'])) && (in_array($mod, $GLOBALS['cache_array']['modules']['module']))) {
// Load from cache
- $name = $cacheArray['modules']['title'][$mod];
+ $name = $GLOBALS['cache_array']['modules']['title'][$mod];
// Update cache hits
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);
}
@@ -65,7 +67,7 @@ function ADD_MODULE_TITLE($mod) {
// Still no luck or empty title?
if (empty($name)) {
// No name found
- $name = sprintf("%s (%s)", LANG_UNKNOWN_MODULE, $mod);
+ $name = sprintf("%s (%s)", getMessage('LANG_UNKNOWN_MODULE'), $mod);
if (SQL_NUMROWS($result) == 0) {
// Add module to database
$dummy = CHECK_MODULE($mod);
@@ -78,9 +80,6 @@ function ADD_MODULE_TITLE($mod) {
// Check validity of a given module name (no file extension)
function CHECK_MODULE ($mod) {
- // We need them now here...
- global $cacheArray, $cacheInstance;
-
// Filter module name (names with low chars and underlines are fine!)
$mod = preg_replace("/[^a-z_]/", "", $mod);
@@ -94,25 +93,34 @@ function CHECK_MODULE ($mod) {
if (EXT_IS_ACTIVE($modSplit[0])) {
// The prefix is an extension's name, so let's set it
$extension = $modSplit[0]; $mod = $modSplit[1];
- }
- }
+ } // END - if
+ } // END - if
// Major error in module registry is the default
$ret = "major";
// Check if script is installed if not return a "done" to prevent some errors
- if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (!isBooleanConstantAndTrue('admin_registered'))) return "done";
+ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isInstalling()) || (!isBooleanConstantAndTrue('admin_registered'))) {
+ // Not installed or no admin registered or in installation phase
+ return "done";
+ } // END - if
+
+ // Init variables
+ $locked = "Y";
+ $hidden = "N";
+ $admin = "N";
+ $mem = "N";
+ $found = false;
// Check if cache is latest version
- $locked = "Y"; $hidden = "N"; $admin = "N"; $mem = "N"; $found = false;
if (GET_EXT_VERSION("cache") >= "0.1.2") {
// Is the module cached?
- if (isset($cacheArray['modules']['locked'][$mod_chk])) {
+ if (isset($GLOBALS['cache_array']['modules']['locked'][$mod_chk])) {
// Check cache
- $locked = $cacheArray['modules']['locked'][$mod_chk];
- $hidden = $cacheArray['modules']['hidden'][$mod_chk];
- $admin = $cacheArray['modules']['admin_only'][$mod_chk];
- $mem = $cacheArray['modules']['mem_only'][$mod_chk];
+ $locked = $GLOBALS['cache_array']['modules']['locked'][$mod_chk];
+ $hidden = $GLOBALS['cache_array']['modules']['hidden'][$mod_chk];
+ $admin = $GLOBALS['cache_array']['modules']['admin_only'][$mod_chk];
+ $mem = $GLOBALS['cache_array']['modules']['mem_only'][$mod_chk];
// Update cache hits
incrementConfigEntry('cache_hits');
@@ -123,7 +131,8 @@ function CHECK_MODULE ($mod) {
}
} 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);
@@ -133,7 +142,7 @@ function CHECK_MODULE ($mod) {
}
// Is the module found?
- if ($found) {
+ if ($found === true) {
// Check returned values against current access permissions
//
// Admin access ----- Guest access ----- --- Guest or member? ---
@@ -149,23 +158,31 @@ function CHECK_MODULE ($mod) {
} elseif (($admin == "Y") && (!IS_ADMIN())) {
// Only the Admin is allowed to enter this module!
$ret = "admin_only";
+ } else {
+ // @TODO Nothing helped???
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("ret=%s,locked=%s,admin=%s,mem=%s",
+ $ret,
+ $locked,
+ $admin,
+ $mem
+ ));
}
} // END - if
// Still no luck or not found?
if (($ret == "cache_miss") || (!$found)) {
- // ----- Legacy module ----- ---- Module in base folder ---- --- Module with extension's name ---
- if ((FILE_READABLE(sprintf("%sinc/modules/%s.php", PATH, $mod))) || (FILE_READABLE(sprintf("%s%s.php", PATH, $mod))) || (FILE_READABLE(sprintf("%s%s/%s.php", PATH, $extension, $mod)))) {
+ // ----- Legacy module ----- ---- Module in base folder ---- --- Module with extension's name ---
+ if ((FILE_READABLE(sprintf("%sinc/modules/%s.php", constant('PATH'), $mod))) || (FILE_READABLE(sprintf("%s%s.php", constant('PATH'), $mod))) || (FILE_READABLE(sprintf("%s%s/%s.php", constant('PATH'), $extension, $mod)))) {
// Data is missing so we add it
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!
- 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__);
}
@@ -202,21 +219,21 @@ function CHECK_MODULE ($mod) {
}
// Add menu description pending on given file name (without path!)
-function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
- global $NAV_DEPTH;
- // Use only filename of the file ;)
- $file = basename($file);
+function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
+ // Use only filename of the FQFN...
+ $file = basename($FQFN);
// Init variables
- $LINK_ADD = ""; $OUT = ""; $AND = "";
+ $LINK_ADD = "";
+ $OUT = "";
+ $AND = "";
// First we have to do some analysis...
if (substr($file, 0, 7) == "action-") {
// This is an action file!
$type = "action";
$search = substr($file, 7);
- switch ($ACC_LVL)
- {
+ switch ($ACC_LVL) {
case "admin":
$modCheck = "admin";
break;
@@ -227,14 +244,13 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
$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";
$search = substr($file, 5);
$AND = "";
- switch ($ACC_LVL)
- {
+ switch ($ACC_LVL) {
case "admin":
$modCheck = "admin";
break;
@@ -243,30 +259,32 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
case "member":
$modCheck = $GLOBALS['module'];
if (!IS_ADMIN()) {
- $AND = " AND visible='Y' AND locked='N'";
+ $AND = " AND `visible`='Y' AND `locked`='N'";
}
break;
}
$dummy = substr($search, 0, -4);
- $AND .= " AND action='".GET_ACTION($ACC_LVL, $dummy)."'";
+ $AND .= " AND `action`='".GET_ACTION($ACC_LVL, $dummy)."'";
} elseif (($ACC_LVL == "sponsor") || ($ACC_LVL == "engine")) {
// Sponsor / engine menu
- $type = "what";
- $search = $file;
+ $type = "what";
+ $search = $file;
$modCheck = $GLOBALS['module'];
- $AND = "";
+ $AND = "";
} else {
// Other
- $type = "menu";
- $search = $file;
+ $type = "menu";
+ $search = $file;
$modCheck = $GLOBALS['module'];
- $AND = "";
+ $AND = "";
}
- if ((!isset($NAV_DEPTH)) && (!$return)) {
- $NAV_DEPTH = 0;
- $prefix = "
".YOU_ARE_HERE."
Home ";
+
+ // Begin the navigation line
+ if ((!isset($GLOBALS['nav_depth'])) && (!$return)) {
+ $GLOBALS['nav_depth'] = 0;
+ $prefix = "
{--YOU_ARE_HERE--}
Home ";
} else {
- if (!$return) $NAV_DEPTH++;
+ if (!$return) $GLOBALS['nav_depth']++;
$prefix = "";
}
@@ -279,7 +297,7 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
} // 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?
@@ -293,7 +311,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
- $OUT = $prefix."
".$ret." \n";
+ $OUT = $prefix."
".$ret." \n";
// Can we close the you-are-here navigation?
//* DEBUG: */ echo __LINE__."*".$type."/".$GLOBALS['what']."*
\n";
@@ -301,7 +319,7 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
//* DEBUG: */ echo __LINE__."+".$type."+
\n";
// Add closing div and br-tag
$OUT .= "
\n";
- $NAV_DEPTH = "0";
+ $GLOBALS['nav_depth'] = "0";
// Run the filter chain
$ret = RUN_FILTER('post_youhere_line', array('access_level' => $ACC_LVL, 'type' => $type, 'content' => ""));
@@ -322,6 +340,7 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
return $OUT;
}
}
+
//
function ADD_MENU ($MODE, $act, $wht) {
// Init some variables
@@ -330,19 +349,22 @@ function ADD_MENU ($MODE, $act, $wht) {
$main_action = "";
$sub_what = "";
- if (!VALIDATE_MENU_ACTION($MODE, $act, $wht, true)) return CODE_MENU_NOT_VALID;
+ // is the menu action valid?
+ if (!VALIDATE_MENU_ACTION($MODE, $act, $wht, true)) {
+ return getMessage('CODE_MENU_NOT_VALID');
+ } // END - if
// 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...
- $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']."*
\n";
if (SQL_NUMROWS($result_main) > 0) {
- OUTPUT_HTML("");
}
}
+
// This patched function will reduce many SELECT queries for the specified or current admin login
function IS_ADMIN ($admin="") {
- global $cacheArray;
-
// Init variables
$ret = false; $passCookie = ""; $valPass = "";
//* DEBUG: */ echo __LINE__."ADMIN:".$admin."
";
@@ -454,21 +475,21 @@ function IS_ADMIN ($admin="") {
//* DEBUG: */ echo __LINE__."ADMIN:".$admin."/".$passCookie."
";
// Search in array for entry
- if (isset($cacheArray['admin_hash'])) {
+ if (isset($GLOBALS['cache_array']['admin_hash'])) {
// Use cached string
- $valPass = $cacheArray['admin_hash'];
- } elseif ((!empty($passCookie)) && (isset($cacheArray['admins']['password'][$admin])) && (!empty($admin))) {
- // Count cache hits
- incrementConfigEntry('cache_hits');
-
+ $valPass = $GLOBALS['cache_array']['admin_hash'];
+ } elseif ((!empty($passCookie)) && (isset($GLOBALS['cache_array']['admins']['password'][$admin])) && (!empty($admin))) {
// Login data is valid or not?
- $valPass = generatePassString($cacheArray['admins']['password'][$admin]);
+ $valPass = generatePassString($GLOBALS['cache_array']['admins']['password'][$admin]);
// Cache it away
- $cacheArray['admin_hash'] = $valPass;
- } elseif ((!empty($admin)) && ((!EXT_IS_ACTIVE("cache"))) || (!isset($cacheArray['admins']['password'][$admin]))) {
+ $GLOBALS['cache_array']['admin_hash'] = $valPass;
+
+ // Count cache hits
+ incrementConfigEntry('cache_hits');
+ } elseif ((!empty($admin)) && ((!EXT_IS_ACTIVE("cache"))) || (!isset($GLOBALS['cache_array']['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?
@@ -478,7 +499,7 @@ function IS_ADMIN ($admin="") {
list($passDB) = SQL_FETCHROW($result);
// Temporary cache it
- $cacheArray['admins']['password'][$admin] = $passDB;
+ $GLOBALS['cache_array']['admins']['password'][$admin] = $passDB;
// Generate password hash
$valPass = generatePassString($passDB);
@@ -498,126 +519,103 @@ function IS_ADMIN ($admin="") {
//* DEBUG: */ if (!$ret) echo __LINE__."OK!
";
return $ret;
}
-//
-function ADD_MAX_RECEIVE_LIST($MODE, $default="", $return=false)
-{
- global $_POST;
+
+// Generates a list of "max receiveable emails per day"
+function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) {
$OUT = "";
- switch ($MODE)
- {
+ switch ($MODE) {
case "guest":
// Guests (in the registration form) are not allowed to select 0 mails per day.
- $result = SQL_QUERY("SELECT value, comment FROM "._MYSQL_PREFIX."_max_receive WHERE value > 0 ORDER BY value", __FILE__, __LINE__);
- if (SQL_NUMROWS($result) > 0)
- {
+ $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 = "";
- while (list($value, $comment) = SQL_FETCHROW($result))
- {
- $OUT .= "
0)
- {
+ $result = SQL_QUERY("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` ORDER BY value", __FILE__, __LINE__);
+ if (SQL_NUMROWS($result) > 0) {
$OUT = "";
- while (list($value, $comment) = SQL_FETCHROW($result))
- {
- $OUT .= " ".get_session('u_hash')."
";
@@ -636,17 +637,11 @@ function IS_MEMBER()
// Maybe got locked etc.
//* DEBUG: */ echo __LINE__."!!!
";
destroy_user_session();
-
- // Reset userid
- $GLOBALS['userid'] = 0;
}
} else {
// Cookie data is invalid!
//* DEBUG: */ echo __LINE__."***
";
destroy_user_session();
-
- // Reset userid
- $GLOBALS['userid'] = 0;
}
// Free memory
@@ -655,60 +650,70 @@ function IS_MEMBER()
// Cookie data is invalid!
//* DEBUG: */ echo __LINE__."///
";
destroy_user_session();
-
- // Reset userid
- $GLOBALS['userid'] = 0;
}
// Cache status
- $cacheArray['is_member'] = $ret;
+ $GLOBALS['cache_array']['is_member'] = $ret;
// Return status
return $ret;
}
-//
-function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false)
-{
+
+// Validate the given menu action
+function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false) {
+ // Is the cache entry there and we shall not update?
+ if ((isset($GLOBALS['cache_array']['action_valid'][$MODE][$act][$wht])) && ($UPDATE === false)) {
+ // Count cache hit
+ incrementConfigEntry('cache_hits');
+
+ // Then use this cache
+ return $GLOBALS['cache_array']['action_valid'][$MODE][$act][$wht];
+ } // END - if
+
+ // By default nothing is valid
$ret = false;
+
+ // Look in all menus or only unlocked
$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."*
\n";
- if (($MODE != "admin") && ($UPDATE)) {
+ if (($MODE != "admin") && ($UPDATE === true)) {
// 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") {
+ } elseif (($wht != "overview") && (!empty($wht))) {
// Other actions
- $SQL = SQL_QUERY_ESC("SELECT id, what FROM "._MYSQL_PREFIX."_%s_menu WHERE action='%s'".$ADD." ORDER BY action DESC LIMIT 1",
- array($MODE, $act), __FILE__, __LINE__, false);
+ $SQL = SQL_QUERY_ESC("SELECT id, what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what`='%s'".$ADD." ORDER BY action DESC LIMIT 1",
+ array($MODE, $act, $wht), __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);
}
// Run SQL command
$result = SQL_QUERY($SQL, __FILE__, __LINE__);
- if ($UPDATE) {
- if (SQL_AFFECTEDROWS() == 1) $ret = true;
- //* DEBUG: */ debug_print_backtrace();
+ if ($UPDATE === true) {
+ // Check updated/affected rows
+ $ret = (SQL_AFFECTEDROWS() == 1);
} else {
- if (SQL_NUMROWS($result) == 1) {
- //* DEBUG: */ echo __LINE__."+".$SQL."+
\n";
- //* DEBUG: */ echo __LINE__."*".$id."/".$wht."/".$wht2."*
\n";
- $ret = true;
- }
+ // Check found rows
+ $ret = (SQL_NUMROWS($result) == 1);
}
// Free memory
SQL_FREERESULT($result);
+ // Set cache entry
+ $GLOBALS['cache_array']['action_valid'][$MODE][$act][$wht] = $ret;
+
// Return result
return $ret;
}
+
//
-function GET_MOD_DESCR($MODE, $wht, $column="what")
-{
+function GET_MOD_DESCR($MODE, $wht, $column="what") {
// Fix empty "what"
if (empty($wht)) {
$wht = "welcome";
@@ -719,7 +724,7 @@ function GET_MOD_DESCR($MODE, $wht, $column="what")
$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?
@@ -737,7 +742,7 @@ function SEND_MODE_MAILS($mod, $modes) {
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
@@ -748,9 +753,9 @@ function SEND_MODE_MAILS($mod, $modes) {
// Now let's compare passwords
$hash = generatePassString($hashDB);
- if (($hash == get_session('u_hash')) || ($_POST['pass1'] == $_POST['pass2'])) {
+ if (($hash == get_session('u_hash')) || (REQUEST_POST('pass1') == REQUEST_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
@@ -775,7 +780,7 @@ function SEND_MODE_MAILS($mod, $modes) {
case "normal": break; // Do not add any special lines
case "email": // Email was changed!
- $content = MEMBER_CHANGED_EMAIL.": ".$_POST['old_addy']."\n";
+ $content = MEMBER_CHANGED_EMAIL.": ".REQUEST_POST('old_addy')."\n";
break;
case "pass": // Password was changed
@@ -791,7 +796,7 @@ function SEND_MODE_MAILS($mod, $modes) {
if (EXT_IS_ACTIVE("country")) {
// Replace code with description
- $DATA[4] = COUNTRY_GENERATE_INFO($_POST['country_code']);
+ $DATA[4] = COUNTRY_GENERATE_INFO(REQUEST_POST('country_code'));
} // END - if
// Load template
@@ -811,25 +816,25 @@ function SEND_MODE_MAILS($mod, $modes) {
$sub_mem = MEMBER_CHANGED_DATA;
// Output success message
- $content = "
".MYDATA_MAIL_SENT." ";
+ $content = "
".MYDATA_MAIL_SENT." ";
break;
default:
DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
- $content = "
".UNKNOWN_MODULE." ";
+ $content = "
".UNKNOWN_MODULE." ";
break;
} // END - switch
} else {
// Could not load profile data
- $content = "
".MEMBER_CANNOT_LOAD_PROFILE." ";
+ $content = "
{--MEMBER_CANNOT_LOAD_PROFILE--} ";
}
} else {
// Passwords mismatch
- $content = "
".MEMBER_PASSWORD_ERROR." ";
+ $content = "
{--MEMBER_PASSWORD_ERROR--} ";
}
} else {
// Could not load profile
- $content = "
".MEMBER_CANNOT_LOAD_PROFILE." ";
+ $content = "
{--MEMBER_CANNOT_LOAD_PROFILE--} ";
}
// Send email to user if required
@@ -845,10 +850,10 @@ function SEND_MODE_MAILS($mod, $modes) {
SEND_ADMIN_NOTIFICATION($sub_adm, $msg_admin, $content, $GLOBALS['userid']);
} elseif (getConfig('admin_notify') == "Y") {
// Cannot send mails to admin!
- $content = CANNOT_SEND_ADMIN_MAILS;
+ $content = getMessage('CANNOT_SEND_ADMIN_MAILS');
} else {
// No mail to admin
- $content = "
".MYDATA_MAIL_SENT." ";
+ $content = "
{--MYDATA_MAIL_SENT--} ";
}
} // END - if
@@ -859,15 +864,13 @@ 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!
- 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
}
// Get action value from mode (admin/guest/member) and what-value
function GET_ACTION ($MODE, &$wht) {
- global $ret;
-
- // @DEPRECATED Init status
+ // Init status
$ret = "";
//* DEBUG: */ echo __LINE__."=".$MODE."/".$wht."/".$GLOBALS['action']."=
";
@@ -903,7 +906,7 @@ function GET_ACTION ($MODE, &$wht) {
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... ;-)
@@ -912,7 +915,7 @@ function GET_ACTION ($MODE, &$wht) {
// Free memory
SQL_FREERESULT($result);
- } elseif (GET_EXT_VERSION("sql_patches") == "") {
+ } elseif ((GET_EXT_VERSION("sql_patches") == "") && ($MODE != "admin")) {
// No sql_patches installed!
LOAD_URL("admin.php");
}
@@ -924,15 +927,15 @@ function GET_ACTION ($MODE, &$wht) {
// Get category name back
function GET_CATEGORY ($cid) {
// Default is not found
- $ret = _CATEGORY_404;
+ $ret = getMessage('_CATEGORY_404');
// Is the category id set?
if ($cid == "0") {
// No category
- $ret = _CATEGORY_NONE;
+ $ret = getMessage('_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... :-)
@@ -950,10 +953,10 @@ function GET_CATEGORY ($cid) {
// Get a string of "mail title" and price back
function GET_PAYMENT ($pid, $full=false) {
// Default is not found
- $ret = _PAYMENT_404;
+ $ret = getMessage('_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... :-)
@@ -963,7 +966,7 @@ function GET_PAYMENT ($pid, $full=false) {
} else {
// Return title and price
list($t, $p) = SQL_FETCHROW($result);
- $ret = $t." / ".TRANSLATE_COMMA($p)." ".POINTS;
+ $ret = $t." / ".TRANSLATE_COMMA($p)." {!POINTS!}";
}
}
@@ -975,13 +978,11 @@ function GET_PAYMENT ($pid, $full=false) {
}
// Get (basicly) the price of given payment id
-function GET_PAY_POINTS($pid, $lookFor="price")
-{
+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)
- {
+ if (SQL_NUMROWS($result) == 1) {
// Payment type found... :-)
list($ret) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
@@ -990,8 +991,7 @@ function GET_PAY_POINTS($pid, $lookFor="price")
}
// Remove a receiver's ID from $ARRAY and add a link for him to confirm
-function REMOVE_RECEIVER (&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=false)
-{
+function REMOVE_RECEIVER (&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=false) {
$ret = "failed";
if ($uid > 0)
{
@@ -1004,12 +1004,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"; }
- $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!
- 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";
}
@@ -1034,12 +1034,12 @@ function GET_TOTAL_DATA ($search, $tableName, $lookFor, $whereStatement="userid"
if (($onlyRows) || ($lookFor == "userid")) {
// Count rows
//* DEBUG: */ echo "COUNT!
\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!
\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__);
}
@@ -1063,25 +1063,23 @@ function GET_TOTAL_DATA ($search, $tableName, $lookFor, $whereStatement="userid"
}
// "Getter fro ref level percents
function GET_REF_LEVEL_PERCENTS ($level) {
- global $cacheInstance, $cacheArray;
-
// Default is zero
$per = 0;
// Do we have cache?
- if ((isset($cacheArray['ref_depths']['level'])) && (EXT_IS_ACTIVE("cache"))) {
+ if ((isset($GLOBALS['cache_array']['ref_depths']['level'])) && (EXT_IS_ACTIVE("cache"))) {
// First look for level
- $key = array_search($level, $cacheArray['ref_depths']['level']);
+ $key = array_search($level, $GLOBALS['cache_array']['ref_depths']['level']);
if ($key !== false) {
// Entry found!
- $per = $cacheArray['ref_depths']['percents'][$key];
+ $per = $GLOBALS['cache_array']['ref_depths']['percents'][$key];
// Count cache hit
incrementConfigEntry('cache_hits');
}
} 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?
@@ -1112,7 +1110,7 @@ function GET_REF_LEVEL_PERCENTS ($level) {
*/
function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid="0", $locked=false, $add_mode="ref") {
//* DEBUG: */ print "-----------------------
".__FUNCTION__." - ENTRY ------------------------
\n";
- global $DATA, $cacheArray;
+ global $DATA;
// Convert mode to lower-case
$add_mode = strtolower($add_mode);
@@ -1148,14 +1146,14 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
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__."(".__LINE__." ):uid={$uid},numRows=".SQL_NUMROWS($result_user).",points={$points} \n";
if (SQL_NUMROWS($result_user) == 1) {
// This is the user and his ref
list($ref, $email) = SQL_FETCHROW($result_user);
- $cacheArray['add_uid'][$ref] = $uid;
+ $GLOBALS['cache_array']['add_uid'][$ref] = $uid;
// Get percents
$per = GET_REF_LEVEL_PERCENTS($GLOBALS['ref_level']);
@@ -1168,21 +1166,21 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
$ref_points = $points * $per / 100;
// Pay refback here if level > 0 and in ref-mode
- if ((EXT_IS_ACTIVE("refback")) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($add_mode == "ref") && (isset($cacheArray['add_uid'][$uid]))) {
- //* DEBUG: */ print __FUNCTION__."(".__LINE__." ):uid={$uid},data={$cacheArray['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - BEFORE! \n";
- $ref_points = ADD_REFBACK_POINTS($cacheArray['add_uid'][$uid], $uid, $points, $ref_points);
- //* DEBUG: */ print __FUNCTION__."(".__LINE__." ):uid={$uid},data={$cacheArray['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - AFTER! \n";
+ if ((EXT_IS_ACTIVE("refback")) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($add_mode == "ref") && (isset($GLOBALS['cache_array']['add_uid'][$uid]))) {
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__." ):uid={$uid},data={$GLOBALS['cache_array']['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - BEFORE! \n";
+ $ref_points = ADD_REFBACK_POINTS($GLOBALS['cache_array']['add_uid'][$uid], $uid, $points, $ref_points);
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__." ):uid={$uid},data={$GLOBALS['cache_array']['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - AFTER! \n";
} // 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__."(".__LINE__." ):data={$data},ref_points={$ref_points},uid={$uid},depth={$GLOBALS['ref_level']},mode={$add_mode} - UPDATE! (".SQL_AFFECTEDROWS().") \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__."(".__LINE__." ):data={$data},ref_points={$ref_points},uid={$uid},depth={$GLOBALS['ref_level']},mode={$add_mode} - INSERTED! (".SQL_AFFECTEDROWS().") \n";
} // END - if
@@ -1222,7 +1220,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
// 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 (!REQUEST_ISSET_GET(('mid'))) LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_POINTS_ADDED'));
}
// Maybe there's another ref?
@@ -1240,27 +1238,25 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
}
//
function UPDATE_REF_COUNTER ($uid) {
- global $cacheArray, $cacheInstance;
-
// Make it sure referal level zero (member him-/herself) is at least selected
- if (empty($cacheArray['ref_level'][$uid])) $cacheArray['ref_level'][$uid] = 1;
- //* DEBUG: */ print __FUNCTION__."(".__LINE__." ):uid={$uid},level={$cacheArray['ref_level'][$uid]} \n";
+ if (empty($GLOBALS['cache_array']['ref_level'][$uid])) $GLOBALS['cache_array']['ref_level'][$uid] = 1;
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__." ):uid={$uid},level={$GLOBALS['cache_array']['ref_level'][$uid]} \n";
// Update counter
- 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__);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_refsystem` SET counter=counter+1 WHERE userid=%s AND level='%s' LIMIT 1",
+ array(bigintval($uid), $GLOBALS['cache_array']['ref_level'][$uid]), __FILE__, __LINE__);
// When no entry was updated then we have to create it here
//* DEBUG: */ print __FUNCTION__."(".__LINE__." ):updated=".SQL_AFFECTEDROWS()." \n";
if (SQL_AFFECTEDROWS() < 1) {
// First count!
- SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_refsystem (userid, level, counter) VALUES (%s,%s,1)",
- array(bigintval($uid), $cacheArray['ref_level'][$uid]), __FILE__, __LINE__);
+ SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_refsystem` (userid, level, counter) VALUES (%s,%s,1)",
+ array(bigintval($uid), $GLOBALS['cache_array']['ref_level'][$uid]), __FILE__, __LINE__);
//* DEBUG: */ print __FUNCTION__."(".__LINE__." ):uid={$uid} \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
@@ -1274,7 +1270,7 @@ function UPDATE_REF_COUNTER ($uid) {
if (($ref > 0) && ($ref != $uid)) {
// Move to next referal level and count his counter one up!
//* DEBUG: */ print __FUNCTION__."(".__LINE__." ):ref={$ref} - ADVANCE! \n";
- $cacheArray['ref_level'][$uid]++; UPDATE_REF_COUNTER($ref);
+ $GLOBALS['cache_array']['ref_level'][$uid]++; UPDATE_REF_COUNTER($ref);
} elseif ((($ref == $uid) || ($ref == 0)) && (GET_EXT_VERSION("cache") >= "0.1.2")) {
// Remove cache here
//* DEBUG: */ print __FUNCTION__."(".__LINE__." ):ref={$ref} - CACHE! \n";
@@ -1282,18 +1278,18 @@ function UPDATE_REF_COUNTER ($uid) {
}
// "Walk" back here
- $cacheArray['ref_level'][$uid]--;
+ $GLOBALS['cache_array']['ref_level'][$uid]--;
// Handle refback here if extension is installed
if (EXT_IS_ACTIVE("refback")) {
- UPDATE_REFBACK_TABLE($uid);
+ UPDATE_REFBACK_table($uid);
} // END - if
}
// 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);
@@ -1307,18 +1303,20 @@ function SEND_ADMIN_EMAILS ($subj, $msg) {
// Get ID number from administrator's login name
function GET_ADMIN_ID ($login) {
- global $cacheArray;
+ // By default no admin is found
$ret = "-1";
- if (isset($cacheArray['admins']['aid'][$login])) {
- // Check cache
- $ret = $cacheArray['admins']['aid'][$login];
+
+ // Check cache
+ if (isset($GLOBALS['cache_array']['admins']['aid'][$login])) {
+ // Use it if found to save SQL queries
+ $ret = $GLOBALS['cache_array']['admins']['aid'][$login];
// Update cache hits
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",
- array($login), __FILE__, __LINE__);
+ $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);
} // END - if
@@ -1342,26 +1340,26 @@ function GET_CURRENT_ADMIN_ID () {
}
// Get password hash from administrator's login name
-function GET_ADMIN_HASH ($aid)
-{
- global $cacheArray;
+function GET_ADMIN_HASH ($aid) {
+ // By default an invalid hash is returned
$ret = "-1";
- if (isset($cacheArray['admins']['password'][$aid])) {
+
+ if (isset($GLOBALS['cache_array']['admins']['password'][$aid])) {
// Check cache
- $ret = $cacheArray['admins']['password'][$aid];
+ $ret = $GLOBALS['cache_array']['admins']['password'][$aid];
// Update cache hits
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
list($ret) = SQL_FETCHROW($result);
// Set cache
- $cacheArray['admins']['password'][$aid] = $ret;
+ $GLOBALS['cache_array']['admins']['password'][$aid] = $ret;
}
// Free result
@@ -1371,24 +1369,25 @@ function GET_ADMIN_HASH ($aid)
}
//
function GET_ADMIN_LOGIN ($aid) {
- global $cacheArray;
+ // By default a non-existent login is returned (other functions react on this!)
$ret = "***";
- if (isset($cacheArray['admins']['login'][$aid])) {
+
+ if (isset($GLOBALS['cache_array']['admins']['login'][$aid])) {
// Get cache
- $ret = $cacheArray['admins']['login'][$aid];
+ $ret = $GLOBALS['cache_array']['admins']['login'][$aid];
// Update cache hits
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
list($ret) = SQL_FETCHROW($result);
// Set cache
- $cacheArray['admins']['login'][$aid] = $ret;
+ $GLOBALS['cache_array']['admins']['login'][$aid] = $ret;
} // END - if
// Free memory
@@ -1398,25 +1397,25 @@ function GET_ADMIN_LOGIN ($aid) {
}
// Get email address of admin id
function GET_ADMIN_EMAIL ($aid) {
- global $cacheArray;
-
+ // By default an invalid emails is returned
$ret = "***";
- if (isset($cacheArray['admins']['email'][$aid])) {
+
+ if (isset($GLOBALS['cache_array']['admins']['email'][$aid])) {
// Get cache
- $ret = $cacheArray['admins']['email'][$aid];
+ $ret = $GLOBALS['cache_array']['admins']['email'][$aid];
// Update cache hits
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
list($ret) = SQL_FETCHROW($result_aid);
// Set cache
- $cacheArray['admins']['email'][$aid] = $ret;
+ $GLOBALS['cache_array']['admins']['email'][$aid] = $ret;
} // END - if
// Free result
@@ -1428,25 +1427,25 @@ function GET_ADMIN_EMAIL ($aid) {
}
// Get default ACL of admin id
function GET_ADMIN_DEFAULT_ACL ($aid) {
- global $cacheArray;
-
+ // By default an invalid ACL value is returned
$ret = "***";
- if (isset($cacheArray['admins']['def_acl'][$aid])) {
+
+ if (isset($GLOBALS['cache_array']['admins']['def_acl'][$aid])) {
// Use cache
- $ret = $cacheArray['admins']['def_acl'][$aid];
+ $ret = $GLOBALS['cache_array']['admins']['def_acl'][$aid];
// Update cache hits
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
list($ret) = SQL_FETCHROW($result_aid);
// Set cache
- $cacheArray['admins']['def_acl'][$aid] = $ret;
+ $GLOBALS['cache_array']['admins']['def_acl'][$aid] = $ret;
}
// Free result
@@ -1457,16 +1456,16 @@ function GET_ADMIN_DEFAULT_ACL ($aid) {
return $ret;
}
//
-function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="") {
+function ADD_OPTION_LINES ($table, $id, $name, $default="", $special="", $where="") {
$ret = "";
if ($table == "/ARRAY/") {
// Selection from array
if (is_array($id) && is_array($name) && sizeof($id) == sizeof($name)) {
// Both are arrays
foreach ($id as $idx => $value) {
- $ret .= "\n";
+ $ret .= " \n";
} // END - foreach
} // END - if
} else {
@@ -1475,23 +1474,23 @@ function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="")
if (!empty($special)) $SPEC = ", ".$special;
$ORDER = $name.$SPEC;
if ($table == "country") $ORDER = $special;
- $result = SQL_QUERY_ESC("SELECT %s, %s".$SPEC." FROM "._MYSQL_PREFIX."_%s ".$where." ORDER BY %s",
- array($id, $ORDER, $table, $name), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT %s, %s".$SPEC." FROM `{!_MYSQL_PREFIX!}_%s` ".$where." ORDER BY %s",
+ array($id, $ORDER, $table, $name), __FILE__, __LINE__);
if (SQL_NUMROWS($result) > 0) {
// Found data so add them as OPTION lines: $id is the value and $name is the "name" of the option
while (list($value, $title, $add) = SQL_FETCHROW($result)) {
if (empty($special)) $add = "";
- $ret .= " \n";
+ $ret .= ">".$title.$add." \n";
} // END - while
// Free memory
SQL_FREERESULT($result);
} else {
// No data found
- $ret = "".SELECT_NONE." \n";
+ $ret = "".SELECT_NONE." \n";
}
}
@@ -1506,9 +1505,9 @@ function activateExchange() {
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
@@ -1523,8 +1522,8 @@ function DELETE_USER_ACCOUNT($uid, $reason)
{
$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) {
@@ -1533,7 +1532,7 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
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") {
@@ -1546,21 +1545,21 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
}
// Delete category selections as well...
- SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_cats WHERE userid=%s",
- array(bigintval($uid)), __FILE__, __LINE__);
+ 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")) {
- SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_users WHERE userid=%s",
- array(bigintval($uid)), __FILE__, __LINE__);
+ 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);
- SEND_EMAIL($uid, ADMIN_DEL_ACCOUNT, $msg);
+ SEND_EMAIL($uid, getMessage('ADMIN_DEL_ACCOUNT'), $msg);
// 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__);
}
//
@@ -1568,7 +1567,7 @@ function META_DESCRIPTION ($mod, $wht) {
// Exclude admin and member's area
if (($mod != "admin") && ($mod != "login")) {
// Construct dynamic description
- $DESCR = MAIN_TITLE." ".trim(getConfig('title_middle'))." ".ADD_DESCR("guest", "what-".$wht, true);
+ $DESCR = "{!MAIN_TITLE!} ".trim(getConfig('title_middle'))." ".ADD_DESCR("guest", "what-".$wht, true);
// Output it directly
OUTPUT_HTML(" ");
@@ -1579,16 +1578,16 @@ function META_DESCRIPTION ($mod, $wht) {
}
//
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
- 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
- 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__);
}
}
@@ -1598,16 +1597,16 @@ function SUB_JACKPOT($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
- 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
- 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
@@ -1617,19 +1616,18 @@ function SUB_JACKPOT($points) {
SQL_FREERESULT($result);
}
//
-function IS_DEMO() {
+function IS_DEMO () {
return ((EXT_IS_ACTIVE("demo")) && (get_session('admin_login') == "demo"));
}
//
function LOAD_CONFIG ($no="0") {
- global $cacheArray;
$CFG_DUMMY = array();
// Check for cache extension, cache-array and if the requested configuration is in cache
- if ((is_array($cacheArray)) && (isset($cacheArray['config'][$no])) && (is_array($cacheArray['config'][$no]))) {
+ if ((is_array($GLOBALS['cache_array'])) && (isset($GLOBALS['cache_array']['config'][$no])) && (is_array($GLOBALS['cache_array']['config'][$no]))) {
// Load config from cache
- //* DEBUG: */ echo gettype($cacheArray['config'][$no])." \n";
- foreach ($cacheArray['config'][$no] as $key => $value) {
+ //* DEBUG: */ echo gettype($GLOBALS['cache_array']['config'][$no])." \n";
+ foreach ($GLOBALS['cache_array']['config'][$no] as $key => $value) {
$CFG_DUMMY[$key] = $value;
} // END - foreach
@@ -1637,9 +1635,9 @@ function LOAD_CONFIG ($no="0") {
if ((isset($CFG_DUMMY['cache_hits'])) && (EXT_IS_ACTIVE("cache"))) {
$CFG_DUMMY['cache_hits']++;
} // END - if
- } elseif ((!EXT_IS_ACTIVE("cache")) || (!isset($cacheArray['config'][$no]))) {
+ } elseif ((!EXT_IS_ACTIVE("cache")) || (!isset($GLOBALS['cache_array']['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
@@ -1649,7 +1647,7 @@ function LOAD_CONFIG ($no="0") {
SQL_FREERESULT($result_config);
// Remember this config in the array
- $cacheArray['config'][$no] = $CFG_DUMMY;
+ $GLOBALS['cache_array']['config'][$no] = $CFG_DUMMY;
}
// Return config array
@@ -1683,7 +1681,7 @@ function GET_WHAT($modCheck) {
// 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
@@ -1701,10 +1699,8 @@ function SUB_POINTS ($subject, $uid, $points) {
// Update config entries
function UPDATE_CONFIG ($entries, $values, $updateMode="") {
- global $CSS;
-
// Do not update config in CSS mode
- if (($CSS == "1") || ($CSS == -1)) {
+ if (($GLOBALS['output_mode'] == "1") || ($GLOBALS['output_mode'] == -1)) {
return;
} // END - if
@@ -1716,6 +1712,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
// Update mode set?
if (!empty($updateMode)) {
// Update entry
+ // @TODO Find a way for updating $_CONFIG here
$all .= sprintf("%s=%s%s%s,", $entry, $entry, $updateMode, (float)$values[$idx]);
} else {
// Check if string or number
@@ -1730,21 +1727,28 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
$all .= sprintf("%s='%s',", $entry, SQL_ESCAPE($values[$idx]));
}
}
+
+ // Set it in $_CONFIG as well
+ setConfigEntry($entry, $values[$idx]);
} // END - foreach
// Remove last comma
$entries = substr($all, 0, -1);
} elseif (!empty($updateMode)) {
// Update mode set
+ // @TODO Find a way for updating $_CONFIG here
$entries .= sprintf("=%s%s%s", $entries, $updateMode, (float)$values);
} else {
+ // Set it in $_CONFIG first
+ setConfigEntry($entries, $values);
+
// Regular entry to update
$entries .= sprintf("='%s'", SQL_ESCAPE($values));
}
// 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();
@@ -1774,8 +1778,8 @@ function PREPARE_SQL_HTML_HOLIDAY ($mode) {
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
@@ -1791,7 +1795,7 @@ WHERE status='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML_HOLIDAY($mode),
// Returns HTML code with an " 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...
@@ -1802,7 +1806,7 @@ function ADD_CATEGORY_OPTIONS ($mode) {
);
// 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)) {
@@ -1811,14 +1815,14 @@ function ADD_CATEGORY_OPTIONS ($mode) {
$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)) {
- $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",
+ $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);
@@ -1840,11 +1844,11 @@ WHERE userid=%s AND status='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML_H
$OUT = "";
foreach ($CATS['id'] as $key => $value) {
if (strlen($CATS['name'][$key]) > 20) $CATS['name'][$key] = substr($CATS['name'][$key], 0, 17)."...";
- $OUT .= " ".$CATS['name'][$key]." (".$CATS['uids'][$key]." ".USER_IN_CAT.") \n";
+ $OUT .= " ".$CATS['name'][$key]." (".$CATS['uids'][$key]." ".USER_IN_CAT.") \n";
}
} else {
// No cateogries are defined yet
- $OUT = "".MEMBER_NO_CATS." \n";
+ $OUT = "{!MEMBER_NO_CATS!} \n";
}
// Return HTML code
@@ -1880,37 +1884,37 @@ function ADD_BONUS_MAIL_TO_QUEUE ($subject, $text, $receiverList, $points, $seco
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,
- $receiverList,
- $points,
- $seconds,
- $url,
- $cat,
- $target,
- bigintval($receiver),
- $HTML
-), __FILE__, __LINE__);
+ array(
+ $subject,
+ $text,
+ $receiverList,
+ $points,
+ $seconds,
+ $url,
+ $cat,
+ $target,
+ bigintval($receiver),
+ $HTML
+ ), __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,
- $receiverList,
- $points,
- $seconds,
- $url,
- $cat,
- $target,
- bigintval($receiver),
-), __FILE__, __LINE__);
+ array(
+ $subject,
+ $text,
+ $receiverList,
+ $points,
+ $seconds,
+ $url,
+ $cat,
+ $target,
+ bigintval($receiver),
+ ), __FILE__, __LINE__);
}
}
@@ -1934,7 +1938,7 @@ function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") {
// Category given?
if ($cat > 0) {
// Select category
- $CAT_TABS = "LEFT JOIN "._MYSQL_PREFIX."_user_cats AS c ON d.userid=c.userid";
+ $CAT_TABS = "LEFT JOIN `{!_MYSQL_PREFIX!}_user_cats` AS c ON d.userid=c.userid";
$CAT_WHERE = " AND c.cat_id=%s";
} // END - if
@@ -1946,11 +1950,11 @@ function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") {
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
- $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__);
}
@@ -1991,7 +1995,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`
-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__);
@@ -2020,7 +2024,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!
- 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!
@@ -2042,10 +2046,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."
-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
-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",
@@ -2100,7 +2104,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
- $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?
@@ -2112,7 +2116,7 @@ function REDUCT_RECIPIENT_RECEIVED_MAILS ($column, $id, $count) {
} // 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