Include vendor defined value if not defined

Remove excess includes; Vendor-ready x2 Dropped a \ Fix typo with in-line documentation More vendor readiness x2 x3 Whoops
Valgorithms · Aug 23, 2021 · 193ee80 · 193ee80
1 parent 6ca9f87
commit 193ee80
Show file tree

Hide file tree

Showing 26 changed files with 42 additions and 60 deletions.
diff --git a/channel_roles.php b/channel_roles.php
@@ -1,6 +1,4 @@
 <?php
-include_once 'custom_functions.php';
-
 $channelroles = array(
 	"Anime" => "📺",
     "Art" => "🖌️",

diff --git a/config.php b/config.php
@@ -11,7 +11,7 @@
 //Variables need to be reinitialized within the event listener by using the GLOBAL keyword (e.g. GLOBAL $bot_id;)
 
 $server_invite = "https://discord.com/oauth2/authorize?client_id=662093882795753482&scope=bot&permissions=8"; //Invite link to add this bot to the server
-$bot_id = "662093882795753482"; //id of this bot (change it to match your bot if not using Palace Bo#9203)
+$bot_id = "662093882795753482"; //id of this bot (change it to match your bot if not using Palace Bot#9203)
 
 //These are default options that should be set up before the bot is started for the first time. Any future changes need to be done with a chat command
 $react_option = true;

diff --git a/constants.php b/constants.php
@@ -1,4 +1,4 @@
 <?php
-$BASE_DIR = __DIR__ . "/../";
-$DIR = __DIR__ . "\\";
+$BASE_DIR = getcwd() . "/../";
+$DIR = getcwd() . "\\";
 $now = new DateTime();
diff --git a/custom_functions.php b/custom_functions.php
@@ -43,7 +43,7 @@ function CheckDir($foldername)
 {
     //echo "CheckDir" . PHP_EOL;
     include("constants.php");
-    $path = $DIR.$foldername."/";
+    $path = getcwd().$foldername."/";
     $exist = false;
     //Create folder if it doesn't already exist
     if (!file_exists($path)) {
@@ -63,7 +63,7 @@ function CheckFile($foldername, $filename)
     }  else $folder_symbol = "";
     //echo "CheckDir" . PHP_EOL;
     include("constants.php");
-    $path = $DIR.$foldername.$folder_symbol.$filename;
+    $path = getcwd().$foldername.$folder_symbol.$filename;
     //Create folder if it doesn't already exist
     if (file_exists($path)) {
         $exist = true;
@@ -74,15 +74,15 @@ function CheckFile($foldername, $filename)
 }
 
 //Saves a variable to a file
-//Target is a full path, IE $DIR.target.php
+//Target is a full path, IE getcwd().target.php
 function VarSave($foldername, $filename, $variable)
 {
     if ($foldername !== null) {
         $folder_symbol = "/";
     }  else $folder_symbol = "";
     //echo "VarSave" . PHP_EOL;
     include("constants.php");
-    $path = $DIR.$foldername.$folder_symbol; //echo "PATH: $path" . PHP_EOL;
+    $path = getcwd().$foldername.$folder_symbol; //echo "PATH: $path" . PHP_EOL;
     //Create folder if it doesn't already exist
     if (!file_exists($path)) {
         mkdir($path, 0777, true);
@@ -94,15 +94,15 @@ function VarSave($foldername, $filename, $variable)
 }
 
 //Loads a variable from a file
-//Target is a full path, IE $DIR.target.php
+//Target is a full path, IE getcwd().target.php
 function VarLoad($foldername, $filename)
 {
     if ($foldername !== null) {
         $folder_symbol = "/";
     }  else $folder_symbol = "";
     //echo "[VarLoad]" . PHP_EOL;
     include("constants.php");
-    $path = $DIR.$foldername.$folder_symbol; //echo "PATH: $path" . PHP_EOL;
+    $path = getcwd().$foldername.$folder_symbol; //echo "PATH: $path" . PHP_EOL;
     //Make sure the file exists
     if (!file_exists($path.$filename)) {
         return null;
@@ -120,7 +120,7 @@ function VarDelete($foldername, $filename)
     }  else $folder_symbol = "";
     echo "VarDelete" . PHP_EOL;
     include("constants.php");
-    $path = $DIR.$foldername.$folder_symbol.$filename; //echo "PATH: $path" . PHP_EOL;
+    $path = getcwd().$foldername.$folder_symbol.$filename; //echo "PATH: $path" . PHP_EOL;
     //Make sure the file exists first
     if (CheckFile($foldername, $filename)) {
         //Delete the file
@@ -345,7 +345,7 @@ function SetCooldown($foldername, $filename)
         $folder_symbol = "/";
     }  else $folder_symbol = "";
     include("constants.php");
-    $path = $DIR.$foldername.$folder_symbol; //echo "PATH: $path" . PHP_EOL;
+    $path = getcwd().$foldername.$folder_symbol; //echo "PATH: $path" . PHP_EOL;
     $now = new DateTime();
     VarSave($foldername, $filename, $now);
 }

diff --git a/custom_roles.php b/custom_roles.php
@@ -1,6 +1,4 @@
 <?php
-include_once 'custom_functions.php';
-
 $customroles = array(
     "Persistence" => "♾️",
     "Nomads" => "🛠️",

diff --git a/functions/guildbanadd-function.php b/functions/guildbanadd-function.php
@@ -24,15 +24,15 @@ function guildBanAdd($ban, $discord) {
 	}
 
 	//Load config variables for the guild
-	$guild_config_path = __DIR__  . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
+	$guild_config_path = getcwd()  . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
 	if (!include "$guild_config_path") {
 		echo "CONFIG CATCH!" . PHP_EOL;
 		$counter = $GLOBALS[$guild_id."_config_counter"] ?? 0;
 		if ($counter <= 10) {
 			$GLOBALS[$guild_id."_config_counter"]++;
 		} else {
 			$discord->guilds->leave($guild);
-			rmdir(__DIR__  . $guild_folder);
+			rmdir(getcwd()  . $guild_folder);
 			echo "[GUILD DIR REMOVED - BAN]" . PHP_EOL;
 		}
 	}

diff --git a/functions/guildbanremove-function.php b/functions/guildbanremove-function.php
@@ -24,15 +24,15 @@ function guildBanRemove($ban, $discord) {
 	}
 
 	//Load config variables for the guild
-	$guild_config_path = __DIR__  . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
+	$guild_config_path = getcwd()  . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
 	if (!include "$guild_config_path") {
 		echo "CONFIG CATCH!" . PHP_EOL;
 		$counter = $GLOBALS[$guild_id."_config_counter"] ?? 0;
 		if ($counter <= 10) {
 			$GLOBALS[$guild_id."_config_counter"]++;
 		} else {
 			$discord->guilds->leave($guild);
-			rmdir(__DIR__  . $guild_folder);
+			rmdir(getcwd()  . $guild_folder);
 			echo "[GUILD DIR REMOVED - BAN]" . PHP_EOL;
 		}
 	}

diff --git a/functions/guildmemberadd-function.php b/functions/guildmemberadd-function.php
@@ -41,7 +41,7 @@ function guildMemberAdd($guildmember, $discord) {
 
 	//Load config variables for the guild
 	$guild_folder = "\\guilds\\$author_guild_id";
-	$guild_config_path = __DIR__  . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
+	$guild_config_path = getcwd()  . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
 	include "$guild_config_path";
 	if ($welcome_log_channel_id) {
 		$welcome_log_channel = $guildmember->guild->channels->get('id', $welcome_log_channel_id);

diff --git a/functions/guildmemberremove-function.php b/functions/guildmemberremove-function.php
@@ -36,7 +36,7 @@ function guildMemberRemove($guildmember, $discord) {
 		$author_guild_id = $guildmember->guild->id;
 		//Load config variables for the guild
 		$guild_folder = "\\guilds\\$author_guild_id";
-		$guild_config_path = __DIR__  . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
+		$guild_config_path = getcwd()  . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
 		include "$guild_config_path";
 
 		try {

diff --git a/functions/guildmemberupdate-function.php b/functions/guildmemberupdate-function.php
@@ -87,7 +87,7 @@ function ($error) {
 	}
 
 	//Load config variables for the guild
-	$guild_config_path = __DIR__  . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
+	$guild_config_path = getcwd()  . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
 	if (!include "$guild_config_path") {
 		echo "CONFIG CATCH!" . PHP_EOL;
 		$counter = $GLOBALS[$author_guild_id."_config_counter"] ?? 0;
@@ -99,7 +99,7 @@ function ($error) {
 					var_dump($error->getMessage());
 				}
 			);
-			rmdir(__DIR__  . $guild_folder);
+			rmdir(getcwd()  . $guild_folder);
 			echo "GUILD DIR REMOVED" . PHP_EOL;
 		}
 	}

diff --git a/functions/message-function.php b/functions/message-function.php
@@ -121,7 +121,7 @@ function message($message, $discord, $loop, $token, $restcord, $stats, $twitch,
 		else $booster = false;
 
 		//Load config variables for the guild
-		$guild_config_path = __DIR__  . "\\$guild_folder\\guild_config.php";														//echo "guild_config_path: " . $guild_config_path . PHP_EOL;
+		$guild_config_path = getcwd()  . "\\$guild_folder\\guild_config.php";														//echo "guild_config_path: " . $guild_config_path . PHP_EOL;
 		if (!CheckFile($guild_folder, "guild_config.php")) {
 			$file = 'guild_config_template.php';
 			if (!copy($file, $guild_config_path)) {
@@ -151,7 +151,7 @@ function message($message, $discord, $loop, $token, $restcord, $stats, $twitch,
 		if ($tip_pending_channel_id) $tip_pending_channel = $author_guild->channels->get('id', strval($tip_pending_channel_id));
 		if ($tip_approved_channel_id) $tip_approved_channel = $author_guild->channels->get('id', strval($tip_approved_channel_id));
 
-		$guild_custom_roles_path = __DIR__  . "\\$guild_folder\\custom_roles.php";
+		$guild_custom_roles_path = getcwd()  . "\\$guild_folder\\custom_roles.php";
 		if (CheckFile($guild_folder."/", 'custom_roles.php')) {
 			include "$guild_custom_roles_path"; //Overwrite default custom_roles
 		}else{
@@ -361,7 +361,7 @@ function ($watcher_dmchannel) use ($message) {	//Promise
 	*/
 
 
-	include 'CHANGEME.php';
+	if(!(include getcwd() . 'CHANGEME.PHP')) include getcwd() . '/vendor/vzgcoders/palace/CHANGEME.php';
 	if ($author_id == $creator_id) $creator = true;
 
 	//echo '[TEST]' . __FILE__ . ':' . __LINE__ . PHP_EOL;
@@ -871,15 +871,15 @@ function ($watcher_dmchannel) use ($message) {	//Promise
 				return $message->delete();
 				break;
 			case 'updateconfig': //;updateconfig
-				$file = 'guild_config_template.php';
-				if (sha1_file($guild_config_path) == sha1_file('guild_config_template.php')) return $message->reply("Guild configuration is already up to date!");
+				$file = __DIR__ . 'guild_config_template.php';
+				if (sha1_file($guild_config_path) == sha1_file(__DIR__ . '\guild_config_template.php')) return $message->reply("Guild configuration is already up to date!");
 				else {
 					if (!copy($file, $guild_config_path)) return $message->reply("Failed to create guild_config file! Please contact <@116927250145869826> for assistance.");
 					else return $author_channel->sendMessage("The server's configuration file was recently updated by <@$author_id>. Please check the ;currentsetup");
 				}
 				break;
 			case 'clearconfig': //;clearconfig
-				$files = glob(__DIR__  . "$guild_folder" . '/*');
+				$files = glob(getcwd()  . "$guild_folder" . '/*');
 				// Deleting all the files in the list
 				foreach ($files as $file) {
 					if (is_file($file)) {
@@ -2006,10 +2006,10 @@ function ($error) {
 	if ($games) {
 		if ( is_null($games_channel_id) || ($author_channel_id == $games_channel_id) ) { //Commands that can only be used in the dedicated games channel
 			//yahtzee
-			include "yahtzee.php";
+			include '..\yahtzee.php';
 			//machi koro
-			//include_once (__DIR__ . "/machikoro/classes.php");
-			//include (__DIR__ . "/machikoro/game.php");
+			//include_once (getcwd() . "/machikoro/classes.php");
+			//include (getcwd() . "/machikoro/game.php");
 		}
 
 		/*Commands that can be used anywhere*/
@@ -3894,7 +3894,7 @@ function ($error) {
 			$rescue = VarLoad("_globals", "RESCUE.php"); //Check if recovering from a fatal crash
 			if ($rescue) { //Attempt to restore crashed session
 				echo "[RESCUE START]" . PHP_EOL;
-				$rescue_dir = __DIR__ . '/_globals';
+				$rescue_dir = getcwd() . '/_globals';
 				$rescue_vars = scandir($rescue_dir);
 				foreach ($rescue_vars as $var) {
 					$backup_var = VarLoad("_globals", "$var");

diff --git a/functions/messagedelete-function.php b/functions/messagedelete-function.php
@@ -13,7 +13,7 @@ function messageDelete($message, $discord) {
 
 		$guild = $discord->guilds->get('id', $guild_id);
 		$guild_folder = "\\guilds\\$guild_id";
-		$guild_config_path = __DIR__ . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
+		$guild_config_path = getcwd() . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
 		include "$guild_config_path";
 
 		if ($modlog_channel = $guild->channels->get('id', $modlog_channel_id)) $modlog_channel->sendMessage($content);
@@ -48,7 +48,7 @@ function messageDelete($message, $discord) {
 
 	//Load config variables for the guild
 	$guild_folder = "\\guilds\\$guild_id";
-	$guild_config_path = __DIR__ . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
+	$guild_config_path = getcwd() . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
 	include "$guild_config_path";
 
 	if ($author_channel_id == $modlog_channel_id) return; //Don't log deletion of messages in the log channel

diff --git a/functions/messagedeleteraw-function.php b/functions/messagedeleteraw-function.php
@@ -15,7 +15,7 @@ function messageDeleteRaw($channel, $message_id, $discord) {
 	$guild = $channel->guild ?? $discord->guilds->offsetGet($author_guild_id);
 	//Load config variables for the guild
 	$guild_folder = "\\guilds\\$author_guild_id";
-	$guild_config_path = __DIR__  . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
+	$guild_config_path = getcwd()  . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
 	include "$guild_config_path"; //$modlog_channel_id
 	$modlog_channel	= $guild->channels->get('id', $modlog_channel_id);
 	if($modlog_channel) $modlog_channel->sendEmbed($embed);

diff --git a/functions/messagereactionadd-function.php b/functions/messagereactionadd-function.php
@@ -57,13 +57,13 @@ function messageReactionAdd($reaction, $discord) {
 	$guild_folder = "\\guilds\\$author_guild_id";
 	CheckDir($guild_folder);
 	//Load config variables for the guild
-	$guild_config_path = __DIR__  . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
+	$guild_config_path = getcwd()  . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
 	include "$guild_config_path";
 
 	//Role picker stuff
 	$message_id	= $message->id;														//echo "message_id: " . $message_id . PHP_EOL;
 	global $gameroles, $species, $species2, $species3, $sexualities, $gender, $pronouns, $channelroles, $nsfwroles, $nsfwsubroles;
-	$guild_custom_roles_path = __DIR__  . "\\$guild_folder\\custom_roles.php";
+	$guild_custom_roles_path = getcwd()  . "\\$guild_folder\\custom_roles.php";
 	if (CheckFile($guild_folder."/", 'custom_roles.php')) {
 		include "$guild_custom_roles_path"; //Overwrite default custom_roles
 	}else global $customroles;

diff --git a/functions/messageupdate-function.php b/functions/messageupdate-function.php
@@ -42,7 +42,7 @@ function messageUpdate($message_new, $discord, $message_old) {
 	}
 
 	//Load config variables for the guild
-	$guild_config_path = __DIR__  . "\\$guild_folder\\guild_config.php";														//echo "guild_config_path: " . $guild_config_path . PHP_EOL;
+	$guild_config_path = getcwd()  . "\\$guild_folder\\guild_config.php";														//echo "guild_config_path: " . $guild_config_path . PHP_EOL;
 	if (!CheckFile($guild_folder, "guild_config.php")) {
 		$file = 'guild_config_template.php';
 		if (!copy($file, $guild_config_path)) {

diff --git a/functions/messageupdateraw-function.php b/functions/messageupdateraw-function.php
@@ -23,7 +23,7 @@ function messageUpdateRaw($channel, $data_array, $discord) {
 	$author_guild_id = $guild->id;
 	//Load config variables for the guild
 	$guild_folder = "\\guilds\\$author_guild_id";
-	$guild_config_path = __DIR__  . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
+	$guild_config_path = getcwd()  . "$guild_folder\\guild_config.php"; //echo "guild_config_path: " . $guild_config_path . PHP_EOL;
 	include "$guild_config_path";
 
 	$modlog_channel		= $guild->channels->get('id', $modlog_channel_id);

diff --git a/game_roles.php b/game_roles.php
@@ -1,6 +1,4 @@
 <?php
-include_once 'custom_functions.php';
-
 $gameroles = array(
 	"LFG" => "🔍",
 	"Call of Duty" => "🪖",

diff --git a/gender.php b/gender.php
@@ -1,6 +1,4 @@
 <?php
-include_once 'custom_functions.php';
-
 $gender = array(
     "gender Fluid" => "💧",
     "non Binary" => "⛔",

diff --git a/imagecreate_include.php b/imagecreate_include.php
@@ -36,7 +36,7 @@
 //Save the image
 
 $img_rand = rand(0, 99999999999); //Some big number to make the URLs unique because Discord caches image links
-$img_dir_path = __DIR__ . "\\";
+$img_dir_path = getcwd() . "\\";
 $cache_folder = "cache\\" . $author_id . "\\";
 CheckDir($cache_folder);
 $full_folder_path = $img_dir_path . $cache_folder; //echo "full_folder_path: " . $full_folder_path . PHP_EOL;

diff --git a/nsfw_role.php b/nsfw_role.php
@@ -1,6 +1,4 @@
 <?php
-include_once 'custom_functions.php';
-
 $nsfwroles = array(
     "18+" => "🍆"
 );

diff --git a/nsfw_subroles.php b/nsfw_subroles.php
@@ -1,6 +1,4 @@
 <?php
-include_once 'custom_functions.php';
-
 $nsfwsubroles = array(
     "Placeholder" => "🖌️"
 );

diff --git a/pronouns.php b/pronouns.php
@@ -1,6 +1,4 @@
 <?php
-include_once 'custom_functions.php';
-
 $pronouns = array(
     "They/Them" => "1️⃣",
     "She/Her" => "2️⃣",

diff --git a/run.php b/run.php
@@ -10,7 +10,7 @@
 //Always subtract 1 when counting roles because everyone has an @everyone role
 $vm = false; //Set this to true if using a VM that can be paused
 
-include __DIR__ . '/vendor/autoload.php';
+include getcwd() . '/vendor/autoload.php';
 define('MAIN_INCLUDED', 1); //Token and SQL credential files are protected, this must be defined to access
 ini_set('memory_limit', '-1'); //Unlimited memory usage
 //use RestCord\DiscordClient;
@@ -54,7 +54,7 @@ function execInBackground($cmd) {
 include_once 'functions/guildmemberupdate-function.php'; //guildMemberUpdate()
 
 
-require __DIR__.'/../token.php';
+require getcwd().'/../token.php';
 $logger = new Monolog\Logger('New logger');
 $logger->pushHandler(new Monolog\Handler\StreamHandler('php://stdout'));
 $loop = React\EventLoop\Factory::create();
@@ -416,7 +416,7 @@ function ($user) {
 $GLOBALS['presenceupdate'] = false;
 if ($rescue == true) { //Attempt to restore crashed session
     echo "[RESCUE START]" . PHP_EOL;
-    $rescue_dir = __DIR__ . '/_globals';
+    $rescue_dir = getcwd() . '/_globals';
     $rescue_vars = scandir($rescue_dir);
     foreach ($rescue_vars as $var) {
         $backup_var = VarLoad("_globals", "$var");
@@ -672,7 +672,7 @@ function ($user) {
 
     echo "RESTARTING BOT" . PHP_EOL;
     $discord->destroy();
-    $restart_cmd = 'cmd /c "'. __DIR__ . '\run.bat"'; //echo $restart_cmd . PHP_EOL;
+    $restart_cmd = 'cmd /c "'. getcwd() . '\run.bat"'; //echo $restart_cmd . PHP_EOL;
     //system($restart_cmd);
     execInBackground($restart_cmd);
     die();

diff --git a/sexualities.php b/sexualities.php
@@ -1,6 +1,4 @@
 <?php
-include_once 'custom_functions.php';
-
 $sexualities = array(
     "straight" => "👩‍❤️‍💋‍👨",
     "questioning Sexuality" => "❓",

diff --git a/species.php b/species.php
@@ -1,6 +1,4 @@
 <?php
-include_once 'custom_functions.php';
-
 $species = array(
     "aquatic" => "🐟", //:fish:
     "avian" => "🐦", //:bird: