From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Thu, 13 Mar 2014 07:15:04 +0000 (+0100)
Subject: Merge branch 'master' into auto-maintenance
X-Git-Tag: v4.14.0~20
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=20e2a68f563f8fb2451d587248240971b2927bf8;hp=ef707202db0efb1094bac1ad7e2f1a656be252c0;p=brisk.git

Merge branch 'master' into auto-maintenance
---

diff --git a/TODO.txt b/TODO.txt
index 862e2a4..3d779e3 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -11,7 +11,7 @@
       DONE . Distinguish between inherited mult and local mult
 
    - AUTO-MAINTENANCE
-     . Terms Of Service acceptance
+     DONE . Terms Of Service acceptance
        DONE . print date of hard switch
        DONE . TOS version
        DONE . user TOS acceptance (db field)
diff --git a/sql/sql.d/052-user-rename-tsusp.sql b/sql/sql.d/052-user-rename-tsusp.sql
index e219983..25a8896 100644
--- a/sql/sql.d/052-user-rename-tsusp.sql
+++ b/sql/sql.d/052-user-rename-tsusp.sql
@@ -1 +1,3 @@
-ALTER TABLE #PFX#users RENAME COLUMN tsusp TO lintm;
+ALTER TABLE #PFX#users RENAME COLUMN lintm TO tsusp; --MB
+ALTER TABLE #PFX#users RENAME COLUMN tsusp TO lintm; --MF
+
diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index cf857dd..4754969 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -67,6 +67,7 @@ define('USER_FLAG_TY_DISABLE', 0x800000); // done
 define('USER_DIS_REA_INVMAIL', 1);
 define('USER_DIS_REA_LICENCE', 2);
 define('USER_DIS_REA_BANNED',  3);
+define('USER_DIS_REA_MALICIOUS',  4);
 
 // 240 is the right value, 600 is for fwrite error test
 define('RD_ENDTIME_DELTA',  240);