More use of REVERT_COMMA() fixes problems
[mailer.git] / inc / modules / admin / admin-inc.php
index 7ef2e0aa551460bf65d5528565237463dca36aba..0c7f5bfeee32742170a6f4246e3451b663b2b9d9 100644 (file)
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // 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);
 }
@@ -62,73 +61,119 @@ function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER)
 function CHECK_ADMIN_LOGIN ($admin_login, $password)
 {
        global $cacheArray, $_CONFIG, $cacheInstance;
-       $ret = "404"; $pass = "";
-       if (!empty($cacheArray['admins']['aid'][$admin_login])) {
+
+       // Init variables
+       $ret = "404";
+       $data = array();
+
+       // Is the cache valid?
+       if (!empty($cacheArray['admins']['password'][$admin_login])) {
                // Get password from cache
-               $pass = $cacheArray['admins']['password'][$admin_login];
+               $data['password'] = $cacheArray['admins']['password'][$admin_login];
                $ret = "pass";
                $_CONFIG['cache_hits']++;
-       } else {
+
+               // Include more admins data?
+               if (GET_EXT_VERSION("admins") >= "0.7.0") {
+                       // Load them here
+                       $data['login_failtures'] = $cacheArray['admins']['login_failtures'][$admin_login];
+                       $data['last_failture']   = $cacheArray['admins']['last_failture'][$admin_login];
+               } // END - if
+       } elseif (EXT_IS_ACTIVE("cache")) {
+               $ADD = "";
+               if (GET_EXT_VERSION("admins") >= "0.7.0") {
+                       // Load them here
+                       $ADD = ", login_failtures, UNIX_TIMESTAMP(last_failture) AS last_failture";
+               } // END - if
+
                // Get password from DB
-               $result = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT password".$ADD." FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
                 array($admin_login), __FILE__, __LINE__);
                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."<br />";
-       if ((strlen($pass) == 32) && ($pass == md5($password))) {
+       //* DEBUG: */ echo "*".$data['password']."/".md5($password)."/".$ret."<br />";
+       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."*<br >\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."*<br >\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 failtures if available
+               if (GET_EXT_VERSION("admins") >= "0.7.0") {
+                       // Store it in session
+                       set_session('mxchange_admin_failtures', $data['login_failtures']);
+                       set_session('mxchange_admin_last_fail', $data['last_failture']);
+
+                       // Update password and reset login failtures
+                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s',login_failtures=0,last_failture='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1",
+                               array($data['password'], $admin_login), __FILE__, __LINE__);
+               } else {
+                       // Update password
+                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s' WHERE login='%s' LIMIT 1",
+                               array($data['password'], $admin_login), __FILE__, __LINE__);
                }
 
+               // Rebuild cache
+               REBUILD_CACHE("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 failture 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_failtures=login_failtures+1,last_failture=NOW() WHERE login='%s' LIMIT 1",
+                       array($admin_login), __FILE__, __LINE__);
+
+               // Rebuild cache
+               REBUILD_CACHE("admins", "admin");
+       } // END - if
+
        // Return the result
        //* DEBUG: */ die("RETURN=".$ret);
        return $ret;
@@ -136,6 +181,18 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
 
 // Try to login the admin by setting some session/cookie variables
 function LOGIN_ADMIN ($adminLogin, $passHash) {
+       global $cacheInstance;
+
+       // Reset failture 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_failtures=0,last_failture='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1",
+                       array($adminLogin), __FILE__, __LINE__);
+
+               // Rebuild cache
+               REBUILD_CACHE("admins", "admin");
+       } // END - if
+
        // Now set all session variables and return the result
        return (
                (
@@ -145,7 +202,7 @@ function LOGIN_ADMIN ($adminLogin, $passHash) {
                ) && (
                        set_session("admin_last", time())
                ) && (
-                       set_session("admin_to", $_POST['timeout'])
+                       set_session("admin_to", bigintval($_POST['timeout']))
                )
        );
 }
@@ -154,28 +211,12 @@ function LOGIN_ADMIN ($adminLogin, $passHash) {
 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) {
-                       // Entry found
-                       $ret = "pass";
 
-                       // Fetch password
-                       list($pass) = SQL_FETCHROW($result);
-               }
+       // Get hash
+       $pass = GET_ADMIN_HASH($admin_login);
+       if ($pass != "-1") $ret = "pass";
 
