';
} // END - if
} // END - if
@@ -622,32 +733,47 @@ function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
}
// Creates a user-profile link for the admin. This function can also be used for many other purposes
-function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
- if (($title == '') && (isValidUserId($userid))) {
- // Set userid as title
- $title = $userid;
- } elseif ($userid == 0) {
- // User id zero is invalid
- return '' . $userid . ' ';
- }
+function generateUserProfileLink ($userid, $title = '', $what = '') {
+ // Is there cache?
+ if (!isset($GLOBALS[__FUNCTION__][$userid][$title . '_' . $what])) {
+ // Is title empty and valid userid?
+ if (($title == '') && (isValidId($userid))) {
+ // Set userid as title
+ $title = $userid;
+ } elseif (!isValidId($userid)) {
+ // User id zero is invalid
+ return '' . convertNullToZero($userid) . ' ';
+ }
- if (($title == '0') && ($what == 'list_refs')) {
- // Return title again
- return $title;
- } elseif (isExtensionActive('nickname')) {
- // Get nickname
- $nick = getNickname($userid);
+ // Is what set?
+ if (empty($what)) {
+ // Then get it to 'list_user'
+ $what = 'list_user';
+ } // END - if
- // Is it not empty, use it as title else the userid
- if (!empty($nick)) {
- $title = $nick . '(' . $userid . ')';
- } else {
- $title = $userid;
+ if (($title == '0') && ($what == 'list_refs')) {
+ // Return title again
+ return $title;
+ } elseif (!empty($title)) {
+ // Not empty, so skip next one
+ } elseif (isExtensionActive('nickname')) {
+ // Get nickname
+ $nick = getNickname($userid);
+
+ // Is it not empty, use it as title else the userid
+ if (!empty($nick)) {
+ $title = $nick . '(' . $userid . ')';
+ } else {
+ $title = $userid;
+ }
}
- }
- // Return link
- return '[' . $title . ' ]';
+ // Set it in cache
+ $GLOBALS[__FUNCTION__][$userid][$title . '_' . $what] = '[' . $title . ' ]';
+ } // END - if
+
+ // Return cache
+ return $GLOBALS[__FUNCTION__][$userid][$title . '_' . $what];
}
// Check "logical-area-mode"
@@ -655,7 +781,7 @@ function adminGetMenuMode () {
// Set the default menu mode as the mode for all admins
$mode = 'global';
- // If sql_patches is up-to-date enough, use the configuration
+ // If ext-sql_patches is up-to-date enough, use the configuration
if (isExtensionInstalledAndNewer('sql_patches', '0.3.2')) {
$mode = getAdminMenu();
} // END - if
@@ -676,7 +802,7 @@ function adminGetMenuMode () {
$result = SQL_QUERY_ESC("SELECT `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
array($adminId), __FUNCTION__, __LINE__);
- // Do we have an entry?
+ // Is there an entry?
if (SQL_NUMROWS($result) == 1) {
// Load data
list($adminMode) = SQL_FETCHROW($result);
@@ -750,381 +876,262 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
}
}
-// Send mails for del/edit/lock build modes
-function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $userIdColumn = 'userid') {
- // Default subject is the subject part
- $subject = $subjectPart;
-
- // Is the subject part not set?
- if (empty($subjectPart)) {
- // Then use it from the mode
- $subject = strtoupper($mode);
- } // END - if
-
- // Is the raw userid set?
- if (postRequestParameter($userIdColumn, $id) > 0) {
- // Load email template
- if (!empty($subjectPart)) {
- $mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content);
- } else {
- $mail = loadEmailTemplate('member_' . $mode . '_' . $table, $content);
- }
-
- // Send email out
- sendEmail(postRequestParameter($userIdColumn, $id), strtoupper('{--MEMBER_' . $subject . '_' . $table . '_SUBJECT--}'), $mail);
- } // END - if
-
- // Generate subject
- $subject = strtoupper('{--ADMIN_' . $subject . '_' . $table . '_SUBJECT--}');
-
- // Send admin notification out
- if (!empty($subjectPart)) {
- sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter($userIdColumn, $id));
- } else {
- sendAdminNotification($subject, 'admin_' . $mode . '_' . $table, $content, postRequestParameter($userIdColumn, $id));
- }
-}
-
// Build a special template list
-function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $userid = 'userid') {
- $OUT = '';
-
- // "Walk"Â through all entries
- foreach ($IDs as $id => $selected) {
- // Secure id number
- $id = bigintval($id);
+// @TODO cacheFiles is not yet supported
+function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid'), $content = array()) {
+ // Call inner (general) function
+ doGenericListBuilder('admin', $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content);
+}
- // Get result from a given column array and table name
- $result = SQL_RESULT_FROM_ARRAY($table, $columns, $idColumn, $id, __FUNCTION__, __LINE__);
+// Change status of "build" list
+function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray, $rawUserId = array('userid'), $cacheFiles = array()) {
+ // $tableName must be an array
+ 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 (!is_array($idColumn)) {
+ // $idColumn is no array
+ reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
+ } elseif ((!is_array($userIdColumn)) || (count($userIdColumn) != 1)) {
+ // $tableName is no array
+ reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
+ } // END - if
- // Is there one entry?
- if (SQL_NUMROWS($result) == 1) {
- // Load all data
- $content = SQL_FETCHARRAY($result);
-
- // Filter all data
- foreach ($content as $key => $value) {
- // Search index
- $idx = array_search($key, $columns, true);
-
- //Â Do we have a userid?
- if ($key == $userIdColumn) {
- // Add it again as raw id
- $content[$userIdColumn] = bigintval($value);
- $content[$userIdColumn . '_raw'] = $content[$userIdColumn];
- } // END - if
+ // "Walk" through all entries
+ foreach (postRequestElement($idColumn[0]) as $id => $sel) {
+ // Construct SQL query
+ $sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET", SQL_ESCAPE($tableName[0]));
- // If the key matches the idColumn variable, we need to temporary remember it
- //* DEBUG: */ debugOutput('key=' . $key . ',idColumn=' . $idColumn . ',value=' . $value);
- if ($key == $idColumn) {
- // Found, so remember it
- $GLOBALS['admin_list_builder_id_value'] = $value;
- } // END - if
+ // Load data of entry
+ $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
+ array(
+ $tableName[0],
+ $idColumn[0],
+ $id
+ ), __FUNCTION__, __LINE__);
- // Handle the call in external function
- //* DEBUG: */ debugOutput('key=' . $key . ',fucntion=' . $filterFunctions[$idx] . ',value=' . $value);
- $content[$key] = handleExtraValues(
- $filterFunctions[$idx],
- $value,
- $extraValues[$idx]
- );
- } // END - foreach
-
- // Then list it
- $OUT .= loadTemplate(sprintf("admin_%s_%s_row",
- $listType,
- $table
- ), true, $content
- );
- } // END - if
+ // Fetch the data
+ $content = SQL_FETCHARRAY($result);
// Free the result
SQL_FREERESULT($result);
- } // END - foreach
-
- // Load master template
- loadTemplate(sprintf("admin_%s_%s",
- $listType,
- $table
- ), false, $OUT
- );
-}
-
-// Change status of "build" list
-function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray, $userid = 'userid') {
- // 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)) {
- // "Walk" through all entries
- foreach ($IDs as $id => $sel) {
- // Construct SQL query
- $sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET", SQL_ESCAPE($table));
-
- // Load data of entry
- $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
- array($table, $idColumn, $id), __FUNCTION__, __LINE__);
-
- // Fetch the data
- $content = SQL_FETCHARRAY($result);
-
- // Free the result
- SQL_FREERESULT($result);
- // Add all status entries (e.g. status column last_updated or so)
- $newStatus = 'UNKNOWN';
- $oldStatus = 'UNKNOWN';
- $statusColumn = 'unknown';
- foreach ($statusArray as $column => $statusInfo) {
- // 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]]));
-
- // Remember status
- if ($statusColumn == 'unknown') {
- // Always (!!!) change status column first!
- $oldStatus = $content[$column];
- $newStatus = $statusInfo[$oldStatus];
- $statusColumn = $column;
- } // END - if
- } elseif (isset($content[$column])) {
- // Unfinished!
- debug_report_bug(__FUNCTION__, __LINE__, ':UNFINISHED: id=' . $id . ',column=' . $column . '[' . gettype($statusInfo) . '] = ' . $content[$column]);
- }
- } // END - foreach
-
- // Add other columns as well
- foreach (postRequestArray() as $key => $entries) {
- // Debug message
- logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key);
-
- // Skip id, raw userid and 'do_$mode'
- if (!in_array($key, array($idColumn, $userid, ('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]));
- } else {
- // Add regular entry
- $sql .= sprintf(" `%s`='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
+ // Add all status entries (e.g. status column last_updated or so)
+ $newStatus = 'UNKNOWN';
+ $oldStatus = 'UNKNOWN';
+ $statusColumn = 'unknown';
+ foreach ($statusArray as $column => $statusInfo) {
+ // 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]]));
+
+ // Remember status
+ if ($statusColumn == 'unknown') {
+ // Always (!!!) change status column first!
+ $oldStatus = $content[$column];
+ $newStatus = $statusInfo[$oldStatus];
+ $statusColumn = $column;
+ } // END - if
+ } elseif (isset($content[$column])) {
+ // Unfinished!
+ reportBug(__FUNCTION__, __LINE__, ':UNFINISHED: id=' . $id . ',column=' . $column . '[' . gettype($statusInfo) . '] = ' . $content[$column]);
+ }
+ } // END - foreach
- // Add entry
- $content[$key] = $entries[$id];
- }
+ // Add other columns as well
+ foreach (postRequestArray() as $key => $entries) {
+ // Debug message
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key);
+
+ // Skip id, raw userid and '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]));
} else {
- // Skipped entry
- logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $key);
- }
- } // END - foreach
-
- // Finish SQL statement
- $sql = substr($sql, 0, -1) . sprintf(" WHERE `%s`=%s AND `%s`='%s' LIMIT 1",
- $idColumn,
- bigintval($id),
- $statusColumn,
- $oldStatus
- );
-
- // Run the SQL
- SQL_QUERY($sql, __FUNCTION__, __LINE__);
-
- // Do we have an URL?
- if (isset($content['url'])) {
- // Then add a framekiller test as well
- $content['frametester'] = generateFrametesterUrl($content['url']);
- } // END - if
+ // Add regular entry
+ $sql .= sprintf(" `%s`='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
- // Send "build mails" out
- sendAdminBuildMails($mode, $table, $content, $id, $statusInfo[$content[$column]], $userIdColumn);
+ // Add entry
+ $content[$key] = $entries[$id];
+ }
+ } elseif (isDebugModeEnabled()) {
+ // Skipped entry
+ logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $key);
+ }
} // 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') {
- // All valid entries? (We hope so here!)
- if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
- // Shall we delete here or list for deletion?
- if ($deleteNow === 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) {
- // Is there a userid?
- if (isPostRequestParameterSet($userid, $id)) {
- // 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__);
- // Fetch the data
- $content = SQL_FETCHARRAY($result);
+ // Finish SQL statement
+ $sql = substr($sql, 0, -1) . sprintf(" WHERE `%s`=%s AND `%s`='%s' LIMIT 1",
+ $idColumn[0],
+ bigintval($id),
+ $statusColumn,
+ $oldStatus
+ );
- // Free the result
- SQL_FREERESULT($result);
+ // Run the SQL
+ SQL_QUERY($sql, __FUNCTION__, __LINE__);
- // Send "build mails" out
- sendAdminBuildMails('delete', $table, $content, $id, '', $userIdColumn);
- } // END - if
+ // Send "build mails" out
+ sendGenericBuildMails($mode, $tableName, $content, $id, $statusInfo[$content[$column]], $userIdColumn);
+ } // END - foreach
+}
- // Add id number
- $idList .= $id . ',';
- } // END - foreach
+// Delete rows by given id numbers
+function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $content = array()) {
+ // $tableName must be an array
+ 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 (!is_array($idColumn)) {
+ // $idColumn is no array
+ reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
+ } elseif (!is_array($userIdColumn)) {
+ // $userIdColumn is no array
+ reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
+ } elseif (!is_array($deleteNow)) {
+ // $deleteNow is no array
+ reportBug(__FUNCTION__, __LINE__, 'deleteNow[]=' . gettype($deleteNow) . '!=array: userIdColumn=' . $userIdColumn);
+ } // END - if
- // Run the query
- SQL_QUERY_ESC($sql, array($table, $idColumn, substr($idList, 0, -1)), __FUNCTION__, __LINE__);
+ // Shall we delete here or list for deletion?
+ if ($deleteNow[0] === TRUE) {
+ // Call generic function
+ $affected = doGenericDeleteEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $deleteNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
- // Was this fine?
- if (SQL_AFFECTEDROWS() == count($IDs)) {
- // All deleted
- displayMessage('{--ADMIN_ALL_ENTRIES_REMOVED--}');
- } else {
- // Some are still there :(
- displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
- }
+ // Was this fine?
+ if ($affected == countPostSelection($idColumn[0])) {
+ // All deleted
+ displayMessage('{--ADMIN_ALL_ENTRIES_REMOVED--}');
} else {
- // List for deletion confirmation
- adminListBuilder('delete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ // Some are still there :(
+ displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), countPostSelection($idColumn[0])));
}
- } // END - if
+ } else {
+ // List for deletion confirmation
+ adminListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content);
+ }
}
// Edit rows by given id numbers
-function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunctions = array(), $extraValues = array(), $editNow = false, $idColumn = 'id', $userIdColumn = 'userid', $userid = 'userid') {
- // All valid entries? (We hope so here!)
- if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
- // Shall we change here or list for editing?
- if ($editNow === true) {
- // Change them all
- $affected = '0';
- foreach ($IDs 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)
- );
- foreach (postRequestArray() as $key => $entries) {
- // Skip raw userid which is always invalid
- if ($key == $userid) {
- // Continue with next field
- continue;
- } // END - if
-
- // Is entries an array?
- if (($key != $idColumn) && (is_array($entries)) && (isset($entries[$id]))) {
- // Add this entry to content
- $content[$key] = $entries[$id];
-
- // Send data through the filter function if found
- if ((isset($filterFunctions[$key])) && (isset($extraValues[$key]))) {
- // Filter function set!
- $entries[$id] = handleExtraValues($filterFunctions[$key], $entries[$id], $extraValues[$key]);
- } // END - if
-
- // Then add this value
- $sql .= sprintf(" `%s`='%s',",
- SQL_ESCAPE($key),
- SQL_ESCAPE($entries[$id])
- );
- } elseif (($key != $idColumn) && (!is_array($entries))) {
- // Add normal entries as well!
- $content[$key] = $entries;
- }
-
- // Do we have an URL?
- if ($key == 'url') {
- // Then add a framekiller test as well
- $content['frametester'] = generateFrametesterUrl($content[$key]);
- } // END - if
- } // END - foreach
-
- // Finish SQL command
- $sql = substr($sql, 0, -1) . " WHERE `" . $idColumn . "`=" . bigintval($id) . " LIMIT 1";
-
- // Run this query
- SQL_QUERY($sql, __FUNCTION__, __LINE__);
-
- // Add affected rows
- $affected += SQL_AFFECTEDROWS();
-
- // 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__);
-
- // Fetch the data and merge it into $content
- $content = merge_array($content, SQL_FETCHARRAY($result));
-
- // Free the result
- SQL_FREERESULT($result);
+function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $content = array()) {
+ // $tableName must be an array
+ 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 (!is_array($idColumn)) {
+ // $idColumn is no array
+ reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
+ } elseif (!is_array($userIdColumn)) {
+ // $userIdColumn is no array
+ reportBug(__FUNCTION__, __LINE__, 'userIdColumn[]=' . gettype($userIdColumn) . '!=array: userIdColumn=' . $userIdColumn);
+ } elseif (!is_array($editNow)) {
+ // $editNow is no array
+ reportBug(__FUNCTION__, __LINE__, 'editNow[]=' . gettype($editNow) . '!=array: userIdColumn=' . $userIdColumn);
+ } // END - if
- // Send "build mails" out
- sendAdminBuildMails('edit', $table, $content, $id, '', $userIdColumn);
- } // END - foreach
+ // Shall we change here or list for editing?
+ if ($editNow[0] === TRUE) {
+ // Call generic change method
+ $affected = doGenericEditEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $editNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
- // Was this fine?
- if ($affected == count($IDs)) {
- // All deleted
- displayMessage('{--ADMIN_ALL_ENTRIES_EDITED--}');
- } else {
- // Some are still there :(
- displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs)));
- }
+ // Was this fine?
+ if ($affected == countPostSelection($idColumn[0])) {
+ // All deleted
+ displayMessage('{--ADMIN_ALL_ENTRIES_EDITED--}');
} else {
- // List for editing
- adminListBuilder('edit', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ // Some are still there :(
+ displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, countPostSelection($idColumn[0])));
}
} else {
- // Maybe some invalid parameters
- debug_report_bug(__FUNCTION__, __LINE__, 'IDs[]=' . gettype($IDs) . ',table=' . $table . ',columns[]=' . gettype($columns) . ',filterFunctions[]=' . gettype($filterFunctions) . ',extraValues[]=' . gettype($extraValues) . ',idColumn=' . $idColumn . ',userIdColumn=' . $userIdColumn . ' - INVALID!');
+ // List for editing
+ adminListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content);
}
}
// 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') {
- // 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))) {
- // Shall we un-/lock here or list for locking?
- if ($lockNow === true) {
- // Un-/lock entries
- adminBuilderStatusHandler('lock', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
- } else {
- // List for editing
- adminListBuilder('lock', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
- }
+// @TODO rawUserId/content is not yet supported
+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
+ reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
+ } elseif (!is_array($idColumn)) {
+ // $idColumn is no array
+ reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
+ } elseif (!is_array($lockNow)) {
+ // $lockNow is no array
+ reportBug(__FUNCTION__, __LINE__, 'lockNow[]=' . gettype($lockNow) . '!=array: userIdColumn=' . $userIdColumn);
} // END - if
+
+ // Shall we un-/lock here or list for locking?
+ if ($lockNow[0] === TRUE) {
+ // Un-/lock entries
+ adminBuilderStatusHandler('lock', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
+ } else {
+ // List for editing
+ adminListBuilder('lock', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ }
}
// Undelete rows by given id numbers
-function adminUndeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $undeleteNow=false, $idColumn='id', $userIdColumn='userid') {
- // 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))) {
- // Shall we un-/lock here or list for locking?
- if ($undeleteNow === true) {
- // Undelete entries
- adminBuilderStatusHandler('undelete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
- } else {
- // List for editing
- adminListBuilder('undelete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
- }
+// @TODO rawUserId/cacheFiles/content is not yet supported
+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
+ reportBug(__FUNCTION__, __LINE__, 'tableName is not given. Please fix your XML,tableName[]=' . gettype($tableName) . '!=array: userIdColumn=' . $userIdColumn);
+ } elseif (!is_array($idColumn)) {
+ // $idColumn is no array
+ reportBug(__FUNCTION__, __LINE__, 'idColumn[]=' . gettype($idColumn) . '!=array: userIdColumn=' . $userIdColumn);
+ } elseif (!is_array($undeleteNow)) {
+ // $undeleteNow is no array
+ reportBug(__FUNCTION__, __LINE__, 'undeleteNow[]=' . gettype($undeleteNow) . '!=array: userIdColumn=' . $userIdColumn);
+ } // END - if
+
+ // Shall we un-/lock here or list for locking?
+ if ($undeleteNow[0] === TRUE) {
+ // Undelete entries
+ adminBuilderStatusHandler('undelete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
+ } else {
+ // List for editing
+ adminListBuilder('undelete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ }
+}
+
+// Adds a given entry to the database
+function adminAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $columnIndex = NULL) {
+ // Is the userid set?
+ if (!isPostRequestElementSet('userid')) {
+ // Then set NULL here
+ setPostRequestElement('userid', NULL);
} // END - if
+
+ // Call inner function
+ doGenericAddEntries($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $columnIndex);
+
+ // Entry has been added?
+ if ((!SQL_HASZEROAFFECTED()) && ($GLOBALS['__XML_PARSE_RESULT'] === TRUE)) {
+ // Display success message
+ displayMessage('{--ADMIN_ENTRY_ADDED--}');
+ } else {
+ // Display failed message
+ displayMessage('{--ADMIN_ENTRY_NOT_ADDED--}');
+ }
}
-// Checks proxy settins by fetching check-updates3.php from www.mxchange.org
+// Checks proxy settins by fetching check-updates3.php from mxchange.org
function adminTestProxySettings ($settingsArray) {
// Set temporary the new settings
mergeConfig($settingsArray);
// Now get the test URL
- $content = sendGetRequest('check-updates3.php');
+ $content = sendHttpGetRequest('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;
@@ -1136,7 +1143,7 @@ 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?
@@ -1152,7 +1159,7 @@ function sendAdminPasswordResetLink ($email) {
SQL_FREERESULT($result);
// Generate hash for reset link
- $content['hash'] = generateHash(getUrl() . getEncryptSeperator() . $content['id'] . getEncryptSeperator() . $content['login'] . getEncryptSeperator() . $content['password'], substr($content['password'], getSaltLength()));
+ $content['hash'] = generateHash(getUrl() . getEncryptSeparator() . $content['id'] . getEncryptSeparator() . $content['login'] . getEncryptSeparator() . $content['password'], substr($content['password'], getSaltLength()));
// Remove some data
unset($content['id']);
@@ -1171,7 +1178,7 @@ function sendAdminPasswordResetLink ($email) {
// Validate hash and login for password reset
function adminResetValidateHashLogin ($hash, $login) {
// By default nothing validates... ;)
- $valid = false;
+ $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",
@@ -1183,7 +1190,7 @@ function adminResetValidateHashLogin ($hash, $login) {
$content = SQL_FETCHARRAY($result);
// Generate hash again
- $hashFromData = generateHash(getUrl() . getEncryptSeperator() . $content['id'] . getEncryptSeperator() . $login . getEncryptSeperator() . $content['password'], substr($content['password'], getSaltLength()));
+ $hashFromData = generateHash(getUrl() . getEncryptSeparator() . $content['id'] . getEncryptSeparator() . $login . getEncryptSeparator() . $content['password'], substr($content['password'], getSaltLength()));
// Does both match?
$valid = ($hash == $hashFromData);
@@ -1198,15 +1205,20 @@ function adminResetValidateHashLogin ($hash, $login) {
// Reset the password for the login. Do NOT call this function without calling above function first!
function doResetAdminPassword ($login, $password) {
- // Generate hash (we already check for sql_patches in generateHash())
+ // Generate hash (we already check for ext-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--}';
@@ -1226,16 +1238,13 @@ 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) {
+ reportBug(__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",
+ reportBug(__FUNCTION__, __LINE__, sprintf("id is invalid: %s. row=%s, data=%s",
$id,
$row,
$data
@@ -1251,7 +1260,7 @@ function adminUpdateTaskData ($id, $row, $data) {
), __FUNCTION__, __LINE__);
}
-// Checks wether if the admin menu has entries
+// Checks whether if the admin menu has entries
function ifAdminMenuHasEntries ($action) {
return (
((
@@ -1259,7 +1268,7 @@ function ifAdminMenuHasEntries ($action) {
isset($GLOBALS['admin_menu_has_entries'][$action])
) && (
// And do we have a menu for this action?
- $GLOBALS['admin_menu_has_entries'][$action] === true
+ $GLOBALS['admin_menu_has_entries'][$action] === TRUE
)) || (
// Login has always a menu
$action == 'login'
@@ -1275,7 +1284,7 @@ function setAdminMenuHasEntries ($action, $hasEntries) {
// Creates a link to the user's admin-profile
function adminCreateUserLink ($userid) {
// Is the userid set correctly?
- if (isValidUserId($userid)) {
+ if (isValidId($userid)) {
// Create a link to that profile
return '{%url=modules.php?module=admin&what=list_user&userid=' . bigintval($userid) . '%}';
} // END - if
@@ -1287,10 +1296,10 @@ 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) {
+ if (isValidId($adminId)) {
// Load admin's login
$login = getAdminLogin($adminId);
@@ -1306,7 +1315,7 @@ function generateAdminLink ($adminId) {
}
} else {
// Maybe deleted?
- $adminLink = '{%message,ADMIN_ID_404=' . $adminId . '%}
';
+ $adminLink = '{%message,ADMIN_ID_404=' . $adminId . '%}
';
}
} // END - if
@@ -1336,18 +1345,15 @@ function doVerifyExpertSettings () {
// Okay, does he want to see them?
if (isAdminsExpertWarningEnabled()) {
// Ask for them
- if (isFormSent()) {
+ if (isFormSent('save_expert')) {
// 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';
// Change it in the admin
adminsChangeAdminAccount($postData, 'expert_warning');
-
- // Clear form
- unsetPostRequestParameter('ok');
} // END - if
// All fine!
@@ -1363,6 +1369,13 @@ function doVerifyExpertSettings () {
// Do not display
$return = 'agreed';
}
+
+ // Is a form sent?
+ if ((isFormSent()) && (isPostRequestElementSet('expert_settings'))) {
+ // Clear form
+ unsetPostRequestElement('ok');
+ unsetPostRequestElement('expert_settings');
+ } // END - if
} else {
// Forbidden
$return = 'forbidden';
@@ -1383,14 +1396,14 @@ function doVerifyExpertSettings () {
}
// Generate link to unconfirmed mails for admin
-function generateUnconfirmedAdminLink ($id, $unconfirmed, $type = 'bid') {
+function generateUnconfirmedAdminLink ($id, $unconfirmed, $type) {
// Init output
$OUT = $unconfirmed;
- // Do we have unconfirmed mails?
+ // Is there unconfirmed mails?
if ($unconfirmed > 0) {
// Add link to list_unconfirmed what-file
- $OUT = '{%pipe,translateComma=' . $unconfirmed . '%} ';
+ $OUT = '{%pipe,translateComma=' . $unconfirmed . '%} ';
} // END - if
// Return it
@@ -1406,14 +1419,14 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
} // END - if
$TOP = '';
- if ($show_form === false) {
+ if ($show_form === FALSE) {
$TOP = ' top';
} // END - if
$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 {
@@ -1421,13 +1434,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 {
@@ -1435,7 +1448,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 .= '|';
@@ -1448,9 +1461,9 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
$content['top'] = $TOP;
// Load navigation template
- $OUT = loadTemplate('admin_email_nav_row', true, $content);
+ $OUT = loadTemplate('admin_email_nav_row', TRUE, $content);
- if ($return === true) {
+ if ($return === TRUE) {
// Return generated HTML-Code
return $OUT;
} else {
@@ -1462,7 +1475,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);
@@ -1471,43 +1484,52 @@ function adminProcessMenuEditForm ($type, $subMenu) {
$AND = "`action`='" . $subMenu . "'";
} // END - if
- switch (postRequestParameter('ok')) {
+ switch (postRequestElement('ok')) {
case 'edit': // Edit menu
- if (postRequestParameter('sel_what', $sel) == '') {
+ // Shall we update a menu or sub menu?
+ if (!isGetRequestElementSet('sub')) {
// 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__);
+ ), __FUNCTION__, __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__);
+ ), __FUNCTION__, __LINE__);
}
break;
case 'delete': // Delete menu
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
- array($type, $sel), __FILE__, __LINE__);
+ array(
+ $type,
+ $sel
+ ), __FUNCTION__, __LINE__);
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
+ ), __FUNCTION__, __LINE__);
break;
default: // Unexpected action
- logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
- displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestParameter('ok') . '%}');
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported action %s detected.", postRequestElement('ok')));
+ displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestElement('ok') . '%}');
break;
} // END - switch
} // END - foreach
@@ -1519,27 +1541,27 @@ function adminProcessMenuEditForm ($type, $subMenu) {
// Handle weightning
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'))
- ), __FILE__, __LINE__);
+ getRequestElement('act'),
+ bigintval(getRequestElement('tid'))
+ ), __FUNCTION__, __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'))
- ), __FILE__, __LINE__);
+ getRequestElement('act'),
+ bigintval(getRequestElement('fid'))
+ ), __FUNCTION__, __LINE__);
list($fid) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
} else {
@@ -1547,15 +1569,15 @@ function doAdminProcessMenuWeightning ($type, $AND) {
$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'))
- ), __FILE__, __LINE__);
+ bigintval(getRequestElement('tid'))
+ ), __FUNCTION__, __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'))
- ), __FILE__, __LINE__);
+ bigintval(getRequestElement('fid'))
+ ), __FUNCTION__, __LINE__);
list($fid) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
}
@@ -1565,18 +1587,154 @@ function doAdminProcessMenuWeightning ($type, $AND) {
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__);
+ ), __FUNCTION__, __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__);
+ ), __FUNCTION__, __LINE__);
} // END - if
} // END - if
}
+// Function to register first admin
+function registerFirstAdmin () {
+ // Make sure that no admin is registered
+ assert(!isAdminRegistered());
+
+ // Admin is not registered so we have to inform the user
+ if ((isFormSent('add_first_admin')) && ((!isPostRequestElementSet('admin_login')) || (!isPostRequestElementSet('admin_password1')) || (strlen(postRequestElement('admin_password1')) < getConfig('minium_admin_pass_length')) || (!isPostRequestElementSet('admin_password2')) || (strlen(postRequestElement('admin_password2')) < getConfig('minium_admin_pass_length')) || (postRequestElement('admin_password1') != postRequestElement('admin_password2')))) {
+ setPostRequestElement('add_first_admin', '***');
+ } // END - if
+
+ // Clear error message
+ $errorMessage = '';
+ $ret = 'init';
+
+ // Is form for first admin sent?
+ if ((isFormSent('add_first_admin')) && (postRequestElement('add_first_admin') != '***')) {
+ // Hash the password with the old function because we are here in install mode
+ $hashedPass = md5(postRequestElement('admin_password1'));
+
+ // Kill maybe existing session variables
+ destroyAdminSession();
+
+ // Do registration
+ $ret = addAdminAccount(postRequestElement('admin_login'), $hashedPass, getWebmaster(), 'allow');
+
+ // Check if registration wents fine
+ switch ($ret) {
+ case 'done':
+ // Change ADMIN_REGISTERED entry
+ $done = changeDataInLocalConfigurationFile('ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
+
+ // Was it successfull?
+ if ($done === TRUE) {
+ // Registering is done
+ redirectToUrl('modules.php?module=admin®ister=done');
+ } else {
+ // Registration incomplete
+ $errorMessage = '{--ADMIN_CANNOT_COMPLETE--}';
+
+ // Set this to have our error message displayed
+ setPostRequestElement('add_first_admin', '***');
+ }
+ break;
+
+ case 'failed': // Registration has failed
+ $errorMessage = '{--ADMIN_REGISTER_FAILED--}';
+
+ // Set this to have our error message displayed
+ setPostRequestElement('add_first_admin', '***');
+ break;
+
+ case 'already': // Admin does already exists!
+ $errorMessage = '{--ADMIN_LOGIN_ALREADY_REG--}';
+
+ // Set this to have our error message displayed
+ setPostRequestElement('add_first_admin', '***');
+ break;
+
+ default:
+ // Any other kind will be logged
+ $errorMessage = sprintf("Unknown return code %s from ifAdminLoginDataIsValid().", $ret);
+ logDebugMessage(__FUNCTION__, __LINE__, $errorMessage);
+
+ // Set this to have our error message displayed
+ setPostRequestElement('add_first_admin', '***');
+ break;
+ } // END - switch
+ } // END - if
+
+ // Whas that action okay?
+ if ($ret != 'done') {
+ // Init login name
+ $content['admin_login'] = '';
+ if (isPostRequestElementSet('admin_login')) {
+ $content['admin_login'] = postRequestElement('admin_login');
+ } // END - if
+
+ // Init array elements
+ $content['login_message'] = '';
+ $content['password1_message'] = '';
+ $content['password2_message'] = '';
+ $content['error_message'] = '';
+
+ // Yet-another notice-fix
+ if ((isFormSent('add_first_admin')) && (postRequestElement('add_first_admin') == '***')) {
+ // Init variables
+ $loginMessage = '';
+ $password1Message = '';
+ $password2Message = '';
+
+ // No login entered?
+ if (empty($content['admin_login'])) {
+ $loginMessage = '{--ADMIN_NO_LOGIN--}';
+ } // END - if
+
+ // An error comes back from registration?
+ if ((!empty($ret)) && ($ret != 'init')) {
+ $loginMessage = $errorMessage;
+ } // END - if
+
+ // No password 1 entered or to short?
+ if (!isPostRequestElementSet('admin_password1')) {
+ $password1Message = '{--ADMIN_NO_PASSWORD1--}';
+ } elseif (strlen(postRequestElement('admin_password1')) < getConfig('minium_admin_pass_length')) {
+ $password1Message = '{--ADMIN_SHORT_PASSWORD1--}';
+ }
+
+ // No password 2 entered or to short?
+ if (!isPostRequestElementSet('admin_password2')) {
+ $password2Message = '{--ADMIN_NO_PASSWORD2--}';
+ } elseif (strlen(postRequestElement('admin_password2')) < getConfig('minium_admin_pass_length')) {
+ $password2Message = '{--ADMIN_SHORT_PASSWORD2--}';
+ }
+
+ // Both didn't match?
+ if (postRequestElement('admin_password1') != postRequestElement('admin_password2')) {
+ // No match
+ if (empty($password1Message)) $password1Message = '{--ADMIN_PASSWORD1_MISMATCH--}';
+ if (empty($password2Message)) $password2Message = '{--ADMIN_PASSWORD2_MISMATCH--}';
+ } // END - if
+
+ // Output error messages
+ $content['login_message'] = loadTemplate('admin_login_msg', TRUE, $loginMessage);
+ $content['password1_message'] = loadTemplate('admin_login_msg', TRUE, $password1Message);
+ $content['password2_message'] = loadTemplate('admin_login_msg', TRUE, $password2Message);
+ $content['error_message'] = loadTemplate('admin_login_msg', TRUE, $errorMessage);
+ } // END - if
+
+ // Output message in seperate template
+ displayMessage('{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
+
+ // Load register template
+ loadTemplate('admin_reg_form', FALSE, $content);
+ } // END - if
+}
+
// [EOF]
?>