// Only be executed on login procedure!
function CHECK_ADMIN_LOGIN ($admin_login, $password)
{
- global $ADMINS, $CONFIG, $CACHE;
+ global $cacheArray, $_CONFIG, $cacheInstance;
$ret = "404"; $pass = "";
- if (!empty($ADMINS['aid'][$admin_login]))
+ if (!empty($cacheArray['admins']['aid'][$admin_login]))
{
// Get password from cache
- $pass = $ADMINS['password'][$admin_login];
+ $pass = $cacheArray['admins']['password'][$admin_login];
$ret = "pass";
- $CONFIG['cache_hits']++;
+ $_CONFIG['cache_hits']++;
}
else
{
}
}
- //* DEBUG: */ echo "*".$pass."/".$password."/".$ret."<BR>";
+ //* DEBUG: */ echo "*".$pass."/".$password."/".$ret."<br />";
if ((strlen($pass) == 32) && ($pass == md5($password)))
{
// Generate new hash
array($pass, $admin_login), __FILE__, __LINE__);
// Shall I remove the cache file?
- if ((EXT_IS_ACTIVE("cache")) && ($CACHE != false))
+ if ((EXT_IS_ACTIVE("cache")) && ($cacheInstance != false))
{
- if ($CACHE->cache_file("admins", true)) $CACHE->cache_destroy();
+ if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy();
}
// Password matches!
return $ret;
}
// Only be executed on cookie checking
-function CHECK_ADMIN_COOKIES ($admin_login, $password)
-{
- global $ADMINS, $CONFIG;
+function CHECK_ADMIN_COOKIES ($admin_login, $password) {
+ global $cacheArray, $_CONFIG;
$ret = "404"; $pass = "";
- if (!empty($ADMINS['aid'][$admin_login]))
- {
+ if (!empty($cacheArray['admins']['aid'][$admin_login])) {
// Get password from cache
- $pass = $ADMINS['password'][$admin_login];
+ $pass = $cacheArray['admins']['password'][$admin_login];
$ret = "pass";
- $CONFIG['cache_hits']++;
- }
- else
- {
+ $_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)
- {
+ if (SQL_NUMROWS($result) == 1) {
$ret = "pass";
list($pass) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
}
}
- //* DEBUG: */ echo "*".$pass."/".$password."<BR>";
+ //* DEBUG: */ echo "*".$pass."/".$password."<br />";
// Check if password matches
- if (($ret == "pass") && ((generatePassString($pass) == $password) || ($pass == $password)))
- {
+ if (($ret == "pass") && ((generatePassString($pass) == $password) || ($pass == $password))) {
// Passwords matches!
$ret = "done";
}
+
+ // Return result
return $ret;
}
//
-function admin_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SEEK=0)
+function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0)
{
- $DONE = false; $SEEK++; $found = false;
+ $done = false; $seek++; $found = false;
if (file_exists($file))
{
- $search = "CFG: ".$COMMENT;
+ $search = "CFG: ".$comment;
$tmp = $file.".tmp";
- $fp = fopen($file, 'r') or OUTPUT_HTML ("<STRONG>READ:</STRONG> ".$file."<BR>");
+ $fp = fopen($file, 'r') or OUTPUT_HTML("<STRONG>READ:</STRONG> ".$file."<br />");
if ($fp)
{
- $fp_tmp = fopen($tmp, 'w') or OUTPUT_HTML ("<STRONG>WRITE:</STRONG> ".$tmp."<BR>");
+ $fp_tmp = fopen($tmp, 'w') or OUTPUT_HTML("<STRONG>WRITE:</STRONG> ".$tmp."<br />");
if ($fp_tmp)
{
while (! feof($fp))
if (strpos($line, $search) > -1) { $next = 0; $found = true; }
if ($next > -1)
{
- if ($next == $SEEK)
+ if ($next == $seek)
{
$next = -1;
- $line = $PREFIX.$DATA.$SUFFIX."\n";
+ $line = $prefix . $DATA . $suffix."\n";
}
else
{
}
fclose($fp_tmp);
// Finished writing tmp file
- $DONE = true;
+ $done = true;
}
fclose($fp);
- if (($DONE) && ($found))
+ if (($done) && ($found))
{
// Copy back tmp file and delete tmp :-)
@copy($tmp, $file);
}
elseif (!$found)
{
- OUTPUT_HTML ("<STRONG>CHANGE:</STRONG> 404!");
+ OUTPUT_HTML("<STRONG>CHANGE:</STRONG> 404!");
define ('_FATAL', true);
}
else
{
- OUTPUT_HTML ("<STRONG>TMP:</STRONG> UNDONE!");
+ OUTPUT_HTML("<STRONG>TMP:</STRONG> UNDONE!");
define ('_FATAL', true);
}
}
}
else
{
- OUTPUT_HTML ("<STRONG>404:</STRONG> ".$file."<BR>");
+ OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<br />");
}
}
//
function ADMIN_DO_ACTION($wht)
{
- global $menuDesription, $MTITLE, $CONFIG, $EXTENSIONS, $link, $DATA;
+ global $menuDesription, $menuTitle, $_CONFIG, $cacheArray, $link, $DATA;
//* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*<br />\n";
if (EXT_IS_ACTIVE("cache"))
{
// Include cache instance
- global $CACHE;
+ global $cacheInstance;
}
// Remove any spaces from variable
$act = GET_ACTION($GLOBALS['module'], $wht);
// Define admin login name and ID number
- define('__ADMIN_LOGIN', SQL_ESCAPE($_COOKIE['admin_login']));
- define('__ADMIN_ID' , GET_ADMIN_ID($_COOKIE['admin_login']));
+ define('__ADMIN_LOGIN', SQL_ESCAPE(get_session('admin_login')));
+ define('__ADMIN_ID' , GET_ADMIN_ID(get_session('admin_login')));
// Preload templates
if (EXT_IS_ACTIVE("admins")) {
//
function ADD_ADMIN_MENU($act, $wht,$return=false)
{
- global $_GET, $menuDesription, $MTITLE, $link;
+ global $menuDesription, $menuTitle, $link;
$SUB = false;
// Menu descriptions
$menuDesription = array();
- $MTITLE = array();
+ $menuTitle = 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__);
if (!$SUB)
{
// Insert compiled menu title and description
- $MTITLE[$menu] = $title;
+ $menuTitle[$menu] = $title;
$menuDesription[$menu] = $descr;
}
$OUT .= "<TR>
if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu))
{
$menuDesription = array();
- $MTITLE = array(); $SUB = true;
+ $menuTitle = array(); $SUB = true;
$OUT .= "<TR>
<TD width=\"10\" class=\"seperator\"> </TD>
<TD class=\"admin_menu\">
if ($ACL)
{
// Insert compiled title and description
- $MTITLE[$wht_sub] = $title_what;
+ $menuTitle[$wht_sub] = $title_what;
$menuDesription[$wht_sub] = $desc_what;
$OUT .= "<TR>
<TD class=\"admin_menu\" colspan=\"2\">
if ($return) {
return $OUT;
} else {
- OUTPUT_HTML ($OUT);
+ OUTPUT_HTML($OUT);
}
}
//
function ADD_MEMBER_SELECTION_BOX($add_all = false, $return = false, $none = false, $def = "0")
{
- global $_GET;
// 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 = "";
return $OUT;
}
//
-function ADMIN_SAVE_SETTINGS (&$POST, $TABLE, $WHERE="config='1'", $translateComma = array(), $alwaysAdd=false)
+function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="config=0", $translateComma = array(), $alwaysAdd=false)
{
- global $CONFIG, $CFG_CACHE, $CACHE;
+ global $_CONFIG, $cacheArray, $cacheInstance;
$DATA = array();
$skip = false; $TEST2 = "";
foreach ($POST as $id=>$val) {
}
// Update current configuration
- $CONFIG[$id] = $val;
+ $_CONFIG[$id] = $val;
}
}
}
// Check if entry does exist
$result = false;
if (!$alwaysAdd) {
- if (!empty($WHERE)) {
- $result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX.$TABLE." WHERE ".$WHERE." LIMIT 1", __FILE__, __LINE__);
+ if (!empty($whereStatement)) {
+ $result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX.$tableName." WHERE ".$whereStatement." LIMIT 1", __FILE__, __LINE__);
} else {
- $result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX.$TABLE." LIMIT 1", __FILE__, __LINE__);
+ $result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX.$tableName." LIMIT 1", __FILE__, __LINE__);
}
}
$DATA_UPDATE = implode(", ", $DATA);
// Generate SQL string
- $SQL = "UPDATE "._MYSQL_PREFIX.$TABLE." SET ".$DATA_UPDATE." WHERE ".$WHERE." LIMIT 1";
+ $SQL = "UPDATE "._MYSQL_PREFIX.$tableName." SET ".$DATA_UPDATE." WHERE ".$whereStatement." LIMIT 1";
} else {
// Add Line (does only work with auto_increment!
$KEYs = array(); $VALUEs = array();
$VALUEs = implode(", ", $VALUEs);
// Generate SQL string
- $SQL = "INSERT INTO "._MYSQL_PREFIX.$TABLE." (".$KEYs.") VALUES(".$VALUEs.")";
+ $SQL = "INSERT INTO "._MYSQL_PREFIX.$tableName." (".$KEYs.") VALUES(".$VALUEs.")";
}
// Free memory
$result = SQL_QUERY($SQL, __FILE__, __LINE__);
// Is the config table updated and the cache extension installed?
- if ((GET_EXT_VERSION("cache") >= "0.1.2") && ($TABLE == "_config")) {
+ if ((GET_EXT_VERSION("cache") >= "0.1.2") && ($tableName == "_config")) {
// Remove it here...
- if ($CACHE->cache_file("config", true)) $CACHE->cache_destroy();
- unset($CFG_CACHE);
+ if ($cacheInstance->cache_file("config", true)) $cacheInstance->cache_destroy();
+ unset($cacheArray);
}
// Settings saved
return $title;
}
- //* DEBUG: */ echo "A:".$title."<BR>";
+ //* DEBUG: */ echo "A:".$title."<br />";
// Return link
return "<A href=\"".URL."/modules.php?module=admin&what=".$wht."&u_id=".$uid."\" title=\"".ADMIN_USER_PROFILE_TITLE."\">".$title."</A>";
}
//
function ADMIN_CHECK_MENU_MODE()
{
- global $CONFIG, $ADMINS, $_COOKIE;
+ global $_CONFIG, $cacheArray;
// Set the global mode as the mode for all admins
- $MODE = $CONFIG['admin_menu']; $ADMIN = $MODE;
+ $MODE = $_CONFIG['admin_menu']; $ADMIN = $MODE;
// Check individual settings of current admin
- if (isset($ADMINS['la_mode'][$_COOKIE['admin_login']]))
+ if (isset($cacheArray['admins']['la_mode'][get_session('admin_login')]))
{
// Load from cache
- $ADMIN = $ADMINS['la_mode'][$_COOKIE['admin_login']];
- $CONFIG['cache_hits']++;
+ $ADMIN = $cacheArray['admins']['la_mode'][get_session('admin_login')];
+ $_CONFIG['cache_hits']++;
}
elseif (GET_EXT_VERSION("admins") >= "0.6.7")
{
// Load from database when version of "admins" is enough
$result = SQL_QUERY_ESC("SELECT la_mode FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
- array($_COOKIE['admin_login']), __FILE__, __LINE__);
+ array(get_session('admin_login')), __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1)
{
// Load data
}
// Change activation status
function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
- global $CONFIG;
+ global $_CONFIG;
$cnt = 0; $newStatus = 'Y';
if ((is_array($IDs)) && (count($IDs) > 0)) {
// "Walk" all through and count them
}
// Delete rows by given ID numbers
function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $row, $columns = array(), $filterFunctions = array(), $deleteNow=false, $idRow="id") {
- global $CONFIG;
+ global $_CONFIG;
$OUT = ""; $SW = 2;
if ((is_array($IDs)) && (count($IDs) > 0)) {
// "Walk" through all entries and count them
projects / mailer.git / blobdiff