Merge pull request #15 from znaeff/master

v1.7 - added uploaded picture description checking.
CleanTalk · May 11, 2016 · 16eea2a · 16eea2a
2 parents 10920ad + d1ce7c0
commit 16eea2a
Show file tree

Hide file tree

Showing 2 changed files with 103 additions and 2 deletions.
diff --git a/Antispam.hooks.php b/Antispam.hooks.php
@@ -2,6 +2,20 @@
 
 class CTHooks {
 
+	/**
+	 * Some HTML&JS code for JavaScript test 
+	 * @param UploadForm $editPage
+	 * @return bool
+	 */
+    public static function onShowUploadForm( $editPage ) {
+        global $wgCTSubmitTimeLabel;
+
+        $editPage->uploadFormTextTop = CTBody::AddJSCode();
+
+        $_SESSION[$wgCTSubmitTimeLabel] = time();
+
+        return true;
+    }
 	/**
 	 * Some HTML&JS code for JavaScript test 
 	 * @param HTMLForm $form
@@ -31,6 +45,90 @@ public static function onUserCreateForm( &$template ) {
         return true;
     }
 
+    /**
+	 * Upload spam test 
+	 * UploadBase $upload
+	 * string $mime
+	 * bool|array $error
+	 * @return none
+	 */
+    public static function onUploadFilter ( $upload, $mime, &$error ) {
+        global $wgCTAccessKey, $wgCTServerURL, $wgRequest, $wgCTAgent, $wgCTExtName, $wgCTNewEditsOnly, $wgCTMinEditCount, $wgUser;
+
+        # Skip spam check if error exists already
+        if ($error !== TRUE) {
+            return;
+        }
+
+        $allowUpload = true;
+
+        // Skip antispam test if user is member of special group
+        if ( $wgUser->isAllowed('cleantalk-bypass') ) {
+            return;
+        }
+
+        // Skip antispam test for user with getEditCount() more than setted value
+        $edit_count = $wgUser->getEditCount();
+        if ( isset($edit_count) && $edit_count > $wgCTMinEditCount ) {
+            return;
+        }
+
+        // The facility in which to store the query parameters
+        $ctRequest = new CleantalkRequest();
+
+        $ctRequest->auth_key = $wgCTAccessKey;
+        $ctRequest->sender_email = $wgUser->mEmail;
+        $ctRequest->sender_nickname = $wgUser->mName;
+        $ctRequest->message = $wgRequest->getVal('wpUploadDescription');
+        $ctRequest->agent = $wgCTAgent;
+        $ctRequest->sender_ip = $wgRequest->getIP(); 
+        $ctRequest->js_on = CTBody::JSTest(); 
+        $ctRequest->submit_time = CTBody::SubmitTimeTest(); 
+
+        $ctRequest->sender_info=json_encode(
+	    Array(
+		'page_url' => htmlspecialchars(@$_SERVER['SERVER_NAME'].@$_SERVER['REQUEST_URI']),
+    		'REFFERRER' => $_SERVER['HTTP_REFERER'],
+    		'USER_AGENT' => $_SERVER['HTTP_USER_AGENT'],
+	    )
+	);
+
+        $ct = new Cleantalk();
+        $ct->server_url = $wgCTServerURL;
+
+        // Check
+        $ctResult = $ct->isAllowMessage($ctRequest);
+
+        if ( $ctResult->errno != 0 ) {
+        	if(CTBody::JSTest() != 1)
+        	{
+        		$ctResult->allow = 0;
+        		$ctResult->comment = "Forbidden. Please, enable Javascript.";
+        		$allowUpload = false;
+        	}
+        	else
+        	{
+        		$ctResult->allow = 1;
+        		$allowUpload = true;
+        	}
+        }
+
+        // Disallow edit with CleanTalk comment 
+        if (!$allowUpload || $ctResult->allow == 0) {
+            // Converting links to wikitext format
+            $errorText = preg_replace("(<a\shref=\"([^\s]+)\".+>([a-f0-9]+)</a>)", "[$1 $2]", $ctResult->comment);
+
+            // Fill $error parameter as array with error text
+            $error = array($errorText);
+        }
+
+        if ($ctResult->inactive === 1) {
+            CTBody::SendAdminEmail( $wgCTExtName, $ctResult->comment );
+        }
+
+        return;
+    }
+
     /**
 	 * Edit spam test 
 	 * @return bool

diff --git a/Antispam.php b/Antispam.php
@@ -35,7 +35,7 @@
 /**
  * Extension agent name and version 
  */
-$wgCTAgent = 'mediawiki-16';
+$wgCTAgent = 'mediawiki-17';
 
 /**
  * Extension name 
@@ -103,7 +103,7 @@
 	'author' => 'Denis Shagimuratov',
 	'url' => 'https://www.mediawiki.org/wiki/Extension:Antispam',
 	'descriptionmsg' => 'cleantalk-desc',
-	'version' => '1.6',
+	'version' => '1.7',
 );
 
 $wgAutoloadClasses['CTBody'] = __DIR__ . '/Antispam.body.php';
@@ -115,6 +115,9 @@
 $wgHooks['EditFilter'][] = 'CTHooks::onEditFilter';
 $wgHooks['EditPage::showEditForm:initial'][] = 'CTHooks::onShowEditForm';
 
+$wgHooks['UploadForm:initial'][] = 'CTHooks::onShowUploadForm';
+$wgHooks['UploadVerifyFile'][] = 'CTHooks::onUploadFilter';
+
 // Skip edit test for Administrators
 $wgGroupPermissions['sysop']['cleantalk-bypass'] = true;