projects / mailer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Heavy rewrite:
[mailer.git] / inc / install-inc.php
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 55cb320c4462674125d62d148035004df3fb5e3b..561967bd61dc3848ba5307ae49bf7315373342e4 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -50,32 +50,32 @@ if (!defined('__SECURITY')) {
 
 // Init variables
 $mysql = array();
-if ((REQUEST_ISSET_POST(('mysql'))) && (is_array(REQUEST_POST('mysql')))) $mysql = REQUEST_POST('mysql');
+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))) {
        // Okay, we have to check it
-       if (REQUEST_ISSET_POST(('smtp_user')) && (!REQUEST_ISSET_POST(('smtp_host')))) {
+       if (REQUEST_ISSET_POST('smtp_user') && (!REQUEST_ISSET_POST('smtp_host'))) {
                // Hostname not set
-               OUTPUT_HTML(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY')."<br />");
+               OUTPUT_HTML(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '<br />');
                REQUEST_SET_GET('page', 3);
        } // END - if
 
-       if ((!REQUEST_ISSET_POST(('smtp_pass1'))) && (REQUEST_ISSET_POST(('smtp_pass2')))) {
+       if ((!REQUEST_ISSET_POST('smtp_pass1')) && (REQUEST_ISSET_POST('smtp_pass2'))) {
                // Password is empty
-               OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY')."<br />");
+               OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY') . '<br />');
                REQUEST_SET_GET('page', 3);
        } // END - if
 
-       if ((REQUEST_ISSET_POST(('smtp_pass1'))) && (!REQUEST_ISSET_POST(('smtp_pass2')))) {
+       if ((REQUEST_ISSET_POST('smtp_pass1')) && (!REQUEST_ISSET_POST('smtp_pass2'))) {
                // Password repeat is empty
-               OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY')."<br />");
+               OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY') . '<br />');
                REQUEST_SET_GET('page', 3);
        } // END - if
 
        if (REQUEST_POST('smtp_pass1') != REQUEST_POST('smtp_pass1')) {
                // Passwords are not matching
-               OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH')."<br />");
+               OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH') . '<br />');
                REQUEST_SET_GET('page', 3);
        } // END - if
 } // END - if
@@ -103,11 +103,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        if (empty($mysql['prefix'])) $mysql['prefix'] = 'mxchange';
                        if (empty($mysql['type']))   $mysql['type']   = 'MyISAM';
                        if (getTotalFatalErrors() > 0) {
-                               OUTPUT_HTML("<span class=\"install_fatal\">");
+                               OUTPUT_HTML('<span class="install_fatal">');
                                foreach (getFatalArray() as $key => $err) {
-                                       OUTPUT_HTML("  <strong>&middot;</strong>&nbsp;{--FATAL_NO--}".($key + 1).":&nbsp;".$err."<br />");
+                                       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']);
@@ -139,9 +139,9 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        $smtpPass2 = getConfig('SMTP_PASSWORD');
 
                        // Overwrite it with the data from sent (failed) form
-                       if (REQUEST_ISSET_POST(('smtp_host'))) $smtpHost = REQUEST_POST('smtp_host');
-                       if (REQUEST_ISSET_POST(('smtp_user'))) $smtpUser = REQUEST_POST('smtp_user');
-                       if (REQUEST_ISSET_POST(('smtp_pass'))) {
+                       if (REQUEST_ISSET_POST('smtp_host')) $smtpHost = REQUEST_POST('smtp_host');
+                       if (REQUEST_ISSET_POST('smtp_user')) $smtpUser = REQUEST_POST('smtp_user');
+                       if (REQUEST_ISSET_POST('smtp_pass')) {
                                $smtpPass1 = REQUEST_POST('smtp_pass');
                                $smtpPass2 = REQUEST_POST('smtp_pass');
                        } // END - if
@@ -184,79 +184,16 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        define('__SMTP_HOST', REQUEST_POST('smtp_host'));
                        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_main\">
-<tr>
-  <td colspan=\"2\" align=\"center\">
-    <div class=\"install\">{--HEADER_TEXT_PAGE5--}</strong>
-  </td>
-</tr>
-<tr><td colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</td></tr>
-<tr>
-  <td colspan=\"2\"><span class=\"install_text\">
-    {--TEXT_PAGE_5--}
-  </span></td>
-</tr>
-<tr><td colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</td></tr>
-<tr>
-  <td class=\"install\" align=\"right\">{--LANG_OUTPUT_MODE--}:&nbsp;&nbsp;</td>
-  <td>
-    <select name=\"omode\" size=\"1\" class=\"install_select\">
-      <option value=\"render\">{--MODE_RENDER--}</option>
-      <option value=\"direct\">{--MODE_DIRECT--}</option>
-    </select>
-  </td>
-</tr>
-<tr><td colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</td></tr>
-<tr>
-  <td class=\"install\" align=\"right\">{--WARN_NO_PASSWORD--}:&nbsp;&nbsp;</td>
-  <td>
-    <select name=\"warn_no_pass\" size=\"1\" class=\"install_select\">
-      <option value=\"Y\">{--YES--}</option>
-      <option value=\"N\">{--NO--}</option>
-    </select>
-  </td>
-</tr>
-<tr><td colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</td></tr>
-<tr>
-  <td class=\"install\" align=\"right\">{--LANG_WRITE_FOOTER--}:&nbsp;&nbsp;</td>
-  <td>
-    <select name=\"wfooter\" size=\"1\" class=\"install_select\">
-      <option value=\"Y\">{--YES--}</option>
-      <option value=\"N\">{--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>
-    <select name=\"blink\" size=\"1\" class=\"install_select\">
-      <option value=\"Y\">{--YES--}</option>
-      <option value=\"N\">{--NO--}</option>
-    </select>
-  </td>
-</tr>
-<tr><td colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</td></tr>
-<tr>
-  <td colspan=\"2\" align=\"center\">");
+
+                       // MySQL data
+                       $content = '';
                        foreach ($mysql as $key => $value) {
-                               OUTPUT_HTML("    <input type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\" />");
+                               $content .= "    <input type=\"hidden\" name=\"mysql[" . $key . "]\" value=\"" . $value . "\" />\n";
                        }
-                       OUTPUT_HTML("    <input type=\"hidden\" name=\"spath\" value=\"{!__SPATH_VALUE!}\" />
-    <input type=\"hidden\" name=\"burl\" value=\"{!__BURL_VALUE!}\" />
-    <input type=\"hidden\" name=\"title\" value=\"{!__TITLE_VALUE!}\" />
-    <input type=\"hidden\" name=\"slogan\" value=\"{!__SLOGAN_VALUE!}\" />
-    <input type=\"hidden\" name=\"email\" value=\"{!__EMAIL_VALUE!}\" />
-    <input type=\"hidden\" name=\"smtp_host\" value=\"{!__SMTP_HOST!}\" />
-    <input type=\"hidden\" name=\"smtp_user\" value=\"{!__SMTP_USER!}\" />
-    <input type=\"hidden\" name=\"smtp_pass\" value=\"{!__SMTP_PASS!}\" />
-    <input type=\"submit\" class=\"admin_submit submit\" name=\"finalize\" value=\"{--NEXT_PAGE--}\" class=\"install_submit\" />
-  </td>
-</tr>
-<tr><td colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</td></tr>
-</table>
-</form>");
+                       define('__MYSQL_DATA', $content);
+
+                       // Load template
+                       LOAD_TEMPLATE('install_page5');
                        break;
 
                case 'finalize': // Write captured data to files
Mailer-Project repository