Sophie

Sophie

distrib > Mandriva > 2007.0 > x86_64 > media > contrib-release-src > by-pkgid > 3da3cbd330316b67bdf3f5c6a421752a > files > 5

dotproject-2.0.2-2mdk.src.rpm

diff -Naur dotproject/classes/permissions.class.php dotproject.oden/classes/permissions.class.php
--- dotproject/classes/permissions.class.php	2006-03-03 13:13:09.000000000 +0100
+++ dotproject.oden/classes/permissions.class.php	2006-04-26 11:23:51.000000000 +0200
@@ -18,7 +18,7 @@
 
 // Set the ADODB directory
 if (! defined('ADODB_DIR')) {
-  define('ADODB_DIR', "$baseDir/lib/adodb");
+  define('/usr/share/php-adodb');
 }
  
 // Include the PHPGACL library
diff -Naur dotproject/classes/query.class.php dotproject.oden/classes/query.class.php
--- dotproject/classes/query.class.php	2005-12-25 13:33:42.000000000 +0100
+++ dotproject.oden/classes/query.class.php	2006-04-26 11:24:54.000000000 +0200
@@ -19,7 +19,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 }}}*/
 
-require_once "$baseDir/lib/adodb/adodb.inc.php";
+require_once "/usr/share/php-adodb/adodb.inc.php";
 
 define('QUERY_STYLE_ASSOC', ADODB_FETCH_ASSOC);
 define('QUERY_STYLE_NUM' , ADODB_FETCH_NUM);
@@ -709,7 +709,7 @@
 	function execXML($xml, $mode = 'REPLACE') {
 		global $db, $baseDir, $AppUI;
 
-		include_once $baseDir.'/lib/adodb/adodb-xmlschema.inc.php';
+		include_once '/usr/share/php-adodb/adodb-xmlschema.inc.php';
 		$schema = new adoSchema($db);
 		$schema->setUpgradeMode($mode);
 		if (isset($this->_table_prefix) && $this->_table_prefix) {
diff -Naur dotproject/includes/db_adodb.php dotproject.oden/includes/db_adodb.php
--- dotproject/includes/db_adodb.php	2005-03-25 05:49:14.000000000 +0100
+++ dotproject.oden/includes/db_adodb.php	2006-04-26 11:23:51.000000000 +0200
@@ -9,7 +9,7 @@
 	A generic database layer providing a set of low to middle level functions
 	originally written for WEBO project, see webo source for "real life" usages
 */
-require_once( "$baseDir/lib/adodb/adodb.inc.php" );
+require_once( "/usr/share/php-adodb/adodb.inc.php" );
 
 $db = NewADOConnection($dPconfig['dbtype']);
 
diff -Naur dotproject/install/check_upgrade.php dotproject.oden/install/check_upgrade.php
--- dotproject/install/check_upgrade.php	2006-04-21 09:14:55.000000000 +0200
+++ dotproject.oden/install/check_upgrade.php	2006-04-26 11:26:21.000000000 +0200
@@ -41,7 +41,7 @@
 
 require_once 'install.inc.php';
 $baseDir = dirname(dirname(__FILE__));
-require_once "$baseDir/lib/adodb/adodb.inc.php";
+require_once "/usr/share/php-adodb/adodb.inc.php";
 
 function dPcheckExistingDB($conf) {
 	global $AppUI, $ADODB_FETCH_MODE;
diff -Naur dotproject/install/do_install_db.php dotproject.oden/install/do_install_db.php
--- dotproject/install/do_install_db.php	2006-04-21 09:36:37.000000000 +0200
+++ dotproject.oden/install/do_install_db.php	2006-04-26 11:23:51.000000000 +0200
@@ -57,7 +57,7 @@
 
 $lastDBUpdate = '';
 
-require_once( "$baseDir/lib/adodb/adodb.inc.php" );
+require_once( "/usr/share/php-adodb/adodb.inc.php" );
 @include_once "$baseDir/includes/version.php";
 
 $db = NewADOConnection($dbtype);
@@ -76,7 +76,7 @@
 if ($dobackup){
 
  if( $dbc ) {
-  require_once( "$baseDir/lib/adodb/adodb-xmlschema.inc.php" );
+  require_once( "/usr/share/php-adodb/adodb-xmlschema.inc.php" );
 
   $schema = new adoSchema( $db );
 
diff -Naur dotproject/modules/backup/do_backup.php dotproject.oden/modules/backup/do_backup.php
--- dotproject/modules/backup/do_backup.php	2005-05-19 07:42:46.000000000 +0200
+++ dotproject.oden/modules/backup/do_backup.php	2006-04-26 11:23:51.000000000 +0200
@@ -26,7 +26,7 @@
   $AppUI->redirect('m=public&a=access_denied');
 }
 
-require_once "$baseDir/lib/adodb/adodb-xmlschema.inc.php";
+require_once "/usr/share/php-adodb/adodb-xmlschema.inc.php";
 
 
 if ($output_format == 'xml') {
diff -Naur dotproject/modules/backup/do_restore.php dotproject.oden/modules/backup/do_restore.php
--- dotproject/modules/backup/do_restore.php	2005-05-19 07:42:46.000000000 +0200
+++ dotproject.oden/modules/backup/do_restore.php	2006-04-26 11:23:51.000000000 +0200
@@ -17,7 +17,7 @@
 $upload_tmp_file = $_FILES['xmlfile']['tmp_name'];
 $continue = dPgetParam($_POST, 'continue', false);
 
-require_once $baseDir . '/lib/adodb/adodb-xmlschema.inc.php';
+require_once '/usr/share/php-adodb/adodb-xmlschema.inc.php';
 $schema = new adoSchema($GLOBALS['db']);
 $schema->setUpgradeMethod('REPLACE');
 $schema->ContinueOnError(true);