From 99943002b57f8fd1149d9ee1dc26e44b41b3b301 Mon Sep 17 00:00:00 2001
From: Gea-Suan Lin <gslin@gslin.org>
Date: Wed, 31 Jul 2019 14:08:53 +0800
Subject: [PATCH 1/3] Use __DIR__ to avoid include_path dependency.

---
 www/account_manager/index.php | 6 +++---
 www/change_password/index.php | 4 ++--
 www/index.php                 | 2 +-
 www/log_in/index.php          | 4 ++--
 www/log_out/index.php         | 2 +-
 www/setup/index.php           | 4 ++--
 www/setup/run_checks.php      | 6 +++---
 www/setup/setup_ldap.php      | 6 +++---
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/www/account_manager/index.php b/www/account_manager/index.php
index 42ab836..b1ccb04 100644
--- a/www/account_manager/index.php
+++ b/www/account_manager/index.php
@@ -1,8 +1,8 @@
 <?php
 
-include_once("web_functions.inc.php");
-include_once("ldap_functions.inc.php");
-include_once("module_functions.inc.php");
+include_once __DIR__ . "/../includes/web_functions.inc.php";
+include_once __DIR__ . "/../includes/ldap_functions.inc.php";
+include_once __DIR__ . "/../includes/module_functions.inc.php";
 set_page_access("admin");
 
 render_header("LDAP manager");
diff --git a/www/change_password/index.php b/www/change_password/index.php
index 9c84bd3..c4ab7c4 100644
--- a/www/change_password/index.php
+++ b/www/change_password/index.php
@@ -1,7 +1,7 @@
 <?php
 
-include_once("web_functions.inc.php");
-include_once("ldap_functions.inc.php");
+include_once __DIR__ . "/web_functions.inc.php";
+include_once __DIR__ . "/ldap_functions.inc.php";
 
 set_page_access("user");
 
diff --git a/www/index.php b/www/index.php
index e3156e0..bd8944b 100644
--- a/www/index.php
+++ b/www/index.php
@@ -1,6 +1,6 @@
 <?php
 
