* Update the JS last update date on upgrade

chrisdeeming · chrisdeeming · commit f34b9db6ddec · 2016-02-15T21:54:20.000Z
* Prevent JS errors on some browsers which do not support the Notifications API
* Prevent a template error for guests
diff --git a/addon-LiveUpdate.xml b/addon-LiveUpdate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<addon addon_id="LiveUpdate" title="Live Update" version_string="4.1.0" version_id="4010072" url="https://xenresources.com" install_callback_class="LiveUpdate_Install" install_callback_method="installer" uninstall_callback_class="LiveUpdate_Install" uninstall_callback_method="uninstaller">
+<addon addon_id="LiveUpdate" title="Live Update" version_string="4.1.0" version_id="4010073" url="https://xenresources.com" install_callback_class="LiveUpdate_Install" install_callback_method="installer" uninstall_callback_class="LiveUpdate_Install" uninstall_callback_method="uninstaller">
   <admin_navigation/>
   <admin_permissions/>
   <admin_style_properties/>
diff --git a/upload/js/liveupdate/min/update.js b/upload/js/liveupdate/min/update.js
diff --git a/upload/js/liveupdate/update.js b/upload/js/liveupdate/update.js
@@ -100,20 +100,22 @@ var LiveUpdate = {};
 		}
 	};
 
+	LiveUpdate.Notification = null;
+
 	LiveUpdate.SetupNotificationAPI = function()
 	{
-		if (Notification.permission !== 'denied' && Notification.permission !== 'granted')
+		if (LiveUpdate.Notification && LiveUpdate.Notification.permission !== 'denied' && LiveUpdate.Notification.permission !== 'granted')
 		{
-			Notification.requestPermission(function (permission) {})
+			LiveUpdate.Notification.requestPermission(function (permission) {})
 		}
 	};
 
