From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Fri, 15 Aug 2014 08:48:55 +0000 (+0200)
Subject: backported various fixes from production installation
X-Git-Tag: 4.14.5~1
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=328de26963e512cc34c999baf67f449020a62bfd;p=brisk.git

backported various fixes from production installation
---

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 47b8f13..3d94f65 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -108,8 +108,8 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
                                            'en' => 'EN<br>The signalling message of the table<br>will be deactivated for %d second%s.<br><br>'),
                       'alarpass' => array( 'it' => '<br>La password digitata non &egrave; corretta.<br><br>',
                                            '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>."'),
+                      '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 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>',
diff --git a/web/brisk.css b/web/brisk.css
index 56bd604..0539984 100644
--- a/web/brisk.css
+++ b/web/brisk.css
@@ -257,7 +257,7 @@ span.au1 {
     font-style: italic;
 /* orange   background-color: #ffd780; */
 /* red      background-color: #ffb0b0; */
-    background-color: #81a8ff;
+    background-color: #a1c8ff;
 }
 
 span.au2 {
diff --git a/web/room.js b/web/room.js
index 59117c9..c25728b 100644
--- a/web/room.js
+++ b/web/room.js
@@ -106,7 +106,7 @@ function state_add(flags, comp)
     }
 
     if ((flags & 0xf0000) != 0) {
-        superst = flags & 0xf0000;
+        superst = flags & 0x20000;
         if (name != "") {
             supersfx = "_side";                
         }
diff --git a/web/usermgmt.php b/web/usermgmt.php
index ec9a83e..95a9c76 100644
--- a/web/usermgmt.php
+++ b/web/usermgmt.php
@@ -225,7 +225,8 @@ SELECT usr.*, guar.login AS guar_login
      FROM %susers AS usr
      JOIN %susers AS guar ON guar.code = usr.guar_code
      WHERE ( (usr.type & (CAST (X'%x' as integer))) = (CAST (X'%x' as integer)) )
-         AND usr.disa_reas = %d;",
+         AND usr.disa_reas = %d
+     ORDER BY usr.lintm;",
                                $G_dbpfx, $G_dbpfx,
                                USER_FLAG_TY_DISABLE, USER_FLAG_TY_DISABLE,
                                USER_DIS_REA_NU_ADDED);
@@ -342,7 +343,8 @@ SELECT usr.*, guar.login AS guar_login
      FROM %susers AS usr
      JOIN %susers AS guar ON guar.code = usr.guar_code
      WHERE ( (usr.type & (CAST (X'%x' as integer))) = (CAST (X'%x' as integer)) )
-         AND usr.disa_reas = %d;",
+         AND usr.disa_reas = %d
+     ORDER BY usr.lintm;",
                                $G_dbpfx, $G_dbpfx,
                                USER_FLAG_TY_DISABLE, USER_FLAG_TY_DISABLE,
                                USER_DIS_REA_NU_MAILED);
@@ -473,7 +475,8 @@ SELECT usr.*, guar.login AS guar_login
      FROM %susers AS usr
      JOIN %susers AS guar ON guar.code = usr.guar_code
      WHERE ( (usr.type & (CAST (X'%x' as integer))) = (CAST (X'%x' as integer)) )
-         AND usr.disa_reas = %d;",
+         AND usr.disa_reas = %d
+     ORDER BY usr.lintm;",
                                $G_dbpfx, $G_dbpfx,
                                USER_FLAG_TY_ALL, USER_FLAG_TY_DISABLE,
                                USER_DIS_REA_NU_TOBECHK);