SF.net SVN: postfixadmin:[1094] trunk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1094
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1094&view=rev
Author:   christian_boltz
Date:     2011-07-19 21:41:37 +0000 (Tue, 19 Jul 2011)

Log Message:
-----------
sendmail.php, broadcast-message.php:
- use smtp_get_admin_email() to determinate the mail sender
- rename $SESSID_USERNAME to $smtp_from_email
- replaced tMessage with flash_error() / flash_info()

sendmail.php:
- changes compared to Dale's patch:
  - use flash_info() for $PALANG['pSendmail_result_success']

broadcast-message.php:
- use flash_error() for $PALANG['pBroadcast_error_empty'] instead of
  hardcoding it in the template


sendmail.tpl,templates/broadcast-message.tpl:
- replace <h3> with <th>
- replaced $SESSID_USERNAME / $CONF[admin_email] with $smtp_from_email
- mark labels with <label>
- mark non-editable fields with <em>
- align buttons with input fields
- remove tMessage

sendmail.tpl:
- changes compared to Dale's patch:
  - fixed colspan for buttons cell

templates/broadcast-message.tpl:
- remove hardcoded error message (see broadcast-message.php change above)
- changes compared to Dale's patch:
  - fixed colspan for <th>

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583

Modified Paths:
--------------
    trunk/broadcast-message.php
    trunk/sendmail.php
    trunk/templates/broadcast-message.tpl
    trunk/templates/sendmail.tpl

Modified: trunk/broadcast-message.php
===================================================================

--- trunk/broadcast-message.php	2011-07-19 21:12:25 UTC (rev 1093)
+++ trunk/broadcast-message.php	2011-07-19 21:41:37 UTC (rev 1094)
@@ -35,13 +35,14 @@
    exit;
 }
 
-$SESSID_USERNAME = authentication_get_username();
+$smtp_from_email = smtp_get_admin_email();
 
 if ($_SERVER['REQUEST_METHOD'] == "POST")
 {
    if (empty($_POST['subject']) || empty($_POST['message']) || empty($_POST['name']))
    {
       $error = 1;
+      flash_error($PALANG['pBroadcast_error_empty']);
    }
    else
    {
@@ -63,7 +64,7 @@
          while ($row = db_array ($result['result'])) {
             $fTo = $row[0];
             $fHeaders  = 'To: ' . $fTo . "\n";
-            $fHeaders .= 'From: ' . $b_name . ' <' . $CONF['admin_email'] . ">\n";
+            $fHeaders .= 'From: ' . $b_name . ' <' . $smtp_from_email . ">\n";
             $fHeaders .= 'Subject: ' . $b_subject . "\n";
             $fHeaders .= 'MIME-Version: 1.0' . "\n";
             $fHeaders .= 'Content-Type: text/plain; charset=UTF-8' . "\n";
@@ -71,17 +72,17 @@
 
             $fHeaders .= $b_message;
 
-            if (!smtp_mail ($fTo, $CONF['admin_email'], $fHeaders))
+            if (!smtp_mail ($fTo, $smtp_from_email, $fHeaders))
             {
-               $tMessage .= "<br />" . $PALANG['pSendmail_result_error'] . "<br />";
+               flash_error("<br />" . $PALANG['pSendmail_result_error'] . "<br />");
             }
             else
             {
-               $tMessage .= "<br />" . $PALANG['pSendmail_result_success'] . "<br />";
+               flash_info("<br />" . $PALANG['pSendmail_result_success'] . "<br />");
             }
          }
       }
-		$smarty->assign ('tMessage', $PALANG['pBroadcast_success']);
+		flash_info($PALANG['pBroadcast_success']);
 		$smarty->assign ('smarty_template', 'message');
 		$smarty->display ('index.tpl');
 //		echo '<p>'.$PALANG['pBroadcast_success'].'</p>';
@@ -90,6 +91,7 @@
 
 if ($_SERVER['REQUEST_METHOD'] == "GET" || $error == 1)
 {
+	$smarty->assign ('smtp_from_email', $smtp_from_email);
 	$smarty->assign ('error', $error);
 	$smarty->assign ('smarty_template', 'broadcast-message');
 	$smarty->display ('index.tpl');

Modified: trunk/sendmail.php
===================================================================
--- trunk/sendmail.php	2011-07-19 21:12:25 UTC (rev 1093)
+++ trunk/sendmail.php	2011-07-19 21:41:37 UTC (rev 1094)
@@ -18,7 +18,6 @@
  *
  * Template Variables:
  *
- * tMessage
  * tFrom
  * tSubject
  * tBody
@@ -36,12 +35,13 @@
 
 (($CONF['sendmail'] == 'NO') ? header("Location: main.php") && exit : '1');
 
-$SESSID_USERNAME = authentication_get_username();
+$smtp_from_email = smtp_get_admin_email();
 
+
 if ($_SERVER['REQUEST_METHOD'] == "POST")
 {
    $fTo = safepost('fTo');
-   $fFrom = $SESSID_USERNAME;
+   $fFrom = $smtp_from_email;
    $fSubject = safepost('fSubject');
 
    $tBody = $_POST['fBody'];
@@ -55,21 +55,19 @@
       $error = 1;
       $tTo = escape_string ($_POST['fTo']);
       $tSubject = escape_string ($_POST['fSubject']);
-      $tMessage = $PALANG['pSendmail_to_text_error'];
+      flash_error($PALANG['pSendmail_to_text_error']);
    }
 
    if ($error != 1)
    {
       if (!smtp_mail ($fTo, $fFrom, $fSubject, $tBody)) {
-         $tMessage .= $PALANG['pSendmail_result_error'];
+         flash_error($PALANG['pSendmail_result_error']);
       } else {
-         $tMessage .= $PALANG['pSendmail_result_success'];
+         flash_info($PALANG['pSendmail_result_success']);
       }
    }
 }
-$smarty->assign ('SESSID_USERNAME', $SESSID_USERNAME);
-$smarty->assign ('tMessage', $tMessage, false);
-
+$smarty->assign ('smtp_from_email', $smtp_from_email);
 $smarty->assign ('smarty_template', 'sendmail');
 $smarty->display ('index.tpl');
 

Modified: trunk/templates/broadcast-message.tpl
===================================================================
--- trunk/templates/broadcast-message.tpl	2011-07-19 21:12:25 UTC (rev 1093)
+++ trunk/templates/broadcast-message.tpl	2011-07-19 21:41:37 UTC (rev 1094)
@@ -2,29 +2,27 @@
 <form name="broadcast-message" method="post" action="">
 <table>
 	<tr>
-		<td colspan="3"><h3>{$PALANG.pBroadcast_title}</h3></td>
+		<th colspan="2">{$PALANG.pBroadcast_title}</th>
 	</tr>
 	<tr>
-		<td>{$PALANG.pBroadcast_from}:</td>
-		<td>{$CONF.admin_email}</td>
+		<td class="label"><label>{$PALANG.pBroadcast_from}:</label></td>
+		<td><em>{$smtp_from_email}</em></td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pBroadcast_name}:</td>
+		<td class="label"><label>{$PALANG.pBroadcast_name}:</label></td>
 		<td><input class="flat" size="43" type="text" name="name"/></td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pBroadcast_subject}:</td>
