* adjust the ui code of the mail->set page.

* adjust the lang setting of send types.

module/mail/lang/en.php

@@ -8,10 +8,10 @@ $lang->mail->mta          = 'The style of send email';
 $lang->mail->debugExample = '0:close,1 and 2 :open,2 is more infomation than 1';
 
 $lang->mail->mtaList['']         = '';
-$lang->mail->mtaList['gmail']    = 'gmail';
-$lang->mail->mtaList['smtp']     = 'smtp';
-$lang->mail->mtaList['phpmail']  = 'phpmail';
-$lang->mail->mtaList['sendmail'] = 'sendmail';
+$lang->mail->mtaList['gmail']    = 'Gmail sever';
+$lang->mail->mtaList['smtp']     = 'Smtp server';
+$lang->mail->mtaList['phpmail']  = 'Mail function build in php';
+$lang->mail->mtaList['sendmail'] = 'Sendmail on localhost';
 
 /* Trun on email feature or not */
 $lang->mail->turnonList['true']  = 'open';

module/mail/lang/zh-cn.php

@@ -8,10 +8,10 @@ $lang->mail->mta          = '请选择发信方式';
 $lang->mail->debugExample = '0表示关闭调试信息,1和2表示打开调试信息，但2比1调试信息显示更详细';
 
 $lang->mail->mtaList['']         = '';
-$lang->mail->mtaList['gmail']    = 'gmail';
-$lang->mail->mtaList['smtp']     = 'smtp';
-$lang->mail->mtaList['phpmail']  = 'phpmail';
-$lang->mail->mtaList['sendmail'] = 'sendmail';
+$lang->mail->mtaList['gmail']    = 'Gmail服务器方式';
+$lang->mail->mtaList['smtp']     = 'SMTP服务器方式';
+$lang->mail->mtaList['phpmail']  = 'PHP内置mail函数';
+$lang->mail->mtaList['sendmail'] = '本机sendmail';
 
 /* Trun on email feature or not */
 $lang->mail->turnonList['true']  = '打开';

module/mail/view/set.html.php

@@ -12,77 +12,29 @@
 include '../../common/view/header.html.php';
 include '../../common/view/tablesorter.html.php';?>
 <?php
-if(!empty($mailConfig->gmail->username)) 
-{
-    $gmailUsername = $mailConfig->gmail->username;
-}
-else 
-{
-    $gmailUsername = '';
-}
-if(!empty($mailConfig->gmail->password)) 
-{
-    $gmailPassword = $mailConfig->gmail->password;
-}
-else 
-{
-    $gmailPassword = '';
-}
-if(!empty($mailConfig->smtp->username)) 
-{
-    $smtpUsername = $mailConfig->smtp->username;
-}
-else 
-{
-    $smtpUsername = '';
-}
-if(!empty($mailConfig->smtp->password)) 
-{
-    $smtpPassword = $mailConfig->smtp->password;
-}
-else 
-{
-    $smtpPassword = '';
-}
-if(!empty($mailConfig->smtp->host)) 
-{
-    $smtpHost = $mailConfig->smtp->host;
-}
-else 
-{
-    $smtpHost = '';
-}
-if(!empty($mailConfig->smtp->secure)) 
-{
-    $smtpSecure = $mailConfig->smtp->secure;
-}
-else 
-{
-    $smtpSecure = '';
-}
-if(!empty($mailConfig->smtp->auth)) 
-{
-    $smtpAuth = $mailConfig->smtp->auth;
-}
-else 
-{
-    $smtpAuth = '';
-}
-if(!empty($mailConfig->smtp->port)) 
-{
-    $smtpPort = $mailConfig->smtp->port;
-}
-else 
-{
-    $smtpPort = '';
-}
+$gmailUsername = '';
+$gmailPassword = '';
+$smtpUsername  = '';
+$smtpPassword  = '';
+$smtpHost      = '';
+$smtpSecure    = '';
+$smtpAuth      = '';
+$smtpPort      = '';
+if(!empty($mailConfig->gmail->username)) $gmailUsername = $mailConfig->gmail->username;
+if(!empty($mailConfig->gmail->password)) $gmailPassword = $mailConfig->gmail->password;
+if(!empty($mailConfig->smtp->username))  $smtpUsername  = $mailConfig->smtp->username;
+if(!empty($mailConfig->smtp->password))  $smtpPassword  = $mailConfig->smtp->password;
+if(!empty($mailConfig->smtp->host))      $smtpHost      = $mailConfig->smtp->host;
+if(!empty($mailConfig->smtp->secure))    $smtpSecure    = $mailConfig->smtp->secure;
+if(!empty($mailConfig->smtp->auth))      $smtpAuth      = $mailConfig->smtp->auth;
+if(!empty($mailConfig->smtp->port))      $smtpPort      = $mailConfig->smtp->port;
 ?>
 <form method='post' enctype='multipart/form-data' action='<?php echo inlink('save');?>'>
   <table align='center' class='table-1'>
   <caption><?php echo $lang->mail->setParam; ?></caption>
   <tr>
