[serversetup-bwlp] add location selection to menu edit + ui improvements

- add multiselect to select the locations
- add architecture information to the bootentry select modal
- add glyphicon to the hide entry column header
- default menu is now selected in the menu list
- fixed error when creating a menu (isdefault has no default value)
  and when creating a menu without bootentries

4 files changed, 261 insertions, 98 deletions

diff --git a/modules-available/serversetup-bwlp/config.json b/modules-available/serversetup-bwlp/config.json
index ff485760..8b3ce2a3 100644
--- a/modules-available/serversetup-bwlp/config.json
+++ b/modules-available/serversetup-bwlp/config.json
@@ -2,6 +2,7 @@
 	"category": "main.settings-server",
 	"dependencies" : [
 		"locations",
-		"js_jqueryui"
+		"js_jqueryui",
+		"bootstrap_multiselect"
 	]
 }
\ No newline at end of file
diff --git a/modules-available/serversetup-bwlp/page.inc.php b/modules-available/serversetup-bwlp/page.inc.php
index 615bac64..87c57dea 100644
--- a/modules-available/serversetup-bwlp/page.inc.php
+++ b/modules-available/serversetup-bwlp/page.inc.php
@@ -87,6 +87,11 @@ class Page_ServerSetup extends Page
 			$this->deleteMenu();
 		}
 
+		if ($action === 'setDefaultMenu') {
+			User::assertPermission('ipxe.menu.edit', 0);
+			$this->setDefaultMenu();
+		}
+
 		if (Request::isPost()) {
 			Util::redirect('?do=serversetup');
 		}
@@ -213,7 +218,8 @@ class Page_ServerSetup extends Page
 
 		Render::addTemplate('menu-list', array(
 			'menuTable' => $menuTable,
-			'allowAddMenu' => $allowAddMenu
+			'allowAddMenu' => $allowAddMenu,
+			'showSetDefault' => User::hasPermission('ipxe.menu.edit', 0)
 		));
 	}
 
@@ -252,11 +258,15 @@ class Page_ServerSetup extends Page
 			Message::addError('invalid-menu-id', $id);
 			Util::redirect('?do=serversetup&show=menu');
 		}