-               // Free result
-               SQL_FREERESULT($result);
-       }
-
-       //* DEBUG: */ echo __FUNCTION__.":".$pass."(".strlen($pass).")/".$password."(".strlen($password).")<br />\n";
+       //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):".generatePassString($pass)."(".strlen($pass).")/".$password."(".strlen($password).")<br />\n";
 
        // Check if password matches
        if (($ret == "pass") && ((generatePassString($pass) == $password) || ($pass == $password) || ((strlen($pass) == 32) && (md5($password) == $pass)))) {
@@ -194,7 +235,7 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) {
        $found = false;
 
        // Is the file there and read-/write-able?
-       if ((file_exists($file)) && (is_readable($file)) && (is_writeable($file))) {
+       if ((FILE_READABLE($file)) && (is_writeable($file))) {
                $search = "CFG: ".$comment;
                $tmp = $file.".tmp";
 
@@ -257,24 +298,20 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) {
 }
 
 //
-function ADMIN_DO_ACTION($wht)
-{
-       global $menuDesription, $menuTitle, $_CONFIG, $cacheArray, $link, $DATA, $DEPTH;
+function ADMIN_DO_ACTION($wht) {
+       global $menuDesription, $menuTitle, $_CONFIG, $cacheArray, $DATA, $DEPTH;
+
        //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*<br />\n";
-       if (EXT_IS_ACTIVE("cache"))
-       {
+       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,7 +320,7 @@ 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_LOGIN', get_session('admin_login'));
        define('__ADMIN_ID'   , GET_ADMIN_ID(get_session('admin_login')));
 
        // Preload templates
@@ -299,29 +336,21 @@ 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
+       $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), __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) == 1)
-       {
-               // Free memory
-               SQL_FREERESULT($result);
+       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))
-               {
+               if ((FILE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) {
                        // Ok, we finally load the admin action module
                        include($INC);
-               }
-                elseif (__ACL_ALLOW == false)
-               {
+               } elseif (__ACL_ALLOW == false) {
                        // Access denied
                        LOAD_TEMPLATE("admin_menu_failed", false, ADMINS_ACCESS_DENIED);
                        ADD_FATAL(ADMINS_ACCESS_DENIED);
-               }
-                else
-               {
+               } 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);
@@ -332,22 +361,50 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
                ADD_FATAL(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2);
        }
 
+       // 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) {
+       global $menuDesription, $menuTitle, $cacheInstance, $_CONFIG;
+
+       // Init variables
        $SUB = false;
+       $OUT = "";
 
        // Menu descriptions
        $menuDesription = array();
        $menuTitle = array();
 
+       // Is there a cache instance?
+       if ((is_object($cacheInstance)) && (isset($_CONFIG['cache_admin_menu'])) && ($_CONFIG['cache_admin_menu'] == "Y")) {
+               // Create cache name
+               $cacheName = "admin_".$act."_".$wht."_".GET_LANGUAGE()."_".strtolower(get_session('admin_login'));
+
+               // Is that cache there?
+               if ($cacheInstance->cache_file($cacheName, true)) {
+                       // Then load it
+                       $data = $cacheInstance->cache_load();
+
+                       // Extract all parts
+                       $OUT = base64_decode($data['output'][0]);
+                       $menuTitle = unserialize(base64_decode($data['title'][0]));
+                       $menuDescription = unserialize(base64_decode($data['descr'][0]));
+
+                       // Return or output content?
+                       if ($return) {
+                               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 = "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_main\">
@@ -368,13 +425,13 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                if (!$SUB)
                                {
                                        // Insert compiled menu title and description
-                                       $menuTitle[$menu]        = $title;
+                                       $menuTitle[$menu]      = $title;
                                        $menuDesription[$menu] = $descr;
                                }
                                $OUT .= "<TR>
        <TD class=\"admin_menu\" colspan=\"2\">
                <NOBR>&nbsp;<STRONG>&middot;</STRONG>&nbsp;";
-                                       if (($menu == $act) && (empty($wht)))
+                               if (($menu == $act) && (empty($wht)))
                                {
                                        $OUT .= "<STRONG>";
                                }
@@ -383,7 +440,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                        $OUT .= "[<A href=\"".URL."/modules.php?module=admin&amp;action=".$menu."\">";
                                }
                                $OUT .= $title;
-                                       if (($menu == $act) && (empty($wht)))
+                               if (($menu == $act) && (empty($wht)))
                                {
                                        $OUT .= "</STRONG>";
                                }
@@ -393,7 +450,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                }
                                $OUT .= "</NOBR></TD>
 </TR>\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",
+                               $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, id DESC",
                                 array($menu), __FILE__, __LINE__);
                                if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu))
                                {
@@ -403,24 +460,19 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
        <TD width=\"10\" class=\"seperator\">&nbsp;</TD>
        <TD class=\"admin_menu\">
                <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_sub\">\n";
-                                               while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what))
-                                       {
+                                       while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
                                                // Filename
                                                $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $wht_sub);
-                                               if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2"))
-                                               {
+                                               if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) {
                                                        $ACL = ADMINS_CHECK_ACL("", $wht_sub);
-                                               }
-                                                else
-                                               {
+                                               } else {
                                                        // ACL is "allow"... hmmm
                                                        $ACL = true;
                                                }
