diff --git a/modules/Accounts/models/Module.php b/modules/Accounts/models/Module.php index 65e130107183eb788cbaff4c281a12ea7f7d6c4d..02d42db528a7db80e06258725d8a54a026fe727d 100644 --- a/modules/Accounts/models/Module.php +++ b/modules/Accounts/models/Module.php @@ -62,7 +62,7 @@ class Accounts_Module_Model extends Vtiger_Module_Model { $position = stripos($listQuery, 'where'); if($position) { - $split = spliti('where', $listQuery); + $split = preg_split('/where/', $listQuery); $overRideQuery = $split[0] . ' WHERE ' . $split[1] . ' AND ' . $condition; } else { $overRideQuery = $listQuery. ' WHERE ' . $condition; diff --git a/modules/Campaigns/models/Module.php b/modules/Campaigns/models/Module.php index 5e8a990c20b6b5881ed18596c8e41245d264db43..a7bd89cfd554d3fba768e7f1b61864b3bbecafb1 100644 --- a/modules/Campaigns/models/Module.php +++ b/modules/Campaigns/models/Module.php @@ -51,7 +51,7 @@ class Campaigns_Module_Model extends Vtiger_Module_Model { $pos = stripos($listQuery, 'where'); if ($pos) { - $split = spliti('where', $listQuery); + $split = preg_split('/where/', $listQuery); $overRideQuery = $split[0] . ' WHERE ' . $split[1] . ' AND ' . $condition; } else { $overRideQuery = $listQuery. ' WHERE ' . $condition; diff --git a/modules/Inventory/models/Module.php b/modules/Inventory/models/Module.php index 775bb722066b04ff12890b98c9e4a5c46e3503b4..86263401d07e83d11a0cfbc42d670474a456faff 100644 --- a/modules/Inventory/models/Module.php +++ b/modules/Inventory/models/Module.php @@ -85,7 +85,7 @@ class Inventory_Module_Model extends Vtiger_Module_Model { */ public function getExportQuery($focus, $query) { $baseTableName = $focus->table_name; - $splitQuery = spliti(' FROM ', $query); + $splitQuery = preg_split('/ from /', $query); $columnFields = explode(',', $splitQuery[0]); foreach ($columnFields as $key => &$value) { if($value == ' vtiger_inventoryproductrel.discount_amount'){ @@ -96,7 +96,7 @@ class Inventory_Module_Model extends Vtiger_Module_Model { $value = ' vtiger_currency_info.currency_name AS currency_id'; } } - $joinSplit = spliti(' WHERE ',$splitQuery[1]); + $joinSplit = preg_split('/ WHERE /',$splitQuery[1]); $joinSplit[0] .= " LEFT JOIN vtiger_currency_info ON vtiger_currency_info.id = $baseTableName.currency_id"; $splitQuery[1] = $joinSplit[0] . ' WHERE ' .$joinSplit[1]; diff --git a/modules/PriceBooks/models/Module.php b/modules/PriceBooks/models/Module.php index 98fe882bb28a3c26c44f6d963426a0d10e548742..087581a595bbc1f4b65c8a60e26cf771960fe388 100644 --- a/modules/PriceBooks/models/Module.php +++ b/modules/PriceBooks/models/Module.php @@ -75,7 +75,7 @@ class PriceBooks_Module_Model extends Vtiger_Module_Model { AND vtiger_pricebook.active = 1"; } if ($pos) { - $split = spliti(' where ', $listQuery); + $split = preg_split('/ where /', $listQuery); $overRideQuery = $split[0] . ' WHERE ' . $split[1] . ' AND ' . $condition; } else { $overRideQuery = $listQuery . ' WHERE ' . $condition; diff --git a/modules/Vtiger/models/FindDuplicate.php b/modules/Vtiger/models/FindDuplicate.php index 23d9f1a8699854e50b39db4df04875f6a8a5769f..c474ee99717ace66c059fd2c02d5671b449f50bd 100644 --- a/modules/Vtiger/models/FindDuplicate.php +++ b/modules/Vtiger/models/FindDuplicate.php @@ -133,7 +133,7 @@ class Vtiger_FindDuplicate_Model extends Vtiger_Base_Model { $position = stripos($query, 'from'); if ($position) { - $split = spliti('from ', $query); + $split = preg_split('/from /', $query); $splitCount = count($split); $query = 'SELECT count(*) AS count '; for ($i=1; $i<$splitCount; $i++) { diff --git a/modules/Vtiger/models/RelationListView.php b/modules/Vtiger/models/RelationListView.php index 30256a61f265cb15dbb34413fe96afa569913375..97bddadcc1033b9d89c0ca5b55cd3b303010b554 100644 --- a/modules/Vtiger/models/RelationListView.php +++ b/modules/Vtiger/models/RelationListView.php @@ -225,7 +225,7 @@ class Vtiger_RelationListView_Model extends Vtiger_Base_Model { $orderByFieldModuleModel = $relationModule->getFieldByColumn($orderBy); if($orderByFieldModuleModel && $orderByFieldModuleModel->isReferenceField()) { //If reference field then we need to perform a join with crmentity with the related to field - $queryComponents = $split = spliti(' where ', $query); + $queryComponents = $split = preg_split('/ where /', $query); $selectAndFromClause = $queryComponents[0]; $whereCondition = $queryComponents[1]; $qualifiedOrderBy = 'vtiger_crmentity'.$orderByFieldModuleModel->get('column'); @@ -383,10 +383,10 @@ class Vtiger_RelationListView_Model extends Vtiger_Base_Model { $query = $queryGenerator->getQuery(); - $queryComponents = spliti(' FROM ', $query); + $queryComponents = preg_split('/ from /', $query); $query = $queryComponents[0].' ,vtiger_crmentity.crmid FROM '.$queryComponents[1]; - $whereSplitQueryComponents = spliti(' WHERE ', $query); + $whereSplitQueryComponents = preg_split('/ WHERE /', $query); $joinQuery = ' INNER JOIN '.$parentModuleBaseTable.' ON '.$parentModuleBaseTable.'.'.$parentModuleDirectRelatedField." = ".$relatedModuleBaseTable.'.'.$relatedModuleEntityIdField; $query = "$whereSplitQueryComponents[0] $joinQuery WHERE $parentModuleBaseTable.$parentModuleEntityIdField = $parentRecordId AND $whereSplitQueryComponents[1]"; @@ -437,7 +437,7 @@ class Vtiger_RelationListView_Model extends Vtiger_Base_Model { $relationQuery = ereg_replace("[ \t\n\r]+", " ", $relationQuery); $position = stripos($relationQuery,' from '); if ($position) { - $split = spliti(' FROM ', $relationQuery); + $split = preg_split('/ from /', $relationQuery); $splitCount = count($split); $relationQuery = 'SELECT COUNT(DISTINCT vtiger_crmentity.crmid) AS count'; for ($i=1; $i<$splitCount; $i++) { @@ -476,7 +476,7 @@ class Vtiger_RelationListView_Model extends Vtiger_Base_Model { $pos = stripos($relationQuery, 'where'); if ($pos) { - $split = spliti('where', $relationQuery); + $split = preg_split('/where/', $relationQuery); $updatedQuery = $split[0] . ' WHERE ' . $split[1] . ' AND ' . $condition; } else { $updatedQuery = $relationQuery . ' WHERE ' . $condition;