Merge branch 'dev'

Author: davydovct

.gitignore

@@ -1,6 +1,6 @@
-Version 2.15 October 05, 2017
+Version 2.16 Septebmer 14, 2017
 ------------------------------
-- Fix auto-update
+- Update fix.
 
 Version 2.14 Septebmer 14, 2017
 ------------------------------

CHANGELOG

@@ -8,9 +8,9 @@
 class RoboFile extends \Robo\Tasks
 {
     const PACKAGE = 'antispam_cleantalk_smf';
-    const VERSION = '2.15';
+    const VERSION = '2.16';
 
-    const SMF_VERSION = '2.0.15'; // for forumPrepare
+    const SMF_VERSION = '2.0.14'; // for forumPrepare
 
     /**
      * Build SMF zip-package

RoboFile.php

@@ -24,7 +24,7 @@
 require_once(dirname(__FILE__) . '/CleantalkSFW.php');
 
 // Common CleanTalk options
-define('CT_AGENT_VERSION', 'smf-215');
+define('CT_AGENT_VERSION', 'smf-216');
 define('CT_SERVER_URL', 'http://moderate.cleantalk.org');
 define('CT_DEBUG', false);
 
@@ -201,7 +201,7 @@ function cleantalk_check_message(&$msgOptions, $topicOptions, $posterOptions){
 		$ct_request->sender_ip = $ct->ct_session_ip($ip);
 
 		$ct_request->sender_nickname = isset($posterOptions['name']) ? $posterOptions['name'] : '';
-		$ct_request->message = $msgOptions['body'];
+		$ct_request->message = preg_replace('/\s+/', ' ',str_replace("<br />", " ", $msgOptions['body']));
 
 		$ct_request->submit_time = cleantalk_get_form_submit_time();
 
@@ -591,9 +591,9 @@ function cleantalk_load()
 			$ct_request->feedback = '0:'.CT_AGENT_VERSION;
 			$ct_result = $ct->sendFeedback($ct_request);
 			unset($ct, $ct_request);
-			
+			$curr_key = isset($modSettings['cleantalk_api_key'])?$modSettings['cleantalk_api_key']:'';
 			// Check if key is valid
-			if($_POST['cleantalk_api_key'] != $modSettings['cleantalk_api_key']){
+			if($_POST['cleantalk_api_key'] != $curr_key){
 
 				$key_to_validate = strval($_POST['cleantalk_api_key']);
 				$result = CleantalkHelper::noticeValidateKey($key_to_validate);
@@ -608,8 +608,7 @@ function cleantalk_load()
 								'cleantalk_api_key' => $key_to_validate								
 							),
 							false
-						);
-						
+						);						
 					}else{
 						updateSettings(
 							array(
@@ -644,7 +643,11 @@ function cleantalk_load()
 
 			// If key is valid doing noticePaidTill(), sfw update and sfw send logs via cron
 			if(!empty($modSettings['cleantalk_api_key_is_ok']))
+			{
+				if (isset($_POST['cleantalk_sfw']) && $_POST['cleantalk_sfw'] == 1)
+					updateSettings(array('cleantalk_sfw' => '1'), false);										
 				$doing_cron = true;
+			}
 
 		}
 
@@ -690,7 +693,6 @@ function cleantalk_load()
 
 	/* Cron for update SFW */
 	if(!empty($modSettings['cleantalk_sfw']) && (!empty($doing_cron) || (!empty($modSettings['cleantalk_api_key_is_ok']) && ((isset($modSettings['cleantalk_sfw_last_update']) && $modSettings['cleantalk_sfw_last_update'] < time()) || !isset($modSettings['cleantalk_sfw_last_update']) ) ))){
-
 		$sfw = new CleantalkSFW;
 		$sfw->sfw_update($modSettings['cleantalk_api_key']);
 		unset($sfw);
@@ -891,14 +893,13 @@ function cleantalk_buffer($buffer)
 
 			if(isset($_GET['ctcheckspam'])){
 
-				if($modSettings['cleantalk_api_key_is_ok'] == '1' && $modSettings['cleantalk_api_key'] != ''){
+				if(isset($modSettings['cleantalk_api_key_is_ok']) && $modSettings['cleantalk_api_key_is_ok'] == '1' && $modSettings['cleantalk_api_key'] != ''){
 
 					db_extend('packages');
 
 					// Unmark all users
-					$sql = 'UPDATE {db_prefix}members SET ct_marked = 0';
-					$result = $smcFunc['db_query']('', $sql, Array());
-					$smcFunc['db_free_result']($result);
+					$sql = 'UPDATE {db_prefix}members SET ct_marked = {int:default_value}';
+					$result = $smcFunc['db_query']('', $sql, array('default_value' => 0));
 
 					// Cicle params
 					$offset = 0;
@@ -937,13 +938,11 @@ function cleantalk_buffer($buffer)
 									if($value['appears'] == 1){
 										$sql = 'UPDATE {db_prefix}members set ct_marked=1 where member_ip="'.$key.'"';
 										$sub_result = $smcFunc['db_query']('', $sql, Array('db_error_skip' => true));
-										$smcFunc['db_free_result']($sub_result);
 									}
 								}else{
 									if($value['appears'] == 1){
 										$sql = 'UPDATE {db_prefix}members set ct_marked=1 where email_address="'.$key.'"';
 										$sub_result = $smcFunc['db_query']('', $sql, Array('db_error_skip' => true));
-										$smcFunc['db_free_result']($sub_result);
 									}
 								}
 							}

CleantalkMod.php cleantalkMod.php

@@ -77,23 +77,7 @@
 
 	/* SFW data table */
 		$smcFunc['db_drop_table']('{db_prefix}cleantalk_sfw');
-		$columns = array(
-			array(
-				'name' => 'network',
-				'type' => 'int',
-				'size' => 11,
-				'unsigned' => true
-			),
-			array(
-				'name' => 'mask',
-				'type' => 'int',
-				'size' => 11,
-				'unsigned' => true
-			),
-		);
-		$indexes = array();
-		$parameters = array();
-		$smcFunc['db_create_table']('{db_prefix}cleantalk_sfw', $columns, $indexes, $parameters, 'update_remove');
+		$smcFunc['db_query']('','CREATE TABLE {db_prefix}cleantalk_sfw (network int(11) unsigned not null, mask int(11) unsigned not null)',array());
 
 	/* SFW logs table */
 		$smcFunc['db_drop_table']('{db_prefix}cleantalk_sfw_logs');
@@ -157,5 +141,6 @@
 		$smcFunc['db_drop_table']('{db_prefix}cleantalk_sfw');
 		$smcFunc['db_drop_table']('{db_prefix}cleantalk_sfw_logs');
 		$smcFunc['db_remove_column']('{db_prefix}members', 'ct_marked', array(), '');
+		$smcFunc['db_query']('',"DELETE FROM {db_prefix}settings WHERE variable LIKE '%cleantalk%'",array());
     }
 }

install.php

@@ -4,27 +4,37 @@
 <head>
     <meta charset='utf-8' />
     <meta name='viewport' content='width=device-width, initial-scale=1' />
-	<meta http-equiv='сache-сontrol' content='no-cache'>
-	<meta http-equiv='сache-сontrol' content='private'>
-	<meta http-equiv='сache-сontrol' content='max-age=0, must-revalidate'>
-	<meta http-equiv='сache-сontrol' content='max-age=0, proxy-revalidate'>
-	<meta http-equiv='expires' content='0' />
-	<meta http-equiv='expires' content='Tue, 01 Jan 1980 1:00:00 GMT' />
-	<meta http-equiv='pragma' content='no-cache' />
+    <meta http-equiv='сache-сontrol' content='no-cache'>
+    <meta http-equiv='сache-сontrol' content='private'>
+    <meta http-equiv='сache-сontrol' content='max-age=0, must-revalidate'>
+    <meta http-equiv='сache-сontrol' content='max-age=0, proxy-revalidate'>
+    <meta http-equiv='expires' content='0' />
+    <meta http-equiv='expires' content='Tue, 01 Jan 1980 1:00:00 GMT' />
+    <meta http-equiv='pragma' content='no-cache' />
 
   <!--[if lt IE 9]>
   <script src='http://html5shiv.googlecode.com/svn/trunk/html5.js'></script>
   <![endif]-->
 <style>
-    html{font-size: 14pt;}
+    html{font-size: 10pt;font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;background: #f1f1f1;}
     h1{text-align:center}
+    a:hover,
+    a:active {
+            color: #00a0d2;
+    }
     h1.main{margin-top: 1em;margin-bottom: 3em;}
-    div.container {text-align:center;}
-    div.container p.js_notice{width: 60%; display: inline-block;}
-    div.footer {color: #666; position: absolute; bottom: 1em; text-align: center; width: 100%;}
+    div.container {text-align:center;
+                background: #fff;
+            color: #444;
+            margin: 2em auto;
+            padding: 1em 2em;
+            max-width: 700px;
+            -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13);
+            box-shadow: 0 1px 3px rgba(0,0,0,0.13);}
+    div.container p.js_notice{width: 100%%; display: inline-block;}
+    div.footer {color: #666; position: fixed; bottom: 1em; text-align: center; width: 100%%;}
     div.footer a {color: #666; vertical-align:bottom; text-align: center;}
     div#js_passed {display:none;}
-
     @media (max-width: 600px) {
     }
 </style>
@@ -49,8 +59,8 @@ <h1 class='main'>{SFW_DIE_NOTICE_IP}<a href='https://cleantalk.org/blacklists/{R
 
         <div id='js_passed'>
         <h3>{SFW_DIE_CLICK_TO_PASS}</h3>
-        <a href='{REQUEST_URI}'><script>get_current_url();</script></a>
-		{GENERATED}
+        <a href='{REQUEST_URI}' onclick="set_spamFireWallCookie('{COOKIE_PREFIX}ct_sfw_pass_key','{SFW_COOKIE}');set_spamFireWallCookie('{COOKIE_PREFIX}ct_sfw_passed','1'); window.location.reload(1)"><script>get_current_url();</script></a>
+        {GENERATED}
         <br /><br /><br />
         <p class='js_notice'>{SFW_DIE_YOU_WILL_BE_REDIRECTED}</p>
         </div>
@@ -61,11 +71,9 @@ <h3>{SFW_DIE_CLICK_TO_PASS}</h3>
     <script type='text/javascript'>
         document.getElementById('js_info').style.display = 'none';
         document.getElementById('js_passed').style.display = 'block';
-		setTimeout(function(){
-			set_spamFireWallCookie('{COOKIE_PREFIX}ct_sfw_pass_key','{SFW_COOKIE}');
-			set_spamFireWallCookie('{COOKIE_PREFIX}ct_sfw_passed','1');
-		}, 2000);
         setTimeout(function(){
+           set_spamFireWallCookie('{COOKIE_PREFIX}ct_sfw_pass_key','{SFW_COOKIE}');
+            set_spamFireWallCookie('{COOKIE_PREFIX}ct_sfw_passed','1');           
             window.location.reload(1);
         }, reload_timeout);
     </script>

lib/sfw_die_page.html

@@ -2,7 +2,7 @@
 <!DOCTYPE modification SYSTEM "http://www.simplemachines.org/xml/modification">
 <modification xmlns="www.simplemachines.org/xml/modification">
 	<id>cleantalk:antispam</id>
-	<version>2.15</version>
+	<version>2.16</version>
     <file name="$sourcedir/Post.php">
         <operation error="fatal">
             <search position="after"><![CDATA[createPost($msgOptions, $topicOptions, $posterOptions);]]></search>

modification.xml

@@ -4,8 +4,8 @@
 	<id>cleantalk:antispam</id>
 	<name>Anti-spam by CleanTalk</name>
 	<type>modification</type>
-	<version>2.15</version>
-	<install for="2.0 - 2.0.99">
+	<version>2.16</version>
+	<install for="2.0 - 2.1.99">
 		<readme type="file" parsebbc="true">readme.txt</readme>
 		<create-dir name="cleantalk" destination="$sourcedir"/>
 		<require-file name="cleantalkMod.php" destination="$sourcedir/cleantalk">Mod main file</require-file>
@@ -27,7 +27,7 @@
 			you are being redirected to this mod configuration settings.
 		</redirect>
 	</install>
-	<uninstall for="2.0 - 2.0.99">
+	<uninstall for="2.0 - 2.1.99">
 		<database>install.php</database>
 		<modification format="xml" type="file" reverse="true">modification.xml</modification>
 		<modification format="xml" type="file" reverse="true">languages/english.xml</modification>
@@ -36,9 +36,36 @@
 		<modification format="xml" type="file" reverse="true">languages/russian-utf8.xml</modification>
 		<remove-dir name="$sourcedir/cleantalk/"/>
 	</uninstall>
-	<upgrade from="2.0 - 2.0.99">
+	<upgrade from="1.80 - 2.11">
 		<readme type="inline" parsebbc="true">
 			<![CDATA[[size=14pt][color=red]Please uninstall old version cleantalk mod when installing newer version![/color][/size]]]>
 		</readme>
 	</upgrade>
+	<upgrade from="2.12 - 2.15">
+		<readme type="inline" parsebbc="true">This upgrade for Antispam by Cleantalk to 2.16 version:
+			- Fix SFW update on save settings
+			- Change SFW template
+			- Remove plugin settings on uninstall
+			- Fix sfw_create_table query
+		</readme>
+		<create-dir name="cleantalk" destination="$sourcedir"/>
+		<require-file name="cleantalkMod.php" destination="$sourcedir/cleantalk">Mod main file</require-file>
+		<require-file name="lib/Cleantalk.php" destination="$sourcedir/cleantalk">Base class</require-file>
+		<require-file name="lib/CleantalkRequest.php" destination="$sourcedir/cleantalk">Extend for base class</require-file>
+		<require-file name="lib/CleantalkResponse.php" destination="$sourcedir/cleantalk">Extend for base class</require-file>
+		<require-file name="lib/CleantalkHelper.php" destination="$sourcedir/cleantalk">Helper functions</require-file>
+		<require-file name="lib/CleantalkSFW.php" destination="$sourcedir/cleantalk">SFW class</require-file>
+		<require-file name="lib/phpFix.php" destination="$sourcedir/cleantalk">Fix for old PHP versions</require-file>
+		<require-file name="lib/sfw_die_page.html" destination="$sourcedir/cleantalk">SFW die page</require-file>
+		<require-file name="attention.png" destination="$sourcedir/cleantalk">attention picture</require-file>
+		<modification format="xml" type="file">modification.xml</modification>
+		<modification format="xml" type="file">languages/english.xml</modification>
+		<modification format="xml" type="file">languages/english-utf8.xml</modification>
+		<modification format="xml" type="file">languages/russian.xml</modification>
+		<modification format="xml" type="file">languages/russian-utf8.xml</modification>
+		<database>install.php</database>
+		<redirect url="$boardurl/index.php?action=admin;area=modsettings" type="inline">Please stand by while
+			you are being redirected to this mod configuration settings.
+		</redirect>			
+	</upgrade>
 </package-info>

package-info.xml

@@ -1,5 +1,5 @@
 MOD [b]Anti-spam by CleanTalk[/b]
-Version: 2.15
+Version: 2.16
 
 Anti-spam by CleanTalk mod with protection against spam bots and manual spam.
 No Captcha, no questions, no counting animals, no puzzles, no math.