MRBS 1.12.2 等保2.0二级整改完整提交

包含：登录失败锁定、90天密码有效期、30分钟会话超时、
强制改密、登录审计日志、屏幕水印、企业背景图、
备案信息固定底部、favicon、登录页JS修复等全部改动

web/upgrade/21/mysql.sql

@@ -0,0 +1 @@
+# Nothing to do

web/upgrade/21/post.inc

@@ -0,0 +1,29 @@
+<?php
+namespace MRBS;
+
+// Go through the area table and if any of the per-area settings are NULL then
+// set them to the area defaults
+
+global $area_defaults, $boolean_fields;
+
+$fields = $upgrade_handle->field_info(_tbl('area'));
+foreach ($fields as $field)
+{
+  $key = $field['name'];
+  if (array_key_exists($key, $area_defaults))
+  {
+    if (in_array($key, $boolean_fields['area']))
+    {
+      $sql_val = ($area_defaults[$key]) ? 1 : 0;
+    }
+    else
+    {
+      $sql_val = $area_defaults[$key];
+    }
+    $sql = "UPDATE " . _tbl('area') . "
+               SET $key=?
+             WHERE $key IS NULL";
+    $upgrade_handle->command($sql, array($sql_val));
+  }
+}
+