X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Finstall-inc.php;h=abf378c987c7ceb7d635fafe17fa3f94c3da61fb;hp=1e00d24106bfda972a3380fb0a3ae5fc5b64b7dc;hb=ab5ff5126ef56b08f5130a9e110b53c00d0a2761;hpb=34200254d76999df3ed2ced0f49758285bc82e7e

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 1e00d24106..abf378c987 100644
--- 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
 
@@ -67,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);
@@ -97,7 +97,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 {