change link for login in footer fc2blog#269

uzulla · Apr 16, 2021 · b7a4a26 · b7a4a26
1 parent 1ee648c
commit b7a4a26
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git 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
@@ -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
@@ -299,7 +299,7 @@ function submit(){
 
   <div id="footer">
     <div class="footer_menu">
-      <a href="<%server_url><%blog_id>/admin.php"><%template_login></a>
+      <a href="<%server_url>admin/"><%template_login></a>
       <a href="mailto:@?subject=FC2%E3%83%96%E3%83%AD%E3%82%B0&body=<%url>"><%template_tell_friend></a>
     </div>
     <p class="copyright">Copyright (c) <%blog_name></p>

diff --git a/app/templates/skeleton/fc2_skeleton_template_sp.php b/app/templates/skeleton/fc2_skeleton_template_sp.php
@@ -313,7 +313,7 @@
 <ul>
     <li><a href="<%url>">ホーム</a></li>
     <li><a href="#header">ページトップ</a></li>
-    <li><a href="<%server_url><%blog_id>/admin.php">ログイン</a></li>
+    <li><a href="<%server_url>admin/">ログイン</a></li>
 </ul>
 
 </body>

diff --git a/tests/test_fixture.sql b/tests/test_fixture.sql