Skip to content

Commit 79cd5b5

Browse files
TurboPTtimschofield
authored andcommitted
PaulT: Remove the last of the remaining URL 'SID' references.
1 parent 9d5aaa1 commit 79cd5b5

26 files changed

+52
-54
lines changed

FixedAssetRegister.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
} elseif (isset($_POST['csv'])) {
7777
$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";
7878
} else {
79-
echo '<form id="RegisterForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">
79+
echo '<form id="RegisterForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
8080
<div>';
8181
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
8282
echo '<div class="centre">' ._('From') . ':' . $_POST['FromDate'] . ' ' . _('to') . ' ' . $_POST['ToDate'] . '</div>';

FormDesigner.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,25 +147,25 @@ function SelectShowElement($keyName, $keyValue) {
147147
$FormDesign->asXML(sys_get_temp_dir().'/'.$_POST['FormName']);
148148
switch ($_POST['FormName']) {
149149
case 'PurchaseOrder.xml':
150-
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PO_PDFPurchOrder.php?' . SID .'OrderNo=Preview">';
150+
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PO_PDFPurchOrder.php?OrderNo=Preview">';
151151
break;
152152
case 'GoodsReceived.xml':
153-
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFGrn.php?' . SID .'GRNNo=Preview&PONo=1">';
153+
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFGrn.php?GRNNo=Preview&PONo=1">';
154154
break;
155155
case 'PickingList.xml':
156-
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFPickingList.php?' . SID .'TransNo=Preview">';
156+
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFPickingList.php?TransNo=Preview">';
157157
break;
158158
case 'QALabel.xml':
159-
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFQALabel.php?' . SID .'GRNNo=Preview&PONo=1">';
159+
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFQALabel.php?GRNNo=Preview&PONo=1">';
160160
break;
161161
case 'WOPaperwork.xml':
162-
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFWOPrint.php?' . SID .'WO=Preview">';
162+
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFWOPrint.php?WO=Preview">';
163163
break;
164164
case 'FGLabel.xml':
165-
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFFGLabel.php?' . SID .'WO=Preview">';
165+
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFFGLabel.php?WO=Preview">';
166166
break;
167167
case 'ShippingLabel.xml':
168-
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFShipLabel.php?' . SID .'ORD=Preview">';
168+
echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/PDFShipLabel.php?ORD=Preview">';
169169
break;
170170
}
171171
} else {
@@ -183,7 +183,7 @@ function SelectShowElement($keyName, $keyValue) {
183183
* drop down list of possible forms */
184184
if (empty($_POST['FormName'])) {
185185
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />';
186-
echo '<form method="post" id="ChooseForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">';
186+
echo '<form method="post" id="ChooseForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
187187
echo '<div>';
188188
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
189189
echo '<table><tr>';
@@ -219,7 +219,7 @@ function SelectShowElement($keyName, $keyValue) {
219219
_('All coordinates are measured from the lower left corner of the sheet to the top left corner of the element.') . '</div><br />';
220220

221221
$Papers=array('A4_Landscape', 'A4_Portrait', 'A5_Landscape', 'A5_Portrait', 'A6_Landscape', 'A3_Landscape', 'A3_Portrait', 'Letter_Portrait', 'Letter_Landscape', 'Legal_Portrait', 'Legal_Landscape'); // Possible paper sizes/orientations
222-
echo '<form method="post" id="Form" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">';
222+
echo '<form method="post" id="Form" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
223223
echo '<div>';
224224
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
225225
echo '<input name="FormName" type="hidden" value="'.$_POST['FormName'].'" />';

MRPReschedules.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
include('includes/header.php');
1313
echo '<br />';
1414
prnMsg( _('The MRP calculation must be run before you can run this report') . '<br />' .
15-
_('To run the MRP calculation click').' ' . '<a href='.$RootPath .'/MRP.php?' . SID .'>' . _('here') . '</a>', 'error');
15+
_('To run the MRP calculation click').' ' . '<a href="'.$RootPath .'/MRP.php">' . _('here') . '</a>', 'error');
1616
include('includes/footer.php');
1717
exit;
1818
}
@@ -55,7 +55,7 @@
5555
$Title = _('MRP Reschedules') . ' - ' . _('Problem Report');
5656
include('includes/header.php');
5757
prnMsg( _('No MRP reschedule retrieved'), 'warn');
58-
echo '<br /><a href="' .$RootPath .'/index.php?' . SID . '">' . _('Back to the menu') . '</a>';
58+
echo '<br /><a href="' .$RootPath .'/index.php">' . _('Back to the menu') . '</a>';
5959
if ($debug==1){
6060
echo '<br />' . $sql;
6161
}

SuppShiptChgs.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787

8888
echo '<tr><td>' . $EnteredShiptRef->ShiptRef . '</td>
8989
<td class="number">' . locale_number_format($EnteredShiptRef->Amount,2) . '</td>
90-
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '&Delete=' . $EnteredShiptRef->Counter . '">' . _('Delete') . '</a></td></tr>';
90+
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=' . $EnteredShiptRef->Counter . '">' . _('Delete') . '</a></td></tr>';
9191

9292
$TotalShiptValue = $TotalShiptValue + $EnteredShiptRef->Amount;
9393

SupplierCredit.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
include('includes/header.php');
3131
include('includes/SQL_CommonFunctions.inc');
3232

33-
//this is available from the menu on this page already
34-
//echo "<a href='" . $RootPath . '/SelectSupplier.php?' . SID . "'>" . _('Back to Suppliers') . '</a><br />';
35-
3633
if (isset($_GET['New'])) {
3734
unset($_SESSION['SuppTrans']);
3835
}

Z_DataExport.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function NULLToPrice( &$Field ) {
6969
$Title = _('Price List Export Problem ....');
7070
include('includes/header.php');
7171
prnMsg( _('The Price List could not be retrieved by the SQL because'). ' - ' . DB_error_msg(), 'error');
72-
echo '<br /><a href="' .$RootPath .'/index.php?' . SID . '">' . _('Back to the menu'). '</a>';
72+
echo '<br /><a href="' .$RootPath .'/index.php">' . _('Back to the menu'). '</a>';
7373
if ($debug==1){
7474
echo '<br />' . $SQL;
7575
}
@@ -344,7 +344,7 @@ function NULLToPrice( &$Field ) {
344344
$Title = _('Security Token List Export Problem ....');
345345
include('includes/header.php');
346346
prnMsg( _('The Security Token List could not be retrieved by the SQL because'). ' - ' . DB_error_msg(), 'error');
347-
echo '<br /><a href="' .$RootPath .'/index.php?' . SID . '">' . _('Back to the menu'). '</a>';
347+
echo '<br /><a href="' .$RootPath .'/index.php">' . _('Back to the menu'). '</a>';
348348
if ($debug==1){
349349
echo '<br />' . $SQL;
350350
}
@@ -416,7 +416,7 @@ function NULLToPrice( &$Field ) {
416416
$Title = _('Security Group List Export Problem ....');
417417
include('includes/header.php');
418418
prnMsg( _('The Security Group List could not be retrieved by the SQL because'). ' - ' . DB_error_msg(), 'error');
419-
echo '<br /><a href="' .$RootPath .'/index.php?' . SID . '">' . _('Back to the menu'). '</a>';
419+
echo '<br /><a href="' .$RootPath .'/index.php">' . _('Back to the menu'). '</a>';
420420
if ($debug==1){
421421
echo '<br />' . $SQL;
422422
}

Z_ImportGLAccountGroups.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
prnMsg( _('Select a csv file containing the details of the account sections that you wish to import into webERP. '). '<br />' .
6767
_('The first line must contain the field names that you wish to import. ').
6868
'<a href ="Z_DescribeTable.php?table=accountsection">' . _('The field names can be found here'). '</a>', 'info');
69-
echo '<form id="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' .SID .'">';
69+
echo '<form id="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
7070
echo '<div class="centre">';
7171
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
7272
echo '<table><tr><td>' . _('File to import') . '</td>' .

Z_ImportGLAccountSections.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
prnMsg( _('Select a csv file containing the details of the account sections that you wish to import into webERP. '). '<br />' .
7171
_('The first line must contain the field names that you wish to import. ').
7272
'<a href ="Z_DescribeTable.php?table=accountsection">' . _('The field names can be found here'). '</a>', 'info');
73-
echo '<form id="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' .SID .'">';
73+
echo '<form id="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
7474
echo '<div class="centre">';
7575
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
7676
echo '<table><tr><td>' . _('File to import') . '</td>' .

Z_ImportPartCodes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
prnMsg( _('Select a csv file containing the details of the parts that you wish to import into webERP. '). '<br />' .
7878
_('The first line must contain the field names that you wish to import. ').
7979
'<a href ="Z_DescribeTable.php?table=stockmaster">' . _('The field names can be found here'). '</a>', 'info');
80-
echo '<form id="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' .SID .'">';
80+
echo '<form id="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
8181
echo '<div class="centre">';
8282
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
8383
echo '<table><tr><td>' . _('File to import') . '</td>' .

Z_MakeNewCompany.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
if (isset($_POST['EnterCompanyDetails'])) {
1111

12-
header ('Location:' . $RootPath . '/CompanyPreferences.php?' . SID);
12+
header ('Location:' . $RootPath . '/CompanyPreferences.php');
1313
exit;
1414
}
1515
$Title = _('Make New Company Database Utility');
@@ -31,7 +31,7 @@
3131
prnMsg(_('Company database must not contain spaces, \& or " or \''),'error');
3232
} else {
3333
$_POST['NewDatabase'] = strtolower($_POST['NewDatabase']);
34-
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">';
34+
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
3535
echo '<div class="centre">';
3636
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
3737
/* check for directory existence */
@@ -229,7 +229,7 @@
229229
prnMsg (_('This utility will create a new company') . '<br /><br />' .
230230
_('If the company name already exists then you cannot recreate it'), 'info', _('PLEASE NOTE'));
231231
echo '<br /></div>';
232-
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '" enctype="multipart/form-data">';
232+
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" enctype="multipart/form-data">';
233233
echo '<div class="centre">';
234234
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
235235

0 commit comments

Comments
 (0)