-		if (!$this->hasMenuPermission($id, 'ipxe.menu.edit')) {
+		if ($id !== 0 && !$this->hasMenuPermission($id, 'ipxe.menu.edit')) {
 			$menu['readonly'] = 'readonly';
 			$menu['disabled'] = 'disabled';
 			$menu['plainpass'] = '';
 		}
+		if (!User::hasPermission('ipxe.menu.edit', 0)) {
+			$menu['globalMenuWarning'] = true;
+		}
+
 		$menu['timeout'] = round($menu['timeoutms'] / 1000);
 		$menu['entries'] = Database::queryAll("SELECT menuentryid, entryid, hotkey, title, hidden, sortval, plainpass FROM
 			serversetup_menuentry WHERE menuid = :id ORDER BY sortval ASC", compact('id'));
@@ -264,13 +274,50 @@ class Page_ServerSetup extends Page
 		$menu['entrylist'] = Database::queryAll("SELECT entryid, title, hotkey, data FROM serversetup_bootentry ORDER BY title ASC");
 		foreach ($menu['entrylist'] as &$bootentry) {
 			$bootentry['json'] = $bootentry['data'];
-			$bootentry['data'] = json_decode($bootentry['data']);
+			$bootentry['data'] = json_decode($bootentry['data'], true);
+			if (array_key_exists('arch', $bootentry['data'])) {
+				$bootentry['data']['PCBIOS'] = array('executable' => $bootentry['data']['executable']['PCBIOS'],
+																'initRd' => $bootentry['data']['initRd']['PCBIOS'],
+																'commandLine' => $bootentry['data']['commandLine']['PCBIOS']);
+				$bootentry['data']['EFI'] = array('executable' => $bootentry['data']['executable']['EFI'],
+															'initRd' => $bootentry['data']['initRd']['EFI'],
+															'commandLine' => $bootentry['data']['commandLine']['EFI']);
+
+				if ($bootentry['data']['arch'] === 'PCBIOS') {
+					$bootentry['data']['arch'] = Dictionary::translateFile('template-tags','lang_biosOnly', true);
+					unset($bootentry['data']['EFI']);
+				} else if ($bootentry['data']['arch'] === 'EFI') {
+					$bootentry['data']['arch'] = Dictionary::translateFile('template-tags','lang_efiOnly', true);
+					unset($bootentry['data']['PCBIOS']);
+				} else {
+					$bootentry['data']['arch'] = Dictionary::translateFile('template-tags','lang_archBoth', true);
+				}
+
+			} else {
+				$bootentry['data']['arch'] = Dictionary::translateFile('template-tags','lang_archAgnostic', true);
+				$bootentry['data']['archAgnostic'] = array('executable' => $bootentry['data']['executable'],
+																		'initRd' => $bootentry['data']['initRd'],
+																		'commandLine' => $bootentry['data']['commandLine']);
+			}
 		}
 		foreach ($menu['entries'] as &$entry) {
 			$entry['isdefault'] = ($entry['menuentryid'] == $menu['defaultentryid']);
 			// TODO: plainpass only when permissions
 		}
 		// TODO: Make assigned locations editable
+
+		$currentLocations = Database::queryColumnArray('SELECT locationid FROM serversetup_menu_location
+																					WHERE menuid = :menuid', array('menuid' => $id));
+		$menu['locations'] = Location::getLocations($currentLocations);
+
+		// if user has no permission to edit for this location, disable the location in the select
+		$allowedEditLocations = User::getAllowedLocations('ipxe.menu.edit');
+		foreach ($menu['locations'] as &$loc) {
+			if (!in_array($loc["locationid"], $allowedEditLocations)) {
+				$loc["disabled"] = "disabled";
+			}
+		}
+
 		Permission::addGlobalTags($menu['perms'], 0, ['ipxe.menu.edit']);
 		Render::addTemplate('menu-edit', $menu);
 	}
@@ -300,6 +347,7 @@ class Page_ServerSetup extends Page
 			$params['oldentryid'] = $params['entryid'] = $row['entryid'];
 			$params['builtin'] = $row['builtin'];
 		}
+
 		Render::addTemplate('ipxe-new-boot-entry', $params);
 	}
 
@@ -361,6 +409,17 @@ class Page_ServerSetup extends Page
 		Message::addSuccess('bootentry-deleted');
 	}
 
+	private function setDefaultMenu()
+	{
+		$id = Request::post('menuid', false, 'int');
+		if ($id === false) {
+			Message::addError('main.parameter-missing', 'menuid');
+			return;
+		}
+		Database::exec('UPDATE serversetup_menu SET isdefault = (menuid = :menuid)', ['menuid' => $id]);
+		Message::addSuccess('menu-set-default');
+	}
+
 	private function deleteMenu()
 	{
 		$id = Request::post('deleteid', false, 'int');
@@ -374,7 +433,6 @@ class Page_ServerSetup extends Page
 		}
 		Database::exec("DELETE FROM serversetup_menu WHERE menuid = :menuid", array("menuid" => $id));
 		Message::addSuccess('menu-deleted');
-
 	}
 
 	private function saveMenu()
@@ -384,13 +442,30 @@ class Page_ServerSetup extends Page
 			Message::addError('main.parameter-missing', 'menuid');
 			return;
 		}
