X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=491bf296ffee12acb3e81cacc81c5a8297464957;hb=df407c3a035aa8fb211d7191d7a0bb0c64197cc3;hp=a8532d69974104018b6e6dc2a1f02ed7d169f53e;hpb=81bfbcd72e424060ea1223b49ad92fcfa150f361;p=mailer.git
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index a8532d6997..491bf296ff 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -60,7 +60,7 @@ function getModuleTitle ($mod) {
} 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), __FUNCTION__, __LINE__);
+ array($mod), __FUNCTION__, __LINE__);
list($name) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
}
@@ -85,18 +85,18 @@ function getModuleTitle ($mod) {
// "Getter" for module description
function getModuleDescription ($mode, $wht, $column = 'what') {
- // Fix empty "what"
+ // Fix empty 'what'
if (empty($wht)) {
- $wht = "welcome";
+ $wht = 'welcome';
if (getConfig('index_home') != '') $wht = getConfig('index_home');
} // END - if
// Default is not found
- $ret = "??? (".$wht.')';
+ $ret = '??? (' . $wht . ')';
// Look for title
$result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE %s='%s' LIMIT 1",
- array($mode, $column, $wht), __FUNCTION__, __LINE__);
+ array($mode, $column, $wht), __FUNCTION__, __LINE__);
// Is there an entry?
if (SQL_NUMROWS($result) == 1) {
@@ -112,7 +112,7 @@ function getModuleDescription ($mode, $wht, $column = 'what') {
// Check validity of a given module name (no file extension)
function checkModulePermissions ($mod) {
// Filter module name (names with low chars and underlines are fine!)
- $mod = preg_replace("/[^a-z_]/", '', $mod);
+ $mod = preg_replace('/[^a-z_]/', '', $mod);
// Check for prefix is a extension...
$modSplit = explode("_", $mod);
@@ -128,7 +128,7 @@ function checkModulePermissions ($mod) {
} // END - if
// Major error in module registry is the default
- $ret = "major";
+ $ret = 'major';
// Check if script is installed if not return a 'done' to prevent some errors
if ((!isInstalled()) || (isInstalling()) || (!isAdminRegistered())) {
@@ -146,14 +146,16 @@ function checkModulePermissions ($mod) {
// Check if cache is latest version
if (GET_EXT_VERSION('cache') >= '0.1.2') {
// Is the cache there?
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'Using cache.');
if (!isset($GLOBALS['cache_array']['modules'])) {
- // This should normally not happen...
- debug_report_bug("Cache 'modules' is gone.");
+ // This happens when a new extension is registered while ext-cache is installed
+ $ret = 'cache_miss';
} // END - if
// Is the module cached?
if (isset($GLOBALS['cache_array']['modules']['locked'][$mod_chk])) {
// Check cache
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'Cache found.');
$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];
@@ -164,19 +166,27 @@ function checkModulePermissions ($mod) {
$found = true;
} else {
// No, then we have to update it!
- $ret = "cache_miss";
+ $ret = 'cache_miss';
}
} 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",
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'Using 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), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Read data
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'Entry found.');
list($locked, $hidden, $admin, $mem) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
$found = true;
+ } elseif (isDebugModeEnabled()) {
+ // Debug message only in debug-mode...
+ DEBUG_LOG(__FUNCTION__, __LINE__, 'Module ' . $mod_chk . ' not found!');
}
+
+ // Free result
+ SQL_FREERESULT($result);
}
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'ret=' . $ret);
// Is the module found?
if ($found === true) {
@@ -184,17 +194,20 @@ function checkModulePermissions ($mod) {
//
// Admin access ----- Guest access ----- --- Guest or member? ---
if ((IS_ADMIN()) || (($locked == 'N') && ($admin == 'N') && (($mem == 'N') || (IS_MEMBER())))) {
+ // Count module
+ countModuleHit($mod_chk);
+
// If you are admin you are welcome for everything!
$ret = 'done';
} elseif ($locked == 'Y') {
// Module is locked
- $ret = "locked";
+ $ret = 'locked';
} elseif (($mem == 'Y') && (!IS_MEMBER())) {
// You have to login first!
- $ret = "mem_only";
+ $ret = 'mem_only';
} elseif (($admin == 'Y') && (!IS_ADMIN())) {
// Only the Admin is allowed to enter this module!
- $ret = "admin_only";
+ $ret = 'admin_only';
} else {
// @TODO Nothing helped???
DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("ret=%s,locked=%s,admin=%s,mem=%s",
@@ -207,7 +220,7 @@ function checkModulePermissions ($mod) {
} // END - if
// Still no luck or not found?
- if (($ret == "cache_miss") || (!$found)) {
+ if (($found === false) && (!EXT_IS_ACTIVE('cache')) && ($ret != 'done')) {
// ----- Legacy module ----- ---- Module in base folder ---- --- Module with extension's name ---
if ((isFileReadable(sprintf("%sinc/modules/%s.php", constant('PATH'), $mod))) || (isFileReadable(sprintf("%s%s.php", constant('PATH'), $mod))) || (isFileReadable(sprintf("%s%s/%s.php", constant('PATH'), $extension, $mod)))) {
// Data is missing so we add it
@@ -215,23 +228,24 @@ function checkModulePermissions ($mod) {
// 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`
-(module, locked, hidden, mem_only, admin_only, has_menu) VALUES
+(`module`, `locked`, `hidden`, `mem_only`, `admin_only`, `has_menu`) VALUES
('%s','Y','N','N','N','N')", array($mod_chk), __FUNCTION__, __LINE__);
} else {
// Wrong/missing sql_patches!
SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_mod_reg`
-(module, locked, hidden, mem_only, admin_only) VALUES
+(`module`, `locked`, `hidden`, `mem_only`, `admin_only`) VALUES
('%s','Y','N','N','N')", array($mod_chk), __FUNCTION__, __LINE__);
}
// Everthing is fine?
if (SQL_AFFECTEDROWS() < 1) {
// Something bad happend!
- return "major";
+ return 'major';
} // END - if
// Destroy cache here
- rebuildCacheFiles("modreg", "modreg");
+ // @TODO Rewrite this to a filter
+ rebuildCacheFiles('modreg', 'modreg');
// And reload data
$ret = checkModulePermissions($mod_chk);
@@ -239,7 +253,10 @@ function checkModulePermissions ($mod) {
// Module not found we don't add it to the database
$ret = '404';
}
- } elseif (!$found) {
+ } elseif (($ret == 'cache_miss') && (getOutputMode() > -1)) {
+ // Rebuild the cache files
+ rebuildCacheFiles('modreg', 'modreg');
+ } elseif ($found === false) {
// Problem with module detected
DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Problem in module %s detected. ret=%s, locked=%s, hidden=%s, mem=%s, admin=%s",
$mod,
@@ -252,11 +269,12 @@ function checkModulePermissions ($mod) {
}
// Return the value
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'ret=' . $ret);
return $ret;
}
// Add menu description pending on given file name (without path!)
-function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
+function ADD_DESCR ($accessLevel, $FQFN, $return = false, $output = true) {
// Use only filename of the FQFN...
$file = basename($FQFN);
@@ -266,66 +284,67 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
$AND = '';
// First we have to do some analysis...
- if (substr($file, 0, 7) == "action-") {
+ if (substr($file, 0, 7) == 'action-') {
// This is an action file!
- $type = "action";
+ $type = 'action';
$search = substr($file, 7);
- switch ($ACC_LVL) {
- case 'admin':
- $modCheck = 'admin';
- break;
-
- case 'sponsor':
- case 'guest':
- case 'member':
- $modCheck = $GLOBALS['module'];
- break;
+ switch ($accessLevel) {
+ case 'admin':
+ $modCheck = 'admin';
+ break;
+
+ case 'sponsor':
+ case 'guest':
+ case 'member':
+ $modCheck = getModule();
+ break;
}
$AND = " AND (`what`='' OR `what` IS NULL)";
- } elseif (substr($file, 0, 5) == "what-") {
+ } elseif (substr($file, 0, 5) == 'what-') {
// This is an admin what file!
- $type = "what";
+ $type = 'what';
$search = substr($file, 5);
$AND = '';
- switch ($ACC_LVL) {
- case 'admin':
- $modCheck = 'admin';
- break;
-
- case 'guest':
- case 'member':
- $modCheck = $GLOBALS['module'];
- if (!IS_ADMIN()) {
- $AND = " AND `visible`='Y' AND `locked`='N'";
- }
- break;
+ switch ($accessLevel) {
+ case 'admin':
+ $modCheck = 'admin';
+ break;
+
+ case 'guest':
+ case 'member':
+ $modCheck = getModule();
+ if (!IS_ADMIN()) {
+ $AND = " AND `visible`='Y' AND `locked`='N'";
+ }
+ break;
}
+
$dummy = substr($search, 0, -4);
- $AND .= " AND `action`='".getModeAction($ACC_LVL, $dummy)."'";
- } elseif (($ACC_LVL == 'sponsor') || ($ACC_LVL == "engine")) {
+ $AND .= " AND `action`='".getModeAction($accessLevel, $dummy)."'";
+ } elseif (($accessLevel == 'sponsor') || ($accessLevel == "engine")) {
// Sponsor / engine menu
- $type = "what";
+ $type = 'what';
$search = $file;
- $modCheck = $GLOBALS['module'];
+ $modCheck = getModule();
$AND = '';
} else {
// Other
- $type = "menu";
+ $type = 'menu';
$search = $file;
- $modCheck = $GLOBALS['module'];
+ $modCheck = getModule();
$AND = '';
}
// Begin the navigation line
if ((!isset($GLOBALS['nav_depth'])) && (!$return)) {
$GLOBALS['nav_depth'] = 0;
- $prefix = "
{--YOU_ARE_HERE--}
Home";
+ $prefix = "
{--YOU_ARE_HERE--}
Home";
} else {
if (!$return) $GLOBALS['nav_depth']++;
$prefix = '';
}
- $prefix .= " -> ";
+ $prefix .= ' -> ';
// We need to remove .php and the end
if (substr($search, -4, 4) == '.php') {
@@ -335,7 +354,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
// Get the title from menu
$result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE %s='%s' ".$AND." LIMIT 1",
- array($ACC_LVL, $type, $search), __FUNCTION__, __LINE__);
+ array($accessLevel, $type, $search), __FUNCTION__, __LINE__);
// Menu found?
if (SQL_NUMROWS($result) == 1) {
@@ -348,18 +367,18 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $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";
- if (($type == "what") || (($type == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview")))) {
+ //* DEBUG: */ echo __LINE__."*".$type.'/'.getWhat()."*
\n";
+ if (($type == 'what') || (($type == 'action') && ((!isWhatSet()) || (getWhat() == 'overview')))) {
//* DEBUG: */ echo __LINE__.'+'.$type."+
\n";
// Add closing div and br-tag
$OUT .= "
\n";
$GLOBALS['nav_depth'] = '0';
// Run the filter chain
- $ret = runFilterChain('post_youhere_line', array('access_level' => $ACC_LVL, 'type' => $type, 'content' => ""));
+ $ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ""));
$OUT .= $ret['content'];
} // END - if
}
@@ -397,23 +416,23 @@ function ADD_MENU ($mode, $act, $wht) {
} // END - if
// 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`",
+ $result_main = SQL_QUERY_ESC("SELECT `title`, `action` FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE (`what`='' OR `what` IS NULL)".$AND." ORDER BY `sort` ASC",
array($mode), __FUNCTION__, __LINE__);
- //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$main_action.'/'.$sub_what.':'.$GLOBALS['what']."*
\n";
+ //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$main_action.'/'.$sub_what.':'.getWhat()."*
\n";
if (SQL_NUMROWS($result_main) > 0) {
OUTPUT_HTML("");
- }
+ } // END - if
}
// Checks wether the current user is a member
function IS_MEMBER () {
- // @TODO Why is this global??? #100
- global $status;
-
- if (!is_array($GLOBALS['last'])) $GLOBALS['last'] = array();
+ // By default no member
$ret = false;
+ // Fix missing 'last' array, damn stupid code :(((
+ // @TODO Try to rewrite this to one or more functions
+ if ((!isset($GLOBALS['last'])) || (!is_array($GLOBALS['last']))) $GLOBALS['last'] = array();
+
// is the cache entry there?
- if (isset($GLOBALS['cache_array']['is_member'])) {
+ if (isset($GLOBALS['is_member'])) {
// Then return it
- return $GLOBALS['cache_array']['is_member'];
+ return $GLOBALS['is_member'];
} // END - if
+ // Init global 'status'
+ $GLOBALS['status'] = false;
+
// Fix "deleted" cookies first
fixDeletedCookies(array('userid', 'u_hash'));
// Are cookies set?
if ((isUserIdSet()) && (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(getUserId()), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Load data from cookies
- list($password, $status, $mod, $onl) = SQL_FETCHROW($result);
+ list($password, $GLOBALS['status'], $mod, $onl) = SQL_FETCHROW($result);
// Validate password by created the difference of it and the secret key
$valPass = generatePassString($password);
// Transfer last module and online time
if ((!empty($mod)) && (empty($GLOBALS['last']['module']))) {
+ // @TODO Try to rewrite this to one or more functions
$GLOBALS['last']['module'] = $mod;
$GLOBALS['last']['online'] = $onl;
} // END - if
// So did we now have valid data and an unlocked user?
- //* DEBUG: */ echo $valPass."
".getSession('u_hash')."
";
- if (($status == 'CONFIRMED') && ($valPass == getSession('u_hash'))) {
+ if (($GLOBALS['status'] == 'CONFIRMED') && ($valPass == getSession('u_hash'))) {
// Account is confirmed and all cookie data is valid so he is definely logged in! :-)
$ret = true;
} else {
@@ -568,7 +593,7 @@ function IS_MEMBER () {
}
// Cache status
- $GLOBALS['cache_array']['is_member'] = $ret;
+ $GLOBALS['is_member'] = $ret;
// Return status
return $ret;
@@ -604,7 +629,7 @@ function IS_ADMIN ($admin = '') {
} 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",
- array($admin), __FUNCTION__, __LINE__);
+ array($admin), __FUNCTION__, __LINE__);
// Is he admin?
$passDB = '';
@@ -627,7 +652,7 @@ function IS_ADMIN ($admin = '') {
// Check if password is valid
//* DEBUG: */ print __FUNCTION__."*".$valPass.'/'.$passCookie."*
\n";
$ret = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == "*FAILED*") && (!EXT_IS_ACTIVE('cache'))));
- }
+ } // END - if
// Return result of comparision
//* DEBUG: */ if (!$ret) echo __LINE__."OK!
";
@@ -643,13 +668,13 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
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",
- __FUNCTION__, __LINE__);
+ __FUNCTION__, __LINE__);
break;
case 'member':
// Members are allowed to set to zero mails per day (we will change this soon!)
$result = SQL_QUERY("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` ORDER BY value",
- __FUNCTION__, __LINE__);
+ __FUNCTION__, __LINE__);
break;
default: // Invalid!
@@ -670,10 +695,10 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
define('__MAX_RECEIVE_OPTIONS', $OUT);
// Load template
- $OUT = LOAD_TEMPLATE($mode."_receive_table", true);
+ $OUT = LOAD_TEMPLATE($mode . '_receive_table', true);
} else {
// Maybe the admin has to setup some maximum values?
- debug_report_bug("Nothing is being done here?");
+ debug_report_bug('Nothing is being done here?');
}
// Free result
@@ -692,7 +717,7 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
function isEmailTaken ($email) {
// Query the database
$result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE email LIKE '{PER}%s{PER}' LIMIT 1",
- array($email), __FUNCTION__, __LINE__);
+ array($email), __FUNCTION__, __LINE__);
// Is the email there?
$ret = (SQL_NUMROWS($result) == 1);
@@ -727,13 +752,13 @@ function isMenuActionValid ($mode, $act, $wht, $UPDATE=false) {
// Update guest or member menu
$sql = SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_%s_menu` SET counter=counter+1 WHERE `action`='%s' AND `what`='%s'".$add." LIMIT 1",
array($mode, $act, $wht), __FUNCTION__, __LINE__, false);
- } elseif (($wht != "overview") && (!empty($wht))) {
+ } elseif (($wht != 'overview') && (!empty($wht))) {
// Other actions
- $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",
+ $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), __FUNCTION__, __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), __FUNCTION__, __LINE__, false);
}
@@ -762,7 +787,7 @@ function sendModeMails ($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(getUserId()), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result_main) == 1) {
// Load hash from database
@@ -775,8 +800,8 @@ function sendModeMails ($mod, $modes) {
$hash = generatePassString($hashDB);
if (($hash == getSession('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",
- array(getUserId(), $hashDB), __FUNCTION__, __LINE__);
+ $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(getUserId(), $hashDB), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Load the data
$DATA = SQL_FETCHROW($result);
@@ -793,56 +818,59 @@ function sendModeMails ($mod, $modes) {
switch ($mod)
{
- case 'mydata':
- foreach ($modes as $mode) {
- switch ($mode)
- {
- case 'normal': break; // Do not add any special lines
-
- case 'email': // Email was changed!
- $content = getMessage('MEMBER_CHANGED_EMAIL').": ".REQUEST_POST('old_addy')."\n";
- break;
-
- case 'pass': // Password was changed
- $content = getMessage('MEMBER_CHANGED_PASS')."\n";
- break;
-
- default:
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode));
- $content = getMessage('MEMBER_UNKNOWN_MODE').": ".$mode."\n\n";
- break;
- } // END - switch
- } // END - if
-
- if (EXT_IS_ACTIVE('country')) {
- // Replace code with description
- $DATA[4] = COUNTRY_GENERATE_INFO(REQUEST_POST('country_code'));
- } // END - if
-
- // Load template
- $msg = LOAD_EMAIL_TEMPLATE("member_mydata_notify", $content, getUserId());
-
- if (getConfig('admin_notify') == 'Y') {
- // The admin needs to be notified about a profile change
- $msg_admin = "admin_mydata_notify";
- $sub_adm = getMessage('ADMIN_CHANGED_DATA');
- } else {
- // No mail to admin
- $msg_admin = '';
- $sub_adm = '';
- }
+ case 'mydata':
+ foreach ($modes as $mode) {
+ switch ($mode)
+ {
+ case 'normal': break; // Do not add any special lines
+
+ case 'email': // Email was changed!
+ $content = getMessage('MEMBER_CHANGED_EMAIL').": ".REQUEST_POST('old_addy')."\n";
+ break;
+
+ case 'pass': // Password was changed
+ $content = getMessage('MEMBER_CHANGED_PASS')."\n";
+ break;
+
+ default:
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode));
+ $content = getMessage('MEMBER_UNKNOWN_MODE').": ".$mode."\n\n";
+ break;
+ } // END - switch
+ } // END - if
+
+ if (EXT_IS_ACTIVE('country')) {
+ // Replace code with description
+ $DATA[4] = COUNTRY_GENERATE_INFO(REQUEST_POST('country_code'));
+ } // END - if
+
+ // Merge content with data from POST
+ $content = merge_array($content, REQUEST_POST_ARRAY());
+
+ // Load template
+ $message = LOAD_EMAIL_TEMPLATE('member_mydata_notify', $content, getUserId());
+
+ if (getConfig('admin_notify') == 'Y') {
+ // The admin needs to be notified about a profile change
+ $message_admin = 'admin_mydata_notify';
+ $sub_adm = getMessage('ADMIN_CHANGED_DATA');
+ } else {
+ // No mail to admin
+ $message_admin = '';
+ $sub_adm = '';
+ }
- // Set subject lines
- $sub_mem = getMessage('MEMBER_CHANGED_DATA');
+ // Set subject lines
+ $sub_mem = getMessage('MEMBER_CHANGED_DATA');
- // Output success message
- $content = "
{--MYDATA_MAIL_SENT--}";
- break;
+ // Output success message
+ $content = "
{--MYDATA_MAIL_SENT--}";
+ break;
- default:
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
- $content = "
{--UNKNOWN_MODULE--}";
- break;
+ default: // Unsupported module!
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
+ $content = "
{--UNKNOWN_MODULE--}";
+ break;
} // END - switch
} else {
// Could not load profile data
@@ -858,16 +886,16 @@ function sendModeMails ($mod, $modes) {
}
// Send email to user if required
- if ((!empty($sub_mem)) && (!empty($msg))) {
+ if ((!empty($sub_mem)) && (!empty($message))) {
// Send member mail
- sendEmail($DATA[7], $sub_mem, $msg);
+ sendEmail($DATA[7], $sub_mem, $message);
} // END - if
// Send only if no other error has occured
if (empty($content)) {
- if ((!empty($sub_adm)) && (!empty($msg_admin))) {
+ if ((!empty($sub_adm)) && (!empty($message_admin))) {
// Send admin mail
- sendAdminNotification($sub_adm, $msg_admin, $content, getUserId());
+ sendAdminNotification($sub_adm, $message_admin, $content, getUserId());
} elseif (getConfig('admin_notify') == 'Y') {
// Cannot send mails to admin!
$content = getMessage('CANNOT_SEND_ADMIN_MAILS');
@@ -883,21 +911,19 @@ function sendModeMails ($mod, $modes) {
// Update module counter
function countModuleHit($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",
- array($mod), __FUNCTION__, __LINE__);
- } // END - if
+ // 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",
+ array($mod), __FUNCTION__, __LINE__);
}
// Get action value from mode (admin/guest/member) and what-value
-function getModeAction ($mode, &$wht) {
+function getModeAction ($mode, $wht) {
// Init status
$ret = '';
- //* DEBUG: */ echo __LINE__.'='.$mode.'/'.$wht.'/'.$GLOBALS['action']."=
";
+ //* DEBUG: */ echo __LINE__.'='.$mode.'/'.$wht.'/'.getAction()."=
";
if ((empty($wht)) && ($mode != 'admin')) {
- $wht = "welcome";
+ $wht = 'welcome';
if (getConfig('index_home') != '') $wht = getConfig('index_home');
} // END - if
@@ -906,16 +932,16 @@ function getModeAction ($mode, &$wht) {
if (REQUEST_ISSET_GET('action')) {
// Use from request!
return REQUEST_GET('action');
- } elseif (!empty($GLOBALS['action'])) {
+ } elseif (isActionSet()) {
// Get it directly from URL
- return $GLOBALS['action'];
- } elseif (($wht == "overview") || (empty($GLOBALS['what']))) {
+ return getAction();
+ } elseif (($wht == 'overview') || (!isWhatSet())) {
// Default value for admin area
- $ret = "login";
+ $ret = 'login';
}
- } elseif (!empty($GLOBALS['action'])) {
+ } elseif (isActionSet()) {
// Get it directly from URL
- return $GLOBALS['action'];
+ return getAction();
}
//* DEBUG: */ echo __FUNCTION__."(
".__LINE__."): ret=".$ret."
\n";
@@ -924,15 +950,15 @@ function getModeAction ($mode, &$wht) {
// Rewriting modules to menu
switch ($mode) {
case 'index': $mode = 'guest'; break;
- case "login": $mode = 'member'; break;
+ case 'login': $mode = 'member'; break;
} // END - switch
- // Guest and member menu is "main" as the default
- if (empty($ret)) $ret = "main";
+ // Guest and member menu is 'main' as the default
+ if (empty($ret)) $ret = 'main';
// Load from database
$result = SQL_QUERY_ESC("SELECT action FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `what`='%s' LIMIT 1",
- array($mode, $wht), __FUNCTION__, __LINE__);
+ array($mode, $wht), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Load action value and pray that this one is the right you want... ;-)
list($ret) = SQL_FETCHROW($result);
@@ -965,7 +991,7 @@ function getCategory ($cid) {
} elseif ($cid > 0) {
// Lookup the category in database
$result = SQL_QUERY_ESC("SELECT cat FROM `{!_MYSQL_PREFIX!}_cats` WHERE `id`=%s LIMIT 1",
- array(bigintval($cid)), __FUNCTION__, __LINE__);
+ array(bigintval($cid)), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Category found... :-)
list($ret) = SQL_FETCHROW($result);
@@ -986,7 +1012,7 @@ function getPaymentTitlePrice ($pid, $full=false) {
// Load payment data
$result = SQL_QUERY_ESC("SELECT mail_title, price FROM `{!_MYSQL_PREFIX!}_payments` WHERE `id`=%s LIMIT 1",
- array(bigintval($pid)), __FUNCTION__, __LINE__);
+ array(bigintval($pid)), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Payment type found... :-)
if (!$full) {
@@ -1013,7 +1039,7 @@ function getPaymentPoints ($pid, $lookFor = 'price') {
// Search for it in database
$result = SQL_QUERY_ESC("SELECT %s FROM `{!_MYSQL_PREFIX!}_payments` WHERE `id`=%s LIMIT 1",
- array($lookFor, $pid), __FUNCTION__, __LINE__);
+ array($lookFor, $pid), __FUNCTION__, __LINE__);
// Is the entry there?
if (SQL_NUMROWS($result) == 1) {
@@ -1029,7 +1055,7 @@ function getPaymentPoints ($pid, $lookFor = 'price') {
}
// Remove a receiver's ID from $receivers and add a link for him to confirm
-function removeReceiver (&$receivers, $key, $uid, $pool_id, $stats_id='', $bonus=false) {
+function removeReceiver (&$receivers, $key, $uid, $pool_id, $stats_id = '', $bonus = false) {
// Default is not removed
$ret = 'failed';
@@ -1051,7 +1077,7 @@ function removeReceiver (&$receivers, $key, $uid, $pool_id, $stats_id='', $bonus
// Was it *not* found?
if (SQL_NUMROWS($result) == 0) {
// 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), __FUNCTION__, __LINE__);
$ret = 'done';
} else {
@@ -1132,7 +1158,7 @@ function getReferalLevelPercents ($level) {
} elseif (!EXT_IS_ACTIVE('cache')) {
// Get referal data
$result_lvl = SQL_QUERY_ESC("SELECT percents FROM `{!_MYSQL_PREFIX!}_refdepths` WHERE level='%s' LIMIT 1",
- array(bigintval($level)), __FUNCTION__, __LINE__);
+ array(bigintval($level)), __FUNCTION__, __LINE__);
// Entry found?
if (SQL_NUMROWS($result_lvl) == 1) {
@@ -1199,8 +1225,8 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify = false, $r
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",
- array(bigintval($uid)), __FUNCTION__, __LINE__);
+ $result_user = SQL_QUERY_ESC("SELECT refid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
+ array(bigintval($uid)), __FUNCTION__, __LINE__);
//* DEBUG: */ print __FUNCTION__."(
".__LINE__."):uid={$uid},numRows=".SQL_NUMROWS($result_user).",points={$points}
\n";
if (SQL_NUMROWS($result_user) == 1) {
@@ -1226,15 +1252,15 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify = false, $r
} // 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",
- array($data, $data, $ref_points, bigintval($uid), bigintval($GLOBALS['ref_level'])), __FUNCTION__, __LINE__);
+ 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'])), __FUNCTION__, __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)",
- array($data, bigintval($uid), bigintval($GLOBALS['ref_level']), $ref_points), __FUNCTION__, __LINE__);
+ array($data, bigintval($uid), bigintval($GLOBALS['ref_level']), $ref_points), __FUNCTION__, __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
@@ -1255,9 +1281,9 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify = false, $r
);
// Load email template
- $msg = LOAD_EMAIL_TEMPLATE('confirm-referal', $content, bigintval($uid));
+ $message = LOAD_EMAIL_TEMPLATE('confirm-referal', $content, bigintval($uid));
- sendEmail($email, THANX_REFERRAL_ONE, $msg);
+ sendEmail($email, THANX_REFERRAL_ONE, $message);
} elseif (($send_notify) && ($ref == 0) && (!$locked) && ($add_mode == 'direct') && (!defined('__POINTS_VALUE'))) {
// Direct payment shall be notified about
define('__POINTS_VALUE', $ref_points);
@@ -1269,11 +1295,11 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify = false, $r
);
// Load message
- $msg = LOAD_EMAIL_TEMPLATE('add-points', $content, $uid);
+ $message = LOAD_EMAIL_TEMPLATE('add-points', $content, $uid);
// And sent it away
- sendEmail($email, getMessage('SUBJECT_DIRECT_PAYMENT'), $msg);
- if (!REQUEST_ISSET_GET(('mid'))) LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
+ sendEmail($email, getMessage('SUBJECT_DIRECT_PAYMENT'), $message);
+ if (!REQUEST_ISSET_GET('mid')) LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
}
// Maybe there's another ref?
@@ -1302,20 +1328,20 @@ function updateReferalCounter ($uid) {
//* 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",
+ 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]), __FUNCTION__, __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)",
+ SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_refsystem` (`userid`, `level`, `counter`) VALUES (%s,%s,1)",
array(bigintval($uid), $GLOBALS['cache_array']['ref_level'][$uid]), __FUNCTION__, __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)), __FUNCTION__, __LINE__);
// Load refid
@@ -1347,12 +1373,12 @@ function updateReferalCounter ($uid) {
// Sends out mail to all administrators. This function is no longer obsolete
// because we need it when there is no ext-admins installed
-function SEND_ADMIN_EMAILS ($subj, $msg) {
+function SEND_ADMIN_EMAILS ($subj, $message) {
// Load all admin email addresses
- $result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id` ASC", __FUNCTION__, __LINE__);
+ $result = SQL_QUERY("SELECT `email` FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id` ASC", __FUNCTION__, __LINE__);
while ($content = SQL_FETCHARRAY($result)) {
// Send the email out
- sendEmail($content['email'], $subj, $msg);
+ sendEmail($content['email'], $subj, $message);
} // END - if
// Free result
@@ -1376,7 +1402,7 @@ function GET_ADMIN_ID ($login) {
} 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), __FUNCTION__, __LINE__);
+ array($login), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
list($ret) = SQL_FETCHROW($result);
} // END - if
@@ -1413,7 +1439,7 @@ function GET_ADMIN_HASH ($aid) {
} elseif (!EXT_IS_ACTIVE('cache')) {
// Load from database
$result = SQL_QUERY_ESC("SELECT password FROM `{!_MYSQL_PREFIX!}_admins` WHERE `id`=%s LIMIT 1",
- array($aid), __FUNCTION__, __LINE__);
+ array($aid), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Fetch data
list($ret) = SQL_FETCHROW($result);
@@ -1442,7 +1468,7 @@ function getAdminLogin ($aid) {
} elseif (!EXT_IS_ACTIVE('cache')) {
// Load from database
$result = SQL_QUERY_ESC("SELECT login FROM `{!_MYSQL_PREFIX!}_admins` WHERE `id`=%s LIMIT 1",
- array(bigintval($aid)), __FUNCTION__, __LINE__);
+ array(bigintval($aid)), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Fetch data
list($ret) = SQL_FETCHROW($result);
@@ -1471,14 +1497,14 @@ function getAdminEmail ($aid) {
} elseif (!EXT_IS_ACTIVE('cache')) {
// Load from database
$result_aid = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` WHERE `id`=%s LIMIT 1",
- array(bigintval($aid)), __FUNCTION__, __LINE__);
+ array(bigintval($aid)), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result_aid) == 1) {
// Get data
list($ret) = SQL_FETCHROW($result_aid);
// Set cache
$GLOBALS['cache_array']['admins']['email'][$aid] = $ret;
- } // END - if
+ } // END - if
// Free result
SQL_FREERESULT($result_aid);
@@ -1506,7 +1532,7 @@ function getAdminDefaultAcl ($aid) {
} 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",
- array(bigintval($aid)), __FUNCTION__, __LINE__);
+ array(bigintval($aid)), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result_aid) == 1) {
// Fetch data
list($ret) = SQL_FETCHROW($result_aid);
@@ -1543,7 +1569,7 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
$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), __FUNCTION__, __LINE__);
+ array($id, $ORDER, $table, $name), __FUNCTION__, __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
// @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
@@ -1583,15 +1609,15 @@ function activateExchange () {
"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
- runFilterChain('run_sqls');
+ // Run SQLs
+ runFilterChain('run_sqls');
- // Rebuild caches
- // @TODO Rewrite this to a filter
- rebuildCacheFiles('config', 'config');
- rebuildCacheFiles('modreg', 'modreg');
+ // Rebuild caches
+ // @TODO Rewrite this to a filter
+ rebuildCacheFiles('config', 'config');
+ rebuildCacheFiles('modreg', 'modreg');
} // END - if
}
@@ -1608,7 +1634,7 @@ WHERE p.userid=%s", array(bigintval($uid)), __FUNCTION__, __LINE__);
list($points) = SQL_FETCHROW($result);
// Delete points entries as well
- SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_points` WHERE userid=%s", array(bigintval($uid)), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_points` WHERE `userid`=%s", array(bigintval($uid)), __FUNCTION__, __LINE__);
// Update mediadata as well
if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
@@ -1624,21 +1650,21 @@ WHERE p.userid=%s", array(bigintval($uid)), __FUNCTION__, __LINE__);
SQL_FREERESULT($result);
// Delete category selections as well...
- SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s",
- array(bigintval($uid)), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE `userid`=%s",
+ array(bigintval($uid)), __FUNCTION__, __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)), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE `userid`=%s",
+ array(bigintval($uid)), __FUNCTION__, __LINE__);
} // END - if
// Now a mail to the user and that's all...
- $msg = LOAD_EMAIL_TEMPLATE('del-user', array('text' => $reason), $uid);
- sendEmail($uid, getMessage('ADMIN_DEL_ACCOUNT'), $msg);
+ $message = LOAD_EMAIL_TEMPLATE('del-user', array('text' => $reason), $uid);
+ sendEmail($uid, getMessage('ADMIN_DEL_ACCOUNT'), $message);
// Ok, delete the account!
- SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($uid)), __FUNCTION__, __LINE__);
}
// Generates meta description for given module and 'what' value
@@ -1668,7 +1694,7 @@ function ADD_JACKPOT ($points) {
// Update points
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_jackpot` SET points=points+%s WHERE ok='ok' LIMIT 1",
- array($points), __FUNCTION__, __LINE__);
+ array($points), __FUNCTION__, __LINE__);
}
}
@@ -1688,7 +1714,7 @@ function SUB_JACKPOT ($points) {
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",
- array($points), __FUNCTION__, __LINE__);
+ array($points), __FUNCTION__, __LINE__);
$ret = $jackpot - $points;
} // END - if
}
@@ -1710,24 +1736,25 @@ function getWhatFromModule ($modCheck) {
return REQUEST_GET('what');
} // END - if
+ // Default is empty
$wht = '';
+
//* DEBUG: */ echo __LINE__.'!'.$modCheck."!
\n";
- switch ($modCheck)
- {
- case 'admin':
- $wht = 'overview';
- break;
-
- case 'login':
- case 'index':
- $wht = 'welcome';
- if (($modCheck == 'index') && (getConfig('index_home') != '')) $wht = getConfig('index_home');
- break;
+ switch ($modCheck) {
+ case 'admin':
+ $wht = 'overview';
+ break;
- default:
- $wht = '';
- break;
- }
+ case 'login':
+ case 'index':
+ $wht = 'welcome';
+ if (($modCheck == 'index') && (getConfig('index_home') != '')) $wht = getConfig('index_home');
+ break;
+
+ default:
+ $wht = '';
+ break;
+ } // END - switch
// Return what value
return $wht;
@@ -1736,10 +1763,11 @@ function getWhatFromModule ($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",
- array($points, bigintval($uid)), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `used_points`=`used_points`+%s WHERE `userid`=%s LIMIT 1",
+ array($points, bigintval($uid)), __FUNCTION__, __LINE__);
// Insert booking record
+ // @TODO Rewrite this to a filter
if (EXT_IS_ACTIVE('booking')) {
// Add record
ADD_BOOKING_RECORD($subject, $uid, $points, 'sub');
@@ -1755,7 +1783,7 @@ function SUB_POINTS ($subject, $uid, $points) {
// Update config entries
function updateConfiguration ($entries, $values, $updateMode='') {
// Do not update config in CSS mode
- if (($GLOBALS['output_mode'] == '1') || ($GLOBALS['output_mode'] == -1)) {
+ if ((getOutputMode() == '1') || (getOutputMode() == -1)) {
return;
} // END - if
@@ -1836,7 +1864,7 @@ function getTotalReceivers ($mode='normal') {
$result_all = SQL_QUERY("SELECT userid
FROM `{!_MYSQL_PREFIX!}_user_data`
WHERE `status`='CONFIRMED' AND receive_mails > 0 ".PREPARE_SQL_HTML_HOLIDAY($mode),
- __FUNCTION__, __LINE__);
+ __FUNCTION__, __LINE__);
// Get num rows
$numRows = SQL_NUMROWS($result_all);
@@ -1872,14 +1900,19 @@ function generateCategoryOptionsList ($mode) {
// Check which users are in this category
$result_uids = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s",
- array(bigintval($content['id'])), __FUNCTION__, __LINE__);
+ array(bigintval($content['id'])), __FUNCTION__, __LINE__);
// Start adding all
$uid_cnt = 0;
// @TODO Rewrite this to $content = SQL_FETCHARRAY()
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)), __FUNCTION__, __LINE__);
// Add user count
@@ -1946,34 +1979,34 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
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
- ), __FUNCTION__, __LINE__);
+ array(
+ $subject,
+ $text,
+ $receiverList,
+ $points,
+ $seconds,
+ $url,
+ $cat,
+ $target,
+ bigintval($receiver),
+ $HTML
+ ), __FUNCTION__, __LINE__);
} else {
// Add regular mail
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),
- ), __FUNCTION__, __LINE__);
+ array(
+ $subject,
+ $text,
+ $receiverList,
+ $points,
+ $seconds,
+ $url,
+ $cat,
+ $target,
+ bigintval($receiver),
+ ), __FUNCTION__, __LINE__);
}
}
@@ -2011,11 +2044,11 @@ function generateReceiverList ($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",
- array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FUNCTION__, __LINE__);
+ array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FUNCTION__, __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",
- array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FUNCTION__, __LINE__);
+ array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FUNCTION__, __LINE__);
}
// Entries found?
@@ -2056,9 +2089,13 @@ function getTimestampFromUserStats ($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`
-WHERE userid=%s AND stats_type='%s' AND stats_data='%s'
+WHERE `userid`=%s AND `stats_type`='%s' AND `stats_data`='%s'
LIMIT 1",
- array(bigintval($uid), $type, $data), __FUNCTION__, __LINE__);
+ array(
+ bigintval($uid),
+ $type,
+ $data
+ ), __FUNCTION__, __LINE__);
// Is the entry there?
if (SQL_NUMROWS($result) == 1) {
@@ -2085,10 +2122,10 @@ function insertUserStatsRecord ($uid, $type, $data) {
if ((!getTimestampFromUserStats($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')",
- array(bigintval($uid), $type, $data), __FUNCTION__, __LINE__);
+ array(bigintval($uid), $type, $data), __FUNCTION__, __LINE__);
} elseif (is_array($data)) {
// Invalid data!
- DEBUG_LOG(__FUNCTION__, __LINE__, " uid={$uid},type={$type},data={".gettype($data).": Invalid statistics data type!");
+ DEBUG_LOG(__FUNCTION__, __LINE__, "uid={$uid},type={$type},data={".gettype($data).": Invalid statistics data type!");
}
}
@@ -2113,7 +2150,7 @@ 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",
- array(bigintval($uid), bigintval($level)), __FUNCTION__, __LINE__);
+ array(bigintval($uid), bigintval($level)), __FUNCTION__, __LINE__);
// Are there some entries?
if (SQL_NUMROWS($result) > 0) {
@@ -2165,7 +2202,7 @@ ORDER BY ur.refid ASC",
function reduceRecipientReceivedMails ($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",
- array($column, bigintval($id), $count), __FUNCTION__, __LINE__);
+ array($column, bigintval($id), $count), __FUNCTION__, __LINE__);
// Are there entries?
if (SQL_NUMROWS($result) > 0) {
@@ -2245,10 +2282,18 @@ function COUNT_SQLS () {
// Checks wether the SQLs array is filled
function IS_SQLS_VALID () {
return (
- (IS_SQLS_INITIALIZED()) &&
+ (IS_SQLS_INITIALIZED())
+ &&
(COUNT_SQLS() > 0)
);
}
+// Creates a new task
+function createNewTask($subject, $notes, $taskType, $userid = 0, $admin_id = 0, $strip = true) {
+ // Insert the task data into the database
+ SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (`assigned_admin`, `userid`, `status`, `task_type`, `subject`, `text`, `task_created`) VALUES (%s,%s,'NEW','%s','%s','%s', UNIX_TIMESTAMP())",
+ array($admin_id, $userid, $taskType, $subject, $notes), __FUNCTION__, __LINE__, true, $strip);
+}
+
// [EOF]
?>