Removed gone websites

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

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 1e00d24106bfda972a3380fb0a3ae5fc5b64b7dc..ab96d7b41ec19026c59858839872e3ba24412dd9 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -6,17 +6,12 @@
  * -------------------------------------------------------------------- *
  * File              : install-inc.php                                  *
  * -------------------------------------------------------------------- *
- * Short description : Functions for installation procedure             *
+ * Short description : Initial stuff for plain (old) installer          *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Funktionen fuer die Installationsroutine         *
- * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
+ * Kurzbeschreibung  : Initiale Dinge fuer alten Installer              *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 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 +31,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
+if ((!defined('__SECURITY')) || (!isInstaller())) {
        die();
 } // END - if
 
@@ -67,19 +62,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);
@@ -97,7 +92,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                loadIncludeOnce($inc);
        } else {
                // Not found, may be invalid page
-               logDebugMessage(__FILE__, __LINE__, sprintf("Wrong install_page=%s detected", getRequestElement('install_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 {