Skip to content

Commit

Permalink
Add EmailBody sugarfield
Browse files Browse the repository at this point in the history
  • Loading branch information
Dillon-Brown committed Jun 15, 2018
1 parent 48180f4 commit a60c60f
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 9 deletions.
67 changes: 67 additions & 0 deletions include/SugarFields/Fields/EmailBody/SugarFieldEmailBody.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?php
/**
*
* SugarCRM Community Edition is a customer relationship management program developed by
* SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2018 SalesAgility Ltd.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
* Free Software Foundation with the addition of the following permission added
* to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
* IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
* OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
* details.
*
* You should have received a copy of the GNU Affero General Public License along with
* this program; if not, see http://www.gnu.org/licenses or write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*
* You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
* SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
*
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU Affero General Public License version 3.
*
* In accordance with Section 7(b) of the GNU Affero General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "Powered by
* SugarCRM" logo and "Supercharged by SuiteCRM" logo. If the display of the logos is not
* reasonably feasible for technical reasons, the Appropriate Legal Notices must
* display the words "Powered by SugarCRM" and "Supercharged by SuiteCRM".
*/

if (!defined('sugarEntry') || !sugarEntry) {
die('Not A Valid Entry Point');
}

require_once dirname(__DIR__) . '/Base/SugarFieldBase.php';


class SugarFieldEmailBody extends SugarFieldBase
{

/**
* @param string $parentFieldArray
* @param array $vardef
* @param array $displayParams
* @param integer $tabindex
* @return string
*/
public function getDetailViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex)
{
$sugarCleaner = new SugarCleaner();
$vardef['value'] = $sugarCleaner::cleanHtml($this->getVardefValue($vardef));

$this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);

return $this->fetch($this->findTemplate('DetailView'));
}
}
10 changes: 2 additions & 8 deletions include/SugarFields/Fields/Html/SugarFieldHtml.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
die('Not A Valid Entry Point');
}

require_once dirname(__DIR__).'/Base/SugarFieldBase.php';
require_once dirname(__DIR__) . '/Base/SugarFieldBase.php';


class SugarFieldHtml extends SugarFieldBase
Expand All @@ -62,13 +62,7 @@ public function getDetailViewSmarty($parentFieldArray, $vardef, $displayParams,

$this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);

$module = $GLOBALS['module'];

if ($module === 'Emails') {
return $this->fetch($this->findTemplate('Emails/EmailDetailView'));
} else {
return $this->fetch($this->findTemplate('DetailView'));
}
return $this->fetch($this->findTemplate('DetailView'));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion modules/Emails/vardefs.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
),
'description_html' => array(
'name' => 'description_html',
'type' => 'html',
'type' => 'emailbody',
'vname' => 'description_html',
'source' => 'non-db',
'inline_edit' => false,
Expand Down

1 comment on commit a60c60f

@jamiemurray
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit breaks the DetailView of emails when using xampp. Specifically the vardefs.php change.

Please sign in to comment.