german language file updated

WebInterfaceDataset replaces CryptoBoxWebserverSettings
WebInterfaceSites replaces CryptoBoxWebserverSites
input validation rewritten
clearsiler macro 'print_form_header' now expects the 'action' as a parameter

pythonrewrite/templates/form_config.cs

@@ -3,7 +3,7 @@
 <div id="config">
     <h1><?cs var:html_escape(Lang.Title.Config) ?></h1>
 
-      <?cs call:print_form_header() ?>
+      <?cs call:print_form_header("config_do") ?>
 	<?cs if:Data.Config.AdminPasswordIsSet ?>
 			<p><label for="current_admin_password"><?cs var:html_escape(Lang.Text.EnterCurrentAdminPassword) ?></label><br/>
 				<input type="password" id="current_admin_password" name="current_admin_password" size="20" maxlength="40" /> </p>
@@ -26,7 +26,6 @@
 		    <?cs /each ?>
 		</select></p>
 
-	<input type="hidden" name="action" value="config_do" />
 	<button type="submit"><?cs var:html_escape(Lang.Button.SaveConfig) ?></button>
 
     </form>

pythonrewrite/templates/form_init.cs

@@ -3,14 +3,19 @@
 <h1><?cs var:html_escape(Lang.Title.Init) ?></h1>
 
 <div class="init">
-	<?cs call:print_form_header() ?>
+	<?cs call:print_form_header("init_do") ?>
 
 		<p class="note"><?cs var:html_escape(Lang.Text.InitWarning) ?></p>
 		<p><label for="confirm"><?cs var:html_escape(Lang.Text.ConfirmInitHint) ?><br/>
 			<span class="note" id="confirmtext"><?cs var:html_escape(Lang.Text.ConfirmInit)
 				?></span></label><br/>
 			<input type="text" id="confirm" name="confirm" size="30" maxlength="50" /></p>
-			<input type="hidden" name="action" value="init_do" />
+		<?cs if:Data.Init.isCrypto ?>
+			<p><label for="crypto_password"><?cs var:html_escape(Lang.Text.EnterNewCryptoPassword) ?></label> <input type="password" id="crypto_password" name="crypto_password" /></p>
+			<p><label for="crypto_password2"><?cs var:html_escape(Lang.Text.EnterSameCryptoPassword) ?></label> <input type="password" id="crypto_password2" name="crypto_password2" /></p>
+			<input type="hidden" name="encryption" value="1" />
+		<?cs /if ?>
+		<input type="hidden" name="device" value="<?cs var:Data.CurrentDisk.device ?>" />
 		<button type="submit"><?cs var:html_escape(Lang.Button.DoInit) ?></button>
 	</form>
 </div>

pythonrewrite/templates/form_init_partition.cs

@@ -2,7 +2,7 @@
 
 <h1><?cs var:html_escape(Lang.Title.Init) ?></h1>
 
-<?cs call:print_form_header() ?>
+<?cs call:print_form_header("volume_init_do") ?>
  
 	<p class="note"><?cs var:html_escape(Lang.Text.InitWarning) ?></p>
 	<?cs if:Data.Config.AdminPasswordIsSet ?>
@@ -27,7 +27,6 @@
  		<input type="text" id="confirm" name="confirm" size="30" maxlength="50" /></p>
 
 	<p><input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
-	<input type="hidden" name="action" value="volume_init_do" />
 	<button type="submit"><?cs var:html_escape(Lang.Button.InitContainer) ?></button></p>
 </form>
 

pythonrewrite/templates/form_mount.cs

@@ -10,7 +10,7 @@
 
 	<div align="center">
 
-		<?cs call:print_form_header() ?>
+		<?cs call:print_form_header("mount_do") ?>
 
 		<?cs if:subcount(Data.Disks.passive) > 1 ?>
 			<p><label for="device"><?cs var:html_escape(Lang.Text.ChoosePartition) ?></label>
@@ -30,7 +30,6 @@
 				?></label>
 			<input type="password" id="crypto_password" name="crypto_password" size="20" maxlength="40" /></p>
 
-			<input type="hidden" name="action" value="mount_do" />
 		<button type="submit"><?cs var:html_escape(Lang.Button.Mount) ?></button>
 
 		</form>

pythonrewrite/templates/form_umount.cs

@@ -1,6 +1,6 @@
 <?cs # $Id$ ?>
 
-<?cs if:subcount(Data.Disks.active) == 0 ?>
+<?cs if:Data.activeDisksCount == 0 ?>
 
 	<?cs call:warning('NoDiskAvailableForUmount') ?>
 
@@ -9,25 +9,28 @@
 	<h1><?cs var:html_escape(Lang.Title.Umount) ?></h1>
 
 	<div align="center">
-		<?cs call:print_form_header() ?>
+		<?cs call:print_form_header("umount_do") ?>
 
-		<?cs if:subcount(Data.Disks.active) > 1 ?>
+		<?cs if:Data.activeDisksCount > 1 ?>
 			<p><label for="device"><?cs var:html_escape(Lang.Text.ChoosePartition) ?></label>
 				<select name="device" id="device" size="0">
-					<?cs each:partition = Data.Disks.active ?><option value="<?cs
+					<?cs each:partition = Data.Disks
+					?><?cs if:partition.active ?><option value="<?cs
 						var:partition.device ?>"><?cs
-						var:partition.name ?></option>
+						var:partition.name ?></option><?cs /if ?>
 					<?cs /each ?>
 				</select></p>
 		<?cs else ?>
 			<?cs # the perl code should take care, that there is at least
 				one mounted disk - otherwise it should display a warning ?>
+			<?cs each:partition = Data.Disks ?><?cs
+				if:partition.active ?><?cs set:act_name = partition.name ?><?cs
+				act_device = partition.device ?><?cs /if ?><?cs /each ?>
 			<p><?cs var:html_escape(Lang.Text.ChosenPartition) ?>: <?cs
-				var:Data.Disks.active.0.name ?></p>
+				var:act_name ?></p>
 			<input type="hidden" name="device" value="<?cs
-				var:Data.Disks.active.0.device ?>"/>
+				var:act_device ?>"/>
 		<?cs /if ?>
-		<input type="hidden" name="action" value="umount_do" />
 		<button type="submit"><?cs var:html_escape(Lang.Button.Umount) ?></button>
 
 		</form>

pythonrewrite/templates/header.cs

@@ -16,7 +16,7 @@
 </head>
 <body>
 
-<?cs if:subcount(Data.Disks.available) > 0 ?>
+<?cs if:subcount(Data.Disks) > 0 ?>
 <div id="volumes">
 	<?cs include:Settings.TemplateDir + '/show_volumes.cs' ?>
 </div>
@@ -24,14 +24,13 @@
 
 <div id="lang">
 	<?cs each:item = Data.Languages ?>
-		<a href="<?cs call:link('weblang',name(item),'','','') ?><?cs
-			if:Data.QueryString ?>&<?cs var:Data.QueryString ?><?cs /if ?>"><?cs
+		<a href="<?cs call:link('','weblang',name(item),'','') ?>"><?cs
 			var:item ?></a><br/>
 	<?cs /each ?>
 </div>
 
 <div id="main">
-	<?cs if:subcount(Data.Disks.active) > 0 ?>
+	<?cs if:Data.activeDisksCount > 0 ?>
 	 <div id="head_red">
 	<?cs else ?>
 	 <div id="head_green">

pythonrewrite/templates/macros.cs

@@ -75,8 +75,8 @@ def:link(path, attr1, value1, attr2, value2)
 	?><?cs /if ?><?cs
  /def ?><?cs
 
-def:print_form_header() ?><?cs #
+def:print_form_header(action) ?><?cs #
 # the header of a form - including Setting.LinkAttrs
-	?><form action="<?cs call:link("","","","","") ?>" method="post" enctype="application/x-www-from-urlencoded" accept-charset="utf-8"><?cs
+	?><form action="<?cs call:link(action,"","","","") ?>" method="post" enctype="application/x-www-from-urlencoded" accept-charset="utf-8"><?cs
 /def ?>
 

