X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=2d5d26fa9af300d84339cf283937fcf42e9b7e2e;hb=75062a410999a290b18fe181370139b37a160eb5;hp=e4ef99b7002818d881166f91de7c301e61aa6422;hpb=aa63aed07428a99ea09002c8d072990677700080;p=mailer.git
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index e4ef99b700..2d5d26fa9a 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -42,8 +42,8 @@ if (!defined('__SECURITY')) {
require($INC);
}
-// Returns the title for given module
-function ADD_MODULE_TITLE ($mod) {
+// "Getter" for module title
+function getModuleTitle ($mod) {
// Init variables
$name = '';
$result = false;
@@ -60,7 +60,7 @@ function ADD_MODULE_TITLE ($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);
}
@@ -83,6 +83,32 @@ function ADD_MODULE_TITLE ($mod) {
return $name;
}
+// "Getter" for module description
+function getModuleDescription ($mode, $wht, $column = 'what') {
+ // Fix empty "what"
+ if (empty($wht)) {
+ $wht = "welcome";
+ if (getConfig('index_home') != '') $wht = getConfig('index_home');
+ } // END - if
+
+ // Default is not found
+ $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__);
+
+ // Is there an entry?
+ if (SQL_NUMROWS($result) == 1) {
+ // Fetch the title
+ list($ret) = SQL_FETCHROW($result);
+ } // END - if
+
+ // Free result
+ SQL_FREERESULT($result);
+ return $ret;
+}
+
// Check validity of a given module name (no file extension)
function checkModulePermissions ($mod) {
// Filter module name (names with low chars and underlines are fine!)
@@ -104,17 +130,17 @@ function checkModulePermissions ($mod) {
// Major error in module registry is the default
$ret = "major";
- // Check if script is installed if not return a "done" to prevent some errors
+ // Check if script is installed if not return a 'done' to prevent some errors
if ((!isInstalled()) || (isInstalling()) || (!isAdminRegistered())) {
// Not installed or no admin registered or in installation phase
- return "done";
+ return 'done';
} // END - if
// Init variables
- $locked = "Y";
- $hidden = "N";
- $admin = "N";
- $mem = "N";
+ $locked = 'Y';
+ $hidden = 'N';
+ $admin = 'N';
+ $mem = 'N';
$found = false;
// Check if cache is latest version
@@ -143,7 +169,7 @@ function checkModulePermissions ($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), __FUNCTION__, __LINE__);
+ array($mod_chk), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Read data
list($locked, $hidden, $admin, $mem) = SQL_FETCHROW($result);
@@ -159,7 +185,7 @@ function checkModulePermissions ($mod) {
// Admin access ----- Guest access ----- --- Guest or member? ---
if ((IS_ADMIN()) || (($locked == 'N') && ($admin == 'N') && (($mem == 'N') || (IS_MEMBER())))) {
// If you are admin you are welcome for everything!
- $ret = "done";
+ $ret = 'done';
} elseif ($locked == 'Y') {
// Module is locked
$ret = "locked";
@@ -172,10 +198,10 @@ function checkModulePermissions ($mod) {
} else {
// @TODO Nothing helped???
DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("ret=%s,locked=%s,admin=%s,mem=%s",
- $ret,
- $locked,
- $admin,
- $mem
+ $ret,
+ $locked,
+ $admin,
+ $mem
));
}
} // END - if
@@ -183,7 +209,7 @@ function checkModulePermissions ($mod) {
// 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", constant('PATH'), $mod))) || (FILE_READABLE(sprintf("%s%s.php", constant('PATH'), $mod))) || (FILE_READABLE(sprintf("%s%s/%s.php", constant('PATH'), $extension, $mod)))) {
+ 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
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
@@ -211,17 +237,17 @@ function checkModulePermissions ($mod) {
$ret = checkModulePermissions($mod_chk);
} else {
// Module not found we don't add it to the database
- $ret = "404";
+ $ret = '404';
}
} elseif (!$found) {
// 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,
- $ret,
- $locked,
- $hidden,
- $mem,
- $admin
+ $mod,
+ $ret,
+ $locked,
+ $hidden,
+ $mem,
+ $admin
));
}
@@ -245,15 +271,15 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
$type = "action";
$search = substr($file, 7);
switch ($ACC_LVL) {
- case 'admin':
- $modCheck = 'admin';
- break;
-
- case 'sponsor':
- case 'guest':
- case 'member':
- $modCheck = $GLOBALS['module'];
- break;
+ case 'admin':
+ $modCheck = 'admin';
+ break;
+
+ case 'sponsor':
+ case 'guest':
+ case 'member':
+ $modCheck = $GLOBALS['module'];
+ break;
}
$AND = " AND (`what`='' OR `what` IS NULL)";
} elseif (substr($file, 0, 5) == "what-") {
@@ -262,20 +288,20 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
$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;
+ case 'admin':
+ $modCheck = 'admin';
+ break;
+
+ case 'guest':
+ case 'member':
+ $modCheck = $GLOBALS['module'];
+ if (!IS_ADMIN()) {
+ $AND = " AND `visible`='Y' AND `locked`='N'";
+ }
+ break;
}
$dummy = substr($search, 0, -4);
- $AND .= " AND `action`='".GET_ACTION($ACC_LVL, $dummy)."'";
+ $AND .= " AND `action`='".getModeAction($ACC_LVL, $dummy)."'";
} elseif (($ACC_LVL == 'sponsor') || ($ACC_LVL == "engine")) {
// Sponsor / engine menu
$type = "what";
@@ -302,14 +328,14 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
$prefix .= " -> ";
// We need to remove .php and the end
- if (substr($search, -4, 4) == ".php") {
+ if (substr($search, -4, 4) == '.php') {
// Remove the .php
$search = substr($search, 0, -4);
} // END - i
// 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($ACC_LVL, $type, $search), __FUNCTION__, __LINE__);
// Menu found?
if (SQL_NUMROWS($result) == 1) {
@@ -322,15 +348,15 @@ 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";
+ //* DEBUG: */ echo __LINE__."*".$type.'/'.$GLOBALS['what']."*
\n";
if (($type == "what") || (($type == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview")))) {
- //* DEBUG: */ echo __LINE__."+".$type."+
\n";
+ //* DEBUG: */ echo __LINE__.'+'.$type."+
\n";
// Add closing div and br-tag
$OUT .= "
\n";
- $GLOBALS['nav_depth'] = "0";
+ $GLOBALS['nav_depth'] = '0';
// Run the filter chain
$ret = runFilterChain('post_youhere_line', array('access_level' => $ACC_LVL, 'type' => $type, 'content' => ""));
@@ -361,7 +387,7 @@ function ADD_MENU ($mode, $act, $wht) {
$sub_what = '';
// is the menu action valid?
- if (!VALIDATE_MENU_ACTION($mode, $act, $wht, true)) {
+ if (!isMenuActionValid($mode, $act, $wht, true)) {
return getCode('MENU_NOT_VALID');
} // END - if
@@ -372,13 +398,13 @@ function ADD_MENU ($mode, $act, $wht) {
// 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), __FUNCTION__, __LINE__);
- //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*
\n";
+ array($mode), __FUNCTION__, __LINE__);
+ //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$main_action.'/'.$sub_what.':'.$GLOBALS['what']."*
\n";
if (SQL_NUMROWS($result_main) > 0) {
OUTPUT_HTML("
");
}
}
+// 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();
+ $ret = false;
+
+ // is the cache entry there?
+ if (isset($GLOBALS['cache_array']['is_member'])) {
+ // Then return it
+ return $GLOBALS['cache_array']['is_member'];
+ } // END - if
+
+ // 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",
+ array(getUserId()), __FUNCTION__, __LINE__);
+ if (SQL_NUMROWS($result) == 1) {
+ // Load data from cookies
+ list($password, $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']))) {
+ $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'))) {
+ // Account is confirmed and all cookie data is valid so he is definely logged in! :-)
+ $ret = true;
+ } else {
+ // Maybe got locked etc.
+ //* DEBUG: */ echo __LINE__."!!!
";
+ destroyUserSession();
+ }
+ } else {
+ // Cookie data is invalid!
+ //* DEBUG: */ echo __LINE__."***
";
+ destroyUserSession();
+ }
+
+ // Free memory
+ SQL_FREERESULT($result);
+ } else {
+ // Cookie data is invalid!
+ //* DEBUG: */ echo __LINE__."///
";
+ destroyUserSession();
+ }
+
+ // Cache status
+ $GLOBALS['cache_array']['is_member'] = $ret;
+
+ // Return status
+ return $ret;
+}
+
// This patched function will reduce many SELECT queries for the specified or current admin login
-function IS_ADMIN ($admin="") {
+function IS_ADMIN ($admin = '') {
// Init variables
$ret = false; $passCookie = ''; $valPass = '';
//* DEBUG: */ echo __LINE__."ADMIN:".$admin."
";
@@ -491,10 +583,10 @@ function IS_ADMIN ($admin="") {
// If admin login is not given take current from cookies...
if ((empty($admin)) && (isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5'))) {
// Get admin login and password from session/cookies
- $admin = get_session('admin_login');
- $passCookie = get_session('admin_md5');
+ $admin = getSession('admin_login');
+ $passCookie = getSession('admin_md5');
}
- //* DEBUG: */ echo __LINE__."ADMIN:".$admin."/".$passCookie."
";
+ //* DEBUG: */ echo __LINE__."ADMIN:".$admin.'/'.$passCookie."
";
// Search in array for entry
if (isset($GLOBALS['cache_array']['admin_hash'])) {
@@ -512,7 +604,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 = '';
@@ -533,9 +625,9 @@ function IS_ADMIN ($admin="") {
if (!empty($valPass)) {
// Check if password is valid
- //* DEBUG: */ print __FUNCTION__."*".$valPass."/".$passCookie."*
\n";
+ //* 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!
";
@@ -543,7 +635,7 @@ function IS_ADMIN ($admin="") {
}
// Generates a list of "max receiveable emails per day"
-function ADD_MAX_RECEIVE_LIST ($mode, $default = "", $return = false) {
+function addMaxReceiveList ($mode, $default = '', $return = false) {
$OUT = '';
$result = false;
@@ -551,13 +643,13 @@ function ADD_MAX_RECEIVE_LIST ($mode, $default = "", $return = false) {
case 'guest':
// Guests (in the registration form) are not allowed to select 0 mails per day.
$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!
@@ -572,16 +664,16 @@ function ADD_MAX_RECEIVE_LIST ($mode, $default = "", $return = false) {
$OUT .= " ".get_session('u_hash')."
";
- if (($status == "CONFIRMED") && ($valPass == get_session('u_hash'))) {
- // Account is confirmed and all cookie data is valid so he is definely logged in! :-)
- $ret = true;
- } else {
- // Maybe got locked etc.
- //* DEBUG: */ echo __LINE__."!!!
";
- destroy_user_session();
- }
- } else {
- // Cookie data is invalid!
- //* DEBUG: */ echo __LINE__."***
";
- destroy_user_session();
- }
-
- // Free memory
- SQL_FREERESULT($result);
- } else {
- // Cookie data is invalid!
- //* DEBUG: */ echo __LINE__."///
";
- destroy_user_session();
- }
-
- // Cache status
- $GLOBALS['cache_array']['is_member'] = $ret;
-
- // Return status
- return $ret;
-}
-
// Validate the given menu action
-function VALIDATE_MENU_ACTION ($mode, $act, $wht, $UPDATE=false) {
+function isMenuActionValid ($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
@@ -696,19 +722,19 @@ function VALIDATE_MENU_ACTION ($mode, $act, $wht, $UPDATE=false) {
$add = '';
if ((!IS_ADMIN()) && ($mode != 'admin')) $add = " AND `locked`='N'";
- //* DEBUG: */ echo __LINE__.":".$mode."/".$act."/".$wht."*
\n";
+ //* DEBUG: */ echo __LINE__.':'.$mode.'/'.$act.'/'.$wht."*
\n";
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",
- array($mode, $act, $wht), __FUNCTION__, __LINE__, false);
+ array($mode, $act, $wht), __FUNCTION__, __LINE__, false);
} 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",
- array($mode, $act, $wht), __FUNCTION__, __LINE__, false);
+ 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",
- array($mode, $act), __FUNCTION__, __LINE__, false);
+ array($mode, $act), __FUNCTION__, __LINE__, false);
}
// Run SQL command
@@ -732,50 +758,25 @@ function VALIDATE_MENU_ACTION ($mode, $act, $wht, $UPDATE=false) {
}
//
-function GET_MOD_DESCR($mode, $wht, $column="what") {
- // Fix empty "what"
- if (empty($wht)) {
- $wht = "welcome";
- if (getConfig('index_home') != "") $wht = getConfig('index_home');
- } // END - if
-
- // Default is not found
- $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__);
-
- // Is there an entry?
- if (SQL_NUMROWS($result) == 1) {
- // Fetch the title
- list($ret) = SQL_FETCHROW($result);
- } // END - if
-
- // Free result
- SQL_FREERESULT($result);
- return $ret;
-}
-//
-function SEND_MODE_MAILS($mod, $modes) {
+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",
- array(getUserId()), __FUNCTION__, __LINE__);
+ array(getUserId()), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result_main) == 1) {
// Load hash from database
list($hashDB) = SQL_FETCHROW($result_main);
// Extract salt from cookie
- $salt = substr(get_session('u_hash'), 0, -40);
+ $salt = substr(getSession('u_hash'), 0, -40);
// Now let's compare passwords
$hash = generatePassString($hashDB);
- if (($hash == get_session('u_hash')) || (REQUEST_POST('pass1') == REQUEST_POST('pass2'))) {
+ 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__);
+ array(getUserId(), $hashDB), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Load the data
$DATA = SQL_FETCHROW($result);
@@ -784,7 +785,7 @@ function SEND_MODE_MAILS($mod, $modes) {
SQL_FREERESULT($result);
// Translate gender
- $DATA[0] = TRANSLATE_GENDER($DATA[0]);
+ $DATA[0] = translateGender($DATA[0]);
// Clear/init the content variable
$content = '';
@@ -792,56 +793,59 @@ function SEND_MODE_MAILS($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 = MEMBER_CHANGED_EMAIL.": ".REQUEST_POST('old_addy')."\n";
- break;
-
- case 'pass': // Password was changed
- $content = MEMBER_CHANGED_PASS."\n";
- break;
-
- default:
- DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode));
- $content = 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 = 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
+ $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 = '';
+ }
- // Set subject lines
- $sub_mem = 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
@@ -859,14 +863,14 @@ function SEND_MODE_MAILS($mod, $modes) {
// Send email to user if required
if ((!empty($sub_mem)) && (!empty($msg))) {
// Send member mail
- SEND_EMAIL($DATA[7], $sub_mem, $msg);
+ sendEmail($DATA[7], $sub_mem, $msg);
} // END - if
// Send only if no other error has occured
if (empty($content)) {
if ((!empty($sub_adm)) && (!empty($msg_admin))) {
// Send admin mail
- SEND_ADMIN_NOTIFICATION($sub_adm, $msg_admin, $content, getUserId());
+ sendAdminNotification($sub_adm, $msg_admin, $content, getUserId());
} elseif (getConfig('admin_notify') == 'Y') {
// Cannot send mails to admin!
$content = getMessage('CANNOT_SEND_ADMIN_MAILS');
@@ -885,19 +889,19 @@ 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__);
+ array($mod), __FUNCTION__, __LINE__);
} // END - if
}
// Get action value from mode (admin/guest/member) and what-value
-function GET_ACTION ($mode, &$wht) {
+function getModeAction ($mode, &$wht) {
// Init status
$ret = '';
- //* DEBUG: */ echo __LINE__."=".$mode."/".$wht."/".$GLOBALS['action']."=
";
+ //* DEBUG: */ echo __LINE__.'='.$mode.'/'.$wht.'/'.$GLOBALS['action']."=
";
if ((empty($wht)) && ($mode != 'admin')) {
$wht = "welcome";
- if (getConfig('index_home') != "") $wht = getConfig('index_home');
+ if (getConfig('index_home') != '') $wht = getConfig('index_home');
} // END - if
if ($mode == 'admin') {
@@ -931,7 +935,7 @@ function GET_ACTION ($mode, &$wht) {
// 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);
@@ -939,12 +943,12 @@ function GET_ACTION ($mode, &$wht) {
// Free memory
SQL_FREERESULT($result);
- } elseif ((GET_EXT_VERSION('sql_patches') == "") && ($mode != 'admin')) {
+ } elseif ((GET_EXT_VERSION('sql_patches') == '') && ($mode != 'admin')) {
// No sql_patches installed, but maybe we need to register an admin?
if (isAdminRegistered()) {
// Redirect
// @TODO Why does this lead into an endless loop but we still need it???
- // @TODO Commented out LOAD_URL('admin.php');
+ // @TODO Commented out redirectToUrl('admin.php');
} // END - if
}
@@ -953,7 +957,7 @@ function GET_ACTION ($mode, &$wht) {
}
// Get category name back
-function GET_CATEGORY ($cid) {
+function getCategory ($cid) {
// Default is not found
$ret = getMessage('_CATEGORY_404');
@@ -963,8 +967,8 @@ function GET_CATEGORY ($cid) {
$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",
- array(bigintval($cid)), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT cat FROM `{!_MYSQL_PREFIX!}_cats` WHERE `id`=%s LIMIT 1",
+ array(bigintval($cid)), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Category found... :-)
list($ret) = SQL_FETCHROW($result);
@@ -979,13 +983,13 @@ function GET_CATEGORY ($cid) {
}
// Get a string of "mail title" and price back
-function GET_PAYMENT ($pid, $full=false) {
+function getPaymentTitlePrice ($pid, $full=false) {
// Default is not found
$ret = getMessage('_PAYMENT_404');
// 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__);
+ $result = SQL_QUERY_ESC("SELECT mail_title, price FROM `{!_MYSQL_PREFIX!}_payments` WHERE `id`=%s LIMIT 1",
+ array(bigintval($pid)), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Payment type found... :-)
if (!$full) {
@@ -994,7 +998,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.' / '.translateComma($p).' {!POINTS!}';
}
}
@@ -1006,20 +1010,29 @@ function GET_PAYMENT ($pid, $full=false) {
}
// Get (basicly) the price of given payment id
-function GET_PAY_POINTS ($pid, $lookFor = 'price') {
+function getPaymentPoints ($pid, $lookFor = 'price') {
+ // Default value...
$ret = '-1';
- $result = SQL_QUERY_ESC("SELECT %s FROM `{!_MYSQL_PREFIX!}_payments` WHERE id=%s LIMIT 1",
- array($lookFor, $pid), __FUNCTION__, __LINE__);
+
+ // 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__);
+
+ // Is the entry there?
if (SQL_NUMROWS($result) == 1) {
// Payment type found... :-)
list($ret) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
- }
+ } // END - if
+
+ // Free result
+ SQL_FREERESULT($result);
+
+ // Return value
return $ret;
}
// Remove a receiver's ID from $receivers and add a link for him to confirm
-function REMOVE_RECEIVER (&$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';
@@ -1035,14 +1048,14 @@ function REMOVE_RECEIVER (&$receivers, $key, $uid, $pool_id, $stats_id='', $bonu
if ($bonus) { $type = 'BONUS'; $rowName = 'bonus_id'; }
// Try to look the entry up
- $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), __FUNCTION__, __LINE__);
+ $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), __FUNCTION__, __LINE__);
// 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')",
- array($rowName, $stats_id, bigintval($uid), $type), __FUNCTION__, __LINE__);
+ array($rowName, $stats_id, bigintval($uid), $type), __FUNCTION__, __LINE__);
$ret = 'done';
} else {
// Already found
@@ -1067,22 +1080,22 @@ function GET_TOTAL_DATA ($search, $tableName, $lookFor = 'id', $whereStatement =
if ($countRows === true) {
// Count whole table
$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) FROM `{!_MYSQL_PREFIX!}_%s`".$add,
- array($lookFor, $tableName), __FUNCTION__, __LINE__);
+ array($lookFor, $tableName), __FUNCTION__, __LINE__);
} else {
// Sum whole table
$result = SQL_QUERY_ESC("SELECT SUM(`%s`) FROM `{!_MYSQL_PREFIX!}_%s`".$add,
- array($lookFor, $tableName), __FUNCTION__, __LINE__);
+ array($lookFor, $tableName), __FUNCTION__, __LINE__);
}
} elseif (($countRows === true) || ($lookFor == 'userid')) {
// Count rows
//* DEBUG: */ echo "COUNT!
\n";
$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) FROM `{!_MYSQL_PREFIX!}_%s` WHERE `%s`='%s'".$add,
- array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
+ array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
} else {
// Add all rows
//* DEBUG: */ echo "SUM!
\n";
$result = SQL_QUERY_ESC("SELECT SUM(`%s`) FROM `{!_MYSQL_PREFIX!}_%s` WHERE `%s`='%s'".$add,
- array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
+ array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
}
// Load row
@@ -1104,7 +1117,7 @@ function GET_TOTAL_DATA ($search, $tableName, $lookFor = 'id', $whereStatement =
return $ret;
}
// Getter fro ref level percents
-function GET_REF_LEVEL_PERCENTS ($level) {
+function getReferalLevelPercents ($level) {
// Default is zero
$per = 0;
@@ -1122,7 +1135,7 @@ function GET_REF_LEVEL_PERCENTS ($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) {
@@ -1137,6 +1150,7 @@ function GET_REF_LEVEL_PERCENTS ($level) {
// Return percent
return $per;
}
+
/**
*
* Dynamic referal system, can also send mails!
@@ -1147,10 +1161,10 @@ function GET_REF_LEVEL_PERCENTS ($level) {
* send_notify = shall I send the referal an email or not?
* rid = inc/modules/guest/what-confirm.php need this (DEPRECATED???)
* locked = Shall I pay it to normal (false) or locked (true) points ammount?
- * add_mode = Add points only to $uid or also refs? (WARNING! Changing "ref" to "direct"
+ * add_mode = Add points only to $uid or also refs? (WARNING! Changing 'ref' to 'direct'
* for default value will cause no referal will get points ever!!!)
*/
-function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid='0', $locked=false, $add_mode='ref') {
+function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify = false, $rid = '0', $locked = false, $add_mode = 'ref') {
//* DEBUG: */ print "----------------------- ".__FUNCTION__." - ENTRY ------------------------- \n";
global $DATA;
@@ -1189,7 +1203,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
// 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__);
+ 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) {
@@ -1198,7 +1212,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
$GLOBALS['cache_array']['add_uid'][$ref] = $uid;
// Get percents
- $per = GET_REF_LEVEL_PERCENTS($GLOBALS['ref_level']);
+ $per = getReferalLevelPercents($GLOBALS['ref_level']);
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):uid={$uid},points={$points},depth={$GLOBALS['ref_level']},per={$per},mode={$add_mode}
\n";
// Some percents found?
@@ -1216,14 +1230,14 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
// 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__);
+ 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
@@ -1246,22 +1260,22 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
// Load email template
$msg = LOAD_EMAIL_TEMPLATE('confirm-referal', $content, bigintval($uid));
- SEND_EMAIL($email, THANX_REFERRAL_ONE, $msg);
- } elseif (($send_notify) && ($ref == 0) && (!$locked) && ($add_mode == "direct") && (!defined('__POINTS_VALUE'))) {
+ sendEmail($email, THANX_REFERRAL_ONE, $msg);
+ } elseif (($send_notify) && ($ref == 0) && (!$locked) && ($add_mode == 'direct') && (!defined('__POINTS_VALUE'))) {
// Direct payment shall be notified about
define('__POINTS_VALUE', $ref_points);
// Prepare content
$content = array(
'text' => getMessage('REASON_DIRECT_PAYMENT'),
- 'points' => TRANSLATE_COMMA($ref_points)
+ 'points' => translateComma($ref_points)
);
// Load message
$msg = LOAD_EMAIL_TEMPLATE('add-points', $content, $uid);
// And sent it away
- SEND_EMAIL($email, getMessage('SUBJECT_DIRECT_PAYMENT'), $msg);
+ sendEmail($email, getMessage('SUBJECT_DIRECT_PAYMENT'), $msg);
if (!REQUEST_ISSET_GET(('mid'))) LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
}
@@ -1278,28 +1292,34 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
SQL_FREERESULT($result_user);
//* DEBUG: */ print "
----------------------- ".__FUNCTION__." - EXIT ------------------------
\n";
}
-//
-function UPDATE_REF_COUNTER ($uid) {
+
+// Wrapper function for ADD_POINTS_REFSYSTEM()
+function ADD_POINTS_REFSYSTEM_DIRECT ($subject, $uid, $points) {
+ return ADD_POINTS_REFSYSTEM($subject, $uid, $points, false, 0, false, 'direct');
+}
+
+// Updates the referal counter
+function updateReferalCounter ($uid) {
// Make it sure referal level zero (member him-/herself) is at least selected
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), $GLOBALS['cache_array']['ref_level'][$uid]), __FUNCTION__, __LINE__);
+ 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)",
- array(bigintval($uid), $GLOBALS['cache_array']['ref_level'][$uid]), __FUNCTION__, __LINE__);
+ 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",
- array(bigintval($uid)), __FUNCTION__, __LINE__);
+ array(bigintval($uid)), __FUNCTION__, __LINE__);
// Load refid
list($ref) = SQL_FETCHROW($result);
@@ -1312,7 +1332,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";
- $GLOBALS['cache_array']['ref_level'][$uid]++; UPDATE_REF_COUNTER($ref);
+ $GLOBALS['cache_array']['ref_level'][$uid]++; updateReferalCounter($ref);
} elseif ((($ref == $uid) || ($ref == 0)) && (GET_EXT_VERSION('cache') >= '0.1.2')) {
// Remove cache here
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):ref={$ref} - CACHE!
\n";
@@ -1324,7 +1344,7 @@ function UPDATE_REF_COUNTER ($uid) {
// Handle refback here if extension is installed
if (EXT_IS_ACTIVE('refback')) {
- UPDATE_REFBACK_table($uid);
+ updateRefbackTable($uid);
} // END - if
}
@@ -1335,7 +1355,7 @@ function SEND_ADMIN_EMAILS ($subj, $msg) {
$result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id` ASC", __FUNCTION__, __LINE__);
while ($content = SQL_FETCHARRAY($result)) {
// Send the email out
- SEND_EMAIL($content['email'], $subj, $msg);
+ sendEmail($content['email'], $subj, $msg);
} // END - if
// Free result
@@ -1358,8 +1378,8 @@ function GET_ADMIN_ID ($login) {
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), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",
+ array($login), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
list($ret) = SQL_FETCHROW($result);
} // END - if
@@ -1371,9 +1391,9 @@ function GET_ADMIN_ID ($login) {
}
// "Getter" for current admin id
-function GET_CURRENT_ADMIN_ID () {
+function getCurrentAdminId () {
// Get the admin login from session
- $adminLogin = get_session('admin_login');
+ $adminLogin = getSession('admin_login');
// "Solve" it into an id
$adminId = GET_ADMIN_ID($adminLogin);
@@ -1395,8 +1415,8 @@ function GET_ADMIN_HASH ($aid) {
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",
- array($aid), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT password FROM `{!_MYSQL_PREFIX!}_admins` WHERE `id`=%s LIMIT 1",
+ array($aid), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Fetch data
list($ret) = SQL_FETCHROW($result);
@@ -1410,8 +1430,9 @@ function GET_ADMIN_HASH ($aid) {
}
return $ret;
}
-//
-function GET_ADMIN_LOGIN ($aid) {
+
+// "Getter" for admin login
+function getAdminLogin ($aid) {
// By default a non-existent login is returned (other functions react on this!)
$ret = '***';
@@ -1423,8 +1444,8 @@ function GET_ADMIN_LOGIN ($aid) {
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",
- array(bigintval($aid)), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT login FROM `{!_MYSQL_PREFIX!}_admins` WHERE `id`=%s LIMIT 1",
+ array(bigintval($aid)), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Fetch data
list($ret) = SQL_FETCHROW($result);
@@ -1438,8 +1459,9 @@ function GET_ADMIN_LOGIN ($aid) {
}
return $ret;
}
+
// Get email address of admin id
-function GET_ADMIN_EMAIL ($aid) {
+function getAdminEmail ($aid) {
// By default an invalid emails is returned
$ret = '***';
@@ -1451,15 +1473,15 @@ function GET_ADMIN_EMAIL ($aid) {
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",
- array(bigintval($aid)), __FUNCTION__, __LINE__);
+ $result_aid = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` WHERE `id`=%s LIMIT 1",
+ 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);
@@ -1468,8 +1490,9 @@ function GET_ADMIN_EMAIL ($aid) {
// Return email
return $ret;
}
+
// Get default ACL of admin id
-function GET_ADMIN_DEFAULT_ACL ($aid) {
+function getAdminDefaultAcl ($aid) {
// By default an invalid ACL value is returned
$ret = '***';
@@ -1485,8 +1508,8 @@ function GET_ADMIN_DEFAULT_ACL ($aid) {
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",
- array(bigintval($aid)), __FUNCTION__, __LINE__);
+ $result_aid = SQL_QUERY_ESC("SELECT default_acl FROM `{!_MYSQL_PREFIX!}_admins` WHERE `id`=%s LIMIT 1",
+ array(bigintval($aid)), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result_aid) == 1) {
// Fetch data
list($ret) = SQL_FETCHROW($result_aid);
@@ -1502,8 +1525,9 @@ function GET_ADMIN_DEFAULT_ACL ($aid) {
// Return email
return $ret;
}
-//
-function ADD_OPTION_LINES ($table, $id, $name, $default='', $special='', $where='') {
+
+// Generates an option list from various parameters
+function generateOptionList ($table, $id, $name, $default='', $special='', $where='') {
$ret = '';
if ($table == '/ARRAY/') {
// Selection from array
@@ -1518,11 +1542,11 @@ function ADD_OPTION_LINES ($table, $id, $name, $default='', $special='', $where=
} else {
// Data from database
$SPEC = ', '.$id;
- if (!empty($special)) $SPEC = ', '.$special;
+ 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), __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()
@@ -1560,22 +1584,22 @@ function activateExchange () {
// Activate System
SET_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!}_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
}
-//
-function DELETE_USER_ACCOUNT ($uid, $reason) {
+// Deletes a user account with given reason
+function deleteUserAccount ($uid, $reason) {
$points = 0;
$result = SQL_QUERY_ESC("SELECT (SUM(p.points) - d.used_points) AS points
FROM `{!_MYSQL_PREFIX!}_user_points` AS p
@@ -1585,7 +1609,6 @@ WHERE p.userid=%s", array(bigintval($uid)), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Save his points to add them to the jackpot
list($points) = SQL_FETCHROW($result);
- 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)), __FUNCTION__, __LINE__);
@@ -1598,32 +1621,35 @@ WHERE p.userid=%s", array(bigintval($uid)), __FUNCTION__, __LINE__);
// Now, when we have all his points adds them do the jackpot!
ADD_JACKPOT($points);
- }
+ } // END - if
+
+ // Free the result
+ 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__);
+ 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__);
- }
+ 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);
- SEND_EMAIL($uid, getMessage('ADMIN_DEL_ACCOUNT'), $msg);
+ $msg = LOAD_EMAIL_TEMPLATE('del-user', array('text' => $reason), $uid);
+ sendEmail($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)), __FUNCTION__, __LINE__);
}
-//
-function META_DESCRIPTION ($mod, $wht) {
+// Generates meta description for given module and 'what' value
+function generateMetaDescriptionCode ($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('');
@@ -1632,8 +1658,9 @@ function META_DESCRIPTION ($mod, $wht) {
// Remove depth
unset($GLOBALS['ref_level']);
}
-//
-function ADD_JACKPOT($points) {
+
+// Adds points to the jackpot
+function ADD_JACKPOT ($points) {
$result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 0) {
// Create line
@@ -1644,11 +1671,12 @@ 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__);
}
}
-//
-function SUB_JACKPOT($points) {
+
+// Subtracts points from the jackpot
+function SUB_JACKPOT ($points) {
// First failed
$ret = '-1';
@@ -1663,7 +1691,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
}
@@ -1674,11 +1702,11 @@ function SUB_JACKPOT($points) {
// Checks wether the extension demo is actuve and the admin login is demo (password needs to be demo, too!)
function IS_DEMO () {
- return ((EXT_IS_ACTIVE('demo')) && (get_session('admin_login') == 'demo'));
+ return ((EXT_IS_ACTIVE('demo')) && (getSession('admin_login') == 'demo'));
}
// Gets the matching what name from module
-function GET_WHAT ($modCheck) {
+function getWhatFromModule ($modCheck) {
// Is the request element set?
if (REQUEST_ISSET_GET('what')) {
// Then return this!
@@ -1686,22 +1714,22 @@ function GET_WHAT ($modCheck) {
} // END - if
$wht = '';
- //* DEBUG: */ echo __LINE__."!".$modCheck."!
\n";
+ //* 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;
-
- default:
- $wht = '';
- break;
+ case 'admin':
+ $wht = 'overview';
+ break;
+
+ case 'login':
+ case 'index':
+ $wht = 'welcome';
+ if (($modCheck == 'index') && (getConfig('index_home') != '')) $wht = getConfig('index_home');
+ break;
+
+ default:
+ $wht = '';
+ break;
}
// Return what value
@@ -1712,7 +1740,7 @@ function GET_WHAT ($modCheck) {
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__);
+ array($points, bigintval($uid)), __FUNCTION__, __LINE__);
// Insert booking record
if (EXT_IS_ACTIVE('booking')) {
@@ -1728,7 +1756,7 @@ function SUB_POINTS ($subject, $uid, $points) {
}
// Update config entries
-function UPDATE_CONFIG ($entries, $values, $updateMode='') {
+function updateConfiguration ($entries, $values, $updateMode='') {
// Do not update config in CSS mode
if (($GLOBALS['output_mode'] == '1') || ($GLOBALS['output_mode'] == -1)) {
return;
@@ -1789,6 +1817,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode='') {
}
// Prepares an SQL statement part for HTML mail and/or holiday depency
+// @TODO Can this be rewritten to a filter?
function PREPARE_SQL_HTML_HOLIDAY ($mode) {
// Exclude no users by default
$MORE = '';
@@ -1805,12 +1834,12 @@ function PREPARE_SQL_HTML_HOLIDAY ($mode) {
}
// "Getter" for total available receivers
-function GET_TOTAL_RECEIVERS ($mode='normal') {
+function getTotalReceivers ($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),
- __FUNCTION__, __LINE__);
+ __FUNCTION__, __LINE__);
// Get num rows
$numRows = SQL_NUMROWS($result_all);
@@ -1823,7 +1852,7 @@ WHERE `status`='CONFIRMED' AND receive_mails > 0 ".PREPARE_SQL_HTML_HOLIDAY($mod
}
// Returns HTML code with an "