From c7ee6d9b4a441f96196bc057c4819a814ae10a74 Mon Sep 17 00:00:00 2001
From: steinm <steinm@577cc39b-cfd1-4aa2-8bc3-eda205cea05a>
Date: Thu, 24 Jan 2013 10:09:34 +0000
Subject: [PATCH] set workflow if passed to script

---
 op/op.AddDocument.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 767279bff..0e808d9b3 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -63,6 +63,11 @@ if(isset($_POST["attributes_version"]))
 else
 	$attributes_version = array();
 
+if(isset($_POST["workflow"]))
+	$workflow = $dms->getWorkflow($_POST["workflow"]);
+else
+	$workflow = null;
+
 $reqversion = (int)$_POST["reqversion"];
 if ($reqversion<1) $reqversion=1;
 
@@ -196,7 +201,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 															$cats, $userfiletmp, basename($userfilename),
 	                            $fileType, $userfiletype, $sequence,
 	                            $reviewers, $approvers, $reqversion,
-	                            $version_comment, $attributes, $attributes_version);
+	                            $version_comment, $attributes, $attributes_version, $workflow);
 
 	if (is_bool($res) && !$res) {
 		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));
@@ -244,7 +249,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 					$notifyList['groups'][] = $dms->getGroup($approvergrpid);
 				}
 			}
-			$subject = "###SITENAME###: ".$folder->_name." - ".getMLText("new_document_email");
+			$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("new_document_email");
 			$message = getMLText("new_document_email")."\r\n";
 			$message .= 
 				getMLText("name").": ".$name."\r\n".