From 90edaf26edcde5a07f6db0dfdda20c545257116e Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Mon, 9 Jan 2006 01:35:59 +0000 Subject: [PATCH] Adding config.php.new and cleaning up configuration variables --- includes/config.php.new | 77 +++++++++++++++++++++++++++++++++++++++++ includes/init.php | 14 ++++---- 2 files changed, 84 insertions(+), 7 deletions(-) create mode 100644 includes/config.php.new diff --git a/includes/config.php.new b/includes/config.php.new new file mode 100644 index 0000000..1106f06 --- /dev/null +++ b/includes/config.php.new @@ -0,0 +1,77 @@ + \ No newline at end of file diff --git a/includes/init.php b/includes/init.php index 89f09ce..eac8657 100644 --- a/includes/init.php +++ b/includes/init.php @@ -39,13 +39,13 @@ require_once('./includes/config.php'); define('ISSO_ESCAPE_STRINGS', 1); define('ISSO_CHECK_POST_REFERER', 1); -require_once($issopath . 'kernel.php'); +require_once($conf['paths']['isso'] . 'kernel.php'); $viewsvn = new Shared_Object_Framework(); $viewsvn->set('application', 'ViewSVN'); $viewsvn->set('apppath', getcwd()); $viewsvn->set('appversion', '[#]version[#]'); $viewsvn->set('debug', $debug); -$viewsvn->set('sourcepath', $issopath); +$viewsvn->set('sourcepath', $conf['paths']['isso']); $viewsvn->load('functions', 'funct', true); @@ -56,7 +56,7 @@ $viewsvn->load('localize', 'lang', true); // ################################################################### // handle template system $viewsvn->load('template_fs', 'template', true); -$template->set('templatedir', './templates/' . $templatedir); +$template->set('templatedir', './templates/' . $conf['paths']['templateset']); $template->set('extension', 'tpl'); // ################################################################### @@ -72,18 +72,18 @@ $viewsvn->shell =& new Shell(); // ################################################################### // setup repository require_once('./includes/repository.php'); -$viewsvn->repos =& new Repository($repository, $iscontainer); +$viewsvn->repos =& new Repository($conf['repository']['path'], $conf['repository']['iscontainer']); // ################################################################### // path manager require_once('./includes/paths.php'); -$viewsvn->path = $webpath; -$viewsvn->paths =& new Paths($pathtype); +$viewsvn->path = $conf['paths']['web']; +$viewsvn->paths =& new Paths($conf['other']['pathtype']); // ################################################################### // initialize SVN require_once('./includes/svnlib.php'); -$viewsvn->svn =& new SVNLib($svnpath); +$viewsvn->svn =& new SVNLib($conf['paths']['svn']); /*=====================================================================*\ || ################################################################### -- 2.43.5