X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=be375eea693240de433a91fd2ff6667ca89417d4;hp=e4ef99b7002818d881166f91de7c301e61aa6422;hb=7b0f17cd637e388049d2167811e4332cec1e979b;hpb=aea4f2a51ffa6f483056c6ce167c8c6fd8ca6129 diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index e4ef99b700..be375eea69 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; @@ -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 @@ -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"; @@ -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 @@ -275,7 +301,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { 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"; @@ -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 @@ -373,12 +399,12 @@ 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"; + //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$main_action.'/'.$sub_what.':'.$GLOBALS['what']."*
\n"; if (SQL_NUMROWS($result_main) > 0) { OUTPUT_HTML(""); // There are menus available, so we simply display them... :) while ($content = SQL_FETCHARRAY($result_main)) { - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$sub_what.":".$GLOBALS['what']."*
\n"; + //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$sub_what.':'.$GLOBALS['what']."*
\n"; // Init variables $GLOBALS['block_mode'] = false; $act = $content['action']; @@ -409,13 +435,13 @@ function ADD_MENU ($mode, $act, $wht) { // Full file name for checking menu //* DEBUG: */ echo __LINE__.":!!!!".$content['sub_what']."!!!
\n"; $INC = sprintf("inc/modules/%s/what-%s.php", $mode, $content['sub_what']); - if (INCLUDE_READABLE($INC)) { + if (isIncludeReadable($INC)) { if ((!empty($wht)) && (($wht == $content['sub_what']))) { $OUT = ""; } // Navigation link - $OUT .= ""; + $OUT .= ""; } else { $OUT .= ""; } @@ -423,7 +449,7 @@ function ADD_MENU ($mode, $act, $wht) { // Menu title $OUT .= getConfig('menu_blur_spacer') . $content['sub_title']; - if (INCLUDE_READABLE($INC)) { + if (isIncludeReadable($INC)) { $OUT .= ""; } else { $OUT .= ""; @@ -453,21 +479,21 @@ function ADD_MENU ($mode, $act, $wht) { // This is a menu block... ;-) $GLOBALS['block_mode'] = true; $INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']); - if (FILE_READABLE($INC_BLOCK)) { + if (isFileReadable($INC_BLOCK)) { // Load include file if ((!EXT_IS_ACTIVE($content['action'])) || ($content['action'] == 'online')) OUTPUT_HTML(""); } - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*
\n"; + //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*
\n"; } $main_cnt++; - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*
\n"; + //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*
\n"; if (SQL_NUMROWS($result_main) > $main_cnt) { OUTPUT_HTML(""); } // END - if @@ -477,13 +503,79 @@ function ADD_MENU ($mode, $act, $wht) { SQL_FREERESULT($result_main); // Close table - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*
\n"; + //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*
\n"; OUTPUT_HTML("
"); - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*
\n"; - LOAD_INC($INC_BLOCK); - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*
\n"; + //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*
\n"; + loadInclude($INC_BLOCK); + //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*
\n"; if ((!EXT_IS_ACTIVE($content['action'])) || ($content['action'] == 'online')) 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'])) { @@ -533,7 +625,7 @@ 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')))); } @@ -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; @@ -597,7 +689,7 @@ function ADD_MAX_RECEIVE_LIST ($mode, $default = "", $return = false) { } // Checks wether the given email address is used. -function SEARCH_EMAIL_USERTAB ($email) { +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__); @@ -612,74 +704,8 @@ function SEARCH_EMAIL_USERTAB ($email) { return $ret; } -// 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 - FIX_DELETED_COOKIES(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."
".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,7 +722,7 @@ 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", @@ -732,32 +758,7 @@ 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 @@ -768,11 +769,11 @@ function SEND_MODE_MAILS($mod, $modes) { 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__); @@ -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 = ''; @@ -799,16 +800,16 @@ function SEND_MODE_MAILS($mod, $modes) { case 'normal': break; // Do not add any special lines case 'email': // Email was changed! - $content = MEMBER_CHANGED_EMAIL.": ".REQUEST_POST('old_addy')."\n"; + $content = getMessage('MEMBER_CHANGED_EMAIL').": ".REQUEST_POST('old_addy')."\n"; break; case 'pass': // Password was changed - $content = MEMBER_CHANGED_PASS."\n"; + $content = getMessage('MEMBER_CHANGED_PASS')."\n"; break; default: DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode)); - $content = MEMBER_UNKNOWN_MODE.": ".$mode."\n\n"; + $content = getMessage('MEMBER_UNKNOWN_MODE').": ".$mode."\n\n"; break; } // END - switch } // END - if @@ -824,7 +825,7 @@ function SEND_MODE_MAILS($mod, $modes) { 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; + $sub_adm = getMessage('ADMIN_CHANGED_DATA'); } else { // No mail to admin $msg_admin = ''; @@ -832,15 +833,15 @@ function SEND_MODE_MAILS($mod, $modes) { } // Set subject lines - $sub_mem = MEMBER_CHANGED_DATA; + $sub_mem = getMessage('MEMBER_CHANGED_DATA'); // Output success message - $content = "".MYDATA_MAIL_SENT.""; + $content = "{--MYDATA_MAIL_SENT--}"; break; default: DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod)); - $content = "".UNKNOWN_MODULE.""; + $content = "{--UNKNOWN_MODULE--}"; break; } // END - switch } else { @@ -859,14 +860,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'); @@ -890,14 +891,14 @@ function countModuleHit($mod) { } // 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') { @@ -939,12 +940,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 +954,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,7 +964,7 @@ 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", + $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... :-) @@ -979,12 +980,12 @@ 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", + $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... :-) @@ -994,7 +995,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 +1007,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", + + // 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,7 +1045,7 @@ 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", + $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? @@ -1104,7 +1114,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; @@ -1137,6 +1147,7 @@ function GET_REF_LEVEL_PERCENTS ($level) { // Return percent return $per; } + /** * * Dynamic referal system, can also send mails! @@ -1147,10 +1158,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 ----------------------------------------------- ".__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"; @@ -1312,7 +1329,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 +1341,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 +1352,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,7 +1375,7 @@ 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", + $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); @@ -1371,9 +1388,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,7 +1412,7 @@ 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", + $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 @@ -1410,8 +1427,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,7 +1441,7 @@ 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", + $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 @@ -1438,8 +1456,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,7 +1470,7 @@ 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", + $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 @@ -1468,8 +1487,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,7 +1505,7 @@ 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", + $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 @@ -1502,8 +1522,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,7 +1539,7 @@ 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", @@ -1560,8 +1581,8 @@ 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 @@ -1574,8 +1595,8 @@ function activateExchange () { } // 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 @@ -1612,14 +1633,14 @@ WHERE p.userid=%s", array(bigintval($uid)), __FUNCTION__, __LINE__); // 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); + 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 @@ -1632,7 +1653,8 @@ function META_DESCRIPTION ($mod, $wht) { // Remove depth unset($GLOBALS['ref_level']); } -// + +// 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) { @@ -1647,7 +1669,8 @@ function ADD_JACKPOT($points) { array($points), __FUNCTION__, __LINE__); } } -// + +// Subtracts points from the jackpot function SUB_JACKPOT($points) { // First failed $ret = '-1'; @@ -1674,11 +1697,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,7 +1709,7 @@ function GET_WHAT ($modCheck) { } // END - if $wht = ''; - //* DEBUG: */ echo __LINE__."!".$modCheck."!
\n"; + //* DEBUG: */ echo __LINE__.'!'.$modCheck."!
\n"; switch ($modCheck) { case 'admin': @@ -1728,7 +1751,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 +1812,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,7 +1829,7 @@ 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` @@ -1823,7 +1847,7 @@ WHERE `status`='CONFIRMED' AND receive_mails > 0 ".PREPARE_SQL_HTML_HOLIDAY($mod } // Returns HTML code with an "