Merge pull request #294 from JoomJunk/development

Merge dev branch into master
JoomJunk · May 24, 2018 · 9ebceba · 9ebceba
2 parents 013acb2 + 5c5245f
commit 9ebceba
Show file tree

Hide file tree

Showing 34 changed files with 51 additions and 37 deletions.
diff --git a/changelog.php b/changelog.php
@@ -14,6 +14,10 @@
 - -> Removed
 ! -> Note
 
+Version 8.1.14
+# Fixed install SQL missing a field
+# Fixed HTML5 notification image on multilingual sites
+
 Version 8.1.13
 ^ Improved layout for RTL languages
 

diff --git a/mod_shoutbox/fields/pro.php b/mod_shoutbox/fields/pro.php
@@ -2,7 +2,7 @@
 /**
  * @package    JJ_Shoutbox
  * @author     JoomJunk <[email protected]>
- * @copyright  Copyright (C) 2011 - 2017 JoomJunk. All Rights Reserved
+ * @copyright  Copyright (C) 2011 - 2018 JoomJunk. All Rights Reserved
  * @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
  */
 

diff --git a/mod_shoutbox/fields/sep.php b/mod_shoutbox/fields/sep.php
@@ -1,7 +1,7 @@
 <?php
 /**
 * @package    JJ_Shoutbox
-* @copyright  Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+* @copyright  Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 * @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
 */
 

diff --git a/mod_shoutbox/helper.php b/mod_shoutbox/helper.php
@@ -1,7 +1,7 @@
 <?php
 /**
 * @package    JJ_Shoutbox
-* @copyright  Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+* @copyright  Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 * @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
 */
 

diff --git a/mod_shoutbox/language/de-DE/de-DE.mod_shoutbox.ini b/mod_shoutbox/language/de-DE/de-DE.mod_shoutbox.ini
@@ -1,7 +1,7 @@
 ; $Id: de-DE.mod_shoutbox.ini 00001 20.04.2016 01.47.30 $
 ; Mod mod_shoutbox (mod_shoutbox)
 ; @date 20.04.2016
-; @Copyright Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+; @Copyright Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 ; @http://www.gnu.org/licenses/gpl-3.0.html
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/mod_shoutbox/language/de-DE/de-DE.mod_shoutbox.sys.ini b/mod_shoutbox/language/de-DE/de-DE.mod_shoutbox.sys.ini
@@ -1,7 +1,7 @@
 ; $Id: de-DE.mod_shoutbox.ini 00001 20.04.2016 01.47.30 $
 ; Mod mod_shoutbox (mod_shoutbox)
 ; @date 20.04.2016
-; @Copyright Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+; @Copyright Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 ; @http://www.gnu.org/licenses/gpl-3.0.html
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/mod_shoutbox/language/en-GB/en-GB.mod_shoutbox.ini b/mod_shoutbox/language/en-GB/en-GB.mod_shoutbox.ini
@@ -1,7 +1,7 @@
 ; $Id: en-GB.mod_shoutbox.ini 00001 05.03.2012 01.47.30 $
 ; Mod mod_shoutbox (mod_shoutbox)
 ; @date 15.03.2012
-; @Copyright Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+; @Copyright Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 ; @http://www.gnu.org/licenses/gpl-3.0.html
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/mod_shoutbox/language/en-GB/en-GB.mod_shoutbox.sys.ini b/mod_shoutbox/language/en-GB/en-GB.mod_shoutbox.sys.ini
@@ -1,7 +1,7 @@
 ; $Id: en-GB.mod_shoutbox.sys.ini 00001 05.03.2012 01.47.30 $
 ; Mod mod_shoutbox (mod_shoutbox)
 ; @date 15.03.2012
-; @Copyright Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+; @Copyright Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 ; @http://www.gnu.org/licenses/gpl-3.0.html
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/mod_shoutbox/language/fr-FR/fr-FR.mod_shoutbox.ini b/mod_shoutbox/language/fr-FR/fr-FR.mod_shoutbox.ini
@@ -1,7 +1,7 @@
 ; $Id: fr-FR.mod_shoutbox.ini 00001 05.03.2012 01.47.30 $
 ; Mod mod_shoutbox (mod_shoutbox)
 ; @date 15.03.2012
