X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=6824a16c43adc7cafcee3417b50850f3c85e9ac0;hb=77669502ccc2779d32a842f6d523fb68169fadda;hp=69b023ff4c58576c78812acc8180bf803588c20f;hpb=0b4c98232a5c9c5b934a5049dc3c84ad32ab1125;p=mailer.git
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 69b023ff4c..6824a16c43 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -160,8 +160,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) . '';
@@ -483,7 +483,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
@@ -868,10 +868,10 @@ function getCategory ($cid) {
$data['cat'] = '{--_CATEGORY_404--}';
// Is the category id set?
- if ($cid == '0') {
+ if (!isValidId($cid)) {
// No category
$data['cat'] = '{--_CATEGORY_NONE--}';
- } elseif ($cid > 0) {
+ } elseif (isValidId($cid)) {
// Lookup the category in database
$result = SQL_QUERY_ESC('SELECT `cat` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1',
array(bigintval($cid)), __FUNCTION__, __LINE__);
@@ -941,12 +941,12 @@ function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isB
$ret = 'failed';
// Is the userid valid?
- if (isValidUserId($userid)) {
+ if (isValidId($userid)) {
// Remove entry from array
unset($receivers[$key]);
// Is there already a line for this user available?
- if ($statsId > 0) {
+ if (isValidId($statsId)) {
// Default is 'normal' mail
$type = 'NORMAL';
$rowName = 'stats_id';
@@ -1002,7 +1002,7 @@ function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isB
function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatement = 'userid', $countRows = FALSE, $add = '', $mode = '=') {
// Debug message
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'search=' . $search . ',tableName=' . $tableName . ',lookFor=' . $lookFor . ',whereStatement=' . $whereStatement . ',add=' . $add);
- if ((empty($search)) && ($search != '0')) {
+ if ((empty($search)) && (!is_null($search))) {
// Count or sum whole table?
if ($countRows === TRUE) {
// Count whole table
@@ -1023,26 +1023,68 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
}
} elseif (($countRows === TRUE) || ($lookFor == 'userid')) {
// Count rows
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'COUNT!');
- $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'" . $add . ' LIMIT 1',
- array(
- $lookFor,
- $tableName,
- $whereStatement,
- $mode,
- $search
- ), __FUNCTION__, __LINE__);
+ if (is_null($search)) {
+ // Fix mode
+ if ($mode == '=') {
+ $mode = 'IS';
+ } elseif ($mode == '!=') {
+ $mode = 'IS NOT';
+ }
+
+ // Look for NULL/0
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'COUNT-NULL!');
+ $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE (`%s` %s NULL OR `%s`=0)" . $add . ' LIMIT 1',
+ array(
+ $lookFor,
+ $tableName,
+ $whereStatement,
+ $mode,
+ $whereStatement
+ ), __FUNCTION__, __LINE__);
+ } else {
+ // Regular entry
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'COUNT!');
+ $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'" . $add . ' LIMIT 1',
+ array(
+ $lookFor,
+ $tableName,
+ $whereStatement,
+ $mode,
+ $search
+ ), __FUNCTION__, __LINE__);
+ }
} else {
- // Add all rows
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SUM!');
- $result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'" . $add . ' LIMIT 1',
- array(
- $lookFor,
- $tableName,
- $whereStatement,
- $mode,
- $search
- ), __FUNCTION__, __LINE__);
+ // Sum all rows
+ if (is_null($search)) {
+ // Fix mode
+ if ($mode == '=') {
+ $mode = 'IS';
+ } elseif ($mode == '!=') {
+ $mode = 'IS NOT';
+ }
+
+ // Look for NULL/0
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SUM-NULL!');
+ $result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE (`%s` %s NULL OR `%s`=0)" . $add . ' LIMIT 1',
+ array(
+ $lookFor,
+ $tableName,
+ $whereStatement,
+ $mode,
+ $whereStatement
+ ), __FUNCTION__, __LINE__);
+ } else {
+ // Regular entry
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SUM!');
+ $result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`%s'%s'" . $add . ' LIMIT 1',
+ array(
+ $lookFor,
+ $tableName,
+ $whereStatement,
+ $mode,
+ $search
+ ), __FUNCTION__, __LINE__);
+ }
}
// Load row
@@ -1055,7 +1097,7 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
if ((empty($data['res'])) && ($lookFor != 'counter') && ($lookFor != 'id') && ($lookFor != 'userid') && ($lookFor != 'rallye_id')) {
// Float number
$data['res'] = '0.00000';
- } elseif (''.$data['res'].'' == '') {
+ } elseif ('' . $data['res'] . '' == '') {
// Fix empty result
$data['res'] = '0';
}
@@ -1259,7 +1301,7 @@ function getAdminDefaultAcl ($adminId) {
// Is ext-sql_patches there and was it found in cache?
if (!isExtensionActive('sql_patches')) {
// Not found, which is bad, so we need to allow all
- $data['default_acl'] = 'allow';
+ $data['default_acl'] = 'allow';
} elseif (isset($GLOBALS['cache_array']['admin']['default_acl'][$adminId])) {
// Use cache
$data['default_acl'] = $GLOBALS['cache_array']['admin']['default_acl'][$adminId];
@@ -1296,7 +1338,7 @@ function getAdminMenuMode ($adminId) {
// Is ext-sql_patches there and was it found in cache?
if (!isExtensionActive('sql_patches')) {
// Not found, which is bad, so we need to allow all
- $data['la_mode'] = 'global';
+ $data['la_mode'] = 'global';
} elseif (isset($GLOBALS['cache_array']['admin']['la_mode'][$adminId])) {
// Use cache
$data['la_mode'] = $GLOBALS['cache_array']['admin']['la_mode'][$adminId];
@@ -1429,15 +1471,15 @@ function deleteUserAccount ($userid, $reason) {
// Search for the points and user data
$result = SQL_QUERY_ESC("SELECT
- (SUM(p.`points`) - d.`used_points`) AS `points`
+ (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__);
@@ -1718,25 +1760,35 @@ 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'";
+ $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`.`html`='Y'";
} // END - if
// Run query
- $result = SQL_QUERY_ESC("SELECT d.`userid` FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$extraColumns." WHERE d.`status`='CONFIRMED' ".$addWhere." ORDER BY d.`{?order_select?}` {?order_mode?} LIMIT %s",
+ $result = SQL_QUERY_ESC("SELECT
+ `d`.`userid`
+FROM
+ `{?_MYSQL_PREFIX?}_user_data` AS `d`
+ " . $extraColumns . "
+WHERE
+ `d`.`status`='CONFIRMED'
+ " . $addWhere . "
+ORDER BY
+ `d`.`{?order_select?}` {?order_mode?}
+LIMIT %s",
array(
$receiver
), __FUNCTION__, __LINE__);
@@ -1773,7 +1825,7 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
// 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
+ // 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
@@ -1859,8 +1911,8 @@ 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
@@ -1876,76 +1928,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 (count($columns) == 0) {
+ // No columns specified
+ reportBug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML,tableTemplate=' . $tableTemplate . ',rowTemplate=' . $rowTemplate . ',tableName[0]=' . $tableName[0]);
+ }
- // 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);
@@ -2054,7 +2077,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
$search = key(search_array($columns, 'column', $columnName));
// Try to handle call-back functions and/or extra values on the list
- //* DEBUG: */ outputHtml($key . '/' . $columnName . '='.print_r($columns,true).'
search_array()='.print_r(search_array($columns, 'column', $columnName), true).'
');
+ //* 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
@@ -2276,7 +2299,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
@@ -2419,10 +2442,11 @@ 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
);
}