adamjakab / SuiteCRM

modules/TableDictionary.php

Indentation +1 added lines, -1 removed lines

@@ -125,6 +125,6 @@
 include('metadata/securitygroups_usersMetaData.php');
 
 if(file_exists('custom/application/Ext/TableDictionary/tabledictionary.ext.php')){
-	include('custom/application/Ext/TableDictionary/tabledictionary.ext.php');
+    include('custom/application/Ext/TableDictionary/tabledictionary.ext.php');
 }
 ?>

modules/AOS_Products_Quotes/AOS_Products_Quotes.php

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php
 /**
- * Advanced OpenSales, Advanced, robust set of sales modules.
- * @package Advanced OpenSales for SugarCRM
- * @copyright SalesAgility Ltd http://www.salesagility.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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 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
- *
- * @author SalesAgility <info@salesagility.com>
- */
+     * Advanced OpenSales, Advanced, robust set of sales modules.
+     * @package Advanced OpenSales for SugarCRM
+     * @copyright SalesAgility Ltd http://www.salesagility.com
+     *
+     * This program is free software; you can redistribute it and/or modify
+     * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+     * the Free Software Foundation; either version 3 of the License, or
+     * (at your option) any later version.
+     *
+     * 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 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
+     *
+     * @author SalesAgility <info@salesagility.com>
+     */
 
 require_once('modules/AOS_Products_Quotes/AOS_Products_Quotes_sugar.php');
 class AOS_Products_Quotes extends AOS_Products_Quotes_sugar {

modules/Home/language/en_us.lang.php

Indentation +133 added lines, -133 removed lines

@@ -55,7 +55,7 @@ 
     'LBL_EMAIL_ADDRESS' => 'Email Address:',
     'LBL_MY_PIPELINE_FORM_TITLE' => 'My Pipeline',
     'LBL_PIPELINE_FORM_TITLE' => 'Pipeline By Sales Stage',
-		'LBL_RGraph_PIPELINE_FORM_TITLE' => 'Pipeline By Sales Stage',
+        'LBL_RGraph_PIPELINE_FORM_TITLE' => 'Pipeline By Sales Stage',
     'LBL_CAMPAIGN_ROI_FORM_TITLE' => 'Campaign ROI',
     'LBL_MY_CLOSED_OPPORTUNITIES_GAUGE' => 'My Closed Won Opportunities Gauge',
     'LNK_NEW_CONTACT' => 'Create Contact',
@@ -80,35 +80,35 @@ 
     'LBL_NO_RESULTS' => '<h2>There were no results found. Please search again.</h2><br>',
     'LBL_NO_RESULTS_TIPS' => '<h3>Search Tips:</h3><ul><li>Make sure you have the proper categories selected above.</li><li>Broaden your search criteria.</li><li>If you still cannot find any results try the advanced search option.</li></ul>',
 
-  'LBL_RELOAD_PAGE' => 'Please <a href="javascript: window.location.reload()">reload the window</a> to use this SuiteCRM Dashlet.',
-  'LBL_ADD_DASHLETS' => 'Add SuiteCRM Dashlets',
-  'LBL_ADD_PAGE' => 'Add Page',
-  'LBL_DEL_PAGE' => 'Delete Page',
-  'LBL_WEBSITE_TITLE' => 'Website',
-  'LBL_RSS_TITLE' => 'News Feed',
-  'LBL_DELETE_PAGE' => 'Delete Page',
-  'LBL_CHANGE_LAYOUT' => 'Change Layout',
-  'LBL_RENAME_PAGE' => 'Rename Page',
-  'LBL_CLOSE_DASHLETS' => 'Close',
-  'LBL_OPTIONS' => 'Options',
-  // dashlet search fields
-  'LBL_TODAY'=>'Today',
-  'LBL_YESTERDAY' => 'Yesterday',
-  'LBL_TOMORROW'=>'Tomorrow',
-  'LBL_LAST_WEEK'=>'Last Week',
-  'LBL_NEXT_WEEK'=>'Next Week',
-  'LBL_LAST_7_DAYS'=>'Last 7 Days',
-  'LBL_NEXT_7_DAYS'=>'Next 7 Days',
-  'LBL_LAST_MONTH'=>'Last Month',
-  'LBL_NEXT_MONTH'=>'Next Month',
-  'LBL_LAST_QUARTER'=>'Last Quarter',
-  'LBL_THIS_QUARTER'=>'This Quarter',
-  'LBL_LAST_YEAR'=>'Last Year',
-  'LBL_NEXT_YEAR'=>'Next Year',
-  'LBL_LAST_30_DAYS' => 'Last 30 Days',
-  'LBL_NEXT_30_DAYS' => 'Next 30 Days',
-  'LBL_THIS_MONTH' => 'This Month',
-  'LBL_THIS_YEAR' => 'This Year',
+    'LBL_RELOAD_PAGE' => 'Please <a href="javascript: window.location.reload()">reload the window</a> to use this SuiteCRM Dashlet.',
+    'LBL_ADD_DASHLETS' => 'Add SuiteCRM Dashlets',
+    'LBL_ADD_PAGE' => 'Add Page',
+    'LBL_DEL_PAGE' => 'Delete Page',
+    'LBL_WEBSITE_TITLE' => 'Website',
+    'LBL_RSS_TITLE' => 'News Feed',
+    'LBL_DELETE_PAGE' => 'Delete Page',
+    'LBL_CHANGE_LAYOUT' => 'Change Layout',
+    'LBL_RENAME_PAGE' => 'Rename Page',
+    'LBL_CLOSE_DASHLETS' => 'Close',
+    'LBL_OPTIONS' => 'Options',
+    // dashlet search fields
+    'LBL_TODAY'=>'Today',
+    'LBL_YESTERDAY' => 'Yesterday',
+    'LBL_TOMORROW'=>'Tomorrow',
+    'LBL_LAST_WEEK'=>'Last Week',
+    'LBL_NEXT_WEEK'=>'Next Week',
+    'LBL_LAST_7_DAYS'=>'Last 7 Days',
+    'LBL_NEXT_7_DAYS'=>'Next 7 Days',
+    'LBL_LAST_MONTH'=>'Last Month',
+    'LBL_NEXT_MONTH'=>'Next Month',
+    'LBL_LAST_QUARTER'=>'Last Quarter',
+    'LBL_THIS_QUARTER'=>'This Quarter',
+    'LBL_LAST_YEAR'=>'Last Year',
+    'LBL_NEXT_YEAR'=>'Next Year',
+    'LBL_LAST_30_DAYS' => 'Last 30 Days',
+    'LBL_NEXT_30_DAYS' => 'Next 30 Days',
+    'LBL_THIS_MONTH' => 'This Month',
+    'LBL_THIS_YEAR' => 'This Year',
 
     'LBL_MODULES' => 'Modules',
     'LBL_CHARTS' => 'Charts',
@@ -116,44 +116,44 @@ 
     'LBL_WEB' => 'Web',
     'LBL_SEARCH_RESULTS' => 'Search Result',
 
-  // Dashlet Categories
-  'dashlet_categories_dom' => array(
-      'Module Views' => 'Module Views',
-      'Portal' => 'Portal',
-      'Charts' => 'Charts',
-      'Tools' => 'Tools',
-      'Miscellaneous' => 'Miscellaneous'),
-  'LBL_MAX_DASHLETS_REACHED' => 'You have reached the maximum number of SuiteCRM Dashlets your administrator has set. Please remove a SuiteCRM Dashlet to add a new one.',
-  'LBL_ADDING_DASHLET' => 'Adding SuiteCRM Dashlet ...',
-  'LBL_ADDED_DASHLET' => 'SuiteCRM Dashlet Added',
-  'LBL_REMOVE_DASHLET_CONFIRM' => 'Are you sure you want to remove this SuiteCRM Dashlet?',
-  'LBL_REMOVING_DASHLET' => 'Removing SuiteCRM Dashlet ...',
-  'LBL_REMOVED_DASHLET' => 'SuiteCRM Dashlet Removed',
-  'LBL_DASHLET_CONFIGURE_GENERAL' => 'General',
-  'LBL_DASHLET_CONFIGURE_FILTERS' => 'Filters',
-  'LBL_DASHLET_CONFIGURE_MY_ITEMS_ONLY' => 'Only My Items',
-  'LBL_DASHLET_CONFIGURE_TITLE' => 'Title',
-  'LBL_DASHLET_CONFIGURE_DISPLAY_ROWS' => 'Display Rows',
+    // Dashlet Categories
+    'dashlet_categories_dom' => array(
+        'Module Views' => 'Module Views',
+        'Portal' => 'Portal',
+        'Charts' => 'Charts',
+        'Tools' => 'Tools',
+        'Miscellaneous' => 'Miscellaneous'),
+    'LBL_MAX_DASHLETS_REACHED' => 'You have reached the maximum number of SuiteCRM Dashlets your administrator has set. Please remove a SuiteCRM Dashlet to add a new one.',
+    'LBL_ADDING_DASHLET' => 'Adding SuiteCRM Dashlet ...',
+    'LBL_ADDED_DASHLET' => 'SuiteCRM Dashlet Added',
+    'LBL_REMOVE_DASHLET_CONFIRM' => 'Are you sure you want to remove this SuiteCRM Dashlet?',
+    'LBL_REMOVING_DASHLET' => 'Removing SuiteCRM Dashlet ...',
+    'LBL_REMOVED_DASHLET' => 'SuiteCRM Dashlet Removed',
+    'LBL_DASHLET_CONFIGURE_GENERAL' => 'General',
+    'LBL_DASHLET_CONFIGURE_FILTERS' => 'Filters',
+    'LBL_DASHLET_CONFIGURE_MY_ITEMS_ONLY' => 'Only My Items',
+    'LBL_DASHLET_CONFIGURE_TITLE' => 'Title',
+    'LBL_DASHLET_CONFIGURE_DISPLAY_ROWS' => 'Display Rows',
 
-  'LBL_DASHLET_DELETE' => 'Delete SuiteCRM Dashlet',
-  'LBL_DASHLET_REFRESH' => 'Refresh SuiteCRM Dashlet',
-  'LBL_DASHLET_EDIT' => 'Edit SuiteCRM Dashlet',
+    'LBL_DASHLET_DELETE' => 'Delete SuiteCRM Dashlet',
+    'LBL_DASHLET_REFRESH' => 'Refresh SuiteCRM Dashlet',
+    'LBL_DASHLET_EDIT' => 'Edit SuiteCRM Dashlet',
 
     'LBL_TRAINING_TITLE' => 'Training',
 
-  'LBL_CREATING_NEW_PAGE' => 'Creating New Page...',
-  'LBL_NEW_PAGE_FEEDBACK' => 'You have created a new page. You can add new content with the Add SuiteCRM Dashlets option.',
-  'LBL_DELETE_PAGE_CONFIRM' => 'Are you sure you want to delete this page?',
-  'LBL_SAVING_PAGE_TITLE' => 'Saving Page Title...',
-  'LBL_RETRIEVING_PAGE' => 'Retrieving Page...',
+    'LBL_CREATING_NEW_PAGE' => 'Creating New Page...',
+    'LBL_NEW_PAGE_FEEDBACK' => 'You have created a new page. You can add new content with the Add SuiteCRM Dashlets option.',
+    'LBL_DELETE_PAGE_CONFIRM' => 'Are you sure you want to delete this page?',
+    'LBL_SAVING_PAGE_TITLE' => 'Saving Page Title...',
+    'LBL_RETRIEVING_PAGE' => 'Retrieving Page...',
 
-  // Default out-of-box names for tabs
-  'LBL_HOME_PAGE_1_NAME' => 'My SuiteCRM',
-  'LBL_HOME_PAGE_2_NAME' => 'Sales',
-  'LBL_HOME_PAGE_3_NAME' => 'Support',
-  'LBL_HOME_PAGE_6_NAME' => 'Marketing',//bug 16510, separate the support and marketing page from each other
-  'LBL_HOME_PAGE_4_NAME' => 'Tracker',
-  'LBL_CLOSE_SITEMAP' => 'Close',
+    // Default out-of-box names for tabs
+    'LBL_HOME_PAGE_1_NAME' => 'My SuiteCRM',
+    'LBL_HOME_PAGE_2_NAME' => 'Sales',
+    'LBL_HOME_PAGE_3_NAME' => 'Support',
+    'LBL_HOME_PAGE_6_NAME' => 'Marketing',//bug 16510, separate the support and marketing page from each other
+    'LBL_HOME_PAGE_4_NAME' => 'Tracker',
+    'LBL_CLOSE_SITEMAP' => 'Close',
 
     'LBL_SEARCH' => 'Search',
     'LBL_CLEAR' => 'Clear',
@@ -166,7 +166,7 @@ 
     'LBL_MY_TEAM_REPORT_CHARTS' => 'My Team Reports',
     'LBL_MY_SAVED_REPORT_CHARTS' => 'My Saved Reports',
 
-  'LBL_DASHLET_SEARCH' => 'Find SuiteCRM Dashlet',
+    'LBL_DASHLET_SEARCH' => 'Find SuiteCRM Dashlet',
 
 //ABOUT page
     'LBL_VERSION' => 'Version',
@@ -177,77 +177,77 @@ 
     'LBL_ADD_TERM_COM' => '<P>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 General Public License version 3, these Appropriate Legal Notices must retain the display of the &quot;Powered by SugarCRM&quot; logo. If the display of the logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices must display the words &quot;Powered by SugarCRM&quot;.</P>',
 
 
-  'LBL_SUGAR_COMMUNITY_EDITION' => 'Sugar Community Edition',
-  'LBL_AND' => "and",
-  'LBL_ARE' => "are",
-  'LBL_TRADEMARKS' => 'trademarks',
-  'LBL_OF' => 'of',
-  'LBL_FOUNDERS' => 'Founders',
-  'LBL_JOIN_SUGAR_COMMUNITY' => 'Join the SuiteCRM Community',
-  'LBL_DETAILS_SUGARFORGE' => 'Collaborate and develop SuiteCRM extensions',
-  'LBL_DETAILS_SUGAREXCHANGE' => 'Buy and sell certified SuiteCRM extensions',
-  'LBL_TRAINING' => 'Training',
-  'LBL_DETAILS_TRAINING' => 'Learn about SuiteCRM using online and interactive learning content',
-  'LBL_FORUMS' => 'Forums',
-  'LBL_DETAILS_FORUMS' => 'Discuss SuiteCRM with expert community users and developers',
-  'LBL_WIKI' => 'Wiki',
-  'LBL_DETAILS_WIKI' => 'Search the knowledge base of user and developer topics',
-  'LBL_DEVSITE' => 'Developer Site',
-  'LBL_DETAILS_DEVSITE' => 'Discover resources, tutorials, and helpful links to get you up to speed on SuiteCRM development',
- 'LBL_GET_SUGARCRM_RSS' => 'Get SuiteCRM RSS',
-  'LBL_SUGARCRM_NEWS' => 'SuiteCRM News',
-  'LBL_SUGARCRM_TRAINING_NEWS' => 'SuiteCRM Training News',
-  'LBL_SUGARCRM_FORUMS' => 'SuiteCRM Forums',
-  'LBL_SUGARFORGE_NEWS' => 'SuiteCRM News',
-  'LBL_ALL_NEWS' => 'All News',
-  'LBL_SOURCE_CODE' => 'Source Code',
+    'LBL_SUGAR_COMMUNITY_EDITION' => 'Sugar Community Edition',
+    'LBL_AND' => "and",
+    'LBL_ARE' => "are",
+    'LBL_TRADEMARKS' => 'trademarks',
+    'LBL_OF' => 'of',
+    'LBL_FOUNDERS' => 'Founders',
+    'LBL_JOIN_SUGAR_COMMUNITY' => 'Join the SuiteCRM Community',
+    'LBL_DETAILS_SUGARFORGE' => 'Collaborate and develop SuiteCRM extensions',
+    'LBL_DETAILS_SUGAREXCHANGE' => 'Buy and sell certified SuiteCRM extensions',
+    'LBL_TRAINING' => 'Training',
+    'LBL_DETAILS_TRAINING' => 'Learn about SuiteCRM using online and interactive learning content',
+    'LBL_FORUMS' => 'Forums',
+    'LBL_DETAILS_FORUMS' => 'Discuss SuiteCRM with expert community users and developers',
+    'LBL_WIKI' => 'Wiki',
+    'LBL_DETAILS_WIKI' => 'Search the knowledge base of user and developer topics',
+    'LBL_DEVSITE' => 'Developer Site',
+    'LBL_DETAILS_DEVSITE' => 'Discover resources, tutorials, and helpful links to get you up to speed on SuiteCRM development',
+    'LBL_GET_SUGARCRM_RSS' => 'Get SuiteCRM RSS',
+    'LBL_SUGARCRM_NEWS' => 'SuiteCRM News',
+    'LBL_SUGARCRM_TRAINING_NEWS' => 'SuiteCRM Training News',
+    'LBL_SUGARCRM_FORUMS' => 'SuiteCRM Forums',
+    'LBL_SUGARFORGE_NEWS' => 'SuiteCRM News',
+    'LBL_ALL_NEWS' => 'All News',
+    'LBL_SOURCE_CODE' => 'Source Code',
     'LBL_SOURCE_SUGAR' => 'SugarCRM Inc - providers of CE framework',
-  'LBL_SOURCE_XTEMPLATE' => 'XTemplate - A template engine for PHP created by Barnabás Debreceni',
-  'LBL_SOURCE_NUSOAP' => 'NuSOAP - A set of PHP classes that allow developers to create and consume web services created by NuSphere Corporation and Dietrich Ayala',
-  'LBL_SOURCE_JSCALENDAR' => 'JS Calendar - A calendar for entering dates created by Mihai Bazon',
-  'LBL_SOURCE_PHPPDF' => 'PHP PDF - A library for creating PDF documents created by Wayne Munro',
-  'LBL_SOURCE_HTTP_WEBDAV_SERVER' => 'HTTP_WebDAV_Server - A WebDAV Server Implementation in PHP.',
-  'LBL_SOURCE_PCLZIP' => 'PclZip - library offers compression and extraction functions for Zip formatted archives by Vincent Blavet',
-  'LBL_SOURCE_SMARTY' => 'Smarty - A template engine for PHP.',
-  'LBL_SOURCE_YAHOO_UI_LIB' => 'Yahoo! User Interface Library - The UI Library Utilities facilitate the implementation of rich client-side features.',
-  'LBL_SOURCE_PHPMAILER' => 'PHPMailer - A full featured email transfer class for PHP',
-  'LBL_SOURCE_JSHRINK' => 'JShrink - A Javascript minifier written in PHP',
-  'LBL_SOURCE_CRYPT_BLOWFISH' => 'Crypt_Blowfish - Allows for quick two-way blowfish encryption without requiring the MCrypt PHP extension.',
-  'LBL_SOURCE_XML_HTMLSAX3' => 'XML_HTMLSax3 - A SAX parser for HTML and other badly formed XML documents',
-  'LBL_SOURCE_YAHOO_UI_LIB_EXT' => 'Yahoo! UI Extensions Library - Extensions to the Yahoo! User Interface Library by Jack Slocum',
-  'LBL_SOURCE_SWFOBJECT' => 'SWFObject - Javascript Flash Player detection and embed script.',
-  'LBL_SOURCE_TINYMCE' => 'TinyMCE - A WYSIWYG editor control for web browsers that enables the user to edit HTML contents',
-  'LBL_SOURCE_EXT' => 'Ext - A client-side JavaScript framework for building web applications.',
-  'LBL_SOURCE_RECAPTCHA' => 'reCAPTCHA - A free CAPTCHA service that helps to digitize books, newspapers and old time radio shows.',
-  'LBL_SOURCE_TCPDF' => 'TCPDF - A PHP class for generating PDF documents.',
-  'LBL_SOURCE_CSSMIN' => 'CssMin - A css parser and minifier.',
-  'LBL_SOURCE_PHPSAML' => 'PHP-SAML - A simple SAML toolkit for PHP.',
-  'LBL_SOURCE_ISCROLL' => 'iScroll - The overflow:scroll for mobile webkit.  Native scrolling inside a fixed width/height element.',
-  'LBL_SOURCE_FLASHCANVAS' => 'FlashCanvas - FlashCanvas is a JavaScript library which adds the HTML5 Canvas support to Internet Explorer. It renders shapes and images via Flash drawing API. It supports almost all Canvas APIs and, in many cases, runs faster than other similar libraries which use VML or Silverlight.',
-  'LBL_SOURCE_JIT' => 'JavaScript InfoVis Toolkit - The JavaScript InfoVis Toolkit provides tools for creating Interactive Data Visualizations for the Web.',
-  'LBL_SOURCE_ZEND' => 'Zend Framework - An open source, object oriented web application framework for PHP5.',
-  'LBL_SOURCE_PARSECSV' => 'parseCSV - CSV data parser for PHP',
-  'LBL_SOURCE_PHPJS' => 'php.js - Use PHP functions in JavaScript',
-  'LBL_SOURCE_PHPSQL' => 'PHP SQL Parser',
-  'LBL_SOURCE_HTMLPURIFIER' => 'HTML Purifier - A standards-compliant HTML filtering library.',
-  'LBL_SOURCE_XHPROF' => 'XHProf - A function-level hierarchical profiler for PHP.',
-  'LBL_SOURCE_ELASTICA' => 'Elastica - PHP client for the distributed search engine elasticsearch ',
-  'LBL_SOURCE_FACEBOOKSDK' => 'Facebook PHP SDK',
-  'LBL_SOURCE_JQUERY' => 'jQuery - jQuery is a fast, small, and feature-rich JavaScript library.',
-  'LBL_SOURCE_JQUERY_UI' => 'jQuery UI - jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library.',
-  'LBL_SOURCE_OVERLIB' => 'OverlibMWS - The overlibmws library uses javascript for DHTML popups that serve as informational and navigational aids for websites.',
+    'LBL_SOURCE_XTEMPLATE' => 'XTemplate - A template engine for PHP created by Barnabás Debreceni',
+    'LBL_SOURCE_NUSOAP' => 'NuSOAP - A set of PHP classes that allow developers to create and consume web services created by NuSphere Corporation and Dietrich Ayala',
+    'LBL_SOURCE_JSCALENDAR' => 'JS Calendar - A calendar for entering dates created by Mihai Bazon',
+    'LBL_SOURCE_PHPPDF' => 'PHP PDF - A library for creating PDF documents created by Wayne Munro',
+    'LBL_SOURCE_HTTP_WEBDAV_SERVER' => 'HTTP_WebDAV_Server - A WebDAV Server Implementation in PHP.',
+    'LBL_SOURCE_PCLZIP' => 'PclZip - library offers compression and extraction functions for Zip formatted archives by Vincent Blavet',
+    'LBL_SOURCE_SMARTY' => 'Smarty - A template engine for PHP.',
+    'LBL_SOURCE_YAHOO_UI_LIB' => 'Yahoo! User Interface Library - The UI Library Utilities facilitate the implementation of rich client-side features.',
+    'LBL_SOURCE_PHPMAILER' => 'PHPMailer - A full featured email transfer class for PHP',
+    'LBL_SOURCE_JSHRINK' => 'JShrink - A Javascript minifier written in PHP',
+    'LBL_SOURCE_CRYPT_BLOWFISH' => 'Crypt_Blowfish - Allows for quick two-way blowfish encryption without requiring the MCrypt PHP extension.',
+    'LBL_SOURCE_XML_HTMLSAX3' => 'XML_HTMLSax3 - A SAX parser for HTML and other badly formed XML documents',
+    'LBL_SOURCE_YAHOO_UI_LIB_EXT' => 'Yahoo! UI Extensions Library - Extensions to the Yahoo! User Interface Library by Jack Slocum',
+    'LBL_SOURCE_SWFOBJECT' => 'SWFObject - Javascript Flash Player detection and embed script.',
+    'LBL_SOURCE_TINYMCE' => 'TinyMCE - A WYSIWYG editor control for web browsers that enables the user to edit HTML contents',
+    'LBL_SOURCE_EXT' => 'Ext - A client-side JavaScript framework for building web applications.',
+    'LBL_SOURCE_RECAPTCHA' => 'reCAPTCHA - A free CAPTCHA service that helps to digitize books, newspapers and old time radio shows.',
+    'LBL_SOURCE_TCPDF' => 'TCPDF - A PHP class for generating PDF documents.',
+    'LBL_SOURCE_CSSMIN' => 'CssMin - A css parser and minifier.',
+    'LBL_SOURCE_PHPSAML' => 'PHP-SAML - A simple SAML toolkit for PHP.',
+    'LBL_SOURCE_ISCROLL' => 'iScroll - The overflow:scroll for mobile webkit.  Native scrolling inside a fixed width/height element.',
+    'LBL_SOURCE_FLASHCANVAS' => 'FlashCanvas - FlashCanvas is a JavaScript library which adds the HTML5 Canvas support to Internet Explorer. It renders shapes and images via Flash drawing API. It supports almost all Canvas APIs and, in many cases, runs faster than other similar libraries which use VML or Silverlight.',
+    'LBL_SOURCE_JIT' => 'JavaScript InfoVis Toolkit - The JavaScript InfoVis Toolkit provides tools for creating Interactive Data Visualizations for the Web.',
+    'LBL_SOURCE_ZEND' => 'Zend Framework - An open source, object oriented web application framework for PHP5.',
+    'LBL_SOURCE_PARSECSV' => 'parseCSV - CSV data parser for PHP',
+    'LBL_SOURCE_PHPJS' => 'php.js - Use PHP functions in JavaScript',
+    'LBL_SOURCE_PHPSQL' => 'PHP SQL Parser',
+    'LBL_SOURCE_HTMLPURIFIER' => 'HTML Purifier - A standards-compliant HTML filtering library.',
+    'LBL_SOURCE_XHPROF' => 'XHProf - A function-level hierarchical profiler for PHP.',
+    'LBL_SOURCE_ELASTICA' => 'Elastica - PHP client for the distributed search engine elasticsearch ',
+    'LBL_SOURCE_FACEBOOKSDK' => 'Facebook PHP SDK',
+    'LBL_SOURCE_JQUERY' => 'jQuery - jQuery is a fast, small, and feature-rich JavaScript library.',
+    'LBL_SOURCE_JQUERY_UI' => 'jQuery UI - jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library.',
+    'LBL_SOURCE_OVERLIB' => 'OverlibMWS - The overlibmws library uses javascript for DHTML popups that serve as informational and navigational aids for websites.',
 
-  'LBL_DASHLET_TITLE' => 'My Sites',
-  'LBL_DASHLET_OPT_TITLE' => 'Title',
-  'LBL_DASHLET_INCORRECT_URL' => 'Incorrect website location is specified',
-  'LBL_DASHLET_OPT_URL' => 'Website Location',
-  'LBL_DASHLET_OPT_HEIGHT' => 'Dashlet Height (in pixels)',
-  'LBL_DASHLET_SUGAR_NEWS' => 'SuiteCRM News',
-  'LBL_DASHLET_DISCOVER_SUGAR_PRO' => 'Discover SuiteCRM',
-	'LBL_POWERED_BY_SUGAR' => 'Powered By SugarCRM' /*for 508 compliance fix*/,
-	'LBL_MORE_DETAIL' => 'More Detail' /*for 508 compliance fix*/,
-	'LBL_BASIC_SEARCH' => 'Basic Search' /*for 508 compliance fix*/,
-	'LBL_ADVANCED_SEARCH' => 'Advanced Search' /*for 508 compliance fix*/,
+    'LBL_DASHLET_TITLE' => 'My Sites',
+    'LBL_DASHLET_OPT_TITLE' => 'Title',
+    'LBL_DASHLET_INCORRECT_URL' => 'Incorrect website location is specified',
+    'LBL_DASHLET_OPT_URL' => 'Website Location',
+    'LBL_DASHLET_OPT_HEIGHT' => 'Dashlet Height (in pixels)',
+    'LBL_DASHLET_SUGAR_NEWS' => 'SuiteCRM News',
+    'LBL_DASHLET_DISCOVER_SUGAR_PRO' => 'Discover SuiteCRM',
+    'LBL_POWERED_BY_SUGAR' => 'Powered By SugarCRM' /*for 508 compliance fix*/,
+    'LBL_MORE_DETAIL' => 'More Detail' /*for 508 compliance fix*/,
+    'LBL_BASIC_SEARCH' => 'Basic Search' /*for 508 compliance fix*/,
+    'LBL_ADVANCED_SEARCH' => 'Advanced Search' /*for 508 compliance fix*/,
     'LBL_TOUR_HOME' => 'Home Icon',
     'LBL_TOUR_HOME_DESCRIPTION' => 'Quickly get back to your Home Page dashboard in one click.',
     'LBL_TOUR_MODULES' => 'Modules',

modules/Home/UnifiedSearchAdvanced.php

Indentation +295 added lines, -295 removed lines

@@ -69,93 +69,93 @@ 
         $this->cache_display = sugar_cached('modules/unified_search_modules_display.php');
     }
 
