} // 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 . '<strong><a class="you_are_here" href="{%url=modules.php?module=' . $modCheck . '&' . $type . '=' . $search . $linkAdd . '%}">' . getTitleFromMenu($accessLevel, $search, $type, $ADD) . '</a></strong>';
// 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);
- // 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(
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';
}
// Is it a bug report?
if ($isBugReport === TRUE) {
// Then add a reply-to line back to the author (me)
- $mailHeader = 'Reply-To: webmaster@mxchange.org' . chr(10);
+ $mailHeader = 'Reply-To: webmaster@mxchange.org' . PHP_EOL;
} // END - if
// Load all admin email addresses
// 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
}
// List all given rows (callback function from XML)
-function doGenericListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tableName, $columns, $whereColumns, $orderByColumns, $callbackColumns, $extraParameters = array(), $conditions = array()) {
+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
} // END - if
// 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__);
if (!SQL_HASZERONUMS($result)) {
// List all URLs
$OUT = '';
- while ($content = SQL_FETCHARRAY($result)) {
+ while ($row = SQL_FETCHARRAY($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])) {
// Call the callback-function
//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'callbackFunction=' . $callbackName . ',args=<pre>'.print_r($args, TRUE).'</pre>');
// @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);
+ $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 ((is_array($content)) && (count($content) > 0)) {
+ // 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] . '--}');
// Is columnIndex set?
if (!is_null($columnIndex)) {
// Check conditions
- //* DEBUG: */ die('columnIndex=<pre>'.print_r($columnIndex,TRUE).'</pre>'.debug_get_printable_backtrace());
+ //* DEBUG: */ die('column
Name=<pre>'.print_r($columnName,TRUE).'</pre>columnIndex=<pre>'.print_r($columnIndex,TRUE).'</pre>'.debug_get_printable_backtrace());
assert((is_array($columnName)) && (is_string($columnIndex)) && (isset($columnName[$columnIndex])));
// Then use that index "blindly"
$sqlColumns[$key] = SQL_ESCAPE($columnName);
$sqlValues[$key] = SQL_ESCAPE(postRequestElement($columnName));
+ // 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 . '=<pre>'.print_r($columns,true).'</pre>search_array()=<pre>'.print_r(search_array($columns, 'column', $columnName), true).'</pre>');
+ //* 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);
// "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=<pre>'.print_r($entries,TRUE).'</pre>');
+ /
/* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',id=' . $id . ',idColumn[0]=' . $idColumn[0] . ',entries=<pre>'.print_r($entries,TRUE).'</pre>');
// Is entries an array?
if (($key != $idColumn[0]) && (is_array($entries)) && (isset($entries[$id]))) {
//* BUG: */ die($key.'/<pre>'.print_r($search, TRUE).'</pre>=<pre>'.print_r($columns, TRUE).'</pre>');
// 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;
$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);
} // 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 `" . SQL_ESCAPE($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
// Is a user id provided?
//* BUG: */ die('<pre>'.print_r($rawUserId,TRUE).'</pre><pre>'.print_r($userIdColumn,TRUE).'</pre>');
- 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
}
// 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
// Is there one entry?
if (SQL_NUMROWS($result) == 1) {
// Load all data
- $content = SQL_FETCHARRAY($result);
+ $row = SQL_FETCHARRAY($result);
// Filter all data
- foreach ($content as $key => $value) {
+ foreach ($row as $key => $value) {
// Search index
- $idx = searchXmlArray($key, $columns, 'column');
+ $idx = searchXmlArray($key, $columns, 'column');
+
+ // Default name is NULL
+ $name = NULL;
+
+ // Is the name there?
+ if (isset($columns[$idx]['name'])) {
+ // Then use it
+ $name = $columns[$idx]['name'];
+ } // END - if
// Skip any missing entries
if ($idx === FALSE) {
if ($key == $userIdColumn[0]) {
// Add it again as raw id
//* DEBUG: */ reportBug(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]);
- $content[$userIdColumn[0]] = convertZeroToNull($value);
- $content[$userIdColumn[0] . '_raw'] = $content[$userIdColumn[0]];
+ $row[$userIdColumn[0]] = convertZeroToNull($value);
+ $row[$userIdColumn[0] . '_raw'] = $row[$userIdColumn[0]];
} // END - if
// If the key matches the idColumn variable, we need to temporary remember it
} // END - if
// Try to handle call-back functions and/or extra values
- $content[$key] = doHandleExtraValues($filterFunctions, $extraValues, $idx, $content[$key], $userIdColumn, $idx);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'idx=' . $idx . ',row[' . $key . ']=' . $row[$key]);
+ //if ($key == 'forced_campaign_created') die($idx.'=<pre>'.print_r($columns,true).'</pre><pre>'.print_r($extraValues,true).'</pre>');
+ $row[$key] = doHandleExtraValues($filterFunctions, $extraValues, $idx, $row[$key], $userIdColumn, ((!is_null($name)) ? $name : $key), $id);
} // END - foreach
// Then list it
$prefix,
$listType,
$tableName[0]
- ), TRUE, $content
+ ), TRUE, $row
);
} // END - if
SQL_FREERESULT($result);
} // END - foreach
+ // Is there an entry in $content?
+ if ((is_array($content)) && (count($content) > 0)) {
+ // Use generic 'rows'
+ $content['rows'] = $OUT;
+ } else {
+ // Use direct output
+ $content = $OUT;
+ }
+
// Load master template
- loadTemplate(sprintf("%s_%s_%s",
- $prefix,
- $listType,
- $tableName[0]
- ), FALSE, $OUT
+ loadTemplate(
+ sprintf("%s_%s_%s",
+ $prefix,
+ $listType,
+ $tableName[0]
+ ), FALSE, $content
);
}
projects / mailer.git / blobdiff