Merge pull request #221 from JoomJunk/development

Merge update 7.0.1
JoomJunk · Jan 23, 2016 · 41413d7 · 41413d7
2 parents 5b59e5d + f2e128e
commit 41413d7
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 20 deletions.
diff --git a/changelog.php b/changelog.php
@@ -14,17 +14,25 @@
 - -> Removed
 ! -> Note
 
+###Wip
+
+Version 7.0.1
+# Fixed images sometimes not being inline
+# Fixed object [Object] error
+# Fixed ReCaptcha being executed if called from 3rd party sources
+# Fixed cancel button always showing for Bootstrap 2
+
 Version 7.0.0
-- Added ability for user to edit their shout
-- Added option to set the output box height
-- Added Russian language files
-- Added option for header text colour
-- Added option for shout post text colour
-- Added option for textarea height
-- Added automatic email cloak
-- Added French language file (thanks Dominique)
-- Fixed error coming from extract() function
-- CSS improvements
++ Added ability for user to edit their shout
++ Added option to set the output box height
++ Added Russian language files
++ Added option for header text colour
++ Added option for shout post text colour
++ Added option for textarea height
++ Added automatic email cloak
++ Added French language file (thanks Dominique)
+# Fixed error coming from extract() function
+^ CSS improvements
 
 Version 6.0.4
 # Fixed maths question not refreshing after submitted post

diff --git a/mod_shoutbox/language/de-DE/de-DE.mod_shoutbox.ini b/mod_shoutbox/language/de-DE/de-DE.mod_shoutbox.ini
@@ -7,6 +7,7 @@
 
 JJSHOUTBOX_DESCRIPTION="<h1 style='color:black; font-weight:bold; padding:0px;'>JJ Shoutbox</h1><p>Copyright &copy; <a href='http://www.joomjunk.co.uk'>JoomJunk</a></p><p>Veröffentlicht unter GNU/GPL 3.0 Lizenz</p>"
 SHOUT_ADMIN_OPTIONS="Admin Options"
+SHOUT_AJAX_ERROR="There was an error completing the request. Please try again. If you see this error multiple times, please contact the administrator of the site."
 SHOUT_ALERTDESC="Die Angabe der Anzahl der Zeichen färbt sich orange wenn nur noch die hier eingebene Anzahl an Zeichen verbleiben."
 SHOUT_ALERTLABEL="Alarmierung Zeichenlimit"
 SHOUT_ANSWER_INCORRECT="Die Antwort ist nicht korrekt. Bitte versuchen Sie es erneut."

diff --git a/mod_shoutbox/language/en-GB/en-GB.mod_shoutbox.ini b/mod_shoutbox/language/en-GB/en-GB.mod_shoutbox.ini
@@ -7,6 +7,7 @@
 
 JJSHOUTBOX_DESCRIPTION="<h1 style='color:black; font-weight:bold; padding:0px;'>JJ Shoutbox</h1><p>Copyright &copy; <a href='http://www.joomjunk.co.uk'>JoomJunk</a></p><p>Released under GNU/GPL 3.0 License</p>"
 SHOUT_ADMIN_OPTIONS="Admin Options"
+SHOUT_AJAX_ERROR="There was an error completing the request. Please try again. If you see this error multiple times, please contact the administrator of the site."
 SHOUT_ALERTDESC="The number of characters remaining will change to orange when there are this amount of characters left."
 SHOUT_ALERTLABEL="Alert Character Length"
 SHOUT_ANSWER_INCORRECT="Security answer is incorrect. Please try again."

diff --git a/mod_shoutbox/language/fr-FR/fr-FR.mod_shoutbox.ini b/mod_shoutbox/language/fr-FR/fr-FR.mod_shoutbox.ini
@@ -7,6 +7,7 @@
 
 JJSHOUTBOX_DESCRIPTION="<h1 style='color:black; font-weight:bold; padding:0px;'>JJ Shoutbox</h1><p>Copyright &copy; <a href='http://www.joomjunk.co.uk'>JoomJunk</a></p><p>Réalisé sous licence GNU/GPL 3.0</p>"
 SHOUT_ADMIN_OPTIONS="Admin Options"
+SHOUT_AJAX_ERROR="There was an error completing the request. Please try again. If you see this error multiple times, please contact the administrator of the site."
 SHOUT_ALERTDESC="Le nombre de caractères restants sera indiqué en Orange, en-deça de la valeur indiquée"
 SHOUT_ALERTLABEL="Alerte Nombre de Caractères"
 SHOUT_ANSWER_INCORRECT="La réponse de sécurité est incorrecte. Veuillez essayer de nouveau."