pythonrewrite/templates/nav.cs

@@ -6,14 +6,14 @@
 <!-- TODO: remove the following lines, as soon as we completely switched to the volume-based user interface
     <?cs if:subcount(Data.Disks.passive) > 0 ?>
 		<a href="<?cs call:link('mount_ask','','','','') ?>" title="<?cs var:html_escape(Lang.Text.DoMount) ?>"><?cs var:html_escape(Lang.Button.Mount) ?></a><?cs /if ?>
-    <?cs if:subcount(Data.Disks.active) > 0 ?>
+    <?cs if:Data.activeDisksCount > 0 ?>
 		<a href="<?cs call:link('umount_ask','','','','') ?>" title="<?cs var:html_escape(Lang.Text.DoUmount) ?>"><?cs var:html_escape(Lang.Button.Umount) ?></a><?cs /if ?>
 -->
 
-	<a href="<?cs if:subcount(Data.Disks.available) > 1
+	<a href="<?cs if:subcount(Data.Disks) > 1
 				?><?cs call:link('show_status','','','','')
 			?><?cs else
-				?><?cs call:link('show_volume','device',Data.Disks.available.0.device,'','')
+				?><?cs call:link('show_volume','device',Data.Disks.0.device,'','')
 			?><?cs /if
 		?>" title="<?cs var:html_escape(Lang.Button.Status) ?>"><?cs var:html_escape(Lang.Button.Status) ?></a>
 <?cs /if ?>

pythonrewrite/templates/show_status.cs

@@ -2,27 +2,27 @@
 
 <h1><?cs var:html_escape(Lang.Title.Status) ?></h1>
 
-<?cs if:subcount(Data.Disks.available) == 0 ?>
+<?cs if:subcount(Data.Disks) == 0 ?>
 	<?cs # there are no partitions available ?>
 	<?cs # this case may never be true, as it should trigger a warning before ?>
 	<p>Sorry - you should have never seen this ...</p>
-<?cs # elif:subcount(Data.Disks.active) == subcount(Data.Disks.available) ?>
+<?cs # elif:Data.activeDisksCount == subcount(Data.Disks) ?>
 	<?cs # all available disks are mounted ?>
 	<?cs # we do not use this special condition now - or should we? ?>
-<?cs # elif:subcount(Data.Disks.passive) == subcount(Data.Disks.available) ?>
+<?cs # elif:subcount(Data.Disks.passive) == subcount(Data.Disks) ?>
 	<?cs # no available disk is mounted ?>
 	<?cs # we do not use this special condition now - or should we? ?>
 <?cs else ?>
 	<?cs # some are mounted - and some are not ... ?>
-	<?cs if:subcount(Data.Disks.active) > 0 ?>
+	<?cs if:Data.activeDisksCount > 0 ?>
 		<p><?cs var:html_escape(Lang.Text.ActivePartitions) ?>:
-			<ul><?cs each:partition = Data.Disks.active ?>
+			<ul><?cs each:partition = Data.Disks ?><?cs if:partition.active ?>
 				<li><a href="<?cs call:link('show_volume','device',partition.device,'','')
-					?>"><?cs var:partition.name ?></a></li><?cs /each ?></ul><?cs /if ?>
-	<?cs if:subcount(Data.Disks.passive) > 0 ?>
+					?>"><?cs var:partition.name ?></a></li><?cs /if ?><?cs /each ?></ul><?cs /if ?>
+	<?cs if:Data.activeDisksCount < subcount(Data.Disks) ?>
 		<p><?cs var:html_escape(Lang.Text.PassivePartitions) ?>:
-			<ul><?cs each:partition = Data.Disks.passive ?>
+			<ul><?cs each:partition = Data.Disks ?><?cs if:partition.active ?>
 				<li><a href="<?cs call:link('show_volume','device',partition.device,'','')
-					?>"><?cs var:partition.name ?></a></li><?cs /each ?></ul><?cs /if ?>
+					?>"><?cs var:partition.name ?></a></li><?cs /if ?><?cs /each ?></ul><?cs /if ?>
 <?cs /if ?>
 

