release 2.4

CleanTalk/ControllerPublic/CleanTalkForum.php

@@ -0,0 +1,16 @@
+<?php
+
+class CleanTalk_ControllerPublic_CleanTalkForum extends XFCP_CleanTalk_ControllerPublic_CleanTalkForum {
+
+    public function actionCreateThread() {
+        $options = XenForo_Application::getOptions();
+	if ($options->get('cleantalk', 'enabled_comm')) {
+            XenForo_Application::getSession()->set('ct_submit_comment_time', time());
+            $field_name = CleanTalk_Base_CleanTalk::getCheckjsName();
+            $ct_check = CleanTalk_Base_CleanTalk::getCheckjsValue();
+            setcookie($field_name, $ct_check, 0, '/');
+        }
+	return parent::actionCreateThread();
+    }
+
+}

CleanTalk/ControllerPublic/CleanTalkMisc.php

@@ -0,0 +1,219 @@
+<?php
+
+class CleanTalk_ControllerPublic_CleanTalkMisc extends XFCP_CleanTalk_ControllerPublic_CleanTalkMisc {
+
+    public function actionContact() {
+
+		$options = XenForo_Application::get('options');
+
+		if($options->get('cleantalk', 'enabled_comm')){
+
+			if ($options->contactUrl['type'] == 'custom')
+				return $this->responseRedirect(
+					XenForo_ControllerResponse_Redirect::RESOURCE_CANONICAL,
+					$options->contactUrl['custom']
+				);
+			else if (!$options->contactUrl['type'])
+				return $this->responseRedirect(
+					XenForo_ControllerResponse_Redirect::RESOURCE_CANONICAL,
+					XenForo_Link::buildPublicLink('index')
+				);
+
+			if ($this->_request->isPost()){
+
+				if (!XenForo_Captcha_Abstract::validateDefault($this->_input))
+					return $this->responseCaptchaFailed();
+
+				$user = XenForo_Visitor::getInstance()->toArray();
+
+				if (!$user['user_id']){
+
+					$user['email'] = $this->_input->filterSingle('email', XenForo_Input::STRING);
+
+					if (!XenForo_Helper_Email::isEmailValid($user['email']))
+						return $this->responseError(new XenForo_Phrase('please_enter_valid_email'));
+
+				}
+
+				$input = $this->_input->filter(array(
+					'subject' => XenForo_Input::STRING,
+					'message' => XenForo_Input::STRING
+				));
+
+				if (!$user['username'] || !$input['subject'] || !$input['message'])
+					return $this->responseError(new XenForo_Phrase('please_complete_required_fields'));
+
+				$this->assertNotFlooding('contact');
+
+	// CleanTalk Part
+
+
+				require_once 'CleanTalk/Base/cleantalk.class.php';
+
+				$options = XenForo_Application::getOptions();
+
+				$ct_authkey = $options->get('cleantalk', 'apikey');
+
+				$dataRegistryModel = $this->getModelFromCache('XenForo_Model_DataRegistry');
+				$ct_ws = $dataRegistryModel->get('cleantalk_ws');
+				if (!$ct_ws) {
+					$ct_ws = array(
+						'work_url' => 'http://moderate.cleantalk.ru',
+						'server_url' => 'http://moderate.cleantalk.ru',
+						'server_ttl' => 0,
+						'server_changed' => 0
+					);
+				}
+
+				$field_name = CleanTalk_Base_CleanTalk::getCheckjsName();
+
+				if (!isset($_COOKIE[$field_name]))
+					$checkjs = NULL;
+				elseif (in_array($_COOKIE[$field_name], CleanTalk_Base_CleanTalk::getCheckJSArray()))
+					$checkjs = 1;
+				else
+					$checkjs = 0;
+
+				$js_timezone = (isset($_COOKIE['ct_timezone']) ? $_COOKIE['ct_timezone'] : '');
+				$first_key_timestamp = (isset($_COOKIE['ct_fkp_timestamp']) ? $_COOKIE['ct_fkp_timestamp'] : '');
+				$pointer_data = (isset($_COOKIE['ct_pointer_data']) ? json_decode($_COOKIE['ct_pointer_data']) : '');
+				$page_set_timestamp = (isset($_COOKIE['ct_ps_timestamp']) ? $_COOKIE['ct_ps_timestamp'] : 0);			
+
+				$refferrer 	= (!empty($_SERVER['HTTP_REFERER'])		? $_SERVER['HTTP_REFERER']		: null);
+				$user_agent = (!empty($_SERVER['HTTP_USER_AGENT'])	? $_SERVER['HTTP_USER_AGENT']	: null);
+
+				$ct = new Cleantalk();
+				$ct->work_url = $ct_ws['work_url'];
+				$ct->server_url = $ct_ws['server_url'];
+				$ct->server_ttl = $ct_ws['server_ttl'];
+				$ct->server_changed = $ct_ws['server_changed'];
+
+				$options = XenForo_Application::getOptions();
+				$ct_options=array(
+					'enabled_reg' => $options->get('cleantalk', 'enabled_reg'),
+					'enabled_comm' => $options->get('cleantalk', 'enabled_comm'),
+					'apikey' => $options->get('cleantalk', 'apikey')
+				);
+
+				$sender_info = json_encode(
+					array(
+						'cms_lang' => 'en',
+						'REFFERRER' => $refferrer,
+						'post_url' => $refferrer,
+						'USER_AGENT' => $user_agent,
+						'ct_options' => json_encode($ct_options),
+						'js_timezone' => $js_timezone,
+						'mouse_cursor_positions' => $pointer_data,
+						'key_press_timestamp' => $first_key_timestamp,
+						'page_set_timestamp' => $page_set_timestamp
+					)
+				);
+
+				$ct_request = new CleantalkRequest();
+				$ct_request->auth_key = $ct_authkey;
+				$ct_request->agent = 'xenforo-22';
+				$ct_request->response_lang = 'en';
+				$ct_request->js_on = $checkjs;
+				$ct_request->sender_info = $sender_info;
+				$ct_request->sender_email = $user['email'];
+				$ct_request->sender_nickname = $user['username'];
+				$ct_request->sender_ip = $ct->ct_session_ip($_SERVER['REMOTE_ADDR']);
+
+				$ct_submit_time = NULL;
+
+				$stored_time = XenForo_Application::getSession()->get('ct_submit_contact_time');
+				if (!empty($stored_time))
+					$ct_submit_time = time() - $stored_time;
+
+				$timelabels_key = 'e_comm';
+
+				$ct_request->submit_time = $ct_submit_time;
+				$ct_request->message = 	$message = json_encode(array_merge(
+					array(
+						'subject' => $input['subject']), 
+					array(
+						'message' => $input['message'])
+				));
+
+				// Additional info.
+				$post_info = '';
+				$a_post_info['comment_type'] = 'comment';
+
+				// JSON format.
+				$post_info = json_encode($a_post_info);
+
+				if ($post_info === FALSE)
+					$post_info = '';
+
+				$ct_request->post_info = $post_info;
+
+				$ct_result = $ct->isAllowMessage($ct_request);
+
+				$ret_val = array();
+				$ret_val['ct_request_id'] = $ct_result->id;
+
+				if ($ct->server_change) {
+					$dataRegistryModel->set('cleantalk_ws', array(
+						'work_url' => $ct->work_url,
+						'server_url' => $ct->server_url,
+						'server_ttl' => $ct->server_ttl,
+						'server_changed' => time()
+					));
+				}
+
+
+				// First check errstr flag.
+				if (!empty($ct_result->errstr) || (!empty($ct_result->inactive) && $ct_result->inactive == 1)){
+					// Cleantalk error so we go default way (no action at all).
+					// Just inform admin.
+
+					if (!empty($ct_result->errstr))
+						$ct_result->comment = $this->_filterResponse($ct_result->errstr);
+
+					$send_flag = FALSE;
+
+					$ct_time = $dataRegistryModel->get('cleantalk_' . $timelabels_key);
+
+					if (!$ct_time)
+						$send_flag = TRUE;
+					elseif(time() - 900 > $ct_time[0])// 15 minutes.
+						$send_flag = TRUE;
+
+					if ($send_flag) {
+						$dataRegistryModel->set('cleantalk_' . $timelabels_key, array(time()));
+
+						$mail = XenForo_Mail::create('cleantalk_error', array(
+								'plainText' => 1,
+								'htmlText' => nl2br($ct_result->comment)
+							)
+						);
+
+						$mail->send($options->get('contactEmailAddress'));
+					}
+					return parent::actionContact();
+				}
+
+				if ($ct_result->allow == 1) 
+					return parent::actionContact();
+				else
+					return $this->responseError(new XenForo_Phrase($ct_result->comment));
+
+			}else{
+				XenForo_Application::getSession()->set('ct_submit_contact_time', time());
+				return parent::actionContact();				
+			}
+		}
+		return parent::actionContact();
+    }
+
+	protected function _filterResponse($ct_response) {
+
+		if (preg_match('//u', $ct_response))
+			$err_str = preg_replace('/\*\*\*/iu', '', $ct_response);
+		else
+			$err_str = preg_replace('/\*\*\*/i', '', $ct_response);
+
+		return $err_str;
+    }
+
+}

