From 4ddfcdb32603966e110675eaf2bcf17d87da7f80 Mon Sep 17 00:00:00 2001
From: pezcurrel <pezcurrel@tiscali.it>
Date: Thu, 21 May 2020 16:19:13 +0200
Subject: [PATCH] ...

---
 .gitignore                     |  1 +
 web/mustard/.htaccess          |  1 +
 web/mustard/dafa.txt           |  3 +-
 web/mustard/include/menu.php   |  2 +-
 web/mustard/include/notifs.php |  2 +-
 web/mustard/notifs.php         | 62 +++++++++++++++-------------------
 6 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/.gitignore b/.gitignore
index d7b0365..7b3e962 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /web/mustard/zzz-materiali/simplemaps_worldcities_basicv1.6.zip
 /web/mustard/zzz-materiali/snippettoni.php
 /web/mustard/zzz-materiali/worldcities/
+/web/mustard/zzz-materiali/fork_awesome_css/
diff --git a/web/mustard/.htaccess b/web/mustard/.htaccess
index 226358b..6b407d9 100644
--- a/web/mustard/.htaccess
+++ b/web/mustard/.htaccess
@@ -1,2 +1,3 @@
 RewriteEngine Off
 RewriteEngine On
+php_value "mail.add_x_header" "Off"
diff --git a/web/mustard/dafa.txt b/web/mustard/dafa.txt
index c616e60..be3cbd1 100644
--- a/web/mustard/dafa.txt
+++ b/web/mustard/dafa.txt
@@ -13,7 +13,8 @@
 * niente virtualhost, spostare mastostart nella docroot di default di apache, così che per vederlo basti andare su 172.17.0.2, senza dover toccare /etc/hosts dell'host
 * aggiornare update.sh così che rifletta il cambiamento al punto precedente
 
-- account.php: tradurre; ckf è meglio checki tutto in js, la validazione del form da parte del browser non funziona per es. in opera
+- instances.php: usare input type datetime per le colonne time
+- account.php: tradurre
 - transazioni, dove appropriato (crawler compreso)
 - dispinst.php: setlocale: il nome della locale è sempre quello su tutti i sistemi?
 ! invite.php: una modalità di test che non manda le mail ma crea gli account "guest"
