Merge branch 'seeddms-4.3.11' into develop

Conflicts: Makefile views/bootstrap/class.Search.php views/bootstrap/class.ViewFolder.php
2025-05-11 20:21:16 +00:00 · 2014-11-13 09:21:08 +01:00 · 2014-11-13 09:21:08 +01:00 · 15c5392ed8
commit 15c5392ed8
parent 8db94efbf9 afb434a35f
19 changed files with 135 additions and 36 deletions
--- a/5
+++ b/5
@ -3,6 +3,11 @@
 --------------------------------------------------------------------------------
 - translation updates
 - password expiration can be set to 'never'
+- fixed saving multi value attributes
+- do not close browser window anymore when keywords are chosen (Bug #141)
+- fix almost unrestricted fast upload (Bug #175)
+- no more php warning on Workflow summary page (Bug #177)
+- various bug fixes in saving and searching for multi value attributes

 --------------------------------------------------------------------------------
                     Changes in version 4.3.10
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-VERSION=4.3.10
+VERSION=4.3.11
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi
 # webapp

--- a/SeedDMS_Core/Core/inc.ClassAttribute.php
+++ b/SeedDMS_Core/Core/inc.ClassAttribute.php
@ -91,8 +91,33 @@ class SeedDMS_Core_Attribute { /* {{{ */

 	function getID() { return $this->_id; }

+	/**
+	 * Return attribute value as stored in database
+	 *
+	 * This function will return the value of multi value attributes
+	 * including the separator char.
+	 *
+	 * @return string the attribute value as it is stored in the database.
+	 */
 	function getValue() { return $this->_value; }

+	/**
+	 * Return attribute values as an array
+	 *
+	 * This function returns the attribute value as an array. Such an array
+	 * has one element for non multi value attributes and n elements for
+	 * multi value attributes.
+	 *
+	 * @return array the attribute values
+	 */
+	function getValueAsArray() { /* {{{ */
+		if($this->_attrdef->getMultipleValues()) {
+			return explode($this->_value[0], substr($this->_value, 1));
+		} else {
+			return array($this->_value);
+		}
+	} /* }}} */
+
 	/**
 	 * Set a value of an attribute
 	 * The attribute is deleted completely if the value is the empty string
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@ -243,7 +243,7 @@ class SeedDMS_Core_DMS {
 		$this->convertFileTypes = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '4.3.10';
+			$this->version = '4.3.11';
 	} /* }}} */

 	function getDB() { /* {{{ */
@ -550,7 +550,9 @@ class SeedDMS_Core_DMS {
 	 * @param modificationstartdate array search for documents modified after this date
 	 * @param modificationenddate array search for documents modified before this date
 	 * @param categories array list of categories the documents must have assigned
-	 * @param attributes array list of attributes
+	 * @param attributes array list of attributes. The key of this array is the
+	 * attribute definition id. The value of the array is the value of the
+	 * attribute. If the attribute may have multiple values it must be an array.
 	 * @param mode int decide whether to search for documents/folders
 	 *        0x1 = documents only
 	 *        0x2 = folders only
@ -623,10 +625,13 @@ class SeedDMS_Core_DMS {
 				foreach($attributes as $attrdefid=>$attribute) {
 					if($attribute) {
 						$attrdef = $this->getAttributeDefinition($attrdefid);
-						if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) {
-							if($attrdef->getValueSet())
-								$searchAttributes[] = "`tblFolderAttributes`.`attrdef`=".$attrdefid." AND `tblFolderAttributes`.`value`='".$attribute."'";
-							else
+						if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder || $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_all) {
+							if($valueset = $attrdef->getValueSet()) {
+								if($attrdef->getMultipleValues()) {
+									$searchAttributes[] = "`tblFolderAttributes`.`attrdef`=".$attrdefid." AND (`tblFolderAttributes`.`value` like '".$valueset[0].implode("%' OR `tblFolderAttributes`.`value` like '".$valueset[0], $attribute)."%')";
+								} else
+									$searchAttributes[] = "`tblFolderAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentAttributes`.`value`='".$attribute."'";
+							} else
 								$searchAttributes[] = "`tblFolderAttributes`.`attrdef`=".$attrdefid." AND `tblFolderAttributes`.`value` like '%".$attribute."%'";
 						}
 					}
@ -783,10 +788,13 @@ class SeedDMS_Core_DMS {
 				foreach($attributes as $attrdefid=>$attribute) {
 					if($attribute) {
 						$attrdef = $this->getAttributeDefinition($attrdefid);
-						if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document) {
-							if($attrdef->getValueSet())
-								$searchAttributes[] = "`tblDocumentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentAttributes`.`value`='".$attribute."'";
-							else
+						if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document || $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_all) {
+							if($valueset = $attrdef->getValueSet()) {
+								if($attrdef->getMultipleValues()) {
+									$searchAttributes[] = "`tblDocumentAttributes`.`attrdef`=".$attrdefid." AND (`tblDocumentAttributes`.`value` like '".$valueset[0].implode("%' OR `tblDocumentAttributes`.`value` like '".$valueset[0], $attribute)."%')";
+								} else
+									$searchAttributes[] = "`tblDocumentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentAttributes`.`value`='".$attribute."'";
+							} else
 								$searchAttributes[] = "`tblDocumentAttributes`.`attrdef`=".$attrdefid." AND `tblDocumentAttributes`.`value` like '%".$attribute."%'";
 						} elseif($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) {
 							if($attrdef->getValueSet())
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@ -451,7 +451,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {

 		if($attributes) {
 			foreach($attributes as $attrdefid=>$attribute) {
-				if(trim($attribute))
+				if($attribute)
 					if(!$newFolder->setAttributeValue($this->_dms->getAttributeDefinition($attrdefid), $attribute)) {
 						$db->rollbackTransaction();
 						return false;
@ -750,7 +750,8 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {

 		if($attributes) {
 			foreach($attributes as $attrdefid=>$attribute) {
-				if(trim($attribute))
+				/* $attribute can be a string or an array */
+				if($attribute)
 					if(!$document->setAttributeValue($this->_dms->getAttributeDefinition($attrdefid), $attribute)) {
 						$document->remove();
 						$db->rollbackTransaction();
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@ -12,11 +12,11 @@
  <email>uwe@steinmann.cx</email>
  <active>yes</active>
 </lead>
- <date>2014-10-22</date>
- <time>14:13:32</time>
+ <date>2014-11-13</date>
+ <time>09:09:35</time>
 <version>
-  <release>4.3.10</release>
-  <api>4.3.10</api>
+  <release>4.3.11</release>
+  <api>4.3.11</api>
 </version>
 <stability>
  <release>stable</release>
@ -24,7 +24,8 @@
 </stability>
 <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
 <notes>
-new release
+- fixed saving multivalue attributes
+- add method SeedDMS_Core_Attribute::getValueAsArray()
 </notes>
 <contents>
  <dir baseinstalldir="SeedDMS" name="/">
@ -700,5 +701,21 @@ no changes
 - SeedDMS_Core_DMS::addUser() doesn't throw an error if sql_mode is set to STRICT_TRANS_TABLES and pwdexpiration is not set to a valid date.
 	 </notes>
  </release>
+  <release>
+   <date>2014-10-22</date>
+   <time>14:13:32</time>
+   <version>
+    <release>4.3.10</release>
+    <api>4.3.10</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+new release
+   </notes>
+  </release>
 </changelog>
 </package>
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@ -20,7 +20,7 @@

 class SeedDMS_Version {

-	public $_number = "4.3.10";
+	public $_number = "4.3.11";
 	private $_string = "SeedDMS";

 	function SeedDMS_Version() {
--- a/install/install.php
+++ b/install/install.php
@ -116,7 +116,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
 * Load default settings + set
 */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "4.3.10");
+define("SEEDDMS_VERSION", "4.3.11");

 require_once('../inc/inc.ClassSettings.php');

--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@ -462,6 +462,20 @@ switch($command) {
 					echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_folder_id")));
 					exit;
 				}
+
+				if ($folder->getAccessMode($user) < M_READWRITE) {
+					echo json_encode(array('success'=>false, 'message'=>getMLText("access_denied")));
+					exit;
+				}
+
+				if($settings->_quota > 0) {
+					$remain = checkQuota($user);
+					if ($remain < 0) {
+						echo json_encode(array('success'=>false, 'message'=>getMLText("quota_exceeded", array('bytes'=>SeedDMS_Core_File::format_filesize(abs($remain))))));
+						exit;
+					}
+				}
+
 				if (!is_uploaded_file($_FILES["userfile"]["tmp_name"]) || $_FILES['userfile']['error']!=0){
 					header('Content-Type', 'application/json');
 					echo json_encode(array('success'=>false, 'message'=>getMLText("uploading_failed")));
--- a/op/op.Search.php
+++ b/op/op.Search.php
@ -437,7 +437,7 @@ if(count($entries) == 1 && ($resArr['totalDocs'] + $resArr['totalFolders']) == 1
 		$view->setParam('status', isset($status) ? $status : array());
 		$view->setParam('categories', isset($categories) ? $categories : '');
 		$view->setParam('attributes', isset($attributes) ? $attributes : '');
-		$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_document, SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_folder/*, SeedDMS_Core_AttributeDefinition::objtype_all*/));
+		$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_document, SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all));
 		$view->setParam('attrdefs', $attrdefs);
 		$allCats = $dms->getDocumentCategories();
 		$view->setParam('allcategories', $allCats);
--- a/out/out.RewindWorkflow.php
+++ b/out/out.RewindWorkflow.php
@ -23,6 +23,7 @@ include("../inc/inc.Utils.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");

 if (!$user->isAdmin()) {
@ -56,9 +57,13 @@ if (!is_object($workflow)) {

 $folder = $document->getFolder();

+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version));
 if($view) {
+	$view->setParam('accessobject', $accessop);
 	$view->show();
 	exit;
 }
--- a/out/out.RunSubWorkflow.php
+++ b/out/out.RunSubWorkflow.php
@ -23,6 +23,7 @@ include("../inc/inc.Utils.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");

 if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
@ -61,9 +62,13 @@ if (!is_object($subworkflow)) {

 $folder = $document->getFolder();

+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'subworkflow'=>$subworkflow));
 if($view) {
+	$view->setParam('accessobject', $accessop);
 	$view->show();
 	exit;
 }
--- a/out/out.WorkflowSummary.php
+++ b/out/out.WorkflowSummary.php
@ -35,7 +35,7 @@ if ($user->isGuest()) {
 }

 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'workflowmode'=>$settings->_workflowMode, 'previewwidthlist'=>$settings->_previewWidthList));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'workflowmode'=>$settings->_workflowMode, 'previewWidthList'=>$settings->_previewWidthList));
 if($view) {
 	$view->show();
 	exit;
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@ -77,7 +77,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 </style>
 <?php
 		}
-		echo "<title>".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS").(strlen($title)>0 ? ": " : "").htmlspecialchars($title)."</title>\n";
+		$sitename = trim(strip_tags($this->params['sitename']));
+		echo "<title>".(strlen($sitename)>0 ? $sitename : "SeedDMS").(strlen($title)>0 ? ": " : "").htmlspecialchars($title)."</title>\n";
 		echo "</head>\n";
 		echo "<body".(strlen($bodyClass)>0 ? " class=\"".$bodyClass."\"" : "").">\n";
 		if($this->params['session'] && $flashmsg = $this->params['session']->getSplashMsg()) {
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@ -120,7 +120,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 ?>
 		    <tr>
 					<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-					<td><?php echo htmlspecialchars($attribute->getValue()); ?></td>
+					<td><?php echo htmlspecialchars(implode(', ', $attribute->getValueAsArray())); ?></td>
 		    </tr>
 <?php
 			}
--- a/views/bootstrap/class.KeywordChooser.php
+++ b/views/bootstrap/class.KeywordChooser.php
@ -63,13 +63,13 @@ function insertKeywords(keywords) {
 }

 function cancel() {
-	window.close();
+//	window.close();
 	return true;
 }

 function acceptKeywords() {
 	targetObj.value = myTA.value;
-	window.close();
+//	window.close();
 	return true;
 }

--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@ -162,6 +162,24 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
        </span>
 </td>
 </tr>
+
+<?php
+		if($attrdefs) {
+			foreach($attrdefs as $attrdef) {
+				$attricon = '';
+				if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_all) {
+?>
+<tr>
+	<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
+	<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '') ?></td>
+</tr>
+
+<?php
+				}
+			}
+		}
+?>
+
 <tr>
 <td></td><td><button type="submit" class="btn"><i class="icon-search"></i> <?php printMLText("search"); ?></button></td>
 </tr>
@ -462,7 +480,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 						if($lcattributes) {
 							foreach($lcattributes as $lcattribute) {
 								$attrdef = $lcattribute->getAttributeDefinition();
-								print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars($lcattribute->getValue())."</li>\n";
+								print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $lcattribute->getValueAsArray()))."</li>\n";
 							}
 						}
 						print "</ul>\n";
@ -471,7 +489,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 						if($docttributes) {
 							foreach($docttributes as $docttribute) {
 								$attrdef = $docttribute->getAttributeDefinition();
-								print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars($docttribute->getValue())."</li>\n";
+								print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $docttribute->getValueAsArray()))."</li>\n";
 							}
 						}
 						print "</ul>\n";
@ -537,7 +555,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 					if($folderattributes) {
 						foreach($folderattributes as $folderattribute) {
 							$attrdef = $folderattribute->getAttributeDefinition();
-							print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars($folderattribute->getValue())."</li>\n";
+							print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $folderattribute->getValueAsArray()))."</li>\n";
 						}
 					}
 					print "</td>";
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@ -242,7 +242,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 		    <tr>
 					<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-					<td><?php echo htmlspecialchars($attribute->getValue()); ?></td>
+					<td><?php echo htmlspecialchars(implode(', ', $attribute->getValueAsArray())); ?></td>
 		    </tr>
 <?php
 			}
@ -346,7 +346,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($attributes) {
 			foreach($attributes as $attribute) {
 				$attrdef = $attribute->getAttributeDefinition();
-				print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars($attribute->getValue())."</li>\n";
+				print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $attribute->getValueAsArray()))."</li>\n";
 			}
 		}
 		print "</ul>\n";
@ -710,7 +710,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if(SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $latestContent->getWorkflowState())) {
 					print "<form action=\"../out/out.RemoveWorkflowFromDocument.php\" method=\"post\">".createHiddenFieldWithKey('removeworkflowfromdocument')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"icon-remove\"></i> ".getMLText('rm_workflow')."</button></form>";
 				} else {
-					print "<form action=\"../out/out.RewindWorkflow.php\" method=\"post\">".createHiddenFieldWithKey('rewindworkflow')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"icon-refresh\"></i>".getMLText('rewind_workflow')."</button></form>";
+					print "<form action=\"../out/out.RewindWorkflow.php\" method=\"post\">".createHiddenFieldWithKey('rewindworkflow')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"icon-refresh\"></i> ".getMLText('rewind_workflow')."</button></form>";
 				}
 			}

