diff '-Nurpx*~' '-x*.orig' rutorrent-def+fhs/php/util.php rutorrent-def+fhs2/php/util.php --- rutorrent-def+fhs/php/util.php 2012-03-07 18:04:41.192448132 +0200 +++ rutorrent-def+fhs2/php/util.php 2012-03-07 18:05:12.502716803 +0200 @@ -16,6 +16,7 @@ if(!isset($_SERVER['REMOTE_USER'])) } $rootPath = realpath(dirname(__FILE__)."/.."); +require_once( '/usr/share/rutorrent/php/defaults-rpm.php' ); require_once( '/etc/rutorrent/config.php' ); $conf = getConfFile('config.php'); if($conf) @@ -297,6 +298,9 @@ function getPluginConf($plugin) { $ret = ''; global $rootPath; + $conf = '/usr/share/rutorrent/plugins/'.$plugin.'/defaults-rpm.php'; + if(is_file($conf) && is_readable($conf)) + $ret.='require_once("'.$conf.'");'; $conf = '/etc/rutorrent/plugins/'.$plugin.'/conf.php'; if(is_file($conf) && is_readable($conf)) $ret.='require("'.$conf.'");';