From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Wed, 28 Oct 2015 08:26:16 +0000 (+0100)
Subject: use user->is_appr() when needed
X-Git-Tag: v5.1.0~7
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=2a36c945e6c9107f400dfb24d57c682f1c7f49e2;p=brisk.git

use user->is_appr() when needed
---

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index b61a450..f2e9007 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -2169,7 +2169,7 @@ class Brisk
         $to_user = sprintf('chatt_sub("%s",[%d,"%s"],"%s");', $dt, $user->flags, xcape($user->name), xcape("== chat ban =="));
       }
       else {
-          if ( TRUE && (! $user->is_auth()) ) {
+          if ( TRUE && (!$user->is_auth() || $user->is_appr()) ) {
               $to_user = nickserv_msg($dt, xcape("Visto l'elevato numero di molestatori che ultimamente hanno preso dimora su Brisk abbiamo deciso"));
               $to_user .= nickserv_msg($dt, xcape("di disattivare temporaneamente la chat in room per i non registrati, non ce ne vogliate e buone feste."));
               if (FALSE) {
diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh
index f674d3b..80db1f4 100644
--- a/web/Obj/sac-a-push.phh
+++ b/web/Obj/sac-a-push.phh
@@ -74,6 +74,7 @@ function global_dump()
     fprintf(STDERR, "G_with_splash = [%s]\n", print_r($G_with_splash, TRUE));
     fprintf(STDERR, "G_with_topbanner = [%s]\n", print_r($G_with_topbanner, TRUE));
     fprintf(STDERR, "G_selfreg_mask = [%x]\n", print_r($G_selfreg_mask, TRUE));
+
     fprintf(STDERR, "G_selfreg_tout = [%s]\n", print_r($G_selfreg_tout, TRUE));
 
 }
diff --git a/web/commons.js b/web/commons.js
index 3789e9c..7dcf922 100644
--- a/web/commons.js
+++ b/web/commons.js
@@ -1043,12 +1043,14 @@ function user_decorator(user, is_real)
         }
     }
 
-    if (flags != 0)
+    if (flags != 0) {
         name = "<span class='" + cl + "'><span class='" +
         (is_real && (flags & 0xfffffe && ((flags & 0x01) == 0)) ? "id_usr" : "") +
-        "'>"+user[1]+"</span></span>";
-    else
+        "'>" + user[1] + "</span></span>";
+    }
+    else {
         name = user[1];
+    }
 
     return (name);
 }
diff --git a/web/index.php b/web/index.php
index baad9b5..ea7f22b 100644
--- a/web/index.php
+++ b/web/index.php
@@ -506,7 +506,7 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f
         $tables .= '<div class="room_tab">';
         $tables .= '<table class="room_tab">';
         for ($ii = 0 ; $ii < TABLES_N ; $ii++) {
-            if ($user->is_auth())
+            if ($user->is_auth() && !$user->is_appr())
                 $i = $ii;
             else
                 $i = TABLES_N - $ii - 1;
diff --git a/web/index_wr.php b/web/index_wr.php
index b7d6339..b0c9ac0 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -593,7 +593,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
         $dobreak = FALSE;
         do {
             log_wr("INFO:SKIP:argz == poll name: [".$cli_poll_name."] AUTH: ".$user->is_auth());
-            if ( ! $user->is_auth() ) {
+            if ( ! $user->is_auth() || $user->is_appr() ) {
                 // MLANG: <b>Per partecipare al sondaggio devi essere autenticato.</b>
                 $mesg_to_user = nickserv_msg($dt, $mlang_indwr['pollmust'][$G_lang]);
                 log_wr("break1");