X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=a9733b4ec1489db3e08ea1f4dbba5cdd434320e9;hb=188495baa4eae4327a063f99989ea503598b2174;hp=4c79c47eddec8640ebd55b2e57e58125e6d7b7ad;hpb=8720389106820efb6ee1668b0bc8d00d5d034bda;p=mailer.git diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 4c79c47edd..a9733b4ec1 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -17,7 +17,7 @@ * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * * Copyright (c) 2009 - 2011 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * 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 * @@ -46,7 +46,13 @@ function getTitleFromMenu ($mode, $what, $column = 'what', $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 == 'overview') { + // Overview page + return '{--WHAT_IS_OVERVIEW--}'; + } // Default is not found $data['title'] = '??? (' . $what . ')'; @@ -131,11 +137,12 @@ 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' => $LINK_ADD, 'content' => '', 'add' => $ADD)); // Add pre-content $prefix = $ret['content']; + // Add default content $prefix .= '
{--YOU_ARE_HERE--} Home'; } elseif ($return === false) { // Count depth @@ -159,14 +166,16 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) { if (($type == 'what') || (($type == 'action') && ((!isWhatSet()) || (getWhat() == 'overview')))) { //* 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' => $LINK_ADD, '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 +193,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 +200,15 @@ 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 @@ -259,8 +269,14 @@ ORDER BY $OUT = ''; } // END - if - // Navigation link - $OUT .= ''; + // 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())) { + // Use index.php as link + $OUT .= ''; + } else { + // Regular navigation link + $OUT .= ''; + } } else { // Not found - open $OUT .= ''; @@ -435,7 +451,10 @@ 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 + debug_report_bug(__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') { @@ -451,10 +470,12 @@ function fetchUserData ($value, $column = 'userid') { debug_report_bug(__FUNCTION__, __LINE__, 'User id ' . $value . ' is invalid.'); } elseif (isUserDataValid()) { // Use cache, so it is fine + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #1'); return true; } } elseif (isUserDataValid()) { // Using cache is fine + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #2'); return true; } @@ -486,7 +507,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'])) { @@ -592,13 +613,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; @@ -612,7 +633,7 @@ function addMaxReceiveList ($mode, $default = '', $return = false) { $OUT = ''; while ($content = SQL_FETCHARRAY($result)) { $OUT .= ' '; } // END - while } else { // No data found @@ -1354,9 +1422,9 @@ 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 @@ -1403,7 +1471,7 @@ function generateCategoryOptionsList ($mode) { ); // Get categories - $result = SQL_QUERY('SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`' . $whereStatement . ' ORDER BY `sort` ASC', + $result = SQL_QUERY('SELECT `id`,`cat` FROM `{?_MYSQL_PREFIX?}_cats`' . $whereStatement . ' ORDER BY `sort` ASC', __FUNCTION__, __LINE__); // Do we have entries? @@ -1479,7 +1547,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, @@ -1496,7 +1564,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, @@ -1603,7 +1671,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) { @@ -1621,12 +1691,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, + makeZeroToNull($adminId), + makeZeroToNull($userid), $taskType, $subject, $notes @@ -1640,7 +1710,15 @@ function createNewTask ($subject, $notes, $taskType, $userid = '0', $adminId = ' // @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", + SQL_QUERY_ESC("UPDATE + `{?_MYSQL_PREFIX?}_user_data` +SET + `last_module`='%s', + `last_online`=UNIX_TIMESTAMP(), + `REMOTE_ADDR`='%s' +WHERE + `userid`=%s +LIMIT 1", array( getWhat(), detectRemoteAddr(),