From 6f7ac86e7f18257dd894e0539d14f696074acb97 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sat, 20 Jul 2019 15:29:47 +0900 Subject: [PATCH] =?UTF-8?q?c0a30a2640...ff00990520=20=EA=B9=8C=EC=A7=80=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/index.php | 6 ++++-- hwe/j_general_set_permission.php | 2 +- hwe/sammo/ResetHelper.php | 1 + src/sammo/WebUtil.php | 3 +++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/hwe/index.php b/hwe/index.php index b25a3afc..4fcd2e4d 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -79,11 +79,13 @@ if ($gameStor->npcmode == 0) { } $color = "cyan"; $mapTheme = $gameStor->map_theme; +$serverName = UniqueConst::$serverName; +$serverCnt = $gameStor->server_cnt; ?> -<?=UniqueConst::$serverName?>: 메인 +<?=$serverName?>: 메인 @@ -129,7 +131,7 @@ $(function(){
- + diff --git a/hwe/j_general_set_permission.php b/hwe/j_general_set_permission.php index 76744f36..4de7a5b1 100644 --- a/hwe/j_general_set_permission.php +++ b/hwe/j_general_set_permission.php @@ -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'=>'외교권자는 최대 둘까지만 설정 가능합니다.' diff --git a/hwe/sammo/ResetHelper.php b/hwe/sammo/ResetHelper.php index 48db1ab9..07073686 100644 --- a/hwe/sammo/ResetHelper.php +++ b/hwe/sammo/ResetHelper.php @@ -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){ diff --git a/src/sammo/WebUtil.php b/src/sammo/WebUtil.php index 29e0da6d..45672612 100644 --- a/src/sammo/WebUtil.php +++ b/src/sammo/WebUtil.php @@ -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);
삼국지 모의전투 HiDCHe ()삼국지 모의전투 HiDCHe 기 ()