devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

js, html에서 참조하는 이미지 경로 수정

Browse Source
This commit is contained in:
Hide_D
2018-04-08 17:59:39 +09:00
parent e36a50889b
commit 9108ce3f19
23 changed files with 61 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/a_status.php
+1
View File
@@ -31,6 +31,7 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>세력도</title> <title>세력도</title>
<script src="../e_lib/jquery-3.2.1.min.js"></script> <script src="../e_lib/jquery-3.2.1.min.js"></script>
<script src="../d_shared/common_path.js"></script>
<script src="js/common.js"></script> <script src="js/common.js"></script>
<script src="js/base_map.js"></script> <script src="js/base_map.js"></script>
<script src="js/map.js"></script> <script src="js/map.js"></script>
hwe/b_diplomacy.php
+1
View File
@@ -55,6 +55,7 @@ for($i=0; $i < $nationcount; $i++) {
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>중원정보</title> <title>중원정보</title>
<script src="../e_lib/jquery-3.2.1.min.js"></script> <script src="../e_lib/jquery-3.2.1.min.js"></script>
<script src="../d_shared/common_path.js"></script>
<script src="js/common.js"></script> <script src="js/common.js"></script>
<script src="js/base_map.js"></script> <script src="js/base_map.js"></script>
<script src="js/map.js"></script> <script src="js/map.js"></script>
hwe/index.php
+1
View File
@@ -68,6 +68,7 @@ $scenario = $admin['scenario_text'];
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<script src="../e_lib/jquery-3.2.1.min.js"></script> <script src="../e_lib/jquery-3.2.1.min.js"></script>
<script src="../d_shared/common_path.js"></script>
<script src="js/common.js"></script> <script src="js/common.js"></script>
<script src="js/main.js"></script> <script src="js/main.js"></script>
<script src="js/base_map.js"></script> <script src="js/base_map.js"></script>
hwe/js/map.js
+5 -5
View File
@@ -262,28 +262,28 @@ function reloadWorldMap(option){
if('color' in city && city.color !== null){ if('color' in city && city.color !== null){
var $bgObj = $('<div class="city_bg"></div>'); var $bgObj = $('<div class="city_bg"></div>');
$cityObj.append($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 = $('<a class="city_link"></a>'); var $linkObj = $('<a class="city_link"></a>');
$linkObj.data({'text':city.text,'nation':city.nation,'id':city.id}); $linkObj.data({'text':city.text,'nation':city.nation,'id':city.id});
$cityObj.append($linkObj); $cityObj.append($linkObj);
var $imgObj = $('<div class="city_img"><img src="/images/cast_{0}.gif"><div class="city_filler"></div></div>'.format(city.level)); var $imgObj = $('<div class="city_img"><img src="{0}/cast_{1}.gif"><div class="city_filler"></div></div>'.format(pathConfig.gameImage, city.level));
$linkObj.append($imgObj); $linkObj.append($imgObj);
if(city.state > 0){ if(city.state > 0){
var $stateObj = $('<div class="city_state"><img src="/images/event{0}.gif"></div>'.format(city.state)); var $stateObj = $('<div class="city_state"><img src="{0}/event{1}.gif"></div>'.format(pathConfig.gameImage, city.state));
$linkObj.append($stateObj); $linkObj.append($stateObj);
} }
if(city.nationId && city.nationId > 0){ if(city.nationId && city.nationId > 0){
var flagType = city.supply?'f':'d'; var flagType = city.supply?'f':'d';
var $flagObj = $('<div class="city_flag"><img src="/images/{0}{1}.gif"></div>'.format(flagType, convColorValue(city.color))); var $flagObj = $('<div class="city_flag"><img src="{0}/{1}{2}.gif"></div>'.format(pathConfig.gameImage, flagType, convColorValue(city.color)));
if(city.isCapital){ if(city.isCapital){
var $capitalObj = $('<div class="city_capital"><img src="/images/event51.gif"></div>'); var $capitalObj = $('<div class="city_capital"><img src="{0}/event51.gif"></div>'.format(pathConfig.gameImage));
$flagObj.append($capitalObj); $flagObj.append($capitalObj);
} }
$imgObj.append($flagObj); $imgObj.append($flagObj);
hwe/processing.php
+1
View File
@@ -118,6 +118,7 @@ function starter($name, $type=0) {
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<script src="../e_lib/jquery-3.2.1.min.js"></script> <script src="../e_lib/jquery-3.2.1.min.js"></script>
<script src="../d_shared/common_path.js"></script>
<script src="js/common.js"></script> <script src="js/common.js"></script>
<script src="js/main.js"></script> <script src="js/main.js"></script>
<script src="js/base_map.js"></script> <script src="js/base_map.js"></script>
hwe/templates/msg_plate.php
+1 -1
View File
@@ -24,7 +24,7 @@
<?php if ($src['iconPath'] !== null): ?> <?php if ($src['iconPath'] !== null): ?>
<img src="<?=$this->e(urlencode($src['iconPath']))?>"> <img src="<?=$this->e(urlencode($src['iconPath']))?>">
<?php else: ?> <?php else: ?>
<img src="/image/default.jpg"> <?php /*NOTE: image 폴더는 어느 단에서 다뤄야하는가? */?> <img src="<?=$this->imagePath?>/default.jpg">
<?php endif; ?> <?php endif; ?>
</td> </td>
<td width="434px" valign="top"> <td width="434px" valign="top">
i_entrance/admin_userlist.html
+3 -1
View File
@@ -7,11 +7,13 @@
<!-- 스타일 --> <!-- 스타일 -->
<link type="text/css" rel="stylesheet" href="../e_lib/bootstrap.min.css"> <link type="text/css" rel="stylesheet" href="../e_lib/bootstrap.min.css">
<link type="text/css" rel="stylesheet" href='../d_shared/common.css'>
<link type="text/css" rel="stylesheet" href='../css/admin_member.css'> <link type="text/css" rel="stylesheet" href='../css/admin_member.css'>
<script type="text/javascript" src='../js/common.js'></script>
<script type="text/javascript" src='../e_lib/jquery-3.2.1.min.js'></script> <script type="text/javascript" src='../e_lib/jquery-3.2.1.min.js'></script>
<script type="text/javascript" src="../e_lib/bootstrap.bundle.min.js"></script> <script type="text/javascript" src="../e_lib/bootstrap.bundle.min.js"></script>
<script src='../d_shared/common_path.js'></script>
<script type="text/javascript" src='../js/common.js'></script>
<script type="text/javascript" src='../js/func.js'></script> <script type="text/javascript" src='../js/func.js'></script>
<script type="text/javascript" src='../js/admin_member.js'></script> <script type="text/javascript" src='../js/admin_member.js'></script>
i_entrance/j_get_user_info.php
+2 -2
View File
@@ -12,7 +12,7 @@ $db = RootDB::db();
$member = $db->queryFirstRow('SELECT `id`, `name`, `grade`, `picture` FROM `MEMBER` WHERE `NO` = %i', $userID); $member = $db->queryFirstRow('SELECT `id`, `name`, `grade`, `picture` FROM `MEMBER` WHERE `NO` = %i', $userID);
if(!$member['picture']){ if(!$member['picture']){
$picture = ServConfig::$sharedIconPath.'/default.jpg'; $picture = ServConfig::getSharedIconPath().'/default.jpg';
} }
else{ else{
$picture = $member['picture']; $picture = $member['picture'];
@@ -26,7 +26,7 @@ else{
$picture = AppConf::getUserIconPathWeb().'/'.$picture; $picture = AppConf::getUserIconPathWeb().'/'.$picture;
} }
else{ else{
$picture = ServConfig::$sharedIconPath.'/'.$picture; $picture = ServConfig::getSharedIconPath().'/'.$picture;
} }
} }
i_entrance/j_get_userlist.php
+1 -1
View File
@@ -22,7 +22,7 @@ foreach($db->query('SELECT member.*, max(member_log.date) as loginDate from memb
$icon = AppConf::getUserIconPathWeb().'/'.$member['PICTURE']; $icon = AppConf::getUserIconPathWeb().'/'.$member['PICTURE'];
} }
else{ else{
$icon = ServConfig::$sharedIconPath.'/'.$member['PICTURE']; $icon = ServConfig::getSharedIconPath().'/'.$member['PICTURE'];
} }
$userList[] = [ $userList[] = [
i_entrance/j_icon_change.php
+1 -1
View File
@@ -65,7 +65,7 @@ if(!is_uploaded_file($image['tmp_name'])) {
while(true){ while(true){
$newPicName = dechex(rand(0x000000f,0xfffffff)).$newExt; $newPicName = dechex(rand(0x000000f,0xfffffff)).$newExt;
$dest = ROOT.'/d_pic/'.$newPicName; $dest = AppConf::getUserIconPathFS().$newPicName;
if(file_exists($dest)){ if(file_exists($dest)){
continue; continue;
} }
i_entrance/user_info.html
+17 -16
View File
@@ -1,22 +1,23 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>계정 관리</title> <title>계정 관리</title>
<!-- 스타일 --> <!-- 스타일 -->
<link type="text/css" rel="stylesheet" href='../d_shared/common.css'> <link type="text/css" rel="stylesheet" href='../d_shared/common.css'>
<link type="text/css" rel="stylesheet" href='../css/config.css'> <link type="text/css" rel="stylesheet" href='../css/config.css'>
<link type="text/css" rel="stylesheet" href='../css/user_info.css'> <link type="text/css" rel="stylesheet" href='../css/user_info.css'>
<!-- 액션 --> <!-- 액션 -->
<script type="text/javascript" src='../js/common.js'></script> <script src='../d_shared/common_path.js'></script>
<script type="text/javascript" src='../e_lib/jquery-3.2.1.min.js'></script> <script type="text/javascript" src='../js/common.js'></script>
<script type="text/javascript" src='../e_lib/sha512.min.js'></script> <script type="text/javascript" src='../e_lib/jquery-3.2.1.min.js'></script>
<script type="text/javascript" src='../js/func.js'></script> <script type="text/javascript" src='../e_lib/sha512.min.js'></script>
<script type="text/javascript" src='../js/user_info.js'></script> <script type="text/javascript" src='../js/func.js'></script>
</head> <script type="text/javascript" src='../js/user_info.js'></script>
</head>
<body> <body>
<div id="user_info_container"> <div id="user_info_container">
<table class="bg0" id="user_info_table"> <table class="bg0" id="user_info_table">
@@ -95,8 +96,8 @@
<tr> <tr>
<th class="bg1">전용<br>아이콘</th> <th class="bg1">전용<br>아이콘</th>
<td colspan="2" style="height:64px;"> <td colspan="2" style="height:64px;">
<img width="64px" height="64px" id="slot_icon" src="../../image/default.jpg"> <img width="64px" height="64px" id="slot_icon">
<img width="64px" height="64px" id="slot_new_icon" src="../../image/default.jpg"> <img width="64px" height="64px" id="slot_new_icon">
</td> </td>
<td colspan="3" style="position:relative;" > <td colspan="3" style="position:relative;" >
<form name="change_icon_form" id="change_icon_form" method="post" enctype="multipart/form-data"> <form name="change_icon_form" id="change_icon_form" method="post" enctype="multipart/form-data">
js/user_info.js
+1
View File
@@ -198,6 +198,7 @@ function deleteMe(){
} }
$(function(){ $(function(){
$('#slot_icon, #slot_new_icon').attr('src', pathConfig.sharedIcon+'/default.jpg');
$.ajax({ $.ajax({
type:'post', type:'post',
url:'j_get_user_info.php', url:'j_get_user_info.php',
src/sammo/Json.php
+1 -1
View File
@@ -9,7 +9,7 @@ class Json
public static function encode($value, $flag = 0) public static function encode($value, $flag = 0)
{ {
$rawFlag = JSON_UNESCAPED_UNICODE; $rawFlag = JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES;
if ($flag & static::PRETTY) { if ($flag & static::PRETTY) {
$rawFlag |= JSON_PRETTY_PRINT; $rawFlag |= JSON_PRETTY_PRINT;
} }
tmp_map/map.html
+2 -1
View File
@@ -5,12 +5,13 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<script src="../e_lib/jquery-3.2.1.min.js"></script> <script src="../e_lib/jquery-3.2.1.min.js"></script>
<script src="../d_shared/common_path.js"></script>
<script src="common.js"></script> <script src="common.js"></script>
<script src="base_map.js"></script> <script src="base_map.js"></script>
<script src="map.js"></script> <script src="map.js"></script>
<link href="../hwe/css/normalize.css" rel="stylesheet"> <link href="../hwe/css/normalize.css" rel="stylesheet">
<link href="../d_shared/common.css" rel="stylesheet"> <link href="../d_shared/common.css" rel="stylesheet">
<link href="../twe/css/common.css" rel="stylesheet"> <link href="../hwe/css/common.css" rel="stylesheet">
<link href="map.css" rel="stylesheet"> <link href="map.css" rel="stylesheet">
<script> <script>
tmp_map/map.js
+5 -5
View File
@@ -223,28 +223,28 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback, hrefTemplate)
if('color' in city && city.color !== null){ if('color' in city && city.color !== null){
var $bgObj = $('<div class="city_bg"></div>'); var $bgObj = $('<div class="city_bg"></div>');
$cityObj.append($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 = $('<a class="city_link"></a>'); var $linkObj = $('<a class="city_link"></a>');
$linkObj.data({'text':city.text,'nation':city.nation,'id':city.id}); $linkObj.data({'text':city.text,'nation':city.nation,'id':city.id});
$cityObj.append($linkObj); $cityObj.append($linkObj);
var $imgObj = $('<div class="city_img"><img src="/images/cast_{0}.gif"><div class="city_filler"></div></div>'.format(city.level)); var $imgObj = $('<div class="city_img"><img src="{0}/cast_{1}.gif"><div class="city_filler"></div></div>'.format(pathConfig.gameImage, city.level));
$linkObj.append($imgObj); $linkObj.append($imgObj);
if(city.state > 0){ if(city.state > 0){
var $stateObj = $('<div class="city_state"><img src="/images/event{0}.gif"></div>'.format(city.state)); var $stateObj = $('<div class="city_state"><img src="{0}/event{1}.gif"></div>'.format(pathConfig.gameImage, city.state));
$linkObj.append($stateObj); $linkObj.append($stateObj);
} }
if(city.nationId && city.nationId > 0){ if(city.nationId && city.nationId > 0){
var flagType = city.supply?'f':'d'; var flagType = city.supply?'f':'d';
var $flagObj = $('<div class="city_flag"><img src="/images/{0}{1}.gif"></div>'.format(flagType, convColorValue(city.color))); var $flagObj = $('<div class="city_flag"><img src="{0}/{1}{2}.gif"></div>'.format(pathConfig.gameImage, flagType, convColorValue(city.color)));
if(city.isCapital){ if(city.isCapital){
var $capitalObj = $('<div class="city_capital"><img src="/images/event51.gif"></div>'); var $capitalObj = $('<div class="city_capital"><img src="{0}/event51.gif"></div>'.format(pathConfig.gameImage));
$flagObj.append($capitalObj); $flagObj.append($capitalObj);
} }
$imgObj.append($flagObj); $imgObj.append($flagObj);
tmp_msg/add_msg_dummy.php
+1 -1
View File
@@ -1,5 +1,5 @@
<?php <?php
require('../twe/lib.php'); require('../hwe/lib.php');
$jsonPost = WebUtil::parseJsonPost(); $jsonPost = WebUtil::parseJsonPost();
tmp_msg/json_result.php
+3 -1
View File
@@ -1,5 +1,7 @@
<?php <?php
require('../twe/lib.php'); namespace sammo;
require('../hwe/lib.php');
/* /*
원래대로라면 json을 돌려주는게 맞지만 원래대로라면 json을 돌려주는게 맞지만
tmp_msg/msg.html
+5 -3
View File
@@ -5,10 +5,12 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<script src="../e_lib/jquery-3.2.1.min.js"></script> <script src="../e_lib/jquery-3.2.1.min.js"></script>
<script src="../twe/js/common.js"></script> <script src="../d_shared/common_path.js"></script>
<script src="../hwe/js/common.js"></script>
<script src="msg.js"></script> <script src="msg.js"></script>
<link href="../twe/css/normalize.css" rel="stylesheet"> <link href="../hwe/css/normalize.css" rel="stylesheet">
<link href="../twe/css/common.css" rel="stylesheet"> <link href="../d_shared/common.css" rel="stylesheet">
<link href="../hwe/css/common.css" rel="stylesheet">
<link href="msg.css" rel="stylesheet"> <link href="msg.css" rel="stylesheet">
<script> <script>
tmp_msg/msg.js
+1
View File
@@ -134,6 +134,7 @@ function redrawMsg(deferred){
} }
msg.msgType = msgType; msg.msgType = msgType;
msg.defaultIcon = pathConfig.sharedIcon+'/default.jpg';
var msgHtml = TemplateEngine(messageTemplate, msg); var msgHtml = TemplateEngine(messageTemplate, msg);
tmp_msg/prompt_dummy.php
+3 -1
View File
@@ -1,5 +1,7 @@
<?php <?php
require('../twe/lib.php'); namespace sammo;
require('../hwe/lib.php');
$jsonPost = WebUtil::parseJsonPost(); $jsonPost = WebUtil::parseJsonPost();
tmp_msg/tmp_template.html
+1 -1
View File
@@ -7,7 +7,7 @@
<%if(src.icon) { %> <%if(src.icon) { %>
<img src="<%encodeURI(src.icon)%>"> <img src="<%encodeURI(src.icon)%>">
<%} else {%> <%} else {%>
<img src="/image/default.jpg"> <img src="<%encodeURI(defaultIcon)%>">
<%}%> <%}%>
</div> </div>
<div class="msg_body"> <div class="msg_body">
vendor/composer/autoload_classmap.php
Vendored
+1
View File
@@ -17,4 +17,5 @@ return array(
'WhereClause' => $vendorDir . '/sergeytsalkov/meekrodb/db.class.php', 'WhereClause' => $vendorDir . '/sergeytsalkov/meekrodb/db.class.php',
'kakao\\KakaoKey' => $baseDir . '/d_setting/KakaoKey.php', 'kakao\\KakaoKey' => $baseDir . '/d_setting/KakaoKey.php',
'sammo\\RootDB' => $baseDir . '/d_setting/RootDB.php', 'sammo\\RootDB' => $baseDir . '/d_setting/RootDB.php',
'sammo\\ServConfig' => $baseDir . '/d_setting/ServConfig.php',
); );
vendor/composer/autoload_static.php
Vendored
+1
View File
@@ -126,6 +126,7 @@ class ComposerStaticInit67b09c83b85c3bc0027caefe5bba171a
'WhereClause' => __DIR__ . '/..' . '/sergeytsalkov/meekrodb/db.class.php', 'WhereClause' => __DIR__ . '/..' . '/sergeytsalkov/meekrodb/db.class.php',
'kakao\\KakaoKey' => __DIR__ . '/../..' . '/d_setting/KakaoKey.php', 'kakao\\KakaoKey' => __DIR__ . '/../..' . '/d_setting/KakaoKey.php',
'sammo\\RootDB' => __DIR__ . '/../..' . '/d_setting/RootDB.php', 'sammo\\RootDB' => __DIR__ . '/../..' . '/d_setting/RootDB.php',
'sammo\\ServConfig' => __DIR__ . '/../..' . '/d_setting/ServConfig.php',
); );
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)