From 3f8126ba8c4d4f60b170199f68e2ee86dc8dd40c Mon Sep 17 00:00:00 2001 From: Paul Huang Date: Wed, 7 May 2014 16:39:36 -0700 Subject: [PATCH] Release 6.5.16 --- ModuleInstall/ModuleScanner.php | 32 +- cache/include/javascript/sugar_grp1.js | 9 +- cache/include/javascript/sugar_grp_emails.js | 12 +- cache/include/javascript/sugar_grp_jsolait.js | 4 +- .../include/javascript/sugar_grp_quickcomp.js | 8 +- data/SugarBean.php | 35 +- download.php | 28 +- files.md5 | 248 +++++++------- include/EditView/EditView.tpl | 4 +- .../HTMLPurifier/HTMLPurifier.standalone.php | 281 +++++++++++++++- .../HTMLPurifier/README.UPGRADE | 30 +- include/ListView/ListViewDisplay.php | 121 +++---- include/MVC/Controller/SugarController.php | 15 +- include/Popups/PopupSmarty.php | 62 +--- include/Popups/tpls/PopupGeneric.tpl | 2 +- include/SearchForm/SearchForm2.php | 3 + .../Smarty/plugins/function.sugar_field.php | 6 +- include/SubPanel/SubPanelTiles.js | 8 +- .../Jit/FlashCanvas/flashcanvas.js | 2 +- include/SugarCharts/Jit/Jit.php | 5 + .../SugarFields/Fields/Address/DetailView.tpl | 7 +- .../SugarFields/Fields/Address/EditView.tpl | 130 +++----- .../Fields/Address/SugarFieldAddress.php | 27 +- .../Fields/Address/en_us.DetailView.tpl | 64 ---- .../Fields/Address/en_us.EditView.tpl | 137 -------- .../Fields/Datetimecombo/RangeSearchForm.tpl | 6 + .../Fields/Float/SugarFieldFloat.php | 4 +- .../Fields/Int/RangeSearchForm.tpl | 33 ++ .../SugarFields/Fields/Int/SugarFieldInt.php | 2 +- include/SugarLogger/SugarLogger.php | 52 ++- .../SugarObjects/templates/person/vardefs.php | 1 + include/SugarTinyMCE.php | 2 +- include/Sugarpdf/Sugarpdf.php | 4 + include/externalAPI/ExternalAPIFactory.php | 2 +- .../SugarWidgets/SugarWidgetFielddatetime.php | 77 ++++- .../SugarWidgetFieldparent_type.php | 18 ++ .../SugarWidgets/SugarWidgetFieldreadonly.php | 19 +- .../SugarWidgets/SugarWidgetReportField.php | 7 + include/javascript/popup_helper.js | 14 +- include/javascript/quickCompose.js | 2 +- include/javascript/sugar_3.js | 7 +- include/language/en_us.lang.php | 14 +- include/tcpdf/tcpdf.php | 1 + include/upload_file.php | 28 +- include/utils.php | 27 +- include/utils/autoloader.php | 2 + install/language/en_us.lang.php | 1 + .../include/SubPanel/SubPanelTiles.js | 10 + .../Jit/FlashCanvas/flashcanvas.js | 2 +- .../include/javascript/popup_helper.js | 50 +-- .../include/javascript/quickCompose.js | 3 +- .../src_files/include/javascript/sugar_3.js | 19 +- .../modules/Meetings/jsclass_scheduler.js | 263 ++++++++++++--- modules/Accounts/metadata/detailviewdefs.php | 1 - modules/Accounts/vardefs.php | 1 + modules/Administration/controller.php | 4 +- modules/Administration/index.php | 2 +- .../Administration/language/en_us.lang.php | 7 +- .../metadata/adminpaneldefs.php | 2 +- modules/Administration/updater_utils.php | 9 +- modules/Bugs/Bug.php | 4 +- modules/Bugs/language/en_us.lang.php | 4 +- modules/Calendar/CalendarActivity.php | 94 ++++-- modules/Calls/CallFormBase.php | 8 + modules/Calls/metadata/quickcreatedefs.php | 1 + modules/Cases/language/en_us.lang.php | 1 + modules/Cases/metadata/subpaneldefs.php | 15 +- modules/Cases/vardefs.php | 7 + .../Connectors/InstallDefaultConnectors.php | 5 - .../ext/rest/linkedin/tpls/linkedin.gif | Bin 325 -> 0 bytes .../sources/ext/rest/linkedin/linkedin.php | 142 -------- modules/Contacts/metadata/detailviewdefs.php | 1 - modules/Contacts/metadata/subpaneldefs.php | 5 + modules/Contacts/vardefs.php | 32 +- modules/DynamicFields/DynamicField.php | 4 +- modules/DynamicFields/FieldCases.php | 3 + .../templates/Fields/TemplateLink.php} | 33 +- modules/EmailMan/testOutboundEmail.php | 8 +- modules/EmailMan/tpls/config.tpl | 2 +- modules/Emails/Email.php | 10 +- modules/Emails/EmailUI.php | 169 ++++++---- modules/Emails/EmailUIAjax.php | 9 +- modules/Emails/javascript/EmailUI.js | 3 +- modules/Emails/javascript/grid.js | 10 +- modules/Emails/javascript/init.js | 5 +- modules/Home/index.php | 4 +- modules/InboundEmail/InboundEmail.php | 44 +-- modules/Leads/vardefs.php | 14 - modules/Meetings/MeetingFormBase.php | 8 + modules/Meetings/jsclass_scheduler.js | 4 +- modules/Meetings/metadata/quickcreatedefs.php | 1 + modules/MergeRecords/SaveMerge.php | 2 +- modules/MergeRecords/Step3.php | 86 ++++- modules/ModuleBuilder/MB/AjaxCompose.php | 8 +- modules/ModuleBuilder/Module/StudioModule.php | 4 +- modules/ModuleBuilder/language/en_us.lang.php | 4 +- .../ModuleBuilder/parsers/parser.label.php | 21 +- .../MyNotesDashlet/MyNotesDashlet.data.php | 2 +- modules/Notes/Note.php | 12 +- modules/Relationships/vardefs.php | 18 +- modules/Schedulers/Scheduler.php | 18 ++ modules/Schedulers/_AddJobsHere.php | 29 ++ modules/Schedulers/language/en_us.lang.php | 2 + modules/Studio/language/en_us.Portal.html | 4 +- modules/SugarFeed/vardefs.php | 6 +- modules/Tasks/Save.php | 7 + modules/Tasks/metadata/quickcreatedefs.php | 1 + modules/UpgradeWizard/uw_utils.php | 74 ++++- modules/Users/User.php | 3 +- .../LDAPAuthenticate/LDAPAuthenticateUser.php | 14 +- modules/Users/tpls/EditViewFooter.tpl | 5 +- modules/iCals/iCal.php | 184 ++++++----- modules/vCals/vCal.php | 197 ++++++++---- service/core/SugarWebServiceImpl.php | 2 +- service/v3/SugarWebServiceImplv3.php | 2 +- service/v3_1/SugarWebServiceImplv3_1.php | 2 +- service/v4/SugarWebServiceImplv4.php | 2 +- soap/SoapHelperFunctions.php | 4 +- soap/SoapSugarUsers.php | 25 +- soap/SoapTypes.php | 3 +- sugar_version.json | 8 +- sugar_version.php | 8 +- tests/ModuleInstall/Bug56228Test.php | 16 +- tests/ModuleInstall/ModuleScannerTest.php | 78 +++++ tests/SugarTestMeetingUtilities.php | 1 + .../SugarTestProductCategoryUtilities.php | 59 +++- tests/SugarTestProspectUtilities.php | 32 +- tests/data/Bug62294Test.php | 47 +++ .../HTMLPurifier/HTMLPurifier_ArrayTest.php | 304 ++++++++++++++++++ tests/include/Smarty/plugins/Bug28321Test.php | 12 - .../SugarFields/Fields/Bug60141Test.php | 56 ++-- tests/include/SugarFolders/Bug62883Test.php | 187 +++++++++++ .../templates/file/Bug42862Test.php | 14 +- tests/include/SugarTinyMCETest.php | 9 +- tests/include/connectors/Bug40247Test.php | 11 +- .../generic/SugarWidgets/Bug57902Test.php | 29 +- .../modules/Calendar/Bug63403Test.php | 83 ++--- tests/modules/Configurator/Bug47845Test.php | 7 - .../Connectors/ConnectorsAdminViewTest.php | 4 - .../templates/Fields/Bug56692Test.php | 41 ++- .../Home/UnifiedSearchAdvancedTest.php | 6 + tests/modules/InboundEmail/Bug63989Test.php | 105 ++++++ tests/modules/Meetings/Bug58012Test.php | 2 + .../modules/ModuleBuilder/Bug46152_P5Test.php | 1 + tests/modules/Notes/Bug44138Test.php | 44 +++ tests/modules/Schedulers/SchedulerTest.php | 3 + .../UpgradeWizard/Bug30709_Part_2_Test.php | 2 +- .../Contacts/metadata/detailviewdefs.php | 6 - tests/modules/vCals/Bug62943Test.php | 41 +-- tests/modules/vCals/Bug64061Test.php | 98 ++++++ tests/service/OAuthTest.php | 6 +- tests/soap/Bug51182Test.php | 28 +- tests/soap/Bug63924Test.php | 100 ++++++ themes/default/css/bootstrap.css | 3 - themes/default/less/font-awesome.less | 1 - 155 files changed, 3299 insertions(+), 1520 deletions(-) rename modules/Connectors/connectors/sources/ext/rest/linkedin/vardefs.php => include/HTMLPurifier/README.UPGRADE (79%) delete mode 100644 include/SugarFields/Fields/Address/en_us.DetailView.tpl delete mode 100644 include/SugarFields/Fields/Address/en_us.EditView.tpl rename modules/Connectors/connectors/sources/ext/rest/linkedin/config.php => include/generic/SugarWidgets/SugarWidgetFieldreadonly.php (88%) delete mode 100644 modules/Connectors/connectors/formatters/ext/rest/linkedin/tpls/linkedin.gif delete mode 100644 modules/Connectors/connectors/sources/ext/rest/linkedin/linkedin.php rename modules/{Connectors/connectors/sources/ext/rest/linkedin/mapping.php => DynamicFields/templates/Fields/TemplateLink.php} (87%) rename modules/Connectors/connectors/sources/ext/rest/linkedin/language/en_us.lang.php => tests/SugarTestProductCategoryUtilities.php (59%) mode change 100644 => 100755 create mode 100755 tests/data/Bug62294Test.php create mode 100755 tests/include/HTMLPurifier/HTMLPurifier_ArrayTest.php rename modules/Connectors/connectors/formatters/ext/rest/linkedin/linkedin.php => tests/include/SugarFields/Fields/Bug60141Test.php (64%) mode change 100644 => 100755 create mode 100755 tests/include/SugarFolders/Bug62883Test.php rename modules/Connectors/connectors/formatters/ext/rest/linkedin/tpls/default.tpl => tests/modules/Calendar/Bug63403Test.php (58%) mode change 100644 => 100755 rename get_url.php => tests/modules/DynamicFields/templates/Fields/Bug56692Test.php (75%) mode change 100644 => 100755 create mode 100755 tests/modules/InboundEmail/Bug63989Test.php create mode 100755 tests/modules/Notes/Bug44138Test.php create mode 100755 tests/modules/vCals/Bug64061Test.php create mode 100755 tests/soap/Bug63924Test.php diff --git a/ModuleInstall/ModuleScanner.php b/ModuleInstall/ModuleScanner.php index 666b983c..e89ef351 100644 --- a/ModuleInstall/ModuleScanner.php +++ b/ModuleInstall/ModuleScanner.php @@ -66,7 +66,8 @@ class ModuleScanner{ private $blackListExempt = array(); private $classBlackListExempt = array(); - private $validExt = array('png', 'gif', 'jpg', 'css', 'js', 'php', 'txt', 'html', 'htm', 'tpl', 'pdf', 'md5', 'xml'); + // Bug 56717 - adding hbs extension to the whitelist - rgonzalez + private $validExt = array('png', 'gif', 'jpg', 'css', 'js', 'php', 'txt', 'html', 'htm', 'tpl', 'pdf', 'md5', 'xml', 'hbs'); private $classBlackList = array( // Class names specified here must be in lowercase as the implementation // of the tokenizer converts all tokens to lowercase. @@ -469,17 +470,31 @@ class ModuleScanner{ /** *Ensures that a file has a valid extension */ - private function isValidExtension($file){ + public function isValidExtension($file) + { $file = strtolower($file); + $pi = pathinfo($file); - $extPos = strrpos($file, '.'); //make sure they don't override the files.md5 - if($extPos === false || $file == 'files.md5')return false; - $ext = substr($file, $extPos + 1); - return in_array($ext, $this->validExt); + if(empty($pi['extension']) || $pi['basename'] == 'files.md5') { + return false; + } + return in_array($pi['extension'], $this->validExt); } + public function isConfigFile($file) + { + $real = realpath($file); + if($real == realpath("config.php")) { + return true; + } + if(file_exists("config_override.php") && $real == realpath("config_override.php")) { + return true; + } + return false; + } + /** *Scans a directory and calls on scan file for each file **/ @@ -535,6 +550,11 @@ class ModuleScanner{ $this->issues['file'][$file] = $issues; return $issues; } + if($this->isConfigFile($file)){ + $issues[] = translate('ML_OVERRIDE_CORE_FILES'); + $this->issues['file'][$file] = $issues; + return $issues; + } $contents = file_get_contents($file); if(!$this->isPHPFile($contents)) return $issues; $tokens = @token_get_all($contents); diff --git a/cache/include/javascript/sugar_grp1.js b/cache/include/javascript/sugar_grp1.js index 4bfc3013..80b840c3 100644 --- a/cache/include/javascript/sugar_grp1.js +++ b/cache/include/javascript/sugar_grp1.js @@ -6,7 +6,7 @@ function checkMinSupported(c,s){var current=c.split(".");var supported=s.split(" return true;} function checkMaxSupported(c,s){var current=c.split(".");var supported=s.split(".");for(var i in supported){if(current[i]&&parseInt(current[i])>parseInt(supported[i]))return false;else if(current[i]&&parseInt(current[i])=d1;} @@ -904,7 +905,7 @@ var theme=SUGAR.themes.theme_name;var idx=0;if(!SE.composeLayout.composeTemplate SE.composeLayout.composeTemplate=new YAHOO.SUGAR.Template(SE.templates['compose']);var panel_modal=dce_mode?false:true,panel_width='880px',panel_constrain=dce_mode?false:true,panel_height=dce_mode?'auto':'400px',panel_shadow=dce_mode?false:true,panel_draggable=dce_mode?false:true,panel_resize=dce_mode?false:true,panel_close=dce_mode?false:true;SQ.parentPanel=new YAHOO.widget.Panel("container1",{modal:panel_modal,visible:true,constraintoviewport:panel_constrain,width:panel_width,height:panel_height,shadow:panel_shadow,draggable:panel_draggable,resize:panel_resize,close:panel_close});if(!dce_mode){SQ.parentPanel.setHeader(SUGAR.language.get('app_strings','LBL_EMAIL_QUICK_COMPOSE'));} SQ.parentPanel.setBody("");var composePanel=SE.composeLayout.getQuickComposeLayout(SQ.parentPanel,this.options);if(!dce_mode){var resize=new YAHOO.util.Resize('container1',{handles:['br'],autoRatio:false,minWidth:400,minHeight:350,status:false});resize.on('resize',function(args){var panelHeight=args.height;this.cfg.setProperty("height",panelHeight+"px");var layout=SE.composeLayout[SE.composeLayout.currentInstanceId];layout.set("height",panelHeight-50);layout.resize(true);SE.composeLayout.resizeEditor(SE.composeLayout.currentInstanceId);},SQ.parentPanel,true);}else{SUGAR.util.doWhen("typeof SE.composeLayout[SE.composeLayout.currentInstanceId] != 'undefined'",function(){var panelHeight=400;SQ.parentPanel.cfg.setProperty("height",panelHeight+"px");var layout=SE.composeLayout[SE.composeLayout.currentInstanceId];layout.set("height",panelHeight);layout.resize(true);SE.composeLayout.resizeEditor(SE.composeLayout.currentInstanceId);});} YAHOO.util.Dom.setStyle("container1","z-index",1);if(!SQ.tinyLoaded) -{tinymce.dom.Event.domLoaded=true;tinyMCE.init({convert_urls:false,theme_advanced_toolbar_align:tinyConfig.theme_advanced_toolbar_align,valid_children:tinyConfig.valid_children,width:tinyConfig.width,theme:tinyConfig.theme,theme_advanced_toolbar_location:tinyConfig.theme_advanced_toolbar_location,theme_advanced_buttons1:tinyConfig.theme_advanced_buttons1,theme_advanced_buttons2:tinyConfig.theme_advanced_buttons2,theme_advanced_buttons3:tinyConfig.theme_advanced_buttons3,plugins:tinyConfig.plugins,elements:tinyConfig.elements,language:tinyConfig.language,extended_valid_elements:tinyConfig.extended_valid_elements,mode:tinyConfig.mode,strict_loading_mode:true});SQ.tinyLoaded=true;} +{tinymce.dom.Event.domLoaded=true;tinyMCE.init({convert_urls:false,theme_advanced_toolbar_align:tinyConfig.theme_advanced_toolbar_align,valid_children:tinyConfig.valid_children,width:tinyConfig.width,theme:tinyConfig.theme,theme_advanced_toolbar_location:tinyConfig.theme_advanced_toolbar_location,theme_advanced_buttons1:tinyConfig.theme_advanced_buttons1,theme_advanced_buttons2:tinyConfig.theme_advanced_buttons2,theme_advanced_buttons3:tinyConfig.theme_advanced_buttons3,plugins:tinyConfig.plugins,elements:tinyConfig.elements,language:tinyConfig.language,extended_valid_elements:tinyConfig.extended_valid_elements,mode:tinyConfig.mode,strict_loading_mode:true,gecko_spellcheck:tinyConfig.gecko_spellcheck});SQ.tinyLoaded=true;} SQ.parentPanel.show();SUGAR.email2.composeLayout.forceCloseCompose=function(o){SUGAR.quickCompose.parentPanel.hide();} if(!dce_mode){SQ.parentPanel.center();}},init:function(o){if(typeof o.menu_id!='undefined'){this.dceMenuPanel=o.menu_id;}else{this.dceMenuPanel=null;} loadingMessgPanl=new YAHOO.widget.SimpleDialog('loading',{width:'200px',close:true,modal:true,visible:true,fixedcenter:true,constraintoviewport:true,draggable:false});loadingMessgPanl.setHeader(SUGAR.language.get('app_strings','LBL_EMAIL_PERFORMING_TASK'));loadingMessgPanl.setBody(SUGAR.language.get('app_strings','LBL_EMAIL_ONE_MOMENT'));loadingMessgPanl.render(document.body);loadingMessgPanl.show();if(!SUGAR.quickCompose.resourcesLoaded) diff --git a/cache/include/javascript/sugar_grp_emails.js b/cache/include/javascript/sugar_grp_emails.js index 1651d93f..1aea445c 100644 --- a/cache/include/javascript/sugar_grp_emails.js +++ b/cache/include/javascript/sugar_grp_emails.js @@ -563,7 +563,7 @@ AjaxObject.startRequest(callbackFolderSubscriptions,urlStandard+'&emailUIAction= activeGroupIds.push(ieID);}} return activeGroupIds;}};SE.folders.checkEmail2=function(){AjaxObject.startRequest(callbackCheckEmail2,urlStandard+"&emailUIAction=checkEmail2");} SE.keys={overall:function(e){switch(e.charCode){case 119:if(e.ctrlKey||e.altKey){var focusRegion=SE.innerLayout.regions.center;if(focusRegion.activePanel.closable==true){focusRegion.remove(focusRegion.activePanel);}} -break;}}};SE.listView={currentRowId:-1,populateListFrame:function(node,ieId,forceRefresh){SE.innerLayout.selectTab(0);YAHOO.util.Connect.abort(AjaxObject.currentRequestObject,null,false);Dom.get('_blank').innerHTML="";SE.grid.params['emailUIAction']='getMessageList';SE.grid.params['mbox']=node.data.mbox;SE.grid.params['ieId']=ieId;forcePreview=true;SE.listView.refreshGrid();},populateListFrameSugarFolder:function(node,folderId,forceRefresh){SE.innerLayout.selectTab(0);Dom.get('_blank').innerHTML="";SE.grid.params['emailUIAction']='getMessageListSugarFolders';SE.grid.params['ieId']=node.data.id;SE.grid.params['mbox']=node.data.origText?node.data.origText:node.data.text;SE.listView.refreshGrid();},saveListViewSortOrder:function(sortBy,focusFolderPassed,ieIdPassed,ieNamePassed){ieId=ieIdPassed;ieName=ieNamePassed;focusFolder=focusFolderPassed;SE.util.clearHiddenFieldValues('emailUIForm');var previousSort=document.getElementById('sortBy').value;document.getElementById('sortBy').value=sortBy;document.getElementById('emailUIAction').value='saveListViewSortOrder';document.getElementById('focusFolder').value=focusFolder;document.getElementById('ieId').value=ieId;if(sortBy==previousSort){document.getElementById('reverse').value='1';} +break;}}};SE.listView={currentRowId:-1,populateListFrame:function(node,ieId,forceRefresh){SE.innerLayout.selectTab(0);YAHOO.util.Connect.abort(AjaxObject.currentRequestObject,null,false);Dom.get('_blank').innerHTML="";SE.grid.params['emailUIAction']='getMessageList';SE.grid.params['mbox']=node.data.mbox;SE.grid.params['ieId']=ieId;forcePreview=true;SE.listView.refreshGrid();},populateListFrameSugarFolder:function(node,folderId,forceRefresh,getUnread){SE.innerLayout.selectTab(0);Dom.get('_blank').innerHTML="";SE.grid.params['emailUIAction']='getMessageListSugarFolders';SE.grid.params['ieId']=node.data.id;SE.grid.params['mbox']=node.data.origText?node.data.origText:node.data.text;SE.grid.params['getUnread']=getUnread;SE.listView.refreshGrid();},saveListViewSortOrder:function(sortBy,focusFolderPassed,ieIdPassed,ieNamePassed){ieId=ieIdPassed;ieName=ieNamePassed;focusFolder=focusFolderPassed;SE.util.clearHiddenFieldValues('emailUIForm');var previousSort=document.getElementById('sortBy').value;document.getElementById('sortBy').value=sortBy;document.getElementById('emailUIAction').value='saveListViewSortOrder';document.getElementById('focusFolder').value=focusFolder;document.getElementById('ieId').value=ieId;if(sortBy==previousSort){document.getElementById('reverse').value='1';} var formObject=document.getElementById('emailUIForm');YAHOO.util.Connect.setForm(formObject);AjaxObject.startRequest(callbackListViewSortOrderChange,null);},selectFirstRow:function(){SE.grid.selModel.selectFirstRow();},selectLastRow:function(){SE.grid.selModel.selectRow(SE.grid.dataSource.data.getCount()-1);},setEmailListStyles:function(){SE.listView.boldUnreadRows();return;var ds=SE.grid.getStore();if(SE.grid.getSelections().length==0){document.getElementById('_blank').innerHTML='';} var acctMbox='';if(typeof(ds.baseParams.mbox)!='undefined'){acctMbox=(ds.baseParams.acct)?ds.baseParams.acct+" "+ds.baseParams.mbox:ds.baseParams.mbox;var cm=SE.grid.getColumnModel();if(ds.baseParams.mbox==mod_strings.LBL_LIST_FORM_SENT_TITLE){cm.setColumnHeader(4,mod_strings.LBL_LIST_DATE_SENT);}else if(cm.config[4].header!=app_strings.LBL_EMAIL_DATE_SENT_BY_SENDER){cm.setColumnHeader(4,app_strings.LBL_EMAIL_DATE_SENT_BY_SENDER);}} var total=(typeof(ds.totalLength)!="undefined")?" ("+ds.totalLength+" "+app_strings.LBL_EMAIL_MESSAGES+") ":"";SE.listViewLayout.setTitle(acctMbox+total);if(ds.reader.xmlData.getElementsByTagName('UnreadCount').length>0){var unread=ds.reader.xmlData.getElementsByTagName('UnreadCount')[0].childNodes[0].data;var node=SE.folders.getNodeFromIeIdAndMailbox(ds.baseParams.ieId,ds.baseParams.mbox);if(node)node.data.unseen=unread;} @@ -947,10 +947,12 @@ e2Grid={init:function(){var Ck=YAHOO.util.Cookie;var widths=[10,10,150,250,175,1 function flaggedIcon(cell,record,column,value){if(value!=""){cell.innerHTML="!";}} function repliedIcon(cell,record,column,value){if(value!=""){cell.innerHTML="";}} function attachIcon(cell,record,column,value){if(value=="1"){cell.innerHTML="";}} -var colModel=[{label:"

",width:10,sortable:false,fixed:true,resizeable:true,formatter:attachIcon,key:'hasAttach'},{label:"!",width:widths[0],sortable:true,fixed:true,resizeable:true,formatter:flaggedIcon,key:'flagged'},{label:"",width:widths[1],sortable:true,fixed:true,resizeable:true,formatter:repliedIcon,key:'status'},{label:app_strings.LBL_EMAIL_FROM,width:widths[2],sortable:true,resizeable:true,key:'from'},{label:app_strings.LBL_EMAIL_SUBJECT,width:widths[3],sortable:true,resizeable:true,key:'subject'},{label:mod_strings.LBL_LIST_DATE,width:widths[4],sortable:true,resizeable:true,key:'date'},{label:app_strings.LBL_EMAIL_TO,width:widths[5],sortable:false,resizeable:true,key:'to_addrs'},{label:'uid',hidden:true,key:'uid'},{label:'mbox',hidden:true,key:'mbox'},{label:'ieId',hidden:true,key:'ieId'},{label:'site_url',hidden:true,key:'site_url'},{label:'seen',hidden:true,key:'seen'},{label:'type',hidden:true,key:'type'}];var dataModel=new YAHOO.util.DataSource(urlBase+"?",{responseType:YAHOO.util.DataSource.TYPE_JSON,responseSchema:{resultsList:'Email',fields:['flagged','status','from','subject','date','to_addrs','uid','mbox','ieId','site_url','seen','type','AssignedTo','hasAttach'],metaFields:{total:'TotalCount',unread:"UnreadCount",fromCache:"FromCache"}}});var params={to_pdf:"true",module:"Emails",action:"EmailUIAjax",emailUIAction:"getMessageList",mbox:"INBOX",ieId:"",forceRefresh:"false"};if(lazyLoadFolder!=null){params['mbox']=lazyLoadFolder.folder;params['ieId']=lazyLoadFolder.ieId;var test=new String(lazyLoadFolder.folder);if(test.match(/SUGAR\./)){params['emailUIAction']='getMessageListSugarFolders';params['mbox']=test.substr(6);}} +var colModel=[{label:"

",width:10,sortable:false,fixed:true,resizeable:true,formatter:attachIcon,key:'hasAttach'},{label:"!",width:widths[0],sortable:true,fixed:true,resizeable:true,formatter:flaggedIcon,key:'flagged'},{label:"",width:widths[1],sortable:true,fixed:true,resizeable:true,formatter:repliedIcon,key:'status'},{label:app_strings.LBL_EMAIL_FROM,width:widths[2],sortable:true,resizeable:true,key:'from'},{label:app_strings.LBL_EMAIL_SUBJECT,width:widths[3],sortable:true,resizeable:true,key:'subject'},{label:mod_strings.LBL_LIST_DATE,width:widths[4],sortable:true,resizeable:true,key:'date'},{label:app_strings.LBL_EMAIL_TO,width:widths[5],sortable:false,resizeable:true,key:'to_addrs'},{label:'uid',hidden:true,key:'uid'},{label:'mbox',hidden:true,key:'mbox'},{label:'ieId',hidden:true,key:'ieId'},{label:'site_url',hidden:true,key:'site_url'},{label:'seen',hidden:true,key:'seen'},{label:'type',hidden:true,key:'type'}];var dataModel=new YAHOO.util.DataSource(urlBase+"?",{responseType:YAHOO.util.DataSource.TYPE_JSON,responseSchema:{resultsList:'Email',fields:['flagged','status','from','subject','date','to_addrs','uid','mbox','ieId','site_url','seen','type','AssignedTo','hasAttach'],metaFields:{total:'TotalCount',unread:"UnreadCount",fromCache:"FromCache"}}});var params={to_pdf:"true",module:"Emails",action:"EmailUIAjax",emailUIAction:"getMessageList",mbox:"INBOX",ieId:"",forceRefresh:"false"};if(lazyLoadFolder!=null){params['mbox']=lazyLoadFolder.folder;params['ieId']=lazyLoadFolder.ieId;var test=new String(lazyLoadFolder.folder);if(test.match(/SUGAR\./)){params['emailUIAction']='getMessageListSugarFolders';params['mbox']=test.substr(6);params['getUnread']=1;}} var grid=SUGAR.email2.grid=new YAHOO.SUGAR.SelectionGrid('emailGrid',colModel,dataModel,{MSG_EMPTY:SUGAR.language.get("Emails","LBL_EMPTY_FOLDER"),dynamicData:true,paginator:new YAHOO.widget.Paginator({rowsPerPage:parseInt(SUGAR.email2.userPrefs.emailSettings.showNumInList),containers:["dt-pag-nav"],template:"",firstPageLinkLabel:"",previousPageLinkLabel:"",nextPageLinkLabel:"",lastPageLinkLabel:""}),initialRequest:SUGAR.util.paramsToUrl(params),width:"800px",height:"400px"});initRowDD();grid.set("generateRequest",function(oState,oSelf){oState=oState||{pagination:null,sortedBy:null};var sort=(oState.sortedBy)?oState.sortedBy.key:oSelf.getColumnSet().keys[5].getKey();var dir=(oState.sortedBy&&oState.sortedBy.dir===YAHOO.widget.DataTable.CLASS_ASC)?"asc":"desc";var startIndex=(oState.pagination)?oState.pagination.recordOffset:0;var results=(oState.pagination)?oState.pagination.rowsPerPage:null;var ret=SUGAR.util.paramsToUrl(oSelf.params)+"&sort="+sort+"&dir="+dir+"&start="+startIndex+ -((results!==null)?"&limit="+results:"");return ret;});grid.handleDataReturnPayload=function(oRequest,oResponse,oPayload){oPayload=oPayload||{};oPayload.totalRecords=oResponse.meta.total;oPayload.unreadRecords=oResponse.meta.unread;var tabObject=SE.innerLayout.get("tabs")[0];var mboxTitle="";if(this.params.mbox!=null){mboxTitle=this.params.mbox;} -var tabtext=mboxTitle+" ("+oResponse.meta.total+" "+app_strings.LBL_EMAIL_MESSAGES+" )";tabObject.get("labelEl").firstChild.data=tabtext;if(SE.tree){var node=SE.tree.getNodeByProperty('id',this.params.ieId)||SE.tree.getNodeByProperty('origText',this.params.mbox);if(node){node.data.unseen=oResponse.meta.unread;SE.accounts.renderTree();}} +((results!==null)?"&limit="+results:"");return ret;});grid.handleDataReturnPayload=function(oRequest,oResponse,oPayload){oPayload=oPayload||{};oPayload.totalRecords=oResponse.meta.total;if(oResponse.meta.unread!=-1){oPayload.unreadRecords=oResponse.meta.unread;} +var tabObject=SE.innerLayout.get("tabs")[0];var mboxTitle="";if(this.params.mbox!=null){mboxTitle=this.params.mbox;} +var tabtext=mboxTitle+" ("+oResponse.meta.total+" "+app_strings.LBL_EMAIL_MESSAGES+" )";tabObject.get("labelEl").firstChild.data=tabtext;if(SE.tree){var node=SE.tree.getNodeByProperty('id',this.params.ieId)||SE.tree.getNodeByProperty('origText',this.params.mbox);if(node){if(oResponse.meta.unread!=-1){node.data.unseen=oResponse.meta.unread;} +SE.accounts.renderTree();}} return oPayload;} var resize=grid.resizeGrid=function(){SUGAR.email2.grid.set("width",SUGAR.email2.grid.get("element").parentNode.clientWidth+"px");SUGAR.email2.grid.set("height",(SUGAR.email2.grid.get("element").parentNode.clientHeight-47)+"px");} grid.convertDDRows=function(){var rowEl=this.getFirstTrEl();while(rowEl!=null){new this.DDRow(this,this.getRecord(rowEl),rowEl);rowEl=this.getNextTrEl(rowEl);}} @@ -985,7 +987,7 @@ return-1;var aNames=a.getData("name").split(' ');var bNames=b.getData("name").sp {case 0:var oRecord=p_myDataTable.getRecord(elRow);p_myDataTable.deleteRow(elRow);SUGAR.email2.addressBook.grid.reSelectRowsOnRender();}}}};var contextMenu=new YAHOO.widget.ContextMenu("contextmenu",{trigger:gridResults.getTbodyEl()});contextMenu.addItem(app_strings.LBL_EMAIL_DELETE);contextMenu.render("addrSearchResultGrid");contextMenu.clickEvent.subscribe(onContextMenuClick,gridResults);}/* End of File modules/Emails/javascript/grid.js */ -function email2init(){if(!SUGAR.util.isTouchScreen()){tinyMCE.init({convert_urls:false,theme_advanced_toolbar_align:tinyConfig.theme_advanced_toolbar_align,valid_children:tinyConfig.valid_children,width:tinyConfig.width,theme:tinyConfig.theme,theme_advanced_toolbar_location:tinyConfig.theme_advanced_toolbar_location,theme_advanced_buttons1:tinyConfig.theme_advanced_buttons1,theme_advanced_buttons2:tinyConfig.theme_advanced_buttons2,theme_advanced_buttons3:tinyConfig.theme_advanced_buttons3,plugins:tinyConfig.plugins,elements:tinyConfig.elements,language:tinyConfig.language,extended_valid_elements:tinyConfig.extended_valid_elements,mode:tinyConfig.mode,strict_loading_mode:true,force_br_newlines:true,forced_root_block:'',directionality:(typeof(rtl)=="undefined")?"ltr":"rtl"});} +function email2init(){if(!SUGAR.util.isTouchScreen()){tinyMCE.init({convert_urls:false,theme_advanced_toolbar_align:tinyConfig.theme_advanced_toolbar_align,valid_children:tinyConfig.valid_children,width:tinyConfig.width,theme:tinyConfig.theme,theme_advanced_toolbar_location:tinyConfig.theme_advanced_toolbar_location,theme_advanced_buttons1:tinyConfig.theme_advanced_buttons1,theme_advanced_buttons2:tinyConfig.theme_advanced_buttons2,theme_advanced_buttons3:tinyConfig.theme_advanced_buttons3,plugins:tinyConfig.plugins,elements:tinyConfig.elements,language:tinyConfig.language,extended_valid_elements:tinyConfig.extended_valid_elements,mode:tinyConfig.mode,strict_loading_mode:true,force_br_newlines:true,forced_root_block:'',directionality:(typeof(rtl)=="undefined")?"ltr":"rtl",gecko_spellcheck:tinyConfig.gecko_spellcheck});} SUGAR.email2.e2overlay=new YAHOO.widget.Dialog("SUGAR.email2.e2overlay",{modal:false,autoTabs:true,width:300,height:120,shadow:true});if(SUGAR.themes.tempHideLeftCol) SUGAR.themes.tempHideLeftCol();YAHOO.util.DDM.mode=0;SUGAR.email2.nextYear=new Date();SUGAR.email2.nextYear.setDate(SUGAR.email2.nextYear.getDate()+360);complexLayoutInit();gridInit();SUGAR.email2.folders.rebuildFolders(true);var SEC=SUGAR.email2.contextMenus;var emailMenu=SEC.emailListContextMenu=new YAHOO.widget.ContextMenu("emailContextMenu",{trigger:SUGAR.email2.grid.get("element"),lazyload:true});emailMenu.subscribe("beforeShow",function(){var oTarget=this.contextEventTarget;if(typeof(oTarget)=="undefined") return;var grid=SUGAR.email2.grid;var selectedRows=grid.getSelectedRows();var multipleSelected=(selectedRows.length>1)?true:false;if(!multipleSelected) diff --git a/cache/include/javascript/sugar_grp_jsolait.js b/cache/include/javascript/sugar_grp_jsolait.js index 378111c9..eb951d6b 100644 --- a/cache/include/javascript/sugar_grp_jsolait.js +++ b/cache/include/javascript/sugar_grp_jsolait.js @@ -77,9 +77,7 @@ if(form.search_last_name.value!=''){conditions[conditions.length]={"name":"last_ if(form.search_email.value!=''){conditions[conditions.length]={"name":"email1","op":"starts_with","value":form.search_email.value}} var query={"modules":["Users","Contacts","Leads"],"group":"and","field_list":['id','full_name','email1','phone_work'],"conditions":conditions};global_request_registry[req_count]=[this,'display'];req_id=global_rpcClient.call_method('query',query);global_request_registry[req_id]=[GLOBAL_REGISTRY['widget_element_map'][form.id],'refresh_list'];} SugarWidgetSchedulerSearch.prototype.refresh_list=function(rslt){GLOBAL_REGISTRY['result_list']=rslt['list'];if(rslt['list'].length>0){this.list_view.display();document.getElementById('empty-search-message').style.display='none';}else{document.getElementById('list_div_win').style.display='none';document.getElementById('empty-search-message').style.display='';}} -SugarWidgetSchedulerSearch.prototype.display=function(){var html='

'+GLOBAL_REGISTRY['meeting_strings']['LBL_ADD_INVITEE']+'

';html+='
';html+='
';html+='' -html+='';html+='';html+='';html+='';html+='';html+='
      
';html+='
';html+='
';this.parentNode.innerHTML+=html;var div=document.createElement('div');div.setAttribute('id','list_div_win');div.style.overflow='auto';div.style.width='100%';div.style.height='100%';div.style.display='none';this.parentNode.appendChild(div);html='';html+='
';html+='';html+='

'+GLOBAL_REGISTRY['meeting_strings']['LBL_CREATE_INVITEE']+'

';html+='
';html+=' ';html+=' ';html+='
';html+='';html+='
';this.parentNode.innerHTML+=html;addToValidate('createInviteeForm','last_name','last_name',true,GLOBAL_REGISTRY['meeting_strings']['LBL_LAST_NAME']);this.list_view=new SugarWidgetListView();this.list_view.load(div);} +SugarWidgetSchedulerSearch.prototype.display=function(){var html=document.createElement("div");html.setAttribute('class','schedulerInvitees');var h3=document.createElement("h3");h3.innerHTML=GLOBAL_REGISTRY['meeting_strings']['LBL_ADD_INVITEE'];html.appendChild(h3);var table1=document.createElement("table");table1.setAttribute('class','edit view');table1.setAttribute('border','0');table1.setAttribute('cellpadding','0');table1.setAttribute('cellspacing','0');table1.setAttribute('width','100%');var row1=table1.insertRow(0);var cell1=row1.insertCell(0);var form=document.createElement("form");form.setAttribute('name','schedulerwidget');form.setAttribute('id',this.form_id);form.setAttribute('onsubmit','SugarWidgetSchedulerSearch.submit(this);return false;');var table2=document.createElement("table");table2.setAttribute('border','0');table2.setAttribute('cellpadding','0');table2.setAttribute('cellspacing','0');table2.setAttribute('width','100%');var row2=table2.insertRow(0);var cell21=row2.insertCell(0);cell21.setAttribute('scope','col');cell21.setAttribute('nowrap','nowrap');var label1=document.createElement("label");label1.setAttribute('for','search_first_name');label1.innerHTML=GLOBAL_REGISTRY['meeting_strings']['LBL_FIRST_NAME']+':  ';cell21.appendChild(label1);var input1=document.createElement("input");input1.setAttribute('name','search_first_name');input1.setAttribute('id','search_first_name');input1.setAttribute('value','');input1.setAttribute('type','text');input1.setAttribute('size','10');cell21.appendChild(input1);var cell22=row2.insertCell(1);cell22.setAttribute('scope','col');cell22.setAttribute('nowrap','nowrap');var label2=document.createElement("label");label2.setAttribute('for','search_last_name');label2.innerHTML=GLOBAL_REGISTRY['meeting_strings']['LBL_LAST_NAME']+':  ';cell22.appendChild(label2);var input2=document.createElement("input");input2.setAttribute('name','search_last_name');input2.setAttribute('id','search_last_name');input2.setAttribute('value','');input2.setAttribute('type','text');input2.setAttribute('size','10');cell22.appendChild(input2);var cell23=row2.insertCell(2);cell23.setAttribute('scope','col');cell23.setAttribute('nowrap','nowrap');var label3=document.createElement("label");label3.setAttribute('for','search_email');label3.innerHTML=GLOBAL_REGISTRY['meeting_strings']['LBL_EMAIL']+':  ';cell23.appendChild(label3);var input3=document.createElement("input");input3.setAttribute('name','search_email');input3.setAttribute('id','search_email');input3.setAttribute('value','');input3.setAttribute('type','text');input3.setAttribute('size','10');cell23.appendChild(input3);var cell24=row2.insertCell(3);cell24.setAttribute('valign','center');var input3=document.createElement("input");input3.setAttribute('class','button');input3.setAttribute('id','invitees_search');input3.setAttribute('value',GLOBAL_REGISTRY['meeting_strings']['LBL_SEARCH_BUTTON']);input3.setAttribute('type','submit');cell24.appendChild(input3);form.appendChild(table2);cell1.appendChild(form);html.appendChild(table1);this.parentNode.appendChild(html);var div=document.createElement('div');div.setAttribute('id','list_div_win');div.style.overflow='auto';div.style.width='100%';div.style.height='100%';div.style.display='none';this.parentNode.appendChild(div);var create_invitees=document.createElement("div");create_invitees.setAttribute('id','create-invitees');create_invitees.setAttribute('style','margin-bottom: 10px;');var empty_search_message=document.createElement("div");empty_search_message.setAttribute('id','empty-search-message');empty_search_message.setAttribute('style','display: none;');empty_search_message.innerHTML=GLOBAL_REGISTRY['meeting_strings']['LBL_EMPTY_SEARCH_RESULT'];create_invitees.appendChild(empty_search_message);var h3=document.createElement("h3");h3.setAttribute('id','create-invitees-title');h3.innerHTML=GLOBAL_REGISTRY['meeting_strings']['LBL_CREATE_INVITEE'];create_invitees.appendChild(h3);var create_invitees_buttons=document.createElement("div");create_invitees_buttons.setAttribute('id','create-invitees-buttons');var button1=document.createElement("button");button1.setAttribute('id','create_invitee_as_contact');button1.setAttribute('type','button');button1.setAttribute('onclick','SugarWidgetSchedulerSearch.showCreateForm(\'Contacts\');');button1.innerHTML=GLOBAL_REGISTRY['meeting_strings']['LBL_CREATE_CONTACT'];create_invitees_buttons.appendChild(button1);var button2=document.createElement("button");button2.setAttribute('id','create_invitee_as_lead');button2.setAttribute('type','button');button2.setAttribute('onclick','SugarWidgetSchedulerSearch.showCreateForm(\'Leads\');');button2.innerHTML=GLOBAL_REGISTRY['meeting_strings']['LBL_CREATE_LEAD'];create_invitees_buttons.appendChild(button2);create_invitees.appendChild(create_invitees_buttons);var create_invitee_edit=document.createElement("div");create_invitee_edit.setAttribute('id','create-invitee-edit');create_invitee_edit.setAttribute('style','display: none;');var form1=document.createElement("form");form1.setAttribute('name','createInviteeForm');form1.setAttribute('id','createInviteeForm');form1.setAttribute('onsubmit','SugarWidgetSchedulerSearch.createInvitee(this); return false;');var input4=document.createElement("input");input4.setAttribute('name','inviteeModule');input4.setAttribute('value','Contacts');input4.setAttribute('type','hidden');form1.appendChild(input4);var table3=document.createElement("table");table3.setAttribute('class','edit view');table3.setAttribute('cellpadding','0');table3.setAttribute('cellspacing','0');table3.setAttribute('style','width: 330px; margin-top: 2px;');var row3=table3.insertRow(0);var cell31=row3.insertCell(0);cell31.setAttribute('valign','top');cell31.setAttribute('width','33%');cell31.innerHTML=GLOBAL_REGISTRY['meeting_strings']['LBL_FIRST_NAME']+':';var cell32=row3.insertCell(1);cell32.setAttribute('valign','top');var input5=document.createElement("input");input5.setAttribute('name','first_name');input5.setAttribute('size','19');input5.setAttribute('type','text');cell32.appendChild(input5);var row4=table3.insertRow(1);var cell41=row4.insertCell(0);cell41.setAttribute('valign','top');cell41.setAttribute('width','33%');cell41.innerHTML=GLOBAL_REGISTRY['meeting_strings']['LBL_LAST_NAME']+':';var cell42=row4.insertCell(1);cell42.setAttribute('valign','top');var input6=document.createElement("input");input6.setAttribute('name','last_name');input6.setAttribute('size','19');input6.setAttribute('type','text');cell42.appendChild(input6);var row5=table3.insertRow(2);var cell51=row5.insertCell(0);cell51.setAttribute('valign','top');cell51.setAttribute('width','33%');cell51.innerHTML=GLOBAL_REGISTRY['meeting_strings']['LBL_EMAIL']+':';var cell52=row5.insertCell(1);cell52.setAttribute('valign','top');var input7=document.createElement("input");input7.setAttribute('name','email1');input7.setAttribute('size','19');input7.setAttribute('type','text');cell52.appendChild(input7);form1.appendChild(table3);var button3=document.createElement("button");button3.setAttribute('id','create-invitee-btn');button3.setAttribute('type','button');button3.setAttribute('onclick','SugarWidgetSchedulerSearch.createInvitee(this.form);');button3.innerHTML=GLOBAL_REGISTRY['meeting_strings']['LBL_CREATE_AND_ADD'];form1.appendChild(button3);var button4=document.createElement("button");button4.setAttribute('id','cancel-create-invitee-btn');button4.setAttribute('type','button');button4.setAttribute('onclick','SugarWidgetSchedulerSearch.hideCreateForm();');button4.innerHTML=GLOBAL_REGISTRY['meeting_strings']['LBL_CANCEL_CREATE_INVITEE'];form1.appendChild(button4);create_invitee_edit.appendChild(form1);create_invitees.appendChild(create_invitee_edit);this.parentNode.appendChild(create_invitees);addToValidate('createInviteeForm','last_name','last_name',true,GLOBAL_REGISTRY['meeting_strings']['LBL_LAST_NAME']);this.list_view=new SugarWidgetListView();this.list_view.load(div);} SugarWidgetSchedulerSearch.showCreateForm=function(module){document.getElementById('create-invitee-edit').style.display='';document.getElementById('create-invitees-buttons').style.display='none';document.getElementById('list_div_win').style.display='none';document.forms['createInviteeForm'].elements['inviteeModule'].value=module;document.getElementById('empty-search-message').style.display='none';if(typeof document.createInviteeForm.first_name!='undefined'&&typeof document.schedulerwidget.search_first_name!='undefined') document.createInviteeForm.first_name.value=document.schedulerwidget.search_first_name.value;if(typeof document.createInviteeForm.last_name!='undefined'&&typeof document.schedulerwidget.search_last_name!='undefined') document.createInviteeForm.last_name.value=document.schedulerwidget.search_last_name.value;if(typeof document.createInviteeForm.email1!='undefined'&&typeof document.schedulerwidget.search_email!='undefined') diff --git a/cache/include/javascript/sugar_grp_quickcomp.js b/cache/include/javascript/sugar_grp_quickcomp.js index 4ee8365e..9098ba88 100644 --- a/cache/include/javascript/sugar_grp_quickcomp.js +++ b/cache/include/javascript/sugar_grp_quickcomp.js @@ -207,10 +207,12 @@ e2Grid={init:function(){var Ck=YAHOO.util.Cookie;var widths=[10,10,150,250,175,1 function flaggedIcon(cell,record,column,value){if(value!=""){cell.innerHTML="!";}} function repliedIcon(cell,record,column,value){if(value!=""){cell.innerHTML="";}} function attachIcon(cell,record,column,value){if(value=="1"){cell.innerHTML="";}} -var colModel=[{label:"

",width:10,sortable:false,fixed:true,resizeable:true,formatter:attachIcon,key:'hasAttach'},{label:"!",width:widths[0],sortable:true,fixed:true,resizeable:true,formatter:flaggedIcon,key:'flagged'},{label:"",width:widths[1],sortable:true,fixed:true,resizeable:true,formatter:repliedIcon,key:'status'},{label:app_strings.LBL_EMAIL_FROM,width:widths[2],sortable:true,resizeable:true,key:'from'},{label:app_strings.LBL_EMAIL_SUBJECT,width:widths[3],sortable:true,resizeable:true,key:'subject'},{label:mod_strings.LBL_LIST_DATE,width:widths[4],sortable:true,resizeable:true,key:'date'},{label:app_strings.LBL_EMAIL_TO,width:widths[5],sortable:false,resizeable:true,key:'to_addrs'},{label:'uid',hidden:true,key:'uid'},{label:'mbox',hidden:true,key:'mbox'},{label:'ieId',hidden:true,key:'ieId'},{label:'site_url',hidden:true,key:'site_url'},{label:'seen',hidden:true,key:'seen'},{label:'type',hidden:true,key:'type'}];var dataModel=new YAHOO.util.DataSource(urlBase+"?",{responseType:YAHOO.util.DataSource.TYPE_JSON,responseSchema:{resultsList:'Email',fields:['flagged','status','from','subject','date','to_addrs','uid','mbox','ieId','site_url','seen','type','AssignedTo','hasAttach'],metaFields:{total:'TotalCount',unread:"UnreadCount",fromCache:"FromCache"}}});var params={to_pdf:"true",module:"Emails",action:"EmailUIAjax",emailUIAction:"getMessageList",mbox:"INBOX",ieId:"",forceRefresh:"false"};if(lazyLoadFolder!=null){params['mbox']=lazyLoadFolder.folder;params['ieId']=lazyLoadFolder.ieId;var test=new String(lazyLoadFolder.folder);if(test.match(/SUGAR\./)){params['emailUIAction']='getMessageListSugarFolders';params['mbox']=test.substr(6);}} +var colModel=[{label:"

",width:10,sortable:false,fixed:true,resizeable:true,formatter:attachIcon,key:'hasAttach'},{label:"!",width:widths[0],sortable:true,fixed:true,resizeable:true,formatter:flaggedIcon,key:'flagged'},{label:"",width:widths[1],sortable:true,fixed:true,resizeable:true,formatter:repliedIcon,key:'status'},{label:app_strings.LBL_EMAIL_FROM,width:widths[2],sortable:true,resizeable:true,key:'from'},{label:app_strings.LBL_EMAIL_SUBJECT,width:widths[3],sortable:true,resizeable:true,key:'subject'},{label:mod_strings.LBL_LIST_DATE,width:widths[4],sortable:true,resizeable:true,key:'date'},{label:app_strings.LBL_EMAIL_TO,width:widths[5],sortable:false,resizeable:true,key:'to_addrs'},{label:'uid',hidden:true,key:'uid'},{label:'mbox',hidden:true,key:'mbox'},{label:'ieId',hidden:true,key:'ieId'},{label:'site_url',hidden:true,key:'site_url'},{label:'seen',hidden:true,key:'seen'},{label:'type',hidden:true,key:'type'}];var dataModel=new YAHOO.util.DataSource(urlBase+"?",{responseType:YAHOO.util.DataSource.TYPE_JSON,responseSchema:{resultsList:'Email',fields:['flagged','status','from','subject','date','to_addrs','uid','mbox','ieId','site_url','seen','type','AssignedTo','hasAttach'],metaFields:{total:'TotalCount',unread:"UnreadCount",fromCache:"FromCache"}}});var params={to_pdf:"true",module:"Emails",action:"EmailUIAjax",emailUIAction:"getMessageList",mbox:"INBOX",ieId:"",forceRefresh:"false"};if(lazyLoadFolder!=null){params['mbox']=lazyLoadFolder.folder;params['ieId']=lazyLoadFolder.ieId;var test=new String(lazyLoadFolder.folder);if(test.match(/SUGAR\./)){params['emailUIAction']='getMessageListSugarFolders';params['mbox']=test.substr(6);params['getUnread']=1;}} var grid=SUGAR.email2.grid=new YAHOO.SUGAR.SelectionGrid('emailGrid',colModel,dataModel,{MSG_EMPTY:SUGAR.language.get("Emails","LBL_EMPTY_FOLDER"),dynamicData:true,paginator:new YAHOO.widget.Paginator({rowsPerPage:parseInt(SUGAR.email2.userPrefs.emailSettings.showNumInList),containers:["dt-pag-nav"],template:"",firstPageLinkLabel:"",previousPageLinkLabel:"",nextPageLinkLabel:"",lastPageLinkLabel:""}),initialRequest:SUGAR.util.paramsToUrl(params),width:"800px",height:"400px"});initRowDD();grid.set("generateRequest",function(oState,oSelf){oState=oState||{pagination:null,sortedBy:null};var sort=(oState.sortedBy)?oState.sortedBy.key:oSelf.getColumnSet().keys[5].getKey();var dir=(oState.sortedBy&&oState.sortedBy.dir===YAHOO.widget.DataTable.CLASS_ASC)?"asc":"desc";var startIndex=(oState.pagination)?oState.pagination.recordOffset:0;var results=(oState.pagination)?oState.pagination.rowsPerPage:null;var ret=SUGAR.util.paramsToUrl(oSelf.params)+"&sort="+sort+"&dir="+dir+"&start="+startIndex+ -((results!==null)?"&limit="+results:"");return ret;});grid.handleDataReturnPayload=function(oRequest,oResponse,oPayload){oPayload=oPayload||{};oPayload.totalRecords=oResponse.meta.total;oPayload.unreadRecords=oResponse.meta.unread;var tabObject=SE.innerLayout.get("tabs")[0];var mboxTitle="";if(this.params.mbox!=null){mboxTitle=this.params.mbox;} -var tabtext=mboxTitle+" ("+oResponse.meta.total+" "+app_strings.LBL_EMAIL_MESSAGES+" )";tabObject.get("labelEl").firstChild.data=tabtext;if(SE.tree){var node=SE.tree.getNodeByProperty('id',this.params.ieId)||SE.tree.getNodeByProperty('origText',this.params.mbox);if(node){node.data.unseen=oResponse.meta.unread;SE.accounts.renderTree();}} +((results!==null)?"&limit="+results:"");return ret;});grid.handleDataReturnPayload=function(oRequest,oResponse,oPayload){oPayload=oPayload||{};oPayload.totalRecords=oResponse.meta.total;if(oResponse.meta.unread!=-1){oPayload.unreadRecords=oResponse.meta.unread;} +var tabObject=SE.innerLayout.get("tabs")[0];var mboxTitle="";if(this.params.mbox!=null){mboxTitle=this.params.mbox;} +var tabtext=mboxTitle+" ("+oResponse.meta.total+" "+app_strings.LBL_EMAIL_MESSAGES+" )";tabObject.get("labelEl").firstChild.data=tabtext;if(SE.tree){var node=SE.tree.getNodeByProperty('id',this.params.ieId)||SE.tree.getNodeByProperty('origText',this.params.mbox);if(node){if(oResponse.meta.unread!=-1){node.data.unseen=oResponse.meta.unread;} +SE.accounts.renderTree();}} return oPayload;} var resize=grid.resizeGrid=function(){SUGAR.email2.grid.set("width",SUGAR.email2.grid.get("element").parentNode.clientWidth+"px");SUGAR.email2.grid.set("height",(SUGAR.email2.grid.get("element").parentNode.clientHeight-47)+"px");} grid.convertDDRows=function(){var rowEl=this.getFirstTrEl();while(rowEl!=null){new this.DDRow(this,this.getRecord(rowEl),rowEl);rowEl=this.getNextTrEl(rowEl);}} diff --git a/data/SugarBean.php b/data/SugarBean.php index a8a55185..c56aa52b 100644 --- a/data/SugarBean.php +++ b/data/SugarBean.php @@ -2582,7 +2582,8 @@ class SugarBean // Bug 38803 - Use CONVERT() function when doing an order by on ntext, text, and image fields if ($source != 'non-db' && $this->db->isTextType($this->db->getFieldType($bean_queried->field_defs[$list_column_name]))) { - $list_column[0] = $this->db->convert($list_column[0], "text2char"); + // array(10000) is for db2 only. It tells db2manager to cast 'clob' to varchar(10000) for this 'sort by' column + $list_column[0] = $this->db->convert($list_column[0], "text2char", array(10000)); } $is_valid = true; @@ -5613,22 +5614,22 @@ class SugarBean $street_field ) { - $street_field_2 = $street_field.'_2'; - $street_field_3 = $street_field.'_3'; - $street_field_4 = $street_field.'_4'; - if ( isset($this->$street_field_2)) { - $this->$street_field .= "\n". $this->$street_field_2; - unset($this->$street_field_2); - } - if ( isset($this->$street_field_3)) { - $this->$street_field .= "\n". $this->$street_field_3; - unset($this->$street_field_3); - } - if ( isset($this->$street_field_4)) { - $this->$street_field .= "\n". $this->$street_field_4; - unset($this->$street_field_4); - } - if ( isset($this->$street_field)) { + if (isset($this->$street_field)) { + $street_field_2 = $street_field.'_2'; + $street_field_3 = $street_field.'_3'; + $street_field_4 = $street_field.'_4'; + if ( isset($this->$street_field_2)) { + $this->$street_field .= "\n". $this->$street_field_2; + unset($this->$street_field_2); + } + if ( isset($this->$street_field_3)) { + $this->$street_field .= "\n". $this->$street_field_3; + unset($this->$street_field_3); + } + if ( isset($this->$street_field_4)) { + $this->$street_field .= "\n". $this->$street_field_4; + unset($this->$street_field_4); + } $this->$street_field = trim($this->$street_field, "\n"); } } diff --git a/download.php b/download.php index 3e569048..992af2cf 100644 --- a/download.php +++ b/download.php @@ -52,7 +52,6 @@ else { $app_strings = return_application_language($GLOBALS['current_language']); $mod_strings = return_module_language($GLOBALS['current_language'], 'ACL'); $file_type = strtolower($_REQUEST['type']); - $check_image = false; if(!isset($_REQUEST['isTempFile'])) { //Custom modules may have capitalizations anywhere in their names. We should check the passed in format first. require('include/modules.php'); @@ -133,9 +132,8 @@ else { $query="SELECT document_revisions.filename name FROM document_revisions INNER JOIN kbdocument_revisions ON document_revisions.id = kbdocument_revisions.document_revision_id INNER JOIN kbdocuments ON kbdocument_revisions.kbdocument_id = kbdocuments.id "; $query .= "WHERE document_revisions.id = '" . $db->quote($_REQUEST['id']) ."'"; } elseif($file_type == 'notes') { - $query = "SELECT filename name FROM notes "; + $query = "SELECT filename name, file_mime_type FROM notes "; $query .= "WHERE notes.id = '" . $db->quote($_REQUEST['id']) ."'"; - $check_image = true; } elseif( !isset($_REQUEST['isTempFile']) && !isset($_REQUEST['tempName'] ) && isset($_REQUEST['type']) && $file_type!='temp' ){ //make sure not email temp file. $query = "SELECT filename name FROM ". $file_type ." "; $query .= "WHERE ". $file_type .".id= '".$db->quote($_REQUEST['id'])."'"; @@ -143,6 +141,7 @@ else { $doQuery = false; } + $mime_type = 'application/octet-stream'; if($doQuery && isset($query)) { $rs = $GLOBALS['db']->query($query); $row = $GLOBALS['db']->fetchByAssoc($rs); @@ -151,6 +150,12 @@ else { die($app_strings['ERROR_NO_RECORD']); } $name = $row['name']; + + // expose original mime type only for images, otherwise the content of arbitrary type + // may be interpreted/executed by browser + if (isset($row['file_mime_type']) && strpos($row['file_mime_type'], 'image/') === 0) { + $mime_type = $row['file_mime_type']; + } $download_location = "upload://{$_REQUEST['id']}"; } else if(isset( $_REQUEST['tempName'] ) && isset($_REQUEST['isTempFile']) ){ // downloading a temp file (email 2.0) @@ -177,15 +182,7 @@ else { header("Content-Type: image/png"); } } else { - - if ($check_image && ($mime = getimagesize($download_location)) !== false) - { - header("Content-Type: " . $mime['mime']); - } - else - { - header("Content-type: application/octet-stream"); - } + header('Content-type: ' . $mime_type); header("Content-Disposition: attachment; filename=\"".$name."\";"); } @@ -195,11 +192,10 @@ else { header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 2592000)); set_time_limit(0); - @ob_end_clean(); - ob_start(); + // When output_buffering = On, ob_get_level() may return 1 even if ob_end_clean() returns false + // This happens on some QA stacks. See Bug#64860 + while (ob_get_level() && @ob_end_clean()); readfile($download_location); - @ob_flush(); } } -?> diff --git a/files.md5 b/files.md5 index 4238b1a0..d8f9e7b3 100644 --- a/files.md5 +++ b/files.md5 @@ -1,8 +1,8 @@ 'd3f150e4a5bed444763ebe8a81742a95', - './sugar_version.json' => '4f296ab1ea0d5af9ae1f7edff7d72d2f', + './sugar_version.json' => 'e5a791d36f115df8e3a7397ddd70cac1', './.htaccess' => 'd41d8cd98f00b204e9800998ecf8427e', './config_override.php' => 'd41d8cd98f00b204e9800998ecf8427e', './config.php' => 'd41d8cd98f00b204e9800998ecf8427e', @@ -68,7 +68,7 @@ $md5_string = array ( './include/SugarObjects/templates/company/language/en_us.lang.php' => '27745c61a0c06545bc425c7e03af6d45', './include/SugarObjects/templates/company/language/application/en_us.lang.php' => '7edad0ae72bfc57914785fc0d8eab212', './include/SugarObjects/templates/person/config.php' => '97cd8f77525d81d46c6ec9a2c22369b3', - './include/SugarObjects/templates/person/vardefs.php' => '7b94cb921900c82ccc34e8252cde6d4f', + './include/SugarObjects/templates/person/vardefs.php' => '49ace7918e1013fb1ef5406e34636f92', './include/SugarObjects/templates/person/icons/person.gif' => 'ea5e2b2022166291d01ccedaf24b4e33', './include/SugarObjects/templates/person/icons/person_32.gif' => '1550c24a793910550200679be1c5c078', './include/SugarObjects/templates/person/icons/Createperson.gif' => '2e20692d501b15729294b80f4f311d77', @@ -132,6 +132,7 @@ $md5_string = array ( './include/SugarObjects/implements/assignable/vardefs.php' => '8954877055c988ff445079dbe49a21b3', './include/SugarObjects/implements/assignable/language/en_us.lang.php' => 'c5d4c8bbf7c6fd636eb9384920a69214', './include/SugarObjects/SugarConfig.php' => '3a91206f8d68e3d563e7668f061d893b', + './include/HTMLPurifier/README.UPGRADE' => 'cdb17b0280d05cda3660811cbac13869', './include/HTMLPurifier/HTMLPurifier.autoload.php' => '4b4731b18fc20cf22a3524093b122278', './include/HTMLPurifier/standalone/HTMLPurifier/Filter/YouTube.php' => '92324458027c0e4bb3bce76361312080', './include/HTMLPurifier/standalone/HTMLPurifier/Filter/ExtractStyleBlocks.php' => '739249b8ed7c1e1ff906931b13d477f6', @@ -269,11 +270,11 @@ $md5_string = array ( './include/HTMLPurifier/standalone/HTMLPurifier/EntityLookup/entities.ser' => '0effa122c2636c1b1d5ed4b900e51e68', './include/HTMLPurifier/standalone/HTMLPurifier/Printer.php' => '530db343c69ec3d4ba27e09e4b837903', './include/HTMLPurifier/VERSION' => 'c9e4dc50b8d6ed20385fdca95873b3a5', - './include/HTMLPurifier/HTMLPurifier.standalone.php' => '7780b45f4f623b2fb08b04c3aed3f0ce', + './include/HTMLPurifier/HTMLPurifier.standalone.php' => '0ed7d382da3820a0e9fb3176e8f2c140', './include/HTMLPurifier/LICENSE' => 'a1b3d3e45e8422eed104489842a6f546', './include/HTMLPurifier/CREDITS' => 'a5f9ddecea015543001404c0a9bfd181', './include/SugarHtml/SugarHtml.php' => 'ac86d214d3f6b4d0a9dd72e0aa647b6f', - './include/SubPanel/SubPanelTiles.js' => '1d54b4402826fba3a78edd63896eff30', + './include/SubPanel/SubPanelTiles.js' => '1509aee3b2d562f2413c4a34228cd9b5', './include/SubPanel/SugarTab.php' => '43d978b88d82d1257057924ed2a316ea', './include/SubPanel/SubPanelDynamic.html' => '719a36409ba810b2d8ee75ff261b5253', './include/SubPanel/tpls/singletabmenu.tpl' => '7a1c4c8d47e31cb40c99bcdd8eece6e2', @@ -296,11 +297,11 @@ $md5_string = array ( './include/Sugarpdf/SugarpdfHelper.php' => '35599a65bb962f0c4cc4301a1a331f20', './include/Sugarpdf/SugarpdfFactory.php' => '8167ec6ab68f9f9750d42ceffec76bec', './include/Sugarpdf/sugarpdf/sugarpdf.smarty.php' => '9a26252b2e52978c4c0dc119ce7109bc', - './include/Sugarpdf/Sugarpdf.php' => '150a845134ec7b60d1e77a4db3529582', + './include/Sugarpdf/Sugarpdf.php' => 'acae531a88a70764dfc5229b2cacbf47', './include/Sugarpdf/sugarpdf_default.php' => 'ff9bbdfd9b541e43af9f4ee1cfeecba4', './include/Sugarpdf/sugarpdf_config.php' => '4d11694a169ef65afb1c6812499c9333', './include/clean.php' => '60e45d68744c50b6c3878b26fc6223ec', - './include/externalAPI/ExternalAPIFactory.php' => '59678c829e4ea18f8799ab291893fa0a', + './include/externalAPI/ExternalAPIFactory.php' => 'd81518445decfed66ecd6d1912ca6291', './include/externalAPI/cmis_repository_wrapper.php' => 'ff3bb54e2abd73334bb05df8b6920b8d', './include/externalAPI/Base/WebDocument.php' => '82bf1b7c2c816f4aef320cfe7f09fca8', './include/externalAPI/Base/OAuthPluginBase.php' => 'fd828a666d6ecba48c32e7e84e06991a', @@ -349,7 +350,7 @@ $md5_string = array ( './include/SugarFields/Fields/Datetime/SugarFieldDatetime.php' => '4bd80a61561627a7178eb097cdc3e70c', './include/SugarFields/Fields/Datetime/DetailView.tpl' => 'e22c3f484f3515946922edbf98a1aff0', './include/SugarFields/Fields/Datetime/EditView.tpl' => '65ee19735345151519f5b1dfe4fd07a2', - './include/SugarFields/Fields/Float/SugarFieldFloat.php' => 'ef31796846f1a474fede57c20e37655b', + './include/SugarFields/Fields/Float/SugarFieldFloat.php' => '6a108ddff9530d6ada71b15d34f58bdd', './include/SugarFields/Fields/Float/DetailView.tpl' => '0604c7bf033e80c439e7981dce75cda8', './include/SugarFields/Fields/Float/EditView.tpl' => '174cda65c4b5114158c4de8257035a08', './include/SugarFields/Fields/Currency/DetailView.tpl' => 'd626794d7f4278437584305c5ebf6414', @@ -367,7 +368,7 @@ $md5_string = array ( './include/SugarFields/Fields/Phone/EditView.tpl' => '9a15b6015624a410097d590a06cb0e49', './include/SugarFields/Fields/Phone/ListView.tpl' => '2fbbb08c716b765ac374695689f7154b', './include/SugarFields/Fields/Datetimecombo/Datetimecombo.js' => '577c712bffdbc84028a3144f75ca0a80', - './include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl' => '6ef42b334f4a78493686d4c6e8dfbcae', + './include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl' => 'c086af49225642aa157e1ec8e580acdb', './include/SugarFields/Fields/Datetimecombo/SugarFieldDatetimecombo.php' => 'da0ef66f63b577c6e691ed2b27ccaa2e', './include/SugarFields/Fields/Datetimecombo/EditView.tpl' => 'acd61b061c2c35e7cf69326e0ebd6e89', './include/SugarFields/Fields/Datetimecombo/SearchView.tpl' => 'baa2bbb9ac71a9bc36ba0f99ebdb3056', @@ -384,10 +385,10 @@ $md5_string = array ( './include/SugarFields/Fields/Enum/SearchView.tpl' => '4ebde97544ae828786bb965f72589562', './include/SugarFields/Fields/Enum/SugarFieldEnum.php' => 'cd3fd9bea9bb375edce26862210d57da', './include/SugarFields/Fields/Readonly/SugarFieldReadonly.php' => '0e60f2fd079eb14dbc64989f618497b0', - './include/SugarFields/Fields/Int/RangeSearchForm.tpl' => '509245762b0d874b95dec4ca3868f710', + './include/SugarFields/Fields/Int/RangeSearchForm.tpl' => 'b7930cf372c1e0a80c3232dbf07c70bc', './include/SugarFields/Fields/Int/SearchForm.tpl' => 'ff406142e532f9fdd34763bdaabe263e', './include/SugarFields/Fields/Int/DetailView.tpl' => 'b3f0a77d61f42a27c2be5ecd59a9a214', - './include/SugarFields/Fields/Int/SugarFieldInt.php' => '5896fc0cdc7a2d09fdd44a3b2394e7cd', + './include/SugarFields/Fields/Int/SugarFieldInt.php' => '9d1e9eb6461ebd0f3918b9c53a3b82bb', './include/SugarFields/Fields/Int/EditView.tpl' => '545b7a9c8e6d7676e961cb488214659d', './include/SugarFields/Fields/Collection/SugarFieldCollection.js' => 'c0bd0306ce51b687bdcd38883730bfd7', './include/SugarFields/Fields/Collection/view.sugarfieldcollection.php' => 'e44a357a4b9aff6918bd7f6e80984d39', @@ -399,11 +400,9 @@ $md5_string = array ( './include/SugarFields/Fields/Collection/CollectionEditViewRow.tpl' => '0cd10a16786c974577929353a34cc93d', './include/SugarFields/Fields/Collection/EditView.tpl' => '9ecf6526440c311227a5972b63a5dcd2', './include/SugarFields/Fields/Address/SugarFieldAddress.js' => '290f2e20738602902e5aafe00a4c998c', - './include/SugarFields/Fields/Address/SugarFieldAddress.php' => '57c5f4328bbb958decc0275217f7cd31', - './include/SugarFields/Fields/Address/en_us.EditView.tpl' => '649acb8a4f5a7eea623efe83ac381530', - './include/SugarFields/Fields/Address/DetailView.tpl' => 'eb28b303fd7a2daee8618d36ede573a5', - './include/SugarFields/Fields/Address/en_us.DetailView.tpl' => '99229b0ea1e10dd35f25d2a5cbd8ab60', - './include/SugarFields/Fields/Address/EditView.tpl' => '4a973cbcd89c1962b20954341c8d02af', + './include/SugarFields/Fields/Address/SugarFieldAddress.php' => '4340b9e0683b45304a759ee877a4da5b', + './include/SugarFields/Fields/Address/DetailView.tpl' => '54d3f30aa39ced1e63ef0cc5cdeb0529', + './include/SugarFields/Fields/Address/EditView.tpl' => '6702386fd9ad952c9505d87052b92d0b', './include/SugarFields/Fields/Id/SugarFieldId.php' => '0b02663d0470dfd7b847dc405cf7ff7e', './include/SugarFields/Fields/Base/ImportViewFunction.tpl' => 'a97c7a9e01bfdb6bd574f660d2b89893', './include/SugarFields/Fields/Base/InlineEdit.tpl' => 'e24e4e5ab6acfd24faf3437b909c4e7a', @@ -489,13 +488,13 @@ $md5_string = array ( './include/SugarCharts/Jit/tpls/chart.tpl' => '338a00c4b18e676050f866b1ce836336', './include/SugarCharts/Jit/tpls/DashletGenericChartScript.tpl' => '81ec53a43eca08c5cb93fd0a5293bc90', './include/SugarCharts/Jit/JitReports.php' => '4a84c631957991da42d4d803398b2d16', - './include/SugarCharts/Jit/FlashCanvas/flashcanvas.js' => 'c2300996439f4a33c849f40afc5da8ae', + './include/SugarCharts/Jit/FlashCanvas/flashcanvas.js' => '089f8d5ff5bec4065cfe11df3725267a', './include/SugarCharts/Jit/FlashCanvas/canvas2png.js' => '71a23466955e17ab3094233fee8db708', './include/SugarCharts/Jit/FlashCanvas/flashcanvas.swf' => '528d82bb81799f23d4def3425badf913', './include/SugarCharts/Jit/FlashCanvas/proxy.php' => '82ccbc7400b0bda3a33316920de41e60', './include/SugarCharts/Jit/FlashCanvas/save.php' => 'b128689255043db993d1cc2f4bc484bc', './include/SugarCharts/Jit/css/base.css' => '6e068c29d959fcc3a8352d20545f60d5', - './include/SugarCharts/Jit/Jit.php' => '623132e9d5f62c7f05c4e397f7d34c30', + './include/SugarCharts/Jit/Jit.php' => '1d9c9e2baf5c005212e4ebcc4403dbcd', './include/JSON.php' => '692a73ae786d73d5696bae9cbd73380e', './include/utils/logic_utils.php' => 'afe0e20d46be88852e0d856d6917423a', './include/utils/LogicHook.php' => 'bcce19899ef75439237ffcc54e5d6229', @@ -504,7 +503,7 @@ $md5_string = array ( './include/utils/array_utils.php' => 'c03d8d4e81065e4c307421b555a5f516', './include/utils/sugar_file_utils.php' => '24145be30268bf9d49e5e57a040f858c', './include/utils/security_utils.php' => 'bbb90067f557ba011a47cb9c1138bf6a', - './include/utils/autoloader.php' => '6a762c07922c720e902887ee13aa9670', + './include/utils/autoloader.php' => '51bb490bcd106c650a2af611486f665b', './include/utils/db_utils.php' => 'e9b12dfbb911ad4717f354ff4da970ac', './include/utils/encryption_utils.php' => 'ff80a1ff0c79048d7fbb4bd3d56d9713', './include/utils/activity_utils.php' => 'ba03f93c8b416f57ad5c97dc76e76f0b', @@ -583,7 +582,7 @@ $md5_string = array ( './include/nusoap/license.txt' => '25823f4a2e463ab2c6b5873f07e428e1', './include/nusoap/class.wsdl.php' => 'cd7f1a43ca08891ac1ce04d4d1282c49', './include/nusoap/class.soap_val.php' => '084a898ecf261c201427fd41d4ee40e0', - './include/utils.php' => 'b24ae8e1d56284a0263ea7d7fd0e7978', + './include/utils.php' => '4b508e043852c657d57cfd03d527b5d0', './include/SugarHttpClient.php' => '44857baa23778fb3b8346aca15e15491', './include/Sugar_Smarty.php' => '2df55eb0c0e85f5c757680cb4c022d74', './include/phpmailer/extras/htmlfilter.php' => '4d5143899340a690d41a4959428ea674', @@ -651,8 +650,8 @@ $md5_string = array ( './include/QuickSearchDefaults.php' => '1477d239504932d6a3aa269579e2fbd1', './include/Popups/tpls/footer.tpl' => '9384eec4814b86a9a646c69bb2f6b814', './include/Popups/tpls/header.tpl' => '132ca519775a21b7817837c2a2e4f199', - './include/Popups/tpls/PopupGeneric.tpl' => '83b2f701ddda9f4573d9add0f5e33474', - './include/Popups/PopupSmarty.php' => '6384f04de1c79333fe63bc6480a234f5', + './include/Popups/tpls/PopupGeneric.tpl' => '79284d34f2f5765b232a8f24115de0fa', + './include/Popups/PopupSmarty.php' => '20673d0e0d4e8206fa4d86304686f0eb', './include/Popups/Popup_picker.php' => '92cc9c3a84d4ebbe76e7487605dd5da8', './include/templates/TemplateDragDropChooser.php' => '7ea8b4e854412716a49842e0ec20925b', './include/templates/Template.php' => 'e66cbf4c2a382db7a578224a398bbd8b', @@ -667,7 +666,7 @@ $md5_string = array ( './include/SugarDependentDropdown/SugarDependentDropdown.php' => 'a55f720c8073e67e64281d752a76815d', './include/export_utils.php' => '3bef79db0b6eefc6ca00ac49b96dd0da', './include/globalControlLinks.php' => 'bf7590760099fc3a1bc92b39a0e2e784', - './include/SugarTinyMCE.php' => '0ba088a42b65615d6ba9a1372456cc56', + './include/SugarTinyMCE.php' => 'b8af5072ddbdfb2b26e34da6b74cdf11', './include/tabs.php' => '45b4cecd7fcd0eed024d748c1caad884', './include/SugarOAuthServer.php' => '8f3738e36c51a920d0b69bd6e90516f6', './include/modules.php' => 'b4c765d1ec2e198fa4f54484bb97a8c2', @@ -751,7 +750,7 @@ $md5_string = array ( './include/EditView/EditView2.php' => '2b698b163e0cd877292f75ec707b482c', './include/EditView/PopupQuickCreate.php' => '2ac7f47aa60662ff5f7a51e02323bf8a', './include/EditView/SugarVCR.tpl' => 'ddd7c9f152d4dba681a60d74b5a095cd', - './include/EditView/EditView.tpl' => 'e628d68c24498fa1bd437d19492ca2b9', + './include/EditView/EditView.tpl' => '27924d46d612fe216bd162b286e08c80', './include/EditView/QuickCreate.php' => '37c74b892ff9ef7be88f22ef2187de8d', './include/EditView/SubpanelQuickEdit.php' => '5291ae4ba5327417098e380191bfe873', './include/SugarQueue/SugarCronJobs.php' => '3c2de2e04e4c85fe333cc54a6fa0dc01', @@ -792,24 +791,24 @@ $md5_string = array ( './include/tcpdf/barcodes.php' => 'ae6a844d3c0d140c53e0f8fa29256714', './include/tcpdf/2dbarcodes.php' => 'ffd7b4d2b008aeffecb7967041777c44', './include/tcpdf/CHANGELOG.TXT' => 'b41664d05748e067b3d52ba1eba1e9c3', - './include/tcpdf/tcpdf.php' => 'e1032f914233be45b287bbb29bdfb452', + './include/tcpdf/tcpdf.php' => '0ebdc28f3633b3913e55a866109a05a2', './include/tcpdf/README.TXT' => 'f64835b5e9149a89515a9eb589d13a38', './include/javascript/ajaxUI.js' => '7d1f05513e3a3b52ed4f144a719dd055', './include/javascript/calendar.js' => 'f66e74c73108b6a49778709829f8eeb5', './include/javascript/iscroll.js' => 'f6b1477d2416ee1c40578d56c89220c1', './include/javascript/include.js' => 'f3ef613992bd21dcb9a6033c03675b90', './include/javascript/dashlets.js' => 'f3154b0f2bff9641df358ed967e9eb5d', - './include/javascript/popup_helper.js' => '96c9afa646fed96bd44c158b65b123ab', + './include/javascript/popup_helper.js' => '34a9a63d4cedc7a766963b1489d4218a', './include/javascript/report_additionals.js' => 'b368977a0256850a04b2f3fcde32f3b7', './include/javascript/quicksearch.js' => 'ce6e9f076e89b7b990f3af22ae9e9676', './include/javascript/sugar_yui_overrides.js' => '8f58b85d735143b06883b06246e39170', './include/javascript/cookie.js' => 'fca904047ebf36d4eee53df902debb4f', './include/javascript/popup_parent_helper.js' => '2589c529444f256450a92957e38c3785', - './include/javascript/sugar_3.js' => '0585570c9acce30f62c923c6fa76f9ba', + './include/javascript/sugar_3.js' => '92845c18a9287e4e2c94333d0d588199', './include/javascript/jquery.js' => '819fb9d29c24f79d34343e9f182aaf24', './include/javascript/sugar_connection_event_listener.js' => '382b26c2895d7921378688996c93d090', './include/javascript/jsclass_async.js' => 'c09187c0aeaee9f7771b8d9dbde402c4', - './include/javascript/quickCompose.js' => '43694b8ad631b58dd9030925a99f5a15', + './include/javascript/quickCompose.js' => 'c3f2d67a850c6b1ef1342e77bcab4357', './include/javascript/menu.js' => 'ae03a8baff44fcd4810058275f2844aa', './include/javascript/tour.js' => '782ed9e3bd73c09eecf32a0893f9374c', './include/javascript/importWizard.js' => '6cfd3fb2d1ef76ce73503dc596754fd6', @@ -2591,7 +2590,7 @@ $md5_string = array ( './include/MVC/SugarApplication.php' => 'a4dceec0466f3811805e1cbf4233020c', './include/MVC/Controller/file_access_control_map.php' => '973ffb0c666e5e252a7563a4dbfa0e60', './include/MVC/Controller/entry_point_registry.php' => '8f30e68f35d444a9fc110febdd7ae3dd', - './include/MVC/Controller/SugarController.php' => '9760deb77f9debea34f61ece846c7468', + './include/MVC/Controller/SugarController.php' => '42e9c980c403e59a7e6578ed41b8c404', './include/MVC/Controller/action_file_map.php' => '341c47830c5235c35586a637f9f50130', './include/MVC/Controller/action_view_map.php' => 'f9da4a6f0f4905ea87361903e4671910', './include/MVC/Controller/ControllerFactory.php' => '61d5694afd6301c639db299aa0348d8b', @@ -2603,7 +2602,7 @@ $md5_string = array ( './include/SearchForm/tpls/SearchFormGeneric.tpl' => '599f1c02680f4a31c467467a2d691968', './include/SearchForm/SugarSpot.php' => 'd8449360de3e2907dae694c8c984f40b', './include/SearchForm/SearchForm.php' => 'bb489966e170ef2b9782cdeffaf8f2eb', - './include/SearchForm/SearchForm2.php' => '811bc0b5b15bdeec55171fd7d1ef56f4', + './include/SearchForm/SearchForm2.php' => '11935484201d176875b2641a468858b2', './include/Dashlets/DashletRssFeedTitle.php' => 'a47b01bb0712af9ed5c9cf86de254252', './include/Dashlets/DashletGenericAutoRefreshDynamic.tpl' => '2dafbe3aeb4faac8dda04fdc7153ac45', './include/Dashlets/DashletCacheBuilder.php' => '0c919c1e633ce4d3c8782f36c7a23642', @@ -2630,10 +2629,10 @@ $md5_string = array ( './include/ListView/ListViewDCMenu.tpl' => 'b8fc691b5015320ea9ff8d56c26da377', './include/ListView/ListViewXTPL.php' => '13b61371300ea84868bfecd1625d5be1', './include/ListView/ListViewPagination.tpl' => '8192c397efea1a40b0be1e3eec43d281', - './include/ListView/ListViewDisplay.php' => '80ecf9f1e96267d2c2367289ced4e434', + './include/ListView/ListViewDisplay.php' => '2ad025c6f2b9a9805b36f0dd88e01a91', './include/ListView/ListViewNoMassUpdate.tpl' => 'ec0365083c62e59025105324d30646e7', './include/vCard.php' => 'c9be6dabeb36452ca470e861a39470fa', - './include/upload_file.php' => 'a0576c012db7b8864b8baa45318d4c3a', + './include/upload_file.php' => 'd2e0af86266c8b87a6b99f7e26c37385', './include/controller/Controller.php' => 'a8eeb941b5d10c61040811d9a20903ec', './include/formbase.php' => '0883eaf8dcf5f2da61442694fb94e277', './include/SugarOauth.php' => '5ee5bb506e3df35b1e732c88994f5eb9', @@ -2642,7 +2641,7 @@ $md5_string = array ( './include/resource/Observers/ResourceObserver.php' => '77d273ea39b8e2abe026f1f8c515408b', './include/resource/Observers/SoapResourceObserver.php' => '8966a226d081e396d109d1e13dd6e6e0', './include/language/jsLanguage.php' => 'c5d5b59aa6c5c5a52e96c8758fc5a14e', - './include/language/en_us.lang.php' => '05a11b034027f47fc5207f3e087bdf72', + './include/language/en_us.lang.php' => '8503f9c7bf444963c4d6c0ce5e8e4493', './include/language/en_us.notify_template.html' => 'b885a3d87060bee2226369fa918e77f3', './include/pclzip/readme.txt' => '2265cad9ccb84cfcd4093ce26b22dc97', './include/pclzip/gnu-lgpl.txt' => '7fbc338309ac38fefcd64b04bb903e34', @@ -2742,7 +2741,7 @@ $md5_string = array ( './include/Smarty/plugins/modifier.count_paragraphs.php' => '094571a25323b4a624339c510c235e23', './include/Smarty/plugins/function.sugar_actions_link.php' => '618049c67e273e5f045a6a30979fae5b', './include/Smarty/plugins/modifier.count_sentences.php' => 'ce2aa6fd44be95bbca2f9fa405184476', - './include/Smarty/plugins/function.sugar_field.php' => 'f8c7e9483705a46ba9eb0e596330cf9d', + './include/Smarty/plugins/function.sugar_field.php' => 'fa680cca3af159b3f462e942c13e2204', './include/Smarty/plugins/modifier.strip.php' => 'd37cbead10b238172272e54a5cd9c691', './include/Smarty/plugins/modifier.cat.php' => '0bdc246da1c7628c41296b51705ef4cf', './include/Smarty/plugins/modifier.string_format.php' => '916e60af3846575f2f0b70db2d25ba98', @@ -2790,6 +2789,7 @@ $md5_string = array ( './include/generic/SugarWidgets/SugarWidgetField.php' => '5a6e5390a14cf66cbf53f359ee9b7f57', './include/generic/SugarWidgets/SugarWidgetSubPanelIcon.php' => '307b74aa834be8b606e6679163ddb0f8', './include/generic/SugarWidgets/SugarWidgetSubPanelTopMessage.php' => '3941e88f198e51aa2e9060b51ac7db68', + './include/generic/SugarWidgets/SugarWidgetFieldreadonly.php' => 'dbb15701ba214f47fdcfbc37793e7f46', './include/generic/SugarWidgets/SugarWidgetFieldvarchar.php' => 'c74fd35f8eabf369cafab412f23ad9b3', './include/generic/SugarWidgets/SugarWidgetFieldbool.php' => '651faf4c2d46b9820ae2313db40046c6', './include/generic/SugarWidgets/SugarWidgetFieldlongtext.php' => '24ab3ec27ed9c0f27cfbd1876d8fcf67', @@ -2809,7 +2809,7 @@ $md5_string = array ( './include/generic/SugarWidgets/SugarWidgetFieldradioenum.php' => 'afdecdd2595330a935be7a30ae57426d', './include/generic/SugarWidgets/SugarWidgetSubPanelActivitiesStatusField.php' => '6a1ad20a8e47b4eb0360f9c916776fff', './include/generic/SugarWidgets/SugarWidgetFieldlong.php' => 'e21529513c7f69087abf1b4876851bf3', - './include/generic/SugarWidgets/SugarWidgetFieldparent_type.php' => '79c612e4af8cb498178962cc365ca81d', + './include/generic/SugarWidgets/SugarWidgetFieldparent_type.php' => '34be12d0ab7cf668eceafcff7fca5529', './include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateLeadNameButton.php' => '9690f29860c62748e3e61b1a82523d20', './include/generic/SugarWidgets/SugarWidgetSubPanelDeleteButton.php' => 'be2e150549d6c9d2226fa16add332864', './include/generic/SugarWidgets/SugarWidgetFieldfile.php' => '4dffa8be0094fc500a1cba226eb1ac4a', @@ -2834,13 +2834,13 @@ $md5_string = array ( './include/generic/SugarWidgets/SugarWidgetSubPanelTopButton.php' => '24f2871da5dc8c415e485a405b79a75a', './include/generic/SugarWidgets/SugarWidgetSubPanelEditButton.php' => 'd66ecb30b75f0a22fa2652cc93e76a48', './include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateCampaignLogEntryButton.php' => 'ad4f6ef8810e8d0aae49d30d2151c5a0', - './include/generic/SugarWidgets/SugarWidgetReportField.php' => '8da0e61ab5ab98656dc772934cef30df', + './include/generic/SugarWidgets/SugarWidgetReportField.php' => '7787e33aac3a280d9d92a1e1151f33d2', './include/generic/SugarWidgets/SugarWidgetSubPanelCloseButton.php' => 'dc4aeab45c4536d847d098096e606519', './include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateNoteButton.php' => '737000e60b4f1d2089311ce1a49f7a50', './include/generic/SugarWidgets/SugarWidgetFieldnum.php' => 'a38a9d4090dd5e904dfaf450a89951ac', './include/generic/SugarWidgets/SugarWidgetFieldrelate.php' => '5b9659616ccb8890968bcbecbe9955e4', './include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectAccountButton.php' => 'e7948f3a338cf8535134e4ad53335785', - './include/generic/SugarWidgets/SugarWidgetFielddatetime.php' => 'fa360b743edbec3cabda669cdf1047fb', + './include/generic/SugarWidgets/SugarWidgetFielddatetime.php' => '2c3cb2fc25b1c286374ee9dc33c633d6', './include/generic/SugarWidgets/SugarWidgetSubPanelEmailLink.php' => 'd6279c8abe809bc070309a8c71e9c4c0', './include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButtonMeetings.php' => '877aa3f9a6283175aeaabd1d76be0b69', './include/generic/SugarWidgets/SugarWidgetFieldfloat.php' => 'aaff5e04fe77e6c303efc0cb5abd76eb', @@ -2850,7 +2850,7 @@ $md5_string = array ( './include/generic/SugarWidgets/SugarWidgetFielddatetimecombo.php' => 'f88bf9e9b28cb50754ae90d19dcc9c9d', './include/TimeDate.php' => '337d3f46d93fbb3ad2f66d83cb614c6c', './include/Localization/Localization.php' => '82bca3fff2970f0104b41d869fbbb4f5', - './include/SugarLogger/SugarLogger.php' => '749c5daac2243ba4e236f63021682056', + './include/SugarLogger/SugarLogger.php' => '45a0823f43f79914675fd940b1fd80e1', './include/SugarLogger/LoggerManager.php' => 'ca6ce3930f9c14d278e842508e7c2e3e', './include/SugarLogger/LoggerTemplate.php' => 'a26171e000dc96e41467315c146408af', './include/SugarCache/SugarCacheMemory.php' => 'a31af7167a2bcf06e1085b2334e9b3b9', @@ -2888,7 +2888,7 @@ $md5_string = array ( './dictionary.php' => '2c944c4e9de0ad7ee323dbbfb2388764', './HandleAjaxCall.php' => '52ec9af41f1f3b3787c02fafa4ba4da1', './ModuleInstall/extensions.php' => '34bab7a46f584229895919f6783429e0', - './ModuleInstall/ModuleScanner.php' => '192e1cd76a9deafa4cea39979cddac42', + './ModuleInstall/ModuleScanner.php' => '0aec32c1805e0a0e3ed75789f387189f', './ModuleInstall/ModuleInstaller.php' => '78ffa995728557e195ecba6929041fed', './ModuleInstall/PackageManager/tpls/PackageForm.tpl' => '1c0ab9066a5bd2597ade0fb345f8537a', './ModuleInstall/PackageManager/tpls/PackageManagerScripts.tpl' => '72add280abe1587ee92f106896c88d99', @@ -2902,7 +2902,6 @@ $md5_string = array ( './ModuleInstall/PackageManager/ListViewPackages.php' => 'af2002819a36d6b8a62f8031b2359b1f', './ModuleInstall/PackageManager/PackageManagerDownloader.php' => 'c1a0667ae35852c42f6a21e03a514d83', './campaign_tracker.php' => '77d66a0803c5114403069d4fdaa4fb4b', - './get_url.php' => 'cff3a146d6aa7d0d204d0e19f7e55e15', './metagen.php' => '882c0c8f7cb0fba96cfdde5fe1adf442', './removeme.php' => '2e68032912896a9dba0db4da87baefec', './image.php' => 'ff023083835518c677c1b3904bb21aa2', @@ -3310,7 +3309,7 @@ $md5_string = array ( './SugarSecurity.php' => 'f49c2b65fbdc18e2e6d8c6d92a989c6e', './export.php' => 'd9db290e9c27d0061a5214fabe1e9e5a', './data/BeanFactory.php' => '66eb7cf0ed822114e12c7eee7ec3137b', - './data/SugarBean.php' => '0fd3a80949d1f561c11f6fae38788d57', + './data/SugarBean.php' => '2f965e2e8013122b589d41a118a75d29', './data/Link.php' => '667ba00ff4e368a8de7c696729d6a5db', './data/Relationships/One2OneRelationship.php' => '31e10349d8cac5b63008a8f57dee70d6', './data/Relationships/EmailAddressRelationship.php' => '88c955642bcc4b1d7f324d92c5223160', @@ -3328,7 +3327,7 @@ $md5_string = array ( './service/core/SugarSoapService.php' => 'f8935c2260dd22cbd7ad275d7ee41d5c', './service/core/SugarRestServiceImpl.php' => '906bb46e9df54528048c8e9c10ed415a', './service/core/WSDL.tpl' => 'd41d8cd98f00b204e9800998ecf8427e', - './service/core/SugarWebServiceImpl.php' => '737e05b203043e1791d967c6b94c874c', + './service/core/SugarWebServiceImpl.php' => '710ba8594b2c292f7059a9751044c7a9', './service/core/SoapHelperWebService.php' => '1cd19525ad113afbc7fa06000ebbfa6d', './service/core/SugarWebService.php' => 'd9fa202bf8379ae984941bf28913dd50', './service/core/PHP5Soap.php' => '24fea66cb2f6c3dd4d273246ea9689c1', @@ -3348,9 +3347,9 @@ $md5_string = array ( './service/v3/soap.php' => '7611e20e1e921da530c7b8b4320d0338', './service/v3/registry.php' => '8c18e43f4bc598e2b4b69205a7806f48', './service/v3/rest.php' => '07d5f3759bb959a40d40b25d44247d1a', - './service/v3/SugarWebServiceImplv3.php' => '48f599e7e6cda57b94f8b81143ce34e3', + './service/v3/SugarWebServiceImplv3.php' => 'd7a42bba71674d786161f6bdf268c8e1', './service/v3/SugarWebServiceUtilv3.php' => '7d880b1fd93b2f091706f2e7a554c7eb', - './service/v3_1/SugarWebServiceImplv3_1.php' => '31dcb5c025fc43d42e4a7906e7cfe91b', + './service/v3_1/SugarWebServiceImplv3_1.php' => '1f7e45330ef8054415a6d5789bdf391f', './service/v3_1/soap.php' => '5d9e8526a68b0dcebb2436eee84c5392', './service/v3_1/registry.php' => '268c2b144ea972cffbd2aa6cb2890930', './service/v3_1/SugarWebServiceUtilv3_1.php' => 'ca1fd57fe7e780d9b65f3e696a210e2d', @@ -3367,7 +3366,7 @@ $md5_string = array ( './service/v4/soap.php' => '2f1116aa3dc77d20cc40d46f47d80198', './service/v4/registry.php' => '327b971392fb633d5c0615f2b1c6cc00', './service/v4/rest.php' => 'ea23fb4927de5f1ac981b392dfa3624e', - './service/v4/SugarWebServiceImplv4.php' => 'b8c9c526ce1ce8cf05012841aeecf66d', + './service/v4/SugarWebServiceImplv4.php' => '63a26bb12a813be5b23e0bfed1211b24', './service/v4/SugarWebServiceUtilv4.php' => 'f057e46f87193f453a254d61fd3afa30', './custom/index.html' => '601a18f179c2ac55779c9bac46942525', './modules/EmailTemplates/EmailTemplate.js' => 'a40693190f3b6917751569ccce16f764', @@ -3403,7 +3402,7 @@ $md5_string = array ( './modules/Leads/tpls/DetailViewHeader.tpl' => 'bedba1b180768f1f11edb26cd2956269', './modules/Leads/tpls/ConvertLeadFooter.tpl' => '2ea6576f9fe58d92409a9c6b97b94d3b', './modules/Leads/Menu.php' => 'ed395651f15ffd38d41ca964c664de2a', - './modules/Leads/vardefs.php' => '94b9fb1416029864372c3da6f20b446d', + './modules/Leads/vardefs.php' => '883dbb8538ecbb3124bd6ddf4fbda659', './modules/Leads/views/view.showduplicates.php' => '8aab3c88d7f9693a22a3bc407fd6e2c5', './modules/Leads/views/view.list.php' => 'c48c873cc327566d9f2f52c16105aef6', './modules/Leads/views/view.edit.php' => '1e52112d67afec904f3ac40d24b86784', @@ -3461,10 +3460,10 @@ $md5_string = array ( './modules/Notes/metadata/detailviewdefs.php' => 'e99d0948a7bcce7ef302580f4fd6f886', './modules/Notes/NoteSoap.php' => 'd9f082203ce7eb87763a7e2f010ad898', './modules/Notes/Dashlets/MyNotesDashlet/MyNotesDashlet.meta.php' => '76dbcdf35f89f80e8144f3f859924916', - './modules/Notes/Dashlets/MyNotesDashlet/MyNotesDashlet.data.php' => '1a3316a4879b68279ab2bcd4d5856160', + './modules/Notes/Dashlets/MyNotesDashlet/MyNotesDashlet.data.php' => '215694c01bf3ade87a99e1e1448951bd', './modules/Notes/Dashlets/MyNotesDashlet/MyNotesDashlet.php' => '286949dd473e6cb47c61e316b498edfb', './modules/Notes/language/en_us.lang.php' => '59ca4ea83d2d2fd7801a80d9dd403743', - './modules/Notes/Note.php' => '95a53e7142e01c541bc702eb907ded6c', + './modules/Notes/Note.php' => '444612b5d1a8b38c8e47a8007d1316b1', './modules/Notes/SubPanelView.html' => 'bd57c534caf7763eb98e0b7b09109c6a', './modules/Notes/NotesQuickCreate.php' => '8385097e288812b63f9267db2f985e6c', './modules/TableDictionary.php' => 'ec9eb632051475d26af707d93f94bf71', @@ -3476,7 +3475,7 @@ $md5_string = array ( './modules/Audit/language/en_us.lang.php' => '7f033d8457f19d1ee7cc1ff1f4638b33', './modules/iCals/Server.php' => '4d7aa950359b5cc23176c27f8b12bf99', './modules/iCals/HTTP_WebDAV_Server_iCal.php' => 'eb5f8f788e950ac6acbaa4eca98b7245', - './modules/iCals/iCal.php' => 'a68d2c988aa03169be14b29566e52949', + './modules/iCals/iCal.php' => '0ccf30a7505e81d9146a037922909b48', './modules/OAuthKeys/vardefs.php' => '188add64b030056701c1fbaf3210ea82', './modules/OAuthKeys/controller.php' => '442fe64e7a2720c024fd7df624d54790', './modules/OAuthKeys/metadata/searchdefs.php' => '8cc0e7b1d81a7e347a451c4d6b784a52', @@ -3492,11 +3491,11 @@ $md5_string = array ( './modules/EmailText/EmailText.php' => '05fef5d00dc3a441c4273c885efe16a5', './modules/Cases/tpls/QuickCreate.tpl' => '5182603493a69751650468855cd8c13c', './modules/Cases/Menu.php' => '4850d6cfcd5f58a4bb3980a75d05aa0a', - './modules/Cases/vardefs.php' => '599a1536a846e4d8ec15ff9c29667a7e', + './modules/Cases/vardefs.php' => '109fa898c759ed736fa6494fc58a8406', './modules/Cases/field_arrays.php' => 'ea61d1f7c57496b04888d07f6d59d4a9', './modules/Cases/CasesQuickCreate.php' => '80d58be2490d81b391067c792d2bb202', './modules/Cases/metadata/searchdefs.php' => '8f0662ca3723b80ea69043820e39cd31', - './modules/Cases/metadata/subpaneldefs.php' => '6ff32afc81d43d7dfde3a88ed6c0ef92', + './modules/Cases/metadata/subpaneldefs.php' => 'a89c12b391c741fdcb0ab8e4d59dc062', './modules/Cases/metadata/quickcreatedefs.php' => '6c412c02f43aef4c253198628de2e3aa', './modules/Cases/metadata/editviewdefs.php' => 'c0a7e93cdd7279cc7cea67bc8190c6f3', './modules/Cases/metadata/SearchFields.php' => '8fcce7723a08bf1b98829e2d96383843', @@ -3512,7 +3511,7 @@ $md5_string = array ( './modules/Cases/Dashlets/MyCasesDashlet/MyCasesDashlet.meta.php' => 'a9504203833b1c07ea4d048bd71695dd', './modules/Cases/Dashlets/MyCasesDashlet/MyCasesDashlet.php' => '46205dbeda7e16cf6b95ab755d1e9134', './modules/Cases/Dashlets/MyCasesDashlet/MyCasesDashlet.data.php' => 'e442c93119e518c122affa37dc87603f', - './modules/Cases/language/en_us.lang.php' => '36dc0f7fd40e29d216b6ebd612efe51f', + './modules/Cases/language/en_us.lang.php' => '94b165caa587dfca46bce92b8b36868f', './modules/Cases/Case.php' => '1d91b2c3ea15e8ec1ca2ac7cf0a401ae', './modules/Cases/SugarFeeds/CaseFeed.php' => 'af81b8e802ded0ea4f9b7240ac5c6e9f', './modules/Documents/documents.js' => '9ebf2a4905349eb5aa1afd2701b95051', @@ -3549,8 +3548,8 @@ $md5_string = array ( './modules/Documents/DocumentSoap.php' => 'e5da1e11252f0281f7eda3843d465339', './modules/DynamicFields/Save.php' => 'e4eac740436ef3b2a1c8214ce6a6fb1e', './modules/DynamicFields/vardefs.php' => '015382d7643e81debffc8763e2f28a0e', - './modules/DynamicFields/DynamicField.php' => 'ef7f73862e2a608a72057e9cb218b933', - './modules/DynamicFields/FieldCases.php' => '43a6e7f7ec59e9deba48fa9ace0432f6', + './modules/DynamicFields/DynamicField.php' => '19dd24d04d1125ab1d89d2df48bfed0a', + './modules/DynamicFields/FieldCases.php' => 'f521d83b1f727338cc5765ded9f1e52d', './modules/DynamicFields/templates/Fields/TemplateRelatedTextField.php' => 'f0ac6f198a174e6f3642011065eef665', './modules/DynamicFields/templates/Fields/TemplateAddressCountry.php' => '6ab6ad4b696362620e88092a485813a3', './modules/DynamicFields/templates/Fields/TemplateHTML.php' => '1f8126be47622c4a36484be95b68875c', @@ -3600,6 +3599,7 @@ $md5_string = array ( './modules/DynamicFields/templates/Fields/TemplateDate.php' => '1025480eebac457c5fd340b6fcba14bb', './modules/DynamicFields/templates/Fields/TemplateRange.php' => '72b6fe3fb563bd1e2fd069fc5f11b2c8', './modules/DynamicFields/templates/Fields/TemplateMultiEnum.php' => 'f2dc2f7fc13e07b44706f9f63817f247', + './modules/DynamicFields/templates/Fields/TemplateLink.php' => 'f256aef0d0e52a7757d930249d8a0207', './modules/DynamicFields/templates/Fields/TemplateFloat.php' => '3c40b39a26021877782cbd8dcd4e3bbb', './modules/DynamicFields/templates/Fields/TemplateParentType.php' => 'b25b6a92e85b1917f1769eaaf92e2bb1', './modules/DynamicFields/templates/Fields/TemplatePhone.php' => '79d8cdba11e4e0e51b39f2185f83d696', @@ -3682,7 +3682,7 @@ $md5_string = array ( './modules/Calendar/views/view.createinvitee.php' => '23d3de8c274a611d24060543b3e5a3ec', './modules/Calendar/controller.php' => '9012bbec7f34948388ed10d2c298c547', './modules/Calendar/Calendar.php' => '9e77091dc4503f337c9cc3b32529b9e8', - './modules/Calendar/CalendarActivity.php' => '0615ccbb2551809a789dbd207d8dceab', + './modules/Calendar/CalendarActivity.php' => '0ae3d723dd4a6facaa244eabe41e494c', './modules/Calendar/action_view_map.php' => '569fe57460745baccc0ae58918cfeb7c', './modules/Calendar/Dashlets/CalendarDashlet/CalendarDashletOptions.tpl' => 'e443d1e2748d0b960559e0c15eb89495', './modules/Calendar/Dashlets/CalendarDashlet/CalendarDashlet.meta.php' => 'f6c295275bd81d5e45a42631ad491e32', @@ -3725,7 +3725,7 @@ $md5_string = array ( './modules/Emails/MassDelete.php' => 'd029fe863c949431939ef83ed80c1361', './modules/Emails/SearchFormMyInbox.html' => '0b800702739ae56fc6219af5e269ae37', './modules/Emails/PopupDocuments.php' => '4ed88a2e9fb38fd6ec12351345fb3f59', - './modules/Emails/EmailUI.php' => 'd5399228491ef264a215071ad6a5cb32', + './modules/Emails/EmailUI.php' => 'df9e22ce9401aaa448f04ca5a3021f05', './modules/Emails/Status.php' => '57891f0c6a4b0dde725922734da24af5', './modules/Emails/Save.php' => 'adbf3dbaa0b9e265628ebb8316e8c020', './modules/Emails/ListViewHome.html' => '0768818fffe02c0de0c4c0a84a2b567c', @@ -3786,7 +3786,7 @@ $md5_string = array ( './modules/Emails/DetailView.php' => 'd86fad1e398cda1613b995e8c38304be', './modules/Emails/EmailUI.css' => '45f38209c13a5487f2979183c1e207e0', './modules/Emails/Delete.php' => '54d1d80f42ad65f27a4e843867065272', - './modules/Emails/EmailUIAjax.php' => '854ae816819e9f3d9aa8325067625f78', + './modules/Emails/EmailUIAjax.php' => '0f8452dde783afbb72ee923252f01b91', './modules/Emails/DetailViewSent.html' => 'e36e4de04472b5b74393d5d471452a1f', './modules/Emails/SubPanelViewRecipients.php' => '635331ca714eae8e1aa1472c6514ea83', './modules/Emails/metadata/subpaneldefs.php' => 'be89eec29129cd78655aceceee218f8d', @@ -3803,12 +3803,12 @@ $md5_string = array ( './modules/Emails/javascript/composeEmailTemplate.js' => 'dea7f6fcaec5c4d99dd172dd59f1b380', './modules/Emails/javascript/Email.js' => '9139de2d66c322c563ebd636067c985b', './modules/Emails/javascript/email_popup_helper.js' => '29852336f7a6cfb99ba83cd91dd511b0', - './modules/Emails/javascript/init.js' => '589b656506d7e061c74f1b304fd2f997', + './modules/Emails/javascript/init.js' => '106331a3e50ad71ea936b25e0118a126', './modules/Emails/javascript/displayOneEmailTemplate.js' => '1c08074715773e437d3645fcc26cfc37', './modules/Emails/javascript/ajax.js' => '34cd3a8d8d7c4adc0148ee9e4659ccd0', './modules/Emails/javascript/EmailUICompose.js' => '943b2bac2f5e9a1cb815bbc411e06898', - './modules/Emails/javascript/EmailUI.js' => 'c2443d1f1910154109006eefb98124d0', - './modules/Emails/javascript/grid.js' => 'e9322c6364864d7d4a5ab18640e3f0aa', + './modules/Emails/javascript/EmailUI.js' => '7ffebbc3a04772454595366c71b93a10', + './modules/Emails/javascript/grid.js' => '097bcf8d7234057ed3e17b9f1d8d05ee', './modules/Emails/javascript/viewPrintable.js' => 'f6607dbb693a458a99b4291eb8deb203', './modules/Emails/javascript/vars.js' => 'f20d35e82dd087149f0005e2b8dadbd6', './modules/Emails/javascript/EmailUIShared.js' => '6dacfe3c73e470312dc344387f85ad13', @@ -3826,7 +3826,7 @@ $md5_string = array ( './modules/Emails/PessimisticLock.php' => 'a326fa1c6da260363192d48bafae6dc4', './modules/Emails/language/en_us.lang.php' => 'cd00d97f18781f3f741d7b020c08ecb6', './modules/Emails/ListViewMyInbox.html' => 'd0b0365b728f121473848d2eb58295a7', - './modules/Emails/Email.php' => '90a3ac43fac8c81c2ff4e99b10d10a82', + './modules/Emails/Email.php' => 'c892361900bc4bf63657f94d50b57229', './modules/Emails/subpanels/ForQueues.php' => '0224aeefd4537b381511dcf8422f7d57', './modules/Emails/subpanels/ForHistory.php' => 'a67add6c1090ddad1c1fa0386b15a640', './modules/Emails/subpanels/ForContacts.php' => '9350fb0ef9ef4db5e7b4a1011d9e849f', @@ -3862,7 +3862,7 @@ $md5_string = array ( './modules/Configurator/language/en_us.lang.php' => '4098b6c0afdb34dbf801fdde0e7282c4', './modules/Configurator/Forms.php' => 'd27aef3247f02668b0cddd955656962a', './modules/Schedulers/Schedulers.js' => '68e26e48cdcb723c290ab1e4e4e8dec1', - './modules/Schedulers/_AddJobsHere.php' => 'd0fd0b4fa77e6a25b3da73af89d070a7', + './modules/Schedulers/_AddJobsHere.php' => '848e92163501b0c4c70d081aa725f82e', './modules/Schedulers/Save.php' => '30b80e2bf9364ff3a3ae62e364f0f7ca', './modules/Schedulers/Menu.php' => '52b7b71414e031f6b75fb9dadc70a105', './modules/Schedulers/vardefs.php' => '925ee14481ee4a5eb3cdbd804a6d319d', @@ -3871,7 +3871,7 @@ $md5_string = array ( './modules/Schedulers/views/view.detail.php' => '0af07daa4ee3f5e1f6388748e46b9542', './modules/Schedulers/EditView.php' => '0116502580cf134bedf1f76d58e19c3c', './modules/Schedulers/field_arrays.php' => '863e59ea48eb28b621bcfa51bbdc3d92', - './modules/Schedulers/Scheduler.php' => '9e5aba57fb76fbd89616e732d7fa54f6', + './modules/Schedulers/Scheduler.php' => '04cad07e4e9d6aaa54d581265558baa1', './modules/Schedulers/metadata/searchdefs.php' => '031ca19f3b1fb41bd0204c1414994c22', './modules/Schedulers/metadata/subpaneldefs.php' => '3b2b2ae8e50107d1f3659916d939ae3c', './modules/Schedulers/metadata/editviewdefs.php' => '1a543b32f1d58afc936fe0ec4e7b1476', @@ -3879,7 +3879,7 @@ $md5_string = array ( './modules/Schedulers/metadata/subpanels/default.php' => '3e72587cdb1ce3aa370cd3e3f3e37d31', './modules/Schedulers/metadata/listviewdefs.php' => 'ba318fd62822c94886f591bb981c6481', './modules/Schedulers/metadata/detailviewdefs.php' => 'ea5bf5a1c1e36592a768ddf063a9a7d1', - './modules/Schedulers/language/en_us.lang.php' => '921ecab0c0ac99513d7ae7e8f2f3099d', + './modules/Schedulers/language/en_us.lang.php' => '8acd18899b23df14d4a4ec6c169dd2af', './modules/Schedulers/EditView.html' => 'a60ba0d27557509bf314b77742429f3e', './modules/OAuthTokens/vardefs.php' => 'e02055b9627f14b1b1ecdf36b9146c60', './modules/OAuthTokens/views/view.authorize.php' => '8831836f4d1cf2c6e001584b817250a9', @@ -3926,7 +3926,7 @@ $md5_string = array ( './modules/InboundEmail/DetailView.php' => '72ae5bf17bed26d97aa9df7ac0e25416', './modules/InboundEmail/Delete.php' => '208c424262be980d2f4f3ae5db1b5516', './modules/InboundEmail/Popup.php' => '4fb3ff4b79aa040392b7d796eb6a4999', - './modules/InboundEmail/InboundEmail.php' => '25837d0eec89356f4572ac418b7e3eb3', + './modules/InboundEmail/InboundEmail.php' => 'be4731e63b88ad3568945d1d9753324b', './modules/InboundEmail/ListView.html' => 'b7b06c6dbe6d7dc4e48b3eb1edb63535', './modules/InboundEmail/index.php' => '464b33bf25e4b937637c915647939755', './modules/InboundEmail/language/en_us.lang.php' => 'df406781a9409bcf003ff03e9024b2ff', @@ -4000,7 +4000,7 @@ $md5_string = array ( './modules/ModuleBuilder/parsers/views/DeployedSubpanelImplementation.php' => '39260deff6db909604b92b066dde120e', './modules/ModuleBuilder/parsers/views/SearchViewMetaDataParser.php' => '36814376a1851a19491d6ee14297bdf0', './modules/ModuleBuilder/parsers/views/AbstractMetaDataParser.php' => '80a1fa9c1fe57ff7f2e4b7b487c5536f', - './modules/ModuleBuilder/parsers/parser.label.php' => '461551949ff190ad0dd11a5f8f7e6946', + './modules/ModuleBuilder/parsers/parser.label.php' => '55ef4c455284a93e8339e24d18005dfa', './modules/ModuleBuilder/parsers/parser.searchfields.php' => 'f4c0781facfcd9201bb95794c6132713', './modules/ModuleBuilder/parsers/parser.dropdown.php' => '6f8aa1266976b1e82813ab0354871ef5', './modules/ModuleBuilder/parsers/constants.php' => '0aee30be192f3ec2e1485b289d55ec9e', @@ -4011,7 +4011,7 @@ $md5_string = array ( './modules/ModuleBuilder/Module/MainTree.php' => '94d488a6a33eada81f374d89d03cf11a', './modules/ModuleBuilder/Module/StudioTree.php' => '3aadd6b9398340d26ec95261f2ec2466', './modules/ModuleBuilder/Module/StudioBrowser.php' => 'eb24a55521d327786a13200ee7eff68a', - './modules/ModuleBuilder/Module/StudioModule.php' => 'd0fa3048e6833b58cee80a9eacd8d3fb', + './modules/ModuleBuilder/Module/StudioModule.php' => 'd666963fa9b9a05ca9fd7b89f334f229', './modules/ModuleBuilder/Module/DropDownTree.php' => '747c045392371171a02cff09c35a5dc3', './modules/ModuleBuilder/Module/DropDownBrowser.php' => '12aa1fe77ef1a0ec12c16223988e1baf', './modules/ModuleBuilder/views/view.modulefield.php' => 'feaabf452efd02bff77d510c47c91dc2', @@ -4056,14 +4056,14 @@ $md5_string = array ( './modules/ModuleBuilder/MB/header.php' => '7a0f15ace21352763ed67771cc4d2773', './modules/ModuleBuilder/MB/MBField.php' => '30ef149782e187f92cf841070b0e1799', './modules/ModuleBuilder/MB/MBModule.php' => '46d7016a6bd471446754dab318d7e749', - './modules/ModuleBuilder/MB/AjaxCompose.php' => '9b6055c49da903968001ade7e48b5683', + './modules/ModuleBuilder/MB/AjaxCompose.php' => 'ea985b5b4e6a17587b5e625c12144b26', './modules/ModuleBuilder/MB/MBPackageTree.php' => 'b456993db5908240a6885396739f0538', './modules/ModuleBuilder/MB/MBPackage.php' => '52d2ca6f96fcc71316e0c630ed1cdfde', './modules/ModuleBuilder/MB/MBVardefs.php' => 'bd451146e2dae68cdee9c61620e541b6', './modules/ModuleBuilder/MB/MBLanguage.php' => '91ca569f0c08619e10f0c20c08e5dcc5', './modules/ModuleBuilder/MB/ModuleBuilder.php' => '6ac64c56ebc7419c07d8fd47ddfa45e2', './modules/ModuleBuilder/MB/MBRelationship.php' => '54f98e03309f1bcb9641a20e490352da', - './modules/ModuleBuilder/language/en_us.lang.php' => '64bbd9fb5b2fc8f7e10070b90d60d85b', + './modules/ModuleBuilder/language/en_us.lang.php' => 'c57e9b5944089d75586c450e3f172011', './modules/ModuleBuilder/Forms.php' => '385d62115fd9616fda262306689c4d85', './modules/BeanDictionary.php' => '3a90299dfaa9c2e0bbdc5d26b5c19947', './modules/ACL/Save.php' => '9b09eb945baf5dea3290c2888aa2cfca', @@ -4147,7 +4147,7 @@ $md5_string = array ( './modules/OptimisticLock/language/en_us.lang.php' => '87240852666071997196ddd6a40623da', './modules/OptimisticLock/Forms.php' => '320c4f6b46cf4a6950d8a38207c1f96a', './modules/Tasks/MyTasks.html' => 'b522f5b4f129e1dc92314e43806f2ef6', - './modules/Tasks/Save.php' => 'dbf321cc6d40410a781365a71d41dd5c', + './modules/Tasks/Save.php' => '0cc87c8717307db4094b3c15af7c3618', './modules/Tasks/tpls/QuickCreate.tpl' => 'd8b9101f79a5d589b191c384c9c8b761', './modules/Tasks/Menu.php' => 'ffb482e49e2662cfbcef7a92cd32a34b', './modules/Tasks/vardefs.php' => 'aa2149cff80573e25335c5f333c3726e', @@ -4157,7 +4157,7 @@ $md5_string = array ( './modules/Tasks/TasksQuickCreate.php' => '8af31f9e97a9ea8839bb6baddbb394d1', './modules/Tasks/metadata/searchdefs.php' => 'd0ada531dedad5235387b54799ba267e', './modules/Tasks/metadata/subpaneldefs.php' => '25e0cc31c2611adec22aac41fa6b07cf', - './modules/Tasks/metadata/quickcreatedefs.php' => 'a17ccb0ace11d164bfa9656268564fcd', + './modules/Tasks/metadata/quickcreatedefs.php' => '32c663abbb7eefe582d26cb1143ac466', './modules/Tasks/metadata/editviewdefs.php' => '85e97af34ba2fc730ffc459e6c58572f', './modules/Tasks/metadata/SearchFields.php' => '9a6328b41aae49825cee126b19c40950', './modules/Tasks/metadata/subpanels/ForHistory.php' => '33df839189faf60afeaa8de35961f8cc', @@ -4232,7 +4232,7 @@ $md5_string = array ( './modules/EmailMarketing/SubPanelView.html' => 'd8919b7c154830f035426bc5ff2eee05', './modules/EmailMarketing/EmailMarketing.php' => 'd52eb9e6e42ceb6c268d29ccf07b78f2', './modules/EmailMarketing/EditView.html' => 'ea2799ea5a954ac623badbdcbf1ff5d2', - './modules/Relationships/vardefs.php' => '4272e80c0d9888cad717df9df51568b6', + './modules/Relationships/vardefs.php' => '960e5240b0533c7662511a860a83b0f7', './modules/Relationships/views/view.editfields.php' => 'dd1671e001e586bb89582754f5288f08', './modules/Relationships/RelationshipHandler.php' => '1a66f6060cc15a437a1923be65782ae9', './modules/Relationships/field_arrays.php' => '77468bb489c2b3cb6a1c4c9041f7e5fd', @@ -4250,7 +4250,7 @@ $md5_string = array ( './modules/Versions/index.html' => '688140bad753b22c15c42bf343d0f39f', './modules/Versions/ExpectedVersions.php' => 'a930bc1b1952454c6f97eac8c6cf19e0', './modules/EmailMan/EmailManDelivery.php' => 'dc5f470646a07fab014257b71085d1e1', - './modules/EmailMan/tpls/config.tpl' => 'f317b2e0f2c8e336ad3ffef1587a51c6', + './modules/EmailMan/tpls/config.tpl' => '0ae2684c105ba809886d257a37c45de5', './modules/EmailMan/tpls/campaignconfig.tpl' => '7480ca4f1b481496f77d70ba348da27b', './modules/EmailMan/EmailMan.php' => '66d0cd5a10fef0ba24d3c7a4e5e06d0d', './modules/EmailMan/Menu.php' => '0f61581cebd90cd06095a9cf0ee047b7', @@ -4260,7 +4260,7 @@ $md5_string = array ( './modules/EmailMan/views/view.config.php' => 'c8f971bf53af8a068052301e32523af9', './modules/EmailMan/controller.php' => '3c27010c97f22bce7952f32b370122e9', './modules/EmailMan/field_arrays.php' => 'c98e05397f489f8b0ef1a6fcf659ef98', - './modules/EmailMan/testOutboundEmail.php' => 'f73ef3d211ade5aed84c39af2b2389ea', + './modules/EmailMan/testOutboundEmail.php' => 'a1d1d5c34f459fbb4466c8600156db2b', './modules/EmailMan/metadata/searchdefs.php' => '595446cfb62a1a8b15fa24f6234649cf', './modules/EmailMan/metadata/SearchFields.php' => 'c84c54fac3561c8f0cbc1848409bcc46', './modules/EmailMan/metadata/subpanels/default.php' => '658c4b36db1885ad3df69aba22eb0305', @@ -4279,7 +4279,7 @@ $md5_string = array ( './modules/Users/Error.php' => '1eb611fec9972b8cfcab430cb0dcd42f', './modules/Users/Save.php' => '662f8d84b1c460223b99c74e9e3ac9ef', './modules/Users/tpls/DetailViewFooter.tpl' => 'd8cbd6ebd0545bab4bd8dcb370c3a228', - './modules/Users/tpls/EditViewFooter.tpl' => 'd11e5847ca664a36cc793da8a30a0ebb', + './modules/Users/tpls/EditViewFooter.tpl' => 'd2dc12214a78d99ce011770a29311c13', './modules/Users/tpls/EditViewHeader.tpl' => 'e228e86ba363f7eff1da331cfe5701de', './modules/Users/tpls/wizard.tpl' => 'c8dab56d7ccf24c80f6eead578e966df', './modules/Users/tpls/QuickEditFooter.tpl' => '692fa211731f53365773c06a1348a6bb', @@ -4306,7 +4306,7 @@ $md5_string = array ( './modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/response.php' => 'fe50684dde6449668ec090969855ed59', './modules/Users/authentication/SAMLAuthenticate/index.php' => 'c576340598c48831d9f63bd10a650bf7', './modules/Users/authentication/AuthenticationController.php' => '6927215b40c1efc62775f5754a532c95', - './modules/Users/authentication/LDAPAuthenticate/LDAPAuthenticateUser.php' => '844422c2e95aa4e922b36d5ba4de6955', + './modules/Users/authentication/LDAPAuthenticate/LDAPAuthenticateUser.php' => '2800f31d9157ce0ab8cd07503d8d28ce', './modules/Users/authentication/LDAPAuthenticate/LDAPConfigs/default.php' => '35b840464b0f18d1b3353184d3c02f0c', './modules/Users/authentication/LDAPAuthenticate/LDAPAuthenticate.php' => '6c1ed6d78d1f828d841f51c6328bfa80', './modules/Users/login.css' => '16bbc155311f2cc183677a5cf2805301', @@ -4318,7 +4318,7 @@ $md5_string = array ( './modules/Users/views/view.detail.php' => '5a79a0bed6a7e1066b8dd2d0c183c7ff', './modules/Users/controller.php' => 'da217ac87c3a2dfc6ef343b211608c85', './modules/Users/SaveSignature.php' => '0dc93f44171b3a7ff29d363820f4ead7', - './modules/Users/User.php' => '1713fc308d5b7017a1f0403d47627ef4', + './modules/Users/User.php' => 'aa6f30ec156de30f4071f9cfe618e543', './modules/Users/login.tpl' => '04ab214e72811e566efb5fddb3f7dc20', './modules/Users/LoggedOut.tpl' => '61fb28e18a396a2b4e7f7b73edf610d2', './modules/Users/SaveTimezone.php' => 'da6ea699f04af08645fb90561985da4f', @@ -4364,11 +4364,11 @@ $md5_string = array ( './modules/Users/PopupSignature.php' => 'f0d761ac881d4cd5a8740b8a31205421', './modules/MergeRecords/Merge.js' => '7ea6d853772bc5028b1cd0a7be3592e4', './modules/MergeRecords/Menu.php' => '5461a3c83744a0a1a7a8982c0d1092c3', - './modules/MergeRecords/Step3.php' => '5205d5391a4bc58db57dcadea6cebe50', + './modules/MergeRecords/Step3.php' => 'e26ebd666ce5fe0118a8120a6decb877', './modules/MergeRecords/vardefs.php' => 'b9a0b22130625cb644e4f96dfcf807fb', './modules/MergeRecords/Step1.php' => 'b63f5e96e7fdea8210f383e695f75216', './modules/MergeRecords/MergeRecord.php' => 'cd1a846223b7879238f35b3b2271c1e7', - './modules/MergeRecords/SaveMerge.php' => '4adf74909ff2813213de06dbfafee532', + './modules/MergeRecords/SaveMerge.php' => 'c4ed335b636b06c735d6c0a51d2add64', './modules/MergeRecords/SearchForm.html' => 'e75f805c886c24bab76825e1671a14fc', './modules/MergeRecords/Step1.html' => 'cffd07a87673c4892b14e28e3031a354', './modules/MergeRecords/controller.php' => '75144597a9f5e01e9e6b3069c1956828', @@ -4384,7 +4384,7 @@ $md5_string = array ( './modules/SugarFeed/linkHandlers/YouTube.php' => '09afb7aaf73807ec87d28c651dc28548', './modules/SugarFeed/linkHandlers/Image.php' => 'c2c444a81956ed874dfe034bada5ce19', './modules/SugarFeed/Menu.php' => '9f42875f6f51ed2e5e6f59497f48a72e', - './modules/SugarFeed/vardefs.php' => 'a99c6a80b55dc74d632ff82e6c4ece0f', + './modules/SugarFeed/vardefs.php' => '6092e42a7366ff65d1df91a99d43cd57', './modules/SugarFeed/views/view.adminsettings.php' => '5496a225f96c386bb70af4988aa7e8cc', './modules/SugarFeed/SugarFeedFlush.php' => '5f28853b5d2212c18425efd022dec283', './modules/SugarFeed/metadata/searchdefs.php' => '18fed7dacfc333cd00cd7512d696b8f4', @@ -4423,7 +4423,7 @@ $md5_string = array ( './modules/Studio/TabGroups/TabGroupHelper.php' => 'acbb98ae3c94d7edbbc9025860a0630d', './modules/Studio/TabGroups/EditViewTabs.tpl' => '4af8f0c4622c1bedc7e3d03344fc1855', './modules/Studio/language/en_us.lang.php' => '51a411b2f33265a9cacfb836d813e6ef', - './modules/Studio/language/en_us.Portal.html' => '2e5583deaa66090f1a3f8a4a773bcf58', + './modules/Studio/language/en_us.Portal.html' => '0537ecd9d4f1097bf4c079db113f3512', './modules/Studio/wizards/RenameModules.tpl' => '478a48907c033285f9954539c9310399', './modules/Studio/wizards/StudioWizard.php' => '03dbcf41408c8e5dc73eb9f83e0826f2', './modules/Studio/wizards/EditDropDownWizard.php' => '11e9f49a21603f55dbe126aa237bdb55', @@ -4451,7 +4451,7 @@ $md5_string = array ( './modules/UpgradeWizard/processing.gif' => 'd7c43fc19181ee59862601bfce100b41', './modules/UpgradeWizard/systemCheckJson.php' => '1e070259aab4c413521c5634783de218', './modules/UpgradeWizard/end.php' => '3d993dc6a90ab1809ddfed1377e80269', - './modules/UpgradeWizard/uw_utils.php' => 'cbeceff75c054c9a8cce5cf73172de45', + './modules/UpgradeWizard/uw_utils.php' => 'b1db24acd6624442e21a4a59a715867b', './modules/UpgradeWizard/preflightJson.php' => '941442e02f8eaa60b5151ee59c5ecfcc', './modules/UpgradeWizard/upgradeTimeCounter.php' => '95d2cb34e45635ddaf4d5ff6fefc37f3', './modules/UpgradeWizard/uw_files.php' => '913449185b7aa91aebd48c535da9d1c0', @@ -4491,7 +4491,7 @@ $md5_string = array ( './modules/Calls/Menu.php' => '93b8d2399e38e08ff0c17f0c69f616ae', './modules/Calls/vardefs.php' => 'b001e023fcdba47a61c7af5cc03f34e0', './modules/Calls/CallsQuickCreate.php' => 'c39e8cf63dbd41d4a9a5c2e5108b1573', - './modules/Calls/CallFormBase.php' => '0d1267e6eb4266afb39c36a6a55c3d24', + './modules/Calls/CallFormBase.php' => '9ec83691abd9700c705ed3e0203bb148', './modules/Calls/views/view.list.php' => 'd29bcbfa22fa2929927d8186a41f1498', './modules/Calls/views/view.edit.php' => '49b18e0274b5bc0fd0609bc8ebc7749b', './modules/Calls/Call.php' => '492fc29933c9c412d357b259ded489fa', @@ -4499,7 +4499,7 @@ $md5_string = array ( './modules/Calls/SubPanelViewInvitees.php' => '7e79695bec3006266d99fa32cc664c7e', './modules/Calls/metadata/searchdefs.php' => '2a03354f08467b02f54285b34a09bd91', './modules/Calls/metadata/subpaneldefs.php' => 'f6622b05268f7ab3c80b2210be7f1761', - './modules/Calls/metadata/quickcreatedefs.php' => '041336fd5376638de9e9d37e18c35893', + './modules/Calls/metadata/quickcreatedefs.php' => 'f7f8e96ed4769ff76a684c33b7c49b5b', './modules/Calls/metadata/editviewdefs.php' => '0dac858f2963c17d350f5871272bdeec', './modules/Calls/metadata/SearchFields.php' => '0db943758457cccf1b2833fd2a6a62a8', './modules/Calls/metadata/subpanels/ForHistory.php' => '5dd301042403090b6d6980605d429e63', @@ -4535,7 +4535,7 @@ $md5_string = array ( './modules/Connectors/tpls/listview.tpl' => '9c5aefe22b4225a523d5073407581c43', './modules/Connectors/tpls/modify_properties.tpl' => 'bea174095a89d690de0e236da44c90b3', './modules/Connectors/Menu.php' => '76c19008979052df79e837d3746e4fcf', - './modules/Connectors/InstallDefaultConnectors.php' => '43fa19c204ff4c927c2c4350035fa314', + './modules/Connectors/InstallDefaultConnectors.php' => 'd806a1a0879bc33f65de23af916909ea', './modules/Connectors/views/view.searchproperties.php' => '3f7a6d9cb833c32e9137bf7de8c0197b', './modules/Connectors/views/view.modifymapping.php' => 'd31dae9f4140c512fd6b30a70ff58593', './modules/Connectors/views/view.modifydisplay.php' => '30ff895bf1a1ca31324f0551435ae191', @@ -4547,11 +4547,6 @@ $md5_string = array ( './modules/Connectors/views/view.connectorsettings.php' => '234863c9e8d5a116cdbdf6cc8a844ad7', './modules/Connectors/controller.php' => 'c925f4d8dd9d6639ae3aec9c77f9cc68', './modules/Connectors/ConnectorRecord.php' => '4b048a11ea21e312548a6d407d0951ee', - './modules/Connectors/connectors/sources/ext/rest/linkedin/config.php' => 'bd7e5ef9cf898ec776a0cef8cab6ef04', - './modules/Connectors/connectors/sources/ext/rest/linkedin/vardefs.php' => 'e984a84601e611d3243058736fc31307', - './modules/Connectors/connectors/sources/ext/rest/linkedin/mapping.php' => '00784836b89319f6cc9d29705a1ccb6a', - './modules/Connectors/connectors/sources/ext/rest/linkedin/linkedin.php' => '40cb6c2fc37e66ce09fdf6834bc0c024', - './modules/Connectors/connectors/sources/ext/rest/linkedin/language/en_us.lang.php' => '6cf66888d98ecd28eb8d89c64547ca6f', './modules/Connectors/connectors/sources/ext/rest/insideview/config.php' => 'c1390b4a5617d593fe3980857aae7aa9', './modules/Connectors/connectors/sources/ext/rest/insideview/InsideViewLogicHook.php' => '4d2cd7214b20e80d9c3103aca4c23898', './modules/Connectors/connectors/sources/ext/rest/insideview/tpls/InsideView.tpl' => '534a68c0ef83c4562d7e0ae203664ec4', @@ -4563,9 +4558,6 @@ $md5_string = array ( './modules/Connectors/connectors/sources/ext/rest/insideview/insideview.php' => '8ba8e8519e512d4c6cc70463d40c081e', './modules/Connectors/connectors/sources/ext/rest/insideview/mapping.php' => 'a128fd8a18115f2bd5b7976ef1af3936', './modules/Connectors/connectors/sources/ext/rest/insideview/language/en_us.lang.php' => '15eba15d3eda92ddb32adbacc4d75731', - './modules/Connectors/connectors/formatters/ext/rest/linkedin/tpls/linkedin.gif' => '3440ba160f32d8eb17a5b2ed03be60c6', - './modules/Connectors/connectors/formatters/ext/rest/linkedin/tpls/default.tpl' => '5c51e71ccdccc03f0eca3c6de646903c', - './modules/Connectors/connectors/formatters/ext/rest/linkedin/linkedin.php' => '806fecff2b50f4b0be90d28cf8a56b74', './modules/Connectors/connectors/formatters/ext/rest/twitter/tpls/twitter.gif' => '025ad081fbafed4577cc09c9eddb9a8d', './modules/Connectors/metadata/searchdefs.php' => 'f45772ac091705ccb5c5aa815b45c73f', './modules/Connectors/action_view_map.php' => '791939069e69d9d310d47fb5b9a83f33', @@ -4598,7 +4590,7 @@ $md5_string = array ( './modules/Accounts/Save.php' => 'c94b4125cc2344c3f4fc59f6b8f08efd', './modules/Accounts/tpls/QuickCreate.tpl' => 'ce36d0263b1971e00f8ce4c080d5932a', './modules/Accounts/Menu.php' => '7b1724457e13b5582b4714d81be2e94d', - './modules/Accounts/vardefs.php' => 'ab824ab8f299f3739459181199e4d328', + './modules/Accounts/vardefs.php' => '798306b6189c629409774e49905b8c6e', './modules/Accounts/ShowDuplicates.html' => 'b5ad2ee11cf988330bab61a2723042c0', './modules/Accounts/AccountsQuickCreate.php' => '9b1e6b2aa2717d1bf39d6966270a43dc', './modules/Accounts/views/view.list.php' => '7c74df55b4bb64a37e0dba02847ba614', @@ -4621,7 +4613,7 @@ $md5_string = array ( './modules/Accounts/metadata/listviewdefs.php' => '7df1c766a8df284a9223b012ec8a4f32', './modules/Accounts/metadata/additionalDetails.php' => '2abab064d80711d3c4accf5aef840f27', './modules/Accounts/metadata/studio.php' => '38f94d117f8683f104683349cee192c5', - './modules/Accounts/metadata/detailviewdefs.php' => '5b31298210390f199ec06e2ba04a7eb7', + './modules/Accounts/metadata/detailviewdefs.php' => 'e10665d35f7964b06d73c3fd38bd661c', './modules/Accounts/metadata/acldefs.php' => '6d4f72392f1e6209b1b0c47d6fb8cfef', './modules/Accounts/Dashlets/MyAccountsDashlet/MyAccountsDashlet.meta.php' => 'b974752c5f5d7a52535add8ed134a23a', './modules/Accounts/Dashlets/MyAccountsDashlet/MyAccountsDashlet.php' => 'ec76cb988bc1b77823b2e732c376996d', @@ -4785,8 +4777,8 @@ $md5_string = array ( './modules/vCals/vardefs.php' => '936e73ff2b48562edfe8e01adc9f0944', './modules/vCals/HTTP_WebDAV_Server_vCal.php' => '485b8f7a5e4aea71afb187045f02236c', './modules/vCals/field_arrays.php' => 'f170f58856c0c7446a5a02bf3fb35d0c', - './modules/vCals/vCal.php' => '5915456f3f79365f64f875674f0da463', - './modules/Bugs/Bug.php' => '48d9cab31e800047e3f3c8dce0c508a5', + './modules/vCals/vCal.php' => 'c46794e69820caa80dc75f4c3e7448fa', + './modules/Bugs/Bug.php' => '18f3a727f1d29e7c07e51e0c9c901471', './modules/Bugs/tpls/QuickCreate.tpl' => 'b0e6e39604dcc9ffcf233e248cb22baa', './modules/Bugs/Menu.php' => 'd0e995c5556b8dcc04a63e0a55f18fe3', './modules/Bugs/vardefs.php' => '932de4790c1feafd8f5494c205befb6c', @@ -4809,7 +4801,7 @@ $md5_string = array ( './modules/Bugs/Dashlets/MyBugsDashlet/MyBugsDashlet.meta.php' => 'ff1c73f62bf4040b79e55a854bcb2a6c', './modules/Bugs/Dashlets/MyBugsDashlet/MyBugsDashlet.data.php' => '42a5ae1dfeb2990a22d842bc207651db', './modules/Bugs/Dashlets/MyBugsDashlet/MyBugsDashlet.php' => '3fd951655407807bf464385a32a2750f', - './modules/Bugs/language/en_us.lang.php' => '65297db63ed6d6d12447de6417800fd4', + './modules/Bugs/language/en_us.lang.php' => 'a08b46ca2936230c9c8510279056d3a3', './modules/Bugs/BugsQuickCreate.php' => '2e228e0702b25c9b6bc53014254cae0d', './modules/SchedulersJobs/vardefs.php' => '02ba66476b4735afd3348441c814cc4a', './modules/SchedulersJobs/field_arrays.php' => 'dc4fa2992e0c563aa87ed621d9ecefc9', @@ -4822,7 +4814,7 @@ $md5_string = array ( './modules/Contacts/Save.php' => '2ce993533bff632cd03c6bc4335d7d6a', './modules/Contacts/tpls/QuickCreate.tpl' => 'b0ec6ed8d21111a38ac6768912d62336', './modules/Contacts/Menu.php' => 'a4b78115e73168cbce32bae2806ccfad', - './modules/Contacts/vardefs.php' => 'e096185d07c8b7d3cf36e28f4a834caf', + './modules/Contacts/vardefs.php' => 'b796b6b1f2fa8452f53c00a78d93bc6c', './modules/Contacts/ContactFormBase.php' => 'ed2034ac43e33267a5564f52ca6d4243', './modules/Contacts/ShowDuplicates.html' => 'e7c155a7e02ed4990c46366e14ce1719', './modules/Contacts/views/view.closecontactaddresspopup.php' => '63fbacd0bedb183a7314ec33a5207b2b', @@ -4842,7 +4834,7 @@ $md5_string = array ( './modules/Contacts/ContactOpportunityRelationshipEdit.html' => 'afdde9f65b057d6f73935a9e79725012', './modules/Contacts/ShowDuplicates.php' => 'a6a6833d6f1f826a06c061ff8a41bf99', './modules/Contacts/metadata/searchdefs.php' => '45ef3707e19c0fc60ef90f0b8b5a0a91', - './modules/Contacts/metadata/subpaneldefs.php' => 'b75bdba1bf9cda35bfd983650112698b', + './modules/Contacts/metadata/subpaneldefs.php' => '1592e817f1555b73ade4ee7a7721ceef', './modules/Contacts/metadata/popupdefsEmail.php' => 'a697d8537c41062b210dda73fc371132', './modules/Contacts/metadata/metafiles.php' => '8bb22d8f942c7d31cc6a9fd9ec818943', './modules/Contacts/metadata/quickcreatedefs.php' => 'b596a303a62b166af70edf94c3517d82', @@ -4861,7 +4853,7 @@ $md5_string = array ( './modules/Contacts/metadata/listviewdefs.php' => 'e344d8ca3276822c8dff142da0891b1c', './modules/Contacts/metadata/additionalDetails.php' => '090a8de19ac0fa78584462cfcd66e2ff', './modules/Contacts/metadata/studio.php' => '1b06ac3676acfcb82fe54dd24ca8acf0', - './modules/Contacts/metadata/detailviewdefs.php' => 'b049d6751df0d3a04570974c224e51cb', + './modules/Contacts/metadata/detailviewdefs.php' => 'a69aa6188604321459f26b2c254ca63f', './modules/Contacts/MailMergePicker.html' => 'e9a260a3492e11eb443e1576f2e83d71', './modules/Contacts/Contact.php' => '9994fb90dd3bf54de093bdabdfbab384', './modules/Contacts/Dashlets/MyContactsDashlet/MyContactsDashlet.meta.php' => 'bd84338f0b1ec004574ccfc7b7c21ba4', @@ -4992,7 +4984,7 @@ $md5_string = array ( './modules/Project/language/en_us.lang.php' => '4380d13f408219e7d41f2204d79ef3c3', './modules/Project/SubPanelView.html' => '830f3850b52d8e8a549b78ba6c96b89d', './modules/Project/ProjectQuickCreate.php' => '0a1f85573e9e73c1f9e1ed7e5d6e4de1', - './modules/Meetings/jsclass_scheduler.js' => '48df8ab09f7c54f4d96b0c0db7cca125', + './modules/Meetings/jsclass_scheduler.js' => '977039d5824c4ad38e1dada0d738150f', './modules/Meetings/duration_dependency.js' => 'aaf3c40b0bcb47321da73b3a4f0f3221', './modules/Meetings/Save.php' => '40280f5661fd35c4831d4d116dae2c8c', './modules/Meetings/tpls/footer.tpl' => '5a6c2a887ef66f4ceec7d5d6b68f2e94', @@ -5013,7 +5005,7 @@ $md5_string = array ( './modules/Meetings/SubPanelViewInvitees.php' => '3bdecea0b46ceb4e252e536b58b7beed', './modules/Meetings/metadata/searchdefs.php' => 'b086bfa12de735088fe05570e1a4fc57', './modules/Meetings/metadata/subpaneldefs.php' => '4b2d8ffb79ca1b3e50cc579ad9291840', - './modules/Meetings/metadata/quickcreatedefs.php' => '441961f9e92a7058e454e977d0b3e45d', + './modules/Meetings/metadata/quickcreatedefs.php' => '5c7fe06f326ad8731b4f767a35dccc6a', './modules/Meetings/metadata/editviewdefs.php' => 'a696a0a1ad44ae1fee93589ca0d97cab', './modules/Meetings/metadata/SearchFields.php' => 'ca6d60a198b91ca9e5fec622d7f92230', './modules/Meetings/metadata/subpanels/ForHistory.php' => 'c77b177118e94193dc37fc84b19820e8', @@ -5030,7 +5022,7 @@ $md5_string = array ( './modules/Meetings/MeetingsQuickCreate.php' => '79d751535efb9f4fd80f84cef02bdfa3', './modules/Meetings/language/en_us.lang.php' => '3cc831f0a50845065e8e62f590d8aa95', './modules/Meetings/SubPanelViewInvitees.html' => '9d45dab502f332ac234fdd77c2058db4', - './modules/Meetings/MeetingFormBase.php' => '0b46e0fc6e1cf41d4d4425c6b856413a', + './modules/Meetings/MeetingFormBase.php' => '5214787f68ce55c53bbbf1d5c1357e0b', './modules/Administration/RepairIndex.php' => 'def0ccbf18e96a9063ab4a1a41de52f8', './modules/Administration/RepairActivities.php' => 'd76513d36d67fb884b81ea96b5c0cab7', './modules/Administration/RepairSeedUsers.php' => 'd4b713983f12a55d1a4ffd63fe0b8c6e', @@ -5067,7 +5059,7 @@ $md5_string = array ( './modules/Administration/views/view.languages.php' => '8064cf876b19d0e5224eef112a0e620c', './modules/Administration/views/view.repair.php' => '75e95d15f040d9b4581270f35a4565e7', './modules/Administration/views/view.backups.php' => '729305976cdbf8c9211f8c2c510113be', - './modules/Administration/controller.php' => '6fd7e2b224458299a86b046560e99774', + './modules/Administration/controller.php' => '62e936207febe05bcf8b29848504beb3', './modules/Administration/RepairUploadFolder.php' => '52d7a4d12e44b995c344083487a83d11', './modules/Administration/Async.php' => 'a2c7867af607bc2857beb3aa7144226d', './modules/Administration/SupportPortal.php' => 'ac534a61ffc214726ffbcf2f9aaf718c', @@ -5092,11 +5084,11 @@ $md5_string = array ( './modules/Administration/RebuildDashlets.php' => '1ee6746dca01df316e7bf64bdfe2a39f', './modules/Administration/UpgradeIISAccess.php' => 'c7db1a933668bda4bca3d136bf7873ab', './modules/Administration/updateTimezonePrefs.php' => '05a7e859747c1d826d5fff580682affd', - './modules/Administration/updater_utils.php' => '21827e3bb6c0c09ea09bce6e80345a01', + './modules/Administration/updater_utils.php' => '9e4d6674c1d17041b5ae8f84d16a2213', './modules/Administration/DiagnosticDownload.php' => '7084df724673c724047f61b6354572f7', './modules/Administration/DisplayWarnings.php' => '752f9c69ebacdbf61de4bb2be8de5d52', './modules/Administration/RepairJSFile.php' => '37456d779396651afd6df4714201e2ef', - './modules/Administration/metadata/adminpaneldefs.php' => '58647b98b48e181056fecd647a0cd77f', + './modules/Administration/metadata/adminpaneldefs.php' => 'ab5385c4d8789772bee9c0c8ec685bcd', './modules/Administration/metadata/SearchFields.php' => 'abe1b07358a4774e4ab41d68943b0c1c', './modules/Administration/clear_chart_cache.php' => 'c8a7c376596acc096ae6bd6b08c74959', './modules/Administration/action_view_map.php' => '318d6e90646ac974a6dbc40325a10a97', @@ -5104,12 +5096,12 @@ $md5_string = array ( './modules/Administration/javascript/Administration.js' => '7def6d0d8474afef157b6537551c16f1', './modules/Administration/RebuildFulltextIndices.php' => '4ad26fb3312712cb1e141562e634a17c', './modules/Administration/updateclass.php' => '7d940bf4d2c8e8cb32e37bf685dc8d3e', - './modules/Administration/index.php' => 'a0dd76b4f71471625c718181150bf6c6', + './modules/Administration/index.php' => '2207fcbf758a5502f6a1cad95c9f38ff', './modules/Administration/SupportPortal.tpl' => '681fdcc6d2767c98632c15278acd22da', './modules/Administration/PasswordManager.php' => '234e1ddbd40335bcc24a9723a0dc293e', './modules/Administration/Locale.tpl' => 'e922cc662c1df97d13bc8e62e3333e20', './modules/Administration/RebuildExpressionPlugins.php' => '0a36201d0496d43b09aba4f50a4ccdac', - './modules/Administration/language/en_us.lang.php' => 'ae296f88714d642848be958d8c6d8286', + './modules/Administration/language/en_us.lang.php' => 'd8fc04e654b025e166ff2dc7a1df8aad', './modules/Administration/UpgradeHistory.php' => '32542b41029818c2ad89053c7d6dfaad', './modules/Administration/upgrade_custom_relationships.php' => '49cd673c257d91d5e7d6d38f05139dd9', './modules/Administration/ImportCustomFieldStructure.php' => 'ae698c924ae4f2ba29d6198746ca0977', @@ -5265,7 +5257,7 @@ $md5_string = array ( './modules/Home/Dashlets/JotPadDashlet/JotPadDashlet.php' => '2aa954e335286eb0c1ad1c8d7795495f', './modules/Home/Dashlets/JotPadDashlet/JotPadDashletOptions.tpl' => '66bb697583e1f5c36c2258d2d45dfbd7', './modules/Home/dashlets.php' => '4d60591fdf4c2fb2aad780c1770940a0', - './modules/Home/index.php' => 'c12a9b5dea8415166c887b94b57277dc', + './modules/Home/index.php' => 'b7083c7b9515bf4f5bf74b70b159d8e3', './modules/Home/language/en_us.lang.php' => '954339204c466974efc01875586d6965', './modules/Home/SaveSubpanelLayout.php' => '1e8830cbb0ef9cabf80fc2e4b66645a2', './modules/Home/UnifiedSearchAdvancedForm.tpl' => 'c8e060e0d120e52a80cdd60cbe08967e', @@ -5276,16 +5268,16 @@ $md5_string = array ( './modules/Home/LastViewed.php' => 'c560b62a3343fe67a86925ecc5f3cfd9', './modules/Home/AddToFavorites.php' => 'dcce47a643221281508edb0f5bbeae94', './modules/Home/TrainingPortal.php' => '8f0c1226166a7a5d6935d09e874812a1', - './cache/include/javascript/sugar_grp_jsolait.js' => 'bf76c7f2a747c29058fdd36ffc8bf69e', - './cache/include/javascript/sugar_grp_quickcomp.js' => 'f44849492cb1684a8769f4050e496fa0', - './cache/include/javascript/sugar_grp_emails.js' => 'eec967d7881e2ff146606324686e8e7c', + './cache/include/javascript/sugar_grp_jsolait.js' => '274f8c088199f0e840d6b5f6ae75b3b7', + './cache/include/javascript/sugar_grp_quickcomp.js' => 'a62fd573cd69be7b92a61e90db440d79', + './cache/include/javascript/sugar_grp_emails.js' => 'f51e6a812916401d79178fae22a1a94f', './cache/include/javascript/sugar_grp_yui2.js' => '53c8d4d026a0adc7ea775e6488245de5', './cache/include/javascript/sugar_grp_yui_widgets.css' => '17f5b268fda1a8a3e27b41ebefe4d408', './cache/include/javascript/sugar_grp_yui_widgets.js' => '35fe43cba48260f75b169dd1af5c64fe', './cache/include/javascript/sugar_grp1_yui.js' => 'fc7f073177656bf9faf81c6893eb1e7a', './cache/include/javascript/sugar_field_grp.js' => '339b3b1d92f554dbac7fad410360c8f1', './cache/include/javascript/sugar_grp1_jquery.js' => '9c164fdc669d8af0c3e11559154a214c', - './cache/include/javascript/sugar_grp1.js' => '40b99772f2ceeb772f17dab2cb3ff3a7', + './cache/include/javascript/sugar_grp1.js' => 'ca387b9dfe012fad202e605e865fba3c', './cache/layout/index.html' => '9cd784063d39b18d308932c28c385853', './cache/images/index.html' => '9cd784063d39b18d308932c28c385853', './cache/xml/index.html' => '9cd784063d39b18d308932c28c385853', @@ -5357,7 +5349,7 @@ $md5_string = array ( './metadata/prospect_lists_prospectsMetaData.php' => '7e3faa998b4fab3e2235775744413cc9', './metadata/inboundEmail_autoreplyMetaData.php' => 'a48873b7d72942a2ce8c75519e210ebd', './metadata/acl_roles_actionsMetaData.php' => '4d6ecdbf5b06104a468ec955616121e3', - './sugar_version.php' => '5d1dfb8e1a479ba07ebaf3bee6fc9793', + './sugar_version.php' => 'c151e5d8323419684797b7d8921111b3', './cron.php' => 'a130498059ba9e03ad8c32a9cc79faca', './log4php/LoggerManager.php' => 'fa34194306cd50c01b71d8d5060ee362', './TreeData.php' => '261ed723f457b1fabd1c33ae230120e4', @@ -5973,7 +5965,7 @@ $md5_string = array ( './themes/default/less/wells.less' => '07cc7d04d7f7f344742f23886cbe5683', './themes/default/less/bootstrap.less' => '6d7ea975856359e0e79d85737f6b503e', './themes/default/less/button-groups.less' => '1b9f8b26b4b2b3f0e9969212622cfaf4', - './themes/default/less/font-awesome.less' => 'fd0453172d43d0fdd57cebc1186401ae', + './themes/default/less/font-awesome.less' => 'ad7ec5512d08cd4eacd7a4728da097f0', './themes/default/less/carousel.less' => '3ad7d4b5a908686f352f0cdc085644b3', './themes/default/less/navbar.less' => '16d39b241ef60ee5292d18386c9d0b37', './themes/default/less/sugar.less' => '15673889377c652687822a66b54239da', @@ -6004,7 +5996,7 @@ $md5_string = array ( './themes/default/font/fontawesome-webfont.ttf' => 'ed1087510537f07b14eb94d5bf45cdb7', './themes/default/font/fontawesome-webfont.svg' => 'dc17583d7073f6a7e269e9a72b8d733c', './themes/default/css/style.css' => '84405820ae3ed39ea220a8a9b64c535e', - './themes/default/css/bootstrap.css' => 'e82686cdcac3d854553ec8827eb15ca0', + './themes/default/css/bootstrap.css' => '35cda076a2dfccfb460b8225f38c104f', './themes/default/css/chart.css' => '62ecba0a0c90f895be214991e69ab19c', './themes/default/css/print.css' => 'c8cb0832e266d9d9a07006bb3f1fcfc6', './themes/default/css/wizard.css' => '294dc0cd237fdad7925a182bec7d4e21', @@ -6626,7 +6618,7 @@ $md5_string = array ( './jssource/src_files/modules/Currencies/EditView.js' => '94354bd58c09ade09dac8320972ad358', './jssource/src_files/modules/Administration/javascript/Async.js' => '9700af0c08cdbc8e65dae7b435811cd2', './jssource/src_files/modules/Administration/javascript/Administration.js' => '1af7a9ff567d854580460d6ba9391e7d', - './jssource/src_files/modules/Meetings/jsclass_scheduler.js' => '7b581210314db4b2fef61075f96cd9fe', + './jssource/src_files/modules/Meetings/jsclass_scheduler.js' => 'ca1499f1ffa8d4ee0d43f2687bed671e', './jssource/src_files/modules/Meetings/duration_dependency.js' => '6fea7474ccc25b6ebb16b8afaec0872e', './jssource/src_files/modules/Project/Project.js' => '45818e242a7c29d7838f3d406db90e62', './jssource/src_files/modules/Contacts/Contact.js' => '6aee5d69be1008a8e427e9ae4250da15', @@ -7425,7 +7417,7 @@ $md5_string = array ( './jssource/src_files/include/javascript/yui3/build/stylesheet/stylesheet-min.js' => '75bd882fb0e8921fa84a7ec0f7b25644', './jssource/src_files/include/javascript/yui3/assets/dpSyntaxHighlighter.js' => 'e3c2434acdcd9f4b0717efba1d7d7ebb', './jssource/src_files/include/javascript/yui3/assets/syntax.js' => '4099ad678b4ce516afa04ba6b112a568', - './jssource/src_files/include/javascript/popup_helper.js' => '4cfd932be8bde79989c893fd56b1056b', + './jssource/src_files/include/javascript/popup_helper.js' => 'e4e9b2a495505512b9c67aee84a86947', './jssource/src_files/include/javascript/phpjs/get_html_translation_table.js' => '9667941dd790119d552f99b6d6b73fdf', './jssource/src_files/include/javascript/phpjs/html_entity_decode.js' => '022ed687a9c7c55a21b4a2aaa848921d', './jssource/src_files/include/javascript/phpjs/license.js' => '8d1e879645acd34b64c2270879203213', @@ -7435,11 +7427,11 @@ $md5_string = array ( './jssource/src_files/include/javascript/sugar_yui_overrides.js' => '0de3b58c8897f035f1f577234f9f8c57', './jssource/src_files/include/javascript/cookie.js' => '98c35f5fdf24e9af504b83f99560f610', './jssource/src_files/include/javascript/popup_parent_helper.js' => '9ab9a2b26a22cdd4ead193b54e223063', - './jssource/src_files/include/javascript/sugar_3.js' => '8e5a70d71328396f9828b1522a829268', + './jssource/src_files/include/javascript/sugar_3.js' => '2b50c727238c2ebc8f7b552e77dfca91', './jssource/src_files/include/javascript/jquery.js' => '219073097031d9c1a95a1291d66f3a10', './jssource/src_files/include/javascript/sugar_connection_event_listener.js' => 'a4b04fb7d5aabfd45de233ce4ba7459d', './jssource/src_files/include/javascript/jsclass_async.js' => 'da4b79bcd6fcc9eb3bb1c694707d9e09', - './jssource/src_files/include/javascript/quickCompose.js' => '11a2d042c773ecec8afd0a26137265c7', + './jssource/src_files/include/javascript/quickCompose.js' => 'a3f2f5efff493bc66bc57986d5144616', './jssource/src_files/include/javascript/menu.js' => '94bc61fcc798a480b5334b1d937cc1f0', './jssource/src_files/include/javascript/sugarwidgets/SugarYUILoader.js' => 'a3fc1aef484a47059455c02ddc29024d', './jssource/src_files/include/javascript/sugarwidgets/SugarYUIWidgets.js' => 'ec13860ae9f1e8e6ff14d6becee7570b', @@ -7460,7 +7452,7 @@ $md5_string = array ( './jssource/src_files/include/ytree/treeutil.js' => '622d40cee213034994496e227d9728b4', './jssource/src_files/include/SugarDependentDropdown/javascript/SugarDependentDropdown.js' => 'c63117009b7c1b75b4acfd89be4b23e6', './jssource/src_files/include/connectors/formatters/default/company_detail.js' => 'f8d85cde2353f208603606e634f60b8e', - './jssource/src_files/include/SugarCharts/Jit/FlashCanvas/flashcanvas.js' => '60e9df067b6a0591aedbfd15f2a6d21b', + './jssource/src_files/include/SugarCharts/Jit/FlashCanvas/flashcanvas.js' => '7a932038747ba7e7031766e9273ce680', './jssource/src_files/include/SugarCharts/Jit/FlashCanvas/canvas2png.js' => '4c95a8c2071e0d5b4ae1531a790f1492', './jssource/src_files/include/SugarCharts/Jit/js/sugarCharts.js' => '5248d93ab4845146ff627e5185709cad', './jssource/src_files/include/SugarCharts/Jit/js/mySugarCharts.js' => '56556e852e26bc4ede38db89f4973013', @@ -7470,7 +7462,7 @@ $md5_string = array ( './jssource/src_files/include/SugarFields/Fields/Collection/SugarFieldCollection.js' => '0193eba94d4fbf43f9f8f94c37f4c517', './jssource/src_files/include/SugarFields/Fields/Time/Time.js' => '76e0238ad91ad30b402a242dfdbdf254', './jssource/src_files/include/SugarFields/Fields/Datetimecombo/Datetimecombo.js' => 'e71ad9b60c4ee5ec2cbfe6d6202306e8', - './jssource/src_files/include/SubPanel/SubPanelTiles.js' => '5fea3044ac2b1928b1721ffb94597cb2', + './jssource/src_files/include/SubPanel/SubPanelTiles.js' => '27bb37adfa1038bd08d588ae4973803c', './jssource/src_files/include/HTMLPurifier/standalone/HTMLPurifier/Printer/ConfigForm.js' => 'ee5990d6bb62017463a7a8d72c8288b5', './jssource/minify.php' => '0af28efb7b3fb17907385d14b30672a3', './jssource/minify_utils.php' => 'd227d8019884682e1a7c7d628bff4ff3', @@ -7511,25 +7503,25 @@ $md5_string = array ( './install/installSystemCheck.php' => 'ba44bd4fab442277edcf51555b666234', './install/register.php' => '52f73d3313d3bb3e8108f43ed2d3d44d', './install/TeamDemoData.php' => '05f380071c5c1170d3b0c5ff6ac27da6', - './install/language/en_us.lang.php' => '2722888e9991095871462a654dd2102c', + './install/language/en_us.lang.php' => '455779db478349d135a33582d82ec077', './install/seed_data/quotes_SeedData.php' => '264f74bb5197baa5531ad2b3a543dc10', './install/seed_data/Advanced_Password_SeedData.php' => 'a1f9ef61c7a97402231837708fd44651', './install/licensePrint.php' => 'd9a6ea3b03290d190217b10e67cdea25', './install/license.php' => '0a3148dd0946840f5924f3b1f40de3db', './install/installType.php' => 'a3911f1dc837987f4b19c04099a57d23', './install/download_modules.php' => '7ad96abd4b62fb3e8f70c84dd64727d5', - './download.php' => '3dd971a12234b8bdb129cb058924f30d', + './download.php' => 'f8c0d6d13759ed26556e379e4da56ffb', './campaign_trackerv2.php' => '1522033bfca05941607274251c557f88', './install.php' => '306206a8fb3c31df5ddc127228518b2c', './soap/SoapDeprecated.php' => 'f48e5bf4aeed3e14b058e60fbddb0171', './soap/SoapError.php' => '07510ab768a147717e69512ec92d183e', - './soap/SoapHelperFunctions.php' => 'b9a756995fe8e239b7bd3352f767d185', + './soap/SoapHelperFunctions.php' => 'bb3028a0894df49b78773ff72fd5e462', './soap/SoapPortalHelper.php' => 'a49b70deba464a81beaccdccb70e336e', - './soap/SoapSugarUsers.php' => 'a5233d260b78819b071111b320ae9dec', + './soap/SoapSugarUsers.php' => 'c2cf733948c3373f88ed79d07f3134d9', './soap/SoapStudio.php' => 'a526d5ff3a9c0f32b1c37a909c4c52e1', './soap/SoapRelationshipHelper.php' => 'beaed29f3137e134a0529dbfd813f391', './soap/SoapErrorDefinitions.php' => 'd51e20c60a042417cf16547915a3ee68', - './soap/SoapTypes.php' => 'e184c93f2403a0d8833d7eb5154deea5', + './soap/SoapTypes.php' => '0b16e886b55077912db06f4b1372357a', './soap/SoapPortalUsers.php' => 'fd9ab0b852a6ebf9a58612f725a691a0', './soap/SoapData.php' => '0622cd88dae6abf8fac42fcdc72f06d4', ); diff --git a/include/EditView/EditView.tpl b/include/EditView/EditView.tpl index bafbeb92..e26ca651 100644 --- a/include/EditView/EditView.tpl +++ b/include/EditView/EditView.tpl @@ -210,7 +210,7 @@ class="yui-navset" {{foreach from=$colData.field.fields item=subField}} {{if $fields[$subField.name]}} {counter name="panelFieldCount"} - {{sugar_field parentFieldArray='fields' accesskey=$ACCKEY tabindex=$tabindex vardef=$fields[$subField.name] displayType='EditView' displayParams=$subField.displayParams formName=$form_name}}  + {{sugar_field parentFieldArray='fields' accesskey=$ACCKEY tabindex=$tabindex vardef=$fields[$subField.name] displayType='EditView' displayParams=$subField.displayParams formName=$form_name module=$module}}  {{/if}} {{/foreach}} {{elseif !empty($colData.field.customCode) && empty($colData.field.customCodeRenderField)}} @@ -219,7 +219,7 @@ class="yui-navset" {{elseif $fields[$colData.field.name]}} {counter name="panelFieldCount"} {{$colData.displayParams}} - {{sugar_field parentFieldArray='fields' accesskey=$ACCKEY tabindex=$tabindex vardef=$fields[$colData.field.name] displayType='EditView' displayParams=$colData.field.displayParams typeOverride=$colData.field.type formName=$form_name}} + {{sugar_field parentFieldArray='fields' accesskey=$ACCKEY tabindex=$tabindex vardef=$fields[$colData.field.name] displayType='EditView' displayParams=$colData.field.displayParams typeOverride=$colData.field.type formName=$form_name module=$module}} {{/if}} {{if !empty($colData.field.customCode) && !empty($colData.field.customCodeRenderField)}} {counter name="panelFieldCount"} diff --git a/include/HTMLPurifier/HTMLPurifier.standalone.php b/include/HTMLPurifier/HTMLPurifier.standalone.php index 5499b578..b878aaac 100644 --- a/include/HTMLPurifier/HTMLPurifier.standalone.php +++ b/include/HTMLPurifier/HTMLPurifier.standalone.php @@ -15032,7 +15032,13 @@ class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy $length = $j - $i + 1; // perform removal - array_splice($tokens, $i, $length); + // CODE HAS TO BE MOVED WITH UPGRADE START + if ($tokens instanceof HTMLPurifier_Array) { + $tokens->splice($i, $length); + } else { + array_splice($tokens, $i, $length); + } + // CODE HAS TO BE MOVED WITH UPGRADE ENT // update size $size -= $length; @@ -15071,7 +15077,13 @@ class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy } // perform replacement - array_splice($tokens, $i + 1, $length, $result); + // CODE HAS TO BE MOVED WITH UPGRADE START + if ($tokens instanceof HTMLPurifier_Array) { + $tokens->splice($i + 1, $length, $result); + } else { + array_splice($tokens, $i + 1, $length, $result); + } + // CODE HAS TO BE MOVED WITH UPGRADE END // update size $size -= $length; @@ -15187,7 +15199,9 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy protected $context; public function execute($tokens, $config, $context) { - + // CODE HAS TO BE MOVED WITH UPGRADE START + $tokens = new HTMLPurifier_Array($tokens); + // CODE HAS TO BE MOVED WITH UPGRADE END $definition = $config->getHTMLDefinition(); // local variables @@ -15595,7 +15609,9 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy $context->destroy('CurrentToken'); unset($this->injectors, $this->stack, $this->tokens, $this->t); - return $tokens; + // CODE HAS TO BE MOVED WITH UPGRADE START + return $tokens->getArray(); + // CODE HAS TO BE MOVED WITH UPGRADE END } /** @@ -15632,7 +15648,15 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy // array(number nodes to delete, new node 1, new node 2, ...) $delete = array_shift($token); - $old = array_splice($this->tokens, $this->t, $delete, $token); + // CODE HAS TO BE MOVED WITH UPGRADE START + $old = array(); + if ($this->tokens instanceof HTMLPurifier_Array) { + $old = $this->tokens->splice($this->t, $delete, $token); + } else { + $old = array_splice($this->tokens, $this->t, $delete, $token); + } + // CODE HAS TO BE MOVED WITH UPGRADE END + if ($injector > -1) { // determine appropriate skips @@ -15650,7 +15674,9 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy * this token. You must reprocess after this. */ private function insertBefore($token) { - array_splice($this->tokens, $this->t, 0, array($token)); + // CODE HAS TO BE MOVED WITH UPGRADE START + $this->tokens->insertBefore($this->t, $token); + // CODE HAS TO BE MOVED WITH UPGRADE END } /** @@ -15658,7 +15684,9 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy * occupied space. You must reprocess after this. */ private function remove() { - array_splice($this->tokens, $this->t, 1); + // CODE HAS TO BE MOVED WITH UPGRADE START + $this->tokens->remove($this->t); + // CODE HAS TO BE MOVED WITH UPGRADE END } /** @@ -16830,5 +16858,244 @@ class HTMLPurifier_VarParser_Native extends HTMLPurifier_VarParser } +// CODE HAS TO BE MOVED WITH UPGRADE START +class HTMLPurifier_Array implements ArrayAccess +{ + /** + * @param HTMLPurifier_ArrayNode + */ + public $head = null; + + /** + * @var int + */ + protected $count = 0; + + /** + * @var int + */ + protected $offset = 0; + + /** + * @var HTMLPurifier_ArrayNode + */ + protected $offsetItem = null; + + + public function __construct(array $array = array()) + { + /** + * @var HTMLPurifier_ArrayNode $temp + */ + $temp = null; + $i = 0; + + foreach ($array as &$v) { + $item = new HTMLPurifier_ArrayNode($v); + + if ($this->head == null) { + $this->head = &$item; + } + if ($temp instanceof HTMLPurifier_ArrayNode) { + $item->prev = &$temp; + $temp->next = &$item; + } + unset($temp); + $temp = &$item; + + $i ++; + + unset($item, $v); + } + $this->count = $i; + $this->offset = 0; + $this->offsetItem = &$this->head; + } + + protected function findIndex($offset) + { + if ($this->head == null) { + return array( + 'correct' => false, + 'value' => null + ); + } + + $current = &$this->head; + $goUp = true; + $index = 0; + + if ($this->offset <= $offset && $this->offsetItem instanceof HTMLPurifier_ArrayNode) { + $current = &$this->offsetItem; + $index = $this->offset; + } elseif ($this->offset > $offset && ($this->offset - $offset) < $offset && $this->offsetItem instanceof HTMLPurifier_ArrayNode) { + $current = &$this->offsetItem; + $index = $this->offset; + $goUp = false; + } + + if ($goUp) { + while ($current->next instanceof HTMLPurifier_ArrayNode && $index != $offset) { + $current = &$current->next; + $index ++; + } + } else { + while ($current->prev instanceof HTMLPurifier_ArrayNode && $index != $offset) { + $current = &$current->prev; + $index --; + } + } + + if ($index == $offset) { + $this->offset = $offset; + $this->offsetItem = &$current; + return array( + 'correct' => true, + 'value' => &$current + ); + } + + return array( + 'correct' => false, + 'value' => &$current + ); + } + + public function insertBefore($offset, $value) + { + $result = $this->findIndex($offset); + + $this->count ++; + $item = new HTMLPurifier_ArrayNode($value); + if ($result['correct'] == false) { + if ($result['value'] instanceof HTMLPurifier_ArrayNode) { + $result['value']->next = &$item; + $item->prev = &$result['value']; + } + } else { + if ($result['value'] instanceof HTMLPurifier_ArrayNode) { + $item->prev = &$result['value']->prev; + $item->next = &$result['value']; + } + if ($item->prev instanceof HTMLPurifier_ArrayNode) { + $item->prev->next = &$item; + } + if ($result['value'] instanceof HTMLPurifier_ArrayNode) { + $result['value']->prev = &$item; + } + } + if ($offset == 0) { + $this->head = &$item; + } + if ($offset <= $this->offset && $this->offsetItem instanceof HTMLPurifier_ArrayNode) { + $this->offsetItem = &$this->offsetItem->prev; + } + } + + public function remove($offset) + { + $result = $this->findIndex($offset); + + if ($result['correct']) { + $this->count --; + $item = $result['value']; + if ($item->prev instanceof HTMLPurifier_ArrayNode) { + $item->prev->next = &$result['value']->next; + } + if ($item->next instanceof HTMLPurifier_ArrayNode) { + $item->next->prev = &$result['value']->prev; + } + if ($offset == 0) { + $this->head = &$item->next; + } + if ($offset < $this->offset) { + $this->offset --; + } elseif ($offset == $this->offset) { + $this->offsetItem = &$item->next; + } + } + } + + public function splice($offset, $length = 0, $replacement = null) + { + $old = array(); + + for ($i = 0; $i < $length; $i ++) { + $result = $this->findIndex($offset); + if ($result['correct']) { + $old[] = $result['value']->value; + $this->remove($offset); + } + } + foreach ((array)$replacement as $k => $v) { + $this->insertBefore($offset + $k, $v); + } + + return $old; + } + + public function getArray() + { + $return = array(); + $head = $this->head; + + while ($head instanceof HTMLPurifier_ArrayNode) { + $return[] = $head->value; + $head = &$head->next; + } + + return $return; + } + + public function offsetExists($offset) + { + return $offset >= 0 && $offset < $this->count; + } + + public function offsetGet($offset) + { + $result = $this->findIndex($offset); + if ($result['correct']) { + return $result['value']->value; + } + + return null; + } + + public function offsetSet($offset, $value) + { + $result = $this->findIndex($offset); + if ($result['correct']) { + $result['value']->value = &$value; + } + } + + public function offsetUnset($offset) + { + $this->remove($offset); + } +} + +class HTMLPurifier_ArrayNode +{ + public function __construct(&$value) + { + $this->value = &$value; + } + /** + * @var HTMLPurifier_ArrayNode + */ + public $prev = null; + /** + * @var HTMLPurifier_ArrayNode + */ + public $next = null; + + /** + * @var mixed + */ + public $value = null; +} +// CODE HAS TO BE MOVED WITH UPGRADE END diff --git a/modules/Connectors/connectors/sources/ext/rest/linkedin/vardefs.php b/include/HTMLPurifier/README.UPGRADE similarity index 79% rename from modules/Connectors/connectors/sources/ext/rest/linkedin/vardefs.php rename to include/HTMLPurifier/README.UPGRADE index b84a574e..c07d94b6 100644 --- a/modules/Connectors/connectors/sources/ext/rest/linkedin/vardefs.php +++ b/include/HTMLPurifier/README.UPGRADE @@ -1,5 +1,3 @@ - 'vardefs for linkedin connector', - 'fields' => array ( - 'id' => - array ( - 'name' => 'id', - 'vname' => 'LBL_ID', - 'type' => 'id', - 'comment' => 'Unique identifier', - 'hidden' => true, - ), - 'name'=> array( - 'name' => 'name', - 'vname' => 'LBL_NAME', - 'type' => 'varchar', - 'hover' => true, - 'comment' => 'The name of the company', - ), - ) -); -?> \ No newline at end of file +If you going to upgrade HTMLPurifier.standalone.php file please note that you should save changes from Bug #61818. + +Code is marked by comments like + +// CODE HAS TO BE MOVED WITH UPGRADE START +code which should be moved +// CODE HAS TO BE MOVED WITH UPGRADE END diff --git a/include/ListView/ListViewDisplay.php b/include/ListView/ListViewDisplay.php index c208e732..33605c66 100644 --- a/include/ListView/ListViewDisplay.php +++ b/include/ListView/ListViewDisplay.php @@ -134,63 +134,7 @@ class ListViewDisplay { $data = $this->lvd->getListViewData($seed, $where, $offset, $limit, $filter_fields, $params, $id_field); - foreach($this->displayColumns as $columnName => $def) - { - $seedName = strtolower($columnName); - if(!empty($this->lvd->seed->field_defs[$seedName])){ - $seedDef = $this->lvd->seed->field_defs[$seedName]; - } - - if(empty($this->displayColumns[$columnName]['type'])){ - if(!empty($seedDef['type'])){ - $this->displayColumns[$columnName]['type'] = (!empty($seedDef['custom_type']))?$seedDef['custom_type']:$seedDef['type']; - }else{ - $this->displayColumns[$columnName]['type'] = ''; - } - }//fi empty(...) - - if(!empty($seedDef['options'])){ - $this->displayColumns[$columnName]['options'] = $seedDef['options']; - } - - //C.L. Fix for 11177 - if($this->displayColumns[$columnName]['type'] == 'html') { - $cField = $this->seed->custom_fields; - if(isset($cField) && isset($cField->bean->$seedName)) { - $seedName2 = strtoupper($columnName); - $htmlDisplay = html_entity_decode($cField->bean->$seedName); - $count = 0; - while($count < count($data['data'])) { - $data['data'][$count][$seedName2] = &$htmlDisplay; - $count++; - } - } - }//fi == 'html' - - //Bug 40511, make sure relate fields have the correct module defined - if ($this->displayColumns[$columnName]['type'] == "relate" && !empty($seedDef['link']) && empty( $this->displayColumns[$columnName]['module'])) - { - $link = $seedDef['link']; - if (!empty($this->lvd->seed->field_defs[$link]) && !empty($this->lvd->seed->field_defs[$seedDef['link']]['module'])) - { - $this->displayColumns[$columnName]['module'] = $this->lvd->seed->field_defs[$seedDef['link']]['module']; - } - } - - if (!empty($seedDef['sort_on'])) { - $this->displayColumns[$columnName]['orderBy'] = $seedDef['sort_on']; - } - - if(isset($seedDef)){ - // Merge the two arrays together, making sure the seedDef doesn't override anything explicitly set in the displayColumns array. - $this->displayColumns[$columnName] = $this->displayColumns[$columnName] + $seedDef; - } - - //C.L. Bug 38388 - ensure that ['id'] is set for related fields - if(!isset($this->displayColumns[$columnName]['id']) && isset($this->displayColumns[$columnName]['id_name'])) { - $this->displayColumns[$columnName]['id'] = strtoupper($this->displayColumns[$columnName]['id_name']); - } - } + $this->fillDisplayColumnsWithVardefs(); $this->process($file, $data, $seed->object_name); return true; @@ -626,4 +570,67 @@ EOF; { return new MassUpdate(); } + + /** + * Fill displayColumns with additional field values from vardefs of the current bean seed. + * We need vardefs to be in displayColumns for a further processing (e.g. in SugarField) + * Similar vardef field values do not override field values from displayColumns, only necessary and missing ones are added + */ + protected function fillDisplayColumnsWithVardefs() + { + foreach ($this->displayColumns as $columnName => $def) { + $seedName = strtolower($columnName); + if (!empty($this->lvd->seed->field_defs[$seedName])) { + $seedDef = $this->lvd->seed->field_defs[$seedName]; + } + + if (empty($this->displayColumns[$columnName]['type'])) { + if (!empty($seedDef['type'])) { + $this->displayColumns[$columnName]['type'] = (!empty($seedDef['custom_type']))?$seedDef['custom_type']:$seedDef['type']; + } else { + $this->displayColumns[$columnName]['type'] = ''; + } + }//fi empty(...) + + if (!empty($seedDef['options'])) { + $this->displayColumns[$columnName]['options'] = $seedDef['options']; + } + + //C.L. Fix for 11177 + if ($this->displayColumns[$columnName]['type'] == 'html') { + $cField = $this->seed->custom_fields; + if (isset($cField) && isset($cField->bean->$seedName)) { + $seedName2 = strtoupper($columnName); + $htmlDisplay = html_entity_decode($cField->bean->$seedName); + $count = 0; + while ($count < count($data['data'])) { + $data['data'][$count][$seedName2] = &$htmlDisplay; + $count++; + } + } + }//fi == 'html' + + //Bug 40511, make sure relate fields have the correct module defined + if ($this->displayColumns[$columnName]['type'] == "relate" && !empty($seedDef['link']) && empty( $this->displayColumns[$columnName]['module'])) { + $link = $seedDef['link']; + if (!empty($this->lvd->seed->field_defs[$link]) && !empty($this->lvd->seed->field_defs[$seedDef['link']]['module'])) { + $this->displayColumns[$columnName]['module'] = $this->lvd->seed->field_defs[$seedDef['link']]['module']; + } + } + + if (!empty($seedDef['sort_on'])) { + $this->displayColumns[$columnName]['orderBy'] = $seedDef['sort_on']; + } + + if (isset($seedDef)) { + // Merge the two arrays together, making sure the seedDef doesn't override anything explicitly set in the displayColumns array. + $this->displayColumns[$columnName] = $this->displayColumns[$columnName] + $seedDef; + } + + //C.L. Bug 38388 - ensure that ['id'] is set for related fields + if (!isset($this->displayColumns[$columnName]['id']) && isset($this->displayColumns[$columnName]['id_name'])) { + $this->displayColumns[$columnName]['id'] = strtoupper($this->displayColumns[$columnName]['id_name']); + } + } + } } \ No newline at end of file diff --git a/include/MVC/Controller/SugarController.php b/include/MVC/Controller/SugarController.php index 0c3ca5d7..4ce43480 100644 --- a/include/MVC/Controller/SugarController.php +++ b/include/MVC/Controller/SugarController.php @@ -753,12 +753,19 @@ class SugarController{ $this->view = 'edit'; $GLOBALS['view'] = $this->view; ob_clean(); + $retval = false; + if(method_exists($this->bean, 'deleteAttachment')) { - echo $this->bean->deleteAttachment($_REQUEST['isDuplicate']) ? 'true' : 'false'; - } else { - echo 'false'; + $duplicate = "false"; + if (isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == "true") { + $duplicate = "true"; + } + if (isset($_REQUEST['duplicateSave']) && $_REQUEST['duplicateSave'] == "true") { + $duplicate = "true"; + } + $retval = $this->bean->deleteAttachment($duplicate); } - + echo json_encode($retval); sugar_cleanup(true); } diff --git a/include/Popups/PopupSmarty.php b/include/Popups/PopupSmarty.php index 88ba9bec..6647feb9 100644 --- a/include/Popups/PopupSmarty.php +++ b/include/Popups/PopupSmarty.php @@ -237,6 +237,7 @@ class PopupSmarty extends ListViewSmarty{ $this->th->ss->assign('ASSOCIATED_JAVASCRIPT_DATA', 'var associated_javascript_data = '.$json->encode($associated_row_data). '; var is_show_fullname = '.$is_show_fullname.';'); $this->th->ss->assign('module', $this->seed->module_dir); $request_data = empty($_REQUEST['request_data']) ? '' : $_REQUEST['request_data']; + $this->th->ss->assign('request_data', $request_data); $this->th->ss->assign('fields', $this->fieldDefs); $this->th->ss->assign('formData', $this->formData); @@ -385,6 +386,11 @@ class PopupSmarty extends ListViewSmarty{ } } + if (isset($_REQUEST['request_data'])) { + $request_data = json_decode(html_entity_decode($_REQUEST['request_data']), true); + $_POST['field_to_name'] = $_REQUEST['field_to_name'] = array_keys($request_data['field_to_name_array']); + } + /** * Bug #46842 : The relate field field_to_name_array fails to copy over custom fields * By default bean's create_new_list_query function loads fields displayed on the page or used in the search @@ -402,26 +408,6 @@ class PopupSmarty extends ListViewSmarty{ } } - } - else if (!empty($_REQUEST['request_data'])) - { - $request_data = get_object_vars(json_decode(htmlspecialchars_decode($_REQUEST['request_data']))); - - if (!empty($request_data['field_to_name_array'])) - { - $request_data['field_to_name'] = get_object_vars($request_data['field_to_name_array']); - if (is_array($request_data['field_to_name'])) - { - foreach ($request_data['field_to_name'] as $add_field) - { - $add_field = strtolower($add_field); - if ($add_field != 'id' && !isset($this->filter_fields[$add_field]) && isset($this->seed->field_defs[$add_field])) - { - $this->filter_fields[$add_field] = true; - } - } - } - } } @@ -439,41 +425,7 @@ class PopupSmarty extends ListViewSmarty{ ); } - foreach($this->displayColumns as $columnName => $def) - { - $seedName = strtolower($columnName); - - if(empty($this->displayColumns[$columnName]['type'])){ - if(!empty($this->lvd->seed->field_defs[$seedName]['type'])){ - $seedDef = $this->lvd->seed->field_defs[$seedName]; - $this->displayColumns[$columnName]['type'] = (!empty($seedDef['custom_type']))?$seedDef['custom_type']:$seedDef['type']; - }else{ - $this->displayColumns[$columnName]['type'] = ''; - } - }//fi empty(...) - - if(!empty($this->lvd->seed->field_defs[$seedName]['options'])){ - $this->displayColumns[$columnName]['options'] = $this->lvd->seed->field_defs[$seedName]['options']; - } - - //C.L. Fix for 11177 - if($this->displayColumns[$columnName]['type'] == 'html') { - $cField = $this->seed->custom_fields; - if(isset($cField) && isset($cField->bean->$seedName)) { - $seedName2 = strtoupper($columnName); - $htmlDisplay = html_entity_decode($cField->bean->$seedName); - $count = 0; - while($count < count($data['data'])) { - $data['data'][$count][$seedName2] = &$htmlDisplay; - $count++; - } - } - }//fi == 'html' - - if (!empty($this->lvd->seed->field_defs[$seedName]['sort_on'])) { - $this->displayColumns[$columnName]['orderBy'] = $this->lvd->seed->field_defs[$seedName]['sort_on']; - } - } + $this->fillDisplayColumnsWithVardefs(); $this->process($file, $data, $this->seed->object_name); } diff --git a/include/Popups/tpls/PopupGeneric.tpl b/include/Popups/tpls/PopupGeneric.tpl index b738d6b5..b3d6abf5 100644 --- a/include/Popups/tpls/PopupGeneric.tpl +++ b/include/Popups/tpls/PopupGeneric.tpl @@ -268,4 +268,4 @@ {else} {$APP.LBL_SEARCH_POPULATE_ONLY} {/if} -{{include file=$footerTpl}} \ No newline at end of file +{{include file=$footerTpl}} diff --git a/include/SearchForm/SearchForm2.php b/include/SearchForm/SearchForm2.php index de178f8d..31c06d99 100644 --- a/include/SearchForm/SearchForm2.php +++ b/include/SearchForm/SearchForm2.php @@ -671,6 +671,9 @@ require_once('include/EditView/EditView2.php'); $field = $real_field; unset($this->searchFields[$end_field]['value']); + }else{ + //if both start and end ranges have not been defined, skip this filter. + continue; } } else if (preg_match('/^range_(.*?)$/', $field, $match) && isset($this->searchFields[$field]['value'])) { $real_field = $match[1]; diff --git a/include/Smarty/plugins/function.sugar_field.php b/include/Smarty/plugins/function.sugar_field.php index 1cedd350..3d7a4008 100644 --- a/include/Smarty/plugins/function.sugar_field.php +++ b/include/Smarty/plugins/function.sugar_field.php @@ -84,7 +84,11 @@ function smarty_function_sugar_field($params, &$smarty) if(isset($params['field'])) { $params['vardef']['name'] = $params['field']; } - + + if (isset($params['module'])) { + $displayParams['module'] = $params['module']; + } + if (isset($params['call_back_function'])) { $displayParams['call_back_function'] = $params['call_back_function']; } diff --git a/include/SubPanel/SubPanelTiles.js b/include/SubPanel/SubPanelTiles.js index 8ee9b31a..1cb2ba2d 100644 --- a/include/SubPanel/SubPanelTiles.js +++ b/include/SubPanel/SubPanelTiles.js @@ -103,12 +103,14 @@ SUGAR.subpanelUtils=function(){var originalLayout=null,subpanelContents={},subpa if(asString)return subpanelIds.join(',');else return subpanelIds;},onDrag:function(e,id){originalLayout=SUGAR.subpanelUtils.getLayout(true,true);},onDrop:function(e,id){newLayout=SUGAR.subpanelUtils.getLayout(true,true);if(originalLayout!=newLayout){SUGAR.subpanelUtils.saveLayout(newLayout);}},saveLayout:function(order){ajaxStatus.showStatus(SUGAR.language.get('app_strings','LBL_SAVING_LAYOUT'));if(typeof SUGAR.subpanelUtils.currentSubpanelGroup!='undefined'){var orderList=SUGAR.subpanelUtils.getLayout(false,true);var currentGroup=SUGAR.subpanelUtils.currentSubpanelGroup;} var success=function(data){ajaxStatus.showStatus(SUGAR.language.get('app_strings','LBL_SAVED_LAYOUT'));window.setTimeout('ajaxStatus.hideStatus()',2000);if(typeof SUGAR.subpanelUtils.currentSubpanelGroup!='undefined'){SUGAR.subpanelUtils.reorderSubpanelSubtabs(currentGroup,orderList);}} url='index.php?module=Home&action=SaveSubpanelLayout&layout='+order+'&layoutModule='+currentModule;if(typeof SUGAR.subpanelUtils.currentSubpanelGroup!='undefined'){url=url+'&layoutGroup='+encodeURI(SUGAR.subpanelUtils.currentSubpanelGroup);} -var cObj=YAHOO.util.Connect.asyncRequest('GET',url,{success:success,failure:success});},inlineSave:function(theForm,buttonName){ajaxStatus.showStatus(SUGAR.language.get('app_strings','LBL_SAVING'));var success=function(data){var module=get_module_name();var id=get_record_id();var layout_def_key=get_layout_def_key();try{eval('result = '+data.responseText);}catch(err){} -if(typeof(result)!='undefined'&&result!=null&&result['status']=='dupe'){document.location.href="index.php?"+result['get'].replace(/&/gi,'&').replace(/</gi,'<').replace(/>/gi,'>').replace(/'/gi,'\'').replace(/"/gi,'"').replace(/\r\n/gi,'\n');return;}else{SUGAR.subpanelUtils.cancelCreate(buttonName);var parts=theForm.split('_');var savedModule='';var subPanels=[];for(var i=parts.length-1;i>=0;i--){if(parts[i]==''){continue;} +var cObj=YAHOO.util.Connect.asyncRequest('GET',url,{success:success,failure:success});},inlineSave:function(theForm,buttonName){var saveButton=document.getElementsByName(buttonName);for(var i=0;i').replace(/'/gi,'\'').replace(/"/gi,'"').replace(/\r\n/gi,'\n');for(var i=0;i=0;i--){if(parts[i]==''){continue;} if(savedModule!=''){savedModule='_'+savedModule;} savedModule=parts[i]+savedModule;if(window.ModuleSubPanels&&window.ModuleSubPanels[savedModule]){subPanels=subPanels.concat(window.ModuleSubPanels[savedModule]);}} for(var i=0;i=8?a.src:a.getAttribute("src",4)}function v(a){return(""+a).replace(/&/g,"&").replace(/0){var ret=this.B.CallFunction(''+a.join("�")+"");if(ret!='undefined'){return eval(this.B.CallFunction(ret));}else{return;}}},I:function(a,b){this.e();this.D();if(a>0)this.B.width=a;if(b>0)this.B.height=b;this.a.push(e.resize,a,b)}};t.prototype={addColorStop:function(a,b){if(isNaN(a)||a<0||a>1)i(1);this.G.a.push(e.addColorStop,this.id,a,b)}};D.prototype=Error();var T={1:"INDEX_SIZE_ERR",9:"NOT_SUPPORTED_ERR",11:"INVALID_STATE_ERR",12:"SYNTAX_ERR",17:"TYPE_MISMATCH_ERR",18:"SECURITY_ERR"},B={initElement:function(a){if(a.getContext)return a;var b=a.uniqueID,c="external"+b;x[b]=false;n[b]=1;Q(a);a.innerHTML='';s[b]=a;var d=a.firstChild;y[b]=a.lastChild;var f=j.body.contains;if(f(a))d.movie=w;else var g=setInterval(function(){if(f(a)){clearInterval(g);d.movie=w}},0);if(j.compatMode==="BackCompat"||!h.XMLHttpRequest)y[b].style.overflow="hidden";var o=new u(a,d);a.getContext=function(l){return l==="2d"?o:k};a.toDataURL=function(l,z){(""+l).replace(/[A-Z]+/g,W)==="image/jpeg"?o.a.push(e.toDataURL,l,typeof z==="number"?z:""):o.a.push(e.toDataURL,l);return o.e()};d.attachEvent(K,G);return a},saveImage:function(a){a.firstChild.saveImage()},setOptions:function(){},trigger:function(a,b){s[a].fireEvent("on"+b)},unlock:function(a,b){n[a]&&--n[a];if(b){var c=s[a],d=c.firstChild,f,g;Q(c);f=c.width;g=c.height;c.style.width=f+"px";c.style.height=g+"px";if(f>0)d.width=f;if(g>0)d.height=g;d.resize(f,g);c.attachEvent(L,H);x[a]=true}}};j.createElement(r);j.createStyleSheet().cssText=r+"{display:inline-block;overflow:hidden;width:300px;height:150px}";j.readyState==="complete"?A():j.attachEvent(F,A);h.attachEvent(J,I);if(w.indexOf(location.protocol+"//"+location.host+"/")===0){var S=new ActiveXObject("Microsoft.XMLHTTP");S.open("GET",w,false);S.send(k)}h[M]=u;h[N]=t;h[O]=E;h[C]=B;h[P]={init:function(){},init_:function(){},initElement:B.initElement};keep=u.measureText}(window,document); \ No newline at end of file +window.ActiveXObject&&!window.CanvasRenderingContext2D&&function(h,j){function D(a){this.code=a;this.message=T[a]}function U(a){this.width=a}function E(a){this.id=a.C++}function t(a){this.G=a;this.id=a.C++}function u(a,b){this.canvas=a;this.B=b;this.d=a.uniqueID;this.D();this.C=0;this.t="";var c=this;setInterval(function(){n[c.d]===0&&c.e()},30)}function A(){if(j.readyState==="complete"){j.detachEvent(F,A);for(var a=j.getElementsByTagName(r),b=0,c=a.length;b=8?a.src:a.getAttribute("src",4)}function v(a){return(""+a).replace(/&/g,"&").replace(/0){var ret=this.B.CallFunction(''+a.join("�")+"");if(ret!='undefined'){return eval(ret);}else{return;}}},I:function(a,b){this.e();this.D();if(a>0)this.B.width=a;if(b>0)this.B.height=b;this.a.push(e.resize,a,b)}};t.prototype={addColorStop:function(a,b){if(isNaN(a)||a<0||a>1)i(1);this.G.a.push(e.addColorStop,this.id,a,b)}};D.prototype=Error();var T={1:"INDEX_SIZE_ERR",9:"NOT_SUPPORTED_ERR",11:"INVALID_STATE_ERR",12:"SYNTAX_ERR",17:"TYPE_MISMATCH_ERR",18:"SECURITY_ERR"},B={initElement:function(a){if(a.getContext)return a;var b=a.uniqueID,c="external"+b;x[b]=false;n[b]=1;Q(a);a.innerHTML='';s[b]=a;var d=a.firstChild;y[b]=a.lastChild;var f=j.body.contains;if(f(a))d.movie=w;else var g=setInterval(function(){if(f(a)){clearInterval(g);d.movie=w}},0);if(j.compatMode==="BackCompat"||!h.XMLHttpRequest)y[b].style.overflow="hidden";var o=new u(a,d);a.getContext=function(l){return l==="2d"?o:k};a.toDataURL=function(l,z){(""+l).replace(/[A-Z]+/g,W)==="image/jpeg"?o.a.push(e.toDataURL,l,typeof z==="number"?z:""):o.a.push(e.toDataURL,l);return o.e()};d.attachEvent(K,G);return a},saveImage:function(a){a.firstChild.saveImage()},setOptions:function(){},trigger:function(a,b){s[a].fireEvent("on"+b)},unlock:function(a,b){n[a]&&--n[a];if(b){var c=s[a],d=c.firstChild,f,g;Q(c);f=c.width;g=c.height;c.style.width=f+"px";c.style.height=g+"px";if(f>0)d.width=f;if(g>0)d.height=g;d.resize(f,g);c.attachEvent(L,H);x[a]=true}}};j.createElement(r);j.createStyleSheet().cssText=r+"{display:inline-block;overflow:hidden;width:300px;height:150px}";j.readyState==="complete"?A():j.attachEvent(F,A);h.attachEvent(J,I);if(w.indexOf(location.protocol+"//"+location.host+"/")===0){var S=new ActiveXObject("Microsoft.XMLHTTP");S.open("GET",w,false);S.send(k)}h[M]=u;h[N]=t;h[O]=E;h[C]=B;h[P]={init:function(){},init_:function(){},initElement:B.initElement};keep=u.measureText}(window,document); \ No newline at end of file diff --git a/include/SugarCharts/Jit/Jit.php b/include/SugarCharts/Jit/Jit.php index 53406fc0..dd922c01 100644 --- a/include/SugarCharts/Jit/Jit.php +++ b/include/SugarCharts/Jit/Jit.php @@ -51,6 +51,11 @@ class Jit extends JsChart { function getChartResources() { return ' diff --git a/include/SugarFields/Fields/Address/DetailView.tpl b/include/SugarFields/Fields/Address/DetailView.tpl index 98b710e9..15a24160 100644 --- a/include/SugarFields/Fields/Address/DetailView.tpl +++ b/include/SugarFields/Fields/Address/DetailView.tpl @@ -47,6 +47,11 @@ {$fields.{{$displayParams.key}}_address_city.value|escape:'htmlentitydecode'|escape:'html'|url2html|nl2br} {$fields.{{$displayParams.key}}_address_state.value|escape:'htmlentitydecode'|strip_tags|url2html|nl2br}  {$fields.{{$displayParams.key}}_address_postalcode.value|escape:'htmlentitydecode'|strip_tags|url2html|nl2br}
{$fields.{{$displayParams.key}}_address_country.value|escape:'htmlentitydecode'|escape:'html'|url2html|nl2br} +{{if !empty($displayParams.enableConnectors)}} + +{{sugarvar_connector view='DetailView'}} + +{{/if}} {{* This is custom code that you may set to show on the second column of the address @@ -56,4 +61,4 @@ See modules/Accounts/views/view.detail.php to see the value being set {$custom_code_{{$displayParams.key}}} - \ No newline at end of file + diff --git a/include/SugarFields/Fields/Address/EditView.tpl b/include/SugarFields/Fields/Address/EditView.tpl index 62c3d822..68fcf5fd 100644 --- a/include/SugarFields/Fields/Address/EditView.tpl +++ b/include/SugarFields/Fields/Address/EditView.tpl @@ -36,102 +36,44 @@ *} -{{assign var="key" value=$displayParams.key|upper}} -{{assign var="street" value=$displayParams.key|cat:'_address_street'}} -{{assign var="city" value=$displayParams.key|cat:'_address_city'}} -{{assign var="state" value=$displayParams.key|cat:'_address_state'}} -{{assign var="country" value=$displayParams.key|cat:'_address_country'}} -{{assign var="postalcode" value=$displayParams.key|cat:'_address_postalcode'}} -
-{sugar_translate label='LBL_{{$key}}_ADDRESS' module='{{$module}}'} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -{{if $displayParams.copy}} - - - - -{{else}} - - - -{{/if}} -
- -{if $fields.{{$street}}.required || {{if $street|lower|in_array:$displayParams.required}}true{{else}}false{{/if}}} -{$APP.LBL_REQUIRED_SYMBOL} -{/if} - -{{if $displayParams.maxlength}} - -{{else}} - -{{/if}} -
- -{if $fields.{{$city}}.required || {{if $city|lower|in_array:$displayParams.required}}true{{else}}false{{/if}}} -{$APP.LBL_REQUIRED_SYMBOL} -{/if} - - -
- -{if $fields.{{$state}}.required || {{if $state|lower|in_array:$displayParams.required}}true{{else}}false{{/if}}} -{$APP.LBL_REQUIRED_SYMBOL} -{/if} - - -
- - -{if $fields.{{$postalcode}}.required || {{if $postalcode|lower|in_array:$displayParams.required}}true{{else}}false{{/if}}} -{$APP.LBL_REQUIRED_SYMBOL} -{/if} - - -
- - -{if $fields.{{$country}}.required || {{if $country|lower|in_array:$displayParams.required}}true{{else}}false{{/if}}} -{$APP.LBL_REQUIRED_SYMBOL} -{/if} - - -
-{sugar_translate label='LBL_COPY_ADDRESS_FROM_LEFT' module=''}: - - -
 
+
+ {sugar_translate label='LBL_{{$displayParams.key|upper}}_ADDRESS' module='{{$module}}'} + + {{foreach from=$displayParams.fields item=field}} + + + + + {{/foreach}} + {{if $displayParams.copy}} + + + + + {{else}} + + + + {{/if}} +
+ + {{if $field.required || $field.name|lower|in_array:$displayParams.required}} + {$APP.LBL_REQUIRED_SYMBOL} + {{/if}} + + {{if strpos($field.name, 'address_street')}} + + {{else}} + + {{/if}} +
+ {sugar_translate label='LBL_COPY_ADDRESS_FROM_LEFT' module=''}: + + +
 
\ No newline at end of file + diff --git a/include/SugarFields/Fields/Address/SugarFieldAddress.php b/include/SugarFields/Fields/Address/SugarFieldAddress.php index 002725d3..3f65ee89 100644 --- a/include/SugarFields/Fields/Address/SugarFieldAddress.php +++ b/include/SugarFields/Fields/Address/SugarFieldAddress.php @@ -84,14 +84,18 @@ class SugarFieldAddress extends SugarFieldBase { } function getEditViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) { - $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex); global $app_strings; + if(!isset($displayParams['key'])) { $GLOBALS['log']->debug($app_strings['ERR_ADDRESS_KEY_NOT_SPECIFIED']); $this->ss->trigger_error($app_strings['ERR_ADDRESS_KEY_NOT_SPECIFIED']); return; } - + + $displayParams['fields'] = $this->getDisplayParamsForFields($displayParams['key'], $displayParams['module']); + + $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex); + //Allow for overrides. You can specify a Smarty template file location in the language file. if(isset($app_strings['SMARTY_ADDRESS_EDITVIEW'])) { $tplCode = $app_strings['SMARTY_ADDRESS_EDITVIEW']; @@ -100,6 +104,21 @@ class SugarFieldAddress extends SugarFieldBase { return $this->fetch($this->findTemplate('EditView')); } - + + /** + * @param $key - Address group field key (primary, billing, shipping, ...) + * @return array - array of fields included in Address group and their vardefs + */ + private function getDisplayParamsForFields($key, $module) + { + $bean = BeanFactory::getBean($module); + + return array( + 'street' => $bean->field_defs[$key . '_address_street'], + 'city' => $bean->field_defs[$key . '_address_city'], + 'state' => $bean->field_defs[$key . '_address_state'], + 'postalcode' => $bean->field_defs[$key . '_address_postalcode'], + 'country' => $bean->field_defs[$key . '_address_country'], + ); + } } -?> diff --git a/include/SugarFields/Fields/Address/en_us.DetailView.tpl b/include/SugarFields/Fields/Address/en_us.DetailView.tpl deleted file mode 100644 index 85ae9699..00000000 --- a/include/SugarFields/Fields/Address/en_us.DetailView.tpl +++ /dev/null @@ -1,64 +0,0 @@ -{* -/********************************************************************************* - * SugarCRM Community Edition is a customer relationship management program developed by - * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. - * - * 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. If the display of the logo is not reasonably feasible for - * technical reasons, the Appropriate Legal Notices must display the words - * "Powered by SugarCRM". - ********************************************************************************/ - -*} - - - -{{if !empty($displayParams.enableConnectors)}} - -{{/if}} - - -
- - - - - -{$fields.{{$displayParams.key}}_address_street.value|escape:'htmlentitydecode'|escape:'html'|url2html|nl2br}
-{$fields.{{$displayParams.key}}_address_city.value|escape:'htmlentitydecode'|escape:'html'|url2html|nl2br} {$fields.{{$displayParams.key}}_address_state.value|escape:'htmlentitydecode'|strip_tags|url2html|nl2br}  {$fields.{{$displayParams.key}}_address_postalcode.value|escape:'htmlentitydecode'|strip_tags|url2html|nl2br}
-{$fields.{{$displayParams.key}}_address_country.value|escape:'htmlentitydecode'|escape:'html'|url2html|nl2br} -		 -{{sugarvar_connector view='DetailView'}} - -{{* -This is custom code that you may set to show on the second column of the address -table. An example would be the "Copy" button present from the Accounts detailview. -See modules/Accounts/views/view.detail.php to see the value being set -*}} -{$custom_code_{{$displayParams.key}}} -
\ No newline at end of file diff --git a/include/SugarFields/Fields/Address/en_us.EditView.tpl b/include/SugarFields/Fields/Address/en_us.EditView.tpl deleted file mode 100644 index e7491ed5..00000000 --- a/include/SugarFields/Fields/Address/en_us.EditView.tpl +++ /dev/null @@ -1,137 +0,0 @@ -{* -/********************************************************************************* - * SugarCRM Community Edition is a customer relationship management program developed by - * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc. - * - * 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. If the display of the logo is not reasonably feasible for - * technical reasons, the Appropriate Legal Notices must display the words - * "Powered by SugarCRM". - ********************************************************************************/ - -*} - -{{assign var="key" value=$displayParams.key|upper}} -{{assign var="street" value=$displayParams.key|cat:'_address_street'}} -{{assign var="city" value=$displayParams.key|cat:'_address_city'}} -{{assign var="state" value=$displayParams.key|cat:'_address_state'}} -{{assign var="country" value=$displayParams.key|cat:'_address_country'}} -{{assign var="postalcode" value=$displayParams.key|cat:'_address_postalcode'}} -
-{sugar_translate label='LBL_{{$key}}_ADDRESS' module='{{$module}}'} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -{{if $displayParams.copy}} - - - - -{{else}} - - - -{{/if}} -
- -{if $fields.{{$street}}.required || {{if $street|lower|in_array:$displayParams.required}}true{{else}}false{{/if}}} -{$APP.LBL_REQUIRED_SYMBOL} -{/if} - -{{if $displayParams.maxlength}} - -{{else}} - -{{/if}} -
- - -
- -{if $fields.{{$state}}.required || {{if $state|lower|in_array:$displayParams.required}}true{{else}}false{{/if}}} -{$APP.LBL_REQUIRED_SYMBOL} -{/if} - - -
- - -{if $fields.{{$postalcode}}.required || {{if $postalcode|lower|in_array:$displayParams.required}}true{{else}}false{{/if}}} -{$APP.LBL_REQUIRED_SYMBOL} -{/if} - - -
- - -{if $fields.{{$country}}.required || {{if $country|lower|in_array:$displayParams.required}}true{{else}}false{{/if}}} -{$APP.LBL_REQUIRED_SYMBOL} -{/if} - - -
-{sugar_translate label='LBL_COPY_ADDRESS_FROM_LEFT' module=''}: - - -
 
-
- \ No newline at end of file diff --git a/include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl b/include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl index e8c4dbf8..f7c8844b 100644 --- a/include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl +++ b/include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl @@ -178,6 +178,12 @@ YAHOO.util.Event.onDOMReady(function() {ldelim} {rdelim}); YAHOO.util.Event.onDOMReady(function() {ldelim} + //register on basic search form button if it exists + if(document.getElementById('search_form_submit')) + {ldelim} + YAHOO.util.Event.addListener('search_form_submit', 'click',{$id}_range_validate); + {rdelim} + //register on advanced search submit button if it exists if(document.getElementById('search_form_submit_advanced')) {ldelim} YAHOO.util.Event.addListener('search_form_submit_advanced', 'click',{$id}_range_validate); diff --git a/include/SugarFields/Fields/Float/SugarFieldFloat.php b/include/SugarFields/Fields/Float/SugarFieldFloat.php index e3c1b893..a7d99bdf 100644 --- a/include/SugarFields/Fields/Float/SugarFieldFloat.php +++ b/include/SugarFields/Fields/Float/SugarFieldFloat.php @@ -56,7 +56,7 @@ class SugarFieldFloat extends SugarFieldInt public function unformatField($formattedField, $vardef){ if ( $formattedField === '' || $formattedField === NULL ) { - return ''; + return null; } return (float)unformat_number($formattedField); } @@ -80,6 +80,6 @@ class SugarFieldFloat extends SugarFieldInt return false; } - return $value; + return (float)$value; } } diff --git a/include/SugarFields/Fields/Int/RangeSearchForm.tpl b/include/SugarFields/Fields/Int/RangeSearchForm.tpl index 9fa95a48..c09f9314 100644 --- a/include/SugarFields/Fields/Int/RangeSearchForm.tpl +++ b/include/SugarFields/Fields/Int/RangeSearchForm.tpl @@ -90,6 +90,39 @@ YAHOO.util.Event.onDOMReady(function() {ldelim} {rdelim} {rdelim}); +YAHOO.util.Event.onDOMReady(function() {ldelim} + //register on basic search form button if it exists + if(document.getElementById('search_form_submit')) + {ldelim} + YAHOO.util.Event.addListener('search_form_submit', 'click',{$id}_range_validate); + {rdelim} + //register on advanced search submit button if it exists + if(document.getElementById('search_form_submit_advanced')) + {ldelim} + YAHOO.util.Event.addListener('search_form_submit_advanced', 'click',{$id}_range_validate); + {rdelim} + +{rdelim}); + +// this function is specific to range searches and will check that both start and end range fields have been +// filled prior to submitting search form. It is called from the listener added above. +function {$id}_range_validate(e){ldelim} + if ( + (document.getElementById("start_range_{$id}").value.length >0 && document.getElementById("end_range_{$id}").value.length == 0) + ||(document.getElementById("end_range_{$id}").value.length >0 && document.getElementById("start_range_{$id}").value.length == 0) + ) + {ldelim} + e.preventDefault(); + alert('{$APP.LBL_CHOOSE_START_AND_END_ENTRIES}'); + if (document.getElementById("start_range_{$id}").value.length == 0) {ldelim} + document.getElementById("start_range_{$id}").focus(); + {rdelim} + else {ldelim} + document.getElementById("end_range_{$id}").focus(); + {rdelim} + {rdelim} + +{rdelim} diff --git a/include/SugarFields/Fields/Int/SugarFieldInt.php b/include/SugarFields/Fields/Int/SugarFieldInt.php index d1f32c56..16ff0aad 100644 --- a/include/SugarFields/Fields/Int/SugarFieldInt.php +++ b/include/SugarFields/Fields/Int/SugarFieldInt.php @@ -54,7 +54,7 @@ class SugarFieldInt extends SugarFieldBase public function unformatField($formattedField, $vardef){ if ( $formattedField === '' || $formattedField === NULL ) { - return ''; + return null; } return (int)unformat_number($formattedField); } diff --git a/include/SugarLogger/SugarLogger.php b/include/SugarLogger/SugarLogger.php index 96368f8f..3296bbab 100644 --- a/include/SugarLogger/SugarLogger.php +++ b/include/SugarLogger/SugarLogger.php @@ -62,7 +62,7 @@ class SugarLogger implements LoggerTemplate protected $filesuffix = ""; protected $date_suffix = ""; protected $log_dir = '.'; - + protected $full_log_file; /** * used for config screen @@ -217,25 +217,47 @@ class SugarLogger implements LoggerTemplate } //check if our log file is greater than that or if we are forcing the log to roll if and only if roll size assigned the value correctly if ( $force || ($rollAt && filesize ( $this->full_log_file ) >= $rollAt) ) { - //now lets move the logs starting at the oldest and going to the newest - for($i = $this->maxLogs - 2; $i > 0; $i --) { - if (file_exists ( $this->log_dir . $this->logfile . $this->date_suffix . '_'. $i . $this->ext )) { - $to = $i + 1; - $old_name = $this->log_dir . $this->logfile . $this->date_suffix . '_'. $i . $this->ext; - $new_name = $this->log_dir . $this->logfile . $this->date_suffix . '_'. $to . $this->ext; - //nsingh- Bug 22548 Win systems fail if new file name already exists. The fix below checks for that. - //if/else branch is necessary as suggested by someone on php-doc ( see rename function ). - sugar_rename($old_name, $new_name); + $temp = tempnam($this->log_dir, 'rot'); + if ($temp) { + // warning here is expected in case if log file is opened by another process on Windows + // or rotation has been already started by another process + if (@rename($this->full_log_file, $temp)) { + + // manually remove the obsolete part. Otherwise, rename() may fail on Windows (bug #22548) + $obsolete_part = $this->getLogPartPath($this->maxLogs - 1); + if (file_exists($obsolete_part)) { + unlink($obsolete_part); + } - //rename ( $this->logfile . $i . $this->ext, $this->logfile . $to . $this->ext ); - } - } - //now lets move the current .log file - sugar_rename ($this->full_log_file, $this->log_dir . $this->logfile . $this->date_suffix . '_1' . $this->ext); + // now lets move the logs starting at the oldest and going to the newest + for ($old = $this->maxLogs - 2; $old > 0; $old--) { + $old_name = $this->getLogPartPath($old); + if (file_exists($old_name)) { + $new_name = $this->getLogPartPath($old + 1); + rename($old_name, $new_name); + } + } + $part1 = $this->getLogPartPath(1); + rename($temp, $part1); + } else { + unlink($temp); + } + } } } + /** + * Returns path for the given log part + * + * @param int $i + * @return string + */ + protected function getLogPartPath($i) + { + return $this->log_dir . $this->logfile . $this->date_suffix . '_' . $i . $this->ext; + } + /** * This is needed to prevent unserialize vulnerability */ diff --git a/include/SugarObjects/templates/person/vardefs.php b/include/SugarObjects/templates/person/vardefs.php index 172e3c11..3b8df154 100644 --- a/include/SugarObjects/templates/person/vardefs.php +++ b/include/SugarObjects/templates/person/vardefs.php @@ -151,6 +151,7 @@ $vardefs =array( ), 'vname' =>'LBL_ANY_EMAIL', 'studio' => array('visible'=>false, 'searchview'=>true), + 'importable' => false, ), 'phone_mobile' => array ( diff --git a/include/SugarTinyMCE.php b/include/SugarTinyMCE.php index ff503b58..8a09b0cb 100644 --- a/include/SugarTinyMCE.php +++ b/include/SugarTinyMCE.php @@ -93,7 +93,7 @@ class SugarTinyMCE { 'elements' => '', 'extended_valid_elements' => 'style[dir|lang|media|title|type],hr[class|width|size|noshade],@[class|style]', 'content_css' => 'include/javascript/tiny_mce/themes/advanced/skins/default/content.css', - + 'gecko_spellcheck' => 'true', ); diff --git a/include/Sugarpdf/Sugarpdf.php b/include/Sugarpdf/Sugarpdf.php index 26402c7b..cd6a65a8 100644 --- a/include/Sugarpdf/Sugarpdf.php +++ b/include/Sugarpdf/Sugarpdf.php @@ -361,6 +361,10 @@ class Sugarpdf extends TCPDF // need to adjust the current page number // so the following output will not overlap the previous output if ($this->getNumPages() != $this->getPage()) { + if (!empty($this->currentY)) { + $this->y = $this->currentY; + $this->currentY = 0; + } $this->setPage($this->getNumPages()); } $firstcell = true; diff --git a/include/externalAPI/ExternalAPIFactory.php b/include/externalAPI/ExternalAPIFactory.php index 58440510..6a46d760 100644 --- a/include/externalAPI/ExternalAPIFactory.php +++ b/include/externalAPI/ExternalAPIFactory.php @@ -60,7 +60,7 @@ class ExternalAPIFactory if(isset($data['authMethod']) && $data['authMethod'] == 'oauth'){ $connector = SourceFactory::getSource($data['connector'], false); if(!empty($connector) && $connector->propertyExists('oauth_consumer_key') - && $connector->propertyExists('oauth_consumer_secret')) { + && $connector->isRequiredConfigFieldsSet()) { $filteredList[$name] = $data; } }else{ diff --git a/include/generic/SugarWidgets/SugarWidgetFielddatetime.php b/include/generic/SugarWidgets/SugarWidgetFielddatetime.php index 63e8115d..c9b504f8 100644 --- a/include/generic/SugarWidgets/SugarWidgetFielddatetime.php +++ b/include/generic/SugarWidgets/SugarWidgetFielddatetime.php @@ -379,15 +379,76 @@ class SugarWidgetFieldDateTime extends SugarWidgetReportField return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb()); } + /** + * Return the between WHERE query for Quarter filter + * + * Find quarter for given date, modify the start/end with $modifyFilter parameter + * + * @param $layout_def - Filter layout_def + * @param string $modifyFilter - Modification to start/end date, used to select previous/next quarter + * @param string $date - Date for which to find the quarter filter, if not set uses current date + * @return string - BETWEEN WHERE query for quarter filter + */ + protected function getQuarterFilter($layout_def, $modifyFilter, $date = '') + { + $timedate = TimeDate::getInstance(); - function queryFilterTP_this_quarter($layout_def) - { - global $timedate; - $begin = $this->now(); - $begin->setDate($begin->year, floor(($begin->month-1)/3)*3+1, 1)->setTime(0, 0); - $end = $begin->get("+3 month")->setTime(23, 59, 59); - return $this->get_start_end_date_filter($layout_def,$begin->asDb(),$end->asDb()); - } + // See if date is set, if not, use current date + if (empty($date)) { + $begin = $timedate->getNow(true); + } else { + $begin = $timedate->fromString($date); + } + + $begin->setDate( + $begin->year, + floor(($begin->month - 1) / 3) * 3 + 1, // Find starting month of quarter + 1 + )->setTime(0, 0); + + $end = $begin->get("+3 month")->setTime(23, 59, 59)->get("-1 day"); + + // Modify begin/end if filter is set + if (!empty($modifyFilter)) { + $begin->modify($modifyFilter); + $end->modify($modifyFilter); + } + + return $this->get_start_end_date_filter($layout_def, $begin->asDb(), $end->asDb()); + } + + /** + * Returns part of query for select + * + * @param array $layout_def for field + * @return string part of select query with last quarter only + */ + public function queryFilterTP_last_quarter($layout_def) + { + return $this->getQuarterFilter($layout_def, '-3 month'); + } + + /** + * Returns part of query for select + * + * @param array $layout_def for field + * @return string part of select query with this quarter only + */ + public function queryFilterTP_this_quarter($layout_def) + { + return $this->getQuarterFilter($layout_def, ''); + } + + /** + * Returns part of query for select + * + * @param array $layout_def for field + * @return string part of select query with next quarter only + */ + public function queryFilterTP_next_quarter($layout_def) + { + return $this->getQuarterFilter($layout_def, '+3 month'); + } function queryFilterTP_last_year($layout_def) { diff --git a/include/generic/SugarWidgets/SugarWidgetFieldparent_type.php b/include/generic/SugarWidgets/SugarWidgetFieldparent_type.php index 5ea539c1..58efb699 100644 --- a/include/generic/SugarWidgets/SugarWidgetFieldparent_type.php +++ b/include/generic/SugarWidgets/SugarWidgetFieldparent_type.php @@ -55,6 +55,24 @@ class SugarWidgetFieldparent_type extends SugarWidgetFieldEnum } return $value; } + + /** + * Return value of a field from layout_def + * @param mixed $layout_def + * @return string + */ + function _get_list_value(&$layout_def) + { + $value = parent::_get_list_value($layout_def); + if ( + !empty($value) + && isset($this->reporter->all_fields[$layout_def['column_key']]['options']) + ) { + $app_list_strings = return_app_list_strings_language($GLOBALS['current_language']); + $value = $app_list_strings[$this->reporter->all_fields[$layout_def['column_key']]['options']][$value]; + } + return $value; + } } ?> diff --git a/modules/Connectors/connectors/sources/ext/rest/linkedin/config.php b/include/generic/SugarWidgets/SugarWidgetFieldreadonly.php similarity index 88% rename from modules/Connectors/connectors/sources/ext/rest/linkedin/config.php rename to include/generic/SugarWidgets/SugarWidgetFieldreadonly.php index 0aad289b..9420304b 100644 --- a/modules/Connectors/connectors/sources/ext/rest/linkedin/config.php +++ b/include/generic/SugarWidgets/SugarWidgetFieldreadonly.php @@ -35,16 +35,9 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point'); * "Powered by SugarCRM". ********************************************************************************/ -// created: 2008-10-03 14:31:59 -$config = array ( - 'name' => 'LinkedIn©', - 'order' => 1, - 'eapm' => array( - 'enabled' => true, - ), - 'properties' => - array ( - 'company_url'=>'http://www.linkedin.com/companyInsider?script&useBorder=no', - ), -); -?> + + +class SugarWidgetFieldreadonly extends SugarWidgetFieldVarchar +{ + +} diff --git a/include/generic/SugarWidgets/SugarWidgetReportField.php b/include/generic/SugarWidgets/SugarWidgetReportField.php index fd1c9859..b036a5b6 100644 --- a/include/generic/SugarWidgets/SugarWidgetReportField.php +++ b/include/generic/SugarWidgets/SugarWidgetReportField.php @@ -180,6 +180,7 @@ class SugarWidgetReportField extends SugarWidgetField function queryOrderBy($layout_def) { + $field_def = array(); if(!empty($this->reporter->all_fields[$layout_def['column_key']])) $field_def = $this->reporter->all_fields[$layout_def['column_key']]; if (!empty($layout_def['group_function'])) @@ -196,6 +197,12 @@ class SugarWidgetReportField extends SugarWidgetField $order_by = $this->_get_column_alias($layout_def)." \n"; } + //use sugar db function convert on order by string to convert to varchar. This is mainly for db's + //that do not allow sorting on clob/text fields + if ($this->reporter->db->isTextType($this->reporter->db->getFieldType($field_def))) { + $order_by = $this->reporter->db->convert($order_by,'text2char', array(10000)); // array(10000) is for db2 only + } + if ( empty($layout_def['sort_dir']) || $layout_def['sort_dir'] == 'a') { return $order_by." ASC"; diff --git a/include/javascript/popup_helper.js b/include/javascript/popup_helper.js index a706ca27..efe8ece8 100644 --- a/include/javascript/popup_helper.js +++ b/include/javascript/popup_helper.js @@ -46,14 +46,14 @@ function send_back(module,id) {var associated_row_data=associated_javascript_data[id];eval("var temp_request_data = "+window.document.forms['popup_query_form'].request_data.value);if(temp_request_data.jsonObject){var request_data=temp_request_data.jsonObject;}else{var request_data=temp_request_data;} var passthru_data=Object();if(typeof(request_data.passthru_data)!='undefined') {passthru_data=request_data.passthru_data;} -var form_name=request_data.form_name;var field_to_name_array=request_data.field_to_name_array;var call_back_function=eval("window.opener."+request_data.call_back_function);var array_contents=Array();for(var the_key in field_to_name_array) -{if(the_key!='toJSON') -{var the_name=field_to_name_array[the_key];var the_value='';if(module!=''&&id!='') -{if(associated_row_data['DOCUMENT_NAME']&&the_key.toUpperCase()=="NAME"){the_value=associated_row_data['DOCUMENT_NAME'];} -else if((the_key.toUpperCase()=='USER_NAME'||the_key.toUpperCase()=='LAST_NAME'||the_key.toUpperCase()=='FIRST_NAME')&&typeof(is_show_fullname)!='undefined'&&is_show_fullname&&form_name!='search_form'){the_value=associated_row_data['FULL_NAME'];} -else{the_value=associated_row_data[the_key.toUpperCase()];}} +var form_name=request_data.form_name;var field_to_name_array=request_data.field_to_name_array;var call_back_function=eval("window.opener."+request_data.call_back_function);var array_contents=Array();var fill_array_contents=function(the_key,the_name) +{var the_value='';if(module!=''&&id!=''){if(associated_row_data['DOCUMENT_NAME']&&the_key.toUpperCase()=="NAME"){the_value=associated_row_data['DOCUMENT_NAME'];}else if((the_key.toUpperCase()=='USER_NAME'||the_key.toUpperCase()=='LAST_NAME'||the_key.toUpperCase()=='FIRST_NAME')&&typeof(is_show_fullname)!='undefined'&&is_show_fullname&&form_name!='search_form'){the_value=associated_row_data['FULL_NAME'];}else{the_value=associated_row_data[the_key.toUpperCase()];}} if(typeof(the_value)=='string'){the_value=the_value.replace(/\r\n|\n|\r/g,'\\n');} -array_contents.push('"'+the_name+'":"'+the_value+'"');}} +array_contents.push('"'+the_name+'":"'+the_value+'"');} +for(var the_key in field_to_name_array) +{if(the_key!='toJSON') +{if(YAHOO.lang.isArray(field_to_name_array[the_key])){for(var i=0;i