From 90edaf26edcde5a07f6db0dfdda20c545257116e Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
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 @@
+<?php
+/*=====================================================================*\
+|| ###################################################################
+|| # ViewSVN [#]version[#]
+|| # Copyright ©2002-[#]year[#] Iris Studios, Inc.
+|| #
+|| # This program is free software; you can redistribute it and/or modify
+|| # it under the terms of the GNU General Public License as published by
+|| # the Free Software Foundation; version [#]gpl[#] of the License.
+|| #
+|| # This program is distributed in the hope that it will be useful, but
+|| # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+|| # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+|| # more details.
+|| #
+|| # You should have received a copy of the GNU General Public License along
+|| # with this program; if not, write to the Free Software Foundation, Inc.,
+|| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+|| ###################################################################
+\*=====================================================================*/
+
+// ###################################################################
+// ///////////////////////// REPOSITORY PATH
+// -------------------------------------------------------------------
+// The path to your repository or the parent-path for a directory of
+// repositories
+$conf['repository']['path'] = '/home/svn/repos/';
+
+// ###################################################################
+// ///////////////////////// REPOSITORY IS CONTAINER
+// -------------------------------------------------------------------
+// Set this to TRUE if the above path is actually a parent-path
+$conf['repository']['iscontainer'] = false;
+
+// ###################################################################
+// ///////////////////////// ISSO PATH
+// -------------------------------------------------------------------
+// This is the full path (that ends with a trailing /) to where your
+// copy of the ISSO2 framework is located.
+$conf['paths']['isso'] = '/htdocs/isso/';
+
+// ###################################################################
+// ///////////////////////// WEB PATH
+// -------------------------------------------------------------------
+// The relative path (as in accessible from the root of your webserver)
+// to the viewsvn/ directory. THIS DOES NOT END IN A TRAILING SLASH!
+$conf['paths']['web'] = '/viewsvn/';
+
+// ###################################################################
+// ///////////////////////// SVN BINARY
+// -------------------------------------------------------------------
+// The full path to the location of your SVN binary. If the binary
+// is in your shell's path, then you can set this to 'svn'.
+$conf['paths']['svn'] = '/usr/local/bin/svn';
+
+// ###################################################################
+// ///////////////////////// TEMPLATE SET
+// -------------------------------------------------------------------
+// Choose which directory to use in templates/ as the template set.
+$conf['paths']['templateset'] = 'default';
+
+// ###################################################################
+// ///////////////////////// PATH SYSTEM
+// -------------------------------------------------------------------
+// ViewSVN has two ways in which the current location is passed in the
+// URL bar. Type 1 is the simple one: blame.php?path=/repos/somedir
+// you should only need to use this if the second one fails. The more
+// advanced (and default) type 2 uses blame.php/repos/somedir/.
+$conf['other']['pathtype'] = 2;
+
+/*=====================================================================*\
+|| ###################################################################
+|| # $HeadURL$
+|| # $Id$
+|| ###################################################################
+\*=====================================================================*/
+?>
\ 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.22.5