diff --git a/include/Webservices/VtigerModuleOperation.php b/include/Webservices/VtigerModuleOperation.php
index 675b67ff8b4f000211db868d3a1ad9a3c4898626..5cbd5d810fd5074e5c9b0af9d51c198f4cf05723 100644
--- a/include/Webservices/VtigerModuleOperation.php
+++ b/include/Webservices/VtigerModuleOperation.php
@@ -193,7 +193,16 @@ class VtigerModuleOperation extends WebserviceEntityOperation {
$output[] = DataTransform::sanitizeDataWithColumn($row,$meta);
}
- return $output;
+ $newOutput = array();
+ if(count($output)) {
+ //Added check if tags was requested or not
+ if(stripos($mysql_query, $meta->getEntityBaseTable().'.tags') !== false) $tags = Vtiger_Tag_Model::getAllAccessibleTags(array_keys($output));
+ foreach($output as $id => $row1) {
+ if(!empty($tags[$id])) $output[$id]['tags'] = $tags[$id];
+ $newOutput[] = $output[$id];
+ }
+ }
+ return $newOutput;
}
public function describe($elementType){
diff --git a/include/utils/InventoryUtils.php b/include/utils/InventoryUtils.php
index 8eb69863ea3c21ff28da0bfdc4948c358598cc7d..2c00ba34f6519c990c304ff0c137fa05a640c11a 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 0a78c64bfe5be005056f15580fa9d24a94afec50..411ccf11e1d0857dc4d3ed45db55399c515bdde0 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/Rss/resources/List.js b/layouts/v7/modules/Rss/resources/List.js
index e22540f52771345735f5e0de4148cebfe1521d03..c34408ffbaf2c567c9816d170c9649ef529962b0 100644
--- a/layouts/v7/modules/Rss/resources/List.js
+++ b/layouts/v7/modules/Rss/resources/List.js
@@ -215,9 +215,8 @@ Vtiger_List_Js("Rss_List_Js",{},{
var thisInstance = this;
jQuery('#page').on('click', '#deleteButton', function(e){
var elem = jQuery(e.currentTarget);
- var originalDropDownMenu = elem.closest('.dropdown-menu').data('original-menu');
- var parent = app.helper.getDropDownmenuParent(originalDropDownMenu);
- thisInstance.deleteRecord(parent);
+ var feedContainer = elem.closest('.feedContainer');
+ thisInstance.deleteRecord(feedContainer);
})
},
diff --git a/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js b/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js
index c89bba9c5f2de67c6c787530a760811f026bb8e5..cf26d355efd552bb8a9a431ea95033af64272670 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/layouts/v7/modules/Vtiger/resources/Detail.js b/layouts/v7/modules/Vtiger/resources/Detail.js
index 86842fa212b404273c3b5761b77884c489b45c97..fc0f6890f9560660154668e1fa9737fd42e2db05 100644
--- a/layouts/v7/modules/Vtiger/resources/Detail.js
+++ b/layouts/v7/modules/Vtiger/resources/Detail.js
@@ -1136,7 +1136,7 @@ Vtiger.Class("Vtiger_Detail_Js",{
fieldName = multiPicklistFieldName[0];
}
- var customHandlingFields = ['owner','ownergroup','picklist','multipicklist','reference','currencyList','text'];
+ var customHandlingFields = ['owner','ownergroup','picklist','multipicklist','reference','currencyList','text', 'documentsFolder'];
if(jQuery.inArray(fieldType, customHandlingFields) !== -1){
value = rawValue;
}
diff --git a/layouts/v7/modules/Vtiger/resources/Field.js b/layouts/v7/modules/Vtiger/resources/Field.js
index 78dacb077adbe4871a8fb0315d50ee0c50a74c7e..a8891ac7b8d05304be0ba5c260ed02de813e9f09 100644
--- a/layouts/v7/modules/Vtiger/resources/Field.js
+++ b/layouts/v7/modules/Vtiger/resources/Field.js
@@ -289,6 +289,48 @@ Vtiger_Field_Js('Vtiger_Picklist_Field_Js',{},{
}
});
+Vtiger_Field_Js('Vtiger_Documentsfolder_Field_Js',{},{
+
+ /**
+ * Function to get the pick list values
+ * @return <object> key value pair of options
+ */
+ getPickListValues : function() {
+ return this.get('documentFolders');
+ },
+
+ /**
+ * Function to get the ui
+ * @return - select element and chosen element
+ */
+ getUi : function() {
+ //added class inlinewidth
+ var html = '<select class="select2 inputElement inlinewidth" name="'+ this.getName() +'" id="field_'+this.getModuleName()+'_'+this.getName()+'">';
+ var pickListValues = this.getPickListValues();
+ var selectedOption = app.htmlDecode(this.getValue());
+
+ if(typeof pickListValues[' '] == 'undefined' || pickListValues[' '].length <= 0 || pickListValues[' '] != 'Select an Option') {
+ html += '<option value="">'+app.vtranslate('JS_SELECT_OPTION')+'</option>';
+ }
+
+ var data = this.getData();
+
+ var fieldName = this.getName();
+ for(var option in pickListValues) {
+ html += '<option value="'+option+'" ';
+ if(option == selectedOption) {
+ html += ' selected ';
+ }
+ html += '>'+pickListValues[option]+'</option>';
+ }
+ html +='</select>';
+
+ var selectContainer = jQuery(html);
+ this.addValidationToElement(selectContainer);
+ return selectContainer;
+ }
+});
+
Vtiger_Field_Js('Vtiger_Currencylist_Field_Js',{},{
/**
diff --git a/layouts/v7/modules/Vtiger/resources/Vtiger.js b/layouts/v7/modules/Vtiger/resources/Vtiger.js
index 074942acf5b1dfa967a3f93e1c96edd9e2e02515..9efa3deda60902ddf82c110683b8c1e4bdbb32cd 100644
--- a/layouts/v7/modules/Vtiger/resources/Vtiger.js
+++ b/layouts/v7/modules/Vtiger/resources/Vtiger.js
@@ -498,9 +498,9 @@ Vtiger.Class('Vtiger_Index_Js', {
//fix for Refresh list view after Quick create
var parentModule=app.getModuleName();
var viewname=app.view();
- if((quickCreateModuleName == parentModule) && (viewname=="List")){
- var listinstance = app.controller();
- listinstance.loadListViewRecords();
+ if(((quickCreateModuleName == parentModule) || (quickCreateModuleName == 'Events' && parentModule == 'Calendar')) && (viewname=="List")){
+ var listinstance = app.controller();
+ listinstance.loadListViewRecords();
}
};
}
diff --git a/modules/Calendar/Activity.php b/modules/Calendar/Activity.php
index d61e67730c7a081c5d209bd14d2b23e18a31bbeb..42a06897ea4b04378c5d61c954a84629b8bd2f0b 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 19316b7a2604b3654cd133694f40323ff0e60de4..f3dac4473ecedbf522c468277a292c54188eb6e3 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 916a3dc2e84dc4c7ca91e7ae0961201627033dd9..514e0936b2f00c75230193e7c3eb0e817269c5ba 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 1af6edee6cfd3dc87c8431049901f9a0d64ecdff..f7b64bd6b702fb1320bf7560e9b2737157b88028 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 2a597b084e77f818915b12f2c5197f9fc6db2168..4442b0ca412f79fb318feca200754d2aefc25123 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 f1990bc93c9068455279b10fd5f50f0acf320050..41ebbfe890a541b19c13888f3d727a19b30d9648 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 7488c9d125aeec9675d9fdaccd06ad2d35220d22..5aafae4603bf2cad1b008781695e5569ea54e16b 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/actions/SaveAjax.php b/modules/Users/actions/SaveAjax.php
index 942e90261e1203d8c90bde2bfed5fae3e877b6b1..5188833bbf57d126b0247fac44e7853ad9f0fc46 100644
--- a/modules/Users/actions/SaveAjax.php
+++ b/modules/Users/actions/SaveAjax.php
@@ -90,8 +90,12 @@ class Users_SaveAjax_Action extends Vtiger_SaveAjax_Action {
$currentUserModel = Users_Record_Model::getCurrentUserModel();
if ($fieldName === 'is_admin' && (!$currentUserModel->isAdminUser() || !$request->get('value'))) {
$recordModel->set($fieldName, 'off');
+ } else if($fieldName === 'is_admin' && $currentUserModel->isAdminUser()) {
+ $requestValue = $request->get('value');
+ $value = $requestValue==1?"on":"off";
+ $recordModel->set($fieldName,$value);
}
-
+
if($fieldName == "is_owner" || $fieldName == "roleid") {
$recordId = $request->get('record');
$moduleName = $request->getModule();
diff --git a/modules/Users/models/ListView.php b/modules/Users/models/ListView.php
index f8515992c0d348089087fb02ca59fa2b33228dee..b2fc6be574af91ab9dde13c9a5f1ad94c5f30c21 100644
--- a/modules/Users/models/ListView.php
+++ b/modules/Users/models/ListView.php
@@ -68,6 +68,7 @@ class Users_ListView_Model extends Vtiger_ListView_Model {
public function getQuery() {
$listQuery = parent::getQuery();
$searchKey = $this->get('search_key');
+ $db = PearDatabase::getInstance();
if(!empty($searchKey)) {
$listQueryComponents = explode(" WHERE vtiger_users.status='Active' AND", $listQuery);
@@ -78,10 +79,11 @@ class Users_ListView_Model extends Vtiger_ListView_Model {
// Impose non-admin restrictions.
$user = vglobal('current_user');
if(!is_admin($user)){
- $listQuery .= " AND vtiger_users.id = {$user->id}";
+ $listQuery .= " AND vtiger_users.id = ?";
+ $param[] = $user->id;
//TODO: Consider user based on Role-heirarchy
}
- return $listQuery;
+ return $db->convert2Sql($listQuery, $param);
}
/**
diff --git a/modules/Users/models/Record.php b/modules/Users/models/Record.php
index c12abc18b48181843b476cffe4b02a2c391be203..56cfb7a67da24d65d85dc5074e60ad503ff3dc6d 100644
--- a/modules/Users/models/Record.php
+++ b/modules/Users/models/Record.php
@@ -738,8 +738,8 @@ class Users_Record_Model extends Vtiger_Record_Model {
$noOfUsers = $db->num_rows($result);
$users = array();
if($noOfUsers > 0) {
- $focus = new Users();
for($i=0; $i<$noOfUsers; ++$i) {
+ $focus = new Users();
$userId = $db->query_result($result, $i, 'id');
$focus->id = $userId;
$focus->retrieve_entity_info($userId, 'Users');
diff --git a/modules/Users/views/Import.php b/modules/Users/views/Import.php
index 8da395dd48ece8b8ef692e897d92d43acdb4fdf5..55a715cdcafb9a12b2bb1b18efc3a79fdfbd94f3 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 3def25fd85c183974dcac538a6330a326e389584..4e3ac8e5ca92a0323d131877b1f8792933d7b071 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 = '';
@@ -158,9 +157,6 @@ class Vtiger_Save_Action extends Vtiger_Action_Controller {
foreach ($fieldModelList as $fieldName => $fieldModel) {
$fieldValue = $request->get($fieldName, null);
$fieldDataType = $fieldModel->getFieldDataType();
- if($fieldValue){
- $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue,$fieldModel);
- }
if($fieldDataType == 'time' && $fieldValue !== null){
$fieldValue = Vtiger_Time_UIType::getTimeValueWithSeconds($fieldValue);
}
diff --git a/modules/Vtiger/actions/SaveAjax.php b/modules/Vtiger/actions/SaveAjax.php
index 4207e24b1fca96ba253b7d927384d0997e13ece3..49ec727dac8c4cbea38a539dc8272d587e736ca4 100644
--- a/modules/Vtiger/actions/SaveAjax.php
+++ b/modules/Vtiger/actions/SaveAjax.php
@@ -102,9 +102,6 @@ class Vtiger_SaveAjax_Action extends Vtiger_Save_Action {
}else if($fieldName === $request->get('field')){
$fieldValue = $request->get('value');
}
- if($fieldValue){
- $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue,$fieldModel);
- }
$fieldDataType = $fieldModel->getFieldDataType();
if ($fieldDataType == 'time' && $fieldValue !== null) {
$fieldValue = Vtiger_Time_UIType::getTimeValueWithSeconds($fieldValue);
diff --git a/modules/Vtiger/helpers/Util.php b/modules/Vtiger/helpers/Util.php
index a235950841cc553754aea9eafcded79235f94714..ec0091b29189b81e7026aa741f4ce4167e259322 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/Field.php b/modules/Vtiger/models/Field.php
index 27324065da7e76b1863589afe9acbff96a766e0e..df0987285df9cc5e23579da26505dc883fecebcf 100644
--- a/modules/Vtiger/models/Field.php
+++ b/modules/Vtiger/models/Field.php
@@ -583,6 +583,13 @@ class Vtiger_Field_Model extends Vtiger_Field {
$this->fieldInfo['picklistColors'] = $picklistColors;
}
}
+
+ if($fieldDataType == "documentsFolder"){
+ $documentFolders = $this->getDocumentFolders();
+ if(!empty($documentFolders)) {
+ $this->fieldInfo['documentFolders'] = $documentFolders;
+ }
+ }
if($fieldDataType === 'currencyList'){
$currencyList = $this->getCurrencyList();
diff --git a/modules/Vtiger/models/Module.php b/modules/Vtiger/models/Module.php
index 4122115608a2ad2e07312288cb440fd06621c423..5ee02638af76e200f5aa14299719c58d3d0d9f79 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 21a619a079f379f0270805dc0bf12d2176387fe1..076a7109ba869f7857156b82a789df40705b8908 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 0de1652ab0377b215ddcce5275ab0910ebd502a7..30175a0f2ac61514f8a5382dd22f8e01e8e799ed 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 ba3fdd45f285f8312a8a0d1279a4922c6779edf9..abcd9762f16242b61a63f2b2463fed31de08a9d2 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 d8b005752839f922b2810590ef8a98b9e87504a0..9e6714f03eefcc93eb989867ac0d575b47850f45 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 52f5b3f53c6291c108b48754bfc465ca5a87cea1..3897eeaa2e674094006b1ad1b7a3dae09e467895 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();