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

out/out.AddEvent.php

@@ -25,6 +25,7 @@ require_once("inc/inc.Init.php");
 require_once("inc/inc.Extension.php");
 require_once("inc/inc.DBInit.php");
 require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.ClassAccessOperation.php");
 require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
@@ -38,6 +39,8 @@ if ($user->isGuest()) {
 	UI::exitError(getMLText("edit_event"),getMLText("access_denied"));
 }
 
+$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
+
 if($view) {
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('strictformcheck', $settings->_strictFormCheck);

views/bootstrap/class.AddEvent.php

@@ -78,7 +78,6 @@ $(document).ready(function() {
 		$this->pageNavigation("", "calendar");
 
 		$this->contentHeading(getMLText("add_event"));
-		$this->contentContainerStart();
 
 		$expdate = getReadableDate();
 ?>
@@ -87,6 +86,7 @@ $(document).ready(function() {
 		<?php echo createHiddenFieldWithKey('addevent'); ?>
 
 <?php
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("from"),
 			$this->getDateChooser($expdate, "from", $this->params['session']->getLanguage())
@@ -114,13 +114,13 @@ $(document).ready(function() {
 				'cols'=>80
 			)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit(getMLText('add_event'));
 ?>
 
 </form>
 
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

views/bootstrap/class.Calendar.php

@@ -65,13 +65,13 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
 		if($event) {
 //			print_r($event);
 			$this->contentHeading(getMLText('edit_event'));
-			$this->contentContainerStart();
 ?>
 
 <form class="form-horizontal" action="../op/op.EditEvent.php" id="form1" name="form1" method="post">
   <?php echo createHiddenFieldWithKey('editevent'); ?>
 	<input type="hidden" name="eventid" value="<?php echo (int) $event["id"]; ?>">
 <?php
+			$this->contentContainerStart();
 			$this->formField(
 				getMLText("from"),
 				$this->getDateChooser(getReadableDate($event["start"]), "from")
@@ -100,11 +100,11 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
 					'required'=>$strictformcheck
 				)
 			);
+			$this->contentContainerEnd();
 			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
-			$this->contentContainerEnd();
 			$this->contentHeading(getMLText('rm_event'));
 		$this->contentContainerStart();
 ?>

views/bootstrap/class.KeywordChooser.php

@@ -142,8 +142,7 @@ myTA.focus();
 			$owner = $category->getOwner();
 			if($owner->isAdmin()) {
 				$lists = $category->getKeywordLists();
-				if(count($lists) == 0) print getMLText("no_default_keywords");
+				if(count($lists)) {
-				else {
 					$kw = array();
 					foreach ($lists as $list) {
 						$kw[] =  "<a class=\"insertkeyword\" keyword=\"".htmlspecialchars($list["keywords"])."\"><span class=\"badge badge-secondary\">".htmlspecialchars($list["keywords"])."</span></a>";
@@ -180,8 +179,7 @@ myTA.focus();
 			$owner = $category->getOwner();
 			if(!$owner->isAdmin()) {
 				$lists = $category->getKeywordLists();
-				if(count($lists) == 0) print getMLText("no_default_keywords");
+				if(count($lists)) {
-				else {
 					$kw = array();
 					foreach ($lists as $list) {
 						$kw[] =  "<a class=\"insertkeyword\" keyword=\"".htmlspecialchars($list["keywords"])."\"><span class=\"badge badge-secondary\">".htmlspecialchars($list["keywords"])."</span></a>";

views/bootstrap4/class.Bootstrap4.php

@@ -1819,7 +1819,7 @@ $(document).ready(function() {
 			if($users) {
 				$allowempty = $attrdef->getMinValues() == 0;
 				$allowmultiple = $attrdef->getMultipleValues();
-				$content .= "<select class=\"chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"".$fieldname."[".$attrdef->getId()."]".($allowmultiple ? '[]' : '')."\"".($allowmultiple ? " multiple" : "")." data-placeholder=\"".getMLText("select_user")."\">";
+				$content .= "<select class=\"form-control chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"".$fieldname."[".$attrdef->getId()."]".($allowmultiple ? '[]' : '')."\"".($allowmultiple ? " multiple" : "")." data-placeholder=\"".getMLText("select_user")."\">";
 				if($allowempty)
 					$content .= "<option value=\"\"></option>";
 				foreach($users as $curuser) {
@@ -1839,7 +1839,7 @@ $(document).ready(function() {
 			if($groups) {
 				$allowempty = $attrdef->getMinValues() == 0;
 				$allowmultiple = $attrdef->getMultipleValues();
-				$content .= "<select class=\"chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"".$fieldname."[".$attrdef->getId()."]".($allowmultiple ? '[]' : '')."\"".($allowmultiple ? " multiple" : "")." data-placeholder=\"".getMLText("select_group")."\">";
+				$content .= "<select class=\"form-control chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"".$fieldname."[".$attrdef->getId()."]".($allowmultiple ? '[]' : '')."\"".($allowmultiple ? " multiple" : "")." data-placeholder=\"".getMLText("select_group")."\">";
 				if($allowempty)
 					$content .= "<option value=\"\"></option>";
 				foreach($groups as $curgroup) {
@@ -1862,7 +1862,7 @@ $(document).ready(function() {
 				} else {
 					$content .= "\" data-allow-clear=\"true\"";
 				}
-				$content .= "".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '')." class=\"chzn-select\" data-placeholder=\"".getMLText("select_value")."\">";
+				$content .= "".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '')." class=\"form-control chzn-select\" data-placeholder=\"".getMLText("select_value")."\">";
 				if(!$attrdef->getMultipleValues()) {
 					$content .= "<option value=\"\"></option>";
 				}