c0a30a2640...ff00990520 까지 반영

2019-07-20 15:29:47 +09:00
parent ead0e14350
commit 549114ae1f
4 changed files with 9 additions and 3 deletions
@@ -79,11 +79,13 @@ if ($gameStor->npcmode == 0) {
 }
 $color = "cyan";
 $mapTheme = $gameStor->map_theme;
+$serverName = UniqueConst::$serverName;
+$serverCnt = $gameStor->server_cnt;
 ?>
 <!DOCTYPE html>
 <html>
 <head>
-<title><?=UniqueConst::$serverName?>: 메인</title>
+<title><?=$serverName?>: 메인</title>
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
@@ -129,7 +131,7 @@ $(function(){
 <div><?=allButton()?></div>
 <table class="tb_layout bg0" style="width:1000px;">
    <tr height=50>
-        <td colspan=5 align=center><font size=4>삼국지 모의전투 HiDCHe (<font color=cyan><?=$scenario?></font>)</font></td>
+        <td colspan=5 id="server_title" align=center><font size=4>삼국지 모의전투 HiDCHe <?=$serverName.$serverCnt?>기 (<font color=cyan><?=$scenario?></font>)</font></td>
    </tr>
 <?php if ($valid == 1): ?>
    <tr height=30>
@@ -32,7 +32,7 @@ $nationID = $me['nation'];
 if($isAmbassador){
    $targetType = 'ambassador';
    $targetLevel = 4;
-    if(count($genlist) > 2){
+    if($genlist && count($genlist) > 2){
        Json::die([
            'result'=>false,
            'reason'=>'외교권자는 최대 둘까지만 설정 가능합니다.'
@@ -241,6 +241,7 @@ class ResetHelper{
            'tnmt_trig'=>$tournament_trig,
            'prev_winner'=>$prevWinner,
            'tournament'=>0,
+            'server_cnt'=>$db->queryFirstField('SELECT count(*) FROM ng_games')
        ];

        foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM member WHERE grade >= 5') as $admin){
@@ -154,6 +154,9 @@ class WebUtil
        }

        $config = \HTMLPurifier_HTML5Config::createDefault();
+        $config->set('Filter.Custom', array (new \HTMLPurifier_Filter_YouTube()));
+        $config->set('HTML.SafeIframe', true);
+        $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/)%'); //allow YouTube and Vime
        $def = $config->getHTMLDefinition();
        $def->info_global_attr['data-flip'] = new \HTMLPurifier_AttrDef_Text;
        $purifier = new \HTMLPurifier($config);