From 1f413762426daea49232701ebed69f7ca24188c8 Mon Sep 17 00:00:00 2001
From: root <you@example.com>
Date: Fri, 24 May 2024 17:14:57 +0530
Subject: [PATCH] Fixes : E_ALL Cleanups in Opportunities module
---
layouts/v7/modules/Vtiger/uitypes/Text.tpl | 8 ++++++--
modules/Vtiger/views/List.php | 21 ++++++++++-----------
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/layouts/v7/modules/Vtiger/uitypes/Text.tpl b/layouts/v7/modules/Vtiger/uitypes/Text.tpl
index 63ce500cf..31137741b 100644
--- a/layouts/v7/modules/Vtiger/uitypes/Text.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/Text.tpl
@@ -15,6 +15,10 @@
{if !isset($FIELD_NAME)}
{assign var="FIELD_NAME" value=$FIELD_MODEL->getFieldName()}
{/if}
+{assign var="fieldValue" value=purifyHtmlEventAttributes($FIELD_MODEL->get('fieldvalue'),true)}
+{if $fieldValue === null}
+ {assign var="fieldValue" value=""}
+{/if}
{if $FIELD_MODEL->get('uitype') eq '19' || $FIELD_MODEL->get('uitype') eq '20'}
<textarea rows="3" id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" class="inputElement textAreaElement col-lg-12 {if $FIELD_MODEL->isNameField()}nameField{/if}" name="{$FIELD_NAME}" {if $FIELD_NAME eq "notecontent"}id="{$FIELD_NAME}"{/if} {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if}
{if $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if}
@@ -22,7 +26,7 @@
data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}'
{/if}
>
- {purifyHtmlEventAttributes($FIELD_MODEL->get('fieldvalue'),true)|regex_replace:"/(?!\w)\ (?=\w)/":" "}
+ {$fieldValue|regex_replace:"/(?!\w)\ (?=\w)/":" "}
</textarea>
{else}
<textarea rows="5" id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" class="inputElement {if $FIELD_MODEL->isNameField()}nameField{/if}" name="{$FIELD_NAME}" {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if}
@@ -31,7 +35,7 @@
data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}'
{/if}
>
- {purifyHtmlEventAttributes($FIELD_MODEL->get('fieldvalue'),true)|regex_replace:"/(?!\w)\ (?=\w)/":" "}
+ {$fieldValue|regex_replace:"/(?!\w)\ (?=\w)/":" "}
</textarea>
{/if}
{/strip}
diff --git a/modules/Vtiger/views/List.php b/modules/Vtiger/views/List.php
index 324d7daa5..8e2c0a8a1 100644
--- a/modules/Vtiger/views/List.php
+++ b/modules/Vtiger/views/List.php
@@ -232,21 +232,20 @@ class Vtiger_List_View extends Vtiger_Index_View {
if(empty($orderBy) && empty($searchValue) && empty($pageNumber)) {
if($orderParams) {
- $pageNumber = $orderParams['page'] ?? "";
- $orderBy = $orderParams['orderby'] ?? "";
- $sortOrder = $orderParams['sortorder'] ?? "";
- $searchKey = $orderParams['search_key'] ?? "";
- $searchValue = $orderParams['search_value'] ?? "";
- $operator = $orderParams['operator'] ?? "";
- if(empty($tagParams)){
- $tagParams = $orderParams['tag_params'] ?? "";
+ $pageNumber = isset($orderParams['page']) ? $orderParams['page'] : "";
+ $orderBy = isset($orderParams['orderby']) ? $orderParams['orderby'] : "";
+ $sortOrder = isset($orderParams['sortorder']) ? $orderParams['sortorder'] : "";
+ $searchKey = isset($orderParams['search_key']) ? $orderParams['search_key'] : "";
+ $searchValue = isset($orderParams['search_value']) ? $orderParams['search_value'] : "";
+ $operator = isset($orderParams['operator']) ? $orderParams['operator'] : "";
+ if(empty($tagParams)){
+ $tagParams = isset($orderParams['tag_params']) ? $orderParams['tag_params'] : "";
}
if(empty($searchParams)) {
- $searchParams = $orderParams['search_params'] ?? "";
+ $searchParams = isset($orderParams['search_params']) ? $orderParams['search_params'] : "";
}
-
if(empty($starFilterMode)) {
- $starFilterMode = $orderParams['star_filter_mode'] ?? "";
+ $starFilterMode = isset($orderParams['star_filter_mode']) ? $orderParams['star_filter_mode'] : "";
}
}
} else if($request->get('nolistcache') != 1) {
--
GitLab