From: Matteo Nastasi <nastasi@alternativeoutput.it>
Date: Thu, 12 Jan 2017 06:23:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master' into nginx
X-Git-Tag: v5.6.0~34
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=302c97f7ac81dfcc6fc8d8d44359f4f432e4618a;p=brisk.git

Merge remote-tracking branch 'origin/master' into nginx

Conflicts:
	web/briskin5/index_wr.php
	web/index_wr.php
---

302c97f7ac81dfcc6fc8d8d44359f4f432e4618a
diff --cc web/index_wr.php
index 71b3f9c,c427c3d..48b3c14
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@@ -736,17 -765,9 +765,9 @@@ function index_wr_main(&$brisk, $remote
              log_wr($user->comm[$user->step % COMM_N]);
              $user->step_inc();
  
-         }
-         else if ($argz[0] == 'whysupport') {
-             $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
-             $user->comm[$user->step % COMM_N] .=  show_notify(str_replace("\n", " ", $G_room_whysupport[$G_lang]), 0, $mlang_indwr['btn_backtotab'][$G_lang], 400, 200);
- 
-             log_wr($user->comm[$user->step % COMM_N]);
-             $user->step_inc();
- 
          }
          else if ($argz[0] == 'chatt') {
-             $brisk->chatt_send($user, xcapemesg($mesg));
 -            $brisk->chatt_send(&$user, xcapemesg($mesg), $mlang_indwr);
++            $brisk->chatt_send($user, xcapemesg($mesg), $mlang_indwr);
          }
          else if ($argz[0] == 'tosmgr') {
              // check IF is authnticated user, both terms of service versions matches