CleanTalk/ControllerPublic/CleanTalkPost.php

@@ -0,0 +1,16 @@
+<?php
+
+class CleanTalk_ControllerPublic_CleanTalkPost extends XFCP_CleanTalk_ControllerPublic_CleanTalkPost {
+
+    public function actionEdit() {
+        $options = XenForo_Application::getOptions();
+	if ($options->get('cleantalk', 'enabled_comm')) {
+            XenForo_Application::getSession()->set('ct_submit_comment_time', time());
+            $field_name = CleanTalk_Base_CleanTalk::getCheckjsName();
+            $ct_check = CleanTalk_Base_CleanTalk::getCheckjsValue();
+            setcookie($field_name, $ct_check, 0, '/');
+        }
+	return parent::actionEdit();
+    }
+
+}

CleanTalk/ControllerPublic/CleanTalkRegister.php

@@ -0,0 +1,16 @@
+<?php
+
+class CleanTalk_ControllerPublic_CleanTalkRegister extends XFCP_CleanTalk_ControllerPublic_CleanTalkRegister {
+
+    protected function _getRegisterFormResponse(array $fields, array $errors = array()) {
+        $options = XenForo_Application::getOptions();
+	if ($options->get('cleantalk', 'enabled_reg')) {
+            XenForo_Application::getSession()->set('ct_submit_register_time', time());
+            $field_name = CleanTalk_Base_CleanTalk::getCheckjsName();
+            $ct_check = CleanTalk_Base_CleanTalk::getCheckjsValue();
+            setcookie($field_name, $ct_check, 0, '/');
+        }
+	return parent::_getRegisterFormResponse($fields, $errors);
+    }
+
+}

