A *lot* more code-cleanups, errors in CSS fixed (missing brackets) and frameset suppo...

[mailer.git] / inc / install-inc.php

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 043c701cfcadb65afcf79cae53fa278981ffedad..5e0a39a00df5a9904b180668eb0eece4990da176 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -48,9 +48,9 @@ function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0)
        if (file_exists($file)) {
                $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 (is_resource($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 (is_resource($fp_tmp)) {
                                while (!feof($fp)) {
                                        $line = fgets ($fp, 10240);
@@ -82,7 +82,7 @@ function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0)
                        }
                }
        } else {
-               OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<BR>");
+               OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<br />");
        }
 }
 
@@ -156,9 +156,9 @@ if ((!mxchange_installed) || (!admin_registered))
                if ((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) {
                        OUTPUT_HTML("<SPAN class=\"install_fatal\">");
                        foreach ($FATAL as $key=>$err) {
-                               OUTPUT_HTML("  <STRONG>&middot;</STRONG>&nbsp;".FATAL_NO.($key + 1).":&nbsp;".$err."<BR>\n");
+                               OUTPUT_HTML("  <STRONG>&middot;</STRONG>&nbsp;".FATAL_NO.($key + 1).":&nbsp;".$err."<br />");
                        }
-                       OUTPUT_HTML("</SPAN><BR>");
+                       OUTPUT_HTML("</SPAN><br />");
                }
                define('__MYSQL_HOST'  , $mysql['host']);
                define('__MYSQL_DBASE' , $mysql['dbase']);
@@ -284,20 +284,6 @@ if ((!mxchange_installed) || (!admin_registered))
   </TD>
 </TR>
 <TR><TD colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</TD></TR>
-<TR>
-  <TD class=\"install\" align=\"right\">".LANG_FRAMESET_ACTIVE.":&nbsp;&nbsp;</TD>
-  <TD>
-    <SELECT name=\"frameset\" size=\"1\" class=\"install_select\">
-      <OPTION value=\"true\"");
-               if (frameset_active) OUTPUT_HTML(" selected=\"selected\"");
-               OUTPUT_HTML(">".YES."</OPTION>
-      <OPTION value=\"false\"");
-               if (!frameset_active) OUTPUT_HTML(" selected=\"selected\"");
-               OUTPUT_HTML(">".NO."</OPTION>
-    </SELECT>
-  </TD>
-</TR>
-<TR><TD colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</TD></TR>
 <TR>
   <TD class=\"install\" align=\"right\">".INSTALL_ENABLE_BACKLINK.":&nbsp;&nbsp;</TD>
   <TD>
@@ -391,7 +377,6 @@ if ((!mxchange_installed) || (!admin_registered))
                                                install_WriteData($_POST['spath']."inc/config.php", "NULLPASS-WARNING", "define ('warn_no_pass', ", ");", $_POST['warn_no_pass'], 0);
                                                install_WriteData($_POST['spath']."inc/config.php", "WRITE-FOOTER", "define ('WRITE_FOOTER', ", ");", $_POST['wfooter'], 0);
                                                install_WriteData($_POST['spath']."inc/config.php", "BACKLINK", "define ('ENABLE_BACKLINK', ", ");", $_POST['blink'], 0);
-                                               // install_WriteData($_POST['spath']."inc/config.php", "FRAMESET", "define ('frameset_active', ", ");", $_POST['frameset'], 0);
                                                // install_WriteData($_POST['spath']."inc/config.php", "OUTPUT-MODE", "define ('OUTPUT_MODE', \"", "\");", $_POST['omode'], 0);
                                                install_WriteData($_POST['spath']."inc/config.php", "MYSQL-HOST", "     'host'     => \"", "\",", $mysql['host'], 0);
                                                install_WriteData($_POST['spath']."inc/config.php", "MYSQL-DBASE", "    'dbase'    => \"", "\",", $mysql['dbase'], 0);