';
diff --git a/MRPPlannedPurchaseOrders.php b/MRPPlannedPurchaseOrders.php
index ed90396a6..0b3f57495 100644
--- a/MRPPlannedPurchaseOrders.php
+++ b/MRPPlannedPurchaseOrders.php
@@ -333,7 +333,7 @@ function PrintHeader(&$pdf,&$YPos,&$PageNumber,$Page_Height,$Top_Margin,$Left_Ma
$displayconsolidation = _('Weekly');
} else {
$displayconsolidation = _('Monthly');
- };
+ }
$pdf->addTextWrap($Left_Margin,$YPos,65,$FontSize,_('Consolidation').':');
$pdf->addTextWrap(110,$YPos,40,$FontSize,$displayconsolidation);
diff --git a/MRPPlannedWorkOrders.php b/MRPPlannedWorkOrders.php
index 27f12c04e..eee237ccb 100755
--- a/MRPPlannedWorkOrders.php
+++ b/MRPPlannedWorkOrders.php
@@ -376,7 +376,7 @@ function PrintHeader(&$pdf,&$YPos,&$PageNumber,$Page_Height,$Top_Margin,$Left_Ma
$displayconsolidation = _('Weekly');
} else {
$displayconsolidation = _('Monthly');
- };
+ }
$pdf->addTextWrap($Left_Margin,$YPos,65,$FontSize,_('Consolidation').':');
$pdf->addTextWrap(110,$YPos,40,$FontSize,$displayconsolidation);
diff --git a/PcClaimExpensesFromTab.php b/PcClaimExpensesFromTab.php
index 33ef2fafe..07a6302e1 100644
--- a/PcClaimExpensesFromTab.php
+++ b/PcClaimExpensesFromTab.php
@@ -136,7 +136,7 @@
$ReceiptExistingFiles = glob($ReceiptFileDir . '/' . $SelectedIndex . '.{' . implode(',', $ReceiptSupportedExt) . '}', GLOB_BRACE); //Find all existing receipt files for the expense, in case more than 1 file type is currently in the receipts directory
foreach($ReceiptExistingFiles as $ReceiptExistingFile) { // Overwrite existing files, and delete all other file types.
unlink($ReceiptExistingFile);
- };
+ }
move_uploaded_file($UploadTempName, $ReceiptFilePath); //Move the uploaded file from the temp directory to the receipts directory.
}
}
@@ -241,7 +241,7 @@
$ReceiptExistingFiles = glob($ReceiptFileDir . '/' . $SelectedIndex . '.{' . implode(',', $ReceiptSupportedExt) . '}', GLOB_BRACE); //Find all existing receipt files for the expense, in case more than 1 file type is currently in the receipts directory
foreach($ReceiptExistingFiles as $ReceiptExistingFile) { // Overwrite existing files, and delete all other file types.
unlink($ReceiptExistingFile);
- };
+ }
move_uploaded_file($UploadTempName, $ReceiptFilePath); //Move the uploaded file from the temp directory to the receipts directory.
}
}
@@ -268,7 +268,7 @@
$ReceiptExistingFiles = glob($ReceiptFileDir . '/' . $SelectedIndex . '.{' . implode(',', $ReceiptSupportedExt) . '}', GLOB_BRACE); //Find all existing receipt files for the expense, in case more than 1 file type is currently in the receipts directory
foreach($ReceiptExistingFiles as $ReceiptExistingFile) {
unlink($ReceiptExistingFile);
- };
+ }
unset($_GET['delete']);
} //end of get delete
if (!isset($SelectedTabs)) {
diff --git a/PurchData.php b/PurchData.php
index 85cf7eba0..e12e1fa8c 100644
--- a/PurchData.php
+++ b/PurchData.php
@@ -392,7 +392,7 @@
';
include ('includes/footer.php');
exit;
- };
+ }
}
if ($Edit == true) {
diff --git a/SupplierPriceList.php b/SupplierPriceList.php
index a14d2247a..108c138e0 100644
--- a/SupplierPriceList.php
+++ b/SupplierPriceList.php
@@ -419,7 +419,7 @@
echo '';
include ('includes/footer.php');
exit;
- };
+ }
}
if(isset($_POST['SearchSupplier'])) {
diff --git a/SystemParameters.php b/SystemParameters.php
index 0a89655b2..992a62db6 100644
--- a/SystemParameters.php
+++ b/SystemParameters.php
@@ -1243,7 +1243,7 @@
} elseif ($_SESSION['QualityLogSamples'] == 1){
echo '';
echo '';
- };
+ }
echo '
diff --git a/doc/Change.log b/doc/Change.log
index d1fa67f78..a9b88894c 100644
--- a/doc/Change.log
+++ b/doc/Change.log
@@ -1,6 +1,7 @@
webERP Change Log
-27/1/17 PaulT: MiscFunctions.php, Z_ChangeStockCode.php, Z_ChangeGLAccountCode.php: Remove unused $db parameter from function ChangeFieldInTable().
+27/1/18 Paul Becker (PaulT commit): Remove stray ; appearing after if, else, and foreach blocks. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8064)
+27/1/18 PaulT: MiscFunctions.php, Z_ChangeStockCode.php, Z_ChangeGLAccountCode.php: Remove unused $db parameter from function ChangeFieldInTable().
26/1/18 Andrew Galuski/Tim (PaulT merge/commit): New picking list feature for regular and controlled/serialized stock. This feature improves (and replaces) the current pick list handling. (Reported in forums by HDeriauFF: http://www.weberp.org/forum/showthread.php?tid=7988)
26/1/18 Exson: Add single quotation escape and charset in htmlspecialchars() in session.inc
26/1/18 Exson: Use htmlspecialchars() to encode html special characters to html entity and set the cookie available only httponly in session.inc
diff --git a/includes/MiscFunctions.php b/includes/MiscFunctions.php
index bafcda279..1308a6287 100644
--- a/includes/MiscFunctions.php
+++ b/includes/MiscFunctions.php
@@ -139,7 +139,7 @@ class XmlElement {
var $attributes;
var $content;
var $children;
-};
+}
function GetECBCurrencyRates () {
/* See http://www.ecb.int/stats/exchange/eurofxref/html/index.en.html
diff --git a/includes/class.pdf.php b/includes/class.pdf.php
index 678e14a4b..dfd5d51d3 100644
--- a/includes/class.pdf.php
+++ b/includes/class.pdf.php
@@ -144,7 +144,7 @@ function addTextWrap($XPos, $YPos, $Width, $Height, $Text, $Align='J', $border=0
$ns=0;
$cw = $this->GetStringWidth($s, '', '', 0, true);
while($i<$nb) {
- /*$c=$s{$i};*/
+
$c=mb_substr($s, $i, 1, 'UTF-8');
if($c===' ' AND $i>0) {
$sep=$i;
diff --git a/javascripts/MiscFunctions.js b/javascripts/MiscFunctions.js
index 5a084b2b3..b0fa5690d 100644
--- a/javascripts/MiscFunctions.js
+++ b/javascripts/MiscFunctions.js
@@ -59,7 +59,7 @@ function rLocaleNumber() {
} else {
this.setCustomValidity('The number format is wrong');
return false;
- };
+ }
}
function assignComboToInput(c, i) {
' . ' ' .$Title . '