-; @Copyright Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+; @Copyright Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 ; @http://www.gnu.org/licenses/gpl-3.0.html
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/mod_shoutbox/language/fr-FR/fr-FR.mod_shoutbox.sys.ini b/mod_shoutbox/language/fr-FR/fr-FR.mod_shoutbox.sys.ini
@@ -1,7 +1,7 @@
 ; $Id: fr-FR.mod_shoutbox.sys.ini 00001 05.03.2012 01.47.30 $
 ; Mod mod_shoutbox (mod_shoutbox)
 ; @date 15.03.2012
-; @Copyright Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+; @Copyright Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 ; @http://www.gnu.org/licenses/gpl-3.0.html
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/mod_shoutbox/language/it-IT/it-IT.mod_shoutbox.ini b/mod_shoutbox/language/it-IT/it-IT.mod_shoutbox.ini
@@ -1,7 +1,7 @@
 ; $Id: it-IT.mod_shoutbox.ini 00001 05.03.2012 01.47.30 $
 ; Mod mod_shoutbox (mod_shoutbox)
 ; @date 15.03.2012
-; @Copyright Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+; @Copyright Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 ; @http://www.gnu.org/licenses/gpl-3.0.html
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/mod_shoutbox/language/it-IT/it-IT.mod_shoutbox.sys.ini b/mod_shoutbox/language/it-IT/it-IT.mod_shoutbox.sys.ini
@@ -1,7 +1,7 @@
 ; $Id: it-IT.mod_shoutbox.sys.ini 00001 05.03.2012 01.47.30 $
 ; Mod mod_shoutbox (mod_shoutbox)
 ; @date 15.03.2012
-; @Copyright Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+; @Copyright Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 ; @http://www.gnu.org/licenses/gpl-3.0.html
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/mod_shoutbox/language/nb-NO/nb-NO.mod_shoutbox.ini b/mod_shoutbox/language/nb-NO/nb-NO.mod_shoutbox.ini
@@ -1,7 +1,7 @@
 ; $Id: nb-NO.mod_shoutbox.ini 00001 02.04.2016 10.54.21 $
 ; Mod mod_shoutbox (mod_shoutbox)
 ; @date 02.04.2016
-; @Copyright Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+; @Copyright Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 ; @http://www.gnu.org/licenses/gpl-3.0.html
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/mod_shoutbox/language/nb-NO/nb-NO.mod_shoutbox.sys.ini b/mod_shoutbox/language/nb-NO/nb-NO.mod_shoutbox.sys.ini
@@ -1,7 +1,7 @@
 ; $Id: nb-NO.mod_shoutbox.sys.ini 00001 02.04.2016 10.54.21 $
 ; Mod mod_shoutbox (mod_shoutbox)
 ; @date 02.04.2016
-; @Copyright Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+; @Copyright Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 ; @http://www.gnu.org/licenses/gpl-3.0.html
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/mod_shoutbox/language/nl-NL/nl-NL.mod_shoutbox.ini b/mod_shoutbox/language/nl-NL/nl-NL.mod_shoutbox.ini
@@ -1,7 +1,7 @@
 ; $Id: nl-NL.mod_shoutbox.ini 00001 05.03.2012 01.47.30 $
 ; Mod mod_shoutbox (mod_shoutbox)
 ; @date 15.03.2012
-; @Copyright Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+; @Copyright Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 ; @http://www.gnu.org/licenses/gpl-3.0.html
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/mod_shoutbox/language/nl-NL/nl-NL.mod_shoutbox.sys.ini b/mod_shoutbox/language/nl-NL/nl-NL.mod_shoutbox.sys.ini
@@ -1,7 +1,7 @@
 ; $Id: nl-NL.mod_shoutbox.sys.ini 00001 05.03.2012 01.47.30 $
 ; Mod mod_shoutbox (mod_shoutbox)
 ; @date 15.03.2012
-; @Copyright Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+; @Copyright Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 ; @http://www.gnu.org/licenses/gpl-3.0.html
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/mod_shoutbox/language/pl-PL/pl-PL.mod_shoutbox.ini b/mod_shoutbox/language/pl-PL/pl-PL.mod_shoutbox.ini
@@ -1,7 +1,7 @@
 ; $Id: pl-PL.mod_shoutbox.ini 00001 12.03.2014 01.47.30 $
 ; Mod mod_shoutbox (mod_shoutbox)
 ; @date 12.03.2014
