From: Banana <mail@bananas-playground.net>
Date: Fri, 8 Jan 2021 10:30:39 +0000 (+0100)
Subject: collection management can update the entries with the rights of the collection
X-Git-Tag: 1.1~30
X-Git-Url: http://91.132.146.200/gitweb/?a=commitdiff_plain;h=45993d7ee598890b0c428820114536868c2c46a5;p=bibliotheca-php.git

collection management can update the entries with the rights of the collection
---

diff --git a/CHANGELOG b/CHANGELOG
index c6c3032..0bc865f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,11 +3,12 @@
 	* Missing changelog file
 	* api has its own log file now.
 	* User profile for editing own settings.
+	* Collection management has the option to update entry rights with the collection ones.
 
 1.0 - Castle 20210106
 	* First usable version
 	* Using as a collection management software will work
-	* Rights management needs tweeking, so use the admin account for a start
+	* Rights management needs tweaking, so use the admin account for a start
 	* Documentation covers the basics
 	* Use it and give feedback.
 	* Also, make backups.
diff --git a/webclient/lib/managecollections.class.php b/webclient/lib/managecollections.class.php
index a31328e..fc6b86e 100644
--- a/webclient/lib/managecollections.class.php
+++ b/webclient/lib/managecollections.class.php
@@ -329,6 +329,9 @@ class ManageCollections {
 			try {
 				$this->_DB->query($queryStr);
 				$this->_updateToolRelation($data['id'],$data['tool']);
+				if($data['doRightsForEntries'] === true) {
+					$this->_updateEntryRights($data['id'], $data['owner'], $data['group'], $data['rights']);
+				}
 				$ret = true;
 			}
 			catch (Exception $e) {
@@ -536,11 +539,37 @@ class ManageCollections {
 			}
 			$this->_DB->commit();
 			$ret = true;
-		} catch (Exception $e) {
+		}
+		catch (Exception $e) {
 			$this->_DB->rollback();
 			error_log("[ERROR] ".__METHOD__." mysql catch: ".$e->getMessage());
 		}
 
 		return $ret;
 	}
+
+	private function _updateEntryRights($collectionId, $owner=false, $group=false, $rights=false) {
+		if(!empty($collectionId)) {
+			$queryStr = "UPDATE `".DB_PREFIX."_collection_entry_".$collectionId."` SET";
+
+			if(Summoner::validate($owner, "digit")) {
+				$queryStr .= " `owner` = '".$this->_DB->real_escape_string($owner)."',";
+			}
+			if(Summoner::validate($group, "digit")) {
+				$queryStr .= " `group` = '".$this->_DB->real_escape_string($group)."',";
+			}
+			if(Summoner::validate($rights, "rights")) {
+				$queryStr .= " `rights` = '".$this->_DB->real_escape_string($rights)."',";
+			}
+			$queryStr = trim($queryStr, ",");
+
+			if(QUERY_DEBUG) error_log("[QUERY] ".__METHOD__." query: ".var_export($queryStr,true));
+			try {
+				$this->_DB->query($queryStr);
+			}
+			catch (Exception $e) {
+				error_log("[ERROR] ".__METHOD__." mysql catch: ".$e->getMessage());
+			}
+		}
+	}
 }
diff --git a/webclient/view/default/managecolletions/managecolletions.html b/webclient/view/default/managecolletions/managecolletions.html
index 486957f..a127e55 100644
--- a/webclient/view/default/managecolletions/managecolletions.html
+++ b/webclient/view/default/managecolletions/managecolletions.html
@@ -19,6 +19,36 @@
 						   value="<?php echo Summoner::ifset($TemplateData['editData'], 'description'); ?>">
 				</div>
 			</div>
