From 249720af92e8b9de7eb6c23f1ff1f03b4f1538dc Mon Sep 17 00:00:00 2001
From: yogeshwar <yogeshwar.g@vtigersolutions.com>
Date: Mon, 3 Jun 2024 18:55:55 +0530
Subject: [PATCH] E-all Settings -Other Settings
---
include/database/PearDatabase.php | 1 +
.../modules/Settings/MailConverter/Rule.tpl | 2 +-
.../modules/Settings/MailConverter/Step2.tpl | 2 +-
layouts/v7/modules/Vtiger/BreadCrumbs.tpl | 4 ++--
.../MailConverter/handlers/MailBox.php | 1 +
.../handlers/MailScannerAction.php | 1 +
.../handlers/MailScannerInfo.php | 4 +++-
.../MailConverter/models/RuleRecord.php | 21 ++++++++++++-------
8 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/include/database/PearDatabase.php b/include/database/PearDatabase.php
index ea06f9500..1e60d2a14 100644
--- a/include/database/PearDatabase.php
+++ b/include/database/PearDatabase.php
@@ -531,6 +531,7 @@ class PearDatabase{
function getRowCount(&$result){
global $log;
+ $rows='';
if(isset($result) && !empty($result))
$rows= $result->RecordCount();
return $rows;
diff --git a/layouts/v7/modules/Settings/MailConverter/Rule.tpl b/layouts/v7/modules/Settings/MailConverter/Rule.tpl
index 346434162..6b10c87c2 100644
--- a/layouts/v7/modules/Settings/MailConverter/Rule.tpl
+++ b/layouts/v7/modules/Settings/MailConverter/Rule.tpl
@@ -12,7 +12,7 @@
<div class="details border1px">
<div class="ruleHead modal-header" style="cursor: move; min-height: 30px; padding: 10px 0px;">
<strong>
- <img class="alignMiddle" src="{vimage_path('white-drag.png')}" style="margin-left: 10px;" /> {vtranslate('LBL_RULE', $QUALIFIED_MODULE)} <span class="sequenceNumber">{$RULE_COUNT}</span> : {vtranslate($RULE_MODEL->get('action'), $QUALIFIED_MODULE)}
+ <img class="alignMiddle" src="{vimage_path('white-drag.png')}" style="margin-left: 10px;" /> {vtranslate('LBL_RULE', $QUALIFIED_MODULE)} <span class="sequenceNumber">{(isset($RULE_COUNT)) ? $RULE_COUNT : ''}</span> : {vtranslate($RULE_MODEL->get('action'), $QUALIFIED_MODULE)}
<div class="pull-right" style="padding-right: 10px;">
{foreach from=$RULE_MODEL->getRecordLinks() item=ACTION_LINK}
<span {if stripos($ACTION_LINK->getUrl(), 'javascript:')===0}
diff --git a/layouts/v7/modules/Settings/MailConverter/Step2.tpl b/layouts/v7/modules/Settings/MailConverter/Step2.tpl
index 253e6d138..bf1c40ac6 100644
--- a/layouts/v7/modules/Settings/MailConverter/Step2.tpl
+++ b/layouts/v7/modules/Settings/MailConverter/Step2.tpl
@@ -8,7 +8,7 @@
************************************************************************************}
{strip}
- {if $IMAP_ERROR || $CONNECTION_ERROR}
+ {if (isset($IMAP_ERROR) && $IMAP_ERROR) || (isset($CONNECTION_ERROR) && $CONNECTION_ERROR)}
<div class="block">
<strong>
{if $IMAP_ERROR}
diff --git a/layouts/v7/modules/Vtiger/BreadCrumbs.tpl b/layouts/v7/modules/Vtiger/BreadCrumbs.tpl
index 74ea4350c..4f5bf922f 100644
--- a/layouts/v7/modules/Vtiger/BreadCrumbs.tpl
+++ b/layouts/v7/modules/Vtiger/BreadCrumbs.tpl
@@ -7,13 +7,13 @@
* All Rights Reserved.
*************************************************************************************}
-<div id="{$BREADCRUMB_ID}" class="breadcrumb">
+<div id="{(isset($BREADCRUMB_ID)) ? $BREADCRUMB_ID : ''}" class="breadcrumb">
<ul class="crumbs">
{assign var=ZINDEX value=9}
{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 {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}"
+ <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 isset($ACTIVESTEP) && $ACTIVESTEP eq $INDEX}active{/if}"
id="{$CRUMBID}" data-value="{$INDEX}" style="z-index:{$ZINDEX}">
<a href="#">
<span class="stepNum">{$INDEX}</span>
diff --git a/modules/Settings/MailConverter/handlers/MailBox.php b/modules/Settings/MailConverter/handlers/MailBox.php
index d02a8e9ec..a8ddc81c9 100644
--- a/modules/Settings/MailConverter/handlers/MailBox.php
+++ b/modules/Settings/MailConverter/handlers/MailBox.php
@@ -186,6 +186,7 @@ class Vtiger_MailBox {
$imapfolders = imap_list($this->_imap, $this->_imapurl, '*');
if($imapfolders) {
foreach($imapfolders as $imapfolder) {
+ if(!is_array($folders)) $folders = [];
$folders[] = substr($imapfolder, strlen($this->_imapurl));
}
} else {
diff --git a/modules/Settings/MailConverter/handlers/MailScannerAction.php b/modules/Settings/MailConverter/handlers/MailScannerAction.php
index f769f16b6..b799ae10f 100644
--- a/modules/Settings/MailConverter/handlers/MailScannerAction.php
+++ b/modules/Settings/MailConverter/handlers/MailScannerAction.php
@@ -20,6 +20,7 @@ require_once ('modules/Accounts/Accounts.php');
/**
* Mail Scanner Action
*/
+#[\AllowDynamicProperties]
class Vtiger_MailScannerAction {
// actionid for this instance
var $actionid = false;
diff --git a/modules/Settings/MailConverter/handlers/MailScannerInfo.php b/modules/Settings/MailConverter/handlers/MailScannerInfo.php
index df2612007..9d72f231a 100644
--- a/modules/Settings/MailConverter/handlers/MailScannerInfo.php
+++ b/modules/Settings/MailConverter/handlers/MailScannerInfo.php
@@ -51,6 +51,8 @@ class Vtiger_MailScannerInfo {
// Rules associated with this mail scanner
var $rules = false;
+ public $debug;
+
/**
* Constructor
*/
@@ -146,7 +148,7 @@ class Vtiger_MailScannerInfo {
function dateBasedOnMailServerTimezone($format='d-M-Y') {
$returnDate = NULL;
##--Fix for trac : http://trac.vtiger.com/cgi-bin/trac.cgi/ticket/8051-##
- if ($this->timezone && trim($this->timezone)) {
+ if (property_exists($this,'timezone') && $this->timezone && trim($this->timezone)) {
$currentTZ = date_default_timezone_get();
list ($tzhours, $tzminutes) = explode(':', trim($this->time_zone));
$returnDate = date($format, strtotime(sprintf("%s hours %s minutes", $tzhours, $tzminutes)));
diff --git a/modules/Settings/MailConverter/models/RuleRecord.php b/modules/Settings/MailConverter/models/RuleRecord.php
index f972356b8..2a6f17841 100644
--- a/modules/Settings/MailConverter/models/RuleRecord.php
+++ b/modules/Settings/MailConverter/models/RuleRecord.php
@@ -19,6 +19,7 @@ class Settings_MailConverter_RuleRecord_Model extends Settings_Vtiger_Record_Mod
var $cc = false;
var $bcc = false;
+ public $actions = [];
/**
* Function to get Id of this record instance
* @return <Integer> Id
@@ -153,12 +154,15 @@ class Settings_MailConverter_RuleRecord_Model extends Settings_Vtiger_Record_Mod
if ($actionString != $newActionString) {
$actionId = '';
$actions = $this->getActions();
+ $actionModel = '';
if ($actions) {
$actionModel = reset($this->getActions());
$actionId = $actionModel->actionid;
}
//Svaing the Action info
- $ruleModel->updateAction($actionModel->actionid, str_replace('_', ',', $newActionString));
+ if($actionId) {
+ $ruleModel->updateAction($actionModel->actionid, str_replace('_', ',', $newActionString));
+ }
}
return $ruleModel->ruleid;
}
@@ -186,8 +190,9 @@ class Settings_MailConverter_RuleRecord_Model extends Settings_Vtiger_Record_Mod
if ($db->num_rows($result)) {
$recordModel = new self();
$recordModel->setData($db->query_result_rowdata($result));
- $action = reset($recordModel->getActions());
- return $recordModel->set('action', str_replace(',', '_', $action->actiontext));
+ $actions=$recordModel->getActions();
+ $action = reset($actions);
+ return $recordModel->set('action', isset($action->actiontext) ? str_replace(',', '_', $action->actiontext) : '');
}
return false;
}
@@ -207,8 +212,9 @@ class Settings_MailConverter_RuleRecord_Model extends Settings_Vtiger_Record_Mod
$rowData = $db->query_result_rowdata($result,$i);
$ruleModel = new self();
$ruleModel->setData($rowData);
- $action = reset($ruleModel->getActions());
- $ruleModel->set('action', str_replace(',', '_', $action->actiontext));
+ $actions = $ruleModel->getActions();
+ $action = reset($actions);
+ $ruleModel->set('action', isset($action->actiontext) ? str_replace(',', '_', $action->actiontext) : '');
$assignedTo = Settings_MailConverter_RuleRecord_Model::getAssignedTo($rowData['scannerid'], $rowData['ruleid']);
$ruleModel->set('assigned_to', $assignedTo[1]);
$ruleModelsList[$rowData['ruleid']] = $ruleModel;
@@ -231,8 +237,9 @@ class Settings_MailConverter_RuleRecord_Model extends Settings_Vtiger_Record_Mod
$ruleModel->setData($rowData);
$assignedTo = Settings_MailConverter_RuleRecord_Model::getAssignedTo($scannerId, $ruleId);
$ruleModel->set('assigned_to', $assignedTo[1]);
- $action = reset($ruleModel->getActions());
- return $ruleModel->set('action', str_replace(',', '_', $action->actiontext));
+ $actions=$ruleModel->getActions();
+ $action = reset($actions);
+ return $ruleModel->set('action', isset($action->actiontext) ? str_replace(',', '_', $action->actiontext) : '');
}
return false;
}
--
GitLab