Fixes for 'Can't use function return value in write context in /foo/bar.php'

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

diff --git a/inc/modules/admin/what-config_home.php b/inc/modules/admin/what-config_home.php
index 6ce223e3136fb873070362b89108a129c913aa89..d9b8a9addee4e590b9f836ad34121b8a06681d70 100644 (file)
--- a/inc/modules/admin/what-config_home.php
+++ b/inc/modules/admin/what-config_home.php
@@ -32,13 +32,13 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 $sub = "";
 if (!empty($_GET['sub'])) $sub = $_GET['sub'];
@@ -50,42 +50,37 @@ case "": // Output selection table
        break;
 
 case "settings": // Settings related to the index page
-       if (isset($_POST['ok']))
-       {
+       if (isset($_POST['ok'])) {
                // Save settings
                ADMIN_SAVE_SETTINGS($_POST);
                OUTPUT_HTML("<A href=\"".URL."/modules.php?module=admin&amp;what=config_home&amp;sub=settings\">".ADMIN_CONTINUE_TO_CONFIG."</A>");
-       }
-        else
-       {
+       } else {
                // Prepare data for the template
                $content = array_fill(-1, 60, "");
-               $content[$_CONFIG['index_delay']] = " selected=\"selected\"";
+               $content[getConfig('index_delay')] = " selected=\"selected\"";
 
-               define('__INDEX_COOKIE_SELECTION', CREATE_TIME_SELECTIONS($_CONFIG['index_cookie'], "index_cookie", "YMWD"));
+               define('__INDEX_COOKIE_SELECTION', CREATE_TIME_SELECTIONS(getConfig('index_cookie'), "index_cookie", "YMWD"));
                LOAD_TEMPLATE("admin_config_home_settings", false, $content);
        }
        break;
 
 case "target": // Set which what-file will be placed in home-page (only modules.php?module=index)
-       if (isset($_GET['home']))
-       {
+       if (isset($_GET['home'])) {
                // Set new home
-               $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET index_home='%s' WHERE config='0' LIMIT 1", array($_GET['home']), __FILE__, __LINE__);
-               $_CONFIG['index_home'] = $_GET['home'];
-       }
+               UPDATE_CONFIG("index_home", SQL_ESCAPE($_GET['home']));
+       } // END - if
 
        // Load all what menu points
        $result = SQL_QUERY("SELECT id, what, title
- FROM "._MYSQL_PREFIX."_guest_menu
- WHERE action='main' AND what != '' AND locked='N'
- ORDER BY sort", __FILE__, __LINE__);
+FROM "._MYSQL_PREFIX."_guest_menu
+WHERE action='main' AND what != '' AND what IS NOT NULL AND locked='N'
+ORDER BY sort ASC", __FILE__, __LINE__);
 
        $SW = 2; $OUT = ""; $atitle = "";
        while (list($id, $wht, $wtitle) = SQL_FETCHROW($result))
        {
                $LINK = "<A href=\"".URL."/modules.php?module=admin&amp;what=config_home&amp;sub=target&amp;home=".$wht."\">"._IS_NEW_HOME."</A>";
-               if ($wht == $_CONFIG['index_home'])
+               if ($wht == getConfig('index_home'))
                {
                        // Is current home
                        $LINK   = "<STRONG class=\"admin_note\">"._IS_CURRENT_HOME."</STRONG>";