X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmysql-manager.php;h=4eb508c5c48c8660c90069531e7d8ab3ee3d269e;hb=0ec2d97bfc19f79d1f4228b2c7a318ac58d25cd4;hp=5c996cea14c0f6c20ee8cb74c222ae101d37505c;hpb=93dc3d5b067c15568b01bcda1550018b38d1cdd9;p=mailer.git
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 5c996cea14..4eb508c5c4 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -6,19 +6,17 @@
* -------------------------------------------------------------------- *
* File : mysql-manager.php *
* -------------------------------------------------------------------- *
- * Short description : All MySQL-related functions *
+ * Short description : All database-related functions *
* -------------------------------------------------------------------- *
- * Kurzbeschreibung : Alle MySQL-Relevanten Funktionen *
+ * Kurzbeschreibung : Alle datenbank-relevanten Funktionen *
* -------------------------------------------------------------------- *
* $Revision:: $ *
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2011 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,60 +40,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,179 +72,8 @@ 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) {
+// Add link into output stream (or return it) for 'You Are Here' navigation
+function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
// Use only filename of the FQFN...
$file = basename($FQFN);
@@ -328,9 +107,9 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
if (isAdmin()) $ADD = '';
$dummy = substr($search, 0, -4);
- $ADD .= " AND `action`='".getActionFromModuleWhat($accessLevel, $dummy)."'";
- } elseif (($accessLevel == 'sponsor') || ($accessLevel == 'engine')) {
- // Sponsor / engine menu
+ $ADD .= sprintf(" AND `action`='%s'", getActionFromModuleWhat($accessLevel, $dummy));
+ } elseif ($accessLevel == 'sponsor') {
+ // Sponsor menu
$type = 'what';
$search = $file;
$modCheck = getModule();
@@ -344,7 +123,7 @@ 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';
@@ -366,16 +145,16 @@ 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 .= '';
$GLOBALS['nav_depth'] = '0';
@@ -426,13 +205,13 @@ 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);
// Load menu header template
@@ -456,9 +235,9 @@ ORDER BY
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';
+ $count = '0';
// Load all sub menus
while ($content2 = SQL_FETCHARRAY($result_sub)) {
@@ -469,7 +248,7 @@ ORDER BY
$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
@@ -480,12 +259,12 @@ ORDER BY
// Navigation link
$OUT .= '';
} else {
- // Not found! - open
- $OUT .= '';
+ // Not found - open
+ $OUT .= '';
}
// Menu title
- $OUT .= getConfig('menu_blur_spacer') . $content['sub_title'];
+ $OUT .= '{?menu_blur_spacer?}' . $content['sub_title'];
if (isIncludeReadable($inc)) {
$OUT .= '';
@@ -495,12 +274,12 @@ ORDER BY
$OUT .= '';
} // END - if
} else {
- // Not found! - close
+ // Not found - close
$OUT .= '';
}
// Cunt it up
- $cnt++;
+ $count++;
// Rewrite array
$content = array(
@@ -511,7 +290,7 @@ ORDER BY
);
// Add regular menu row or bottom row?
- if ($cnt < SQL_NUMROWS($result_sub)) {
+ if ($count < SQL_NUMROWS($result_sub)) {
$GLOBALS['rows'] .= loadTemplate($mode . '_menu_row', true, $content);
} else {
$GLOBALS['rows'] .= loadTemplate($mode . '_menu_bottom', true, $content);
@@ -526,12 +305,12 @@ ORDER BY
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
@@ -540,7 +319,7 @@ ORDER BY
// 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);
@@ -575,7 +354,7 @@ ORDER BY
);
// 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
}
@@ -587,63 +366,60 @@ function isMember () {
// Fix missing 'last_online' array, damn stupid code :(((
// @TODO Try to rewrite this to one or more functions
- if ((!isset($GLOBALS['last_online'])) || (!is_array($GLOBALS['last_online']))) $GLOBALS['last_online'] = array();
+ if ((!isset($GLOBALS['last_online'])) || (!is_array($GLOBALS['last_online']))) {
+ $GLOBALS['last_online'] = array();
+ } // END - if
- // is the cache entry there?
- if (isset($GLOBALS['is_member'])) {
+ // Is the cache entry there?
+ 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
+ // Destroy any existing user session data
+ destroyMemberSession();
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No member set in cookie/session.');
+
+ // Abort further processing
return false;
- } else {
- // Get it secured from session
- setMemberId(getSession('userid'));
- setCurrentUserId(getMemberId());
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . getSession('userid') . ' used from cookie/session.');
}
+ // Get userid secured from session
+ setMemberId(getSession('userid'));
+
+ // ... and set it as currently handled user id
+ setCurrentUserId(getMemberId());
+
// Init user data array
initUserData();
// Fix "deleted" cookies first
fixDeletedCookies(array('userid', 'u_hash'));
- // Are cookies set?
- if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
- // 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 = encodeHashForCookie(getUserData('password'));
+ // Are cookies set and can the member data be loaded?
+ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash')) && (fetchUserData(getMemberId()) === true)) {
+ // Validate password by created the difference of it and the secret key
+ $valPass = encodeHashForCookie(getUserData('password'));
+ // So did we now have valid data and an unlocked user?
+ if ((getUserData('status') == 'CONFIRMED') && ($valPass == getSession('u_hash'))) {
// Transfer last module and online time
$GLOBALS['last_online']['module'] = getUserData('last_module');
$GLOBALS['last_online']['online'] = getUserData('last_online');
- // So did we now have valid data and an unlocked user?
- if ((getUserData('status') == 'CONFIRMED') && ($valPass == getSession('u_hash'))) {
- // Account is confirmed and all cookie data is valid so he is definely logged in! :-)
- $ret = true;
- } else {
- // Maybe got locked etc.
- //* DEBUG */ 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.');
+ // Account is confirmed and all cookie data is valid so he is definely logged in! :-)
+ $ret = true;
+ } // END - if
+ } // END - if
+
+ // Is $ret still false?
+ if ($ret === false) {
+ // Yes, so destroy the session
destroyMemberSession();
- }
+ } // END - if
// Cache status
- $GLOBALS['is_member'] = $ret;
+ $GLOBALS[__FUNCTION__] = $ret;
// Return status
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . intval($ret));
@@ -651,39 +427,46 @@ function isMember () {
}
// Fetch user data for given user id
-function fetchUserData ($userid, $column = 'userid') {
+function fetchUserData ($value, $column = 'userid') {
+ // Extension ext-user must be there at any case
+ if (!isExtensionActive('user')) {
+ // Absent ext-user is really not good
+ return false;
+ } // END - if
+
// If we should look for userid secure&set it here
if (substr($column, -2, 2) == 'id') {
// Secure userid
- $userid = bigintval($userid);
+ $value = bigintval($value);
// Set it here
- setCurrentUserId($userid);
+ setCurrentUserId($value);
// Don't look for invalid userids...
- if ($userid < 1) {
+ if (!isValidUserId($value)) {
// Invalid, so abort here
- debug_report_bug(__FUNCTION__, __LINE__, 'User id ' . $userid . ' is invalid.');
+ debug_report_bug(__FUNCTION__, __LINE__, 'User id ' . $value . ' is invalid.');
} elseif (isUserDataValid()) {
// Use cache, so it is fine
return true;
}
- } elseif (isUserDataValid()) {
- // Use cache, so it is fine
+ } elseif (isUserDataValid()) {
+ // Using cache is fine
return true;
}
-
// By default none was found
$found = false;
// Extra statements
$ADD = '';
- if (isExtensionInstalledAndNewer('user', '0.3.5')) $ADD = ', UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`';
+ if (isExtensionInstalledAndNewer('user', '0.3.5')) {
+ $ADD = ', UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`';
+ } // END - if
// Query for the user
$result = SQL_QUERY_ESC("SELECT *".$ADD." FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1",
- array($column, $userid), __FUNCTION__, __LINE__);
+ array($column, $value), __FUNCTION__, __LINE__);
// Do we have a record?
if (SQL_NUMROWS($result) == 1) {
@@ -692,16 +475,18 @@ function fetchUserData ($userid, $column = 'userid') {
// Set the userid for later use
setCurrentUserId($data['userid']);
+
+ // And cache the data for this userid
$GLOBALS['user_data'][getCurrentUserId()] = $data;
- // Rewrite 'last_failure' if found
- if (isset($GLOBALS['user_data'][getCurrentUserId()]['last_failure'])) {
+ // Rewrite 'last_failure' if found and ext-user has version >= 0.3.7
+ if ((isExtensionInstalledAndNewer('user', '0.3.7')) && (isset($GLOBALS['user_data'][getCurrentUserId()]['last_failure']))) {
// Backup the raw one and zero it
$GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'] = $GLOBALS['user_data'][getCurrentUserId()]['last_failure'];
- $GLOBALS['user_data'][getCurrentUserId()]['last_failure'] = '0';
+ $GLOBALS['user_data'][getCurrentUserId()]['last_failure'] = null;
// Is it not zero?
- if ($GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'] != '0000-00-00 00:00:00') {
+ if (!is_null($GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'])) {
// Seperate data/time
$array = explode(' ', $GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw']);
@@ -733,7 +518,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;
@@ -741,39 +526,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');
- $passCookie = getSession('admin_md5');
+ $adminId = getCurrentAdminId();
+ $passCookie = getAdminMd5();
+ } // END - if
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminId.'/'.$passCookie);
+
+ // Abort if admin id is zero
+ if ($adminId == '0') {
+ return false;
} // END - if
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminLogin.'/'.$passCookie.'
');
// 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;
@@ -782,12 +573,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"
@@ -798,13 +589,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;
@@ -814,7 +605,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);
+ $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);
} 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
@@ -898,10 +703,10 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
// Should we look for affected rows (only update) or found rows?
if ($updateEntry === true) {
// Check updated/affected rows
- $ret = (SQL_AFFECTEDROWS() == 1);
+ $ret = (!SQL_HASZEROAFFECTED());
} else {
// Check found rows
- $ret = (SQL_NUMROWS($result) == 1);
+ $ret = (!SQL_HASZERONUMS($result));
}
// Free memory
@@ -919,7 +724,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()) {
@@ -934,7 +739,7 @@ function getActionFromModuleWhat ($module, $what) {
}
} elseif ((empty($what)) && ($module != 'admin')) {
// Use configured 'home'
- $what = getConfig('index_home');
+ $what = getIndexHome();
} // END - if
if ($module == 'admin') {
@@ -953,7 +758,7 @@ function getActionFromModuleWhat ($module, $what) {
// Get it directly from URL
return getAction();
}
- //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__ . '): ret=' . $data['action'] . '
');
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ' ret=' . $data['action']);
// Does the module have a menu?
if (ifModuleHasMenu($module)) {
@@ -988,12 +793,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",
@@ -1014,11 +819,13 @@ 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",
array(bigintval($pid)), __FUNCTION__, __LINE__);
+
+ // Do we have an entry?
if (SQL_NUMROWS($result) == 1) {
// Payment type found... :-)
$data = SQL_FETCHARRAY($result);
@@ -1027,9 +834,9 @@ function getPaymentTitlePrice ($pid, $full=false) {
if ($full === false) {
$ret = $data['mail_title'];
} else {
- $ret = $data['mail_title'] . ' / ' . translateComma($data['price']) . ' {?POINTS?}';
+ $ret = $data['mail_title'] . ' / {%pipe,translateComma=' . $data['price'] . '%} {?POINTS?}';
}
- }
+ } // END - if
// Free result
SQL_FREERESULT($result);
@@ -1041,7 +848,7 @@ function getPaymentTitlePrice ($pid, $full=false) {
// Get (basicly) the price of given payment id
function getPaymentPoints ($pid, $lookFor = 'price') {
// Default value...
- $data[$lookFor] = '-1';
+ $data[$lookFor] = -1;
// Search for it in database
$result = SQL_QUERY_ESC("SELECT `%s` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1",
@@ -1061,20 +868,26 @@ function getPaymentPoints ($pid, $lookFor = 'price') {
}
// Remove a receiver's id from $receivers and add a link for him to confirm
-function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $bonus = false) {
+function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = 0, $isBonusMail = false) {
// Default is not removed
$ret = 'failed';
// Is the userid valid?
- if ($userid > 0) {
+ if (isValidUserId($userid)) {
// Remove entry from array
unset($receivers[$key]);
// Is there already a line for this user available?
if ($stats_id > 0) {
+ // Default is 'normal' mail
+ $type = 'NORMAL';
+ $rowName = 'stats_id';
+
// 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 ($isBonusMail === true) {
+ $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",
@@ -1085,6 +898,13 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
// 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__);
+
+ // Update 'mails_sent' if sql_patches is updated
+ if (isExtensionInstalledAndNewer('sql_patches', '0.7.4')) {
+ // Update the pool
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `mails_sent`=`mails_sent`+1 WHERE `id`=%s LIMIT 1",
+ array(bigintval($pool_id)), __FUNCTION__, __LINE__);
+ } // END - if
$ret = 'done';
} else {
// Already found
@@ -1093,8 +913,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;
@@ -1105,27 +925,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__);
}
@@ -1145,7 +965,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
@@ -1158,7 +978,7 @@ function getReferalLevelPercents ($level) {
// First look for level
$key = array_search($level, $GLOBALS['cache_array']['refdepths']['level']);
if ($key !== false) {
- // Entry found!
+ // Entry found
$data['percents'] = $GLOBALS['cache_array']['refdepths']['percents'][$key];
// Count cache hit
@@ -1185,156 +1005,186 @@ function getReferalLevelPercents ($level) {
/**
*
- * Dynamic referal system, can also send mails!
+ * Dynamic referal and points 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'
+ * add_mode = Add points only to $userid or also refs? (WARNING! Changing 'REFERAL' 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 ------------------------