-; @Copyright Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+; @Copyright Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 ; @http://www.gnu.org/licenses/gpl-3.0.html
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/mod_shoutbox/language/pl-PL/pl-PL.mod_shoutbox.sys.ini b/mod_shoutbox/language/pl-PL/pl-PL.mod_shoutbox.sys.ini
@@ -1,7 +1,7 @@
 ; $Id: pl-PL.mod_shoutbox.sys.ini 00001 12.03.2014 01.47.30 $
 ; Mod mod_shoutbox (mod_shoutbox)
 ; @date 12.03.2014
-; @Copyright Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+; @Copyright Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 ; @http://www.gnu.org/licenses/gpl-3.0.html
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/mod_shoutbox/language/ru-RU/ru-RU.mod_shoutbox.ini b/mod_shoutbox/language/ru-RU/ru-RU.mod_shoutbox.ini
@@ -1,7 +1,7 @@
 ; $Id: ru-RU.mod_shoutbox.ini 00001 05.03.2012 01.47.30 $
 ; Mod mod_shoutbox (mod_shoutbox)
 ; @date 15.03.2012
-; @Copyright Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+; @Copyright Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 ; @http://www.gnu.org/licenses/gpl-3.0.html
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/mod_shoutbox/language/ru-RU/ru-RU.mod_shoutbox.sys.ini b/mod_shoutbox/language/ru-RU/ru-RU.mod_shoutbox.sys.ini
@@ -1,7 +1,7 @@
 ; $Id: ru-RU.mod_shoutbox.sys.ini 00001 05.03.2012 01.47.30 $
 ; Mod mod_shoutbox (mod_shoutbox)
 ; @date 15.03.2012
-; @Copyright Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+; @Copyright Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 ; @http://www.gnu.org/licenses/gpl-3.0.html
 ; Note : All ini files need to be saved as UTF-8
 

diff --git a/mod_shoutbox/layouts/history.php b/mod_shoutbox/layouts/history.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package    JJ_Shoutbox
- * @copyright  Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+ * @copyright  Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
  * @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
  */
 

diff --git a/mod_shoutbox/layouts/image.php b/mod_shoutbox/layouts/image.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package    JJ_Shoutbox
- * @copyright  Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+ * @copyright  Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
  * @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
  */
 

diff --git a/mod_shoutbox/layouts/message.php b/mod_shoutbox/layouts/message.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package    JJ_Shoutbox
- * @copyright  Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+ * @copyright  Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
  * @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
  */
 

diff --git a/mod_shoutbox/media/css/mod_shoutbox.css b/mod_shoutbox/media/css/mod_shoutbox.css
@@ -1,6 +1,6 @@
 /**
  * @package    JJ_Shoutbox
- * @copyright  Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+ * @copyright  Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
  * @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
  */
 

diff --git a/mod_shoutbox/media/css/mod_shoutbox_bs.css b/mod_shoutbox/media/css/mod_shoutbox_bs.css
@@ -1,6 +1,6 @@
 /**
  * @package    JJ_Shoutbox
- * @copyright  Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+ * @copyright  Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
  * @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
  */
 

diff --git a/mod_shoutbox/media/js/mod_shoutbox.js b/mod_shoutbox/media/js/mod_shoutbox.js
@@ -1,6 +1,6 @@
 /**
  * @package    JJ_Shoutbox
- * @copyright  Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+ * @copyright  Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
  * @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
 */
 
@@ -27,10 +27,17 @@ JJShoutbox.performNotificationCheck = function()
 /**
  * Create the HTML5 Notification
  */
