release 4.96

Author: davydovct

README.md

@@ -1,6 +1,6 @@
 Anti-spam plugin for Joomla 2.5-3.X.
 ============
-Version 4.9.5
+Version 4.9.6
 
 ## Simple antispam test
 

antispambycleantalk.php

@@ -25,7 +25,7 @@ class plgSystemAntispambycleantalk extends JPlugin {
     /**
      * Plugin version string for server
      */
-    const ENGINE = 'joomla3-495';
+    const ENGINE = 'joomla3-496';
 
     /**
      * Default value for hidden field ct_checkjs 
@@ -55,12 +55,7 @@ class plgSystemAntispambycleantalk extends JPlugin {
      * Flag marked JComments form initilization. 
      */
     private $JCReady = false;
-
-    /*
-     * Page load label
-     */
-    private $form_load_label = 'formtime';
-    
+   
     /*
      * Page load label
      */
@@ -491,8 +486,7 @@ public function onAfterInitialise(){
         }else{
            if(!(isset($_GET['option']) && $_GET['option'] == 'com_extrawatch') && !(isset($_GET['checkCaptcha']) && $_GET['checkCaptcha'] == 'true') && strpos($_SERVER['REQUEST_URI'],'securimage_show.php')===false){
 
-            	$session->set($this->form_load_label, time());
-            	$session->set('cleantalk_current_page', JURI::current());
+           		$this->apbct_cookie();
 
             }
         }
@@ -788,8 +782,6 @@ public function onAfterInitialise(){
 		       						{
 		       							if ($user['email']==$mail && substr($user['registerDate'], 0, 10) == $date)
 		       							{
-		       								$db->setQuery("UPDATE `#__users` SET ct_marked_as_spam = 1 WHERE id = ".$user['id']);
-		       								$db->query();	
 		       								if ($user['lastvisitDate'] == '0000-00-00 00:00:00')
 		       									$user['lastvisitDate'] = '-';
 		       								$spam_users[]=$user;
@@ -1438,21 +1430,11 @@ public function onAfterRoute() {
         $submit_time = NULL;
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $checkjs = $this->get_ct_checkjs();
-            $val = $session->get($this->form_load_label);
-            if ($val) {
-                $submit_time = time() - (int) $val;
-            }
 
             if (!$val && session_id() != '') {
                 $this->ct_direct_post = 1;
             }
-        } else {
-        	if(!(isset($_GET['option']) && $_GET['option'] == 'com_extrawatch') && !(isset($_GET['checkCaptcha']) && $_GET['checkCaptcha'] == 'true') && strpos($_SERVER['REQUEST_URI'],'securimage_show.php')===false)
-        	{
-            	$session->set($this->form_load_label, time());
-            	$session->set('cleantalk_current_page', JURI::current());
-            }
-        }
+        } 
         /*
             Contact forms anti-spam code
         */
@@ -1664,7 +1646,6 @@ public function onValidateContact(&$contact, &$data) {
                 $this->sendAdminEmail("CleanTalk. Can't verify feedback message!", $ctResponse['comment']);
             } else {
                 if ($ctResponse['allow'] == 0) {
-                    $session->set($this->form_load_label, time()); // update session 'formtime'
                     $res_str = $ctResponse['comment'];
                     $app->setUserState('com_contact.contact.data', $data);  // not used in 1.5 :(
                     $stub = JRequest::getString('id');
@@ -1676,11 +1657,6 @@ public function onValidateContact(&$contact, &$data) {
                 }
             }
         }
-        if(!(isset($_POST['itemName']) && $_POST['itemName'] == 'reginfo') && !(isset($_POST['option']) && $_POST['option'] == 'com_breezingforms'))
-        {
-        	$session->clear($this->form_load_label); // clear session 'formtime'
-        }
-
     }
 
     ////////////////////////////
@@ -1733,7 +1709,6 @@ public function onJCommentsCommentBeforeAdd(&$comment) {
 
         // set new time because onJCommentsFormAfterDisplay worked only once
         // and formtime in session need to be renewed between ajax posts
-        $session->set($this->form_load_label, time());
 
         $checkjs = $this->get_ct_checkjs();
 
@@ -2210,16 +2185,14 @@ private function initTables() {
         $field_presence = false;
 
         foreach ($users_columns as $column) {
-            if ($column[0] == 'ct_request_id' || $column[0] == 'ct_marked_as_spam') {
+            if ($column[0] == 'ct_request_id') {
                 $field_presence = true;
             }
         }
 
         if (!$field_presence) {
             $db->setQuery("ALTER TABLE `#__users` ADD ct_request_id char(32) NOT NULL DEFAULT ''");
             $db->query();
-            $db->setQuery("ALTER TABLE `#__users` ADD ct_marked_as_spam int NOT NULL DEFAULT 0");
-            $db->query();
         }
 
         if (!empty($arrTables)) {
@@ -2426,15 +2399,11 @@ private function validEmail($string) {
      *
      */
     private function submit_time_test() {
-        $session = JFactory::getSession();
-        $val = $session->get($this->form_load_label);
-        if ($val) {
-            $submit_time = time() - (int) $val;
-        } else {
-            $submit_time = NULL;
-        }
-
-        return $submit_time;
+		if($this->apbct_cookies_test() == 1){
+			return time() - $_COOKIE['apbct_timestamp'];
+		}else{
+			return null;
+		}
     }
 
     /**
@@ -2760,14 +2729,6 @@ private function swf_init($ct_apikey, $sfw_test_ip = null) {
 			$table->store();
             exit; 
         }
-        else
-        {
-        	//$sfw_log[$sender_ip]->all++;
-        	//
-	        // Setup secret key if the visitor doesn't exit in sfw_networks.
-	        //
-	        setcookie($this->sfw_cookie_lable, $sfw_key, 0, '/');
-        }
 
         $params   = new JRegistry($table->params);
 		$params->set('sfw_log',$sfw_log);
@@ -2778,7 +2739,58 @@ private function swf_init($ct_apikey, $sfw_test_ip = null) {
 
         return null;
     }
-    
+	/*
+	 * Set Cookies test for cookie test
+	 * Sets cookies with pararms timestamp && landing_timestamp && pervious_referer
+	 * Sets test cookie with all other cookies
+	 */
+	function apbct_cookie(){
+		
+		$config = $this->getCTConfig();
+		
+		// Cookie names to validate
+		$cookie_test_value = array(
+			'cookies_names' => array(),
+			'check_value' => $config['apikey'],
+		);
+			
+		// Submit time
+		$apbct_timestamp = time();
+		setcookie('apbct_timestamp', $apbct_timestamp, 0, '/');
+		$cookie_test_value['cookies_names'][] = 'apbct_timestamp';
+		$cookie_test_value['check_value'] .= $apbct_timestamp;
+
+		// Cookies test
+		$cookie_test_value['check_value'] = md5($cookie_test_value['check_value']);
+		setcookie('apbct_cookies_test', json_encode($cookie_test_value), 0, '/');
+	}
+	/**
+	 * Cookies test for sender 
+	 * Also checks for valid timestamp in $_COOKIE['apbct_timestamp'] and other apbct_ COOKIES
+	 * @return null|0|1;
+	 */
+	function apbct_cookies_test()
+	{
+		$config = $this->getCTConfig();
+		
+		if(isset($_COOKIE['apbct_cookies_test'])){
+			
+			$cookie_test = json_decode(stripslashes($_COOKIE['apbct_cookies_test']), true);
+			
+			$check_srting = $config['apikey'];
+			foreach($cookie_test['cookies_names'] as $cookie_name){
+				$check_srting .= isset($_COOKIE[$cookie_name]) ? $_COOKIE[$cookie_name] : '';
+			} unset($cokie_name);
+			
+			if($cookie_test['check_value'] == md5($check_srting)){
+				return 1;
+			}else{
+				return 0;
+			}
+		}else{
+			return null;
+		}
+	}    
     private function update_sfw_db_networks($ct_apikey)
     {
         $app = JFactory::getApplication();             

antispambycleantalk.xml

@@ -7,7 +7,7 @@
     <license>GNU/GPLv2</license>
     <authorEmail>welcome@cleantalk.org</authorEmail>
     <authorUrl>cleantalk.org</authorUrl>
-    <version>4.9.5</version>
+    <version>4.9.6</version>
     <description>PLG_CLEANTALK_DESCRIPTION</description>
     <files>
 	<filename plugin="antispambycleantalk">antispambycleantalk.php</filename>

plugin-updates.xml

@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <updates>
+	<update>
+		<name>Antispam by CleanTalk</name>
+		<description>Antispam plugin for Joomla registrations and contacts, for VurtueMart, Rapid Contact, VTEM Contact, JComments 2.3, 3.0.</description>
+		<element>antispambycleantalk</element>
+		<type>plugin</type>
+		<folder>system</folder>
+		<client_id>0</client_id>
+		<client>0</client>
+		<version>4.9.6</version>
+		<infourl title="Antispam by CleanTalk">https://cleantalk.org/joomla-anti-spam-plugin-without-captcha</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/CleanTalk/joomla25-3x-antispam/archive/master.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>CleanTalk</maintainer>
+		<maintainerurl>https://cleantalk.org</maintainerurl>
+		<targetplatform name="joomla" version="[23].*"/>
+	</update>
 	<update>
 		<name>Antispam by CleanTalk</name>
 		<description>Antispam plugin for Joomla registrations and contacts, for VurtueMart, Rapid Contact, VTEM Contact, JComments 2.3, 3.0.</description>

spamfirewall.html

@@ -62,7 +62,7 @@ <h1 class="main">SpamFireWall is activated for your IP <a href="https://cleantal
 
         <div id="js_passed">
         <h3>Please click bellow to pass protection</h3>
-        <a href='' onclick="set_spamFireWallCookie();window.location.reload(1)"><script>get_current_url();</script></a>
+        <a href='' onclick="set_spamFireWallCookie();"><script>get_current_url();</script></a>
         <br /><br /><br />
         <p class="js_notice">Or you will be automatically redirected to the requested page after %d seconds</p>
         </div>
@@ -75,7 +75,7 @@ <h3>Please click bellow to pass protection</h3>
         document.getElementById('js_passed').style.display = 'block';
         setTimeout(function(){
             set_spamFireWallCookie();
-            window.location.reload(1);
+            window.location.href=window.location.href + (window.location.search === '' ? '?sfw=pass' : '&sfw=pass');
         }, reload_timeout);
     </script>
 </body>