X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=f0aff19e6aae954eef2d6e6ef8e1995794ab4d95;hp=6c7c2416eddd4486f86c7f0a7a9524f5d4c03f8e;hb=b29dab42eab7c64ca1945eb70fa7713f8898f6ae;hpb=61bddb167e29e7275f5a1c9fa8cb80431fa5ee6f
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 6c7c2416ed..f0aff19e6a 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* 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 *
* For more information visit: http://www.mxchange.org *
@@ -32,103 +37,153 @@
************************************************************************/
// Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
require($INC);
}
-//
-function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER)
-{
- $ret = "failed";
- $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
- array($user), __FILE__, __LINE__);
+// Register an administrator account
+function REGISTER_ADMIN ($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', '%s')",
- array($user, $md5, $email), __FILE__, __LINE__);
+ SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins` (login, password, email) VALUES ('%s', '%s', '%s')",
+ array($user, $md5, $email), __FUNCTION__, __LINE__);
$ret = "done";
- } else {
- // Free memory
- SQL_FREERESULT($result);
+ } // 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 CHECK_ADMIN_LOGIN ($admin_login, $password) {
+ // By default no admin is found
+ $ret = "404";
+
+ // Get admin id
+ $aid = GET_ADMIN_ID($admin_login);
+
+ // Init array with admin id by default
+ $data = array('aid' => $aid);
+
+ // Is the cache valid?
+ if (isset($GLOBALS['cache_array']['admins']['password'][$aid])) {
// Get password from cache
- $pass = $cacheArray['admins']['password'][$admin_login];
+ $data['password'] = $GLOBALS['cache_array']['admins']['password'][$aid];
$ret = "pass";
- $_CONFIG['cache_hits']++;
- } else {
+ incrementConfigEntry('cache_hits');
+
+ // Include more admins data?
+ if (GET_EXT_VERSION("admins") >= "0.7.2") {
+ // Load them here
+ $data['login_failures'] = $GLOBALS['cache_array']['admins']['login_failures'][$aid];
+ $data['last_failure'] = $GLOBALS['cache_array']['admins']['last_failure'][$aid];
+ } // END - if
+ } elseif (!EXT_IS_ACTIVE("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__);
+ $result = SQL_QUERY_ESC("SELECT password".$add." FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
+ array($aid), __FUNCTION__, __LINE__);
+
+ // Entry found?
if (SQL_NUMROWS($result) == 1) {
+ // Login password found
$ret = "pass";
- list($pass) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
- }
+
+ // Fetch data
+ $data = SQL_FETCHARRAY($result);
+ } // END - if
+
+ // Free result
+ SQL_FREERESULT($result);
}
- //* DEBUG: */ echo "*".$pass."/".md5($password)."/".$ret."
";
- if ((strlen($pass) == 32) && ($pass == md5($password))) {
+ //* DEBUG: */ echo "*".$data['password']."/".md5($password)."/".$ret."
";
+ if ((isset($data['password'])) && (strlen($data['password']) == 32) && ($data['password'] == md5($password))) {
// Generate new hash
- $pass = generateHash($password);
+ $data['password'] = generateHash($password);
// Is the sql_patches not installed, than we cannot have a valid hashed password here!
- if (($ret == "pass") && ((GET_EXT_VERSION("sql_patches") < "0.3.6") || (GET_EXT_VERSION("sql_patches") == ""))) $ret = "done";
- } elseif ((GET_EXT_VERSION("sql_patches") < "0.3.6") || (GET_EXT_VERSION("sql_patches") == "")) {
+ if (($ret == "pass") && ((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("sql_patches") == ""))) $ret = "done";
+ } elseif ((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("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));
+ define('__SALT', substr($data['password'], 0, -40));
$salt = __SALT;
// Check if password is same
- //* DEBUG: */ echo "*".$ret.",".$pass.",".$password.",".$salt."*
\n";
- if (($ret == "pass") && ($pass == generateHash($password, $salt)) && (!empty($salt))) {
- // Change the passord hash here
- $pass = generateHash($password);
-
- // 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: */ echo "*".$ret.",".$data['password'].",".$password.",".$salt."*
\n";
+ 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 (GET_EXT_VERSION("admins") >= "0.7.2") {
+ // Store it in session
+ set_session('mxchange_admin_failures', $data['login_failures']);
+ set_session('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'], $aid), __FUNCTION__, __LINE__);
+ } else {
+ // Update password
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE id=%s LIMIT 1",
+ array($data['password'], $aid), __FUNCTION__, __LINE__);
}
+ // Rebuild cache
+ rebuildCacheFiles("admins", "admin");
+
// Login has failed by default... ;-)
$ret = "failed";
// Password matches so login here
- if (LOGIN_ADMIN($admin_login, $pass)) {
+ if (LOGIN_ADMIN($admin_login, $data['password'])) {
// All done now
$ret = "done";
- }
+ } // END - if
} elseif ((empty($salt)) && ($ret == "pass")) {
// Something bad went wrong
$ret = "failed";
} elseif ($ret == "done") {
// Try to login here if we have the old hashing way (sql_patches not installed?)
- if (!LOGIN_ADMIN($admin_login, $pass)) {
+ if (!LOGIN_ADMIN($admin_login, $data['password'])) {
// Something went wrong
$ret = "failed";
- }
+ } // END - if
}
+ // Count login failure if admins extension version is 0.7.0+
+ if (($ret == "pass") && (GET_EXT_VERSION("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($aid), __FUNCTION__, __LINE__);
+
+ // Rebuild cache
+ rebuildCacheFiles("admins", "admin");
+ } // END - if
+
// Return the result
//* DEBUG: */ die("RETURN=".$ret);
return $ret;
@@ -136,46 +191,40 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
// Try to login the admin by setting some session/cookie variables
function LOGIN_ADMIN ($adminLogin, $passHash) {
+ // Reset failure counter on matching admins version
+ if ((GET_EXT_VERSION("admins") >= "0.7.0") && ((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("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
+ rebuildCacheFiles("admins", "admin");
+ } // END - if
+
// Now set all session variables and return the result
return (
(
- set_session("admin_md5", generatePassString($passHash))
+ set_session('admin_md5', generatePassString($passHash))
) && (
- set_session("admin_login", $adminLogin)
+ set_session('admin_login', $adminLogin)
) && (
- set_session("admin_last", time())
+ set_session('admin_last', time())
) && (
- set_session("admin_to", $_POST['timeout'])
+ set_session('admin_to', bigintval(REQUEST_POST('timeout')))
)
);
}
// Only be executed on cookie checking
function CHECK_ADMIN_COOKIES ($admin_login, $password) {
- global $cacheArray, $_CONFIG;
+ // By default no admin cookies are found
$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) {
- // Entry found
- $ret = "pass";
- // Fetch password
- list($pass) = SQL_FETCHROW($result);
- }
-
- // Free result
- SQL_FREERESULT($result);
- }
+ // Get hash
+ $pass = GET_ADMIN_HASH(GET_ADMIN_ID($admin_login));
+ if ($pass != "-1") $ret = "pass";
- //* DEBUG: */ echo __FUNCTION__.":".$pass."(".strlen($pass).")/".$password."(".strlen($password).")
\n";
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):".generatePassString($pass)."(".strlen($pass).")/".$password."(".strlen($password).")
\n";
// Check if password matches
if (($ret == "pass") && ((generatePassString($pass) == $password) || ($pass == $password) || ((strlen($pass) == 32) && (md5($password) == $pass)))) {
@@ -186,95 +235,17 @@ function CHECK_ADMIN_COOKIES ($admin_login, $password) {
// Return result
return $ret;
}
-//
-function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) {
- // Initialize some variables
- $done = false;
- $seek++;
- $found = false;
-
- // Is the file there and read-/write-able?
- if ((file_exists($file)) && (is_readable($file)) && (is_writeable($file))) {
- $search = "CFG: ".$comment;
- $tmp = $file.".tmp";
-
- // Open the source file
- $fp = @fopen($file, 'r') or OUTPUT_HTML("READ: ".$file."
");
-
- // Is the resource valid?
- if (is_resource($fp)) {
- // Open temporary file
- $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("WRITE: ".$tmp."
");
-
- // Is the resource again valid?
- if (is_resource($fp_tmp)) {
- while (!feof($fp)) {
- // Read from source file
- $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++;
- }
- }
-
- // Write to temp file
- fputs($fp_tmp, $line);
- }
-
- // Close temp file
- fclose($fp_tmp);
-
- // Finished writing tmp file
- $done = true;
- }
-
- // Close source file
- 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 {
- // File not found, not readable or writeable
- OUTPUT_HTML("404: ".$file."
");
- }
-}
//
-function ADMIN_DO_ACTION($wht)
-{
- global $menuDesription, $menuTitle, $_CONFIG, $cacheArray, $link, $DATA, $DEPTH;
+function ADMIN_DO_ACTION ($wht) {
+ global $DATA;
//* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*
\n";
- if (EXT_IS_ACTIVE("cache"))
- {
- // Include cache instance
- global $cacheInstance;
- }
// Remove any spaces from variable
- if (empty($wht))
- {
+ if (empty($wht)) {
// Default admin action is the overview page
$wht = "overview";
- }
- else
- {
+ } else {
// Compile out some chars
$wht = COMPILE_CODE($wht, false, false, false);
}
@@ -283,8 +254,8 @@ function ADMIN_DO_ACTION($wht)
$act = GET_ACTION($GLOBALS['module'], $wht);
// Define admin login name and ID number
- define('__ADMIN_LOGIN', SQL_ESCAPE(get_session('admin_login')));
- define('__ADMIN_ID' , GET_ADMIN_ID(get_session('admin_login')));
+ define('__ADMIN_LOGIN', get_session('admin_login'));
+ define('__ADMIN_ID' , GET_CURRENT_ADMIN_ID());
// Preload templates
if (EXT_IS_ACTIVE("admins")) {
@@ -299,294 +270,307 @@ function ADMIN_DO_ACTION($wht)
LOAD_TEMPLATE("admin_main_header");
// 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='' OR what IS NULL) 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($act, $wht, $wht), __FUNCTION__, __LINE__);
+ if (SQL_NUMROWS($result_action) == 1) {
// Is valid but does the inlcude file exists?
- $INC = sprintf("%sinc/modules/admin/action-%s.php", PATH, $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", $act);
+ if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && ($GLOBALS['acl_allow'] === true)) {
// Ok, we finally load the admin action module
- include($INC);
- }
- elseif (__ACL_ALLOW == false)
- {
+ LOAD_INC($INC);
+ } elseif ($GLOBALS['acl_allow'] === false) {
// Access denied
- LOAD_TEMPLATE("admin_menu_failed", false, ADMINS_ACCESS_DENIED);
- ADD_FATAL(ADMINS_ACCESS_DENIED);
- }
- else
- {
+ LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_ACCESS_DENIED'));
+ addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACCESS_DENIED'));
+ } 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);
+ LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_404'), $act));
+ addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACTION_404'), $act);
}
} 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);
+ LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht));
+ addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht);
}
+ // Free memory
+ SQL_FREERESULT($result_action);
+
// Tableset footer
LOAD_TEMPLATE("admin_main_footer");
}
+
//
-function ADD_ADMIN_MENU($act, $wht,$return=false)
-{
- global $menuDesription, $menuTitle, $link;
+function ADD_ADMIN_MENU ($act, $wht, $return=false) {
+ // Init variables
$SUB = false;
+ $OUT = "";
// Menu descriptions
- $menuDesription = array();
- $menuTitle = array();
+ $GLOBALS['menu']['description'] = array();
+ $GLOBALS['menu']['title'] = array();
+
+ // Is there a cache instance?
+ if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == "Y")) {
+ // Create cache name
+ $cacheName = "admin_".$act."_".$wht."_".GET_LANGUAGE()."_".strtolower(get_session('admin_login'));
+
+ // Is that cache there?
+ if ($GLOBALS['cache_instance']->loadCacheFile($cacheName)) {
+ // Then load it
+ $data = $GLOBALS['cache_instance']->getArrayFromCache();
+
+ // Extract all parts
+ $OUT = base64_decode($data['output'][0]);
+ $GLOBALS['menu']['title'] = unserialize(base64_decode($data['title'][0]));
+ $GLOBALS['menu']['description'] = unserialize(base64_decode($data['descr'][0]));
+
+ // Return or output content?
+ if ($return === true) {
+ return $OUT;
+ } else {
+ OUTPUT_HTML($OUT);
+ }
+ } // END - if
+ } // END - if
// Build main menu
- $result_main = SQL_QUERY("SELECT action, title, descr FROM "._MYSQL_PREFIX."_admin_menu WHERE (what='' OR what IS NULL) 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"))
- {
+ $result_main = SQL_QUERY("SELECT action, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort`, id DESC", __FUNCTION__, __LINE__);
+ if (SQL_NUMROWS($result_main) > 0) {
+ $OUT = "
+ |
\n";
+ // @TODO Rewrite this to $content = SQL_FETCHARRAY()
+ 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
- {
+ } else {
// ACL is "allow"... hmmm
$ACL = true;
}
- if ($ACL)
- {
- if (!$SUB)
- {
+
+ if ($ACL === true) {
+ if (!$SUB) {
// Insert compiled menu title and description
- $menuTitle[$menu] = $title;
- $menuDesription[$menu] = $descr;
- }
- $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?
+ if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == "Y")) {
+ // Init cache
+ $GLOBALS['cache_instance']->init($cacheName);
+
+ // Prepare cache data
+ $data = array(
+ 'output' => base64_encode($OUT),
+ 'title' => $GLOBALS['menu']['title'],
+ 'descr' => $GLOBALS['menu']['description']
+ );
+
+ // Write the data away
+ $GLOBALS['cache_instance']->addRow($data);
+
+ // Close cache
+ $GLOBALS['cache_instance']->finalize();
+ } // END - if
// Return or output content?
- if ($return) {
+ if ($return === true) {
return $OUT;
} else {
OUTPUT_HTML($OUT);
}
}
-//
-function ADD_MEMBER_SELECTION_BOX($add_all = false, $return = false, $none = false, $def = "0")
-{
+
+// Create member selection box
+function ADD_MEMBER_SELECTION_BOX ($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__);
+ $result = SQL_QUERY("SELECT userid, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` ORDER BY userid", __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 .= "