X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=ff30180d0a40304c64619b482135044a17f3df68;hp=2b48644bdfcb8477ceaf7af1bc84c1d37995937a;hb=49acdb7a7adbcf25a8e8683b5581bfcec72b23bd;hpb=5bb4af7ad275a532206a773edb2f36d5ad355e06 diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 2b48644bdf..ff30180d0a 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -10,13 +10,8 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Alle datenbank-relevanten Funktionen * * -------------------------------------------------------------------- * - * $Revision:: $ * - * $Date:: $ * - * $Tag:: 0.2.1-FINAL $ * - * $Author:: $ * - * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009 - 2012 by Mailer Developer Team * + * Copyright (c) 2009 - 2015 by Mailer Developer Team * * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -61,7 +56,7 @@ function getTitleFromMenu ($mode, $what, $column = 'what', $ADD = '') { $data['title'] = '??? (' . $what . ')'; // Look for title - $result = SQL_QUERY_ESC("SELECT `title` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `%s`='%s'" . $ADD . " LIMIT 1", + $result = sqlQueryEscaped("SELECT `title` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `%s`='%s'" . $ADD . " LIMIT 1", array( $mode, $column, @@ -69,13 +64,13 @@ function getTitleFromMenu ($mode, $what, $column = 'what', $ADD = '') { ), __FUNCTION__, __LINE__); // Is there an entry? - if (SQL_NUMROWS($result) == 1) { + if (sqlNumRows($result) == 1) { // Fetch the title - $data = SQL_FETCHARRAY($result); + $data = sqlFetchArray($result); } // END - if // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); // Return it return $data['title']; @@ -160,8 +155,8 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = FALSE) { } // 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'))) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isExtensionInstalledAndNewer()=' . intval(isExtensionInstalledAndNewer('sql_patches', '0.2.3')) . ',youre_here=' . getYoureHere() . ',isAdmin()=' . intval(isAdmin()) . ',modCheck=' . $modCheck); + if (((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (isYoureHereEnabled())) || ((isAdmin()) && ($modCheck == 'admin'))) { // Output HTML code $OUT = $prefix . '' . getTitleFromMenu($accessLevel, $search, $type, $ADD) . ''; @@ -211,7 +206,7 @@ function addMenu ($mode, $action, $what) { } // END - if // Load SQL data and add the menu to the output stream... - $result_main = SQL_QUERY_ESC("SELECT + $result_main = sqlQueryEscaped("SELECT `title`, `what`, `action`, @@ -227,10 +222,10 @@ ORDER BY array($mode), __FUNCTION__, __LINE__); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat()); - if (!SQL_HASZERONUMS($result_main)) { + if (!ifSqlHasZeroNumRows($result_main)) { // There are menus available, so we simply display them... :) $GLOBALS['rows'] = ''; - while ($content = SQL_FETCHARRAY($result_main)) { + while ($content = sqlFetchArray($result_main)) { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat()); // Disable the block-mode enableBlockMode(FALSE); @@ -239,7 +234,7 @@ ORDER BY $GLOBALS['rows'] .= loadTemplate($mode . '_menu_title', TRUE, $content); // Sub menu - $result_sub = SQL_QUERY_ESC("SELECT + $result_sub = sqlQueryEscaped("SELECT `title` AS `sub_title`, `what` AS `sub_what`, `visible` AS `sub_visible`, @@ -259,12 +254,12 @@ ORDER BY ), __FUNCTION__, __LINE__); // Are there some entries? - if (!SQL_HASZERONUMS($result_sub)) { + if (!ifSqlHasZeroNumRows($result_sub)) { // Init counter $count = '0'; // Load all sub menus - while ($content2 = SQL_FETCHARRAY($result_sub)) { + while ($content2 = sqlFetchArray($result_sub)) { // Merge both arrays in one $content = merge_array($content, $content2); @@ -273,7 +268,7 @@ ORDER BY // Full file name for checking menu //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sub_what=' . $content['sub_what']); - $inc = sprintf("inc/modules/%s/what-%s.php", $mode, $content['sub_what']); + $inc = sprintf('inc/modules/%s/what-%s.php', $mode, $content['sub_what']); if (isIncludeReadable($inc)) { // Mark currently selected menu - open if ((!empty($what)) && (($what == $content['sub_what']))) { @@ -320,7 +315,7 @@ ORDER BY ); // Add regular menu row or bottom row? - if ($count < SQL_NUMROWS($result_sub)) { + if ($count < sqlNumRows($result_sub)) { $GLOBALS['rows'] .= loadTemplate($mode . '_menu_row', TRUE, $content); } else { $GLOBALS['rows'] .= loadTemplate($mode . '_menu_bottom', TRUE, $content); @@ -331,7 +326,7 @@ ORDER BY enableBlockMode(); // Load menu block - $INC = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']); + $INC = sprintf('inc/modules/%s/action-%s.php', $mode, $content['action']); if (isFileReadable($INC)) { // Load include file if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_begin', TRUE, $mode); @@ -344,38 +339,48 @@ ORDER BY } // Free result - SQL_FREERESULT($result_sub); + sqlFreeResult($result_sub); // Count one up $main_cnt++; //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat()); - if (SQL_NUMROWS($result_main) > $main_cnt) { + if (sqlNumRows($result_main) > $main_cnt) { // 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); + // Prepare filter data array + $filterData = array( + 'output' => '', + 'exclusive' => FALSE, + 'action' => $action, + 'mode' => $mode, + ); - // Add separator again - $GLOBALS['rows'] .= loadTemplate('menu_separator', TRUE, $mode); - } // END - if + // Run filter chain + $filterData = runFilterChain($mode . '_menu_advert', $filterData); + + // Add content output + $GLOBALS['rows'] .= $filterData['output']; } // END - if } // END - while // Free memory - SQL_FREERESULT($result_main); + sqlFreeResult($result_main); - // Should we display adverts in this menu? - if ((isExtensionInstalledAndNewer('menu', '0.0.1')) && (getConfig($mode . '_menu_advert_enabled') == 'Y')) { - // Add separator again - $GLOBALS['rows'] .= loadTemplate('menu_separator', TRUE, $mode); + // Prepare filter data array + $filterData = array( + 'output' => '', + 'exclusive' => FALSE, + 'action' => $action, + 'mode' => $mode, + ); - // Display advert template - $GLOBALS['rows'] .= loadTemplate('menu_' . $mode . '_advert_end', TRUE); - } // END - if + // Run filter chain + $filterData = runFilterChain($mode . '_menu_advert_end', $filterData); + + // Add content output + $GLOBALS['rows'] .= $filterData['output']; // Prepare data $content = array( @@ -473,7 +478,7 @@ function fetchUserData ($value, $column = 'userid') { $value = bigintval($value); // Don't look for invalid userids... - if (!isValidUserId($value)) { + if (!isValidId($value)) { // Invalid, so abort here reportBug(__FUNCTION__, __LINE__, 'User id ' . $value . ' is invalid.'); } // END - if @@ -482,12 +487,12 @@ function fetchUserData ($value, $column = 'userid') { if ((isCurrentUserIdSet()) && (getCurrentUserId() != $value)) { // Unset it unsetCurrentUserId(); - } elseif (isUserDataValid()) { + } elseif (isValidUserData()) { // Use cache, so it is fine //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #1'); return TRUE; } // END - if - } elseif (isUserDataValid()) { + } elseif (isValidUserData()) { // Using cache is fine //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'value=' . $value . ' is valid, using cache #2'); return TRUE; @@ -500,16 +505,16 @@ function fetchUserData ($value, $column = 'userid') { $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", + $result = sqlQueryEscaped("SELECT *" . $ADD . " FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1", array( $column, $value ), __FUNCTION__, __LINE__); // Is there a record? - if (SQL_NUMROWS($result) == 1) { + if (sqlNumRows($result) == 1) { // Load data from cookies - $data = SQL_FETCHARRAY($result); + $data = sqlFetchArray($result); // Set the userid for later use setCurrentUserId($data['userid']); @@ -545,11 +550,11 @@ function fetchUserData ($value, $column = 'userid') { } // END - if // Found, but valid? - $found = isUserDataValid(); + $found = isValidUserData(); } // END - if // Free memory - SQL_FREERESULT($result); + sqlFreeResult($result); // Return result return $found; @@ -562,16 +567,20 @@ function fetchUserData ($value, $column = 'userid') { * login. */ function isAdmin () { + //* DIE: */ reportBug(__FUNCTION__, __LINE__, 'CALLED!'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CALLED!'); + // Is there cache? if (isset($GLOBALS[__FUNCTION__])) { // Return it - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isAdmin()=' . intval($GLOBALS[__FUNCTION__])); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isAdmin()=' . intval($GLOBALS[__FUNCTION__]) . ' - CACHED!'); return $GLOBALS[__FUNCTION__]; } // END - if - // No admin in installation phase! - if ((isInstallationPhase()) || (!isAdminRegistered())) { + if ((isInstaller()) || (!isAdminRegistered())) { + // No admin in installation phase! $GLOBALS[__FUNCTION__] = FALSE; + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isAdmin()=' . intval($GLOBALS[__FUNCTION__]) . ' - INSTALLER!'); return FALSE; } // END - if @@ -579,15 +588,18 @@ function isAdmin () { $ret = FALSE; $adminId = '0'; $passwordFromCookie = ''; - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminId); // If admin login is not given take current from cookies... + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isSessionVariableSet(admin_id)=' . intval(isSessionVariableSet('admin_id')) . ',isSessionVariableSet(admin_md5)=' . intval(isSessionVariableSet('admin_md5'))); if ((isSessionVariableSet('admin_id')) && (isSessionVariableSet('admin_md5'))) { + // Debug message + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Getting admin data from session ...'); + // Get admin login and password from session/cookies $adminId = getCurrentAdminId(); $passwordFromCookie = getAdminMd5(); } // END - if - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminId=' . $adminId . ',passwordFromCookie=' . $passwordFromCookie); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminId=' . $adminId . ',passwordFromCookie=' . $passwordFromCookie); // Abort if admin id is zero if (($adminId == '0') || (empty($passwordFromCookie))) { @@ -605,26 +617,26 @@ function isAdmin () { // Search in array for entry if (isset($GLOBALS['admin_hash'])) { // Use cached string - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using admin_hash=' . $GLOBALS['admin_hash'] . ' from cache'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using admin_hash=' . $GLOBALS['admin_hash'] . ' from cache'); } elseif ((!empty($adminId)) && (!empty($passwordFromCookie)) && (isAdminHashSet($adminId) === TRUE)) { // Get admin hash and hash it $GLOBALS['admin_hash'] = encodeHashForCookie(getAdminHash($adminId)); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'valPass=' . $GLOBALS['admin_hash']); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'valPass=' . $GLOBALS['admin_hash']); // Count cache hits incrementStatsEntry('cache_hits'); } elseif ((!empty($adminId)) && ((!isExtensionActive('cache')) || (isAdminHashSet($adminId) === FALSE))) { // Get admin hash and hash it $GLOBALS['admin_hash'] = encodeHashForCookie(getAdminHash($adminId)); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'valPass=' . $GLOBALS['admin_hash']); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'valPass=' . $GLOBALS['admin_hash']); } // Check if password is valid - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '(' . $GLOBALS['admin_hash'] . '==' . $passwordFromCookie . ')='.intval($GLOBALS['admin_hash'] == $passwordFromCookie)); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '(' . $GLOBALS['admin_hash'] . '==' . $passwordFromCookie . ')='.intval($GLOBALS['admin_hash'] == $passwordFromCookie)); $GLOBALS[__FUNCTION__] = ((!empty($GLOBALS['admin_hash'])) && ($GLOBALS['admin_hash'] == $passwordFromCookie)); // Return result of comparision - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isAdmin()=' . intval($GLOBALS[__FUNCTION__])); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isAdmin()=' . intval($GLOBALS[__FUNCTION__])); return $GLOBALS[__FUNCTION__]; } @@ -636,26 +648,26 @@ function addMaxReceiveList ($mode, $default = '') { 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 = sqlQuery('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 = sqlQuery('SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC', __FUNCTION__, __LINE__); break; default: // Invalid! - logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid mode %s detected.", $mode)); + logDebugMessage(__FUNCTION__, __LINE__, sprintf('Invalid mode %s detected.', $mode)); break; } // Some entries are found? - if (!SQL_HASZERONUMS($result)) { + if (!ifSqlHasZeroNumRows($result)) { $OUT = ''; - while ($content = SQL_FETCHARRAY($result)) { + while ($content = sqlFetchArray($result)) { $OUT .= ' '; + } // END - if + if ($table == '/ARRAY/') { // Selection from array if ((is_array($key)) && (is_array($value)) && ((count($key)) == (count($value)) || (!empty($callback)))) { @@ -1357,7 +1438,7 @@ function generateOptions ($table, $key, $value, $default = '', $extra = '', $whe } // END - if // Run SQL query - $result = SQL_QUERY_ESC("SELECT `%s` AS `key`, `%s` AS `value`" . $extraColumn . " FROM `{?_MYSQL_PREFIX?}_%s` " . $whereStatement . " ORDER BY `%s` ASC", + $result = sqlQueryEscaped("SELECT `%s` AS `key`, `%s` AS `value`" . $extraColumn . " FROM `{?_MYSQL_PREFIX?}_%s` " . $whereStatement . " ORDER BY `%s` ASC", array( $key, $value, @@ -1366,9 +1447,9 @@ function generateOptions ($table, $key, $value, $default = '', $extra = '', $whe ), __FUNCTION__, __LINE__); // Is there rows? - if (!SQL_HASZERONUMS($result)) { + if (!ifSqlHasZeroNumRows($result)) { // Found data so add them as OPTION lines - while ($content = SQL_FETCHARRAY($result)) { + while ($content = sqlFetchArray($result)) { // Is extra set? if (!isset($content['extra'])) { // Set it to empty @@ -1405,7 +1486,7 @@ function generateOptions ($table, $key, $value, $default = '', $extra = '', $whe } // Free memory - SQL_FREERESULT($result); + sqlFreeResult($result); } // Return - hopefully - the requested data @@ -1418,27 +1499,27 @@ function deleteUserAccount ($userid, $reason) { $data['points'] = '0'; // Search for the points and user data - $result = SQL_QUERY_ESC("SELECT - (SUM(p.`points`) - d.`used_points`) AS `points` + $result = sqlQueryEscaped("SELECT + (SUM(`p`.`points`) - `d`.`used_points`) AS `points` FROM `{?_MYSQL_PREFIX?}_user_points` AS `p` LEFT JOIN `{?_MYSQL_PREFIX?}_user_data` AS `d` ON - p.`userid`=d.`userid` + `p`.`userid`=`d`.`userid` WHERE - p.`userid`=%s + `p`.`userid`=%s LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__); // Is there an entry? - if (SQL_NUMROWS($result) == 1) { + if (sqlNumRows($result) == 1) { // Save his points to add them to the jackpot - $data = SQL_FETCHARRAY($result); + $data = sqlFetchArray($result); // Delete points entries as well // @TODO Rewrite these lines to a filter - SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s", + sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s", array(bigintval($userid)), __FUNCTION__, __LINE__); // Update mediadata as well @@ -1454,16 +1535,16 @@ LIMIT 1", } // END - if // Free the result - SQL_FREERESULT($result); + sqlFreeResult($result); // Delete category selections as well... - SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `userid`=%s", + sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `userid`=%s", array(bigintval($userid)), __FUNCTION__, __LINE__); // Remove from rallye if found // @TODO Rewrite this to a filter if (isExtensionActive('rallye')) { - SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `userid`=%s", + sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `userid`=%s", array(bigintval($userid)), __FUNCTION__, __LINE__); } // END - if @@ -1475,7 +1556,7 @@ LIMIT 1", sendEmail($userid, '{--ADMIN_DELETE_ACCOUNT--}', $message); // Ok, delete the account! - SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__); + sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__); } // Gets the matching what name from module @@ -1526,7 +1607,7 @@ function generateCategoryOptionsList ($mode, $userid = NULL) { ); // Get categories - $result = SQL_QUERY('SELECT + $result = sqlQuery('SELECT `id`, `cat` FROM @@ -1537,15 +1618,15 @@ ORDER BY __FUNCTION__, __LINE__); // Are there entries? - if (!SQL_HASZERONUMS($result)) { + if (!ifSqlHasZeroNumRows($result)) { // ... and begin loading stuff - while ($content = SQL_FETCHARRAY($result)) { + while ($content = sqlFetchArray($result)) { // Transfer some data $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 AND `userid` != %s ORDER BY `userid` ASC", + $result_userids = sqlQueryEscaped("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s AND `userid` != %s ORDER BY `userid` ASC", array( bigintval($content['id']), convertNullToZero($userid) @@ -1555,20 +1636,20 @@ ORDER BY $userid_cnt = '0'; // Start adding all - while ($data = SQL_FETCHARRAY($result_userids)) { + while ($data = sqlFetchArray($result_userids)) { // Add user count $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); + sqlFreeResult($result_userids); // Add counter array_push($categories['userids'], $userid_cnt); } // END - while // Free memory - SQL_FREERESULT($result); + sqlFreeResult($result); // Generate options $OUT = ''; @@ -1607,7 +1688,7 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds, // HTML extension active? if (isExtensionActive('html_mail')) { // Add HTML mail - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus` ( + sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_bonus` ( `subject`, `text`, `receivers`, @@ -1648,7 +1729,7 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds, ), __FUNCTION__, __LINE__); } else { // Add regular mail - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus` ( + sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_bonus` ( `subject`, `text`, `receivers`, @@ -1708,33 +1789,38 @@ function generateReceiverList ($categoryId, $receiver, $mode = '') { $addWhere = runFilterChain('user_exclusion_sql', ' '); // Category given? - if ($categoryId > 0) { + if (isValidId($categoryId)) { // Select category - $extraColumns = "LEFT JOIN `{?_MYSQL_PREFIX?}_user_cats` AS c ON d.`userid`=c.`userid`"; - $addWhere = 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 - $addWhere .= " AND d.`holiday_active`='N'"; - } // END - if - - // Include only HTML recipients? - if ((isExtensionActive('html_mail')) && ($mode == 'html')) { - $addWhere .= " AND d.`html`='Y'"; + $addWhere .= " AND `d`.`holiday_active`='N'"; } // 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", + $result = sqlQueryEscaped("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)) { + if ((sqlNumRows($result) >= $receiver) && ($receiver > 0)) { // Load all entries - while ($content = SQL_FETCHARRAY($result)) { + while ($content = sqlFetchArray($result)) { // Add receiver when not empty if (!empty($content['userid'])) { $receiverList .= $content['userid'] . ';'; @@ -1742,7 +1828,7 @@ function generateReceiverList ($categoryId, $receiver, $mode = '') { } // END - while // Free memory - SQL_FREERESULT($result); + sqlFreeResult($result); // Remove trailing semicolon $receiverList = substr($receiverList, 0, -1); @@ -1755,23 +1841,28 @@ function generateReceiverList ($categoryId, $receiver, $mode = '') { // Recuce the amount of received emails for the receipients for given email function reduceRecipientReceivedMails ($column, $id, $count) { // Search for mail in database - $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `%s`=%s ORDER BY `userid` ASC LIMIT %s", - array($column, bigintval($id), $count), __FUNCTION__, __LINE__); + $result = sqlQueryEscaped("SELECT * FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `%s`=%s ORDER BY `userid` ASC LIMIT %s", + array( + $column, + bigintval($id), + $count + ), __FUNCTION__, __LINE__ + ); // Are there entries? - if (!SQL_HASZERONUMS($result)) { + if (!ifSqlHasZeroNumRows($result)) { // Now load all userids for one big query! $userids = array(); - while ($data = SQL_FETCHARRAY($result)) { - // By default we want to reduce and have no mails found + while ($data = sqlFetchArray($result)) { + // By default reduce and found no emails $num = 0; // We must now look if he has already confirmed this mail, so might sound double, but it may resolve problems // @TODO Rewrite this to a filter - if ((isset($data['stats_id'])) && ($data['stats_id'] > 0)) { + if ((isset($data['stats_id'])) && (isValidId($data['stats_id']))) { // User email $num = countSumTotalData($data['userid'], 'user_stats_data', 'id', 'userid', TRUE, sprintf(" AND `stats_type`='mailid' AND `stats_data`=%s", bigintval($data['stats_id']))); - } elseif ((isset($data['bonus_id'])) && ($data['bonus_id'] > 0)) { + } elseif ((isset($data['bonus_id'])) && (isValidId($data['bonus_id']))) { // Bonus mail $num = countSumTotalData($data['userid'], 'user_stats_data', 'id', 'userid', TRUE, sprintf(" AND `stats_type`='bonusid' AND `stats_data`=%s", bigintval($data['bonus_id']))); } @@ -1782,9 +1873,9 @@ function reduceRecipientReceivedMails ($column, $id, $count) { } // END - if } // END - while - if (count($userids) > 0) { + if (isFilledArray($userids)) { // Now update all user accounts - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_received`=`emails_received`-1 WHERE `userid` IN (%s) LIMIT %s", + sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_received`=`emails_received`-1 WHERE `userid` IN (%s) LIMIT %s", array( implode(',', $userids), count($userids) @@ -1796,13 +1887,13 @@ function reduceRecipientReceivedMails ($column, $id, $count) { } // END - if // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); } // Creates a new task 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())", + sqlQueryEscaped("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( convertZeroToNull($adminId), convertZeroToNull($userid), @@ -1812,7 +1903,7 @@ function createNewTask ($subject, $notes, $taskType, $userid = NULL, $adminId = ), __FUNCTION__, __LINE__, TRUE, $strip); // Return insert id which is the task id - return SQL_INSERTID(); + return getSqlInsertId(); } // Updates last module / online time @@ -1820,7 +1911,7 @@ function updateLastActivity ($userid) { // Is 'what' set? if (isWhatSet()) { // Run the update query - SQL_QUERY_ESC("UPDATE + sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `{%%pipe,getUserLastWhatName%%}`='{%%pipe,getWhat%%}', @@ -1834,7 +1925,7 @@ LIMIT 1", ), __FUNCTION__, __LINE__); } else { // No what set, needs to be ignored (last_module is last_what) - SQL_QUERY_ESC("UPDATE + sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `{%%pipe,getUserLastWhatName%%}`=NULL, @@ -1849,13 +1940,13 @@ LIMIT 1", } } -// List all given rows (callback function from XML) -function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array(), $conditions = array(), $content = array()) { +// List all given joined rows (callback function from XML) +function doGenericJoinedListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $tableJoinType, $tableJoinName, $joinOnLeftTable, $joinOnCondition, $joinOnRightTable, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array(), $conditions = array(), $content = 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) { + } elseif (!isFilledArray($columns)) { // No columns specified reportBug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML,tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate . ',tableName[0]=' . $tableName[0]); } @@ -1866,76 +1957,47 @@ function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, // Get the sql part back from given array $sql .= getSqlPartFromXmlArray($columns); - // Remove last commata and add FROM statement - $sql .= ' FROM `{?_MYSQL_PREFIX?}_' . $tableName[0] . '`'; + // Add "FROM" + $sql .= getSqlXmlFromTable($tableName); - // 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 '; + // Add "JOIN" + $sql .= getSqlXmlJoinedTable($tableJoinType, $tableJoinName, $joinOnLeftTable, $joinOnCondition, $joinOnRightTable); - // Table/alias included? - if (!empty($whereColumns[0]['table'])) { - // Add it as well - $sql .= $whereColumns[0]['table'] . '.'; - } // END - if + // Add "WHERE" + $sql .= getSqlXmlWhereConditions($whereColumns, $conditions); - // 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 "ORDER BY" + $sql .= getSqlXmlOrderBy($orderByColumns); - // Add to SQL query - $sql .= $condition; + // Now handle all over to the inner function which will execute the listing + doListEntries($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters, $content); +} - // Table/alias included? - if (!empty($whereColumns[$idx]['table'])) { - // Add it as well - $sql .= $whereColumns[$idx]['table'] . '.'; - } // END - if +// List all given rows (callback function from XML) +function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array(), $conditions = array(), $content = 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 (!isFilledArray($columns)) { + // No columns specified + reportBug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML,tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate . ',tableName[0]=' . $tableName[0]); + } - // 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 + // This is the minimum query, so at least columns and tableName must have entries + $sql = 'SELECT '; - // 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_values($array))); - - // table/alias can be omitted - if (!empty($table)) { - // table/alias is given - $sql .= $table . '.'; - } // END - if + // Get the sql part back from given array + $sql .= getSqlPartFromXmlArray($columns); - // Add order-by column - $sql .= '`' . $orderByColumn . '` ' . $sorting . ','; - } // END - foreach + // Add "FROM" + $sql .= getSqlXmlFromTable($tableName); - // Remove last column - $sql = substr($sql, 0, -1); - } // END - if + // Add "WHERE" + $sql .= getSqlXmlWhereConditions($whereColumns, $conditions); + + // Add "ORDER BY" + $sql .= getSqlXmlOrderBy($orderByColumns); // Now handle all over to the inner function which will execute the listing doListEntries($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters, $content); @@ -1944,13 +2006,13 @@ function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, // Do the listing of entries function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters = array(), $content = array()) { // Run the SQL query - $result = SQL_QUERY($sql, __FUNCTION__, __LINE__); + $result = sqlQuery($sql, __FUNCTION__, __LINE__); // Are there some URLs left? - if (!SQL_HASZERONUMS($result)) { + if (!ifSqlHasZeroNumRows($result)) { // List all URLs $OUT = ''; - while ($row = SQL_FETCHARRAY($result)) { + while ($row = sqlFetchArray($result)) { // "Translate" content foreach ($callbackColumns as $columnName => $callbackName) { // Fill the callback arguments @@ -1964,7 +2026,7 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $ // 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 + // @TODO If the EL sub-system can support more than one parameter, this call_user_func_array() can be avoided $row[$columnName] = call_user_func_array($callbackName, $args); } // END - foreach @@ -1973,7 +2035,7 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $ } // END - while // Is at least one entry set in content? - if ((is_array($content)) && (count($content) > 0)) { + if (isFilledArray($content)) { // Then add generic 'rows' element $content['rows'] = $OUT; } else { @@ -1989,7 +2051,7 @@ function doListEntries ($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $ } // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); } // Adds a given entry to the database @@ -1999,7 +2061,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions = 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) { + } elseif (!isFilledArray($columns)) { // No columns specified reportBug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML.'); } @@ -2012,7 +2074,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions = $GLOBALS['__XML_PARSE_RESULT'] = TRUE; // Is there "time columns"? - if (count($timeColumns) > 0) { + if (isFilledArray($timeColumns)) { // Then "walk" through all entries foreach ($timeColumns as $column) { // Convert all (possible) selections @@ -2026,7 +2088,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions = // Is columnIndex set? if (!is_null($columnIndex)) { // Check conditions - //* DEBUG: */ die('columnIndex=
'.print_r($columnIndex,TRUE).'
'.debug_get_printable_backtrace()); + //* DEBUG: */ die('columnName=
'.print_r($columnName,TRUE).'
columnIndex=
'.print_r($columnIndex,TRUE).'
'.debug_get_printable_backtrace()); assert((is_array($columnName)) && (is_string($columnIndex)) && (isset($columnName[$columnIndex]))); // Then use that index "blindly" @@ -2036,15 +2098,35 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions = // 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']))); + // Get value back (no array supported) + $value = postRequestElement($columnName); + + // Is this an array and element 0 is set? + if ((is_array($value)) && (isset($value[0]))) { + // Then only take this + $value = $value[0]; + } // END - if + // Copy entry securely to the final arrays - $sqlColumns[$key] = SQL_ESCAPE($columnName); - $sqlValues[$key] = SQL_ESCAPE(postRequestElement($columnName)); + $sqlColumns[$key] = sqlEscapeString($columnName); + $sqlValues[$key] = sqlEscapeString($value); + + // Search for it + $search = key(search_array($columns, 'column', $columnName)); // Try to handle call-back functions and/or extra values on the list - $sqlValues[$key] = doHandleExtraValues($filterFunctions, $extraValues, $key . '_list', $sqlValues[$key], $userIdColumn, key(search_array($columns, 'column', $key))); + //* DEBUG: */ outputHtml($key . '/' . $columnName . '=
'.print_r($columns,true).'
search_array()=
'.print_r(search_array($columns, 'column', $columnName), TRUE).'
'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '(' . gettype($key) . ')][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!'); + if (is_string($key)) { + // Key is a string + $sqlValues[$key] = doHandleExtraValues($filterFunctions, $extraValues, $key . '_list', $sqlValues[$key], array(''), $search); + } else { + // Is a number + $sqlValues[$key] = doHandleExtraValues($filterFunctions, $extraValues, $key, $sqlValues[$key], array(''), $search); + } // Is the value not a number? - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key]); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '(' . gettype($key) . ')][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!'); if (($sqlValues[$key] != 'NULL') && (is_string($sqlValues[$key]))) { // Add quotes around it $sqlValues[$key] = chr(39) . $sqlValues[$key] . chr(39); @@ -2064,22 +2146,22 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions = $sql = 'INSERT INTO `{?_MYSQL_PREFIX?}_' . $tableName[0] . '` (`' . implode('`, `', $sqlColumns) . "`) VALUES (" . implode(',', $sqlValues) . ')'; // Run the SQL query - SQL_QUERY($sql, __FUNCTION__, __LINE__); + sqlQuery($sql, __FUNCTION__, __LINE__); // Add id number - setPostRequestElement('id', SQL_INSERTID()); + setPostRequestElement('id', getSqlInsertId()); // Prepare filter data array $filterData = array( 'mode' => 'add', 'table_name' => $tableName, 'content' => postRequestArray(), - 'id' => SQL_INSERTID(), + 'id' => getSqlInsertId(), 'subject' => '', // @TODO Used generic 'userid' here 'userid_column' => array('userid'), 'raw_userid' => array('userid'), - 'affected' => SQL_AFFECTEDROWS(), + 'affected' => sqlAffectedRows(), 'sql' => $sql, ); @@ -2091,7 +2173,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions = // Edit rows by given id numbers function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $subject = '') { // Is there "time columns"? - if (count($timeColumns) > 0) { + if (isFilledArray($timeColumns)) { // Then "walk" through all entries foreach ($timeColumns as $column) { // Convert all (possible) selections @@ -2109,21 +2191,21 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun $content = array(); // Prepare SQL for this row - $sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET", - SQL_ESCAPE($tableName[0]) + $sql = sprintf('UPDATE `{?_MYSQL_PREFIX?}_%s` SET', + sqlEscapeString($tableName[0]) ); // "Walk" through all entries foreach (postRequestArray() as $key => $entries) { // Skip raw userid which is always invalid - if (($key == $rawUserId[0]) || ($key == 'do_edit')) { + if (($key == $rawUserId[0]) || ($key == ($rawUserId[0] . '_raw')) || ($key == 'do_edit')) { // Continue with next field //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',idColumn[0]=' . $idColumn[0] . ',rawUserId=' . $rawUserId[0]); continue; } // END - if // Debug message - /* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',id=' . $id . ',idColumn[0]=' . $idColumn[0] . ',entries=
'.print_r($entries,TRUE).'
'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',id=' . $id . ',idColumn[0]=' . $idColumn[0] . ',entries=
'.print_r($entries,TRUE).'
'); // Is entries an array? if (($key != $idColumn[0]) && (is_array($entries)) && (isset($entries[$id]))) { @@ -2147,7 +2229,7 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun //* BUG: */ die($key.'/
'.print_r($search, TRUE).'
=
'.print_r($columns, TRUE).'
'); // Debug message - /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - BEFORE!'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - BEFORE!'); // Add normal entries as well $content[$key] = $entries; @@ -2156,7 +2238,7 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun $entries = doHandleExtraValues($filterFunctions, $extraValues, $key, $entries, $userIdColumn, $search); // Debug message - /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - AFTER!'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',entries[' . gettype($entries) . ']=' . $entries . ',search=' . $search . ' - AFTER!'); // Add key/value pair to SQL string $sql .= addKeyValueSql($key, $entries); @@ -2164,8 +2246,8 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun } // END - foreach // Finish SQL command - $sql = substr($sql, 0, -1) . " WHERE `" . SQL_ESCAPE($idColumn[0]) . "`=" . bigintval($id); - if ((isset($rawUserId[0])) && (isPostRequestElementSet($rawUserId[0])) && (isset($userIdColumn[0]))) { + $sql = substr($sql, 0, -1) . " WHERE `" . sqlEscapeString($idColumn[0]) . "`=" . $id; + if ((isset($rawUserId[0])) && (isset($userIdColumn[0])) && (isPostRequestElementSet($rawUserId[0])) && (!is_array(postRequestElement($rawUserId[0])))) { // Add user id as well $sql .= ' AND `' . $userIdColumn[0] . '`=' . bigintval(postRequestElement($rawUserId[0])); } // END - if @@ -2173,14 +2255,14 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun // Run this query //* BUG: */ die($sql.'
'.print_r(postRequestArray(), TRUE).'
'); - SQL_QUERY($sql, __FUNCTION__, __LINE__); + sqlQuery($sql, __FUNCTION__, __LINE__); // Add affected rows - $edited = SQL_AFFECTEDROWS(); + $edited = sqlAffectedRows(); $affected += $edited; // Load all data from that id - $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1", + $result = sqlQueryEscaped("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1", array( $tableName[0], $idColumn[0], @@ -2188,7 +2270,7 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun ), __FUNCTION__, __LINE__); // Fetch the data and merge it into $content - $content = merge_array($content, SQL_FETCHARRAY($result)); + $content = merge_array($content, sqlFetchArray($result)); // Prepare filter data array $filterData = array( @@ -2207,11 +2289,11 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun runFilterChain('send_build_mail', $filterData); // Free the result - SQL_FREERESULT($result); + sqlFreeResult($result); } // END - foreach // Delete cache? - if ((count($cacheFiles) > 0) && (!empty($cacheFiles[0]))) { + if ((isFilledArray($cacheFiles)) && (!empty($cacheFiles[0]))) { // Delete cache file(s) foreach ($cacheFiles as $cache) { // Skip any empty entries @@ -2220,11 +2302,8 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun continue; } // END - if - // Is the cache file loadable? - if ($GLOBALS['cache_instance']->loadCacheFile($cache)) { - // Then remove it - $GLOBALS['cache_instance']->removeCacheFile(); - } // END - if + // Use rebuildCache() to delete it + rebuildCache($cache); } // END - foreach } // END - if @@ -2239,7 +2318,7 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF // Is a user id provided? //* BUG: */ die('
'.print_r($rawUserId,TRUE).'
'.print_r($userIdColumn,TRUE).'
'); - if ((isset($rawUserId[0])) && (isPostRequestElementSet($rawUserId[0])) && (isset($userIdColumn[0]))) { + if ((isset($rawUserId[0])) && (isset($userIdColumn[0])) && (isPostRequestElementSet($rawUserId[0])) && (!is_array(postRequestElement($rawUserId[0])))) { // Add user id as well $sql .= ' AND `' . $userIdColumn[0] . '`=' . bigintval(postRequestElement($rawUserId[0])); } // END - if @@ -2255,7 +2334,7 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF $idList = ''; foreach (postRequestElement($idColumn[0]) as $id => $sel) { // Is id zero? - if ($id == '0') { + if (!isValidId($id)) { // Then skip this continue; } // END - if @@ -2263,7 +2342,7 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF // Is there a userid? if (isPostRequestElementSet($userIdColumn[0])) { // Load all data from that id - $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1", + $result = sqlQueryEscaped("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1", array( $tableName[0], $idColumn[0], @@ -2271,10 +2350,10 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF ), __FUNCTION__, __LINE__); // Fetch the data - $content = SQL_FETCHARRAY($result); + $content = sqlFetchArray($result); // Free the result - SQL_FREERESULT($result); + sqlFreeResult($result); // Send "build mails" out sendGenericBuildMails('delete', $tableName, $content, $id, '', $userIdColumn); @@ -2285,7 +2364,7 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF } // END - foreach // Run the query - SQL_QUERY_ESC($sql, + sqlQueryEscaped($sql, array( $tableName[0], $idColumn[0], @@ -2293,7 +2372,7 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF ), __FUNCTION__, __LINE__); // Return affected rows - return SQL_AFFECTEDROWS(); + return sqlAffectedRows(); } // Build a special template list @@ -2321,12 +2400,12 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter $id = bigintval($id); // Get result from a given column array and table name - $result = SQL_RESULT_FROM_ARRAY($tableName[0], $columns, $idColumn[0], $id, __FUNCTION__, __LINE__); + $result = getSqlResultFromArray($tableName[0], $columns, $idColumn[0], $id, __FUNCTION__, __LINE__); // Is there one entry? - if (SQL_NUMROWS($result) == 1) { + if (sqlNumRows($result) == 1) { // Load all data - $row = SQL_FETCHARRAY($result); + $row = sqlFetchArray($result); // Filter all data foreach ($row as $key => $value) { @@ -2372,11 +2451,11 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter // Try to handle call-back functions and/or extra values //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'idx=' . $idx . ',row[' . $key . ']=' . $row[$key]); //if ($key == 'forced_campaign_created') die($idx.'=
'.print_r($columns,true).'
'.print_r($extraValues,true).'
'); - $row[$key] = doHandleExtraValues($filterFunctions, $extraValues, $idx, $row[$key], $userIdColumn, ((!is_null($name)) ? $name : $key)); + $row[$key] = doHandleExtraValues($filterFunctions, $extraValues, $idx, $row[$key], $userIdColumn, ((!is_null($name)) ? $name : $key), $id); } // END - foreach // Then list it - $OUT .= loadTemplate(sprintf("%s_%s_%s_row", + $OUT .= loadTemplate(sprintf('%s_%s_%s_row', $prefix, $listType, $tableName[0] @@ -2385,11 +2464,11 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter } // END - if // Free the result - SQL_FREERESULT($result); + sqlFreeResult($result); } // END - foreach // Is there an entry in $content? - if ((is_array($content)) && (count($content) > 0)) { + if (isFilledArray($content)) { // Use generic 'rows' $content['rows'] = $OUT; } else { @@ -2398,48 +2477,15 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter } // Load master template - loadTemplate(sprintf("%s_%s_%s", - $prefix, - $listType, - $tableName[0] + loadTemplate( + sprintf('%s_%s_%s', + $prefix, + $listType, + $tableName[0] ), FALSE, $content ); } -// Checks whether given URL is blacklisted -function isUrlBlacklisted ($url) { - // Mark it as not listed by default - $listed = FALSE; - - // Is black-listing enbaled? - if (!isUrlBlacklistEnabled()) { - // No, then all URLs are not in this list - return FALSE; - } elseif (!isset($GLOBALS['blacklist_data'][$url])) { - // Check black-list for given URL - $result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`timestamp`) AS `blist_timestamp` FROM `{?_MYSQL_PREFIX?}_url_blacklist` WHERE `url`='%s' LIMIT 1", - array($url), __FILE__, __LINE__); - - // Is there an entry? - if (SQL_NUMROWS($result) == 1) { - // Jupp, we got one listed - $GLOBALS['blacklist_data'][$url] = SQL_FETCHARRAY($result); - - // Mark it as listed - $listed = TRUE; - } // END - if - - // Free result - SQL_FREERESULT($result); - } else { - // Is found in cache -> black-listed - $listed = TRUE; - } - - // Return result - return $listed; -} - // Adds key/value pair to a working SQL string together function addKeyValueSql ($key, $value) { // Init SQL @@ -2449,19 +2495,19 @@ function addKeyValueSql ($key, $value) { if (($value == 'NULL') || (is_null($value))) { // Add key with NULL $sql .= sprintf(' `%s`=NULL,', - SQL_ESCAPE($key) + sqlEscapeString($key) ); } elseif ((is_double($value)) || (is_float($value)) || (is_int($value))) { // Is a number, so addd it directly - $sql .= sprintf(" `%s`=%s,", - SQL_ESCAPE($key), + $sql .= sprintf(' `%s`=%s,', + sqlEscapeString($key), $value ); } else { // Else add the value escape'd $sql .= sprintf(" `%s`='%s',", - SQL_ESCAPE($key), - SQL_ESCAPE($value) + sqlEscapeString($key), + sqlEscapeString($value) ); } @@ -2469,5 +2515,43 @@ function addKeyValueSql ($key, $value) { return $sql; } +// "Getter" for an array from given table and columns +function getArrayFromTable ($tableName, $columns, $orderBy, $ordered = 'ASC', $whereSql = '') { + // The table must exist + assert(ifSqlTableExists($tableName)); + + // Search for it + $result = sqlQueryEscaped('SELECT + `' . implode('`, `', $columns) . '` +FROM + `{?_MYSQL_PREFIX?}_%s` +' . $whereSql . ' +ORDER BY + `%s` %S', + array( + $tableName, + $orderBy, + $ordered + ), __FUNCTION__, __LINE__ + ); + + // Init array + $rows = array(); + + // Are there entries? + if (!ifSqlHasZeroNumRows($result)) { + // Load all entries + while ($row = sqlFetchArray($result)) { + array_push($rows, $row); + } // END - while + } // END - if + + // Free result + sqlFreeResult($result); + + // Return all found rows + return $rows; +} + // [EOF] ?>