-                                               $readable = ((file_exists($INC)) && (is_readable($INC)));
-                                               if ($ACL)
-                                               {
+                                               $readable = FILE_READABLE($INC);
+                                               if ($ACL) {
                                                        // Insert compiled title and description
-                                                       $menuTitle[$wht_sub]        = $title_what;
+                                                       $menuTitle[$wht_sub]      = $title_what;
                                                        $menuDesription[$wht_sub] = $desc_what;
                                                        $OUT .= "<TR>
        <TD class=\"admin_menu\" colspan=\"2\">
@@ -481,6 +533,25 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
        $eval = "\$OUT = \"".COMPILE_CODE(addslashes($OUT))."\";";
        eval($eval);
 
+       // Is there a cache instance again?
+       if ((is_object($cacheInstance)) && (isset($_CONFIG['cache_admin_menu'])) && ($_CONFIG['cache_admin_menu'] == "Y")) {
+               // Init cache
+               $cacheInstance->cache_init($cacheName);
+
+               // Prepare cache data
+               $data = array(
+                       'output' => base64_encode($OUT),
+                       'title'  => $menuTitle,
+                       'descr'  => $menuDesription
+               );
+
+               // Write the data away
+               $cacheInstance->add_row($data);
+
+               // Close cache
+               $cacheInstance->cache_close();
+       } // END - if
+
        // Return or output content?
        if ($return) {
                return $OUT;
@@ -489,7 +560,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
        }
 }
 //
-function ADD_MEMBER_SELECTION_BOX($add_all = false, $return = false, $none = false, $def = "0")
+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__);
@@ -500,23 +571,26 @@ function ADD_MEMBER_SELECTION_BOX($add_all = false, $return = false, $none = fal
         elseif ($none) $OUT = "      <OPTION value=\"0\">".SELECT_NONE."</OPTION>\n";
        while (list($id, $sname, $fname) = SQL_FETCHROW($result))
        {
-               $OUT .= "      <OPTION value=\"".$id."\"";
+               $OUT .= "      <OPTION value=\"".bigintval($id)."\"";
                if ($def == $id) $OUT .= " selected=\"selected\"";
-               $OUT .= ">".$sname." ".$fname." (".$id.")</OPTION>\n";
+               $OUT .= ">".$sname." ".$fname." (".bigintval($id).")</OPTION>\n";
        }
 
        // Free memory
        SQL_FREERESULT($result);
 
-       // Remeber options in constant
-       define('_MEMBER_SELECTION', $OUT);
-
        if (!$return) {
+               // Remeber options in constant
+               define('_MEMBER_SELECTION', $OUT);
+
                // Display selection box
                define('__LANG_VALUE', GET_LANGUAGE());
 
                // Load template
                LOAD_TEMPLATE("admin_member_selection_box", false, $GLOBALS['what']);
+       } else {
+               // Return content in selection frame
+               return "<select class=\"admin_select\" name=\"".$field."\" size=\"1\">\n".$OUT."</select>\n";
        }
 }
 //
@@ -525,26 +599,22 @@ function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") {
        if ($MODE == "action") $wht = "(what='' OR what IS NULL) AND action !='login'";
        $result = SQL_QUERY_ESC("SELECT %s, title FROM "._MYSQL_PREFIX."_admin_menu WHERE ".$wht." ORDER BY sort",
         array($MODE), __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) > 0)
-       {
+       if (SQL_NUMROWS($result) > 0) {
                // Load menu as selection
                $OUT = "<SELECT name=\"".$MODE."_menu";
                if ((!empty($defid)) || ($defid == "0")) $OUT .= "[".$defid."]";
                $OUT .= "\" size=\"1\" class=\"admin_select\">
        <OPTION value=\"\">".SELECT_NONE."</OPTION>\n";
-               while (list($menu, $title) = SQL_FETCHROW($result))
-               {
+               while (list($menu, $title) = SQL_FETCHROW($result)) {
                        $OUT .= "  <OPTION value=\"".$menu."\"";
                        if ((!empty($default)) && ($default == $menu)) $OUT .= " selected=\"selected\"";
                        $OUT .= ">".$title."</OPTION>\n";
-               }
+               } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
                $OUT .= "</SELECT>\n";
-       }
-        else
-       {
+       } else {
                // No menus???
                $OUT = ADMIN_PROBLEM_NO_MENU;
        }
@@ -552,41 +622,20 @@ function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") {
        // Return output
        return $OUT;
 }
