diff --git a/data/CRMEntity.php b/data/CRMEntity.php
index 1189864cf043a1c60440bb54dfd954b44f8ddd4a..bd63100b45c0cff8ba1803ea1d1f22e562019f0d 100644
--- a/data/CRMEntity.php
+++ b/data/CRMEntity.php
@@ -300,7 +300,6 @@ class CRMEntity {
$this->column_fields['label'] = $label;
if ($this->mode == 'edit') {
-
$description_val = from_html($this->column_fields['description'], ($insertion_mode == 'edit') ? true : false);
$tabid = getTabid($module);
@@ -649,9 +648,9 @@ class CRMEntity {
if(php7_count($IMG_FILES)){
foreach($IMG_FILES as $fileIndex => $file) {
if($file['error'] == 0 && $file['name'] != '' && $file['size'] > 0) {
- if($_REQUEST[$fileIndex.'_hidden'] != '')
+ if(isset($_REQUEST[$fileIndex.'_hidden']) && $_REQUEST[$fileIndex] != '') {
$file['original_name'] = vtlib_purify($_REQUEST[$fileIndex.'_hidden']);
- else {
+ } else {
$file['original_name'] = stripslashes($file['name']);
}
$file['original_name'] = str_replace('"','',$file['original_name']);
diff --git a/data/VTEntityDelta.php b/data/VTEntityDelta.php
index 1dfd40951c9f2c240ae8b9eab6c9840824214d02..305d3ed29454d8d22383261b7724a68d5686c1b7 100644
--- a/data/VTEntityDelta.php
+++ b/data/VTEntityDelta.php
@@ -109,6 +109,7 @@ class VTEntityDelta extends VTEventHandler {
}
function hasChanged($moduleName, $recordId, $fieldName, $fieldValue = NULL) {
+ $result = false;
if(empty(self::$oldEntity[$moduleName][$recordId])) {
return false;
}
@@ -119,7 +120,9 @@ class VTEntityDelta extends VTEventHandler {
if(is_array($fieldDelta)) {
$fieldDelta = array_map('decode_html', $fieldDelta);
}
- $result = $fieldDelta['oldValue'] != $fieldDelta['currentValue'];
+ if(isset($fieldDelta['oldValue']) && isset($fieldDelta['currentValue'])) {
+ $result = $fieldDelta['oldValue'] != $fieldDelta['currentValue'];
+ }
if ($fieldValue !== NULL) {
$result = $result && ($fieldDelta['currentValue'] === $fieldValue);
}
diff --git a/include/QueryGenerator/QueryGenerator.php b/include/QueryGenerator/QueryGenerator.php
index 6abdb7beb55866b73b2bc612f43b105a9f69d1fc..537e28096ddce0e735620f9e2da17a415d3b9e71 100644
--- a/include/QueryGenerator/QueryGenerator.php
+++ b/include/QueryGenerator/QueryGenerator.php
@@ -53,6 +53,7 @@ class QueryGenerator {
public static $AND = 'AND';
public static $OR = 'OR';
protected $customViewFields;
+ protected $referenceModuleField;
/**
* Import Feature
*/
diff --git a/include/Webservices/DataTransform.php b/include/Webservices/DataTransform.php
index 32263fa92cfc368fc929447aee5125f488a4dbfe..5964d59f0a867a2d3a403061cf32b8ab5b8c4af1 100644
--- a/include/Webservices/DataTransform.php
+++ b/include/Webservices/DataTransform.php
@@ -187,7 +187,7 @@
}
if(!isset($row['id'])){
- if($row[$meta->getObectIndexColumn()] ){
+ if(isset($row[$meta->getObectIndexColumn()] )){
$row['id'] = vtws_getId($meta->getEntityId(),$row[$meta->getObectIndexColumn()]);
}else{
//TODO Handle this.
@@ -211,7 +211,7 @@
continue;
}
if(strtolower($meta->getEntityName()) == "emails"){
- if(isset($row['parent_id'])){
+ if (isset($row['parent_id']) && $row['parent_id'] !== null && strpos($row['parent_id'], '@') !== false) {
list($row['parent_id'], $fieldId) = explode('@', $row['parent_id']);
}
}
@@ -273,7 +273,7 @@
foreach ($moduleFields as $fieldName => $fieldObj) {
if (in_array($fieldObj->getUIType(), $supportedUITypes)) {
//while doing retrieve operation we have record_id and on query operation we have id.
- $id = $row['record_id'] ? $row['record_id'] : $row['id'];
+ $id = isset($row['record_id']) ? $row['record_id'] : (isset($row['id']) ? $row['id'] : null);
$ids = Vtiger_Functions::getAttachmentIds($id, $meta->getEntityId());
if($ids) {
foreach($ids as $id){
diff --git a/include/utils/EmailTemplate.php b/include/utils/EmailTemplate.php
index 44813a713dcf2cd838fc0342852fa72a4882bc21..ccb9fddd6974ce7376d915e8f917515ae8a01608 100644
--- a/include/utils/EmailTemplate.php
+++ b/include/utils/EmailTemplate.php
@@ -50,17 +50,19 @@ class EmailTemplate {
for ($i = 0; $i < php7_count($templateVariablePair); $i++) {
$templateVariablePair[$i] = str_replace('$', '', $templateVariablePair[$i]);
list($module, $columnName) = explode('-', $templateVariablePair[$i]);
- list($parentColumn, $childColumn) = explode(':', $columnName);
- $this->templateFields[$module][] = $parentColumn;
- $this->referencedFields[$parentColumn][] = $childColumn;
- $this->processedmodules[$module] = false;
+ if(isset($columnName) && strpos($columnName, ':') !== false) {
+ list($parentColumn, $childColumn) = explode(':', $columnName);
+ $this->templateFields[$module][] = $parentColumn;
+ $this->referencedFields[$parentColumn][] = $childColumn;
+ $this->processedmodules[$module] = false;
+ }
}
$this->processed = false;
}
}
private function getTemplateVariableListForModule($module) {
- return $this->templateFields[strtolower($module)];
+ return isset($this->templateFields[strtolower($module)]) ? $this->templateFields[strtolower($module)] : "";
}
public function process($params) {
diff --git a/layouts/v7/modules/Emails/SendEmailResult.tpl b/layouts/v7/modules/Emails/SendEmailResult.tpl
index 135c42d1362171804a2d545468af0d1172f27212..0aa5fea3cb37cf9b2c42ab182ff07171d3f1fafd 100644
--- a/layouts/v7/modules/Emails/SendEmailResult.tpl
+++ b/layouts/v7/modules/Emails/SendEmailResult.tpl
@@ -15,7 +15,7 @@
{include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE="Result"}
<div class="modal-body">
{if $SUCCESS}
- <div class="mailSentSuccessfully" data-relatedload="{$RELATED_LOAD}">
+ <div class="mailSentSuccessfully" data-relatedload="{if isset($RELATED_LOAD)}{$RELATED_LOAD}{else}''{/if}">
{if $FLAG eq 'SENT'}
{vtranslate('LBL_MAIL_SENT_SUCCESSFULLY')}
{else}
diff --git a/layouts/v7/modules/Vtiger/BreadCrumbs.tpl b/layouts/v7/modules/Vtiger/BreadCrumbs.tpl
index d0a860e3d2aeb50855c3d5d96e477cee467f53ed..74ea4350c7caab4c56a3bc4d19965a8b028f8690 100644
--- a/layouts/v7/modules/Vtiger/BreadCrumbs.tpl
+++ b/layouts/v7/modules/Vtiger/BreadCrumbs.tpl
@@ -13,7 +13,7 @@
{foreach key=CRUMBID item=STEPTEXT from=$BREADCRUMB_LABELS name=breadcrumbLabels}
{assign var=INDEX value=$smarty.foreach.breadcrumbLabels.index}
{assign var=INDEX value=$INDEX+1}
- <li class="step {if $smarty.foreach.breadcrumbLabels.first} first {$FIRSTBREADCRUMB} {else} {$ADDTIONALCLASS} {/if} {if $smarty.foreach.breadcrumbLabels.last} last {/if} {if $ACTIVESTEP eq $INDEX}active{/if}"
+ <li class="step {if $smarty.foreach.breadcrumbLabels.first} first {if isset($FIRSTBREADCRUMB)} {$FIRSTBREADCRUMB} {/if} {else} {if isset($ADDTIONALCLASS)} {$ADDTIONALCLASS} {/if}{/if} {if $smarty.foreach.breadcrumbLabels.last} last {/if} {if $ACTIVESTEP eq $INDEX}active{/if}"
id="{$CRUMBID}" data-value="{$INDEX}" style="z-index:{$ZINDEX}">
<a href="#">
<span class="stepNum">{$INDEX}</span>
diff --git a/layouts/v7/modules/Vtiger/ComposeEmailForm.tpl b/layouts/v7/modules/Vtiger/ComposeEmailForm.tpl
index dea10cf2bb9f9de46f2dfd1a372970e0ff97b513..c622bb971dc6c7d69dc7caa24c2c59dbf1186686 100644
--- a/layouts/v7/modules/Vtiger/ComposeEmailForm.tpl
+++ b/layouts/v7/modules/Vtiger/ComposeEmailForm.tpl
@@ -26,7 +26,7 @@
<input type="hidden" id="flag" name="flag" value="" />
<input type="hidden" id="maxUploadSize" value="{$MAX_UPLOAD_SIZE}" />
<input type="hidden" id="documentIds" name="documentids" value="" />
- <input type="hidden" name="emailMode" value="{$EMAIL_MODE}" />
+ <input type="hidden" name="emailMode" value="{if isset($EMAIL_MODE)}{$EMAIL_MODE}{/if}" />
<input type="hidden" name="source_module" value="{$SOURCE_MODULE}" />
{if !empty($PARENT_EMAIL_ID)}
<input type="hidden" name="parent_id" value="{$PARENT_EMAIL_ID}" />
@@ -35,10 +35,12 @@
{if !empty($RECORDID)}
<input type="hidden" name="record" value="{$RECORDID}" />
{/if}
- <input type="hidden" name="search_key" value= "{$SEARCH_KEY}" />
+ <input type="hidden" name="search_key" value="{if isset($SEARCH_KEY)}{$SEARCH_KEY}{/if}" />
<input type="hidden" name="operator" value="{$OPERATOR}" />
- <input type="hidden" name="search_value" value="{$ALPHABET_VALUE}" />
- <input type="hidden" name="search_params" value='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($SEARCH_PARAMS))}' />
+ <input type="hidden" name="search_value" value="{if isset($ALPHABET_VALUE)}{$ALPHABET_VALUE}{/if}" />
+ {if !empty($SEARCH_PARAMS)}
+ <input type="hidden" name="search_params" value='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($SEARCH_PARAMS))}' />
+ {/if}
<div class="row toEmailField">
<div class="col-lg-12">
@@ -49,7 +51,7 @@
{if !empty($TO)}
{assign var=TO_EMAILS value=","|implode:$TO|htmlentities}
{/if}
- <input id="emailField" style="width:100%" name="toEmail" type="text" class="autoComplete sourceField select2" data-rule-required="true" data-rule-multiEmails="true" value="{$TO_EMAILS}" placeholder="{vtranslate('LBL_TYPE_AND_SEARCH',$MODULE)}">
+ <input id="emailField" style="width:100%" name="toEmail" type="text" class="autoComplete sourceField select2" data-rule-required="true" data-rule-multiEmails="true" value="{if !empty($TO_EMAILS)}{$TO_EMAILS|escape:html}{/if}" placeholder="{vtranslate('LBL_TYPE_AND_SEARCH',$MODULE)}">
</div>
<div class="col-lg-4 input-group">
<select style="width: 140px;" class="select2 emailModulesList pull-right">
@@ -110,7 +112,7 @@
<span class="">{vtranslate('LBL_SUBJECT',$MODULE)} <span class="redColor">*</span></span>
</div>
<div class="col-lg-6">
- <input type="text" name="subject" value="{$SUBJECT}" data-rule-required="true" id="subject" spellcheck="true" class="inputElement"/>
+ <input type="text" name="subject" value="{if !empty($SUBJECT)}{$SUBJECT|escape:html}{/if}" data-rule-required="true" id="subject" spellcheck="true" class="inputElement"/>
</div>
<div class="col-lg-4"></div>
</div>
@@ -124,7 +126,7 @@
<div class="col-lg-9">
<div class="row">
<div class="col-lg-4 browse">
- <input type="file" {if $FILE_ATTACHED}class="removeNoFileChosen"{/if} id="multiFile" name="file[]"/>
+ <input type="file" {if isset($FILE_ATTACHED)}class="removeNoFileChosen"{/if} id="multiFile" name="file[]"/>
</div>
<div class="col-lg-4 brownseInCrm">
<button type="button" class="btn btn-small btn-default" id="browseCrm" data-url="{$DOCUMENTS_URL}" title="{vtranslate('LBL_BROWSE_CRM',$MODULE)}">{vtranslate('LBL_BROWSE_CRM',$MODULE)}</button>
@@ -134,20 +136,22 @@
</div>
</div>
<div id="attachments">
- {foreach item=ATTACHMENT from=$ATTACHMENTS}
- {if ('docid'|array_key_exists:$ATTACHMENT)}
- {assign var=DOCUMENT_ID value=$ATTACHMENT['docid']}
- {assign var=FILE_TYPE value="document"}
- {else}
- {assign var=FILE_TYPE value="file"}
- {/if}
- <div class="MultiFile-label customAttachment" data-file-id="{$ATTACHMENT['fileid']}" data-file-type="{$FILE_TYPE}" data-file-size="{$ATTACHMENT['size']}" {if $FILE_TYPE eq "document"} data-document-id="{$DOCUMENT_ID}"{/if}>
- {if $ATTACHMENT['nondeletable'] neq true}
- <a name="removeAttachment" class="cursorPointer">x </a>
+ {if isset($ATTACHMENTS) && $ATTACHMENTS|@count > 0}
+ {foreach item=ATTACHMENT from=$ATTACHMENTS}
+ {if ('docid'|array_key_exists:$ATTACHMENT)}
+ {assign var=DOCUMENT_ID value=$ATTACHMENT['docid']}
+ {assign var=FILE_TYPE value="document"}
+ {else}
+ {assign var=FILE_TYPE value="file"}
{/if}
- <span>{$ATTACHMENT['attachment']}</span>
- </div>
- {/foreach}
+ <div class="MultiFile-label customAttachment" data-file-id="{$ATTACHMENT['fileid']}" data-file-type="{$FILE_TYPE}" data-file-size="{$ATTACHMENT['size']}" {if $FILE_TYPE eq "document"} data-document-id="{$DOCUMENT_ID}"{/if}>
+ {if $ATTACHMENT['nondeletable'] neq true}
+ <a name="removeAttachment" class="cursorPointer">x </a>
+ {/if}
+ <span>{$ATTACHMENT['attachment']}</span>
+ </div>
+ {/foreach}
+ {/if}
</div>
</div>
</div>
@@ -171,14 +175,14 @@
</div>
<div class="row templateContent">
<div class="col-lg-12">
- <textarea style="width:390px;height:200px;" id="description" name="description">{$DESCRIPTION}</textarea>
+ <textarea style="width:390px;height:200px;" id="description" name="description">{if !empty($DESCRIPTION)}{$DESCRIPTION|escape:html}{/if}</textarea>
</div>
</div>
- {if $RELATED_LOAD eq true}
+ {if isset($RELATED_LOAD) && $RELATED_LOAD eq true}
<input type="hidden" name="related_load" value={$RELATED_LOAD} />
{/if}
- <input type="hidden" name="attachments" value='{ZEND_JSON::encode($ATTACHMENTS)}' />
+ <input type="hidden" name="attachments" value="{if isset($ATTACHMENTS)}{ZEND_JSON::encode($ATTACHMENTS)}{/if}" />
<div id="emailTemplateWarningContent" style="display: none;">
{vtranslate('LBL_EMAILTEMPLATE_WARNING_CONTENT',$MODULE)}
</div>
diff --git a/layouts/v7/modules/Vtiger/Export.tpl b/layouts/v7/modules/Vtiger/Export.tpl
index 8f84d447e1a21165ea3de404cdd0bb390b7b939a..de8867b5ae15a0143d25a1034ac02b5d902ac012 100644
--- a/layouts/v7/modules/Vtiger/Export.tpl
+++ b/layouts/v7/modules/Vtiger/Export.tpl
@@ -19,9 +19,9 @@
<input type="hidden" name="selected_ids" value={ZEND_JSON::encode($SELECTED_IDS)}>
<input type="hidden" name="excluded_ids" value={ZEND_JSON::encode($EXCLUDED_IDS)}>
<input type="hidden" id="page" name="page" value="{$PAGE}" />
- <input type="hidden" name="search_key" value= "{$SEARCH_KEY}" />
+ <input type="hidden" name="search_key" value="{if isset($SEARCH_KEY)}{$SEARCH_KEY}{/if}"/>
<input type="hidden" name="operator" value="{$OPERATOR}" />
- <input type="hidden" name="search_value" value="{$ALPHABET_VALUE}" />
+ <input type="hidden" name="search_value" value="{if isset($ALPHABET_VALUE)}{$ALPHABET_VALUE}{/if}"/>
<input type="hidden" name="search_params" value='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($SEARCH_PARAMS))}' />
<input type="hidden" name="orderby" value="{$ORDER_BY}" />
<input type="hidden" name="sortorder" value="{$SORT_ORDER}" />
@@ -72,7 +72,7 @@
<input type="radio" name="mode" value="ExportAllData" id="group3" {if empty($SELECTED_IDS)} checked="checked" {/if} style="margin:2px 0 -4px" />
<label style="font-weight:normal" for="group3"> {vtranslate('LBL_EXPORT_ALL_DATA',$MODULE)}</label>
</div>
- {if $MULTI_CURRENCY}
+ {if isset($MULTI_CURRENCY)}
<br>
<div class="row">
<div class="col-lg-8 col-md-8 col-lg-pull-0"><strong>{vtranslate('LBL_EXPORT_LINEITEM_CURRENCY',$MODULE)}: </strong>
diff --git a/layouts/v7/modules/Vtiger/Popup.tpl b/layouts/v7/modules/Vtiger/Popup.tpl
index a2bf9977716ebea0c8073bca069b5cbbd972dfe8..4831d8ad2cce7c91e87f3844adff23cd6a1856f1 100644
--- a/layouts/v7/modules/Vtiger/Popup.tpl
+++ b/layouts/v7/modules/Vtiger/Popup.tpl
@@ -17,15 +17,15 @@
<input type="hidden" id="parentModule" value="{$SOURCE_MODULE}"/>
<input type="hidden" id="module" value="{$MODULE}"/>
<input type="hidden" id="parent" value="{$PARENT_MODULE}"/>
- <input type="hidden" id="sourceRecord" value="{$SOURCE_RECORD}"/>
- <input type="hidden" id="sourceField" value="{$SOURCE_FIELD}"/>
- <input type="hidden" id="url" value="{$GETURL}" />
- <input type="hidden" id="multi_select" value="{$MULTI_SELECT}" />
- <input type="hidden" id="currencyId" value="{$CURRENCY_ID}" />
- <input type="hidden" id="relatedParentModule" value="{$RELATED_PARENT_MODULE}"/>
- <input type="hidden" id="relatedParentId" value="{$RELATED_PARENT_ID}"/>
+ <input type="hidden" id="sourceRecord" {if isset($SOURCE_RECORD)} value="{$SOURCE_RECORD}" {/if}/>
+ <input type="hidden" id="sourceField" {if isset($SOURCE_FIELD)} value="{$SOURCE_FIELD}" {/if}/>
+ <input type="hidden" id="url" {if isset($GETURL)} value="{$GETURL}" {/if}/>
+ <input type="hidden" id="multi_select" {if isset($MULTI_SELECT)} value="{$MULTI_SELECT}" {/if}/>
+ <input type="hidden" id="currencyId" {if isset($CURRENCY_ID)} value="{$CURRENCY_ID}" {/if}/>
+ <input type="hidden" id="relatedParentModule" {if isset($RELATED_PARENT_MODULE)} value="{$RELATED_PARENT_MODULE}" {/if}/>
+ <input type="hidden" id="relatedParentId" {if isset($RELATED_PARENT_ID)} value="{$RELATED_PARENT_ID}" {/if}/>
<input type="hidden" id="view" name="view" value="{$VIEW}"/>
- <input type="hidden" id="relationId" value="{$RELATION_ID}" />
+ <input type="hidden" id="relationId" {if isset($RELATION_ID)} value="{$RELATION_ID}" {/if}/>
<input type="hidden" id="selectedIds" name="selectedIds">
{if !empty($POPUP_CLASS_NAME)}
<input type="hidden" id="popUpClassName" value="{$POPUP_CLASS_NAME}"/>
diff --git a/layouts/v7/modules/Vtiger/PopupContents.tpl b/layouts/v7/modules/Vtiger/PopupContents.tpl
index fc7379c7737d25c6eb55fdc0b4bd4395faf45523..ac63b9f607117d75a0b90221535736a02b144457 100644
--- a/layouts/v7/modules/Vtiger/PopupContents.tpl
+++ b/layouts/v7/modules/Vtiger/PopupContents.tpl
@@ -21,8 +21,8 @@
<input type="hidden" id="previousPageExist" value="{$PAGING_MODEL->isPrevPageExists()}" />
<input type="hidden" id="nextPageExist" value="{$PAGING_MODEL->isNextPageExists()}" />
<input type="hidden" id="totalCount" value="{$LISTVIEW_ENTRIES_COUNT}" />
- {if $GETURL}<input type="hidden" id="getUrl" value="{$GETURL}" />{/if}
- <input type="hidden" value="{Vtiger_Util_Helper::toSafeHTML(Zend_JSON::encode($SEARCH_DETAILS))}" id="currentSearchParams" />
+ {if isset($GETURL)}<input type="hidden" id="getUrl" value="{$GETURL}" />{/if}
+ {if isset($SEARCH_DETAILS)}<input type="hidden" value="{Vtiger_Util_Helper::toSafeHTML(Zend_JSON::encode($SEARCH_DETAILS))}" id="currentSearchParams" />{/if}
<div class="contents-topscroll">
<div class="topscroll-div">
@@ -41,7 +41,7 @@
<table class="listview-table table-bordered listViewEntriesTable">
<thead>
<tr class="listViewHeaders">
- {if $MULTI_SELECT}
+ {if isset($MULTI_SELECT)}
<th class="{$WIDTHTYPE}">
<input type="checkbox" class="selectAllInCurrentPage" />
</th>
@@ -83,8 +83,8 @@
{foreach item=LISTVIEW_ENTRY from=$LISTVIEW_ENTRIES name=popupListView}
{assign var="RECORD_DATA" value=$LISTVIEW_ENTRY->getRawData()}
<tr class="listViewEntries" data-id="{$LISTVIEW_ENTRY->getId()}" {if $MODULE eq 'EmailTemplates'} data-name="{$RECORD_DATA['subject']}" data-info="{$LISTVIEW_ENTRY->get('body')}" {else} data-name="{$LISTVIEW_ENTRY->getName()}" data-info='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($LISTVIEW_ENTRY->getRawData()))}' {/if}
- {if $GETURL neq ''} data-url='{$LISTVIEW_ENTRY->$GETURL()}' {/if} id="{$MODULE}_popUpListView_row_{$smarty.foreach.popupListView.index+1}">
- {if $MULTI_SELECT}
+ {if isset($GETURL) && $GETURL neq ''} data-url='{$LISTVIEW_ENTRY->$GETURL()}' {/if} id="{$MODULE}_popUpListView_row_{$smarty.foreach.popupListView.index+1}">
+ {if isset($MULTI_SELECT)}
<td class="{$WIDTHTYPE}">
<input class="entryCheckBox" type="checkbox" />
</td>
diff --git a/layouts/v7/modules/Vtiger/PopupNavigation.tpl b/layouts/v7/modules/Vtiger/PopupNavigation.tpl
index b50db8a96de3d0ddd771e7ef6d6a697e56fe4c53..43b9577adbb5ecbe2b49fbd65446ade36b0bcbb6 100644
--- a/layouts/v7/modules/Vtiger/PopupNavigation.tpl
+++ b/layouts/v7/modules/Vtiger/PopupNavigation.tpl
@@ -11,7 +11,7 @@
{strip}
<div class="col-md-2">
- {if $MULTI_SELECT}
+ {if isset($MULTI_SELECT)}
{if !empty($LISTVIEW_ENTRIES)}<button class="select btn btn-default" disabled="disabled"><strong>{vtranslate('LBL_ADD', $MODULE)}</strong></button>{/if}
{else}
diff --git a/layouts/v7/modules/Vtiger/RecentActivities.tpl b/layouts/v7/modules/Vtiger/RecentActivities.tpl
index c7200ef719a1807adee26fd12a0df8a4729a537f..7b29b717cb57aaf8d89ceb79fd0e4de90c17fa69 100644
--- a/layouts/v7/modules/Vtiger/RecentActivities.tpl
+++ b/layouts/v7/modules/Vtiger/RecentActivities.tpl
@@ -84,6 +84,8 @@
{assign var=FIELD_DATA_TYPE value=$FIELDMODEL->getFieldInstance()->getFieldDataType()}
{assign var=PRE_DISPLAY_VALUE value=$FIELDMODEL->getDisplayValue(decode_html($FIELDMODEL->get('prevalue')))}
{assign var=POST_DISPLAY_VALUE value=$FIELDMODEL->getDisplayValue(decode_html($FIELDMODEL->get('postvalue')))}
+ {assign var=TIME_PRE_DISPLAY_VALUE value=$FIELDMODEL->getDisplayValue(decode_html($FIELDMODEL->get('prevalue')))}
+ {assign var=TIME_POST_DISPLAY_VALUE value=$FIELDMODEL->getDisplayValue(decode_html($FIELDMODEL->get('postvalue')))}
{if in_array($FIELD_NAME,array('time_start','time_end')) && in_array($MODULE_NAME,array('Events','Calendar'))}
{assign var=CALENDAR_RECORD_MODEL value =Vtiger_Record_Model::getInstanceById($RECORD_ID)}
diff --git a/layouts/v7/modules/Vtiger/SelectEmailFields.tpl b/layouts/v7/modules/Vtiger/SelectEmailFields.tpl
index 98db34602f502efa8c749165e175a861010df081..142b79c13fc9c9f9142f21f7cac8da978cc0cdfb 100644
--- a/layouts/v7/modules/Vtiger/SelectEmailFields.tpl
+++ b/layouts/v7/modules/Vtiger/SelectEmailFields.tpl
@@ -20,11 +20,15 @@
<input type="hidden" name="viewname" value="{$VIEWNAME}" />
<input type="hidden" name="module" value="{$MODULE}"/>
<input type="hidden" name="view" value="ComposeEmail"/>
- <input type="hidden" name="search_key" value= "{$SEARCH_KEY}" />
+ {if isset($SEARCH_KEY)}
+ <input type="hidden" name="search_key" value= "{$SEARCH_KEY}" />
+ {/if}
<input type="hidden" name="operator" value="{$OPERATOR}" />
- <input type="hidden" name="search_value" value="{$ALPHABET_VALUE}" />
+ {if isset($ALPHABET_VALUE)}
+ <input type="hidden" name="search_value" value="{$ALPHABET_VALUE}" />
+ {/if}
<input type="hidden" name="tag_params" value={ZEND_JSON::encode($TAG_PARAMS)}>
- {if $SEARCH_PARAMS}
+ {if isset($SEARCH_PARAMS)}
<input type="hidden" name="search_params" value='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($SEARCH_PARAMS))}' />
{/if}
<input type="hidden" name="fieldModule" value={$SOURCE_MODULE} />
@@ -68,13 +72,13 @@
{/if}
{/if}
</div>
- {if $RELATED_LOAD eq true}
+ {if isset($RELATED_LOAD) && $RELATED_LOAD eq true}
<input type="hidden" name="relatedLoad" value={$RELATED_LOAD} />
{/if}
</div>
<div class="preferenceDiv" style="padding: 0px 0px 10px 35px;">
<label class="checkbox displayInlineBlock">
- <input type="checkbox" name="saveRecipientPrefs" id="saveRecipientPrefs" {if $RECIPIENT_PREF_ENABLED}checked="true"{/if}/>
+ <input type="checkbox" name="saveRecipientPrefs" id="saveRecipientPrefs" {if isset($RECIPIENT_PREF_ENABLED)}checked="true"{/if}/>
{vtranslate('LBL_REMEMBER_MY_PREF',$MODULE)}
</label>
<i class="fa fa-info-circle" title="{vtranslate('LBL_EDIT_EMAIL_PREFERENCE_TOOLTIP', $MODULE)}"></i>
diff --git a/modules/Emails/Emails.php b/modules/Emails/Emails.php
index b2a924d64574d502511095eb5df39ef6c88dd466..655ce2c37f0a2bea8be9c2ead0b54bce540f653c 100644
--- a/modules/Emails/Emails.php
+++ b/modules/Emails/Emails.php
@@ -81,9 +81,10 @@ class Emails extends CRMEntity {
function save_module($module) {
global $adb;
+ $insertion_mode = '';
//Inserting into seactivityrel
//modified by Richie as raju's implementation broke the feature for addition of webmail to vtiger_crmentity.need to be more careful in future while integrating code
- if ($_REQUEST['module'] == "Emails" && $_REQUEST['smodule'] != 'webmails' && (!$this->plugin_save)) {
+ if ($_REQUEST['module'] == "Emails" && $_REQUEST['module'] != 'webmails' && (!$this->plugin_save)) {
if ($_REQUEST['currentid'] != '') {
$actid = $_REQUEST['currentid'];
} else {
@@ -170,7 +171,7 @@ class Emails extends CRMEntity {
$file_saved = false;
//Added to send generated Invoice PDF with mail
- $pdfAttached = $_REQUEST['pdf_attachment'];
+ $pdfAttached = isset($_REQUEST['pdf_attachment']);
//created Invoice pdf is attached with the mail
if (isset($_REQUEST['pdf_attachment']) && $_REQUEST['pdf_attachment'] != '') {
$file_saved = pdfAttach($this, $module, $pdfAttached, $id);
@@ -196,7 +197,7 @@ class Emails extends CRMEntity {
}
}
}
- if ($_REQUEST['att_module'] == 'Webmails') {
+ if (isset($_REQUEST['att_module']) && $_REQUEST['att_module'] == 'Webmails') {
require_once("modules/Webmails/Webmails.php");
require_once("modules/Webmails/MailParse.php");
require_once('modules/Webmails/MailBox.php');
diff --git a/modules/Emails/models/Mailer.php b/modules/Emails/models/Mailer.php
index 9d8ec7eda864d05ea05dcc5095fc4f55cad5df29..71d7905064caeb5a9bce850ff49a702f74a69e6b 100644
--- a/modules/Emails/models/Mailer.php
+++ b/modules/Emails/models/Mailer.php
@@ -15,6 +15,8 @@ include_once 'include/database/PearDatabase.php';
class Emails_Mailer_Model extends Vtiger_Mailer {
+ private $dom = null;
+
public static function getInstance() {
return new self();
}
diff --git a/modules/Emails/models/Record.php b/modules/Emails/models/Record.php
index 5595d222b624a79ebc5c5060a1f71aa8dda327ce..d865d72920fb87770e7920c8fb3355a445951bb3 100644
--- a/modules/Emails/models/Record.php
+++ b/modules/Emails/models/Record.php
@@ -48,9 +48,11 @@ class Emails_Record_Model extends Vtiger_Record_Model {
public function send($addToQueue = false) {
$currentUserModel = Users_Record_Model::getCurrentUserModel();
$rootDirectory = vglobal('root_directory');
+ $logo = false;
$mailer = Emails_Mailer_Model::getInstance();
$mailer->IsHTML(true);
+ $id = isset($_REQUEST['id']) ? $_REQUEST['id'] : null;
$fromEmail = $this->getFromEmailAddress();
$replyTo = $this->getReplyToEmail();
@@ -173,7 +175,7 @@ class Emails_Record_Model extends Vtiger_Record_Model {
$plainBody = decode_emptyspace_html($description);
$plainBody = preg_replace(array("/<p>/i","/<br>/i","/<br \/>/i"),array("\n","\n","\n"),$plainBody);
$plainBody .= "\n\n".$currentUserModel->get('signature');
- $plainBody = utf8_encode(strip_tags($plainBody));
+ $plainBody = strip_tags($plainBody);
$plainBody = Emails_Mailer_Model::convertToAscii($plainBody);
$plainBody = $this->convertUrlsToTrackUrls($plainBody, $id,'plain');
$mailer->AltBody = $plainBody;
diff --git a/modules/Emails/views/MassSaveAjax.php b/modules/Emails/views/MassSaveAjax.php
index f230e536c0a2fd4fb104ca450c63cda74345ab25..97cc396b46bf0bc17ce71c8354254b47bfdf7ab4 100644
--- a/modules/Emails/views/MassSaveAjax.php
+++ b/modules/Emails/views/MassSaveAjax.php
@@ -39,6 +39,7 @@ class Emails_MassSaveAjax_View extends Vtiger_Footer_View {
public function massSave(Vtiger_Request $request) {
global $upload_badext;
$adb = PearDatabase::getInstance();
+ $parentIds = '';
$moduleName = $request->getModule();
$currentUserModel = Users_Record_Model::getCurrentUserModel();
@@ -243,6 +244,7 @@ class Emails_MassSaveAjax_View extends Vtiger_Footer_View {
}
}
$success = true;
+ $message = '';
if($flag == 'SENT') {
$status = $recordModel->send();
if ($status === true) {
diff --git a/modules/Vtiger/actions/ExportData.php b/modules/Vtiger/actions/ExportData.php
index 454b0d23443543e1695d298e74ac8815a8219ca0..d8c4e51aca5b2eae41d3166b38ff6b5f9b6234a6 100644
--- a/modules/Vtiger/actions/ExportData.php
+++ b/modules/Vtiger/actions/ExportData.php
@@ -110,7 +110,7 @@ class Vtiger_ExportData_Action extends Vtiger_Mass_Action {
$fieldInstances = $this->moduleFieldInstances;
$orderBy = $request->get('orderby');
- $orderByFieldModel = $fieldInstances[$orderBy];
+ $orderByFieldModel = isset($fieldInstances[$orderBy]) ? $fieldInstances[$orderBy] : "";
$sortOrder = $request->get('sortorder');
if ($mode !== 'ExportAllData') {
@@ -293,14 +293,16 @@ class Vtiger_ExportData_Action extends Vtiger_Mass_Action {
continue;
}
//Track if the value had quotes at beginning
- $beginsWithDoubleQuote = strpos($value, '"') === 0;
- $endsWithDoubleQuote = substr($value,-1) === '"'?1:0;
+ if (is_string($value)) {
+ $beginsWithDoubleQuote = strpos($value, '"') === 0;
+ $endsWithDoubleQuote = substr($value,-1) === '"'?1:0;
+ $value = trim($value,"\"");
+ }
- $value = trim($value,"\"");
$uitype = $fieldInfo->get('uitype');
$fieldname = $fieldInfo->get('name');
- if(!$this->fieldDataTypeCache[$fieldName]) {
+ if(!isset($this->fieldDataTypeCache[$fieldName])) {
$this->fieldDataTypeCache[$fieldName] = $fieldInfo->getFieldDataType();
}
$type = $this->fieldDataTypeCache[$fieldName];
diff --git a/modules/Vtiger/actions/TagCloud.php b/modules/Vtiger/actions/TagCloud.php
index 16a23dfe2d1de5d39536eb0930ea6aebc7780a04..e50d2522aee44c6d324e819fc798deb0bec85dcd 100644
--- a/modules/Vtiger/actions/TagCloud.php
+++ b/modules/Vtiger/actions/TagCloud.php
@@ -95,11 +95,11 @@ class Vtiger_TagCloud_Action extends Vtiger_Mass_Action {
if(empty($newTags)) {
$newTags = array();
}
- $existingTags = $tagsList['existing'];
+ $existingTags = isset($tagsList['existing']);
if(empty($existingTags)) {
$existingTags = array();
}
- $deletedTags = $tagsList['deleted'];
+ $deletedTags = isset($tagsList['deleted']);
if(empty($deletedTags)) {
$deletedTags = array();
}
diff --git a/modules/Vtiger/helpers/Util.php b/modules/Vtiger/helpers/Util.php
index 57b862f53c3b65675e6382bbfe7a857feb3a63de..17731db7e721528ace6ee6cb9d833f9241d18a98 100644
--- a/modules/Vtiger/helpers/Util.php
+++ b/modules/Vtiger/helpers/Util.php
@@ -115,7 +115,7 @@ class Vtiger_Util_Helper {
*/
public static function toVtiger6SafeHTML($input) {
$allowableTags = '<a><br>';
- return strip_tags($input, $allowableTags);
+ return strip_tags((string) $input, $allowableTags);
}
/**
* Function to validate the input with given pattern.
diff --git a/modules/Vtiger/views/ComposeEmail.php b/modules/Vtiger/views/ComposeEmail.php
index 0f47423688d0565ad1c4f00a9a4df9826f866e44..d66dec4501e104eab25612c2b3d31d0789c484f6 100644
--- a/modules/Vtiger/views/ComposeEmail.php
+++ b/modules/Vtiger/views/ComposeEmail.php
@@ -255,6 +255,7 @@ class Vtiger_ComposeEmail_View extends Vtiger_Footer_View {
}
public function process(Vtiger_Request $request) {
+ $moduleName = $request->getModule();
$mode = $request->getMode();
if(!empty($mode)) {
echo $this->invokeExposedMethod($mode, $request);
@@ -270,6 +271,7 @@ class Vtiger_ComposeEmail_View extends Vtiger_Footer_View {
}
public function getRecordsListFromRequest(Vtiger_Request $request, $model = false) {
+ $moduleName = $request->getModule();
$cvId = $request->get('viewname');
$selectedIds = $request->get('selected_ids');
$excludedIds = $request->get('excluded_ids');
diff --git a/modules/Vtiger/views/MassActionAjax.php b/modules/Vtiger/views/MassActionAjax.php
index 2926f5cf8193d683f1ada9f552ec6ab51f51823f..d8eb6a4e7f92aaf8a54a7bce995b153bd9b01844 100644
--- a/modules/Vtiger/views/MassActionAjax.php
+++ b/modules/Vtiger/views/MassActionAjax.php
@@ -248,10 +248,11 @@ class Vtiger_MassActionAjax_View extends Vtiger_IndexAjax_View {
$emailFieldsInfo = array();
$moduleModel = Vtiger_Module_Model::getInstance($sourceModule);
$recipientPrefModel = Vtiger_RecipientPreference_Model::getInstance($sourceModule);
+ $recipientPrefs = array();
if($recipientPrefModel)
$recipientPrefs = $recipientPrefModel->getPreferences();
- $moduleEmailPrefs = $recipientPrefs[$moduleModel->getId()];
+ $moduleEmailPrefs = isset($recipientPrefs[$moduleModel->getId()]);
$emailFields = $moduleModel->getFieldsByType('email');
$accesibleEmailFields = array();
diff --git a/modules/Vtiger/views/Popup.php b/modules/Vtiger/views/Popup.php
index e2e5569b2f67c39cb10521b69cdf592c56ae9079..712607f7e04420377689b6cf75efa93ec55e71d9 100644
--- a/modules/Vtiger/views/Popup.php
+++ b/modules/Vtiger/views/Popup.php
@@ -11,6 +11,7 @@
class Vtiger_Popup_View extends Vtiger_Footer_View {
protected $listViewEntries = false;
protected $listViewHeaders = false;
+ protected $listViewLinks = false;
public function requiresPermission(Vtiger_Request $request){
$permissions = parent::requiresPermission($request);
diff --git a/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/models/ListView.php b/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/models/ListView.php
index 125282ff8f8c1d8ecec29b00b3cbd87e9942e162..066d7c05873dd392d03492b26dd244cbb7c89555 100644
--- a/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/models/ListView.php
+++ b/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/models/ListView.php
@@ -88,6 +88,7 @@ class EmailTemplates_ListView_Model extends Vtiger_ListView_Model {
public function getListViewEntries($pagingModel) {
$db = PearDatabase::getInstance();
+ $whereQuery = '';
$startIndex = $pagingModel->getStartIndex();
$pageLimit = $pagingModel->getPageLimit();
$orderBy = $this->getForSql('orderby');
diff --git a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportAdvanced.tpl b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportAdvanced.tpl
index 6c5909cbb82eb1ec14a25239ccb7755e1ab06d59..32e4210fa805d6e0af07a9396a0931bfa3485dd3 100644
--- a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportAdvanced.tpl
+++ b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportAdvanced.tpl
@@ -27,15 +27,15 @@
<div class='modal-body'>
{assign var=LABELS value=[]}
- {if $FORMAT eq 'vcf'}
+ {if isset($FORMAT) eq 'vcf'}
{$LABELS["step1"] = 'LBL_UPLOAD_VCF'}
- {else if $FORMAT eq 'ics'}
+ {else if isset($FORMAT) eq 'ics'}
{$LABELS["step1"] = 'LBL_UPLOAD_ICS'}
{else}
{$LABELS["step1"] = 'LBL_UPLOAD_CSV'}
{/if}
- {if $DUPLICATE_HANDLING_NOT_SUPPORTED eq 'true'}
+ {if isset($DUPLICATE_HANDLING_NOT_SUPPORTED) eq 'true'}
{$LABELS["step3"] = 'LBL_FIELD_MAPPING'}
{else}
{$LABELS["step2"] = 'LBL_DUPLICATE_HANDLING'}
diff --git a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportBasicStep.tpl b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportBasicStep.tpl
index 3dc4cb650cca00ac7f6121c49ecebf5fc11c3a92..966cd6887018a380caa989520594f7cfd9400abb 100644
--- a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportBasicStep.tpl
+++ b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportBasicStep.tpl
@@ -32,7 +32,7 @@
{/if}
{if $FORMAT neq 'ics'}
- {if $DUPLICATE_HANDLING_NOT_SUPPORTED eq 'true'}
+ {if isset($DUPLICATE_HANDLING_NOT_SUPPORTED) eq 'true'}
{$LABELS["step3"] = 'LBL_FIELD_MAPPING'}
{else}
{$LABELS["step2"] = 'LBL_DUPLICATE_HANDLING'}
@@ -56,7 +56,7 @@
<a class="cancelLink" data-dismiss="modal" href="#">{vtranslate('LBL_CANCEL', $MODULE)}</a>
{else}
<div id="importStepOneButtonsDiv">
- {if $DUPLICATE_HANDLING_NOT_SUPPORTED eq 'true'}
+ {if isset($DUPLICATE_HANDLING_NOT_SUPPORTED) eq 'true'}
<button class="btn btn-success btn-lg" id="skipDuplicateMerge" onclick="Vtiger_Import_Js.uploadAndParse('0');">{vtranslate('LBL_NEXT_BUTTON_LABEL', $MODULE)}</button>
{else}
<button class="btn btn-success btn-lg" id ="importStep2" onclick="Vtiger_Import_Js.importActionStep2();">{vtranslate('LBL_NEXT_BUTTON_LABEL', $MODULE)}</button>
diff --git a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportResult.tpl b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportResult.tpl
index 8691a62f79e05197f69b1332f33647c1455e36c3..a53a55683fffb974a3b7e2dfd541623f738e0de3 100644
--- a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportResult.tpl
+++ b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportResult.tpl
@@ -18,7 +18,7 @@
<div class="summaryWidgetContainer">
<input type="hidden" name="module" value="{$FOR_MODULE}" />
<h4>{'LBL_TOTAL_RECORDS_SCANNED'|@vtranslate:$MODULE} : {$IMPORT_RESULT.TOTAL}</h4>
- {if $ERROR_MESSAGE neq ''}<span>{$ERROR_MESSAGE}</span>{/if}
+ {if isset($ERROR_MESSAGE) && $ERROR_MESSAGE neq ''}<span>{$ERROR_MESSAGE}</span>{/if}
<hr>
<div>{include file="Import_Result_Details.tpl"|@vtemplate_path:'Import'}</div>
</div>
diff --git a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportStepOne.tpl b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportStepOne.tpl
index 72d070aad7f72b8a52622de17a3eb6d86e37c77e..6629fb0952759e75c287539d18dbd13627cd6af1 100644
--- a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportStepOne.tpl
+++ b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportStepOne.tpl
@@ -71,7 +71,7 @@
{/foreach}
</td>
</tr>
- {if $MULTI_CURRENCY}
+ {if isset($MULTI_CURRENCY)}
<tr id="lineitem_currency_container" style="height:50px">
<td>{vtranslate('LBL_IMPORT_LINEITEMS_CURRENCY',$MODULE)}</td>
<td>
diff --git a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportStepThree.tpl b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportStepThree.tpl
index e27a7527d69134eec5ba3370bb94cd7d8593847f..517634478248c3e4a123316bc339fff56b8af2ca 100644
--- a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportStepThree.tpl
+++ b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportStepThree.tpl
@@ -19,7 +19,7 @@
<input type="checkbox" name="save_map" id="save_map"> <label for="save_map">{'LBL_SAVE_AS_CUSTOM_MAPPING'|@vtranslate:$MODULE}</label>
<input type="text" name="save_map_as" id="save_map_as" class = "form-control">
</div>
-{if !$IMPORTABLE_FIELDS}
+{if !isset($IMPORTABLE_FIELDS)}
{assign var=IMPORTABLE_FIELDS value=$AVAILABLE_FIELDS}
{/if}
{include file="Import_Default_Values_Widget.tpl"|@vtemplate_path:'Import' IMPORTABLE_FIELDS=$IMPORTABLE_FIELDS}
\ No newline at end of file
diff --git a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/Import_Mapping.tpl b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/Import_Mapping.tpl
index dea8a75edaedbfae8c0c3098ecf70f8a6eaada23..7d1078fdf99827c6de839c82f2fb9e1951c288d2 100644
--- a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/Import_Mapping.tpl
+++ b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/Import_Mapping.tpl
@@ -10,7 +10,7 @@
{strip}
<input type="hidden" name="merge_type" value='{$USER_INPUT->get('merge_type')}' />
<input type="hidden" name="merge_fields" value='{$MERGE_FIELDS}' />
- <input type="hidden" name="lineitem_currency" value='{$LINEITEM_CURRENCY}'>
+ <input type="hidden" name="lineitem_currency" value='{if isset($LINEITEM_CURRENCY)}{$LINEITEM_CURRENCY}{else}''{/if}'>
<input type="hidden" id="mandatory_fields" name="mandatory_fields" value='{$ENCODED_MANDATORY_FIELDS}' />
<input type="hidden" name="field_mapping" id="field_mapping" value="" />
<input type="hidden" name="default_values" id="default_values" value="" />
diff --git a/pkg/vtiger/modules/Import/modules/Import/actions/Data.php b/pkg/vtiger/modules/Import/modules/Import/actions/Data.php
index 9ccaf0d4d4220650d3876d3f82cbeae0d1469b6b..d4ca1b2ad068eda319f27bab801bc54f974d9690 100644
--- a/pkg/vtiger/modules/Import/modules/Import/actions/Data.php
+++ b/pkg/vtiger/modules/Import/modules/Import/actions/Data.php
@@ -652,7 +652,7 @@ class Import_Data_Action extends Vtiger_Action_Controller {
unset($this->allPicklistValues[$fieldName]);
}
} else {
- $fieldData[$fieldName] = $picklistDetails[$picklistValueInLowerCase];
+ $fieldData[$fieldName] = isset($picklistDetails[$picklistValueInLowerCase]);
}
} else if ($fieldDataType == 'currency') {
// While exporting we are exporting as user format, we should import as db format while importing
@@ -773,7 +773,7 @@ class Import_Data_Action extends Vtiger_Action_Controller {
$fieldData['source'] = $this->recordSource;
if ($fieldData != null && $checkMandatoryFieldValues) {
foreach ($moduleFields as $fieldName => $fieldInstance) {
- if ((($fieldData[$fieldName] == '') || ($fieldData[$fieldName] == null)) && $fieldInstance->isMandatory()) {
+ if ((empty($fieldData[$fieldName]) || !isset($fieldData[$fieldName])) && $fieldInstance->isMandatory()) {
return null;
}
}
diff --git a/pkg/vtiger/modules/Import/modules/Import/helpers/Utils.php b/pkg/vtiger/modules/Import/modules/Import/helpers/Utils.php
index 5e16ff426b0f7a28960311c0378a2f9bbc606a11..fed3847c3de14314bbae2b32373320a179ac875c 100644
--- a/pkg/vtiger/modules/Import/modules/Import/helpers/Utils.php
+++ b/pkg/vtiger/modules/Import/modules/Import/helpers/Utils.php
@@ -9,7 +9,9 @@
* All Rights Reserved.
* *********************************************************************************** */
//required for auto detecting file endings for files create in mac
-ini_set("auto_detect_line_endings", true);
+if (version_compare(PHP_VERSION, '8.1.0') <= 0) {
+ ini_set("auto_detect_line_endings", true);
+}
class Import_Utils_Helper {
@@ -142,6 +144,7 @@ class Import_Utils_Helper {
}
public static function getAssignedToUserList($module) {
+ $current_user = Users_Record_Model::getCurrentUserModel();
$cache = Vtiger_Cache::getInstance();
if($cache->getUserList($module,$current_user->id)){
return $cache->getUserList($module,$current_user->id);
@@ -153,6 +156,7 @@ class Import_Utils_Helper {
}
public static function getAssignedToGroupList($module) {
+ $current_user = Users_Record_Model::getCurrentUserModel();
$cache = Vtiger_Cache::getInstance();
if($cache->getGroupList($module,$current_user->id)){
return $cache->getGroupList($module,$current_user->id);
diff --git a/pkg/vtiger/modules/Import/modules/Import/readers/CSVReader.php b/pkg/vtiger/modules/Import/modules/Import/readers/CSVReader.php
index 008969489cb1d87666c979373d521c746b78ccfa..7c383d23bf273caa5c1a62e7d28e21557d095b11 100644
--- a/pkg/vtiger/modules/Import/modules/Import/readers/CSVReader.php
+++ b/pkg/vtiger/modules/Import/modules/Import/readers/CSVReader.php
@@ -7,7 +7,9 @@
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
*************************************************************************************/
-ini_set("auto_detect_line_endings", true);
+if(version_compare(PHP_VERSION, '8.1.0') <= 0) {
+ ini_set("auto_detect_line_endings", true);
+}
class Import_CSVReader_Reader extends Import_FileReader_Reader {
diff --git a/pkg/vtiger/modules/Import/modules/Import/views/Main.php b/pkg/vtiger/modules/Import/modules/Import/views/Main.php
index 6cceb2e0fc778807e8c990be8f4e88874777db45..fe6179cc515ffd22d687920998cd4062cb0dfedc 100644
--- a/pkg/vtiger/modules/Import/modules/Import/views/Main.php
+++ b/pkg/vtiger/modules/Import/modules/Import/views/Main.php
@@ -118,6 +118,7 @@ class Import_Main_View extends Vtiger_View_Controller{
public static function showResult($importInfo, $importStatusCount) {
$moduleName = $importInfo['module'];
$ownerId = $importInfo['user_id'];
+ $skippedRecords = $importStatusCount['SKIPPED'];
$viewer = new Vtiger_Viewer();
diff --git a/vtlib/Vtiger/FieldBasic.php b/vtlib/Vtiger/FieldBasic.php
index 3b8a68ede950fd012ba684c5cb2ad4f5f1b153e6..995b5fe302145b7f260f7d473eb6ba288643e737 100644
--- a/vtlib/Vtiger/FieldBasic.php
+++ b/vtlib/Vtiger/FieldBasic.php
@@ -248,7 +248,7 @@ class Vtiger_FieldBasic {
* Get module id to which this field instance is associated
*/
function getModuleId() {
- return $this->block->module->id;
+ return $this->block && $this->block->module ? $this->block->module->id : "";
}
/**