From 75099a5fb8b2973f86cb3e8cdfa872e3b447c923 Mon Sep 17 00:00:00 2001
From: root <root@test.selfmade.ninja>
Date: Thu, 21 Apr 2022 15:13:50 +0000
Subject: [PATCH] base path
---
_templates/_head.php | 6 +++---
_templates/_signup.php | 2 +-
index.php | 2 +-
libs/load.php | 5 +++--
login.php | 3 +--
signup.php | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/_templates/_head.php b/_templates/_head.php
index d2f3905b..96f67250 100644
--- a/_templates/_head.php
+++ b/_templates/_head.php
@@ -7,10 +7,10 @@
<title>Login to Photogram</title>
<!-- Bootstrap core CSS -->
- <link href="/photogram/assets/dist/css/bootstrap.min.css" rel="stylesheet">
+ <link href="<?=get_config('base_path')?>assets/dist/css/bootstrap.min.css" rel="stylesheet">
<title>Photogram by LAHTP</title>
- <? if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/photogram/css/' . basename($_SERVER['PHP_SELF'], ".php") . ".css")) { ?>
- <link href="/photogram/css/<?= basename($_SERVER['PHP_SELF'], ".php") ?>.css" rel="stylesheet">
+ <? if (file_exists($_SERVER['DOCUMENT_ROOT'] .get_config('base_path').'css/' . basename($_SERVER['PHP_SELF'], ".php") . ".css")) { ?>
+ <link href="<?=get_config('base_path')?>css/<?= basename($_SERVER['PHP_SELF'], ".php") ?>.css" rel="stylesheet">
<? } ?>
</head>
\ No newline at end of file
diff --git a/_templates/_signup.php b/_templates/_signup.php
index 0ee4d37d..59a99112 100644
--- a/_templates/_signup.php
+++ b/_templates/_signup.php
@@ -18,7 +18,7 @@ if ($signup) {
<main class="container">
<div class="bg-light p-5 rounded mt-3">
<h1>Signup Success</h1>
- <p class="lead">Now you can login from <a href="/photogram/login.php">here</a>.</p>
+ <p class="lead">Now you can login from <a href="<?=get_config('base_path')?>login.php">here</a>.</p>
</div>
</main>
diff --git a/index.php b/index.php
index fa137133..90c913e1 100644
--- a/index.php
+++ b/index.php
@@ -19,7 +19,7 @@ include 'libs/load.php';
</main>
<? load_template('_footer'); ?>
- <script src="/photogram/assets/dist/js/bootstrap.bundle.min.js"></script>
+ <script src="<?=get_config('base_path')?>assets/dist/js/bootstrap.bundle.min.js"></script>
</body>
diff --git a/libs/load.php b/libs/load.php
index 57130c16..624935ef 100644
--- a/libs/load.php
+++ b/libs/load.php
@@ -6,9 +6,10 @@ include_once 'includes/Database.class.php';
include_once 'includes/UserSession.class.php';
global $__site_config;
+// global $__base_path;
//Note: Change this path if you run this code outside lab.
$__site_config = file_get_contents($_SERVER['DOCUMENT_ROOT'].'/../photogramconfig.json');
-
+// $__base_path = get_config('base_path');
Session::start();
function get_config($key, $default=null)
@@ -24,7 +25,7 @@ function get_config($key, $default=null)
function load_template($name)
{
- include $_SERVER['DOCUMENT_ROOT'] . "/photogram/_templates/$name.php"; //not consistant.
+ include $_SERVER['DOCUMENT_ROOT'] . get_config('base_path'). "_templates/$name.php"; //not consistant.
}
function validate_credentials($username, $password)
diff --git a/login.php b/login.php
index dbcdb2b3..43ed7dec 100644
--- a/login.php
+++ b/login.php
@@ -1,5 +1,4 @@
<?php
-
include 'libs/load.php';
?>
@@ -17,7 +16,7 @@ include 'libs/load.php';
</main>
<? load_template('_footer'); ?>
- <script src="/photogram/assets/dist/js/bootstrap.bundle.min.js"></script>
+ <script src="<?=get_config('base_path')?>assets/dist/js/bootstrap.bundle.min.js"></script>
</body>
diff --git a/signup.php b/signup.php
index 3f9c105a..6f66ee75 100644
--- a/signup.php
+++ b/signup.php
@@ -17,7 +17,7 @@ include 'libs/load.php';
</main>
<? load_template('_footer'); ?>
- <script src="/photogram/assets/dist/js/bootstrap.bundle.min.js"></script>
+ <script src="<?=get_config('base_path')?>assets/dist/js/bootstrap.bundle.min.js"></script>
</body>
--
GitLab