-//
-function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="config=0", $translateComma = array(), $alwaysAdd=false)
-{
+// Save settings to the database
+function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="config=0", $translateComma=array(), $alwaysAdd=false) {
        global $_CONFIG, $cacheArray, $cacheInstance;
+
+       // Prepare all arrays, variables
        $DATA = array();
-       $skip = false; $TEST2 = "";
-       foreach ($POST as $id=>$val) {
+       $skip = false;
+
+       // Now, walk through all entries and prepare them for saving
+       foreach ($POST as $id => $val) {
                // Process only formular field but not submit buttons ;)
                if ($id != "ok") {
                        // Do not save the ok value
-                       $TEST = substr($id, -3);
-                       if ((($TEST == "_ye") || ($TEST == "_mo") || ($TEST == "_we") || ($TEST == "_da") || ($TEST == "_ho") || ($TEST == "_mi") || ($TEST == "_se")) && (isset($val))) {
-                               // Found a multi-selection for timings?
-                               $TEST = substr($id, 0, -3);
-                               if ((isset($POST[$TEST."_ye"])) && (isset($POST[$TEST."_mo"])) && (isset($POST[$TEST."_we"])) && (isset($POST[$TEST."_da"])) && (isset($POST[$TEST."_ho"])) && (isset($POST[$TEST."_mi"])) && (isset($POST[$TEST."_se"])) && ($TEST != $TEST2)) {
-                                       // Generate timestamp
-                                       $POST[$TEST] = CREATE_TIMESTAMP_FROM_SELECTIONS($TEST, $POST);
-                                       $DATA[] = "$TEST='".$POST[$TEST]."'";
-
-                                       // Remove data from array
-                                       unset($POST[$TEST."_ye"]);
-                                       unset($POST[$TEST."_mo"]);
-                                       unset($POST[$TEST."_we"]);
-                                       unset($POST[$TEST."_da"]);
-                                       unset($POST[$TEST."_ho"]);
-                                       unset($POST[$TEST."_mi"]);
-                                       unset($POST[$TEST."_se"]);
-
-                                       // Skip adding
-                                       unset($id); $skip = true; $TEST2 = $TEST;
-                               }
-                       } else {
-                               // Process this entry
-                               $skip = false; $TEST2 = "";
-                       }
+                       CONVERT_SELECTIONS_TO_TIMESTAMP($POST, $DATA, $id, $skip);
 
                        // Shall we process this ID? It muss not be empty, of course
                        if ((!$skip) && (!empty($id))) {
@@ -596,8 +645,8 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
                                // Translate the value? (comma to dot!)
                                if ((is_array($translateComma)) && (in_array($id, $translateComma))) {
                                        // Then do it here... :)
-                                       $val = str_replace(",", ".", $val);
-                               }
+                                       $val = REVERT_COMMA($val);
+                               } // END - if
 
                                // Shall we add numbers or strings?
                                $test = (float)$val;
@@ -611,9 +660,9 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
 
                                // Update current configuration
                                $_CONFIG[$id] = $val;
-                       }
-               }
-       }
+                       } // END - if
+               } // END - if
+       } // END - foreach
 
        // Check if entry does exist
        $result = false;
@@ -623,7 +672,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
                } else {
                        $result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX.$tableName." LIMIT 1", __FILE__, __LINE__);
                }
-       }
+       } // END - if
 
        if (SQL_NUMROWS($result) == 1) {
                // "Implode" all data to single string
@@ -638,7 +687,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
                        // Split up
                        $line = explode("=", $entry);
                        $KEYs[] = $line[0]; $VALUEs[] = $line[1];
-               }
+               } // END - foreach
 
                // Add both in one line
                $KEYs = implode(", ", $KEYs);
@@ -654,12 +703,8 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
        // Simply run generated SQL string
        $result = SQL_QUERY($SQL, __FILE__, __LINE__);
 
-       // Is the config table updated and the cache extension installed?
-       if ((GET_EXT_VERSION("cache") >= "0.1.2") && ($tableName == "_config")) {
-               // Remove it here...
-               if ($cacheInstance->cache_file("config", true)) $cacheInstance->cache_destroy();
-               unset($cacheArray);
-       }
+       // Rebuild cache
+       REBUILD_CACHE("config", "config");
 
        // Settings saved
        LOAD_TEMPLATE("admin_settings_saved", false, "<STRONG class=\"admin_done\">".SETTINGS_SAVED."</STRONG>");
@@ -671,6 +716,7 @@ function ADMIN_MAKE_MENU_SELECTION($menu, $type, $name, $default="") {
 
        // Init the selection box
        $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)) {
                // Is this a PHP script?
@@ -679,7 +725,8 @@ function ADMIN_MAKE_MENU_SELECTION($menu, $type, $name, $default="") {
                        $test = sprintf("%sinc/modules/%s/%s", PATH, $menu, $file);
                        if ((is_file($test)) && (is_readable($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") {
@@ -689,47 +736,46 @@ function ADMIN_MAKE_MENU_SELECTION($menu, $type, $name, $default="") {
                                } // END - if
                        } // END - if
                } // END - if
-       }
+       } // END - while
+
+       // Close dir and selection box
        closedir($handle);
        $OUT .= "</SELECT>\n";
        return $OUT;
 }
 //
