Merge pull request #14351 from seamuslee001/ics_file

dev/core#974 Whitelist .ics extension
civicrm · May 27, 2019 · 7b5909f · 7b5909f
2 parents 4eb527d + 301ef60
commit 7b5909f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/CRM/Upgrade/Incremental/sql/5.14.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.14.beta1.mysql.tpl
@@ -1 +1,7 @@
 {* file to handle db changes in 5.14.beta1 during upgrade *}
+
+SELECT @option_group_id_sfe            := max(id) from civicrm_option_group where name = 'safe_file_extension';
+
+INSERT INTO `civicrm_option_value` (`option_group_id`,  {localize field='label'}label{/localize}, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`,  {localize field='description'}description{/localize}, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`, `icon`)
+VALUES  (@option_group_id_sfe, {localize}'ics'{/localize},  15, 'ics',   NULL, 0, 0, 15, {localize}NULL{/localize}, 0, 0, 1, NULL, NULL, NULL);
+
diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
@@ -674,6 +674,7 @@ VALUES
   (@option_group_id_sfe, 'docx', 12, 'docx',  NULL, 0, 0, 12, NULL, 0, 0, 1, NULL, NULL, NULL),
   (@option_group_id_sfe, 'xlsx', 13, 'xlsx',  NULL, 0, 0, 13, NULL, 0, 0, 1, NULL, NULL, NULL),
   (@option_group_id_sfe, 'odt',  14, 'odt',   NULL, 0, 0, 14, NULL, 0, 0, 1, NULL, NULL, NULL),
+  (@option_group_id_sfe, 'ics',  15, 'ics',   NULL, 0, 0, 15, NULL, 0, 0, 1, NULL, NULL, NULL),
 
   (@option_group_id_we, '{ts escape="sql"}Textarea{/ts}', 1, 'Textarea', NULL, 0, NULL, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
   (@option_group_id_we, 'CKEditor', 2, 'CKEditor', NULL, 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL, NULL),