new span.auX class management, new guaranty policy

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 6ff2b8e..4e765a1 100644 (file)
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -60,7 +60,7 @@ define('WAKEUP_TIME', 12);
 // BAN_TIME da allineare anche in commons.js
 define('BAN_TIME', 3600);
 define('GARBAGE_TIMEOUT', 5);
-define('NICKSERV', "<i>BriskServ</i>");
+define('NICKSERV', "BriskServ");
 
 define('LOCK_SHARE_MAX', 10000);
 
@@ -110,8 +110,8 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
                                            'en' => '<br>The entered password is not correct.<br><br>'),
                       'alarret'  => array( 'it' => '"Alarm \\"<b>%s</b>\\" inviato a <b>%s</b>."',
                                            'en' => '"Alarm \\"<b>%s</b>\\" sent to <b>%s</b>."'),
-                      'authmust' => array( 'it' => '<b>Per autenticare qualcuno devi a tua volta essere autenticato.</b>',
-                                           'en' => '<b>To authenticate someone you have to be authenticated.</b>'), // on your turn
+                      'authmust' => array( 'it' => '<b>Per autenticare qualcuno devi a tua volta essere autenticato e certificato.</b>',
+                                           'en' => '<b>To authenticate someone you have to be authenticated and certified.</b>'), // on your turn
                       'mesgmust' => array( 'it' => '<b>Per inviare un messaggio devi essere autenticato.</b>',
                                            'en' => '<b>To send a message you have to be authenticated.</b>'),
                       'nickmust' => array( 'it' => 'Il nickname deve contenere almeno una lettera dell\'alfabeto o una cifra.',

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 5ef9d9c..96706b8 100644 (file)
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -562,9 +562,17 @@ class User {
       // 4 -> is certified
       // 2 -> is authorized
       // 1 -> is myself
-      $class_id = (($this->flags & USER_FLAG_TY_CERT) >> 16) | ($this->flags & USER_FLAG_AUTH) | 1;
-      
-      return (sprintf('$("myname").innerHTML = "<span class=\"au%d\">%s</span>";', $class_id, 
+      $class_ids = (($this->flags & USER_FLAG_TY_CERT) >> 16) | ($this->flags & USER_FLAG_AUTH) | 1;
+      $sp = "";
+      $cl = "";
+
+      for ($i = 0 ; $i < 3 ; $i++) {
+          if ($class_ids & (1 << $i)) {
+              $cl .= sprintf("%sau%d", $sp, $i);
+              $sp = " ";
+          }
+      }
+      return (sprintf('$("myname").innerHTML = "<span class=\"%s\">%s</span>";', $cl,
                       xcape($this->name,ENT_COMPAT,"UTF-8")));
   }
 

diff --git a/web/brisk.css b/web/brisk.css
index 1e247cf..f984cb0 100644 (file)
--- a/web/brisk.css
+++ b/web/brisk.css
@@ -1,7 +1,7 @@
 /*
  *  brisk - brisk.css
  *
- *  Copyright (C) 2006-2012 Matteo Nastasi
+ *  Copyright (C) 2006-2014 Matteo Nastasi
  *                          mailto: nastasi@alternativeoutput.it 
  *                                  matteo.nastasi@milug.org
  *                          web: http://www.alternativeoutput.it
@@ -247,37 +247,19 @@ img.button:hover {
     cursor: pointer;
 }
 
-span.au1 {
+span.au0 {
     font-weight: bold;
 }
 
-span.au2 {
-    font-style: italic;
-    background-color: #bafcba;
-}
-
-span.au3 {
-    font-weight: bold;
+span.au1 {
+    padding-left: 2px;
+    padding-right: 4px;
     font-style: italic;
     background-color: #bafcba;
 }
 
-span.au4 {
-    background-color: #ffd780;
-}
-
-span.au5 {
-    font-weight: bold;
-    background-color: #ffd780;
-}
-
-span.au6 {
-    font-style: italic;
-    background-color: #ffd780;
-}
-
-span.au7 {
-    font-weight: bold;
-    font-style: italic;
-    background-color: #ffd780;
+span.au2 {
+    /* orange: background-color: #ffd780; */
+    /* background-color: #e0ff00; */
+    background-color: #8c7dfb;
 }

diff --git a/web/commons.js b/web/commons.js
index b95519b..09129c3 100644 (file)
--- a/web/commons.js
+++ b/web/commons.js
@@ -1026,11 +1026,18 @@ var CHATT_MAXLINES = 40;
 
 function user_decorator(user)
 {
-    var name;
+    var name, i, sp = "", cl = "";
     var flags = user[0] & 0x03 | ((user[0] & 0x040000) >> 16);
 
+    for (i = 0 ; i < 3 ; i++) {
+        if (flags & (1 << i)) {
+            cl += sp + "au" + i;
+            sp = " ";
+        }
+    }
+
     if (flags != 0)
-        name = "<span class='au" + flags + "'>"+user[1]+"</span>";
+        name = "<span class='" + cl + "'>"+user[1]+"</span>";
     else
         name = user[1];
 

diff --git a/web/index_wr.php b/web/index_wr.php
index d8cd409..4ababaa 100644 (file)
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -32,8 +32,8 @@ $mlang_indwr = array( 'btn_backtotab' => array( 'it' => 'Torna ai tavoli.',
                                           'en' => '<b>An error was occurred during the saving, try again or contact the administrator.</b>'),
                       'coerrdb' => array( 'it' => '<b>Il database è temporaneamente irraggiungibile, riprova più tardi o contatta l\'amministratore.</b>',
                                           'en' => '<b>The database is temporarly unavailable, retry to later or conctact the administrator.</b>'),
-                      'warrmust' => array( 'it' => '<b>Per autenticare qualcuno devi a tua volta essere autenticato.</b>',
-                                           'en' => 'To authenticate somebody you have to be authenticated in your turn'),
+                      'warrmust' => array( 'it' => '<b>Per autenticare qualcuno devi a tua volta essere autenticato e certificato.</b>',
+                                           'en' => 'To authenticate somebody you have to be authenticated and certified yourown'),
                       'mesgrepl' => array( 'it' => '<br><br>Il messaggio &egrave; stato inoltrato all\'amministratore.',
                                            'en' => '<br><br>The message was forwarded to the administrator'),
                       'mesgmust' => array( 'it' => '<b>Per mandare messaggi all\'amministratore devi essere autenticato.</b>',
@@ -300,8 +300,8 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
         
         $mesg_to_user = "";
         
-        log_wr("INFO:SKIP:argz == warranty name: [".$cli_name."] AUTH: ".$user->is_auth());
-        if ($user->is_auth()) {
+        log_wr("INFO:SKIP:argz == warranty name: [".$cli_name."] CERT: ".$user->is_cert());
+        if ($user->is_cert()) {
             if (0 == 1) {
                 if (($wa_lock = Warrant::lock_data(TRUE)) != FALSE) {
                     if (($fp = @fopen(LEGAL_PATH."/warrant.txt", 'a')) != FALSE) {