removed all development error_log calls, removed many by reference operator and some...

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

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index c74c141..ca9a140 100644 (file)
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -134,12 +134,12 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
 $G_lng = langtolng($G_lang);
 
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "3.4.3";
+$G_brisk_version = "3.5.0";
 
 /* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: versione di test per la nuova gestione dei dati volatili, rivista gestione del ticker.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: seconda versione di test per la nuova gestione dei dati volatili, rivista gestione del ticker.',
                                        'Se vuoi iscriverti alla <a target="_blank" href="mailto:ml-briscola+subscribe@milug.org">Mailing List</a>, cliccala!' ),
-                       'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NEWS</b>: test version for the new volatile data management, ticker management refactored.',
+                       'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NEWS</b>: second test version for the new volatile data management, ticker management refactored.',
                                        'If you want to subscribe our <a target="_blank" href="ml-briscola+subscribe@milug.org">Mailing List</a>, click it!' ) );
 
 $G_room_help = array( 'it' => '
@@ -638,8 +638,6 @@ class User {
   }
 
   function create($idx, $name, $sess, $stat = "", $subst = "", $table = -1, $ip="0.0.0.0") {
-    // error_log("User::create BEGIN", 0);
-
     if (($thiz = new User()) == FALSE)
       return (FALSE);
 
@@ -904,8 +902,6 @@ class User {
 
   static function load_data($id, $sess) 
   {
-      // error_log("User::load_data BEGIN", 0);
-      
       log_main("load_data: id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] ");
       
       $doexit = FALSE;
@@ -931,8 +927,6 @@ class User {
                   break;
               }
               log_only("user ==  ".($user == FALSE ?   "FALSE" : "TRUE")."  user ===  ".($user === FALSE ? "FALSE" : "TRUE")."  user isset ".(isset($user) ?   "TRUE" : "FALSE"));
-              if (isset($user)) 
-                  log_only("bri count ".count($user));
               
               if ($user == FALSE) {
                   log_only("INIT MAIN DATA");
@@ -969,9 +963,6 @@ class User {
       
       $shm =   FALSE;
       
-      // var_dump($user);
-      // error_log("User::save_data BEGIN", 0);
-      
       if (($tok = @ftok(FTOK_PATH."/user".$id, "B")) == -1) {
           return (FALSE);
       }
@@ -2030,7 +2021,6 @@ class Room {
             log_auth("XXX", "authenticate: ".($authenticate != FALSE ? "TRUE" : "FALSE"));
             
             if ($authenticate != FALSE) {
-                // error_log(print_r(&$authenticate, TRUE),0);
                 $user_type = $authenticate->type_get();
             }
             else {
@@ -2243,8 +2233,6 @@ class Room {
     GLOBAL $sess;
     $doexit = FALSE;
 
-    // error_log("Room::load_data BEGIN", 0);
-
     do {
       if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) {
        log_main("ftok failed");
@@ -2270,8 +2258,6 @@ class Room {
               log_only("INIT MAIN DATA");
               shm_detach($shm);
               
-              // error_log("DE CHE", 0);
-
               $room = Room::create();
               
               if (Room::save_data($room) == FALSE)
@@ -2343,9 +2329,6 @@ class Room {
       $ret =   FALSE;
       $shm =   FALSE;
     
-      // var_dump($room);
-      // error_log("Room::save_data BEGIN", 0);
-    
       if (($tok = @ftok(FTOK_PATH."/main", "B")) == -1) 
           return (FALSE);
     
@@ -2499,7 +2482,7 @@ class Room {
       do {
           if (file_exists(PROXY_PATH) == FALSE)
               mkdir(PROXY_PATH);
-          if (($fp = @fopen(PROXY_PATH."/room_garbage_time.expired", 'rb')) == FALSE)
+          if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'rb')) == FALSE)
               break;
           if (($s = fread($fp, 4)) == FALSE)
               break;
@@ -2523,7 +2506,7 @@ class Room {
       do {
           if (file_exists(PROXY_PATH) == FALSE)
               mkdir(PROXY_PATH);
-          if (($fp = @fopen(PROXY_PATH."/room_garbage_time.expired", 'wb')) == FALSE)
+          if (($fp = @fopen(PROXY_PATH."/garbage_time.expired", 'wb')) == FALSE)
               break;
           fwrite($fp, pack("L",$tm));
           fclose($fp);
@@ -2942,6 +2925,8 @@ function secstoword($secs)
 {
   GLOBAL $G_lang;
 
+  $ret = "";
+
   $mins = floor($secs / 60);
   $secs = $secs % 60;
   if ($G_lang == 'en') {