From 5470910335a6a3e37b30783bfa39a15e8ff225b1 Mon Sep 17 00:00:00 2001
From: Matteo Nastasi <nastasi@alternativeoutput.it>
Date: Thu, 12 Mar 2020 22:37:22 +0100
Subject: [PATCH] latest changes

---
 INSTALL.sh       |  2 +-
 web/brisk.css    |  4 ++--
 web/index.php    |  9 +++++++++
 web/room.css     | 10 +++++-----
 web/usermgmt.php |  4 ++--
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/INSTALL.sh b/INSTALL.sh
index 5391cae..81be3e5 100755
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -185,7 +185,7 @@ while [ $# -gt 0 ]; do
         -l*) legal_path="$(get_param "-l" "$1" "$2")"; sh=$?;;
         -U*) usock_path="$(get_param "-U" "$1" "$2")"; sh=$?;;
         -u*) sys_user="$(get_param "-u" "$1" "$2")"; sh=$?;;
-        system) action=system;;
+        system) action=system ; sh=1;;
         -W) web_only="TRUE";;
         -x) test_add="TRUE";;
         -h) usage $0; exit 0;;
diff --git a/web/brisk.css b/web/brisk.css
index 5311daa..81dfb02 100644
--- a/web/brisk.css
+++ b/web/brisk.css
@@ -28,7 +28,7 @@
 }
 
 body {
-    background-image: url('img/beta.png');
+    background-image: url('img/brisk-bg.png');
     background-color: #fafafa;
     background-attachment: fixed;
     margin: 0px;
@@ -110,7 +110,7 @@ img.ib_nobo {
     -moz-border-radius: 8px;
     border-radius: 8px;
 
-    background-image: url('img/beta_light.png');
+    background-image: url('img/brisk-bg-light.png');
     background-attachment: fixed;
 
     top: 0;
diff --git a/web/index.php b/web/index.php
index 3556c9b..39e2a54 100644
--- a/web/index.php
+++ b/web/index.php
@@ -206,6 +206,10 @@ $mlang_room = array( 'userpassuse'  => array('it' => 'Il tuo nickname &egrave; g
                                               'en' => 'cookie policy'),
                      'itm_cook'      => array('it' => 'cookie',
                                               'en' => 'cookie'),
+                     'tit_dtmg'      => array('it' => 'trattamento dati personali',
+                                              'en' => 'personal data management'),
+                     'itm_dtmg'      => array('it' => 'dati personali',
+                                              'en' => 'personal data'),
                      'tit_cla'      => array('it' => 'classifiche degli utenti',
                                              'en' => 'user\'s placings'),
                      'itm_cla'      => array('it' => 'classifiche',
@@ -752,6 +756,11 @@ google_color_url = "000000";
    onmouseover="menu_hide(0,1);"
    title="'.$mlang_room['tit_cook'][$G_lang].'"
    alt="'.$mlang_room['tit_cook'][$G_lang].'">'.$mlang_room['itm_cook'][$G_lang].'</a><br>
+
+<a target="_blank" href="http://www.alternativeoutput.it/personal_data.php"
+   onmouseover="menu_hide(0,1);"
+   title="'.$mlang_room['tit_dtmg'][$G_lang].'"
+   alt="'.$mlang_room['tit_dtmg'][$G_lang].'">'.$mlang_room['itm_dtmg'][$G_lang].'</a><br>
 <hr>
 
 <a href="#"
diff --git a/web/room.css b/web/room.css
index 45c0e96..8964025 100644
--- a/web/room.css
+++ b/web/room.css
@@ -139,7 +139,7 @@ table.placings td
 }
 
 table.placing {
-    background-image: url('img/beta_light.png');
+    background-image: url('img/brisk-bg-light.png');
     background-attachment: fixed;
 
     border: 1px solid gray;
@@ -203,7 +203,7 @@ table.room_tab td {
     -moz-border-radius: 8px;
     border-radius: 8px;
 
-    background-image: url('img/beta_light.png');
+    background-image: url('img/brisk-bg-light.png');
     background-attachment: fixed;
 
     width: 25%;
@@ -251,7 +251,7 @@ table.room_standup {
     border-spacing: 0px;
     padding: 0px;
 
-    background-image: url('img/beta_light.png');
+    background-image: url('img/brisk-bg-light.png');
     background-attachment: fixed;
 }
 
@@ -271,7 +271,7 @@ table.login {
     border: 1px solid gray;
     margin-top: 8px;
 
-    background-image: url('img/beta_light.png');
+    background-image: url('img/brisk-bg-light.png');
     background-attachment: fixed;
  }
 
@@ -323,7 +323,7 @@ div.esco {
     -moz-border-radius: 4px;
     border-radius: 4px;
 
-    background-image: url('img/beta_light.png');
+    background-image: url('img/brisk-bg-light.png');
     background-attachment: fixed;
 }
 
diff --git a/web/usermgmt.php b/web/usermgmt.php
index 3aa9fed..436b99c 100644
--- a/web/usermgmt.php
+++ b/web/usermgmt.php
@@ -226,9 +226,9 @@ SELECT usr.*, guar.login AS guar_login
                     $subj = $mlang_indwr['nu_msubj'][$G_lang];
                     if (($usr_obj->type & USER_FLAG_TY_APPR) == USER_FLAG_TY_APPR) {
                         $body_txt = sprintf($mlang_indwr['ap_mtext'][$G_lang],
-                                            $cli_name, $confirm_page);
+                                            $usr_obj->login, $confirm_page);
                         $body_htm = sprintf($mlang_indwr['ap_mhtml'][$G_lang],
-                                            $cli_name, $confirm_page);
+                                            $usr_obj->login, $confirm_page);
                     }
                     else {
                         $body_txt = sprintf($mlang_indwr['nu_mtext'][$G_lang],
-- 
2.17.1