diff --git a/serverquery/cron.php b/serverquery/cron.php index bc5cec5..e228f86 100644 --- a/serverquery/cron.php +++ b/serverquery/cron.php @@ -24,8 +24,8 @@ * THE SOFTWARE. */ -require __DIR__ . '/config.php'; -require __DIR__ . '/lib/ServerQuery.class.php'; +require dirname(__FILE__) . '/config.php'; +require dirname(__FILE__) . '/lib/ServerQuery.class.php'; $sleepTime = SQ_Config::CACHE_TIME; diff --git a/serverquery/lib/ServerQuery.class.php b/serverquery/lib/ServerQuery.class.php index ff9cf7c..3797b38 100644 --- a/serverquery/lib/ServerQuery.class.php +++ b/serverquery/lib/ServerQuery.class.php @@ -24,7 +24,7 @@ * THE SOFTWARE. */ -require __DIR__ . '/Gameserver.class.php'; +require dirname(__FILE__) . '/Gameserver.class.php'; /** * Main application class @@ -59,7 +59,7 @@ class SQ_ServerQuery { */ public function __construct() { if(SQ_Config::CACHE_ENABLE) { - $dir = __DIR__ . '/../cache'; + $dir = dirname(__FILE__) . '/../cache'; $this->useCache = is_dir($dir) && is_writable($dir); $this->cronMode = $this->useCache && SQ_Config::CRON_MODE; } @@ -143,7 +143,7 @@ private function getServerObject(array $server, $update = true) { private static function initServerObject(array $server) { $className = 'SQ_Game_' . SQ_Config::$games[$server['game']]['class']; if(!class_exists($className)) { - $fileName = __DIR__ . '/games/'; + $fileName = dirname(__FILE__) . '/games/'; $fileName .= substr($className, strrpos($className, '_') + 1); $fileName .= '.class.php'; require $fileName; @@ -210,7 +210,7 @@ private static function updateCache(SQ_Gameserver $server) { * @return string */ private static function getCacheFileName(SQ_Gameserver $server) { - $fileName = __DIR__ . '/../cache/'; + $fileName = dirname(__FILE__) . '/../cache/'; $fileName .= $server->getGameId() . '_'; $fileName .= str_replace(':', '_', $server->getAddress()); $fileName .= '.dat'; diff --git a/serverquery/lib/games/Minecraft.class.php b/serverquery/lib/games/Minecraft.class.php index 0facc45..35f511e 100644 --- a/serverquery/lib/games/Minecraft.class.php +++ b/serverquery/lib/games/Minecraft.class.php @@ -56,17 +56,17 @@ public function setName($name) { protected function query($timeout) { if($this->config['useLegacy']) { if(!class_exists('SQ_MinecraftLegacy')) { - require __DIR__ . '/inc/MinecraftLegacy.class.php'; + require dirname(__FILE__) . '/inc/MinecraftLegacy.class.php'; } $obj = new SQ_MinecraftLegacy($this); } elseif($this->config['useQuery']) { if(!class_exists('SQ_MinecraftQuery')) { - require __DIR__ . '/inc/MinecraftQuery.class.php'; + require dirname(__FILE__) . '/inc/MinecraftQuery.class.php'; } $obj = new SQ_MinecraftQuery($this, $this->config['queryPort']); } else { if(!class_exists('SQ_MinecraftSLP')) { - require __DIR__ . '/inc/MinecraftSLP.class.php'; + require dirname(__FILE__) . '/inc/MinecraftSLP.class.php'; } $obj = new SQ_MinecraftSLP($this); } diff --git a/serverquery/lib/games/Valve.class.php b/serverquery/lib/games/Valve.class.php index 775c564..6116e9a 100644 --- a/serverquery/lib/games/Valve.class.php +++ b/serverquery/lib/games/Valve.class.php @@ -24,7 +24,7 @@ * THE SOFTWARE. */ -require __DIR__ . '/inc/ValveBuffer.class.php'; +require dirname(__FILE__) . '/inc/ValveBuffer.class.php'; /** * Base class for all Valve-based games diff --git a/serverquery/serverquery.php b/serverquery/serverquery.php index 43f3229..ce06c4d 100644 --- a/serverquery/serverquery.php +++ b/serverquery/serverquery.php @@ -24,12 +24,12 @@ * THE SOFTWARE. */ -require __DIR__ . '/config.php'; -require __DIR__ . '/lib/ServerQuery.class.php'; -require __DIR__ . '/lib/Template.class.php'; +require dirname(__FILE__) . '/config.php'; +require dirname(__FILE__) . '/lib/ServerQuery.class.php'; +require dirname(__FILE__) . '/lib/Template.class.php'; $sq = new SQ_ServerQuery(); $sq->exec(); $data = SQ_Template::getTemplateData($sq); -require __DIR__ . '/template.php'; +require dirname(__FILE__) . '/template.php'; diff --git a/serverquery/test.php b/serverquery/test.php index c1f4678..36b5fb0 100644 --- a/serverquery/test.php +++ b/serverquery/test.php @@ -24,9 +24,9 @@ * THE SOFTWARE. */ -require __DIR__ . '/config.php'; -require __DIR__ . '/lib/ServerQuery.class.php'; -require __DIR__ . '/lib/Template.class.php'; +require dirname(__FILE__) . '/config.php'; +require dirname(__FILE__) . '/lib/ServerQuery.class.php'; +require dirname(__FILE__) . '/lib/Template.class.php'; header('Content-Type: text/plain; charset=UTF-8');