X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=239d9048c122537fc62ad0e6d9cfe67b10feb4b6;hb=7770a9545292d628afd2be4f58f86da5c9139619;hp=e20d71821634e5103137441b894e0df7916b74cd;hpb=e5dffd4249c97200cbad02f3f4eaf5c373fdb89a;p=mailer.git

diff --git a/inc/filters.php b/inc/filters.php
index e20d718216..239d9048c1 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -247,7 +247,7 @@ function FILTER_RUN_SQLS ($filterData) {
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Entered!');
 
 	// Is the array there?
-	if ((isSqlsValid()) && ((!isset($filterData['dry_run'])) || ($filterData['dry_run'] == FALSE))) {
+	if ((ifSqlsRegistered()) && ((!isset($filterData['dry_run'])) || ($filterData['dry_run'] == FALSE))) {
 		// Run SQL commands
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Found ' . countSqls() . ' queries to run.');
 		foreach (getSqls() as $mode => $sqls) {
@@ -711,25 +711,6 @@ function FILTER_FLUSH_OUTPUT () {
 	outputHtml();
 }
 
-// Prepares an SQL statement part for HTML mail and/or holiday dependency
-function FILTER_HTML_INCLUDE_USERS ($mode) {
-	// Exclude no users by default
-	$MORE = '';
-
-	// HTML mail?
-	if ($mode == 'html') {
-		$MORE = " AND `html`='Y'";
-	} // END - if
-
-	if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
-		// Add something for the holiday extension
-		$MORE .= " AND `holiday_active`='N'";
-	} // END - if
-
-	// Return result
-	return $MORE;
-}
-
 // Filter for determining what/action/module
 function FILTER_DETERMINE_WHAT_ACTION () {
 	// In installation phase we don't have what/action
@@ -1302,27 +1283,34 @@ function FILTER_ADD_HISTORY_ENTRY ($filterData) {
 
 // Filter for initializing ext-sql_patches
 function FILTER_GENERATE_FILE_SECRET_HASH ($filterData) {
-	// Transfer POINTS word
-	if (isExtensionInstalledAndNewer('sql_patches', '0.0.3')) {
-		// Okay, recent enough, so transfer the word for POINTS
-		setConfigEntry('POINTS', getPointsWord());
+	// Is ext-sql_patches installed and transfer POINTS word?
+	if ((!isExtensionInstalled('sql_patches')) || (!isExtensionInstalledAndNewer('sql_patches', '0.9.0'))) {
+		// Extension ext-sql_patches is missing, so better abort here
+		return;
 	} // END - if
 
+	// Okay, recent enough, so transfer the word for POINTS
+	setConfigEntry('POINTS', getPointsWord());
+
 	// Init key
 	setConfigEntry('secret_key', '');
 
-	// File hash fas generated so we can also file the secret file... hopefully.
+	// File hash was generated so we can also file the secret file... hopefully.
 	$hashFile = sprintf('%s%s.%s.cache', getPath(), getCachePath(), getFileHash());
 
 	// Read key from secret file
 	if ((getFileHash() == '') || (getMasterSalt() == '') || (getPassScramble() == '') || (!isFileReadable($hashFile))) {
 		// Maybe need setup of secret key!
 		loadIncludeOnce('inc/gen_sql_patches.php');
+
+		// Generate file name again
+		$hashFile = sprintf('%s%s.%s.cache', getPath(), getCachePath(), getFileHash());
 	} // END - if
 
 	// Test again
 	if ((getFileHash() != '') && (getMasterSalt() != '') && (getPassScramble() != '')) {
 		// Is the secret key file readable?
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'hashFile=' . $hashFile);
 		if (isFileReadable($hashFile)) {
 			// Read file
 			setConfigEntry('secret_key', readFromFile($hashFile));
@@ -1365,7 +1353,7 @@ function FILTER_HANDLE_REFERRER_BANNER_CLICK ($filterData) {
 	// Check required parameters
 	if ((isGetRequestElementSet('user')) && (isGetRequestElementSet('banner'))) {
 		// Update clicks counter...
-		sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_refbanner` SET `clicks`=`clicks`+1 WHERE `id`=%s LIMIT 1",
+		sqlQueryEscaped('UPDATE `{?_MYSQL_PREFIX?}_refbanner` SET `clicks`=`clicks`+1 WHERE `id`=%s LIMIT 1',
 			array(bigintval(getRequestElement('banner'))), __FUNCTION__, __LINE__);
 
 		// A line has been updated?
@@ -1384,7 +1372,7 @@ function FILTER_HANDLE_REFERRER_BANNER_VIEW ($filterData) {
 	// Are all required parameters set
 	if ((isGetRequestElementSet('user')) && (isGetRequestElementSet('banner'))) {
 		// For later things... ;-)
-		$result = sqlQueryEscaped("SELECT `url` FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `id`=%s LIMIT 1",
+		$result = sqlQueryEscaped('SELECT `url` FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `id`=%s LIMIT 1',
 			array(bigintval(getRequestElement('banner'))), __FUNCTION__, __LINE__);
 
 		// Is there the banner?
@@ -1393,7 +1381,7 @@ function FILTER_HANDLE_REFERRER_BANNER_VIEW ($filterData) {
 			$data = sqlFetchArray($result);
 
 			// Update counter
-			sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_refbanner` SET `counter`=`counter`+1 WHERE `id`=%s LIMIT 1",
+			sqlQueryEscaped('UPDATE `{?_MYSQL_PREFIX?}_refbanner` SET `counter`=`counter`+1 WHERE `id`=%s LIMIT 1',
 				array(bigintval(getRequestElement('banner'))), __FUNCTION__, __LINE__);
 
 			// Set header and ...
@@ -1435,7 +1423,7 @@ function FILTER_REDIRECT_WRONG_SERVER_NAME ($filterData) {
 // Filter for adding hidden session id
 function FILTER_ADD_INPUT_HIDDEN_SESSION_ID ($filterData) {
 	// Is a spider detected?
-	if ((!isSpider()) && (!isSessionValid()) && ($filterData['__form_method'] == 'get')) {
+	if ((!isSpider()) && (!isValidSession()) && ($filterData['__form_method'] == 'get')) {
 		// No, then add the hidden field
 		$filterData['__replacer'] .= '<input type="hidden" name="' . session_name() . '" value="' . session_id() . '" />';
 	} // END - if