pythonrewrite/templates/show_volume.cs

@@ -7,21 +7,19 @@
 	<?cs # is the disc active? ?>
 	<?cs if:!Data.CurrentDisk.active ?>
 		<h2>Mount container</h2>
-		<?cs call:print_form_header() ?>
+		<?cs call:print_form_header("mount_do") ?>
 			<p>
 			<?cs if:Data.CurrentDisk.encryption ?>
 				<label for="crypto_passwort"><?cs var:html_escape(Lang.Text.EnterCurrentCryptoPassword) ?></label>
 				<input type="password" id="crypto_password" name="crypto_password" size="20" maxlength="40" />
 			<?cs /if ?>
 			<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
-			<input type="hidden" name="action" value="mount_do" />
 			<button type="submit"><?cs var:html_escape(Lang.Button.Mount) ?></button></p>
 		</form>
 	<?cs else ?>
 		<h2>Unmount container</h2>
-		<?cs call:print_form_header() ?>
+		<?cs call:print_form_header("umount_do") ?>
 			<p><input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
-			<input type="hidden" name="action" value="umount_do" />
 			<button type="submit"><?cs var:html_escape(Lang.Button.Umount) ?></button></p>
 		</form>
 	<?cs /if ?>
@@ -30,11 +28,10 @@
 <?cs # name change is only possible if the volume is not mounted ?>
 <?cs if:!Data.CurrentDisk.active ?>
 	<h2>Change the name of the container</h2>
-	<?cs call:print_form_header() ?>
+	<?cs call:print_form_header("volume_name_set") ?>
 		<p><label for="vol_name"><?cs var:html_escape(Lang.Text.ContainerName) ?></label>
 		<input type="text" name="volume_name" size="20" id="volume_name" value="<?cs var:html_escape(Data.CurrentDisk.name) ?>" />
 		<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
-		<input type="hidden" name="action" value="volume_name_set" />
 		<button type="submit"><?cs var:html_escape(Lang.Button.ContainerNameSet) ?></button></p>
 	</form>
 <?cs /if ?>
@@ -43,11 +40,10 @@
 <?cs # move initialization to the "system" menu ?>
 <?cs if:!Data.CurrentDisk.active ?>
 	<h2>Reinitialize container</h2>
-	<?cs call:print_form_header() ?>
+	<?cs call:print_form_header("volume_init_ask") ?>
 		<p><input type="checkbox" name="encryption" id="encryption" value="selected" checked="checked" />
 			<label for="encryption"><?cs var:html_escape(Lang.Text.ContainerEncryption) ?></label>
 		<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
-		<input type="hidden" name="action" value="volume_init_ask" />
 		<button type="submit"><?cs var:html_escape(Lang.Button.InitContainer) ?></button></p>
 	</form>
 <?cs /if ?>
@@ -64,8 +60,7 @@
 	<?cs if:Data.CurrentDisk.active ?>
 		<li>Size of container: <?cs var:html_escape(Data.CurrentDisk.capacity.size) ?></li>
 		<li>Available space of container: <?cs var:html_escape(Data.CurrentDisk.capacity.free) ?></li>
-		<li>Used space of container: <?cs var:html_escape(Data.CurrentDisk.capacity.used)
-			?> / <?cs var:html_escape(Data.CurrentDisk.capacity.percent) ?></li>
+		<li>Used space of container: <?cs var:html_escape(Data.CurrentDisk.capacity.percent) ?>%</li>
 	<?cs /if ?>
 </ul></p>
 

pythonrewrite/templates/show_volumes.cs

@@ -1,6 +1,8 @@
 <?cs # $Id$ ?>
 
-<?cs each:volume = Data.Disks.available ?>
+<!-- TODO: completely useless for now - do something about it :) -->
+
+<?cs each:volume = Data.Disks ?>
 
 <a href="<?cs call:link('show_volume','device',volume.device,'','') ?>" title="<?cs
 		var:volume.name ?>">