@ -934,7 +934,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if($attributes) {
 					foreach($attributes as $attribute) {
 						$attrdef = $attribute->getAttributeDefinition();
-						print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars($attribute->getValue())."</li>\n";
+						print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $attribute->getValueAsArray()))."</li>\n";
 					}
 				}
 				print "</ul>\n";
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@ -146,7 +146,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 		}
 		echo "<div class=\"span".$RightColumnSpan."\">\n";

-		if ($enableDropUpload) {
+		if ($enableDropUpload && $folder->getAccessMode($user) >= M_READWRITE) {
 			echo "<div class=\"row-fluid\">";
 			echo "<div class=\"span8\">";
 		}
@ -203,7 +203,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 			?>
 					<tr>
 					<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-					<td><?php echo htmlspecialchars($attribute->getValue()); ?></td>
+					<td><?php echo htmlspecialchars(implode(', ', $attribute->getValueAsArray())); ?></td>
 					</tr>
 			<?php
 				}
@ -211,7 +211,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 			echo "</table>\n";
 			$this->contentContainerEnd();
 		}
-		if ($enableDropUpload) {
+		if ($enableDropUpload && $folder->getAccessMode($user) >= M_READWRITE) {
 			echo "</div>";
 			echo "<div class=\"span4\">";
 			$this->contentHeading(getMLText("dropupload"), true);