Commit Graph

195 Commits

Author SHA1 Message Date
Ralf Becker
36b9eb4cfb move bo_merge as Storage\Merge into api 2016-04-05 18:43:46 +00:00
Nathan Gray
c6501b6a88 Avoid double encoding when not parsing html styles 2016-04-04 20:57:01 +00:00
Nathan Gray
cd1f03c761 Add ability to test for blank fields when merging:
{{IF~ #fieldname ~ EMPTY ~ Empty ~Not empty}} or {{IF~#fieldname~~Empty~Not empty}}
2016-03-09 21:58:56 +00:00
Nathan Gray
6aa1e19a6f Support using div as a linebreak 2016-03-02 16:19:23 +00:00
Nathan Gray
4ebaf56413 If we are not processing styles, just encode special characters.
Fixes broken downloads, missing bits if there were <> in the text
2016-03-01 22:31:19 +00:00
Nathan Gray
86d1cf4511 Fix label merge
Accidentally broken by SVN r54894
2016-02-29 16:49:44 +00:00
Nathan Gray
6ccc3e5713 Avoid value not being properly parsed in calc 2016-02-16 23:58:37 +00:00
Nathan Gray
f9bcb91d33 Reduce memory usage during merge a bit 2016-02-02 04:47:16 +00:00
Ralf Becker
2a77e523f5 need to load all cfs for $ignore_acl=true 2016-01-21 13:25:22 +00:00
Ralf Becker
a0f707eaea need to use private cfs too for $ignore_acl=true 2016-01-21 13:21:55 +00:00
Ralf Becker
cd1692c4a6 adding an ignore-acl parameter to addressbook_bo::read() and addressbook_merge::get_replacements() 2016-01-20 14:39:16 +00:00
Nathan Gray
b9fb162a72 Fix merging into HTML did not properly process style tags. 2015-11-26 17:22:40 +00:00
Nathan Gray
f57ccb9a41 Allow custom fields in IF placeholders 2015-10-06 19:59:43 +00:00
Ralf Becker
5449825beb use raw custom-field data for yaml files, no user-preference specific formatting, all to use regular expressions in yaml files to modify content of placeholders, eg. commas with linebreaks: "{{name/, */\n}}" 2015-06-18 13:18:07 +00:00
Ralf Becker
46c8c6e318 minimal support for yaml files in document merge: multi-line replacements get prefixed with as many space as the placeholder 2015-06-17 19:37:40 +00:00
Nathan Gray
aa724afc03 Some date formatting options could not be automatically parsed, so explicitly use user's date & time settings.
Fixes intermittent automatic {{timestamp/date}} placeholder.
2015-05-25 15:34:41 +00:00
Nathan Gray
69f1fc4696 Fix some problems with merging into email files:
- Use correct merge sub-class when merging multiple entries
- Accept merge placeholders in to/cc/bcc fields (displayed as invalid, but still accepted)
- Use merge placeholders to pull addresses from associated entry
2015-05-19 19:24:02 +00:00
Nathan Gray
1ae125f08e Handle escaped curly bracket placeholders in rtf 2015-04-29 21:40:12 +00:00
Nathan Gray
681566471a Accept and process commands even if they're right at the beginning.
Fixes bug where commands at the start of content were not processed.
2014-12-03 19:58:59 +00:00
Ralf Becker
7bfa13728d class var to enable/disable memory_usage reporting to error_log 2014-11-19 12:57:31 +00:00
Ralf Becker
c633e0033b * all aps: lower memory requirements of insert into document by skipping HTML processing, if there are no html (custom-)fields 2014-11-19 12:20:59 +00:00
Ralf Becker
be66f13885 fix unknown modifier "n" warning caused by a "/" in replacement 2014-11-18 12:28:20 +00:00
Ralf Becker
08ab6679d2 try to increase/double prce.backtrack_limit no failure to preg_replace up to 1/4 of memory_limit
previous code was adding max 10 time 10000 to default limit of 1000000, which increased it by 10% max, given we have now a default memory_limit of 128M
2014-11-14 19:08:18 +00:00
Nathan Gray
f6bca11f4f Add an additional format to parse times in the formatY-m-dTHⓂ️s for insertion into spreadsheets, fixes warning when merge printing "Unable to parse date ... left as text" 2014-08-12 23:19:39 +00:00
Nathan Gray
4944b1a1fb Fix double encoded & in merge functions 2014-08-12 17:48:47 +00:00
Nathan Gray
694a63d1f4 Indicate merge class to use for mail, fixes infolog placeholders not known 2014-08-12 16:58:07 +00:00
Nathan Gray
210ebb5706 - Add $$user/primary_group$$ common placeholder
- Add calendar_owner/<contact> sub-placeholders, including primary_group
2014-07-08 19:05:09 +00:00
Nathan Gray
ee7349f4f6 Fix missing path, prevented single selected address merge into mail from opening properly in popup 2014-06-04 15:41:24 +00:00
Nathan Gray
79f7a8a6cf Use popup mail compose window if default document is an email, same as non-default documents 2014-05-29 15:33:27 +00:00
Ralf Becker
9455efae32 added postSubmit=true to document actions in mime-type sub-menus, was there for all other cases already 2014-05-26 16:09:03 +00:00
Klaus Leithoff
bec6913567 revert changes, as the double - is needed here; needs to be fixed elsewhere 2014-03-21 14:50:53 +00:00
Klaus Leithoff
354a2ac3e8 fix ->typo<- that prevented the merge action on message/rfc822 in addressbook to function properly 2014-03-21 14:26:10 +00:00
Nathan Gray
92e29ff0c4 Fix merge print to work with both old & new ODF spreadsheets
- adds support for calcext:value-type cell attribute
2014-03-18 14:13:57 +00:00
Nathan Gray
4cdd4d9d4a Update opendocument spreadsheet numeric cell attributes to include celcext:value-type. 2014-03-11 17:35:50 +00:00
Ralf Becker
6de6114e22 remove old API browser class, apps only used content_header method with is available as html::browser_header() with identical signature 2014-01-19 09:30:33 +00:00
Nathan Gray
05f0e486e3 Use long task UI to merge contacts into email templates 2014-01-16 14:05:07 +00:00
Nathan Gray
f9c2c73432 Get merging contact into mail template file working 2014-01-15 16:29:30 +00:00
Ralf Becker
6e30816758 fixed not working download via action system: needed submit via POST request instead of Ajax, add new boolean action attribute postSubmit 2013-10-04 12:48:11 +00:00
Klaus Leithoff
d2a851931f provide contact-id on errormessage on failure of mail-merge 2013-08-07 08:07:24 +00:00
Klaus Leithoff
6362e257b1 alter message on success/failure of multiple message sending via addressbook mail-merge 2013-08-06 13:48:20 +00:00
Nathan Gray
654054826f Implement home-accounts and select-account custom fields sub-placeholder expansions in the correct place, with the rest of them 2013-06-05 17:03:27 +00:00
Nathan Gray
bd6c23298b Change ODS file line break tag from <text:line-break> to </text:p><text:p> so it works in LibreOffice 2013-04-22 15:25:19 +00:00
Nathan Gray
81fbfc23cc Add general placeholder {{link}} is a link to current record 2013-03-19 20:56:58 +00:00
Nathan Gray
ef826ee2b9 Change all merges to use common get_all_links() function 2013-02-07 09:36:07 +00:00
Nathan Gray
03aeacf69d Add get_all_links() to get all link placeholders from content 2013-02-07 09:15:59 +00:00
Klaus Leithoff
d04f027709 missed commit for r41402 (adapted message on merging mail templates with single mail) 2013-01-25 14:03:14 +00:00
Ralf Becker
78fc93df60 * Addressbook/eMail: fixed wrong characterset when merge printing into eMail 2012-10-25 16:16:41 +00:00
Christian Binder
2fbf1d36e8 document merge helper function to allow download by HTTP POST request 2012-09-29 10:16:39 +00:00
Klaus Leithoff
5637674315 * mergeprint: fix problem with not replaced app-links like #contact/nfn; fix problem with not replaced date only option on date/datetime customfields 2012-08-23 10:26:43 +00:00
Ralf Becker
f7fa8ea37e * Addressbook/InfoLog/Filemanager/Tracker: added or fixed formatting of certain custom field types using a single shared method 2012-08-09 12:41:47 +00:00