-function ADMIN_USER_PROFILE_LINK($uid, $title="", $wht="list_user")
-{
-       if (($title == "") && ($title != "0")) { $title = $uid; }
-       if (($title == "0") && ($wht == "list_refs"))
-       {
+function ADMIN_USER_PROFILE_LINK($uid, $title="", $wht="list_user") {
+       if (($title == "") && ($title != "0")) {
+               // Set userid as title
+               $title = $uid;
+       } // END - if
+
+       if (($title == "0") && ($wht == "list_refs")) {
                // Return title again
                return $title;
-       }
+       } // END - if
 
        //* DEBUG: */ echo "A:".$title."<br />";
        // Return link
        return "<A href=\"".URL."/modules.php?module=admin&amp;what=".$wht."&amp;u_id=".$uid."\" title=\"".ADMIN_USER_PROFILE_TITLE."\">".$title."</A>";
 }
 //
-function ADMIN_CHECK_MENU_MODE()
-{
+function ADMIN_CHECK_MENU_MODE() {
        global $_CONFIG, $cacheArray;
 
        // Set the global mode as the mode for all admins
        $MODE = $_CONFIG['admin_menu']; $ADMIN = $MODE;
 
        // Check individual settings of current admin
-       if (isset($cacheArray['admins']['la_mode'][get_session('admin_login')]))
-       {
+       if (isset($cacheArray['admins']['la_mode'][get_session('admin_login')])) {
                // Load from cache
                $ADMIN = $cacheArray['admins']['la_mode'][get_session('admin_login')];
                $_CONFIG['cache_hits']++;
-       }
-        elseif (GET_EXT_VERSION("admins") >= "0.6.7")
-       {
+       } 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(get_session('admin_login')), __FILE__, __LINE__);
-               if (SQL_NUMROWS($result) == 1)
-               {
+               if (SQL_NUMROWS($result) == 1) {
                        // Load data
                        list($ADMIN) = SQL_FETCHROW($result);
                }
@@ -750,7 +796,7 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
        $cnt = 0; $newStatus = "Y";
        if ((is_array($IDs)) && (count($IDs) > 0)) {
                // "Walk" all through and count them
-               foreach ($IDs as $id=>$selected) {
+               foreach ($IDs as $id => $selected) {
                        // Secure the ID number
                        $id = bigintval($id);
 
@@ -786,123 +832,342 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
                LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NOTHING_SELECTED_CHANGE);
        }
 }
-// Delete rows by given ID numbers
-function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $row, $columns = array(), $filterFunctions = array(), $deleteNow=false, $idRow="id") {
+// Send mails for del/edit/lock build modes
+function ADMIN_SEND_BUILD_MAILS ($mode, $table, $content, $id, $subjectPart="") {
+       // Default subject is the subject part
+       $subject = $subjectPart;
+
+       // Is the subject part not set?
+       if (empty($subjectPart)) {
+               // Then use it from the mode
+               $subject = strtoupper($mode);
+       } // END - if
+
+       // Is the raw userid set?
+       if ($_POST['uid_raw'][$id] > 0) {
+               // Generate subject
+               $eval = "\$subjectLine = MEMBER_".$subject."_".strtoupper($table)."_SUBJECT;";
+               eval($eval);
+
+               // Load email template
+               if (!empty($subjectPart)) {
+                       $mail = LOAD_EMAIL_TEMPLATE("member_".$mode."_".strtolower($subjectPart)."_".$table, $content);
+               } else {
+                       $mail = LOAD_EMAIL_TEMPLATE("member_".$mode."_".$table, $content);
+               }
+
+               // Send email out
+               SEND_EMAIL($_POST['uid_raw'][$id], $subjectLine, $mail);
+       } // END - if
+
+       // Generate subject
+       $eval = "\$subjectLine = ADMIN_".$subject."_".strtoupper($table)."_SUBJECT;";
+       eval($eval);
+
+       // Send admin notification out
+       if (!empty($subjectPart)) {
+               SEND_ADMIN_NOTIFICATION($subjectLine, "admin_".$mode."_".strtolower($subjectPart)."_".$table, $content, $_POST['uid_raw'][$id]);
+       } else {
+               SEND_ADMIN_NOTIFICATION($subjectLine, "admin_".$mode."_".$table, $content, $_POST['uid_raw'][$id]);
+       }
+}
+// Build a special template list
+function ADMIN_BUILD_LIST ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn) {
        global $_CONFIG;
        $OUT = ""; $SW = 2;
-       if ((is_array($IDs)) && (count($IDs) > 0)) {
-               // "Walk" through all entries and count them
-               if ($deleteNow) {
-                       // Delete them
-                       die("DELETE!");
-               } else {
-                       // List for confirmation
-                       foreach ($IDs as $id => $selected) {
-                               // Secure ID number
-                               $id = bigintval($id);
-
-                               // Will always be 1 ;-)
-                               if ($selected == 1) {
-                                       // Get result from a given column array and table name
-                                       $result = SQL_RESULT_FROM_ARRAY($table, $columns, $idRow, $id);
-
-                                       // Is there one entry?
-                                       if (SQL_NUMROWS($result) == 1) {
-                                               // Load all data
-                                               $content = SQL_FETCHARRAY($result);
-
-                                               // Filter all data
-                                               foreach ($content as $key=>$value) {
-                                                       // Is a filter function set?
-                                                       $idx = array_search($key, $columns, true);
-                                                       if (!empty($filterFunctions[$idx])) {
-                                                               // Then call it!
-                                                               $content[$key] = call_user_func($filterFunctions[$idx], $value);
-                                                       }
-                                               }
 
-                                               // Add color switching
-                                               $content['sw'] = $SW;
+       // "Walk" through all entries
+       foreach ($IDs as $id => $selected) {
+               // Secure ID number
+               $id = bigintval($id);
+
+               // Get result from a given column array and table name
+               $result = SQL_RESULT_FROM_ARRAY($table, $columns, $idColumn, $id, __FILE__, __LINE__);
 
-                                               // Then list it again...
-                                               $OUT .= LOAD_TEMPLATE("admin_del_".$table."_row", true, $content);
-                                               $SW = 3 - $SW;
+               // Is there one entry?
+               if (SQL_NUMROWS($result) == 1) {
+                       // Load all data
+                       $content = SQL_FETCHARRAY($result);
+
+                       // Filter all data
+                       foreach ($content as $key => $value) {
+                               // Search index
+                               $idx = array_search($key, $columns, true);
+
+                               // Do we have a userid?
+                               if ($key == "userid") {
+                                       // Add it again as raw id
+                                       $content['uid'] = bigintval($value);
+                               } // END - if
+
+                               // Handle the call in external function
+                               $content[$key] = HANDLE_EXTRA_VALUES($filterFunctions[$idx], $value, $extraValues[$idx]);
+                       } // END - foreach
+
+                       // Add color switching
+                       $content['sw'] = $SW;
+
+                       // Then list it
+                       $OUT .= LOAD_TEMPLATE("admin_".$listType."_".$table."_row", true, $content);
+
+                       // Switch color
+                       $SW = 3 - $SW;
+               } // END - if
+
+               // Free the result
+               SQL_FREERESULT($result);
+       } // END - foreach
+
+       // Load master template
+       LOAD_TEMPLATE("admin_".$listType."_".$table."", false, $OUT);
+}
+// Change status of "build" list
+function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray) {
+       // All valid entries? (We hope so here!)
+       if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (count($statusArray) > 0)) {
+               // "Walk" through all entries
+               foreach ($IDs as $id => $sel) {
+                       // Construct SQL query
+                       $SQL = "UPDATE "._MYSQL_PREFIX."_".$table." SET";
+
+                       // Load data of entry
+                       $result = SQL_QUERY_ESC("SELECT * FROM "._MYSQL_PREFIX."_%s WHERE %s=%s LIMIT 1",
+                               array($table, $idColumn, $id), __FILE__, __LINE__);
+
+                       // Fetch the data
+                       $content = SQL_FETCHARRAY($result);
+
+                       // Free the result
+                       SQL_FREERESULT($result);
+
+                       // Add all status entries (e.g. status column last_updated or so)
+                       $newStatus = "UNKNOWN";
+                       $oldStatus = "UNKNOWN";
+                       $statusColumn = "unknown";
+                       foreach ($statusArray as $column => $statusInfo) {
+                               // Does the entry exist?
+                               if ((isset($content[$column])) && (isset($statusInfo[$content[$column]]))) {
+                                       // Add these entries for update
+                                       $SQL .= sprintf(" %s='%s',", SQL_ESCAPE($column), SQL_ESCAPE($statusInfo[$content[$column]]));
+
+                                       // Remember status
+                                       if ($statusColumn == "unknown") {
+                                               // Always (!!!) change status column first!
+                                               $oldStatus = $content[$column];
+                                               $newStatus = $statusInfo[$oldStatus];
+                                               $statusColumn = $column;
+                                       } // END - if
+                               } elseif (isset($content[$column])) {
+                                       // Unfinished!
+                                       mxchange_die("{--".__FUNCTION__."--}:UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
+                               }
+                       } // END - foreach
+
+                       // Add other columns as well
+                       foreach ($_POST as $key => $entries) {
+                               // Skip id, raw userid and 'do_lock'
+                               if (!in_array($key, array($idColumn, 'uid_raw', 'do_lock'))) {
+                                       // Are there brackets () at the end?
+                                       if (substr($entries[$id], -2, 2) == "()") {
+                                               // Direct SQL command found
+                                               $SQL .= sprintf(" %s=%s,", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
+                                       } else {
+                                               // Add regular entry
+                                               $SQL .= sprintf(" %s='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
                                        }
+                               } // END - if
+                       } // END - if
+
+                       // Finish SQL statement
+                       $SQL = substr($SQL, 0, -1) . " WHERE ".$idColumn."=".bigintval($id)." AND ".$statusColumn."='".$oldStatus."' LIMIT 1";
+
+                       // Run the SQL
+                       SQL_QUERY($SQL, __FILE__, __LINE__);
+
+                       // Do we have an URL?
+                       if (isset($content['url'])) {
+                               // Then add a framekiller test as well
+                               $content['frametester'] = FRAMETESTER($content['url']);
+                       } // END - if
+
+                       // Send "build mails" out
+                       ADMIN_SEND_BUILD_MAILS($mode, $table, $content, $id, $statusInfo[$content[$column]]);
+               } // END - foreach
+       } // END - if
+}
+// Delete rows by given ID numbers
+function ADMIN_DELETE_ENTRIES_CONFIRM ($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))) {
+               // Shall we delete here or list for deletion?
+               if ($deleteNow) {
+                       // The base SQL command:
+                       $SQL = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_%s WHERE %s IN (%s)";
+
+                       // Delete them all
+                       $idList = "";
+                       foreach ($IDs as $id => $sel) {
+                               // Is there a userid?
+                               if (isset($_POST['uid_raw'][$id])) {
+                                       // Load all data from that id
+                                       $result = SQL_QUERY_ESC("SELECT * FROM "._MYSQL_PREFIX."_%s WHERE %s=%s LIMIT 1",
+                                               array($table, $idColumn, $id), __FILE__, __LINE__);
+
+                                       // Fetch the data
+                                       $content = SQL_FETCHARRAY($result);
 
                                        // Free the result
                                        SQL_FREERESULT($result);
-                               }
-                       }
 
-                       // Load master template
-                       LOAD_TEMPLATE("admin_del_".$table."", false, $OUT);
+                                       // Send "build mails" out
+                                       ADMIN_SEND_BUILD_MAILS("del", $table, $content, $id);
+                               } // END - if
+
+                               // Add id number
+                               $idList .= $id.",";
+                       } // END - foreach
+
+                       // Run the query
+                       SQL_QUERY($SQL, array($table, $idColumn, substr($idList, 0, -1)), __FILE__, __LINE__);
+
+                       // Was this fine?
+                       if (SQL_AFFECTEDROWS() == count($IDs)) {
+                               // All deleted
+                               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ALL_ENTRIES_REMOVED);
+                       } else {
+                               // Some are still there :(
+                               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(ADMIN_SOME_ENTRIES_NOT_DELETED, SQL_AFFECTEDROWS(), count($IDs)));
+                       }
+               } else {
+                       // List for deletion confirmation
+                       ADMIN_BUILD_LIST("del", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
                }
-       }
+       } // END - if
 }
 // Edit rows by given ID numbers
-function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $row, $columns = array(), $filterFunctions = array(), $editNow=false, $idRow="id") {
-       global $_CONFIG;
-       $OUT = ""; $SW = 2;
-       if ((is_array($IDs)) && (count($IDs) > 0)) {
-               // "Walk" through all entries and count them
+function ADMIN_EDIT_ENTRIES_CONFIRM ($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))) {
+               // Shall we change here or list for editing?
                if ($editNow) {
-                       // Delete them
-                       die("EDIT!");
-               } else {
-                       // List for confirmation
-                       foreach ($IDs as $id => $selected) {
-                               // Secure ID number
-                               $id = bigintval($id);
-
-                               // Will always be 1 ;-)
-                               if ($selected == 1) {
-                                       // Get result from a given column array and table name
-                                       $result = SQL_RESULT_FROM_ARRAY($table, $columns, $idRow, $id);
-
-                                       // Is there one entry?
-                                       if (SQL_NUMROWS($result) == 1) {
-                                               // Load all data
-                                               $content = SQL_FETCHARRAY($result);
-
-                                               // Filter all data
-                                               foreach ($content as $key=>$value) {
-                                                       // Is a filter function set?
-                                                       $idx = array_search($key, $columns, true);
-                                                       if (!empty($filterFunctions[$idx])) {
-                                                               // Then call it!
-                                                               $content[$key] = call_user_func($filterFunctions[$idx], $value);
-                                                       }
-                                               }
+                       // Change them all
+                       $affected = 0;
+                       foreach ($IDs as $id => $sel) {
+                               // Prepare content array (new values)
+                               $content = array();
+
+                               // Prepare SQL for this row
+                               $SQL = "UPDATE "._MYSQL_PREFIX."_".$table." SET";
+                               foreach ($_POST as $key => $entries) {
+                                       // Skip raw userid which is always invalid
+                                       if ($key == "uid_raw") {
+                                               // Continue with next field
+                                               continue;
+                                       } // END - if
+
+                                       // Is entries an array?
+                                       if (($key != $idColumn) && (is_array($entries)) && (isset($entries[$id]))) {
+                                               // Add this entry to content
+                                               $content[$key] = $entries[$id];
+
+                                               // Send data through the filter function if found
+                                               if ((isset($filterFunctions[$key])) && (isset($extraValues[$key]))) {
+                                                       // Filter function set!
+                                                       $entries[$id] = HANDLE_EXTRA_VALUES($filterFunctions[$key], $entries[$id], $extraValues[$key]);
+                                               } // END - if
+
+                                               // Then add this value
+                                               $SQL .= sprintf(" %s='%s',",
+                                                       SQL_ESCAPE($key),
+                                                       SQL_ESCAPE($entries[$id])
+                                               );
+                                       } elseif (($key != $idColumn) && (!is_array($entries))) {
+                                               // Add normal entries as well!
+                                               $content[$key] =  $entries;
+                                       }
 
-                                               // Add color switching
-                                               $content['sw'] = $SW;
+                                       // Do we have an URL?
+                                       if ($key == "url") {
+                                               // Then add a framekiller test as well
+                                               $content['frametester'] = FRAMETESTER($content[$key]);
+                                       } // END - if
+                               } // END - foreach
 
-                                               // Then list it again...
-                                               $OUT .= LOAD_TEMPLATE("admin_edit_".$table."_row", true, $content);
-                                               $SW = 3 - $SW;
-                                       }
+                               // Finish SQL command
+                               $SQL = substr($SQL, 0, -1) . " WHERE ".$idColumn."=".bigintval($id)." LIMIT 1";
 
-                                       // Free the result
-                                       SQL_FREERESULT($result);
-                               }
-                       }
+                               // Run this query
+                               SQL_QUERY($SQL, __FILE__, __LINE__);
+
+                               // Add affected rows
+                               $affected += SQL_AFFECTEDROWS();
+
+                               // Load all data from that id
+                               $result = SQL_QUERY_ESC("SELECT * FROM "._MYSQL_PREFIX."_%s WHERE %s=%s LIMIT 1",
+                                       array($table, $idColumn, $id), __FILE__, __LINE__);
+
+                               // Fetch the data
+                               global $DATA;
+                               $DATA = SQL_FETCHARRAY($result);
+
+                               // Free the result
+                               SQL_FREERESULT($result);
 
-                       // Load master template
-                       LOAD_TEMPLATE("admin_edit_".$table."", false, $OUT);
+                               // Send "build mails" out
+                               ADMIN_SEND_BUILD_MAILS("edit", $table, $content, $id);
+                       } // END - foreach
+
+                       // Was this fine?
+                       if ($affected == count($IDs)) {
+                               // All deleted
+                               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ALL_ENTRIES_EDITED);
+                       } else {
+                               // Some are still there :(
+                               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(ADMIN_SOME_ENTRIES_NOT_EDITED, $affected, count($IDs)));
+                       }
+               } else {
+                       // List for editing
+                       ADMIN_BUILD_LIST("edit", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
                }
-       }
+       } // END - if
 }
