From 9108ce3f199eb3878250bd5fd4119878e01df4da Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 8 Apr 2018 17:59:39 +0900 Subject: [PATCH] =?UTF-8?q?js,=20html=EC=97=90=EC=84=9C=20=EC=B0=B8?= =?UTF-8?q?=EC=A1=B0=ED=95=98=EB=8A=94=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/a_status.php | 1 + hwe/b_diplomacy.php | 1 + hwe/index.php | 1 + hwe/js/map.js | 10 ++++---- hwe/processing.php | 1 + hwe/templates/msg_plate.php | 2 +- i_entrance/admin_userlist.html | 4 ++- i_entrance/j_get_user_info.php | 4 +-- i_entrance/j_get_userlist.php | 2 +- i_entrance/j_icon_change.php | 2 +- i_entrance/user_info.html | 37 ++++++++++++++------------- js/user_info.js | 1 + src/sammo/Json.php | 2 +- tmp_map/map.html | 3 ++- tmp_map/map.js | 10 ++++---- tmp_msg/add_msg_dummy.php | 2 +- tmp_msg/json_result.php | 4 ++- tmp_msg/msg.html | 8 +++--- tmp_msg/msg.js | 1 + tmp_msg/prompt_dummy.php | 4 ++- tmp_msg/tmp_template.html | 2 +- vendor/composer/autoload_classmap.php | 1 + vendor/composer/autoload_static.php | 1 + 23 files changed, 61 insertions(+), 43 deletions(-) diff --git a/hwe/a_status.php b/hwe/a_status.php index 7bb0fd39..cc69ee98 100644 --- a/hwe/a_status.php +++ b/hwe/a_status.php @@ -31,6 +31,7 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); } 세력도 + diff --git a/hwe/b_diplomacy.php b/hwe/b_diplomacy.php index 1ee8dd2e..d6225262 100644 --- a/hwe/b_diplomacy.php +++ b/hwe/b_diplomacy.php @@ -55,6 +55,7 @@ for($i=0; $i < $nationcount; $i++) { 중원정보 + diff --git a/hwe/index.php b/hwe/index.php index 8301996f..bdb0842e 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -68,6 +68,7 @@ $scenario = $admin['scenario_text']; + diff --git a/hwe/js/map.js b/hwe/js/map.js index 00d441c5..8cdc9d02 100644 --- a/hwe/js/map.js +++ b/hwe/js/map.js @@ -262,28 +262,28 @@ function reloadWorldMap(option){ if('color' in city && city.color !== null){ var $bgObj = $('
'); $cityObj.append($bgObj); - $bgObj.css({'background-image':'url(/images/b{0}.png)'.format(convColorValue(city.color))}); + $bgObj.css({'background-image':'url({0}/b{1}.png)'.format(pathConfig.gameImage, convColorValue(city.color))}); } var $linkObj = $(''); $linkObj.data({'text':city.text,'nation':city.nation,'id':city.id}); $cityObj.append($linkObj); - var $imgObj = $('
'.format(city.level)); + var $imgObj = $('
'.format(pathConfig.gameImage, city.level)); $linkObj.append($imgObj); if(city.state > 0){ - var $stateObj = $('
'.format(city.state)); + var $stateObj = $('
'.format(pathConfig.gameImage, city.state)); $linkObj.append($stateObj); } if(city.nationId && city.nationId > 0){ var flagType = city.supply?'f':'d'; - var $flagObj = $('
'.format(flagType, convColorValue(city.color))); + var $flagObj = $('
'.format(pathConfig.gameImage, flagType, convColorValue(city.color))); if(city.isCapital){ - var $capitalObj = $('
'); + var $capitalObj = $('
'.format(pathConfig.gameImage)); $flagObj.append($capitalObj); } $imgObj.append($flagObj); diff --git a/hwe/processing.php b/hwe/processing.php index b62d7c90..ea05c4e0 100644 --- a/hwe/processing.php +++ b/hwe/processing.php @@ -118,6 +118,7 @@ function starter($name, $type=0) { + diff --git a/hwe/templates/msg_plate.php b/hwe/templates/msg_plate.php index 48e4df2f..ee4b183a 100644 --- a/hwe/templates/msg_plate.php +++ b/hwe/templates/msg_plate.php @@ -24,7 +24,7 @@ - + diff --git a/i_entrance/admin_userlist.html b/i_entrance/admin_userlist.html index b4e2c145..59044fc3 100644 --- a/i_entrance/admin_userlist.html +++ b/i_entrance/admin_userlist.html @@ -7,11 +7,13 @@ + - + + diff --git a/i_entrance/j_get_user_info.php b/i_entrance/j_get_user_info.php index ed2afbe4..a34d2bf5 100644 --- a/i_entrance/j_get_user_info.php +++ b/i_entrance/j_get_user_info.php @@ -12,7 +12,7 @@ $db = RootDB::db(); $member = $db->queryFirstRow('SELECT `id`, `name`, `grade`, `picture` FROM `MEMBER` WHERE `NO` = %i', $userID); if(!$member['picture']){ - $picture = ServConfig::$sharedIconPath.'/default.jpg'; + $picture = ServConfig::getSharedIconPath().'/default.jpg'; } else{ $picture = $member['picture']; @@ -26,7 +26,7 @@ else{ $picture = AppConf::getUserIconPathWeb().'/'.$picture; } else{ - $picture = ServConfig::$sharedIconPath.'/'.$picture; + $picture = ServConfig::getSharedIconPath().'/'.$picture; } } diff --git a/i_entrance/j_get_userlist.php b/i_entrance/j_get_userlist.php index d8b1ff2a..fce81770 100644 --- a/i_entrance/j_get_userlist.php +++ b/i_entrance/j_get_userlist.php @@ -22,7 +22,7 @@ foreach($db->query('SELECT member.*, max(member_log.date) as loginDate from memb $icon = AppConf::getUserIconPathWeb().'/'.$member['PICTURE']; } else{ - $icon = ServConfig::$sharedIconPath.'/'.$member['PICTURE']; + $icon = ServConfig::getSharedIconPath().'/'.$member['PICTURE']; } $userList[] = [ diff --git a/i_entrance/j_icon_change.php b/i_entrance/j_icon_change.php index 1089f075..ddb34941 100644 --- a/i_entrance/j_icon_change.php +++ b/i_entrance/j_icon_change.php @@ -65,7 +65,7 @@ if(!is_uploaded_file($image['tmp_name'])) { while(true){ $newPicName = dechex(rand(0x000000f,0xfffffff)).$newExt; - $dest = ROOT.'/d_pic/'.$newPicName; + $dest = AppConf::getUserIconPathFS().$newPicName; if(file_exists($dest)){ continue; } diff --git a/i_entrance/user_info.html b/i_entrance/user_info.html index 38d57633..1cdcc195 100644 --- a/i_entrance/user_info.html +++ b/i_entrance/user_info.html @@ -1,22 +1,23 @@ - - - 계정 관리 - - - - - - - - - - - - - + + + 계정 관리 + + + + + + + + + + + + + +
@@ -95,8 +96,8 @@
전용
아이콘		 - - + +
diff --git a/js/user_info.js b/js/user_info.js index 4281e4c9..a3119784 100644 --- a/js/user_info.js +++ b/js/user_info.js @@ -198,6 +198,7 @@ function deleteMe(){ } $(function(){ + $('#slot_icon, #slot_new_icon').attr('src', pathConfig.sharedIcon+'/default.jpg'); $.ajax({ type:'post', url:'j_get_user_info.php', diff --git a/src/sammo/Json.php b/src/sammo/Json.php index 23bfff86..dd5e4a04 100644 --- a/src/sammo/Json.php +++ b/src/sammo/Json.php @@ -9,7 +9,7 @@ class Json public static function encode($value, $flag = 0) { - $rawFlag = JSON_UNESCAPED_UNICODE; + $rawFlag = JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES; if ($flag & static::PRETTY) { $rawFlag |= JSON_PRETTY_PRINT; } diff --git a/tmp_map/map.html b/tmp_map/map.html index 7e45073a..6de06bb8 100644 --- a/tmp_map/map.html +++ b/tmp_map/map.html @@ -5,12 +5,13 @@ + - + - + + - - + + +