X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=239d9048c122537fc62ad0e6d9cfe67b10feb4b6;hb=382df1e8685f2307b00724668e8cb66cb72500d8;hp=ceaf0e0ac9c47e6332df05342cf8a914989f7848;hpb=e2bc60f3a30b8b796be59d5a03d9c91f06e4bac4;p=mailer.git

diff --git a/inc/filters.php b/inc/filters.php
index ceaf0e0ac9..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
@@ -1442,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