-// Checks proxy settins by fetching check-updates2.php from www.mxchange.org
+// Un-/lock rows by given ID numbers
+function ADMIN_LOCK_ENTRIES_CONFIRM ($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) || (count($statusArray) == 1))) {
+               // Shall we un-/lock here or list for locking?
+               if ($lockNow) {
+                       // Un-/lock entries
+                       ADMIN_BUILD_STATUS_HANDLER("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+               } else {
+                       // List for editing
+                       ADMIN_BUILD_LIST("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+               }
+       } // END - if
+}
+// Undelete rows by given ID numbers
+function ADMIN_UNDELETE_ENTRIES_CONFIRM ($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) || (count($statusArray) == 1))) {
+               // Shall we un-/lock here or list for locking?
+               if ($lockNow) {
+                       // Undelete entries
+                       ADMIN_BUILD_STATUS_HANDLER("undelete", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
+               } else {
+                       // List for editing
+                       ADMIN_BUILD_LIST("undelete", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+               }
+       } // END - if
+}
+// Checks proxy settins by fetching check-updates3.php from www.mxchange.org
 function ADMIN_TEST_PROXY_SETTINGS ($settingsArray) {
        global $_CONFIG;
-       // By default they are invalid
-       $valid = false;
 
        // Set temporary the new settings
        $_CONFIG = array_merge($_CONFIG, $settingsArray);
 
        // Now get the test URL
-       $content = MXCHANGE_OPEN("check-updates2.php");
+       $content = GET_URL("check-updates3.php");
 
        // Is the first line with "200 OK"?
        $valid = eregi("200 OK", $content[0]);
@@ -1002,5 +1267,21 @@ function ADMIN_RESET_PASSWORD ($login, $password) {
        // Return output
        return ADMIN_PASSWORD_RESET_DONE;
 }
+// Solves a task by given id number
+function ADMIN_SOLVE_TASK ($id) {
+       // Update the task data
+       ADMIN_UPDATE_TASK_DATA($id, "status", "SOLVED");
+}
+// Marks a given task as deleted
+function ADMIN_DELETE_TASK ($id) {
+       // Update the task data
+       ADMIN_UPDATE_TASK_DATA($id, "status", "DELETED");
+}
+// Function to update task data
+function ADMIN_UPDATE_TASK_DATA ($id, $row, $data) {
+       // Update the task
+       SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET %s='%s' WHERE id=%s LIMIT 1",
+               array($row, $data, bigintval($id)), __FILE__, __LINE__);
+}
 //
 ?>