X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=80d3ce91b8773d4d5520432f42eeb8b0b324cc97;hb=f4178d38662a52ae2ccc8957e499621e735f4d16;hp=0ac092ae0ac88d913f03e738db0c95a76e353320;hpb=536da22ebde5fa66e0f7524e9efc0316391f1afd;p=brisk.git

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 0ac092a..80d3ce9 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -63,6 +63,10 @@ define('USER_FLAG_TY_FIRONLY', 0x200000); // done
 define('USER_FLAG_TY_SUSPEND', 0x400000); // done
 define('USER_FLAG_TY_DISABLE', 0x800000); // done
 
+define('USER_DIS_REA_INVMAIL', 1);
+define('USER_DIS_REA_LICENCE', 2);
+define('USER_DIS_REA_BANNED',  3);
+
 // 240 is the right value, 600 is for fwrite error test
 define('RD_ENDTIME_DELTA',  240);
 define('RD_KEEPALIVE_TOUT',   4);
@@ -513,7 +517,7 @@ class User {
                       xcape($this->name,ENT_COMPAT,"UTF-8")));
   }
 
-  /* INDEX_RD_IFRA PORT */
+  /* INDEX_RD PORT */
 
   static function blocking_error($is_unrecoverable)
   {
@@ -531,34 +535,35 @@ class User {
       return (sprintf('createCookie("table_idx", %d, 24*365, cookiepath); createCookie("table_token", "%s", 24*365, cookiepath); xstm.stop(); window.onunload = null; window.onbeforeunload = null; document.location.assign("%s");', $table_idx, $table_token, $page));
   }
 
-
-
-
-  protected function maincheck($cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_subst, &$new_step, $splashdate, $table_idx, $table_token)
+  protected function maincheck($get, $post, $cookie)
   {
       GLOBAL $G_lang, $mlang_indrd;
       // 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;
-      $CO_splashdate = "CO_splashdate".$G_splash_idx;
-      $$CO_splashdate = $splashdate;
-      
+      GLOBAL $G_lice_vers, $G_lice_fname, $G_lice_dthard, $G_lice_dtsoft, $G_lice_idx;
+
       GLOBAL $S_load_stat;
       
+      $CO_splashdate = "CO_splashdate".$G_splash_idx;
+
+      if (($splashdate = gpcs_var("$CO_splashdate", $get, $post, $cookie)) === FALSE)
+          $splashdate = "";
+
       log_rd("maincheck begin");
       
       $ret = FALSE;
       $curtime = time();
       
       /* Nothing changed, return. */
-      if ($cur_step == $this->step) 
+      if ($this->rd_step == $this->step)
           return (FALSE);
       
-      log_rd2("do other cur_stat[".$cur_stat."] user->stat[".$this->stat."] cur_step[".$cur_step."] user_step[".$this->step."]");
+      log_rd2("do other cur_stat[".$this->rd_stat."] user->stat[".$this->stat."] cur_step[".$this->rd_step."] user_step[".$this->step."]");
       
-      if ($cur_step == -1) {
+      if ($this->rd_step == -1) {
           /*
-           *  if $cur_step == -1 load the current state from the main struct
+           *  if $this->rd_step == -1 load the current state from the main struct
            */
           
           $S_load_stat['wR_minusone']++;
@@ -569,7 +574,7 @@ class User {
           
           if ($this->trans_step != -1) {
               log_rd2("TRANS USATO ".$this->trans_step);
-              $cur_step = $this->trans_step;
+              $this->rd_step = $this->trans_step;
               $this->trans_step = -1;
           }
           else {
@@ -579,16 +584,48 @@ class User {
       
       
       /* this part I suppose is read only on $this->room structure */
-      if ($cur_step == -1) {
+      if ($this->rd_step == -1) {
           log_rd2("PRE-NEWSTAT: ".$this->stat);
           
           if ($this->stat == 'room') {
               log_rd("roomma ".$this->step);
               $curtime = time();
-              
+              if ($this->rec !== FALSE) {
+                  if ($curtime > $G_lice_dtsoft || $curtime > $G_lice_dthard) {
+                      if (versions_cmp($this->rec->lice_vers_get(), $G_lice_vers) < 0) { // comparison between user version and current version
+                          if ($curtime > $G_lice_dtsoft) {
+                              // 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);
+                              $ret .= sprintf("act_licencemgr('soft', g_nd.ret_get(), '%s', '%s');", 
+                                              xcape($this->rec->lice_vers_get()), xcape($G_lice_vers));
+                          }
+                          else if ($curtime > $G_lice_dthard) {
+                              // 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);
+                              $ret .= sprintf("act_licencemgr('hard', g_nd.ret_get(), '%s', '%s');", 
+                                              xcape($this->rec->lice_vers_get()), xcape($G_lice_vers));
+                          }
+
+
+                          /* $ret .=  show_notify_ex(str_replace("\n", " ", "Versione corrente: [".$this->rec->lice_vers_get()."] Versione sito: ".$G_lice_vers), */
+                          /*     ($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, */
+                          /*     ($is_super ? 0 : $G_splash_timeout)); */
+                          /* $ret .= sprintf('|createCookie("CO_lice_date%d", %d, 24*365, cookiepath);', $G_lice_idx, $curtime); */
+
+
+                      }
+                  }
+              }
               if ($G_with_splash &&
-                  ($$CO_splashdate < $curtime - $G_splash_interval ||
-                   $$CO_splashdate > $curtime)) {
+                  ($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), 
@@ -602,9 +639,9 @@ class User {
               
               // TODO uncomment and test
               /* NOTE the sets went common */
-              $new_stat =  $this->stat;
-              $new_subst = $this->subst;
-              $new_step =  $this->step;
+              $this->rd_stat =  $this->stat;
+              $this->rd_subst = $this->subst;
+              $this->rd_step =  $this->step;
           }
           /***************
            *             *
@@ -618,15 +655,15 @@ class User {
               return ($this->page_sync($this->sess, "briskin5/index.php", $this->table, $this->table_token));
           }
           log_rd2("NEWSTAT: ".$this->stat);
-      } /* if ($cur_step == -1) { */
+      } /* if ($this->rd_step == -1) { */
       else {
           /* $sem = Room::lock_data(FALSE); */
           $S_load_stat['rU_heavy']++;
           
-          if ($cur_step < $this->step) {
+          if ($this->rd_step < $this->step) {
               do {
-                  if ($cur_step + COMM_N < $this->step) {
-                      if (($cur_stat != $this->stat)) {
+                  if ($this->rd_step + COMM_N < $this->step) {
+                      if (($this->rd_stat != $this->stat)) {
                           $to_stat = $this->stat;
                           /* Room::unlock_data($sem); */
                           log_load("RESYNC");
@@ -634,23 +671,23 @@ class User {
                           return ($this->page_sync($this->sess, ($to_stat == "table" ? "briskin5/index.php" : "index.php"), $this->table, $this->table_token));
                       }
                       log_rd2("lost history, refresh from scratch");
-                      $new_step = -1;
+                      $this->rd_step = -1;
                       break;
                   } 
-                  for ($i = $cur_step ; $i < $this->step ; $i++) {
+                  for ($i = $this->rd_step ; $i < $this->step ; $i++) {
                       $ii = $i % COMM_N;
                       log_rd2("ADDED TO THE STREAM: ".$this->comm[$ii]);
                       if ($this->comm[$ii] == "") {
-                          if ($i == $cur_step)
+                          if ($i == $this->rd_step)
                               continue;
                           else
                               break;
                       }
                       $ret .= $this->comm[$ii];
                   }
-                  $new_stat =  $this->stat;
-                  $new_subst = $this->subst;
-                  $new_step =  $this->step;
+                  $this->rd_stat =  $this->stat;
+                  $this->rd_subst = $this->subst;
+                  $this->rd_step =  $this->step;
               } while (0);
               
               log_rd2($this->step, 'index_rd.php: after ret set');
@@ -673,10 +710,10 @@ class User {
                       
                   } /* if ($this->the_end == TRUE) { ... */
               } /* if ($this->the_end == TRUE) { ... */
-          } /* if ($cur_step < $this->step) { */
+          } /* if ($this->rd_step < $this->step) { */
           
           /* Room::unlock_data($sem); */
-      }  /* else of if ($cur_step == -1) { */
+      }  /* else of if ($this->rd_step == -1) { */
       
     
       return ($ret);
@@ -711,7 +748,7 @@ function stream_init($init_string, $enc, $header, &$header_out, &$body, $get, $p
     
     printf("CLASS: [%s] base: [%s]\n", get_class($this), self::base_get());
 
-    log_load("index_rd_ifra_init.php");
+    log_load("index_rd_init.php");
     
     if (($from  = gpcs_var('from', $get, $post, $cookie)) === FALSE)
         $from = "";
@@ -739,16 +776,6 @@ function stream_init($init_string, $enc, $header, &$header_out, &$body, $get, $p
 
 function stream_main(&$body, $get, $post, $cookie)
 {
-    GLOBAL $G_splash_idx;
-
-    $CO_splashdate = "CO_splashdate".$G_splash_idx;
-    if (($splashdate = gpcs_var("$CO_splashdate", $get, $post, $cookie)) === FALSE)
-        $splashdate = ""; 
-    if (($table_idx = gpcs_var("table_idx", $get, $post, $cookie)) === FALSE)
-        $table_idx = ""; 
-    if (($table_token = gpcs_var("table_token", $get, $post, $cookie)) === FALSE)
-        $table_token = ""; 
-
     log_rd2("FROM OUTSIDE - STAT: ".$this->rd_stat." SUBST: ".$this->rd_subst." STEP: ".$this->rd_step." FROM: ".$this->rd_from);
     
     
@@ -758,7 +785,7 @@ function stream_main(&$body, $get, $post, $cookie)
     $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, $this->rd_stat, $this->rd_subst, $this->rd_step, $splashdate, $table_idx, $table_token)) != FALSE) {
+    if (($ret = $this->maincheck($old_stat, $old_subst, $old_step, $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).')');
     }