-    <th class='rowhead'><?php echo $lang->mail->turnon; ?></th>
-    <td><?php echo html::select('turnon', $lang->mail->turnonList, $mailConfig->turnon); ?></td>
+    <th class='rowhead w-200px'><?php echo $lang->mail->turnon; ?></th>
+    <td><?php echo html::select('turnon', $lang->mail->turnonList, $mailConfig->turnon, 'class=select-3'); ?></td>
   </tr>
   <tr>
     <th class='rowhead'><?php echo $lang->mail->mta; ?></th>
@@ -90,31 +42,31 @@ else
   </tr>
   <tr>
     <th class='rowhead'><?php echo $lang->mail->fromAddress; ?></th>
-    <td><?php echo html::input('fromAddress', $mailConfig->fromAddress) ?></td>
+    <td><?php echo html::input('fromAddress', $mailConfig->fromAddress, 'class=text-3') ?></td>
   </tr>
   <tr>
     <th class='rowhead'><?php echo $lang->mail->fromName; ?></th>
-    <td><?php echo html::input('fromName', $mailConfig->fromName) ?></td>
+    <td><?php echo html::input('fromName', $mailConfig->fromName, 'class=text-3') ?></td>
   </tr>
   <tr id='gmailDebug' class='hidden'>
-    <th><?php echo $lang->mail->gmail->debug; ?></th>
-    <td><?php echo html::select('gmailDebug', $lang->mail->debugList, ''); echo $lang->mail->debugExample; ?></td>
+    <th class='rowhead'><?php echo $lang->mail->gmail->debug; ?></th>
+    <td><?php echo html::select('gmailDebug', $lang->mail->debugList, '', 'class=select-3'); echo $lang->mail->debugExample; ?></td>
   </tr>
   <tr id='gmailUsername' class='hidden'>
     <th class='rowhead'><?php echo $lang->mail->gmail->username; ?></th>
-    <td><?php echo html::input('gmailUsername', $gmailUsername) ?></td>
+    <td><?php echo html::input('gmailUsername', $gmailUsername, 'class=text-3') ?></td>
   </tr>
   <tr id='gmailPassword' class='hidden'>
     <th class='rowhead'><?php echo $lang->mail->gmail->password; ?></th>
-    <td><?php echo html::input('gmailPassword', $gmailPassword) ?></td>
+    <td><?php echo html::input('gmailPassword', $gmailPassword, 'class=text-3') ?></td>
   </tr>
   <tr id='smtpHost' class='hidden'>
     <th class='rowhead'><?php echo $lang->mail->smtp->host; ?></th>
-    <td><?php echo html::input('smtpHost', $smtpHost); echo $lang->mail->smtp->hostInfo;?></td>
+    <td><?php echo html::input('smtpHost', $smtpHost, 'class=text-3'); echo $lang->mail->smtp->hostInfo;?></td>
   </tr>
   <tr id='smtpDebug' class='hidden'>
-    <th><?php echo $lang->mail->smtp->debug; ?></th>
-    <td><?php echo html::select('smtpDebug', $lang->mail->debugList, ''); echo $lang->mail->debugExample; ?></td>
+    <th class='rowhead'><?php echo $lang->mail->smtp->debug; ?></th>
+    <td><?php echo html::select('smtpDebug', $lang->mail->debugList, '', 'class=select-3'); echo $lang->mail->debugExample; ?></td>
   </tr>
   <tr id='smtpAuth' class='hidden'>
     <th class='rowhead'><?php echo $lang->mail->smtp->auth; ?></th>
@@ -122,19 +74,19 @@ else
   </tr>
   <tr id='smtpUsername' class='hidden'>
     <th class='rowhead'><?php echo $lang->mail->smtp->username; ?></th>
-    <td><?php echo html::input('smtpUsername', $smtpUsername) ?></td>
+    <td><?php echo html::input('smtpUsername', $smtpUsername, 'class=text-3') ?></td>
   </tr>
   <tr id='smtpPassword' class='hidden'>
     <th class='rowhead'><?php echo $lang->mail->smtp->password; ?></th>
-    <td><?php echo html::input('smtpPassword', $smtpPassword) ?></td>
+    <td><?php echo html::input('smtpPassword', $smtpPassword, 'class=text-3') ?></td>
   </tr>
   <tr id='smtpSecure' class='hidden'>
     <th class='rowhead'><?php echo $lang->mail->smtp->secure; ?></th>
-    <td><?php echo html::select('smtpSecure', $lang->mail->smtp->secureList, $smtpSecure); ?></td>
+    <td><?php echo html::select('smtpSecure', $lang->mail->smtp->secureList, $smtpSecure, 'class=select-3'); ?></td>
   </tr>
   <tr id='smtpPort' class='hidden'>
     <th class='rowhead'><?php echo $lang->mail->smtp->port; ?></th>
-    <td><?php echo html::input('smtpPort', $smtpPort); echo $lang->mail->smtp->portInfo ?></td>
+    <td><?php echo html::input('smtpPort', $smtpPort, 'class=text-3'); echo $lang->mail->smtp->portInfo ?></td>
   </tr>
   <tr>
     <td colspan='2' class='a-center'><?php echo html::submitButton();?></td>