Merge pull request #269 from JoomJunk/development

Update to v8.1.2

changelog.php

@@ -14,6 +14,12 @@
 - -> Removed
 ! -> Note
 
+Version 8.1.2
+^ Cursor is now inserted between tags if they're empty
+^ Error now thrown if session has expired
+^ CSS improvements
+- Remove User Tagging beta feature (pro only feature)
+
 Version 8.1.1
 # Fixed edit/remove icons not showing on refresh
 # Fixed name not updating on shout edit

mod_shoutbox/fields/pro.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package    JJ_Shoutbox
+ * @author     JoomJunk <[email protected]>
+ * @copyright  Copyright (C) 2011 - 2016 JoomJunk. All Rights Reserved
+ * @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Notification for Pro version.
+ *
+ * @package     JJ_Shoutbox
+ * @since       1.5.6
+ */
+class JFormFieldPro extends JFormField
+{
+	/**
+	 * @var string
+	 */
+	protected $type = 'Pro';
+
+	/**
+	 * @return string
+	 */
+	protected function getLabel()
+	{
+		$app = JFactory::getApplication();
+		$msg = '<h3>Love JJ Shoutbox? Take a look at the <a href="http://joomjunk.co.uk/products/shoutbox-pro.html" target="_blank">Pro version</a> which is packed with many more features.</h3>';
+
+        return $app->enqueueMessage($msg, 'message');
+	}
+
+	/**
+	 * @return mixed
+	 */
+	protected function getInput()
+	{
+        return;
+	}
+}

mod_shoutbox/helper.php

@@ -42,42 +42,6 @@ public function __construct($id)
 		$this->params = $this->getParams($id);
 	}
 
