From: Roland Häder <roland@mxchange.org>
Date: Sat, 27 Sep 2008 16:47:40 +0000 (+0000)
Subject: Fixes for missing secret file
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dc1d66c49b8cb1e4fb8056d46b9c7e3fecd0ffdd;p=mailer.git

Fixes for missing secret file
---

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index 88543231a8..2efdb59de6 100644
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -636,7 +636,7 @@ default: // Do stuff when extension is loaded
 			// Maybe need setup of secret key!
 			require_once(PATH."inc/gen_sql_patches.php");
 
-			if (GET_EXT_VERSION("cache") >= "0.1.2") {
+			if ((GET_EXT_VERSION("cache") >= "0.1.2") && (is_object($cacheInstance))) {
 				// Remove extensions and mod_reg cache file
 				require_once(PATH."inc/libs/cache_functions.php");
 				require_once(PATH."inc/extensions/ext-cache.php");
@@ -653,8 +653,11 @@ default: // Do stuff when extension is loaded
 				// Read file
 				$_CONFIG['secret_key'] = implode("", file($hashFile));
 			} else {
+				// Remove it from database
+				UPDATE_CONFIG("file_hash", "");
+
 				// Cannot read secret file!
-				mxchange_die("Cannot read secret file!");
+				mxchange_die("Cannot read secret file! Please try to reload");
 			}
 		} // END - if
 
diff --git a/inc/functions.php b/inc/functions.php
index b3db62630d..9a7b1fc6f1 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1927,7 +1927,7 @@ function generateHash ($plainText, $salt = "") {
 	global $_CONFIG, $_SERVER;
 
 	// Is the required extension "sql_patches" there and a salt is not given?
-	if (((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("sql_patches") == "")) && (empty($salt))) {
+	if (((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (EXT_IS_ACTIVE("sql_patches"))) && (empty($salt))) {
 		// Extension sql_patches is missing/outdated so we return the plain text
 		return $plainText;
 	} // END - if
@@ -1941,7 +1941,7 @@ function generateHash ($plainText, $salt = "") {
 	} // END - if
 
 	// When the salt is empty build a new one, else use the first x configured characters as the salt
-	if ($salt == "") {
+	if (empty($salt)) {
 		// Build server string
 		$server = $_SERVER['PHP_SELF'].":".getenv('HTTP_USER_AGENT').":".getenv('SERVER_SOFTWARE').":".getenv('REMOTE_ADDR').":".":".filemtime(PATH."inc/databases.php");
 
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 47f6e86b48..552956e9a6 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -104,7 +104,7 @@ if (isset($_POST['mysql']) && is_array($_POST['mysql'])) $mysql = $_POST['mysql'
 if (URL != "http://your-server.com") {
 	// Already installed???
 	$burl = URL;
-} elseif ($burl == "") {
+} elseif (empty($burl)) {
 	// Auto-detect URL
 	$burl = "http://".$SERVER_NAME.$_SERVER['PHP_SELF'];
 	$burl = substr($burl, 0, strpos($burl, "install.php"));