X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=cfd3e318cd896fcbf174e2eaf150380de76538d5;hb=4fef71140a7d5faeaff256ab7c5bf4616c671f63;hp=afed52db34fe7b0d169cc70be00ff33f03a5f30a;hpb=98e44adab9035e30efe78181b76d78c6e13ba574;p=mailer.git diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index afed52db34..cfd3e318cd 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -16,8 +16,8 @@ * $Author:: $ * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009 - 2011 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2012 by Mailer Developer Team * + * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -42,11 +42,20 @@ if (!defined('__SECURITY')) { // "Getter" for module description // @TODO Can we cache this? -function getTitleFromMenu ($mode, $what, $column = 'what', $ADD='') { +function getTitleFromMenu ($mode, $what, $column = 'what', $ADD = '') { + // Debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'mode=' . $mode . ',what=' . $what . ',column=' . $column . ',add=' . $ADD); + // Fix empty 'what' if (empty($what)) { $what = getIndexHome(); - } // END - if + } elseif ((isGetRequestElementSet('action')) && ($column == 'what')) { + // Get it from action + return getTitleFromMenu($mode, getAction(), 'action', $ADD); + } elseif ($what == 'welcome') { + // Overview page + return '{--WHAT_IS_WELCOME--}'; + } // Default is not found $data['title'] = '??? (' . $what . ')'; @@ -78,7 +87,7 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) { $file = basename($FQFN); // Init variables - $LINK_ADD = ''; + $linkAdd = ''; $OUT = ''; $ADD = ''; $prefix = ''; @@ -116,13 +125,11 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) { $type = 'what'; $search = $file; $modCheck = getModule(); - $ADD = ''; } else { // Other $type = 'menu'; $search = $file; $modCheck = getModule(); - $ADD = ''; } // Begin the navigation line @@ -131,17 +138,19 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) { $GLOBALS['nav_depth'] = '0'; // Run the pre-filter chain - $ret = runFilterChain('pre_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => '')); + $ret = runFilterChain('pre_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'search' => $search, 'prefix' => $prefix, 'link_add' => $linkAdd, 'content' => '', 'add' => $ADD)); // Add pre-content $prefix = $ret['content']; - $prefix .= '
{--YOU_ARE_HERE--} Home'; + // Add default content + $prefix .= '
{--YOU_ARE_HERE--} Home'; } elseif ($return === false) { // Count depth $GLOBALS['nav_depth']++; } + // Add arrow $prefix .= ' -> '; // We need to remove .php and the end @@ -150,23 +159,27 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) { $search = substr($search, 0, -4); } // END - if + // Is ext-sql_patches installed? + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isExtensionInstalledAndNewer()=' . intval(isExtensionInstalledAndNewer('sql_patches', '0.2.3')) . ',youre_here=' . getConfig('youre_here') . ',isAdmin()=' . intval(isAdmin()) . ',modCheck=' . $modCheck); if (((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (getConfig('youre_here') == 'Y')) || ((isAdmin()) && ($modCheck == 'admin'))) { // Output HTML code - $OUT = $prefix . '' . getTitleFromMenu($accessLevel, $search, $type, $ADD) . ''; + $OUT = $prefix . '' . getTitleFromMenu($accessLevel, $search, $type, $ADD) . ''; // Can we close the you-are-here navigation? - //* DEBUG: */ debugOutput(__LINE__.'*'.$type.'/'.getWhat().'*'); - if (($type == 'what') || (($type == 'action') && ((!isWhatSet()) || (getWhat() == 'overview')))) { - //* DEBUG: */ debugOutput(__LINE__.'+'.$type.'+'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'type=' . $type . ',getWhat()=' . getWhat() . ',accessLevel=' . $accessLevel . ',isWhatSet()=' . intval(isWhatSet())); + if (($type == 'what') || (($type == 'action') && ((!isWhatSet()) || (($accessLevel == 'admin') && (getWhat() == 'welcome'))))) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'type=' . $type); // Add closing div and br-tag - $OUT .= '
'; $GLOBALS['nav_depth'] = '0'; // Run the post-filter chain - $ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'content' => '')); + $ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'search' => $search, 'prefix' => $prefix, 'link_add' => $linkAdd, 'content' => $OUT, 'add' => $ADD)); + + // Get content from filter back + $OUT = $ret['content']; - // Add additional content - $OUT .= $ret['content']; + // Close div-tag, so not the filters have to do it + $OUT .= '
'; } // END - if } // END - if @@ -184,7 +197,6 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) { function addMenu ($mode, $action, $what) { // Init some variables $main_cnt = '0'; - $ADD = ''; // is the menu action valid? if (!isMenuActionValid($mode, $action, $what, true)) { @@ -192,13 +204,19 @@ function addMenu ($mode, $action, $what) { } // END - if // Non-admin shall not see all menus - if (!isAdmin()) { - $ADD = " AND `visible`='Y' AND `locked`='N'"; + $ADD = " AND `visible`='Y' AND `locked`='N'"; + if (isAdmin()) { + // Is admin, so make all visible + $ADD = ''; } // END - if // Load SQL data and add the menu to the output stream... $result_main = SQL_QUERY_ESC("SELECT - `title`, `what`, `action`, `visible`, `locked` + `title`, + `what`, + `action`, + `visible`, + `locked` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE @@ -208,12 +226,12 @@ ORDER BY `sort` ASC", array($mode), __FUNCTION__, __LINE__); - //* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . ':' . getWhat() . '*'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat()); if (!SQL_HASZERONUMS($result_main)) { // There are menus available, so we simply display them... :) $GLOBALS['rows'] = ''; while ($content = SQL_FETCHARRAY($result_main)) { - //* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . ':' . getWhat() . '*'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat()); // Disable the block-mode enableBlockMode(false); @@ -232,10 +250,13 @@ WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL - ".$ADD." + " . $ADD . " ORDER BY `sort` ASC", - array($mode, $content['action']), __FUNCTION__, __LINE__); + array( + $mode, + $content['action'] + ), __FUNCTION__, __LINE__); // Do we have some entries? if (!SQL_HASZERONUMS($result_sub)) { @@ -251,7 +272,7 @@ ORDER BY $OUT = ''; // Full file name for checking menu - //* DEBUG: */ debugOutput(__LINE__ . ':!!!!' . $content['sub_what'] . '!!!'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sub_what=' . $content['sub_what']); $inc = sprintf("inc/modules/%s/what-%s.php", $mode, $content['sub_what']); if (isIncludeReadable($inc)) { // Mark currently selected menu - open @@ -259,11 +280,17 @@ ORDER BY $OUT = ''; } // END - if - // Navigation link - $OUT .= ''; + // Is ext-sql_patches up-to-date, and display_home_in_index is Y? + if ((getModule() == 'index') && (isExtensionInstalledAndNewer('sql_patches', '0.8.3')) && (isDisplayHomeInIndexEnabled()) && ($content['sub_what'] == getIndexHome())) { + // Use index.php as link + $OUT .= ''; + } else { + // Regular navigation link + $OUT .= ''; + } } else { // Not found - open - $OUT .= ''; + $OUT .= ''; } // Menu title @@ -278,7 +305,7 @@ ORDER BY } // END - if } else { // Not found - close - $OUT .= ''; + $OUT .= ''; } // Cunt it up @@ -308,12 +335,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: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . '/' . getWhat().'*'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat()); loadInclude($INC); - //* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . '/' . getWhat() . '*'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat()); if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_end', true, $mode); } - //* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . '/' . $content['sub_what'] . ':' . getWhat() . '*'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat()); } // Free result @@ -322,18 +349,18 @@ ORDER BY // Count one up $main_cnt++; - //* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . ':' . getWhat() . '*'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat()); if (SQL_NUMROWS($result_main) > $main_cnt) { - // Add seperator - $GLOBALS['rows'] .= loadTemplate('menu_seperator', true, $mode); + // Add separator + $GLOBALS['rows'] .= loadTemplate('menu_separator', true, $mode); // Should we display adverts in this menu? if ((isExtensionInstalledAndNewer('menu', '0.0.1')) && (getConfig($mode . '_menu_advert_enabled') == 'Y') && ($action != 'admin')) { // Display advert template $GLOBALS['rows'] .= loadTemplate('menu_' . $mode . '_advert_' . $action, true); - // Add seperator again - $GLOBALS['rows'] .= loadTemplate('menu_seperator', true, $mode); + // Add separator again + $GLOBALS['rows'] .= loadTemplate('menu_separator', true, $mode); } // END - if } // END - if } // END - while @@ -343,8 +370,8 @@ ORDER BY // Should we display adverts in this menu? if ((isExtensionInstalledAndNewer('menu', '0.0.1')) && (getConfig($mode . '_menu_advert_enabled') == 'Y')) { - // Add seperator again - $GLOBALS['rows'] .= loadTemplate('menu_seperator', true, $mode); + // Add separator again + $GLOBALS['rows'] .= loadTemplate('menu_separator', true, $mode); // Display advert template $GLOBALS['rows'] .= loadTemplate('menu_' . $mode . '_advert_end', true); @@ -352,17 +379,17 @@ ORDER BY // Prepare data $content = array( - 'rows' => $GLOBALS['rows'], - 'mode' => $mode + 'rows' => $GLOBALS['rows'], + 'menu_mode' => $mode ); // Load main template - //* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . '/' . $content['sub_what'] . ':' . getWhat() . '*'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat()); loadTemplate('menu_table', false, $content); } // END - if } -// Checks wether the current user is a member +// Checks whether the current user is a member function isMember () { // By default no member $ret = false; @@ -396,7 +423,7 @@ function isMember () { // Init user data array initUserData(); - // Fix "deleted" cookies first + // Fix "deleted" cookies fixDeletedCookies(array('userid', 'u_hash')); // Are cookies set and can the member data be loaded? @@ -407,7 +434,7 @@ function isMember () { // 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']['module'] = getUserData(getUserLastWhatName()); $GLOBALS['last_online']['online'] = getUserData('last_online'); // Account is confirmed and all cookie data is valid so he is definely logged in! :-) @@ -435,41 +462,49 @@ function fetchUserData ($value, $column = 'userid') { if (!isExtensionActive('user')) { // Absent ext-user is really not good return false; - } // END - if + } elseif (is_null($value)) { + // This shall never happen, so please report it + reportBug(__FUNCTION__, __LINE__, 'value=NULL,column=' . $column . ' - value can never be NULL'); + } // If we should look for userid secure&set it here if (substr($column, -2, 2) == 'id') { // Secure userid $value = bigintval($value); - // Set it here - setCurrentUserId($value); - // Don't look for invalid userids... if (!isValidUserId($value)) { // Invalid, so abort here - debug_report_bug(__FUNCTION__, __LINE__, 'User id ' . $value . ' is invalid.'); + reportBug(__FUNCTION__, __LINE__, 'User id ' . $value . ' is invalid.'); + } // END - if + + // Unset cached values if found and different + if ((isCurrentUserIdSet()) && (getCurrentUserId() != $value)) { + // Unset it + unsetCurrentUserId(); } elseif (isUserDataValid()) { // Use cache, so it is fine + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #1'); return true; - } - } elseif (isUserDataValid()) { + } // END - if + } elseif (isUserDataValid()) { // Using cache is fine + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #2'); 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`'; - } // END - if + // Extra SQL statements + $ADD = runFilterChain('convert_user_data_columns', ' '); // Query for the user - $result = SQL_QUERY_ESC("SELECT *".$ADD." FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1", - array($column, $value), __FUNCTION__, __LINE__); + $result = SQL_QUERY_ESC("SELECT *" . $ADD . " FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1", + array( + $column, + $value + ), __FUNCTION__, __LINE__); // Do we have a record? if (SQL_NUMROWS($result) == 1) { @@ -486,7 +521,7 @@ function fetchUserData ($value, $column = 'userid') { 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'] = null; + $GLOBALS['user_data'][getCurrentUserId()]['last_failure'] = NULL; // Is it not zero? if (!is_null($GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'])) { @@ -520,7 +555,12 @@ function fetchUserData ($value, $column = 'userid') { return $found; } -// This patched function will reduce many SELECT queries for the specified or current admin login +/* + * Checks whether the current session bears a valid admin id and password hash. + * + * This patched function will reduce many SELECT queries for the current admin + * login. + */ function isAdmin () { // No admin in installation phase! if ((isInstallationPhase()) || (!isAdminRegistered())) { @@ -530,7 +570,7 @@ function isAdmin () { // Init variables $ret = false; $adminId = '0'; - $passCookie = ''; + $passwordFromCookie = ''; $valPass = ''; //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminId); @@ -538,12 +578,16 @@ function isAdmin () { if ((isSessionVariableSet('admin_id')) && (isSessionVariableSet('admin_md5'))) { // Get admin login and password from session/cookies $adminId = getCurrentAdminId(); - $passCookie = getAdminMd5(); + $passwordFromCookie = getAdminMd5(); } // END - if - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminId.'/'.$passCookie); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminId=' . $adminId . 'passwordFromCookie=' . $passwordFromCookie); // Abort if admin id is zero if ($adminId == '0') { + // A very noisy debug message ... + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Current adminId is zero. isSessionVariableSet(admin_id)=' . intval(isSessionVariableSet('admin_id')) . ',isSessionVariableSet(admin_md5)=' . intval(isSessionVariableSet('admin_md5'))); + + // Abort here now return false; } // END - if @@ -556,7 +600,7 @@ function isAdmin () { if (isset($GLOBALS['admin_hash'])) { // Use cached string $valPass = $GLOBALS['admin_hash']; - } elseif ((!empty($passCookie)) && (isAdminHashSet($adminId) === true) && (!empty($adminId))) { + } elseif ((!empty($passwordFromCookie)) && (isAdminHashSet($adminId) === true) && (!empty($adminId))) { // Login data is valid or not? $valPass = encodeHashForCookie(getAdminHash($adminId)); @@ -575,8 +619,8 @@ function isAdmin () { if (!empty($valPass)) { // Check if password is valid - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '(' . $valPass . '==' . $passCookie . ')='.intval($valPass == $passCookie)); - $GLOBALS[__FUNCTION__][$adminId] = (($GLOBALS['admin_hash'] == $passCookie) || ((strlen($GLOBALS['admin_hash']) == 32) && ($GLOBALS['admin_hash'] == md5($passCookie))) || (($GLOBALS['admin_hash'] == '*FAILED*') && (!isExtensionActive('cache')))); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '(' . $valPass . '==' . $passwordFromCookie . ')='.intval($valPass == $passwordFromCookie)); + $GLOBALS[__FUNCTION__][$adminId] = ($GLOBALS['admin_hash'] == $passwordFromCookie); } // END - if } // END - if @@ -592,13 +636,14 @@ 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 'admin': 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; @@ -612,7 +657,11 @@ function addMaxReceiveList ($mode, $default = '', $return = false) { $OUT = ''; while ($content = SQL_FETCHARRAY($result)) { $OUT .= ' '; } // 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) . ',callback=' . $callback); + reportBug(__FUNCTION__, __LINE__, 'Not all are arrays: key[' . count($key) . ']=' . gettype($key) . ',value[' . count($value) . ']=' . gettype($value) . ',callback=' . $callback); } } else { - // Data from database - $SPEC = ', `' . $id . '`'; - if (!empty($special)) { - $SPEC = ', `' . $special . '`'; + /////////////////////// + // Data from database / + /////////////////////// + + // Init extra column (if requested) + $extraColumn = ''; + if (!empty($extra)) { + $extraColumn = ',`' . $extra . '` AS `extra`'; } // END - if - // Query the database - $result = SQL_QUERY_ESC("SELECT `%s`, `%s`".$SPEC." FROM `{?_MYSQL_PREFIX?}_%s` ".$where." ORDER BY `%s` ASC", + // Run SQL query + $result = SQL_QUERY_ESC("SELECT `%s` AS `key`,`%s` AS `value`" . $extraColumn . " FROM `{?_MYSQL_PREFIX?}_%s` " . $whereStatement . " ORDER BY `%s` ASC", array( - $id, - $name, + $key, + $value, $table, - $name + $value ), __FUNCTION__, __LINE__); // Do we have rows? 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)) { - if (empty($special)) $add = ''; - $ret .= ''; } // END - while } else { // No data found @@ -1538,30 +1413,6 @@ function generateOptionList ($table, $id, $name, $default = '', $special = '', $ // Return - hopefully - the requested data return $ret; } -// Activate exchange -function FILTER_ACTIVATE_EXCHANGE () { - // Is the extension 'user' there? - if ((!isExtensionActive('user')) || (getActivateXchange() == '0')) { - // Silently abort here - return false; - } // END - if - - // Check total amount of users - if (getTotalConfirmedUser() >= getActivateXchange()) { - // Activate System - addSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1"); - addSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='order' OR `what`='unconfirmed' LIMIT 2"); - - // Run SQLs - runFilterChain('run_sqls'); - - // Update configuration - updateConfiguration('activate_xchange' ,0); - - // Rebuild cache - rebuildCache('modules', 'modules'); - } // END - if -} // Deletes a user account with given reason function deleteUserAccount ($userid, $reason) { @@ -1632,22 +1483,18 @@ LIMIT 1", // Gets the matching what name from module function getWhatFromModule ($modCheck) { // Is the request element set? - if (isGetRequestParameterSet('what')) { + if (isGetRequestElementSet('what')) { // Then return this! - return getRequestParameter('what'); + return getRequestElement('what'); } // END - if // Default is empty $what = ''; - //* DEBUG: */ debugOutput(__LINE__.'!'.$modCheck.'!'); + // Check on given module + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'modCheck=' . $modCheck); switch ($modCheck) { - case 'admin': - $what = 'overview'; - break; - - case 'login': - case 'index': + case 'index': // Guest area // Is ext-sql_patches installed and newer than 0.0.5? if (isExtensionInstalledAndNewer('sql_patches', '0.0.5')) { // Use it from config @@ -1658,8 +1505,8 @@ function getWhatFromModule ($modCheck) { } break; - default: - $what = ''; + default: // Default for all other menus (getIndexHome() is for index module only) + $what = 'welcome'; break; } // END - switch @@ -1667,52 +1514,21 @@ function getWhatFromModule ($modCheck) { return $what; } -// Subtract points from database and mediadata cache -function subtractPoints ($subject, $userid, $points) { - // Add points to used points - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `used_points`=`used_points`+%s WHERE `userid`=%s LIMIT 1", - array($points, bigintval($userid)), __FUNCTION__, __LINE__); - - // Prepare filter data - $filterData = array( - 'subject' => $subject, - 'userid' => $userid, - 'points' => $points, - 'mode' => 'sub', - 'added' => (!SQL_HASZEROAFFECTED()) - ); - - // Insert booking record - $filterData = runFilterChain('sub_points', $filterData); - - // Return result - return $filterData['added']; -} - -// "Getter" for total available receivers -function getTotalReceivers ($mode = 'normal') { - // Get num rows - $numRows = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, ' AND `receive_mails` > 0' . runFilterChain('exclude_users', $mode)); - - // Return value - return $numRows; -} - // Returns HTML code with an option list of all categories -function generateCategoryOptionsList ($mode) { +function generateCategoryOptionsList ($mode, $userid = NULL) { // Prepare WHERE statement $whereStatement = " WHERE `visible`='Y'"; if (isAdmin()) $whereStatement = ''; // Initialize array... - $CATS = array( - 'id' => array(), - 'name' => array(), + $categories = array( + 'id' => array(), + 'name' => array(), 'userids' => array() ); // 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? @@ -1720,12 +1536,15 @@ function generateCategoryOptionsList ($mode) { // ... and begin loading stuff while ($content = SQL_FETCHARRAY($result)) { // Transfer some data - $CATS['id'][] = $content['id']; - $CATS['name'][] = $content['cat']; + $categories['id'][] = $content['id']; + array_push($categories['name'], $content['cat']); // Check which users are in this category - $result_userids = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s ORDER BY `userid` ASC", - array(bigintval($content['id'])), __FUNCTION__, __LINE__); + $result_userids = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s AND `userid` != %s ORDER BY `userid` ASC", + array( + bigintval($content['id']), + convertNullToZero($userid) + ), __FUNCTION__, __LINE__); // Init count $userid_cnt = '0'; @@ -1733,14 +1552,14 @@ function generateCategoryOptionsList ($mode) { // Start adding all while ($data = SQL_FETCHARRAY($result_userids)) { // Add user count - $userid_cnt += countSumTotalData($data['userid'], 'user_data', 'userid', 'userid', true, " AND `status`='CONFIRMED' AND `receive_mails` > 0"); + $userid_cnt += countSumTotalData($data['userid'], 'user_data', 'userid', 'userid', true, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED' AND `receive_mails` > 0")); } // END - while // Free memory SQL_FREERESULT($result_userids); // Add counter - $CATS['userids'][] = $userid_cnt; + array_push($categories['userids'], $userid_cnt); } // END - while // Free memory @@ -1748,13 +1567,12 @@ function generateCategoryOptionsList ($mode) { // Generate options $OUT = ''; - foreach ($CATS['id'] as $key => $value) { - if (strlen($CATS['name'][$key]) > 20) $CATS['name'][$key] = substr($CATS['name'][$key], 0, 17)."..."; - $OUT .= ' '; + foreach ($categories['id'] as $key => $value) { + $OUT .= ' '; } // END - foreach } else { // No cateogries are defined yet - $OUT = ''; + $OUT = ''; } // Return HTML code @@ -1788,7 +1606,7 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds, // Add HTML mail SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus` -(`subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`, `html_msg`) +(`subject`,`text`,`receivers`,`points`,`time`,`data_type`,`timestamp`,`url`,`cat_id`,`target_send`,`mails_sent`,`html_msg`) VALUES ('%s','%s','%s',%s,%s,'NEW', UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')", array( $subject, @@ -1805,7 +1623,7 @@ VALUES ('%s','%s','%s',%s,%s,'NEW', UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')", } else { // Add regular mail SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus` -(`subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`) +(`subject`,`text`,`receivers`,`points`,`time`,`data_type`,`timestamp`,`url`,`cat_id`,`target_send`,`mails_sent`) VALUES ('%s','%s','%s',%s,%s,'NEW', UNIX_TIMESTAMP(),'%s',%s,%s,%s)", array( $subject, @@ -1824,8 +1642,7 @@ VALUES ('%s','%s','%s',%s,%s,'NEW', UNIX_TIMESTAMP(),'%s',%s,%s,%s)", // Generate a receiver list for given category and maximum receivers function generateReceiverList ($categoryId, $receiver, $mode = '') { // Init variables - $CAT_TABS = ''; - $CAT_WHERE = ''; + $extraColumns = ''; $receiverList = ''; $result = false; @@ -1839,39 +1656,41 @@ function generateReceiverList ($categoryId, $receiver, $mode = '') { $receiver = getTotalReceivers($mode); } // END - if + // Exclude (maybe exclude) testers + $addWhere = runFilterChain('user_exclusion_sql', ' '); + // Category given? if ($categoryId > 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", $categoryId); + $extraColumns = "LEFT JOIN `{?_MYSQL_PREFIX?}_user_cats` AS c ON d.`userid`=c.`userid`"; + $addWhere = sprintf(" AND c.`cat_id`=%s", $categoryId); } // END - if // Exclude users in holiday? if (isExtensionInstalledAndNewer('holiday', '0.1.3')) { // Add something for the holiday extension - $CAT_WHERE .= " AND d.`holiday_active`='N'"; + $addWhere .= " AND d.`holiday_active`='N'"; } // END - if + // Include only HTML recipients? if ((isExtensionActive('html_mail')) && ($mode == 'html')) { - // Only include HTML receivers - $result = SQL_QUERY_ESC("SELECT d.`userid` FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED' AND d.`html`='Y'".$CAT_WHERE." ORDER BY d.`{?order_select?}` {?order_mode?} LIMIT %s", - array( - $receiver - ), __FUNCTION__, __LINE__); - } else { - // Include all - $result = SQL_QUERY_ESC("SELECT d.`userid` FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED'".$CAT_WHERE." ORDER BY d.`{?order_select?}` {?order_mode?} LIMIT %s", - array( - $receiver - ), __FUNCTION__, __LINE__); - } + $addWhere .= " AND d.`html`='Y'"; + } // END - if + + // Run query + $result = SQL_QUERY_ESC("SELECT d.`userid` FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$extraColumns." WHERE d.`status`='CONFIRMED' ".$addWhere." ORDER BY d.`{?order_select?}` {?order_mode?} LIMIT %s", + array( + $receiver + ), __FUNCTION__, __LINE__); // Entries found? if ((SQL_NUMROWS($result) >= $receiver) && ($receiver > 0)) { // Load all entries while ($content = SQL_FETCHARRAY($result)) { // Add receiver when not empty - if (!empty($content['userid'])) $receiverList .= $content['userid'] . ';'; + if (!empty($content['userid'])) { + $receiverList .= $content['userid'] . ';'; + } // END - if } // END - while // Free memory @@ -1885,82 +1704,6 @@ function generateReceiverList ($categoryId, $receiver, $mode = '') { return $receiverList; } -// "Getter" for array for user refs and points in given level -function getUserReferalPoints ($userid, $level) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ' - ENTERED!'); - // Default is no refs and no nickname - $refs = array(); - - // Get refs from database - $result = SQL_QUERY_ESC("SELECT - ur.`id`, ur.`refid`, ud.`status`, ud.`last_online`, ud.`mails_confirmed`, ud.`emails_received` -FROM - `{?_MYSQL_PREFIX?}_user_refs` AS ur -LEFT JOIN - `{?_MYSQL_PREFIX?}_user_points` AS up -ON - ur.refid=up.userid AND - (ur.level=0 OR ur.level IS NULL) -LEFT JOIN - `{?_MYSQL_PREFIX?}_user_data` AS ud -ON - ur.`refid`=ud.`userid` -WHERE - ur.`userid`=%s AND - ur.`level`=%s -ORDER BY - ur.`refid` ASC", - array( - bigintval($userid), - bigintval($level) - ), __FUNCTION__, __LINE__); - - // Are there some entries? - if (!SQL_HASZERONUMS($result)) { - // Fetch all entries - while ($row = SQL_FETCHARRAY($result)) { - // Get total points of this user - $row['points'] = getTotalPoints($row['refid']); - - // Get unconfirmed mails - $row['unconfirmed'] = countSumTotalData($row['refid'], 'user_links', 'id', 'userid', true); - - // Init clickrate with zero - $row['clickrate'] = '0'; - - // Is at least one mail received? - if ($row['emails_received'] > 0) { - // Calculate clickrate - $row['clickrate'] = ($row['mails_confirmed'] / $row['emails_received'] * 100); - } // END - if - - // Activity is 'active' by default because if autopurge is not installed - $row['activity'] = '{--MEMBER_ACTIVITY_ACTIVE--}'; - - // Is autopurge installed and the user inactive? - if ((isExtensionActive('autopurge')) && ((time() - getApInactiveSince()) >= $row['last_online'])) { - // Inactive user! - $row['activity'] = '{--MEMBER_ACTIVITY_INACTIVE--}'; - } // END - if - - // Remove some entries - unset($row['mails_confirmed']); - unset($row['emails_received']); - unset($row['last_online']); - - // Add row - $refs[$row['id']] = $row; - } // END - while - } // END - if - - // Free result - SQL_FREERESULT($result); - - // Return result - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',level=' . $level . ' - EXIT!'); - return $refs; -} - // Recuce the amount of received emails for the receipients for given email function reduceRecipientReceivedMails ($column, $id, $count) { // Search for mail in database @@ -1986,7 +1729,9 @@ function reduceRecipientReceivedMails ($column, $id, $count) { } // Reduce this users total received emails? - if ($num === 0) $userids[$data['userid']] = $data['userid']; + if ($num === 0) { + $userids[$data['userid']] = $data['userid']; + } // END - if } // END - while if (count($userids) > 0) { @@ -2004,12 +1749,12 @@ function reduceRecipientReceivedMails ($column, $id, $count) { } // Creates a new task -function createNewTask ($subject, $notes, $taskType, $userid = '0', $adminId = '0', $strip = true) { +function createNewTask ($subject, $notes, $taskType, $userid = NULL, $adminId = NULL, $strip = true) { // Insert the task data into the database - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_task_system` (`assigned_admin`, `userid`, `status`, `task_type`, `subject`, `text`, `task_created`) VALUES (%s,%s,'NEW','%s','%s','%s', UNIX_TIMESTAMP())", + SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_task_system` (`assigned_admin`,`userid`,`status`,`task_type`,`subject`,`text`,`task_created`) VALUES (%s,%s,'NEW','%s','%s','%s', UNIX_TIMESTAMP())", array( - $adminId, - $userid, + convertZeroToNull($adminId), + convertZeroToNull($userid), $taskType, $subject, $notes @@ -2020,93 +1765,98 @@ function createNewTask ($subject, $notes, $taskType, $userid = '0', $adminId = ' } // Updates last module / online time -// @TODO Fix inconsistency between last_module and getWhat() function updateLastActivity($userid) { - // Run the update query - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `last_module`='%s', `last_online`=UNIX_TIMESTAMP(), `REMOTE_ADDR`='%s' WHERE `userid`=%s LIMIT 1", + // Is 'what' set? + if (isWhatSet()) { + // Run the update query + SQL_QUERY_ESC("UPDATE + `{?_MYSQL_PREFIX?}_user_data` +SET + `%s`='%s', + `last_online`=UNIX_TIMESTAMP(), + `REMOTE_ADDR`='%s' +WHERE + `userid`=%s +LIMIT 1", array( + getUserLastWhatName(), getWhat(), detectRemoteAddr(), bigintval($userid) ), __FUNCTION__, __LINE__); -} - -// Get points data for given extension's name -function getPointsDataArrayFromExtensionName ($ext_name) { - // If we have cache, shortcut it here - if (isset($GLOBALS['cache_array']['points_data'][$ext_name])) { - // Return it - return $GLOBALS['cache_array']['points_data'][$ext_name]; - } // END - if - - // Now checkout the entry in database table - $result = SQL_QUERY_ESC("SELECT `id`, `ext_name`, `column_name`, `locked_mode`, `payment_method` FROM `{?_MYSQL_PREFIX?}_points_data` WHERE `ext_name`='%s' LIMIT 1", - array($ext_name), __FUNCTION__, __LINE__); - - // Do we have an entry? - if (SQL_NUMROWS($result) == 1) { - // Then load it - $pointsData = SQL_FETCHARRAY($result); - - // Add all remaining entries - foreach ($pointsData as $key=>$value) { - $GLOBALS['cache_array']['points_data'][$ext_name][$key] = $value; - } // END - foreach } else { - /* - * Having no entry is not bad but it means that all points will go to - * the general account which the user can let payout. - */ - logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - No entry found, switching to general points account.'); + // No what set, needs to be ignored (last_module is last_what) + SQL_QUERY_ESC("UPDATE + `{?_MYSQL_PREFIX?}_user_data` +SET + `%s`=NULL, + `last_online`=UNIX_TIMESTAMP(), + `REMOTE_ADDR`='%s' +WHERE + `userid`=%s +LIMIT 1", + array( + getUserLastWhatName(), + detectRemoteAddr(), + bigintval($userid) + ), __FUNCTION__, __LINE__); } - - // Free result - SQL_FREERESULT($result); - - // Return it - return $GLOBALS['cache_array']['points_data'][$ext_name]; } -// Determines the right points column name for given extension and 'locked' -function getPointsColumnNameFromExtensionNameLocked ($ext_name, $isLocked) { - // Extension sql_patches must be up-to-date - if (isExtensionInstalledAndOlder('sql_patches', '0.8.0')) { - // Please update ext-sql_patches - debug_report_bug(__FUNCTION__, __LINE__, 'sql_patches is out-dated. Please update to at least 0.8.0 to continue. ext_name=' . $ext_name . ',isLocked=' . intval($isLocked)); - } // END - if - - // Get the points_data entry - $pointsData = getPointsDataArrayFromExtensionName($ext_name); - - // Regular points by default - $columnName = $pointsData['column_name']; +/** + * Checks if given subject is found and if not, adds an SQL query to the + * extension registration queue. + */ +function registerExtensionPointsData ($subject, $columnName, $lockedMode, $paymentMethod) { + // Default is old extension version + $add = ''; - // Are the points locked? - if (($isLocked === true) && ($pointsData['locked_mode'] == 'LOCKED')) { - // Locked points, so prefix it - $columnName = 'locked_' . $pointsData['column_name']; + // Is the extension equal or newer 0.8.9? + if (((isInstallationPhase()) && ((getExtensionMode() == 'register') || (getExtensionMode() == 'update'))) || (isExtensionInstalledAndNewer('sql_patches', '0.8.9'))) { + // Then add provider + $add = " AND `account_provider`='EXTENSION'"; } // END - if - // Return the result - return $columnName; -} + // Is the 'subject' there? + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ifSqlTableExists(points_data)=' . ifSqlTableExists('points_data') . ',getExtensionMode()=' . getExtensionMode() . ',add=' . $add); + if (((!ifSqlTableExists('points_data')) && ((getExtensionMode() == 'register') || (getExtensionMode() == 'update'))) || (countSumTotalData($subject, 'points_data', 'id', 'subject', true, $add) == 0)) { + // Not found so: + if ((isset($GLOBALS['previous_extension'][getCurrentExtensionName()])) && (!ifSqlTableExists('points_data'))) { + $dummy = $GLOBALS['previous_extension'][getCurrentExtensionName()]; + reportBug(__FUNCTION__, __LINE__, 'previous_extension[' . gettype($dummy) . ']=' . $dummy . ',getCurrentExtensionName()=' . getCurrentExtensionName() . ' - Under development, please report this!'); + } // END - if -// Determines the payment method for given extension and 'locked' -function getPaymentMethodFromExtensionName ($ext_name) { - // Extension sql_patches must be up-to-date - if (isExtensionInstalledAndOlder('sql_patches', '0.8.0')) { - // Please update ext-sql_patches - debug_report_bug(__FUNCTION__, __LINE__, 'sql_patches is out-dated. Please update to at least 0.8.0 to continue. ext_name=' . $ext_name . ',isLocked=' . intval($isLocked)); + // ... add an SQL query + addExtensionSql(sprintf("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`,`column_name`,`locked_mode`,`payment_method`) VALUES ('%s','%s','%s','%s')", + $subject, + $columnName, + $lockedMode, + $paymentMethod + )); } // END - if +} - // Get the points_data entry - $pointsData = getPointsDataArrayFromExtensionName($ext_name); +/** + * Checks if given subject is found and if so, adds an SQL query to the + * extension unregistration queue. + */ +function unregisterExtensionPointsData ($subject) { + // Default is old extension version + $add = ''; - // Regular points by default - $paymentMethod = $pointsData['payment_method']; + // Is the extension equal or newer 0.8.9? + if (isExtensionInstalledAndNewer('sql_patches', '0.8.9')) { + // Then add provider + $add = " AND `account_provider`='EXTENSION'"; + } // END - if - // Return the result - return $paymentMethod; + // Is the 'subject' there? + if (countSumTotalData($subject, 'points_data', 'id', 'subject', true, $add) == 1) { + // Found one or more, so add an SQL query + addExtensionSql(sprintf("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_points_data` WHERE `subject`='%s'" . $add . " LIMIT 1", + $subject + )); + } // END - if } // [EOF]