//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):".generatePassString($pass).'('.strlen($pass).")/".$password.'('.strlen($password).")<br />");
// Check if password matches
- if (($ret == 'pass') && ((generatePassString($pass) == $password) || ($pass == $password) || ((strlen($pass) == 32) && (md5($password) == $pass)))) {
+ if (($ret == 'pass') && ((generatePassString($pass) == $password) || ($pass == $password) || ((strlen($pass) == 32) && (md5($password) == $pass))) && (isAdmin())) {
// Passwords matches!
$ret = 'done';
} // END - if
// Default admin action is the overview page
$what = 'overview';
} else {
- // Compile out some chars
- $what = compileCode($what, false, false, false);
+ // Secure it
+ $what = secureString($what);
}
// Get action value
$action = getModeAction(getModule(), $what);
- // Define admin login name and ID number
+ // Define admin login name and id number
$content['login'] = getSession('admin_login');
$content['id'] = getCurrentAdminId();
ORDER BY
`sort` ASC,
`id` DESC", __FUNCTION__, __LINE__);
+
+ // Do we have entries?
if (SQL_NUMROWS($result_main) > 0) {
$OUT = "<div style=\"height:7px\" class=\"seperator\"> </div>\n";
$OUT .= "<ul class=\"admin_menu_main\">\n";
$ACL = true;
}
+ // Filename
+ $inc = sprintf("inc/modules/admin/action-%s.php", $menu);
+
+ // Is the file readable?
+ $readable = isIncludeReadable($inc);
+
if ($ACL === true) {
if ($SUB === false) {
// Insert compiled menu title and description
$OUT .= "<li class=\"admin_menu\">
<div class=\"nobr\"><strong>·</strong> ";
- if (($menu == $action) && (empty($what))) {
- $OUT .= "<strong>";
+ if ($readable === true) {
+ if (($menu == $action) && (empty($what))) {
+ $OUT .= "<strong>";
+ } else {
+ $OUT .= "[<a href=\"{?URL?}/modules.php?module=admin&action=".$menu."\">";
+ }
} else {
- $OUT .= "[<a href=\"{?URL?}/modules.php?module=admin&action=".$menu."\">";
+ $OUT .= "<em style=\"cursor:help\" class=\"admin_note\" title=\"{--MENU_ACTION_404--}\">";
}
$OUT .= $title;
- if (($menu == $action) && (empty($what))) {
- $OUT .= "</strong>";
+ if ($readable === true) {
+ if (($menu == $action) && (empty($what))) {
+ $OUT .= "</strong>";
+ } else {
+ $OUT .= "</a>]";
+ }
} else {
- $OUT .= "</a>]";
+ $OUT .= "</em>";
}
$OUT .= "</div>
}
// Wrapper for $_POST and adminSaveSettings
-function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = 'config=0', $translateComma = array(), $alwaysAdd = false) {
+function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false) {
// Get the array
$postData = postRequestArray();
}
// Save settings to the database
-function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement = 'config=0', $translateComma = array(), $alwaysAdd = false) {
+function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false) {
// Prepare all arrays, variables
$DATA = array();
$skip = false;
// Do not save the ok value
convertSelectionsToTimestamp($postData, $DATA, $id, $skip);
- // Shall we process this ID? It muss not be empty, of course
- if (($skip === false) && (!empty($id))) {
- // Save this entry
- $val = compileCode($val);
-
+ // Shall we process this id? It muss not be empty, of course
+ if (($skip === false) && (!empty($id)) && (!isset($GLOBALS['skip_config'][$id]))) {
// Translate the value? (comma to dot!)
if ((is_array($translateComma)) && (in_array($id, $translateComma))) {
// Then do it here... :)
// Shall we add numbers or strings?
$test = (float)$val;
- if ("".$val."" == ''.$test."") {
+ if ('' . $val . '' == '' . $test . '') {
// Add numbers
$DATA[] = sprintf("`%s`=%s", $id, $test);
} else {
$DATA[] = sprintf("`%s`='%s'", $id, trim($val));
}
+ // Do not add a config entry twice
+ $GLOBALS['skip_config'][$id] = true;
+
// Update current configuration
setConfigEntry($id, $val);
} // END - if
// Generate SQL string
$sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}%s` SET %s WHERE %s LIMIT 1",
- $tableName,
- $DATA_UPDATE,
- $whereStatement
+ $tableName,
+ $DATA_UPDATE,
+ $whereStatement
);
} else {
// Add Line (does only work with auto_increment!
} // END - foreach
// Add both in one line
- $KEYs = implode(', ', $KEYs);
+ $KEYs = implode('`, `', $KEYs);
$values = implode(', ', $values);
// Generate SQL string
- $sql = sprintf("INSERT INTO {?_MYSQL_PREFIX?}%s (%s) VALUES (%s)",
- $tableName,
- $KEYs,
- $values
+ $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}%s` (%s) VALUES (%s)",
+ $tableName,
+ $KEYs,
+ $values
);
}
if ((is_array($IDs)) && (count($IDs) > 0)) {
// "Walk" all through and count them
foreach ($IDs as $id => $selected) {
- // Secure the ID number
+ // Secure the id number
$id = bigintval($id);
// Should always be set... ;-)
// "Walk" through all entries
foreach ($IDs as $id => $selected) {
- // Secure ID number
+ // Secure id number
$id = bigintval($id);
// Get result from a given column array and table name
} // END - if
}
-// Delete rows by given ID numbers
+// Delete rows by given id numbers
function adminDeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $deleteNow=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))) {
} // END - if
}
-// Edit rows by given ID numbers
+// Edit rows by given id numbers
function adminEditEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $editNow=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))) {
} // END - if
}
-// Un-/lock rows by given ID numbers
+// 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))) {
} // END - if
}
-// Undelete rows by given ID numbers
+// 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))) {
// Init output
$OUT = '';
- // Compile out security characters (must be for looking up!)
- $email = compileCode($email);
-
// Look up administator login
$result = SQL_QUERY_ESC("SELECT `id`, `login`, `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `email`='%s' LIMIT 1",
array($email), __FUNCTION__, __LINE__);
// By default nothing validates... ;)
$valid = false;
- // Compile the login for lookup
- $login = compileCode($login);
-
// Then try to find that user
$result = SQL_QUERY_ESC("SELECT `id`, `password`, `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
- array($login), __FUNCTION__, __LINE__);
+ array($login), __FUNCTION__, __LINE__);
// Is an account here?
if (SQL_NUMROWS($result) == 1) {
$content = SQL_FETCHARRAY($result);
// Generate hash again
- $hashFromData = generateHash(getConfig('URL').':'.$content['id'].':'.$login.':'.$content['password'], substr($content['password'], 10));
+ $hashFromData = generateHash(getConfig('URL') . ':' . $content['id'] . ':' . $login . ':' . $content['password'], substr($content['password'], 10));
// Does both match?
$valid = ($hash == $hashFromData);
return '{?URL?}/modules.php?module=admin&what=list_user';
}
+// Generate a "link" for the given admin id (admin_id)
+function generateAdminLink ($adminId) {
+ // No assigned admin is default
+ $adminLink = "<span class=\"admin_note\">{--ADMIN_NO_ADMIN_ASSIGNED--}</span>";
+
+ // Zero? = Not assigned
+ if (bigintval($adminId) > 0) {
+ // Load admin's login
+ $login = getAdminLogin($adminId);
+
+ // Is the login valid?
+ if ($login != '***') {
+ // Is the extension there?
+ if (isExtensionActive('admins')) {
+ // Admin found
+ $adminLink = "<a href=\"".generateEmailLink(getAdminEmail($adminId), 'admins')."\">" . $login."</a>";
+ } else {
+ // Extension not found
+ $adminLink = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'admins');
+ }
+ } else {
+ // Maybe deleted?
+ $adminLink = "<div class=\"admin_note\">".sprintf(getMessage('ADMIN_ID_404'), $adminId)."</div>";
+ }
+ } // END - if
+
+ // Return result
+ return $adminLink;
+}
+
// [EOF]
?>
projects / mailer.git / blobdiff