Permalink
Browse files

Release 6.2.4

  • Loading branch information...
1 parent 8ea6d5b commit e34024840b0d96d239d5fd40115ee22a7de54a45 John Mertic committed Oct 24, 2011
Showing with 4,275 additions and 3,055 deletions.
  1. +56 −0 ModuleInstall/ModuleScanner.php
  2. +3 −3 Zend/Gdata/Docs.php
  3. +1 −1 Zend/Gdata/Docs/Query.php
  4. +3 −1 cron.php
  5. +2 −1 data/SugarBean.php
  6. +15 −3 download.php
  7. +1 −1 export.php
  8. +184 −181 files.md5
  9. +123 −0 include/Dashlets/DashletRssFeedTitle.php
  10. +28 −39 include/EditView/EditView2.php
  11. +1 −1 include/ListView/ListView.php
  12. +6 −1 include/ListView/ListViewDisplay.php
  13. +37 −11 include/Localization/Localization.php
  14. +0 −1 include/MVC/Controller/entry_point_registry.php
  15. +0 −3 include/MVC/View/views/view.quickcreate.php
  16. +6 −3 include/MassUpdate.php
  17. +6 −11 include/MySugar/MySugar.php
  18. +1 −2 include/Popups/tpls/PopupGeneric.tpl
  19. +7 −7 include/SearchForm/SearchForm2.php
  20. +4 −5 include/Smarty/plugins/function.sugar_translate.php
  21. +62 −34 include/SugarCharts/SugarChart.php
  22. +3 −3 include/SugarEmailAddress/SugarEmailAddress.js
  23. +5 −1 include/SugarEmailAddress/SugarEmailAddress.php
  24. +3 −1 include/SugarFields/Fields/Datetimecombo/EditView.tpl
  25. +1 −1 include/SugarFields/Fields/File/EditView.tpl
  26. +0 −62 include/SugarFields/Fields/File/SugarFieldFile.php
  27. +25 −70 json.php → include/SugarFields/Fields/Radioenum/SugarFieldRadioenum.php
  28. +1 −1 include/SugarFields/Fields/Relate/SearchView.tpl
  29. +33 −10 include/SugarObjects/templates/person/Person.php
  30. +1 −0 include/SugarObjects/templates/person/language/en_us.lang.php
  31. +1 −0 include/SugarObjects/templates/person/metadata/searchdefs.php
  32. +17 −1 include/SugarObjects/templates/person/vardefs.php
  33. +2 −1 include/SugarTinyMCE.php
  34. +2 −0 include/TimeDate.php
  35. +13 −0 include/connectors/sources/default/source.php
  36. +1 −1 include/database/MssqlManager.php
  37. +42 −23 include/export_utils.php
  38. +1 −2 include/generic/SugarWidgets/SugarWidgetFielddatepicker.php
  39. +1 −2 include/generic/SugarWidgets/SugarWidgetFieldenum.php
  40. +1 −2 include/generic/SugarWidgets/SugarWidgetFieldsingleenum.php
  41. +1 −21 include/generic/SugarWidgets/SugarWidgetSubPanelEmailLink.php
  42. +2 −0 include/javascript/javascript.php
  43. +4 −4 include/javascript/jsclass_async.js
  44. +3 −6 include/javascript/sugar_3.js
  45. +3 −6 include/javascript/sugar_grp1.js
  46. +28 −15 include/javascript/sugar_grp_emails.js
  47. +25 −12 include/javascript/sugar_grp_quickcomp.js
  48. +30 −2 include/utils.php
  49. +27 −0 include/utils/db_utils.php
  50. +1 −1 include/utils/mvc_utils.php
  51. +19 −6 install/checkDBSettings.php
  52. +1 −10 install/confirmSettings.php
  53. +17 −15 install/install_utils.php
  54. +3 −1 install/language/en_us.lang.php
  55. +1 −0 install/performSetup.php
  56. +10 −405 json_server.php
  57. +2 −6 jssource/src_files/include/SugarEmailAddress/SugarEmailAddress.js
  58. +8 −9 jssource/src_files/include/javascript/jsclass_async.js
  59. +14 −27 jssource/src_files/include/javascript/sugar_3.js
  60. +9 −9 jssource/src_files/modules/Documents/documents.js
  61. +2 −2 modules/ACLRoles/EditAllBody.tpl
  62. +2 −4 modules/Accounts/Account.php
  63. +1 −0 modules/Accounts/metadata/popupdefs.php
  64. +14 −0 modules/Accounts/vardefs.php
  65. +45 −1 modules/Activities/Popup_picker.php
  66. +1 −0 modules/Administration/Locale.tpl
  67. +8 −8 modules/Audit/Popup_picker.html
  68. +1 −2 modules/Calendar/small_month.php
  69. +2 −3 modules/Calendar/templates/templates_calendar.php
  70. +6 −12 modules/Calls/Call.php
  71. +2 −2 modules/Calls/Dashlets/MyCallsDashlet/MyCallsDashlet.php
  72. +2 −0 modules/Calls/vardefs.php
  73. +3 −4 modules/CampaignLog/CampaignLog.php
  74. +1 −2 modules/Campaigns/EmailQueue.php
  75. +123 −0 modules/Campaigns/ProspectLink.php
  76. +5 −3 modules/Campaigns/Schedule.html
  77. +91 −81 modules/Campaigns/Schedule.php
  78. +1 −1 modules/Campaigns/WebToLeadCapture.php
  79. +39 −0 modules/Campaigns/tpls/campaign-inactive.tpl
  80. +6 −0 modules/Campaigns/vardefs.php
  81. +1 −1 modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.php
  82. +1 −1 modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.php
  83. +1 −1 modules/Charts/code/Chart_outcome_by_month.php
  84. +1 −6 modules/Configurator/tpls/adminwizard.tpl
  85. +1 −2 modules/Contacts/SaveContactOpportunityRelationship.php
  86. +2 −1 modules/Contacts/metadata/popupdefs.php
  87. +14 −0 modules/Contacts/vardefs.php
  88. +59 −0 modules/Contacts/views/view.quickcreate.php
  89. +19 −13 modules/Currencies/Currency.php
  90. +1 −1 modules/Documents/documents.js
  91. +2 −2 modules/Documents/vardefs.php
  92. +1 −0 modules/DynamicFields/templates/Fields/TemplateRelatedTextField.php
  93. +3 −1 modules/EmailMan/controller.php
  94. +2 −2 modules/EmailMarketing/EditView.html
  95. +4 −0 modules/EmailMarketing/vardefs.php
  96. +1 −0 modules/EmailTemplates/Delete.php
  97. +5 −0 modules/EmailTemplates/EditView.php
  98. +1 −0 modules/EmailTemplates/Save.php
  99. +0 −433 modules/Emails/EditView.html
  100. +0 −3 modules/Emails/EditView.php
  101. +8 −8 modules/Emails/EditViewArchive.html
  102. +3 −1 modules/Emails/EmailUIAjax.php
  103. +1 −25 modules/Emails/javascript/Email.js
  104. +23 −10 modules/Emails/javascript/EmailUICompose.js
  105. +2 −2 modules/Emails/javascript/grid.js
  106. +2 −0 modules/Emails/templates/_baseEmail.tpl
  107. +13 −0 modules/Employees/Save.php
  108. +18 −1 modules/Home/UnifiedSearchAdvanced.php
  109. +2 −2 modules/Home/index.php
  110. +2 −2 modules/Import/tpls/step1.tpl
  111. +1 −1 modules/Import/views/view.step4.php
  112. +1 −1 modules/InboundEmail/DetailView.html
  113. +3 −3 modules/InboundEmail/EditView.html
  114. +1 −0 modules/Leads/metadata/convertdefs.php
  115. +1 −0 modules/Leads/metadata/popupdefs.php
  116. +2 −2 modules/Leads/tpls/ConvertLead.tpl
  117. +15 −1 modules/Leads/vardefs.php
  118. +147 −83 modules/Leads/views/view.convertlead.php
  119. +2 −2 modules/MailMerge/Step1.php
  120. +27 −29 modules/MailMerge/Step2.html
  121. +114 −0 modules/MailMerge/controller.php
  122. +1 −2 modules/MailMerge/index.php
  123. +2 −2 modules/Meetings/Dashlets/MyMeetingsDashlet/MyMeetingsDashlet.php
  124. +55 −19 modules/Meetings/Meeting.php
  125. +1 −1 modules/Meetings/metadata/editviewdefs.php
  126. +1 −1 modules/ModuleBuilder/Module/StudioBrowser.php
  127. +13 −0 modules/ModuleBuilder/controller.php
  128. +74 −0 modules/ModuleBuilder/parsers/parser.label.php
  129. +1 −0 modules/ModuleBuilder/parsers/relationships/ActivitiesRelationship.php
  130. +11 −0 modules/ModuleBuilder/parsers/relationships/UndeployedRelationships.php
  131. +1 −1 modules/ModuleBuilder/parsers/views/GridLayoutMetaDataParser.php
  132. +49 −42 modules/ModuleBuilder/parsers/views/History.php
  133. +9 −3 modules/ModuleBuilder/parsers/views/ListLayoutMetaDataParser.php
  134. +25 −14 modules/ModuleBuilder/parsers/views/SearchViewMetaDataParser.php
  135. +5 −2 modules/ModuleBuilder/tpls/layoutView.tpl
  136. +2 −1 modules/Notes/metadata/SearchFields.php
  137. +1 −1 modules/Notes/metadata/searchdefs.php
  138. +0 −221 modules/Project/gantt.css
  139. +32 −1 modules/ProjectTask/ProjectTask.php
  140. +1 −2 modules/Roles/DeleteUserRelationship.php
  141. +1 −2 modules/Roles/SaveUserRelationship.php
  142. +1 −1 modules/SavedSearch/SavedSearchSelects.tpl
  143. +6 −4 modules/Schedulers/Scheduler.php
  144. +1 −1 modules/SchedulersJobs/SchedulersJob.php
  145. +7 −0 modules/Studio/DropDowns/DropDownHelper.php
  146. +6 −12 modules/Tasks/Task.php
  147. +3 −2 modules/Tasks/vardefs.php
  148. +1 −1 modules/Trackers/BreadCrumbStack.php
  149. +1 −1 modules/Trackers/Tracker.php
  150. +11 −1 modules/UpgradeWizard/uw_utils.php
  151. +1 −0 modules/Users/EditView.tpl
  152. +15 −4 modules/Users/Login.php
  153. +9 −1 modules/Users/User.php
  154. +1 −7 modules/Users/tpls/wizard.tpl
  155. +3 −1 service/core/SoapHelperWebService.php
  156. +1 −1 service/core/SugarWebServiceImpl.php
  157. +4 −4 sugar_version.php
  158. +3 −0 tests/SugarTestHelper.php
  159. +16 −9 tests/SugarTestMeetingUtilities.php
  160. +67 −0 tests/SugarTestObjectUtilities.php
  161. +78 −0 tests/SugarTestProjectTaskUtilities.php
  162. +70 −0 tests/SugarTestProjectUtilities.php
  163. +55 −0 tests/SugarTestViewConvertLeadUtilities.php
  164. +212 −0 tests/data/Bug45896Test.php
  165. +100 −0 tests/include/Bug45525Test.php
  166. +95 −0 tests/include/Dashlets/Bug46217Test.php
  167. +3 −2 tests/include/ListView/ListViewDisplayTest.php
  168. +84 −0 tests/include/Localization/Bug35413Test.php
  169. +15 −5 tests/include/MassUpdate/MassUpdateTest.php
  170. +6 −6 tests/include/SearchForm/Bug45966Test.php
  171. +45 −0 tests/include/Smarty/plugins/FunctionSugarTranslateTest.php
  172. +1 −2 tests/include/SugarCharts/Bug42326Test.php
  173. +167 −0 tests/include/SugarCharts/Bug44696Test.php
  174. +32 −53 tests/{modules/Home/Bug39610Test.php → include/SugarEmailAddress/Bug42279Test.php}
  175. +26 −23 ...es/Contracts/Bug44836Test.php → include/SugarFields/Fields/Radioenum/SugarFieldRadioenumTest.php}
  176. +43 −0 tests/include/ValidDBNameTest.php
  177. +20 −1 tests/modules/Calls/Bug39161Test.php
  178. +94 −0 tests/modules/Contacts/Bug36989Test.php
  179. +4 −4 tests/modules/Currencies/CurrencyTest.php
  180. +3 −0 tests/modules/Emails/Bug40527Test.php
  181. +3 −0 tests/modules/Emails/Bug40911Test.php
  182. +74 −0 tests/modules/Home/Bug42961Test.php
  183. +1 −1 tests/modules/Home/Bug43653Test.php
  184. +22 −4 tests/modules/Leads/ConvertLeadTests.php
  185. +10 −8 tests/modules/Meetings/Bug45287Test.php
  186. +10 −8 tests/modules/Meetings/Bug45287_2Test.php
  187. +101 −0 tests/modules/Meetings/Bug46294Test.php
  188. +16 −56 ...nclude/SugarFields/Fields/File/Bug22505Test.php → modules/ModuleBuilder/parsers/Bug44712Test.php}
  189. +366 −0 tests/modules/ModuleBuilder/parsers/SearchViewMetaDataParserTest.php
  190. +100 −0 tests/modules/ModuleBuilder/parsers/views/HistoryTest.php
  191. +137 −0 tests/modules/ProjectTask/Bug46350Test.php
  192. +0 −154 tests/modules/ProspectLists/Bug36422Test.php
  193. +0 −141 tests/modules/ProspectLists/Bug41569Test.php
  194. +0 −147 tests/modules/ProspectLists/Bug43478Test.php
  195. +0 −145 tests/modules/ProspectLists/Bug43805Test.php
  196. +52 −0 tests/modules/Reports/Bug47277Test.php
  197. +0 −114 tests/modules/Trackers/store/Bug41051Test.php
  198. +18 −4 tests/modules/UpgradeWizard/Bug36845Test.php
  199. +1 −2 tests/phpunit.php
