From 58ab16432c96a72a66c9a7fa658af0c2daefd3e8 Mon Sep 17 00:00:00 2001
From: Loic d'Anterroches <titoo@users.sourceforge.net>
Date: Fri, 9 Oct 2009 10:16:00 +0200
Subject: [PATCH] Fixed issue 261, default paths for gitcron.php and
 gitserve.php can't find Pluf.

---
 INSTALL.mdtext             |  7 ++++---
 scripts/gitcron.php        | 14 ++++----------
 scripts/gitserve.php       |  9 ++-------
 src/IDF/conf/path.php-dist | 38 ++++++++++++++++++++++++++++++++++++++
 www/index.php              |  8 +-------
 5 files changed, 49 insertions(+), 27 deletions(-)
 create mode 100644 src/IDF/conf/path.php-dist

diff --git a/INSTALL.mdtext b/INSTALL.mdtext
index 24eae3a..817bc5b 100644
--- a/INSTALL.mdtext
+++ b/INSTALL.mdtext
@@ -59,6 +59,8 @@ Here is the step-by-step installation procedure:
 * The InDefero installation folder is the folder containing this file INSTALL.mdtext.
 * Make a copy of `src/IDF/conf/idf.php-dist` as `src/IDF/conf/idf.php`.
 * Update the idf.php file to match your system.
+* Make a copy of `src/IDF/conf/path.php-dist` as `src/IDF/conf/path.php`.
+* Update the path.php file to match your installation paths. It should work out of the box if you followed the recommended file layout.
 * Open a terminal/shell and go into the `src` folder in the InDefero installation folder.
 
 **Command:**
@@ -73,8 +75,7 @@ Here is the step-by-step installation procedure:
 **Bootstrap script:**
 
     <?php
-    set_include_path(get_include_path().PATH_SEPARATOR.'/home/www/indefero/src');
-    set_include_path(get_include_path().PATH_SEPARATOR.'/home/www/pluf/src');
+    require '/home/www/indefero/src/IDF/conf/path.php';
     require 'Pluf.php';
     Pluf::start('/home/www/indefero/src/IDF/conf/idf.php');
     Pluf_Dispatcher::loadControllers(Pluf::f('idf_views'));
@@ -112,11 +113,11 @@ To upgrade:
 
 **Upgrade commands:**
 
+    $ cd /home/www/indefero/src
     $ php /home/www/pluf/src/migrate.php --conf=IDF/conf/idf.php -a -d -u
     $ php /home/www/pluf/src/migrate.php --conf=IDF/conf/idf.php -a -d 
 
 
-
 ## Repository Synchronization
 
 The documentation is available in the `doc` folder.
diff --git a/scripts/gitcron.php b/scripts/gitcron.php
index ee44091..3c32dbc 100644
--- a/scripts/gitcron.php
+++ b/scripts/gitcron.php
@@ -22,18 +22,12 @@
 # ***** END LICENSE BLOCK ***** */
 
 /**
- * This script is used to control the access to the git repositories
- * using a restricted shell access.
+ * This script is used to sync the SSH keys, mark the repositories for
+ * export and prune the deleted repositories.
  *
- * The only argument must be the login of the user.
  */
-// Set the include path to have Pluf and IDF in it.
-$indefero_path = dirname(__FILE__).'/../src';
-//$pluf_path = '/path/to/pluf/src';
-set_include_path(get_include_path()
-                 .PATH_SEPARATOR.$indefero_path
-//                 .PATH_SEPARATOR.$pluf_path
-                 );
+
+require dirname(__FILE__).'/../src/IDF/conf/path.php';
 require 'Pluf.php';
 Pluf::start(dirname(__FILE__).'/../src/IDF/conf/idf.php');
 Pluf_Dispatcher::loadControllers(Pluf::f('idf_views'));
diff --git a/scripts/gitserve.php b/scripts/gitserve.php
index 8dffe1a..d27ece5 100644
--- a/scripts/gitserve.php
+++ b/scripts/gitserve.php
@@ -27,13 +27,8 @@
  *
  * The only argument must be the login of the user.
  */
-// Set the include path to have Pluf and IDF in it.
-$indefero_path = dirname(__FILE__).'/../src';
-//$pluf_path = '/path/to/pluf/src';
-set_include_path(get_include_path()
-                 .PATH_SEPARATOR.$indefero_path
-//                 .PATH_SEPARATOR.$pluf_path
-                 );
+
+require dirname(__FILE__).'/../src/IDF/conf/path.php';
 require 'Pluf.php';
 Pluf::start(dirname(__FILE__).'/../src/IDF/conf/idf.php');
 Pluf_Dispatcher::loadControllers(Pluf::f('idf_views'));
diff --git a/src/IDF/conf/path.php-dist b/src/IDF/conf/path.php-dist
new file mode 100644
index 0000000..d8c90ca
--- /dev/null
+++ b/src/IDF/conf/path.php-dist
@@ -0,0 +1,38 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of InDefero, an open source project management application.
+# Copyright (C) 2008 Céondo Ltd and contributors.
+#
+# InDefero 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; either version 2 of the License, or
+# (at your option) any later version.
+#
+# InDefero 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 St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * This file define the paths to where the Pluf and InDefero libraries
+ * are installed. If you followed the recommended layout of the files
+ * in the installation procedure, they should work out of the box.
+ *
+ * PLUF_PATH: path to the folder containing the Pluf.php file.
+ * IDF_PATH: path to the folder containing the IDF folder.
+ */
+define('PLUF_PATH', dirname(__FILE__).'/../../../../pluf/src');
+define('IDF_PATH', dirname(__FILE__).'/../..');
+
+set_include_path(get_include_path()
+                 .PATH_SEPARATOR.PLUF_PATH
+                 .PATH_SEPARATOR.IDF_PATH
+                 );
diff --git a/www/index.php b/www/index.php
index a5a5446..ff9b7bf 100644
--- a/www/index.php
+++ b/www/index.php
@@ -21,13 +21,7 @@
 #
 # ***** END LICENSE BLOCK ***** */
 
-// Set the include path to have Pluf and IDF in it.
-$indefero_path = dirname(__FILE__).'/../src';
-//$pluf_path = '/path/to/pluf/src';
-set_include_path(get_include_path()
-                 .PATH_SEPARATOR.$indefero_path
-//                 .PATH_SEPARATOR.$pluf_path
-                 );
+require dirname(__FILE__).'/../src/IDF/conf/path.php';
 require 'Pluf.php';
 Pluf::start(dirname(__FILE__).'/../src/IDF/conf/idf.php');
 Pluf_Dispatcher::loadControllers(Pluf::f('idf_views'));