Merge branch 'development'

changelog.php

@@ -14,6 +14,10 @@
 - -> Removed
 ! -> Note
 
+Version 2.0.1
+- Removed a lot of word from swearwords.php
+^ Tweak and cleanup of variables + Javascript
+
 Version 2.0.0
 ^ Changed form names to avoid conflicts with other extensions such as Kunena
 # Fix broken recaptcha library since version 1.3.0

mod_shoutbox/fields/check.php

@@ -43,8 +43,8 @@ protected function getLabel()
 			// Detect Joomla version and render the message
 			if (version_compare(JVERSION, '3.0.0', 'ge'))
 			{			
-				$application = JFactory::getApplication();
-				$application->enqueueMessage(JText::_('WARNING_FREICHAT_IS_INSTALLED'), 'warning');
+				$app = JFactory::getApplication();
+				$app->enqueueMessage(JText::_('WARNING_FREICHAT_IS_INSTALLED'), 'warning');
 			}
 			else
 			{

mod_shoutbox/media/js/mod_shoutbox.js

@@ -4,11 +4,10 @@
  * @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
 */
 
-function addSmiley(smiley, id)
-{
+function addSmiley(smiley, id) {
+
 	// If we are not passed an id, use the default 'jj_message'.
-	if (!id)
-	{
+	if (!id) {
 		id = 'jj_message';
 	}
 
@@ -26,31 +25,41 @@ function addSmiley(smiley, id)
 	el.value = strBegin + " " + smiley + " " + strEnd;
 }
 
-function getCurserPosition(id){
-	var el = document.getElementById(id);
+function getCurserPosition(id) {
+
+	var el 	= document.getElementById(id);
 	var pos = 0;
 	// IE Support
-	if (document.selection){
-		el.focus ();
-		var Sel = document.selection.createRange();
-		var SelLength = document.selection.createRange().text.length;
+	if (document.selection) {
+		el.focus();
+		var Sel 		= document.selection.createRange();
+		var SelLength 	= document.selection.createRange().text.length;
+
 		Sel.moveStart ('character', -el.value.length);
 		pos = Sel.text.length - SelLength;
 	}
 	// Firefox support
-	else if (el.selectionStart || el.selectionStart == '0')
+	else if (el.selectionStart || el.selectionStart == '0') {
 		pos = el.selectionStart;
+	}
 
 	return pos;
 }
 
 jQuery(document).ready(function($) {
-	
+
 	// SlideToggle for smilies
-	$('#jj_btn').on('click', function(e) {	
-		e.preventDefault();
-		$(this).toggleClass('rotated');
-		$('#jj_smiley_box').stop(true, false).slideToggle();
-	});
-
-});
+	(function() {
+
+		var smileyBox 	= $('#jj_smiley_box');
+		var jj_btn		= $('#jj_btn');
+
+		jj_btn.on('click', function(e) {	
+			e.preventDefault();
+			$(this).toggleClass('rotated');
+			smileyBox.stop(true, false).slideToggle();
+		});
+
+	})();
+
+});

mod_shoutbox/mod_shoutbox.php

@@ -12,27 +12,27 @@
 require_once dirname(__FILE__) . '/helper.php';
 
 $displayName 		= $params->get('loginname');
-$smile 			= $params->get('smile');
+$smile 				= $params->get('smile');
 $swearcounter 		= $params->get('swearingcounter');
 $swearnumber 		= $params->get('swearingnumber');
-$number 		= $params->get('maximum');
+$number 			= $params->get('maximum');
 $submittext 		= $params->get('submittext');
 $nonmembers 		= $params->get('nonmembers');
-$profile 		= $params->get('profile');
-$date 			= $params->get('date');
+$profile 			= $params->get('profile');
+$date 				= $params->get('date');
 $securityquestion 	= $params->get('securityquestion');
 $mass_delete 		= $params->get('mass_delete');
 $permissions 		= $params->get('guestpost');
 $deletecolor		= $params->get('deletecolor', '#FF0000');
 $bordercolour 		= $params->get('bordercolor', '#FF3C16');
 $borderwidth 		= $params->get('borderwidth', '1');
 $headercolor 		= $params->get('headercolor', '#D0D0D0');
-$bbcode 		= $params->get('bbcode', 0);
+$bbcode 			= $params->get('bbcode', 0);
 
 // Assemble the factory variables needed
-$doc = JFactory::getDocument();
-$user = JFactory::getUser();
-$app = JFactory::getApplication();
+$doc 	= JFactory::getDocument();
+$user 	= JFactory::getUser();
+$app 	= JFactory::getApplication();
 
 // Add in jQuery if required
 if ($smile == 1 || $smile == 2 || $bbcode == 0)
@@ -43,9 +43,9 @@
 	}
 	else
 	{
-		if (!JFactory::getApplication()->get('jquery'))
+		if (!$app->get('jquery'))
 		{
-			JFactory::getApplication()->set('jquery', true);
+			$app->set('jquery', true);
 			$doc->addScript('//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js');
 			JHtml::_('script', 'mod_shoutbox/jquery-conflict.js', false, true);
 		}

mod_shoutbox/mod_shoutbox.xml

@@ -7,7 +7,7 @@
 	<license>http://www.gnu.org/licenses/gpl-3.0.html</license> 
 	<authorEmail>[email protected]</authorEmail> 
 	<authorUrl>http://www.joomjunk.co.uk</authorUrl> 
-	<version>2.0.0</version> 
+	<version>2.0.1</version> 
 	<description>JJSHOUTBOX_DESCRIPTION</description>
 
 	<install>

mod_shoutbox/sql/mysql/updates/2.0.1.sql

@@ -0,0 +1 @@
+# Placeholder file for database changes for version 2.0.1

mod_shoutbox/sql/postgresql/updates/2.0.1.sql

@@ -0,0 +1 @@
+# Placeholder file for database changes for version 2.0.1

mod_shoutbox/swearWords.php

@@ -8,77 +8,21 @@
 
 define('_JEXEC', 1);
 ?>
-anal
-anus
-arse
-ballsack
-balls
-bastard
-bitch
-biatch
-blowjob
-blow job
-bollock
-bollok
-boner
-boob
-bugger
-bum
-butt
-buttplug
-clitoris
-cock
 coon
-crap
 cunt
-damn
 dick
-dildo
-dyke
-fag
-feck
-fellate
-fellatio
-felching
 fuck
 f u c k
 f.uck
 f.u.c.k
-fudgepacker
-fudge packer
-flange
-homo
-jerk
-jizz
 knobend
 knob end
-labia
-lolita
-milf
-muff
 nigger
 nigga
-penis
-piss
-poop
-porn
-preteen
 prick
-pube
 pussy
-queer
-scrotum
-sex
 shit
 s.hit
 s.h.i.t
 s hit
-sh1t
-slut
-smegma
-spunk
-turd
 twat
-vagina
-wank
-whore