@@ -60,6 +60,62 @@ class ModuleScanner{
private $validExt = array('png', 'gif', 'jpg', 'css', 'js', 'php', 'txt', 'html', 'htm', 'tpl', 'pdf', 'md5', 'xml');
private $blackList = array(
+ 'popen',
+ 'proc_open',
+ 'escapeshellarg',
+ 'escapeshellcmd',
+ 'proc_close',
+ 'proc_get_status',
+ 'proc_nice',
+ 'basename',
+ 'passthru',
+ 'clearstatcache',
+ 'delete',
+ 'dirname',
+ 'disk_free_space',
+ 'disk_total_space',
+ 'diskfreespace',
+ 'fclose',
+ 'feof',
+ 'fflush',
+ 'fgetc',
+ 'fgetcsv',
+ 'fgets',
+ 'fgetss',
+ 'file_exists',
+ 'file_get_contents',
+ 'filesize',
+ 'filetype',
+ 'flock',
+ 'fnmatch',
+ 'fpassthru',
+ 'fputcsv',
+ 'fputs',
+ 'fread',
+ 'fscanf',
+ 'fseek',
+ 'fstat',
+ 'ftell',
+ 'ftruncate',
+ 'fwrite',
+ 'glob',
+ 'is_dir',
+ 'is_file',
+ 'is_link',
+ 'is_readable',
+ 'is_uploaded_file',
+ 'parse_ini_string',
+ 'pathinfo',
+ 'pclose',
+ 'readfile',
+ 'readlink',
+ 'realpath_cache_get',
+ 'realpath_cache_size',
+ 'realpath',
+ 'rewind',
+ 'set_file_buffer',
+ 'tmpfile',
+ 'umask',
'eval',
'exec',
'system',
View
@@ -57,7 +57,7 @@
class Zend_Gdata_Docs extends Zend_Gdata
{
- const DOCUMENTS_LIST_FEED_URI = 'http://docs.google.com/feeds/default/private/full';
+ const DOCUMENTS_LIST_FEED_URI = 'https://docs.google.com/feeds/default/private/full';
const AUTH_SERVICE_NAME = 'writely';
const DEFAULT_MAJOR_PROTOCOL_VERSION = 3;
@@ -174,7 +174,7 @@ public function getDocumentListEntry($location = null)
* @return Zend_Gdata_Docs_DocumentListEntry
*/
public function getResource($resourceId) {
- $uri = 'http://docs.google.com/feeds/documents/private/full/' . $resourceId;
+ $uri = 'https://docs.google.com/feeds/documents/private/full/' . $resourceId;
return $this->getDocumentListEntry($uri);
}
@@ -191,7 +191,7 @@ public function getResource($resourceId) {
* @deprecated Use getResource($resourceId) instead.
*/
public function getDoc($docId, $docType) {
- $location = 'http://docs.google.com/feeds/documents/private/full/' .
+ $location = 'https://docs.google.com/feeds/documents/private/full/' .
$docType . '%3A' . $docId;
return $this->getDocumentListEntry($location);
}
@@ -51,7 +51,7 @@ class Zend_Gdata_Docs_Query extends Zend_Gdata_Query
*
* @var string
*/
- const DOCUMENTS_LIST_FEED_URI = 'http://docs.google.com/feeds/default';
+ const DOCUMENTS_LIST_FEED_URI = 'https://docs.google.com/feeds/default';
/**
* The generic base URL used by some inherited methods
View
@@ -93,7 +93,9 @@
///////////////////////////////////////////////////////////////////////////////
//// EXECUTE IF VALID TIME (NOT DDOS)
-if($timestamp[0] < strtotime(date('H:i'))) {
+// mjamil | bug # 45229 - schedulers not able to run due to current time being equal to
+// $timestamp[0]
+if($timestamp[0] <= strtotime(date('H:i'))) {
if(is_writable($cachePath.'/'.$pid)) {
write_array_to_file('timestamp', array(strtotime(date('H:i'))) , $cachePath.'/'.$pid);
require('modules/Schedulers/Scheduler.php');
View
@@ -4327,8 +4327,9 @@ function mark_deleted($id)
$this->modified_user_id = 1;
}
$query = "UPDATE $this->table_name set deleted=1 , date_modified = '$date_modified', modified_user_id = '$this->modified_user_id' where id='$id'";
- } else
+ } else {
$query = "UPDATE $this->table_name set deleted=1 , date_modified = '$date_modified' where id='$id'";
+ }
$this->db->query($query, true,"Error marking record deleted: ");
$this->deleted = 1;
$this->mark_relationships_deleted($id);
View
@@ -42,6 +42,7 @@
die("Not a Valid Entry Point");
}
else {
+ $file_type=''; // bug 45896
ini_set('zlib.output_compression','Off');//bug 27089, if use gzip here, the Content-Length in hearder may be incorrect.
// cn: bug 8753: current_user's preferred export charset not being honored
$GLOBALS['current_user']->retrieve($_SESSION['authenticated_user_id']);
@@ -103,8 +104,15 @@
} // if
- $local_location = (isset($_REQUEST['isTempFile'])) ? "{$GLOBALS['sugar_config']['cache_dir']}/modules/Emails/{$_REQUEST['ieId']}/attachments/{$_REQUEST['id']}"
- : $GLOBALS['sugar_config']['upload_dir']."/".$_REQUEST['id'];
+ $local_location = $GLOBALS['sugar_config']['upload_dir']."/".$_REQUEST['id'];
+ if (isset($_REQUEST['isTempFile']))
+ {
+ $local_location = $GLOBALS['sugar_config']['cache_dir'].'/modules/Emails/';
+ if (isset($_REQUEST['ieId'])) {
+ $local_location .= $_REQUEST['ieId'].'/';
+ }
+ $local_location .= 'attachments/'.$_REQUEST['id'];
+ }
if(isset($_REQUEST['isTempFile']) && ($_REQUEST['type']=="SugarFieldImage")) {
$local_location = $GLOBALS['sugar_config']['upload_dir']."/".$_REQUEST['id'];
@@ -149,7 +157,11 @@
}
else if(isset($_REQUEST['isTempFile']) && ($_REQUEST['type']=="SugarFieldImage")) {
$download_location = $local_location;
- $name = $_REQUEST['tempName'];
+ $name = '';
+ if (isset($_REQUEST['tempName']))
+ {
+ $name = $_REQUEST['tempName'];
+ }
}
if(isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/MSIE/", $_SERVER['HTTP_USER_AGENT']))
View
@@ -70,7 +70,7 @@
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT" );
header("Last-Modified: " . TimeDate::httpTime() );
header("Cache-Control: post-check=0, pre-check=0", false );
-header("Content-Length: ".strlen($content));
+header("Content-Length: ".mb_strlen($GLOBALS['locale']->translateCharset($content, 'UTF-8', $GLOBALS['locale']->getExportCharset())));
print $GLOBALS['locale']->translateCharset($content, 'UTF-8', $GLOBALS['locale']->getExportCharset());
Oops, something went wrong.

0 comments on commit e340248

Please sign in to comment.