-JJShoutbox.createNotification = function(title, options)
+JJShoutbox.createNotification = function(title)
 {
-	options = {
-		icon: 'media/mod_shoutbox/images/notification.png'
+	var icon = '/media/mod_shoutbox/images/notification.png';
+
+	if (typeof JJ_notification !== 'undefined')
+	{
+		icon = JJ_notification
+	}
+
+	var options = {
+		icon: icon
 	};
 
 	// Let's check if the browser supports notifications

diff --git a/mod_shoutbox/mod_shoutbox.php b/mod_shoutbox/mod_shoutbox.php
@@ -1,7 +1,7 @@
 <?php 
 /**
 * @package    JJ_Shoutbox
-* @copyright  Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+* @copyright  Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
 * @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
 */
 

diff --git a/mod_shoutbox/mod_shoutbox.xml b/mod_shoutbox/mod_shoutbox.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension type="module" version="3.6" client="site" method="upgrade">
+<extension type="module" version="3.8" client="site" method="upgrade">
 	<name>JJ Shoutbox</name>
 	<author>JoomJunk</author>
 	<creationDate>05-Mar-2012</creationDate>
-	<copyright>Copyright (C) 2011 - 2017 JoomJunk</copyright>
+	<copyright>Copyright (C) 2011 - 2018 JoomJunk</copyright>
 	<license>http://www.gnu.org/licenses/gpl-3.0.html</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>http://www.joomjunk.co.uk</authorUrl>
-	<version>8.1.13</version>
+	<version>8.1.14</version>
 	<description>JJSHOUTBOX_DESCRIPTION</description>
 
 	<install>

diff --git a/mod_shoutbox/script.php b/mod_shoutbox/script.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package    JJ_Shoutbox
- * @copyright  Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+ * @copyright  Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
  * @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
  */
 // No direct access to this file

diff --git a/mod_shoutbox/sql/mysql/install.mysql.utf8.sql b/mod_shoutbox/sql/mysql/install.mysql.utf8.sql
@@ -9,4 +9,4 @@ CREATE TABLE IF NOT EXISTS `#__shoutbox` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
 
-INSERT INTO `#__shoutbox` (`name`, `when`, `msg`, `user_id`) VALUES ('JoomJunk', '2012-01-16 20:00:00', 'Welcome to the Shoutbox', '0');
+INSERT INTO `#__shoutbox` (`name`, `when`, `ip`, `msg`, `user_id`) VALUES ('JoomJunk', '2012-01-16 20:00:00', '127.0.0.1', 'Welcome to the Shoutbox', '0');
diff --git a/mod_shoutbox/sql/mysql/updates/8.1.14.sql b/mod_shoutbox/sql/mysql/updates/8.1.14.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 8.1.14
diff --git a/mod_shoutbox/sql/postgresql/install.postgresql.utf8.sql b/mod_shoutbox/sql/postgresql/install.postgresql.utf8.sql
@@ -8,4 +8,4 @@ CREATE TABLE "#__shoutbox" (
   PRIMARY KEY ("id") 
 );
 
-INSERT INTO "#__shoutbox" ("name", "when", "msg", "user_id") VALUES ('JoomJunk', '2013-04-04 20:00:00', 'Welcome to the Shoutbox', '0');
+INSERT INTO "#__shoutbox" ("name", "when", "ip", "msg", "user_id") VALUES ('JoomJunk', '2013-04-04 20:00:00', '127.0.0.1', 'Welcome to the Shoutbox', '0');
diff --git a/mod_shoutbox/sql/postgresql/updates/8.1.14.sql b/mod_shoutbox/sql/postgresql/updates/8.1.14.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 8.1.14
diff --git a/mod_shoutbox/tmpl/default.php b/mod_shoutbox/tmpl/default.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package    JJ_Shoutbox
- * @copyright  Copyright (C) 2011 - 2017 JoomJunk. All rights reserved.
+ * @copyright  Copyright (C) 2011 - 2018 JoomJunk. All rights reserved.
  * @license    GPL v3.0 or later http://www.gnu.org/licenses/gpl-3.0.html
  */
 
@@ -331,13 +331,14 @@ class="<?php echo $input_txtarea; ?>"
 	}
 ?>
 
-<script type="text/javascript">
+<script>
 
 	<?php if ($securitytype == 2) {
 			if ($securityHide == 0 || ($user->guest && $securityHide == 1)) { ?>
 				JJShoutbox.drawMathsQuestion(<?php echo $que_number1; ?>, <?php echo $que_number2; ?>, <?php echo $rtl; ?>);
 	<?php } } ?>
 
+	var JJ_notification  = '<?php echo JUri::root(); ?>media/mod_shoutbox/images/notification.png';
 	var JJ_frameworkType = '<?php echo $framework; ?>';
 	var JJ_BBCode        = <?php echo $bbcode; ?>;
 	var JJ_history       = <?php echo $history; ?>;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# Placeholder file for database changes for version 8.1.14