From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Tue, 3 Dec 2013 18:45:40 +0000 (+0100)
Subject: confirmation function added to notify_document js function
X-Git-Tag: v4.11.0~11
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=7408b42dfc2a340ab4830113b23ce8cf87a131c8;hp=b07bbed348c8eae3ca8136ba77659426e698974d;p=brisk.git

confirmation function added to notify_document js function
---

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 344b30e..2042aec 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -2880,7 +2880,7 @@ function show_notify_ex($text, $tout, $butt, $w, $h, $is_opaque, $block_time)
   return sprintf('var noti = new notify_ex(gst,"%s",%d,"%s",%d,%d, %s, %d);', $text, $tout, $butt, $w, $h, ($is_opaque ? "true" : "false"), $block_time);
 }
 
-function show_notify_document($text, $tout, $butt_arr, $w, $h, $is_opaque, $block_time)
+function show_notify_document($text, $tout, $butt_arr, $confirm_func, $w, $h, $is_opaque, $block_time)
 {
   log_main("SHOW_NOTIFY OPAQUE: ".$text);
 
@@ -2889,8 +2889,8 @@ function show_notify_document($text, $tout, $butt_arr, $w, $h, $is_opaque, $bloc
       $butts .= sprintf("%s'%s'", ($i == 0 ? "" : ","), $butt_arr[$i]);
   }
 
-  return sprintf('g_nd = new notify_document(gst, "%s", %d, [ %s ], %d, %d, %s, %d);|',
-                 escpush($text), $tout, $butts, $w, $h, ($is_opaque ? "true" : "false"), $block_time);
+  return sprintf('g_nd = new notify_document(gst, "%s", %d, [ %s ], %s, %d, %d, %s, %d);|',
+                 escpush($text), $tout, $butts, ($confirm_func == NULL ? "null" : $confirm_func), $w, $h, ($is_opaque ? "true" : "false"), $block_time);
 }
 
 
diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 6235759..a7d9357 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -605,7 +605,7 @@ class User {
                               // call notify soft
                               $ret .=  show_notify_document("Versione corrente: [".$this->rec->lice_vers_get()."] Versione sito: ".$G_lice_vers,
                                        0, array("Accetto.", "Rifiuto.", "Leggo poi.",  /* , "Scarico." */),
-                                       400, 600, TRUE, 0);
+                                       "lice_confirm", 600, 600, TRUE, 0);
                               $ret .= sprintf("act_licencemgr('soft', g_nd.ret_get(), '%s', '%s');", 
                                               xcape($this->rec->lice_vers_get()), xcape($G_lice_vers));
                           }
@@ -613,7 +613,7 @@ class User {
                               // call notify hard
                               $ret .=  show_notify_document("Versione corrente: [".$this->rec->lice_vers_get()."] Versione sito: ".$G_lice_vers,
                                        0, array("Accetto.", "Rifiuto." /* , "Scarico." */),
-                                       400, 600, TRUE, 0);
+                                       "lice_confirm", 600, 600, TRUE, 0);
                               $ret .= sprintf("act_licencemgr('hard', g_nd.ret_get(), '%s', '%s');", 
                                               xcape($this->rec->lice_vers_get()), xcape($G_lice_vers));
                           }
diff --git a/web/commons.js b/web/commons.js
index ad18da4..6fb210e 100644
--- a/web/commons.js
+++ b/web/commons.js
@@ -44,7 +44,10 @@ var mlang_commons = { 'imgload_a' : { 'it' : 'Immagini caricate ',
                                       '1'  : { 'it' : '(solo aut.)',
                                                'en' : '(only aut.)' },
                                       '2'  : { 'it' : '(isolam.to)',
-                                               'en' : '(isolation)' } }
+                                               'en' : '(isolation)' } },
+                      'lic_refu'  : { 'it' : 'Rifiutando di sottoscrivere la nuova licenza d\' uso non ti sarà più possibile accedere col tuo utente registrato al sito, sei proprio sicuro di non voler accettare le nuove condizioni d\'uso ?',
+                                      'en' : 'EN Rifiutando di sottoscrivere la nuova licenza d\' uso non ti sarà più possibile accedere col tuo utente registrato al sito, sei proprio sicuro di non voler accettare le nuove condizioni d\'uso ?'
+                                    }
                     };
 
 function $(id) { return document.getElementById(id); }
@@ -475,8 +478,8 @@ function postact_logout()
 
 /*
   type - 'hard' or 'soft'
-  code - if soft: accept (0), deny (1), after (2)
-         if hard: accept (0), deny (1)
+  code - if soft: accept (0), refuse (1), after (2)
+         if hard: accept (0), refuse (1)
  */
 function act_licencemgr(type, code, lice_curr, lice_vers)
 {
@@ -493,6 +496,16 @@ function act_licencemgr(type, code, lice_curr, lice_vers)
     default:
         break;
     }
+    return true;
+}
+
+function lice_confirm(val)
+{
+    if (val == 1) {
+        return (window.confirm(mlang_commons['lic_refu'][g_lang]));
+    }
+
+    return true;
 }
 
 /*
@@ -646,13 +659,14 @@ function div_show(div)
   block_time:
   */
 
-function notify_document(st, text, tout, butt, w, h, is_opa, block_time)
+function notify_document(st, text, tout, butt, confirm_func, w, h, is_opa, block_time)
 {
     var i, clo, clodiv_ctx, clodiv_wai, box;
 
     this.st = st;
 
     this.ancestor = document.body;
+    this.confirm_func = confirm_func;
 
     this.st.st_loc_new++;
 
@@ -726,6 +740,8 @@ notify_document.prototype = {
     butt: null,
     tblkid: null,
 
+    confirm_func: null,
+
     ret: -1,
 
     /*
@@ -772,6 +788,11 @@ notify_document.prototype = {
 
     hide: function(val)
     {
+        if (this.confirm_func != null) {
+            if (this.confirm_func(val) == false) {
+                return false;
+            }
+        }
         this.ret = val;
 	clearTimeout(this.toutid);
 	this.ancestor.removeChild(this.notitag);