loadInclude($inc);
} elseif ($GLOBALS['acl_allow'] === false) {
// Access denied
- loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACCESS_DENIED', $what));
+ loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACCESS_DENIED=' . $what . '%}');
} else {
// Include file not found :-(
- loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_404', $action));
+ loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_404=' . $action . '%}');
}
} else {
// Invalid action/what pair found
- loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_INVALID', $action . '/' . $what));
+ loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_INVALID=' . $action . '/' . $what . '%}');
}
// Free memory
if (!isset($GLOBALS[__FUNCTION__][$action][$what])) {
// ACL is always 'allow' when no ext-admins is installed
// @TODO This can be rewritten into a filter
- $GLOBALS[__FUNCTION__][$action][$what] = ((!isExtensionInstalledAndNewer('admins', '0.2.0')) || (adminsCheckAdminAcl($action, $what)));
+ $GLOBALS[__FUNCTION__][$action][$what] = ((!isExtensionInstalledAndNewer('admins', '0.2.0')) || (isAdminsAllowedByAcl($action, $what)));
} // END - if
// Return the cached value
$OUT .= '[<a href="{%url=modules.php?module=admin&action=' . $menu . '%}">';
}
} else {
- $OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_ACTION_404=' . $menu . '}">';
+ $OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_ACTION_404_TITLE=' . $menu . '%}">';
}
$OUT .= $title;
// Do we have entries?
if ((ifAdminMenuHasEntries($menu)) && (!SQL_HASZERONUMS($result_what))) {
$GLOBALS['menu']['description'] = array();
- $GLOBALS['menu']['title'] = array(); $SUB = true;
+ $GLOBALS['menu']['title'] = array();
+ $SUB = true;
$OUT .= '<li class="admin_menu_sub"><ul class="admin_menu_sub">';
// @TODO Rewrite this to $content = SQL_FETCHARRAY()
while (list($what_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
$OUT .= '[<a href="{%url=modules.php?module=admin&what=' . $what_sub . '%}">';
}
} else {
- $OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404=' . $what_sub . '%}">';
+ $OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $what_sub . '%}">';
}
$OUT .= $title_what;
// @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",
array($mode), __FUNCTION__, __LINE__);
// 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')) {
$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
// 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) {
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) {
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();
$adminLink = '<a href="' . generateEmailLink(getAdminEmail($adminId), 'admins') . '" title="{--ADMIN_CONTACT_LINK_TITLE--}">' . $login . '</a>';
} 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 = '<div class="notice">' . getMaskedMessage('ADMIN_ID_404', $adminId) . '</div>';
+ $adminLink = '<div class="notice">{%message,ADMIN_ID_404=' . $adminId . '%}</div>';
}
} // END - if
default: // Unexpected action
logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
- displayMessage(getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
+ displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestParameter('ok') . '%}');
break;
} // END - switch
} // END - foreach
}
// Handle weightning
-function doAdminProcessMenuWeightning ($type) {
+function doAdminProcessMenuWeightning ($type, $AND) {
// Are there all required (generalized) GET parameter?
if ((isGetRequestParameterSet('act')) && (isGetRequestParameterSet('tid')) && (isGetRequestParameterSet('fid'))) {
// Init variables