mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-06-18 02:59:27 +00:00
- added handling of categories
This commit is contained in:
parent
c7a2869f0d
commit
dd0deb7f34
|
@ -47,6 +47,7 @@ $comment = sanitizeString($_POST["comment"]);
|
||||||
$version_comment = sanitizeString($_POST["version_comment"]);
|
$version_comment = sanitizeString($_POST["version_comment"]);
|
||||||
|
|
||||||
$keywords = sanitizeString($_POST["keywords"]);
|
$keywords = sanitizeString($_POST["keywords"]);
|
||||||
|
$categories = sanitizeString($_POST["categoryidform1"]);
|
||||||
|
|
||||||
$reqversion = (int)$_POST["reqversion"];
|
$reqversion = (int)$_POST["reqversion"];
|
||||||
if ($reqversion<1) $reqversion=1;
|
if ($reqversion<1) $reqversion=1;
|
||||||
|
@ -151,8 +152,15 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
|
||||||
$name = sanitizeString($_POST["name"]);
|
$name = sanitizeString($_POST["name"]);
|
||||||
else $name = basename($userfilename);
|
else $name = basename($userfilename);
|
||||||
|
|
||||||
|
$cats = array();
|
||||||
|
if($categories) {
|
||||||
|
$catids = explode(',', $categories);
|
||||||
|
foreach($catids as $catid) {
|
||||||
|
$cats[] = $dms->getDocumentCategory($catid);
|
||||||
|
}
|
||||||
|
}
|
||||||
$res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
|
$res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
|
||||||
$userfiletmp, basename($userfilename),
|
$cats, $userfiletmp, basename($userfilename),
|
||||||
$fileType, $userfiletype, $sequence,
|
$fileType, $userfiletype, $sequence,
|
||||||
$reviewers, $approvers, $reqversion,$version_comment);
|
$reviewers, $approvers, $reqversion,$version_comment);
|
||||||
|
|
||||||
|
@ -160,6 +168,13 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
|
||||||
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));
|
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));
|
||||||
} else {
|
} else {
|
||||||
$document = $res[0];
|
$document = $res[0];
|
||||||
|
if(isset($GLOBALS['LETODMS_HOOKS']['postAddDocument'])) {
|
||||||
|
foreach($GLOBALS['LETODMS_HOOKS']['postAddDocument'] as $hookObj) {
|
||||||
|
if (method_exists($hookObj, 'postAddDocument')) {
|
||||||
|
$hookObj->postAddDocument($document);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
// Send notification to subscribers.
|
// Send notification to subscribers.
|
||||||
if($notifier) {
|
if($notifier) {
|
||||||
$folder->getNotifyList();
|
$folder->getNotifyList();
|
||||||
|
|
|
@ -46,6 +46,7 @@ if ($document->getAccessMode($user) < M_READWRITE) {
|
||||||
$name = sanitizeString($_POST["name"]);
|
$name = sanitizeString($_POST["name"]);
|
||||||
$comment = sanitizeString($_POST["comment"]);
|
$comment = sanitizeString($_POST["comment"]);
|
||||||
$keywords = sanitizeString($_POST["keywords"]);
|
$keywords = sanitizeString($_POST["keywords"]);
|
||||||
|
$categories = sanitizeString($_POST["categoryidform1"]);
|
||||||
$sequence = $_POST["sequence"];
|
$sequence = $_POST["sequence"];
|
||||||
if (!is_numeric($sequence)) {
|
if (!is_numeric($sequence)) {
|
||||||
$sequence="keep";
|
$sequence="keep";
|
||||||
|
@ -125,6 +126,28 @@ if (($oldkeywords = $document->getKeywords()) != $keywords) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if($categories) {
|
||||||
|
$categoriesarr = array();
|
||||||
|
foreach(explode(',', $categories) as $catid) {
|
||||||
|
if($cat = $dms->getDocumentCategory($catid)) {
|
||||||
|
$categoriesarr[] = $cat;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
$oldcategories = $document->getCategories();
|
||||||
|
$oldcatsids = array();
|
||||||
|
foreach($oldcategories as $oldcategory)
|
||||||
|
$oldcatsids[] = $oldcategory->getID();
|
||||||
|
|
||||||
|
if (count($categoriesarr) != count($oldcategories) ||
|
||||||
|
array_diff(explode(',', $categories), $oldcatsids)) {
|
||||||
|
if($document->setCategories($categoriesarr)) {
|
||||||
|
} else {
|
||||||
|
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if($sequence != "keep") {
|
if($sequence != "keep") {
|
||||||
if($document->setSequence($sequence)) {
|
if($document->setSequence($sequence)) {
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user