From 0bda3daa800c5bc9a25fb482e3c851e1d62d8888 Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Mon, 27 Jul 2020 17:03:58 -0700
Subject: [PATCH] Update include paths and merge config.inc.php

---
 lib/ntbb-database.lib.php         | 2 +-
 website/ladder.php                | 4 ++--
 website/lib/ntbb-database.lib.php | 2 +-
 website/news/manage.php           | 6 +++---
 website/resetpassword.php         | 2 +-
 website/servers.php               | 2 +-
 website/usermodlog.php            | 4 ++--
 website/users.php                 | 6 +++---
 website/usersearch.php            | 6 +++---
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/ntbb-database.lib.php b/lib/ntbb-database.lib.php
index aed9a54db..e7ee52f58 100644
--- a/lib/ntbb-database.lib.php
+++ b/lib/ntbb-database.lib.php
@@ -1,6 +1,6 @@
 <?php
 
-include_once dirname(__FILE__).'/../config/config.inc.php';
+include_once __DIR__ . '/../config/config.inc.php';
 
 class PSDatabase {
 	var $db = null;
diff --git a/website/ladder.php b/website/ladder.php
index ecf13e1b1..1da968ab7 100644
--- a/website/ladder.php
+++ b/website/ladder.php
@@ -4,8 +4,8 @@ error_reporting(E_ALL);
 ini_set('display_errors', TRUE);
 ini_set('display_startup_errors', TRUE);
 
-include '../play.pokemonshowdown.com/lib/ntbb-session.lib.php';
-include '../play.pokemonshowdown.com/lib/ntbb-ladder.lib.php';
+include '../lib/ntbb-session.lib.php';
+include '../lib/ntbb-ladder.lib.php';
 include 'lib/panels.lib.php';
 
 $formatid = '';
diff --git a/website/lib/ntbb-database.lib.php b/website/lib/ntbb-database.lib.php
index 7fc67441d..cd2db799b 100644
--- a/website/lib/ntbb-database.lib.php
+++ b/website/lib/ntbb-database.lib.php
@@ -3,7 +3,7 @@
 //debug_print_backtrace();
 //die();
 
-include_once dirname(__FILE__).'/../config/config.inc.php';
+include_once __DIR__ . '/../../config/config.inc.php';
 
 class NTBBDatabase {
 	var $db = null;
diff --git a/website/news/manage.php b/website/news/manage.php
index 552b66d9e..5657c2b4d 100644
--- a/website/news/manage.php
+++ b/website/news/manage.php
@@ -2,7 +2,7 @@
 
 error_reporting(E_ALL);
 
-include_once '../../play.pokemonshowdown.com/lib/ntbb-session.lib.php';
+include_once '../../lib/ntbb-session.lib.php';
 include_once __DIR__ . '/../../config/news.inc.php';
 include_once 'include.php';
 
@@ -17,7 +17,7 @@ $newsCache = '.var_export($GLOBALS['newsCache'], true).';
 ');
 
 	date_default_timezone_set('America/Los_Angeles');
-	$indexData = file_get_contents('../../play.pokemonshowdown.com/index.html');
+	$indexData = file_get_contents('../../index.html');
 	$indexData = preg_replace('/					<div class="pm-log" style="max-height:none">
 						.*?
 					<\/div>
@@ -26,7 +26,7 @@ $newsCache = '.var_export($GLOBALS['newsCache'], true).';
 					</div>
 ', $indexData, 1);
 	$indexData = preg_replace('/ data-newsid="[^"]*">/', ' data-newsid="'.getNewsId().'">', $indexData, 1);
-	file_put_contents('../../play.pokemonshowdown.com/index.html', $indexData);
+	file_put_contents('../../index.html', $indexData);
 }
 
 include '../style/wrapper.inc.php';
diff --git a/website/resetpassword.php b/website/resetpassword.php
index 1ca7a4425..24ea7d36a 100644
--- a/website/resetpassword.php
+++ b/website/resetpassword.php
@@ -1,7 +1,7 @@
 <?php
 
 include 'style/wrapper.inc.php';
-include '../play.pokemonshowdown.com/lib/ntbb-session.lib.php';
+include '../lib/ntbb-session.lib.php';
 
 $page = 'resetpassword';
 $pageTitle = "Reset Password";
diff --git a/website/servers.php b/website/servers.php
index a154ea712..368e405d0 100644
--- a/website/servers.php
+++ b/website/servers.php
@@ -1,7 +1,7 @@
 <?php
 
 include_once __DIR__ . '/../config/servers.inc.php';
-include_once '../play.pokemonshowdown.com/lib/ntbb-session.lib.php';
+include_once '../lib/ntbb-session.lib.php';
 include 'style/wrapper.inc.php';
 
 $id = '';
diff --git a/website/usermodlog.php b/website/usermodlog.php
index 18a450950..a8bc4ce66 100644
--- a/website/usermodlog.php
+++ b/website/usermodlog.php
@@ -4,8 +4,8 @@ error_reporting(E_ALL);
 ini_set('display_errors', TRUE);
 ini_set('display_startup_errors', TRUE);
 
-include '../play.pokemonshowdown.com/lib/ntbb-session.lib.php';
-include '../play.pokemonshowdown.com/lib/ntbb-ladder.lib.php';
+include '../lib/ntbb-session.lib.php';
+include '../lib/ntbb-ladder.lib.php';
 include 'lib/panels.lib.php';
 
 $lowerstaff = $curuser['group'] == 4 || $curuser['group'] == 5;
diff --git a/website/users.php b/website/users.php
index 908fddbf2..81c3ac94b 100644
--- a/website/users.php
+++ b/website/users.php
@@ -4,7 +4,7 @@ error_reporting(E_ALL);
 ini_set('display_errors', TRUE);
 ini_set('display_startup_errors', TRUE);
 
-include_once 'config/config.inc.php';
+include_once __DIR__ . '/../config/config.inc.php';
 
 $ntbb_groups = array(
 	array(
@@ -38,8 +38,8 @@ $ntbb_groups = array(
 );
 $STANDINGS = $psconfig['standings'];
 
-include '../play.pokemonshowdown.com/lib/ntbb-session.lib.php';
-include '../play.pokemonshowdown.com/lib/ntbb-ladder.lib.php';
+include '../lib/ntbb-session.lib.php';
+include '../lib/ntbb-ladder.lib.php';
 include 'lib/panels.lib.php';
 
 $authLevel = 0;
diff --git a/website/usersearch.php b/website/usersearch.php
index d38f7a336..8d20d5c68 100644
--- a/website/usersearch.php
+++ b/website/usersearch.php
@@ -4,11 +4,11 @@ error_reporting(E_ALL);
 ini_set('display_errors', TRUE);
 ini_set('display_startup_errors', TRUE);
 
-include '../play.pokemonshowdown.com/lib/ntbb-session.lib.php';
-include '../play.pokemonshowdown.com/lib/ntbb-ladder.lib.php';
+include '../lib/ntbb-session.lib.php';
+include '../lib/ntbb-ladder.lib.php';
 include 'lib/panels.lib.php';
 
-include_once 'config/config.inc.php';
+include_once __DIR__ . '/../config/config.inc.php';
 
 $userid = false;
 $user = false;