X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fmysql-manager.php;h=44e848747020d5efa5fb0dd5cc999045bfc4bde4;hb=902dd0454500594224108e87679dbfadacd4de68;hp=b2614077ab6e067e6fd08a9938f8bf5be0e94290;hpb=96fbb6280e24471eb264ed90ba4d31f5dce44580;p=mailer.git
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index b2614077ab..44e8487470 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -18,6 +18,7 @@
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -42,29 +43,29 @@ if (!defined('__SECURITY')) {
} // END - if
// "Getter" for module title
-function getModuleTitle ($mod) {
+function getModuleTitle ($module) {
// Init variables
- $title = '';
+ $data['title'] = '';
$result = false;
// Is the script installed?
if (isInstalled()) {
// Check if cache is valid
- if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isset($GLOBALS['cache_array']['modules']['module'])) && (in_array($mod, $GLOBALS['cache_array']['modules']['module']))) {
+ if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isset($GLOBALS['cache_array']['modules']['module'])) && (in_array($module, $GLOBALS['cache_array']['modules']['module']))) {
// Load from cache
- $title = $GLOBALS['cache_array']['modules']['title'][$mod];
+ $data['title'] = $GLOBALS['cache_array']['modules']['title'][$module];
// Update cache hits
incrementStatsEntry('cache_hits');
} elseif (!isExtensionActive('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($module), __FUNCTION__, __LINE__);
// Is the entry there?
if (SQL_NUMROWS($result)) {
// Get the title from database
- list($title) = SQL_FETCHROW($result);
+ $data = SQL_FETCHARRAY($result);
} // END - if
// Free the result
@@ -73,74 +74,78 @@ function getModuleTitle ($mod) {
} // END - if
// Trim name
- $title = trim($title);
+ $data['title'] = trim($data['title']);
// Still no luck or empty title?
- if (empty($title)) {
+ if (empty($data['title'])) {
// No name found
- $title = sprintf("%s (%s)", getMessage('LANG_UNKNOWN_MODULE'), $mod);
- if (SQL_NUMROWS($result) == '0') {
+ $data['title'] = sprintf("%s (%s)", getMessage('LANG_UNKNOWN_MODULE'), $module);
+ if ((is_resource($result)) && (SQL_HASZERONUMS($result))) {
// Add module to database
- $dummy = checkModulePermissions($mod);
+ $dummy = checkModulePermissions($module);
} // END - if
} // END - if
// Return name
- return $title;
+ return $data['title'];
}
// "Getter" for module description
// @TODO Can we cache this?
-function getModuleDescription ($mode, $what, $column = 'what') {
+function getTitleFromMenu ($mode, $what, $column = 'what', $ADD='') {
// Fix empty 'what'
if (empty($what)) {
$what = getConfig('index_home');
} // END - if
// Default is not found
- $ret = '??? (' . $what . ')';
+ $data['title'] = '??? (' . $what . ')';
// Look for title
- $result = SQL_QUERY_ESC("SELECT `title` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE %s='%s' LIMIT 1",
- array($mode, $column, $what), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `title` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `%s`='%s'" . $ADD . " LIMIT 1",
+ array(
+ $mode,
+ $column,
+ $what
+ ), __FUNCTION__, __LINE__);
// Is there an entry?
if (SQL_NUMROWS($result) == 1) {
// Fetch the title
- list($ret) = SQL_FETCHROW($result);
+ $data = SQL_FETCHARRAY($result);
} // END - if
// Free result
SQL_FREERESULT($result);
// Return it
- return $ret;
+ return $data['title'];
}
// Check validity of a given module name (no file extension)
-function checkModulePermissions ($mod = '') {
+function checkModulePermissions ($module = '') {
// Is it empty (default), then take the current one
- if (empty($mod)) $mod = getModule();
+ if (empty($module)) $module = getModule();
// Do we have cache?
- if (isset($GLOBALS['module_status'][$mod])) {
+ if (isset($GLOBALS['module_status'][$module])) {
// Then use it
- return $GLOBALS['module_status'][$mod];
+ return $GLOBALS['module_status'][$module];
} // END - if
// Filter module name (names with low chars and underlines are fine!)
- $mod = preg_replace('/[^a-z_]/', '', $mod);
+ $module = preg_replace('/[^a-z_]/', '', $module);
// Check for prefix is a extension...
- $modSplit = explode('_', $mod);
- $extension = ''; $mod_chk = $mod;
- //* DEBUG: */ print(__LINE__."*".count($modSplit)."*/".$mod."*
");
+ $modSplit = explode('_', $module);
+ $extension = ''; $module_chk = $module;
+ //* DEBUG: */ print(__LINE__."*".count($modSplit)."*/".$module."*
");
if (count($modSplit) == 2) {
// Okay, there is a seperator (_) in the name so is the first part a module?
//* DEBUG: */ print(__LINE__."*".$modSplit[0]."*
");
if (isExtensionActive($modSplit[0])) {
// The prefix is an extension's name, so let's set it
- $extension = $modSplit[0]; $mod = $modSplit[1];
+ $extension = $modSplit[0]; $module = $modSplit[1];
} // END - if
} // END - if
@@ -153,24 +158,28 @@ function checkModulePermissions ($mod = '') {
return 'done';
} // END - if
- // Init variables
- $locked = 'Y';
- $hidden = 'N';
- $admin = 'N';
- $mem = 'N';
+ // Init data array
+ $data = array(
+ 'locked' => 'Y',
+ 'hidden' => 'N',
+ 'admin_only' => 'N',
+ 'mem_only' => 'N'
+ );
+
+ // By default nothing is found
$found = false;
// Check if cache is latest version
if (isExtensionInstalledAndNewer('cache', '0.1.2')) {
// Is the cache there?
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using cache.');
- if (isset($GLOBALS['cache_array']['modules']['locked'][$mod_chk])) {
+ if (isset($GLOBALS['cache_array']['modules']['locked'][$module_chk])) {
// Check cache
//* DEBUG: */ logDebugMessage(__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];
- $mem = $GLOBALS['cache_array']['modules']['mem_only'][$mod_chk];
+ $data['locked'] = $GLOBALS['cache_array']['modules']['locked'][$module_chk];
+ $data['hidden'] = $GLOBALS['cache_array']['modules']['hidden'][$module_chk];
+ $data['admin_only'] = $GLOBALS['cache_array']['modules']['admin_only'][$module_chk];
+ $data['mem_only'] = $GLOBALS['cache_array']['modules']['mem_only'][$module_chk];
// Update cache hits
incrementStatsEntry('cache_hits');
@@ -183,15 +192,15 @@ function checkModulePermissions ($mod = '') {
// Check for module in database
//* DEBUG: */ logDebugMessage(__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__);
+ array($module_chk), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Read data
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Entry found.');
- list($locked, $hidden, $admin, $mem) = SQL_FETCHROW($result);
+ $data = SQL_FETCHARRAY($result);
$found = true;
} elseif (isDebugModeEnabled()) {
// Debug message only in debug-mode...
- logDebugMessage(__FUNCTION__, __LINE__, 'Module ' . $mod_chk . ' not found!');
+ logDebugMessage(__FUNCTION__, __LINE__, 'Module ' . $module_chk . ' not found!');
}
// Free result
@@ -203,26 +212,26 @@ function checkModulePermissions ($mod = '') {
if ($found === true) {
// Check returned values against current access permissions
//
- // Admin access ----- Guest access ----- --- Guest or member? ---
- if ((isAdmin()) || (($locked != 'Y') && ($admin != 'Y') && (($mem != 'Y') || (isMember())))) {
+ // Admin access ----- Guest access ----- --- Guest or member? ---
+ if ((isAdmin()) || (($data['locked'] != 'Y') && ($data['admin_only'] != 'Y') && (($data['mem_only'] != 'Y') || (isMember())))) {
// If you are admin you are welcome for everything!
$ret = 'done';
- } elseif ($locked == 'Y') {
+ } elseif ($data['locked'] == 'Y') {
// Module is locked
$ret = 'locked';
- } elseif (($mem == 'Y') && (!isMember())) {
+ } elseif (($data['mem_only'] == 'Y') && (!isMember())) {
// You have to login first!
$ret = 'mem_only';
- } elseif (($admin == 'Y') && (!isAdmin())) {
+ } elseif (($data['admin_only'] == 'Y') && (!isAdmin())) {
// Only the Admin is allowed to enter this module!
$ret = 'admin_only';
} else {
// @TODO Nothing helped???
logDebugMessage(__FUNCTION__, __LINE__, sprintf("ret=%s,locked=%s,admin=%s,mem=%s",
$ret,
- $locked,
- $admin,
- $mem
+ $data['locked'],
+ $data['admin_only'],
+ $data['mem_only']
));
}
} // END - if
@@ -230,19 +239,19 @@ function checkModulePermissions ($mod = '') {
// Still no luck or not found?
if (($found === false) && (!isExtensionActive('cache')) && ($ret != 'done')) {
// ----- Legacy module ----- ---- Module in base folder ---- --- Module with extension's name ---
- if ((isIncludeReadable(sprintf("inc/modules/%s.php", $mod))) || (isIncludeReadable(sprintf("%s.php", $mod))) || (isIncludeReadable(sprintf("%s/%s.php", $extension, $mod)))) {
+ if ((isIncludeReadable(sprintf("inc/modules/%s.php", $module))) || (isIncludeReadable(sprintf("%s.php", $module))) || (isIncludeReadable(sprintf("%s/%s.php", $extension, $module)))) {
// Data is missing so we add it
if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) {
// Since 0.3.6 we have a has_menu column, this took me a half hour
// to find a loop here... *sigh*
SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg`
(`module`, `locked`, `hidden`, `mem_only`, `admin_only`, `has_menu`) VALUES
-('%s','Y','N','N','N','N')", array($mod_chk), __FUNCTION__, __LINE__);
+('%s','Y','N','N','N','N')", array($module_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
-('%s','Y','N','N','N')", array($mod_chk), __FUNCTION__, __LINE__);
+('%s','Y','N','N','N')", array($module_chk), __FUNCTION__, __LINE__);
}
// Everthing is fine?
@@ -253,103 +262,90 @@ function checkModulePermissions ($mod = '') {
// Destroy cache here
// @TODO Rewrite this to a filter
- if ((getOutputMode() == '0') || (getOutputMode() == -1)) rebuildCacheFile('modules', 'modules');
+ if ((getOutputMode() == '0') || (getOutputMode() == -1)) rebuildCache('modules', 'modules');
// And reload data
- unset($GLOBALS['module_status'][$mod]);
- $ret = checkModulePermissions($mod_chk);
+ unset($GLOBALS['module_status'][$module]);
+ $ret = checkModulePermissions($module_chk);
} else {
// Module not found we don't add it to the database
$ret = '404';
}
} elseif (($ret == 'cache_miss') && (getOutputMode() == '0')) {
// Rebuild the cache files
- rebuildCacheFile('modules', 'modules');
+ rebuildCache('modules', 'modules');
} elseif ($found === false) {
// Problem with module detected
logDebugMessage(__FUNCTION__, __LINE__, sprintf("Problem in module %s detected. ret=%s, locked=%s, hidden=%s, mem=%s, admin=%s, output_mode=%s",
- $mod,
+ $module,
$ret,
- $locked,
- $hidden,
- $mem,
- $admin,
+ $data['locked'],
+ $data['hidden'],
+ $data['mem_only'],
+ $data['admin_only'],
getOutputMode()
));
}
// Return the value
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . $ret);
- $GLOBALS['module_status'][$mod] = $ret;
+ $GLOBALS['module_status'][$module] = $ret;
return $ret;
}
// Add menu description pending on given file name (without path!)
-function addMenuDescription ($accessLevel, $FQFN, $return = false, $output = true) {
+function addMenuDescription ($accessLevel, $FQFN, $return = false) {
// Use only filename of the FQFN...
$file = basename($FQFN);
// Init variables
$LINK_ADD = '';
$OUT = '';
- $AND = '';
+ $ADD = '';
// First we have to do some analysis...
if (substr($file, 0, 7) == 'action-') {
// This is an action file!
$type = 'action';
$search = substr($file, 7);
- switch ($accessLevel) {
- case 'admin':
- $modCheck = 'admin';
- break;
-
- case 'sponsor':
- case 'guest':
- case 'member':
- $modCheck = getModule();
- break;
- }
- $AND = " AND (`what`='' OR `what` IS NULL)";
+
+ // Get access level from it
+ $modCheck = getModuleFromFileName($file, $accessLevel);
+
+ // Add what
+ $ADD = " AND (`what`='' OR `what` IS NULL)";
} elseif (substr($file, 0, 5) == 'what-') {
- // This is an admin what file!
+ // This is a 'what file'!
$type = 'what';
$search = substr($file, 5);
- $AND = '';
- switch ($accessLevel) {
- case 'admin':
- $modCheck = 'admin';
- break;
-
- case 'guest':
- case 'member':
- $modCheck = getModule();
- if (!isAdmin()) {
- $AND = " AND `visible`='Y' AND `locked`='N'";
- }
- break;
- }
+ $ADD = " AND `visible`='Y' AND `locked`='N'";
+
+ // Get access level from it
+ $modCheck = getModuleFromFileName($file, $accessLevel);
+
+ // Do we have admin? Then display all
+ if (isAdmin()) $ADD = '';
$dummy = substr($search, 0, -4);
- $AND .= " AND `action`='".getModeAction($accessLevel, $dummy)."'";
- } elseif (($accessLevel == 'sponsor') || ($accessLevel == "engine")) {
+ $ADD .= " AND `action`='".getActionFromModuleWhat($accessLevel, $dummy)."'";
+ } elseif (($accessLevel == 'sponsor') || ($accessLevel == 'engine')) {
// Sponsor / engine menu
$type = 'what';
$search = $file;
$modCheck = getModule();
- $AND = '';
+ $ADD = '';
} else {
// Other
$type = 'menu';
$search = $file;
$modCheck = getModule();
- $AND = '';
+ $ADD = '';
}
// Begin the navigation line
if ((!isset($GLOBALS['nav_depth'])) && ($return === false)) {
$GLOBALS['nav_depth'] = '0';
- $prefix = "
{--YOU_ARE_HERE--}
Home";
+ $prefix = '
{--YOU_ARE_HERE--}
Home';
} else {
if ($return === false) $GLOBALS['nav_depth']++;
$prefix = '';
@@ -363,48 +359,33 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false, $output = tru
$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($accessLevel, $type, $search), __FUNCTION__, __LINE__);
+ if (((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (getConfig('youre_here') == 'Y')) || ((isAdmin()) && ($modCheck == 'admin'))) {
+ // Output HTML code
+ $OUT = $prefix . '
' . getTitleFromMenu($accessLevel, $search, $type, $ADD) . '';
- // Menu found?
- if (SQL_NUMROWS($result) == 1) {
- // Load title
- list($ret) = SQL_FETCHROW($result);
-
- // Shall we return it?
- if ($return === true) {
- // Return title
- return $ret;
- } elseif (((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (getConfig('youre_here') == 'Y')) || ((isAdmin()) && ($modCheck == 'admin'))) {
- // Output HTML code
- $OUT = $prefix . "
" . $ret . "\n";
-
- // Can we close the you-are-here navigation?
- //* DEBUG: */ print(__LINE__."*".$type.'/'.getWhat()."*
");
- if (($type == 'what') || (($type == 'action') && ((!isWhatSet()) || (getWhat() == 'overview')))) {
- //* DEBUG: */ print(__LINE__.'+'.$type."+
");
- // Add closing div and br-tag
- $OUT .= "
\n";
- $GLOBALS['nav_depth'] = '0';
-
- // Run the filter chain
- $ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ""));
- $OUT .= $ret['content'];
- } // END - if
- }
- } // END - if
+ // Can we close the you-are-here navigation?
+ //* DEBUG: */ print(__LINE__."*".$type.'/'.getWhat()."*
");
+ if (($type == 'what') || (($type == 'action') && ((!isWhatSet()) || (getWhat() == 'overview')))) {
+ //* DEBUG: */ print(__LINE__.'+'.$type."+
");
+ // Add closing div and br-tag
+ $OUT .= '
';
+ $GLOBALS['nav_depth'] = '0';
- // Free result
- SQL_FREERESULT($result);
+ // Run the filter chain
+ $ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ''));
+
+ // Add additional content
+ $OUT .= $ret['content'];
+ } // END - if
+ }
// Return or output HTML code?
- if ($output) {
- // Output HTML code here
- outputHtml($OUT);
- } else {
+ if ($return === true) {
// Return HTML code
return $OUT;
+ } else {
+ // Output HTML code here
+ outputHtml($OUT);
}
}
@@ -412,7 +393,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false, $output = tru
function addMenu ($mode, $action, $what) {
// Init some variables
$main_cnt = '0';
- $AND = '';
+ $ADD = '';
// is the menu action valid?
if (!isMenuActionValid($mode, $action, $what, true)) {
@@ -421,11 +402,11 @@ function addMenu ($mode, $action, $what) {
// Non-admin shall not see all menus
if (!isAdmin()) {
- $AND = " AND `visible`='Y' AND `locked`='N'";
+ $ADD = " AND `visible`='Y' AND `locked`='N'";
} // 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` ASC",
+ $result_main = SQL_QUERY_ESC("SELECT `title`, `action` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL)".$ADD." ORDER BY `sort` ASC",
array($mode), __FUNCTION__, __LINE__);
//* DEBUG: */ print(__LINE__.'/'.$main_cnt.':'.getWhat()."*
");
@@ -442,7 +423,7 @@ function addMenu ($mode, $action, $what) {
$GLOBALS['rows'] .= loadTemplate($mode . '_menu_title', true, $content);
// Sub menu
- $result_sub = SQL_QUERY_ESC("SELECT `title` AS sub_title, `what` AS sub_what FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$AND." ORDER BY `sort`",
+ $result_sub = SQL_QUERY_ESC("SELECT `title` AS sub_title, `what` AS sub_what FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$ADD." ORDER BY `sort`",
array($mode, $content['action']), __FUNCTION__, __LINE__);
// Get number of rows
@@ -467,29 +448,29 @@ function addMenu ($mode, $action, $what) {
if (isIncludeReadable($inc)) {
// Mark currently selected menu - open
if ((!empty($what)) && (($what == $content['sub_what']))) {
- $OUT = "";
+ $OUT = '';
} // END - if
// Navigation link
- $OUT .= "";
+ $OUT .= '';
// Mark currently selected menu - close
if ((!empty($what)) && (($what == $content['sub_what']))) {
- $OUT .= "";
+ $OUT .= '';
} // END - if
} else {
// Not found! - close
- $OUT .= "";
+ $OUT .= '';
}
// Cunt it up
@@ -579,16 +560,20 @@ function isMember () {
// is the cache entry there?
if (isset($GLOBALS['is_member'])) {
// Then return it
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHED! (' . intval($GLOBALS['is_member']) . ')');
return $GLOBALS['is_member'];
- } elseif (getMemberId() == '0') {
+ } elseif ((!isSessionVariableSet('userid')) || (!isSessionVariableSet('u_hash'))) {
// No member
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No member set in cookie/session.');
return false;
} else {
- // Transfer userid=>current
- setCurrentUserid(getMemberId());
+ // Get it secured from session
+ setMemberId(getSession('userid'));
+ setCurrentUserId(getMemberId());
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . getSession('userid') . ' used from cookie/session.');
}
- // Init global user data array
+ // Init user data array
initUserData();
// Fix "deleted" cookies first
@@ -599,7 +584,7 @@ function isMember () {
// Cookies are set with values, but are they valid?
if (fetchUserData(getMemberId()) === true) {
// Validate password by created the difference of it and the secret key
- $valPass = generatePassString(getUserData('password'));
+ $valPass = encodeHashForCookie(getUserData('password'));
// Transfer last module and online time
$GLOBALS['last_online']['module'] = getUserData('last_module');
@@ -611,15 +596,17 @@ function isMember () {
$ret = true;
} else {
// Maybe got locked etc.
- logDebugMessage(__FUNCTION__, __LINE__, 'status=' . getUserData('status'));
+ //* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'status=' . getUserData('status') . ',' . $valPass . '(' . strlen($valPass) . ')/' . getSession('u_hash') . '(' . strlen(getSession('u_hash')) . ')/' . getUserData('password') . '(' . strlen(getUserData('password')) . ')');
destroyMemberSession();
}
} else {
// Cookie data is invalid!
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cookie data invalid or user not found.');
destroyMemberSession();
}
} else {
// Cookie data is invalid!
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cookie data not complete.');
destroyMemberSession();
}
@@ -627,11 +614,12 @@ function isMember () {
$GLOBALS['is_member'] = $ret;
// Return status
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . intval($ret));
return $ret;
}
// Fetch user data for given user id
-function fetchUserData ($userid, $column='userid') {
+function fetchUserData ($userid, $column = 'userid') {
// If we should look for userid secure&set it here
if (substr($column, -2, 2) == 'id') {
// Secure userid
@@ -657,8 +645,12 @@ function fetchUserData ($userid, $column='userid') {
// By default none was found
$found = false;
+ // Extra statements
+ $ADD = '';
+ if (isExtensionInstalledAndNewer('user', '0.3.5')) $ADD = ', UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`';
+
// Query for the user
- $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT *".$ADD." FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1",
array($column, $userid), __FUNCTION__, __LINE__);
// Do we have a record?
@@ -709,68 +701,56 @@ function fetchUserData ($userid, $column='userid') {
}
// This patched function will reduce many SELECT queries for the specified or current admin login
-function isAdmin ($admin = '') {
+function isAdmin ($adminLogin = '') {
// Init variables
- $ret = false; $passCookie = ''; $valPass = '';
- //* DEBUG: */ print(__FUNCTION__.':'.$admin.'
');
+ $ret = false;
+ $passCookie = '';
+ $valPass = '';
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminLogin.'
');
// If admin login is not given take current from cookies...
- if ((empty($admin)) && (isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5'))) {
+ if ((empty($adminLogin)) && (isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5'))) {
// Get admin login and password from session/cookies
- $admin = getSession('admin_login');
+ $adminLogin = getSession('admin_login');
$passCookie = getSession('admin_md5');
} // END - if
- //* DEBUG: */ print(__FUNCTION__.':'.$admin.'/'.$passCookie.'
');
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminLogin.'/'.$passCookie.'
');
// Do we have cache?
- if (!isset($GLOBALS['is_admin'][$admin])) {
+ if (!isset($GLOBALS['is_admin'][$adminLogin])) {
// Init it with failed
- $GLOBALS['is_admin'][$admin] = false;
+ $GLOBALS['is_admin'][$adminLogin] = false;
// Search in array for entry
if (isset($GLOBALS['admin_hash'])) {
// Use cached string
$valPass = $GLOBALS['admin_hash'];
- } elseif ((!empty($passCookie)) && (isAdminHashSet($admin) === true) && (!empty($admin))) {
+ } elseif ((!empty($passCookie)) && (isAdminHashSet($adminLogin) === true) && (!empty($adminLogin))) {
// Login data is valid or not?
- $valPass = generatePassString(getAdminHash($admin));
+ $valPass = encodeHashForCookie(getAdminHash($adminLogin));
// Cache it away
$GLOBALS['admin_hash'] = $valPass;
// Count cache hits
incrementStatsEntry('cache_hits');
- } elseif ((!empty($admin)) && ((!isExtensionActive('cache'))) || (isAdminHashSet($admin) === false)) {
- // Search for admin
- $result = SQL_QUERY_ESC("SELECT HIGH_PRIORITY `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
- array($admin), __FUNCTION__, __LINE__);
-
- // Is he admin?
- $passDB = '';
- if (SQL_NUMROWS($result) == 1) {
- // Admin login was found so let's load password from DB
- list($passDB) = SQL_FETCHROW($result);
-
- // Temporary cache it
- setAdminHash($admin, $passDB);
-
- // Generate password hash
- $valPass = generatePassString($passDB);
- } // END - if
+ } elseif ((!empty($adminLogin)) && ((!isExtensionActive('cache')) || (isAdminHashSet($adminLogin) === false))) {
+ // Get admin hash and hash it
+ $valPass = encodeHashForCookie(getAdminHash($adminLogin));
- // Free memory
- SQL_FREERESULT($result);
+ // Cache it away
+ $GLOBALS['admin_hash'] = $valPass;
}
if (!empty($valPass)) {
// Check if password is valid
- //* DEBUG: */ print(__FUNCTION__ . ':(' . $valPass . '==' . $passCookie . ')='.intval($valPass == $passCookie).'
');
- $GLOBALS['is_admin'][$admin] = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == '*FAILED*') && (!isExtensionActive('cache'))));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '(' . $valPass . '==' . $passCookie . ')='.intval($valPass == $passCookie));
+ $GLOBALS['is_admin'][$adminLogin] = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == '*FAILED*') && (!isExtensionActive('cache'))));
} // END - if
} // END - if
// Return result of comparision
- return $GLOBALS['is_admin'][$admin];
+ return $GLOBALS['is_admin'][$adminLogin];
}
// Generates a list of "max receiveable emails per day"
@@ -781,13 +761,13 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
switch ($mode) {
case 'guest':
// Guests (in the registration form) are not allowed to select 0 mails per day.
- $result = SQL_QUERY("SELECT value, comment FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE value > 0 ORDER BY value",
+ $result = SQL_QUERY("SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `value` > 0 ORDER BY `value` ASC",
__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",
+ $result = SQL_QUERY("SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC",
__FUNCTION__, __LINE__);
break;
@@ -800,11 +780,11 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
if (SQL_NUMROWS($result) > 0) {
$OUT = '';
while ($content = SQL_FETCHARRAY($result)) {
- $OUT .= " ");
+ //* DEBUG: */ print(__LINE__.'='.$module.'/'.$what.'/'.getAction()."=
");
if (!isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
// sql_patches is missing so choose depending on mode
if (isWhatSet()) {
// Use setted what
$what = getWhat();
- } elseif ($mode == 'admin') {
+ } elseif ($module == 'admin') {
// Admin area
$what = 'overview';
} else {
// Everywhere else
$what = 'welcome';
}
- } elseif ((empty($what)) && ($mode != 'admin')) {
+ } elseif ((empty($what)) && ($module != 'admin')) {
// Use configured 'home'
$what = getConfig('index_home');
} // END - if
- if ($mode == 'admin') {
+ if ($module == 'admin') {
// Action value for admin area
- if (isGetRequestElementSet('action')) {
+ if (isGetRequestParameterSet('action')) {
// Use from request!
- return getRequestElement('action');
+ return getRequestParameter('action');
} elseif (isActionSet()) {
// Get it directly from URL
return getAction();
} elseif (($what == 'overview') || (!isWhatSet())) {
// Default value for admin area
- $ret = 'login';
+ $data['action'] = 'login';
}
} elseif (isActionSet()) {
// Get it directly from URL
return getAction();
}
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."): ret=".$ret.'
');
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__ . '): ret=' . $data['action'] . '
');
// Does the module have a menu?
- if (ifModuleHasMenu($mode)) {
+ if (ifModuleHasMenu($module)) {
// Rewriting modules to menu
- $mode = mapModuleToTable($mode);
+ $module = mapModuleToTable($module);
// Guest and member menu is 'main' as the default
- if (empty($ret)) $ret = 'main';
+ if (empty($data['action'])) $data['action'] = 'main';
// Load from database
$result = SQL_QUERY_ESC("SELECT `action` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `what`='%s' LIMIT 1",
- array($mode, $what), __FUNCTION__, __LINE__);
+ array($module, $what), __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);
+ $data = SQL_FETCHARRAY($result);
} // END - if
// Free memory
SQL_FREERESULT($result);
- } elseif ((!isExtensionInstalled('sql_patches')) && (($mode != 'admin') && ($mode != 'unknown'))) {
+ } elseif ((!isExtensionInstalled('sql_patches')) && ($module != 'admin') && ($module != 'unknown')) {
// No sql_patches installed, but maybe we need to register an admin?
if (isAdminRegistered()) {
// Redirect to admin area
@@ -965,25 +945,25 @@ function getModeAction ($mode, $what) {
}
// Return action value
- return $ret;
+ return $data['action'];
}
// Get category name back
function getCategory ($cid) {
// Default is not found
- $ret = getMessage('_CATEGORY_404');
+ $data['cat'] = getMessage('_CATEGORY_404');
// Is the category id set?
if ($cid == '0') {
// No category
- $ret = getMessage('_CATEGORY_NONE');
+ $data['cat'] = 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);
+ $data = SQL_FETCHARRAY($result);
} // END - if
// Free result
@@ -991,7 +971,7 @@ function getCategory ($cid) {
} // END - if
// Return result
- return $ret;
+ return $data['cat'];
}
// Get a string of "mail title" and price back
@@ -1000,17 +980,17 @@ function getPaymentTitlePrice ($pid, $full=false) {
$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... :-)
+ $data = SQL_FETCHARRAY($result);
+
+ // Only title or also including price?
if ($full === false) {
- // Return only title
- list($ret) = SQL_FETCHROW($result);
+ $ret = $data['mail_title'];
} else {
- // Return title and price
- list($t, $p) = SQL_FETCHROW($result);
- $ret = $t.' / '.translateComma($p).' {?POINTS?}';
+ $ret = $data['mail_title'] . ' / ' . translateComma($data['price']) . ' {?POINTS?}';
}
}
@@ -1024,23 +1004,23 @@ function getPaymentTitlePrice ($pid, $full=false) {
// Get (basicly) the price of given payment id
function getPaymentPoints ($pid, $lookFor = 'price') {
// Default value...
- $ret = '-1';
+ $data[$lookFor] = '-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__);
+ $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);
+ $data = SQL_FETCHARRAY($result);
} // END - if
// Free result
SQL_FREERESULT($result);
// Return value
- return $ret;
+ return $data[$lookFor];
}
// Remove a receiver's id from $receivers and add a link for him to confirm
@@ -1064,7 +1044,7 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
array($rowName, $stats_id, bigintval($userid), $type), __FUNCTION__, __LINE__);
// Was it *not* found?
- if (SQL_NUMROWS($result) == '0') {
+ if (SQL_HASZERONUMS($result)) {
// 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($userid), $type), __FUNCTION__, __LINE__);
@@ -1085,54 +1065,56 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
// Calculate sum (default) or count records of given criteria
function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatement = 'userid', $countRows = false, $add = '') {
- $ret = '0';
+ // Init count/sum
+ $data['res'] = '0';
+
//* DEBUG: */ print($search.'/'.$tableName.'/'.$lookFor.'/'.$whereStatement.'/'.$add.'
');
if ((empty($search)) && ($search != '0')) {
// Count or sum whole table?
if ($countRows === true) {
// Count whole table
- $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) FROM `{?_MYSQL_PREFIX?}_%s`".$add,
+ $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s`".$add,
array($lookFor, $tableName), __FUNCTION__, __LINE__);
} else {
// Sum whole table
- $result = SQL_QUERY_ESC("SELECT SUM(`%s`) FROM `{?_MYSQL_PREFIX?}_%s`".$add,
+ $result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s`".$add,
array($lookFor, $tableName), __FUNCTION__, __LINE__);
}
} elseif (($countRows === true) || ($lookFor == 'userid')) {
// Count rows
//* DEBUG: */ print("COUNT!
");
- $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
+ $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
} else {
// Add all rows
//* DEBUG: */ print("SUM!
");
- $result = SQL_QUERY_ESC("SELECT SUM(`%s`) FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
+ $result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
}
// Load row
- list($ret) = SQL_FETCHROW($result);
+ $data = SQL_FETCHARRAY($result);
// Free result
SQL_FREERESULT($result);
// Fix empty values
- if ((empty($ret)) && ($lookFor != 'counter') && ($lookFor != 'id') && ($lookFor != 'userid')) {
+ if ((empty($data['res'])) && ($lookFor != 'counter') && ($lookFor != 'id') && ($lookFor != 'userid')) {
// Float number
- $ret = '0.00000';
- } elseif (''.$ret.'' == '') {
+ $data['res'] = '0.00000';
+ } elseif (''.$data['res'].'' == '') {
// Fix empty result
- $ret = '0';
+ $data['res'] = '0';
}
// Return value
- //* DEBUG: */ print 'ret='.$ret.'
';
- return $ret;
+ //* DEBUG: */ print 'ret=' . $data['res'] . '
';
+ return $data['res'];
}
// Getter fro ref level percents
function getReferalLevelPercents ($level) {
// Default is zero
- $per = '0';
+ $data['percents'] = '0';
// Do we have cache?
if ((isset($GLOBALS['cache_array']['refdepths']['level'])) && (isExtensionActive('cache'))) {
@@ -1140,7 +1122,7 @@ function getReferalLevelPercents ($level) {
$key = array_search($level, $GLOBALS['cache_array']['refdepths']['level']);
if ($key !== false) {
// Entry found!
- $per = $GLOBALS['cache_array']['refdepths']['percents'][$key];
+ $data['percents'] = $GLOBALS['cache_array']['refdepths']['percents'][$key];
// Count cache hit
incrementStatsEntry('cache_hits');
@@ -1153,7 +1135,7 @@ function getReferalLevelPercents ($level) {
// Entry found?
if (SQL_NUMROWS($result_level) == 1) {
// Get percents
- list($per) = SQL_FETCHROW($result_level);
+ $data = SQL_FETCHARRAY($result_level);
} // END - if
// Free result
@@ -1161,7 +1143,7 @@ function getReferalLevelPercents ($level) {
}
// Return percent
- return $per;
+ return $data['percents'];
}
/**
@@ -1207,12 +1189,12 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
// Count up referal depth
if (!isset($GLOBALS['ref_level'])) {
// Initialialize referal system
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."): Referal system initialized!
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."): Referal system initialized!
");
$GLOBALS['ref_level'] = '0';
} else {
// Increase referal level
$GLOBALS['ref_level']++;
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."): Referal level increased. DEPTH={$GLOBALS['ref_level']}
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."): Referal level increased. DEPTH={$GLOBALS['ref_level']}
");
}
// Default is 'normal' points
@@ -1222,39 +1204,39 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
if ($locked === true) $data = 'locked_points';
// Check user account
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},points={$points}
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):userid={$userid},points={$points}
");
if (fetchUserData($userid)) {
// This is the user and his ref
$GLOBALS['cache_array']['add_userid'][getUserData('refid')] = $userid;
// Get percents
$per = getReferalLevelPercents($GLOBALS['ref_level']);
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},points={$points},depth={$GLOBALS['ref_level']},per={$per},mode={$add_mode}
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):userid={$userid},points={$points},depth={$GLOBALS['ref_level']},per={$per},mode={$add_mode}
");
// Some percents found?
if ($per > 0) {
// Calculate new points
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},points={$points},per={$per},depth={$GLOBALS['ref_level']}
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):userid={$userid},points={$points},per={$per},depth={$GLOBALS['ref_level']}
");
$ref_points = $points * $per / 100;
// Pay refback here if level > 0 and in ref-mode
if ((isExtensionActive('refback')) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($add_mode == "ref") && (isset($GLOBALS['cache_array']['add_userid'][$userid]))) {
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},data={$GLOBALS['cache_array']['add_userid'][$userid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - BEFORE!
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):userid={$userid},data={$GLOBALS['cache_array']['add_userid'][$userid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - BEFORE!
");
$ref_points = addRefbackPoints($GLOBALS['cache_array']['add_userid'][$userid], $userid, $points, $ref_points);
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},data={$GLOBALS['cache_array']['add_userid'][$userid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - AFTER!
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):userid={$userid},data={$GLOBALS['cache_array']['add_userid'][$userid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - AFTER!
");
} // 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($userid), bigintval($GLOBALS['ref_level'])), __FUNCTION__, __LINE__);
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):data={$data},ref_points={$ref_points},userid={$userid},depth={$GLOBALS['ref_level']},mode={$add_mode} - UPDATE! (".SQL_AFFECTEDROWS().")
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):data={$data},ref_points={$ref_points},userid={$userid},depth={$GLOBALS['ref_level']},mode={$add_mode} - UPDATE! (".SQL_AFFECTEDROWS().")
");
// 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($userid), bigintval($GLOBALS['ref_level']), $ref_points), __FUNCTION__, __LINE__);
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):data={$data},ref_points={$ref_points},userid={$userid},depth={$GLOBALS['ref_level']},mode={$add_mode} - INSERTED! (".SQL_AFFECTEDROWS().")
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):data={$data},ref_points={$ref_points},userid={$userid},depth={$GLOBALS['ref_level']},mode={$add_mode} - INSERTED! (".SQL_AFFECTEDROWS().")
");
} // END - if
// Points updated, maybe I shall send him an email?
@@ -1270,8 +1252,9 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
// Load email template
$message = loadEmailTemplate('confirm-referal', $content, bigintval($userid));
- sendEmail(getUserData('email'), THANX_REFERAL_ONE, $message);
- } elseif (($sendNotify) && (getUserData('refid') == '0') && ($locked === false) && ($add_mode == 'direct')) {
+ // Send email
+ sendEmail($userid, getMessage('THANX_REFERAL_ONE_SUBJECT'), $message);
+ } elseif (($sendNotify === true) && (getUserData('refid') == '0') && ($locked === false) && ($add_mode == 'direct')) {
// Prepare content
$content = array(
'text' => getMessage('REASON_DIRECT_PAYMENT'),
@@ -1282,14 +1265,14 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
$message = loadEmailTemplate('add-points', $content, $userid);
// And sent it away
- sendEmail(getUserData('email'), getMessage('SUBJECT_DIRECT_PAYMENT'), $message);
- if (!isGetRequestElementSet('mid')) loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
+ sendEmail($userid, getMessage('SUBJECT_DIRECT_PAYMENT'), $message);
+ if (!isGetRequestParameterSet('mid')) loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
}
// Maybe there's another ref?
if ((getUserData('refid') > 0) && ($points > 0) && (getUserData('refid') != $userid) && ($add_mode == 'ref')) {
// Then let's credit him here...
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},ref=".getUserData('refid').",points={$points} - ADVANCE!
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):userid={$userid},ref=".getUserData('refid').",points={$points} - ADVANCE!
");
addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, $sendNotify, getUserData('refid'), $locked);
} // END - if
} // END - if
@@ -1302,19 +1285,19 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
function updateReferalCounter ($userid) {
// Make it sure referal level zero (member him-/herself) is at least selected
if (empty($GLOBALS['cache_array']['ref_level'][$userid])) $GLOBALS['cache_array']['ref_level'][$userid] = 1;
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},level={$GLOBALS['cache_array']['ref_level'][$userid]}
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):userid={$userid},level={$GLOBALS['cache_array']['ref_level'][$userid]}
");
// Update counter
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refsystem` SET `counter`=`counter`+1 WHERE `userid`=%s AND `level`='%s' LIMIT 1",
array(bigintval($userid), $GLOBALS['cache_array']['ref_level'][$userid]), __FUNCTION__, __LINE__);
// When no entry was updated then we have to create it here
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):updated=".SQL_AFFECTEDROWS().'
');
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):updated=".SQL_AFFECTEDROWS().'
');
if (SQL_AFFECTEDROWS() < 1) {
// First count!
SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_refsystem` (`userid`, `level`, `counter`) VALUES (%s,%s,1)",
array(bigintval($userid), $GLOBALS['cache_array']['ref_level'][$userid]), __FUNCTION__, __LINE__);
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid}
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):userid={$userid}
");
} // END - if
// Init referal id
@@ -1326,18 +1309,18 @@ function updateReferalCounter ($userid) {
$ref = getUserData('refid');
} // END - if
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},ref={$ref}
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):userid={$userid},ref={$ref}
");
// When he has a referal...
if (($ref > 0) && ($ref != $userid)) {
// Move to next referal level and count his counter one up!
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):ref={$ref} - ADVANCE!
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):ref={$ref} - ADVANCE!
");
$GLOBALS['cache_array']['ref_level'][$userid]++;
updateReferalCounter($ref);
} elseif ((($ref == $userid) || ($ref == '0')) && (isExtensionInstalledAndNewer('cache', '0.1.2'))) {
// Remove cache here
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):ref={$ref} - CACHE!
");
- rebuildCacheFile('refsystem', 'refsystem');
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):ref={$ref} - CACHE!
");
+ rebuildCache('refsystem', 'refsystem');
}
// "Walk" back here
@@ -1366,29 +1349,34 @@ function sendAdminEmails ($subj, $message) {
}
// Get id number from administrator's login name
-function getAdminId ($login) {
+function getAdminId ($adminLogin) {
// By default no admin is found
- $ret = '-1';
+ $data['id'] = '-1';
// Check cache
- if (isset($GLOBALS['cache_array']['admin']['admin_id'][$login])) {
+ if (isset($GLOBALS['cache_array']['admin']['admin_id'][$adminLogin])) {
// Use it if found to save SQL queries
- $ret = $GLOBALS['cache_array']['admin']['admin_id'][$login];
+ $data['id'] = $GLOBALS['cache_array']['admin']['admin_id'][$adminLogin];
// Update cache hits
incrementStatsEntry('cache_hits');
} elseif (!isExtensionActive('cache')) {
// Load from database
$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
- array($login), __FUNCTION__, __LINE__);
+ array($adminLogin), __FUNCTION__, __LINE__);
+
+ // Do we have an entry?
if (SQL_NUMROWS($result) == 1) {
- list($ret) = SQL_FETCHROW($result);
+ // Get it
+ $data = SQL_FETCHARRAY($result);
} // END - if
// Free result
SQL_FREERESULT($result);
}
- return $ret;
+
+ // Return the id
+ return $data['id'];
}
// "Getter" for current admin id
@@ -1402,92 +1390,108 @@ function getCurrentAdminId () {
$adminId = getAdminId($adminLogin);
// Remember in cache securely
- $GLOBALS['current_admin_id'] = bigintval($adminId);
+ setCurrentAdminId(bigintval($adminId));
} // END - if
// Return it
return $GLOBALS['current_admin_id'];
}
+// Setter for current admin id
+function setCurrentAdminId ($currentAdminId) {
+ // Set it secured
+ $GLOBALS['current_admin_id'] = bigintval($currentAdminId);
+}
+
// Get password hash from administrator's login name
-function getAdminHash ($admin) {
+function getAdminHash ($adminLogin) {
// By default an invalid hash is returned
- $ret = '-1';
+ $data['password'] = '-1';
- if (isAdminHashSet($admin)) {
+ if (isAdminHashSet($adminLogin)) {
// Check cache
- $ret = $GLOBALS['cache_array']['admin']['password'][$admin];
+ $data['password'] = $GLOBALS['cache_array']['admin']['password'][$adminLogin];
// Update cache hits
incrementStatsEntry('cache_hits');
} elseif (!isExtensionActive('cache')) {
// Load from database
- $result = SQL_QUERY_ESC("SELECT password FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
- array($admin), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
+ array($adminLogin), __FUNCTION__, __LINE__);
+
+ // Do we have an entry?
if (SQL_NUMROWS($result) == 1) {
// Fetch data
- list($ret) = SQL_FETCHROW($result);
+ $data = SQL_FETCHARRAY($result);
// Set cache
- setAdminHash($admin, $ret);
+ setAdminHash($adminLogin, $data['password']);
} // END - if
// Free result
SQL_FREERESULT($result);
}
- return $ret;
+
+ // Return password hash
+ return $data['password'];
}
// "Getter" for admin login
function getAdminLogin ($adminId) {
// By default a non-existent login is returned (other functions react on this!)
- $ret = '***';
+ $data['login'] = '***';
if (isset($GLOBALS['cache_array']['admin']['login'][$adminId])) {
// Get cache
- $ret = $GLOBALS['cache_array']['admin']['login'][$adminId];
+ $data['login'] = $GLOBALS['cache_array']['admin']['login'][$adminId];
// Update cache hits
incrementStatsEntry('cache_hits');
} elseif (!isExtensionActive('cache')) {
// Load from database
- $result = SQL_QUERY_ESC("SELECT login FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
- array(bigintval($adminId)), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `login` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+ array(bigintval($adminId)), __FUNCTION__, __LINE__);
+
+ // Entry found?
if (SQL_NUMROWS($result) == 1) {
// Fetch data
- list($ret) = SQL_FETCHROW($result);
+ $data = SQL_FETCHARRAY($result);
// Set cache
- $GLOBALS['cache_array']['admin']['login'][$adminId] = $ret;
+ $GLOBALS['cache_array']['admin']['login'][$adminId] = $data['login'];
} // END - if
// Free memory
SQL_FREERESULT($result);
}
- return $ret;
+
+ // Return the result
+ return $data['login'];
}
// Get email address of admin id
function getAdminEmail ($adminId) {
// By default an invalid emails is returned
- $ret = '***';
+ $data['email'] = '***';
if (isset($GLOBALS['cache_array']['admin']['email'][$adminId])) {
// Get cache
- $ret = $GLOBALS['cache_array']['admin']['email'][$adminId];
+ $data['email'] = $GLOBALS['cache_array']['admin']['email'][$adminId];
// Update cache hits
incrementStatsEntry('cache_hits');
} elseif (!isExtensionActive('cache')) {
// Load from database
- $result_admin_id = SQL_QUERY_ESC("SELECT email FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+ $result_admin_id = SQL_QUERY_ESC("SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
array(bigintval($adminId)), __FUNCTION__, __LINE__);
+
+ // Entry found?
if (SQL_NUMROWS($result_admin_id) == 1) {
// Get data
- list($ret) = SQL_FETCHROW($result_admin_id);
+ $data = SQL_FETCHARRAY($result_admin_id);
// Set cache
- $GLOBALS['cache_array']['admin']['email'][$adminId] = $ret;
+ $GLOBALS['cache_array']['admin']['email'][$adminId] = $data['email'];
} // END - if
// Free result
@@ -1495,21 +1499,21 @@ function getAdminEmail ($adminId) {
}
// Return email
- return $ret;
+ return $data['email'];
}
// Get default ACL of admin id
function getAdminDefaultAcl ($adminId) {
// By default an invalid ACL value is returned
- $ret = '***';
+ $data['default_acl'] = '***';
// Is sql_patches there and was it found in cache?
if (!isExtensionActive('sql_patches')) {
// Not found, which is bad, so we need to allow all
- $ret = 'allow';
+ $data['default_acl'] = 'allow';
} elseif (isset($GLOBALS['cache_array']['admin']['def_acl'][$adminId])) {
// Use cache
- $ret = $GLOBALS['cache_array']['admin']['def_acl'][$adminId];
+ $data['default_acl'] = $GLOBALS['cache_array']['admin']['def_acl'][$adminId];
// Update cache hits
incrementStatsEntry('cache_hits');
@@ -1519,22 +1523,22 @@ function getAdminDefaultAcl ($adminId) {
array(bigintval($adminId)), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result_admin_id) == 1) {
// Fetch data
- list($ret) = SQL_FETCHROW($result_admin_id);
+ $data = SQL_FETCHARRAY($result_admin_id);
// Set cache
- $GLOBALS['cache_array']['admin']['def_acl'][$adminId] = $ret;
+ $GLOBALS['cache_array']['admin']['def_acl'][$adminId] = $data['default_acl'];
}
// Free result
SQL_FREERESULT($result_admin_id);
}
- // Return email
- return $ret;
+ // Return default ACL
+ return $data['default_acl'];
}
// Generates an option list from various parameters
-function generateOptionList ($table, $id, $name, $default='', $special='', $where='') {
+function generateOptionList ($table, $id, $name, $default='', $special='', $where='', $disabled=array()) {
$ret = '';
if ($table == '/ARRAY/') {
// Selection from array
@@ -1542,7 +1546,13 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
// Both are arrays
foreach ($id as $idx => $value) {
$ret .= '';
}
+
+ // Free memory
+ SQL_FREERESULT($result);
}
// Return - hopefully - the requested data
@@ -1608,13 +1627,15 @@ function FILTER_ACTIVATE_EXCHANGE () {
updateConfiguration('activate_xchange' ,0);
// Rebuild cache
- rebuildCacheFile('modules', 'modules');
+ rebuildCache('modules', 'modules');
} // END - if
}
// Deletes a user account with given reason
function deleteUserAccount ($userid, $reason) {
- $points = '0';
+ // Init points
+ $data['points'] = '0';
+
$result = SQL_QUERY_ESC("SELECT
(SUM(p.points) - d.used_points) AS points
FROM
@@ -1626,9 +1647,11 @@ ON
WHERE
p.userid=%s",
array(bigintval($userid)), __FUNCTION__, __LINE__);
+
+ // Do we have an entry?
if (SQL_NUMROWS($result) == 1) {
// Save his points to add them to the jackpot
- list($points) = SQL_FETCHROW($result);
+ $data = SQL_FETCHARRAY($result);
// Delete points entries as well
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s", array(bigintval($userid)), __FUNCTION__, __LINE__);
@@ -1636,11 +1659,11 @@ WHERE
// Update mediadata as well
if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
// Update database
- updateMediadataEntry(array('total_points'), 'sub', $points);
+ updateMediadataEntry(array('total_points'), 'sub', $data['points']);
} // END - if
// Now, when we have all his points adds them do the jackpot!
- if (isExtensionActive('jackpot')) addPointsToJackpot($points);
+ if (isExtensionActive('jackpot')) addPointsToJackpot($data['points']);
} // END - if
// Free the result
@@ -1651,40 +1674,30 @@ WHERE
array(bigintval($userid)), __FUNCTION__, __LINE__);
// Remove from rallye if found
+ // @TODO Rewrite this to a filter
if (isExtensionActive('rallye')) {
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `userid`=%s",
array(bigintval($userid)), __FUNCTION__, __LINE__);
} // END - if
+ // Add reason and translate points
+ $data['text'] = $reason;
+ $data['points'] = translateComma($data['points']);
+
// Now a mail to the user and that's all...
- $message = loadEmailTemplate('del-user', array('text' => $reason), $userid);
+ $message = loadEmailTemplate('del-user', $data, $userid);
sendEmail($userid, 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($userid)), __FUNCTION__, __LINE__);
}
-// Generates meta description for given module and 'what' value
-function generateMetaDescriptionCode ($mod, $what) {
- // Exclude admin and member's area
- if (($mod != 'admin') && ($mod != 'login')) {
- // Construct dynamic description
- $DESCR = '{?MAIN_TITLE?} '.trim(getConfig('title_middle')) . ' ' . addMenuDescription('guest', 'what-'.$what, true);
-
- // Output it directly
- outputHtml('');
- } // END - if
-
- // Remove depth
- unset($GLOBALS['ref_level']);
-}
-
// Gets the matching what name from module
function getWhatFromModule ($modCheck) {
// Is the request element set?
- if (isGetRequestElementSet('what')) {
+ if (isGetRequestParameterSet('what')) {
// Then return this!
- return getRequestElement('what');
+ return getRequestParameter('what');
} // END - if
// Default is empty
@@ -1756,7 +1769,7 @@ WHERE
return $numRows;
}
-// Returns HTML code with an "