X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=34e08b03e5f03993b3c097536036dbbed7ce15df;hb=refs%2Ftags%2F3.2.1;hp=e7e7ac7ae2b17694a822733ff2785cd43f9fa41a;hpb=ad62ecf88ef0d5e5fa03d6461ac4510314fc2b50;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index e7e7ac7..34e08b0 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -292,6 +292,11 @@ function eschtml($s)
     return htmlentities($s);
 }
 
+function esclfhtml($s)
+{
+    return str_replace("\n", "<br>\n", htmlentities($s));
+}
+
 
 function langtolng($lang)
 {
@@ -596,6 +601,7 @@ define(USER_FLAG_TY_SUSPEND, 0x400000); // done
 define(USER_FLAG_TY_DISABLE, 0x800000); // done
 
 class User {
+  var $code;       // authentication code
   var $name;       // name of the user
   var $sess;       // session of the user
   var $ip;         // ip of the user
@@ -635,6 +641,7 @@ class User {
     if (($thiz =& new User()) == FALSE)
       return ($G_false);
 
+    $thiz->code  = -1;
     $thiz->name  = $name;
     $thiz->sess  = $sess;
     $thiz->ip    = $ip;
@@ -671,6 +678,7 @@ class User {
   {
     GLOBAL $G_false;
     
+    $this->code       = $from->code;
     $this->name       = $from->name;
     $this->sess       = $from->sess;
     $this->ip         = $from->ip;
@@ -732,6 +740,7 @@ class User {
     if (($thiz =& new User()) == FALSE)
       return ($G_false);
     
+    $thiz->code       = $from->code;
     $thiz->name       = $from->name;
     $thiz->sess       = $from->sess;
     $thiz->ip         = $from->ip;
@@ -774,6 +783,10 @@ class User {
 
     return ($thiz);
   }
+
+  function code_get() {
+      return ($this->code);
+  }
   
   function stat_set($stat) {
     log_main("sess: [".$this->sess. "] NEW STAT: [".$stat."]"); 
@@ -1879,7 +1892,8 @@ class Room {
     $ghost_auth = FALSE;
     $idx = -1;
     $idfree = -1;
-    
+    $code = FALSE;
+
     if (($name_new = validate_name($name)) == FALSE) {
       $idx = -2;
       return ($G_false);
@@ -1899,7 +1913,7 @@ class Room {
       log_auth("XXX", "authenticate: ".($authenticate != FALSE ? "TRUE" : "FALSE"));
       
       if ($authenticate != FALSE) {
-          $user_type = $authenticate->typeget();
+          $user_type = $authenticate->type_get();
       }
       else {
           $idx = -3;
@@ -1995,6 +2009,7 @@ class Room {
 
       
       if ($authenticate != FALSE) {
+        $this->user[$idx]->code = $authenticate->code_get();
         $this->user[$idx]->flags |= USER_FLAG_LISTAUTH;
 
         if (isset($CO_list)) {
@@ -2054,7 +2069,7 @@ class Room {
       $real_idx = $idx;
       if ($login_exists)
         $idx = -($idx + 1);
-      log_main(sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s] count [%d] [%s]", $idx, $sess, $name_new, count($this->user),$this->user[$real_idx]->name));
+      log_main(sprintf("TROVATO LIBERO A [%d] sess [%s] name [%s] count [%d] name [%s] code [%s]", $idx, $sess, $name_new, count($this->user),$this->user[$real_idx]->name, $this->user[$real_idx]->code));
 
       $ret = $this->user[$real_idx];
       return ($ret);
@@ -2545,21 +2560,6 @@ function log_legal($curtime, &$user, $where, $mesg)
   }
 }
 
-function log_points($curtime, &$user, $where, $mesg) 
-{
-  GLOBAL $_SERVER;
-
-  if (($fp = @fopen(LEGAL_PATH."/points.log", 'a')) != FALSE) {
-    /* Unix time | session | nickname | IP | where was | mesg */
-    fwrite($fp, sprintf("%ld|%s|%s|%s|%s|%s|%s|\n", $curtime, $user->sess,
-                        ($user->flags & USER_FLAG_AUTH ? 'A' : 'N'),
-                        $user->name, $_SERVER['REMOTE_ADDR'], $where , $mesg));
-    fclose($fp);
-  }
-}
-
-
-
 
 function lock_banlist()
 {