fix: Uri 기본 사용 방법 변경
This commit is contained in:
@@ -53,7 +53,7 @@ foreach (ServConfig::getServerList() as $setting) {
|
|||||||
<title>삼국지 모의전투 HiDCHe</title>
|
<title>삼국지 모의전투 HiDCHe</title>
|
||||||
<script>
|
<script>
|
||||||
var kakao_oauth_client_id = '<?= KakaoKey::REST_KEY ?>';
|
var kakao_oauth_client_id = '<?= KakaoKey::REST_KEY ?>';
|
||||||
var kakao_oauth_redirect_uri = '<?= WebUtil::replaceDomain(KakaoKey::REDIRECT_URI, $_SERVER['HTTP_HOST']) ?>';
|
var kakao_oauth_redirect_uri = '<?= WebUtil::replaceDomain(KakaoKey::REDIRECT_URI) ?>';
|
||||||
</script>
|
</script>
|
||||||
<?= WebUtil::printJS('d_shared/common_path.js') ?>
|
<?= WebUtil::printJS('d_shared/common_path.js') ?>
|
||||||
<?= WebUtil::printCSS('d_shared/common.css') ?>
|
<?= WebUtil::printCSS('d_shared/common.css') ?>
|
||||||
|
|||||||
@@ -85,7 +85,10 @@ class Kakao_REST_API_Helper
|
|||||||
}
|
}
|
||||||
|
|
||||||
if($changeRedirectDomain && key_exists('HTTP_HOST', $_SERVER)){
|
if($changeRedirectDomain && key_exists('HTTP_HOST', $_SERVER)){
|
||||||
$uriObj = Uri::createFromBaseUri(KakaoKey::REDIRECT_URI, $_SERVER['HTTP_HOST']);
|
$uriObj = Uri::createFromBaseUri(
|
||||||
|
KakaoKey::REDIRECT_URI,
|
||||||
|
Uri::createFromServer($_SERVER)
|
||||||
|
);
|
||||||
$this->REDIRECT_URI = (string)$uriObj;
|
$this->REDIRECT_URI = (string)$uriObj;
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
|
|||||||
@@ -337,8 +337,11 @@ class WebUtil
|
|||||||
return join("\n", $result);
|
return join("\n", $result);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function replaceDomain(string $origPath, string $newDomain): string{
|
public static function replaceDomain(string $origPath): string{
|
||||||
$upath = Uri::createFromBaseUri($origPath, $newDomain);
|
$upath = Uri::createFromBaseUri(
|
||||||
|
$origPath,
|
||||||
|
Uri::createFromServer($_SERVER)
|
||||||
|
);
|
||||||
return (string)$upath;
|
return (string)$upath;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user