CleanTalk/ControllerPublic/CleanTalkThread.php

@@ -0,0 +1,16 @@
+<?php
+
+class CleanTalk_ControllerPublic_CleanTalkThread extends XFCP_CleanTalk_ControllerPublic_CleanTalkThread {
+
+    public function actionReply() {
+        $options = XenForo_Application::getOptions();
+	if ($options->get('cleantalk', 'enabled_comm')) {
+            XenForo_Application::getSession()->set('ct_submit_comment_time', time());
+            $field_name = CleanTalk_Base_CleanTalk::getCheckjsName();
+            $ct_check = CleanTalk_Base_CleanTalk::getCheckjsValue();
+            setcookie($field_name, $ct_check, 0, '/');
+        }
+	return parent::actionReply();
+    }
+
+}

CleanTalk/Listener/LoadClassController.php

@@ -0,0 +1,34 @@
+<?php
+class CleanTalk_Listener_LoadClassController {
+
+        public static function loadClassListenerRegister($class, &$extend) {
+                if ($class == 'XenForo_ControllerPublic_Register') {
+                        $extend[] = 'CleanTalk_ControllerPublic_CleanTalkRegister';
+                }
+        }
+
+        public static function loadClassListenerPost($class, &$extend) {
+                if ($class == 'XenForo_ControllerPublic_Post') {
+                        $extend[] = 'CleanTalk_ControllerPublic_CleanTalkPost';
+                }
+        }
+
+        public static function loadClassListenerForum($class, &$extend) {
+                if ($class == 'XenForo_ControllerPublic_Forum') {
+                        $extend[] = 'CleanTalk_ControllerPublic_CleanTalkForum';
+                }
+        }
+
+        public static function loadClassListenerThread($class, &$extend) {
+                if ($class == 'XenForo_ControllerPublic_Thread') {
+                        $extend[] = 'CleanTalk_ControllerPublic_CleanTalkThread';
+                }
+        }
+
+        public static function loadClassListenerMisc($class, &$extend) {
+                if ($class == 'XenForo_ControllerPublic_Misc') {
+                        $extend[] = 'CleanTalk_ControllerPublic_CleanTalkMisc';
+                }
+        }	
+
+}

CleanTalk/Listener/LoadClassModel.php

@@ -0,0 +1,10 @@
+<?php
+class CleanTalk_Listener_LoadClassModel {
+
+        public static function loadClassListener($class, &$extend) {
+                if ($class == 'XenForo_Model_SpamPrevention') {
+                        $extend[] = 'CleanTalk_Model_CleanTalk';
+                }
+        }
+
+}