Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4627] trunk
|
From: <dai...@us...> - 2011-07-08 10:30:48
|
Revision: 4627
http://web-erp.svn.sourceforge.net/web-erp/?rev=4627&view=rev
Author: daintree
Date: 2011-07-08 10:30:40 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/CounterSales.php
trunk/Currencies.php
trunk/CustEDISetup.php
trunk/CustLoginSetup.php
trunk/CustomerBranches.php
trunk/SelectOrderItems.php
trunk/StockSerialItemResearch.php
trunk/SuppLoginSetup.php
trunk/SystemParameters.php
trunk/UpgradeDatabase.php
trunk/WWW_Users.php
trunk/WorkCentres.php
trunk/Z_ChangeBranchCode.php
trunk/Z_ImportStocks.php
trunk/Z_MakeNewCompany.php
trunk/Z_Upgrade_3.04-3.05.php
trunk/Z_Upgrade_3.05-3.06.php
trunk/Z_Upgrade_3.07-3.08.php
trunk/Z_Upgrade_3.08-3.09.php
trunk/Z_Upgrade_3.09-3.10.php
trunk/Z_Upgrade_3.10-3.11.php
trunk/Z_Upgrade_3.11-4.00.php
trunk/api/api_debtortransactions.php
trunk/api/api_salesorders.php
trunk/api/api_stock.php
trunk/api/api_suppliers.php
trunk/api/api_workorders.php
trunk/doc/Change.log
trunk/includes/MiscFunctions.php
trunk/install/save.php
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/CounterSales.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -35,7 +35,7 @@
if (isset($_POST['OrderItems'])){
foreach ($_POST as $key => $value) {
- if (strstr($key,'itm')) {
+ if (mb_strstr($key,'itm')) {
$NewItemArray[mb_substr($key,3)] = trim($value);
}
}
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/Currencies.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -100,7 +100,7 @@
$InputError = 1;
prnMsg(_('The functional currency cannot be modified or deleted'),'error');
}
- if (strstr($_POST['Abbreviation'],"'") OR strstr($_POST['Abbreviation'],'+') OR strstr($_POST['Abbreviation'],"\"") OR strstr($_POST['Abbreviation'],'&') OR strstr($_POST['Abbreviation'],' ') OR strstr($_POST['Abbreviation'],"\\") OR strstr($_POST['Abbreviation'],'.') OR strstr($_POST['Abbreviation'],'"')) {
+ if (mb_strstr($_POST['Abbreviation'],"'") OR mb_strstr($_POST['Abbreviation'],'+') OR mb_strstr($_POST['Abbreviation'],"\"") OR mb_strstr($_POST['Abbreviation'],'&') OR mb_strstr($_POST['Abbreviation'],' ') OR mb_strstr($_POST['Abbreviation'],"\\") OR mb_strstr($_POST['Abbreviation'],'.') OR mb_strstr($_POST['Abbreviation'],'"')) {
$InputError = 1;
prnMsg( _('The currency code cannot contain any of the following characters') . " . - ' & + \" " . _('or a space'),'error');
$Errors[$i] = 'Abbreviation';
Modified: trunk/CustEDISetup.php
===================================================================
--- trunk/CustEDISetup.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/CustEDISetup.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -26,7 +26,7 @@
//first off validate inputs sensible
if (ContainsIllegalCharacters($_POST['EDIReference'])
- OR strstr($_POST['EDIReference'],' ')) {
+ OR mb_strstr($_POST['EDIReference'],' ')) {
$InputError = 1;
prnMsg(_('The customers EDI reference code cannot contain any of the following characters') .' - \' & + \" ' . _('or a space'),'warn');
}
Modified: trunk/CustLoginSetup.php
===================================================================
--- trunk/CustLoginSetup.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/CustLoginSetup.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -40,7 +40,7 @@
if (mb_strlen($_POST['UserID'])<3){
$InputError = 1;
prnMsg(_('The user ID entered must be at least 4 characters long'),'error');
- } elseif (ContainsIllegalCharacters($_POST['UserID']) OR strstr($_POST['UserID'],' ')) {
+ } elseif (ContainsIllegalCharacters($_POST['UserID']) OR mb_strstr($_POST['UserID'],' ')) {
$InputError = 1;
prnMsg(_('User names cannot contain any of the following characters') . " - ' & + \" \\ " . _('or a space'),'error');
} elseif (mb_strlen($_POST['Password'])<5){
@@ -48,7 +48,7 @@
$InputError = 1;
prnMsg(_('The password entered must be at least 5 characters long'),'error');
}
- } elseif (strstr($_POST['Password'],$_POST['UserID'])!= False){
+ } elseif (mb_strstr($_POST['Password'],$_POST['UserID'])!= False){
$InputError = 1;
prnMsg(_('The password cannot contain the user id'),'error');
} elseif ((mb_strlen($_POST['Cust'])>0) AND (mb_strlen($_POST['BranchCode'])==0)) {
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/CustomerBranches.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -46,7 +46,7 @@
$_POST['BranchCode'] = mb_strtoupper($_POST['BranchCode']);
- if (ContainsIllegalCharacters($_POST['BranchCode']) OR strstr($_POST['BranchCode'],' ')) {
+ if (ContainsIllegalCharacters($_POST['BranchCode']) OR mb_strstr($_POST['BranchCode'],' ')) {
$InputError = 1;
prnMsg(_('The Branch code cannot contain any of the following characters')." - & \'",'error');
$Errors[$i] = 'BranchCode';
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/SelectOrderItems.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -24,7 +24,7 @@
if (isset($_POST['order_items'])){
foreach ($_POST as $key => $value) {
- if (strstr($key,'itm')) {
+ if (mb_strstr($key,'itm')) {
$NewItem_array[mb_substr($key,3)] = trim($value);
}
}
Modified: trunk/StockSerialItemResearch.php
===================================================================
--- trunk/StockSerialItemResearch.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/StockSerialItemResearch.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -38,8 +38,8 @@
if ($SN!='') {
//the point here is to allow a semi fuzzy search, but still keep someone from killing the db server
- if (strstr($SN,'%')){
- while(strstr($SN,'%%')) {
+ if (mb_strstr($SN,'%')){
+ while(mb_strstr($SN,'%%')) {
$SN = str_replace('%%','%',$SN);
}
if (mb_strlen($SN) < 11){
Modified: trunk/SuppLoginSetup.php
===================================================================
--- trunk/SuppLoginSetup.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/SuppLoginSetup.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -82,7 +82,7 @@
$InputError = 1;
prnMsg(_('The password entered must be at least 5 characters long'),'error');
}
- } elseif (strstr($_POST['Password'],$_POST['UserID'])!= False){
+ } elseif (mb_strstr($_POST['Password'],$_POST['UserID'])!= False){
$InputError = 1;
prnMsg(_('The password cannot contain the user id'),'error');
}
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/SystemParameters.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -33,7 +33,7 @@
} elseif (mb_strlen($_POST['X_DefaultCreditLimit']) > 12 || !is_numeric($_POST['X_DefaultCreditLimit']) ) {
$InputError = 1;
prnMsg(_('Default Credit Limit must be a number'),'error');
- } elseif (strstr($_POST['X_RomalpaClause'], "'") || mb_strlen($_POST['X_RomalpaClause']) > 5000) {
+ } elseif (mb_strstr($_POST['X_RomalpaClause'], "'") || mb_strlen($_POST['X_RomalpaClause']) > 5000) {
$InputError = 1;
prnMsg(_('The Romalpa Clause may not contain single quotes and may not be longer than 5000 chars'),'error');
} elseif (mb_strlen($_POST['X_QuickEntries']) > 2 || !is_numeric($_POST['X_QuickEntries']) ||
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/UpgradeDatabase.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -146,7 +146,7 @@
if (mb_substr($SQLEntries[$i], 0, 2) != '--'
AND mb_substr($SQLEntries[$i], 0, 3) != 'USE'
- AND strstr($SQLEntries[$i],'/*')==FALSE
+ AND mb_strstr($SQLEntries[$i],'/*')==FALSE
AND mb_strlen($SQLEntries[$i])>1){
$sql .= ' ' . $SQLEntries[$i];
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/WWW_Users.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -70,7 +70,7 @@
$InputError = 1;
prnMsg(_('The password entered must be at least 5 characters long'),'error');
}
- } elseif (strstr($_POST['Password'],$_POST['UserID'])!= False){
+ } elseif (mb_strstr($_POST['Password'],$_POST['UserID'])!= False){
$InputError = 1;
prnMsg(_('The password cannot contain the user id'),'error');
} elseif ((mb_strlen($_POST['Cust'])>0) AND (mb_strlen($_POST['BranchCode'])==0)) {
Modified: trunk/WorkCentres.php
===================================================================
--- trunk/WorkCentres.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/WorkCentres.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -30,7 +30,7 @@
$InputError = 1;
prnMsg(_('The Work Centre description must be at least 3 characters long'),'error');
}
- if (strstr($_POST['Code'],' ') OR ContainsIllegalCharacters($_POST['Code']) ) {
+ if (mb_strstr($_POST['Code'],' ') OR ContainsIllegalCharacters($_POST['Code']) ) {
$InputError = 1;
prnMsg(_('The work centre code cannot contain any of the following characters') . " - ' & + \" \\ " . _('or a space'),'error');
}
Modified: trunk/Z_ChangeBranchCode.php
===================================================================
--- trunk/Z_ChangeBranchCode.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/Z_ChangeBranchCode.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -26,7 +26,7 @@
include('includes/footer.inc');
exit;
}
- if (strstr($_POST['NewBranchCode'],".")>0 OR strstr($_POST['NewBranchCode'],"&") OR strstr($_POST['NewBranchCode'],"-") OR strstr($_POST['NewBranchCode']," ")){
+ if (mb_strstr($_POST['NewBranchCode'],".")>0 OR mb_strstr($_POST['NewBranchCode'],"&") OR mb_strstr($_POST['NewBranchCode'],"-") OR mb_strstr($_POST['NewBranchCode']," ")){
prnMsg(_('The new customer branch code cannot contain') . ' - & . ' . _('or a space'),'error');
include('includes/footer.inc');
exit;
Modified: trunk/Z_ImportStocks.php
===================================================================
--- trunk/Z_ImportStocks.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/Z_ImportStocks.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -120,7 +120,7 @@
$InputError = 1;
prnMsg (_('The Stock Item code cannot be empty'),'error');
}
- if (strstr($StockID,' ') OR strstr($StockID,"'") OR strstr($StockID,'+') OR strstr($StockID,"\\") OR strstr($StockID,"\"") OR strstr($StockID,'&') OR strstr($StockID,'"')) {
+ if (mb_strstr($StockID,' ') OR mb_strstr($StockID,"'") OR mb_strstr($StockID,'+') OR mb_strstr($StockID,"\\") OR mb_strstr($StockID,"\"") OR mb_strstr($StockID,'&') OR mb_strstr($StockID,'"')) {
$InputError = 1;
prnMsg(_('The stock item code cannot contain any of the following characters') . " ' & + \" \\ " . _('or a space'). " (". $StockID. ")",'error');
$StockID='';
Modified: trunk/Z_MakeNewCompany.php
===================================================================
--- trunk/Z_MakeNewCompany.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/Z_MakeNewCompany.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -105,7 +105,7 @@
if (mb_substr($SQLScriptFile[$i], 0, 2) != '--'
AND mb_substr($SQLScriptFile[$i], 0, 3) != 'USE'
- AND strstr($SQLScriptFile[$i],'/*')==FALSE
+ AND mb_strstr($SQLScriptFile[$i],'/*')==FALSE
AND mb_strlen($SQLScriptFile[$i])>1){
$SQL .= ' ' . $SQLScriptFile[$i];
Modified: trunk/Z_Upgrade_3.04-3.05.php
===================================================================
--- trunk/Z_Upgrade_3.04-3.05.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/Z_Upgrade_3.04-3.05.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -36,7 +36,7 @@
if (mb_substr($SQLScriptFile[$i], 0, 2) != '--'
AND mb_substr($SQLScriptFile[$i], 0, 3) != 'USE'
- AND strstr($SQLScriptFile[$i],'/*')==FALSE
+ AND mb_strstr($SQLScriptFile[$i],'/*')==FALSE
AND mb_strlen($SQLScriptFile[$i])>1){
$SQL .= ' ' . $SQLScriptFile[$i];
Modified: trunk/Z_Upgrade_3.05-3.06.php
===================================================================
--- trunk/Z_Upgrade_3.05-3.06.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/Z_Upgrade_3.05-3.06.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -28,7 +28,7 @@
if (mb_substr($SQLScriptFile[$i], 0, 2) != '--'
AND mb_substr($SQLScriptFile[$i], 0, 3) != 'USE'
- AND strstr($SQLScriptFile[$i],'/*')==FALSE
+ AND mb_strstr($SQLScriptFile[$i],'/*')==FALSE
AND mb_strlen($SQLScriptFile[$i])>1){
$SQL .= ' ' . $SQLScriptFile[$i];
Modified: trunk/Z_Upgrade_3.07-3.08.php
===================================================================
--- trunk/Z_Upgrade_3.07-3.08.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/Z_Upgrade_3.07-3.08.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -28,7 +28,7 @@
if (mb_substr($SQLScriptFile[$i], 0, 2) != '--'
AND mb_substr($SQLScriptFile[$i], 0, 3) != 'USE'
- AND strstr($SQLScriptFile[$i],'/*')==FALSE
+ AND mb_strstr($SQLScriptFile[$i],'/*')==FALSE
AND mb_strlen($SQLScriptFile[$i])>1){
$SQL .= ' ' . $SQLScriptFile[$i];
Modified: trunk/Z_Upgrade_3.08-3.09.php
===================================================================
--- trunk/Z_Upgrade_3.08-3.09.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/Z_Upgrade_3.08-3.09.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -28,7 +28,7 @@
if (mb_substr($SQLScriptFile[$i], 0, 2) != '--'
AND mb_substr($SQLScriptFile[$i], 0, 3) != 'USE'
- AND strstr($SQLScriptFile[$i],'/*')==FALSE
+ AND mb_strstr($SQLScriptFile[$i],'/*')==FALSE
AND mb_strlen($SQLScriptFile[$i])>1){
$SQL .= ' ' . $SQLScriptFile[$i];
Modified: trunk/Z_Upgrade_3.09-3.10.php
===================================================================
--- trunk/Z_Upgrade_3.09-3.10.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/Z_Upgrade_3.09-3.10.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -28,7 +28,7 @@
if (mb_substr($SQLScriptFile[$i], 0, 2) != '--'
AND mb_substr($SQLScriptFile[$i], 0, 3) != 'USE'
- AND strstr($SQLScriptFile[$i],'/*')==FALSE
+ AND mb_strstr($SQLScriptFile[$i],'/*')==FALSE
AND mb_strlen($SQLScriptFile[$i])>1){
$SQL .= ' ' . $SQLScriptFile[$i];
Modified: trunk/Z_Upgrade_3.10-3.11.php
===================================================================
--- trunk/Z_Upgrade_3.10-3.11.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/Z_Upgrade_3.10-3.11.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -38,7 +38,7 @@
if (mb_substr($SQLScriptFile[$i], 0, 2) != '--'
AND mb_substr($SQLScriptFile[$i], 0, 3) != 'USE'
- AND strstr($SQLScriptFile[$i],'/*')==FALSE
+ AND mb_strstr($SQLScriptFile[$i],'/*')==FALSE
AND mb_strlen($SQLScriptFile[$i])>1){
$sql .= ' ' . $SQLScriptFile[$i];
Modified: trunk/Z_Upgrade_3.11-4.00.php
===================================================================
--- trunk/Z_Upgrade_3.11-4.00.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/Z_Upgrade_3.11-4.00.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -38,7 +38,7 @@
if (mb_substr($SQLScriptFile[$i], 0, 2) != '--'
AND mb_substr($SQLScriptFile[$i], 0, 3) != 'USE'
- AND strstr($SQLScriptFile[$i],'/*')==FALSE
+ AND mb_strstr($SQLScriptFile[$i],'/*')==FALSE
AND mb_strlen($SQLScriptFile[$i])>1){
$sql .= ' ' . $SQLScriptFile[$i];
Modified: trunk/api/api_debtortransactions.php
===================================================================
--- trunk/api/api_debtortransactions.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/api/api_debtortransactions.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -87,9 +87,9 @@
$result=DB_query($sql, $db);
$myrow=DB_fetch_array($result);
$DateFormat=$myrow[0];
- if (strstr('/',$PeriodEnd)) {
+ if (mb_strstr('/',$PeriodEnd)) {
$Date_Array = explode('/',$PeriodEnd);
- } elseif (strstr('.',$PeriodEnd)) {
+ } elseif (mb_strstr('.',$PeriodEnd)) {
$Date_Array = explode('.',$PeriodEnd);
}
if ($DateFormat=='d/m/Y') {
Modified: trunk/api/api_salesorders.php
===================================================================
--- trunk/api/api_salesorders.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/api/api_salesorders.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -43,9 +43,9 @@
$result=api_DB_query($sql, $db);
$myrow=DB_fetch_array($result);
$DateFormat=$myrow[0];
- if (strstr($orddate,"/")) {
+ if (mb_strstr($orddate,"/")) {
$DateArray = explode('/',$orddate);
- } elseif (strstr($orddate,".")) {
+ } elseif (mb_strstr($orddate,".")) {
$DateArray = explode('.',$orddate);
}
if ($DateFormat=='d/m/Y') {
@@ -121,9 +121,9 @@
$result=api_DB_query($sql, $db);
$myrow=DB_fetch_array($result);
$DateFormat=$myrow[0];
- if (strstr($deliverydate,'/')) {
+ if (mb_strstr($deliverydate,'/')) {
$DateArray = explode('/',$deliverydate);
- } elseif (strstr($PeriodEnd,'.')) {
+ } elseif (mb_strstr($PeriodEnd,'.')) {
$DateArray = explode('.',$deliverydate);
}
if ($DateFormat=='d/m/Y') {
@@ -231,9 +231,9 @@
$result=api_DB_query($sql, $db);
$myrow=DB_fetch_array($result);
$DateFormat=$myrow[0];
- if (strstr($itemdue,'/')) {
+ if (mb_strstr($itemdue,'/')) {
$DateArray = explode('/',$itemdue);
- } elseif (strstr($itemdue,'.')) {
+ } elseif (mb_strstr($itemdue,'.')) {
$DateArray = explode('.',$itemdue);
}
if ($DateFormat=='d/m/Y') {
Modified: trunk/api/api_stock.php
===================================================================
--- trunk/api/api_stock.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/api/api_stock.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -79,9 +79,9 @@
$result=DB_query($sql, $db);
$myrow=DB_fetch_array($result);
$DateFormat=$myrow[0];
- if (strstr('/',$PeriodEnd)) {
+ if (mb_strstr('/',$PeriodEnd)) {
$Date_Array = explode('/',$PeriodEnd);
- } elseif (strstr('.',$PeriodEnd)) {
+ } elseif (mb_strstr('.',$PeriodEnd)) {
$Date_Array = explode('.',$PeriodEnd);
}
if ($DateFormat=='d/m/Y') {
Modified: trunk/api/api_suppliers.php
===================================================================
--- trunk/api/api_suppliers.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/api/api_suppliers.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -51,9 +51,9 @@
$result=DB_query($sql, $db);
$myrow=DB_fetch_array($result);
$DateFormat=$myrow[0];
- if (strstr('/',$PeriodEnd)) {
+ if (mb_strstr('/',$PeriodEnd)) {
$Date_Array = explode('/',$PeriodEnd);
- } elseif (strstr('.',$PeriodEnd)) {
+ } elseif (mb_strstr('.',$PeriodEnd)) {
$Date_Array = explode('.',$PeriodEnd);
}
if ($DateFormat=='d/m/Y') {
Modified: trunk/api/api_workorders.php
===================================================================
--- trunk/api/api_workorders.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/api/api_workorders.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -48,9 +48,9 @@
$result=DB_query($sql, $db);
$myrow=DB_fetch_array($result);
$DateFormat=$myrow[0];
- if (strstr('/',$PeriodEnd)) {
+ if (mb_strstr('/',$PeriodEnd)) {
$Date_Array = explode('/',$PeriodEnd);
- } elseif (strstr('.',$PeriodEnd)) {
+ } elseif (mb_strstr('.',$PeriodEnd)) {
$Date_Array = explode('.',$PeriodEnd);
}
if ($DateFormat=='d/m/Y') {
@@ -81,9 +81,9 @@
$result=DB_query($sql, $db);
$myrow=DB_fetch_array($result);
$DateFormat=$myrow[0];
- if (strstr('/',$PeriodEnd)) {
+ if (mb_strstr('/',$PeriodEnd)) {
$Date_Array = explode('/',$PeriodEnd);
- } elseif (strstr('.',$PeriodEnd)) {
+ } elseif (mb_strstr('.',$PeriodEnd)) {
$Date_Array = explode('.',$PeriodEnd);
}
if ($DateFormat=='d/m/Y') {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/doc/Change.log 2011-07-08 10:30:40 UTC (rev 4627)
@@ -1,5 +1,6 @@
webERP Change Log
+8/7/11 Phil: Change all strstr occurrences to use multi-byte function mb_strstr
8/7/11 Phil: Trap codes with decimal point "." in them in the IllegalCharacters function
8/7/11 Phil: Fix discount matrix calculations on order entry and amendment
5/7/11 Phil: Amend menu to use PDFStockLocTransfer.php to reprint transfer list - as reported by Ron Wong
Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/includes/MiscFunctions.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -109,16 +109,16 @@
function ContainsIllegalCharacters ($CheckVariable) {
- if (strstr($CheckVariable,"'")
- OR strstr($CheckVariable,'+')
- OR strstr($CheckVariable,'?')
- OR strstr($CheckVariable,'.')
- OR strstr($CheckVariable,"\"")
- OR strstr($CheckVariable,'&')
- OR strstr($CheckVariable,"\\")
- OR strstr($CheckVariable,'"')
- OR strstr($CheckVariable,'>')
- OR strstr($CheckVariable,'<')){
+ if (mb_strstr($CheckVariable,"'")
+ OR mb_strstr($CheckVariable,'+')
+ OR mb_strstr($CheckVariable,'?')
+ OR mb_strstr($CheckVariable,'.')
+ OR mb_strstr($CheckVariable,"\"")
+ OR mb_strstr($CheckVariable,'&')
+ OR mb_strstr($CheckVariable,"\\")
+ OR mb_strstr($CheckVariable,'"')
+ OR mb_strstr($CheckVariable,'>')
+ OR mb_strstr($CheckVariable,'<')){
return true;
} else {
Modified: trunk/install/save.php
===================================================================
--- trunk/install/save.php 2011-07-08 10:28:14 UTC (rev 4626)
+++ trunk/install/save.php 2011-07-08 10:30:40 UTC (rev 4627)
@@ -348,7 +348,7 @@
$SQLScriptFile[$i] = trim($SQLScriptFile[$i]);
//ignore lines that start with -- or USE or /*
if (mb_substr($SQLScriptFile[$i], 0, 2) != '--'
- AND strstr($SQLScriptFile[$i],'/*')==FALSE
+ AND mb_strstr($SQLScriptFile[$i],'/*')==FALSE
AND mb_strlen($SQLScriptFile[$i])>1){
$SQL .= ' ' . $SQLScriptFile[$i];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
