From: <vv...@us...> - 2012-03-16 22:34:11
|
Revision: 5105 http://web-erp.svn.sourceforge.net/web-erp/?rev=5105&view=rev Author: vvs2012 Date: 2012-03-16 22:34:02 +0000 (Fri, 16 Mar 2012) Log Message: ----------- xhtml Modified Paths: -------------- trunk/EDIMessageFormat.php trunk/EmailCustTrans.php trunk/ExchangeRateTrend.php trunk/FTP_RadioBeacon.php trunk/Factors.php trunk/FixedAssetCategories.php trunk/FixedAssetDepreciation.php trunk/FixedAssetItems.php trunk/FixedAssetLocations.php trunk/FixedAssetRegister.php trunk/FixedAssetTransfer.php trunk/FormDesigner.php trunk/FreightCosts.php trunk/GLBudgets.php trunk/POReport.php trunk/PO_AuthoriseMyOrders.php trunk/PO_Items.php trunk/Payments.php trunk/RecurringSalesOrders.php trunk/ReprintGRN.php trunk/ReverseGRN.php trunk/SalesInquiry.php trunk/SelectAsset.php trunk/SelectOrderItems.php trunk/SelectRecurringSalesOrder.php trunk/SelectSalesOrder.php trunk/StockAdjustments.php trunk/StockCounts.php trunk/StockLocStatus.php trunk/StockLocTransferReceive.php trunk/Z_ImportStocks.php trunk/Z_UploadForm.php Modified: trunk/EDIMessageFormat.php =================================================================== --- trunk/EDIMessageFormat.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/EDIMessageFormat.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -98,11 +98,11 @@ } 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 '<p><table border="0" width="100%"> - <p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . - '" alt="" />' . ' ' . $title.'</p>'; +echo '<br /> + <p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>'; if (!isset($SelectedMessageLine)) { @@ -124,7 +124,7 @@ $result = DB_query($sql,$db); echo '<table class="selection">'; - echo '<tr><th colspan="5"><font size="3">' . _('Definition of') . ' ' . $MessageType . ' ' . _('for') . ' ' . $PartnerCode.'</font></th></tr>'; + echo '<tr><th colspan="5"><h3>' . _('Definition of') . ' ' . $MessageType . ' ' . _('for') . ' ' . $PartnerCode.'</h3></th></tr>'; $TableHeader = '<tr> <th>' . _('Section') . '</th> <th>' . _('Sequence') . '</th> @@ -147,8 +147,8 @@ printf('<td>%s</td> <td class="number">%s</td> <td>%s</td> - <td><a href="%s&SelectedMessageLine=%s">' . _('Edit') . '</a></td> - <td><a href="%s&delete=%s">' . _('Delete') . '</a></td> + <td><a href="%s&SelectedMessageLine=%s">' . _('Edit') . '</a></td> + <td><a href="%s&delete=%s">' . _('Delete') . '</a></td> </tr>', $myrow[1], $myrow[2], @@ -159,7 +159,7 @@ $myrow[0]); } //END WHILE LIST LOOP - echo '</table><p>'; + echo '</table><br />'; if (DB_num_rows($result)==0){ echo '<div class="centre"> <input tabindex="1" type="submit" name="NewEDIInvMsg" value="' . _('Create New EDI Invoice Message From Default Template') . '" /> @@ -189,7 +189,7 @@ $_POST['SequenceNo'] = $myrow['sequenceno']; $_POST['LineText'] = $myrow['linetext']; - echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?MessageType=INVOIC&PartnerCode=' . $myrow['partnercode'] . '">' . _('Review Message Lines') . '</a></div>'; + echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?MessageType=INVOIC&PartnerCode=' . $myrow['partnercode'] . '">' . _('Review Message Lines') . '</a></div>'; echo '<input type="hidden" name="SelectedMessageLine" value="' . $SelectedMessageLine . '" />'; echo '<input type="hidden" name="MessageType" value="' . $myrow['messagetype'] . '" />'; @@ -247,7 +247,7 @@ } else { echo '<div class="centre"><input tabindex="5" type="submit" name="submit" value="'. _('Enter Information'). '" /></div>'; } - +echo '</div>'; echo '</form>'; include('includes/footer.inc'); Modified: trunk/EmailCustTrans.php =================================================================== --- trunk/EmailCustTrans.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/EmailCustTrans.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -35,7 +35,8 @@ include ('includes/header.inc'); -echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method=post>'; +echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; +echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<input type="hidden" name="TransNo" value="' . $_GET['FromTransNo'] . '" />'; @@ -62,9 +63,12 @@ echo '<tr><td>' . _('Email') . ' ' . $_GET['InvOrCredit'] . ' ' . _('number') . ' ' . $_GET['FromTransNo'] . ' ' . _('to') . ':</td> <td><input type="text" name="EmailAddr" maxlength="60" size="60" value="' . $EmailAddress . '" /></td> + </tr> </table>'; echo '<br /><div class="centre"><input type="submit" name="DoIt" value="' . _('OK') . '" />'; -echo '</div></form>'; +echo '</div> + </div> + </form>'; include ('includes/footer.inc'); ?> \ No newline at end of file Modified: trunk/ExchangeRateTrend.php =================================================================== --- trunk/ExchangeRateTrend.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/ExchangeRateTrend.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -21,10 +21,11 @@ // SHOW OUR MAIN INPUT FORM // ************************ - echo '<form method="post" name="update" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; + echo '<form method="post" id="update" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<div class="centre"><p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . - _('View Currency Trend') . '" alt="" />' . ' ' . _('View Currency Trend') . '</p>'; + _('View Currency Trend') . '" alt="" />' . ' ' . _('View Currency Trend') . '</p></div>'; echo '<table>'; // First column $SQL = "SELECT * FROM currencies"; @@ -48,7 +49,8 @@ echo '</table>'; /*close off the table in the third column */ - echo '<p><div class="centre"><input type="submit" name="submit" value="' . _('Accept') . '" /></div>'; + echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Accept') . '" /></div>'; + echo '</div>'; echo '</form>'; // ************** @@ -59,9 +61,9 @@ $graph = $CurrencyToShow. '/' . $FunctionalCurrency . $graph; $image = 'http://www.x-rates.com/d/' . $graph; - echo '<p></div><table class="selection">'; - echo '<tr><th><div class="centre"><b><U>' . $FunctionalCurrency . ' / ' . $CurrencyToShow . '</b></U></th></tr>'; - echo '<tr><td><img src=' . $image . ' alt="' ._('Trend Currently Unavailable') . '" /></td></tr>'; + echo '<br /><table class="selection">'; + echo '<tr><th><div class="centre"><b>' . $FunctionalCurrency . ' / ' . $CurrencyToShow . '</b></div></th></tr>'; + echo '<tr><td><img src="' . $image . '" alt="' ._('Trend Currently Unavailable') . '" /></td></tr>'; echo '</table>'; Modified: trunk/FTP_RadioBeacon.php =================================================================== --- trunk/FTP_RadioBeacon.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/FTP_RadioBeacon.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -44,7 +44,7 @@ /*show a table of the orders returned by the SQL */ -echo '<table cellpadding="2" colspan="7" width="100%">'; +echo '<table cellpadding="2" width="100%">'; $TableHeader = '<tr> <td class="tableheader">' . _('Modify') . '</td> <td class="tableheader">' . _('Send to') . '<br />' . _('Radio Beacon') . '</td> Modified: trunk/Factors.php =================================================================== --- trunk/Factors.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/Factors.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -198,10 +198,11 @@ // its a new factor being added 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="FactorID" value="' . $FactorID .'" /> + <input type="hidden" name="New" value="Yes" /> <table class="selection"> - <input type="hidden" name="New" value="Yes" /> <tr> <td>' . _('Factor company Name') . ':</td> <td><input tabindex="1" type="text" name="FactorName" size="42" maxlength="40" value="' .$_POST['FactorName'].'" /></td> @@ -239,7 +240,7 @@ </tr> <tr> <td>' . _('Fax') . ':</td> - <td><input tabindex="10" type="text" name="Fax" value="0" size="20" maxlength="25" value="' . $_POST['Fax'] .'" /></td> + <td><input tabindex="10" type="text" name="Fax" size="20" maxlength="25" value="' . $_POST['Fax'] .'" /></td> </tr> <tr> <td>' . _('Email') . ':</td> @@ -250,20 +251,23 @@ if (isset($_POST['Create'])) { - echo '<p> + echo '<br /> <div class="centre"> <input tabindex="12" type="submit" name="Submit" value="' . _('Insert New Factor') . '" /> </div> + </div> </form>'; } else if (isset($_POST['Amend'])) { - echo '<p> + echo '<br /> <div class="centre"> <input tabindex="13" type="submit" name="Update" value="' . _('Update Factor') . '" /> - <p>'; + <br /> + <br />'; prnMsg ( _('There is no second warning if you hit the delete button below') . '. ' . _('However checks will be made to ensure there are no suppliers are using this factor before the deletion is processed'), 'warn'); - echo '<p> + echo '<br /> <input tabindex="14" type="submit" name="Delete" value="' . _('Delete Factor') . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this factoring company?') . '\');" /> </div> + </div> </form>'; } @@ -273,6 +277,7 @@ if (empty($FactorID) AND !isset($_POST['Create']) AND !isset($_POST['Amend'])) { 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="New" value="No" />'; @@ -330,11 +335,12 @@ </tr>'; } //end while loop echo '</table> - <p> + <br /> <div class="centre"> <br /> <input tabindex="3" type="submit" name="Create" value="' . _('Create New Factor') . '" /> </div> + </div> </form>'; } Modified: trunk/FixedAssetCategories.php =================================================================== --- trunk/FixedAssetCategories.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/FixedAssetCategories.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -11,7 +11,8 @@ echo '<div class="centre"> <p class="page_title_text"> <img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Fixed Asset Categories') . '" alt="" />' . ' ' . $title . ' - </p>'; + </p> + </div>'; if (isset($_GET['SelectedCategory'])){ $SelectedCategory = mb_strtoupper($_GET['SelectedCategory']); @@ -162,7 +163,7 @@ <th>' . _('Cat Code') . '</th> <th>' . _('Description') . '</th> <th>' . _('Cost GL') . '</th> - <th>' . _('P & L Depn GL') . '</th> + <th>' . _('P & L Depn GL') . '</th> <th>' . _('Disposal GL') . '</th> <th>' . _('Accum Depn GL') . '</th> </tr>'; @@ -183,8 +184,8 @@ <td class="number">%s</td> <td class="number">%s</td> <td class="number">%s</td> - <td><a href="%sSelectedCategory=%s">' . _('Edit') . '</td> - <td><a href="%sSelectedCategory=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this fixed asset category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . '\');">' . _('Delete') . '</td> + <td><a href="%sSelectedCategory=%s">' . _('Edit') . '</a></td> + <td><a href="%sSelectedCategory=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this fixed asset category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . '\');">' . _('Delete') . '</a></td> </tr>', $myrow['categoryid'], $myrow['categorydescription'], @@ -198,7 +199,8 @@ $myrow['categoryid']); } //END WHILE LIST LOOP - echo '</table>'; + echo '</table> + <br />'; } //end of ifs and buts! @@ -207,7 +209,8 @@ echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' ._('Show All Fixed Asset Categories') . '</a></div>'; } -echo '<form name="CategoryForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; +echo '<form id="CategoryForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; +echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; if (isset($SelectedCategory) and !isset($_POST['submit'])) { @@ -284,9 +287,9 @@ while ($myrow = DB_fetch_array($BSAccountsResult)){ if (isset($_POST['CostAct']) and $myrow['accountcode']==$_POST['CostAct']) { - echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>'; + echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')</option>'; } else { - echo '<option value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>'; + echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')</option>'; } } //end while loop echo '</select></td> @@ -297,9 +300,9 @@ while ($myrow = DB_fetch_array($PnLAccountsResult)) { if (isset($_POST['DepnAct']) and $myrow['accountcode']==$_POST['DepnAct']) { - echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>'; + echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')</option>'; } else { - echo '<option value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')</option>'; + echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')</option>'; } } //end while loop echo '</select></td> @@ -311,9 +314,9 @@ <td><select name="DisposalAct">'; while ($myrow = DB_fetch_array($PnLAccountsResult)) { if (isset($_POST['DisposalAct']) and $myrow['accountcode']==$_POST['DisposalAct']) { - echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>'; + echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')' . '</option>'; } else { - echo '<option value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>'; + echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')' . '</option>'; } } //end while loop echo '</select></td> @@ -327,9 +330,9 @@ while ($myrow = DB_fetch_array($BSAccountsResult)) { if (isset($_POST['AccumDepnAct']) and $myrow['accountcode']==$_POST['AccumDepnAct']) { - echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>'; + echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')' . '</option>'; } else { - echo '<option value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . ' ('.$myrow['accountcode'].')' . '</option>'; + echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8',false) . ' ('.$myrow['accountcode'].')' . '</option>'; } } //end while loop @@ -343,6 +346,7 @@ echo '<div class="centre"> <input type="submit" name="submit" value="' . _('Enter Information') . '" /> </div> + </div> </form>'; include('includes/footer.inc'); Modified: trunk/FixedAssetDepreciation.php =================================================================== --- trunk/FixedAssetDepreciation.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/FixedAssetDepreciation.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -80,7 +80,7 @@ $PeriodNo = GetPeriod($_POST['ProcessDate'],$db); } -echo '<p></p><table>'; +echo '<br /><table>'; $Heading = '<tr> <th>' . _('Asset ID') . '</th> <th>' . _('Description') . '</th> @@ -257,7 +257,7 @@ echo '</table> <hr /> - <p />'; + <br />'; if (isset($_POST['CommitDepreciation']) AND $InputError==false){ $result = DB_Txn_Commit($db); @@ -267,11 +267,11 @@ /*And post the journal too */ include ('includes/GLPostings.inc'); } else { - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" name="form">'; + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" id="form">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; - echo '<p /> + echo '<br /> <table class="selection" width="30%"> - <tr></tr> <tr>'; if ($AllowUserEnteredProcessDate){ echo '<td>'._('Date to Process Depreciation'). ':</td> @@ -284,6 +284,7 @@ </tr> </table> <br /> + </div> </form>'; } include('includes/footer.inc'); Modified: trunk/FixedAssetItems.php =================================================================== --- trunk/FixedAssetItems.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/FixedAssetItems.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -380,9 +380,10 @@ } /* end if delete asset */ $result = DB_Txn_Commit($db); -echo '<form name="AssetForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '"> - <table class="selection">'; +echo '<form id="AssetForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '"> + <div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; +echo '<table class="selection">'; if (!isset($AssetID) OR $AssetID=='') { @@ -390,7 +391,7 @@ /*If the page was called without $AssetID passed to page then assume a new asset is to be entered other wise the form showing the fields with the existing entries against the asset will show for editing with a hidden AssetID field. New is set to flag that the page may have called itself and still be entering a new asset, in which case the page needs to know not to go looking up details for an existing asset*/ $New = 1; - echo '<input type="hidden" name="New" value="" /><br />'; + echo '<tr><td><input type="hidden" name="New" value="" /></td></tr>'; $_POST['LongDescription'] = ''; $_POST['Description'] = ''; @@ -434,14 +435,14 @@ <td>' . _('Asset Code') . ':</td> <td>' . $AssetID . '</td> </tr>'; - echo '<input type="Hidden" name="AssetID" value="'.$AssetID.'"/>'; + echo '<tr><td><input type="hidden" name="AssetID" value="'.$AssetID.'"/></td></tr>'; } else { // some changes were made to the data so don't re-set form variables to DB ie the code above echo '<tr> <td>' . _('Asset Code') . ':</td> <td>' . $AssetID . '</td> </tr>'; - echo '<input type="Hidden" name="AssetID" value="' . $AssetID . '"/>'; + echo '<tr><td><input type="hidden" name="AssetID" value="' . $AssetID . '"/></td></tr>'; } if (isset($_POST['Description'])) { @@ -631,6 +632,7 @@ } echo '</div> + </div> </form>'; include('includes/footer.inc'); ?> \ No newline at end of file Modified: trunk/FixedAssetLocations.php =================================================================== --- trunk/FixedAssetLocations.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/FixedAssetLocations.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -104,14 +104,15 @@ $ParentResult=DB_query($ParentSql, $db); $ParentRow=DB_fetch_array($ParentResult); echo '<td>' . $ParentRow['locationdescription'] . '</td> - <td><a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedLocation='.$myrow['locationid'].'">' . _('Edit') . '</td>'; + <td><a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedLocation='.$myrow['locationid'].'">' . _('Edit') . '</a></td></tr>'; } echo '</table> <br />'; -echo '<form name="LocationForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '"> +echo '<form id="LocationForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '"> + <div> + <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" /> <table class="selection"> - <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" /> <tr> <th style="text-align:left">'._('Location ID').'</th>'; if (isset($_GET['SelectedLocation'])) { @@ -156,6 +157,7 @@ echo '<input type="submit" name="submit" value="' . _('Enter Information') . '" />'; } echo '</div> + </div> </form>'; include('includes/footer.inc'); Modified: trunk/FixedAssetRegister.php =================================================================== --- trunk/FixedAssetRegister.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/FixedAssetRegister.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -73,8 +73,9 @@ } elseif (isset($_POST['csv'])) { $csv_output = "'Asset ID','Description','Serial Number','Location','Date Acquired','Cost B/Fwd','Period Additions','Depn B/Fwd','Period Depreciation','Cost C/Fwd', 'Accum Depn C/Fwd','NBV','Disposal Value'\n"; } else { - echo '<form name="RegisterForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '"><table class="selection">'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<form id="RegisterForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '"> + <div>'; + echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<div class="centre">' ._('From') . ':' . $_POST['FromDate'] . ' ' . _('to') . ' ' . $_POST['ToDate'] . '</div>'; echo '<br /> <table width="80%" cellspacing="1" class="selection"> @@ -219,11 +220,6 @@ header('Location: ' .$_SESSION['reports_dir'] . '/FixedAssetRegister_' . Date('Y-m-d') .'.csv'); } else { - echo '<input type="hidden" name="FromDate" value="' . $_POST['FromDate'] . '" />'; - echo '<input type="hidden" name="ToDate" value="' . $_POST['ToDate'] . '" />'; - echo '<input type="hidden" name="AssetCategory" value="' . $_POST['AssetCategory'] . '" />'; - echo '<input type="hidden" name="AssetID" value="' . $_POST['AssetID'] . '" />'; - echo '<input type="hidden" name="AssetLocation" value="' . $_POST['AssetLocation'] . '" />'; //Total Values echo '<tr><th style="vertical-align:top" colspan="5">' . _('TOTAL') . '</th>'; echo '<th style="text-align:right">' . locale_number_format($TotalCostBfwd, $_SESSION['CompanyRecord']['decimalplaces']) . '</th>'; @@ -235,16 +231,28 @@ echo '<th style="text-align:right">' . locale_number_format($TotalNBV, $_SESSION['CompanyRecord']['decimalplaces']) . '</th>'; echo '<th style="text-align:right">' . locale_number_format($TotalDisposals, $_SESSION['CompanyRecord']['decimalplaces']) . '</th></tr>'; echo '</table>'; + + echo '<input type="hidden" name="FromDate" value="' . $_POST['FromDate'] . '" />'; + echo '<input type="hidden" name="ToDate" value="' . $_POST['ToDate'] . '" />'; + echo '<input type="hidden" name="AssetCategory" value="' . $_POST['AssetCategory'] . '" />'; + echo '<input type="hidden" name="AssetID" value="' . $_POST['AssetID'] . '" />'; + echo '<input type="hidden" name="AssetLocation" value="' . $_POST['AssetLocation'] . '" />'; + echo '<br /><div class="centre"><input type="submit" name="pdf" value="' . _('Print as a pdf') . '" /> '; - echo '<input type="submit" name="csv" value="' . _('Print as CSV') . '" /></div></form>'; + echo '<input type="submit" name="csv" value="' . _('Print as CSV') . '" /> + </div> + </div> + </form>'; } } else { include ('includes/header.inc'); - echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ' . $title; + echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . '</p>'; $result = DB_query('SELECT categoryid,categorydescription FROM fixedassetcategories', $db); - echo '<form name="RegisterForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '"><table class="selection">'; + echo '<form id="RegisterForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<table class="selection">'; echo '<tr> <th>' . _('Asset Category') . '</th> <td><select name="AssetCategory"> @@ -310,6 +318,7 @@ <input type="submit" name="pdf" value="' . _('Print as a pdf') . '" /> <input type="submit" name = "csv" value="' . _('Print as CSV') . '" /> </div> + </div> </form>'; } include ('includes/footer.inc'); Modified: trunk/FixedAssetTransfer.php =================================================================== --- trunk/FixedAssetTransfer.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/FixedAssetTransfer.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -27,6 +27,7 @@ $sql="SELECT categoryid, categorydescription FROM fixedassetcategories"; $result=DB_query($sql, $db); echo '<form action="'. htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . '</p>'; @@ -46,7 +47,7 @@ } } - echo '</select>'; + echo '</select></td>'; echo '<td>'. _('Enter partial') . '<b> ' . _('Description') . '</b>:</td><td>'; @@ -69,7 +70,10 @@ echo '</td></tr></table><br />'; - echo '<div class="centre"><input type="submit" name="Search" value="'. _('Search Now') . '" /></div></form><br />'; + echo '<div class="centre"><input type="submit" name="Search" value="'. _('Search Now') . '" /></div> + </div> + </form> + <br />'; } if (isset($_POST['Search'])) { @@ -105,8 +109,9 @@ AND fixedassets.serialno " . LIKE . "'".$_POST['SerialNumber']."'"; $Result=DB_query($sql, $db); echo '<form action="'. htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"> - <table class="selection">'; - echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + <div>'; + echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; + echo '<table class="selection">'; echo '<tr> <th>'._('Asset ID') . '</th> <th>' . _('Description') . '</th> @@ -147,7 +152,9 @@ echo '<td><input type="submit" name="Move'.$myrow['assetid'].'" value="Move" /></td>'; echo '</tr>'; } - echo '</table></form>'; + echo '</table> + </div> + </form>'; } include('includes/footer.inc'); Modified: trunk/FormDesigner.php =================================================================== --- trunk/FormDesigner.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/FormDesigner.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -128,6 +128,7 @@ if (empty($_POST['FormName'])) { echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />'; echo '<form method="post" id="ChooseForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table><tr>'; echo '<td>'. _('Select the form to edit') .'</td><td><select name="FormName">'; @@ -144,6 +145,7 @@ } echo '</select></td></tr></table>'; echo '<br /><div class="centre"><input tabindex="6" type="submit" name="submit" value="' . _('Edit Form Layout') . '" /></div>'; + echo '</div>'; echo '</form>'; include('includes/footer.inc'); exit; @@ -153,16 +155,17 @@ if (empty($_POST['preview'])) { $FormDesign = simplexml_load_file($PathPrefix.'companies/'.$_SESSION['DatabaseName'].'/FormDesigns/'.$_POST['FormName']); } -echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Form Design') . '" alt="" />' . ' ' . _('Form Design').'<br />'. $FormDesign['name'] . ''; +echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Form Design') . '" alt="" />' . ' ' . _('Form Design').'<br />'. $FormDesign['name'] . '</p>'; echo '<div class="page_help_text">' . _('Enter the changes that you want in the form layout below.') .'<br /> '. _('All measurements are in millimetres') . '.</div><br />'; $Papers=array('A4_Landscape', 'A4_Portrait', 'A5_Landscape', 'A5_Portrait', 'A3_Landscape', 'A3_Portrait', 'letter_Portrait', 'letter_Landscape', 'legal_Portrait', 'legal_Landscape'); // Possible paper sizes/orientations echo '<form method="post" id="Form" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">'; +echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<input name="FormName" type="hidden" value="'.$_POST['FormName'].'" />'; echo '<table width="95%" border="1">'; //Start of outer table -echo '<tr><th width="33%">'._('Form Name').'<input type="text" name="formname" value="'.$FormDesign['name'].'" /></th>'; +echo '<tr><th style="width:33%">'._('Form Name').'<input type="text" name="formname" value="'.$FormDesign['name'].'" /></th>'; /* Select the paper size/orientation */ -echo '<th width="33%">'._('Paper Size').'<select name="PaperSize">'; +echo '<th style="width:33%">'._('Paper Size').'<select name="PaperSize">'; foreach ($Papers as $Paper) { if (mb_substr($Paper,-8)=='Portrait') { $PaperValue=mb_substr($Paper,0,mb_strlen($Paper)-9); @@ -177,28 +180,34 @@ } echo '</select></th>'; /* and the standard line height for the form */ -echo '<th width="33%">'._('Line Height').'<input type="text" class="number" name="LineHeight" size="3" maxlength="3" value="'.$FormDesign->LineHeight.'" /></th></tr><tr>'; +echo '<th style="width:33%">'._('Line Height').'<input type="text" class="number" name="LineHeight" size="3" maxlength="3" value="'.$FormDesign->LineHeight.'" /></th></tr><tr>'; $counter=1; // Count how many sub tables are in the row foreach ($FormDesign as $key) { switch ($key['type']) { case 'image': echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="8">'.$key['name'].'</th></tr>'; + echo '<tr>'; echo '<td class="number">'._('x').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'x" size="4" maxlength="4" value="'.$key->x.'" /></td>'; echo '<td class="number">'._('y').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'y" size="4" maxlength="4" value="'.$key->y.'" /></td>'; echo '<td class="number">'._('Width').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'width" size="4" maxlength="4" value="'.$key->width.'" /></td>'; echo '<td class="number">'._('Height').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'height" size="4" maxlength="4" value="'.$key->height.'" /></td>'; + echo '</tr>'; echo '</table></td>'; $counter=$counter+1; break; case 'SimpleText': echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">'.$key['name'].'</th></tr>'."\n"; + echo '<tr>'; SimpleTextLine($key); + echo '</tr>'; echo '</table></td>'; $counter=$counter+1; break; case 'MultiLineText': echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="4">'.$key['name'].'</th></tr>'."\n"; + echo '<tr>'; MultiTextLine($key); + echo '</tr>'; echo '</table></td>'; $counter=$counter+1; break; @@ -231,29 +240,35 @@ break; case 'CurvedRectangle': echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">'.$key['name'].'</th></tr>'; + echo '<tr>'; echo '<td class="number">'._('x').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'x" size="4" maxlength="4" value="'.$key->x.'" /></td>'; echo '<td class="number">'._('y').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'y" size="4" maxlength="4" value="'.$key->y.'" /></td>'; echo '<td class="number">'._('Width').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'width" size="4" maxlength="4" value="'.$key->width.'" /></td></tr><tr>'; echo '<td class="number">'._('Height').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'height" size="4" maxlength="4" value="'.$key->height.'" /></td>'; echo '<td class="number">'._('Radius').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'radius" size="3" maxlength="3" value="'.$key->radius.'" /></td>'; + echo '</tr>'; echo '</table></td>'; $counter=$counter+1; break; case 'Rectangle': echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">'.$key['name'].'</th></tr>'; + echo '<tr>'; echo '<td class="number">'._('x').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'x" size="4" maxlength="4" value="'.$key->x.'" /></td>'; echo '<td class="number">'._('y').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'y" size="4" maxlength="4" value="'.$key->y.'" /></td></tr><tr>'; echo '<td class="number">'._('Width').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'width" size="4" maxlength="4" value="'.$key->width.'" /></td>'; echo '<td class="number">'._('Height').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'height" size="4" maxlength="4" value="'.$key->height.'" /></td>'; + echo '</tr>'; echo '</table></td>'; $counter=$counter+1; break; case 'Line': echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">'.$key['name'].'</th></tr>'; + echo '<tr>'; echo '<td class="number">'._('Start x co-ordinate').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'startx" size="4" maxlength="4" value="'.$key->startx.'" /></td>'; echo '<td class="number">'._('Start y co-ordinate').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'starty" size="4" maxlength="4" value="'.$key->starty.'" /></td></tr><tr>'; echo '<td class="number">'._('End x co-ordinate').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'endx" size="4" maxlength="4" value="'.$key->endx.'" /></td>'; echo '<td class="number">'._('End y co-ordinate').' = '.'</td><td><input type="text" class="number" name="'.$key['id'].'endy" size="4" maxlength="4" value="'.$key->endy.'" /></td>'; + echo '</tr>'; echo '</table></td>'; $counter=$counter+1; break; @@ -266,6 +281,7 @@ echo '</tr></table>'; //End of outer table echo '<br /><div class="centre"><input tabindex="6" type="submit" name="preview" value="' . _('Preview the Form Layout') . '" /></div>'; echo '<br /><div class="centre"><input tabindex="6" type="submit" name="save" value="' . _('Save the Form Layout') . '" /></div>'; +echo '</div>'; echo '</form>'; include('includes/footer.inc'); ?> \ No newline at end of file Modified: trunk/FreightCosts.php =================================================================== --- trunk/FreightCosts.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/FreightCosts.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -23,11 +23,12 @@ } echo '<div class="centre"><p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . - _('Freight Costs') . '" alt="" />' . ' ' . $title . '</p>'; + _('Freight Costs') . '" alt="" />' . ' ' . $title . '</p></div>'; if (!isset($LocationFrom) OR !isset($ShipperID)) { echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; $sql = "SELECT shippername, shipper_id FROM shippers"; $ShipperResults = DB_query($sql,$db); @@ -57,6 +58,7 @@ echo '</select></td></tr> </table> <br /><div class="centre"><input type="submit" value="' . _('Accept') . '" name="Accept" /></div> + </div> </form>'; } else { @@ -237,8 +239,8 @@ <td class="number">%s</td> <td class="number">%s</td> <td class="number">%s</td> - <td><a href="%s&SelectedFreightCost=%s&LocationFrom=%s&ShipperID=%s">' . _('Edit') . '</td> - <td><a href="%s&SelectedFreightCost=%s&LocationFrom=%s&ShipperID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this freight cost') . '\');">' . _('Delete') . '</td></tr>', + <td><a href="%s&SelectedFreightCost=%s&LocationFrom=%s&ShipperID=%s">' . _('Edit') . '</a></td> + <td><a href="%s&SelectedFreightCost=%s&LocationFrom=%s&ShipperID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this freight cost') . '\');">' . _('Delete') . '</a></td></tr>', $myrow[1], $myrow[2], $myrow[3], @@ -264,12 +266,13 @@ //end of ifs and buts! if (isset($SelectedFreightCost)) { - echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?LocationFrom=' . $LocationFrom . '&ShipperID=' . $ShipperID . '">' . _('Show all freight costs for') . ' ' . $ShipperName . ' ' . _('from') . ' ' . $LocationName . '</a></div>'; + echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?LocationFrom=' . $LocationFrom . '&ShipperID=' . $ShipperID . '">' . _('Show all freight costs for') . ' ' . $ShipperName . ' ' . _('from') . ' ' . $LocationName . '</a></div>'; } if (isset($LocationFrom) AND isset($ShipperID)) { echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; + echo '<div>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; if (isset($SelectedFreightCost)) { @@ -325,19 +328,19 @@ <td><input type="text" name="CubRate" class="number" size="6" maxlength="5" value="' . $_POST['CubRate'] . '" /></td></tr>'; echo '<tr><td>' . _('Rate Per KG') . ':</td> <td><input type="text" name="KGRate" class="number" size="6" maxlength="5" value="' . $_POST['KGRate'] . '" /></td></tr>'; - echo '<tr><td>' . _('Maximum Weight Per Package (KGs)') . ':</a></td> + echo '<tr><td>' . _('Maximum Weight Per Package (KGs)') . ':</td> <td><input type="text" name="MAXKGs" class="number" size="8" maxlength="7" value="' . $_POST['MAXKGs'] . '" /></td></tr>'; - echo '<tr><td>' . _('Maximum Volume Per Package (cubic metres)') . ':</a></td> + echo '<tr><td>' . _('Maximum Volume Per Package (cubic metres)') . ':</td> <td><input type="text" name="MAXCub" class="number" size="8" maxlength="7" value="' . $_POST['MAXCub'] . '" /></td></tr>'; - echo '<tr><td>' . _('Fixed Price (zero if rate per KG or Cubic)') . ':</a></td> + echo '<tr><td>' . _('Fixed Price (zero if rate per KG or Cubic)') . ':</td> <td><input type="text" name="FixedPrice" class="number" size="6" maxlength="5" value="' . $_POST['FixedPrice'] . '" /></td></tr>'; - echo '<tr><td>' . _('Minimum Charge (0 is N/A)') . ':</a></td> + echo '<tr><td>' . _('Minimum Charge (0 is N/A)') . ':</td> <td><input type="text" name="MinimumChg" class="number" size="6" maxlength="5" value="' . $_POST['MinimumChg'] . '" /></td></tr>'; echo '</table><br />'; echo '<div class="centre"><input type="submit" name="submit" value="' . _('Enter Information') . '" /></div>'; - + echo '</div>'; echo '</form>'; } //end if record deleted no point displaying form to add record Modified: trunk/GLBudgets.php =================================================================== --- trunk/GLBudgets.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/GLBudgets.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -157,7 +157,7 @@ // Table Headers - echo '<form name="form" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method=post>'; + echo '<form name="form" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<br /> <table class="selection"> Modified: trunk/POReport.php =================================================================== --- trunk/POReport.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/POReport.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -1494,7 +1494,7 @@ // Display form fields. This function is called the first time // the page is called. - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method=post>'; + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table class="selection">'; Modified: trunk/PO_AuthoriseMyOrders.php =================================================================== --- trunk/PO_AuthoriseMyOrders.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/PO_AuthoriseMyOrders.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -48,7 +48,7 @@ WHERE status='Pending'"; $result=DB_query($sql, $db); -echo '<form method=post action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; +echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table class="selection">'; Modified: trunk/PO_Items.php =================================================================== --- trunk/PO_Items.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/PO_Items.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -641,7 +641,7 @@ /* This is where the order as selected should be displayed reflecting any deletions or insertions*/ -echo '<form name="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method=post>'; +echo '<form name="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; /*need to set up entry for item description where not a stock item and GL Codes */ Modified: trunk/Payments.php =================================================================== --- trunk/Payments.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/Payments.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -282,7 +282,7 @@ <br /> <br />'; - echo '<form method=post action="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?identifier=' . $identifier) . '">'; + echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'] . '?identifier=' . $identifier) . '">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo _('Has the cheque been printed') . '? <br /> Modified: trunk/RecurringSalesOrders.php =================================================================== --- trunk/RecurringSalesOrders.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/RecurringSalesOrders.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -308,7 +308,7 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Search') . '" alt="" /><b>'.' '. _('Recurring Order for Customer') .' : ' . $_SESSION['Items'.$identifier]->CustomerName .'</b></p>'; -echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '" method=post>'; +echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '" method="post">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; Modified: trunk/ReprintGRN.php =================================================================== --- trunk/ReprintGRN.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/ReprintGRN.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -11,7 +11,7 @@ $_POST['PONumber']=''; } -echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method=post>'; +echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table class="selection"> <tr> Modified: trunk/ReverseGRN.php =================================================================== --- trunk/ReverseGRN.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/ReverseGRN.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -339,7 +339,7 @@ /*end of Process Goods Received Reversal entry */ } else { - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method=post>'; + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; if (!isset($_POST['RecdAfterDate']) OR !Is_Date($_POST['RecdAfterDate'])) { Modified: trunk/SalesInquiry.php =================================================================== --- trunk/SalesInquiry.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/SalesInquiry.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -1037,7 +1037,7 @@ // Display form fields. This function is called the first time // the page is called. - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method=post> + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post"> <br/> <br/>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; Modified: trunk/SelectAsset.php =================================================================== --- trunk/SelectAsset.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/SelectAsset.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -40,7 +40,7 @@ } // end of showing search facilities -echo '<form action="SelectAsset.php?' . SID . '" method=post>'; +echo '<form action="SelectAsset.php?' . SID . '" method="post">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>'; echo '<table class="selection"><tr>'; Modified: trunk/SelectOrderItems.php =================================================================== --- trunk/SelectOrderItems.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/SelectOrderItems.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -1658,7 +1658,7 @@ echo '<div class="page_help_text">' . _('Select an item by entering the quantity required. Click Order when ready.') . '</div>'; echo '<br />'; $j = 1; - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method=post name="orderform">'; + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post" name="orderform">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<table class="table1">'; echo '<tr><td colspan="1"><input type="hidden" name="previous" value="'.strval($Offset-1).'" /><input tabindex="'.strval($j+8).'" type="submit" name="Prev" value="'._('Prev').'" /></td>'; Modified: trunk/SelectRecurringSalesOrder.php =================================================================== --- trunk/SelectRecurringSalesOrder.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/SelectRecurringSalesOrder.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -5,7 +5,7 @@ $title = _('Search Recurring Sales Orders'); include('includes/header.inc'); -echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method=post>'; +echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/customer.png" title="' . _('Inventory Items') . '" alt="" />' . ' ' . $title . '</p>'; Modified: trunk/SelectSalesOrder.php =================================================================== --- trunk/SelectSalesOrder.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/SelectSalesOrder.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -382,7 +382,7 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/sales.png" title="' . _('Sales') . '" alt="" />' . ' ' . _('Outstanding Sales Orders') . '</p> '; -echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'" method=post>'; +echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'" method="post">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; Modified: trunk/StockAdjustments.php =================================================================== --- trunk/StockAdjustments.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/StockAdjustments.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -352,7 +352,7 @@ }/* end if the user hit enter the adjustment */ -echo '<form action="'. htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'" method=post>'; +echo '<form action="'. htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier.'" method="post">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; if (!isset($_SESSION['Adjustment' . $identifier])) { Modified: trunk/StockCounts.php =================================================================== --- trunk/StockCounts.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/StockCounts.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -9,7 +9,7 @@ include('includes/header.inc'); -echo "<form action='" . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . "' method=post>"; +echo "<form action='" . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . "' method="post">"; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . Modified: trunk/StockLocStatus.php =================================================================== --- trunk/StockLocStatus.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/StockLocStatus.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -15,7 +15,7 @@ } -echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method=post>'; +echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; $sql = "SELECT loccode, Modified: trunk/StockLocTransferReceive.php =================================================================== --- trunk/StockLocTransferReceive.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/StockLocTransferReceive.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -410,7 +410,7 @@ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') . '" alt="" />' . ' ' . $title . '</p>'; - echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?'. SID . '" method=post>'; + echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?'. SID . '" method="post">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; prnMsg(_('Please Verify Shipment Quantities Received'),'info'); Modified: trunk/Z_ImportStocks.php =================================================================== --- trunk/Z_ImportStocks.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/Z_ImportStocks.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -290,7 +290,7 @@ <br /> <br /> '; - echo "<form ENCtype='multipart/form-data' action='Z_ImportStocks.php' method=post>"; + echo "<form ENCtype='multipart/form-data' action='Z_ImportStocks.php' method="post">"; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo "<input type='hidden' name='MAX_FILE_SIZE' value='1000000' />" . Modified: trunk/Z_UploadForm.php =================================================================== --- trunk/Z_UploadForm.php 2012-03-13 08:29:08 UTC (rev 5104) +++ trunk/Z_UploadForm.php 2012-03-16 22:34:02 UTC (rev 5105) @@ -9,7 +9,7 @@ include('includes/header.inc'); -echo "<form ENCtype='multipart/form-data' action='Z_UploadResult.php' method=post>"; +echo "<form ENCtype='multipart/form-data' action='Z_UploadResult.php' method="post">"; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; echo "<input type='hidden' name='MAX_FILE_SIZE' value='1000000' />" . This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |