archive/salesagility_SuiteCRM
0
0
Fork 0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2025-03-16 06:13:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix-7.8.x' into hotfix

Browse source 
# Conflicts:
#	data/SugarBean.php
#	include/MVC/View/ViewFactory.php
#	include/MassUpdate.php
#	include/SearchForm/SearchForm2.php
#	include/SugarFields/Fields/Base/SugarFieldBase.php
#	include/SugarFields/Fields/Parent/SugarFieldParent.php
#	include/SugarFields/Parsers/MetaParser.php
#	include/SugarObjects/LanguageManager.php
#	include/Sugarpdf/SugarpdfFactory.php
#	include/database/DBManager.php
#	include/utils.php
#	install/installSystemCheck.php
#	modules/AOW_WorkFlow/aow_utils.php
#	modules/Calls/metadata/additionalDetails.php
#	modules/Campaigns/Charts.php
#	modules/Charts/code/Chart_lead_source_by_outcome.php
#	modules/Charts/code/Chart_my_pipeline_by_sales_stage.php
#	modules/Charts/code/Chart_outcome_by_month.php
#	modules/Charts/code/Chart_pipeline_by_lead_source.php
#	modules/Charts/code/Chart_pipeline_by_sales_stage.php
#	modules/DynamicFields/DynamicField.php
#	modules/Employees/EmployeeStatus.php
#	modules/FP_events/metadata/additionalDetails.php
#	modules/InboundEmail/InboundEmail.php
#	modules/Meetings/metadata/additionalDetails.php
#	modules/ModuleBuilder/MB/MBModule.php
#	modules/SavedSearch/SavedSearch.php
#	modules/Tasks/metadata/additionalDetails.php
#	suitecrm_version.php
This commit is contained in:
Dillon Brown 2017-12-01 10:57:52 +00:00
commit d145be0bd7
37 changed files with 617 additions and 467 deletions

6
data/SugarBean.php
View file

