Complete rewrite of and , wrapper functions added, see bug #101

[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 d9b8a9addee4e590b9f836ad34121b8a06681d70..7a0d4ccfd0e4b8e463891e012667f508e05e95a9 100644 (file)
--- a/inc/modules/admin/what-config_home.php
+++ b/inc/modules/admin/what-config_home.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 $sub = "";
-if (!empty($_GET['sub'])) $sub = $_GET['sub'];
+if (REQUEST_ISSET_GET(('sub'))) $sub = REQUEST_GET('sub');
 
 switch ($sub)
 {
@@ -50,10 +50,10 @@ case "": // Output selection table
        break;
 
 case "settings": // Settings related to the index page
-       if (isset($_POST['ok'])) {
+       if (IS_FORM_SENT()) {
                // 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>");
+               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 {
                // Prepare data for the template
                $content = array_fill(-1, 60, "");
@@ -65,37 +65,35 @@ case "settings": // Settings related to the index page
        break;
 
 case "target": // Set which what-file will be placed in home-page (only modules.php?module=index)
-       if (isset($_GET['home'])) {
+       if (REQUEST_ISSET_GET(('home'))) {
                // Set new home
-               UPDATE_CONFIG("index_home", SQL_ESCAPE($_GET['home']));
+               UPDATE_CONFIG("index_home", SQL_ESCAPE(REQUEST_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 what IS NOT NULL AND locked='N'
-ORDER BY sort ASC", __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 == getConfig('index_home'))
-               {
+       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 == getConfig('index_home')) {
                        // Is current home
-                       $LINK   = "<STRONG class=\"admin_note\">"._IS_CURRENT_HOME."</STRONG>";
-                       $atitle = "<STRONG class=\"admin_note\">".$atitle."</STRONG>";
-                       $wtitle = "<STRONG class=\"admin_note\">".$wtitle."</STRONG>";
+                       $LINK   = "<div class=\"admin_note\">{!_IS_CURRENT_HOME!}</div>";
+                       $atitle = "<div class=\"admin_note\">".$atitle."</div>";
+                       $wtitle = "<div class=\"admin_note\">".$wtitle."</div>";
                }
 
                // Add row...
-               $OUT .= "<TR>
-         <TD class=\"switch_sw".$SW." bottom right\">&nbsp;".$id."</TD>
-         <TD class=\"switch_sw".$SW." bottom right\">&nbsp;".$wtitle."</TD>
-         <TD class=\"switch_sw".$SW." bottom\" align=\"center\">
+               $OUT .= "<tr>
+         <td class=\"switch_sw".$SW." bottom right\">&nbsp;".$id."</td>
+         <td class=\"switch_sw".$SW." bottom right\">&nbsp;".$wtitle."</td>
+         <td class=\"switch_sw".$SW." bottom\" align=\"center\">
            ".$LINK."
-         </TD>
-       </TR>\n";
+         </td>
+       </tr>\n";
 
                // Switch color
                $SW = 3 - $SW;
@@ -109,5 +107,6 @@ ORDER BY sort ASC", __FILE__, __LINE__);
        LOAD_TEMPLATE("admin_config_home");
        break;
 }
+
 //
 ?>