diff --git a/web/mustard/include/menu.php b/web/mustard/include/menu.php
index 07c8b52..c29a870 100644
--- a/web/mustard/include/menu.php
+++ b/web/mustard/include/menu.php
@@ -6,8 +6,8 @@ if ($account['Level']!='guest') {
 			array(
 				'instances'=>array('liadd'=>null, 'href'=>'instances.php', 'title'=>'Istanze', 'selected'=>false, 'submenu'=>null),
 				'blacklist'=>array('liadd'=>null, 'href'=>'#', 'title'=>'Blacklist', 'selected'=>false, 'submenu'=>null),
-				'accounts'=>array('liadd'=>null, 'href'=>'#', 'title'=>'Accounts', 'selected'=>false, 'submenu'=>null),
 				'notifs'=>array('liadd'=>null, 'href'=>'notifs.php', 'title'=>'Notifiche', 'selected'=>false, 'submenu'=>null),
+				'accounts'=>array('liadd'=>null, 'href'=>'#', 'title'=>'Accounts', 'selected'=>false, 'submenu'=>null),
 				'account'=>array('liadd'=>null, 'href'=>'account.php?id='.$account['ID'], 'title'=>'Il tuo account', 'selected'=>false, 'submenu'=>null),
 				'logout'=>array('liadd'=>null, 'href'=>'logout.php', 'title'=>'Logout', 'selected'=>false, 'submenu'=>null)
 			)
diff --git a/web/mustard/include/notifs.php b/web/mustard/include/notifs.php
index 198bb7d..3e90be3 100644
--- a/web/mustard/include/notifs.php
+++ b/web/mustard/include/notifs.php
@@ -9,7 +9,7 @@ function notifs(&$link) {
 	$res=mysqli_query($link,'SELECT * FROM Notifications ORDER BY Microtime DESC')
 		or muoribene(mysqli_error($link),true);
 	while ($row=mysqli_fetch_assoc($res)) {
-		array_push($notifs, $row);
+		$notifs[]=$row;
 		if ($row['Seen']==0) {
 			$unreadnotifs=true;
 			$notifclass='notifunseen';
diff --git a/web/mustard/notifs.php b/web/mustard/notifs.php
index 3389311..6b1a331 100644
--- a/web/mustard/notifs.php
+++ b/web/mustard/notifs.php
@@ -68,12 +68,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && $_SERVER["CONTENT_TYPE"] === "appli
 $dbg .= $dlang . '<br>' . N;
 $dbg .= '<pre>' . print_r($_GET, 1) . '</pre>';
 
-if ($account['Level'] != 'guest') {
-    require('include/notifs.php');
-    $notifs = notifs($link);
-} else {
-    muoribene("Non hai i permessi per vedere questa pagina", true);
-}
+require('include/notifs.php');
+$notifs = notifs($link);
 
 $filtordon = false;
 if ($filtordon) {
@@ -97,12 +93,11 @@ if ($filtordon) {
     <link rel="apple-touch-icon-precomposed" href="imgs/icona-180.png">
     <script language="JavaScript" src="js/menu.js?v=<?php echo($cjrand); ?>"></script>
     <script language="JavaScript" src="js/confirma.js?v=<?php echo($cjrand); ?>"></script>
-    <script language="JavaScript" src="js/alerta.js?v=<?php echo($cjrand); ?>"></script>
     <link rel="stylesheet" type="text/css" href="css/theme.css?v=<?php echo($cjrand); ?>">
     <link rel="stylesheet" type="text/css" href="css/notifs.css?v=<?php echo($cjrand); ?>">
     <script language="JavaScript">
         <!--
-        <?php if ($account['Level'] != 'guest') require('js/notifs.js.php'); ?>
+        <?php require('js/notifs.js.php'); ?>
 
         function reverseSelection() {
             let checkboxes = getAliveCheckboxes()
@@ -285,7 +280,7 @@ if ($filtordon) {
         <div id="rightdiv">
             <img src="<?php echo($filtordimgoff); ?>" id="lente" class="rlinks" title="Mostra il pannello di filtraggio"
                  onclick="showFilterPanel();">
-            <?php if ($account['Level'] != 'guest') echo('<img src="' . $notifs['imgoff'] . '" id="bell" class="rlinks" title="Show notifications" onclick="shidenotifs();">' . N); ?>
+            <?php echo('<img src="' . $notifs['imgoff'] . '" id="bell" class="rlinks" title="Show notifications" onclick="shidenotifs();">' . N); ?>
             <img src="imgs/esci.svg" class="rlinks" title="Logout" onclick="document.location.href='logout.php';">
         </div>
     </div>
@@ -296,31 +291,30 @@ if ($filtordon) {
 <div id="notifs-grid">
     <div id="notifs-list">
         <?php
-        if ($account['Level'] != 'guest') {
-            $sev_classes = array(
-                1 => "sev-normal",
-                2 => "sev-warning",
-                3 => "sev-error"
-            );
-            $seen_class = array(
-                0 => "unseen",
-                1 => "seen"
-            );
-            $deleted = array(
-                0 => "",
-                1 => "deleted"
-            );
-            foreach ($notifs['notifs'] as $n) {
-                echo("<div id=\"notif-" . $n["ID"] . "\" class=\"" . "notif " . $deleted[$n["Deleted"]] . " " . $sev_classes[$n["Severity"]] . " " . $seen_class[$n["Seen"]] .
-                    "\" data-microtime='" . $n['Microtime'] . "' " .
-                    "data-severity='" . $n['Severity'] . "'>" .
-                    "<input type=\"checkbox\" class=\"seen-checkbox\" onclick='notifSelect(this)'>" .
-                    "<button type='button' onclick='markread(this.parentElement)'><i class=\"fa fa-envelope-open-o\" aria-hidden=\"true\"></i></button>" .
-                    "<button type='button' onclick='markdeleted(this.parentElement)'><i class=\"fa fa-trash-o\" aria-hidden=\"true\"></i></button>" .
-                    "<p id='notif-text'>" . strftime('%d/%m/%y %T', $n['Microtime']) . ": " . $n["Notification"] . "</p>" .
-                    "</div>\n");
+		$sev_classes = array(
+			1 => "sev-normal",
+			2 => "sev-warning",
+			3 => "sev-error"
+		);
+		$seen_class = array(
+			0 => "unseen",
+			1 => "seen"
+		);
+		$deleted = array(
+			0 => "",
+			1 => "deleted"
+		);
+		foreach ($notifs['notifs'] as $n) {
+			echo("<div id=\"notif-" . $n["ID"] . "\" class=\"" . "notif " . $deleted[$n["Deleted"]] . " " . $sev_classes[$n["Severity"]] . " " . $seen_class[$n["Seen"]] .
+				"\" data-microtime='" . $n['Microtime'] . "' " .
+				"data-severity='" . $n['Severity'] . "'>" .
+				"<input type=\"checkbox\" class=\"seen-checkbox\" onclick='notifSelect(this)'>" .
+				"<button type='button' onclick='markread(this.parentElement)'><i class=\"fa fa-envelope-open-o\" aria-hidden=\"true\"></i></button>" .
+				"<button type='button' onclick='markdeleted(this.parentElement)'><i class=\"fa fa-trash-o\" aria-hidden=\"true\"></i></button>" .
+				"<p id='notif-text'>" . strftime('%d/%m/%y %T', $n['Microtime']) . ": " . $n["Notification"] . "</p>" .
+				"</div>\n");
             }
-        } ?>
+        ?>
     </div>
 
     <div id="popup">
@@ -349,7 +343,7 @@ if ($filtordon) {
 
 <div id="plancia">
     <button id='clear-filters-btn' type='button'
-            onclick="confirma('Confermi di voler rimuovere tutti i criteri di filtraggio?','clearFilters()')">
+            onclick="confirma('Attenzione!','<p>Confermi di voler rimuovere tutti i criteri di filtraggio?</p>','No','Si','','clearFilters();')">
         Rimuovi tutti i criteri di filtraggio
     </button>
     <div id="criterion-list"></div>