From fc12cc3505c3a65423f051ebd7530bc81addab5c Mon Sep 17 00:00:00 2001
From: Preexo <tim.niklas@web.de>
Date: Fri, 13 May 2016 16:08:53 +0800
Subject: [PATCH] replaced deprecated spliti with preg_split
---
include/ChartUtils.php | 2 +-
include/utils/InventoryUtils.php | 2 +-
include/utils/export.php | 2 +-
include/utils/utils.php | 2 +-
modules/Contacts/models/Module.php | 2 +-
modules/Documents/models/Module.php | 2 +-
modules/EmailTemplates/models/ListView.php | 2 +-
modules/HelpDesk/models/Module.php | 2 +-
modules/Leads/models/Module.php | 2 +-
modules/Potentials/models/Module.php | 2 +-
modules/PriceBooks/models/ListView.php | 2 +-
modules/PriceBooks/models/Relation.php | 2 +-
modules/Products/models/ListView.php | 2 +-
modules/Products/models/Module.php | 2 +-
modules/Products/models/Relation.php | 2 +-
modules/Services/models/Module.php | 2 +-
modules/Settings/Vtiger/models/ListView.php | 2 +-
modules/Vtiger/models/ListView.php | 2 +-
modules/Vtiger/models/Module.php | 2 +-
pkg/vtiger/modules/EmailTemplates/models/ListView.php | 2 +-
.../EmailTemplates/modules/EmailTemplates/models/ListView.php | 2 +-
.../modules/RecycleBin/modules/RecycleBin/models/ListView.php | 2 +-
pkg/vtiger/modules/Services/modules/Services/models/Module.php | 2 +-
23 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/include/ChartUtils.php b/include/ChartUtils.php
index 410e40c9..04aaedc6 100644
--- a/include/ChartUtils.php
+++ b/include/ChartUtils.php
@@ -370,7 +370,7 @@ Class ChartUtils {
if ($fieldDetails != '') {
list($tablename, $colname, $module_field, $fieldname, $single) = explode(":", $fieldDetails);
- list($module, $field) = split("_", $module_field);
+ list($module, $field) = explode("_", $module_field);
$dateField = false;
if ($single == 'D') {
$dateField = true;
diff --git a/include/utils/InventoryUtils.php b/include/utils/InventoryUtils.php
index ffe16774..cd6afa09 100644
--- a/include/utils/InventoryUtils.php
+++ b/include/utils/InventoryUtils.php
@@ -591,7 +591,7 @@ function saveInventoryProductDetails(&$focus, $module, $update_prod_stock='false
$sub_prod_str = $_REQUEST['subproduct_ids'.$i];
if (!empty($sub_prod_str)) {
- $sub_prod = split(":",$sub_prod_str);
+ $sub_prod = explode(":",$sub_prod_str);
for($j=0;$j<count($sub_prod);$j++){
$query ="insert into vtiger_inventorysubproductrel(id, sequence_no, productid) values(?,?,?)";
$qparams = array($focus->id,$prod_seq,$sub_prod[$j]);
diff --git a/include/utils/export.php b/include/utils/export.php
index 41720fbd..2e2f015f 100755
--- a/include/utils/export.php
+++ b/include/utils/export.php
@@ -135,7 +135,7 @@ function export($type){
}
$params = array();
- list($idstring, $export_data) = split("#@@#",getExportRecordIds($type, $viewid, $_REQUEST));
+ list($idstring, $export_data) = explode("#@@#",getExportRecordIds($type, $viewid, $_REQUEST));
if(($search_type == 'withoutsearch' || $search_type == 'includesearch') && $export_data == 'selecteddata'){
$idstring = getSelectedRecords($_REQUEST, $type, $idstring, vtlib_purify($_REQUEST['excludedRecords']));
diff --git a/include/utils/utils.php b/include/utils/utils.php
index d1686507..7e0a1e8f 100755
--- a/include/utils/utils.php
+++ b/include/utils/utils.php
@@ -2143,7 +2143,7 @@ function getSelectAllQuery($input,$module) {
$query = $oCustomView->getModifiedCvListQuery($viewid,$listquery,$module);
$where = '';
if($input['query'] == 'true') {
- list($where, $ustring) = split("#@@#",getWhereCondition($module, $input));
+ list($where, $ustring) = explode("#@@#",getWhereCondition($module, $input));
if(isset($where) && $where != '') {
$query .= " AND " .$where;
}
diff --git a/modules/Contacts/models/Module.php b/modules/Contacts/models/Module.php
index 7820e72b..b97aaa58 100644
--- a/modules/Contacts/models/Module.php
+++ b/modules/Contacts/models/Module.php
@@ -277,7 +277,7 @@ class Contacts_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/Documents/models/Module.php b/modules/Documents/models/Module.php
index 40ac4845..22ae4e56 100644
--- a/modules/Documents/models/Module.php
+++ b/modules/Documents/models/Module.php
@@ -66,7 +66,7 @@ class Documents_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/EmailTemplates/models/ListView.php b/modules/EmailTemplates/models/ListView.php
index b319c131..126aece9 100755
--- a/modules/EmailTemplates/models/ListView.php
+++ b/modules/EmailTemplates/models/ListView.php
@@ -164,7 +164,7 @@ class EmailTemplates_ListView_Model extends Vtiger_ListView_Model {
$position = stripos($listQuery, 'from');
if ($position) {
- $split = spliti('from', $listQuery);
+ $split = preg_split('/from/', $listQuery);
$splitCount = count($split);
$listQuery = 'SELECT count(*) AS count ';
for ($i=1; $i<$splitCount; $i++) {
diff --git a/modules/HelpDesk/models/Module.php b/modules/HelpDesk/models/Module.php
index bb7943e9..9c352972 100644
--- a/modules/HelpDesk/models/Module.php
+++ b/modules/HelpDesk/models/Module.php
@@ -170,7 +170,7 @@ class HelpDesk_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/Leads/models/Module.php b/modules/Leads/models/Module.php
index a9bef485..fba67d65 100644
--- a/modules/Leads/models/Module.php
+++ b/modules/Leads/models/Module.php
@@ -331,7 +331,7 @@ class Leads_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/Potentials/models/Module.php b/modules/Potentials/models/Module.php
index 8c40e48f..b3a5b504 100644
--- a/modules/Potentials/models/Module.php
+++ b/modules/Potentials/models/Module.php
@@ -336,7 +336,7 @@ class Potentials_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/PriceBooks/models/ListView.php b/modules/PriceBooks/models/ListView.php
index a8222b9c..c29c3f25 100644
--- a/modules/PriceBooks/models/ListView.php
+++ b/modules/PriceBooks/models/ListView.php
@@ -207,7 +207,7 @@ class PriceBooks_ListView_Model extends Vtiger_ListView_Model {
}
$position = stripos($listQuery, ' from ');
if ($position) {
- $split = spliti(' from ', $listQuery);
+ $split = preg_split('/ from /', $listQuery);
$splitCount = count($split);
$listQuery = 'SELECT count(*) AS count ';
for ($i=1; $i<$splitCount; $i++) {
diff --git a/modules/PriceBooks/models/Relation.php b/modules/PriceBooks/models/Relation.php
index 249764ea..d6ad3b7d 100644
--- a/modules/PriceBooks/models/Relation.php
+++ b/modules/PriceBooks/models/Relation.php
@@ -39,7 +39,7 @@ class PriceBooks_Relation_Model extends Vtiger_Relation_Model{
$queryGenerator = new QueryGenerator($relatedModuleName, $currentUser);
$queryGenerator->setFields($relatedListFields);
$selectColumnSql = $queryGenerator->getSelectClauseColumnSQL();
- $newQuery = spliti('FROM', $query);
+ $newQuery = preg_split('/from/', $query);
$selectColumnSql = 'SELECT DISTINCT vtiger_crmentity.crmid,'.$selectColumnSql;
}
if($functionName == ('get_pricebook_products' || 'get_pricebook_services')){
diff --git a/modules/Products/models/ListView.php b/modules/Products/models/ListView.php
index 7a515af0..011781c9 100644
--- a/modules/Products/models/ListView.php
+++ b/modules/Products/models/ListView.php
@@ -224,7 +224,7 @@ class Products_ListView_Model extends Vtiger_ListView_Model {
}
$position = stripos($listQuery, ' from ');
if ($position) {
- $split = spliti(' from ', $listQuery);
+ $split = preg_split('/ from /', $listQuery);
$splitCount = count($split);
$listQuery = 'SELECT count(*) AS count ';
for ($i=1; $i<$splitCount; $i++) {
diff --git a/modules/Products/models/Module.php b/modules/Products/models/Module.php
index b982a13e..f71674ab 100644
--- a/modules/Products/models/Module.php
+++ b/modules/Products/models/Module.php
@@ -37,7 +37,7 @@ class Products_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/Products/models/Relation.php b/modules/Products/models/Relation.php
index 0c8601a6..816ec6c5 100644
--- a/modules/Products/models/Relation.php
+++ b/modules/Products/models/Relation.php
@@ -39,7 +39,7 @@ class Products_Relation_Model extends Vtiger_Relation_Model {
$queryGenerator = new QueryGenerator($relatedModuleName, $currentUser);
$queryGenerator->setFields($relatedListFields);
$selectColumnSql = $queryGenerator->getSelectClauseColumnSQL();
- $newQuery = spliti('FROM', $query);
+ $newQuery = preg_split('/from/', $query);
$selectColumnSql = 'SELECT DISTINCT vtiger_crmentity.crmid, '.$selectColumnSql;
}
if($functionName == 'get_product_pricebooks'){
diff --git a/modules/Services/models/Module.php b/modules/Services/models/Module.php
index f5f5e710..25323b7c 100644
--- a/modules/Services/models/Module.php
+++ b/modules/Services/models/Module.php
@@ -34,7 +34,7 @@ class Services_Module_Model extends Products_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/Settings/Vtiger/models/ListView.php b/modules/Settings/Vtiger/models/ListView.php
index 95eb13a1..e48fb600 100644
--- a/modules/Settings/Vtiger/models/ListView.php
+++ b/modules/Settings/Vtiger/models/ListView.php
@@ -152,7 +152,7 @@ class Settings_Vtiger_ListView_Model extends Vtiger_Base_Model {
$position = stripos($listQuery, ' from ');
if ($position) {
- $split = spliti(' from ', $listQuery);
+ $split = preg_split('/ from /', $listQuery);
$splitCount = count($split);
$listQuery = 'SELECT count(*) AS count ';
for ($i=1; $i<$splitCount; $i++) {
diff --git a/modules/Vtiger/models/ListView.php b/modules/Vtiger/models/ListView.php
index aaa6028f..29d89c53 100644
--- a/modules/Vtiger/models/ListView.php
+++ b/modules/Vtiger/models/ListView.php
@@ -335,7 +335,7 @@ class Vtiger_ListView_Model extends Vtiger_Base_Model {
}
$position = stripos($listQuery, ' from ');
if ($position) {
- $split = spliti(' from ', $listQuery);
+ $split = preg_split('/ from /', $listQuery);
$splitCount = count($split);
$listQuery = 'SELECT count(*) AS count ';
for ($i=1; $i<$splitCount; $i++) {
diff --git a/modules/Vtiger/models/Module.php b/modules/Vtiger/models/Module.php
index b716f580..608f1918 100644
--- a/modules/Vtiger/models/Module.php
+++ b/modules/Vtiger/models/Module.php
@@ -1349,7 +1349,7 @@ class Vtiger_Module_Model extends Vtiger_Module {
$queryGenerator = new QueryGenerator($relatedModuleName, $currentUser);
$queryGenerator->setFields($relatedListFields);
$selectColumnSql = $queryGenerator->getSelectClauseColumnSQL();
- $newQuery = spliti('FROM', $query);
+ $newQuery = preg_split('/from/', $query);
$selectColumnSql = 'SELECT DISTINCT vtiger_crmentity.crmid,'.$selectColumnSql;
$query = $selectColumnSql.' FROM '.$newQuery[1];
}
diff --git a/pkg/vtiger/modules/EmailTemplates/models/ListView.php b/pkg/vtiger/modules/EmailTemplates/models/ListView.php
index b319c131..126aece9 100755
--- a/pkg/vtiger/modules/EmailTemplates/models/ListView.php
+++ b/pkg/vtiger/modules/EmailTemplates/models/ListView.php
@@ -164,7 +164,7 @@ class EmailTemplates_ListView_Model extends Vtiger_ListView_Model {
$position = stripos($listQuery, 'from');
if ($position) {
- $split = spliti('from', $listQuery);
+ $split = preg_split('/from/', $listQuery);
$splitCount = count($split);
$listQuery = 'SELECT count(*) AS count ';
for ($i=1; $i<$splitCount; $i++) {
diff --git a/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/models/ListView.php b/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/models/ListView.php
index b319c131..126aece9 100644
--- a/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/models/ListView.php
+++ b/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/models/ListView.php
@@ -164,7 +164,7 @@ class EmailTemplates_ListView_Model extends Vtiger_ListView_Model {
$position = stripos($listQuery, 'from');
if ($position) {
- $split = spliti('from', $listQuery);
+ $split = preg_split('/from/', $listQuery);
$splitCount = count($split);
$listQuery = 'SELECT count(*) AS count ';
for ($i=1; $i<$splitCount; $i++) {
diff --git a/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/models/ListView.php b/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/models/ListView.php
index 5f5fb0c6..498268f7 100644
--- a/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/models/ListView.php
+++ b/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/models/ListView.php
@@ -136,7 +136,7 @@ class RecycleBin_ListView_Model extends Vtiger_ListView_Model {
$position = stripos($listQuery, ' from ');
if ($position) {
- $split = spliti(' from ', $listQuery);
+ $split = preg_split('/ from /', $listQuery);
$splitCount = count($split);
$listQuery = 'SELECT count(*) AS count ';
for ($i=1; $i<$splitCount; $i++) {
diff --git a/pkg/vtiger/modules/Services/modules/Services/models/Module.php b/pkg/vtiger/modules/Services/modules/Services/models/Module.php
index f5f5e710..25323b7c 100644
--- a/pkg/vtiger/modules/Services/modules/Services/models/Module.php
+++ b/pkg/vtiger/modules/Services/modules/Services/models/Module.php
@@ -34,7 +34,7 @@ class Services_Module_Model extends Products_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;
--
GitLab