Installation page=welcome rewritten to use div

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

diff --git a/inc/install-inc.php b/inc/install-inc.php
index eea54299728eeef13f7aa9e3fdd7a1dd21463fc4..6994276a42326fd1b68177fff21c297a58deee21 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -42,7 +42,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
@@ -51,7 +51,7 @@ $mysql = array();
 if ((REQUEST_ISSET_POST(('mysql'))) && (is_array(REQUEST_POST('mysql')))) $mysql = REQUEST_POST('mysql');
 
 // Check if both passwords from SMTP are matching
-if ((REQUEST_ISSET_GET(('page')) && (REQUEST_GET('page') == 5))) {
+if ((REQUEST_ISSET_GET('page') && (REQUEST_GET('page') == 5))) {
        // Okay, we have to check it
        if (REQUEST_ISSET_POST(('smtp_user')) && (!REQUEST_ISSET_POST(('smtp_host')))) {
                // Hostname not set
@@ -182,7 +182,7 @@ if ((!isInstalled()) || (!isAdminRegistered()))
                define('__SMTP_USER'    , REQUEST_POST('smtp_user'));
                define('__SMTP_PASS'    , REQUEST_POST('smtp_pass1'));
                OUTPUT_HTML("<form action=\"{!__BURL_ACTION!}/install.php?page=finalize\" method=\"POST\" target=\"_self\">
-<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
+<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_main\">
 <tr>
   <td colspan=\"2\" align=\"center\">
     <div class=\"install\">{--HEADER_TEXT_PAGE5--}</strong>
@@ -190,7 +190,7 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 </tr>
 <tr><td colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</td></tr>
 <tr>
-  <td colspan=\"2\"><span class=\"install_intro\">
+  <td colspan=\"2\"><span class=\"install_text\">
     {--TEXT_PAGE_5--}
   </span></td>
 </tr>
@@ -200,10 +200,10 @@ if ((!isInstalled()) || (!isAdminRegistered()))
   <td>
     <select name=\"omode\" size=\"1\" class=\"install_select\">
       <option value=\"render\"");
-               if (constant('OUTPUT_MODE') == "render") OUTPUT_HTML(" selected=\"selected\"");
+               if (constant('OUTPUT_MODE') == "render") OUTPUT_HTML(' selected="selected"');
                OUTPUT_HTML(">{--MODE_RENDER--}</option>
       <option value=\"direct\"");
-               if (constant('OUTPUT_MODE') == "direct") OUTPUT_HTML(" selected=\"selected\"");
+               if (constant('OUTPUT_MODE') == "direct") OUTPUT_HTML(' selected="selected"');
                OUTPUT_HTML(">{--MODE_DIRECT--}</option>
     </select>
   </td>
@@ -214,10 +214,10 @@ if ((!isInstalled()) || (!isAdminRegistered()))
   <td>
     <select name=\"warn_no_pass\" size=\"1\" class=\"install_select\">
       <option value=\"true\"");
-               if (isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
+               if (isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(' selected="selected"');
                OUTPUT_HTML(">{--YES--}</option>
       <option value=\"false\"");
-               if (!isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
+               if (!isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(' selected="selected"');
                OUTPUT_HTML(">{--NO--}</option>
     </select>
   </td>
@@ -228,10 +228,10 @@ if ((!isInstalled()) || (!isAdminRegistered()))
   <td>
     <select name=\"wfooter\" size=\"1\" class=\"install_select\">
       <option value=\"true\"");
-               if (isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
+               if (isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(' selected="selected"');
                OUTPUT_HTML(">{--YES--}</option>
       <option value=\"false\"");
-               if (!isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
+               if (!isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(' selected="selected"');
                OUTPUT_HTML(">{--NO--}</option>
     </select>
   </td>
@@ -242,10 +242,10 @@ if ((!isInstalled()) || (!isAdminRegistered()))
   <td>
     <select name=\"blink\" size=\"1\" class=\"install_select\">
       <option value=\"true\"");
-               if (isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(" selected=\"selected\"");
+               if (isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(' selected="selected"');
                OUTPUT_HTML(">{--YES--}</option>
       <option value=\"false\"");
-               if (!isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(" selected=\"selected\"");
+               if (!isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(' selected="selected"');
                OUTPUT_HTML(">{--NO--}</option>
     </select>
   </td>