修复密码不支持特殊问题！

修复内容超出撑坏页面！

application/controllers/User.php

@@ -134,7 +134,7 @@ class User extends MY_controller
             $msg['code'] = 0;
             $msg['msg'] = "该用户名已存在请换一个。";
         }
-        if($password && !preg_match_all("/^[a-zA-Z\d_]{8,}$/",$password) && $msg['code']){
+        if($password && strlen($password)<8 && $msg['code']){
             $msg['code'] = 0;
             $msg['msg'] = "密码格式不正确，最小长度为8！";
         }
@@ -260,7 +260,7 @@ class User extends MY_controller
         if(!$password && $msg['code']){
             $msg['code'] = 0;
             $msg['msg'] = "密码不能为空！";
-        }elseif(!preg_match_all("/^[a-zA-Z\d_]{8,}$/",$password) && $msg['code']){
+        }elseif(strlen($password)<8 && $msg['code']){
             $msg['code'] = 0;
             $msg['msg'] = "密码格式不正确，最小长度为8！";
         }

application/views/templates/warning/ignoreindex.html

@@ -66,7 +66,7 @@
                 <td class="text-center" data-searchable="true">{if array_key_exists($val['type'],$warning_type)}<span class="level warning_type{$val['type']}">{$warning_type[$val['type']]}</span>{else}未知类型{/if}</td>  <!--失陷事件、脆弱性、残余攻击-->
                 <td class="text-center"><span class="level level{{$val['level']}}">{$warning_level[$val['level']]}</span></td> <!--已失陷、高可疑、高危、中危、低危-->
                 <td data-searchable="true">{if array_key_exists($val['branch']['branch_id'],$branch)}{$branch[$val['branch']['branch_id']]['branch_name']}{else}未配置分支{/if}</td>
-                <td class="text_over col-sm-2">{$val['content']}</td>
+                <td class="col-xs-2"><div class="text_over" style="width: 260px;">{$val['content']}</div></td>
                 <td class="text-center">{$val['create_time']->toDateTime()|date_format:'%Y-%m-%d %H:%M:%S'}</td>
                 <td class="text-center"><span class="w_status{$val['status']}">{$warning_status[$val['status']]}</span></td> <!--待审核下发、已忽略-->
                 <td class="text-center">

application/views/templates/warning/index.html

@@ -78,11 +78,11 @@
                     <tr>
                         <th class="text-center" style="width: 40px;"><input name="check_all" class="check_all" value="true" type="checkbox"></th>
                         <!--<th></th>-->
-                        <th class="text-center">告警名称</th>
-                        <th class="text-center">类型</th>
-                        <th class="text-center">等级</th>
+                        <th class="text-center">告警事件名称</th>
+                        <th class="text-center">事件类型</th>
+                        <th class="text-center">主机等级</th>
                         <th class="text-center">所属分支</th>
-                        <th class="text-center col-sm-2">内容</th>
+                        <th class="text-center col-xs-2">内容</th>
                         <th class="text-center" style="width: 180px;">时间</th>
                         <th class="text-center">状态</th>
                         <th class="text-center" style="width: 230px">操作</th>
@@ -96,7 +96,7 @@
                         <td class="text-center" data-searchable="true">{if array_key_exists($val['type'],$warning_type)}<span class="level warning_type{$val['type']}">{$warning_type[$val['type']]}</span>{else}未知类型{/if}</td>  <!--失陷事件、脆弱性、残余攻击-->
                         <td class="text-center"><span class="level level{{$val['level']}}">{$warning_level[$val['level']]}</span></td> <!--已失陷、高可疑、高危、中危、低危-->
                         <td data-searchable="true">{if array_key_exists($val['branch']['branch_id'],$branch)}{$branch[$val['branch']['branch_id']]['branch_name']}{else}未配置分支{/if}</td>
-                        <td class="text_over col-sm-2">{$val['content']}</td>
+                        <td class="col-xs-2"><div class="text_over" style="width: 260px;">{$val['content']}</div></td>
                         <td class="text-center">{$val['create_time']->toDateTime()|date_format:'%Y-%m-%d %H:%M:%S'}</td>
                         <td class="text-center"><span class="w_status{$val['status']}">{$warning_status[$val['status']]}</span></td> <!--待审核下发、已忽略-->
                         <td class="text-left">

application/views/templates/warning/view.html

@@ -30,7 +30,7 @@
                 <div class="form-group">
                     <label class="col-xs-2 control-label">告警类型：</label>
                     <div class="col-xs-9 text-left">
-                        <span class="level warning_type{$warning['type']}">{$warning_type[$warning['type']]}</span>
+                        {if array_key_exists($warning['type'],$warning_type)}<span class="level warning_type{$warning['type']}">{$warning_type[$warning['type']]}</span>{else}未知类型{/if}
                     </div>
                 </div>
                 <div class="form-group">
@@ -54,13 +54,13 @@
                 <div class="form-group">
                     <label class="col-xs-2 control-label">设备ID：</label>
                     <div class="col-xs-9">
-                        {$warning['device']['device_id']}
+                        {if array_key_exists('device_id',$warning['device'])}{$warning['device']['device_id']}{/if}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-xs-2 control-label">设备类型：</label>
                     <div class="col-xs-9">
-                        {$warning['device']['device_type']}
+                        {if array_key_exists('device_type',$warning['device'])}{$warning['device']['device_type']}{/if}
                     </div>
                 </div>
                 <div class="form-group">