-	function getDropDownDiv($tpl = 'modules/Home/UnifiedSearchAdvanced.tpl') {
-		global $app_list_strings, $app_strings;
+    function getDropDownDiv($tpl = 'modules/Home/UnifiedSearchAdvanced.tpl') {
+        global $app_list_strings, $app_strings;
 
-		if(!file_exists($this->cache_search))
-		{
-			$this->buildCache();
-		}
+        if(!file_exists($this->cache_search))
+        {
+            $this->buildCache();
+        }
 
-		$unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
+        $unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
 
-		global $mod_strings, $modListHeader, $app_list_strings, $current_user, $app_strings, $beanList;
-		$users_modules = $current_user->getPreference('globalSearch', 'search');
+        global $mod_strings, $modListHeader, $app_list_strings, $current_user, $app_strings, $beanList;
+        $users_modules = $current_user->getPreference('globalSearch', 'search');
 
-		// preferences are empty, select all
-		if(empty($users_modules)) {
-			$users_modules = array();
-			foreach($unified_search_modules_display as $module=>$data) {
-				if (!empty($data['visible']) ) {
+        // preferences are empty, select all
+        if(empty($users_modules)) {
+            $users_modules = array();
+            foreach($unified_search_modules_display as $module=>$data) {
+                if (!empty($data['visible']) ) {
                     $users_modules[$module] = $beanList[$module];
                 }
-			}
-			$current_user->setPreference('globalSearch', $users_modules, 0, 'search');
-		}
+            }
+            $current_user->setPreference('globalSearch', $users_modules, 0, 'search');
+        }
 
-		$sugar_smarty = new Sugar_Smarty();
+        $sugar_smarty = new Sugar_Smarty();
 
-		$modules_to_search = array();
+        $modules_to_search = array();
 
-		foreach($users_modules as $key=>$module)
-		{
+        foreach($users_modules as $key=>$module)
+        {
             if(ACLController::checkAccess($key, 'list', true))
             {
                 $modules_to_search[$key]['checked'] = true;
             }
-		}
-
-		if(!empty($this->query_string))
-		{
-			$sugar_smarty->assign('query_string', securexss($this->query_string));
-		} else {
-			$sugar_smarty->assign('query_string', '');
-		}
-
-		$sugar_smarty->assign('MOD', return_module_language($GLOBALS['current_language'], 'Administration'));
-		$sugar_smarty->assign('APP', $app_strings);
-		$sugar_smarty->assign('USE_SEARCH_GIF', 0);
-		$sugar_smarty->assign('LBL_SEARCH_BUTTON_LABEL', $app_strings['LBL_SEARCH_BUTTON_LABEL']);
-
-		$json_enabled = array();
-		$json_disabled = array();
-
-		//Now add the rest of the modules that are searchable via Global Search settings
-		foreach($unified_search_modules_display as $module=>$data)
-		{
-			if(!isset($modules_to_search[$module]) && $data['visible'] && ACLController::checkAccess($module, 'list', true))
-			{
-			   $modules_to_search[$module]['checked'] = false;
-			} else if (isset($modules_to_search[$module]) && !$data['visible']) {
-			   unset($modules_to_search[$module]);
-			}
-		}
-
-		//Create the two lists (doing it this way preserves the user's ordering choice for enabled modules)
-		foreach($modules_to_search as $module=>$data)
-		{
-			$label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
-			if(!empty($data['checked']))
-			{
-				$json_enabled[] = array("module" => $module, 'label' => $label);
-			} else {
-				$json_disabled[] = array("module" => $module, 'label' => $label);
-			}
-		}
-
-		$sugar_smarty->assign('enabled_modules', json_encode($json_enabled));
-		$sugar_smarty->assign('disabled_modules', json_encode($json_disabled));
-
-		$showDiv = $current_user->getPreference('showGSDiv', 'search');
-		if(!isset($showDiv))
-		{
-		   $showDiv = 'no';
-		}
-
-		$sugar_smarty->assign('SHOWGSDIV', $showDiv);
-		$sugar_smarty->debugging = true;
-		return $sugar_smarty->fetch($tpl);
-	}
+        }
+
+        if(!empty($this->query_string))
+        {
+            $sugar_smarty->assign('query_string', securexss($this->query_string));
+        } else {
+            $sugar_smarty->assign('query_string', '');
+        }
+
+        $sugar_smarty->assign('MOD', return_module_language($GLOBALS['current_language'], 'Administration'));
+        $sugar_smarty->assign('APP', $app_strings);
+        $sugar_smarty->assign('USE_SEARCH_GIF', 0);
+        $sugar_smarty->assign('LBL_SEARCH_BUTTON_LABEL', $app_strings['LBL_SEARCH_BUTTON_LABEL']);
+
+        $json_enabled = array();
+        $json_disabled = array();
+
+        //Now add the rest of the modules that are searchable via Global Search settings
+        foreach($unified_search_modules_display as $module=>$data)
+        {
+            if(!isset($modules_to_search[$module]) && $data['visible'] && ACLController::checkAccess($module, 'list', true))
+            {
+                $modules_to_search[$module]['checked'] = false;
+            } else if (isset($modules_to_search[$module]) && !$data['visible']) {
+                unset($modules_to_search[$module]);
+            }
+        }
+
+        //Create the two lists (doing it this way preserves the user's ordering choice for enabled modules)
+        foreach($modules_to_search as $module=>$data)
+        {
+            $label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
+            if(!empty($data['checked']))
+            {
+                $json_enabled[] = array("module" => $module, 'label' => $label);
+            } else {
+                $json_disabled[] = array("module" => $module, 'label' => $label);
+            }
+        }
+
+        $sugar_smarty->assign('enabled_modules', json_encode($json_enabled));
+        $sugar_smarty->assign('disabled_modules', json_encode($json_disabled));
+
+        $showDiv = $current_user->getPreference('showGSDiv', 'search');
+        if(!isset($showDiv))
+        {
+            $showDiv = 'no';
+        }
+
+        $sugar_smarty->assign('SHOWGSDIV', $showDiv);
+        $sugar_smarty->debugging = true;
+        return $sugar_smarty->fetch($tpl);
+    }
 
 
     /**
@@ -168,70 +168,70 @@ 
      *
      *
      */
-	function search() {
+    function search() {
 
         $unified_search_modules = $this->getUnifiedSearchModules();
-		$unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
+        $unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
 
 
-		require_once 'include/ListView/ListViewSmarty.php';
+        require_once 'include/ListView/ListViewSmarty.php';
 
-		global $modListHeader, $beanList, $beanFiles, $current_language, $app_strings, $current_user, $mod_strings;
-		$home_mod_strings = return_module_language($current_language, 'Home');
+        global $modListHeader, $beanList, $beanFiles, $current_language, $app_strings, $current_user, $mod_strings;
+        $home_mod_strings = return_module_language($current_language, 'Home');
 
-		$this->query_string = $GLOBALS['db']->quote(securexss(from_html(clean_string($this->query_string, 'UNIFIED_SEARCH'))));
+        $this->query_string = $GLOBALS['db']->quote(securexss(from_html(clean_string($this->query_string, 'UNIFIED_SEARCH'))));
 
-		if(!empty($_REQUEST['advanced']) && $_REQUEST['advanced'] != 'false') {
-			$modules_to_search = array();
-			if(!empty($_REQUEST['search_modules']))
-			{
-			    foreach(explode (',', $_REQUEST['search_modules'] ) as $key)
-	            {
+        if(!empty($_REQUEST['advanced']) && $_REQUEST['advanced'] != 'false') {
+            $modules_to_search = array();
+            if(!empty($_REQUEST['search_modules']))
+            {
+                foreach(explode (',', $_REQUEST['search_modules'] ) as $key)
+                {
                     if (isset($unified_search_modules_display[$key]) && !empty($unified_search_modules_display[$key]['visible']))
                     {
                         $modules_to_search[$key] = $beanList[$key];
                     }
-	            }
-			}
-
-			$current_user->setPreference('showGSDiv', isset($_REQUEST['showGSDiv']) ? $_REQUEST['showGSDiv'] : 'no', 0, 'search');
-			$current_user->setPreference('globalSearch', $modules_to_search, 0, 'search'); // save selections to user preference
-		} else {
-			$users_modules = $current_user->getPreference('globalSearch', 'search');
-			$modules_to_search = array();
-
-			if(!empty($users_modules)) {
-				// use user's previous selections
-			    foreach ( $users_modules as $key => $value ) {
-			    	if (isset($unified_search_modules_display[$key]) && !empty($unified_search_modules_display[$key]['visible'])) {
-		            	$modules_to_search[$key] = $beanList[$key];
-		        	}
-			    }
-			} else {
-				foreach($unified_search_modules_display as $module=>$data) {
-				    if (!empty($data['visible']) ) {
-				        $modules_to_search[$module] = $beanList[$module];
-				    }
-				}
-			}
-			$current_user->setPreference('globalSearch', $modules_to_search, 'search');
-		}
-
-
-		$templateFile = 'modules/Home/UnifiedSearchAdvancedForm.tpl';
-		if(file_exists('custom/' . $templateFile))
-		{
-		   $templateFile = 'custom/'.$templateFile;
-		}
-
-		echo $this->getDropDownDiv($templateFile);
-
-		$module_results = array();
-		$module_counts = array();
-		$has_results = false;
-
-		if(!empty($this->query_string)) {
-			foreach($modules_to_search as $moduleName => $beanName) {
+                }
+            }
+
+            $current_user->setPreference('showGSDiv', isset($_REQUEST['showGSDiv']) ? $_REQUEST['showGSDiv'] : 'no', 0, 'search');
+            $current_user->setPreference('globalSearch', $modules_to_search, 0, 'search'); // save selections to user preference
+        } else {
+            $users_modules = $current_user->getPreference('globalSearch', 'search');
+            $modules_to_search = array();
+
+            if(!empty($users_modules)) {
+                // use user's previous selections
+                foreach ( $users_modules as $key => $value ) {
+                    if (isset($unified_search_modules_display[$key]) && !empty($unified_search_modules_display[$key]['visible'])) {
+                        $modules_to_search[$key] = $beanList[$key];
+                    }
+                }
+            } else {
+                foreach($unified_search_modules_display as $module=>$data) {
+                    if (!empty($data['visible']) ) {
+                        $modules_to_search[$module] = $beanList[$module];
+                    }
+                }
+            }
+            $current_user->setPreference('globalSearch', $modules_to_search, 'search');
+        }
+
+
+        $templateFile = 'modules/Home/UnifiedSearchAdvancedForm.tpl';
+        if(file_exists('custom/' . $templateFile))
+        {
+            $templateFile = 'custom/'.$templateFile;
+        }
+
+        echo $this->getDropDownDiv($templateFile);
+
+        $module_results = array();
+        $module_counts = array();
+        $has_results = false;
+
+        if(!empty($this->query_string)) {
+            foreach($modules_to_search as $moduleName => $beanName) {
                 require_once $beanFiles[$beanName] ;
                 $seed = new $beanName();
 
@@ -241,7 +241,7 @@ 
 
                 //retrieve the original list view defs and store for processing in case of custom layout changes
                 require('modules/'.$seed->module_dir.'/metadata/listviewdefs.php');
-				$orig_listViewDefs = $listViewDefs;
+                $orig_listViewDefs = $listViewDefs;
 
                 if(file_exists('custom/modules/'.$seed->module_dir.'/metadata/listviewdefs.php'))
                 {
@@ -253,20 +253,20 @@ 
                     continue;
                 }
 
-			    $unifiedSearchFields = array () ;
+                $unifiedSearchFields = array () ;
                 $innerJoins = array();
                 foreach ( $unified_search_modules[ $moduleName ]['fields'] as $field=>$def )
                 {
-                	$listViewCheckField = strtoupper($field);
-                	//check to see if the field is in listview defs
-					if ( empty($listViewDefs[$seed->module_dir][$listViewCheckField]['default']) ) {
-						//check to see if field is in original list view defs (in case we are using custom layout defs)
-						if (!empty($orig_listViewDefs[$seed->module_dir][$listViewCheckField]['default']) ) {
-							//if we are here then the layout has been customized, but the field is still needed for query creation
-							$listViewDefs[$seed->module_dir][$listViewCheckField] = $orig_listViewDefs[$seed->module_dir][$listViewCheckField];
-						}
+                    $listViewCheckField = strtoupper($field);
+                    //check to see if the field is in listview defs
+                    if ( empty($listViewDefs[$seed->module_dir][$listViewCheckField]['default']) ) {
+                        //check to see if field is in original list view defs (in case we are using custom layout defs)
+                        if (!empty($orig_listViewDefs[$seed->module_dir][$listViewCheckField]['default']) ) {
+                            //if we are here then the layout has been customized, but the field is still needed for query creation
+                            $listViewDefs[$seed->module_dir][$listViewCheckField] = $orig_listViewDefs[$seed->module_dir][$listViewCheckField];
+                        }
 
-					}
+                    }
 
                     //bug: 34125 we might want to try to use the LEFT JOIN operator instead of the INNER JOIN in the case we are
                     //joining against a field that has not been populated.
@@ -300,7 +300,7 @@ 
                 require_once $beanFiles[$beanName] ;
                 $seed = new $beanName();
                 
-				require_once $this->searchFormPath;
+                require_once $this->searchFormPath;
                 $searchForm = new $this->searchFormClass ( $seed, $moduleName ) ;
 
                 $searchForm->setup (array ( $moduleName => array() ) , $unifiedSearchFields , '' , 'saved_views' /* hack to avoid setup doing further unwanted processing */ ) ;
@@ -309,11 +309,11 @@ 
                 $params = array('custom_select' => "");
                 foreach($innerJoins as $field=>$def) {
                     if (isset ($def['db_field'])) {
-                      foreach($def['db_field'] as $dbfield)
-                          $where_clauses[] = $dbfield . " LIKE '" . $this->query_string . "%'";
-                          $params['custom_select'] .= ", $dbfield";
-                          $params['distinct'] = true;
-                          //$filterFields[$dbfield] = $dbfield;
+                        foreach($def['db_field'] as $dbfield)
+                            $where_clauses[] = $dbfield . " LIKE '" . $this->query_string . "%'";
+                            $params['custom_select'] .= ", $dbfield";
+                            $params['distinct'] = true;
+                            //$filterFields[$dbfield] = $dbfield;
                     }
                 }
 
@@ -339,9 +339,9 @@ 
 
                 if(count($displayColumns) > 0)
                 {
-                	$lv->displayColumns = $displayColumns;
+                    $lv->displayColumns = $displayColumns;
                 } else {
-                	$lv->displayColumns = $listViewDefs[$seed->module_dir];
+                    $lv->displayColumns = $listViewDefs[$seed->module_dir];
                 }
 
                 $lv->export = false;
@@ -366,56 +366,56 @@ 
                     $module_results[$moduleName] .= $lv->display(false, false);
                 }
 
-			}
-		}
+            }
+        }
 
-		if($has_results) {
-			foreach($module_counts as $name=>$value) {
-				echo $module_results[$name];
-			}
-		} else if(empty($_REQUEST['form_only'])) {
-			echo $home_mod_strings['LBL_NO_RESULTS'];
-			echo $home_mod_strings['LBL_NO_RESULTS_TIPS'];
-		}
+        if($has_results) {
+            foreach($module_counts as $name=>$value) {
+                echo $module_results[$name];
+            }
+        } else if(empty($_REQUEST['form_only'])) {
+            echo $home_mod_strings['LBL_NO_RESULTS'];
+            echo $home_mod_strings['LBL_NO_RESULTS_TIPS'];
+        }
 
-	}
+    }
 
-	function buildCache()
-	{
+    function buildCache()
+    {
 
-		global $beanList, $beanFiles, $dictionary;
+        global $beanList, $beanFiles, $dictionary;
 
-		$supported_modules = array();
+        $supported_modules = array();
 
-		foreach($beanList as $moduleName=>$beanName)
-		{
-			if (!isset($beanFiles[$beanName]))
-				continue;
+        foreach($beanList as $moduleName=>$beanName)
+        {
+            if (!isset($beanFiles[$beanName]))
+                continue;
 
-			$beanName = BeanFactory::getObjectName($moduleName);
-			$manager = new VardefManager ( );
-			$manager->loadVardef( $moduleName , $beanName ) ;
+            $beanName = BeanFactory::getObjectName($moduleName);
+            $manager = new VardefManager ( );
+            $manager->loadVardef( $moduleName , $beanName ) ;
 
-			// obtain the field definitions used by generateSearchWhere (duplicate code in view.list.php)
-			if(file_exists('custom/modules/'.$moduleName.'/metadata/metafiles.php')){
+            // obtain the field definitions used by generateSearchWhere (duplicate code in view.list.php)
+            if(file_exists('custom/modules/'.$moduleName.'/metadata/metafiles.php')){
                 require('custom/modules/'.$moduleName.'/metadata/metafiles.php');
             }elseif(file_exists('modules/'.$moduleName.'/metadata/metafiles.php')){
                 require('modules/'.$moduleName.'/metadata/metafiles.php');
             }
 
 
-			if(!empty($metafiles[$moduleName]['searchfields']))
-			{
-				require $metafiles[$moduleName]['searchfields'] ;
-			} else if(file_exists("modules/{$moduleName}/metadata/SearchFields.php")) {
-				require "modules/{$moduleName}/metadata/SearchFields.php" ;
-			}
+            if(!empty($metafiles[$moduleName]['searchfields']))
+            {
+                require $metafiles[$moduleName]['searchfields'] ;
+            } else if(file_exists("modules/{$moduleName}/metadata/SearchFields.php")) {
+                require "modules/{$moduleName}/metadata/SearchFields.php" ;
+            }
 
-			//Load custom SearchFields.php if it exists
-			if(file_exists("custom/modules/{$moduleName}/metadata/SearchFields.php"))
-			{
-				require "custom/modules/{$moduleName}/metadata/SearchFields.php" ;
-			}				
+            //Load custom SearchFields.php if it exists
+            if(file_exists("custom/modules/{$moduleName}/metadata/SearchFields.php"))
+            {
+                require "custom/modules/{$moduleName}/metadata/SearchFields.php" ;
+            }				
 
             //If there are $searchFields are empty, just continue, there are no search fields defined for the module
             if(empty($searchFields[$moduleName]))
@@ -423,34 +423,34 @@ 
                 continue;
             }
 
-			$isCustomModule = preg_match('/^([a-z0-9]{1,5})_([a-z0-9_]+)$/i' , $moduleName);
-
-			//If the bean supports unified search or if it's a custom module bean and unified search is not defined
-			if(!empty($dictionary[$beanName]['unified_search']) || $isCustomModule)
-			{
-				$fields = array();
-				foreach ( $dictionary [ $beanName ][ 'fields' ] as $field => $def )
-				{
-					// We cannot enable or disable unified_search for email in the vardefs as we don't actually have a vardef entry for 'email'
-					// the searchFields entry for 'email' doesn't correspond to any vardef entry. Instead it contains SQL to directly perform the search.
-					// So as a proxy we allow any field in the vardefs that has a name starting with 'email...' to be tagged with the 'unified_search' parameter
-
-					if (strpos($field,'email') !== false)
-					{
-						$field = 'email' ;
-					}
-
-					//bug: 38139 - allow phone to be searched through Global Search
-					if (strpos($field,'phone') !== false)
-					{
-						$field = 'phone' ;
-					}
-
-					if ( !empty($def['unified_search']) && isset ( $searchFields [ $moduleName ] [ $field ]  ))
-					{
-						$fields [ $field ] = $searchFields [ $moduleName ] [ $field ] ;
-					}
-				}
+            $isCustomModule = preg_match('/^([a-z0-9]{1,5})_([a-z0-9_]+)$/i' , $moduleName);
+
+            //If the bean supports unified search or if it's a custom module bean and unified search is not defined
+            if(!empty($dictionary[$beanName]['unified_search']) || $isCustomModule)
+            {
+                $fields = array();
+                foreach ( $dictionary [ $beanName ][ 'fields' ] as $field => $def )
+                {
+                    // We cannot enable or disable unified_search for email in the vardefs as we don't actually have a vardef entry for 'email'
+                    // the searchFields entry for 'email' doesn't correspond to any vardef entry. Instead it contains SQL to directly perform the search.
+                    // So as a proxy we allow any field in the vardefs that has a name starting with 'email...' to be tagged with the 'unified_search' parameter
+
+                    if (strpos($field,'email') !== false)
+                    {
+                        $field = 'email' ;
+                    }
+
+                    //bug: 38139 - allow phone to be searched through Global Search
+                    if (strpos($field,'phone') !== false)
+                    {
+                        $field = 'phone' ;
+                    }
+
+                    if ( !empty($def['unified_search']) && isset ( $searchFields [ $moduleName ] [ $field ]  ))
+                    {
+                        $fields [ $field ] = $searchFields [ $moduleName ] [ $field ] ;
+                    }
+                }
 
                 foreach ($searchFields[$moduleName] as $field => $def)
                 {
@@ -463,23 +463,23 @@ 
                     }
                 }
 
-				if(count($fields) > 0) {
-					$supported_modules [$moduleName] ['fields'] = $fields;
-					if (isset($dictionary[$beanName]['unified_search_default_enabled']) && $dictionary[$beanName]['unified_search_default_enabled'] === TRUE)
-					{
+                if(count($fields) > 0) {
+                    $supported_modules [$moduleName] ['fields'] = $fields;
+                    if (isset($dictionary[$beanName]['unified_search_default_enabled']) && $dictionary[$beanName]['unified_search_default_enabled'] === TRUE)
+                    {
                         $supported_modules [$moduleName]['default'] = true;
                     } else {
                         $supported_modules [$moduleName]['default'] = false;
                     }
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-		ksort($supported_modules);
-		write_array_to_file('unified_search_modules', $supported_modules, $this->cache_search);
-	}
+        ksort($supported_modules);
+        write_array_to_file('unified_search_modules', $supported_modules, $this->cache_search);
+    }
 
     /**
      * Retrieve the enabled and disabled modules used for global search.
@@ -523,9 +523,9 @@ 
                 $label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
                 if($data['default'])
                 {
-                  $json_enabled[] = array("module" => $module, 'label' => $label);
+                    $json_enabled[] = array("module" => $module, 'label' => $label);
                 } else {
-                  $json_disabled[] = array("module" => $module, 'label' => $label);
+                    $json_disabled[] = array("module" => $module, 'label' => $label);
                 }
             }
         }
@@ -534,47 +534,47 @@ 
     }
 
 
-	/**
-	 * saveGlobalSearchSettings
-	 * This method handles the administrator's request to save the searchable modules selected and stores
-	 * the results in the unified_search_modules_display.php file
-	 *
-	 */
-	function saveGlobalSearchSettings()
-	{
-		if(isset($_REQUEST['enabled_modules']))
-		{
+    /**
+     * saveGlobalSearchSettings
+     * This method handles the administrator's request to save the searchable modules selected and stores
+     * the results in the unified_search_modules_display.php file
+     *
+     */
+    function saveGlobalSearchSettings()
+    {
+        if(isset($_REQUEST['enabled_modules']))
+        {
             $unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
 
-			$new_unified_search_modules_display = array();
+            $new_unified_search_modules_display = array();
 
             foreach(explode (',', $_REQUEST['enabled_modules'] ) as $module)
             {
                 $new_unified_search_modules_display[$module]['visible'] = true;
             }
 
-			foreach($unified_search_modules_display as $module=>$data)
-			{
-				if(!isset($new_unified_search_modules_display[$module]))
-				{
-				   $new_unified_search_modules_display[$module]['visible'] = false;
-				}
-			}
-
-			$this->writeUnifiedSearchModulesDisplayFile($new_unified_search_modules_display);
-		}
-	}
-
-
-	public static function unlinkUnifiedSearchModulesFile() {
-		//clear the unified_search_module.php file
-		$cache_search = sugar_cached('modules/unified_search_modules.php');
-    	if(file_exists($cache_search))
-    	{
-    		$GLOBALS['log']->info("unlink {$cache_search}");
-    		unlink($cache_search);
-    	}
-	}
+            foreach($unified_search_modules_display as $module=>$data)
+            {
+                if(!isset($new_unified_search_modules_display[$module]))
+                {
+                    $new_unified_search_modules_display[$module]['visible'] = false;
+                }
+            }
+
+            $this->writeUnifiedSearchModulesDisplayFile($new_unified_search_modules_display);
+        }
+    }
+
+
+    public static function unlinkUnifiedSearchModulesFile() {
+        //clear the unified_search_module.php file
+        $cache_search = sugar_cached('modules/unified_search_modules.php');
+        if(file_exists($cache_search))
+        {
+            $GLOBALS['log']->info("unlink {$cache_search}");
+            unlink($cache_search);
+        }
+    }
     
 
     /**
@@ -587,21 +587,21 @@ 
      */
     public function getUnifiedSearchModules()
     {
-		//Make directory if it doesn't exist
+        //Make directory if it doesn't exist
         $cachedir = sugar_cached('modules');
-		if(!file_exists($cachedir))
-		{
-		   mkdir_recursive($cachedir);
-		}
+        if(!file_exists($cachedir))
+        {
+            mkdir_recursive($cachedir);
+        }
 
-		//Load unified_search_modules.php file
+        //Load unified_search_modules.php file
         $cachedFile = sugar_cached('modules/unified_search_modules.php');
-		if(!file_exists($cachedFile))
-		{
-			$this->buildCache();
-		}
+        if(!file_exists($cachedFile))
+        {
+            $this->buildCache();
+        }
 
-		include $cachedFile;
+        include $cachedFile;
         return $unified_search_modules;
     }
 
@@ -616,8 +616,8 @@ 
      */
     public function getUnifiedSearchModulesDisplay()
     {
-		if(!file_exists('custom/modules/unified_search_modules_display.php'))
-		{
+        if(!file_exists('custom/modules/unified_search_modules_display.php'))
+        {
             $unified_search_modules = $this->getUnifiedSearchModules();
 
             $unified_search_modules_display = array();
@@ -631,13 +631,13 @@ 
             }
 
             $this->writeUnifiedSearchModulesDisplayFile($unified_search_modules_display);
-		}
+        }
 
-		include('custom/modules/unified_search_modules_display.php');
+        include('custom/modules/unified_search_modules_display.php');
         return $unified_search_modules_display;
     }
 
-	/*
+    /*
 	 * writeUnifiedSearchModulesDisplayFile
 	 * Private method to handle writing the unified_search_modules_display value to file
 	 *
@@ -645,35 +645,35 @@ 
 	 * @return boolean value indication whether or not file was successfully written
 	 * @throws Exception Thrown if the file write operation fails
 	 */
-	private function writeUnifiedSearchModulesDisplayFile($unified_search_modules_display)
-	{
-		if(is_null($unified_search_modules_display) || empty($unified_search_modules_display))
-		{
-		   return false;
-		}
-
-	    if(!write_array_to_file("unified_search_modules_display", $unified_search_modules_display, 'custom/modules/unified_search_modules_display.php'))
-	    {
-	    	//Log error message and throw Exception
-	    	global $app_strings;
-	    	$msg = string_format($app_strings['ERR_FILE_WRITE'], array('custom/modules/unified_search_modules_display.php'));
-	    	$GLOBALS['log']->error($msg);
-	    	throw new Exception($msg);
-	    }
-
-	    return true;
-	}
+    private function writeUnifiedSearchModulesDisplayFile($unified_search_modules_display)
+    {
+        if(is_null($unified_search_modules_display) || empty($unified_search_modules_display))
+        {
+            return false;
+        }
+
+        if(!write_array_to_file("unified_search_modules_display", $unified_search_modules_display, 'custom/modules/unified_search_modules_display.php'))
+        {
+            //Log error message and throw Exception
+            global $app_strings;
+            $msg = string_format($app_strings['ERR_FILE_WRITE'], array('custom/modules/unified_search_modules_display.php'));
+            $GLOBALS['log']->error($msg);
+            throw new Exception($msg);
+        }
+
+        return true;
+    }
 }
 
 
 function unified_search_modules_cmp($a, $b) {
-	if(!isset($a['translated']) || !isset($b['translated']))
-	{
-	   return 0;
-	}
+    if(!isset($a['translated']) || !isset($b['translated']))
+    {
+        return 0;
+    }
 
-	$name1 = strtolower($a['translated']);
-	$name2 = strtolower($b['translated']);
+    $name1 = strtolower($a['translated']);
+    $name2 = strtolower($b['translated']);
 
-	return $name1 < $name2 ? -1 : 1;
+    return $name1 < $name2 ? -1 : 1;
 }

modules/Project/ProjectQuickCreate.php

Indentation +11 added lines, -11 removed lines

@@ -66,24 +66,24 @@
         $this->javascript->setSugarBean($focus);
         $this->javascript->addAllFields('');
 
-		//$this->ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['project_status_dom'], $focus->status));
+        //$this->ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['project_status_dom'], $focus->status));
         $this->ss->assign('additionalScripts', $this->javascript->getScript(false));
         $this->ss->assign('CALENDAR_DATEFORMAT', $timedate->get_cal_date_format());
         
         
         $json = getJSONobj();
         
-		$popup_request_data = array(
-			'call_back_function' => 'set_return',
-			'form_name' => 'projectsQuickCreate',
-			'field_to_name_array' => array(
-				'id' => 'account_id',
-				'name' => 'account_name',
-			),
-		);
+        $popup_request_data = array(
+            'call_back_function' => 'set_return',
+            'form_name' => 'projectsQuickCreate',
+            'field_to_name_array' => array(
+                'id' => 'account_id',
+                'name' => 'account_name',
+            ),
+        );
 	
-		$encoded_popup_request_data = $json->encode($popup_request_data);
-		$this->ss->assign('encoded_popup_request_data', $encoded_popup_request_data);        
+        $encoded_popup_request_data = $json->encode($popup_request_data);
+        $this->ss->assign('encoded_popup_request_data', $encoded_popup_request_data);        
 
         
     }   

modules/Project/metadata/additionalDetails.php

Indentation +15 added lines, -15 removed lines

@@ -42,25 +42,25 @@
 
 
 function additionalDetailsProject($fields) {
-	static $mod_strings;
-	if(empty($mod_strings)) {
-		global $current_language;
-		$mod_strings = return_module_language($current_language, 'Project');
-	}
+    static $mod_strings;
+    if(empty($mod_strings)) {
+        global $current_language;
+        $mod_strings = return_module_language($current_language, 'Project');
+    }
 		
-	$overlib_string = '';
+    $overlib_string = '';
 	
-	if(!empty($fields['DESCRIPTION'])) {
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
-	}	
+    if(!empty($fields['DESCRIPTION'])) {
+        $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
+        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+    }	
 
-	return array('fieldToAddTo' => 'NAME', 
-				 'string' => $overlib_string, 
-				 'editLink' => "index.php?action=EditView&module=Project&return_module=Project&record={$fields['ID']}", 
-				 'viewLink' => "index.php?action=DetailView&module=Project&return_module=Project&record={$fields['ID']}");
+    return array('fieldToAddTo' => 'NAME', 
+                    'string' => $overlib_string, 
+                    'editLink' => "index.php?action=EditView&module=Project&return_module=Project&record={$fields['ID']}", 
+                    'viewLink' => "index.php?action=DetailView&module=Project&return_module=Project&record={$fields['ID']}");
 }
  
- ?>
+    ?>
  
  
\ No newline at end of file

modules/Project/metadata/dashletviewdefs.php

Indentation +33 added lines, -33 removed lines

@@ -1,78 +1,78 @@
 <?php
 $dashletData['ProjectDashlet']['searchFields'] = array (
-  'date_entered' => 
-  array (
+    'date_entered' => 
+    array (
     'default' => '',
-  ),
-  'date_modified' => 
-  array (
+    ),
+    'date_modified' => 
+    array (
     'default' => '',
-  ),
-  'assigned_user_id' => 
-  array (
+    ),
+    'assigned_user_id' => 
+    array (
     'type' => 'assigned_user_name',
     'default' => 'Administrator',
-  ),
+    ),
 );
 $dashletData['ProjectDashlet']['columns'] = array (
-  'name' => 
-  array (
+    'name' => 
+    array (
     'width' => '30%',
     'label' => 'LBL_LIST_NAME',
     'link' => true,
     'default' => true,
     'name' => 'name',
-  ),
-  'status' => 
-  array (
+    ),
+    'status' => 
+    array (
     'type' => 'enum',
     'default' => true,
     'label' => 'LBL_STATUS',
     'width' => '10%',
     'name' => 'status',
-  ),
-  'estimated_start_date' => 
-  array (
+    ),
+    'estimated_start_date' => 
+    array (
     'type' => 'date',
     'label' => 'LBL_DATE_START',
     'width' => '10%',
     'default' => true,
     'name' => 'estimated_start_date',
-  ),
-  'assigned_user_name' => 
-  array (
+    ),
+    'assigned_user_name' => 
+    array (
     'width' => '8%',
     'label' => 'LBL_LIST_ASSIGNED_USER',
     'name' => 'assigned_user_name',
     'default' => true,
-  ),
-  'estimated_end_date' => 
-  array (
+    ),
+    'estimated_end_date' => 
+    array (
     'type' => 'date',
     'label' => 'LBL_DATE_END',
     'width' => '10%',
     'default' => true,
     'name' => 'estimated_end_date',
-  ),
-  'date_modified' => 
-  array (
+    ),
+    'date_modified' => 
+    array (
     'width' => '15%',
     'label' => 'LBL_DATE_MODIFIED',
     'name' => 'date_modified',
     'default' => false,
-  ),
-  'date_entered' => 
-  array (
+    ),
+    'date_entered' => 
+    array (
     'width' => '15%',
     'label' => 'LBL_DATE_ENTERED',
     'default' => false,
     'name' => 'date_entered',
-  ),
-  'created_by' => 
-  array (
+    ),
+    'created_by' => 
+    array (
     'width' => '8%',
     'label' => 'LBL_CREATED',
     'name' => 'created_by',
     'default' => false,
-  ),
+    ),
 );

modules/Project/metadata/editviewdefs.php

Indentation +49 added lines, -49 removed lines

@@ -42,102 +42,102 @@
 
 $viewdefs ['Project'] =
 array (
-  'EditView' => 
-  array (
+    'EditView' => 
+    array (
     'templateMeta' => 
     array (
-      'maxColumns' => '2',
-      'widths' => 
-      array (
+        'maxColumns' => '2',
+        'widths' => 
+        array (
         0 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
-      ),
-      'form' => 
-      array (
+        ),
+        'form' => 
+        array (
         'hidden' => '<input type="hidden" name="is_template" value="{$is_template}" />',
         'buttons' => 
         array (
-          0 => 'SAVE',
-          1 => 
-          array (
+            0 => 'SAVE',
+            1 => 
+            array (
             'customCode' => '{if !empty($smarty.request.return_action) && $smarty.request.return_action == "ProjectTemplatesDetailView" && (!empty($fields.id.value) || !empty($smarty.request.return_id)) }<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="this.form.action.value=\'ProjectTemplatesDetailView\'; this.form.module.value=\'{$smarty.request.return_module}\'; this.form.record.value=\'{$smarty.request.return_id}\';" type="submit" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" id="CANCEL{$place}"> {elseif !empty($smarty.request.return_action) && $smarty.request.return_action == "DetailView" && (!empty($fields.id.value) || !empty($smarty.request.return_id)) }<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="this.form.action.value=\'DetailView\'; this.form.module.value=\'{$smarty.request.return_module}\'; this.form.record.value=\'{$smarty.request.return_id}\';" type="submit" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" id="CANCEL{$place}"> {elseif $is_template}<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="this.form.action.value=\'ProjectTemplatesListView\'; this.form.module.value=\'{$smarty.request.return_module}\'; this.form.record.value=\'{$smarty.request.return_id}\';" type="submit" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" id="CANCEL{$place}"> {else}<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="this.form.action.value=\'index\'; this.form.module.value=\'{$smarty.request.return_module}\'; this.form.record.value=\'{$smarty.request.return_id}\';" type="submit" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" id="CANCEL{$place}"> {/if}',
-          ),
+            ),
         ),
-      ),
-      'useTabs' => false,
-      'tabDefs' => 
-      array (
+        ),
+        'useTabs' => false,
+        'tabDefs' => 
+        array (
         'LBL_PROJECT_INFORMATION' => 
         array (
-          'newTab' => false,
-          'panelDefault' => 'expanded',
+            'newTab' => false,
+            'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ASSIGNMENT' => 
         array (
-          'newTab' => false,
-          'panelDefault' => 'expanded',
+            'newTab' => false,
+            'panelDefault' => 'expanded',
+        ),
         ),
-      ),
     ),
     'panels' => 
     array (
-      'lbl_project_information' => 
-      array (
+        'lbl_project_information' => 
+        array (
         0 => 
         array (
-          0 => 'name',
-          1 => 'status',
+            0 => 'name',
+            1 => 'status',
         ),
         1 => 
         array (
-          0 => 'estimated_start_date',
-          1 => 'priority',
+            0 => 'estimated_start_date',
+            1 => 'priority',
         ),
         2 => 
         array (
-          0 => 'estimated_end_date',
-          1 => '',
+            0 => 'estimated_end_date',
+            1 => '',
         ),
         3 => 
         array (
-          0 => 'description',
+            0 => 'description',
+        ),
         ),
-      ),
-      'LBL_PANEL_ASSIGNMENT' => 
-      array (
+        'LBL_PANEL_ASSIGNMENT' => 
+        array (
         0 => 
         array (
-          0 => 'assigned_user_name',
-          1 => 
-          array (
+            0 => 'assigned_user_name',
+            1 => 
+            array (
             'name' => 'am_projecttemplates_project_1_name',
-          ),
+            ),
         ),
         1 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'date_entered',
             'comment' => 'Date record created',
             'label' => 'LBL_DATE_ENTERED',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'date_modified',
             'comment' => 'Date record last modified',
             'label' => 'LBL_DATE_MODIFIED',
-          ),
+            ),
+        ),
         ),
-      ),
     ),
-  ),
+    ),
 );
 ?>

modules/Project/metadata/popupdefs.php

Indentation +7 added lines, -7 removed lines

@@ -40,13 +40,13 @@
 
 
 $popupMeta = array('moduleMain' => 'Project',
-						'varName' => 'PROJECT',
-						'orderBy' => 'name',
-						'whereClauses' => 
-							array('name' => 'project.name'),
-						'searchInputs' =>
-							array('name')
-						);
+                        'varName' => 'PROJECT',
+                        'orderBy' => 'name',
+                        'whereClauses' => 
+                            array('name' => 'project.name'),
+                        'searchInputs' =>
+                            array('name')
+                        );
 
 
 ?>