More fixes from bugtracker issues, thanks to profi-concept

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 5965d8f3942c88a52c38107a96d1d5cf815039ff..31de75a568e6b3037d2ca095c0ba301448b7ba09 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -37,24 +37,27 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
-//
-function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER)
-{
-       $ret = "failed";
+// Register an administrator account
+function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER) {
+       // Login does already exist
+       $ret = "already";
+
+       // Lookup the user
        $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
-        array($user), __FILE__, __LINE__);
+               array($user), __FILE__, __LINE__);
+
+       // Is the entry there?
        if (SQL_NUMROWS($result) == 0) {
                // Ok, let's create the admin login
                SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins (login, password, email) VALUES ('%s', '%s', '%s')",
                        array($user, $md5, $email), __FILE__, __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!
@@ -626,6 +629,7 @@ function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") {
        // Return output
        return $OUT;
 }
+
 // Save settings to the database
 function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="config=0", $translateComma=array(), $alwaysAdd=false) {
        global $_CONFIG, $cacheArray, $cacheInstance;
@@ -713,21 +717,22 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
        SQL_FREERESULT($result);
 
        // Simply run generated SQL string
-       $result = SQL_QUERY($SQL, __FILE__, __LINE__);
+       SQL_QUERY($SQL, __FILE__, __LINE__);
 
        // Rebuild cache
        REBUILD_CACHE("config", "config");
 
        // Settings saved
-       LOAD_TEMPLATE("admin_settings_saved", false, "<STRONG class=\"admin_done\">".SETTINGS_SAVED."</STRONG>");
+       LOAD_TEMPLATE("admin_settings_saved", false, SETTINGS_SAVED);
 }
-//
-function ADMIN_MAKE_MENU_SELECTION($menu, $type, $name, $default="") {
+
+// Generate a selection box
+function ADMIN_MAKE_MENU_SELECTION ($menu, $type, $name, $default="") {
        // Open the requested menu directory
        $handle = opendir(sprintf("%sinc/modules/%s/", PATH, $menu)) or mxchange_die("Cannot load menu ".$menu."!");
 
        // Init the selection box
-       $OUT = "<SELECT name=\"".$name."\" class=\"admin_select\" size=\"1\">\n <OPTION value=\"\">".IS_TOP_MENU."</OPTION>\n";
+       $OUT = "<select name=\"".$name."\" class=\"admin_select\" size=\"1\">\n <option value=\"\">".IS_TOP_MENU."</option>\n";
 
        // Walk through all files
        while ($file = readdir($handle)) {
@@ -735,16 +740,18 @@ function ADMIN_MAKE_MENU_SELECTION($menu, $type, $name, $default="") {
                if (($file != ".") && ($file != "..") && ($file != "lost+found") && (strpos($file, "".$type."-") > -1) && (strpos($file, ".php") > 0)) {
                        // Then test if the file is readable
                        $test = sprintf("%sinc/modules/%s/%s", PATH, $menu, $file);
-                       if ((is_file($test)) && (is_readable($test))) {
+
+                       // Is the file there?
+                       if (FILE_READABLE($test)) {
                                // Extract the value for what=xxx
                                $part = substr($file, (strlen($type) + 1));
                                $part = substr($part, 0, -4);
 
                                // Is that part different from the overview?
                                if ($part != "overview") {
-                                       $OUT .= "       <OPTION value=\"".$part."\"";
-                                       if ($part == $default) $OUT .= "selected";
-                                       $OUT .= ">".$part."</OPTION>\n";
+                                       $OUT .= "       <option value=\"".$part."\"";
+                                       if ($part == $default) $OUT .= " selected=\"selected\"";
+                                       $OUT .= ">".$part."</option>\n";
                                } // END - if
                        } // END - if
                } // END - if
@@ -752,7 +759,9 @@ function ADMIN_MAKE_MENU_SELECTION($menu, $type, $name, $default="") {
 
        // Close dir and selection box
        closedir($handle);
-       $OUT .= "</SELECT>\n";
+       $OUT .= "</select>\n";
+       
+       // Return contents
        return $OUT;
 }
 //
@@ -806,6 +815,7 @@ function ADMIN_CHECK_MENU_MODE() {
        // Return admin-menu's mode
        return $MODE;
 }
+
 // Change activation status
 function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
        $cnt = 0; $newStatus = "Y";
@@ -815,8 +825,8 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
                        // Secure the ID number
                        $id = bigintval($id);
 
-                       // Should always be 1 ;-)
-                       if ($selected == 1) {
+                       // Should always be set... ;-)
+                       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), __FILE__, __LINE__);
@@ -825,7 +835,9 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
                                if (SQL_NUMROWS($result) == 1) {
                                        // Load the status
                                        list($currStatus) = SQL_FETCHROW($result);
-                                       if ($currStatus == "Y") $newStatus='N'; else $newStatus = "Y";
+
+                                       // And switch it N<->Y
+                                       if ($currStatus == "Y") $newStatus = "N"; else $newStatus = "Y";
 
                                        // Change this status
                                        SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_%s SET %s='%s' WHERE %s=%s LIMIT 1",
@@ -833,12 +845,12 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
 
                                        // Count up affected rows
                                        $cnt += SQL_AFFECTEDROWS();
-                               }
+                               } // END - if
 
                                // Free the result
                                SQL_FREERESULT($result);
-                       }
-               }
+                       } // END - if
+               } // END - foreach
 
                // Output status
                LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_STATUS_CHANGED_1.$cnt.ADMIN_STATUS_CHANGED_2.count($IDs).ADMIN_STATUS_CHANGED_3);