-	/**
-	 * Gets a list of all users from the #__users table
-	 *
-	 * @return  object
-	 *
-	 * @since   8.0.0
-	 */
-	public function getAllUsers()
-	{
-		$db = JFactory::getDbo();
-
-		$query = $db->getQuery(true);
-		$query->select('username')
-			->from($db->qn('#__users'));
-
-		$db->setQuery($query);
-
-		$users = $db->loadAssocList();
-
-		// If we have an error then we'll create an exception
-		if ($db->getErrorNum())
-		{
-			throw new RuntimeException($db->getErrorMsg(), $db->getErrorNum());
-		}
-
-		// rename the array key
-		$users = array_map(function($users)
-		{
-			return array(
-				'username' => $users['username']
-			);
-		}, $users);
-
-		return $users;
-	}
-
 	/**
 	 * Method for submitting the post. Note AJAX suffix so it can take advantage of com_ajax
 	 *

mod_shoutbox/language/de-DE/de-DE.mod_shoutbox.ini

@@ -141,6 +141,7 @@ SHOUT_SECURITY_HIDE="Hide for registered users"
 SHOUT_SECURITY_HIDE_DESC="Select if you would like to hide the security question, so that it's only visible to the public"
 SHOUT_SECURITY_TYPE="Spamfilter"
 SHOUT_SECURITY_TYPE_DESC="Sie können zwischen ReCaptcha und einer einfachen Mathematikaufgabe als Spamfilter wählen"
+SHOUT_SESSION_EXPIRED="Your session has expired. Please login again"
 SHOUT_SHOW_DATE="Datum anzeigen"
 SHOUT_SHOW_DATEDESC="Soll das Datum bei einem Shoutbox Eintrag angezeigt werden,wenn ja, in welchem Format?"
 SHOUT_SMILE_CODE="Code"
@@ -157,9 +158,6 @@ SHOUT_SWEARNUMDESC="Wie viele Schimpfwörter darf ein Benutzer in einem Beitrag
 SHOUT_SWEARNUMLABEL="Maximale Anzahl an Schimpfwörtern"
 SHOUT_SWEAR_WORDS="Swear words"
 SHOUT_SWEAR_WORDS_WORD="Word"
-SHOUT_TAG_USER="User Tagging (Beta Feature)"
-SHOUT_TAG_USER_LABEL="Tag a User"
-SHOUT_TAG_USER_DESC="When enabled, you can tag a user in a shout by type '@', followed by the username. A dropdown will appear with a list of suggested usernames (max 5). Enabling this feature loads a list of ALL usernames, so if you have more than 1000 users, this may be resource heavy. We plan to improve the performance of this in the future."
 SHOUT_TEXTAREA_HEIGHT="Textarea height (px)"
 SHOUT_TEXTAREA_HEIGHT_DESC="Set the height (px) for the textarea"
 SHOUT_TIME_AGO="ago"

mod_shoutbox/language/en-GB/en-GB.mod_shoutbox.ini

@@ -141,6 +141,7 @@ SHOUT_SECURITY_HIDE="Hide for registered users"
 SHOUT_SECURITY_HIDE_DESC="Select if you would like to hide the security question, so that it's only visible to the public"
 SHOUT_SECURITY_TYPE="Security Type"
 SHOUT_SECURITY_TYPE_DESC="Select whether you would like to use ReCaptcha or a simple maths question"
+SHOUT_SESSION_EXPIRED="Your session has expired. Please login again"
 SHOUT_SHOW_DATE="Show date"
 SHOUT_SHOW_DATEDESC="Select whether or not you would like the date of the shout to be shown"
 SHOUT_SMILE_CODE="Code"
@@ -157,9 +158,6 @@ SHOUT_SWEARNUMDESC="What is the maximum number of swears a user is allowed to po
 SHOUT_SWEARNUMLABEL="Maximum amount of swears"
 SHOUT_SWEAR_WORDS="Swear words"
 SHOUT_SWEAR_WORDS_WORD="Word"
-SHOUT_TAG_USER="User Tagging (Beta Feature)"
-SHOUT_TAG_USER_LABEL="Tag a User"
-SHOUT_TAG_USER_DESC="When enabled, you can tag a user in a shout by type '@', followed by the username. A dropdown will appear with a list of suggested usernames (max 5). Enabling this feature loads a list of ALL usernames, so if you have more than 1000 users, this may be resource heavy. We plan to improve the performance of this in the future."
 SHOUT_TEXTAREA_HEIGHT="Textarea height (px)"
 SHOUT_TEXTAREA_HEIGHT_DESC="Set the height (px) for the textarea"
 SHOUT_TIME_AGO="ago"

mod_shoutbox/language/fr-FR/fr-FR.mod_shoutbox.ini

@@ -141,6 +141,7 @@ SHOUT_SECURITY_HIDE="Masqué pour les utilisateurs enregistrés"
 SHOUT_SECURITY_HIDE_DESC="Sélectionnez si vous souhaitez ou non masquer la question de sécurité qui sera alors uniquement visible par les visiteurs publics."
 SHOUT_SECURITY_TYPE="Type de sécurité"
 SHOUT_SECURITY_TYPE_DESC="Sélectionnez si vous souhaitez utiliser ReCaptcha ou une question simple de mathématique."
+SHOUT_SESSION_EXPIRED="Votre session a expiré. Veuillez vous connecter à nouveau"
 SHOUT_SHOW_DATE="Afficher la date"
 SHOUT_SHOW_DATEDESC="Sélectionnez si vous souhaitez afficher ou non la date de la discussion."
 SHOUT_SMILE_CODE="Code"
@@ -157,9 +158,6 @@ SHOUT_SWEARNUMDESC="Nombre maximum de tentatives d'insertion de mots injurieux q
 SHOUT_SWEARNUMLABEL="Nombre Max. de tentatives"
 SHOUT_SWEAR_WORDS="Bannissement de mots"
 SHOUT_SWEAR_WORDS_WORD="Mots bannis"
-SHOUT_TAG_USER="User Tagging (Beta Feature)"
-SHOUT_TAG_USER_LABEL="Tag a User"
-SHOUT_TAG_USER_DESC="When enabled, you can tag a user in a shout by type '@', followed by the username. A dropdown will appear with a list of suggested usernames (max 5). Enabling this feature loads a list of ALL usernames, so if you have more than 1000 users, this may be resource heavy. We plan to improve the performance of this in the future."
 SHOUT_TEXTAREA_HEIGHT="Hauteur de la zone de texte (px)"
 SHOUT_TEXTAREA_HEIGHT_DESC="Paramètrez la hauteur (en px) de la zone de texte."
 SHOUT_TIME_AGO="ago"

mod_shoutbox/language/it-IT/it-IT.mod_shoutbox.ini

@@ -141,6 +141,7 @@ SHOUT_SECURITY_HIDE="Hide for registered users"
 SHOUT_SECURITY_HIDE_DESC="Select if you would like to hide the security question, so that it's only visible to the public"
 SHOUT_SECURITY_TYPE="Security Type"
 SHOUT_SECURITY_TYPE_DESC="Select whether you would like to use ReCaptcha or a simple maths question"
+SHOUT_SESSION_EXPIRED="Your session has expired. Please login again"
 SHOUT_SHOW_DATE="Visualizza Data"
 SHOUT_SHOW_DATEDESC="Select whether or not you would like the date of the shout to be shown"
 SHOUT_SMILE_CODE="Code"
@@ -157,9 +158,6 @@ SHOUT_SWEARNUMDESC="Qual è il numero massimo di parolacce che un utente è auto
 SHOUT_SWEARNUMLABEL="Massima quantità di parolacce"
 SHOUT_SWEAR_WORDS="Swear words"
 SHOUT_SWEAR_WORDS_WORD="Word"
-SHOUT_TAG_USER="User Tagging (Beta Feature)"
-SHOUT_TAG_USER_LABEL="Tag a User"
-SHOUT_TAG_USER_DESC="When enabled, you can tag a user in a shout by type '@', followed by the username. A dropdown will appear with a list of suggested usernames (max 5). Enabling this feature loads a list of ALL usernames, so if you have more than 1000 users, this may be resource heavy. We plan to improve the performance of this in the future."
 SHOUT_TEXTAREA_HEIGHT="Textarea height (px)"
 SHOUT_TEXTAREA_HEIGHT_DESC="Set the height (px) for the textarea"
 SHOUT_TIME_AGO="fa"

mod_shoutbox/language/nb-NO/nb-NO.mod_shoutbox.ini

@@ -141,6 +141,7 @@ SHOUT_SECURITY_HIDE="Hide for registered users"
 SHOUT_SECURITY_HIDE_DESC="Select if you would like to hide the security question, so that it's only visible to the public"
 SHOUT_SECURITY_TYPE="Sikkerhetsmetode"
 SHOUT_SECURITY_TYPE_DESC="Velg om du ønsker å bruke ReCaptcha eller et enkelt mattespørsmål"
+SHOUT_SESSION_EXPIRED="Your session has expired. Please login again"
 SHOUT_SHOW_DATE="Vis dato"
 SHOUT_SHOW_DATEDESC="Velg om du ønsker at dato for publisering skal vises eller ikke"
 SHOUT_SMILE_CODE="Code"
@@ -157,9 +158,6 @@ SHOUT_SWEARNUMDESC="Hva er maksimal mengde banning en bruker er tillatt å publi
 SHOUT_SWEARNUMLABEL="Maks mengde banning"
 SHOUT_SWEAR_WORDS="Swear words"
 SHOUT_SWEAR_WORDS_WORD="Word"
-SHOUT_TAG_USER="User Tagging (Beta Feature)"
-SHOUT_TAG_USER_LABEL="Tag a User"
-SHOUT_TAG_USER_DESC="When enabled, you can tag a user in a shout by type '@', followed by the username. A dropdown will appear with a list of suggested usernames (max 5). Enabling this feature loads a list of ALL usernames, so if you have more than 1000 users, this may be resource heavy. We plan to improve the performance of this in the future."
 SHOUT_TEXTAREA_HEIGHT="Textarea height (px)"
 SHOUT_TEXTAREA_HEIGHT_DESC="Set the height (px) for the textarea"
 SHOUT_TIME_AGO="ago"

mod_shoutbox/language/nl-NL/nl-NL.mod_shoutbox.ini

@@ -141,6 +141,7 @@ SHOUT_SECURITY_HIDE="Verberg voor geregistreerde gebruikers"
 SHOUT_SECURITY_HIDE_DESC="Selecteer als u de veiligheidsvraag wilt verbergen, zodat het is alleen zichtbaar zal zijn voor het publiek"
 SHOUT_SECURITY_TYPE="Beveiligins methode"
 SHOUT_SECURITY_TYPE_DESC="Selecteer of je ReCaptcha of een simpele reken vraag wilt gebruiken"
+SHOUT_SESSION_EXPIRED="Your session has expired. Please login again"
 SHOUT_SHOW_DATE="Toon datum"
 SHOUT_SHOW_DATEDESC="Selecteer of de datum moet worden weergegeven in de shoutbox"
 SHOUT_SMILE_CODE="Code"
@@ -157,9 +158,6 @@ SHOUT_SWEARNUMDESC="Wat is het maximale aantal vloeken die voor een gebruiker zi
 SHOUT_SWEARNUMLABEL="Maximum aantal vloeken"
 SHOUT_SWEAR_WORDS="Scheldwoorden"
 SHOUT_SWEAR_WORDS_WORD="Woord"
-SHOUT_TAG_USER="Gebruiker Taggen (Beta Toekomst)"
-SHOUT_TAG_USER_LABEL="Tag een Gebruiker"
-SHOUT_TAG_USER_DESC="Wanneer ingeschakeld, kunt u een gebruiker in een shout taggen ' @', gevolgd door de gebruikersnaam. Een vervolgkeuzelijst wordt weergegeven met een lijst met voorgestelde gebruikersnamen (max 5). Inschakelen van deze functie laadt een lijst met alle gebruikersnamen, hebt u meer dan 1000 gebruikers, kan dit een zware belasting zijn. We zijn van plan om de prestaties van dit in de toekomst te verbeteren."
 SHOUT_TEXTAREA_HEIGHT="Hoogte tekstgedeelte (px)"
 SHOUT_TEXTAREA_HEIGHT_DESC="Stel de hoogte in (px) voor het tekstgedeelte"
 SHOUT_TIME_AGO="geleden"

mod_shoutbox/language/pl-PL/pl-PL.mod_shoutbox.ini

@@ -141,6 +141,7 @@ SHOUT_SECURITY_HIDE="Ukryj dla zarejestrowanych użytkowników"
 SHOUT_SECURITY_HIDE_DESC="Wybierz, czy chcesz, aby ukryć pytanie bezpieczeństwa dla zalogowanych, bedzie ono widoczne tylko dla gości"
 SHOUT_SECURITY_TYPE="Rodzaj zabezpieczenia"
 SHOUT_SECURITY_TYPE_DESC="Wybierz, czy chcesz korzystać z ReCaptcha lub proste pytanie matematyczne"
+SHOUT_SESSION_EXPIRED="Your session has expired. Please login again"
 SHOUT_SHOW_DATE="Pokaż datę"
 SHOUT_SHOW_DATEDESC="Wybierz, czy data ma się pokazywać"
 SHOUT_SMILE_CODE="Kod"
@@ -157,9 +158,6 @@ SHOUT_SWEARNUMDESC="Podaj maksymalną ilość przekleństw, którą użytkownik
 SHOUT_SWEARNUMLABEL="Maksymalna ilość przekleństw"
 SHOUT_SWEAR_WORDS="Przekleństwa"
 SHOUT_SWEAR_WORDS_WORD="Słowo"
-SHOUT_TAG_USER="User Tagging (Beta Feature)"
-SHOUT_TAG_USER_LABEL="Tag a User"
-SHOUT_TAG_USER_DESC="When enabled, you can tag a user in a shout by type '@', followed by the username. A dropdown will appear with a list of suggested usernames (max 5). Enabling this feature loads a list of ALL usernames, so if you have more than 1000 users, this may be resource heavy. We plan to improve the performance of this in the future."
 SHOUT_TEXTAREA_HEIGHT="Pole wiadomosci wysokość (px)"
 SHOUT_TEXTAREA_HEIGHT_DESC="Ustaw wysokosć (px) dla pola wiadomości"
 SHOUT_TIME_AGO="ago"

mod_shoutbox/language/ru-RU/ru-RU.mod_shoutbox.ini

@@ -78,7 +78,7 @@ SHOUT_HEADERLABEL="Цвет фона заголовка"
 SHOUT_HEADER_TEXT_COLOUR="Цвет текста заголовка"
 SHOUT_HEADER_TEXT_COLOUR_DESC="Выберите цвет текста заголовка"
 SHOUT_INVALID_AJAX_PARAMS="The submitted data was invalid"
-SHOUT_OUTOUTBOX_COLOUR="Ouput box colour"
+SHOUT_OUTOUTBOX_COLOUR="Цвет обёртки чата"
 SHOUT_OUTOUTBOX_COLOUR_DESC="Select the colour for the output box that contains the shouts"
 SHOUT_TEXT_COLOUR="Цвет текста сообщения"
 SHOUT_TEXT_COLOUR_DESC="Выберите цвет текста для сообщения"
@@ -141,6 +141,7 @@ SHOUT_SECURITY_HIDE="Скрыть для зарегистрированных п
 SHOUT_SECURITY_HIDE_DESC="Выберите, чтобы скрыть секретный вопрос, так что это будут видеть только незарегистрированные"
 SHOUT_SECURITY_TYPE="Тип безопасности"
 SHOUT_SECURITY_TYPE_DESC="Выберите, хотели бы Вы использовать ReCaptcha или простой вопрос по математике"
+SHOUT_SESSION_EXPIRED="Your session has expired. Please login again"
 SHOUT_SHOW_DATE="Как показывать дату"
 SHOUT_SHOW_DATEDESC="Выберите, показывать ли дату сообщения"
 SHOUT_SMILE_CODE="Код"
@@ -157,9 +158,6 @@ SHOUT_SWEARNUMDESC="Разрешенное кол-во выражений (не
 SHOUT_SWEARNUMLABEL="Максимальная сумма выражений"
 SHOUT_SWEAR_WORDS="Бранные слова"
 SHOUT_SWEAR_WORDS_WORD="Слово"
-SHOUT_TAG_USER="User Tagging (Beta Feature)"
-SHOUT_TAG_USER_LABEL="Tag a User"
-SHOUT_TAG_USER_DESC="When enabled, you can tag a user in a shout by type '@', followed by the username. A dropdown will appear with a list of suggested usernames (max 5). Enabling this feature loads a list of ALL usernames, so if you have more than 1000 users, this may be resource heavy. We plan to improve the performance of this in the future."
 SHOUT_TEXTAREA_HEIGHT="Высота поля textarea (px)"
 SHOUT_TEXTAREA_HEIGHT_DESC="Задайте высоту (px) для поля textarea"
 SHOUT_TIME_AGO="ago"