Add core in includes.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/bin/connect.db.inc.php b/bin/connect.db.inc.php
index 0370d31..e2954f1 100644 (file)
--- a/bin/connect.db.inc.php
+++ b/bin/connect.db.inc.php
@@ -19,10 +19,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-ini_set('include_path',dirname(__FILE__).'/../include:' . dirname(__FILE__).'/../classes:/usr/share/php');
-
+ini_set('include_path', dirname(__FILE__) . '/../core/include:'
+                      . dirname(__FILE__) . '/../include:'
+                      . dirname(__FILE__) . '/../core/classes:'
+                      . dirname(__FILE__) . '/../classes:'
+                      . '/usr/share/php');
 require_once('xorg.inc.php');
-require_once 'xdb.php';
 
 new Platal('core');
 

diff --git a/bin/csv2sql.php b/bin/csv2sql.php
index e768aab..9820fbf 100755 (executable)
--- a/bin/csv2sql.php
+++ b/bin/csv2sql.php
@@ -20,7 +20,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once(dirname(__FILE__) . '/../classes/csvimporter.php');
+require_once(dirname(__FILE__) . '/../core/classes/csvimporter.php');
 
 // {{{ function showHelp()
 
@@ -86,7 +86,7 @@ $action          = CSV_INSERT;
 $keys            = 'id';
 
 processArgs();
-require_once(dirname(__FILE__) . '/../classes/xdb.php');
+require_once(dirname(__FILE__) . '/../core/classes/xdb.php');
 
 $source          = file_get_contents($sourceName);
 $insert_relation = null;

diff --git a/include/validations.inc.php b/include/validations.inc.php
index c65e15b..cf2f77c 100644 (file)
--- a/include/validations.inc.php
+++ b/include/validations.inc.php
@@ -21,7 +21,8 @@
 
 define('SIZE_MAX', 32768);
 
-require_once dirname(__FILE__) . '/../classes/xdb.php';
+global $globals;
+require_once $globals->spoolroot . '/core/classes/xdb.php';
 
 /**
  * Iterator class, that lists objects through the database