[debian-edu-commits] debian-edu/upstream/slbackup-php.git (#164) - master (branch) updated: 0.4.4-5-g2907753

[Mike Gabriel]

The branch, master has been updated
       via  290775315ea6e2e3abfeae16a6af25b50910652b (commit)
      from  4507e7c30364a02094b033fd2faf8cc908a47a21 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 290775315ea6e2e3abfeae16a6af25b50910652b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Sep 24 22:37:50 2013 +0200

    No line breaks in html_options fields as those get handled weirdly by Smarty3. Thanks to Cyril ETCHEVERRIA.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog      |    2 ++
 templates/config.tpl  |    9 +++------
 templates/maint.tpl   |    6 ++----
 templates/restore.tpl |    6 ++----
 4 files changed, 9 insertions(+), 14 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2b1cec3..80b9a36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ slbackup-php (0.4.5-0) UNRELEASED; urgency=low
     - Fix parsing of log file for the case that the server_destdir does not
       exist.
     - Handle scheduler time values as strings. Thanks to Cyril ETCHEVERRIA.
+    - No line breaks in html_options fields as those get handled weirdly by
+      Smarty3. Thanks to Cyril ETCHEVERRIA.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 10 Jun 2013 09:33:30 +0200
 
diff --git a/templates/config.tpl b/templates/config.tpl
index ae46879..5eff991 100644
--- a/templates/config.tpl
+++ b/templates/config.tpl
@@ -45,8 +45,7 @@
 	    <TR>
 		<TD>{t}Servertype{/t}</TD>
 		<TD>
-		    {html_options name=server_type values=$types 
-		                  output=$types selected=$server_type}
+		    {html_options name=server_type values=$types output=$types selected=$server_type}
 		</TD>
 		<TD>{t}User{/t}</TD>
 		<TD>
@@ -66,8 +65,7 @@
 	</TABLE>
 	<H2>{t}Client config{/t}</H2>
 	{t}Client:{/t} 
-	{html_options name=client values=$clients output=$clients 
-	              selected=$client}
+	{html_options name=client values=$clients output=$clients selected=$client}
 	<INPUT type=submit name=chooseclient value="{t}Choose{/t}">
 	<INPUT type=submit name=addclient value="{t}New{/t}">
 	<INPUT type=submit name=delclient value="{t}Remove{/t}">
@@ -87,8 +85,7 @@
 	    <TR>
 		<TD>{t}Clienttype{/t}</TD>
 		<TD>
-		    {html_options name=client_type values=$types 
-		                  output=$types selected=$client_type}
+		    {html_options name=client_type values=$types output=$types selected=$client_type}
 		</TD>
 		<TD>{t}User{/t}</TD>
 		<TD>
diff --git a/templates/maint.tpl b/templates/maint.tpl
index 41752aa..ae2d419 100644
--- a/templates/maint.tpl
+++ b/templates/maint.tpl
@@ -20,14 +20,12 @@
 
     <FORM action="index.php" method=post>
 	<H2>{t}Maintenance{/t}</H2>
-	{html_options name=client values=$clients output=$clients 
-	              selected=$client}
+	{html_options name=client values=$clients output=$clients selected=$client}
 	<INPUT type=submit name=maint value="{t}Choose{/t}">
 	{if $client <> ""}
 	<INPUT type=hidden name=selected value="{$client}">
         {t}Oldest snapshot to keep:{/t}</TD>
-	{html_options name=snapshot values=$snapshots output=$snapshots
-	              selected=$snapshot}
+	{html_options name=snapshot values=$snapshots output=$snapshots selected=$snapshot}
 	<INPUT type=submit name=removesnapshot value="{t}Delete older{/t}">
 	{/if}
 	<HR>
diff --git a/templates/restore.tpl b/templates/restore.tpl
index af52faa..0eb5c2e 100644
--- a/templates/restore.tpl
+++ b/templates/restore.tpl
@@ -20,12 +20,10 @@
 
     <FORM action="index.php" method=post>
 	<H2>{t}Client to restore{/t}</H2>
-	{html_options name=client values=$clients output=$clients 
-	              selected=$client}
+	{html_options name=client values=$clients output=$clients selected=$client}
 	<INPUT type=submit name=restoreclient value="{t}Choose{/t}">
         {t}Locations:{/t}</TD>
-	{html_options name=location values=$locations output=$locations 
-	              selected=$location}
+	{html_options name=location values=$locations output=$locations selected=$location}
 	<INPUT type=submit name=restorelocation value="{t}Browse{/t}">
 	<BR>
 	{if $sub <> ""}


hooks/post-receive
-- 
slbackup-php.git (slbackup-php upstream project)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "slbackup-php.git" (slbackup-php upstream project).