gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2017-03-09 07:40:39 +01:00
commit caf35ad868
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
utils/xmlimport.php
View File

@ -122,7 +122,7 @@ function insert_user($user) { /* {{{ */
}
if ($newUser = $dms->getUserByLogin($user['attributes']['login'])) {
$logger->info("User '".$user['attributes']['login']."' already exists");
$logger->warning("User '".$user['attributes']['login']."' already exists");
} else {
if(in_array('users', $sections)) {
if(substr($user['attributes']['pwdexpiration'], 0, 10) == '0000-00-00')
@ -187,7 +187,7 @@ function insert_group($group) { /* {{{ */
if($debug) print_r($group);
if ($newGroup = $dms->getGroupByName($group['attributes']['name'])) {
$logger->info("Group already exists");
$logger->warning("Group already exists");
} else {
if(in_array('groups', $sections)) {
$newGroup = $dms->addGroup($group['attributes']['name'], $group['attributes']['comment']);
@ -283,7 +283,7 @@ function insert_attributedefinition($attrdef) { /* {{{ */
if($debug)
print_r($attrdef);
if($newAttrdef = $dms->getAttributeDefinitionByName($attrdef['attributes']['name'])) {
$logger->info("Attribute definition already exists");
$logger->warning("Attribute definition already exists");
} else {
if(in_array('attributedefinitions', $sections)) {
$objtype = ($attrdef['objecttype'] == 'folder' ? SeedDMS_Core_AttributeDefinition::objtype_folder : ($attrdef['objecttype'] == 'document' ? SeedDMS_Core_AttributeDefinition::objtype_document : ($attrdef['objecttype'] == 'documentcontent' ? SeedDMS_Core_AttributeDefinition::objtype_documentcontent : 0)));
@ -309,7 +309,7 @@ function insert_documentcategory($documentcat) { /* {{{ */
if($debug) print_r($documentcat);
if($newCategory = $dms->getDocumentCategoryByName($documentcat['attributes']['name'])) {
$logger->info("Document category already exists");
$logger->warning("Document category already exists");
} else {
if(in_array('documentcategories', $sections)) {
if(!$newCategory = $dms->addDocumentCategory($documentcat['attributes']['name'])) {
@ -341,7 +341,7 @@ function insert_keywordcategory($keywordcat) { /* {{{ */
$owner = $objmap['users'][(int) $keywordcat['attributes']['owner']];
if($newCategory = $dms->getKeywordCategoryByName($keywordcat['attributes']['name'], $owner)) {
$logger->info("Document category already exists");
$logger->warning("Keyword category already exists");
} else {
if(in_array('keywordcategories', $sections)) {
if(!$newCategory = $dms->addKeywordCategory($owner, $keywordcat['attributes']['name'])) {
@ -374,7 +374,7 @@ function insert_workflow($workflow) { /* {{{ */
if($debug)
print_r($workflow);
if($newWorkflow = $dms->getWorkflowByName($workflow['attributes']['name'])) {
$logger->info("Workflow already exists");
$logger->warning("Workflow already exists");
} else {
if(in_array('workflows', $sections)) {
if(!$initstate = $dms->getWorkflowState($objmap['workflowstates'][(int)$workflow['attributes']['initstate']])) {
@ -449,7 +449,7 @@ function insert_workflowstate($workflowstate) { /* {{{ */
if($debug)
print_r($workflowstate);
if($newWorkflowstate = $dms->getWorkflowStateByName($workflowstate['attributes']['name'])) {
$logger->info("Workflow state already exists");
$logger->warning("Workflow state already exists");
} else {
if(in_array('workflows', $sections)) {
if(!$newWorkflowstate = $dms->addWorkflowState($workflowstate['attributes']['name'], isset($workflowstate['attributes']['documentstate']) ? $workflowstate['attributes']['documentstate'] : 0)) {
@ -473,7 +473,7 @@ function insert_workflowaction($workflowaction) { /* {{{ */
if($debug)
print_r($workflowaction);
if($newWorkflowaction = $dms->getWorkflowActionByName($workflowaction['attributes']['name'])) {
$logger->info("Workflow action already exists");
$logger->warning("Workflow action already exists");
} else {
if(in_array('workflows', $sections)) {
if(!$newWorkflowaction = $dms->addWorkflowAction($workflowaction['attributes']['name'])) {