diff --git a/app/src/Web/Html.php b/app/src/Web/Html.php index e37a61ef..9442f8ca 100644 --- a/app/src/Web/Html.php +++ b/app/src/Web/Html.php @@ -246,8 +246,9 @@ public static function input(Request $request, $name, $type, $attrs = array(), $ public static function getServerUrl(Request $request): string { - $url = (isset($request->server["HTTPS"]) && $request->server["HTTPS"] === "on") ? 'http://' : 'https://'; + $url = $request->isHttps() ? 'https://' : 'http://'; $url .= Config::get('DOMAIN'); + $url .= $request->isHttps() ? Config::get('HTTPS_PORT_STR') : Config::get('HTTP_PORT_STR'); return $url; } } diff --git a/app/src/Web/Request.php b/app/src/Web/Request.php index 6f73bcd9..399e2d58 100644 --- a/app/src/Web/Request.php +++ b/app/src/Web/Request.php @@ -434,4 +434,9 @@ public function getBlogId(): ?string return null; } } + + public function isHttps(): bool + { + return isset($this->server["HTTPS"]) && $this->server["HTTPS"] === "on"; + } } diff --git a/app/templates/default/fc2_default_template_sp.php b/app/templates/default/fc2_default_template_sp.php index ea1ba814..3fbcfd2c 100644 --- a/app/templates/default/fc2_default_template_sp.php +++ b/app/templates/default/fc2_default_template_sp.php @@ -299,7 +299,7 @@ function submit(){