Fix url_exclusion config

davydovct · davydovct · commit 184c2dea15cb · 2018-02-26T10:34:54.000+05:00
diff --git a/cleantalk.antispam/custom_config.php b/cleantalk.antispam/custom_config.php
@@ -7,7 +7,7 @@ class CleantalkCustomConfig
 
 	function __construct()
 	{
-		$this->cleantalk_url_exclusions = explode(',', trim($this->cleantalk_url_exclusions));	
+		$this->cleantalk_url_exclusions = (!empty($this->cleantalk_url_exclusions) ? explode(',', trim($this->cleantalk_url_exclusions)) : null);	
 	}
 	public function get_url_exclusions()
 	{
diff --git a/cleantalk.antispam/include.php b/cleantalk.antispam/include.php
@@ -909,7 +909,7 @@ function OnEventLogGetAuditTypesHandler(){
     function OnEndBufferContentHandler(&$content) {
     	$custom_config = new CleantalkCustomConfig();
     	$url_exclusion = $custom_config->get_url_exclusions();
-    	if (!empty($url_exclusion))
+    	if ($url_exclusion)
     	{
 	     	foreach ($url_exclusion as $key=>$value)
 	    		if (strpos($_SERVER['REQUEST_URI'],$value) !== false)
@@ -1085,7 +1085,7 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE) {
         }
         $custom_config = new CleantalkCustomConfig();
     	$url_exclusion = $custom_config->get_url_exclusions();
-    	if (!empty($url_exclusion))
+    	if ($url_exclusion)
     	{
 	    	foreach ($url_exclusion as $key=>$value)
 	    		if (strpos($_SERVER['REQUEST_URI'],$value) !== false)

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ class CleantalkCustomConfig`
`7`	`7`
`8`	`8`	`function __construct()`
`9`	`9`	`{`
`10`		`- $this->cleantalk_url_exclusions = explode(',', trim($this->cleantalk_url_exclusions));`
	`10`	`+ $this->cleantalk_url_exclusions = (!empty($this->cleantalk_url_exclusions) ? explode(',', trim($this->cleantalk_url_exclusions)) : null);`
`11`	`11`	`}`
`12`	`12`	`public function get_url_exclusions()`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -909,7 +909,7 @@ function OnEventLogGetAuditTypesHandler(){`
`909`	`909`	`function OnEndBufferContentHandler(&$content) {`
`910`	`910`	`$custom_config = new CleantalkCustomConfig();`
`911`	`911`	`$url_exclusion = $custom_config->get_url_exclusions();`
`912`		`- if (!empty($url_exclusion))`
	`912`	`+ if ($url_exclusion)`
`913`	`913`	`{`
`914`	`914`	`foreach ($url_exclusion as $key=>$value)`
`915`	`915`	`if (strpos($_SERVER['REQUEST_URI'],$value) !== false)`
`@@ -1085,7 +1085,7 @@ static function CheckAllBefore(&$arEntity, $bSendEmail = FALSE) {`
`1085`	`1085`	`}`
`1086`	`1086`	`$custom_config = new CleantalkCustomConfig();`
`1087`	`1087`	`$url_exclusion = $custom_config->get_url_exclusions();`
`1088`		`- if (!empty($url_exclusion))`
	`1088`	`+ if ($url_exclusion)`
`1089`	`1089`	`{`
`1090`	`1090`	`foreach ($url_exclusion as $key=>$value)`
`1091`	`1091`	`if (strpos($_SERVER['REQUEST_URI'],$value) !== false)`