diff --git a/mod_shoutbox/language/it-IT/it-IT.mod_shoutbox.ini b/mod_shoutbox/language/it-IT/it-IT.mod_shoutbox.ini
@@ -7,6 +7,7 @@
 
 JJSHOUTBOX_DESCRIPTION="<h1 style='color:black; font-weight:bold; padding:0px;'>JJ Shoutbox</h1><p>Copyright &copy; <a href='http://www.joomjunk.co.uk'>JoomJunk</a></p><p>Rilasciata sotto licenza GNU/GPL 3.0</p>"
 SHOUT_ADMIN_OPTIONS="Admin Options"
+SHOUT_AJAX_ERROR="There was an error completing the request. Please try again. If you see this error multiple times, please contact the administrator of the site."
 SHOUT_ALERTDESC="Il numero di caratteri rimanenti cambierà di colore arancione quando ci sono questa quantità di caratteri rimasti."
 SHOUT_ALERTLABEL="Avviso lunghezza caratteri"
 SHOUT_ANSWER_INCORRECT="La risposta di sicurezza è sbagliata. Riprova."

diff --git a/mod_shoutbox/language/nb-NO/nb-NO.mod_shoutbox.ini b/mod_shoutbox/language/nb-NO/nb-NO.mod_shoutbox.ini
@@ -7,6 +7,7 @@
 
 JJSHOUTBOX_DESCRIPTION="<h1 style='color:black; font-weight:bold; padding:0px;'>JJ Shoutbox</h1><p>Copyright &copy; <a href='http://www.joomjunk.co.uk'>JoomJunk</a></p><p>Utgitt under GNU / GPL 3.0 lisens</p>"
 SHOUT_ADMIN_OPTIONS="Admin Options"
+SHOUT_AJAX_ERROR="There was an error completing the request. Please try again. If you see this error multiple times, please contact the administrator of the site."
 SHOUT_ALERTDESC="Antall gjenværende bokstaver vil endre farge til oransje når dette antall bokstaver gjennstår"
 SHOUT_ALERTLABEL="Forvarsel for lengde"
 SHOUT_ANSWER_INCORRECT="Svaret er feil. Vennligst prøv igjen."

diff --git a/mod_shoutbox/language/nl-NL/nl-NL.mod_shoutbox.ini b/mod_shoutbox/language/nl-NL/nl-NL.mod_shoutbox.ini
@@ -7,6 +7,7 @@
 
 JJSHOUTBOX_DESCRIPTION="<h1 style='color:black; font-weight:bold; padding:0px;'>JJ Shoutbox</h1><p>Copyright &copy; <a href='http://www.joomjunk.co.uk'>JoomJunk</a></p><p>Vrijgegeven onder GNU/GPL 3.0 Licentie</p>"
 SHOUT_ADMIN_OPTIONS="Admin Options"
+SHOUT_AJAX_ERROR="There was an error completing the request. Please try again. If you see this error multiple times, please contact the administrator of the site."
 SHOUT_ALERTDESC="Het aantal overgebleven tekens zal veranderen naar oranje wanneer dit aantal tekens over is"
 SHOUT_ALERTLABEL="Waarschuwing bij aantal tekens"
 SHOUT_ANSWER_INCORRECT="Beveiligings-antwoord in niet juist. Probeer het opnieuw"

diff --git a/mod_shoutbox/language/pl-PL/pl-PL.mod_shoutbox.ini b/mod_shoutbox/language/pl-PL/pl-PL.mod_shoutbox.ini
@@ -7,6 +7,7 @@
 
 JJSHOUTBOX_DESCRIPTION="<h1 style='color:black; font-weight:bold; padding:0px;'>JJ Shoutbox</h1><p>Copyright &copy; <a href='http://www.joomjunk.co.uk'>JoomJunk</a></p><p>Wydany na licencji GNU/GPL 3.0</p>"
 SHOUT_ADMIN_OPTIONS="Admin Options"
+SHOUT_AJAX_ERROR="There was an error completing the request. Please try again. If you see this error multiple times, please contact the administrator of the site."
 SHOUT_ALERTDESC="Ilość znaków, przy której \"liczba pozostałych znaków\" zmieni kolor na żółty"
 SHOUT_ALERTLABEL="Uwaga o ilości znaków"
 SHOUT_ANSWER_INCORRECT="Niepoprawna odpowiedź na pytanie zabezpieczające. Spróbuj jeszcze raz."

diff --git a/mod_shoutbox/language/ru-RU/ru-RU.mod_shoutbox.ini b/mod_shoutbox/language/ru-RU/ru-RU.mod_shoutbox.ini
@@ -7,6 +7,7 @@
 
 JJSHOUTBOX_DESCRIPTION="<h1 style='color:black; font-weight:bold; padding:0px;'>JJ Shoutbox</h1><p>Copyright &copy; <a href='http://www.joomjunk.co.uk'>JoomJunk</a></p><p>Released under GNU/GPL 3.0 License</p>"
 SHOUT_ADMIN_OPTIONS="Admin Options"