-		// TODO: Validate new locations to be saved (and actually save them)
+
+		$locationids = Request::post('locations', [], "ARRAY");
+		// check if the user is allowed to edit the menu on the affected locations
+		$allowedEditLocations = User::getAllowedLocations('ipxe.menu.edit');
+		$currentLocations = Database::queryColumnArray('SELECT locationid FROM serversetup_menu_location
+																					WHERE menuid = :menuid', array('menuid' => $id));
+		// permission denied if the user tries to assign or remove a menu to/from locations he has no edit rights for
+		// or if the user tries to save a menu without locations but does not have the permission for the root location (0)
+		if (!in_array(0, $allowedEditLocations)
+				&& (
+					(!empty(array_diff($locationids, $allowedEditLocations)) && !empty(array_diff($currentLocations, $allowedEditLocations)))
+					|| empty($locationids)
+				)
+			) {
+			Message::addError('main.no-permission');
+			Util::redirect('?do=serversetup');
+		}
+
 		$insertParams = [
 			'title' => IPxe::sanitizeIpxeString(Request::post('title', '', 'string')),
 			'timeoutms' => abs(Request::post('timeout', 0, 'int') * 1000),
 		];
 		if ($id === 0) {
-			Database::exec("INSERT INTO serversetup_menu (title, timeoutms) VALUES (:title, :timeoutms)", $insertParams);
+			Database::exec("INSERT INTO serversetup_menu (title, timeoutms, isdefault) VALUES (:title, :timeoutms, 0)", $insertParams);
 			$menu['menuid'] = $id = Database::lastInsertId();
 		} else {
 			$menu = Database::queryFirst("SELECT m.menuid, GROUP_CONCAT(l.locationid) AS locations
@@ -410,88 +485,98 @@ class Page_ServerSetup extends Page
 					WHERE menuid = :menuid', $insertParams);
 		}
 
-		if (User::hasPermission('ipxe.menu.edit', 0)
-				&& Request::post('defmenu', false, 'boolean')) {
-			Database::exec('UPDATE serversetup_menu SET isdefault = (menuid = :menuid)', ['menuid' => $id]);
-		}
-
 		$keepIds = [];
 		$entries = Request::post('entry', false, 'array');
 		$wantedDefaultEntryId = Request::post('defaultentry', null, 'string');
 		$defaultEntryId = null;
 
-		foreach ($entries as $key => $entry) {
-			if (!isset($entry['sortval'])) {
-				error_log(print_r($entry, true));
-				continue;
-			}
-			// Fallback defaults
-			$entry += [
-				'entryid' => null,
-				'title' => '',
-				'hidden' => 0,
-				'plainpass' => '',
-			];
-			$params = [
-				'title' => IPxe::sanitizeIpxeString($entry['title']),
-				'sortval' => (int)$entry['sortval'],
-				'menuid' => $menu['menuid'],
-			];
-			if (empty($entry['entryid'])) {
-				// Spacer
-				$params += [
+		if ($entries) {
+			foreach ($entries as $key => $entry) {
+				if (!isset($entry['sortval'])) {
+					error_log(print_r($entry, true));
+					continue;
+				}
+				// Fallback defaults
+				$entry += [
 					'entryid' => null,
-					'hotkey' => '',
-					'hidden' => 0, // Doesn't make any sense
-					'plainpass' => '', // Doesn't make any sense
+					'title' => '',
+					'hidden' => 0,
+					'plainpass' => '',
 				];
-			} else {
-				$params += [
-					'entryid' => $entry['entryid'], // TODO validate?
-					'hotkey' => MenuEntry::filterKeyName($entry['hotkey']),
-					'hidden' => (int)$entry['hidden'], // TODO (needs hotkey to make sense)
-					'plainpass' => $entry['plainpass'],
+				$params = [
+					'title' => IPxe::sanitizeIpxeString($entry['title']),
+					'sortval' => (int)$entry['sortval'],
+					'menuid' => $menu['menuid'],
 				];
-			}
-			if (is_numeric($key)) {
-				if ((string)$key === $wantedDefaultEntryId) { // Check now that we have generated our key
-					$defaultEntryId = $key;
+				if (empty($entry['entryid'])) {
+					// Spacer
+					$params += [
+						'entryid' => null,
+						'hotkey' => '',
+						'hidden' => 0, // Doesn't make any sense
+						'plainpass' => '', // Doesn't make any sense
+					];
+				} else {
+					$params += [
+						'entryid' => $entry['entryid'], // TODO validate?
+						'hotkey' => MenuEntry::filterKeyName($entry['hotkey']),
+						'hidden' => (int)$entry['hidden'], // TODO (needs hotkey to make sense)
+						'plainpass' => $entry['plainpass'],
+					];
 				}
-				$keepIds[] = $key;
-				$params['menuentryid'] = $key;
-				$params['md5pass'] = IPxe::makeMd5Pass($entry['plainpass'], $key);
-				$ret = Database::exec('UPDATE serversetup_menuentry
+				if (is_numeric($key)) {
+					if ((string)$key === $wantedDefaultEntryId) { // Check now that we have generated our key
+						$defaultEntryId = $key;
+					}
+					$keepIds[] = $key;
+					$params['menuentryid'] = $key;
+					$params['md5pass'] = IPxe::makeMd5Pass($entry['plainpass'], $key);
+					$ret = Database::exec('UPDATE serversetup_menuentry
 					SET entryid = :entryid, hotkey = :hotkey, title = :title, hidden = :hidden, sortval = :sortval,
 						plainpass = :plainpass, md5pass = :md5pass
 					WHERE menuid = :menuid AND menuentryid = :menuentryid', $params, true);
-			} else {
-				$ret = Database::exec("INSERT INTO serversetup_menuentry
+				} else {
+					$ret = Database::exec("INSERT INTO serversetup_menuentry
 					(menuid, entryid, hotkey, title, hidden, sortval, plainpass, md5pass)
 					VALUES (:menuid, :entryid, :hotkey, :title, :hidden, :sortval, :plainpass, '')", $params, true);
-				if ($ret) {
-					$newKey = Database::lastInsertId();
-					if ((string)$key === $wantedDefaultEntryId) { // Check now that we have generated our key
-						$defaultEntryId = $newKey;
-					}
-					$keepIds[] = (int)$newKey;
-					if (!empty($entry['plainpass'])) {
-						Database::exec('UPDATE serversetup_menuentry SET md5pass = :md5pass WHERE menuentryid = :id', [
-							'md5pass' => IPxe::makeMd5Pass($entry['plainpass'], $newKey),
-							'id' => $newKey,
-						]);
+					if ($ret) {
+						$newKey = Database::lastInsertId();
+						if ((string)$key === $wantedDefaultEntryId) { // Check now that we have generated our key
+							$defaultEntryId = $newKey;
+						}
+						$keepIds[] = (int)$newKey;
+						if (!empty($entry['plainpass'])) {
+							Database::exec('UPDATE serversetup_menuentry SET md5pass = :md5pass WHERE menuentryid = :id', [
+								'md5pass' => IPxe::makeMd5Pass($entry['plainpass'], $newKey),
+								'id' => $newKey,
+							]);
+						}
 					}
 				}
+
+				if ($ret === false) {
+					Message::addWarning('error-saving-entry', $entry['title'], Database::lastError());
+				}
 			}
+			Database::exec('DELETE FROM serversetup_menuentry WHERE menuid = :menuid AND menuentryid NOT IN (:keep)',
+				['menuid' => $menu['menuid'], 'keep' => $keepIds]);
+			// Set default entry
+			Database::exec('UPDATE serversetup_menu SET defaultentryid = :default WHERE menuid = :menuid',
+				['menuid' => $menu['menuid'], 'default' => $defaultEntryId]);
+		} else {
+			Database::exec('DELETE FROM serversetup_menuentry WHERE menuid = :menuid', ['menuid' => $menu['menuid']]);
+			Database::exec('UPDATE serversetup_menu SET defaultentryid = NULL WHERE menuid = :menuid', ['menuid' => $menu['menuid']]);
+		}
 
-			if ($ret === false) {
-				Message::addWarning('error-saving-entry', $entry['title'], Database::lastError());
+		Database::exec('DELETE FROM serversetup_menu_location WHERE menuid = :menuid', ['menuid' => $menu['menuid']]);
+		if (!empty($locationids)) {
+			Database::exec('DELETE FROM serversetup_menu_location WHERE locationid IN (:locationids)', ['locationids' => $locationids]);
+			foreach ($locationids as $locationid) {
+				Database::exec('INSERT INTO serversetup_menu_location (menuid, locationid) VALUES (:menuid, :locationid)',
+					['menuid' => $menu['menuid'], 'locationid' => $locationid]);
 			}
 		}
-		Database::exec('DELETE FROM serversetup_menuentry WHERE menuid = :menuid AND menuentryid NOT IN (:keep)',
-			['menuid' => $menu['menuid'], 'keep' => $keepIds]);
-		// Set default entry
-		Database::exec('UPDATE serversetup_menu SET defaultentryid = :default WHERE menuid = :menuid',
-			['menuid' => $menu['menuid'], 'default' => $defaultEntryId]);
+
 		Message::addSuccess('menu-saved');
 	}
 
diff --git a/modules-available/serversetup-bwlp/templates/menu-edit.html b/modules-available/serversetup-bwlp/templates/menu-edit.html
index e695ef20..09814da9 100644
--- a/modules-available/serversetup-bwlp/templates/menu-edit.html
+++ b/modules-available/serversetup-bwlp/templates/menu-edit.html
@@ -38,12 +38,17 @@
 			</div>
 			<div class="row list-group-item">
 				<div class="col-sm-3">
+					<label for="panel-locations">{{lang_menuLocations}}</label>
 				</div>
 				<div class="col-sm-9">
-					<div class="checkbox">
-						<input name="defmenu" id="panel-defmenu" type="checkbox" {{#isdefault}}checked disabled{{/isdefault}} {{disabled}}>
-						<label for="panel-defmenu">{{lang_defaultMenu}}</label>
-					</div>
+					<select id="panel-locations" multiple name="locations[]">
+						{{#locations}}
+						<option value="{{locationid}}" {{disabled}} {{#selected}}selected{{/selected}}>{{locationpad}} {{locationname}}</option>
+						{{/locations}}
+					</select>
+					{{#globalMenuWarning}}
+						<span id="global-menu-warning" style="margin-left: 20px; color: red; display: none;">{{lang_globalMenuWarning}}</span>
+					{{/globalMenuWarning}}
 				</div>
 			</div>
 			<div>
@@ -56,7 +61,7 @@
 						<th>{{lang_title}}</th>
 						<th style="width: 150px">{{lang_hotkey}}</th>
 						<th style="width: 200px">{{lang_password}}</th>
-						<th style="width: 10px"></th>
+						<th style="width: 10px"><span class="glyphicon glyphicon-eye-close"></span></th>
 						<th style="width: 10px"></th>
 					</tr>
 					</thead>
@@ -124,7 +129,7 @@
 			</div>
 			<div class="text-right">
 				<a href="?do=serversetup&show=menu" type="button" class="btn btn-default">{{lang_cancel}}</a>
-				<button type="submit" class="btn btn-primary" {{disabled}}>
+				<button id="save-button" type="submit" class="btn btn-primary" {{disabled}}>
 					<span class="glyphicon glyphicon-floppy-disk"></span>
 					{{lang_save}}
 				</button>
@@ -154,29 +159,69 @@
 							</div>
 							{{#data}}
 								{{#script}}
-								<div class="form-group">
-									<label for="{{entryid}}-script">{{lang_scriptContent}}</label>
-									<pre id="{{entryid}}-script">{{.}}</pre>
-								</div>
+									<div class="form-group">
+										<label for="{{entryid}}-script">{{lang_scriptContent}}</label>
+										<pre id="{{entryid}}-script">{{.}}</pre>
+									</div>
+								{{/script}}
+								{{^script}}
+									<div class="form-group">
+										<label for="{{entryid}}-script">{{lang_archSelector}}</label>
+										<pre id="{{entryid}}-arch">{{arch}}</pre>
+									</div>
+									{{#archAgnostic}}
+										<div class="form-group">
+											<label for="{{entryid}}-executable">{{lang_imageToLoad}}</label>
+											<pre id="{{entryid}}-executable">{{executable}}</pre>
+										</div>
+										<div class="form-group">
+											<label for="{{entryid}}-initRd">{{lang_initRd}}</label>
+											<pre id="{{entryid}}-initRd">{{initRd}}</pre>
+										</div>
+										<div class="form-group">
+											<label for="{{entryid}}-commandLine">{{lang_commandLine}}</label>
+											<pre id="{{entryid}}-commandLine" >{{commandLine}}</pre>
+										</div>
+									{{/archAgnostic}}
+									{{#PCBIOS}}
+										<div class="panel panel-default">
+											<div class="panel-heading">PCBIOS</div>
+											<div class="panel-body">
+												<div class="form-group">
+													<label for="{{entryid}}-executable">{{lang_imageToLoad}}</label>
+													<pre id="{{entryid}}-executable">{{executable}}</pre>
+												</div>
+												<div class="form-group">
+													<label for="{{entryid}}-initRd">{{lang_initRd}}</label>
+													<pre id="{{entryid}}-initRd">{{initRd}}</pre>
+												</div>
+												<div class="form-group">
+													<label for="{{entryid}}-commandLine">{{lang_commandLine}}</label>
+													<pre id="{{entryid}}-commandLine" >{{commandLine}}</pre>
+												</div>
+											</div>
+										</div>
+									{{/PCBIOS}}
+									{{#EFI}}
+										<div class="panel panel-default">
+											<div class="panel-heading">EFI</div>
+											<div class="panel-body">
+												<div class="form-group">
+													<label for="{{entryid}}-executable">{{lang_imageToLoad}}</label>
+													<pre id="{{entryid}}-executable">{{executable}}</pre>
+												</div>
+												<div class="form-group">
+													<label for="{{entryid}}-initRd">{{lang_initRd}}</label>
+													<pre id="{{entryid}}-initRd">{{initRd}}</pre>
+												</div>
+												<div class="form-group">
+													<label for="{{entryid}}-commandLine">{{lang_commandLine}}</label>
+													<pre id="{{entryid}}-commandLine" >{{commandLine}}</pre>
+												</div>
+											</div>
+										</div>
+									{{/EFI}}
 								{{/script}}
-								{{#executable}}
-								<div class="form-group">
-									<label for="{{entryid}}-executable">{{lang_imageToLoad}}</label>
-									<pre id="{{entryid}}-executable">{{.}}</pre>
-								</div>
-								{{/executable}}
-								{{#initRd}}
-								<div class="form-group">
-									<label for="{{entryid}}-initRd">{{lang_initRd}}</label>
-									<pre id="{{entryid}}-initRd">{{.}}</pre>
-								</div>
-								{{/initRd}}
-								{{#commandLine}}
-								<div class="form-group">
-									<label for="{{entryid}}-commandLine">{{lang_commandLine}}</label>
-									<pre id="{{entryid}}-commandLine" >{{.}}</pre>
-								</div>
-								{{/commandLine}}
 							{{/data}}
 						</div>
 						{{/entrylist}}
@@ -244,6 +289,29 @@
 	var spacerText = "{{lang_spacer}}";
 
 	document.addEventListener("DOMContentLoaded", function() {
+		var locationSelect = $('#panel-locations');
+		locationSelect.multiselect({numberDisplayed: 1});
+		var globalMenuWarning = $('#global-menu-warning');
+		if (globalMenuWarning.length) {
+			var saveButton = $('#save-button');
+			if (locationSelect.val() !== null) {
+				saveButton.prop('disabled', false);
+				globalMenuWarning.hide();
+			} else {
+				saveButton.prop('disabled', true);
+				globalMenuWarning.show();
+			}
+			locationSelect.change(function () {
+				if ($(this).val() !== null) {
+					saveButton.prop('disabled', false);
+					globalMenuWarning.hide();
+				} else {
+					saveButton.prop('disabled', true);
+					globalMenuWarning.show();
+				}
+			});
+		}
+
 		function reassignSortValues() {
 			var startValue = 1;
 			$('.sort-val').each(function(index, element) {
diff --git a/modules-available/serversetup-bwlp/templates/menu-list.html b/modules-available/serversetup-bwlp/templates/menu-list.html
index 1f190bb7..5d8ee184 100644
--- a/modules-available/serversetup-bwlp/templates/menu-list.html
+++ b/modules-available/serversetup-bwlp/templates/menu-list.html
@@ -20,13 +20,22 @@
 				{{locationCount}}
 			</td>
 			<td align="center">
+				{{^isdefault}}
+					<form method="post" action="?do=serversetup" {{^showSetDefault}}style="display: none;"{{/showSetDefault}}>
+						<input type="hidden" name="token" value="{{token}}">
+						<input type="hidden" name="menuid" value="{{menuid}}">
+						<button type="submit" name="action" value="setDefaultMenu" class="btn btn-xs btn-info">
+							<span class="glyphicon glyphicon-ok"></span>
+						</button>
+					</form>
+				{{/isdefault}}
 				{{#isdefault}}
 					<span class="glyphicon glyphicon-ok"></span>
 				{{/isdefault}}
 			</td>
 			<td align="center">
 				{{#allowEdit}}
-					<a href="?do=serversetup&amp;show=editmenu&amp;id={{menuid}}" class="btn btn-xs btn-default">
+					<a href="?do=serversetup&amp;show=editmenu&amp;id={{menuid}}" class="btn btn-xs btn-primary">
 						<span class="glyphicon glyphicon-edit"></span>
 					</a>
 				{{/allowEdit}}