fooRequestElementBar() functions renamed, adding of request parameters added:
[mailer.git] / inc / install-inc.php
index 7e66a605bf42ab295a2332950afa6e7249dc9e60..51d2fa1a2b3b171b9ef720550fe7704cc69e3667 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/29/2003 *
- * ===============                              Last change: 11/11/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 08/29/2003 *
+ * ===================                          Last change: 11/11/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : install-inc.php                                  *
@@ -47,87 +47,87 @@ if (!defined('__SECURITY')) {
 
 // Init variables
 $mysql = array();
-if ((isPostRequestElementSet('mysql')) && (is_array(postRequestElement('mysql')))) {
+if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) {
        // Transfer 'mysql' array
-       $mysql = postRequestElement('mysql');
+       $mysql = postRequestParameter('mysql');
 } // END - if
 
 // Check if both passwords from SMTP are matching
-if ((isGetRequestElementSet('page') && (getRequestElement('page') == 5))) {
+if ((isGetRequestParameterSet('page') && (getRequestParameter('page') == 5))) {
        // Okay, we have to check it
-       if (isPostRequestElementSet('smtp_user') && (!isPostRequestElementSet('smtp_host'))) {
+       if (isPostRequestParameterSet('smtp_user') && (!isPostRequestParameterSet('smtp_host'))) {
                // Hostname not set
-               addToInstallContent(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '<br />');
-               setRequestGetElement('page', 3);
+               addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '</div>');
+               setGetRequestParameter('page', 3);
        } // END - if
 
-       if ((!isPostRequestElementSet('smtp_pass1')) && (isPostRequestElementSet('smtp_pass2'))) {
+       if ((!isPostRequestParameterSet('smtp_pass1')) && (isPostRequestParameterSet('smtp_pass2'))) {
                // Password is empty
-               addToInstallContent(getMessage('INSTALL_SMTP_PASS1_EMPTY') . '<br />');
-               setRequestGetElement('page', 3);
+               addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS1_EMPTY') . '</div>');
+               setGetRequestParameter('page', 3);
        } // END - if
 
-       if ((isPostRequestElementSet('smtp_pass1')) && (!isPostRequestElementSet('smtp_pass2'))) {
+       if ((isPostRequestParameterSet('smtp_pass1')) && (!isPostRequestParameterSet('smtp_pass2'))) {
                // Password repeat is empty
-               addToInstallContent(getMessage('INSTALL_SMTP_PASS2_EMPTY') . '<br />');
-               setRequestGetElement('page', 3);
+               addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS2_EMPTY') . '</div>');
+               setGetRequestParameter('page', 3);
        } // END - if
 
-       if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) {
+       if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) {
                // Passwords are not matching
-               addToInstallContent(getMessage('INSTALL_SMTP_PASS_MISMATCH') . '<br />');
-               setRequestGetElement('page', 3);
+               addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS_MISMATCH') . '</div>');
+               setGetRequestParameter('page', 3);
        } // END - if
 } // END - if
 
-// Is MXChange installed or no admin registered so far?
+// Is the mailer installed or no admin registered so far?
 if ((!isInstalled()) || (!isAdminRegistered())) {
        // Output page for entered value
-       switch (getRequestElement('page')) {
+       switch (getRequestParameter('page')) {
                case 'welcome': // Welcome to the installation!
                        addTemplateToInstallContent('install_welcome');
                        break;
 
-               case 1: // Server path, base URL
+               case '1': // Server path, base URL
                        // Load template
                        addTemplateToInstallContent('install_page1');
                        break;
 
-               case 2: // MySQL data (alone!)
+               case '2': // MySQL data (alone!)
                        if (empty($mysql['dbase']))  $mysql['dbase']  = 'your_database';
                        if (empty($mysql['login']))  $mysql['login']  = 'your_login';
                        if (empty($mysql['host']))   $mysql['host']   = 'localhost';
                        if (empty($mysql['prefix'])) $mysql['prefix'] = 'mxchange';
                        if (empty($mysql['type']))   $mysql['type']   = 'MyISAM';
                        if (getTotalFatalErrors() > 0) {
-                               addToInstallContent('<span class="install_fatal">');
+                               addToInstallContent('<div class="install_fatal">');
                                foreach (getFatalArray() as $key => $err) {
-                                       addToInstallContent('<strong>&middot;</strong>&nbsp;{--FATAL_NO--}' . ($key + 1) . ':&nbsp;' . $err . '<br />');
+                                       addToInstallContent('<div class="para"><strong>&middot;</strong>&nbsp;{--FATAL_NO--}' . ($key + 1) . ':&nbsp;' . $err . '</div>');
                                }
-                               addToInstallContent('</span><br />');
+                               addToInstallContent('</div>');
                        }
                        $content['mysql_host']   = $mysql['host'];
                        $content['mysql_dbase']  = $mysql['dbase'];
                        $content['mysql_prefix'] = $mysql['prefix'];
                        $content['mysql_login']  = $mysql['login'];
                        $content['table_type']   = $mysql['type'];
-                       $content['spath']        = postRequestElement('spath');
-                       $content['burl']         = postRequestElement('burl');
-                       $content['title']        = postRequestElement('title');
-                       $content['slogan']       = postRequestElement('slogan');
-                       $content['email']        = postRequestElement('email');
+                       $content['spath']        = postRequestParameter('spath');
+                       $content['burl']         = postRequestParameter('burl');
+                       $content['title']        = postRequestParameter('title');
+                       $content['slogan']       = postRequestParameter('slogan');
+                       $content['email']        = postRequestParameter('email');
 
                        // Load template
                        addTemplateToInstallContent('install_page2', $content);
                        break;
 
-               case 3:
+               case '3':
                        // Set more values
-                       $content['spath']      = postRequestElement('spath');
-                       $content['burl']       = postRequestElement('burl');
-                       $content['title']      = postRequestElement('title');
-                       $content['slogan']     = postRequestElement('slogan');
-                       $content['email']      = postRequestElement('email');
+                       $content['spath']      = postRequestParameter('spath');
+                       $content['burl']       = postRequestParameter('burl');
+                       $content['title']      = postRequestParameter('title');
+                       $content['slogan']     = postRequestParameter('slogan');
+                       $content['email']      = postRequestParameter('email');
 
                        // Use default SMTP data
                        $smtpHost  = getConfig('SMTP_HOSTNAME');
@@ -136,11 +136,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        $smtpPass2 = getConfig('SMTP_PASSWORD');
 
                        // Overwrite it with the data from sent (failed) form
-                       if (isPostRequestElementSet('smtp_host')) $smtpHost = postRequestElement('smtp_host');
-                       if (isPostRequestElementSet('smtp_user')) $smtpUser = postRequestElement('smtp_user');
-                       if (isPostRequestElementSet('smtp_pass')) {
-                               $smtpPass1 = postRequestElement('smtp_pass');
-                               $smtpPass2 = postRequestElement('smtp_pass');
+                       if (isPostRequestParameterSet('smtp_host')) $smtpHost = postRequestParameter('smtp_host');
+                       if (isPostRequestParameterSet('smtp_user')) $smtpUser = postRequestParameter('smtp_user');
+                       if (isPostRequestParameterSet('smtp_pass')) {
+                               $smtpPass1 = postRequestParameter('smtp_pass');
+                               $smtpPass2 = postRequestParameter('smtp_pass');
                        } // END - if
 
                        // MySQL settings
@@ -162,18 +162,18 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        addTemplateToInstallContent('install_page3', $content);
                        break;
 
-               case 5: // Misc settings
+               case '5': // Misc settings
                        // General settings
-                       $content['spath']  = postRequestElement('spath');
-                       $content['burl']   = postRequestElement('burl');
-                       $content['title']  = postRequestElement('title');
-                       $content['slogan'] = postRequestElement('slogan');
-                       $content['email']  = postRequestElement('email');
+                       $content['spath']  = postRequestParameter('spath');
+                       $content['burl']   = postRequestParameter('burl');
+                       $content['title']  = postRequestParameter('title');
+                       $content['slogan'] = postRequestParameter('slogan');
+                       $content['email']  = postRequestParameter('email');
 
                        // SMTP settings
-                       $content['smtp_host'] = postRequestElement('smtp_host');
-                       $content['smtp_user'] = postRequestElement('smtp_user');
-                       $content['smtp_pass'] = postRequestElement('smtp_pass1');
+                       $content['smtp_host'] = postRequestParameter('smtp_host');
+                       $content['smtp_user'] = postRequestParameter('smtp_user');
+                       $content['smtp_pass'] = postRequestParameter('smtp_pass1');
 
                        // MySQL data
                        $OUT = '';
@@ -187,7 +187,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        break;
 
                case 'finalize': // Write captured data to files
-                       if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
+                       if ((isPostRequestParameterSet('finalize')) && (!isInstalled())) {
                                // You have submitted data then we have to reset the SQLs
                                initSqls();
 
@@ -197,29 +197,26 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                        // Seems to work, also right database?
                                        if (SQL_SELECT_DB($mysql['dbase'], __FILE__, __LINE__) === true) {
                                                // Automatically run install.sql
-                                               if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
+                                               if ((!isFileReadable(postRequestParameter('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestParameter('spath') . 'install/menu-'.getLanguage().'.sql'))) {
                                                        // Installation area not found!
                                                        addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_MISSING_DUMPS'));
                                                } // END - if
 
-                                               if (getTotalFatalErrors() == 0) {
+                                               if (getTotalFatalErrors() == '0') {
                                                        // Set type and prefix from POST data
-                                                       setConfigEntry('_TABLE_TYPE'  , postRequestElement('mysql', 'type'));
-                                                       setConfigEntry('_MYSQL_PREFIX', postRequestElement('mysql', 'prefix'));
+                                                       setConfigEntry('_TABLE_TYPE'  , postRequestParameter('mysql', 'type'));
+                                                       setConfigEntry('_MYSQL_PREFIX', postRequestParameter('mysql', 'prefix'));
 
                                                        // Both exists so import them
                                                        foreach (array('tables', 'menu-'.getLanguage()) as $dump) {
                                                                // Should be save here because file_exists() is there but we check it again. :)
-                                                               $FQFN = postRequestElement('spath') . 'install/' . $dump . '.sql';
+                                                               $FQFN = postRequestParameter('spath') . 'install/' . $dump . '.sql';
 
                                                                // Is the file readable?
                                                                if (isFileReadable($FQFN)) {
                                                                        // Read the file
                                                                        $fileContent = readFromFile($FQFN, true);
 
-                                                                       // Compile all config entries (we use a filter here, yes...)
-                                                                       $fileContent = FILTER_COMPILE_CONFIG($fileContent);
-
                                                                        // Split it up against ";\n" and merge it into existing SQLs
                                                                        mergeSqls(explode(";\n", $fileContent), 'install');
                                                                } else {
@@ -230,7 +227,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                        //* DEBUG: */ die('<pre>'.print_r(getSqls(), true).'</pre>');
 
                                                        // Are some SQLs found?
-                                                       if (countSqls() == 0) {
+                                                       if (countSqls() == '0') {
                                                                // Abort here
                                                                addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_SQL_IMPORT_FAILED'));
                                                                return;
@@ -248,20 +245,20 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                if (getTotalFatalErrors() > 0) {
                                        $OUT = '';
                                        foreach (getFatalArray() as $value) {
-                                               $OUT .= "    <li>" . $value . "</li>\n";
+                                               $OUT .= '    <li>' . $value . '</li>';
                                        } // END foreach
                                        $content['fatal_errors'] = $OUT;
                                        $OUT = '';
                                        foreach ($mysql as $key => $value) {
-                                               $OUT .= "    <input type=\"hidden\" name=\"mysql[" . $key . "]\" value=\"" . $value . "\" />\n";
+                                               $OUT .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
                                        } // END foreach
                                        $content['mysql_hidden'] = $OUT;
-                                       $content['spath']      = postRequestElement('spath');
-                                       $content['burl']       = postRequestElement('burl');
-                                       $content['title']      = postRequestElement('title');
-                                       $content['smtp_host']  = postRequestElement('smtp_host');
-                                       $content['smtp_user']  = postRequestElement('smtp_user');
-                                       $content['smtp_pass']  = postRequestElement('smtp_pass1');
+                                       $content['spath']      = postRequestParameter('spath');
+                                       $content['burl']       = postRequestParameter('burl');
+                                       $content['title']      = postRequestParameter('title');
+                                       $content['smtp_host']  = postRequestParameter('smtp_host');
+                                       $content['smtp_user']  = postRequestParameter('smtp_user');
+                                       $content['smtp_pass']  = postRequestParameter('smtp_pass1');
 
                                        // Load template
                                        addTemplateToInstallContent('install_fatal_errors', $content);
@@ -286,8 +283,8 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        break;
 
                default:
-                       logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestElement('page')));
-                       addTemplateToInstallContent('admin_settings_saved', "<div class=\"install_error\">{--WRONG_PAGE--}</div>");
+                       logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('page')));
+                       addTemplateToInstallContent('admin_settings_saved', '<div class="install_error">{--WRONG_PAGE--}</div>');
                        break;
        } // END - switch
 } else {