Commit Graph

115 Commits

Author SHA1 Message Date
Nathan Gray
61fb406928 Allow anchor tags in OO.o
r39251: Display error from merge, if merge gives error
r39252: Implement pagerepeat tag for html files
2012-05-22 17:54:01 +00:00
Ralf Becker
0f42a2f916 fixes for PHP 5.4 warnings and strict warnings, thought disabled E_STRICT for now, because of various strict warnings in working code, which could not be easy fixed in all areas (see comment in phpgwapi/inc/functions.inc.php) 2012-05-16 12:39:52 +00:00
Nathan Gray
b3122d519f If openoffice template specifies pagerepeat, use it 2012-05-08 14:31:02 +00:00
Nathan Gray
bbcb33a023 - Test multiple options for date format, stop when one works - Avoid deprecated format_datetime(), only format if there is a value 2012-04-24 15:50:35 +00:00
Nathan Gray
e014964656 Add in seconds, some timestamps have those and date doesn't parse otherwise 2012-04-24 13:59:06 +00:00
Nathan Gray
4300e20195 Avoid infinite loops by not passing real content text, so other app doesn't try to expand custom fields too 2012-04-19 14:20:17 +00:00
Nathan Gray
a66dc3c2fe * Expand link_to custom fields and make available all placeholders from the app.
eg: {{#address}} gives the link title, but now you can use {{#address/n_fn}}, {{#address/email}}, etc.
2012-04-17 17:26:46 +00:00
Nathan Gray
9b0b3f29cb More robust handling of date formatting:
- Handle placeholders with prefixes
- Use user format to parse date/time, in case it's already been formatted
r38938: Add data types to record classes, use them in formatting dates for spreadsheets
2012-04-17 14:32:48 +00:00
Nathan Gray
41ecce19ac When merging into a spreadsheet document, convert dates into SS dates
r38021: Fix typo in Excel date processing
r38111: Fix spreadsheet date/time formatting issue - incorrect parsing of users timer38167: Fix for empty spreadsheet dates in XML & OO.o getting a date anyway
2012-02-27 15:21:21 +00:00
Klaus Leithoff
c80f548999 - Re-arrange HTML tag order to account for simplistic newline handling (broke nested tags); - If unable to load/parse content after trying to convert HTML styles into target document styles, fall back and try again, but strip all tags this time. 2012-02-01 10:27:32 +00:00
Nathan Gray
e843208353 Add mergeprint tag for links to a specified application: links/appname 2012-01-06 17:57:16 +00:00
Nathan Gray
824829ae3e Fix missing >< when merging to XML, caused by double escaping 2011-12-12 23:28:20 +00:00
Ralf Becker
de9280dc6b fixed warning if no name part exists 2011-11-18 13:04:32 +00:00
Ralf Becker
35ac4e0993 * Mergeprint: fixed not working merge (white screen, nothing in error-log) under PHP 5.2.6
Catchable fatal error: argument 1 to transformToXml() must be of type DOMDocument
2011-11-17 08:44:40 +00:00
Nathan Gray
f6a28b7550 Remove ID, if already in title (eg Infolog) 2011-11-03 14:31:01 +00:00
Klaus Leithoff
85857cae6c silence warning: bo_merge::get_links -> make third parameter optional, as the parent function called has this one as optional parameter too. 2011-10-31 11:24:13 +00:00
Nathan Gray
6da51ecbdb * Add {{links}}, {{attachments}}, {{links_attachments}} placeholders for merging 2011-10-27 16:21:15 +00:00
Klaus Leithoff
55dbf20c33 * calendar/addressbook/importexport/merge-print: introduction of a static function to fetch the export limit, and normalize the possible output: bo_merge::getExportLimit; apply new function to bo_mergen, nextmatch_widget, addressbook, calendar and importexport; introduction of an calendar export limit; introduction of hook to provide appspecific export_limit 2011-09-16 13:23:15 +00:00
Ralf Becker
1d6f9f0bfe check if we can use the XSL extension, to not give a fatal error and rendering whole merge-print non-functional AND only keep tags, if XSL is available 2011-09-12 10:56:08 +00:00
Nathan Gray
3bdbeef5d6 Taming tidy - fixes extra line breaks, don't detect encoding. 2011-09-07 15:51:33 +00:00
Ralf Becker
78b7a1442d * Mergeprint uses tidy, if available, before atempting to convert html to office documents, requires now php-tidy 2011-09-06 06:27:07 +00:00
Nathan Gray
cc80f295c6 Remove spans with no attributes, they're invisible and can cause invalid XML with linebreaks 2011-09-05 17:11:20 +00:00
Klaus Leithoff
a3b17caa5f * impportexport/document merge: better control of exportlimits, you are now able to exempt groups or users from any exportlimits set (backport of nathans work, with enhancements from ralf) 2011-09-01 14:32:26 +00:00
Nathan Gray
98ec62d0e2 * Translate basic HTML formatting (bold, underline, cursive, text & background color, bullets & lists, fonts, size) into target document's formatting when merging into a template. Works for odt, docx and some xml. 2011-08-30 16:08:34 +00:00
Nathan Gray
1cddecb832 - Fix missing formatting in xml/word documents
- some changes in bullets, maybe avoid error in docx documents
2011-08-22 22:30:14 +00:00
Nathan Gray
0264b70a0b Silence warning when export exception is not set 2011-08-22 14:20:44 +00:00
Nathan Gray
8f5f334762 Only process HTML inside Word xml documents 2011-08-17 15:47:05 +00:00
Nathan Gray
16bafa78b8 Implement export restriction exception for given users/groups in apps 2011-08-17 15:38:56 +00:00
Nathan Gray
2a815be3d3 Process xml as if it were a MSOffice document 2011-08-17 14:47:17 +00:00
Ralf Becker
7cbff78854 config for export limit excepted users/groups, need backend work from nathan 2011-08-17 09:36:51 +00:00
Nathan Gray
ea8d70136e Implement labelplaceholder for OO.o files 2011-08-16 23:07:44 +00:00
Nathan Gray
e6355334f4 Move applying HTML styles into its own function 2011-08-02 18:41:18 +00:00
Nathan Gray
13afee536c Fix mismatched tag in MS linefeed 2011-08-02 14:25:47 +00:00
Nathan Gray
c2c1b4af95 Fix mismatched tag in MS linefeed 2011-07-29 15:34:12 +00:00
Nathan Gray
a2be785731 Bring some HTML styles into merged documents (ODT & docx) 2011-07-19 23:32:01 +00:00
Nathan Gray
69b0ceed0c Consolidating & simplifying translation phrases 2011-07-11 17:01:55 +00:00
Nathan Gray
624839d0db Translations for placeholder labels 2011-07-05 22:21:49 +00:00
Nathan Gray
aab8157907 Translation for placeholder labels 2011-07-05 21:44:21 +00:00
Ralf Becker
d654437a54 - allow confirmation only for multiple selected
- confirm, confirm_multiple and allowOnMultiple get now inherited by children (@Andreas: allowOnMultiple does NOT work on children for some reason)
- add confirmation for more then one receipient in mail merge
- translations for etemplate part
2011-06-30 17:35:52 +00:00
Klaus Leithoff
b30fcc52f3 allow merge_print for emails on all applications (only one entry at a time, exept addressbook); addressbook merge_print with an email of one contact, the mail is stored with the draft folder and then opens the compose dialog, if used on multiple contacts, we try to send them right away. Better control of SigOnTop Handling. 2011-06-30 15:28:29 +00:00
Klaus Leithoff
51c6e79475 allow email - merge print only for addressbook (by now); handle mergeprint for accounts stored with ldap as well 2011-06-30 11:21:48 +00:00
Klaus Leithoff
aa706d8cb8 * eMail: feature to use merge_print on emails for sending previously prepared (and stored) emails to contacts. The email address is used as To address. If no email address is specified, email_home is used. Addressbook replacements are performed on text/html body and subject; BugFix regarding problems with styledefinitions containing umlauts 2011-06-30 09:47:29 +00:00
Nathan Gray
0ecbc8b54d Allow functions deep in the stack (table callbacks) to throw exceptions in error conditions 2011-06-21 21:14:16 +00:00
Ralf Becker
65a8e4e8d3 fixed some printing stuff in calendar, printing in listview is disabled, because it is NOT working atm. 2011-06-17 15:16:40 +00:00
Ralf Becker
6cf426d465 added a mime-type filter 2011-06-17 14:07:51 +00:00
Ralf Becker
d13b605db8 uncomment testwise commented allowens for admins to export more then the export limit 2011-06-17 13:35:00 +00:00
Ralf Becker
81b78a8e65 fixed not working standard document with absolute path 2011-06-17 13:08:10 +00:00
Ralf Becker
92ddeca1fb - fail with error message, if user trys to export more entries then allowed (previously entries were silently cut down to allowed number, even 0!)
- fixed path of document-actions if more then one directory with subdirectories were given
2011-06-16 11:36:15 +00:00
Ralf Becker
1774e5674f support for multiple space or comma separated download dirs 2011-06-14 10:48:15 +00:00
Ralf Becker
e50565ccb4 allow multiple space or comma separated template directories 2011-06-14 08:54:42 +00:00