Merge branch 'develop' into seeddms-5.1.x

inc/inc.ClassAcl.php

@@ -155,20 +155,21 @@ class SeedDMS_Aro extends SeedDMS_AroAco { /* {{{ */
 		} elseif(is_object($id)) {
 			if($dms->getClassname('role') == get_class($id)) {
 				$model = 'Role';
-				$queryStr = "SELECT * FROM tblAros WHERE model=".$model." AND foreignid=".$id->getID();
+				$queryStr = "SELECT * FROM tblAros WHERE model=".$db->qstr($model)." AND foreignid=".$id->getID();
 				$resArr = $db->getResultArray($queryStr);
 				if (is_bool($resArr) && $resArr == false)
 					return null;
 				if (count($resArr) != 1)
 					return null;
 				$parentid = $resArr[0]['parent'];
+				$resArr = $resArr[0];
 			} else {
 				return null;
 			}
 		}
 
-		if($resArr['model'] == 'Group') {
+		if($resArr['model'] == 'Role') {
-			$classname = $dms->getClassname('group');
+			$classname = $dms->getClassname('role');
 			$object = $classname::getInstance($resArr['foreignid'], $dms);
 		} else {
 			$object = null;

out/out.DocumentVersionDetail.php

@@ -70,7 +70,7 @@ $folder = $document->getFolder();
 $accessop = new SeedDMS_AccessOperation($dms, $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, 'viewonlinefiletypes'=>$settings->_viewOnlineFileTypes, 'enableversionmodification'=>$settings->_enableVersionModification, 'previewwidthdetail'=>$settings->_previewWidthDetail, 'previewconverters'=>$settings->_converters['preview'], 'cachedir'=>$settings->_cacheDir, 'timeout'=>$settings->_cmdTimeout));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'viewonlinefiletypes'=>$settings->_viewOnlineFileTypes, 'enableversionmodification'=>$settings->_enableVersionModification, 'previewWidthDetail'=>$settings->_previewWidthDetail, 'previewconverters'=>$settings->_converters['preview'], 'cachedir'=>$settings->_cacheDir, 'timeout'=>$settings->_cmdTimeout));
 if($view) {
 	$view->setParam('accessobject', $accessop);
 	$view->show();

views/bootstrap/class.AdminTools.php

@@ -48,6 +48,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 	<div class="row-fluid">
 		<a href="../out/out.UsrMgr.php" class="span3 btn btn-medium"><i class="icon-user"></i><br /><?php echo getMLText("user_management")?></a>
 		<a href="../out/out.GroupMgr.php" class="span3 btn btn-medium"><i class="icon-group"></i><br /><?php echo getMLText("group_management")?></a>
+		<a href="../out/out.RoleMgr.php" class="span3 btn btn-medium"><i class="icon-bullseye"></i><br /><?php echo getMLText("role_management")?></a>
 	</div>
 	<div class="row-fluid">
 		<a href="../out/out.BackupTools.php" class="span3 btn btn-medium"><i class="icon-hdd"></i><br /><?php echo getMLText("backup_tools")?></a>

views/bootstrap/class.Bootstrap.php

@@ -665,6 +665,7 @@ $(document).ready(function () {
 		echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("user_group_management")." <i class=\"icon-caret-down\"></i></a>\n";
 		echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		echo "      <li><a href=\"../out/out.UsrMgr.php\">".getMLText("user_management")."</a></li>\n";
+		echo "      <li><a href=\"../out/out.RoleMgr.php\">".getMLText("role_management")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.GroupMgr.php\">".getMLText("group_management")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.UserList.php\">".getMLText("user_list")."</a></li>\n";
 		echo "     </ul>\n";

views/bootstrap/class.Search.php

@@ -213,6 +213,27 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerEnd();
 // }}}
 ?>
+<?php
+		/* First check if any of the folder filters are set. If it is,
+		 * open the accordion.
+		 */
+		$openfilterdlg = false;
+		if($attrdefs) {
+			foreach($attrdefs as $attrdef) {
+				$attricon = '';
+				if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document || $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) {
+					if(!empty($attributes[$attrdef->getID()]))
+						$openfilterdlg = true;
+				}
+			}
+		}
+		if($categories)
+			$openfilterdlg = true;
+		if($status)
+			$openfilterdlg = true;
+		if($expirationdate)
+			$openfilterdlg = true;
+?>
 <?php if($totaldocs): ?>
 <div class="accordion" id="accordion1">
   <div class="accordion-group">
@@ -244,27 +265,6 @@ $(document).ready( function() {
   </div>
 </div>
 <?php endif; ?>
-<?php
-		/* First check if any of the folder filters are set. If it is,
-		 * open the accordion.
-		 */
-		$openfilterdlg = false;
-		if($attrdefs) {
-			foreach($attrdefs as $attrdef) {
-				$attricon = '';
-				if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document || $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) {
-					if(!empty($attributes[$attrdef->getID()]))
-						$openfilterdlg = true;
-				}
-			}
-		}
-		if($categories)
-			$openfilterdlg = true;
-		if($status)
-			$openfilterdlg = true;
-		if($expirationdate)
-			$openfilterdlg = true;
-?>
 <div class="accordion" id="accordion2">
   <div class="accordion-group">
     <div class="accordion-heading">