Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6497] trunk
|
From: <dai...@us...> - 2013-12-14 00:41:50
|
Revision: 6497
http://sourceforge.net/p/web-erp/reponame/6497
Author: daintree
Date: 2013-12-14 00:41:44 +0000 (Sat, 14 Dec 2013)
Log Message:
-----------
As per Gilberto dos santos alves - Extended smtp user name to varchar(50) as sometimes a full email address is required
Modified Paths:
--------------
trunk/FixedAssetItems.php
trunk/SMTPServer.php
trunk/doc/Change.log
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/FixedAssetItems.php
===================================================================
--- trunk/FixedAssetItems.php 2013-12-12 02:48:15 UTC (rev 6496)
+++ trunk/FixedAssetItems.php 2013-12-14 00:41:44 UTC (rev 6497)
@@ -450,7 +450,8 @@
</tr>';
echo '<tr><td><input type="hidden" name="AssetID" value="' . $AssetID . '"/></td></tr>';
}
-if ($AssetRow['disposaldate'] != '0000-00-00'){
+
+if (isset($AssetRow['disposaldate']) AND $AssetRow['disposaldate'] !='0000-00-00'){
echo '<tr>
<td>' . _('Asset Already disposed on') . ':</td>
<td>' . ConvertSQLDate($AssetRow['disposaldate']) . '</td>
@@ -661,4 +662,4 @@
</div>
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/SMTPServer.php
===================================================================
--- trunk/SMTPServer.php 2013-12-12 02:48:15 UTC (rev 6496)
+++ trunk/SMTPServer.php 2013-12-14 00:41:44 UTC (rev 6497)
@@ -18,6 +18,7 @@
username='".$_POST['UserName']."',
password='".$_POST['Password']."',
auth='".$_POST['Auth']."'";
+
$ErrMsg = _('The email setting information failed to update');
$DbgMsg = _('The SQL failed to update is ');
$result1=DB_query($sql, $db, $ErrMsg, $DbgMsg);
@@ -32,13 +33,12 @@
username,
password,
auth)
- VALUES (
- '".$_POST['Host']."',
- '".$_POST['Port']."',
- '".$_POST['HeloAddress']."',
- '".$_POST['UserName']."',
- '".$_POST['Password']."',
- '".$_POST['Auth']."')";
+ VALUES ('".$_POST['Host']."',
+ '".$_POST['Port']."',
+ '".$_POST['HeloAddress']."',
+ '".$_POST['UserName']."',
+ '".$_POST['Password']."',
+ '".$_POST['Auth']."')";
$ErrMsg = _('The email settings failed to be inserted');
$DbgMsg = _('The SQL failed to insert the email information is');
$result2 = DB_query($sql,$db);
@@ -77,19 +77,26 @@
}
-echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
-echo '<div>';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<input type="hidden" name="MailServerSetting" value="' . $MailServerSetting . '" />';
-echo '<table class="selection">';
-echo '<tr><td>' . _('Server Host Name') . '</td>
- <td><input type="text" name="Host" value="'.$myrow['host'].'" /></td></tr>';
-echo '<tr><td>' . _('SMTP port') . '</td>
- <td><input type="text" name="Port" size="4" class="number" value="'.$myrow['port'].'" /></td></tr>';
-echo '<tr><td>' . _('Helo Command') . '</td>
- <td><input type="text" name="HeloAddress" value="'.$myrow['heloaddress'].'" /></td></tr>';
-echo '<tr><td>' . _('Authorisation Required') . '</td><td>';
-echo '<select name="Auth">';
+echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <input type="hidden" name="MailServerSetting" value="' . $MailServerSetting . '" />
+ <table class="selection">
+ <tr>
+ <td>' . _('Server Host Name') . '</td>
+ <td><input type="text" name="Host" required="required" value="' . $myrow['host'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('SMTP port') . '</td>
+ <td><input type="text" name="Port" required="required" size="4" class="number" value="' . $myrow['port'].'" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Helo Command') . '</td>
+ <td><input type="text" name="HeloAddress" value="' . $myrow['heloaddress'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Authorisation Required') . '</td>
+ <td><select name="Auth">';
if ($myrow['auth']==1) {
echo '<option selected="selected" value="1">' . _('True') . '</option>';
echo '<option value="0">' . _('False') . '</option>';
@@ -97,17 +104,26 @@
echo '<option value="1">' . _('True') . '</option>';
echo '<option selected="selected" value="0">' . _('False') . '</option>';
}
-echo '</select></td></tr>';
-echo '<tr><td>' . _('User Name') . '</td>
- <td><input type="text" name="UserName" value="'.$myrow['username'].'" /></td></tr>';
-echo '<tr><td>' . _('Password') . '</td>
- <td><input type="password" name="Password" value="'.$myrow['password'].'" /></td></tr>';
-echo '<tr><td>' . _('Timeout (seconds)') . '</td>
- <td><input type="text" size="5" name="Timeout" class="number" value="'.$myrow['timeout'].'" /></td></tr>';
-echo '<tr><td colspan="2"><div class="centre"><input type="submit" name="submit" value="' . _('Update') . '" /></div></td></tr>';
-echo '</table>
- </div>
- </form>';
+echo '</select></td>
+ </tr>
+ <tr>
+ <td>' . _('User Name') . '</td>
+ <td><input type="text" required="required" name="UserName" size="50" maxlength="50" value="' . $myrow['username'] .'" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Password') . '</td>
+ <td><input type="password" required="required" name="Password" value="' . $myrow['password'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Timeout (seconds)') . '</td>
+ <td><input type="text" size="5" name="Timeout" class="number" value="' . $myrow['timeout'] . '" /></td>
+ </tr>
+ <tr>
+ <td colspan="2"><div class="centre"><input type="submit" name="submit" value="' . _('Update') . '" /></div></td>
+ </tr>
+ </table>
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-12-12 02:48:15 UTC (rev 6496)
+++ trunk/doc/Change.log 2013-12-14 00:41:44 UTC (rev 6497)
@@ -1,5 +1,7 @@
webERP Change Log
-11/12/13: Thumb fixed bug that calculated the wrong StandardCost of assembly parts in Credit_Invoice.php and SelectCreditItems.php. Bug confirmed by Phil.
+
+14/12/12: Phil: As per Gilberto dos santos alves - Extended smtp user name to varchar(50) as sometimes a full email address is required - tidied the script a bit too.
+11/12/13: Thumb: fixed bug that calculated the wrong StandardCost of assembly parts in Credit_Invoice.php and SelectCreditItems.php. Bug confirmed by Phil.
11/12/13 Thumb: fixed bug that using limit without offsetting in PO_Items.php,WorkOrderEntry.php and make users' DisplayRecordsMax effective in SelectOrderItems.php.And fixed typo in SelectCreditItems.php.
9/12/13 Exson Fixed the typo of sql in DiscountCategories.php. Report by tangjun
7/12/13 Phil: Allow entry of stock counts by stock category
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2013-12-12 02:48:15 UTC (rev 6496)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2013-12-14 00:41:44 UTC (rev 6497)
@@ -1 +1,2 @@
+ALTER TABLE `emailsettings` CHANGE `username` `username` VARCHAR( 50 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL
UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';
|
