Remove $rootPath where possible

Plugins will fail to load if the web server doesn't have executable access to all the parent directories. The realpath PHP function requires special permissions. dirname is a safer option because it's not file system aware.
Novik · Apr 22, 2023 · cac8205 · cac8205
1 parent 51bd6e8
commit cac8205
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/php/util.php b/php/util.php
@@ -2,7 +2,9 @@
 
 // Include our base configuration file
 $rootPath = realpath(dirname(__FILE__)."/..");
-require_once( $rootPath.'/conf/config.php' );
+// Avoid reusing $rootPath here becuase it calls realpath
+// dirname is a more stable option becuase it's not file system aware
+require_once( dirname(__FILE__).'/../conf/config.php' );
 
 // Automatically include only the used utility classes
 spl_autoload_register(function ($class) 

diff --git a/plugins/extratio/init.php b/plugins/extratio/init.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once( $rootPath.'/plugins/extratio/rules.php' );
+require_once( 'rules.php' );
 
 $mngr = rRatioRulesList::load();
 if($mngr->setHandlers())

diff --git a/plugins/history/init.php b/plugins/history/init.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once( $rootPath.'/plugins/history/history.php' );
+require_once( 'history.php' );
 
 $mngr = rHistory::load();
 if($mngr->setHandlers())

diff --git a/plugins/loginmgr/accounts.php b/plugins/loginmgr/accounts.php
@@ -1,8 +1,8 @@
 <?php
 
 require_once( dirname(__FILE__)."/../../php/util.php" );
-require_once( $rootPath.'/php/cache.php');
-require_once( $rootPath.'/php/Snoopy.class.inc');
+require_once( dirname(__FILE__)."/../../php/cache.php" );
+require_once( dirname(__FILE__)."/../../php/Snoopy.class.inc");
 eval( FileUtil::getPluginConf( 'loginmgr' ) );
 
 class privateData

diff --git a/plugins/ratio/ratio.php b/plugins/ratio/ratio.php
@@ -1,8 +1,8 @@
 <?php
 
 require_once( dirname(__FILE__)."/../../php/xmlrpc.php" );
-require_once( $rootPath.'/php/cache.php');
-require_once( $rootPath.'/php/settings.php');
+require_once( dirname(__FILE__)."/../../php/cache.php" );
+require_once( dirname(__FILE__)."/../../php/settings.php" );
 eval(FileUtil::getPluginConf('ratio'));
 
 @define('RAT_STOP',0);

diff --git a/plugins/retrackers/update.php b/plugins/retrackers/update.php
@@ -4,8 +4,8 @@
 	$_SERVER['REMOTE_USER'] = $argv[2];
 
 require_once( 'retrackers.php' );
-require_once( $rootPath.'/php/xmlrpc.php' );
-require_once( $rootPath.'/php/rtorrent.php' );
+require_once( dirname(__FILE__)."/../../php/xmlrpc.php" );
+require_once( dirname(__FILE__)."/../../php/cache.php" );
 
 function clearTracker($addition,$tracker)
 {

diff --git a/plugins/scheduler/scheduler.php b/plugins/scheduler/scheduler.php
@@ -1,7 +1,7 @@
 <?php
 
 require_once( dirname(__FILE__)."/../../php/xmlrpc.php" );
-require_once( $rootPath.'/php/cache.php');
+require_once( dirname(__FILE__)."/../../php/cache.php" );
 eval(FileUtil::getPluginConf('scheduler'));
 
 @define('SCH_FAST', 0);

diff --git a/plugins/throttle/throttle.php b/plugins/throttle/throttle.php
@@ -1,6 +1,6 @@
 <?php
 require_once( dirname(__FILE__)."/../../php/xmlrpc.php" );
-require_once( $rootPath.'/php/cache.php');
+require_once( dirname(__FILE__)."/../../php/cache.php" );
 eval(FileUtil::getPluginConf('throttle'));
 
 class rThrottle