1.2.0 update

WBB 4.1, WCF 2.1 compatibility
t1n0-eu · Apr 26, 2015 · c3366d2 · c3366d2
1 parent b972bcf
commit c3366d2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/files.tar b/files.tar
diff --git a/files/lib/system/event/listener/ThreadAddFormAntiURLSpamListener.class.php b/files/lib/system/event/listener/ThreadAddFormAntiURLSpamListener.class.php
@@ -1,6 +1,6 @@
 <?php
 namespace wbb\system\event\listener;
-use wcf\system\event\IEventListener;
+use wcf\system\event\listener\IParameterizedEventListener;
 use wcf\util;
 use wcf\system\WCF;
 use wcf\system\Regex;
@@ -15,7 +15,7 @@
  * @subpackage	system.event.listener
  * @category	Community Framework
  */
-class ThreadAddFormAntiURLSpamListener implements IEventListener {
+class ThreadAddFormAntiURLSpamListener implements IParameterizedEventListener {
 	private $illegalChars = '[^\x0-\x2C\x2E\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]+';
 	private $sourceCodeRegEx = null;
 
@@ -55,16 +55,16 @@ class ThreadAddFormAntiURLSpamListener implements IEventListener {
 
 
 	/**
-	 * @see \wcf\system\event\IEventListener::execute()
+	 * @see \wcf\system\event\listener\IParameterizedEventListener::execute()
 	 */
-	public function execute($obj, $className, $eventName) {
-		$actionName = $obj->getActionName();
-		$parameters = $obj->getParameters();
+	public function execute($eventObj, $className, $eventName, array &$parameters) {
+		$actionName = $eventObj->getActionName();
+		$parameters = $eventObj->getParameters();
 
 		switch ($actionName) {
 			case 'triggerPublication':
 			case 'update':
-				$objects = $obj->getObjects();
+				$objects = $eventObj->getObjects();
 				if (empty($objects[0])) {
 					return;
 				}
@@ -88,7 +88,7 @@ public function execute($obj, $className, $eventName) {
 
 				if (($this->urlCount > POST_LINKRESTRICTION_MAX_URLS)
 					|| (POST_LINKRESTRICTION_ENABLE_IMAGE_RESTRICTION && $this->imgCount > POST_LINKRESTRICTION_MAX_IMAGES)) {
-					$obj->disable();
+					$eventObj->disable();
 				}
 				break;
 		}
@@ -131,9 +131,13 @@ public function parse($text) {
 		foreach ($matches as $match) {
 			$match1 = trim($match[1], '"=\'');
 			$match2 = trim($match[2], '"=\'');
+
 			if (!\wcf\system\application\ApplicationHandler::getInstance()->isInternalURL($match1) &&
-				!$this->isInternalURLCustom($match1) &&
-				!\wcf\system\application\ApplicationHandler::getInstance()->isInternalURL($match2) &&
+				!$this->isInternalURLCustom($match1)) {
+				$count++;
+			}
+
+			if (!\wcf\system\application\ApplicationHandler::getInstance()->isInternalURL($match2) &&
 				!$this->isInternalURLCustom($match2)) {
 				$count++;
 			}
@@ -174,6 +178,7 @@ private function isInternalURLCustom($url) {
 	private function getCustomURLS() {
 		$customURLs = explode(',', POST_LINKRESTRICTION_CUSTOM_URLS);
 		$customURLs = array_map(array($this, 'addHttpToCustomURLs'), $customURLs);
+
 		return $customURLs;
 	}
 

diff --git a/package.xml b/package.xml
@@ -7,8 +7,8 @@
 		<packagedescription>Disables user posts if they have a too low post counter and the post contains external URIs.</packagedescription>
 		<packagedescription language="de"><![CDATA[Deaktiviert Beiträge von Benutzern mit zu wenig Beiträgen, falls der Beitrag externe URLs enthält.]]></packagedescription>
 		<packagedescription language="de-informal"><![CDATA[Deaktiviert Beiträge von Benutzern mit zu wenig Beiträgen, falls der externe Beitrag URLs enthält.]]></packagedescription>
-		<version>1.1.4</version>
-		<date>2015-01-23</date>
+		<version>1.2.0</version>
+		<date>2015-04-26</date>
 		<license>LGPL</license>
 	</packageinformation>
 
@@ -18,8 +18,8 @@
 	</authorinformation>
 
 	<requiredpackages>
-		<requiredpackage minversion="2.0.0">com.woltlab.wcf</requiredpackage>
-		<requiredpackage minversion="4.0.0">com.woltlab.wbb</requiredpackage>
+		<requiredpackage minversion="2.1.0">com.woltlab.wcf</requiredpackage>
+		<requiredpackage minversion="4.1.0">com.woltlab.wbb</requiredpackage>
 	</requiredpackages>
 
 	<instructions type="install">