create-alias.php:

- fixed syntax error introduced in the last revision
- removed $pCreate_alias_goto_text and $pCreate_alias_address_text
  (replaced by PALANG texts in the template)

templates/create-alias.tpl:
- removed colspan to allow helptext in "alias" row
- moved PALANG.pCreate_alias_catchall_text to alias row
- removed pCreate_alias_address_text (always empty)
- replaced PALANG.pCreate_alias_help (empty) with PALANG.pCreate_alias_goto_text
- some whitespace fixes

variables.inc.php
- removed now unused $pCreate_alias_address_text and $pCreate_alias_goto_text

(These changes are _not_ part of Dale's patch ;-)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1105 a1433add-5e2c-0410-b055-b7f2511e0802

create-alias.php

@@ -43,7 +43,6 @@ else {
     $list_domains = list_domains_for_admin ($username);
 }
 
-$pCreate_alias_goto_text = $PALANG['pCreate_alias_goto_text'];
 $pCreate_alias_address_text_error = "";
 
 if ($_SERVER['REQUEST_METHOD'] == "GET")
@@ -145,7 +144,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
         $tAddress = escape_string ($_POST['fAddress']);
         $tGoto = $fGoto;
         $tDomain = $fDomain;
-        flash_error($PALANG['pCreate_alias_goto_text_error']");
+        flash_error($PALANG['pCreate_alias_goto_text_error']);
     }
 
     if (escape_string($_POST['fAddress']) == "*") {
@@ -194,10 +193,8 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
 
 $smarty->assign ('tAddress', $tAddress);
 $smarty->assign ('select_options', select_options ($list_domains, array ($tDomain)), false);
-$smarty->assign ('pCreate_alias_address_text', $pCreate_alias_address_text, false);
 $smarty->assign ('pCreate_alias_address_text_error', $pCreate_alias_address_text_error, false);
 $smarty->assign ('tGoto', $tGoto, false);
-$smarty->assign ('pCreate_alias_goto_text', $pCreate_alias_goto_text);
 $smarty->assign ('smarty_template', 'create-alias');
 $smarty->display ('index.tpl');
 

templates/create-alias.tpl

@@ -7,17 +7,18 @@
 	</tr>
 	<tr>
 		<td class="label"><label>{$PALANG.pCreate_alias_address}:</label></td>
-		<td colspan="2"><input class="flat" type="text" name="fAddress" value="{$tAddress}" />
-		@
-		<select class="flat" name="fDomain">{$select_options}</select>
-		{$pCreate_alias_address_text}
+		<td>
+			<input class="flat" type="text" name="fAddress" value="{$tAddress}" />
+			@
+			<select class="flat" name="fDomain">{$select_options}</select>
 		</td>
+		<td>{$PALANG.pCreate_alias_catchall_text}</td>
 		<td><span class="error_msg">{$pCreate_alias_address_text_error}</span></td>
 	</tr>
 	<tr>
 		<td class="label"><label>{$PALANG.pCreate_alias_goto}:</label></td>
       	<td><textarea class="flat" rows="10" cols="35" name="fGoto">{$tGoto}</textarea></td>
-		<td>{$PALANG.pCreate_alias_help}<br /><br />{$PALANG.pCreate_alias_catchall_text}</td>
+		<td>{$PALANG.pCreate_alias_goto_text}</td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>

variables.inc.php

@@ -77,8 +77,6 @@ $tSubject = "";
 $tUsername = "";
 $tTransport = "";
 
-$pCreate_alias_address_text = " ";
-$pCreate_alias_goto_text = " ";
 $pCreate_mailbox_password_text = " ";
 $pCreate_mailbox_quota_text = " ";
 $pCreate_mailbox_username_text = " ";