Renamed templates + added some filters for mail order

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

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 2375cd5f526e866f8137dc8f45b88563dd6d4102..abf378c987c7ceb7d635fafe17fa3f94c3da61fb 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -36,7 +36,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
+if ((!defined('__SECURITY')) || (!isInstaller())) {
        die();
 } // END - if
 
@@ -46,8 +46,10 @@ loadExtension('timezone', 'test');
 // Set config entry
 setConfigEntry('timezone', 'Europe/Berlin');
 
-// And init timezone
+// Init some things
 FILTER_INIT_TIMEZONE(array());
+FILTER_INIT_RANDOMIZER();
+FILTER_INIT_RANDOM_NUMBER();
 
 // Init variables
 $GLOBALS['install_mysql'] = array();
@@ -65,19 +67,19 @@ if ((isGetRequestElementSet('install_page') && (getRequestElement('install_page'
                setGetRequestElement('install_page', 3);
        } // END - if
 
-       if ((!isPostRequestElementSet('smtp_pass1')) && (isPostRequestElementSet('smtp_pass2'))) {
+       if ((!isPostRequestElementSet('smtp_password1')) && (isPostRequestElementSet('smtp_password2'))) {
                // Password is empty
                addToInstallContent('<div class="para">{--INSTALLER_SMTP_PASSWORD1_EMPTY--}</div>');
                setGetRequestElement('install_page', 3);
        } // END - if
 
-       if ((isPostRequestElementSet('smtp_pass1')) && (!isPostRequestElementSet('smtp_pass2'))) {
+       if ((isPostRequestElementSet('smtp_password1')) && (!isPostRequestElementSet('smtp_password2'))) {
                // Password repeat is empty
                addToInstallContent('<div class="para">{--INSTALLER_SMTP_PASSWORD2_EMPTY--}</div>');
                setGetRequestElement('install_page', 3);
        } // END - if
 
-       if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) {
+       if (postRequestElement('smtp_password1') != postRequestElement('smtp_password1')) {
                // Passwords are not matching
                addToInstallContent('<div class="para">{--INSTALLER_SMTP_PASS_MISMATCH--}</div>');
                setGetRequestElement('install_page', 3);
@@ -87,7 +89,7 @@ if ((isGetRequestElementSet('install_page') && (getRequestElement('install_page'
 // Is the mailer installed or no admin registered so far?
 if ((!isInstalled()) || (!isAdminRegistered())) {
        // Construct include file name
-       $inc = 'inc/install/install_page_' . getRequestElement('install_page');
+       $inc = 'inc/install/install_page_' . getRequestElement('install_page') . '.php';
 
        // Is the include file there?
        if (isIncludeReadable($inc)) {
@@ -95,8 +97,8 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                loadIncludeOnce($inc);
        } else {
                // Not found, may be invalid page
-               logDebugMessage(__FILE__, __LINE__, sprintf("Wrong install_page=%s detected", getRequestElement('install_page')));
-               addTemplateToInstallContent('admin_settings_unsaved', '{--WRONG_PAGE--}');
+               logDebugMessage(__FILE__, __LINE__, sprintf('Wrong install_page=%s detected', getRequestElement('install_page')));
+               addTemplateToInstallContent('admin_settings_unsaved', '{%message,INSTALLER_WRONG_PAGE=' . getRequestElement('install_page') . '%}');
        }
 } else {
        // Already installed!