+			<div class="uk-margin">
+				<label class="uk-form-label" for="defaultSearchField">Default global search field</label>
+				<div class="uk-form-controls">
+					<select class="uk-select" id="defaultSearchField" name="fdata[defaultSearchField]">
+						<option value="">Please select</option>
+						<?php foreach($TemplateData['existingFields'] as $k=>$v) { ?>
+						<option value="<?php echo $v['identifier']; ?>"
+						<?php if(Summoner::ifsetValue($TemplateData['editData'], 'defaultSearchField', $v['identifier'])) echo 'selected'; ?>
+						><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
+						<?php } ?>
+					</select>
+					<small>The field is used in the global search.
+						<span class="" uk-icon="icon: warning"></span> Altering the default search field results in
+						a DB reindex. This could take some time, depending on the amount of data.</small>
+				</div>
+			</div>
+			<div class="uk-margin">
+				<label class="uk-form-label" for="tool">Tools</label>
+				<div class="uk-form-controls">
+					<select class="uk-select" id="tool" name="fdata[tool][]" multiple="multiple" size="5">
+						<option value="">None</option>
+						<?php foreach($TemplateData['toolSelection'] as $k=>$v) { ?>
+						<option value="<?php echo $k; ?>"
+						<?php if(Summoner::ifset($TemplateData['editData']['tool'],$k)) echo 'selected'; ?>
+						><?php echo $v['name']; ?> (<?php echo $v['description']; ?>)</option>
+						<?php } ?>
+					</select>
+				</div>
+			</div>
+			<hr class="uk-margin-large">
 			<div class="uk-margin">
 				<label class="uk-form-label" for="owner">Owner</label>
 				<div class="uk-form-controls">
@@ -83,46 +113,26 @@
 					</table>
 				</div>
 			</div>
+			<?php if(Summoner::ifset($TemplateData['editData'], 'name')) { ?>
 			<div class="uk-margin">
-				<label class="uk-form-label" for="tool">Tools</label>
-				<div class="uk-form-controls">
-					<select class="uk-select" id="tool" name="fdata[tool][]" multiple="multiple" size="5">
-						<option value="">None</option>
-						<?php foreach($TemplateData['toolSelection'] as $k=>$v) { ?>
-						<option value="<?php echo $k; ?>"
-						<?php if(Summoner::ifset($TemplateData['editData']['tool'],$k)) echo 'selected'; ?>
-						><?php echo $v['name']; ?> (<?php echo $v['description']; ?>)</option>
-						<?php } ?>
-					</select>
+				<div class="uk-form-label">Update entry with collection rights</div>
+				<div class="uk-form-controls uk-form-controls-text">
+					<label>
+						<input class="uk-checkbox" type="checkbox" name="fdata[doRightsForEntries]" value="1">
+						Warning: This will overwrite existing entry rights (user, group, rights) with the ones from the collection!
+					</label>
 				</div>
 			</div>
-			<?php if(Summoner::ifset($TemplateData['editData'], 'name')) { ?>
 			<div class="uk-margin">
 				<div class="uk-form-label">Delete <span uk-icon="warning"></span></div>
 				<div class="uk-form-controls uk-form-controls-text">
 					<label>
 						<input class="uk-checkbox" type="checkbox" name="fdata[doDelete]" value="1">
-						Warning: this will delete ALL the data in this collection!
+						Warning: This will delete ALL the data in this collection!
 					</label>
 				</div>
 			</div>
 			<?php } ?>
-			<div class="uk-margin">
-				<label class="uk-form-label" for="defaultSearchField">Default global search field</label>
-				<div class="uk-form-controls">
-					<select class="uk-select" id="defaultSearchField" name="fdata[defaultSearchField]">
-						<option value="">Please select</option>
-						<?php foreach($TemplateData['existingFields'] as $k=>$v) { ?>
-						<option value="<?php echo $v['identifier']; ?>"
-						<?php if(Summoner::ifsetValue($TemplateData['editData'], 'defaultSearchField', $v['identifier'])) echo 'selected'; ?>
-						><?php echo $v['displayname']; ?> (<?php echo $v['type']; ?>)</option>
-						<?php } ?>
-					</select>
-					<small>The field is used in the global search.
-					<span class="" uk-icon="icon: warning"></span> Altering the default search field results in
-					a DB reindex. This could take some time, depending on the amount of data.</small>
-				</div>
-			</div>
 			<div class="uk-margin">
 				<button class="uk-button uk-button-primary" type="submit" name="submitForm">
 					Save
diff --git a/webclient/view/default/managecolletions/managecolletions.php b/webclient/view/default/managecolletions/managecolletions.php
index dbc965e..b029a3b 100644
--- a/webclient/view/default/managecolletions/managecolletions.php
+++ b/webclient/view/default/managecolletions/managecolletions.php
@@ -71,6 +71,11 @@ if(isset($_POST['submitForm'])) {
 			$_saveData['tool'] = $fdata['tool'];
 		}
 
+		$_saveData['doRightsForEntries'] = false;
+		if(isset($fdata['doRightsForEntries'])) {
+			$_saveData['doRightsForEntries'] = true;
+		}
+
 		if(!empty($TemplateData['editData']['name'])) { // EDIT
 			if(isset($fdata['doDelete'])) {
 				$do = $ManangeCollections->deleteCollection($_id);