Extension ext-earning introduced (unfinished), renamings:
[mailer.git] / inc / install-inc.php
index 18af33b97dc2d136af0e86564ce398ec2efe379f..378c60bdea5beafd27f242788311c8481604aa54 100644 (file)
@@ -55,43 +55,43 @@ FILTER_INIT_TIMEZONE(array());
 
 // Init variables
 $GLOBALS['install_mysql'] = array();
-if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) {
+if ((isPostRequestElementSet('mysql')) && (is_array(postRequestElement('mysql')))) {
        // Transfer 'mysql' array
-       $GLOBALS['install_mysql'] = postRequestParameter('mysql');
+       $GLOBALS['install_mysql'] = postRequestElement('mysql');
 } // END - if
 
 // Check if both passwords from SMTP are matching
-if ((isGetRequestParameterSet('page') && (getRequestParameter('page') == 5))) {
+if ((isGetRequestElementSet('page') && (getRequestElement('page') == 5))) {
        // Okay, we have to check it
-       if (isPostRequestParameterSet('smtp_user') && (!isPostRequestParameterSet('smtp_host'))) {
+       if (isPostRequestElementSet('smtp_user') && (!isPostRequestElementSet('smtp_host'))) {
                // Hostname not set
                addToInstallContent('<div class="para">{--INSTALL_SMTP_HOSTNAME_EMPTY--}</div>');
-               setGetRequestParameter('page', 3);
+               setGetRequestElement('page', 3);
        } // END - if
 
-       if ((!isPostRequestParameterSet('smtp_pass1')) && (isPostRequestParameterSet('smtp_pass2'))) {
+       if ((!isPostRequestElementSet('smtp_pass1')) && (isPostRequestElementSet('smtp_pass2'))) {
                // Password is empty
-               addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS1_EMPTY--}</div>');
-               setGetRequestParameter('page', 3);
+               addToInstallContent('<div class="para">{--INSTALL_SMTP_PASSWORD1_EMPTY--}</div>');
+               setGetRequestElement('page', 3);
        } // END - if
 
-       if ((isPostRequestParameterSet('smtp_pass1')) && (!isPostRequestParameterSet('smtp_pass2'))) {
+       if ((isPostRequestElementSet('smtp_pass1')) && (!isPostRequestElementSet('smtp_pass2'))) {
                // Password repeat is empty
-               addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS2_EMPTY--}</div>');
-               setGetRequestParameter('page', 3);
+               addToInstallContent('<div class="para">{--INSTALL_SMTP_PASSWORD2_EMPTY--}</div>');
+               setGetRequestElement('page', 3);
        } // END - if
 
-       if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) {
+       if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) {
                // Passwords are not matching
                addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS_MISMATCH--}</div>');
-               setGetRequestParameter('page', 3);
+               setGetRequestElement('page', 3);
        } // END - if
 } // END - if
 
 // Is the mailer installed or no admin registered so far?
 if ((!isInstalled()) || (!isAdminRegistered())) {
        // Output page for entered value
-       switch (getRequestParameter('page')) {
+       switch (getRequestElement('page')) {
                case 'welcome': // Welcome to the installation!
                        addTemplateToInstallContent('install_welcome');
                        break;
@@ -120,11 +120,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
                        $content['mysql_login']  = $GLOBALS['install_mysql']['login'];
                        $content['table_type']   = $GLOBALS['install_mysql']['type'];
-                       $content['spath']        = postRequestParameter('spath');
-                       $content['burl']         = postRequestParameter('burl');
-                       $content['title']        = postRequestParameter('title');
-                       $content['slogan']       = postRequestParameter('slogan');
-                       $content['email']        = postRequestParameter('email');
+                       $content['spath']        = postRequestElement('spath');
+                       $content['burl']         = postRequestElement('burl');
+                       $content['title']        = postRequestElement('title');
+                       $content['slogan']       = postRequestElement('slogan');
+                       $content['email']        = postRequestElement('email');
 
                        // Load template
                        addTemplateToInstallContent('install_page2', $content);
@@ -132,11 +132,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 
                case '3':
                        // Set more values
-                       $content['spath']      = postRequestParameter('spath');
-                       $content['burl']       = postRequestParameter('burl');
-                       $content['title']      = postRequestParameter('title');
-                       $content['slogan']     = postRequestParameter('slogan');
-                       $content['email']      = postRequestParameter('email');
+                       $content['spath']      = postRequestElement('spath');
+                       $content['burl']       = postRequestElement('burl');
+                       $content['title']      = postRequestElement('title');
+                       $content['slogan']     = postRequestElement('slogan');
+                       $content['email']      = postRequestElement('email');
 
                        // Use default SMTP data
                        $smtpHost  = '{?SMTP_HOSTNAME?}';
@@ -145,11 +145,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        $smtpPass2 = '{?SMTP_PASSWORD?}';
 
                        // Overwrite it with the data from sent (failed) form
-                       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');
+                       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');
                        } // END - if
 
                        // Database login data
@@ -173,16 +173,16 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 
                case '5': // Misc settings
                        // General settings
-                       $content['spath']  = postRequestParameter('spath');
-                       $content['burl']   = postRequestParameter('burl');
-                       $content['title']  = postRequestParameter('title');
-                       $content['slogan'] = postRequestParameter('slogan');
-                       $content['email']  = postRequestParameter('email');
+                       $content['spath']  = postRequestElement('spath');
+                       $content['burl']   = postRequestElement('burl');
+                       $content['title']  = postRequestElement('title');
+                       $content['slogan'] = postRequestElement('slogan');
+                       $content['email']  = postRequestElement('email');
 
                        // SMTP settings
-                       $content['smtp_host'] = postRequestParameter('smtp_host');
-                       $content['smtp_user'] = postRequestParameter('smtp_user');
-                       $content['smtp_pass'] = postRequestParameter('smtp_pass1');
+                       $content['smtp_host'] = postRequestElement('smtp_host');
+                       $content['smtp_user'] = postRequestElement('smtp_user');
+                       $content['smtp_pass'] = postRequestElement('smtp_pass1');
 
                        // Database login data
                        $OUT = '';
@@ -196,7 +196,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        break;
 
                case 'finalize': // Write captured data to files
-                       if ((isPostRequestParameterSet('finalize')) && (!isInstalled())) {
+                       if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
                                // You have submitted data then we have to reset the SQLs
                                initSqls();
 
@@ -215,7 +215,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                        // Seems to work, also right database?
                                        if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === true) {
                                                // Check for dumps
-                                               if ((!isFileReadable(postRequestParameter('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestParameter('spath') . 'install/menu-'.getLanguage().'.sql'))) {
+                                               if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
                                                        // Installation area not found
                                                        debug_report_bug(__FILE__, __LINE__, 'SQL dumps not found. Please extract ALL files from the archive or checkout all files out from SVN.');
                                                        return;
@@ -224,13 +224,13 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                // Any errors detected?
                                                if (!ifFatalErrorsDetected()) {
                                                        // Set type and prefix from POST data
-                                                       setConfigEntry('_TABLE_TYPE'  , postRequestParameter('mysql', 'type'));
-                                                       setConfigEntry('_MYSQL_PREFIX', postRequestParameter('mysql', 'prefix'));
+                                                       setConfigEntry('_TABLE_TYPE'  , postRequestElement('mysql', 'type'));
+                                                       setConfigEntry('_MYSQL_PREFIX', postRequestElement('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 = postRequestParameter('spath') . 'install/' . $dump . '.sql';
+                                                               $FQFN = postRequestElement('spath') . 'install/' . $dump . '.sql';
 
                                                                // Is the file readable?
                                                                if (isFileReadable($FQFN)) {
@@ -273,12 +273,12 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                $OUT .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
                                        } // END foreach
                                        $content['mysql_hidden'] = $OUT;
-                                       $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');
+                                       $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');
 
                                        // Load template
                                        addTemplateToInstallContent('install_fatal_errors', $content);
@@ -306,7 +306,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        break;
 
                default:
-                       logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('page')));
+                       logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestElement('page')));
                        addTemplateToInstallContent('admin_settings_unsaved', '{--WRONG_PAGE--}');
                        break;
        } // END - switch