+SHOUT_AJAX_ERROR="There was an error completing the request. Please try again. If you see this error multiple times, please contact the administrator of the site."
 SHOUT_ALERTDESC="Число оставшихся символов изменится на оранжевый при количестве."
 SHOUT_ALERTLABEL="Оповещение о предельной длине"
 SHOUT_ANSWER_INCORRECT="Ответ безопасности неправилен. Пожалуйста попробуйте еще раз."

diff --git a/mod_shoutbox/media/css/mod_shoutbox.css b/mod_shoutbox/media/css/mod_shoutbox.css
@@ -8,6 +8,9 @@
 	margin: auto; 
 	width: 100%; 
 }
+.jjshoutbox img { 
+	display: inline;
+}
 .jjshoutboxform { 
 	margin: 0 auto; 
 }
@@ -171,6 +174,7 @@
     display: none;
 }
 .edit-cancel,
+.edit-cancel.btn,
 .uk-button.edit-cancel {
     display: none;
 	width: 100%;

diff --git a/mod_shoutbox/media/js/mod_shoutbox.js b/mod_shoutbox/media/js/mod_shoutbox.js
@@ -413,8 +413,8 @@ jQuery(document).ready(function($) {
 				}			
 
 			},
-			error: function(ts){
-				JJShoutbox.showError(ts, instance);
+			error: function(){
+				JJShoutbox.showError(Joomla.JText._('SHOUT_AJAX_ERROR'), instance);
 			}
 		});
 
@@ -493,8 +493,8 @@ jQuery(document).ready(function($) {
 					JJShoutbox.showError(response.message, instance);
 				}
 			},
-			error: function(ts){
-				JJShoutbox.showError(ts, instance);
+			error: function(){
+				JJShoutbox.showError(Joomla.JText._('SHOUT_AJAX_ERROR'), instance);
 			}
 		});
 
@@ -587,8 +587,8 @@ jQuery(document).ready(function($) {
 					JJShoutbox.showError(response.message, instance);
 				}
 			},
-			error: function(ts){
-				JJShoutbox.showError(ts, instance);
+			error: function(){
+				JJShoutbox.showError(Joomla.JText._('SHOUT_AJAX_ERROR'), instance);
 			}
 		});
 
@@ -636,8 +636,8 @@ jQuery(document).ready(function($) {
 					JJShoutbox.showError(response.message, instance);
 				}
 			},
-			error: function(ts){
-				JJShoutbox.showError(ts, instance);
+			error: function(){
+				JJShoutbox.showError(Joomla.JText._('SHOUT_AJAX_ERROR'), instance);
 			}
 		});
 

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>[email protected]</authorEmail> 
 	<authorUrl>http://www.joomjunk.co.uk</authorUrl> 
-	<version>7.0.0</version> 
+	<version>7.0.1</version> 
 	<description>JJSHOUTBOX_DESCRIPTION</description>
 
 	<install>

diff --git a/mod_shoutbox/sql/mysql/updates/7.0.1.sql b/mod_shoutbox/sql/mysql/updates/7.0.1.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 7.0.1
diff --git a/mod_shoutbox/sql/postgresql/updates/7.0.1.sql b/mod_shoutbox/sql/postgresql/updates/7.0.1.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 7.0.1
diff --git a/mod_shoutbox/tmpl/default.php b/mod_shoutbox/tmpl/default.php
@@ -83,6 +83,7 @@
 JText::script('SHOUT_EDITOWN_TOO_LATE');
 JText::script('SHOUT_SUBMITTEXT');
 JText::script('SHOUT_UPDATE');
+JText::script('SHOUT_AJAX_ERROR');
 ?>
 
 <div id="<?php echo $uniqueIdentifier; ?>" class="jjshoutbox <?php echo $jj_class; ?>">
@@ -499,7 +500,10 @@ class="<?php echo $input_txtarea; ?>"
 			}			
 			else
 			{
-				var JJ_Recaptcha = typeof(grecaptcha) == 'undefined' ? '' : grecaptcha.getResponse();
+				var JJ_Recaptcha = '';
+				<?php if ($securitytype == 1) : ?>
+				JJ_Recaptcha = typeof(grecaptcha) == 'undefined' ? '' : grecaptcha.getResponse();
+				<?php endif; ?>
 
 				JJShoutbox.submitPost(shoutId, type, name, '<?php echo $title; ?>', <?php echo $securitytype; ?>, '<?php echo JSession::getFormToken(); ?>', Itemid, instance, JJ_Recaptcha, JJ_History);
 			}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# Placeholder file for database changes for version 7.0.1