diff --git a/data/CRMEntity.php b/data/CRMEntity.php
index 5e7569897f001830e91b59bafdac687762ae3f68..1189864cf043a1c60440bb54dfd954b44f8ddd4a 100644
--- a/data/CRMEntity.php
+++ b/data/CRMEntity.php
@@ -269,6 +269,7 @@ class CRMEntity {
$ownerid = $this->column_fields['assigned_user_id'];
$groupid = $this->column_fields['group_id'];
+ $insertion_mode = $this->mode;
if (empty($groupid))
$groupid = 0;
@@ -299,7 +300,8 @@ class CRMEntity {
$this->column_fields['label'] = $label;
if ($this->mode == 'edit') {
- $description_val = from_html($this->column_fields['description'], ($this->mode == 'edit') ? true : false);
+
+ $description_val = from_html($this->column_fields['description'], ($insertion_mode == 'edit') ? true : false);
$tabid = getTabid($module);
$modified_date_var = $adb->formatDate($date_var, true);
@@ -648,7 +650,7 @@ class CRMEntity {
foreach($IMG_FILES as $fileIndex => $file) {
if($file['error'] == 0 && $file['name'] != '' && $file['size'] > 0) {
if($_REQUEST[$fileIndex.'_hidden'] != '')
- $file['original_name'] = vtlib_purify($_REQUEST[$fileindex.'_hidden']);
+ $file['original_name'] = vtlib_purify($_REQUEST[$fileIndex.'_hidden']);
else {
$file['original_name'] = stripslashes($file['name']);
}
@@ -686,8 +688,8 @@ class CRMEntity {
$uploadedFileNames = array();
foreach($UPLOADED_FILES as $fileIndex => $file) {
if($file['error'] == 0 && $file['name'] != '' && $file['size'] > 0) {
- if($_REQUEST[$fileindex.'_hidden'] != '') {
- $file['original_name'] = vtlib_purify($_REQUEST[$fileindex.'_hidden']);
+ if(isset($_REQUEST[$fileIndex.'_hidden']) && $_REQUEST[$fileIndex.'_hidden'] != '') {
+ $file['original_name'] = vtlib_purify($_REQUEST[$fileIndex.'_hidden']);
} else {
$file['original_name'] = stripslashes($file['name']);
}
@@ -748,6 +750,7 @@ class CRMEntity {
if (!array_key_exists($field, $updateFieldNameColumnNameMap)) {
continue;
}
+
$fieldColumn = $updateFieldNameColumnNameMap[$field];
if(array_key_exists($fieldColumn, $updateFieldValues)) {
array_push($update, $fieldColumn.'=?');
@@ -3137,7 +3140,7 @@ class TrackableObject implements ArrayAccess, IteratorAggregate {
#[\ReturnTypeWillChange]
function offsetSet($key, $value) {
- if(is_array($value)) $value = empty($value) ? "" : $value[0];
+ if(is_array($value)) $value = empty($value) ? "" : (array_key_exists(0, $value) ? $value[0] : ""); //it is an associative (if array without a key 0) modified to prevent warning of Undefined array key 0 .
if($this->tracking && $this->trackingEnabled) {
$olderValue = $this->offsetGet($key);
// decode_html only expects string
diff --git a/data/VTEntityDelta.php b/data/VTEntityDelta.php
index 18610ff23e7adc5a90be2d0661299fd9b4f68665..1dfd40951c9f2c240ae8b9eab6c9840824214d02 100644
--- a/data/VTEntityDelta.php
+++ b/data/VTEntityDelta.php
@@ -124,7 +124,7 @@ class VTEntityDelta extends VTEventHandler {
$result = $result && ($fieldDelta['currentValue'] === $fieldValue);
}
return $result;
+ }
+
}
-
-}
?>
diff --git a/include/ListView/ListViewSession.php b/include/ListView/ListViewSession.php
index 7653e3ec63950907d09ca2a9b700342090aa47b7..790aab9424c8c73ab322a76ea79456dd431546aa 100644
--- a/include/ListView/ListViewSession.php
+++ b/include/ListView/ListViewSession.php
@@ -75,6 +75,7 @@ class ListViewSession {
}
$cv = new CustomView();
$viewId = $cv->getViewId($currentModule);
+ $recordNavigationInfo = array();
if(!empty($_SESSION[$currentModule.'_DetailView_Navigation'.$viewId])){
$recordNavigationInfo = Zend_Json::decode($_SESSION[$currentModule.'_DetailView_Navigation'.$viewId]);
$pageNumber =0;
@@ -103,7 +104,7 @@ class ListViewSession {
}
}
- $list_query = $_SESSION[$currentModule.'_listquery'];
+ $list_query = isset($_SESSION[$currentModule.'_listquery'])?$_SESSION[$currentModule.'_listquery']:'';
if($reUseData === false && !empty($list_query)){
$recordNavigationInfo = array();
diff --git a/include/QueryGenerator/QueryGenerator.php b/include/QueryGenerator/QueryGenerator.php
index 649312e74e04fbbced76bd544c26342447fd0885..6abdb7beb55866b73b2bc612f43b105a9f69d1fc 100644
--- a/include/QueryGenerator/QueryGenerator.php
+++ b/include/QueryGenerator/QueryGenerator.php
@@ -763,7 +763,13 @@ class QueryGenerator {
$columnList[] = "$referenceTable.$column";
}
if(php7_count($columnList) > 1) {
- $columnSql = getSqlForNameInDisplayFormat(array('first_name'=>$columnList[0],'last_name'=>$columnList[1]),'Users');
+ if ($module == "Users") {
+ // Special case
+ $columnSql = getSqlForNameInDisplayFormat(array('first_name'=>$columnList[0],'last_name'=>$columnList[1]),'Users');
+ } else {
+ // Leads or contacts
+ $columnSql = getSqlForNameInDisplayFormat(array('firstname'=>$columnList[0],'lastname'=>$columnList[1]), $module);
+ }
} else {
$columnSql = implode('', $columnList);
}
diff --git a/include/database/PearDatabase.php b/include/database/PearDatabase.php
index dee0f71f797f8ab0029cc8eae040841c5a4215ea..ea06f9500399e6dc912b3f5ef9494677db0a40df 100644
--- a/include/database/PearDatabase.php
+++ b/include/database/PearDatabase.php
@@ -21,6 +21,7 @@ $logsqltm = Logger::getLogger('SQLTIME');
// Callback class useful to convert PreparedStatement Question Marks to SQL value
// See function convertPS2Sql in PearDatabase below
+#[\AllowDynamicProperties]
class PreparedQMark2SqlValue {
// Constructor
function __construct($vals){
diff --git a/include/fields/DateTimeField.php b/include/fields/DateTimeField.php
index 21f4d2de793e43b0c9b2a75911e16c9c27b9dbd3..1bfd3f4e08c88675918318333e8622590551ee5e 100644
--- a/include/fields/DateTimeField.php
+++ b/include/fields/DateTimeField.php
@@ -192,7 +192,10 @@ class DateTimeField {
public static function __convertToUserFormat($date, $format)
{
$date = self::convertToInternalFormat($date);
- list($y, $m, $d) = explode('-', $date[0]);
+ $dates=explode('-', $date[0]);
+ $y=isset($dates[0])?$dates[0]:'';
+ $m=isset($dates[1])?$dates[1]:'';
+ $d=isset($dates[2])?$dates[2]:'';
switch ($format) {
case 'dd.mm.yyyy':
@@ -278,7 +281,7 @@ class DateTimeField {
// create datetime object for given time in source timezone
$sourceTimeZone = new DateTimeZone($sourceTimeZoneName);
if($time == '24:00') $time = '00:00';
- $myDateTime = new DateTime($time, $sourceTimeZone);
+ $myDateTime = new DateTime(isset($time) ? $time : '', $sourceTimeZone);
// convert this to target timezone using the DateTimeZone object
$targetTimeZone = new DateTimeZone($targetTimeZoneName);
diff --git a/include/utils/InventoryUtils.php b/include/utils/InventoryUtils.php
index 223bce80a16dacb34084327d793646265c846fcc..2c949c58885ca57a8851199818d9d01ab879e711 100644
--- a/include/utils/InventoryUtils.php
+++ b/include/utils/InventoryUtils.php
@@ -200,7 +200,8 @@ function getProductTaxPercentage($type,$productid,$default='')
if($current_user->truncate_trailing_zeros == true) {
$taxpercentage = decimalFormat($taxpercentage);
}
- return array('percentage' => $taxpercentage, 'regions' => Zend_Json::decode(html_entity_decode($adb->query_result($res, $i, 'regions'))));
+ $regions=$adb->query_result($res,0, 'regions');
+ return array('percentage' => $taxpercentage, 'regions' => Zend_Json::decode(html_entity_decode(!empty($regions) ? $regions : '')));
}
/** Function used to add the history entry in the relevant tables for PO, SO, Quotes and Invoice modules
@@ -383,7 +384,8 @@ function getTaxDetailsForProduct($productid, $available='all')
$tax_details[$i]['type'] = $adb->query_result($res, $i, 'type');
$tax_details[$i]['regions'] = Zend_Json::decode(html_entity_decode($adb->query_result($res, $i, 'taxregions')));
$tax_details[$i]['compoundon'] = Zend_Json::decode(html_entity_decode($adb->query_result($res, $i, 'compoundon')));
- $tax_details[$i]['productregions']= Zend_Json::decode(html_entity_decode($adb->query_result($res, $i, 'productregions')));
+ $productregions=$adb->query_result($res, $i, 'productregions');
+ $tax_details[$i]['productregions']= Zend_Json::decode(html_entity_decode(!empty($productregions) ? $productregions : ''));
}
}
else
diff --git a/include/utils/utils.php b/include/utils/utils.php
index ca897998b55be668bc52dd8554c2dbcf7ac4ce4e..f6385811d4c10bf5e3ef026579797ad69764e888 100755
--- a/include/utils/utils.php
+++ b/include/utils/utils.php
@@ -148,13 +148,13 @@ function get_user_array($add_blank=true, $status="Active", $assigned_user="",$pr
vtiger_users.first_name as first_name ,vtiger_users.last_name as last_name, vtiger_users.userlabel AS userlabel
from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like ? and status='Active' union
select shareduserid as id,vtiger_users.user_name as user_name ,
- vtiger_users.first_name as first_name ,vtiger_users.last_name as last_name,vtiger_users.userlabel AS userlabel from vtiger_tmp_write_user_sharing_per inner join vtiger_users on vtiger_users.id=vtiger_tmp_write_user_sharing_per.shareduserid where status='Active' and vtiger_tmp_write_user_sharing_per.userid=? and vtiger_tmp_write_user_sharing_per.tabid=? and (user_name != 'admin' OR is_owner=1)";
+ vtiger_users.first_name as first_name ,vtiger_users.last_name as last_name,vtiger_users.userlabel AS userlabel from vtiger_tmp_write_user_sharing_per inner join vtiger_users on vtiger_users.id=vtiger_tmp_write_user_sharing_per.shareduserid where status='Active' and vtiger_tmp_write_user_sharing_per.userid=? and vtiger_tmp_write_user_sharing_per.tabid=?";
$params = array($current_user->id, $current_user_parent_role_seq."::%", $current_user->id, getTabid($module));
}
else
{
$log->debug("Sharing is Public. All vtiger_users should be listed");
- $query = "SELECT id, user_name,first_name,last_name,userlabel from vtiger_users WHERE status=? and (user_name != 'admin' OR is_owner=1)";
+ $query = "SELECT id, user_name,first_name,last_name,userlabel from vtiger_users WHERE status=?";
$params = array($status);
}
}
diff --git a/layouts/v7/modules/Calendar/uitypes/DateTime.tpl b/layouts/v7/modules/Calendar/uitypes/DateTime.tpl
index 42f245c96013777da976a3b68c2a85e9ca81989a..e4a7d436c43bde4506de229356e07b42556ff17a 100644
--- a/layouts/v7/modules/Calendar/uitypes/DateTime.tpl
+++ b/layouts/v7/modules/Calendar/uitypes/DateTime.tpl
@@ -20,8 +20,10 @@
{/if}
{assign var=DATE_TIME_VALUE value=$FIELD_MODEL->get('fieldvalue')}
-{assign var=DATE_TIME_COMPONENTS value=explode(' ' ,$DATE_TIME_VALUE)}
-{if !empty($TIME_FIELD)}
+{if isset($DATE_TIME_VALUE)}
+ {assign var=DATE_TIME_COMPONENTS value=explode(' ', $DATE_TIME_VALUE)}
+{/if}
+{if !empty($TIME_FIELD) && isset($DATE_TIME_COMPONENTS)}
{assign var=TIME_FIELD value=$TIME_FIELD->set('fieldvalue',$DATE_TIME_COMPONENTS[1])}
{/if}
{if $TIME_FIELD}
@@ -30,6 +32,7 @@
{assign var=DATE_TIME_COMPONENTS value=explode(' ' ,$DATE_TIME_CONVERTED_VALUE)}
{assign var=DATE_FIELD value=$DATE_FIELD->set('fieldvalue',$DATE_TIME_COMPONENTS[0])}
{/if}
+
<div>
{include file=vtemplate_path('uitypes/Date.tpl',$MODULE) BLOCK_FIELDS=$BLOCK_FIELDS FIELD_MODEL=$DATE_FIELD}
</div>
diff --git a/layouts/v7/modules/Documents/UploadDocument.tpl b/layouts/v7/modules/Documents/UploadDocument.tpl
index 10ac0db6a61f748d19811a473428c6ee6247d473..15d42c0e99972df64bf420b1f65ea0317e5ec737 100644
--- a/layouts/v7/modules/Documents/UploadDocument.tpl
+++ b/layouts/v7/modules/Documents/UploadDocument.tpl
@@ -27,7 +27,7 @@
<input type="hidden" name="relationOperation" value="{$RELATION_OPERATOR}" />
<input type="hidden" name="sourceModule" value="{$PARENT_MODULE}" />
<input type="hidden" name="sourceRecord" value="{$PARENT_ID}" />
- {if $RELATION_FIELD_NAME}
+ {if isset($RELATION_FIELD_NAME)}
<input type="hidden" name="{$RELATION_FIELD_NAME}" value="{$PARENT_ID}" />
{/if}
{/if}
diff --git a/layouts/v7/modules/Events/uitypes/DateTime.tpl b/layouts/v7/modules/Events/uitypes/DateTime.tpl
index 16648420cd248b14687ad4d9f2a80ca329a6db7f..1c766bbe1b7553659a45fb2c77c76c47a836e8f2 100644
--- a/layouts/v7/modules/Events/uitypes/DateTime.tpl
+++ b/layouts/v7/modules/Events/uitypes/DateTime.tpl
@@ -21,13 +21,16 @@
{/if}
{assign var=DATE_TIME_VALUE value=$FIELD_MODEL->get('fieldvalue')}
+{if isset($DATE_TIME_VALUE)}
{assign var=DATE_TIME_COMPONENTS value=explode(' ' ,$DATE_TIME_VALUE)}
{assign var=TIME_FIELD value=$TIME_FIELD->set('fieldvalue',$DATE_TIME_COMPONENTS[1])}
-
+{/if}
{* Set the date after converting with repsect to timezone *}
{assign var=DATE_TIME_CONVERTED_VALUE value=DateTimeField::convertToUserTimeZone($DATE_TIME_VALUE)->format('Y-m-d H:i:s')}
+{if isset($DATE_TIME_CONVERTED_VALUE)}
{assign var=DATE_TIME_COMPONENTS value=explode(' ' ,$DATE_TIME_CONVERTED_VALUE)}
{assign var=DATE_FIELD value=$DATE_FIELD->set('fieldvalue',$DATE_TIME_COMPONENTS[0])}
+{/if}
<div>
{include file=vtemplate_path('uitypes/Date.tpl',$MODULE) BLOCK_FIELDS=$BLOCK_FIELDS FIELD_MODEL=$DATE_FIELD}
diff --git a/layouts/v7/modules/Vtiger/Comment.tpl b/layouts/v7/modules/Vtiger/Comment.tpl
index 56df0f3668a50450c91de5fd1be0ef6ed84cc186..7234907a5b50f1333274d4a7b2fc4a29c62baeb1 100644
--- a/layouts/v7/modules/Vtiger/Comment.tpl
+++ b/layouts/v7/modules/Vtiger/Comment.tpl
@@ -36,7 +36,7 @@
<span class="creatorName" style="color:blue">
{$CREATOR_NAME}
</span>
- {if $ROLLUP_STATUS and $COMMENT->get('module') ne $MODULE_NAME}
+ {if isset ($ROLLUP_STATUS) && $ROLLUP_STATUS and $COMMENT->get('module') ne $MODULE_NAME}
{assign var=SINGULR_MODULE value='SINGLE_'|cat:$COMMENT->get('module')}
{assign var=ENTITY_NAME value=getEntityName($COMMENT->get('module'), array($COMMENT->get('related_to')))}
<span class="text-muted">
@@ -69,12 +69,12 @@
<br>
<div class="commentActionsContainer">
<span class="commentActions">
- {if $CHILDS_ROOT_PARENT_MODEL}
+ {if isset ($CHILDS_ROOT_PARENT_MODEL) && $CHILDS_ROOT_PARENT_MODEL}
{assign var=CHILDS_ROOT_PARENT_ID value=$CHILDS_ROOT_PARENT_MODEL->getId()}
{/if}
{if $COMMENTS_MODULE_MODEL->isPermitted('EditView')}
- {if $CHILDS_ROOT_PARENT_MODEL}
+ {if isset ($CHILDS_ROOT_PARENT_MODEL) && $CHILDS_ROOT_PARENT_MODEL}
{assign var=CHILDS_ROOT_PARENT_ID value=$CHILDS_ROOT_PARENT_MODEL->getId()}
{/if}
<a href="javascript:void(0);" class="cursorPointer replyComment feedback" style="color: blue;">
@@ -89,7 +89,7 @@
{/if}
{assign var=CHILD_COMMENTS_COUNT value=$COMMENT->getChildCommentsCount()}
- {if $CHILD_COMMENTS_MODEL neq null and ($CHILDS_ROOT_PARENT_ID neq $PARENT_COMMENT_ID)}
+ {if $CHILD_COMMENTS_MODEL neq null and (isset($CHILDS_ROOT_PARENT_ID)&& $CHILDS_ROOT_PARENT_ID neq $PARENT_COMMENT_ID)}
{if $COMMENTS_MODULE_MODEL->isPermitted('EditView')} {/if}
<span class="viewThreadBlock" data-child-comments-count="{$CHILD_COMMENTS_COUNT}">
<a href="javascript:void(0)" class="cursorPointer viewThread" style="color: blue;">
@@ -101,7 +101,7 @@
<span class="childCommentsCount">{$CHILD_COMMENTS_COUNT}</span> {if $CHILD_COMMENTS_COUNT eq 1}{vtranslate('LBL_REPLY',$MODULE_NAME)}{else}{vtranslate('LBL_REPLIES',$MODULE_NAME)}{/if}
</a>
</span>
- {elseif $CHILD_COMMENTS_MODEL neq null and ($CHILDS_ROOT_PARENT_ID eq $PARENT_COMMENT_ID)}
+ {elseif $CHILD_COMMENTS_MODEL neq null and (isset($CHILDS_ROOT_PARENT_ID)&& $CHILDS_ROOT_PARENT_ID eq $PARENT_COMMENT_ID)}
{if $COMMENTS_MODULE_MODEL->isPermitted('EditView')} {/if}
<span class="viewThreadBlock" data-child-comments-count="{$CHILD_COMMENTS_COUNT}" style="display:none;">
<a href="javascript:void(0)" class="cursorPointer viewThread" style="color: blue;">
diff --git a/layouts/v7/modules/Vtiger/CommentsList.tpl b/layouts/v7/modules/Vtiger/CommentsList.tpl
index 2d7764f9d2c10ef0cd010f86c5feca7fd8aa86b7..25bb39f92e8c10394bc1405ea8d3452047027c8d 100644
--- a/layouts/v7/modules/Vtiger/CommentsList.tpl
+++ b/layouts/v7/modules/Vtiger/CommentsList.tpl
@@ -13,7 +13,7 @@
{if !empty($PARENT_COMMENTS)}
<ul class="unstyled">
- {if $CURRENT_COMMENT}
+ {if isset($CURRENT_COMMENT) && $CURRENT_COMMENT}
{assign var=CHILDS_ROOT_PARENT_MODEL value=$CURRENT_COMMENT}
{assign var=CURRENT_COMMENT_PARENT_MODEL value=$CURRENT_COMMENT->getParentCommentModel()}
{while $CURRENT_COMMENT_PARENT_MODEL neq false}
@@ -30,7 +30,7 @@
<li class="commentDetails">
{include file='Comment.tpl'|@vtemplate_path COMMENT=$COMMENT COMMENT_MODULE_MODEL=$COMMENTS_MODULE_MODEL}
- {if $CHILDS_ROOT_PARENT_MODEL}
+ {if isset($CHILDS_ROOT_PARENT_MODEL) && $CHILDS_ROOT_PARENT_MODEL}
{if $CHILDS_ROOT_PARENT_MODEL->getId() eq $PARENT_COMMENT_ID}
{assign var=CHILD_COMMENTS_MODEL value=$CHILDS_ROOT_PARENT_MODEL->getChildComments()}
{include file='CommentsListIteration.tpl'|@vtemplate_path CHILD_COMMENTS_MODEL=$CHILD_COMMENTS_MODEL}
diff --git a/layouts/v7/modules/Vtiger/DetailViewBlockView.tpl b/layouts/v7/modules/Vtiger/DetailViewBlockView.tpl
index 5bc9758e0a9900c9702747402e67fb535910548e..0c2673d2662a245aa3ae0f683cc13ee8993452ae 100644
--- a/layouts/v7/modules/Vtiger/DetailViewBlockView.tpl
+++ b/layouts/v7/modules/Vtiger/DetailViewBlockView.tpl
@@ -18,7 +18,7 @@
<div class="block block_{$BLOCK_LABEL_KEY}" data-block="{$BLOCK_LABEL_KEY}" data-blockid="{$BLOCK_LIST[$BLOCK_LABEL_KEY]->get('id')}">
{assign var=IS_HIDDEN value=$BLOCK->isHidden()}
{assign var=WIDTHTYPE value=$USER_MODEL->get('rowheight')}
- <input type=hidden name="timeFormatOptions" data-value='{$DAY_STARTS}' />
+ <input type=hidden name="timeFormatOptions" data-value='{if isset($DAY_STARTS)}{$DAY_STARTS}{else}""{/if}' />
<div>
<h4 class="textOverflowEllipsis maxWidth50">
<img class="cursorPointer alignMiddle blockToggle {if !($IS_HIDDEN)} hide {/if}" src="{vimage_path('arrowRight.png')}" data-mode="hide" data-id={$BLOCK_LIST[$BLOCK_LABEL_KEY]->get('id')}>
diff --git a/layouts/v7/modules/Vtiger/OverlayDetailView.tpl b/layouts/v7/modules/Vtiger/OverlayDetailView.tpl
index 1bd8d59879cfc2c5517cd8e2d82334929615b744..26add60a04b2130f36116fecd4ecc82a93e3c629 100644
--- a/layouts/v7/modules/Vtiger/OverlayDetailView.tpl
+++ b/layouts/v7/modules/Vtiger/OverlayDetailView.tpl
@@ -54,11 +54,13 @@
<div class="clearfix">
<div class = "btn-group">
<button class="btn btn-default fullDetailsButton" onclick="window.location.href = '{$RECORD->getFullDetailViewUrl()}&app={$SELECTED_MENU_CATEGORY}'">{vtranslate('LBL_DETAILS',$MODULE_NAME)}</button>
- {foreach item=DETAIL_VIEW_BASIC_LINK from=$DETAILVIEW_LINKS['DETAILVIEWBASIC']}
- {if $DETAIL_VIEW_BASIC_LINK && $DETAIL_VIEW_BASIC_LINK->getLabel() == 'LBL_EDIT'}
- <button class="btn btn-default editRelatedRecord" value = "{$RECORD->getEditViewUrl()}">{vtranslate('LBL_EDIT',$MODULE_NAME)}</button>
- {/if}
- {/foreach}
+ {if isset($DETAILVIEW_LINKS)}
+ {foreach item=DETAIL_VIEW_BASIC_LINK from=$DETAILVIEW_LINKS['DETAILVIEWBASIC']}
+ {if $DETAIL_VIEW_BASIC_LINK && $DETAIL_VIEW_BASIC_LINK->getLabel() == 'LBL_EDIT'}
+ <button class="btn btn-default editRelatedRecord" value = "{$RECORD->getEditViewUrl()}">{vtranslate('LBL_EDIT',$MODULE_NAME)}</button>
+ {/if}
+ {/foreach}
+ {/if}
</div>
<div class="pull-right " >
<button type="button" class="close" aria-label="Close" data-dismiss="modal">
diff --git a/layouts/v7/modules/Vtiger/OverlayEditView.tpl b/layouts/v7/modules/Vtiger/OverlayEditView.tpl
index 66c58bdf9ae297d8d5d72671695e90f43da33ddf..e7790c9f4e2524857858ba5ebce467601ce6b506 100644
--- a/layouts/v7/modules/Vtiger/OverlayEditView.tpl
+++ b/layouts/v7/modules/Vtiger/OverlayEditView.tpl
@@ -13,7 +13,12 @@
<div class='fc-overlay-modal modal-content overlayEdit'>
<div class="overlayHeader">
- {assign var=TITLE value="{vtranslate('LBL_EDITING', $MODULE)} {vtranslate($SINGLE_MODULE_NAME, $MODULE)} - {$RECORD_STRUCTURE_MODEL->getRecordName()}"}
+ {if isset($SINGLE_MODULE_NAME)}
+ {assign var="singleModuleName" value=$SINGLE_MODULE_NAME}
+ {else}
+ {assign var="singleModuleName" value=""}
+ {/if}
+ {assign var=TITLE value="{vtranslate('LBL_EDITING', $MODULE)} {vtranslate($singleModuleName, $MODULE)} - {$RECORD_STRUCTURE_MODEL->getRecordName()}"}
{include file="ModalHeader.tpl"|vtemplate_path:$MODULE}
</div>
<form class="form-horizontal recordEditView" id="EditView" name="edit" method="post" action="index.php" enctype="multipart/form-data">
diff --git a/layouts/v7/modules/Vtiger/RecentActivities.tpl b/layouts/v7/modules/Vtiger/RecentActivities.tpl
index ab22c6e86948a99bc4cd3dffa7d2caffa21f61db..c7200ef719a1807adee26fd12a0df8a4729a537f 100644
--- a/layouts/v7/modules/Vtiger/RecentActivities.tpl
+++ b/layouts/v7/modules/Vtiger/RecentActivities.tpl
@@ -92,8 +92,13 @@
{assign var=PRE_DISPLAY_VALUE value=$TIME_PRE_DISPLAY_VALUE}
{assign var=POST_DISPLAY_VALUE value=$TIME_POST_DISPLAY_VALUE}
{/if}
+ {if isset($TIME_PRE_DISPLAY_VALUE)}
+ {assign var=PRE_DISPLAY_TITLE value=$TIME_PRE_DISPLAY_VALUE}
+
+ {else}
+ {assign var=PRE_DISPLAY_TITLE value=''}
+ {/if}
- {assign var=PRE_DISPLAY_TITLE value=$TIME_PRE_DISPLAY_VALUE}
{if $FIELDMODEL && $FIELDMODEL->getFieldInstance() && $FIELDMODEL->getFieldInstance()->isViewable() && $FIELDMODEL->getFieldInstance()->getDisplayType() neq '5'}
diff --git a/layouts/v7/modules/Vtiger/partials/EditViewContents.tpl b/layouts/v7/modules/Vtiger/partials/EditViewContents.tpl
index 004763b240c58dd0b8dd146172bed0aa0d35c759..106011ffc94504b8abd9752caed8d2b284d22eec 100644
--- a/layouts/v7/modules/Vtiger/partials/EditViewContents.tpl
+++ b/layouts/v7/modules/Vtiger/partials/EditViewContents.tpl
@@ -14,7 +14,7 @@
{/if}
<div name='editContent'>
- {if $DUPLICATE_RECORDS}
+ {if isset($DUPLICATE_RECORDS) && $DUPLICATE_RECORDS}
<div class="fieldBlockContainer duplicationMessageContainer">
<div class="duplicationMessageHeader"><b>{vtranslate('LBL_DUPLICATES_DETECTED', $MODULE)}</b></div>
<div>{getDuplicatesPreventionMessage($MODULE, $DUPLICATE_RECORDS)}</div>
diff --git a/layouts/v7/modules/Vtiger/partials/RelatedListHeader.tpl b/layouts/v7/modules/Vtiger/partials/RelatedListHeader.tpl
index 36b24a959db984e895baa56c66266f889420bd6e..3cef97ed0fbdcf3b969d89d887f91f87b25c290b 100644
--- a/layouts/v7/modules/Vtiger/partials/RelatedListHeader.tpl
+++ b/layouts/v7/modules/Vtiger/partials/RelatedListHeader.tpl
@@ -38,7 +38,7 @@
{if $IS_SELECT_BUTTON eq true} data-moduleName="{$RELATED_LINK->get('_module')->get('name')}" {/if}
{if ($RELATED_LINK->isPageLoadLink())}
{if $RELATION_FIELD} data-name="{$RELATION_FIELD->getName()}" {/if}
- data-url="{$RELATED_LINK->getUrl()}{if $SELECTED_MENU_CATEGORY}&app={$SELECTED_MENU_CATEGORY}{/if}"
+ data-url="{$RELATED_LINK->getUrl()}{if isset($SELECTED_MENU_CATEGORY)}&app={$SELECTED_MENU_CATEGORY}{/if}"
{/if}
>{if $IS_SELECT_BUTTON eq false}<i class="fa fa-plus"></i> {/if} {$RELATED_LINK->getLabel()}</button>
{/if}
diff --git a/layouts/v7/modules/Vtiger/uitypes/Date.tpl b/layouts/v7/modules/Vtiger/uitypes/Date.tpl
index 3d0f6c9ae3ea5ad84db66e8f59834801c323cc29..3aadfbdda43ccd9c0cd7dac134ed8952239c27c3 100644
--- a/layouts/v7/modules/Vtiger/uitypes/Date.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/Date.tpl
@@ -13,7 +13,7 @@
{assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
{assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
{assign var="dateFormat" value=$USER_MODEL->get('date_format')}
-{if (!$FIELD_NAME)}
+{if (!isset($FIELD_NAME))}
{assign var="FIELD_NAME" value=$FIELD_MODEL->getFieldName()}
{/if}
<div class="input-group inputElement" style="margin-bottom: 3px">
diff --git a/layouts/v7/modules/Vtiger/uitypes/ProductTax.tpl b/layouts/v7/modules/Vtiger/uitypes/ProductTax.tpl
index ff8f81c875685b5dbbf5543788e568079b4f468a..5c69cf1271450ef8c0beb0585e7be7fb2260e090 100644
--- a/layouts/v7/modules/Vtiger/uitypes/ProductTax.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/ProductTax.tpl
@@ -21,7 +21,7 @@
{/if}
{if $tax_count gt 1}
- <td class="fieldLabel alignMiddle{if $PULL_RIGHT} pull-right{/if}">{*pull-right required in Quick create only*}
+ <td class="fieldLabel alignMiddle{if isset($PULL_RIGHT) && $PULL_RIGHT} pull-right{/if}">{*pull-right required in Quick create only*}
<label class="">
{/if}
<span class="taxLabel alignBottom">{vtranslate($tax.taxlabel, $MODULE)}<span class="paddingLeft10px">(%)</span></span>
diff --git a/layouts/vlayout/modules/Vtiger/uitypes/Date.tpl b/layouts/vlayout/modules/Vtiger/uitypes/Date.tpl
index 50fa8504be4220a2bce435ae461656bcb893d4ad..7e75b6d1a2602c27e6dff3dcb2faff3c3db53e36 100644
--- a/layouts/vlayout/modules/Vtiger/uitypes/Date.tpl
+++ b/layouts/vlayout/modules/Vtiger/uitypes/Date.tpl
@@ -17,7 +17,7 @@
<div class="span12 row-fluid date">
{assign var=FIELD_NAME value=$FIELD_MODEL->get('name')}
<input id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" type="text" class="dateField" name="{$FIELD_MODEL->getFieldName()}" data-date-format="{$dateFormat}"
- type="text" value="{$FIELD_MODEL->getEditViewDisplayValue($FIELD_MODEL->get('fieldvalue'))}" data-validation-engine="validate[{if $FIELD_MODEL->isMandatory() eq true} required,{/if}funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if} data-fieldinfo='{$FIELD_INFO}'
+ type="text" data-validation-engine="validate[{if $FIELD_MODEL->isMandatory() eq true} required,{/if}funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if} data-fieldinfo='{$FIELD_INFO}'
{if $MODE eq 'edit' && $FIELD_NAME eq 'due_date'} data-user-changed-time="true" {/if} />
<span class="add-on"><i class="icon-calendar"></i></span>
</div>
diff --git a/modules/Calendar/Activity.php b/modules/Calendar/Activity.php
index d92db4f65f1b9c58e185afb82a9375e1708efed2..ad8608b928393047f663e3109fded1ef76d0b804 100644
--- a/modules/Calendar/Activity.php
+++ b/modules/Calendar/Activity.php
@@ -145,7 +145,7 @@ class Activity extends CRMEntity {
}
}
$adb->pquery($sql, $params);
- } else if ($_REQUEST['contactidlist'] == '' && $insertion_mode == "edit") {
+ } else if (isset($_REQUEST['contactidlist'] ) && $_REQUEST['contactidlist'] == '' && $insertion_mode == "edit") {
$adb->pquery('DELETE FROM vtiger_cntactivityrel WHERE activityid = ?', array($recordId));
}
@@ -180,7 +180,7 @@ class Activity extends CRMEntity {
$this->insertIntoReminderTable('vtiger_activity_reminder',$module,"");
//Handling for invitees
- $selected_users_string = $_REQUEST['inviteesid'];
+ $selected_users_string = isset($_REQUEST['inviteesid'])?$_REQUEST['inviteesid']:'';
$invitees_array = explode(';',$selected_users_string);
$this->insertIntoInviteeTable($module,$invitees_array);
@@ -242,7 +242,7 @@ class Activity extends CRMEntity {
} else {
$status = 1;
}
-
+ $callback_query='';
if(isset($reminderid)) {
$callback_query = "UPDATE vtiger_activity_reminder_popup set status = ?, date_start = ?, time_start = ? WHERE reminderid = ?";
$callback_params = array($status, $cbdate, $cbtime, $reminderid);
@@ -386,7 +386,7 @@ function insertIntoRecurringTable(& $recurObj)
function insertIntoInviteeTable($module,$invitees_array)
{
global $log,$adb;
- $log->debug("Entering insertIntoInviteeTable(".$module.",".$invitees_array.") method ...");
+ $log->debug("Entering insertIntoInviteeTable(".$module.",".implode(',',$invitees_array).") method ...");
if($this->mode == 'edit'){
$sql = "DELETE FROM vtiger_invitees WHERE activityid=?";
$adb->pquery($sql, array($this->id));
diff --git a/modules/Calendar/RepeatEvents.php b/modules/Calendar/RepeatEvents.php
index 4219cc9a4edba0b6f078d864a33476a3edaf0d55..d2d6409e8071adf49e1c48981d61cdfa474abc9b 100644
--- a/modules/Calendar/RepeatEvents.php
+++ b/modules/Calendar/RepeatEvents.php
@@ -394,7 +394,7 @@ class Calendar_RepeatEvents {
}
static function checkRecurringDataChanged($recurObjRequest, $recurObjDb) {
- if(($recurObjRequest->recur_type == $recurObjDb->recur_type) && ($recurObjRequest->recur_freq == $recurObjDb->recur_freq)
+ if(($recurObjRequest && $recurObjDb) && ($recurObjRequest->recur_type == $recurObjDb->recur_type) && ($recurObjRequest->recur_freq == $recurObjDb->recur_freq)
&& ($recurObjRequest->recurringdates[0] == $recurObjDb->recurringdates[0]) && ($recurObjRequest->recurringenddate == $recurObjDb->recurringenddate)
&& ($recurObjRequest->dayofweek_to_rpt == $recurObjDb->dayofweek_to_rpt) && ($recurObjRequest->repeat_monthby == $recurObjDb->repeat_monthby)
&& ($recurObjRequest->rptmonth_datevalue == $recurObjDb->rptmonth_datevalue) && ($recurObjRequest->rptmonth_daytype == $recurObjDb->rptmonth_daytype)) {
diff --git a/modules/Calendar/models/Field.php b/modules/Calendar/models/Field.php
index cb81df21944800b02ad1010760b1f81a211bc105..880f40678e7d4415c54fbe8cc234efcc07d22427 100644
--- a/modules/Calendar/models/Field.php
+++ b/modules/Calendar/models/Field.php
@@ -80,6 +80,7 @@ class Calendar_Field_Model extends Vtiger_Field_Model {
} else if ($this->getName() == 'due_date') {
$dateTimeValue = $value . ' '. $recordInstance->get('time_end');
$value = $this->getUITypeModel()->getDisplayValue($dateTimeValue);
+ if (substr_count($value, ' ') == 0) $value .= ' '; // if $startTime is missing then added a space to it to avoid undefined array key warning.
list($startDate, $startTime) = explode(' ', $value);
$currentUser = Users_Record_Model::getCurrentUserModel();
diff --git a/modules/Calendar/models/Module.php b/modules/Calendar/models/Module.php
index 11fd4eb3c8dd2fc413e2cde5dafe403fd59deb1e..65a1d40e0c06be882c0ebb17630c5754c8c6d5af 100644
--- a/modules/Calendar/models/Module.php
+++ b/modules/Calendar/models/Module.php
@@ -306,7 +306,7 @@ class Calendar_Module_Model extends Vtiger_Module_Model {
$currentUser = Users_Record_Model::getCurrentUserModel();
if($currentUser->isAdminUser()) {
$query = "SELECT userlabel, id AS userid
- FROM vtiger_users WHERE status='Active' AND (user_name != 'admin' OR is_owner = 1) AND id <> ?";
+ FROM vtiger_users WHERE status='Active' AND id <> ?";
$result = $db->pquery($query, array($id));
} else {
$query = "SELECT vtiger_users.userlabel, vtiger_users.id AS userid
diff --git a/modules/Calendar/models/Record.php b/modules/Calendar/models/Record.php
index d13c3c4ba7320c12ca4e9cd774b9d005efdb8937..d58e2fa7fbf06ca8ee1520650265b50bb19fcebc 100644
--- a/modules/Calendar/models/Record.php
+++ b/modules/Calendar/models/Record.php
@@ -99,7 +99,7 @@ class Calendar_Record_Model extends Vtiger_Record_Model {
function save() {
//Time should changed to 24hrs format
$_REQUEST['time_start'] = Vtiger_Time_UIType::getTimeValueWithSeconds($_REQUEST['time_start']);
- $_REQUEST['time_end'] = Vtiger_Time_UIType::getTimeValueWithSeconds($_REQUEST['time_end']);
+ $_REQUEST['time_end'] = isset($_REQUEST['time_end']) ? Vtiger_Time_UIType::getTimeValueWithSeconds($_REQUEST['time_end']): '';
parent::save();
}
diff --git a/modules/Calendar/uitypes/Time.php b/modules/Calendar/uitypes/Time.php
index afd349279abeefb3e597e7d9ee1d354f061a88da..04f337da83affa7b71ca36c4124432178bfce174 100644
--- a/modules/Calendar/uitypes/Time.php
+++ b/modules/Calendar/uitypes/Time.php
@@ -36,8 +36,8 @@ class Calendar_Time_UIType extends Vtiger_Time_UIType {
* @return <Vtiger_Time_UIType> - getTimeValue
*/
public function getDisplayTimeDifferenceValue($fieldName, $value){
- $userModel = Users_Privileges_Model::getCurrentUserModel();
- $date = new DateTime($value);
+ $userModel = Users_Privileges_Model::getCurrentUserModel();
+ $date = new DateTime(isset($value) ? $value: '');
//No need to set the time zone as DateTimeField::getDisplayTime API is already doing this
/*if(empty($value)) {
diff --git a/modules/Calendar/views/Detail.php b/modules/Calendar/views/Detail.php
index 186583fb7e952add457393681224bf2da3f65b07..d55a45ada04289ca2b61bac6c964923562098a4e 100644
--- a/modules/Calendar/views/Detail.php
+++ b/modules/Calendar/views/Detail.php
@@ -144,7 +144,6 @@ class Calendar_Detail_View extends Vtiger_Detail_View {
$relatedContacts = array();
}
-
$viewer = $this->getViewer($request);
$viewer->assign('RECORD', $recordModel);
$viewer->assign('RECORD_STRUCTURE', $structuredValues);
@@ -152,10 +151,13 @@ class Calendar_Detail_View extends Vtiger_Detail_View {
$viewer->assign('RECORD_STRUCTURE_MODEL', $recordStrucure);
$viewer->assign('USER_MODEL', Users_Record_Model::getCurrentUserModel());
$viewer->assign('MODULE_NAME', $moduleName);
+ $viewer->assign('DAY_STARTS','');
$viewer->assign('RELATED_CONTACTS', $relatedContacts);
$viewer->assign('IS_AJAX_ENABLED', $this->isAjaxEnabled($recordModel));
$viewer->assign('RECURRING_INFORMATION', $recordModel->getRecurringDetails());
+ $appName = !empty($request->get('app'))?$request->get('app'):'';
+ $viewer->assign('SELECTED_MENU_CATEGORY',$appName);
$picklistDependencyDatasource = Vtiger_DependencyPicklist::getPicklistDependencyDatasource($moduleName);
$viewer->assign('PICKIST_DEPENDENCY_DATASOURCE', Vtiger_Functions::jsonEncode($picklistDependencyDatasource));
diff --git a/modules/Documents/Documents.php b/modules/Documents/Documents.php
index b34a3fd32daf0032af78d0d23e6a817d00d12ca9..93f0adcb81baeddf9740206440b98b2aa3cc4442 100644
--- a/modules/Documents/Documents.php
+++ b/modules/Documents/Documents.php
@@ -552,6 +552,7 @@ class Documents extends CRMEntity {
function get_related_list($id, $cur_tab_id, $rel_tab_id,$actions = false) {
$related_module = vtlib_getModuleNameById($rel_tab_id);
$other = CRMEntity::getInstance($related_module);
+ $more_relation='';
vtlib_setup_modulevars('Documents', $this);
vtlib_setup_modulevars($related_module, $other);
diff --git a/modules/Events/actions/Save.php b/modules/Events/actions/Save.php
index 9113275cef57ff994311469149f223ae6d26dae5..bc095debfeaf38a9f2e8b84c1611f565da4d7a29 100644
--- a/modules/Events/actions/Save.php
+++ b/modules/Events/actions/Save.php
@@ -80,7 +80,7 @@ class Events_Save_Action extends Calendar_Save_Action {
$recurObj = getrecurringObjValue();
$recurringDataChanged = Calendar_RepeatEvents::checkRecurringDataChanged($recurObj, $recurObjDb);
//TODO: remove the dependency on $_REQUEST
- if(($_REQUEST['recurringtype'] != '' && $_REQUEST['recurringtype'] != '--None--' && $recurringEditMode != 'current') || ($recurringDataChanged && empty($recurObj))) {
+ if((isset($_REQUEST['recurringtype']))&&($_REQUEST['recurringtype'] != '' && $_REQUEST['recurringtype'] != '--None--' && $recurringEditMode != 'current') || ($recurringDataChanged && empty($recurObj))) {
$focus = CRMEntity::getInstance('Events');
//get all the stored data to this object
$focus->column_fields = new TrackableObject($recordModel->getData());
diff --git a/modules/Products/models/Record.php b/modules/Products/models/Record.php
index 967f4eaac4dfa80c7ded039ae0d249717ca35196..8659fecc8afd68462483b06f058eb94b55ef5756 100644
--- a/modules/Products/models/Record.php
+++ b/modules/Products/models/Record.php
@@ -370,7 +370,7 @@ class Products_Record_Model extends Vtiger_Record_Model {
$imageNamesList[] = $imageName;
$imageUrlsList[] = $url;
}
-
+ $imageOriginalNamesList=array();
if(is_array($imageOriginalNamesList)) {
$countOfImages = php7_count($imageOriginalNamesList);
for($j=0; $j<$countOfImages; $j++) {
diff --git a/modules/Users/models/ListView.php b/modules/Users/models/ListView.php
index 20d72c0f674be222c033341b89794374f77e1432..963de8b27749b6617c6a1d0a6d14649653b22833 100644
--- a/modules/Users/models/ListView.php
+++ b/modules/Users/models/ListView.php
@@ -74,7 +74,6 @@ class Users_ListView_Model extends Vtiger_ListView_Model {
$listQueryComponents = explode(" WHERE vtiger_users.status='Active' AND", $listQuery);
$listQuery = implode(' WHERE ', $listQueryComponents);
}
- $listQuery .= " AND (vtiger_users.user_name != 'admin' OR vtiger_users.is_owner = 1)";
// Impose non-admin restrictions.
$user = vglobal('current_user');
diff --git a/modules/Vtiger/actions/MentionedUsers.php b/modules/Vtiger/actions/MentionedUsers.php
index d6bd2cba374f675d978cc4ec6e32e840f160d38c..31fcb6b876b3ddaccd73964770845f6b2cbd3562 100644
--- a/modules/Vtiger/actions/MentionedUsers.php
+++ b/modules/Vtiger/actions/MentionedUsers.php
@@ -37,7 +37,7 @@ class Vtiger_MentionedUsers_Action extends Vtiger_Action_Controller {
if(($key = array_search(strtolower($currentUserName), $mentionedUsers)) !== false) {
unset($mentionedUsers[$key]);
}
-
+ $mentionedUsersData=array();
if(!empty($mentionedUsers)){
$usersString = '@'.implode(' @', $mentionedUsers);
$mentionedUsersData['usersString'] = $usersString.' ';
diff --git a/modules/Vtiger/models/RelationListView.php b/modules/Vtiger/models/RelationListView.php
index 2a32d8a3fcb1d8ee7ff5a0f4397b08a8b9896176..054045afa4cad9789d776f35c486858402a0f229 100644
--- a/modules/Vtiger/models/RelationListView.php
+++ b/modules/Vtiger/models/RelationListView.php
@@ -281,7 +281,7 @@ class Vtiger_RelationListView_Model extends Vtiger_Base_Model {
if (is_array($fieldValue)) {
$comparator = $fieldValue[1];
$searchValue = $fieldValue[2];
- $type = $fieldValue[3];
+ $type = isset($fieldValue[3])?$fieldValue[3]:'';
if ($type == 'time') {
$searchValue = Vtiger_Time_UIType::getTimeValueWithSeconds($searchValue);
}
@@ -350,8 +350,10 @@ class Vtiger_RelationListView_Model extends Vtiger_Base_Model {
}
}
//To show the value of "Assigned to"
+ if(isset($row['smownerid'])){
$ownerId = $row['smownerid'];
$newRow['assigned_user_id'] = $row['smownerid'];
+ }
if($relationModuleName == 'Calendar') {
$visibleFields = array('activitytype','date_start','time_start','due_date','time_end','assigned_user_id','visibility','smownerid','parent_id');
$visibility = true;
diff --git a/modules/Vtiger/uitypes/Time.php b/modules/Vtiger/uitypes/Time.php
index 4ee1b37e0efbef87245f4d8120cfc3b1349d872c..868152acfcb1ed28a3f69fd7bdb62af6fe7c2e22 100644
--- a/modules/Vtiger/uitypes/Time.php
+++ b/modules/Vtiger/uitypes/Time.php
@@ -64,15 +64,16 @@ class Vtiger_Time_UIType extends Vtiger_Base_UIType {
*/
public static function getTimeValueWithSeconds($time) {
if($time){
+ if (substr_count($time, ':') < 2) $time .= ':'; // adding : if seconds value is missing to avoid undefined array key error
$timeDetails = explode(' ', $time);
list($hours, $minutes, $seconds) = explode(':', $timeDetails[0]);
//If pm exists and if it not 12 then we need to make it to 24 hour format
- if ($timeDetails[1] === 'PM' && $hours != '12') {
+ if (isset($timeDetails[1]) && $timeDetails[1] === 'PM' && $hours != '12') {
$hours = $hours+12;
}
- if($timeDetails[1] === 'AM' && $hours == '12'){
+ if(isset($timeDetails[1]) && $timeDetails[1] === 'AM' && $hours == '12'){
$hours = '00';
}
diff --git a/modules/Vtiger/views/Detail.php b/modules/Vtiger/views/Detail.php
index 6248b3d4173c9d31359ea230a9a70e0f3ca0f265..ff6a69a4ab7611a22bfc54f1ffd21f07ca189dd1 100644
--- a/modules/Vtiger/views/Detail.php
+++ b/modules/Vtiger/views/Detail.php
@@ -319,7 +319,7 @@ class Vtiger_Detail_View extends Vtiger_Index_View {
$viewer->assign('MODULE_NAME', $moduleName);
$viewer->assign('IS_AJAX_ENABLED', $this->isAjaxEnabled($recordModel));
$viewer->assign('MODULE', $moduleName);
-
+ $viewer->assign('DAY_STARTS','');
$picklistDependencyDatasource = Vtiger_DependencyPicklist::getPicklistDependencyDatasource($moduleName);
$viewer->assign('PICKIST_DEPENDENCY_DATASOURCE', Vtiger_Functions::jsonEncode($picklistDependencyDatasource));
@@ -579,7 +579,6 @@ class Vtiger_Detail_View extends Vtiger_Index_View {
$currentUserModel = Users_Record_Model::getCurrentUserModel();
$modCommentsModel = Vtiger_Module_Model::getInstance('ModComments');
$moduleName = $parentCommentModel->getParentRecordModel()->getModuleName();
-
$viewer = $this->getViewer($request);
$viewer->assign('PARENT_COMMENTS', $childComments);
$viewer->assign('CURRENTUSER', $currentUserModel);
diff --git a/modules/Vtiger/views/MassActionAjax.php b/modules/Vtiger/views/MassActionAjax.php
index d014c41109ec0fe61b22c948ed3bd4d3bbdc0aec..2926f5cf8193d683f1ada9f552ec6ab51f51823f 100644
--- a/modules/Vtiger/views/MassActionAjax.php
+++ b/modules/Vtiger/views/MassActionAjax.php
@@ -210,11 +210,15 @@ class Vtiger_MassActionAjax_View extends Vtiger_IndexAjax_View {
$viewer->assign('ALPHABET_VALUE',$searchValue);
$viewer->assign('SEARCH_KEY',$searchKey);
}
+ else{
+ $viewer->assign('OPERATOR','');
+ $viewer->assign('ALPHABET_VALUE','');
+ $viewer->assign('SEARCH_KEY','');
+ }
+
+ $searchParams = !empty($request->get('search_params'))?$request->get('search_params'):' ';
+ $viewer->assign('SEARCH_PARAMS',$searchParams);
- $searchParams = $request->get('search_params');
- if(!empty($searchParams)) {
- $viewer->assign('SEARCH_PARAMS',$searchParams);
- }
$to = $request->get('to');
if (!$to) {
diff --git a/packages/vtiger/mandatory/Import.zip b/packages/vtiger/mandatory/Import.zip
index 8b879521d565b697cd6196ad5ac80a398b8b1797..9e030759cbffba5ef8559f821b417ca88e13f4d3 100644
Binary files a/packages/vtiger/mandatory/Import.zip and b/packages/vtiger/mandatory/Import.zip differ
diff --git a/packages/vtiger/mandatory/MailManager.zip b/packages/vtiger/mandatory/MailManager.zip
index 1a91b4ecaa8d32372d31173080a906d87750ead0..ba0486a024a74892b0ddac260bbb24ca73263ae3 100644
Binary files a/packages/vtiger/mandatory/MailManager.zip and b/packages/vtiger/mandatory/MailManager.zip differ
diff --git a/packages/vtiger/mandatory/Mobile.zip b/packages/vtiger/mandatory/Mobile.zip
index 314d6615e333475f3df901946e9ab7cbc65e03b2..0e42a60e96fbf02725e840eb33a8b1f0509afffa 100644
Binary files a/packages/vtiger/mandatory/Mobile.zip and b/packages/vtiger/mandatory/Mobile.zip differ
diff --git a/packages/vtiger/mandatory/ModTracker.zip b/packages/vtiger/mandatory/ModTracker.zip
index f4ab5d282b2dcdef07f59f7e48bcc0d7ae116b2a..cb7db894bbd2fb6ab7f03c228ee30be046123d50 100644
Binary files a/packages/vtiger/mandatory/ModTracker.zip and b/packages/vtiger/mandatory/ModTracker.zip differ
diff --git a/packages/vtiger/mandatory/PBXManager.zip b/packages/vtiger/mandatory/PBXManager.zip
index 603660f72f8d605a82390cd91e0872d4de00340c..19cab71e4eafd7fc30ec7e298583b89d2cd55b13 100644
Binary files a/packages/vtiger/mandatory/PBXManager.zip and b/packages/vtiger/mandatory/PBXManager.zip differ
diff --git a/packages/vtiger/mandatory/ServiceContracts.zip b/packages/vtiger/mandatory/ServiceContracts.zip
index bb9081390d3787eba29b37b2f247e7e7143e33fd..4d34de34f78c3438518d94abb9f423e46da2ade1 100644
Binary files a/packages/vtiger/mandatory/ServiceContracts.zip and b/packages/vtiger/mandatory/ServiceContracts.zip differ
diff --git a/packages/vtiger/mandatory/Services.zip b/packages/vtiger/mandatory/Services.zip
index 74f2fa669a88929bb070f990d2c02b30ea4fbee8..260f827df3c2fd5f9e3bfda000996382fe11fa88 100644
Binary files a/packages/vtiger/mandatory/Services.zip and b/packages/vtiger/mandatory/Services.zip differ
diff --git a/packages/vtiger/mandatory/WSAPP.zip b/packages/vtiger/mandatory/WSAPP.zip
index e80ccf4192f425e8dcb93c459e6c70d5494fa39c..4c9d79559ba194579d7fee63291581d1a0341077 100644
Binary files a/packages/vtiger/mandatory/WSAPP.zip and b/packages/vtiger/mandatory/WSAPP.zip differ
diff --git a/packages/vtiger/marketplace/ExtensionStore.zip b/packages/vtiger/marketplace/ExtensionStore.zip
index 421f1f37e5857e0970abded28b78f5c5aead54ff..4f132d5fd748c3fc374dcee91e6ec6789d48e767 100644
Binary files a/packages/vtiger/marketplace/ExtensionStore.zip and b/packages/vtiger/marketplace/ExtensionStore.zip differ
diff --git a/packages/vtiger/optional/Arabic_ar_ae.zip b/packages/vtiger/optional/Arabic_ar_ae.zip
index f66e6328829d396f62fd840f827c5ef319d1f59a..9d99a06e674c076464cdc678a348a11cc216c310 100644
Binary files a/packages/vtiger/optional/Arabic_ar_ae.zip and b/packages/vtiger/optional/Arabic_ar_ae.zip differ
diff --git a/packages/vtiger/optional/Assets.zip b/packages/vtiger/optional/Assets.zip
index e58e3b846f2782d971a2a4bca93f96e761b13690..c7d24301373f345ebb1562d1457e389eb5b34d12 100644
Binary files a/packages/vtiger/optional/Assets.zip and b/packages/vtiger/optional/Assets.zip differ
diff --git a/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip b/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip
index 0c607aeec1e40debe87f8c51ade67ec5aa5041e1..89d3e451353a9a615c5aefd6e5ec0e97972932d0 100644
Binary files a/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip and b/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip differ
diff --git a/packages/vtiger/optional/BritishLanguagePack_br_br.zip b/packages/vtiger/optional/BritishLanguagePack_br_br.zip
index 28f6e07acbc2298bce12106e66242c1c1688d11f..147103a1cc1c12f737b1fe4e4c831c837d42e348 100644
Binary files a/packages/vtiger/optional/BritishLanguagePack_br_br.zip and b/packages/vtiger/optional/BritishLanguagePack_br_br.zip differ
diff --git a/packages/vtiger/optional/CustomerPortal.zip b/packages/vtiger/optional/CustomerPortal.zip
index f8f25e769373f85cef3e90adbab159cadbd1c8ac..3f071db4394c543550c0bbeffc499df4ea4f378f 100644
Binary files a/packages/vtiger/optional/CustomerPortal.zip and b/packages/vtiger/optional/CustomerPortal.zip differ
diff --git a/packages/vtiger/optional/Deutsch.zip b/packages/vtiger/optional/Deutsch.zip
index 0d7a6f0c0ce0e886e3ff095012f7714d3307f8ef..f09928442f30ecad8f7f9ec43c3bc3692f26f5ee 100644
Binary files a/packages/vtiger/optional/Deutsch.zip and b/packages/vtiger/optional/Deutsch.zip differ
diff --git a/packages/vtiger/optional/Dutch.zip b/packages/vtiger/optional/Dutch.zip
index 23679a435825cda05d6d36df1cb49ccdd0752b53..2cac9bb30070d721468a28180a813e4ea856cf43 100644
Binary files a/packages/vtiger/optional/Dutch.zip and b/packages/vtiger/optional/Dutch.zip differ
diff --git a/packages/vtiger/optional/EmailTemplates.zip b/packages/vtiger/optional/EmailTemplates.zip
index 8c96595e409849548a5858853dc8460fbadb1ea3..af8991810b3ab0092cb8005b76ccdc2d567cb58c 100644
Binary files a/packages/vtiger/optional/EmailTemplates.zip and b/packages/vtiger/optional/EmailTemplates.zip differ
diff --git a/packages/vtiger/optional/French.zip b/packages/vtiger/optional/French.zip
index a30379660cf4815ee102e23f2432ddc96236229c..bd153e23dc74cae6a8c252a9ecf5d4955343eafa 100644
Binary files a/packages/vtiger/optional/French.zip and b/packages/vtiger/optional/French.zip differ
diff --git a/packages/vtiger/optional/Google.zip b/packages/vtiger/optional/Google.zip
index 7d7f342af67ae7b525a0b2fe309c7a486390add5..5e0a23428557a2326f1b24053592a5f16aeb264e 100644
Binary files a/packages/vtiger/optional/Google.zip and b/packages/vtiger/optional/Google.zip differ
diff --git a/packages/vtiger/optional/Hungarian.zip b/packages/vtiger/optional/Hungarian.zip
index 283897d0e4fbadc08d2775baf634d02129cad25a..b065d52ed6242d1fa0e7db4a068f7025c4b3f40f 100644
Binary files a/packages/vtiger/optional/Hungarian.zip and b/packages/vtiger/optional/Hungarian.zip differ
diff --git a/packages/vtiger/optional/ItalianLanguagePack_it_it.zip b/packages/vtiger/optional/ItalianLanguagePack_it_it.zip
index 543a8b516fa43ef9c33087eadb46ffe4a966a889..83073beab04a9f9161d039d2c494ef58fd9584f5 100644
Binary files a/packages/vtiger/optional/ItalianLanguagePack_it_it.zip and b/packages/vtiger/optional/ItalianLanguagePack_it_it.zip differ
diff --git a/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip b/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip
index 816d870cede50c73b7c885223239a552a1ed39c7..7a9f0d028aaf0538e42b52298ec352a3c5b55d30 100644
Binary files a/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip and b/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip differ
diff --git a/packages/vtiger/optional/ModComments.zip b/packages/vtiger/optional/ModComments.zip
index d4dd7cbab25aef623993324db9131ca904261f51..adb1cc05e93e6449f3532de18a285b5175ab00bc 100644
Binary files a/packages/vtiger/optional/ModComments.zip and b/packages/vtiger/optional/ModComments.zip differ
diff --git a/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip b/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip
index 41acff3ae33b8af7a77524d17cdd99e356e870a8..54513f2a4c826a93bed88e4ef8694db8612c68fa 100644
Binary files a/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip and b/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip differ
diff --git a/packages/vtiger/optional/Projects.zip b/packages/vtiger/optional/Projects.zip
index 4baac1894023af01af4ba23c4f3046a05f73fd11..43a776ac53d56e75c4b9a10502526ad2e10a3a38 100644
Binary files a/packages/vtiger/optional/Projects.zip and b/packages/vtiger/optional/Projects.zip differ
diff --git a/packages/vtiger/optional/RecycleBin.zip b/packages/vtiger/optional/RecycleBin.zip
index 9a700f08b2327e87430659b72426ca48db2bcdb7..502c09b2dd6160f1d61caa59db7351dedad07c57 100644
Binary files a/packages/vtiger/optional/RecycleBin.zip and b/packages/vtiger/optional/RecycleBin.zip differ
diff --git a/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip b/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip
index 043f62ffdd1d6b3f3cc5183f2841a89fe83d8a95..2494066b43d663efb14dd7037c59b9c4def83da7 100644
Binary files a/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip and b/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip differ
diff --git a/packages/vtiger/optional/Russian.zip b/packages/vtiger/optional/Russian.zip
index 03222f1405420b5b6a7c39388534ffe19ed087fc..5e8deafb601668a1f93ac0030a10243bba4aad14 100644
Binary files a/packages/vtiger/optional/Russian.zip and b/packages/vtiger/optional/Russian.zip differ
diff --git a/packages/vtiger/optional/SMSNotifier.zip b/packages/vtiger/optional/SMSNotifier.zip
index 7c0fab9939e36be5780f9813f46522aae183670b..7a46d3ca7cf0054144f70faf29d6ce84cd7f9118 100644
Binary files a/packages/vtiger/optional/SMSNotifier.zip and b/packages/vtiger/optional/SMSNotifier.zip differ
diff --git a/packages/vtiger/optional/Spanish.zip b/packages/vtiger/optional/Spanish.zip
index 92e8c42fcb770f26ae9007399803bffdfa660da7..44156fe4cda93932d3e71be079253ce266fa8d8a 100644
Binary files a/packages/vtiger/optional/Spanish.zip and b/packages/vtiger/optional/Spanish.zip differ
diff --git a/packages/vtiger/optional/Sweden_sv_se.zip b/packages/vtiger/optional/Sweden_sv_se.zip
index 2a703890a409453b3072e43e5caaeba4ac8eb909..8edd2adc92e0fd880bdb7e51e6a6b1e8c1e42587 100644
Binary files a/packages/vtiger/optional/Sweden_sv_se.zip and b/packages/vtiger/optional/Sweden_sv_se.zip differ
diff --git a/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip b/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip
index 791d336c34c5e334ccdebc41615cb713efc9eb79..dcd1bb5239e59222f426ec535838bab992b22756 100644
Binary files a/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip and b/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip differ
diff --git a/packages/vtiger/optional/Webforms.zip b/packages/vtiger/optional/Webforms.zip
index 4e94d0dbee48f9ac426c9fd1f40d5b0e72d4d86a..5f1a5ce437462d0417c14902bf389fab3ae235b9 100644
Binary files a/packages/vtiger/optional/Webforms.zip and b/packages/vtiger/optional/Webforms.zip differ
diff --git a/pkg/vtiger/modules/ModComments/modules/ModComments/views/InRelation.php b/pkg/vtiger/modules/ModComments/modules/ModComments/views/InRelation.php
index 3f46bfb8762e05bf44ecd46642097ddc7cd678e0..07bcd349d87e486f764e0c5a5a930028b69e92da 100644
--- a/pkg/vtiger/modules/ModComments/modules/ModComments/views/InRelation.php
+++ b/pkg/vtiger/modules/ModComments/modules/ModComments/views/InRelation.php
@@ -27,6 +27,8 @@ class ModComments_InRelation_View extends Vtiger_RelatedList_View {
$startindex = $startindex + 10;
} else {
$parentCommentModels = ModComments_Record_Model::getAllParentComments($parentRecordId);
+
+
}
$currentCommentModel = null;
@@ -45,7 +47,6 @@ class ModComments_InRelation_View extends Vtiger_RelatedList_View {
$viewer->assign('FIELD_MODEL', $fileFieldModel);
$viewer->assign('MAX_UPLOAD_LIMIT_MB', Vtiger_Util_Helper::getMaxUploadSize());
$viewer->assign('MAX_UPLOAD_LIMIT_BYTES', Vtiger_Util_Helper::getMaxUploadSizeInBytes());
-
$viewer->assign('MODULE_NAME', $request->getModule());
$viewer->assign('MODULE_RECORD', $parentRecordId);
$viewer->assign('ROLLUP_STATUS', $rollupStatus);
diff --git a/vtigerversion.php b/vtigerversion.php
index 576391f7f6a5ef3b7139d0ee09be567ccf4edbd6..7988f163579cc6c13c6206a098e3847559b5bd3b 100644
--- a/vtigerversion.php
+++ b/vtigerversion.php
@@ -8,7 +8,7 @@
* All Rights Reserved.
************************************************************************************/
-$patch_version = '-20240505'; // -ve timestamp before release, +ve timestamp after release.
+$patch_version = '20240515'; // -ve timestamp before release, +ve timestamp after release.
$modified_database = '';
$vtiger_current_version = '8.2.0';
$_SESSION['vtiger_version'] = $vtiger_current_version;
diff --git a/vtlib/Vtiger/Functions.php b/vtlib/Vtiger/Functions.php
index 3037eca76daa9c75bb09fac744d06bbb7cc257c1..7fc4fd1072adad35b84bd91498d74006d64ca453 100644
--- a/vtlib/Vtiger/Functions.php
+++ b/vtlib/Vtiger/Functions.php
@@ -519,10 +519,12 @@ class Vtiger_Functions {
// Utility
static function formatDecimal($value){
$fld_value = $value;
- if(strpos($value, '.')) {
- $fld_value = rtrim($value, '0');
- }
- $value = rtrim($fld_value, '.');
+ if(!$value)return $value;
+ if(strpos($value, '.')) {
+ $fld_value = rtrim($value, '0');
+ }
+ $value = rtrim($fld_value, '.');
+
return $value;
}
@@ -1743,17 +1745,17 @@ class Vtiger_Functions {
$endchar = "";
// HTML embed in attributes (eg. img src="...").
- $startidx = strpos($input, '"data:', $offset);
+ $startidx = strpos(isset($input) ? $input: '', '"data:', $offset);
if ($startidx !== false) {
$endchar = '"';
} else {
// HTML embed in attributes (eg. img src='...').
- $startidx = strpos($input, "'data:", $offset);
+ $startidx = strpos(isset($input) ? $input: '', "'data:", $offset);
if ($startidx !== false) {
$endchar = "'";
} else {
// TEXT embed with wrap [eg. (data...)]
- $startidx = strpos($input, "(data:", $offset);
+ $startidx = strpos(isset($input) ? $input : '', "(data:", $offset);
if ($startidx !== false) {
$endchar = ")";
} else {
@@ -1782,7 +1784,7 @@ class Vtiger_Functions {
$offset = $endidx + 1;
} while (true);
- if ($offset < strlen($input)) {
+ if ($offset < strlen(isset($input) ? $input: '')) {
$parts[] = substr($input, $offset);
}
return implode("", $parts);