X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fmysql-manager.php;h=874884fd8809d0e517ff1b928ef92604bf58ceeb;hb=074767f2ad1cfd011221dec75eda51a6eb74ade9;hp=b988afb7d9c5c954af4ddd788e896a79d349a5c8;hpb=6fdff977cb2b22ccfbde309684b8d7109a2ab186;p=mailer.git
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index b988afb7d9..874884fd88 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -42,60 +42,12 @@ if (!defined('__SECURITY')) {
die();
} // END - if
-// "Getter" for module title
-function getModuleTitle ($module) {
- // Init variables
- $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($module, $GLOBALS['cache_array']['modules']['module']))) {
- // Load from cache
- $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($module), __FUNCTION__, __LINE__);
-
- // Is the entry there?
- if (SQL_NUMROWS($result)) {
- // Get the title from database
- $data = SQL_FETCHARRAY($result);
- } // END - if
-
- // Free the result
- SQL_FREERESULT($result);
- }
- } // END - if
-
- // Trim name
- $data['title'] = trim($data['title']);
-
- // Still no luck or empty title?
- if (empty($data['title'])) {
- // No name found
- $data['title'] = getMaskedMessage('UNKNOWN_MODULE_DETECTED', $module);
- if ((is_resource($result)) && (SQL_HASZERONUMS($result))) {
- // Add module to database
- $dummy = checkModulePermissions($module);
- } // END - if
- } // END - if
-
- // Return name
- return $data['title'];
-}
-
// "Getter" for module description
// @TODO Can we cache this?
function getTitleFromMenu ($mode, $what, $column = 'what', $ADD='') {
// Fix empty 'what'
if (empty($what)) {
- $what = getConfig('index_home');
+ $what = getIndexHome();
} // END - if
// Default is not found
@@ -122,177 +74,6 @@ function getTitleFromMenu ($mode, $what, $column = 'what', $ADD='') {
return $data['title'];
}
-// Check validity of a given module name (no file extension)
-function checkModulePermissions ($module = '') {
- // Is it empty (default), then take the current one
- if (empty($module)) $module = getModule();
-
- // Do we have cache?
- if (isset($GLOBALS['module_status'][$module])) {
- // Then use it
- return $GLOBALS['module_status'][$module];
- } // END - if
-
- // Filter module name (names with low chars and underlines are fine!)
- $module = preg_replace('/[^a-z_]/', '', $module);
-
- // Check for prefix is a extension...
- $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]; $module = $modSplit[1];
- } // END - if
- } // END - if
-
- // Major error in module registry is the default
- $ret = 'major';
-
- // Check if script is installed if not return a 'done' to prevent some errors
- if ((isInstallationPhase()) || (!isAdminRegistered())) {
- // Not installed or no admin registered or in installation phase
- return 'done';
- } // END - if
-
- // 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'][$module_chk])) {
- // Check cache
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cache found.');
- $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');
- $found = true;
- } else {
- // No, then we have to update it!
- $ret = 'cache_miss';
- }
- } elseif (!isExtensionActive('cache')) {
- // 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($module_chk), __FUNCTION__, __LINE__);
- if (SQL_NUMROWS($result) == 1) {
- // Read data
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Entry found.');
- $data = SQL_FETCHARRAY($result);
- $found = true;
- } elseif (isDebugModeEnabled()) {
- // Debug message only in debug-mode...
- logDebugMessage(__FUNCTION__, __LINE__, 'Module ' . $module_chk . ' not found!');
- }
-
- // Free result
- SQL_FREERESULT($result);
- }
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . $ret);
-
- // Is the module found?
- if ($found === true) {
- // Check returned values against current access permissions
- //
- // 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 ($data['locked'] == 'Y') {
- // Module is locked
- $ret = 'locked';
- } elseif (($data['mem_only'] == 'Y') && (!isMember())) {
- // You have to login first!
- $ret = 'mem_only';
- } 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,
- $data['locked'],
- $data['admin_only'],
- $data['mem_only']
- ));
- }
- } // END - if
-
- // 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", $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($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($module_chk), __FUNCTION__, __LINE__);
- }
-
- // Everthing is fine?
- if (SQL_AFFECTEDROWS() < 1) {
- // Something bad happend!
- return 'major';
- } // END - if
-
- // Destroy cache here
- // @TODO Rewrite this to a filter
- if ((getOutputMode() == '0') || (getOutputMode() == -1)) rebuildCache('modules', 'modules');
-
- // And reload data
- 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
- 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",
- $module,
- $ret,
- $data['locked'],
- $data['hidden'],
- $data['mem_only'],
- $data['admin_only'],
- getOutputMode()
- ));
- }
-
- // Return the value
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . $ret);
- $GLOBALS['module_status'][$module] = $ret;
- return $ret;
-}
-
// Add menu description pending on given file name (without path!)
function addMenuDescription ($accessLevel, $FQFN, $return = false) {
// Use only filename of the FQFN...
@@ -302,6 +83,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
$LINK_ADD = '';
$OUT = '';
$ADD = '';
+ $prefix = '';
// First we have to do some analysis...
if (substr($file, 0, 7) == 'action-') {
@@ -327,7 +109,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
if (isAdmin()) $ADD = '';
$dummy = substr($search, 0, -4);
- $ADD .= " AND `action`='".getActionFromModuleWhat($accessLevel, $dummy)."'";
+ $ADD .= sprintf(" AND `action`='%s'", getActionFromModuleWhat($accessLevel, $dummy));
} elseif (($accessLevel == 'sponsor') || ($accessLevel == 'engine')) {
// Sponsor / engine menu
$type = 'what';
@@ -343,12 +125,20 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
}
// Begin the navigation line
- if ((!isset($GLOBALS['nav_depth'])) && ($return === false)) {
+ if (!isset($GLOBALS['nav_depth'])) {
+ // Init nav_depth
$GLOBALS['nav_depth'] = '0';
- $prefix = '
{--YOU_ARE_HERE--}
Home ';
- } else {
- if ($return === false) $GLOBALS['nav_depth']++;
- $prefix = '';
+
+ // Run the pre-filter chain
+ $ret = runFilterChain('pre_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ''));
+
+ // Add pre-content
+ $prefix = $ret['content'];
+
+ $prefix .= '
{--YOU_ARE_HERE--}
Home ';
+ } elseif ($return === false) {
+ // Count depth
+ $GLOBALS['nav_depth']++;
}
$prefix .= ' -> ';
@@ -357,27 +147,27 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
if (substr($search, -4, 4) == '.php') {
// Remove the .php
$search = substr($search, 0, -4);
- } // END - i
+ } // END - if
if (((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (getConfig('youre_here') == 'Y')) || ((isAdmin()) && ($modCheck == 'admin'))) {
// Output HTML code
$OUT = $prefix . '
' . getTitleFromMenu($accessLevel, $search, $type, $ADD) . ' ';
// Can we close the you-are-here navigation?
- //* DEBUG: */ print(__LINE__."*".$type.'/'.getWhat()."*
");
+ //* DEBUG: */ debugOutput(__LINE__.'*'.$type.'/'.getWhat().'*');
if (($type == 'what') || (($type == 'action') && ((!isWhatSet()) || (getWhat() == 'overview')))) {
- //* DEBUG: */ print(__LINE__.'+'.$type."+
");
+ //* DEBUG: */ debugOutput(__LINE__.'+'.$type.'+');
// Add closing div and br-tag
- $OUT .= '
';
+ $OUT .= '
';
$GLOBALS['nav_depth'] = '0';
- // Run the filter chain
+ // Run the post-filter chain
$ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => ''));
// Add additional content
$OUT .= $ret['content'];
} // END - if
- }
+ } // END - if
// Return or output HTML code?
if ($return === true) {
@@ -406,28 +196,48 @@ function addMenu ($mode, $action, $what) {
} // END - if
// Load SQL data and add the menu to the output stream...
- $result_main = SQL_QUERY_ESC("SELECT `title`, `action`, `visible`, `locked` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL)".$ADD." ORDER BY `sort` ASC",
+ $result_main = SQL_QUERY_ESC("SELECT
+ `title`, `what`, `action`, `visible`, `locked`
+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()."* ");
- if (SQL_NUMROWS($result_main) > 0) {
+ //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.':'.getWhat().'*');
+ if (!SQL_HASZERONUMS($result_main)) {
// There are menus available, so we simply display them... :)
$GLOBALS['rows'] = '';
while ($content = SQL_FETCHARRAY($result_main)) {
- //* DEBUG: */ print(__LINE__.'/'.$main_cnt.'/'.$content['action'].':'.getWhat()."* ");
- // Init/"translate" variables
+ //* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . ':' . getWhat() . '*');
+ // Disable the block-mode
enableBlockMode(false);
- $content = translateMenuVisibleLocked($content);
// Load menu header template
$GLOBALS['rows'] .= loadTemplate($mode . '_menu_title', true, $content);
// Sub menu
- $result_sub = SQL_QUERY_ESC("SELECT `title` AS sub_title, `what` AS sub_what, `visible` AS sub_visible, `locked` AS sub_locked FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$ADD." ORDER BY `sort` ASC",
+ $result_sub = SQL_QUERY_ESC("SELECT
+ `title` AS `sub_title`,
+ `what` AS `sub_what`,
+ `visible` AS `sub_visible`,
+ `locked` AS `sub_locked`
+FROM
+ `{?_MYSQL_PREFIX?}_%s_menu`
+WHERE
+ `action`='%s' AND
+ `what` != '' AND
+ `what` IS NOT NULL
+ ".$ADD."
+ORDER BY
+ `sort` ASC",
array($mode, $content['action']), __FUNCTION__, __LINE__);
// Do we have some entries?
- if (SQL_NUMROWS($result_sub) > 0) {
+ if (!SQL_HASZERONUMS($result_sub)) {
// Init counter
$cnt = '0';
@@ -436,14 +246,11 @@ function addMenu ($mode, $action, $what) {
// Merge both arrays in one
$content = merge_array($content, $content2);
- // Translate visible/locked again
- $content = translateMenuVisibleLocked($content, 'sub_');
-
// Init content
$OUT = '';
// Full file name for checking menu
- //* DEBUG: */ print(__LINE__ . ':!!!!' . $content['sub_what'] . '!!! ');
+ //* DEBUG: */ debugOutput(__LINE__ . ':!!!!' . $content['sub_what'] . '!!!');
$inc = sprintf("inc/modules/%s/what-%s.php", $mode, $content['sub_what']);
if (isIncludeReadable($inc)) {
// Mark currently selected menu - open
@@ -455,11 +262,11 @@ function addMenu ($mode, $action, $what) {
$OUT .= '';
@@ -477,11 +284,11 @@ function addMenu ($mode, $action, $what) {
$cnt++;
// Rewrite array
- $content = array(
- 'menu' => $OUT,
- 'what' => $content['sub_what'],
- 'visible_css' => $content['sub_visible_css'],
- 'locked_css' => $content['sub_locked_css']
+ $content = array(
+ 'menu' => $OUT,
+ 'what' => $content['sub_what'],
+ 'visible' => $content['sub_visible'],
+ 'locked' => $content['locked'],
);
// Add regular menu row or bottom row?
@@ -500,12 +307,12 @@ function addMenu ($mode, $action, $what) {
if (isFileReadable($INC)) {
// Load include file
if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_begin', true, $mode);
- //* DEBUG: */ print(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.getWhat()."* ");
+ //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.getWhat().'*');
loadInclude($INC);
- //* DEBUG: */ print(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.getWhat()."* ");
+ //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.getWhat().'*');
if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_end', true, $mode);
}
- //* DEBUG: */ print(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat()."* ");
+ //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat().'*');
}
// Free result
@@ -514,7 +321,7 @@ function addMenu ($mode, $action, $what) {
// Count one up
$main_cnt++;
- //* DEBUG: */ print(__LINE__.'/'.$main_cnt.':'.getWhat()."* ");
+ //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.':'.getWhat().'*');
if (SQL_NUMROWS($result_main) > $main_cnt) {
// Add seperator
$GLOBALS['rows'] .= loadTemplate('menu_seperator', true, $mode);
@@ -549,7 +356,7 @@ function addMenu ($mode, $action, $what) {
);
// Load main template
- //* DEBUG: */ print(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat()."* ");
+ //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat().'*');
loadTemplate('menu_table', false, $content);
} // END - if
}
@@ -564,10 +371,10 @@ function isMember () {
if ((!isset($GLOBALS['last_online'])) || (!is_array($GLOBALS['last_online']))) $GLOBALS['last_online'] = array();
// is the cache entry there?
- if (isset($GLOBALS['is_member'])) {
+ if (isset($GLOBALS[__FUNCTION__])) {
// Then return it
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHED! (' . intval($GLOBALS['is_member']) . ')');
- return $GLOBALS['is_member'];
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHED! (' . intval($GLOBALS[__FUNCTION__]) . ')');
+ return $GLOBALS[__FUNCTION__];
} elseif ((!isSessionVariableSet('userid')) || (!isSessionVariableSet('u_hash'))) {
// No member
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No member set in cookie/session.');
@@ -617,7 +424,7 @@ function isMember () {
}
// Cache status
- $GLOBALS['is_member'] = $ret;
+ $GLOBALS[__FUNCTION__] = $ret;
// Return status
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . intval($ret));
@@ -635,7 +442,7 @@ function fetchUserData ($userid, $column = 'userid') {
setCurrentUserId($userid);
// Don't look for invalid userids...
- if ($userid < 1) {
+ if (!isValidUserId($userid)) {
// Invalid, so abort here
debug_report_bug(__FUNCTION__, __LINE__, 'User id ' . $userid . ' is invalid.');
} elseif (isUserDataValid()) {
@@ -647,7 +454,6 @@ function fetchUserData ($userid, $column = 'userid') {
return true;
}
-
// By default none was found
$found = false;
@@ -707,7 +513,7 @@ function fetchUserData ($userid, $column = 'userid') {
}
// This patched function will reduce many SELECT queries for the specified or current admin login
-function isAdmin ($adminLogin = '') {
+function isAdmin () {
// No admin in installation phase!
if ((isInstallationPhase()) || (!isAdminRegistered())) {
return false;
@@ -715,39 +521,45 @@ function isAdmin ($adminLogin = '') {
// Init variables
$ret = false;
+ $adminId = '0';
$passCookie = '';
$valPass = '';
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminLogin.' ');
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminId);
// If admin login is not given take current from cookies...
- if ((empty($adminLogin)) && (isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5'))) {
+ if ((isSessionVariableSet('admin_id')) && (isSessionVariableSet('admin_md5'))) {
// Get admin login and password from session/cookies
- $adminLogin = getSession('admin_login');
+ $adminId = getSession('admin_id');
$passCookie = getSession('admin_md5');
} // END - if
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminLogin.'/'.$passCookie.' ');
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminId.'/'.$passCookie);
+
+ // Abort if admin id is zero
+ if ($adminId == '0') {
+ return false;
+ } // END - if
// Do we have cache?
- if (!isset($GLOBALS['is_admin'][$adminLogin])) {
+ if (!isset($GLOBALS[__FUNCTION__][$adminId])) {
// Init it with failed
- $GLOBALS['is_admin'][$adminLogin] = false;
+ $GLOBALS[__FUNCTION__][$adminId] = false;
// Search in array for entry
if (isset($GLOBALS['admin_hash'])) {
// Use cached string
$valPass = $GLOBALS['admin_hash'];
- } elseif ((!empty($passCookie)) && (isAdminHashSet($adminLogin) === true) && (!empty($adminLogin))) {
+ } elseif ((!empty($passCookie)) && (isAdminHashSet($adminId) === true) && (!empty($adminId))) {
// Login data is valid or not?
- $valPass = encodeHashForCookie(getAdminHash($adminLogin));
+ $valPass = encodeHashForCookie(getAdminHash($adminId));
// Cache it away
$GLOBALS['admin_hash'] = $valPass;
// Count cache hits
incrementStatsEntry('cache_hits');
- } elseif ((!empty($adminLogin)) && ((!isExtensionActive('cache')) || (isAdminHashSet($adminLogin) === false))) {
+ } elseif ((!empty($adminId)) && ((!isExtensionActive('cache')) || (isAdminHashSet($adminId) === false))) {
// Get admin hash and hash it
- $valPass = encodeHashForCookie(getAdminHash($adminLogin));
+ $valPass = encodeHashForCookie(getAdminHash($adminId));
// Cache it away
$GLOBALS['admin_hash'] = $valPass;
@@ -756,12 +568,12 @@ function isAdmin ($adminLogin = '') {
if (!empty($valPass)) {
// Check if password is valid
//* 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'))));
+ $GLOBALS[__FUNCTION__][$adminId] = (($GLOBALS['admin_hash'] == $passCookie) || ((strlen($GLOBALS['admin_hash']) == 32) && ($GLOBALS['admin_hash'] == md5($passCookie))) || (($GLOBALS['admin_hash'] == '*FAILED*') && (!isExtensionActive('cache'))));
} // END - if
} // END - if
// Return result of comparision
- return $GLOBALS['is_admin'][$adminLogin];
+ return $GLOBALS[__FUNCTION__][$adminId];
}
// Generates a list of "max receiveable emails per day"
@@ -772,13 +584,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` ASC",
+ $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` ASC",
+ $result = SQL_QUERY('SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC',
__FUNCTION__, __LINE__);
break;
@@ -788,7 +600,7 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
}
// Some entries are found?
- if (SQL_NUMROWS($result) > 0) {
+ if (!SQL_HASZERONUMS($result)) {
$OUT = '';
while ($content = SQL_FETCHARRAY($result)) {
$OUT .= ' ");
+ //* DEBUG: */ debugOutput(__LINE__.':'.$mode.'/'.$action.'/'.$what.'*');
if (($mode != 'admin') && ($updateEntry === 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, $action, $what), __FUNCTION__, __LINE__, false);
+ array(
+ $mode,
+ $action,
+ $what
+ ), __FUNCTION__, __LINE__, false);
} elseif (($what != 'overview') && (!empty($what))) {
// 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, $action, $what), __FUNCTION__, __LINE__, false);
+ array(
+ $mode,
+ $action,
+ $what
+ ), __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, $action), __FUNCTION__, __LINE__, false);
+ array(
+ $mode,
+ $action
+ ), __FUNCTION__, __LINE__, false);
}
// Run SQL command
@@ -893,7 +716,7 @@ function getActionFromModuleWhat ($module, $what) {
// Init status
$data['action'] = '';
- //* DEBUG: */ print(__LINE__.'='.$module.'/'.$what.'/'.getAction()."= ");
+ //* DEBUG: */ debugOutput(__LINE__ . '=' . $module . '/'.$what . '/' . getAction() . '=');
if (!isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
// sql_patches is missing so choose depending on mode
if (isWhatSet()) {
@@ -908,7 +731,7 @@ function getActionFromModuleWhat ($module, $what) {
}
} elseif ((empty($what)) && ($module != 'admin')) {
// Use configured 'home'
- $what = getConfig('index_home');
+ $what = getIndexHome();
} // END - if
if ($module == 'admin') {
@@ -927,7 +750,7 @@ function getActionFromModuleWhat ($module, $what) {
// Get it directly from URL
return getAction();
}
- //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__ . ' ): ret=' . $data['action'] . ' ');
+ //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . ' ): ret=' . $data['action']);
// Does the module have a menu?
if (ifModuleHasMenu($module)) {
@@ -962,12 +785,12 @@ function getActionFromModuleWhat ($module, $what) {
// Get category name back
function getCategory ($cid) {
// Default is not found
- $data['cat'] = getMessage('_CATEGORY_404');
+ $data['cat'] = '{--_CATEGORY_404--}';
// Is the category id set?
if ($cid == '0') {
// No category
- $data['cat'] = getMessage('_CATEGORY_NONE');
+ $data['cat'] = '{--_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",
@@ -988,7 +811,7 @@ function getCategory ($cid) {
// Get a string of "mail title" and price back
function getPaymentTitlePrice ($pid, $full=false) {
// Default is not found
- $ret = getMessage('_PAYMENT_404');
+ $ret = '{--_PAYMENT_404--}';
// Load payment data
$result = SQL_QUERY_ESC("SELECT `mail_title`, `price` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1",
@@ -1040,7 +863,7 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
$ret = 'failed';
// Is the userid valid?
- if ($userid > 0) {
+ if (isValidUserId($userid)) {
// Remove entry from array
unset($receivers[$key]);
@@ -1048,7 +871,10 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
if ($stats_id > 0) {
// Only when we got a real stats id continue searching for the entry
$type = 'NORMAL'; $rowName = 'stats_id';
- if ($bonus) { $type = 'BONUS'; $rowName = 'bonus_id'; }
+ if ($bonus) {
+ $type = 'BONUS';
+ $rowName = 'bonus_id';
+ } // END - if
// 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",
@@ -1067,8 +893,8 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
// Free memory
SQL_FREERESULT($result);
- }
- }
+ } // END - if
+ } // END - if
// Return status for sending routine
return $ret;
@@ -1079,27 +905,27 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
// Init count/sum
$data['res'] = '0';
- //* DEBUG: */ print($search.'/'.$tableName.'/'.$lookFor.'/'.$whereStatement.'/'.$add.' ');
+ //* DEBUG: */ debugOutput($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`) AS res 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`) AS res 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`) AS res FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
+ //* DEBUG: */ debugOutput('COUNT!');
+ $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`) AS res FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
+ //* DEBUG: */ debugOutput('SUM!');
+ $result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
}
@@ -1119,7 +945,7 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
}
// Return value
- //* DEBUG: */ print 'ret=' . $data['res'] . ' ';
+ //* DEBUG: */ debugOutput('ret=' . $data['res']);
return $data['res'];
}
// Getter fro ref level percents
@@ -1162,16 +988,16 @@ function getReferalLevelPercents ($level) {
* Dynamic referal system, can also send mails!
*
* subject = Subject line, write in lower-case letters and underscore is allowed
- * userid = Referal id wich should receive...
+ * userid = Referal id wich should receive...
* points = ... xxx points
* sendNotify = shall I send the referal an email or not?
- * rid = inc/modules/guest/what-confirm.php need this
+ * refid = inc/modules/guest/what-confirm.php need this
* locked = Shall I pay it to normal (false) or locked (true) points ammount?
* add_mode = Add points only to $userid or also refs? (WARNING! Changing 'ref' to 'direct'
* for default value will cause no referal will get points ever!!!)
*/
-function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $rid = '0', $locked = false, $add_mode = 'ref') {
- //* DEBUG: */ print("----------------------- ".__FUNCTION__." - ENTRY ------------------------\n");
+function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $refid = '0', $add_mode = 'ref') {
+ //* DEBUG: */ debugOutput('----------------------- ' . __FUNCTION__ . ' - ENTRY ------------------------');
// Convert mode to lower-case
$add_mode = strtolower($add_mode);
@@ -1182,133 +1008,140 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
return;
} // END - if
- // Prepare data for the filter
- $filterData = array(
- 'subject' => $subject,
- 'userid' => $userid,
- 'points' => $points,
- 'notify' => $sendNotify,
- 'rid' => $rid,
- 'locked' => $locked,
- 'mode' => 'add',
- 'sub_mode' => $add_mode,
- );
-
- // Filter it now
- runFilterChain('add_points', $filterData);
-
// Count up referal depth
if (!isset($GLOBALS['ref_level'])) {
// Initialialize referal system
- //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__." ): Referal system initialized! ");
+ //* DEBUG: */ debugOutput(__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: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . ' ): Referal level increased. DEPTH='.$GLOBALS['ref_level']);
}
- // Default is 'normal' points
- $data = 'points';
-
- // Which points, locked or normal?
- if ($locked === true) $data = 'locked_points';
-
// Check user account
- //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__." ):userid={$userid},points={$points} ");
+ //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . ' ):userid='.$userid.',points='.$points);
if (fetchUserData($userid)) {
+ // Determine wether the user has some mails to click before he/she gets the points
+ $locked = ifUserPointsLocked($userid);
+
+ // Default is 'normal' points
+ $data = 'points';
+
+ // Which points, locked or normal?
+ if ($locked === true) {
+ $data = 'locked_points';
+ } // END - if
+
// 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: */ debugOutput(__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: */ debugOutput(__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! ");
+ if ((isExtensionActive('refback')) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($add_mode == 'ref') && (isset($GLOBALS['cache_array']['add_userid'][$userid]))) {
+ //* DEBUG: */ debugOutput(__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: */ debugOutput(__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",
+ 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: */ debugOutput(__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)",
+ 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: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . ' ):data='.$data.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$add_mode.' - INSERTED! ('.SQL_AFFECTEDROWS().')');
} // END - if
+ // Prepare data for the filter
+ $filterData = array(
+ 'subject' => $subject,
+ 'userid' => $userid,
+ 'points' => $points,
+ 'notify' => $sendNotify,
+ 'refid' => $refid,
+ 'locked' => $locked,
+ 'mode' => 'add',
+ 'sub_mode' => $add_mode,
+ );
+
+ // Filter it now
+ runFilterChain('add_points', $filterData);
+
// Points updated, maybe I shall send him an email?
- if (($sendNotify === true) && (getUserData('refid') > 0) && ($locked === false)) {
+ if (($sendNotify === true) && (isValidUserId(getUserData('refid'))) && ($locked === false)) {
// Prepare content
$content = array(
'percents' => $per,
'level' => bigintval($GLOBALS['ref_level']),
'points' => $ref_points,
- 'refid' => getUserData('refid')
);
// Load email template
$message = loadEmailTemplate('confirm-referal', $content, bigintval($userid));
// Send email
- sendEmail($userid, getMessage('THANX_REFERAL_ONE_SUBJECT'), $message);
- } elseif (($sendNotify === true) && (getUserData('refid') == '0') && ($locked === false) && ($add_mode == 'direct')) {
+ sendEmail($userid, '{--THANX_REFERAL_ONE_SUBJECT--}', $message);
+ } elseif (($sendNotify === true) && (!isValidUserId(getUserData('refid'))) && ($locked === false) && ($add_mode == 'direct')) {
// Prepare content
$content = array(
- 'text' => getMessage('REASON_DIRECT_PAYMENT'),
- 'points' => translateComma($ref_points)
+ 'reason' => '{--REASON_DIRECT_PAYMENT--}',
+ 'points' => $ref_points
);
// Load message
$message = loadEmailTemplate('add-points', $content, $userid);
// And sent it away
- sendEmail($userid, getMessage('SUBJECT_DIRECT_PAYMENT'), $message);
- if (!isGetRequestParameterSet('mid')) loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
+ sendEmail($userid, '{--DIRECT_PAYMENT_SUBJECT--}', $message);
+ if (!isGetRequestParameterSet('mid')) {
+ // Output message to admin
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
+ } // END - if
}
// Maybe there's another ref?
- if ((getUserData('refid') > 0) && ($points > 0) && (getUserData('refid') != $userid) && ($add_mode == 'ref')) {
+ if ((isValidUserId(getUserData('refid'))) && ($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! ");
- addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, $sendNotify, getUserData('refid'), $locked);
+ //* DEBUG: */ debugOutput(__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'));
} // END - if
} // END - if
} // END - if
- //* DEBUG: */ print(" ----------------------- ".__FUNCTION__." - EXIT ------------------------ ");
+ //* DEBUG: */ debugOutput(' ----------------------- '.__FUNCTION__.' - EXIT ------------------------ ');
}
// Updates the referal counter
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: */ debugOutput(__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: */ debugOutput(__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: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . ' ):userid='.$userid);
} // END - if
// Init referal id
@@ -1320,17 +1153,17 @@ function updateReferalCounter ($userid) {
$ref = getUserData('refid');
} // END - if
- //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__." ):userid={$userid},ref={$ref} ");
+ //* DEBUG: */ debugOutput(__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: */ debugOutput(__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! ");
+ //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . ' ):ref='.$ref.' - CACHE!');
rebuildCache('refsystem', 'refsystem');
}
@@ -1338,6 +1171,7 @@ function updateReferalCounter ($userid) {
$GLOBALS['cache_array']['ref_level'][$userid]--;
// Handle refback here if extension is installed
+ // @TODO Rewrite this to a filter
if (isExtensionActive('refback')) {
updateRefbackTable($userid);
} // END - if
@@ -1347,7 +1181,7 @@ function updateReferalCounter ($userid) {
// because we need it when there is no ext-admins installed
function sendAdminEmails ($subj, $message) {
// Load all admin email addresses
- $result = SQL_QUERY("SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC", __FUNCTION__, __LINE__);
+ $result = SQL_QUERY('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC', __FUNCTION__, __LINE__);
while ($content = SQL_FETCHARRAY($result)) {
// Send the email out
sendEmail($content['email'], $subj, $message);
@@ -1395,10 +1229,7 @@ function getCurrentAdminId () {
// Do we have cache?
if (!isset($GLOBALS['current_admin_id'])) {
// Get the admin login from session
- $adminLogin = getSession('admin_login');
-
- // "Solve" it into an id
- $adminId = getAdminId($adminLogin);
+ $adminId = getSession('admin_id');
// Remember in cache securely
setCurrentAdminId(bigintval($adminId));
@@ -1415,20 +1246,20 @@ function setCurrentAdminId ($currentAdminId) {
}
// Get password hash from administrator's login name
-function getAdminHash ($adminLogin) {
+function getAdminHash ($adminId) {
// By default an invalid hash is returned
$data['password'] = '-1';
- if (isAdminHashSet($adminLogin)) {
+ if (isAdminHashSet($adminId)) {
// Check cache
- $data['password'] = $GLOBALS['cache_array']['admin']['password'][$adminLogin];
+ $data['password'] = $GLOBALS['cache_array']['admin']['password'][$adminId];
// Update cache hits
incrementStatsEntry('cache_hits');
} elseif (!isExtensionActive('cache')) {
// Load from database
- $result = SQL_QUERY_ESC("SELECT `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
- array($adminLogin), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+ array(bigintval($adminId)), __FUNCTION__, __LINE__);
// Do we have an entry?
if (SQL_NUMROWS($result) == 1) {
@@ -1436,7 +1267,7 @@ function getAdminHash ($adminLogin) {
$data = SQL_FETCHARRAY($result);
// Set cache
- setAdminHash($adminLogin, $data['password']);
+ setAdminHash($adminId, $data['password']);
} // END - if
// Free result
@@ -1549,11 +1380,11 @@ function getAdminDefaultAcl ($adminId) {
}
// Generates an option list from various parameters
-function generateOptionList ($table, $id, $name, $default='', $special='', $where='', $disabled=array()) {
+function generateOptionList ($table, $id, $name, $default = '', $special = '', $where = '', $disabled = array(), $callback = '') {
$ret = '';
if ($table == '/ARRAY/') {
// Selection from array
- if ((is_array($id)) && (is_array($name)) && (count($id)) == (count($name))) {
+ if ((is_array($id)) && (is_array($name)) && ((count($id)) == (count($name)) || (!empty($callback)))) {
// Both are arrays
foreach ($id as $idx => $value) {
$ret .= '';
} // END - foreach
} else {
// Problem in request
- debug_report_bug(__FUNCTION__, __LINE__, 'Not all are arrays: id[' . count($id) . ']=' . gettype($id) . ',name[' . count($name) . ']=' . gettype($name));
+ debug_report_bug(__FUNCTION__, __LINE__, 'Not all are arrays: id[' . count($id) . ']=' . gettype($id) . ',name[' . count($name) . ']=' . gettype($name) . ',callback=' . $callback);
}
} else {
// Data from database
@@ -1585,7 +1424,7 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
), __FUNCTION__, __LINE__);
// Do we have rows?
- if (SQL_NUMROWS($result) > 0) {
+ if (!SQL_HASZERONUMS($result)) {
// 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()
while (list($value, $title, $add) = SQL_FETCHROW($result)) {
@@ -1598,7 +1437,17 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
// Disabled!
$ret .= ' disabled="disabled"';
}
+
+ // Add it, if set
if (!empty($add)) $add = ' ('.$add.')';
+
+ // Is the call-back function set?
+ if (!empty($callback)) {
+ // Call it
+ $title = call_user_func_array($callback, array($title));
+ } // END - if
+
+ // Finish option list
$ret .= '>' . $title . $add . ' ';
} // END - while
} else {
@@ -1622,9 +1471,7 @@ function FILTER_ACTIVATE_EXCHANGE () {
} // END - if
// Check total amount of users
- $totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, ' AND max_mails > 0');
-
- if ($totalUsers >= getConfig('activate_xchange')) {
+ if (getTotalConfirmedUser() >= getConfig('activate_xchange')) {
// Activate System
setSqlsArray(array(
"UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1",
@@ -1648,15 +1495,16 @@ function deleteUserAccount ($userid, $reason) {
$data['points'] = '0';
$result = SQL_QUERY_ESC("SELECT
- (SUM(p.points) - d.used_points) AS points
+ (SUM(p.`points`) - d.`used_points`) AS `points`
FROM
`{?_MYSQL_PREFIX?}_user_points` AS p
LEFT JOIN
`{?_MYSQL_PREFIX?}_user_data` AS d
ON
- p.userid=d.userid
+ p.`userid`=d.`userid`
WHERE
- p.userid=%s",
+ p.`userid`=%s
+LIMIT 1",
array(bigintval($userid)), __FUNCTION__, __LINE__);
// Do we have an entry?
@@ -1665,7 +1513,8 @@ WHERE
$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__);
+ SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s",
+ array(bigintval($userid)), __FUNCTION__, __LINE__);
// Update mediadata as well
if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
@@ -1693,11 +1542,10 @@ WHERE
// 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', $data, $userid);
- sendEmail($userid, getMessage('ADMIN_DEL_ACCOUNT'), $message);
+ sendEmail($userid, '{--ADMIN_DELETE_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__);
@@ -1714,7 +1562,7 @@ function getWhatFromModule ($modCheck) {
// Default is empty
$what = '';
- //* DEBUG: */ print(__LINE__.'!'.$modCheck."! ");
+ //* DEBUG: */ debugOutput(__LINE__.'!'.$modCheck.'!');
switch ($modCheck) {
case 'admin':
$what = 'overview';
@@ -1725,7 +1573,7 @@ function getWhatFromModule ($modCheck) {
// Is ext-sql_patches installed and newer than 0.0.5?
if (isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
// Use it from config
- $what = getConfig('index_home');
+ $what = getIndexHome();
} else {
// Use default 'welcome'
$what = 'welcome';
@@ -1760,21 +1608,9 @@ function subtractPoints ($subject, $userid, $points) {
}
// "Getter" for total available receivers
-function getTotalReceivers ($mode='normal') {
- // Query database
- $result_all = SQL_QUERY("SELECT
- `userid`
-FROM
- `{?_MYSQL_PREFIX?}_user_data`
-WHERE
- `status`='CONFIRMED' AND `receive_mails` > 0 ".runFilterChain('exclude_users', $mode),
- __FUNCTION__, __LINE__);
-
+function getTotalReceivers ($mode = 'normal') {
// Get num rows
- $numRows = SQL_NUMROWS($result_all);
-
- // Free result
- SQL_FREERESULT($result_all);
+ $numRows = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, ' AND `receive_mails` > 0' . runFilterChain('exclude_users', $mode));
// Return value
return $numRows;
@@ -1794,11 +1630,11 @@ function generateCategoryOptionsList ($mode) {
);
// Get categories
- $result = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`".$whereStatement." ORDER BY `sort` ASC",
+ $result = SQL_QUERY('SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`' . $whereStatement . ' ORDER BY `sort` ASC',
__FUNCTION__, __LINE__);
// Do we have entries?
- if (SQL_NUMROWS($result) > 0) {
+ if (!SQL_HASZERONUMS($result)) {
// ... and begin loading stuff
while ($content = SQL_FETCHARRAY($result)) {
// Transfer some data
@@ -1836,7 +1672,7 @@ function generateCategoryOptionsList ($mode) {
} // END - foreach
} else {
// No cateogries are defined yet
- $OUT = '{--MEMBER_NO_CATS--} ';
+ $OUT = '{--MEMBER_NO_CATEGORIES--} ';
}
// Return HTML code
@@ -1927,8 +1763,8 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
// Category given?
if ($cat > 0) {
// Select category
- $CAT_TABS = "LEFT JOIN `{?_MYSQL_PREFIX?}_user_cats` AS c ON d.userid=c.userid";
- $CAT_WHERE = sprintf(" AND c.cat_id=%s", $cat);
+ $CAT_TABS = "LEFT JOIN `{?_MYSQL_PREFIX?}_user_cats` AS c ON d.`userid`=c.`userid`";
+ $CAT_WHERE = sprintf(" AND c.`cat_id`=%s", $cat);
} // END - if
// Exclude users in holiday?
@@ -1972,7 +1808,7 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
// "Getter" for array for user refs and points in given level
function getUserReferalPoints ($userid, $level) {
- //* DEBUG: */ print("----------------------- ".__FUNCTION__." - ENTRY ------------------------\n");
+ //* DEBUG: */ debugOutput('----------------------- '.__FUNCTION__.' - ENTRY ------------------------');
// Default is no refs and no nickname
$add = '';
$refs = array();
@@ -2005,11 +1841,11 @@ ORDER BY
), __FUNCTION__, __LINE__);
// Are there some entries?
- if (SQL_NUMROWS($result) > 0) {
+ if (!SQL_HASZERONUMS($result)) {
// Fetch all entries
while ($row = SQL_FETCHARRAY($result)) {
// Get total points of this user
- $row['points'] = countSumTotalData($row['refid'], 'user_points', 'points') - countSumTotalData($row['refid'], 'user_data', 'used_points');
+ $row['points'] = getTotalPoints($row['refid']);
// Get unconfirmed mails
$row['unconfirmed'] = countSumTotalData($row['refid'], 'user_links', 'id', 'userid', true);
@@ -2024,12 +1860,12 @@ ORDER BY
} // END - if
// Activity is 'active' by default because if autopurge is not installed
- $row['activity'] = getMessage('MEMBER_ACTIVITY_ACTIVE');
+ $row['activity'] = '{--MEMBER_ACTIVITY_ACTIVE--}';
// Is autopurge installed and the user inactive?
- if ((isExtensionActive('autopurge')) && ((time() - getConfig('ap_inactive_since')) >= $row['last_online'])) {
+ if ((isExtensionActive('autopurge')) && ((time() - getApInactiveSince()) >= $row['last_online'])) {
// Inactive user!
- $row['activity'] = getMessage('MEMBER_ACTIVITY_INACTIVE');
+ $row['activity'] = '{--MEMBER_ACTIVITY_INACTIVE--}';
} // END - if
// Remove some entries
@@ -2046,7 +1882,7 @@ ORDER BY
SQL_FREERESULT($result);
// Return result
- //* DEBUG: */ print(" ----------------------- ".__FUNCTION__." - EXIT ------------------------ ");
+ //* DEBUG: */ debugOutput(' ----------------------- '.__FUNCTION__.' - EXIT ------------------------ ');
return $refs;
}
@@ -2057,7 +1893,7 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
array($column, bigintval($id), $count), __FUNCTION__, __LINE__);
// Are there entries?
- if (SQL_NUMROWS($result) > 0) {
+ if (!SQL_HASZERONUMS($result)) {
// Now load all userids for one big query!
$userids = array();
while ($data = SQL_FETCHARRAY($result)) {
@@ -2103,6 +1939,9 @@ function createNewTask ($subject, $notes, $taskType, $userid = '0', $adminId = '
$subject,
$notes
), __FUNCTION__, __LINE__, true, $strip);
+
+ // Return insert id which is the task id
+ return SQL_INSERTID();
}
// Updates last module / online time