-include_once("web_functions.inc.php");
+include_once __DIR__ . "/includes/web_functions.inc.php";
 render_header();
 
  if (isset($_GET['logged_out'])) {
diff --git a/www/log_in/index.php b/www/log_in/index.php
index 3e310d8..b707358 100644
--- a/www/log_in/index.php
+++ b/www/log_in/index.php
@@ -1,7 +1,7 @@
 <?php
 
-include("web_functions.inc.php");
-include("ldap_functions.inc.php");
+include __DIR__ . "/web_functions.inc.php";
+include __DIR__ . "/ldap_functions.inc.php";
 
 if (isset($_POST["user_id"]) and isset($_POST["password"])) {
 
diff --git a/www/log_out/index.php b/www/log_out/index.php
index 9624e9a..8b9e839 100644
--- a/www/log_out/index.php
+++ b/www/log_out/index.php
@@ -1,4 +1,4 @@
 <?php
-include("web_functions.inc.php");
+include __DIR__ . "/../includes/web_functions.inc.php";
 log_out();
 ?>
diff --git a/www/setup/index.php b/www/setup/index.php
index 2d7c9ef..ae115aa 100644
--- a/www/setup/index.php
+++ b/www/setup/index.php
@@ -1,7 +1,7 @@
 <?php
 
-include("web_functions.inc.php");
-include("ldap_functions.inc.php");
+include __DIR__ . "/../includes/web_functions.inc.php";
+include __DIR__ . "/../includes/ldap_functions.inc.php";
 
 if (isset($_POST["admin_password"])) {
 
diff --git a/www/setup/run_checks.php b/www/setup/run_checks.php
index 4474c7c..7ff8850 100644
--- a/www/setup/run_checks.php
+++ b/www/setup/run_checks.php
@@ -1,8 +1,8 @@
 <?php 
 
-include_once("web_functions.inc.php");
-include_once("ldap_functions.inc.php");
-include_once("module_functions.inc.php");
+include_once __DIR__ . "/../includes/web_functions.inc.php";
+include_once __DIR__ . "/../includes/ldap_functions.inc.php";
+include_once __DIR__ . "/../includes/module_functions.inc.php";
 
 validate_setup_cookie();
 set_page_access("setup");
diff --git a/www/setup/setup_ldap.php b/www/setup/setup_ldap.php
index 5a2b829..0bc38b5 100644
--- a/www/setup/setup_ldap.php
+++ b/www/setup/setup_ldap.php
@@ -1,8 +1,8 @@
 <?php
 
-include_once("web_functions.inc.php");
-include_once("ldap_functions.inc.php");
-include_once("module_functions.inc.php");
+include_once __DIR__ . "/../includes/web_functions.inc.php";
+include_once __DIR__ . "/../includes/ldap_functions.inc.php";
+include_once __DIR__ . "/../includes/module_functions.inc.php";
 
 validate_setup_cookie();
 set_page_access("setup");

From b82d0c24b9b4700d6bc7446a85f1d679e0de4431 Mon Sep 17 00:00:00 2001
From: Gea-Suan Lin <gslin@gslin.org>
Date: Wed, 31 Jul 2019 14:22:37 +0800
Subject: [PATCH 2/3] Fix all include_once() call with `__DIR__`-based paths.

---
 www/account_manager/groups.php     | 6 +++---
 www/account_manager/new_user.php   | 6 +++---
 www/account_manager/show_group.php | 6 +++---
 www/account_manager/show_user.php  | 6 +++---
 www/change_password/index.php      | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/www/account_manager/groups.php b/www/account_manager/groups.php
index d9f5bfc..3d4671f 100644
--- a/www/account_manager/groups.php
+++ b/www/account_manager/groups.php
@@ -1,8 +1,8 @@
 <?php
 
-include_once("web_functions.inc.php");
-include_once("ldap_functions.inc.php");
-include_once("module_functions.inc.php");
+include_once __DIR__ . "/../includes/web_functions.inc.php";
+include_once __DIR__ . "/../includes/ldap_functions.inc.php";
+include_once __DIR__ . "/../includes/module_functions.inc.php";
 set_page_access("admin");
 
 render_header("LDAP manager");
diff --git a/www/account_manager/new_user.php b/www/account_manager/new_user.php
index fa4ee52..3160132 100644
--- a/www/account_manager/new_user.php
+++ b/www/account_manager/new_user.php
@@ -1,8 +1,8 @@
 <?php
 
-include_once("web_functions.inc.php");
-include_once("ldap_functions.inc.php");
-include_once("module_functions.inc.php");
+include_once __DIR__ . "/../includes/web_functions.inc.php";
+include_once __DIR__ . "/../includes/ldap_functions.inc.php";
+include_once __DIR__ . "/../includes/module_functions.inc.php";
 
 if ( $_POST['setup_admin_account'] ) {
  $admin_setup = TRUE;
diff --git a/www/account_manager/show_group.php b/www/account_manager/show_group.php
index 78a1b58..0a0266a 100644
--- a/www/account_manager/show_group.php
+++ b/www/account_manager/show_group.php
@@ -1,8 +1,8 @@
 <?php
 
-include_once("web_functions.inc.php");
-include_once("ldap_functions.inc.php");
-include_once("module_functions.inc.php");
+include_once __DIR__ . "/../includes/web_functions.inc.php";
+include_once __DIR__ . "/../includes/ldap_functions.inc.php";
+include_once __DIR__ . "/../includes/module_functions.inc.php";
 set_page_access("admin");
 
 render_header("LDAP manager");
diff --git a/www/account_manager/show_user.php b/www/account_manager/show_user.php
index c81f465..6d94850 100644
--- a/www/account_manager/show_user.php
+++ b/www/account_manager/show_user.php
@@ -1,8 +1,8 @@
 <?php
 
-include_once("web_functions.inc.php");
-include_once("ldap_functions.inc.php");
-include_once("module_functions.inc.php");
+include_once __DIR__ . "/../includes/web_functions.inc.php";
+include_once __DIR__ . "/../includes/ldap_functions.inc.php";
+include_once __DIR__ . "/../includes/module_functions.inc.php";
 set_page_access("admin");
 
 render_header();
diff --git a/www/change_password/index.php b/www/change_password/index.php
index c4ab7c4..f41901e 100644
--- a/www/change_password/index.php
+++ b/www/change_password/index.php
@@ -1,7 +1,7 @@
 <?php
 
-include_once __DIR__ . "/web_functions.inc.php";
-include_once __DIR__ . "/ldap_functions.inc.php";
+include_once __DIR__ . "/../includes/web_functions.inc.php";
+include_once __DIR__ . "/../includes/ldap_functions.inc.php";
 
 set_page_access("user");
 

From 9e0aaac0087791c7d705480afca59d961c49175d Mon Sep 17 00:00:00 2001
From: Gea-Suan Lin <gslin@gslin.org>
Date: Wed, 31 Jul 2019 14:30:23 +0800
Subject: [PATCH 3/3] Add missing paths.

---
 www/log_in/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/log_in/index.php b/www/log_in/index.php
index b707358..d1cb154 100644
--- a/www/log_in/index.php
+++ b/www/log_in/index.php
@@ -1,7 +1,7 @@
 <?php
 
-include __DIR__ . "/web_functions.inc.php";
-include __DIR__ . "/ldap_functions.inc.php";
+include __DIR__ . "/../includes/web_functions.inc.php";
+include __DIR__ . "/../includes/ldap_functions.inc.php";
 
 if (isset($_POST["user_id"]) and isset($_POST["password"])) {