wrong number of User::maincheck arguments passed, fixed

[brisk.git] / web / Obj / user.phh

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 643f9ea..9ce7967 100644 (file)
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -79,11 +79,22 @@ $S_load_stat = array( 'rU_heavy'      => 0,
                       'wR_minusone'   => 0,
                       'wR_the_end'    => 0 );
 
-$mlang_indrd = array( 
+$mlang_user = array(
                      'btn_backtotab'  => array('it' => ' torna ai tavoli ',
                                                'en' => ' back to tables '),
                      'btn_btotabsup'  => array('it' => ' grazie della donazione, torna ai tavoli ',
-                                               'en' => ' thank you for donation, back to tables ') 
+                                               'en' => ' thank you for donation, back to tables '),
+
+                     'btn_agree'      => array('it' => ' accetto ',
+                                               'en' => ' agree '),
+                     'btn_refuse'     => array('it' => ' rifiuto ',
+                                               'en' => ' refuse '),
+                     '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 {
@@ -557,7 +568,7 @@ class User {
 
   protected function maincheck($get, $post, $cookie)
   {
-      GLOBAL $G_lang, $G_base, $mlang_indrd;
+      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;
@@ -611,25 +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
-                              // FIXME: manage translations
-                              $ret .=  show_notify_document(esclfhtml(file_get_contents($G_base.sprintf($G_tos_fname, $G_tos_vers, $G_lang))),
-                                       0, array("Accetto.", "Rifiuto.", "Leggo poi.",  /* , "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("Accetto.", "Rifiuto." /* , "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));
                       }
                   }
               }
@@ -637,11 +654,11 @@ class User {
                   ($splashdate < $curtime - $G_splash_interval ||
                    $splashdate > $curtime)) {
                   $is_super = $this->flags & USER_FLAG_TY_SUPER;
-                  $ret .=  show_notify_ex(str_replace("\n", " ", $G_splash_content[$G_lang]), 
-                                          ($is_super ? 0 : $G_splash_timeout), 
-                                          // $mlang_indrd[($is_super ? 'btn_btotabsup' : 'btn_backtotab')][$G_lang], 
-                                          $mlang_indrd['btn_backtotab'][$G_lang], 
-                                          $G_splash_w, $G_splash_h, true, 
+                  $ret .=  show_notify_ex(str_replace("\n", " ", $G_splash_content[$G_lang]),
+                                          ($is_super ? 0 : $G_splash_timeout),
+                                          // $mlang_user[($is_super ? 'btn_btotabsup' : 'btn_backtotab')][$G_lang],
+                                          $mlang_user['btn_backtotab'][$G_lang],
+                                          $G_splash_w, $G_splash_h, true,
                                           ($is_super ? 0 : $G_splash_timeout));
                   $ret .= sprintf('|createCookie("CO_splashdate%d", %d, 24*365, cookiepath);', $G_splash_idx, $curtime);
               }
@@ -791,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).')');
     }