CSP for older ownCloud install and Announcement fix

Author: Fmstrat

controller/pagecontroller.php

@@ -16,6 +16,7 @@
 use \OCP\AppFramework\Http\TemplateResponse;
 use \OCP\AppFramework\Controller;
 use \OCP\AppFramework\Http\ContentSecurityPolicy;
+use \OCP\Util;
 
 class PageController extends Controller {
 
@@ -39,10 +40,13 @@ public function __construct($appName, IRequest $request, $userId){
      */
     public function index() {
 	$params = array('user' => $this->userId);
-	$csp = new \OCP\AppFramework\Http\ContentSecurityPolicy();
-	$csp->addAllowedImageDomain('data:');
 	$response = new TemplateResponse('ownnote', 'main', $params);
-	$response->setContentSecurityPolicy($csp);
+	$ocVersion = \OCP\Util::getVersion();
+	if ($ocVersion[0] > 8 || ($ocVersion[0] == 8 && $ocVersion[1] >= 1)) {
+		$csp = new \OCP\AppFramework\Http\ContentSecurityPolicy();
+		$csp->addAllowedImageDomain('data:');
+		$response->setContentSecurityPolicy($csp);
+	}
 	return $response;
     }
 }

js/script.js

@@ -524,8 +524,9 @@
 		var dismissedAnnouncement = getCookie('dismissedAnnouncement');
 		if (curAnnouncement != "") {
 			if (curAnnouncement != dismissedAnnouncement) {
-				var html = "<div id='app-settings'><div id='app-settings-header'><div id='announcement'>"+curAnnouncement+"</div><div id='announcement-dismiss'><a href='javascript:dismissAnnouncement()'>"+trans("Dismiss")+"</a></div></div><div>";
+				var html = "<div id='app-settings'><div id='app-settings-header'><div id='announcement'>"+curAnnouncement+"</div><div id='announcement-dismiss'><a id='dismissButton' href='javascript:dismissAnnouncement()'>"+trans("Dismiss")+"</a></div></div><div>";
 				$('#announcement-container').html(html);
+				$('#dismissButton').click(dismissAnnouncement);
 			}
 		} else {
 			var url = ocUrl("ajax/v0.2/ownnote/ajaxannouncement");
@@ -535,8 +536,9 @@
 					if (data != '') {
 						if (data.replace(/\n/g,'') != 'NONE') {
 							if (data.replace(/\n/g,'') != dismissedAnnouncement) {
-								var html = "<div id='app-settings'><div id='app-settings-header'><div id='announcement'>"+data+"</div><div id='announcement-dismiss'><a href='javascript:dismissAnnouncement()'>"+trans("Dismiss")+"</a></div></div><div>";
+								var html = "<div id='app-settings'><div id='app-settings-header'><div id='announcement'>"+data+"</div><div id='announcement-dismiss'><a id='dismissButton' href='javascript:dismissAnnouncement()'>"+trans("Dismiss")+"</a></div></div><div>";
 								$('#announcement-container').html(html);
+								$('#dismissButton').click(dismissAnnouncement);
 							}
 							setCookie("curAnnouncement", data.replace(/\n/g,''), 7);
 						} else {
@@ -569,6 +571,7 @@
 	} 
 
 	function dismissAnnouncement() {
+		alert('here');
 		setCookie("dismissedAnnouncement", $('#announcement').html().replace(/\n/g,''), 30);
 		$('#announcement-container').html('');
 	}

templates/main.php

@@ -5,6 +5,18 @@
 
 $disableAnnouncement = \OCP\Config::getAppValue('ownnote', 'disableAnnouncement', '');
 $l = OCP\Util::getL10N('ownnote');
+
+$ocVersionArray = OCP\Util::getVersion();
+$ocVersion = "";
+$oci = 0;
+$ocl = sizeof($ocVersionArray);
+foreach ($ocVersionArray as $v) {
+	$ocVersion .= $v;
+	$oci++;
+	if ($oci < $ocl)
+		$ocVersion .= ".";
+}
+
 ?>
 <div id="app">
 	<div id="app-navigation">
@@ -14,7 +26,7 @@
 	<div id="app-content">
 		<div id="ownnote"></div>
 	</div>
-	<input type=hidden value="<?php echo $disableAnnouncement; ?>">
+	<input type=hidden name="disableAnnouncement" id="disableAnnouncement" value="<?php echo $disableAnnouncement; ?>">
 	<div id="ownnote-l10n">
 		l10n["# day ago"] = "<?php p($l->t("# day ago")); ?>";
 		l10n["# days ago"] = "<?php p($l->t("# days ago")); ?>";