From 0be9716286cdb899337b8d5d06d4399775597aa0 Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Mon, 21 Oct 2019 16:28:03 +0530
Subject: [PATCH] Merge request review
---
include/utils/InventoryUtils.php | 8 ++++----
layouts/v7/modules/Reports/resources/Detail.js | 2 +-
.../Settings/Workflows/resources/AdvanceFilter.js | 1 -
modules/Calendar/Activity.php | 2 --
modules/Emails/Emails.php | 1 -
modules/PriceBooks/PriceBooks.php | 2 +-
modules/Settings/Picklist/models/Field.php | 4 +---
modules/Settings/Picklist/models/Module.php | 11 +----------
modules/Settings/Roles/models/Record.php | 2 +-
modules/Users/Users.php | 2 +-
modules/Users/views/Import.php | 2 +-
modules/Vtiger/actions/Save.php | 1 -
modules/Vtiger/helpers/Util.php | 2 --
modules/Vtiger/models/Module.php | 3 ---
modules/Vtiger/views/Import.php | 2 +-
.../modules/Import/modules/Import/actions/Data.php | 4 ++--
.../modules/Import/modules/Import/helpers/Utils.php | 2 +-
.../modules/Import/modules/Import/models/ListView.php | 2 +-
.../Import/modules/Import/readers/FileReader.php | 2 +-
19 files changed, 17 insertions(+), 38 deletions(-)
diff --git a/include/utils/InventoryUtils.php b/include/utils/InventoryUtils.php
index 8eb69863e..2c00ba34f 100644
--- a/include/utils/InventoryUtils.php
+++ b/include/utils/InventoryUtils.php
@@ -972,7 +972,7 @@ function getInventorySHTaxPercent($id, $taxname)
global $log, $adb;
$log->debug("Entering into function getInventorySHTaxPercent($id, $taxname)");
- $taxname = Vtiger_Util_Helper::validateStringForSql($taxname);
+ $taxname = $taxname;
$res = $adb->pquery("select $taxname from vtiger_inventoryshippingrel where id= ?", array($id));
$taxpercentage = $adb->query_result($res,0,$taxname);
@@ -1313,7 +1313,7 @@ function createRecords($obj) {
$focus = CRMEntity::getInstance($moduleName);
$params = array();
- $tableName = Vtiger_Util_Helper::validateStringForSql(Import_Utils_Helper::getDbTableName($obj->user));
+ $tableName = Import_Utils_Helper::getDbTableName($obj->user);
$sql = 'SELECT * FROM ' . $tableName . ' WHERE status = ? GROUP BY subject';
$params[] = Import_Data_Action::$IMPORT_RECORD_NONE;
if($obj->batchImport) {
@@ -1522,7 +1522,7 @@ function importRecord($obj, $inventoryFieldData, $lineItemDetails) {
function getImportStatusCount($obj) {
global $adb;
- $tableName = Vtiger_Util_Helper::validateStringForSql(Import_Utils_Helper::getDbTableName($obj->user));
+ $tableName = Import_Utils_Helper::getDbTableName($obj->user);
$result = $adb->pquery('SELECT status FROM '.$tableName. ' GROUP BY subject', array());
$statusCount = array('TOTAL' => 0, 'IMPORTED' => 0, 'FAILED' => 0, 'PENDING' => 0,
@@ -1565,7 +1565,7 @@ function undoLastImport($obj, $user) {
$owner->id = $ownerId;
$owner->retrieve_entity_info($ownerId, 'Users');
- $dbTableName = Vtiger_Util_Helper::validateStringForSql(Import_Utils_Helper::getDbTableName($owner));
+ $dbTableName = Import_Utils_Helper::getDbTableName($owner);
if(!is_admin($user) && $user->id != $owner->id) {
$viewer = new Vtiger_Viewer();
diff --git a/layouts/v7/modules/Reports/resources/Detail.js b/layouts/v7/modules/Reports/resources/Detail.js
index 0a78c64bf..411ccf11e 100644
--- a/layouts/v7/modules/Reports/resources/Detail.js
+++ b/layouts/v7/modules/Reports/resources/Detail.js
@@ -62,7 +62,7 @@ Vtiger_Detail_Js("Reports_Detail_Js",{},{
function(error,data){
app.helper.hideProgress();
thisInstance.getContentHolder().find('#reportContentsDiv').html(data);
- jQuery('.reportActionButtons').addClass('hide');
+ if(currentMode == 'save') jQuery('.reportActionButtons').addClass('hide');
// app.helper.showHorizontalScroll(jQuery('#reportDetails'));
// To get total records count
diff --git a/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js b/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js
index c89bba9c5..cf26d355e 100644
--- a/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js
+++ b/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js
@@ -596,7 +596,6 @@ Workflows_Reference_Field_Js("Workflows_Multireference_Field_Js",{},{});
Workflows_Field_Js('Workflows_Integer_Field_Js',{},{
getUi : function() {
- console.log('get ui on integer field');
if(this.getName() === 'profile_rating') {
//Special handling for profile_rating field to show dropdown instead of input box as its integer field.
var html = '<select class="select2 inputElement inlinewidth" name="'+ this.getName() +'" id="field_'+this.getModuleName()+'_'+this.getName()+'">';
diff --git a/modules/Calendar/Activity.php b/modules/Calendar/Activity.php
index d61e67730..42a06897e 100644
--- a/modules/Calendar/Activity.php
+++ b/modules/Calendar/Activity.php
@@ -1167,8 +1167,6 @@ function insertIntoRecurringTable(& $recurObj)
$tabId = getTabid("Calendar");
$eventTempTable = 'vt_tmp_u'.$userModel->id.'_t'.$tabId.'_events'.$scope;
$taskTempTable = 'vt_tmp_u'.$userModel->id.'_t'.$tabId.'_task'.$scope;
- $eventTempTable = Vtiger_Util_Helper::validateStringForSql($eventTempTable);
- $taskTempTable = Vtiger_Util_Helper::validateStringForSql($taskTempTable);
$query = " ($eventTempTable.shared IS NOT NULL OR $taskTempTable.shared IS NOT NULL) ";
}
return $query;
diff --git a/modules/Emails/Emails.php b/modules/Emails/Emails.php
index 19316b7a2..f3dac4473 100644
--- a/modules/Emails/Emails.php
+++ b/modules/Emails/Emails.php
@@ -550,7 +550,6 @@ class Emails extends CRMEntity {
$module = getTabname($tabId);
}
$query = $this->getNonAdminAccessQuery($module, $user, $parentRole, $userGroups);
- $tableName = Vtiger_Util_Helper::validateStringForSql($tableName);
$query = "create temporary table IF NOT EXISTS $tableName(id int(11) primary key, shared int(1) default 0) ignore ".$query;
$db = PearDatabase::getInstance();
$result = $db->pquery($query, array());
diff --git a/modules/PriceBooks/PriceBooks.php b/modules/PriceBooks/PriceBooks.php
index 916a3dc2e..514e0936b 100755
--- a/modules/PriceBooks/PriceBooks.php
+++ b/modules/PriceBooks/PriceBooks.php
@@ -347,7 +347,7 @@ class PriceBooks extends CRMEntity {
$moduleSubject = 'bookname';
$params = array();
- $tableName = Vtiger_Util_Helper::validateStringForSql(Import_Utils_Helper::getDbTableName($obj->user));
+ $tableName = Import_Utils_Helper::getDbTableName($obj->user);
$sql = 'SELECT * FROM ' . $tableName . ' WHERE status = ? GROUP BY ?';
array_push($params, Import_Data_Action::$IMPORT_RECORD_NONE);
array_push($params, $moduleSubject);
diff --git a/modules/Settings/Picklist/models/Field.php b/modules/Settings/Picklist/models/Field.php
index 1af6edee6..f7b64bd6b 100644
--- a/modules/Settings/Picklist/models/Field.php
+++ b/modules/Settings/Picklist/models/Field.php
@@ -39,7 +39,7 @@ class Settings_Picklist_Field_Model extends Vtiger_Field_Model {
return Vtiger_Cache::get('PicklistRoleBasedValues',$this->getName().implode('_', $roleIdList));
}
$db = PearDatabase::getInstance();
- $fieldName = Vtiger_Util_Helper::validateStringForSql($this->getName());
+ $fieldName = $this->getName();
$tableName = 'vtiger_'.$fieldName;
$idColName = $fieldName.'id';
$query = 'SELECT '.$fieldName;
@@ -103,7 +103,6 @@ class Settings_Picklist_Field_Model extends Vtiger_Field_Model {
* @return type -- array of values
*/
public function getEditablePicklistValues($fieldName){
- $fieldName = Vtiger_Util_Helper::validateStringForSql($fieldName);
$cache = Vtiger_Cache::getInstance();
$EditablePicklistValues = $cache->get('EditablePicklistValues', $fieldName);
if($EditablePicklistValues) {
@@ -130,7 +129,6 @@ class Settings_Picklist_Field_Model extends Vtiger_Field_Model {
* @return type -- array of values
*/
public static function getNonEditablePicklistValues($fieldName){
- $fieldName = Vtiger_Util_Helper::validateStringForSql($fieldName);
$cache = Vtiger_Cache::getInstance();
$NonEditablePicklistValues = $cache->get('NonEditablePicklistValues', $fieldName);
if($NonEditablePicklistValues) {
diff --git a/modules/Settings/Picklist/models/Module.php b/modules/Settings/Picklist/models/Module.php
index 2a597b084..4442b0ca4 100644
--- a/modules/Settings/Picklist/models/Module.php
+++ b/modules/Settings/Picklist/models/Module.php
@@ -30,7 +30,7 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
public function addPickListValues($fieldModel, $newValue, $rolesSelected = array(), $color = '') {
$db = PearDatabase::getInstance();
- $pickListFieldName = Vtiger_Util_Helper::validateStringForSql($fieldModel->getName());
+ $pickListFieldName = $fieldModel->getName();
$id = $db->getUniqueID("vtiger_$pickListFieldName");
vimport('~~/include/ComboUtil.php');
$picklist_valueid = getUniquePicklistID();
@@ -74,7 +74,6 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
public function renamePickListValues($pickListFieldName, $oldValue, $newValue, $moduleName, $id, $rolesList = false, $color = '') {
$db = PearDatabase::getInstance();
- $pickListFieldName = Vtiger_Util_Helper::validateStringForSql($pickListFieldName);
$query = 'SELECT tablename, fieldid, columnname FROM vtiger_field WHERE fieldname=? and presence IN (0,2)';
$result = $db->pquery($query, array($pickListFieldName));
$num_rows = $db->num_rows($result);
@@ -135,7 +134,6 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
if(!is_array($valueToDeleteId)) {
$valueToDeleteId = array($valueToDeleteId);
}
- $pickListFieldName = Vtiger_Util_Helper::validateStringForSql($pickListFieldName);
$primaryKey = Vtiger_Util_Helper::getPickListId($pickListFieldName);
$pickListValues = array();
@@ -238,7 +236,6 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
$dieOnErrorOldValue = $db->dieOnError;
$db->dieOnError = false;
- $picklistFieldName = Vtiger_Util_Helper::validateStringForSql($picklistFieldName);
$sql = "select picklistid from vtiger_picklist where name=?";
$result = $db->pquery($sql, array($picklistFieldName));
$picklistid = $db->query_result($result,0,"picklistid");
@@ -302,7 +299,6 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
public function updateSequence($pickListFieldName , $picklistValues, $rolesList = false) {
$db = PearDatabase::getInstance();
- $pickListFieldName = Vtiger_Util_Helper::validateStringForSql($pickListFieldName);
$primaryKey = Vtiger_Util_Helper::getPickListId($pickListFieldName);
$paramArray = array();
$query = 'UPDATE '.$this->getPickListTableName($pickListFieldName).' SET sortorderid = CASE ';
@@ -443,7 +439,6 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
} else {
$valueToDeleteID = $valueToDelete;
}
- $pickListFieldName = Vtiger_Util_Helper::validateStringForSql($pickListFieldName);
$primaryKey = Vtiger_Util_Helper::getPickListId($pickListFieldName);
$pickListDeleteValue = array();
$getPickListValueQuery = "SELECT $pickListFieldName FROM " . $this->getPickListTableName($pickListFieldName) . " WHERE $primaryKey IN (" . generateQuestionMarks($valueToDeleteID) . ")";
@@ -463,7 +458,6 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
*/
public static function getPicklistColor($pickListFieldName, $pickListId) {
$db = PearDatabase::getInstance();
- $pickListFieldName = Vtiger_Util_Helper::validateStringForSql($pickListFieldName);
$primaryKey = Vtiger_Util_Helper::getPickListId($pickListFieldName);
$colums = $db->getColumnNames("vtiger_$pickListFieldName");
if(in_array('color',$colums)) {
@@ -501,7 +495,6 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
*/
public static function getPicklistColorMap($fieldName, $key = false) {
$db = PearDatabase::getInstance();
- $fieldName = Vtiger_Util_Helper::validateStringForSql($fieldName);
$primaryKey = Vtiger_Util_Helper::getPickListId($fieldName);
$colums = $db->getColumnNames("vtiger_$fieldName");
if(in_array('color',$colums)) {
@@ -542,7 +535,6 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
*/
public static function getPicklistColorByValue($fieldName, $fieldValue) {
$db = PearDatabase::getInstance();
- $fieldName = Vtiger_Util_Helper::validateStringForSql($fieldName);
$tableName = "vtiger_$fieldName";
if(Vtiger_Utils::CheckTable($tableName)) {
$colums = $db->getColumnNames($tableName);
@@ -573,7 +565,6 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
//As older look utf8 characters are pushed as html-entities,and in new utf8 characters are pushed to database
//so we are checking for both the values
- $pickListFieldName = Vtiger_Util_Helper::validateStringForSql($pickListFieldName);
$primaryKey = Vtiger_Util_Helper::getPickListId($pickListFieldName);
if(!empty($color)) {
$query = 'UPDATE ' . $this->getPickListTableName($pickListFieldName) . ' SET color = ? WHERE '.$primaryKey.' = ?';
diff --git a/modules/Settings/Roles/models/Record.php b/modules/Settings/Roles/models/Record.php
index f1990bc93..41ebbfe89 100644
--- a/modules/Settings/Roles/models/Record.php
+++ b/modules/Settings/Roles/models/Record.php
@@ -283,7 +283,7 @@ class Settings_Roles_Record_Model extends Settings_Vtiger_Record_Model {
*/
public function save() {
$db = PearDatabase::getInstance();
- $roleId = Vtiger_Util_Helper::validateStringForSql($this->getId());
+ $roleId = $this->getId();
$mode = 'edit';
if(empty($roleId)) {
diff --git a/modules/Users/Users.php b/modules/Users/Users.php
index 7488c9d12..5aafae460 100755
--- a/modules/Users/Users.php
+++ b/modules/Users/Users.php
@@ -1690,7 +1690,7 @@ class Users extends CRMEntity {
$moduleName = $obj->module;
$createdRecords = array();
- $tableName = Vtiger_Util_Helper::validateStringForSql(Import_Utils_Helper::getDbTableName($obj->user));
+ $tableName = Import_Utils_Helper::getDbTableName($obj->user);
$sql = 'SELECT * FROM '.$tableName.' WHERE status = ?';
$result = $adb->pquery($sql, array(Import_Data_Action::$IMPORT_RECORD_NONE));
$numberOfRecords = $adb->num_rows($result);
diff --git a/modules/Users/views/Import.php b/modules/Users/views/Import.php
index 8da395dd4..55a715cdc 100644
--- a/modules/Users/views/Import.php
+++ b/modules/Users/views/Import.php
@@ -44,7 +44,7 @@ class Users_Import_View extends Vtiger_Import_View {
$moduleName = $request->getModule();
$user = Users_Record_Model::getCurrentUserModel();
- $dbTableName = Vtiger_Util_Helper::validateStringForSql(Import_Utils_Helper::getDbTableName($user));
+ $dbTableName = Import_Utils_Helper::getDbTableName($user);
$query = "SELECT recordid FROM $dbTableName WHERE status = ? AND recordid IS NOT NULL";
$result = $db->pquery($query, array(Import_Data_Action::$IMPORT_RECORD_CREATED));
diff --git a/modules/Vtiger/actions/Save.php b/modules/Vtiger/actions/Save.php
index 3def25fd8..911b74336 100644
--- a/modules/Vtiger/actions/Save.php
+++ b/modules/Vtiger/actions/Save.php
@@ -19,7 +19,6 @@ class Vtiger_Save_Action extends Vtiger_Action_Controller {
$moduleParameter = 'source_module';
}
$record = $request->get('record');
- // Child class permission check support - DragDropAjax
$recordId = $request->get('id');
if (!$record) {
$recordParameter = '';
diff --git a/modules/Vtiger/helpers/Util.php b/modules/Vtiger/helpers/Util.php
index a23595084..ec0091b29 100644
--- a/modules/Vtiger/helpers/Util.php
+++ b/modules/Vtiger/helpers/Util.php
@@ -326,7 +326,6 @@ class Vtiger_Util_Helper {
}
$db = PearDatabase::getInstance();
- $fieldName = Vtiger_Util_Helper::validateStringForSql($fieldName);
$primaryKey = Vtiger_Util_Helper::getPickListId($fieldName);
$query = 'SELECT '.$primaryKey.', '.$fieldName.' FROM vtiger_'.$fieldName.' order by sortorderid';
$values = array();
@@ -362,7 +361,6 @@ class Vtiger_Util_Helper {
}
$db = PearDatabase::getInstance();
- $fieldName = Vtiger_Util_Helper::validateStringForSql($fieldName);
$query = "SELECT $fieldName
FROM vtiger_$fieldName
INNER JOIN vtiger_role2picklist on vtiger_role2picklist.picklistvalueid = vtiger_$fieldName.picklist_valueid
diff --git a/modules/Vtiger/models/Module.php b/modules/Vtiger/models/Module.php
index 412211560..5ee02638a 100644
--- a/modules/Vtiger/models/Module.php
+++ b/modules/Vtiger/models/Module.php
@@ -1466,14 +1466,11 @@ class Vtiger_Module_Model extends Vtiger_Module {
* @return <Array of Vtiger_Record_Model>
*/
public function searchRecord($searchValue, $parentId=false, $parentModule=false, $relatedModule=false) {
- global $log;
- $log->fatal('search record api is triggered => ');
$searchFields = array('crmid','label','setype');
if(!empty($searchValue) && empty($parentId) && empty($parentModule)) {
$matchingRecords = Vtiger_Record_Model::getSearchResult($searchValue, $this->getName());
} else if($parentId && $parentModule) {
$db = PearDatabase::getInstance();
- $log->fatal('call getSearchRecordsQuery api');
$result = $db->pquery($this->getSearchRecordsQuery($searchValue,$searchFields, $parentId, $parentModule), array());
$noOfRows = $db->num_rows($result);
diff --git a/modules/Vtiger/views/Import.php b/modules/Vtiger/views/Import.php
index 21a619a07..076a7109b 100644
--- a/modules/Vtiger/views/Import.php
+++ b/modules/Vtiger/views/Import.php
@@ -247,7 +247,7 @@ class Vtiger_Import_View extends Vtiger_Index_View {
$ownerId = $request->get('foruser');
$user = Users_Record_Model::getCurrentUserModel();
- $dbTableName = Vtiger_Util_Helper::validateStringForSql(Import_Utils_Helper::getDbTableName($user));
+ $dbTableName = Import_Utils_Helper::getDbTableName($user);
if(!$user->isAdminUser() && $user->id != $ownerId) {
$viewer->assign('MESSAGE', vtranslate('LBL_PERMISSION_DENIED'));
diff --git a/pkg/vtiger/modules/Import/modules/Import/actions/Data.php b/pkg/vtiger/modules/Import/modules/Import/actions/Data.php
index 0de1652ab..30175a0f2 100644
--- a/pkg/vtiger/modules/Import/modules/Import/actions/Data.php
+++ b/pkg/vtiger/modules/Import/modules/Import/actions/Data.php
@@ -196,7 +196,7 @@ class Import_Data_Action extends Vtiger_Action_Controller {
$createdRecords = array();
$entityData = array();
- $tableName = Vtiger_Util_Helper::validateStringForSql(Import_Utils_Helper::getDbTableName($this->user));
+ $tableName = Import_Utils_Helper::getDbTableName($this->user);
$params = array();
$sql = 'SELECT * FROM '.$tableName.' WHERE status = ?';
array_push($params, Import_Data_Action::$IMPORT_RECORD_NONE);
@@ -825,7 +825,7 @@ class Import_Data_Action extends Vtiger_Action_Controller {
public function getImportStatusCount() {
$adb = PearDatabase::getInstance();
- $tableName = Vtiger_Util_Helper::validateStringForSql(Import_Utils_Helper::getDbTableName($this->user));
+ $tableName = Import_Utils_Helper::getDbTableName($this->user);
$focus = CRMEntity::getInstance($this->module);
if ($focus && method_exists($focus, 'getGroupQuery')) {
diff --git a/pkg/vtiger/modules/Import/modules/Import/helpers/Utils.php b/pkg/vtiger/modules/Import/modules/Import/helpers/Utils.php
index ba3fdd45f..abcd9762f 100644
--- a/pkg/vtiger/modules/Import/modules/Import/helpers/Utils.php
+++ b/pkg/vtiger/modules/Import/modules/Import/helpers/Utils.php
@@ -121,7 +121,7 @@ class Import_Utils_Helper {
public static function isUserImportBlocked($user) {
$adb = PearDatabase::getInstance();
- $tableName = Vtiger_Util_Helper::validateStringForSql(self::getDbTableName($user));
+ $tableName = self::getDbTableName($user);
if(Vtiger_Utils::CheckTable($tableName)) {
$result = $adb->pquery('SELECT 1 FROM '.$tableName.' WHERE status = ?', array(Import_Data_Action::$IMPORT_RECORD_NONE));
diff --git a/pkg/vtiger/modules/Import/modules/Import/models/ListView.php b/pkg/vtiger/modules/Import/modules/Import/models/ListView.php
index d8b005752..9e6714f03 100644
--- a/pkg/vtiger/modules/Import/modules/Import/models/ListView.php
+++ b/pkg/vtiger/modules/Import/modules/Import/models/ListView.php
@@ -171,7 +171,7 @@ class Import_ListView_Model extends Vtiger_ListView_Model {
$db = PearDatabase::getInstance();
$user = Users_Record_Model::getCurrentUserModel();
- $userDBTableName = Vtiger_Util_Helper::validateStringForSql(Import_Utils_Helper::getDbTableName($user));
+ $userDBTableName = Import_Utils_Helper::getDbTableName($user);
$result = $db->pquery('SELECT recordid FROM '.$userDBTableName.' WHERE status NOT IN (?,?) AND recordid IS NOT NULL',Array(Import_Data_Action::$IMPORT_RECORD_FAILED, Import_Data_Action::$IMPORT_RECORD_SKIPPED));
$noOfRecords = $db->num_rows($result);
diff --git a/pkg/vtiger/modules/Import/modules/Import/readers/FileReader.php b/pkg/vtiger/modules/Import/modules/Import/readers/FileReader.php
index 52f5b3f53..3897eeaa2 100644
--- a/pkg/vtiger/modules/Import/modules/Import/readers/FileReader.php
+++ b/pkg/vtiger/modules/Import/modules/Import/readers/FileReader.php
@@ -102,7 +102,7 @@ class Import_FileReader_Reader {
public function createTable() {
$db = PearDatabase::getInstance();
- $tableName = Vtiger_Util_Helper::validateStringForSql(Import_Utils_Helper::getDbTableName($this->user));
+ $tableName = Import_Utils_Helper::getDbTableName($this->user);
$fieldMapping = $this->request->get('field_mapping');
$moduleFields = $this->moduleModel->getFields();
--
GitLab