X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=0513795fb2c3df80a613772120c50b56a8ce684e;hp=8d64b2201a3864d6a6b26f8df9f52bef048ad7f7;hb=8fad776382e63b3f73f8dbe289f229d79cfc2c22;hpb=19fc9f2c0cdd76900c082e525a43a4a5decb1a56 diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 8d64b2201a..0513795fb2 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,16 +42,19 @@ 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(); - } elseif ((isGetRequestParameterSet('action')) && ($column == 'what')) { + } elseif ((isGetRequestElementSet('action')) && ($column == 'what')) { // Get it from action return getTitleFromMenu($mode, getAction(), 'action', $ADD); - } elseif ($what == 'overview') { + } elseif ($what == 'welcome') { // Overview page - return '{--WHAT_IS_OVERVIEW--}'; + return '{--WHAT_IS_WELCOME--}'; } // Default is not found @@ -84,7 +87,7 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) { $file = basename($FQFN); // Init variables - $LINK_ADD = ''; + $linkAdd = ''; $OUT = ''; $ADD = ''; $prefix = ''; @@ -108,7 +111,7 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) { // Get access level from it $modCheck = getModuleFromFileName($file, $accessLevel); - // Do we have admin? Then display all + // Is there admin? Then display all $ADD = " AND `visible`='Y' AND `locked`='N'"; if (isAdmin()) { // Display all! @@ -122,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 @@ -137,18 +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, 'search' => $search, 'prefix' => $prefix, 'link_add' => $LINK_ADD, 'content' => '', 'add' => $ADD)); + $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']; // Add default content - $prefix .= '
{--YOU_ARE_HERE--} Home'; + $prefix .= '
{--YOU_ARE_HERE--} Home'; } elseif ($return === false) { // Count depth $GLOBALS['nav_depth']++; } + // Add arrow $prefix .= ' -> '; // We need to remove .php and the end @@ -157,19 +159,21 @@ 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: */ logDebugMessage(__FUNCTION__, __LINE__, 'type=' . $type . 'getWhat()=' . getWhat()); - if (($type == 'what') || (($type == 'action') && ((!isWhatSet()) || (getWhat() == 'overview')))) { + //* 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 $GLOBALS['nav_depth'] = '0'; // Run the post-filter chain - $ret = runFilterChain('post_youhere_line', array('access_level' => $accessLevel, 'type' => $type, 'search' => $search, 'prefix' => $prefix, 'link_add' => $LINK_ADD, 'content' => $OUT, 'add' => $ADD)); + $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']; @@ -208,7 +212,11 @@ function addMenu ($mode, $action, $what) { // 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 @@ -242,12 +250,15 @@ 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? + // Are there some entries? if (!SQL_HASZERONUMS($result_sub)) { // Init counter $count = '0'; @@ -270,7 +281,7 @@ ORDER BY } // END - if // Is ext-sql_patches up-to-date, and display_home_in_index is Y? - if ((isExtensionInstalledAndNewer('sql_patches', '0.8.3')) && (isDisplayHomeInIndexEnabled()) && ($content['sub_what'] == getIndexHome())) { + if ((getModule() == 'index') && (isExtensionInstalledAndNewer('sql_patches', '0.8.3')) && (isDisplayHomeInIndexEnabled()) && ($content['sub_what'] == getIndexHome())) { // Use index.php as link $OUT .= ''; } else { @@ -279,7 +290,7 @@ ORDER BY } } else { // Not found - open - $OUT .= ''; + $OUT .= ''; } // Menu title @@ -294,7 +305,7 @@ ORDER BY } // END - if } else { // Not found - close - $OUT .= ''; + $OUT .= ''; } // Cunt it up @@ -340,16 +351,16 @@ ORDER BY //* 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 @@ -359,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); @@ -368,8 +379,8 @@ ORDER BY // Prepare data $content = array( - 'rows' => $GLOBALS['rows'], - 'mode' => $mode + 'rows' => $GLOBALS['rows'], + 'menu_mode' => $mode ); // Load main template @@ -378,7 +389,7 @@ ORDER BY } // 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; @@ -412,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? @@ -423,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! :-) @@ -453,7 +464,7 @@ function fetchUserData ($value, $column = 'userid') { return false; } elseif (is_null($value)) { // This shall never happen, so please report it - debug_report_bug(__FUNCTION__, __LINE__, 'value=NULL,column=' . $column . ' - value can never be NULL'); + reportBug(__FUNCTION__, __LINE__, 'value=NULL,column=' . $column . ' - value can never be NULL'); } // If we should look for userid secure&set it here @@ -461,19 +472,22 @@ function fetchUserData ($value, $column = 'userid') { // 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; @@ -482,17 +496,17 @@ function fetchUserData ($value, $column = 'userid') { // By default none was found $found = false; - // Extra statements - $ADD = ''; - if (isExtensionInstalledAndNewer('user', '0.3.5')) { - $ADD = ', UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`'; - } // 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? + // Is there a record? if (SQL_NUMROWS($result) == 1) { // Load data from cookies $data = SQL_FETCHARRAY($result); @@ -541,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())) { @@ -551,7 +570,7 @@ function isAdmin () { // Init variables $ret = false; $adminId = '0'; - $passCookie = ''; + $passwordFromCookie = ''; $valPass = ''; //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminId); @@ -559,16 +578,20 @@ 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__, 'mainId=' . $adminId . 'passCookie=' . $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 - // Do we have cache? + // Is there cache? if (!isset($GLOBALS[__FUNCTION__][$adminId])) { // Init it with failed $GLOBALS[__FUNCTION__][$adminId] = false; @@ -577,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)); @@ -596,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 @@ -606,7 +629,7 @@ function isAdmin () { } // Generates a list of "max receiveable emails per day" -function addMaxReceiveList ($mode, $default = '', $return = false) { +function addMaxReceiveList ($mode, $default = '') { $OUT = ''; $result = false; @@ -617,6 +640,7 @@ function addMaxReceiveList ($mode, $default = '', $return = false) { __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', @@ -633,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? + // Is there 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 @@ -1330,7 +1428,7 @@ WHERE LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__); - // Do we have an entry? + // Is there an entry? if (SQL_NUMROWS($result) == 1) { // Save his points to add them to the jackpot $data = SQL_FETCHARRAY($result); @@ -1380,22 +1478,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 = ''; + // 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 @@ -1406,8 +1500,8 @@ function getWhatFromModule ($modCheck) { } break; - default: - $what = ''; + default: // Default for all other menus (getIndexHome() is for index module only) + $what = 'welcome'; break; } // END - switch @@ -1416,15 +1510,15 @@ function getWhatFromModule ($modCheck) { } // 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() ); @@ -1432,17 +1526,20 @@ function generateCategoryOptionsList ($mode) { $result = SQL_QUERY('SELECT `id`,`cat` FROM `{?_MYSQL_PREFIX?}_cats`' . $whereStatement . ' ORDER BY `sort` ASC', __FUNCTION__, __LINE__); - // Do we have entries? + // Are there entries? if (!SQL_HASZERONUMS($result)) { // ... 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'; @@ -1450,14 +1547,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 @@ -1465,13 +1562,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 @@ -1541,8 +1637,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; @@ -1556,32 +1651,32 @@ 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)) { @@ -1649,12 +1744,12 @@ function reduceRecipientReceivedMails ($column, $id, $count) { } // Creates a new task -function createNewTask ($subject, $notes, $taskType, $userid = NULL, $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())", array( - $adminId, - $userid, + convertZeroToNull($adminId), + convertZeroToNull($userid), $taskType, $subject, $notes @@ -1665,23 +1760,286 @@ function createNewTask ($subject, $notes, $taskType, $userid = NULL, $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 + // Is 'what' set? + if (isWhatSet()) { + // Run the update query + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET - `last_module`='%s', + `%s`='%s', `last_online`=UNIX_TIMESTAMP(), `REMOTE_ADDR`='%s' WHERE `userid`=%s LIMIT 1", array( + getUserLastWhatName(), getWhat(), detectRemoteAddr(), bigintval($userid) ), __FUNCTION__, __LINE__); + } else { + // 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__); + } +} + +// List all given rows (callback function from XML) +function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array(), $conditions = array()) { + // Verify that tableName and columns are not empty + if ((!is_array($tableName)) || (count($tableName) != 1)) { + // No tableName specified + reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array,tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate); + } elseif (count($columns) == 0) { + // No columns specified + reportBug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML,tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate . ',tableName[0]=' . $tableName[0]); + } + + // This is the minimum query, so at least columns and tableName must have entries + $SQL = 'SELECT '; + + // Get the sql part back from given array + $SQL .= getSqlPartFromXmlArray($columns); + + // Remove last commata and add FROM statement + $SQL .= ' FROM `{?_MYSQL_PREFIX?}_' . $tableName[0] . '`'; + + // Are there entries from whereColumns to add? + if (count($whereColumns) > 0) { + // Then add these as well + if (count($whereColumns) == 1) { + // One entry found + $SQL .= ' WHERE '; + + // Table/alias included? + if (!empty($whereColumns[0]['table'])) { + // Add it as well + $SQL .= $whereColumns[0]['table'] . '.'; + } // END - if + + // Add the rest + $SQL .= '`' . $whereColumns[0]['column'] . '`' . $whereColumns[0]['condition'] . chr(39) . $whereColumns[0]['look_for'] . chr(39); + } elseif ((count($whereColumns > 1)) && (count($conditions) > 0)) { + // More than one "WHERE" + condition found + foreach ($whereColumns as $idx => $columnArray) { + // Default is WHERE + $condition = 'WHERE'; + + // Is the condition element there? + if (isset($conditions[$columnArray['column']])) { + // Assume the condition + $condition = $conditions[$columnArray['column']]; + } // END - if + + // Add to SQL query + $SQL .= ' ' . $condition; + + // Table/alias included? + if (!empty($whereColumns[$idx]['table'])) { + // Add it as well + $SQL .= $whereColumns[$idx]['table'] . '.'; + } // END - if + + // Add the rest + $SQL .= '`' . $whereColumns[$idx]['column'] . '`' . $whereColumns[$idx]['condition'] . chr(39) . convertDollarDataToGetElement($whereColumns[$idx]['look_for']) . chr(39); + } // END - foreach + } else { + // Did not set $conditions + reportBug(__FUNCTION__, __LINE__, 'Supplied more than "whereColumns" entries but no conditions! Please fix your XML template.'); + } + } // END - if + + // Are there entries from orderByColumns to add? + if (count($orderByColumns) > 0) { + // Add them as well + $SQL .= ' ORDER BY '; + foreach ($orderByColumns as $orderByColumn => $array) { + // Get keys (table/alias) and values (sorting itself) + $table = trim(implode('', array_keys($array))); + $sorting = trim(implode('', array_keys($array))); + + // table/alias can be omitted + if (!empty($table)) { + // table/alias is given + $SQL .= $table . '.'; + } // END - if + + // Add order-by column + $SQL .= '`' . $orderByColumn . '` ' . $sorting . ','; + } // END - foreach + + // Remove last column + $SQL = substr($SQL, 0, -1); + } // END - if + + // Now handle all over to the inner function which will execute the listing + doListEntries($SQL, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters); +} + +// Do the listing of entries +function doListEntries ($SQL, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters = array()) { + // Run the SQL query + $result = SQL_QUERY($SQL, __FUNCTION__, __LINE__); + + // Are there some URLs left? + if (!SQL_HASZERONUMS($result)) { + // List all URLs + $OUT = ''; + while ($content = SQL_FETCHARRAY($result)) { + // "Translate" content + foreach ($callbackColumns as $columnName => $callbackName) { + // Fill the callback arguments + $args = array($content[$columnName]); + + // Is there more to add? + if (isset($extraParameters[$columnName])) { + // Add them as well + $args = merge_array($args, $extraParameters[$columnName]); + } // END - if + + // Call the callback-function + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callbackFunction=' . $callbackName . ',args=
'.print_r($args, true).'
'); + // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided + $content[$columnName] = call_user_func_array($callbackName, $args); + } // END - foreach + + // Load row template + $OUT .= loadTemplate(trim($rowTemplate[0]), true, $content); + } // END - while + + // Load main template + loadTemplate(trim($tableTemplate[0]), false, $OUT); + } else { + // No URLs in surfbar + displayMessage('{--' .$noEntryMessageId[0] . '--}'); + } + + // Free result + SQL_FREERESULT($result); +} + +// Adds a given entry to the database +function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $columnIndex = NULL) { + //* DEBUG: */ die('columns=
'.print_r($columns,true).'
,filterFunctions=
'.print_r($filterFunctions,true).'
,extraValues=
'.print_r($extraValues,true).'
,POST=
'.print_r($_POST,true).'
'); + // Verify that tableName and columns are not empty + if ((!is_array($tableName)) || (count($tableName) != 1)) { + // No tableName specified + reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn); + } elseif (count($columns) == 0) { + // No columns specified + reportBug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML.'); + } + + // Init columns and value elements + $sqlColumns = array(); + $sqlValues = array(); + + // Default is that all went fine + $GLOBALS['__XML_PARSE_RESULT'] = true; + + // Is there "time columns"? + if (count($timeColumns) > 0) { + // Then "walk" through all entries + foreach ($timeColumns as $column) { + // Convert all (possible) selections + convertSelectionsToEpocheTimeInPostData($column . '_ye'); + } // END - foreach + } // END - if + + // Add columns and values + foreach ($columns as $key => $columnName) { + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',columnName=' . $columnName); + // Is columnIndex set? + if (!is_null($columnIndex)) { + // Check conditions + //* DEBUG: */ die('columnIndex=
'.print_r($columnIndex,true).'
'.debug_get_printable_backtrace()); + assert((is_array($columnName)) && (is_string($columnIndex)) && (isset($columnName[$columnIndex]))); + + // Then use that index "blindly" + $columnName = $columnName[$columnIndex]; + } // END - if + + // Debug message + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',columnName[' . gettype($columnName) . ']=' . $columnName . ',filterFunctions=' . $filterFunctions[$key] . ',extraValues=' . intval(isset($extraValues[$key])) . ',extraValuesName=' . intval(isset($extraValues[$columnName . '_list'])) . '
'); + + // Copy entry securely to the final arrays + $sqlColumns[$key] = SQL_ESCAPE($columnName); + $sqlValues[$key] = SQL_ESCAPE(postRequestElement($columnName)); + + // Send data through the filter function if found + if ((isset($filterFunctions[$key])) && (isset($extraValues[$key . '_list']))) { + // Filter function set! + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!'); + $sqlValues[$key] = call_user_func_array($filterFunctions[$key], merge_array(array($columnName), $extraValues[$key . '_list'])); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!'); + } elseif ((isset($filterFunctions[$key])) && (!empty($filterFunctions[$key]))) { + // Run through an extra filter + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!'); + $sqlValues[$key] = handleExtraValues($filterFunctions[$key], $sqlValues[$key], ''); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!'); + } + + // Is the value not a number? + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key]); + if (($sqlValues[$key] != 'NULL') && (is_string($sqlValues[$key]))) { + // Add quotes around it + $sqlValues[$key] = chr(39) . $sqlValues[$key] . chr(39); + } // END - if + + // Is the value false? + if ($sqlValues[$key] === false) { + // One "parser" didn't like it + $GLOBALS['__XML_PARSE_RESULT'] = false; + break; + } // END - if + } // END - foreach + + // If all values are okay, continue + if ($sqlValues[$key] !== false) { + // Build the SQL query + $SQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_' . $tableName[0] . '` (`' . implode('`,`', $sqlColumns) . "`) VALUES (" . implode(',', $sqlValues) . ')'; + + // Run the SQL query + SQL_QUERY($SQL, __FUNCTION__, __LINE__); + } // END - if +} + +// Adds a given entry to the database +function memberAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $columnIndex = NULL) { + // Is it a member? + if (!isMember()) { + // Then abort here + return false; + } // END - if + + // Set POST data generic userid + setPostRequestElement('userid', getMemberId()); + + // Call inner function + doGenericAddEntries($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $columnIndex); + + // Entry has been added? + if ((!SQL_HASZEROAFFECTED()) && ($GLOBALS['__XML_PARSE_RESULT'] === true)) { + // Display success message + displayMessage('{--MEMBER_ENTRY_ADDED--}'); + } else { + // Display failed message + displayMessage('{--MEMBER_ENTRY_NOT_ADDED--}'); + } } // [EOF]