+		<td class="label"><label>{$PALANG.pBroadcast_subject}:</label></td>
 		<td><input class="flat" size="43" type="text" name="subject"/></td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pBroadcast_message}:</td>
+		<td class="label"><label>{$PALANG.pBroadcast_message}:</label></td>
 		<td><textarea class="flat" cols="40" rows="6" name="message"></textarea></td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center">
-{if $error}
-		<br/><span class="error_msg">{$PALANG.pBroadcast_error_empty}</span><br/><br/>
-{/if}
+		<td>&nbsp;</td>
+		<td>
 		<input class="button" type="submit" name="submit" value="{$PALANG.pBroadcast_send}" />
 		</td>
 	</tr>

Modified: trunk/templates/sendmail.tpl
===================================================================
--- trunk/templates/sendmail.tpl	2011-07-19 21:12:25 UTC (rev 1093)
+++ trunk/templates/sendmail.tpl	2011-07-19 21:41:37 UTC (rev 1094)
@@ -2,36 +2,34 @@
 <form name="mailbox" method="post" action="">
 <table>
 	<tr>
-		<td colspan="3"><h3>{$PALANG.pSendmail_welcome}</h3></td>
+		<th colspan="3">{$PALANG.pSendmail_welcome}</th>
 	</tr>
 	<tr>
-		<td>{$PALANG.pSendmail_admin}:</td>
-		<td>{$SESSID_USERNAME}</td>
+		<td class="label"><label>{$PALANG.pSendmail_admin}:</label></td>
+		<td><em>{$smtp_from_email}</em></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pSendmail_to}:</td>
+		<td class="label"><label>{$PALANG.pSendmail_to}:</label></td>
 		<td><input class="flat" type="text" name="fTo" /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pSendmail_subject}:</td>
+		<td class="label"><label>{$PALANG.pSendmail_subject}:</label></td>
 		<td><input class="flat" type="text" name="fSubject" value="{$PALANG.pSendmail_subject_text}" /></td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td>{$PALANG.pSendmail_body}:</td>
+		<td class="label"><label>{$PALANG.pSendmail_body}:</label></td>
 		<td>
 		<textarea class="flat" rows="10" cols="60" name="fBody">{$CONF.welcome_text}</textarea>
 		</td>
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="{$PALANG.pSendmail_button}" /></td>
+		<td class="label">&nbsp;</td>
+		<td colspan="2"><input class="button" type="submit" name="submit" value="{$PALANG.pSendmail_button}" /></td>
 	</tr>
-	<tr>
-		<td colspan="3" class="standout">{$tMessage}</td>
-	</tr>
 </table>
 </form>
 </div>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