@ -736,8 +736,8 @@ class SugarBean
*
* Internal Function, do not override.
*/
public static function get_union_related_list($parentbean, $order_by = "", $sort_order = '', $where = "",
$row_offset = 0, $limit = -1, $max = -1, $show_deleted = 0, $subpanel_def = null)
public static function get_union_related_list($parentbean, $order_by = '', $sort_order = '', $where = '',
$row_offset = 0, $limit = -1, $max = -1, $show_deleted = 0, $subpanel_def= null)
{
if (is_null($subpanel_def)) {
$GLOBALS['log']->fatal('subpanel_def is null');
@ -1032,7 +1032,7 @@ class SugarBean
* @return array $fetched data.
*/
public function process_union_list_query($parent_bean, $query,
$row_offset, $limit = -1, $max_per_page = -1, $where = '', $subpanel_def = null, $query_row_count = '', $secondary_queries = array())
$row_offset, $limit = -1, $max_per_page = -1, $where = '', $subpanel_def= null, $query_row_count = '', $secondary_queries = array())
{
if (is_null($subpanel_def)) {
$GLOBALS['log']->fatal('subpanel_def is null');

23
include/Dashlets/DashletGenericDisplay.tpl
View file

@ -1,9 +1,12 @@
{*
/*********************************************************************************
/**
*
* 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 - 2017 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
@ -13,7 +16,7 @@
*
* 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
* 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
@ -30,14 +33,10 @@
*
* 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. If the display of the logo is not reasonably feasible for
* technical reasons, the Appropriate Legal Notices must display the words
* "Powered by SugarCRM".
********************************************************************************/
* 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".
*/
*}
{assign var="alt_start" value=$navStrings.start}
@ -194,7 +193,7 @@
<a title='{$editLinkString}' href='index.php?action=EditView&module={$pageData.bean.moduleDir}&record={$rowData.ID}&offset={$pageData.offsets.current+$smarty.foreach.rowIteration.iteration}&stamp={$pageData.stamp}&return_module=Home&return_action=index'>{sugar_getimage name="edit_inline.png" attr='border="0" ' alt="$alt_edit"}</a>
{/if}
{if $pageData.access.view}
<a title='{$viewLinkString}' href='index.php?action=DetailView&module={$params.module|default:$pageData.bean.moduleDir}&record={$rowData[$params.parent_id]|default:$rowData.ID}&offset={$pageData.offsets.current+$smarty.foreach.rowIteration.iteration}&stamp={$pageData.stamp}&return_module=Home&return_action=index' title="{sugar_translate label="LBL_VIEW_INLINE"}>{sugar_getimage name="view_inline.png" attr='border="0" ' alt="$alt_view"}</a>
<a title='{$viewLinkString}' href='index.php?action=DetailView&module={$params.module|default:$pageData.bean.moduleDir}&record={$rowData[$params.parent_id]|default:$rowData.ID}&offset={$pageData.offsets.current+$smarty.foreach.rowIteration.iteration}&stamp={$pageData.stamp}&return_module=Home&return_action=index' title="{sugar_translate label="LBL_VIEW_INLINE"}">{sugar_getimage name="view_inline.png" attr='border="0" ' alt="$alt_view"}</a>
{/if}
</td>
{/if}

18
include/ListView/ListViewSubPanel.php
View file

@ -5,7 +5,7 @@
* SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2016 SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@
*
* 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
* 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
@ -34,12 +34,13 @@
* 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".
* 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');
}
if (!defined('sugarEntry') || !sugarEntry) {
die('Not A Valid Entry Point');
}
/**
* ListView for the subpanel- list of many objects
@ -901,6 +902,3 @@
}
}
}
?>

50
include/MVC/View/ViewFactory.php
View file

@ -1,10 +1,11 @@
<?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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -15,7 +16,7 @@
*
* 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
* 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
@ -33,10 +34,13 @@
* 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".
********************************************************************************/
* 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');
}
/**
* ViewFactory
*
@ -49,13 +53,27 @@ require_once('include/MVC/View/SugarView.php');
* Sugar view factory
* @api
*/
class ViewFactory{
/**
* load the correct view
* @param string $type View Type
* @return valid view
*/
static function loadView($type = 'default', $module = '', $bean = null, $view_object_map = array(), $target_module=''){
class ViewFactory
{
/**
* Load the correct view
*
* @param string $type
* @param null $module
* @param null $bean
* @param array $view_object_map
* @param string $target_module
* @return a|null
*/
static function loadView(
$type = 'default',
$module = '',
$bean = null,
$view_object_map = array(),
$target_module = ''
)
{
$type = strtolower($type);
//first let's check if the module handles this view
@ -119,6 +137,7 @@ class ViewFactory{
if(file_exists('custom/include/MVC/View/views/'.$config_file_name)){
require_once('custom/include/MVC/View/views/'.$config_file_name);
$view_config_root_cstm = $view_config;
}
if(file_exists('include/MVC/View/views/'.$config_file_name)){
require_once('include/MVC/View/views/'.$config_file_name);
@ -254,4 +273,3 @@ class ViewFactory{
return new SugarView($bean, $view_object_map);
}
}
?>

51
include/MassUpdate.php
View file

@ -1,11 +1,11 @@
<?php
if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
/*********************************************************************************
/**
*
* 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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
*
* 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
* 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
@ -34,10 +34,13 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
* 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".
********************************************************************************/
* 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('include/EditView/EditView2.php');
@ -745,13 +748,14 @@ EOQ;
}
/**
* Add a generic widget to lookup Users.
* @param displayname Name to display in the popup window
* @param varname name of the variable
* @param id_name name of the id in vardef
* @param mod_type name of the module, either "Contact" or "Releases" currently
*/
function addUserName($displayname, $varname, $id_name, $mod_type){
* Add a generic widget to lookup Users
** @param string $displayname Name to display in the popup window
* @param string $varname name of the variable
* @param string $id_name name of the id in vardef
* @param string $mod_type name of the module, either "Contact" or "Releases" currently
*@return string
*/
publicfunction addUserName($displayname, $varname, $id_name, $mod_type= null){
global $app_strings;
if(empty($id_name))
@ -813,12 +817,13 @@ EOHTML;
/**
* Add a generic module popup selection popup window HTML code.
* Currently supports Contact and Releases
* @param displayname Name to display in the popup window
* @param varname name of the variable
* @param id_name name of the id in vardef
* @param mod_type name of the module, either "Contact" or "Releases" currently
*/
function addGenericModuleID($displayname, $varname, $id_name, $mod_type){
** @param string $displayname Name to display in the popup window
* @param string $varname Name of the variable
* @param string $id_name Name of the id in vardef
* @param string $mod_type Name of the module, either "Contact" or "Releases" currently
*@return string
*/
function addGenericModuleID($displayname, $varname, $id_name, $mod_type= null){
global $app_strings;
if(empty($id_name))
@ -1360,5 +1365,3 @@ EOQ;
return '';
}
}
?>

4
include/MySugar/tpls/addDashletsDialog.tpl
View file

@ -65,9 +65,9 @@
{/if}
{if $moduleName == 'Home'}
<div id="moduleDashlets" style="height:400px;display:;">
<div id="moduleDashlets" style="height:400px;">
<h3>{sugar_translate label='LBL_MODULES' module='Home'}</h3>
<div id="moduleDashletsList" style="height:394px;overflow:auto;display:;">
<div id="moduleDashletsList" style="height:394px;overflow:auto;">
<table width="95%">
{counter assign=rowCounter start=0 print=false}
{foreach from=$modules item=module}

9
include/SearchForm/SearchForm2.php
View file

@ -16,7 +16,7 @@
*
* 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
* 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
@ -34,10 +34,13 @@
* 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".
* 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('include/tabs.php');
require_once('include/ListView/ListViewSmarty.php');

26
include/SugarFields/Fields/Image/SugarFieldImage.php
View file

@ -1,10 +1,11 @@
<?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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -15,7 +16,7 @@
*
* 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
* 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
@ -33,15 +34,20 @@
* 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".
********************************************************************************/
* 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('include/SugarFields/Fields/File/SugarFieldFile.php');
class SugarFieldImage extends SugarFieldFile
{
function getListViewSmarty($parentFieldArray, $vardef, $displayParams, $col) {
public function getListViewSmarty($parentFieldArray, $vardef, $displayParams, $col)
{
if(isset($displayParams['module']) && !empty($displayParams['module'])){
$this->ss->assign("module", $displayParams['module']);
@ -163,5 +169,3 @@ class SugarFieldImage extends SugarFieldFile
}
}
}
?>

10
include/SugarFields/Fields/Parent/SugarFieldParent.php
View file

@ -34,15 +34,12 @@
* 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) {
* 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('include/SugarFields/Fields/Relate/SugarFieldRelate.php');
class SugarFieldParent extends SugarFieldRelate
@ -219,7 +216,6 @@ class SugarFieldParent extends SugarFieldRelate
*/
public function createQuickSearchCode($formName = 'EditView', $vardef = array())
{
require_once('include/QuickSearchDefaults.php');
$json = getJSONobj();

39
include/SugarFields/Parsers/MetaParser.php
View file

@ -1,11 +1,11 @@
<?php
if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
/*********************************************************************************
/**
*
* 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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
*
* 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
* 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
@ -34,10 +34,13 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
* 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".
********************************************************************************/
* 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');
}
/**
* MetaParser.php
@ -151,8 +154,10 @@ function getTagAttribute($name, $contents, $filter = '') {
* Returns an Array of the tables found in the file. If $tableClass parameter
* is supplied, it'll return only those tables that have a matching class attribute
* equal to $tableClass
* @param $tableClass Optional table class parameter value
* @return Array of table elements found
*
* @param null $tableClass Optional table class parameter value
* @param null $contents
* @return array|false of table elements found
*/
function getTables($tableClass = null, $contents = '') {
preg_match_all("'(<table[^>]*?>)(.*?)(</table[^>]*?>)'si", $contents, $matches, PREG_SET_ORDER);
@ -552,7 +557,15 @@ function applyPostRules($moduleDir, $panels) {
return $panels;
}
function createFileContents($moduleDir, $panels, $templateMeta=array()) {
/**
* @param $moduleDir
* @param $panels
* @param array $templateMeta
* @param null $htmlFilePath
* @return mixed|string
*/
public function createFileContents($moduleDir, $panels, $templateMeta = array(), $htmlFilePath = null)
{
$header = "<?php\n\n";
@ -824,4 +837,4 @@ function findSingleVardefElement($formElements=array(), $vardefs=array()) {
}
?>

23
include/SugarObjects/LanguageManager.php
View file

@ -1,10 +1,11 @@
<?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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -15,7 +16,7 @@
*
* 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
* 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
@ -33,10 +34,13 @@
* 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".
********************************************************************************/
* 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');
}
/**
* Language files management
* @api
@ -155,7 +159,8 @@ class LanguageManager
* @param string module_dir the module_dir to clear
* @param string lang the name of the language file we are clearing this is for sugar_cache
*/
static function _clearCache($module_dir, $lang){
private static function _clearCache($module_dir, $lang = null)
{
if(!empty($module_dir) && !empty($lang)){
$file = sugar_cached('modules/').$module_dir.'/language/'.$lang.'.lang.php';
if(file_exists($file)){

38
include/Sugarpdf/SugarpdfFactory.php
View file

@ -1,11 +1,11 @@
<?php
if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
/*********************************************************************************
/**
*
* 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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
*
* 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
* 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
@ -34,26 +34,39 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
* 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".
********************************************************************************/
* 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('include/Sugarpdf/Sugarpdf.php');
class SugarpdfFactory{
class SugarpdfFactory
{
/**
* load the correct Tcpdf
* @param string $type Tcpdf Type
* @return valid Tcpdf
*/
function loadSugarpdf($type, $module, $bean = null, $sugarpdf_object_map = array()){
/**
* Load the correct Tcpdf
*
* @param string $type
* @param null|string $module
* @param null|array $bean
* @param array $sugarpdf_object_map
* @return a|null|Sugarpdf
*/
public function loadSugarpdf($type, $module = null, $bean = null, $sugarpdf_object_map = array())
{
// set $type = 'default' by default
if (empty($type)) {
$type = 'default';
}
$type = strtolower(basename($type));
//SugarpdfFactory::_loadConfig($sugarpdf, $type);
//first let's check if the module handles this Tcpdf
@ -152,4 +165,3 @@ class SugarpdfFactory{
return new Sugarpdf($bean, $sugarpdf_object_map);
}
}
?>

24
include/database/DBManager.php
View file

@ -1318,7 +1318,8 @@ abstract class DBManager
* @deprecated
*
* @param SugarBean $bean the bean from which table we will generate insert stmts
* @param string $select_query the query which will give us the set of objects we want to place into our insert statement
* @param string $select_query the query which will give us the set of objects that
* we want to place into our insert statement
* @param int $start the first row to query
* @param int $count the number of rows to query
* @param string $table the table to query from
@ -2628,22 +2629,21 @@ abstract class DBManager
}
}
/**
* Returns SQL defintions for all columns in a table
*
* @param array $fieldDefs Vardef-format field def
* @param bool $ignoreRequired Optional, true if we should ignor this being a required field
* @param string $tablename Optional, table name
* @return string SQL column definitions
*/
protected function columnSQLRep($fieldDefs, $ignoreRequired, $tablename)
{
/**
* Returns SQL defintions for all columns in a table
*
* @param array $fieldDefs Vardef-format field def
* @param bool $ignoreRequired Optional, true if we should ignor this being a required field
* @param string $tablename Optional, table name
* @return string SQL column definitions
*/
protected function columnSQLRep($fieldDefs, $ignoreRequired , $tablename= null){
// set $ignoreRequired = false by default
if (!is_bool($ignoreRequired)) {
$ignoreRequired = false;
}
$columns = array();
$columns = array();
if ($this->isFieldArray($fieldDefs)) {
foreach ($fieldDefs as $fieldDef) {

49
include/utils.php
View file

@ -38,6 +38,10 @@
* display the words "Powered by SugarCRM" and "Supercharged by SuiteCRM".
*/
if (!defined('sugarEntry') || !sugarEntry) {
die('Not A Valid Entry Point');
}
require_once 'php_version.php';
require_once 'include/SugarObjects/SugarConfig.php';
require_once 'include/utils/security_utils.php';
@ -2631,7 +2635,14 @@ function values_to_keys($array)
return $new_array;
}
function clone_relationship(&$db, $tables, $from_column, $from_id, $to_id)
/**
* @param $db
* @param array $tables
* @param $from_column
* @param $from_id
* @param $to_id
*/
function clone_relationship(&$db, $tables, $from_column = null, $from_id = null, $to_id = null)
{
foreach ((array)$tables as $table) {
if ($table == 'emails_beans') {
@ -2805,8 +2816,23 @@ function number_empty($value)
return empty($value) && $value != '0';
}
function get_bean_select_array($add_blank, $bean_name, $display_columns, $where = '', $order_by = '', $blank_is_none = false)
{
/**
* @param bool $add_blank
* @param $bean_name
* @param $display_columns
* @param string $where
* @param string $order_by
* @param bool $blank_is_none
* @return array
*/
function get_bean_select_array(
$add_blank,
$bean_name = null,
$display_columns = null,
$where = '',
$order_by = '',
$blank_is_none = false
) {
global $beanFiles;
// set $add_blank = true by default
@ -4198,8 +4224,21 @@ function getTrackerSubstring($name)
return $chopped;
}
function generate_search_where($field_list, $values, &$bean, $add_custom_fields = false, $module = '')
{
/**
* @param array $field_list
* @param array $values
* @param array $bean
* @param bool $add_custom_fields
* @param string $module
* @return array
*/
function generate_search_where(
$field_list,
$values,
&$bean = null,
$add_custom_fields = false,
$module = ''
) {
$where_clauses = array();
$like_char = '%';
$table_name = $bean->object_name;

80
include/utils/additional_details.php
View file

@ -1,42 +1,46 @@
<?php
if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
/*********************************************************************************
* SugarCRM Community Edition is a customer relationship management program developed by
* SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
/**
*
* 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 - 2017 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".
*/
* SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd.
* Copyright (C) 2011 - 2014 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');
}
function additional_details($fields, SugarBean $bean, $params) {
@ -98,5 +102,3 @@
);
}
?>

38
install/installSystemCheck.php
View file

@ -1,11 +1,11 @@
<?php
if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
/*********************************************************************************
/**
*
* 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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
*
* 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
* 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
@ -34,22 +34,31 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
* 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".
********************************************************************************/
* 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');
}
$_SESSION['setup_license_accept'] = true;
function runCheck($install_script, $mod_strings){
installLog("Begin System Check Process *************");
/**
* @param bool $install_script
* @param array $mod_strings
* @return string
*/
function runCheck($install_script, $mod_strings = array())
{
installLog('Begin System Check Process *************');
if( !isset( $install_script ) || !$install_script ){
installLog("Error:: ".$mod_strings['ERR_NO_DIRECT_SCRIPT']);
if (!isset($install_script) || !$install_script) {
installLog('Error:: ' . $mod_strings['ERR_NO_DIRECT_SCRIPT']);
die($mod_strings['ERR_NO_DIRECT_SCRIPT']);
}
if(!defined('SUGARCRM_MIN_MEM')) {
if (!defined('SUGARCRM_MIN_MEM')) {
define('SUGARCRM_MIN_MEM', 40);
}
@ -413,4 +422,3 @@ EOQ;
}
//// END PAGEOUTPUT
///////////////////////////////////////////////////////////////////////////////
?>

12
modules/AOW_WorkFlow/aow_utils.php
View file

@ -581,8 +581,16 @@ function getModuleField($module, $fieldname, $aow_field, $view='EditView',$value
}
function getDateField($module, $aow_field, $view, $value, $field_option = true){
/**
* @param string $module
* @param string $aow_field
* @param string $view
* @param $value
* @param bool $field_option
* @return string
*/
function getDateField($module, $aow_field, $view, $value = null, $field_option = true)
{
global $app_list_strings;
// set $view = 'EditView' as default

25
modules/Calls/metadata/additionalDetails.php
View file

@ -1,11 +1,11 @@
<?php
if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
/*********************************************************************************
/**
*
* 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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
*
* 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
* 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
@ -34,14 +34,19 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
* 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".
********************************************************************************/
* 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 "include/utils/additional_details.php";
function additionalDetailsCall($fields, SugarBean $bean, $params = array()) {
function additionalDetailsCall($fields, SugarBean $bean = null, $params = array())
{
return additional_details($fields, $bean, $params);
}

58
modules/Campaigns/Charts.php
View file

@ -1,11 +1,11 @@
<?php
if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
/*********************************************************************************
/**
*
* 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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
*
* 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
* 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
@ -34,21 +34,16 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
* 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".
********************************************************************************/
/*********************************************************************************
* Description: Includes the functions for Customer module specific charts.
********************************************************************************/
* 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('include/SugarCharts/SugarChartFactory.php');
class campaign_charts {
/**
* Creates opportunity pipeline image as a VERTICAL accumlated bar graph for multiple users.
@ -58,7 +53,16 @@ class campaign_charts {
* Contributor(s): ______________________________________..
*/
function campaign_response_by_activity_type($datay= array(),$targets=array(),$campaign_id = null, $cache_file_name='a_file', $refresh=false, $marketing_id='') {
/**
* @param array $datay
* @param array $targets
* @param null|string $campaign_id
* @param string $cache_file_name
* @param bool $refresh
* @param string $marketing_id
* @return string
*/
publicfunction campaign_response_by_activity_type($datay= array(),$targets=array(),$campaign_id= null, $cache_file_name='a_file', $refresh=false, $marketing_id='') {
global $app_strings, $mod_strings, $charset, $lang, $barChartColors,$app_list_strings;
if ($campaign_id) {
@ -183,9 +187,20 @@ class campaign_charts {
return $return;
}
//campaign roi computations.
function campaign_response_roi($datay= array(),$targets=array(),$campaign_id = null, $cache_file_name='a_file', $refresh=false,$marketing_id='',$is_dashlet=false,$dashlet_id='') {
global $app_strings,$mod_strings, $current_module_strings, $charset, $lang, $app_list_strings, $current_language,$sugar_config;
/**
* Campaign roi computations.
*
* @param array $datay
* @param array $targets
* @param string|null $campaign_id
* @param string $cache_file_name
* @param bool $refresh
* @param string $marketing_id
* @param bool $is_dashlet
* @param string $dashlet_id
* @return string
*/function campaign_response_roi($datay= array(),$targets=array(),$campaign_id= null, $cache_file_name='a_file', $refresh=false,$marketing_id='',$is_dashlet=false,$dashlet_id=''
) {global $app_strings,$mod_strings, $current_module_strings, $charset, $lang, $app_list_strings, $current_language,$sugar_config;
$not_empty = false;
@ -475,4 +490,3 @@ class campaign_charts {
return $return;
}
}// end charts class
?>

49
modules/Charts/code/Chart_lead_source_by_outcome.php
View file

@ -1,11 +1,11 @@
<?php
if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
/*********************************************************************************
/**
*
* 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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
*
* 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
* 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
@ -34,23 +34,16 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
* 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".
********************************************************************************/
/*********************************************************************************
* Description: returns HTML for client-side image map.
* Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
* All Rights Reserved.
* Contributor(s): ______________________________________..
********************************************************************************/
* 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('include/charts/Charts.php');
class Chart_lead_source_by_outcome
{
var $modules = array('Opportunities');
@ -230,13 +223,19 @@ global $timedate;
* All Rights Reserved..
* Contributor(s): ______________________________________..
*/
function gen_xml($datay=array('foo','bar'), $user_id=array('1'), $cache_file_name='a_file', $refresh=false,$current_module_strings = array()) {
public function gen_xml(
$datay = array('foo', 'bar'),
$user_id = array('1'),
$cache_file_name = 'a_file',
$refresh = false,
$current_module_strings = null
) {
global $app_strings, $charset, $lang, $barChartColors,$app_list_strings, $current_user, $current_language;
// set $current_module_strings to 'Charts' module strings by default
if (empty($current_module_strings)) {
$current_module_strings = return_module_language($current_language, 'Charts');
}
// set $current_module_strings to 'Charts' module strings by default
if (empty($current_module_strings)) {
$current_module_strings = return_module_language($current_language, 'Charts');
}
$kDelim = $current_user->getPreference('num_grp_sep');
@ -467,5 +466,3 @@ global $timedate;
return array( 'lead_source', 'sales_stage' );
}
}
?>

72
modules/Charts/code/Chart_my_pipeline_by_sales_stage.php
View file

@ -1,11 +1,11 @@
<?php
if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
/*********************************************************************************
/**
*
* 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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
*
* 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
* 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
@ -34,19 +34,13 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
* 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".
********************************************************************************/
/*********************************************************************************
* Description: returns HTML for client-side image map.
* Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
* All Rights Reserved.
* Contributor(s): ______________________________________..
********************************************************************************/
* 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("include/charts/Charts.php");
require_once("modules/Charts/code/Chart_pipeline_by_sales_stage.php");
@ -232,20 +226,36 @@ echo "<P align='center'><span class='chartFootnote'>".$current_module_strings['L
<?php
echo get_validate_chart_js();
/**
* Creates opportunity pipeline image as a HORIZONTAL accumlated BAR GRAPH for multiple users.
* param $datax- the sales stage data to display in the x-axis
* Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
* All Rights Reserved..
* Contributor(s): ______________________________________..
*/
function gen_xml_pipeline_by_sales_stage($datax=array('foo','bar'), $date_start='2071-10-15', $date_end='2071-10-15', $user_id=array('1'), $cache_file_name='a_file', $refresh=false,$chart_size='hBarF',$current_module_strings = array()) {
/**
* Creates opportunity pipeline image as a HORIZONTAL accumlated BAR GRAPH for multiple users.
* param $datax- the sales stage data to display in the x-axi
*
* @param array $datax
* @param string $date_start
* @param string $date_end
* @param array $user_id
* @param string $cache_file_name
* @param bool $refresh
* @param string $chart_size
* @param null $current_module_strings
* @return mixed
*/
function gen_xml_pipeline_by_sales_stage(
$datax = array('foo', 'bar'),
$date_start = '2071-10-15',
$date_end = '2071-10-15',
$user_id = array('1'),
$cache_file_name = 'a_file',
$refresh = false,
$chart_size = 'hBarF',
$current_module_strings = null
) {
global $app_strings, $charset, $lang, $barChartColors, $current_user, $current_language;
// set $current_module_strings to 'Charts' module strings by default
if (empty($current_module_strings)) {
$current_module_strings = return_module_language($current_language, 'Charts');
}
// set $current_module_strings to 'Charts' module strings by default
if (empty($current_module_strings)) {
$current_module_strings = return_module_language($current_language, 'Charts');
}
$kDelim = $current_user->getPreference('num_grp_sep');
global $timedate;
@ -498,5 +508,3 @@ echo get_validate_chart_js();
function constructGroupBy(){
return array('sales_stage');
}
?>

48
modules/Charts/code/Chart_outcome_by_month.php
View file

@ -1,11 +1,11 @@
<?php
if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
/*********************************************************************************
/**
*
* 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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
*
* 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
* 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
@ -34,21 +34,16 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
* 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".
********************************************************************************/
/*********************************************************************************
* Description: returns HTML for client-side image map.
********************************************************************************/
* 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('include/charts/Charts.php');
class Chart_outcome_by_month
{
var $modules = array('Opportunities');
@ -239,13 +234,20 @@ echo get_validate_chart_js();
* All Rights Reserved..
* Contributor(s): ______________________________________..
*/
function gen_xml($date_start='1971-10-15', $date_end='2010-10-15', $user_id=array('1'), $cache_file_name='a_file', $refresh=false,$current_module_strings = array()) {
public function gen_xml(
$date_start = '1971-10-15',
$date_end = '2010-10-15',
$user_id = array('1'),
$cache_file_name = 'a_file',
$refresh = false,
$current_module_strings = null
) {
global $app_strings, $app_list_strings, $charset, $lang, $barChartColors, $current_user, $current_language;
// set $current_module_strings to 'Charts' module strings by default
if (empty($current_module_strings)) {
$current_module_strings = return_module_language($current_language, 'Charts');
}
// set $current_module_strings to 'Charts' module strings by default
if (empty($current_module_strings)) {
$current_module_strings = return_module_language($current_language, 'Charts');
}
$kDelim = $current_user->getPreference('num_grp_sep');
global $timedate;
@ -478,5 +480,3 @@ echo get_validate_chart_js();
}
}
?>

47
modules/Charts/code/Chart_pipeline_by_lead_source.php
View file

@ -1,11 +1,11 @@
<?php
if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
/*********************************************************************************
/**
*
* 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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
*
* 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
* 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
@ -34,24 +34,16 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
* 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".
********************************************************************************/
/*********************************************************************************
* Description: returns HTML for client-side image map.
* Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
* All Rights Reserved.
* Contributor(s): ______________________________________..
********************************************************************************/
* 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('include/charts/Charts.php');
class Chart_pipeline_by_lead_source
{
var $order = 0;
@ -224,13 +216,19 @@ global $timedate;
* All Rights Reserved..
* Contributor(s): ______________________________________..
*/
function gen_xml($legends=array('foo','bar'), $user_id=array('1'), $cache_file_name='a_file', $refresh=true,$current_module_strings = array()) {
public function gen_xml(
$legends = array('foo', 'bar'),
$user_id = array('1'),
$cache_file_name = 'a_file',
$refresh = true,
$current_module_strings = null
) {
global $app_strings, $charset, $lang, $pieChartColors, $current_user, $current_language;
// set $current_module_strings to 'Charts' module strings by default
if (empty($current_module_strings)) {
$current_module_strings = return_module_language($current_language, 'Charts');
}
if (empty($current_module_strings)) {
$current_module_strings = return_module_language($current_language, 'Charts');
}
$kDelim = $current_user->getPreference('num_grp_sep');
@ -450,4 +448,3 @@ global $timedate;
return array( 'lead_source', );
}
}
?>

52
modules/Charts/code/Chart_pipeline_by_sales_stage.php
View file

@ -1,11 +1,11 @@
<?php
if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
/*********************************************************************************
/**
*
* 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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
*
* 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
* 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
@ -34,25 +34,16 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
* 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".
********************************************************************************/
/*********************************************************************************
* Description: returns HTML for client-side image map.
* Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
* All Rights Reserved.
* Contributor(s): ______________________________________..
********************************************************************************/
* 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('include/charts/Charts.php');
class Chart_pipeline_by_sales_stage
{
var $modules = array('Opportunities');
@ -309,13 +300,22 @@ echo get_validate_chart_js();
* All Rights Reserved..
* Contributor(s): ______________________________________..
*/
function gen_xml($datax=array('foo','bar'), $date_start='2071-10-15', $date_end='2071-10-15', $user_id=array('1'), $cache_file_name='a_file', $refresh=false,$chart_size='hBarF',$current_module_strings = array()) {
public function gen_xml(
$datax = array('foo', 'bar'),
$date_start = '2071-10-15',
$date_end = '2071-10-15',
$user_id = array('1'),
$cache_file_name = 'a_file',
$refresh = false,
$chart_size = 'hBarF',
$current_module_strings = null
) {
global $app_strings, $charset, $lang, $barChartColors, $current_user, $current_language;
// set $current_module_strings to 'Charts' module strings by default
if (empty($current_module_strings)) {
$current_module_strings = return_module_language($current_language, 'Charts');
}
if (empty($current_module_strings)) {
$current_module_strings = return_module_language($current_language, 'Charts');
}
$kDelim = $current_user->getPreference('num_grp_sep');
@ -635,5 +635,3 @@ $GLOBALS['log']->debug($datax);
}
}
?>

20
modules/DynamicFields/DynamicField.php
View file

@ -1,16 +1,11 @@
<?php
if (!defined('sugarEntry') || !sugarEntry) {
die('Not A Valid Entry Point');
}
/**
*
* 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 - 2016 SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -21,7 +16,7 @@ if (!defined('sugarEntry') || !sugarEntry) {
*
* 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
* 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
@ -39,9 +34,14 @@ if (!defined('sugarEntry') || !sugarEntry) {
* 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".
* 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');
}
class DynamicField
{
public $use_existing_labels = false; // this value is set to true by install_custom_fields() in ModuleInstaller.php; everything else expects it to be false
@ -131,7 +131,7 @@ class DynamicField
* @param $key
* @param $value
*/
public function setLabel($language, $key, $value)
public function setLabel($language, $key = null, $value = null)
{
// set $language = 'en_us' as default
if (!$language) {

7
modules/EmailTemplates/EmailTemplate.php
View file

@ -766,7 +766,12 @@ class EmailTemplate extends SugarBean
foreach ($replacement as $key => $value) {
// @see defect #48641
if ('multienum' == $field_def['type']) {
$value = implode(', ', unencodeMultienum($value));
$mVals = unencodeMultienum($value);
$translatedVals = array();
foreach($mVals as $mVal){
$translatedVals[] = translate($field_def['options'], $focus->module_dir, $mVal);
}
$value = implode(", ", $translatedVals);
}
$data[$key] = $value;
}

33
modules/Employees/EmployeeStatus.php
View file

@ -1,11 +1,11 @@
<?php
if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
/*********************************************************************************
/**
*
* 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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
*
* 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
* 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
@ -34,13 +34,13 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
* 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".
********************************************************************************/
* 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');
}
/**
* EmployeeStatus.php
@ -48,8 +48,8 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
* @see modules/Users/vardefs.php (employee_status)
* @author Collin Lee
*/
function getEmployeeStatusOptions($focus, $name = 'employee_status', $value = null, $view = 'DetailView') {
function getEmployeeStatusOptions($focus, $name = 'employee_status', $value = null, $view = 'DetailView')
{
global $current_user, $app_list_strings;
@ -78,7 +78,8 @@ function getEmployeeStatusOptions($focus, $name = 'employee_status', $value = nu
}
function getMessengerTypeOptions($focus, $name = 'messenger_type', $value = null, $view = 'DetailView') {
function getMessengerTypeOptions($focus, $name = 'messenger_type', $value = null, $view = 'DetailView')
{
global $current_user, $app_list_strings;
if($view == 'EditView' || $view == 'MassUpdate') {
$messenger_type = "<select name=\"$name\">";
@ -89,5 +90,3 @@ function getMessengerTypeOptions($focus, $name = 'messenger_type', $value = null
return $app_list_strings['messenger_type_dom'][$focus->messenger_type];
}
?>

25
modules/FP_events/metadata/additionalDetails.php
View file

@ -1,11 +1,11 @@
<?php
if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
/*********************************************************************************
/**
*
* 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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
*
* 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
* 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
@ -34,14 +34,19 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
* 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".
********************************************************************************/
* 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 "include/utils/additional_details.php";
function additionalDetailsFP_events($fields, SugarBean $bean, $params = array()) {
function additionalDetailsFP_events($fields, SugarBean $bean = null, $params = array())
{
return additional_details($fields, $bean, $params);
}

11
modules/InboundEmail/InboundEmail.php
View file

@ -16,7 +16,7 @@
*
* 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
* 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
@ -34,14 +34,17 @@
* 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".
* 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');
}
if (!defined('sugarEntry') || !sugarEntry) {
die('Not A Valid Entry Point');
}
require_once('include/OutboundEmail/OutboundEmail.php');
require_once('modules/InboundEmail/Overview.php');
@ -4095,7 +4098,7 @@ class InboundEmail extends SugarBean
* @param array $breadcrumb Default 0, build up of the parts mapping
* @param bool $forDisplay Default false
*/
function saveAttachments($msgNo, $parts, $emailId, $breadcrumb, $forDisplay) {
publicfunction saveAttachments($msgNo, $parts, $emailId, $breadcrumb, $forDisplay= null) {
global $sugar_config;
/*
Primary body types for a part of a mail structure (imap_fetchstructure returned object)

27
modules/Meetings/metadata/additionalDetails.php
View file

@ -1,11 +1,11 @@
<?php
if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
/*********************************************************************************
/**
*
* 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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
*
* 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
* 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
@ -34,15 +34,18 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
* 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".
********************************************************************************/
* 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 "include/utils/additional_details.php";
function additionalDetailsMeeting($fields, SugarBean $bean, $params = array()) {
function additionalDetailsMeeting($fields, SugarBean $bean = null, $params = array())
{
return additional_details($fields, $bean, $params);
}
?>

40
modules/ModuleBuilder/MB/MBModule.php
View file

@ -1,10 +1,11 @@
<?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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -15,7 +16,7 @@
*
* 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
* 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
@ -33,9 +34,13 @@
* 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".
********************************************************************************/
* 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');
}
define ( 'MB_TEMPLATES', 'include/SugarObjects/templates' ) ;
define ( 'MB_IMPLEMENTS', 'include/SugarObjects/implements' ) ;
@ -207,18 +212,18 @@ class MBModule
return $this->mblanguage->getModStrings ( $language ) ;
}
function setModStrings ($language, $mod_strings)
function setModStrings ($language , $mod_strings= array())
{
// set $language = 'en_us' as default
if (!$language) {
$language = 'en_us';
}
$language .= '.lang.php' ;
$this->mblanguage->strings [ $language ] = $mod_strings ;
$language .= '.lang.php';
$this->mblanguage->strings [$language] = $mod_strings;
}
function setLabel ($language, $key , $value)
function setLabel ($language , $key , $value= null)
{
// set $language = 'en_us' as default
if (!$language) {
@ -235,7 +240,7 @@ class MBModule
}
}
function deleteLabel ($language, $key)
function deleteLabel ($language , $key= null)
{
// set $language = 'en_us' as default
if (!$language) {
@ -258,7 +263,7 @@ class MBModule
$this->save();
}
function getLabel ($language, $key)
function getLabel ($language , $key= null)
{
// set $language = 'en_us' as default
if (!$language) {
@ -280,7 +285,7 @@ class MBModule
return $this->mblanguage->getAppListStrings ( $language ) ;
}
function setAppListStrings ($language, $app_list_strings)
function setAppListStrings ($language , $app_list_strings= array())
{
// set $language = 'en_us' as default
if (!$language) {
@ -290,7 +295,7 @@ class MBModule
$this->mblanguage->appListStrings [ $language ] = $app_list_strings ;
}
function setDropDown ($language, $key , $value)
function setDropDown ($language , $key = null, $value= null)
{
// set $language = 'en_us' as default
if (!$language) {
@ -300,7 +305,7 @@ class MBModule
$this->mblanguage->appListStrings [ $language ] [ $key ] = $value ;
}
function deleteDropDown ($language, $key)
function deleteDropDown ($language , $key= null)
{
// set $language = 'en_us' as default
if (!$language) {
@ -953,4 +958,3 @@ class MBModule
}
}
?>

5
modules/ModuleBuilder/javascript/SimpleList.js
View file

@ -290,10 +290,11 @@ if(typeof(SimpleList) == 'undefined'){
var editSpan = document.getElementById('span_edit_'+id);
var textbox = document.getElementById('input_'+id);
var value = escape(val);
dispSpan.style.display = 'inline';
editSpan.style.display = 'none';
dispSpan.innerHTML = "["+val+"]";
document.getElementById('value_'+ id).value = val;
dispSpan.innerHTML = "["+value+"]";
document.getElementById('value_'+ id).value = value;
SimpleList.lastEdit = null; // Bug 14662 - clear the last edit point behind us
},
undoDeleteDropDown : function(transaction){

8
modules/ModuleBuilder/parsers/parser.dropdown.php
View file

@ -60,7 +60,9 @@ require_once('modules/ModuleBuilder/parsers/ModuleBuilderParser.php');
$list_value = str_replace('&quot;&quot;:&quot;&quot;', '&quot;__empty__&quot;:&quot;&quot;', $params['list_value']);
//Bug 21362 ENT_QUOTES- convert single quotes to escaped single quotes.
$temp = $json->decode(html_entity_decode(rawurldecode($list_value), ENT_QUOTES) );
$rawurldecode = rawurldecode($list_value);
$htmldecode = html_entity_decode($rawurldecode, ENT_QUOTES);
$temp = $json->decode($htmldecode);
$dropdown = array () ;
// dropdown is received as an array of (name,value) pairs - now extract to name=>value format preserving order
// we rely here on PHP to preserve the order of the received name=>value pairs - associative arrays in PHP are ordered
@ -68,7 +70,9 @@ require_once('modules/ModuleBuilder/parsers/ModuleBuilderParser.php');
{
foreach ( $temp as $item )
{
$dropdown[ SugarCleaner::stripTags(from_html($item [ 0 ]), false) ] = SugarCleaner::stripTags(from_html($item [ 1 ]), false) ;
$keytemp = SugarCleaner::stripTags(from_html($item [ 0 ]), false);
$valuetemp = SugarCleaner::stripTags(from_html($item [ 1 ]), false);
$dropdown[ $keytemp ] = $valuetemp;
}
}
if(array_key_exists($emptyMarker, $dropdown)){

21
modules/SavedSearch/SavedSearch.php
View file

@ -5,7 +5,7 @@
* SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2016 SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@
*
* 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
* 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
@ -34,17 +34,14 @@
* 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".
* 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');
/*********************************************************************************
* Description: TODO: To be written.
* Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
* All Rights Reserved.
* Contributor(s): ______________________________________..
********************************************************************************/
if (!defined('sugarEntry') || !sugarEntry) {
die('Not A Valid Entry Point');
}
require_once('include/templates/TemplateGroupChooser.php');
@ -292,7 +289,7 @@ class SavedSearch extends SugarBean
SugarApplication::headerRedirect("Location: index.php?action=index&module={$_REQUEST['search_module']}&advanced={$_REQUEST['advanced']}&query=true&clear_query=true");
}
function handleSave($prefix, $redirect = true, $useRequired = false, $id = null, $searchModuleBean = null)
public function handleSave($prefix, $redirect = true, $useRequired = false, $id = null, $searchModuleBean = null)
{
global $current_user, $timedate;

29
modules/Tasks/metadata/additionalDetails.php
View file

@ -1,11 +1,11 @@
<?php
if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
/*********************************************************************************
/**
*
* 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 - 2014 Salesagility Ltd.
*
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
* Copyright (C) 2011 - 2017 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
@ -16,7 +16,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
*
* 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
* 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
@ -34,14 +34,17 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
* 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".
********************************************************************************/
* 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 "include/utils/additional_details.php";
function additionalDetailsTask($fields, SugarBean $bean, $params = array()) {
return additional_details($fields, $bean, $params);
function additionalDetailsTask($fields, SugarBean $bean = null, $params = array())
{
return additional_details($fields, $bean, $params);
}
?>

4
themes/Suite7/css/style.css
View file

@ -2834,7 +2834,7 @@ input, select, textarea, button {
}
/* for the main screen navigation tabs */
#moduleList ul li,
#moduleList ul li
{
font-size: 12px;
}
@ -6678,4 +6678,4 @@ ul.clickMenu.searchAppliedAlert {
.action-link label {
padding: 5px 0 0 0;
}
}

3
themes/SuiteP/css/normalize.css vendored
View file

@ -375,7 +375,6 @@ textarea {
-webkit-appearance: none;
border-radius: 0;
}
}
/*
* Addresses FF3/4 setting line-height on 'input' using !important in the UA stylesheet
@ -480,4 +479,4 @@ textarea {
table {
border-collapse: collapse;
border-spacing: 0;
}
}