gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 20:51:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- moved extending include_path for adodb from inc.Settings.php into

Browse Source 
inc.DBInit.php
This commit is contained in:
steinm 2011-03-10 14:44:55 +00:00
parent 878b2a6175
commit 53f30ad963
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
inc/inc.DBInit.php
View File

@ -18,6 +18,9 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
if(isset($settings->_ADOdbPath))
ini_set('include_path', $settings->_ADOdbPath.":".ini_get('include_path'));
if(!empty($settings->_coreDir)) if(!empty($settings->_coreDir))
require_once($settings->_coreDir.'/Core.php'); require_once($settings->_coreDir.'/Core.php');
else else
@ -27,10 +30,12 @@ $db = new LetoDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostna
$db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\""); $db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");
$dms = new LetoDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir); $dms = new LetoDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
if(!$dms->checkVersion()) { if(!$dms->checkVersion()) {
echo "Database update needed."; echo "Database update needed.";
exit; exit;
} }
$dms->setRootFolderID($settings->_rootFolderID); $dms->setRootFolderID($settings->_rootFolderID);
$dms->setEnableAdminRevApp($settings->_enableAdminRevApp); $dms->setEnableAdminRevApp($settings->_enableAdminRevApp);
$dms->setEnableConverting($settings->_enableConverting); $dms->setEnableConverting($settings->_enableConverting);

4
inc/inc.Settings.php
View File

@ -17,7 +17,6 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$_tmp = dirname($_SERVER['SCRIPT_FILENAME']); $_tmp = dirname($_SERVER['SCRIPT_FILENAME']);
if(is_link($_tmp)) { if(is_link($_tmp)) {
$_arr = preg_split('/\//', $_tmp); $_arr = preg_split('/\//', $_tmp);
@ -28,7 +27,4 @@ if(is_link($_tmp)) {
include("../conf/conf.Settings.php"); include("../conf/conf.Settings.php");
} }
if(isset($settings->_ADOdbPath))
ini_set('include_path', $settings->_ADOdbPath.":".ini_get('include_path'));
?> ?>