X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=7fb6d16ebeb26637b1187b90152839be3e3b84c2;hb=9851c8a9decf584c93ea08092b9ce4955c310704;hp=94df3623b634841dd0ad755e98064db54b61b0a5;hpb=5fa01c83781bbb977710f84ec20ff882d59b8034;p=brisk.git

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 94df362..7fb6d16 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -89,8 +89,12 @@ $mlang_user = array(
                                                'en' => ' agree '),
                      'btn_refuse'     => array('it' => ' rifiuto ',
                                                'en' => ' refuse '),
-                     'btn_after'      => array('it' => ' leggo poi ',
-                                               'en' => ' read later ')
+                     'btn_dload'      => array('it' => ' scarico ',
+                                               'en' => ' download '),
+                     'btn_later'      => array('it' => ' leggo poi ',
+                                               'en' => ' read later '),
+                     'toc_date_dscl'  => array('it' => 'I nuovi termini di servizio entreranno in vigore il %s.',
+                                               'en' => 'EN I nuovi termini di servizio entreranno in vigore il %s.')
                      );
 
 class User {
@@ -564,7 +568,7 @@ class User {
 
   protected function maincheck($get, $post, $cookie)
   {
-      GLOBAL $G_lang, $G_base, $mlang_user;
+      GLOBAL $G_lang, $G_base, $G_doc_path, $mlang_user;
       // GLOBAL $first_loop;
       GLOBAL $G_with_splash, $G_splash_content, $G_splash_interval, $G_splash_idx;
       GLOBAL $G_splash_w, $G_splash_h, $G_splash_timeout;
@@ -618,24 +622,31 @@ class User {
               log_rd("roomma ".$this->step);
               $curtime = time();
               if ($this->rec !== FALSE) {
+                  $doc_filepath = $G_base.$G_doc_path.sprintf($G_tos_fname, $G_tos_vers, $G_lang);
+                  $doc_filename = basename($doc_filepath);
                   if ($curtime > $G_tos_dtsoft || $curtime > $G_tos_dthard) {
                       if (versions_cmp($this->rec->tos_vers_get(), $G_tos_vers) < 0) { // comparison between user version and current version
-                          if ($curtime > $G_tos_dtsoft) {
-                              // call notify soft
-                              $ret .=  show_notify_document(esclfhtml(file_get_contents($G_base.sprintf($G_tos_fname, $G_tos_vers, $G_lang))),
-                                       0, array($mlang_user['btn_agree'][$G_lang], $mlang_user['btn_refuse'][$G_lang], $mlang_user['btn_after'][$G_lang] /* , "Scarico." */),
-                                       "tos_confirm", 600, 600, TRUE, 0);
-                              $ret .= sprintf("act_tosmgr('soft', g_nd.ret_get(), '%s', '%s');",
-                                              xcape($this->rec->tos_vers_get()), xcape($G_tos_vers));
+                          $buttons = array($mlang_user['btn_agree'][$G_lang], $mlang_user['btn_refuse'][$G_lang],
+                                           $mlang_user['btn_dload'][$G_lang]);
+                          if ($curtime > $G_tos_dtsoft && $curtime < $G_tos_dthard) {
+                              // call notify soft (same as soft + later button)
+                              array_push($buttons, $mlang_user['btn_later'][$G_lang]);
+                              $type = "soft";
+                              $preface = sprintf("<div class='doc_alert'>%s</div>",
+                                                 sprintf($mlang_user['toc_date_dscl'][$G_lang],
+                                                         strftime("%e/%m/%Y", $G_tos_dthard)));
                           }
-                          else if ($curtime > $G_tos_dthard) {
+                          else {
                               // call notify hard
-                              $ret .=  show_notify_document(esclfhtml(file_get_contents($G_base.sprintf($G_tos_fname, $G_tos_vers, $G_lang))),
-                                       0, array($mlang_user['btn_agree'][$G_lang], $mlang_user['btn_refuse'][$G_lang] /* , "Scarico." */),
-                                       "tos_confirm", 600, 600, TRUE, 0);
-                              $ret .= sprintf("act_tosmgr('hard', g_nd.ret_get(), '%s', '%s');",
-                                              xcape($this->rec->tos_vers_get()), xcape($G_tos_vers));
+                              $type = "hard";
+                              $preface = "";
                           }
+                          $ret .=  show_notify_document($preface.esclfhtml(file_get_contents($doc_filepath)), 0, $buttons,
+                                     "tos_confirm", sprintf("[ '%s/doc_download.php?doc=%s' ]", SITE_PREFIX,
+                                       basename($doc_filename, ".txt")), 600, 600, TRUE, 0);
+
+                          $ret .= sprintf("act_tosmgr('%s', g_nd.ret_get(), '%s', '%s');", $type,
+                                          xcape($this->rec->tos_vers_get()), xcape($G_tos_vers));
                       }
                   }
               }
@@ -733,7 +744,7 @@ class User {
       
     
       return ($ret);
-  }  //   function maincheck (...
+  }  //   function maincheck(...
 
   public static function stream_fini($transp, $init_string, $is_unrecoverable)
 {
@@ -797,11 +808,8 @@ function stream_main(&$body, $get, $post, $cookie)
     
     $pre_main = gettimeofday(TRUE);
     
-    $old_stat  = $this->rd_stat;
-    $old_subst = $this->rd_subst;
-    $old_step  = $this->rd_step;
     printf("xXx PRE : rd_step %d\n", $this->rd_step);
-    if (($ret = $this->maincheck($old_stat, $old_subst, $old_step, $get, $post, $cookie)) != FALSE) {
+    if (($ret = $this->maincheck($get, $post, $cookie)) != FALSE) {
         $body .= $this->rd_transp->chunk( $this->rd_scristp++, $ret);
         log_rd2(0, 'index_rd.php: after mop_flush (begin: '.sprintf("%f", $pre_main).')');
     }