[Weberp-svn] SF.net SVN: weberp:[5220] trunk
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
[Weberp-svn] SF.net SVN: weberp:[5220] trunk
|
From: <tim...@us...> - 2011-04-24 08:20:34
|
Revision: 5220
http://weberp.svn.sourceforge.net/weberp/?rev=5220&view=rev
Author: tim_schofield
Date: 2011-04-24 08:20:27 +0000 (Sun, 24 Apr 2011)
Log Message:
-----------
XHTML and quoting changes
Modified Paths:
--------------
trunk/AccountSections.php
trunk/AuditTrail.php
trunk/BOMs.php
trunk/PDFLowGP.php
trunk/PO_AuthorisationLevels.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Header.php
trunk/PO_SelectPurchOrder.php
trunk/Payments.php
trunk/PcAssignCashToTab.php
trunk/PcClaimExpensesFromTab.php
trunk/PcTabs.php
trunk/Prices.php
trunk/Prices_Customer.php
trunk/SalesCategories.php
trunk/SalesTypes.php
trunk/SecurityTokens.php
trunk/SelectProduct.php
trunk/SelectRecurringSalesOrder.php
trunk/SelectSalesOrder.php
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/AccountSections.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -70,9 +70,9 @@
$i++;
}
}
- if (strpos($_POST['SectionName'],'&')>0 OR strpos($_POST['SectionName'],"'")>0) {
+ if (ContainsIllegalCharacters($_POST['SectionName'])) {
$InputError = 1;
- prnMsg( _('The account section name cannot contain the character') . " '&' " . _('or the character') ." '",'error');
+ prnMsg( _('The account section name cannot contain illegal characters') ,'error');
$Errors[$i] = 'SectionName';
$i++;
}
@@ -250,14 +250,14 @@
if (!isset($_POST['SectionName'])) {
$_POST['SectionName']='';
}
- echo "<table class='selection'>
+ echo '<table class="selection">
<tr>
- <td>" . _('Section Number') . ':' . '</td>
- <td><input tabindex="1" ' . (in_array('SectionID',$Errors) ? 'class="inputerror"' : '' ) ." type='text' name='SectionID' class='number' size='4' maxlength='4' value='" . $_POST['SectionID'] . "' /></td></tr>";
+ <td>' . _('Section Number') . ':' . '</td>
+ <td><input tabindex="1" ' . (in_array('SectionID',$Errors) ? 'class="inputerror"' : '' ) . ' type="text" name="SectionID" class="number" size="4" maxlength="4" value="' . $_POST['SectionID'] . '" /></td></tr>';
}
- echo "<tr><td>" . _('Section Description') . ':' . '</td>
- <td><input tabindex="2" ' . (in_array('SectionName',$Errors) ? 'class="inputerror"' : '' ) ." type='text' name='SectionName' size='30' maxlength='30' value='" . $_POST['SectionName'] . "' /></td>
- </tr>";
+ echo '<tr><td>' . _('Section Description') . ':' . '</td>
+ <td><input tabindex="2" ' . (in_array('SectionName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="SectionName" size="30" maxlength="30" value="' . $_POST['SectionName'] . '" /></td>
+ </tr>';
echo '<tr><td colspan="2"><div class="centre"><input tabindex="3" type="submit" name="submit" value="' . _('Enter Information') . '" /></div></td></tr>';
echo '</table><br />';
@@ -273,4 +273,4 @@
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/AuditTrail.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -102,7 +102,8 @@
$SQLString = str_replace('SET','',$SQLString);
$SQLString = str_replace('WHERE',',',$SQLString);
$SQLString = str_replace('AND',',',$SQLString);
- $FieldArray = preg_split("/[[:space:]]*([[:alnum:].]+[[:space:]]*=[[:space:]]*(?:'[^']*'|[[:digit:].]+))[[:space:]]*,/", $SQLString, 0, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY); for ($i=0; $i<sizeof($FieldArray); $i++) {
+ $FieldArray = preg_split("/[[:space:]]*([[:alnum:].]+[[:space:]]*=[[:space:]]*(?:'[^']*'|[[:digit:].]+))[[:space:]]*,/", $SQLString, 0, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+ for ($i=0; $i<sizeof($FieldArray); $i++) {
$Assigment = explode('=', $FieldArray[$i]);
$_SESSION['SQLString']['fields'][$i] = $Assigment[0];
if (sizeof($Assigment)>1) {
@@ -153,7 +154,7 @@
$RowColour = '#a8ff90';
}
if (Query_Type($myrow[2]) == 'UPDATE') {
- UpdateQueryInfo(str_replace('UPDATE','',$myrow[2]));
+ UpdateQueryInfo(str_replace("UPDATE",'',$myrow[2]));
$RowColour = '#feff90';
}
if (Query_Type($myrow[2]) == 'DELETE') {
@@ -177,7 +178,7 @@
if (isset($_SESSION['SQLString']['values'][$i]) and (trim(str_replace("'","",$_SESSION['SQLString']['values'][$i])) != "") &
(trim($_SESSION['SQLString']['fields'][$i]) != 'password') &
(trim($_SESSION['SQLString']['fields'][$i]) != 'www_users.password')) {
- echo '<tr bgcolor='.$RowColour.'>';
+ echo '<tr bgcolor="'.$RowColour.'">';
echo '<td></td>
<td></td>
<td></td>
@@ -187,7 +188,7 @@
echo '</tr>';
}
}
- echo '<tr bgcolor=black><td></td><td></td><td></td><td></td><td></td><td></td></tr>';
+ echo '<tr bgcolor=black> <td colspan="6"></td> </tr>';
}
unset($_SESSION['SQLString']);
}
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/BOMs.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -790,7 +790,7 @@
if (!isset($SelectedParent)) {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ' . $title;
- echo '<form action=' . $_SERVER['PHP_SELF'] . '" method=post>' .
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '" method=post>' .
'<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' .
_('to maintain the bill of material for using the options below') . '.' . '<br><font size=1>' .
_('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') .
Modified: trunk/PDFLowGP.php
===================================================================
--- trunk/PDFLowGP.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/PDFLowGP.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -72,7 +72,7 @@
include('includes/header.inc');
prnMsg(_('No low GP items retrieved'), 'warn');
- echo '<br><a href="' . $rootpath . '/index.php?"' . SID . '">' . _('Back to the menu') . '</a>';
+ echo '<br><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />'.$SQL;
}
Modified: trunk/PO_AuthorisationLevels.php
===================================================================
--- trunk/PO_AuthorisationLevels.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/PO_AuthorisationLevels.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -142,10 +142,8 @@
echo '<td>'.$CanCreate.'</td>';
echo '<td>'.$OffHold.'</td>';
echo '<td class="number">'.number_format($myrow['authlevel'],2).'</td>';
- echo '<td><a href="'.$rootpath.'/PO_AuthorisationLevels.php?Edit=Yes&UserID=' . $myrow['userid'] .
- '&Currency='.$myrow['currabrev'].'">'._('Edit').'</td>';
- echo '<td><a href="'.$rootpath.'/PO_AuthorisationLevels.php?Delete=Yes&UserID=' . $myrow['userid'] .
- '&Currency='.$myrow['currabrev'].'">'._('Delete').'</td></tr>';
+ echo '<td><a href="'.$rootpath.'/PO_AuthorisationLevels.php?Edit=Yes&UserID=' . $myrow['userid'] . '&Currency='.$myrow['currabrev'].'">'._('Edit').'</td>';
+ echo '<td><a href="'.$rootpath.'/PO_AuthorisationLevels.php?Delete=Yes&UserID=' . $myrow['userid'] . '&Currency='.$myrow['currabrev'].'">'._('Delete').'</td></tr>';
}
echo '</table><br><br>';
Modified: trunk/PO_AuthoriseMyOrders.php
===================================================================
--- trunk/PO_AuthoriseMyOrders.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/PO_AuthoriseMyOrders.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -20,8 +20,7 @@
if (substr($key,0,6)=='status') {
$orderno=substr($key,6);
$status=$_POST['status'.$orderno];
- $comment=date($_SESSION['DefaultDateFormat']).' - '._('Authorised by').' '.'<a href="mailto:'.
- $emailrow['email'].'">'.$_SESSION['UserID'].'</a><br>'.$_POST['comment'];
+ $comment=date($_SESSION['DefaultDateFormat']).' - '._('Authorised by').' '.'<a href="mailto:'. $emailrow['email'].'">'.$_SESSION['UserID'].'</a><br>'.$_POST['comment'];
$sql="UPDATE purchorders
SET status='".$status."',
stat_comment='".$comment."',
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/PO_Header.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -780,8 +780,7 @@
echo '<td style="width:50%" valign="top"><table class="selection" width="100%">';
if($_SESSION['ExistingOrder'] != 0 and $_SESSION['PO'.$identifier]->Status == PurchOrder::STATUS_PRINTED){
- echo '<tr><td><a href="' .$rootpath . '/GoodsReceived.php?&PONumber=' .
- $_SESSION['PO'.$identifier]->OrderNo . '&identifier='.$identifier.'">'._('Receive this order').'</a></td></tr>';
+ echo '<tr><td><a href="' .$rootpath . '/GoodsReceived.php?&PONumber=' . $_SESSION['PO'.$identifier]->OrderNo . '&identifier='.$identifier.'">'._('Receive this order').'</a></td></tr>';
}
switch ($_SESSION['PO'.$identifier]->Status) {
Modified: trunk/PO_SelectPurchOrder.php
===================================================================
--- trunk/PO_SelectPurchOrder.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/PO_SelectPurchOrder.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -20,7 +20,7 @@
} elseif (isset($_POST['SelectedSupplier'])) {
$SelectedSupplier = $_POST['SelectedSupplier'];
}
-echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method=post>';
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" method=post>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_POST['ResetPart'])) {
unset($SelectedStockItem);
@@ -379,15 +379,15 @@
$FormatedOrderValue = number_format($myrow['ordervalue'], 2);
/* View Supplier Currency Requisition Order Date Initiator Order Total
ModifyPage, $myrow["orderno"], $myrow["suppname"], $myrow["currcode"], $myrow["requisitionno"] $FormatedOrderDate, $myrow["initiator"] $FormatedOrderValue Order Status*/
- echo "<td><a href='" . $ViewPurchOrder . "'>" . $myrow['orderno'] . "</a></td>
- <td>" . $myrow['suppname'] . "</td>
- <td>" . $myrow['currcode'] . "</td>
- <td>" . $myrow['requisitionno'] . "</td>
- <td>" . $FormatedOrderDate . "</td>
- <td>" . $myrow['initiator'] . "</td>
- <td class=number>" . $FormatedOrderValue . "</td>
- <td>" . _($myrow['status']) . "</td>
- </tr>";
+ echo '<td><a href="' . $ViewPurchOrder . '">' . $myrow['orderno'] . '</a></td>
+ <td>' . $myrow['suppname'] . '</td>
+ <td>' . $myrow['currcode'] . '</td>
+ <td>' . $myrow['requisitionno'] . '</td>
+ <td>' . $FormatedOrderDate . '</td>
+ <td>' . $myrow['initiator'] . '</td>
+ <td class=number>' . $FormatedOrderValue . '</td>
+ <td>' . _($myrow['status']) . '</td>
+ </tr>';
//$myrow['status'] is a string which has gettext translations from PO_Header.php script
$j++;
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/Payments.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -702,7 +702,7 @@
}
-echo '<form action=' . $_SERVER['PHP_SELF'] . '?' . SID . ' method=post>';
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" method=post>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/PcAssignCashToTab.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -232,12 +232,8 @@
<td>'.ConvertSQLDate($myrow['authorized']).'</td>
<td>'.$myrow['notes'].'</td>
<td>'.$myrow['receipt'].'</td>
- <td><a href="'.$_SERVER['PHP_SELF'] . '?SelectedIndex='.$myrow['counterindex'].'&SelectedTabs=' .
- $SelectedTabs . '&Days=' . $Days . '&edit=yes">' . _('Edit') . '</td>
- <td><a href="'.$_SERVER['PHP_SELF'] . '?SelectedIndex='.$myrow['counterindex'].'&SelectedTabs=' .
- $SelectedTabs . '&Days=' . $Days . '&delete=yes" onclick=\'return confirm("' .
- _('Are you sure you wish to delete this code and the expense it may have set up?') . '");\'>' .
- _('Delete') . '</td>
+ <td><a href="'.$_SERVER['PHP_SELF'] . '?SelectedIndex='.$myrow['counterindex'].'&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&edit=yes">' . _('Edit') . '</td>
+ <td><a href="'.$_SERVER['PHP_SELF'] . '?SelectedIndex='.$myrow['counterindex'].'&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this code and the expense it may have set up?') . '");\'>' . _('Delete') . '</td>
</tr>';
}else{
echo '<td>'.ConvertSQLDate($myrow['date']).'</td>
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/PcClaimExpensesFromTab.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -227,7 +227,7 @@
<td>%s</td>
<td>%s</td>
<td><a href="%sSelectedIndex=%s&SelectedTabs='.$SelectedTabs.'&Days='.$Days.'&edit=yes">' . _('Edit') . '</td>
- <td><a href="%sSelectedIndex=%s&SelectedTabs='.$SelectedTabs.'&Days='.$Days.'&delete=yes" onclick="return confirm("' . _('Are you sure you wish to delete this code and the expense it may have set up?') . '");\'>' . _('Delete') . '</td>
+ <td><a href="%sSelectedIndex=%s&SelectedTabs='.$SelectedTabs.'&Days='.$Days.'&delete=yes" onclick="return confirm("' . _('Are you sure you wish to delete this code and the expense it may have set up?') . '");">' . _('Delete') . '</td>
</tr>',
ConvertSQLDate($myrow['2']),
$Description['0'],
Modified: trunk/PcTabs.php
===================================================================
--- trunk/PcTabs.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/PcTabs.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -189,7 +189,7 @@
<td>%s</td>
<td>%s</td>
<td><a href="%sSelectedTab=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedTab=%s&delete=yes" onclick="return confirm("' . _('Are you sure you wish to delete this code and all the description it may have set up?') . '");>' . _('Delete') . '</td>
+ <td><a href="%sSelectedTab=%s&delete=yes" onclick="return confirm("' . _('Are you sure you wish to delete this code and all the description it may have set up?') . '");">' . _('Delete') . '</td>
</tr>',
$myrow['tabcode'],
$myrow['usercode'],
Modified: trunk/Prices.php
===================================================================
--- trunk/Prices.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/Prices.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -32,7 +32,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Search') .
'" alt="" />' . '</img>' . $title.'</p>';
-echo "<div class=centre><a href='" . $rootpath . '/SelectProduct.php?' . SID . "'>" . _('Back to Items') . '</a></div><br>';
+echo '<div class="centre"><a href="' . $rootpath . '/SelectProduct.php">' . _('Back to Items') . '</a></div><br>';
$result = DB_query("SELECT stockmaster.description,
@@ -240,29 +240,26 @@
if (in_array(12,$_SESSION['AllowedPageSecurityTokens'])) {
echo '<input type=hidden name="Units" value="' . $myrow['units'] . '">';
- echo "<td>".$myrow['currency']."</td>
- <td>".$myrow['sales_type']."</td>
- <td>".$myrow['units']."</td>
- <td class=number>".$myrow['conversionfactor']."</td>
- <td class=number>".$myrow['decimalplaces']."</td>
- <td class=number>".number_format($myrow['price'],2)."</td>
- <td>".ConvertSQLDate($myrow['startdate'])."</td>
- <td>".$EndDateDisplay."</td>
- <td><a href='".$_SERVER['PHP_SELF']."?".SID."&Item=".$myrow['stockid']."&TypeAbbrev=".$myrow['typeabbrev']."
- &CurrAbrev=".$myrow['currabrev']."&StartDate=".$myrow['startdate']."&EndDate=".$myrow['enddate']."&Edit=1'>" . _('Edit') . "</td>
- <td><a href='".$_SERVER['PHP_SELF']."?".SID."&Item=".$myrow['stockid']."&TypeAbbrev=".$myrow['typeabbrev'].
- "&CurrAbrev=".$myrow['currabrev']."&StartDate=".$myrow['startdate']."&EndDate=".$myrow['enddate'].
- "&delete=yes' onclick=\"return confirm('" . _('Are you sure you wish to delete this price?') . "');\">" . _('Delete') . '</td></tr>';
+ echo '<td>'.$myrow['currency'].'</td>
+ <td>'.$myrow['sales_type'].'</td>
+ <td>'.$myrow['units'].'</td>
+ <td class=number>'.$myrow['conversionfactor'].'</td>
+ <td class=number>'.$myrow['decimalplaces'].'</td>
+ <td class=number>'.number_format($myrow['price'],2).'</td>
+ <td>'.ConvertSQLDate($myrow['startdate']).'</td>
+ <td>'.$EndDateDisplay.'</td>
+ <td><a href="'.$_SERVER['PHP_SELF'].'?'.SID.'&Item='.$myrow['stockid'].'&TypeAbbrev='.$myrow['typeabbrev'].'&CurrAbrev='.$myrow['currabrev'].'&StartDate='.$myrow['startdate'].'&EndDate='.$myrow['enddate'].'&Edit=1">' . _('Edit') . '</td>
+ <td><a href="'.$_SERVER['PHP_SELF'].'?'.SID.'&Item='.$myrow['stockid'].'&TypeAbbrev='.$myrow['typeabbrev'].'&CurrAbrev='.$myrow['currabrev'].'&StartDate='.$myrow['startdate'].'&EndDate='.$myrow['enddate'].'&delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this price?') . '");\'>' . _('Delete') . '</td></tr>';
} else {
- echo "<td>".$myrow['currency']."</td>
- <td>".$myrow['sales_type']."</td>
- <td>".$myrow['units']."</td>
- <td class=number>".$myrow['conversionfactor']."</td>
- <td class=number>".$myrow['decimalplaces']."</td>
- <td class=number>".number_format($myrow['price'],2)."</td>
- <td>".ConvertSQLDate($myrow['startdate'])."</td>
- <td>".$EndDateDisplay."</td>
- </tr>";
+ echo '<td>'.$myrow['currency'].'</td>
+ <td>'.$myrow['sales_type'].'</td>
+ <td>'.$myrow['units'].'</td>
+ <td class=number>'.$myrow['conversionfactor'].'</td>
+ <td class=number>'.$myrow['decimalplaces'].'</td>
+ <td class=number>'.number_format($myrow['price'],2).'</td>
+ <td>'.ConvertSQLDate($myrow['startdate']).'</td>
+ <td>'.$EndDateDisplay.'</td>
+ </tr>';
}
}
Modified: trunk/Prices_Customer.php
===================================================================
--- trunk/Prices_Customer.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/Prices_Customer.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -306,10 +306,8 @@
<td class=number>'.$myrow['conversionfactor'].'</td>
<td>'.ConvertSQLDate($myrow['startdate']).'</td>
<td>'.$EndDateDisplay.'</td>
- <td><a href="'.$_SERVER['PHP_SELF'].'?Item='.$Item.'&Price='.$myrow['price'].'&Branch='.$myrow['branchcode'].
- '&StartDate='.$myrow['startdate'].'&EndDate='.$myrow['enddate'].'&Edit=1">' . _('Edit') . '</td>
- <td><a href="'.$_SERVER['PHP_SELF'].'?Item='.$Item.'&Branch='.$myrow['branchcode'].'&StartDate='.$myrow['startdate'].
- '&EndDate='.$myrow['enddate'].'&delete=yes">' . _('Delete') . '</td></tr>';
+ <td><a href="'.$_SERVER['PHP_SELF'].'?Item='.$Item.'&Price='.$myrow['price'].'&Branch='.$myrow['branchcode'].'&StartDate='.$myrow['startdate'].'&EndDate='.$myrow['enddate'].'&Edit=1">' . _('Edit') . '</td>
+ <td><a href="'.$_SERVER['PHP_SELF'].'?Item='.$Item.'&Branch='.$myrow['branchcode'].'&StartDate='.$myrow['startdate'].'&EndDate='.$myrow['enddate'].'&delete=yes">' . _('Delete') . '</td></tr>';
}
//END WHILE LIST LOOP
}
Modified: trunk/SalesCategories.php
===================================================================
--- trunk/SalesCategories.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/SalesCategories.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -169,8 +169,7 @@
// ----------------------------------------------------------------------------------------
// Calculate Path for navigation
-$CategoryPath = '<a href="'.$_SERVER['PHP_SELF'] . '?' . SID .
- '&ParentCategory=NULL">' . _('Main') . '</a>' . " \\ ";
+$CategoryPath = '<a href="'.$_SERVER['PHP_SELF'] . '?ParentCategory=NULL">' . _('Main') . '</a>' . " \\ ";
$TempPath = '';
if (isset($ParentCategory)) {
$TmpParentID = $ParentCategory;
@@ -186,8 +185,7 @@
if (DB_num_rows($result) > 0) {
$row = DB_fetch_array($result);
$LastParentName = $row['salescatname'];
- $TempPath = '<a href="'.$_SERVER['PHP_SELF'] . '?' . SID .
- '&ParentCategory='.$TmpParentID.'">'.$LastParentName .
+ $TempPath = '<a href="'.$_SERVER['PHP_SELF'] . '?ParentCategory='.$TmpParentID.'">'.$LastParentName .
'</a>'." \\ ".$TempPath;
$TmpParentID = $row['parentcatid']; // Set For Next Round
} else {
@@ -439,14 +437,13 @@
echo '<td>' . $myrow['stockid'] . '</td>';
echo '<td>' . $myrow['description'] . '</td>';
- echo '<td><a href="'.$_SERVER['PHP_SELF'] . '?' . SID .
- '&ParentCategory='.$ParentCategory.'&DelStockID='.$myrow['stockid'].'">'.
+ echo '<td><a href="'.$_SERVER['PHP_SELF'] . 'ParentCategory='.$ParentCategory.'&DelStockID='.$myrow['stockid'].'">'.
_('Remove').
'</a></td></tr>';
}
echo '</table>';
} else {
- prnMsg(_("No Inventory items in this category."));
+ prnMsg(_('No Inventory items in this category.'));
}
DB_free_result($result);
}
Modified: trunk/SalesTypes.php
===================================================================
--- trunk/SalesTypes.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/SalesTypes.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -204,7 +204,7 @@
printf('<td>%s</td>
<td>%s</td>
<td><a href="%sSelectedType=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedType=%s&delete=yes onclick=\'return confirm("' . _('Are you sure you wish to delete this price list and all the prices it may have set up?') . '");\'>' . _('Delete') . '</td>
+ <td><a href="%sSelectedType=%s&delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this price list and all the prices it may have set up?') . '");\'>' . _('Delete') . '</td>
</tr>',
$myrow[0],
$myrow[1],
Modified: trunk/SecurityTokens.php
===================================================================
--- trunk/SecurityTokens.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/SecurityTokens.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -73,8 +73,8 @@
$result= DB_query($sql,$db);
while ($myrow = DB_fetch_array($result,$db)){
- echo '<tr><td>'.$myrow[0].'</td><td>'.$myrow[1].'</td><td><a href="' .
- $_SERVER['PHP_SELF'] . '?SelectedToken=' . $myrow[0] . '&Action=edit">' . _('Edit') . '</a></td></tr>';
+ echo '<tr><td>'.$myrow[0].'</td><td>'.$myrow[1].'</td><td>
+ <a href="' . $_SERVER['PHP_SELF'] . '?SelectedToken=' . $myrow[0] . '&Action=edit">' . _('Edit') . '</a></td></tr>';
}
echo '</table><p></p>';
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/SelectProduct.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -210,7 +210,7 @@
AND stkcatpropid ='" . $PropertyRow['stkcatpropid']."'", $db);
$PropValRow = DB_fetch_row($PropValResult);
$PropertyValue = $PropValRow[0];
- echo '<form name="CatPropForm" enctype="multipart/form-data" method="post" action="' . $_SERVER['PHP_SELF'] . '?' .SID .'">';
+ echo '<form name="CatPropForm" enctype="multipart/form-data" method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<tr><th align="right">' . $PropertyRow['label'] . ':</th>';
switch ($PropertyRow['controltype']) {
@@ -380,8 +380,8 @@
} else {
echo '<td class="select">' . _('No') . '</td>';
}
- echo '<td class="select"><a href="' . $rootpath . '/PO_Header.php?&NewOrder=Yes' . '&SelectedSupplier=' .
- $SuppRow['supplierid'] . '&StockID=' . $StockID . '&Quantity='.$SuppRow['minorderqty'].'">' . _('Order') . ' </a></td>';
+ echo '<td class="select">';
+ echo '<a href="' . $rootpath . '/PO_Header.php?&NewOrder=Yes' . '&SelectedSupplier=' . $SuppRow['supplierid'] . '&StockID=' . $StockID . '&Quantity='.$SuppRow['minorderqty'].'">' . _('Order') . ' </a></td>';
echo '</tr>';
}
echo '</table></td>';
@@ -450,8 +450,7 @@
} else {
$EOQ = $myrow['eoq'];
}
- echo '<a href="' . $rootpath . '/PO_Header.php?&NewOrder=Yes' . '&SelectedSupplier=' . $SuppRow['supplierid'] .
- '&StockID=' . $StockID . '&Quantity=' . $EOQ . '">' . _('Purchase this Item from') . ' ' . $SuppRow['suppname'] . ' (' . _('default') . ')</a><br />';
+ echo '<a href="' . $rootpath . '/PO_Header.php?&NewOrder=Yes' . '&SelectedSupplier=' . $SuppRow['supplierid'] . '&StockID=' . $StockID . '&Quantity=' . $EOQ . '">' . _('Purchase this Item from') . ' ' . $SuppRow['suppname'] . ' (' . _('default') . ')</a><br />';
/**/
} /* end of while */
} /* end of $myrow['mbflag'] == 'B' */
Modified: trunk/SelectRecurringSalesOrder.php
===================================================================
--- trunk/SelectRecurringSalesOrder.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/SelectRecurringSalesOrder.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -1,12 +1,11 @@
<?php
/* $Id$*/
-//$PageSecurity = 2;
include('includes/session.inc');
$title = _('Search Recurring Sales Orders');
include('includes/header.inc');
-echo '<form action=' . $_SERVER['PHP_SELF'] .'?' .SID . ' method=post>';
+echo '<form action="' . $_SERVER['PHP_SELF'] .'" 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>';
@@ -21,20 +20,20 @@
while ($myrow=DB_fetch_array($resultStkLocs)){
if (isset($_POST['StockLocation'])){
if ($myrow['loccode'] == $_POST['StockLocation']){
- echo "<option selected Value='" . $myrow['loccode'] . "'>" . $myrow['locationname'];
+ echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo "<option Value='" . $myrow['loccode'] . "'>" . $myrow['locationname'];
+ echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
} elseif ($myrow['loccode']==$_SESSION['UserStockLocation']){
- echo "<option selected Value='" . $myrow['loccode'] . "'>" . $myrow['locationname'];
+ echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo "<option Value='" . $myrow['loccode'] . "'>" . $myrow['locationname'];
+ echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
echo '</select></td></tr></table>';
-echo "<br /><div class=centre><input type=submit name='SearchRecurringOrders' VALUE='" . _('Search Recurring Orders') . "'></div>";
+echo '<br /><div class=centre><input type=submit name="SearchRecurringOrders" VALUE="' . _('Search Recurring Orders') . '"></div>';
if (isset($_POST['SearchRecurringOrders'])){
@@ -74,16 +73,16 @@
echo '<br /><table cellpadding=2 colspan=7 width=90% class=selection>';
- $tableheader = "<tr>
- <th>" . _('Modify') . "</th>
- <th>" . _('Customer') . "</th>
- <th>" . _('Branch') . "</th>
- <th>" . _('Cust Order') . " #</th>
- <th>" . _('Last Recurrence') . "</th>
- <th>" . _('End Date') . "</th>
- <th>" . _('Times p.a.') . "</th>
- <th>" . _('Order Total') . "</th>
- </tr>";
+ $tableheader = '<tr>
+ <th>' . _('Modify') . '</th>
+ <th>' . _('Customer') . '</th>
+ <th>' . _('Branch') . '</th>
+ <th>' . _('Cust Order') . ' #</th>
+ <th>' . _('Last Recurrence') . '</th>
+ <th>' . _('End Date') . '</th>
+ <th>' . _('Times p.a.') . '</th>
+ <th>' . _('Order Total') . '</th>
+ </tr>';
echo $tableheader;
@@ -100,12 +99,12 @@
$k++;
}
- $ModifyPage = $rootpath . "/RecurringSalesOrders.php?" . SID . '&ModifyRecurringSalesOrder=' . $myrow['recurrorderno'];
+ $ModifyPage = $rootpath . '/RecurringSalesOrders.php?ModifyRecurringSalesOrder=' . $myrow['recurrorderno'];
$FormatedLastRecurrence = ConvertSQLDate($myrow['lastrecurrence']);
$FormatedStopDate = ConvertSQLDate($myrow['stopdate']);
$FormatedOrderValue = number_format($myrow['ordervalue'],2);
- printf("<td><a href='%s'>%s</a></td>
+ printf('<td><a href="%s">%s</a></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -113,7 +112,7 @@
<td>%s</td>
<td>%s</td>
<td class=number>%s</td>
- </tr>",
+ </tr>',
$ModifyPage,
$myrow['recurrorderno'],
$myrow['name'],
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2011-04-24 05:30:33 UTC (rev 5219)
+++ trunk/SelectSalesOrder.php 2011-04-24 08:20:27 UTC (rev 5220)
@@ -312,7 +312,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=' . $_SERVER['PHP_SELF'] .'?' .SID . ' method=post>';
+echo '<form action="' . $_SERVER['PHP_SELF'] .'" method=post>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
