- do not use dir for letodms_core as include path anymore

conf/conf.Settings.php.template

@@ -52,8 +52,11 @@ class Settings
 	// submitting a review or overriding document status.
 	var $_strictFormCheck = false;
 
-	// path to where mydms is located
-	var $_rootDir = "/var/www/letoDMS-1.10/";
+	// Path to where letoDMS is located
+	var $_rootDir = "/var/www/letoDMS-3.0.0/";
+
+	// Path to LetoDMS_Core
+	var $_coreDir = "/var/www/LetoDMS_Core-3.0.0/";
 
 	// The relative path in the URL, after the domain part. Do not include the
 	// http:// prefix or the web host name. e.g. If the full URL is
@@ -140,9 +143,6 @@ class Settings
 	// NOTE: works only with local autentication (no LDAP)
 	var $_adminIP = "";
 
-	//Path to LetoDMS_Core
-	var $_LetoDMSCorePath = $this->_rootDir;
-
 	// -------------------------------- Database-Setup --------------------------------------------
 
 	//Path to adodb. This is the directory containing the adodb directory

inc/inc.DBInit.php

@@ -18,7 +18,10 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-require_once('LetoDMS/LetoDMS_Core.php');
+if(isset($settings->_coreDir))
+	require_once($settings->_coreDir.'/LetoDMS_Core.php');
+else
+	require_once('LetoDMS/LetoDMS_Core.php');
 
 $db = new LetoDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase);
 $db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");

inc/inc.Settings.php

@@ -31,7 +31,4 @@ if(is_link($_tmp)) {
 if(isset($settings->_ADOdbPath))
 	ini_set('include_path', $settings->_ADOdbPath.":".ini_get('include_path'));
 
-if(isset($settings->_LetoDMSCorePath))
-	ini_set('include_path', $settings->_LetoDMSCorePath.ini_get('include_path'));
-
 ?>