X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmysql-manager.php;h=619b58c9ee068b839b6a038cae059c8a52f56c43;hb=8729e9b2566751c19f225e86daa86730f25c49b0;hp=b4b635d87b4e2f5a60261114679589cdcf80bc96;hpb=5dae780ad5a596f93c5fcf338ca56c336a7eb480;p=mailer.git
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index b4b635d87b..619b58c9ee 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 - 2013 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,20 +64,20 @@ 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'];
}
// Add link into output stream (or return it) for 'You Are Here' navigation
-function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
+function addYouAreHereLink ($accessLevel, $FQFN, $return = FALSE) {
// Use only filename of the FQFN...
$file = basename($FQFN);
@@ -145,7 +140,7 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
// Add default content
$prefix .= '
{--YOU_ARE_HERE--} Home';
- } elseif ($return === false) {
+ } elseif ($return === FALSE) {
// Count depth
$GLOBALS['nav_depth']++;
}
@@ -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) . '';
@@ -184,7 +179,7 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
} // END - if
// Return or output HTML code?
- if ($return === true) {
+ if ($return === TRUE) {
// Return HTML code
return $OUT;
} else {
@@ -199,7 +194,7 @@ function addMenu ($mode, $action, $what) {
$main_cnt = '0';
// is the menu action valid?
- if (!isMenuActionValid($mode, $action, $what, true)) {
+ if (!isMenuActionValid($mode, $action, $what, TRUE)) {
return getCode('MENU_NOT_VALID');
} // END - if
@@ -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,19 +222,19 @@ ORDER BY
array($mode), __FUNCTION__, __LINE__);
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat());
- if (!SQL_HASZERONUMS($result_main)) {
+ if (!ifSqlHasZeroNums($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);
+ enableBlockMode(FALSE);
// Load menu header template
- $GLOBALS['rows'] .= loadTemplate($mode . '_menu_title', true, $content);
+ $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 (!ifSqlHasZeroNums($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,10 +315,10 @@ ORDER BY
);
// Add regular menu row or bottom row?
- if ($count < SQL_NUMROWS($result_sub)) {
- $GLOBALS['rows'] .= loadTemplate($mode . '_menu_row', true, $content);
+ if ($count < sqlNumRows($result_sub)) {
+ $GLOBALS['rows'] .= loadTemplate($mode . '_menu_row', TRUE, $content);
} else {
- $GLOBALS['rows'] .= loadTemplate($mode . '_menu_bottom', true, $content);
+ $GLOBALS['rows'] .= loadTemplate($mode . '_menu_bottom', TRUE, $content);
}
} // END - while
} else {
@@ -331,51 +326,61 @@ 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);
+ if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_begin', TRUE, $mode);
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
loadInclude($INC);
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
- if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_end', true, $mode);
+ if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_end', TRUE, $mode);
}
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',action=' . $content['action'] . ',getWhat()=' . getWhat());
}
// 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);
+ $GLOBALS['rows'] .= loadTemplate('menu_separator', TRUE, $mode);
+
+ // Prepare filter data array
+ $filterData = array(
+ 'output' => '',
+ 'exclusive' => FALSE,
+ 'action' => $action,
+ 'mode' => $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);
+ // Run filter chain
+ $filterData = runFilterChain($mode . '_menu_advert', $filterData);
- // Add separator again
- $GLOBALS['rows'] .= loadTemplate('menu_separator', true, $mode);
- } // END - if
+ // Add content output
+ $GLOBALS['rows'] .= $filterData['output'];
} // END - if
} // END - while
// Free memory
- SQL_FREERESULT($result_main);
+ sqlFreeResult($result_main);
+
+ // Prepare filter data array
+ $filterData = array(
+ 'output' => '',
+ 'exclusive' => FALSE,
+ 'action' => $action,
+ 'mode' => $mode,
+ );
- // 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);
+ // Run filter chain
+ $filterData = runFilterChain($mode . '_menu_advert_end', $filterData);
- // Display advert template
- $GLOBALS['rows'] .= loadTemplate('menu_' . $mode . '_advert_end', true);
- } // END - if
+ // Add content output
+ $GLOBALS['rows'] .= $filterData['output'];
// Prepare data
$content = array(
@@ -385,14 +390,14 @@ ORDER BY
// Load main template
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'main_cnt=' . $main_cnt . ',getWhat()=' . getWhat());
- loadTemplate('menu_table', false, $content);
+ loadTemplate('menu_table', FALSE, $content);
} // END - if
}
// Checks whether the current user is a member
function isMember () {
// By default no member
- $ret = false;
+ $ret = FALSE;
// Fix missing 'last_online' array, damn stupid code :(((
// @TODO Try to rewrite this to one or more functions
@@ -411,7 +416,7 @@ function isMember () {
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No member set in cookie/session.');
// Abort further processing
- return false;
+ return FALSE;
}
// Get userid secured from session
@@ -427,7 +432,7 @@ function isMember () {
fixDeletedCookies(array('userid', 'u_hash'));
// Are cookies set and can the member data be loaded?
- if ((isMemberIdSet()) && (isSessionVariableSet('u_hash')) && (fetchUserData(getMemberId()) === true)) {
+ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash')) && (fetchUserData(getMemberId()) === TRUE)) {
// Validate password by created the difference of it and the secret key
$valPass = encodeHashForCookie(getUserData('password'));
@@ -438,12 +443,12 @@ function isMember () {
$GLOBALS['last_online']['online'] = getUserData('last_online');
// Account is confirmed and all cookie data is valid so he is definely logged in! :-)
- $ret = true;
+ $ret = TRUE;
} // END - if
} // END - if
// Is $ret still false?
- if ($ret === false) {
+ if ($ret === FALSE) {
// Yes, so destroy the session
destroyMemberSession();
} // END - if
@@ -461,7 +466,7 @@ function fetchUserData ($value, $column = 'userid') {
// Extension ext-user must be there at any case
if (!isExtensionActive('user')) {
// Absent ext-user is really not good
- return false;
+ return FALSE;
} elseif (is_null($value)) {
// This shall never happen, so please report it
reportBug(__FUNCTION__, __LINE__, 'value=NULL,column=' . $column . ' - value can never be NULL');
@@ -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,34 +487,34 @@ 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;
+ 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;
+ return TRUE;
}
// By default none was found
- $found = false;
+ $found = FALSE;
// 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",
+ $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,100 +567,100 @@ function fetchUserData ($value, $column = 'userid') {
* login.
*/
function isAdmin () {
+ // Is there cache?
+ if (isset($GLOBALS[__FUNCTION__])) {
+ // Return it
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isAdmin()=' . intval($GLOBALS[__FUNCTION__]));
+ return $GLOBALS[__FUNCTION__];
+ } // END - if
+
// No admin in installation phase!
- if ((isInstallationPhase()) || (!isAdminRegistered())) {
- return false;
+ if ((isInstaller()) || (!isAdminRegistered())) {
+ $GLOBALS[__FUNCTION__] = FALSE;
+ return FALSE;
} // END - if
// Init variables
- $ret = false;
+ $ret = FALSE;
$adminId = '0';
$passwordFromCookie = '';
- $valPass = '';
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminId);
// If admin login is not given take current from cookies...
if ((isSessionVariableSet('admin_id')) && (isSessionVariableSet('admin_md5'))) {
// Get admin login and password from session/cookies
- $adminId = getCurrentAdminId();
+ $adminId = getCurrentAdminId();
$passwordFromCookie = getAdminMd5();
} // END - if
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminId=' . $adminId . 'passwordFromCookie=' . $passwordFromCookie);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminId=' . $adminId . ',passwordFromCookie=' . $passwordFromCookie);
// Abort if admin id is zero
- if ($adminId == '0') {
+ if (($adminId == '0') || (empty($passwordFromCookie))) {
// 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;
+ $GLOBALS[__FUNCTION__] = FALSE;
+ return FALSE;
} // END - if
- // Is there cache?
- if (!isset($GLOBALS[__FUNCTION__][$adminId])) {
- // Init it with failed
- $GLOBALS[__FUNCTION__][$adminId] = false;
-
- // Search in array for entry
- if (isset($GLOBALS['admin_hash'])) {
- // Use cached string
- $valPass = $GLOBALS['admin_hash'];
- } elseif ((!empty($passwordFromCookie)) && (isAdminHashSet($adminId) === true) && (!empty($adminId))) {
- // Login data is valid or not?
- $valPass = encodeHashForCookie(getAdminHash($adminId));
-
- // Cache it away
- $GLOBALS['admin_hash'] = $valPass;
-
- // Count cache hits
- incrementStatsEntry('cache_hits');
- } elseif ((!empty($adminId)) && ((!isExtensionActive('cache')) || (isAdminHashSet($adminId) === false))) {
- // Get admin hash and hash it
- $valPass = encodeHashForCookie(getAdminHash($adminId));
-
- // Cache it away
- $GLOBALS['admin_hash'] = $valPass;
- }
+ // Init it with failed
+ $GLOBALS[__FUNCTION__] = FALSE;
- if (!empty($valPass)) {
- // Check if password is valid
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '(' . $valPass . '==' . $passwordFromCookie . ')='.intval($valPass == $passwordFromCookie));
- $GLOBALS[__FUNCTION__][$adminId] = ($GLOBALS['admin_hash'] == $passwordFromCookie);
- } // END - if
- } // END - if
+ // 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');
+ } 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']);
+
+ // 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']);
+ }
+
+ // Check if password is valid
+ //* 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
- return $GLOBALS[__FUNCTION__][$adminId];
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isAdmin()=' . intval($GLOBALS[__FUNCTION__]));
+ return $GLOBALS[__FUNCTION__];
}
// Generates a list of "max receiveable emails per day"
function addMaxReceiveList ($mode, $default = '') {
$OUT = '';
- $result = false;
+ $result = 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 = 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 (!ifSqlHasZeroNums($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)))) {
@@ -1354,7 +1430,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,
@@ -1363,9 +1439,9 @@ function generateOptions ($table, $key, $value, $default = '', $extra = '', $whe
), __FUNCTION__, __LINE__);
// Is there rows?
- if (!SQL_HASZERONUMS($result)) {
+ if (!ifSqlHasZeroNums($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
@@ -1402,7 +1478,7 @@ function generateOptions ($table, $key, $value, $default = '', $extra = '', $whe
}
// Free memory
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
}
// Return - hopefully - the requested data
@@ -1415,27 +1491,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
+ `{?_MYSQL_PREFIX?}_user_points` AS `p`
LEFT JOIN
- `{?_MYSQL_PREFIX?}_user_data` AS d
+ `{?_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
@@ -1451,28 +1527,28 @@ 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
// Add reason and translate points
- $data['text'] = $reason;
+ $data['text'] = $reason;
// Now a mail to the user and that's all...
$message = loadEmailTemplate('member_user_deleted', $data, $userid);
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
@@ -1523,19 +1599,26 @@ function generateCategoryOptionsList ($mode, $userid = NULL) {
);
// Get categories
- $result = SQL_QUERY('SELECT `id`,`cat` FROM `{?_MYSQL_PREFIX?}_cats`' . $whereStatement . ' ORDER BY `sort` ASC',
+ $result = sqlQuery('SELECT
+ `id`,
+ `cat`
+FROM
+ `{?_MYSQL_PREFIX?}_cats`
+' . $whereStatement . '
+ORDER BY
+ `sort` ASC',
__FUNCTION__, __LINE__);
// Are there entries?
- if (!SQL_HASZERONUMS($result)) {
+ if (!ifSqlHasZeroNums($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)
@@ -1545,20 +1628,20 @@ function generateCategoryOptionsList ($mode, $userid = NULL) {
$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"));
+ $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 = '';
@@ -1579,10 +1662,10 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
// Is admin or bonus extension there?
if (!isAdmin()) {
// Abort here
- return false;
+ return FALSE;
} elseif (!isExtensionActive('bonus')) {
// Abort here
- return false;
+ return FALSE;
}
// Calculcate target sent
@@ -1596,13 +1679,34 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
// HTML extension active?
if (isExtensionActive('html_mail')) {
- // Determine if we have HTML mode active
- $HTML = convertBooleanToYesNo($mode == 'html');
-
// 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`)
-VALUES ('%s','%s','%s',%s,%s,'NEW', UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')",
+ sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_bonus` (
+ `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,
$text,
@@ -1613,13 +1717,35 @@ VALUES ('%s','%s','%s',%s,%s,'NEW', UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')",
bigintval($categoryId),
$target,
bigintval($receiver),
- $HTML
+ convertBooleanToYesNo($mode == 'html')
), __FUNCTION__, __LINE__);
} 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`)
-VALUES ('%s','%s','%s',%s,%s,'NEW', UNIX_TIMESTAMP(),'%s',%s,%s,%s)",
+ sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_bonus` (
+ `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,
$text,
@@ -1639,7 +1765,7 @@ function generateReceiverList ($categoryId, $receiver, $mode = '') {
// Init variables
$extraColumns = '';
$receiverList = '';
- $result = false;
+ $result = FALSE;
// Secure data
$categoryId = bigintval($categoryId);
@@ -1655,33 +1781,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'] . ';';
@@ -1689,7 +1820,7 @@ function generateReceiverList ($categoryId, $receiver, $mode = '') {
} // END - while
// Free memory
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
// Remove trailing semicolon
$receiverList = substr($receiverList, 0, -1);
@@ -1702,25 +1833,30 @@ 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 (!ifSqlHasZeroNums($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)) {
+ $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'])) && (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'])));
+ $num = countSumTotalData($data['userid'], 'user_stats_data', 'id', 'userid', TRUE, sprintf(" AND `stats_type`='bonusid' AND `stats_data`=%s", bigintval($data['bonus_id'])));
}
// Reduce this users total received emails?
@@ -1729,10 +1865,13 @@ 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",
- array(implode(',', $userids), count($userids)), __FUNCTION__, __LINE__);
+ sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_received`=`emails_received`-1 WHERE `userid` IN (%s) LIMIT %s",
+ array(
+ implode(',', $userids),
+ count($userids)
+ ), __FUNCTION__, __LINE__);
} else {
// Nothing deleted
displayMessage('{%message,ADMIN_MAIL_NOTHING_DELETED=' . $id . '%}');
@@ -1740,170 +1879,136 @@ 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) {
+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),
$taskType,
$subject,
$notes
- ), __FUNCTION__, __LINE__, true, $strip);
+ ), __FUNCTION__, __LINE__, TRUE, $strip);
// Return insert id which is the task id
- return SQL_INSERTID();
+ return getSqlInsertId();
}
// Updates last module / online time
-function updateLastActivity($userid) {
+function updateLastActivity ($userid) {
// Is 'what' set?
if (isWhatSet()) {
// Run the update query
- SQL_QUERY_ESC("UPDATE
+ sqlQueryEscaped("UPDATE
`{?_MYSQL_PREFIX?}_user_data`
SET
- `%s`='%s',
+ `{%%pipe,getUserLastWhatName%%}`='{%%pipe,getWhat%%}',
`last_online`=UNIX_TIMESTAMP(),
- `REMOTE_ADDR`='%s'
+ `REMOTE_ADDR`='{%%pipe,detectRemoteAddr%%}'
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
+ sqlQueryEscaped("UPDATE
`{?_MYSQL_PREFIX?}_user_data`
SET
- `%s`=NULL,
+ `{%%pipe,getUserLastWhatName%%}`=NULL,
`last_online`=UNIX_TIMESTAMP(),
- `REMOTE_ADDR`='%s'
+ `REMOTE_ADDR`='{%%pipe,detectRemoteAddr%%}'
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()) {
+// 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]);
}
// This is the minimum query, so at least columns and tableName must have entries
- $SQL = 'SELECT ';
+ $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
+ $sql .= getSqlPartFromXmlArray($columns);
- // 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 "FROM"
+ $sql .= getSqlXmlFromTable($tableName);
- // Add to SQL query
- $SQL .= ' ' . $condition;
+ // Add "JOIN"
+ $sql .= getSqlXmlJoinedTable($tableJoinType, $tableJoinName, $joinOnLeftTable, $joinOnCondition, $joinOnRightTable);
- // Table/alias included?
- if (!empty($whereColumns[$idx]['table'])) {
- // Add it as well
- $SQL .= $whereColumns[$idx]['table'] . '.';
- } // END - if
+ // Add "WHERE"
+ $sql .= getSqlXmlWhereConditions($whereColumns, $conditions);
- // 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
+ // Add "ORDER BY"
+ $sql .= getSqlXmlOrderBy($orderByColumns);
- // 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
+ // Now handle all over to the inner function which will execute the listing
+ doListEntries($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters, $content);
+}
- // Add order-by column
- $SQL .= '`' . $orderByColumn . '` ' . $sorting . ',';
- } // END - foreach
+// 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]);
+ }
- // Remove last column
- $SQL = substr($SQL, 0, -1);
- } // END - if
+ // 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);
+
+ // Add "FROM"
+ $sql .= getSqlXmlFromTable($tableName);
+
+ // 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);
+ doListEntries($sql, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters, $content);
}
// Do the listing of entries
-function doListEntries ($SQL, $tableTemplate, $noEntryMessageId, $rowTemplate, $callbackColumns, $extraParameters = array()) {
+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 (!ifSqlHasZeroNums($result)) {
// List all URLs
$OUT = '';
- while ($content = SQL_FETCHARRAY($result)) {
+ while ($row = sqlFetchArray($result)) {
// "Translate" content
foreach ($callbackColumns as $columnName => $callbackName) {
// Fill the callback arguments
- $args = array($content[$columnName]);
+ $args = array($row[$columnName]);
// Is there more to add?
if (isset($extraParameters[$columnName])) {
@@ -1912,34 +2017,43 @@ function doListEntries ($SQL, $tableTemplate, $noEntryMessageId, $rowTemplate, $
} // 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);
+ //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callbackFunction=' . $callbackName . ',args=
'.print_r($args, TRUE).'
');
+ // @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
// Load row template
- $OUT .= loadTemplate(trim($rowTemplate[0]), true, $content);
+ $OUT .= loadTemplate(trim($rowTemplate[0]), TRUE, $row);
} // END - while
+ // Is at least one entry set in content?
+ if (isFilledArray($content)) {
+ // Then add generic 'rows' element
+ $content['rows'] = $OUT;
+ } else {
+ // Direct output is content
+ $content = $OUT;
+ }
+
// Load main template
- loadTemplate(trim($tableTemplate[0]), false, $OUT);
+ loadTemplate(trim($tableTemplate[0]), FALSE, $content);
} else {
// No URLs in surfbar
displayMessage('{--' .$noEntryMessageId[0] . '--}');
}
// Free result
- SQL_FREERESULT($result);
+ sqlFreeResult($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).'
');
+ //* DEBUG: */ die(__FUNCTION__.':columns=
'.print_r($columns,TRUE).'
,filterFunctions=
'.print_r($filterFunctions,TRUE).'
,extraValues=
'.print_r($extraValues,TRUE).'
,timeColumns=
'.print_r($timeColumns,TRUE).'
,columnIndex=
'.print_r($columnIndex,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) {
+ } elseif (!isFilledArray($columns)) {
// No columns specified
reportBug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML.');
}
@@ -1949,10 +2063,10 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
$sqlValues = array();
// Default is that all went fine
- $GLOBALS['__XML_PARSE_RESULT'] = true;
+ $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
@@ -1966,7 +2080,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
// Is columnIndex set?
if (!is_null($columnIndex)) {
// Check conditions
- //* DEBUG: */ die('columnIndex=
');
// Is entries an array?
if (($key != $idColumn[0]) && (is_array($entries)) && (isset($entries[$id]))) {
+ // Search for the right array index
+ $search = key(search_array($columns, 'column', $key));
+
// Add this entry to content
$content[$key] = $entries[$id];
- // Send data through the filter function if found
- if ($key == $userIdColumn[0]) {
- // Is the userid, we have to process it with convertZeroToNull()
- $entries[$id] = convertZeroToNull($entries[$id]);
- } elseif ((isset($filterFunctions[$key])) && (isset($extraValues[$key]))) {
- // Filter function set!
- $entries[$id] = handleExtraValues($filterFunctions[$key], $entries[$id], $extraValues[$key]);
- }
+ // Debug message
+ //* BUG: */ die($key.'/'.$id.'/'.$search.'=
'.print_r($columns,TRUE).'
'.print_r($filterFunctions,TRUE).'
');
- // Is the value NULL?
- if ($entries[$id] == 'NULL') {
- // Add it directly
- $sql .= sprintf(' `%s`=NULL,',
- SQL_ESCAPE($key)
- );
- } else {
- // Else add the value covered
- $sql .= sprintf(" `%s`='%s',",
- SQL_ESCAPE($key),
- SQL_ESCAPE($entries[$id])
- );
- }
+ // Handle possible call-back functions and/or extra values
+ $entries[$id] = doHandleExtraValues($filterFunctions, $extraValues, $key, $entries[$id], $userIdColumn, $search);
+
+ // Add key/value pair to SQL string
+ $sql .= addKeyValueSql($key, $entries[$id]);
} elseif (($key != $idColumn[0]) && (!is_array($entries))) {
- // Add normal entries as well!
- $content[$key] = $entries;
+ // Search for it
+ $search = key(search_array($columns, 'column', $key));
+ //* BUG: */ die($key.'/
');
+ 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],
@@ -2120,7 +2262,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(
@@ -2128,7 +2270,7 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
'table_name' => $tableName,
'content' => $content,
'id' => $id,
- 'subject' => '',
+ 'subject' => $subject,
'userid_column' => $userIdColumn,
'raw_userid' => $rawUserId,
'affected' => $edited,
@@ -2139,11 +2281,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
@@ -2152,11 +2294,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
@@ -2165,23 +2304,37 @@ function doGenericEditEntriesConfirm ($tableName, $columns = array(), $filterFun
}
// Delete rows by given id numbers
-function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
// The base SQL command:
$sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s` IN (%s)";
// Is a user id provided?
- if ((isset($rawUserId[0])) && (isPostRequestElementSet($rawUserId[0])) && (isset($userIdColumn[0]))) {
+ //* BUG: */ die('
'.print_r($rawUserId,TRUE).'
'.print_r($userIdColumn,TRUE).'
');
+ 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
+ // $idColumn[0] in POST must be an array again
+ if (!is_array(postRequestElement($idColumn[0]))) {
+ // This indicates that you have conflicting form field naming with XML names
+ reportBug(__FUNCTION__, __LINE__, 'You have a wrong form field element, idColumn[0]=' . $idColumn[0]);
+ } // END - if
+
// Delete them all
+ //* BUG: */ die($sql.'
'.print_r($tableName,TRUE).'
'.print_r($columns,TRUE).'
'.print_r($filterFunctions,TRUE).'
'.print_r($extraValues,TRUE).'
'.print_r($deleteNow,TRUE).'
'.print_r($idColumn,TRUE).'
');
$idList = '';
foreach (postRequestElement($idColumn[0]) as $id => $sel) {
+ // Is id zero?
+ if (!isValidId($id)) {
+ // Then skip this
+ continue;
+ } // END - if
+
// 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],
@@ -2189,10 +2342,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);
@@ -2203,14 +2356,20 @@ function doGenericDeleteEntriesConfirm ($tableName, $columns = array(), $filterF
} // END - foreach
// Run the query
- SQL_QUERY_ESC($sql, array($tableName[0], $idColumn[0], substr($idList, 0, -1)), __FUNCTION__, __LINE__);
+ sqlQueryEscaped($sql,
+ array(
+ $tableName[0],
+ $idColumn[0],
+ convertNullToZero(substr($idList, 0, -1))
+ ), __FUNCTION__, __LINE__);
// Return affected rows
- return SQL_AFFECTEDROWS();
+ return sqlAffectedRows();
}
// Build a special template list
-function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) {
+// @TODO cacheFiles is not yet supported
+function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid'), $content = array()) {
// $tableName and $idColumn must bove be arrays!
if ((!is_array($tableName)) || (count($tableName) != 1)) {
// $tableName is no array
@@ -2227,26 +2386,35 @@ function doGenericListBuilder ($prefix, $listType, $tableName, $columns, $filter
$OUT = '';
// "Walk"Â through all entries
- //* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'listType=