Skip to content
Snippets Groups Projects
Commit 7eba58fd authored by Prasad's avatar Prasad
Browse files

Fixes #1919: E_ALL warning of dashboard widgets

parent fb8ae91e
Branches forcomposer
No related tags found
No related merge requests found
......@@ -103,7 +103,7 @@ class Vtiger_Viewer extends Smarty {
$modifiers = array('vtranslate', 'vtlib_isModuleActive', 'vimage_path', 'strstr', 'stripos', 'strpos', 'date', 'vtemplate_path', 'vresource_url',
'html_entity_decode', 'decode_html', 'vtlib_purify', 'php7_count', 'getUserFullName', 'array_flip', 'explode', 'trim', 'array_push', 'array_merge',
'array_map', 'array_key_exists', 'get_class', 'vtlib_array', 'getDuplicatesPreventionMessage', 'htmlentities', 'purifyHtmlEventAttributes',
'getCurrencySymbolandCRate', 'mb_substr', 'isPermitted', 'getOwnerName', 'getEntityName', 'function_exists', 'php7_trim', 'php7_htmlentities',
'getCurrencySymbolandCRate', 'getProductBaseCurrency', 'mb_substr', 'isPermitted', 'getOwnerName', 'getEntityName', 'function_exists', 'php7_trim', 'php7_htmlentities',
'strtolower', 'strtoupper', 'str_replace', 'urlencode', 'getTranslatedCurrencyString', 'getTranslatedString', 'is_object', 'is_numeric','preg_match',
'php7_sizeof', 'method_exists','implode','mt_rand','substr','in_array','array_keys', 'json_decode', 'getCurrencyDecimalPlaces', 'number_format', 'isRecordExists');
foreach ($modifiers as $modifier) {
......
......@@ -12,7 +12,7 @@
{strip}
{if php7_count($DATA) gt 0 }
<input class="widgetData" type=hidden value='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($DATA))}' />
<input class="yAxisFieldType" type="hidden" value="{$YAXIS_FIELD_TYPE}" />
<input class="yAxisFieldType" type="hidden" value="{if isset($YAXIS_FIELD_TYPE)}$YAXIS_FIELD_TYPE{/if}" />
<div class="row" style="margin:0px 10px;">
<div class="col-lg-11">
<div class="widgetChartContainer" name='chartcontent' style="height:220px;min-width:300px; margin: 0 auto"></div>
......@@ -25,4 +25,4 @@
{vtranslate('LBL_NO')} {vtranslate($MODULE_NAME, $MODULE_NAME)} {vtranslate('LBL_MATCHED_THIS_CRITERIA')}
</span>
{/if}
{/strip}
\ No newline at end of file
{/strip}
......@@ -99,6 +99,7 @@ class HelpDesk_Module_Model extends Vtiger_Module_Model {
}
$params = array();
$dateFilterSql = '';
if(!empty($dateFilter)) {
$dateFilterSql = ' AND createdtime BETWEEN ? AND ? ';
//appended time frame and converted to db time zone in showwidget.php
......
......@@ -102,6 +102,7 @@ class Leads_Module_Model extends Vtiger_Module_Model {
}
$params = array();
$dateFilterSql = '';
if(!empty($dateFilter)) {
$dateFilterSql = ' AND createdtime BETWEEN ? AND ? ';
//appended time frame and converted to db time zone in showwidget.php
......@@ -186,6 +187,7 @@ class Leads_Module_Model extends Vtiger_Module_Model {
}
$params = array();
$dateFilterSql = '';
if(!empty($dateFilter)) {
$dateFilterSql = ' AND createdtime BETWEEN ? AND ? ';
//appended time frame and converted to db time zone in showwidget.php
......
......@@ -223,6 +223,8 @@ class Potentials_Module_Model extends Vtiger_Module_Model {
$db = PearDatabase::getInstance();
$params = array();
$dateFilterSql = '';
$closingdateFilterSql = '';
$params[] = $currentUser->getId();
if(!empty($closingdateFilter)) {
$closingdateFilterSql = ' AND closingdate BETWEEN ? AND ? ';
......
......@@ -80,7 +80,7 @@ class Vtiger_MailParser {
$nextName = $this->getNextNode($node);
$prevName = $this->getPrevNode($node);
$name = strtolower($node->nodeName);
$parentNodeName = $node->parentNode->nodeName ? strtolower($node->parentNode->nodeName) : '';
$parentNodeName = $node->parentNode && $node->parentNode->nodeName ? strtolower($node->parentNode->nodeName) : '';
$firstChildNode='';
$firstChildName='';
if($node->childNodes){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment