';
} // END - while
@@ -422,7 +473,7 @@ function addMemberSelectionBox ($def = 0, $add_all = false, $return = false, $no
if ($return === false) {
// Remeber options in constant
$content['form_selection'] = $OUT;
- $content['what'] = getWhat();
+ $content['what'] = '{%pipe,getWhat%}';
// Load template
loadTemplate('admin_form_selection_box', false, $content);
@@ -436,10 +487,10 @@ function addMemberSelectionBox ($def = 0, $add_all = false, $return = false, $no
// @TODO Try to rewrite this to adminAddMenuSelectionBox()
// @DEPRECATED
function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
- $what = "`what` != ''";
- if ($mode == 'action') $what = "(`what`='' OR `what` IS NULL) AND `action` !='login'";
+ $what = "`what` != '' AND `what` IS NOT NULL";
+ if ($mode == 'action') $what = "(`what`='' OR `what` IS NULL) AND `action` != 'login'";
- $result = SQL_QUERY_ESC("SELECT `%s` AS `menu`, `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
+ $result = SQL_QUERY_ESC("SELECT `%s` AS `menu`,`title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
array($mode), __FUNCTION__, __LINE__);
if (!SQL_HASZERONUMS($result)) {
// Load menu as selection
@@ -488,7 +539,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
// Process only formular field but not submit buttons ;)
if ($id != 'ok') {
// Do not save the ok value
- convertSelectionsToTimestamp($postData, $tableData, $id, $skip);
+ convertSelectionsToEpocheTime($postData, $tableData, $id, $skip);
// Shall we process this id? It muss not be empty, of course
if (($skip === false) && (!empty($id)) && ((!isset($GLOBALS['skip_config'][$id]))) || ($tableName != '_config')) {
@@ -541,7 +592,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
$whereStatement
);
} else {
- // Add Line (does only work with auto_increment!
+ // Add Line (does only work with AUTO_INCREMENT!
$keys = array(); $values = array();
foreach ($tableData as $entry) {
// Split up
@@ -551,7 +602,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
} // END - foreach
// Add both in one line
- $keys = implode('`, `', $keys);
+ $keys = implode('`,`', $keys);
$values = implode(', ', $values);
// Generate SQL string
@@ -575,7 +626,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
rebuildCache('config', 'config');
// Settings saved, so display message?
- if ($displayMessage === true) loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+ if ($displayMessage === true) displayMessage('{--SETTINGS_SAVED--}');
// Return affected rows
return $affected;
@@ -592,7 +643,7 @@ function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
// Walk through all files
foreach ($menuArray as $file) {
// Is this a PHP script?
- if ((!isDirectory($file)) && (strpos($file, '' . $type . '-') > -1) && (strpos($file, '.php') > 0)) {
+ if ((!isDirectory($file)) && (isInString('' . $type . '-', $file)) && (isInString('.php', $file))) {
// Then test if the file is readable
$test = sprintf("inc/modules/%s/%s", $menu, $file);
@@ -624,9 +675,9 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
if (($title == '') && (isValidUserId($userid))) {
// Set userid as title
$title = $userid;
- } elseif ($userid == 0) {
+ } elseif (!isValidUserId($userid)) {
// User id zero is invalid
- return '' . $userid . ' ';
+ return '' . makeNullToZero($userid) . ' ';
}
if (($title == '0') && ($what == 'list_refs')) {
@@ -637,7 +688,11 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
$nick = getNickname($userid);
// Is it not empty, use it as title else the userid
- if (!empty($nick)) $title = $nick . '(' . $userid . ')'; else $title = $userid;
+ if (!empty($nick)) {
+ $title = $nick . '(' . $userid . ')';
+ } else {
+ $title = $userid;
+ }
}
// Return link
@@ -647,7 +702,14 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
// Check "logical-area-mode"
function adminGetMenuMode () {
// Set the default menu mode as the mode for all admins
- $mode = getAdminMenu();
+ $mode = 'global';
+
+ // If sql_patches is up-to-date enough, use the configuration
+ if (isExtensionInstalledAndNewer('sql_patches', '0.3.2')) {
+ $mode = getAdminMenu();
+ } // END - if
+
+ // Backup it
$adminMode = $mode;
// Get admin id
@@ -684,7 +746,7 @@ function adminGetMenuMode () {
// Change activation status
function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
- $count = '0'; $newStatus = 'Y';
+ $count = '0';
if ((is_array($IDs)) && (count($IDs) > 0)) {
// "Walk" all through and count them
foreach ($IDs as $id => $selected) {
@@ -695,7 +757,12 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
if (!empty($selected)) {
// Determine new status
$result = SQL_QUERY_ESC("SELECT %s FROM `{?_MYSQL_PREFIX?}_%s` WHERE %s=%s LIMIT 1",
- array($row, $table, $idRow, $id), __FUNCTION__, __LINE__);
+ array(
+ $row,
+ $table,
+ $idRow,
+ $id
+ ), __FUNCTION__, __LINE__);
// Row found?
if (SQL_NUMROWS($result) == 1) {
@@ -703,11 +770,17 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
list($currStatus) = SQL_FETCHROW($result);
// And switch it N<->Y
- if ($currStatus == 'Y') $newStatus = 'N'; else $newStatus = 'Y';
+ $newStatus = convertBooleanToYesNo(!($currStatus == 'Y'));
// Change this status
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s` SET %s='%s' WHERE %s=%s LIMIT 1",
- array($table, $row, $newStatus, $idRow, $id), __FUNCTION__, __LINE__);
+ array(
+ $table,
+ $row,
+ $newStatus,
+ $idRow,
+ $id
+ ), __FUNCTION__, __LINE__);
// Count up affected rows
$count += SQL_AFFECTEDROWS();
@@ -719,15 +792,24 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
} // END - foreach
// Output status
- loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_STATUS_CHANGED'), $count, count($IDs)));
+ displayMessage(sprintf(getMessage('ADMIN_STATUS_CHANGED'), $count, count($IDs)));
} else {
// Nothing selected!
- loadTemplate('admin_settings_saved', false, '{--ADMIN_NOTHING_SELECTED_CHANGE--}');
+ displayMessage('{--ADMIN_NOTHING_SELECTED_CHANGE--}');
}
}
// Send mails for del/edit/lock build modes
-function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $userid = 'userid') {
+function sendAdminBuildMails ($mode, $tableName, $content, $id, $subjectPart = '', $userIdColumn = array('userid')) {
+ // $tableName must be an array
+ if ((!is_array($tableName)) || (count($tableName) != 1)) {
+ // $tableName is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'tableName[]=' . gettype($tableName) . '!=array');
+ } elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
+ // $tableName is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
+ } // END - if
+
// Default subject is the subject part
$subject = $subjectPart;
@@ -738,40 +820,54 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
} // END - if
// Is the raw userid set?
- if (postRequestParameter($userid, $id) > 0) {
+ if (postRequestElement($userIdColumn[0], $id) > 0) {
// Load email template
if (!empty($subjectPart)) {
- $mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content);
+ $mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $tableName[0], $content);
} else {
- $mail = loadEmailTemplate('member_' . $mode . '_' . $table, $content);
+ $mail = loadEmailTemplate('member_' . $mode . '_' . $tableName[0], $content);
}
// Send email out
- sendEmail(postRequestParameter($userid, $id), strtoupper('{--MEMBER_' . $subject . '_' . $table . '_SUBJECT--}'), $mail);
+ sendEmail(postRequestElement($userIdColumn[0], $id), strtoupper('{--MEMBER_' . $subject . '_' . $tableName[0] . '_SUBJECT--}'), $mail);
} // END - if
// Generate subject
- $subject = strtoupper('{--ADMIN_' . $subject . '_' . $table . '_SUBJECT--}');
+ $subject = strtoupper('{--ADMIN_' . $subject . '_' . $tableName[0] . '_SUBJECT--}');
// Send admin notification out
if (!empty($subjectPart)) {
- sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter($userid, $id));
+ sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $tableName[0], $content, postRequestElement($userIdColumn[0], $id));
} else {
- sendAdminNotification($subject, 'admin_' . $mode . '_' . $table, $content, postRequestParameter($userid, $id));
+ sendAdminNotification($subject, 'admin_' . $mode . '_' . $tableName[0], $content, postRequestElement($userIdColumn[0], $id));
}
}
// Build a special template list
-function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $userid = 'userid') {
+function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) {
+ // $tableName and $idColumn must bove be arrays!
+ if ((!is_array($tableName)) || (count($tableName) != 1)) {
+ // $tableName is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'tableName[]=' . gettype($tableName) . '!=array');
+ } elseif (!is_array($idColumn)) {
+ // $idColumn is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+ } elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
+ // $tableName is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
+ }
+
+ // Init row output
$OUT = '';
// "Walk"Â through all entries
- foreach ($IDs as $id => $selected) {
+ //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'listType='.print_r($listType,true).' ,tableName'.print_r($tableName,true).' ,columns='.print_r($columns,true).' ,filterFunctions='.print_r($filterFunctions,true).' ,extraValues='.print_r($extraValues,true).' ,idColumn='.print_r($idColumn,true).' ,userIdColumn='.print_r($userIdColumn,true).' ,rawUserId='.print_r($rawUserId,true).' ');
+ foreach (postRequestElement($idColumn[0]) as $id => $selected) {
// Secure id number
$id = bigintval($id);
// Get result from a given column array and table name
- $result = SQL_RESULT_FROM_ARRAY($table, $columns, $idColumn, $id, __FUNCTION__, __LINE__);
+ $result = SQL_RESULT_FROM_ARRAY($tableName[0], $columns, $idColumn[0], $id, __FUNCTION__, __LINE__);
// Is there one entry?
if (SQL_NUMROWS($result) == 1) {
@@ -781,31 +877,55 @@ function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions,
// Filter all data
foreach ($content as $key => $value) {
// Search index
- $idx = array_search($key, $columns, true);
+ $idx = searchXmlArray($key, $columns, 'column');
+
+ // Skip any missing entries
+ if ($idx === false) {
+ // Skip this one
+ //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'key=' . $key . ' - SKIPPED!');
+ continue;
+ } // END - if
//Â Do we have a userid?
- if ($key == $userIdColumn) {
+ //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]);
+ if ($key == $userIdColumn[0]) {
// Add it again as raw id
- $content[$userIdColumn] = bigintval($value);
- $content[$userIdColumn . '_raw'] = $content[$userIdColumn];
+ //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'key=' . $key . ',userIdColumn=' . $userIdColumn[0]);
+ $content[$userIdColumn[0]] = makeZeroToNull($value);
+ $content[$userIdColumn[0] . '_raw'] = $content[$userIdColumn[0]];
} // END - if
// If the key matches the idColumn variable, we need to temporary remember it
- //* DEBUG: */ debugOutput('key=' . $key . ',idColumn=' . $idColumn . ',value=' . $value);
- if ($key == $idColumn) {
+ //* DEBUG: */ debugOutput('key=' . $key . ',idColumn=' . $idColumn[0] . ',value=' . $value);
+ if ($key == $idColumn[0]) {
// Found, so remember it
$GLOBALS['admin_list_builder_id_value'] = $value;
} // END - if
- // Handle the call in external function
- //* DEBUG: */ debugOutput('key=' . $key . ',fucntion=' . $filterFunctions[$idx] . ',value=' . $value);
- $content[$key] = handleExtraValues($filterFunctions[$idx], $value, $extraValues[$idx]);
+ // Do we have a call-back function and extra-value pair?
+ if ((isset($filterFunctions[$idx])) && (isset($extraValues[$idx]))) {
+ // Handle the call in external function
+ //* DEBUG: */ debugOutput('key=' . $key . ',fucntion=' . $filterFunctions[$idx] . ',value=' . $value);
+ $content[$key] = handleExtraValues(
+ $filterFunctions[$idx],
+ $value,
+ $extraValues[$idx]
+ );
+ } elseif ((isset($columns[$idx]['name'])) && (isset($filterFunctions[$columns[$idx]['name']])) && (isset($extraValues[$columns[$idx]['name']]))) {
+ // Handle the call in external function
+ //* DEBUG: */ debugOutput('key=' . $key . ',fucntion=' . $filterFunctions[$columns[$idx]['name']] . ',value=' . $value);
+ $content[$key] = handleExtraValues(
+ $filterFunctions[$columns[$idx]['name']],
+ $value,
+ $extraValues[$columns[$idx]['name']]
+ );
+ }
} // END - foreach
// Then list it
$OUT .= loadTemplate(sprintf("admin_%s_%s_row",
$listType,
- $table
+ $tableName[0]
), true, $content
);
} // END - if
@@ -817,23 +937,39 @@ function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions,
// Load master template
loadTemplate(sprintf("admin_%s_%s",
$listType,
- $table
+ $tableName[0]
), false, $OUT
);
}
// Change status of "build" list
-function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray, $userid = 'userid') {
+function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray, $rawUserId = array('userid')) {
+ // $tableName must be an array
+ if ((!is_array($tableName)) || (count($tableName) != 1)) {
+ // No tableName specified
+ debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+ } elseif (!is_array($idColumn)) {
+ // $idColumn is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+ } elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
+ // $tableName is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
+ } // END - if
+
// All valid entries? (We hope so here!)
- if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (count($statusArray) > 0)) {
+ if ((count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (count($statusArray) > 0)) {
// "Walk" through all entries
- foreach ($IDs as $id => $sel) {
+ foreach (postRequestElement($idColumn[0]) as $id => $sel) {
// Construct SQL query
- $sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET", SQL_ESCAPE($table));
+ $sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET", SQL_ESCAPE($tableName[0]));
// Load data of entry
$result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
- array($table, $idColumn, $id), __FUNCTION__, __LINE__);
+ array(
+ $tableName[0],
+ $idColumn[0],
+ $id
+ ), __FUNCTION__, __LINE__);
// Fetch the data
$content = SQL_FETCHARRAY($result);
@@ -849,7 +985,7 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
// Does the entry exist?
if ((isset($content[$column])) && (isset($statusInfo[$content[$column]]))) {
// Add these entries for update
- $sql .= sprintf(" %s='%s',", SQL_ESCAPE($column), SQL_ESCAPE($statusInfo[$content[$column]]));
+ $sql .= sprintf(" `%s`='%s',", SQL_ESCAPE($column), SQL_ESCAPE($statusInfo[$content[$column]]));
// Remember status
if ($statusColumn == 'unknown') {
@@ -870,14 +1006,14 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key);
// Skip id, raw userid and 'do_$mode'
- if (!in_array($key, array($idColumn, $userid, ('do_' . $mode)))) {
+ if (!in_array($key, array($idColumn[0], $rawUserId[0], ('do_' . $mode)))) {
// Are there brackets () at the end?
if (substr($entries[$id], -2, 2) == '()') {
// Direct SQL command found
- $sql .= sprintf(" %s=%s,", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
+ $sql .= sprintf(" `%s`=%s,", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
} else {
// Add regular entry
- $sql .= sprintf(" %s='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
+ $sql .= sprintf(" `%s`='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
// Add entry
$content[$key] = $entries[$id];
@@ -890,7 +1026,7 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
// Finish SQL statement
$sql = substr($sql, 0, -1) . sprintf(" WHERE `%s`=%s AND `%s`='%s' LIMIT 1",
- $idColumn,
+ $idColumn[0],
bigintval($id),
$statusColumn,
$oldStatus
@@ -906,30 +1042,45 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
} // END - if
// Send "build mails" out
- sendAdminBuildMails($mode, $table, $content, $id, $statusInfo[$content[$column]]);
+ sendAdminBuildMails($mode, $tableName, $content, $id, $statusInfo[$content[$column]], $userIdColumn);
} // END - foreach
} // END - if
}
// Delete rows by given id numbers
-function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = false, $idColumn = 'id', $userIdColumn = 'userid', $userid = 'userid') {
+function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid')) {
+ // $tableName must be an array
+ if ((!is_array($tableName)) || (count($tableName) != 1)) {
+ // No tableName specified
+ debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+ } elseif (!is_array($idColumn)) {
+ // $idColumn is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+ } elseif (!is_array($userIdColumn)) {
+ // $userIdColumn is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
+ } elseif (!is_array($deleteNow)) {
+ // $deleteNow is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'deleteNow[]=' . gettype($deleteNow) . '!=array');
+ } // END - if
+
// All valid entries? (We hope so here!)
- if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
+ if ((count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
// Shall we delete here or list for deletion?
- if ($deleteNow === true) {
+ if ($deleteNow[0] === true) {
// The base SQL command:
$sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s` IN (%s)";
// Delete them all
$idList = '';
- foreach ($IDs as $id => $sel) {
+ foreach (postRequestElement($idColumn[0]) as $id => $sel) {
// Is there a userid?
- if (isPostRequestParameterSet($userid, $id)) {
+ if (isPostRequestElementSet($rawUserId[0], $id)) {
// Load all data from that id
$result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
array(
- $table,
- $idColumn,
+ $tableName[0],
+ $idColumn[0],
$id
), __FUNCTION__, __LINE__);
@@ -940,7 +1091,7 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFun
SQL_FREERESULT($result);
// Send "build mails" out
- sendAdminBuildMails('delete', $table, $content, $id);
+ sendAdminBuildMails('delete', $tableName, $content, $id, '', $userIdColumn);
} // END - if
// Add id number
@@ -948,48 +1099,65 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFun
} // END - foreach
// Run the query
- SQL_QUERY_ESC($sql, array($table, $idColumn, substr($idList, 0, -1)), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC($sql, array($tableName[0], $idColumn[0], substr($idList, 0, -1)), __FUNCTION__, __LINE__);
// Was this fine?
- if (SQL_AFFECTEDROWS() == count($IDs)) {
+ if (SQL_AFFECTEDROWS() == count(postRequestElement($idColumn[0]))) {
// All deleted
- loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_ENTRIES_REMOVED--}');
+ displayMessage('{--ADMIN_ALL_ENTRIES_REMOVED--}');
} else {
// Some are still there :(
- loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
+ displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count(postRequestElement($idColumn[0]))));
}
} else {
// List for deletion confirmation
- adminListBuilder('delete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ adminListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
}
} // END - if
}
// Edit rows by given id numbers
-function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunctions = array(), $extraValues = array(), $editNow = false, $idColumn = 'id', $userIdColumn = 'userid', $userid = 'userid') {
+function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $editNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid')) {
+ // $tableName must be an array
+ if ((!is_array($tableName)) || (count($tableName) != 1)) {
+ // No tableName specified
+ debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+ } elseif (!is_array($idColumn)) {
+ // $idColumn is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+ } elseif (!is_array($userIdColumn)) {
+ // $userIdColumn is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array');
+ } elseif (!is_array($editNow)) {
+ // $editNow is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'editNow[]=' . gettype($editNow) . '!=array');
+ } // END - if
+
// All valid entries? (We hope so here!)
- if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
+ //* DEBUG: */ debug_report_bug(__FUNCTION__, __LINE__, 'idColumn='.print_r($idColumn,true).' ,tableName'.print_r($tableName,true).' ,columns='.print_r($columns,true).' ,filterFunctions='.print_r($filterFunctions,true).' ,extraValues='.print_r($extraValues,true).' ,editNow='.print_r($editNow,true).' ,userIdColumn='.print_r($userIdColumn,true).' ,rawUserId='.print_r($rawUserId,true).' ');
+ //if ((count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
+ if (true) {
// Shall we change here or list for editing?
- if ($editNow === true) {
+ if ($editNow[0] === true) {
// Change them all
$affected = '0';
- foreach ($IDs as $id => $sel) {
+ foreach (postRequestElement($idColumn[0]) as $id => $sel) {
// Prepare content array (new values)
$content = array();
// Prepare SQL for this row
$sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET",
- SQL_ESCAPE($table)
+ SQL_ESCAPE($tableName[0])
);
foreach (postRequestArray() as $key => $entries) {
// Skip raw userid which is always invalid
- if ($key == $userid) {
+ if ($key == $rawUserId[0]) {
// Continue with next field
continue;
} // END - if
// Is entries an array?
- if (($key != $idColumn) && (is_array($entries)) && (isset($entries[$id]))) {
+ if (($key != $idColumn[0]) && (is_array($entries)) && (isset($entries[$id]))) {
// Add this entry to content
$content[$key] = $entries[$id];
@@ -1004,7 +1172,7 @@ function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunct
SQL_ESCAPE($key),
SQL_ESCAPE($entries[$id])
);
- } elseif (($key != $idColumn) && (!is_array($entries))) {
+ } elseif (($key != $idColumn[0]) && (!is_array($entries))) {
// Add normal entries as well!
$content[$key] = $entries;
}
@@ -1017,7 +1185,7 @@ function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunct
} // END - foreach
// Finish SQL command
- $sql = substr($sql, 0, -1) . " WHERE `" . $idColumn . "`=" . bigintval($id) . " LIMIT 1";
+ $sql = substr($sql, 0, -1) . " WHERE `" . $idColumn[0] . "`=" . bigintval($id) . " LIMIT 1";
// Run this query
SQL_QUERY($sql, __FUNCTION__, __LINE__);
@@ -1027,7 +1195,11 @@ function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunct
// Load all data from that id
$result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
- array($table, $idColumn, $id), __FUNCTION__, __LINE__);
+ array(
+ $tableName[0],
+ $idColumn[0],
+ $id
+ ), __FUNCTION__, __LINE__);
// Fetch the data and merge it into $content
$content = merge_array($content, SQL_FETCHARRAY($result));
@@ -1036,55 +1208,238 @@ function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunct
SQL_FREERESULT($result);
// Send "build mails" out
- sendAdminBuildMails('edit', $table, $content, $id);
+ sendAdminBuildMails('edit', $tableName, $content, $id, '', $userIdColumn);
} // END - foreach
// Was this fine?
- if ($affected == count($IDs)) {
+ if ($affected == count(postRequestElement($idColumn[0]))) {
// All deleted
- loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_ENTRIES_EDITED--}');
+ displayMessage('{--ADMIN_ALL_ENTRIES_EDITED--}');
} else {
// Some are still there :(
- loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs)));
+ displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count(postRequestElement($idColumn[0]))));
}
} else {
// List for editing
- adminListBuilder('edit', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ adminListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
}
- } // END - if
+ } else {
+ // Maybe some invalid parameters
+ debug_report_bug(__FUNCTION__, __LINE__, 'tableName=' . $tableName[0] . ',columns[]=' . gettype($columns) . ',filterFunctions[]=' . gettype($filterFunctions) . ',extraValues[]=' . gettype($extraValues) . ',idColumn=' . $idColumn[0] . ',userIdColumn=' . $userIdColumn[0] . ' - INVALID!');
+ }
}
// Un-/lock rows by given id numbers
-function adminLockEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn='id', $userIdColumn='userid') {
+function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $lockNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid')) {
+ // $tableName must be an array
+ if ((!is_array($tableName)) || (count($tableName) != 1)) {
+ // No tableName specified
+ debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+ } elseif (!is_array($idColumn)) {
+ // $idColumn is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+ } elseif (!is_array($lockNow)) {
+ // $lockNow is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'lockNow[]=' . gettype($lockNow) . '!=array');
+ } // END - if
+
// All valid entries? (We hope so here!)
- if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (($lockNow === false) || (count($statusArray) == 1))) {
+ if ((count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (($lockNow[0] === false) || (count($statusArray) == 1))) {
// Shall we un-/lock here or list for locking?
- if ($lockNow === true) {
+ if ($lockNow[0] === true) {
// Un-/lock entries
- adminBuilderStatusHandler('lock', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
+ adminBuilderStatusHandler('lock', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
} else {
// List for editing
- adminListBuilder('lock', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ adminListBuilder('lock', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
}
} // END - if
}
// Undelete rows by given id numbers
-function adminUndeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $undeleteNow=false, $idColumn='id', $userIdColumn='userid') {
+function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $undeleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid')) {
+ // $tableName must be an array
+ if ((!is_array($tableName)) || (count($tableName) != 1)) {
+ // No tableName specified
+ debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+ } elseif (!is_array($idColumn)) {
+ // $idColumn is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array');
+ } elseif (!is_array($undeleteNow)) {
+ // $undeleteNow is no array
+ debug_report_bug(__FUNCTION__, __LINE__, 'undeleteNow[]=' . gettype($undeleteNow) . '!=array');
+ } // END - if
+
// All valid entries? (We hope so here!)
- if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (($undeleteNow === false) || (count($statusArray) == 1))) {
+ if ((count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (($undeleteNow[0] === false) || (count($statusArray) == 1))) {
// Shall we un-/lock here or list for locking?
- if ($undeleteNow === true) {
+ if ($undeleteNow[0] === true) {
// Undelete entries
- adminBuilderStatusHandler('undelete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
+ adminBuilderStatusHandler('undelete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
} else {
// List for editing
- adminListBuilder('undelete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ adminListBuilder('undelete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
}
} // END - if
}
-// Checks proxy settins by fetching check-updates3.php from www.mxchange.org
+// Adds a given entry to the database
+function adminAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array()) {
+ //* DEBUG: */ die('columns='.print_r($columns,true).' ,filterFunctions='.print_r($filterFunctions,true).' ,extraValues='.print_r($extraValues,true).' ,POST='.print_r($_POST,true).' ');
+ // Verify that tableName and columns are not empty
+ if ((!is_array($tableName)) || (count($tableName) != 1)) {
+ // No tableName specified
+ debug_report_bug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array');
+ } elseif (count($columns) == 0) {
+ // No columns specified
+ debug_report_bug(__FUNCTION__, __LINE__, 'columns is not given. Please fix your XML.');
+ }
+
+ // Init columns and value elements
+ $sqlColumns = array();
+ $sqlValues = array();
+
+ // Add columns and values
+ foreach ($columns as $key => $columnName) {
+ // Copy entry to final arrays
+ $sqlColumns[$key] = $columnName;
+ $sqlValues[$key] = postRequestElement($columnName);
+ //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key='.$key.',columnName='.$columnName.',filterFunctions='.$filterFunctions[$key].',extraValues='.intval(isset($extraValues[$key])).',extraValuesName='.intval(isset($extraValues[$columnName . '_list'])).''.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($callbackFunction, $args);
+ } // END - foreach
+
+ // Load row template
+ $OUT .= loadTemplate(trim($rowTemplate[0]), true, $content);
+ } // END - while
+
+ // Load main template
+ loadTemplate(trim($tableTemplate[0]), false, $OUT);
+ } else {
+ // No URLs in surfbar
+ displayMessage('{--' .$noEntryMessageId[0] . '--}');
+ }
+
+ // Free result
+ SQL_FREERESULT($result);
+}
+
+// Checks proxy settins by fetching check-updates3.php from mxchange.org
function adminTestProxySettings ($settingsArray) {
// Set temporary the new settings
mergeConfig($settingsArray);
@@ -1093,7 +1448,7 @@ function adminTestProxySettings ($settingsArray) {
$content = sendGetRequest('check-updates3.php');
// Is the first line with "200 OK"?
- $valid = (strpos($content[0], '200 OK') !== false);
+ $valid = isInString('200 OK', $content[0]);
// Return result
return $valid;
@@ -1105,12 +1460,12 @@ function sendAdminPasswordResetLink ($email) {
$OUT = '';
//Â Look up administator login
- $result = SQL_QUERY_ESC("SELECT `id`, `login`, `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `email`='%s' LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `id`,`login`,`password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE '%s' REGEXP `email` LIMIT 1",
array($email), __FUNCTION__, __LINE__);
// Is there an account?
if (SQL_HASZERONUMS($result)) {
- // No account found!
+ // No account found
return '{--ADMIN_NO_LOGIN_WITH_EMAIL--}';
} // END - if
@@ -1121,20 +1476,20 @@ function sendAdminPasswordResetLink ($email) {
SQL_FREERESULT($result);
// Generate hash for reset link
- $content['hash'] = generateHash(getUrl() . ':' . $content['id'] . ':' . $content['login'] . ':' . $content['password'], substr($content['password'], 10));
+ $content['hash'] = generateHash(getUrl() . getEncryptSeparator() . $content['id'] . getEncryptSeparator() . $content['login'] . getEncryptSeparator() . $content['password'], substr($content['password'], getSaltLength()));
// Remove some data
unset($content['id']);
unset($content['password']);
// Prepare email
- $mailText = loadEmailTemplate('form_reset_password', $content);
+ $mailText = loadEmailTemplate('admin_reset_password', $content);
// Send it out
- sendEmail($email, '{--ADMIN_RESET_PASS_LINK_SUBJECT--}', $mailText);
+ sendEmail($email, '{--ADMIN_RESET_PASSWORD_LINK_SUBJECT--}', $mailText);
// Prepare output
- return '{--ADMIN_RESET_LINK_SENT--}';
+ return '{--ADMIN_RESET_PASSWORD_LINK_SENT--}';
}
// Validate hash and login for password reset
@@ -1143,7 +1498,7 @@ function adminResetValidateHashLogin ($hash, $login) {
$valid = false;
// Then try to find that user
- $result = SQL_QUERY_ESC("SELECT `id`, `password`, `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `id`,`password`,`email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
array($login), __FUNCTION__, __LINE__);
// Is an account here?
@@ -1152,7 +1507,7 @@ function adminResetValidateHashLogin ($hash, $login) {
$content = SQL_FETCHARRAY($result);
// Generate hash again
- $hashFromData = generateHash(getUrl() . ':' . $content['id'] . ':' . $login . ':' . $content['password'], substr($content['password'], 10));
+ $hashFromData = generateHash(getUrl() . getEncryptSeparator() . $content['id'] . getEncryptSeparator() . $login . getEncryptSeparator() . $content['password'], substr($content['password'], getSaltLength()));
// Does both match?
$valid = ($hash == $hashFromData);
@@ -1170,12 +1525,17 @@ function doResetAdminPassword ($login, $password) {
// Generate hash (we already check for sql_patches in generateHash())
$passHash = generateHash($password);
+ // Prepare fake POST data
+ $postData = array(
+ 'login' => array(getAdminId($login) => $login),
+ 'password' => array(getAdminId($login) => $passHash),
+ );
+
// Update database
- SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `password`='%s' WHERE `login`='%s' LIMIT 1",
- array($passHash, $login), __FUNCTION__, __LINE__);
+ $message = adminsChangeAdminAccount($postData, '', false);
// Run filters
- runFilterChain('post_form_reset_pass', array('login' => $login, 'hash' => $passHash));
+ runFilterChain('post_form_reset_pass', array('login' => $login, 'hash' => $passHash, 'message' => $message));
// Return output
return '{--ADMIN_PASSWORD_RESET_DONE--}';
@@ -1195,14 +1555,11 @@ function adminDeleteTask ($id) {
// Function to update task data
function adminUpdateTaskData ($id, $row, $data) {
- // Should be admin!
+ // Should be admin and valid id
if (!isAdmin()) {
// Not an admin so redirect better
- redirectToUrl('modules.php?module=index');
- } // END - if
-
- // Is the id not set, then we need a backtrace here... :(
- if ($id <= 0) {
+ debug_report_bug(__FUNCTION__, __LINE__, 'id=' . $id . ',row=' . $row . ',data=' . $data . ' - isAdmin()=false');
+ } elseif ($id <= 0) {
// Initiate backtrace
debug_report_bug(__FUNCTION__, __LINE__, sprintf("id is invalid: %s. row=%s, data=%s",
$id,
@@ -1256,7 +1613,7 @@ function adminCreateUserLink ($userid) {
// Generate a "link" for the given admin id (admin_id)
function generateAdminLink ($adminId) {
// No assigned admin is default
- $adminLink = '{--ADMIN_NO_ADMIN_ASSIGNED--} ';
+ $adminLink = '{--ADMIN_NO_ADMIN_ASSIGNED--}';
// Zero? = Not assigned
if (bigintval($adminId) > 0) {
@@ -1271,11 +1628,11 @@ function generateAdminLink ($adminId) {
$adminLink = '' . $login . ' ';
} else {
// Extension not found
- $adminLink = getMaskedMessage('ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED', 'admins');
+ $adminLink = '{%message,ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED=admins%}';
}
} else {
// Maybe deleted?
- $adminLink = '' . getMaskedMessage('ADMIN_ID_404', $adminId) . '
';
+ $adminLink = '{%message,ADMIN_ID_404=' . $adminId . '%}
';
}
} // END - if
@@ -1303,11 +1660,11 @@ function doVerifyExpertSettings () {
// Is he allowed?
if ($expertSettings == 'Y') {
// Okay, does he want to see them?
- if (getAminsExpertWarning() == 'Y') {
+ if (isAdminsExpertWarningEnabled()) {
// Ask for them
if (isFormSent()) {
// Is the element set, then we need to change the admin
- if (isPostRequestParameterSet('expert_settings')) {
+ if (isPostRequestElementSet('expert_settings')) {
// Get it and prepare final post data array
$postData['login'][getCurrentAdminId()] = getCurrentAdminLogin();
$postData['expert_warning'][getCurrentAdminId()] = 'N';
@@ -1316,7 +1673,7 @@ function doVerifyExpertSettings () {
adminsChangeAdminAccount($postData, 'expert_warning');
// Clear form
- unsetPostRequestParameter('ok');
+ unsetPostRequestElement('ok');
} // END - if
// All fine!
@@ -1344,7 +1701,7 @@ function doVerifyExpertSettings () {
// Output message for other status than ask/agreed
if (($return != 'ask') && ($return != 'agreed')) {
// Output message
- loadTemplate('admin_settings_saved', false, '{--ADMIN_EXPERT_SETTINGS_STATUS_' . strtoupper($return) . '--}');
+ displayMessage('{--ADMIN_EXPERT_SETTINGS_STATUS_' . strtoupper($return) . '--}');
} // END - if
// Return status
@@ -1382,7 +1739,7 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
$NAV = '';
for ($page = 1; $page <= $numPages; $page++) {
// Is the page currently selected or shall we generate a link to it?
- if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+ if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
// Is currently selected, so only highlight it
$NAV .= '-';
} else {
@@ -1390,13 +1747,13 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
$NAV .= '';
}
$NAV .= $page;
- if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+ if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
// Is currently selected, so only highlight it
$NAV .= '- ';
} else {
@@ -1404,7 +1761,7 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
$NAV .= '';
}
- // Add seperator if we have not yet reached total pages
+ // Add separator if we have not yet reached total pages
if ($page < $numPages) {
// Add it
$NAV .= '|';
@@ -1431,7 +1788,7 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
// Process menu editing form
function adminProcessMenuEditForm ($type, $subMenu) {
// An action is done...
- foreach (postRequestParameter('sel') as $sel => $menu) {
+ foreach (postRequestElement('sel') as $sel => $menu) {
$AND = "(`what` = '' OR `what` IS NULL)";
$sel = bigintval($sel);
@@ -1440,25 +1797,25 @@ function adminProcessMenuEditForm ($type, $subMenu) {
$AND = "`action`='" . $subMenu . "'";
} // END - if
- switch (postRequestParameter('ok')) {
+ switch (postRequestElement('ok')) {
case 'edit': // Edit menu
- if (postRequestParameter('sel_what', $sel) == '') {
+ if (postRequestElement('sel_what', $sel) == '') {
// Update with 'what'=null
- SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s', `action`='%s', `what`=NULL WHERE ".$AND." AND `id`=%s LIMIT 1",
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s',`action`='%s',`what`=NULL WHERE ".$AND." AND `id`=%s LIMIT 1",
array(
$type,
$menu,
- postRequestParameter('sel_action', $sel),
+ postRequestElement('sel_action', $sel),
$sel
), __FILE__, __LINE__);
} else {
// Update with selected 'what'
- SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s', `action`='%s', `what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s',`action`='%s',`what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
array(
$type,
$menu,
- postRequestParameter('sel_action', $sel),
- postRequestParameter('sel_what', $sel),
+ postRequestElement('sel_action', $sel),
+ postRequestElement('sel_what', $sel),
$sel
), __FILE__, __LINE__);
}
@@ -1470,44 +1827,44 @@ function adminProcessMenuEditForm ($type, $subMenu) {
break;
case 'status': // Change status of menus
- SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
- array($type, postRequestParameter('visible', $sel), postRequestParameter('locked', $sel), $sel), __FILE__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `visible`='%s',`locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+ array($type, postRequestElement('visible', $sel), postRequestElement('locked', $sel), $sel), __FILE__, __LINE__);
break;
default: // Unexpected action
- logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
- loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
+ logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestElement('ok')));
+ displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestElement('ok') . '%}');
break;
} // END - switch
} // END - foreach
// Load template
- loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+ displayMessage('{--SETTINGS_SAVED--}');
}
// Handle weightning
-function doAdminProcessMenuWeightning ($type) {
+function doAdminProcessMenuWeightning ($type, $AND) {
// Are there all required (generalized) GET parameter?
- if ((isGetRequestParameterSet('act')) && (isGetRequestParameterSet('tid')) && (isGetRequestParameterSet('fid'))) {
+ if ((isGetRequestElementSet('act')) && (isGetRequestElementSet('tid')) && (isGetRequestElementSet('fid'))) {
// Init variables
$tid = ''; $fid = '';
// Get ids
- if (isGetRequestParameterSet('w')) {
+ if (isGetRequestElementSet('w')) {
// Sub menus selected
$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
array(
$type,
- getRequestParameter('act'),
- bigintval(getRequestParameter('tid'))
+ getRequestElement('act'),
+ bigintval(getRequestElement('tid'))
), __FILE__, __LINE__);
list($tid) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
array(
$type,
- getRequestParameter('act'),
- bigintval(getRequestParameter('fid'))
+ getRequestElement('act'),
+ bigintval(getRequestElement('fid'))
), __FILE__, __LINE__);
list($fid) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
@@ -1516,14 +1873,14 @@ function doAdminProcessMenuWeightning ($type) {
$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
array(
$type,
- bigintval(getRequestParameter('tid'))
+ bigintval(getRequestElement('tid'))
), __FILE__, __LINE__);
list($tid) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
array(
$type,
- bigintval(getRequestParameter('fid'))
+ bigintval(getRequestElement('fid'))
), __FILE__, __LINE__);
list($fid) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
@@ -1534,13 +1891,13 @@ function doAdminProcessMenuWeightning ($type) {
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
array(
$type,
- bigintval(getRequestParameter('tid')),
+ bigintval(getRequestElement('tid')),
bigintval($fid)
), __FILE__, __LINE__);
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
array(
$type,
- bigintval(getRequestParameter('fid')),
+ bigintval(getRequestElement('fid')),
bigintval($tid)
), __FILE__, __LINE__);
} // END - if