diff --git a/utils/xmlimport.php b/utils/xmlimport.php index 77dabe5d8..fd5003bf0 100644 --- a/utils/xmlimport.php +++ b/utils/xmlimport.php @@ -341,10 +341,11 @@ function insert_keywordcategory($keywordcat) { /* {{{ */ if($debug) print_r($keywordcat); if(!array_key_exists((int) $keywordcat['attributes']['owner'], $objmap['users'])) { - $logger->err("Owner of keyword category cannot be found"); - return false; + $logger->warning("Owner of keyword category cannot be mapped using default user"); + $owner = $defaultUser; + } else { + $owner = $objmap['users'][(int) $keywordcat['attributes']['owner']]; } - $owner = $objmap['users'][(int) $keywordcat['attributes']['owner']]; if($newCategory = $dms->getKeywordCategoryByName($keywordcat['attributes']['name'], $owner)) { $logger->warning("Keyword category already exists"); @@ -686,10 +687,11 @@ function insert_document($document) { /* {{{ */ $newDocument->setInheritAccess($document['attributes']['inheritaccess']); foreach($document['versions'] as $version) { if(!array_key_exists((int) $version['attributes']['owner'], $objmap['users'])) { - $logger->err("Owner of document cannot be mapped"); - return false; + $logger->warning("Owner of document version cannot be mapped using default user"); + $owner = $defaultUser; + } else { + $owner = $dms->getUser($objmap['users'][(int) $version['attributes']['owner']]); } - $owner = $dms->getUser($objmap['users'][(int) $version['attributes']['owner']]); /* Rewriting the review/approval log will set reviewers/approvers */ $reviews = array('i'=>array(), 'g'=>array()); @@ -979,10 +981,11 @@ function insert_transmittal($transmittal) { /* {{{ */ if($debug) print_r($transmittal); if(!array_key_exists((int) $transmittal['attributes']['owner'], $objmap['users'])) { - $logger->err( "Owner of transmittal cannot be found"); - return false; + $logger->warning("Owner of transmittal cannot be mapped using default user"); + $owner = $defaultUser; + } else { + $owner = $dms->getUser($objmap['users'][(int) $transmittal['attributes']['owner']]); } - $owner = $dms->getUser($objmap['users'][(int) $transmittal['attributes']['owner']]); if(in_array('transmittals', $sections)) { if(!$newTransmittal = $dms->addTransmittal($transmittal['attributes']['name'], $transmittal['attributes']['comment'], $owner)) { @@ -1901,12 +1904,15 @@ if(isset($options['config'])) { define('SEEDDMS_CONFIG_FILE', $_SERVER['SEEDDMS_CONFIG_FILE']); } -include($myincpath."/inc/inc.Settings.php"); -include($myincpath."/inc/inc.Utils.php"); -include($myincpath."/inc/inc.Init.php"); -include($myincpath."/inc/inc.Extension.php"); -include($myincpath."/inc/inc.DBInit.php"); -include($myincpath."/inc/inc.ClassAcl.php"); +require $myincpath.'/vendor/autoload.php'; +require_once($myincpath."/inc/inc.Settings.php"); +require_once($myincpath.'/inc/inc.Language.php'); +require_once($myincpath."/inc/inc.LogInit.php"); +require_once($myincpath."/inc/inc.Utils.php"); +require_once($myincpath."/inc/inc.Init.php"); +require_once($myincpath."/inc/inc.Extension.php"); +require_once($myincpath."/inc/inc.DBInit.php"); +require_once($myincpath."/inc/inc.ClassAcl.php"); $logfile = "xmlimport.log"; $logconf = array();