Merge branch 'master', remote branch 'origin' into auto-maintenance

diff --git a/TODO.txt b/TODO.txt
index a348846..107969d 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,7 +4,7 @@
   FEATURES |
  ----------+
    - 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 (file)
--- 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 (file)
--- 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);