Merge pull request #288 from JoomJunk/development

C-Lodder · web-flow · commit cce7b5600f32 · 2017-02-28T14:27:05.000+01:00
Update to v8.1.12
diff --git a/changelog.php b/changelog.php
@@ -14,6 +14,10 @@
 - -> Removed
 ! -> Note
 
+Version 8.1.12
+* Prevent access via the 'window.opener' object with submitted links
+^ Fix smiley being shown multiple times for the same image if there are multiple shortcuts
+
 Version 8.1.11
 # Fixed easyprofile avatars not showing on refresh
 # Fixed incorrect name used when updating a different user's shout
diff --git a/mod_shoutbox/helper.php b/mod_shoutbox/helper.php
@@ -514,7 +514,7 @@ public function bbcodeFilter($message)
 			'<span class="jj-italic">$1</span>',
 			'<span class="jj-underline">$1</span>',
 			'<a href="#" data-jj-image="http$1://$2" data-jj-image-alt="$3" class="jj-image-modal">$3</a>',
-			'<a href="http$1://$2" target="_blank">$3</a>'
+			'<a href="http$1://$2" target="_blank" rel="noopener noreferrer">$3</a>'
 		);
 
 		$message = preg_replace($search, $replace, $message);
@@ -527,7 +527,7 @@ public function bbcodeFilter($message)
 	 *
 	 * @param   string  $id  The id of the textarea to insert the smiley into
 	 *
-	 * @return  array  $smilies The smiley images html code.
+	 * @return  string  $smilies The smiley images html code.
 	 *
 	 * @since   1.2
 	 */
@@ -536,8 +536,9 @@ public function smileyShow($id = 'jj_message')
 		$getSmilies = $this->getSmilies();
 
 		$smilies = '';
+		$uniqueSmilies = array_unique($getSmilies);
 
-		foreach ($getSmilies as $smile => $url)
+		foreach ($uniqueSmilies as $smile => $url)
 		{
 			$smilies .= '<li><img class="jj_smiley" src="images/mod_shoutbox/' . $url . '" alt="' . $smile . '" onClick="JJShoutbox.addSmiley(\'' . $smile . '\', \'' . $id . '\')" /></li>';
 		}
diff --git a/mod_shoutbox/mod_shoutbox.xml b/mod_shoutbox/mod_shoutbox.xml
@@ -7,7 +7,7 @@
 	<license>http://www.gnu.org/licenses/gpl-3.0.html</license>
 	<authorEmail>admin@joomjunk.co.uk</authorEmail>
 	<authorUrl>http://www.joomjunk.co.uk</authorUrl>
-	<version>8.1.11</version>
+	<version>8.1.12</version>
 	<description>JJSHOUTBOX_DESCRIPTION</description>
 
 	<install>
diff --git a/mod_shoutbox/sql/mysql/updates/8.1.12.sql b/mod_shoutbox/sql/mysql/updates/8.1.12.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 8.1.12
diff --git a/mod_shoutbox/sql/postgresql/updates/8.1.12.sql b/mod_shoutbox/sql/postgresql/updates/8.1.12.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 8.1.12

Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,7 @@ public function bbcodeFilter($message)`
`514`	`514`	`'<span class="jj-italic">$1</span>',`
`515`	`515`	`'<span class="jj-underline">$1</span>',`
`516`	`516`	`'<a href="#" data-jj-image="http$1://$2" data-jj-image-alt="$3" class="jj-image-modal">$3</a>',`
`517`		`- '<a href="http$1://$2" target="_blank">$3</a>'`
	`517`	`+ '<a href="http$1://$2" target="_blank" rel="noopener noreferrer">$3</a>'`
`518`	`518`	`);`
`519`	`519`
`520`	`520`	`$message = preg_replace($search, $replace, $message);`
`@@ -527,7 +527,7 @@ public function bbcodeFilter($message)`
`527`	`527`	`*`
`528`	`528`	`* @param string $id The id of the textarea to insert the smiley into`
`529`	`529`	`*`
`530`		`- * @return array $smilies The smiley images html code.`
	`530`	`+ * @return string $smilies The smiley images html code.`
`531`	`531`	`*`
`532`	`532`	`* @since 1.2`
`533`	`533`	`*/`
`@@ -536,8 +536,9 @@ public function smileyShow($id = 'jj_message')`
`536`	`536`	`$getSmilies = $this->getSmilies();`
`537`	`537`
`538`	`538`	`$smilies = '';`
	`539`	`+ $uniqueSmilies = array_unique($getSmilies);`
`539`	`540`
`540`		`- foreach ($getSmilies as $smile => $url)`
	`541`	`+ foreach ($uniqueSmilies as $smile => $url)`
`541`	`542`	`{`
`542`	`543`	`$smilies .= '<li><img class="jj_smiley" src="images/mod_shoutbox/' . $url . '" alt="' . $smile . '" onClick="JJShoutbox.addSmiley(\'' . $smile . '\', \'' . $id . '\')" /></li>';`
`543`	`544`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Placeholder file for database changes for version 8.1.12`