From 180e7db88cf6504a9e3c35f41c3b0e0a3bdd93d7 Mon Sep 17 00:00:00 2001 From: Lodder Date: Sun, 7 Dec 2014 19:47:46 +0000 Subject: [PATCH 1/5] Removed all the shit from swearwords file --- mod_shoutbox/swearWords.php | 56 ------------------------------------- 1 file changed, 56 deletions(-) diff --git a/mod_shoutbox/swearWords.php b/mod_shoutbox/swearWords.php index 905331c..0452d41 100644 --- a/mod_shoutbox/swearWords.php +++ b/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 From dea2f78c5af772374397eef5e7da7305c60e5fa1 Mon Sep 17 00:00:00 2001 From: Lodder Date: Sun, 7 Dec 2014 19:50:03 +0000 Subject: [PATCH 2/5] updated changelog --- changelog.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.php b/changelog.php index b42e275..b2e1e19 100644 --- a/changelog.php +++ b/changelog.php @@ -14,6 +14,9 @@ - -> Removed ! -> Note +Version 2.0.1 +- Removed a lot of word from swearwords.php + 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 From 4749def66bd0b873e4015c75094e18ab956166e1 Mon Sep 17 00:00:00 2001 From: Lodder Date: Sun, 7 Dec 2014 20:00:16 +0000 Subject: [PATCH 3/5] variable and code styling tweaks/cleanup --- mod_shoutbox/fields/check.php | 4 +-- mod_shoutbox/media/js/mod_shoutbox.js | 47 ++++++++++++++++----------- mod_shoutbox/mod_shoutbox.php | 20 ++++++------ 3 files changed, 40 insertions(+), 31 deletions(-) diff --git a/mod_shoutbox/fields/check.php b/mod_shoutbox/fields/check.php index 0b695d3..de52a40 100644 --- a/mod_shoutbox/fields/check.php +++ b/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 { diff --git a/mod_shoutbox/media/js/mod_shoutbox.js b/mod_shoutbox/media/js/mod_shoutbox.js index af15434..82990e3 100644 --- a/mod_shoutbox/media/js/mod_shoutbox.js +++ b/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(); + }); + + })(); + +}); \ No newline at end of file diff --git a/mod_shoutbox/mod_shoutbox.php b/mod_shoutbox/mod_shoutbox.php index 13394eb..dfd46be 100644 --- a/mod_shoutbox/mod_shoutbox.php +++ b/mod_shoutbox/mod_shoutbox.php @@ -12,14 +12,14 @@ 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'); @@ -27,12 +27,12 @@ $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); } From 29ce2637babffe6718d729bd34d61844effba65f Mon Sep 17 00:00:00 2001 From: Lodder Date: Sun, 7 Dec 2014 20:05:08 +0000 Subject: [PATCH 4/5] update to version 2.0.1 --- changelog.php | 1 + mod_shoutbox/mod_shoutbox.xml | 2 +- mod_shoutbox/sql/mysql/updates/2.0.1.sql | 1 + mod_shoutbox/sql/postgresql/updates/2.0.1.sql | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 mod_shoutbox/sql/mysql/updates/2.0.1.sql create mode 100644 mod_shoutbox/sql/postgresql/updates/2.0.1.sql diff --git a/changelog.php b/changelog.php index b2e1e19..a516775 100644 --- a/changelog.php +++ b/changelog.php @@ -16,6 +16,7 @@ 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 diff --git a/mod_shoutbox/mod_shoutbox.xml b/mod_shoutbox/mod_shoutbox.xml index 3b4270c..8537d9a 100644 --- a/mod_shoutbox/mod_shoutbox.xml +++ b/mod_shoutbox/mod_shoutbox.xml @@ -7,7 +7,7 @@ http://www.gnu.org/licenses/gpl-3.0.html admin@joomjunk.co.uk http://www.joomjunk.co.uk - 2.0.0 + 2.0.1 JJSHOUTBOX_DESCRIPTION diff --git a/mod_shoutbox/sql/mysql/updates/2.0.1.sql b/mod_shoutbox/sql/mysql/updates/2.0.1.sql new file mode 100644 index 0000000..8d6a48e --- /dev/null +++ b/mod_shoutbox/sql/mysql/updates/2.0.1.sql @@ -0,0 +1 @@ +# Placeholder file for database changes for version 2.0.0 diff --git a/mod_shoutbox/sql/postgresql/updates/2.0.1.sql b/mod_shoutbox/sql/postgresql/updates/2.0.1.sql new file mode 100644 index 0000000..8d6a48e --- /dev/null +++ b/mod_shoutbox/sql/postgresql/updates/2.0.1.sql @@ -0,0 +1 @@ +# Placeholder file for database changes for version 2.0.0 From 2ea3bc54c595684e672969f42eb54e37fd35c0ab Mon Sep 17 00:00:00 2001 From: wilsonge Date: Mon, 8 Dec 2014 14:24:43 +0000 Subject: [PATCH 5/5] Add missing 2.0.1 sql files and 2.0.2 for next release --- mod_shoutbox/sql/mysql/updates/2.0.1.sql | 1 + mod_shoutbox/sql/mysql/updates/2.0.2.sql | 1 + mod_shoutbox/sql/postgresql/updates/2.0.1.sql | 1 + mod_shoutbox/sql/postgresql/updates/2.0.2.sql | 1 + 4 files changed, 4 insertions(+) create mode 100644 mod_shoutbox/sql/mysql/updates/2.0.1.sql create mode 100644 mod_shoutbox/sql/mysql/updates/2.0.2.sql create mode 100644 mod_shoutbox/sql/postgresql/updates/2.0.1.sql create mode 100644 mod_shoutbox/sql/postgresql/updates/2.0.2.sql diff --git a/mod_shoutbox/sql/mysql/updates/2.0.1.sql b/mod_shoutbox/sql/mysql/updates/2.0.1.sql new file mode 100644 index 0000000..74957d8 --- /dev/null +++ b/mod_shoutbox/sql/mysql/updates/2.0.1.sql @@ -0,0 +1 @@ +# Placeholder file for database changes for version 2.0.1 diff --git a/mod_shoutbox/sql/mysql/updates/2.0.2.sql b/mod_shoutbox/sql/mysql/updates/2.0.2.sql new file mode 100644 index 0000000..31a4e33 --- /dev/null +++ b/mod_shoutbox/sql/mysql/updates/2.0.2.sql @@ -0,0 +1 @@ +# Placeholder file for database changes for version 2.0.2 diff --git a/mod_shoutbox/sql/postgresql/updates/2.0.1.sql b/mod_shoutbox/sql/postgresql/updates/2.0.1.sql new file mode 100644 index 0000000..74957d8 --- /dev/null +++ b/mod_shoutbox/sql/postgresql/updates/2.0.1.sql @@ -0,0 +1 @@ +# Placeholder file for database changes for version 2.0.1 diff --git a/mod_shoutbox/sql/postgresql/updates/2.0.2.sql b/mod_shoutbox/sql/postgresql/updates/2.0.2.sql new file mode 100644 index 0000000..31a4e33 --- /dev/null +++ b/mod_shoutbox/sql/postgresql/updates/2.0.2.sql @@ -0,0 +1 @@ +# Placeholder file for database changes for version 2.0.2