X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=ebf2b0e3caba251d4c141eed40166ac957c60b57;hb=7fabfadce30a7bea7ce3ad1f1e2e7e5e616f2669;hp=3d31335d5fe1d2004a7b756dac2903e58e17208a;hpb=52e8a0635bd0b7c653845685c55e4e5f251375fe;p=mailer.git diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 3d31335d5f..0d06e5fbfd 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -10,9 +10,14 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Fuer die Administration benoetigte Funktionen * * -------------------------------------------------------------------- * - * * + * $Revision:: $ * + * $Date:: $ * + * $Tag:: 0.2.1-FINAL $ * + * $Author:: $ * + * Needs to be in all Files and every File needs "svn propset * + * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * - * Copyright (c) 2003 - 2008 by Roland Haeder * + * Copyright (c) 2003 - 2009 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -32,667 +37,676 @@ ************************************************************************/ // Some security stuff... -if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) -{ - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; - require($INC); -} - -// -function REGISTER_ADMIN ($user, $md5) -{ - $ret = "failed"; - $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1", - array($user), __FILE__, __LINE__); - if (SQL_NUMROWS($result) == 0) - { +if (!defined('__SECURITY')) { + die(); +} // END - if + +// Register an administrator account +function addAdminAccount ($user, $md5, $email) { + // Login does already exist + $ret = 'already'; + + // Lookup the admin + $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1", + array($user), __FUNCTION__, __LINE__); + + // Is the entry there? + if (SQL_NUMROWS($result) == 0) { // Ok, let's create the admin login - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins (login, password, email) VALUES('%s', '%s', '".WEBMASTER."')", - array($user, $md5), __FILE__, __LINE__); - $ret = "done"; - } - else - { - // Free memory - SQL_FREERESULT($result); + SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (login, password, email) VALUES ('%s', '%s', '%s')", + array($user, $md5, $email), __FUNCTION__, __LINE__); + $ret = 'done'; + } // END - if - // Login does already exist - $ret = "already"; - } + // Free memory + SQL_FREERESULT($result); + + // Return result return $ret; } + // Only be executed on login procedure! -function CHECK_ADMIN_LOGIN ($admin_login, $password) -{ - global $cacheArray, $_CONFIG, $cacheInstance; - $ret = "404"; $pass = ""; - if (!empty($cacheArray['admins']['aid'][$admin_login])) - { +function ifAdminLoginDataIsValid ($admin, $password) { + // By default no admin is found + $ret = '404'; + + // Get admin id + $adminId = getAdminId($admin); + + // Init array with admin id by default + $data = array('admin_id' => $adminId); + + // Is the cache valid? + if (isAdminHashSet($admin)) { // Get password from cache - $pass = $cacheArray['admins']['password'][$admin_login]; - $ret = "pass"; - $_CONFIG['cache_hits']++; - } - else - { + $data['password'] = getAdminHash($admin); + $ret = 'pass'; + incrementStatsEntry('cache_hits'); + + // Include more admins data? + if ((isExtensionInstalledAndNewer('admins', '0.7.2')) && (isset($GLOBALS['cache_array']['admin']['login_failures'][$adminId]))) { + // Load them here + $data['login_failures'] = $GLOBALS['cache_array']['admin']['login_failures'][$adminId]; + $data['last_failure'] = $GLOBALS['cache_array']['admin']['last_failure'][$adminId]; + } // END - if + } elseif (!isExtensionActive('cache')) { + // Add extra data via filter now + $add = runFilterChain('sql_admin_extra_data'); + // Get password from DB - $result = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1", - array($admin_login), __FILE__, __LINE__); - if (SQL_NUMROWS($result) == 1) - { - $ret = "pass"; - list($pass) = SQL_FETCHROW($result); - SQL_FREERESULT($result); - } + $result = SQL_QUERY_ESC("SELECT `password`" . $add . " FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1", + array($adminId), __FUNCTION__, __LINE__); + + // Entry found? + if (SQL_NUMROWS($result) == 1) { + // Login password found + $ret = 'pass'; + + // Fetch data + $data = SQL_FETCHARRAY($result); + } // END - if + + // Free result + SQL_FREERESULT($result); } - //* DEBUG: */ echo "*".$pass."/".$password."/".$ret."
"; - if ((strlen($pass) == 32) && ($pass == md5($password))) - { + //* DEBUG: */ outputHtml("*".$data['password'].'/'.md5($password).'/'.$ret."
"); + if ((isset($data['password'])) && (strlen($data['password']) == 32) && ($data['password'] == md5($password))) { // Generate new hash - $pass = generateHash($password); - if (($ret == "pass") && (GET_EXT_VERSION("sql_patches") < "0.3.6")) $ret = "done"; - } - elseif ((GET_EXT_VERSION("sql_patches") < "0.3.6") || (GET_EXT_VERSION("sql_patches") == "")) - { + $data['password'] = generateHash($password); + + // Is the sql_patches not installed, than we cannot have a valid hashed password here! + if (($ret == 'pass') && ((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionInstalled('sql_patches')))) $ret = 'done'; + } elseif ((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionInstalled('sql_patches'))) { // Old hashing way return $ret; + } elseif (!isset($data['password'])) { + // Password not found, so no valid login! + return $ret; } // Generate salt of password - define('__SALT', substr($pass, 0, -40)); - $salt = __SALT; + $salt = substr($data['password'], 0, -40); // Check if password is same - if (($ret == "pass") && ($pass == generateHash($password, $salt)) && (!empty($salt))) - { - // Update password - $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s' WHERE login='%s' LIMIT 1", - array($pass, $admin_login), __FILE__, __LINE__); - - // Shall I remove the cache file? - if ((EXT_IS_ACTIVE("cache")) && ($cacheInstance != false)) - { - if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy(); + //* DEBUG: */ outputHtml("*".$ret.','.$data['password'].','.$password.','.$salt."*
"); + if (($ret == 'pass') && ($data['password'] == generateHash($password, $salt)) && ((!empty($salt))) || ($data['password'] == $password)) { + // Re-hash the plain passord with new random salt + $data['password'] = generateHash($password); + + // Do we have 0.7.0 of admins or later? + // Remmeber login failures if available + if ((isExtensionInstalledAndNewer('admins', '0.7.2')) && (isset($data['login_failures']))) { + // Store it in session + setSession('mxchange_admin_failures', $data['login_failures']); + setSession('mxchange_admin_last_fail', $data['last_failure']); + + // Update password and reset login failures + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `password`='%s',`login_failures`=0,`last_failure`='0000-00-00 00:00:00' WHERE `id`=%s LIMIT 1", + array($data['password'], $adminId), __FUNCTION__, __LINE__); + } else { + // Update password + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `password`='%s' WHERE `id`=%s LIMIT 1", + array($data['password'], $adminId), __FUNCTION__, __LINE__); } - // Password matches! - $ret = "done"; - } - elseif ((empty($salt)) && ($ret == "pass")) - { + // Rebuild cache + rebuildCacheFile('admin', 'admin'); + + // Login has failed by default... ;-) + $ret = 'failed1'; + + // Password matches so login here + if (doAdminLogin($admin, $data['password'])) { + // All done now + $ret = 'done'; + } // END - if + } elseif ((empty($salt)) && ($ret == 'pass')) { // Something bad went wrong - $ret = "failed"; + $ret = 'failed_salt'; + } elseif ($ret == 'done') { + // Try to login here if we have the old hashing way (sql_patches not installed?) + if (!doAdminLogin($admin, $data['password'])) { + // Something went wrong + $ret = 'failed2'; + } // END - if } + + // Count login failure if admins extension version is 0.7.0+ + if (($ret == 'pass') && (getExtensionVersion('admins') >= '0.7.0')) { + // Update counter + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins` SET login_failures=login_failures+1,last_failure=NOW() WHERE `id`=%s LIMIT 1", + array($adminId), __FUNCTION__, __LINE__); + + // Rebuild cache + rebuildCacheFile('admin', 'admin'); + } // END - if + + // Return the result + //* DEBUG: */ die("RETURN=".$ret); return $ret; } + +// Try to login the admin by setting some session/cookie variables +function doAdminLogin ($adminLogin, $passHash) { + // Reset failure counter on matching admins version + if ((isExtensionInstalledAndNewer('admins', '0.7.0')) && ((isExtensionOlder('sql_patches', '0.3.6')) || (!isExtensionInstalled('sql_patches')))) { + // Reset counter on out-dated sql_patches version + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `login_failures`=0, `last_failure`='0000-00-00 00:00:00' WHERE `login`='%s' LIMIT 1", + array($adminLogin), __FUNCTION__, __LINE__); + + // Rebuild cache + rebuildCacheFile('admin', 'admin'); + } // END - if + + // Now set all session variables and return the result + return (( + setSession('admin_md5', generatePassString($passHash)) + ) && ( + setSession('admin_login', $adminLogin) + ) && ( + setSession('admin_last', time()) + ) && ( + setSession('admin_to', bigintval(postRequestElement('timeout'))) + )); +} + // Only be executed on cookie checking -function CHECK_ADMIN_COOKIES ($admin_login, $password) { - global $cacheArray, $_CONFIG; - $ret = "404"; $pass = ""; - if (!empty($cacheArray['admins']['aid'][$admin_login])) { - // Get password from cache - $pass = $cacheArray['admins']['password'][$admin_login]; - $ret = "pass"; - $_CONFIG['cache_hits']++; - } else { - // Get password from DB - $result = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1", - array($admin_login), __FILE__, __LINE__); - if (SQL_NUMROWS($result) == 1) { - $ret = "pass"; - list($pass) = SQL_FETCHROW($result); - SQL_FREERESULT($result); - } - } +function ifAdminCookiesAreValid ($admin, $password) { + // By default no admin cookies are found + $ret = '404'; + $pass = ''; + + // Get hash + $pass = getAdminHash($admin); + if ($pass != '-1') $ret = 'pass'; - //* DEBUG: */ echo "*".$pass."/".$password."
"; + //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):".generatePassString($pass).'('.strlen($pass).")/".$password.'('.strlen($password).")
"); // Check if password matches - if (($ret == "pass") && ((generatePassString($pass) == $password) || ($pass == $password))) { + if (($ret == 'pass') && ((generatePassString($pass) == $password) || ($pass == $password) || ((strlen($pass) == 32) && (md5($password) == $pass)))) { // Passwords matches! - $ret = "done"; - } + $ret = 'done'; + } // END - if // Return result return $ret; } -// -function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) -{ - $done = false; $seek++; $found = false; - if (file_exists($file)) - { - $search = "CFG: ".$comment; - $tmp = $file.".tmp"; - $fp = fopen($file, 'r') or OUTPUT_HTML("READ: ".$file."
"); - if ($fp) - { - $fp_tmp = fopen($tmp, 'w') or OUTPUT_HTML("WRITE: ".$tmp."
"); - if ($fp_tmp) - { - while (! feof($fp)) - { - $line = fgets ($fp, 1024); - if (strpos($line, $search) > -1) { $next = 0; $found = true; } - if ($next > -1) - { - if ($next == $seek) - { - $next = -1; - $line = $prefix . $DATA . $suffix."\n"; - } - else - { - $next++; - } - } - fputs($fp_tmp, $line); - } - fclose($fp_tmp); - // Finished writing tmp file - $done = true; - } - fclose($fp); - if (($done) && ($found)) - { - // Copy back tmp file and delete tmp :-) - @copy($tmp, $file); - @unlink($tmp); - define ('_FATAL', false); - } - elseif (!$found) - { - OUTPUT_HTML("CHANGE: 404!"); - define ('_FATAL', true); - } - else - { - OUTPUT_HTML("TMP: UNDONE!"); - define ('_FATAL', true); - } - } - } - else - { - OUTPUT_HTML("404: ".$file."
"); - } -} -// -function ADMIN_DO_ACTION($wht) -{ - global $menuDesription, $menuTitle, $_CONFIG, $cacheArray, $link, $DATA; - //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*
\n"; - if (EXT_IS_ACTIVE("cache")) - { - // Include cache instance - global $cacheInstance; - } + +// Do an admin action +function doAdminAction ($what) { + //* DEBUG: */ outputHtml(__LINE__."*".$what.'/'.getModule().'/'.getAction().'/'.getWhat()."*
"); // Remove any spaces from variable - if (empty($wht)) - { + if (empty($what)) { // Default admin action is the overview page - $wht = "overview"; - } - else - { + $what = 'overview'; + } else { // Compile out some chars - $wht = COMPILE_CODE($wht, false, false, false); + $what = compileCode($what, false, false, false); } // Get action value - $act = GET_ACTION($GLOBALS['module'], $wht); + $action = getModeAction(getModule(), $what); // Define admin login name and ID number - define('__ADMIN_LOGIN', SQL_ESCAPE($_SESSION['admin_login'])); - define('__ADMIN_ID' , GET_ADMIN_ID($_SESSION['admin_login'])); + $content['login'] = getSession('admin_login'); + $content['id'] = getCurrentAdminId(); // Preload templates - if (EXT_IS_ACTIVE("admins")) { - define('__ADMIN_WELCOME', LOAD_TEMPLATE("admin_welcome_admins", true)); + if (isExtensionActive('admins')) { + $content['welcome'] = loadTemplate('admin_welcome_admins', true, $content); } else { - define('__ADMIN_WELCOME', LOAD_TEMPLATE("admin_welcome", true)); + $content['welcome'] = loadTemplate('admin_welcome', true, $content); } - define('__ADMIN_FOOTER' , LOAD_TEMPLATE("admin_footer" , true)); - define('__ADMIN_MENU' , ADD_ADMIN_MENU($act, $wht, true)); + $content['footer'] = loadTemplate('admin_footer' , true, $content); + $content['menu'] = addAdminMenu($action, $what, true); // Tableset header - LOAD_TEMPLATE("admin_main_header"); + loadTemplate('admin_main_header', false, $content); // Check if action/what pair is valid - $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admin_menu -WHERE action='%s' AND ((what='%s' AND what != 'overview') OR (what='' AND '%s'='overview')) -LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__); - if (SQL_NUMROWS($result) == 1) - { - // Free memory - SQL_FREERESULT($result); - + $result_action = SQL_QUERY_ESC("SELECT + `id` +FROM + `{?_MYSQL_PREFIX?}_admin_menu` +WHERE + `action`='%s' AND + ( + ( + `what`='%s' AND `what` != 'overview' + ) OR ( + ( + `what`='' OR `what` IS NULL + ) AND ( + '%s'='overview' + ) + ) + ) +LIMIT 1", array($action, $what, $what), __FUNCTION__, __LINE__); + if (SQL_NUMROWS($result_action) == 1) { // Is valid but does the inlcude file exists? - $INC = sprintf(PATH."inc/modules/admin/action-%s.php", $act); - if ((file_exists($INC)) && (is_readable($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) - { + $inc = sprintf("inc/modules/admin/action-%s.php", $action); + if ((isIncludeReadable($inc)) && (isMenuActionValid('admin', $action, $what)) && ($GLOBALS['acl_allow'] === true)) { // Ok, we finally load the admin action module - include($INC); - } - elseif (__ACL_ALLOW == false) - { + loadInclude($inc); + } elseif ($GLOBALS['acl_allow'] === false) { // Access denied - LOAD_TEMPLATE("admin_menu_failed", false, ADMINS_ACCESS_DENIED); - ADD_FATAL(ADMINS_ACCESS_DENIED); - } - else - { + loadTemplate('admin_menu_failed', false, sprintf(getMessage('ADMIN_ACCESS_DENIED'), $what)); + } else { // Include file not found! :-( - LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_404_ACTION); - ADD_FATAL(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2); + loadTemplate('admin_menu_failed', false, sprintf(getMessage('ADMIN_ACTION_404'), $action)); } } else { // Invalid action/what pair found! - LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_INVALID_ACTION); - ADD_FATAL(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2); + loadTemplate('admin_menu_failed', false, sprintf(getMessage('ADMIN_ACTION_INVALID'), $action.'/'.$what)); } + // Free memory + SQL_FREERESULT($result_action); + // Tableset footer - LOAD_TEMPLATE("admin_main_footer"); + loadTemplate('admin_main_footer', false, $content); } -// -function ADD_ADMIN_MENU($act, $wht,$return=false) -{ - global $menuDesription, $menuTitle, $link; + +// Adds an admin menu +function addAdminMenu ($action, $what, $return=false) { + // Init variables $SUB = false; + $OUT = ''; // Menu descriptions - $menuDesription = array(); - $menuTitle = array(); + $GLOBALS['menu']['description'] = array(); + $GLOBALS['menu']['title'] = array(); // Build main menu - $result_main = SQL_QUERY("SELECT action, title, descr FROM "._MYSQL_PREFIX."_admin_menu WHERE what='' ORDER BY sort, id DESC", __FILE__, __LINE__); - $OUT = ""; - if (SQL_NUMROWS($result_main) > 0) - { - $OUT = " -\n"; - while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) - { - if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) - { - $ACL = ADMINS_CHECK_ACL($menu, ""); - } - else - { - // ACL is "allow"... hmmm + $result_main = SQL_QUERY("SELECT + `action`, `title`, `descr` +FROM + `{?_MYSQL_PREFIX?}_admin_menu` +WHERE + (`what`='' OR `what` IS NULL) +ORDER BY + `sort` ASC, + `id` DESC", __FUNCTION__, __LINE__); + if (SQL_NUMROWS($result_main) > 0) { + $OUT = "
 
\n"; + $OUT .= " - -\n"; - $result_what = SQL_QUERY_ESC("SELECT what, title, descr FROM "._MYSQL_PREFIX."_admin_menu WHERE action='%s' AND what != '' ORDER BY sort, id DESC", - array($menu), __FILE__, __LINE__); - if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu)) - { - $menuDesription = array(); - $menuTitle = array(); $SUB = true; - $OUT .= " - - -\n"; - } - $OUT .= "\n"; - } - } + $OUT .= " +\n"; + } // END - if + + $OUT .= "
  •  
    • \n"; + } // END - if + } // END - while // Free memory SQL_FREERESULT($result_main); - $OUT .= "
     
    -  · "; - if (($menu == $act) && (empty($wht))) - { - $OUT .= ""; - } - else - { - $OUT .= "[ "; + $OUT .= "
  • +
    · "; + + if (($menu == $action) && (empty($what))) { + $OUT .= ""; + } else { + $OUT .= "["; } + $OUT .= $title; - if (($menu == $act) && (empty($wht))) - { - $OUT .= ""; - } - else - { - $OUT .= " ]"; + + if (($menu == $action) && (empty($what))) { + $OUT .= ""; + } else { + $OUT .= "]"; } - $OUT .= "
    •   - \n"; - while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) - { - // Filename - $INC = sprintf(PATH."inc/modules/admin/what-%s.php", $wht_sub); - if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) - { - $ACL = ADMINS_CHECK_ACL("", $wht_sub); - } - else - { - // ACL is "allow"... hmmm + + $OUT .= " +\n"; + + // Check for menu entries + $result_what = SQL_QUERY_ESC("SELECT + `what`, `title`, `descr` +FROM + `{?_MYSQL_PREFIX?}_admin_menu` +WHERE + `action`='%s' AND + `what` != '' AND + `what` IS NOT NULL +ORDER BY + `sort` ASC, + `id` DESC", + array($menu), __FUNCTION__, __LINE__); + + // Remember the count for later checks + setAdminMenuHasEntries($menu, ((SQL_NUMROWS($result_what) > 0) && ($action == $menu))); + + // Do we have entries? + if ((ifAdminMenuHasEntries($menu)) && (SQL_NUMROWS($result_what) > 0)) { + $GLOBALS['menu']['description'] = array(); + $GLOBALS['menu']['title'] = array(); $SUB = true; + $OUT .= "
    • \n"; + // @TODO Rewrite this to $content = SQL_FETCHARRAY() + while (list($what_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) { + // Check for access level + if ((isExtensionActive('admins')) && (getExtensionVersion('admins') > '0.2.0')) { + $ACL = adminsCheckAdminAcl('', $what_sub); + } else { + // @TODO ACL is 'allow'... hmmm $ACL = true; } - $readable = ((file_exists($INC)) && (is_readable($INC))); - if ($ACL) - { + + // Filename + $inc = sprintf("inc/modules/admin/what-%s.php", $what_sub); + + // Is the file readable? + $readable = isIncludeReadable($inc); + + // Access allowed? + if ($ACL === true) { // Insert compiled title and description - $menuTitle[$wht_sub] = $title_what; - $menuDesription[$wht_sub] = $desc_what; - $OUT .= "
    • - -\n"; - } - } + $OUT .= " +\n"; + } // END - if + } // END - while // Free memory SQL_FREERESULT($result_what); - $OUT .= "
    -  --> "; - if ($readable) - { - if ($wht == $wht_sub) - { - $OUT .= ""; + $GLOBALS['menu']['title'][$what_sub] = $title_what; + $GLOBALS['menu']['description'][$what_sub] = $desc_what; + $OUT .= "
  • +
    --> "; + if ($readable === true) { + if ($what == $what_sub) { + $OUT .= ""; + } else { + $OUT .= "["; } - else - { - $OUT .= "[ "; - } - } - else - { - $OUT .= ""; + } else { + $OUT .= ""; } + $OUT .= $title_what; - if ($readable) - { - if ($wht == $wht_sub) - { - $OUT .= ""; - } - else - { - $OUT .= " ]"; + + if ($readable === true) { + if ($what == $what_sub) { + $OUT .= ""; + } else { + $OUT .= "]"; } + } else { + $OUT .= ""; } - else - { - $OUT .= ""; - } - $OUT .= "
    • -
    \n"; + $OUT .= "\n"; } - // Compile and run the code here. This inserts all constants into the - // HTML output. Costs me some time to figure this out... *sigh* Quix0r - $eval = "\$OUT = \"".COMPILE_CODE(addslashes($OUT))."\";"; - eval($eval); - + // Is there a cache instance again? // Return or output content? - if ($return) { + if ($return === true) { return $OUT; } else { - OUTPUT_HTML($OUT); + outputHtml($OUT); } } -// -function ADD_MEMBER_SELECTION_BOX($add_all = false, $return = false, $none = false, $def = "0") -{ + +// Create member selection box +function addMemberSelectionBox ($def='0', $add_all=false, $return=false, $none=false, $field='userid') { // Output selection form with all confirmed user accounts listed - $result = SQL_QUERY("SELECT userid, surname, family FROM "._MYSQL_PREFIX."_user_data ORDER BY userid", __FILE__, __LINE__); - $OUT = ""; + $result = SQL_QUERY("SELECT `userid`, `surname`, `family` FROM `{?_MYSQL_PREFIX?}_user_data` ORDER BY `userid` ASC", __FUNCTION__, __LINE__); + + // Default output + $OUT = ''; // USe this only for adding points (e.g. adding refs really makes no sence ;-) ) - if ($add_all) $OUT = " \n"; - elseif ($none) $OUT = " \n"; - while (list($id, $sname, $fname) = SQL_FETCHROW($result)) - { - $OUT .= " \n"; + elseif ($none === true) $OUT = " \n"; + + while ($content = SQL_FETCHARRAY($result)) { + $OUT .= " \n"; + + // Walk through all files + foreach ($menuArray as $file) { // Is this a PHP script? - if (($file != ".") && ($file != "..") && ($file != "lost+found") && (strpos($file, "".$type."-") > -1) && (strpos($file, ".php") > 0)) { + if ((!isDirectory($file)) && (strpos($file, "".$type.'-') > -1) && (strpos($file, '.php') > 0)) { // Then test if the file is readable - $test = PATH."inc/modules/".$menu."/".$file; - if (is_readable($test)) { + $test = sprintf("inc/modules/%s/%s", $menu, $file); + + // Is the file there? + if (isIncludeReadable($test)) { // Extract the value for what=xxx - $part = substr($file, (strlen($type) + 1)); $part = substr($part, 0, strpos($part, ".php")); + $part = substr($file, (strlen($type) + 1)); + $part = substr($part, 0, -4); // Is that part different from the overview? - if ($part != "overview") { - $OUT .= "