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.0.x' into seeddms-5.1.x

Browse Source
This commit is contained in:
Uwe Steinmann 2018-02-20 06:38:22 +01:00
commit ad8d0d9bba
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SeedDMS_Core/Core/inc.ClassFolder.php
View File

@ -869,7 +869,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
* expiration date
* @param object $owner owner of the new document
* @param SeedDMS_Core_User $keywords keywords of new document
* @param array $categories list of category ids
* @param SeedDMS_Core_DocumentCategory[] $categories list of category objects
* @param string $tmpFile the path of the file containing the content
* @param string $orgFileName the original file name
* @param string $fileType usually the extension of the filename

27
utils/adddoc.php
View File

@ -84,19 +84,6 @@ if(isset($options['k'])) {
$keywords = $options['k'];
}
$categories = array();
if(isset($options['K'])) {
$categorynames = explode(',', $options['K']);
foreach($categorynames as $categoryname) {
$cat = $dms->getDocumentCategoryByName($categoryname);
if($cat) {
$categories[] = $cat->getID();
} else {
echo "Category '".$categoryname."' not found\n";
}
}
}
$sequence = 0;
if(isset($options['s'])) {
$sequence = $options['s'];
@ -143,6 +130,20 @@ if(!$dms->checkVersion()) {
exit;
}
/* Parse categories */
$categories = array();
if(isset($options['K'])) {
$categorynames = explode(',', $options['K']);
foreach($categorynames as $categoryname) {
$cat = $dms->getDocumentCategoryByName($categoryname);
if($cat) {
$categories[] = $cat;
} else {
echo "Category '".$categoryname."' not found\n";
}
}
}
/* Parse document attributes. */
$document_attributes = array();
if (isset($options['a'])) {