-	LiveUpdate.Notification = null;
-
 	LiveUpdate.SendNotification = function(message)
 	{
 		if (LiveUpdate.displayOptions.indexOf('notifications_api') === -1
-			|| Notification.permission !== 'granted'
+			|| navigator.userAgent.search(/\((iPhone|iPad|iPod);/) !== -1
+			|| (LiveUpdate.Notification
+				&& LiveUpdate.Notification.permission !== 'granted')
 		)
 		{
 			return;
diff --git a/upload/library/LiveUpdate/Install.php b/upload/library/LiveUpdate/Install.php
@@ -27,19 +27,19 @@ public static function installer($previous)
 				$dw->delete();
 			}
 
-			self::_runQuery("
+			self::_runQuery('
 				ALTER TABLE xf_user_option
-				ADD COLUMN liveupdate_display_option MEDIUMBLOB NULL DEFAULT NULL
-			");
+				ADD COLUMN liveupdate_display_option MEDIUMBLOB NULL DEFAULT ?
+			', json_encode(array('tab_icon', 'notifications_api')));
 		}
 		else
 		{
 			if ($version < 4010070 || $version < 4010071)
 			{
-				self::_runQuery("
+				self::_runQuery('
 					ALTER TABLE xf_user_option
-					CHANGE COLUMN liveupdate_display_option liveupdate_display_option MEDIUMBLOB NULL DEFAULT NULL
-				");
+					CHANGE COLUMN liveupdate_display_option liveupdate_display_option MEDIUMBLOB NULL DEFAULT ?
+				', json_encode(array('tab_icon', 'notifications_api')));
 
 
 				/**
@@ -71,6 +71,11 @@ public static function installer($previous)
 					WHERE liveupdate_display_option = ''
 				", json_encode(array()));
 			}
+
+			if ($version < 4010073)
+			{
+				self::_updateJsCacheBuster();
+			}
 		}
 	}
 
@@ -81,6 +86,11 @@ public static function uninstaller()
 		");
 	}
 
+	protected static function _updateJsCacheBuster($time = null)
+	{
+		XenForo_Model::create('XenForo_Model_Option')->updateOption('jsLastUpdate', $time ? $time : time());
+	}
+
 	protected static function _runQuery($sql, $bind = array())
 	{
 		$db = self::_getDb();
diff --git a/upload/library/LiveUpdate/Listener.php b/upload/library/LiveUpdate/Listener.php
@@ -24,7 +24,7 @@ public static function helperLiveUpdateOptions($json = false)
 		$visitor = XenForo_Visitor::getInstance();
 		if (!$visitor->user_id)
 		{
-			return '';
+			return array();
 		}
 
 		if (!empty($visitor['permissions']['general']['liveUpdateChangeOptions']))
diff --git a/upload/library/LiveUpdate/addon-LiveUpdate.xml b/upload/library/LiveUpdate/addon-LiveUpdate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<addon addon_id="LiveUpdate" title="Live Update" version_string="4.1.0" version_id="4010072" url="https://xenresources.com" install_callback_class="LiveUpdate_Install" install_callback_method="installer" uninstall_callback_class="LiveUpdate_Install" uninstall_callback_method="uninstaller">
+<addon addon_id="LiveUpdate" title="Live Update" version_string="4.1.0" version_id="4010073" url="https://xenresources.com" install_callback_class="LiveUpdate_Install" install_callback_method="installer" uninstall_callback_class="LiveUpdate_Install" uninstall_callback_method="uninstaller">
   <admin_navigation/>
   <admin_permissions/>
   <admin_style_properties/>

Original file line number	Diff line number	Diff line change
`@@ -100,20 +100,22 @@ var LiveUpdate = {};`
`100`	`100`	`}`
`101`	`101`	`};`
`102`	`102`
	`103`	`+ LiveUpdate.Notification = null;`
	`104`	`+`
`103`	`105`	`LiveUpdate.SetupNotificationAPI = function()`
`104`	`106`	`{`
`105`		`- if (Notification.permission !== 'denied' && Notification.permission !== 'granted')`
	`107`	`+ if (LiveUpdate.Notification && LiveUpdate.Notification.permission !== 'denied' && LiveUpdate.Notification.permission !== 'granted')`
`106`	`108`	`{`
`107`		`- Notification.requestPermission(function (permission) {})`
	`109`	`+ LiveUpdate.Notification.requestPermission(function (permission) {})`
`108`	`110`	`}`
`109`	`111`	`};`
`110`	`112`
`111`		`- LiveUpdate.Notification = null;`
`112`		`-`
`113`	`113`	`LiveUpdate.SendNotification = function(message)`
`114`	`114`	`{`
`115`	`115`	`if (LiveUpdate.displayOptions.indexOf('notifications_api') === -1`
`116`		`- \|\| Notification.permission !== 'granted'`
	`116`	`+ \|\| navigator.userAgent.search(/\((iPhone\|iPad\|iPod);/) !== -1`
	`117`	`+ \|\| (LiveUpdate.Notification`
	`118`	`+ && LiveUpdate.Notification.permission !== 'granted')`
`117`	`119`	`)`
`118`	`120`	`{`
`119`	`121`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -27,19 +27,19 @@ public static function installer($previous)`
`27`	`27`	`$dw->delete();`
`28`	`28`	`}`
`29`	`29`
`30`		`- self::_runQuery("`
	`30`	`+ self::_runQuery('`
`31`	`31`	`ALTER TABLE xf_user_option`
`32`		`- ADD COLUMN liveupdate_display_option MEDIUMBLOB NULL DEFAULT NULL`
`33`		`- ");`
	`32`	`+ ADD COLUMN liveupdate_display_option MEDIUMBLOB NULL DEFAULT ?`
	`33`	`+ ', json_encode(array('tab_icon', 'notifications_api')));`
`34`	`34`	`}`
`35`	`35`	`else`
`36`	`36`	`{`
`37`	`37`	`if ($version < 4010070 \|\| $version < 4010071)`
`38`	`38`	`{`
`39`		`- self::_runQuery("`
	`39`	`+ self::_runQuery('`
`40`	`40`	`ALTER TABLE xf_user_option`
`41`		`- CHANGE COLUMN liveupdate_display_option liveupdate_display_option MEDIUMBLOB NULL DEFAULT NULL`
`42`		`- ");`
	`41`	`+ CHANGE COLUMN liveupdate_display_option liveupdate_display_option MEDIUMBLOB NULL DEFAULT ?`
	`42`	`+ ', json_encode(array('tab_icon', 'notifications_api')));`
`43`	`43`
`44`	`44`
`45`	`45`	`/**`
`@@ -71,6 +71,11 @@ public static function installer($previous)`
`71`	`71`	`WHERE liveupdate_display_option = ''`
`72`	`72`	`", json_encode(array()));`
`73`	`73`	`}`
	`74`	`+`
	`75`	`+ if ($version < 4010073)`
	`76`	`+ {`
	`77`	`+ self::_updateJsCacheBuster();`
	`78`	`+ }`
`74`	`79`	`}`
`75`	`80`	`}`
`76`	`81`
`@@ -81,6 +86,11 @@ public static function uninstaller()`
`81`	`86`	`");`
`82`	`87`	`}`
`83`	`88`
	`89`	`+ protected static function _updateJsCacheBuster($time = null)`
	`90`	`+ {`
	`91`	`+ XenForo_Model::create('XenForo_Model_Option')->updateOption('jsLastUpdate', $time ? $time : time());`
	`92`	`+ }`
	`93`	`+`
`84`	`94`	`protected static function _runQuery($sql, $bind = array())`
`85`	`95`	`{`
`86`	`96`	`$db = self::_getDb();`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public static function helperLiveUpdateOptions($json = false)`
`24`	`24`	`$visitor = XenForo_Visitor::getInstance();`
`25`	`25`	`if (!$visitor->user_id)`
`26`	`26`	`{`
`27`		`- return '';`
	`27`	`+ return array();`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`if (!empty($visitor['permissions']['general']['liveUpdateChangeOptions']))`