Преглед изворни кода

Adds cookie message. Alerts are now dismissable.

Alan Lam пре 8 година
родитељ
комит
645278f13a
3 измењених фајлова са 34 додато и 1 уклоњено
  1. 2 0
      engine/core.php
  2. 7 0
      initialise.php
  3. 25 1
      views/header.php

+ 2 - 0
engine/core.php

@@ -14,6 +14,8 @@ class Core {
 	public static $page = 1;
 	public static $page = 1;
 	public static $page_count = 1;
 	public static $page_count = 1;
 
 
+	public static $cookie_alert_shown = false;
+
 	public static $scripts = [];
 	public static $scripts = [];
 
 
 	public static function addAlert($class, $message) {
 	public static function addAlert($class, $message) {

+ 7 - 0
initialise.php

@@ -53,6 +53,13 @@ if(!empty($_COOKIE[SESSION_NAME])) {
 	Session::extend(time() + 14 * 86400);
 	Session::extend(time() + 14 * 86400);
 }
 }
 
 
+if(PHP_SAPI != "cli") {
+	Core::$cookie_alert_shown = isset($_COOKIE["cookie_alert_shown"]);
+	$_COOKIE["cookie_alert_shown"] = 1;
+	setcookie("cookie_alert_shown", 1, time() + 8640000, "/", DOMAIN);
+}
+
+
 Core::addScript("public/js/jquery-3.3.1.min.js");
 Core::addScript("public/js/jquery-3.3.1.min.js");
 Core::addScript("public/js/popper.min.js");
 Core::addScript("public/js/popper.min.js");
 Core::addScript("public/js/bootstrap.min.js");
 Core::addScript("public/js/bootstrap.min.js");

+ 25 - 1
views/header.php

@@ -114,7 +114,10 @@ if(!PRODUCTION) {
 					if($class == "error") $icon = "exclamation-circle";
 					if($class == "error") $icon = "exclamation-circle";
 
 
 					?>
 					?>
-					<div class="alert alert-<?=$class?>">
+					<div class="alert alert-<?=$class?> alert-dismissable fade show">
+						<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+							<span aria-hidden="true">&times;</span>
+						</button>
 						<i class="fal fa-fw fa-<?=$icon?>"></i> <?=htmlspecialchars($message)?>
 						<i class="fal fa-fw fa-<?=$icon?>"></i> <?=htmlspecialchars($message)?>
 					</div>
 					</div>
 					<?php
 					<?php
@@ -125,4 +128,25 @@ if(!PRODUCTION) {
 			}
 			}
 		}
 		}
 
 
+		if(!Core::$cookie_alert_shown) {
+			?>
+			<div class="container">
+				<div class="alert alert-info alert-dismissable fade show">
+					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+						<span aria-hidden="true">&times;</span>
+					</button>
+					<div class="row">
+						<div class="col-auto pr-0">
+							<i class="fal fa-fw fa-info-circle"></i>
+						</div>
+						<div class="col">
+							<strong>This site uses cookies to improve functionality and personalisation.</strong><br />
+							By continuing to use the site, you consent to our use of cookies and our privacy policy.
+						</div>
+					</div>
+				</div>
+			</div>
+			<?php
+		}
+
 		?>
 		?>