Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

CHANGELOG

@@ -182,6 +182,8 @@
 - fix selection of documents/folders
 - new hooks SeedDMS_View_Document::[startRightColumn|extraVersionsViews|prePreviousVersionsTab|preLatestVersionTab]
 - add expiration of documents in 3 years
+- fix setting quota when importing users
+- export csv file of users of a group
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.19

SeedDMS_Core/Core/inc.ClassGroup.php

@@ -223,7 +223,9 @@ class SeedDMS_Core_Group { /* {{{ */
 		$classname = $this->_dms->getClassname('user');
 		foreach ($resArr as $row) {
 			/** @var SeedDMS_Core_User $user */
-			$user = new $classname($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $row["role"], $row['hidden']);
+			$role = $classnamerole::getInstance($row['role'], $this->_dms);
+			$user = new $classname($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $role, $row['hidden']);
+			$user->setDMS($this->_dms);
 			array_push($managers, $user);
 		}
 		return $managers;
@@ -595,7 +597,7 @@ class SeedDMS_Core_Group { /* {{{ */
 		$notifications = array();
 		foreach ($resArr as $row) {
 			$not = new SeedDMS_Core_Notification($row["target"], $row["targetType"], $row["userID"], $row["groupID"]);
-			$not->setDMS($this);
+			$not->setDMS($this->_dms);
 			array_push($notifications, $not);
 		}
 

SeedDMS_Core/package.xml

@@ -27,6 +27,7 @@
 - SeedDMS_Core_DMS::getDocumentList() returns false, if an unknown list passed
 - SeedDMS_Core_Document::getDocumentFiles() has new parameter to select only those files attached to a specific version of the document
 - removing a document version will not remove attachments of the document anymore
+- set dms of new user instances in SeedDMS_Core_Group
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

controllers/class.UserListCsv.php

@@ -26,8 +26,13 @@ class SeedDMS_Controller_UserListCsv extends SeedDMS_Controller_Common {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$settings = $this->params['settings'];
+		$group = $this->params['group'];
 
-		$allUsers = $dms->getAllUsers($settings->_sortUsersInList);
+		if($group) {
+			$allUsers = $group->getUsers();
+		} else {
+			$allUsers = $dms->getAllUsers($settings->_sortUsersInList);
+		}
 		$m = 0;
 		foreach($allUsers as $u) {
 			$m = max($m, count($u->getGroups()));

op/op.ImportUsers.php

@@ -237,7 +237,7 @@ if (isset($_FILES['userdata']) && $_FILES['userdata']['error'] == 0) {
 					if(isset($u['quota']) && $u['quota'] != $eu->getQuota()) {
 						$log[$uhash][] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "Quota of user updated. '".$u['quota']."' != '".$eu->getQuota()."'");
 						if($makeupdate)
-							$eu->setQuota($u['language']);
+							$eu->setQuota($u['quota']);
 					}
 					if(isset($u['homefolder']) && $u['homefolder']->getId() != $eu->getHomeFolder()) {
 						$log[$uhash][] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "Homefolder of user updated. '".(is_object($u['homefolder']) ? $u['homefolder']->getId() : '')."' != '".($eu->getHomeFolder() ? $eu->getHomeFolder() : '')."'");

op/op.UserListCsv.php

@@ -34,9 +34,15 @@ if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
+if(!empty($_GET['groupid'])) {
+	$group = $dms->getGroup((int) $_GET['groupid']);
+} else {
+	$group = null;
+}
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
+$controller->setParam('group', $group);
 if(!$controller->run()) {
 	if ($controller->getErrorMsg() != '')
 		$errormsg = $controller->getErrorMsg();

views/bootstrap/class.GroupMgr.php

@@ -164,6 +164,7 @@ $(document).ready( function() {
   <ul class="dropdown-menu">
 <?php
 			echo '<li><a href="../out/out.RemoveGroup.php?groupid='.$selgroup->getID().'"><i class="fa fa-remove"></i> '.getMLText("rm_group").'</a><li>';
+			echo '<li><a href="../op/op.UserListCsv.php?groupid='.$selgroup->getID().'"><i class="fa fa-download"></i> '.getMLText("export_user_list_csv").'</a><li>';
 ?>
 	</ul>
 </div>