Commit Graph

193 Commits

Author SHA1 Message Date
Christian Binder
c900737797 reverted r39642 for a better solution to come 2012-07-02 20:43:00 +00:00
Nathan Gray
195a3353d7 Add date only placeholders for timestamps: {{timestamp_placeholder/date}} 2012-07-02 15:24:15 +00:00
Christian Binder
183fa30aca Registry of apps currently supporting merge (for later usage) 2012-07-01 18:22:38 +00:00
Nathan Gray
36cc792d46 Format numbers inside writer tables as numbers 2012-06-26 16:21:20 +00:00
Nathan Gray
13571a6254 Implement pagerepeat tag for html files 2012-05-16 17:36:07 +00:00
Nathan Gray
7a5c8f6ad6 Allow anchor tags in OO.o 2012-05-14 13:48:32 +00:00
Nathan Gray
94cd19a50c If openoffice template specifies pagerepeat, use it 2012-05-07 21:09:31 +00:00
Christian Binder
7852cf2baa feature: split document merge context menu entries if subfolders exist in template folders 2012-05-02 19:59:15 +00:00
Nathan Gray
1b30ed3870 - Test multiple options for date format, stop when one works - Avoid deprecated format_datetime(), only format if there is a value 2012-04-24 14:36:31 +00:00
Nathan Gray
0e9e4ae325 Add in seconds, some timestamps have those and date doesn't parse otherwise 2012-04-23 16:32:34 +00:00
Nathan Gray
5b8b8fd838 Avoid infinite loops by not passing real content text, so other app doesn't try to expand custom fields too 2012-04-18 16:21:24 +00:00
Nathan Gray
fb69fb21ea More robust handling of date formatting:
- Handle placeholders with prefixes
- Use user format to parse date/time, in case it's already been formatted
2012-04-16 15:54:22 +00:00
Nathan Gray
4feaa8375e Expansion of link_to custom fields 2012-04-11 20:03:11 +00:00
Nathan Gray
4d37157497 Make match non-greedy to only match placeholder 2012-04-10 15:05:41 +00:00
Nathan Gray
18ca0470b2 Merged links are always external 2012-04-02 22:14:15 +00:00
Nathan Gray
57602e41ca 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-02 21:25:42 +00:00
Ralf Becker
f676a23821 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-03-04 13:33:10 +00:00
Nathan Gray
dc6da791f4 Add placeholder [links|attachments|links_attachments]/link to get a download url for attachments 2012-02-28 00:23:41 +00:00
Nathan Gray
058553b8d9 - Fix last[-1] comments
- Show custom notification / signature checkboxes for all queues too
- Handle message / signature as HTML, not text
- When merging HTML, keep the same tags as OO.o & word documents
2012-02-27 21:34:34 +00:00
Nathan Gray
9caec6fffb Fix for empty spreadsheet dates in XML & OO.o getting a date anyway 2012-02-24 23:29:58 +00:00
Nathan Gray
2b39a7a059 Fix spreadsheet date/time formatting issue - incorrect parsing of user's time 2012-02-20 16:15:18 +00:00
Nathan Gray
1624c37dc7 Fix typo in Excel date processing 2012-02-13 19:23:17 +00:00
Nathan Gray
4f669300a4 When merging into a spreadsheet document, convert dates into SS dates 2012-02-13 18:59:00 +00:00
Nathan Gray
b8d9b748ac - 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 00:03:31 +00:00
Nathan Gray
af2e743a83 Add parameter to exclude certain entries 2012-01-06 17:28:40 +00:00
Nathan Gray
2e9866bab9 Add mergeprint tag for links to a specified application: links/appname 2012-01-05 17:43:44 +00:00
Nathan Gray
2eee7a5119 Fix missing >< when merging to XML, caused by double escaping 2011-12-09 21:00:57 +00:00
Ralf Becker
38f282bccf fixed warning if no name part exists 2011-11-18 13:03:12 +00:00
Ralf Becker
978b014ffc * 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-16 09:26:23 +00:00
Nathan Gray
4449f65797 Call entry2name() for titles, don't just use cache 2011-10-31 15:47:24 +00:00
Klaus Leithoff
0141321c76 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:23:04 +00:00
Nathan Gray
40fbf0a450 List each link on own line, add ID shortcut like filemanager, if available 2011-10-27 16:08:59 +00:00
Nathan Gray
18e38b1dfc - Add app filter
- List should be comma separated
- Add attachments translation
2011-10-25 22:50:05 +00:00
Nathan Gray
c972484133 Add common function to get titles of linked entries 2011-10-25 22:30:51 +00:00
Klaus Leithoff
2d494997ab rework of bo_merge::getExportLimit, apply to etemplate, importexport, addressbook, calendar 2011-09-16 13:03:46 +00:00
Klaus Leithoff
d9905d3fb4 calendar/addressbook/API: introduce hook to fetch the export_limit to be applied for an app; introduce method to test if a specific hook exists for an application; fetch the export_limit via hook where appropriate 2011-09-15 14:46:56 +00:00
Klaus Leithoff
70a7026915 * merge_print/calendar: control the availability of mergeprint and csv export, if the export_limit is set to ->no<- and the user in question is not exempted from export_limit restrictions 2011-09-14 13:09:13 +00:00
Klaus Leithoff
36e3a1b8ce add missing translations for export_limit feature of calendar, correcting translation strings for export_limit warnings 2011-09-14 10:27:53 +00:00
Klaus Leithoff
74b41ec99a fix bug regarding merge_print with export_limit set in calendar, as calendar may pass a search query instead of a list of ids (this is the reason, why the test within bo_merge on export_limit is not working as expected) 2011-09-13 15:41:31 +00:00
Klaus Leithoff
d52c72207c * calendar/importexport/addressbook: calendar introduce new config option to set app specific export_limit; calendar csv export: use enumerate for exporting events as csv; bo_merge: introduce new helper functions to get and check export-limit; addressbook: use new helper functions 2011-09-13 09:05:33 +00:00
Ralf Becker
132cafc8a9 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:51:21 +00:00
Ralf Becker
9066385fa5 check if we can use the XSL extension, to not give a fatal error and rendering whole merge-print non-functional 2011-09-12 10:21:18 +00:00
Nathan Gray
ae1b9c8a64 - Don't let tidy wrap lines - line breaks don't go inside tags
- If tidy reports errors, strip all tags so we should get some sort of openable file
2011-09-07 15:15:08 +00:00
Nathan Gray
d71b807b8f Use 'utf-8' (instead of utf8) as the encoding, it seems to solve any encoding issues 2011-09-06 18:21:39 +00:00
Nathan Gray
67d7615ecc Fix config for HTML Tidy, fix stripped text in lists 2011-09-06 17:22:48 +00:00
Ralf Becker
7984af4c0e specify encoding, as it defaults to latin1 (iso-8859-1) which is not longer used by EGroupware and writes non-ascii as entities 2011-09-06 06:25:17 +00:00
Nathan Gray
9e17bd1faa If HTML Tidy is available, use it to clean HTML content 2011-09-05 20:24:10 +00:00
Nathan Gray
cb5ee32664 Remove spans with no attributes, they're invisible and can cause invalid XML with linebreaks 2011-09-05 16:10:04 +00:00
Ralf Becker
bc739d8309 adding an empty hidden field, to force some return value, if no account was selected for export_limit_excepted, without any return value nothing gets returned and therefore stored 2011-08-30 08:16:51 +00:00
Ralf Becker
389486793d - config is now cached on instance level
- arrays in $GLOBALS[egw_info][server] are now automatically serialized and unserialized
- new static method to check if user is export-limit excepted
--> saves to query it on each request (for non-phpgwapi, which was already cached in the session)
2011-08-26 13:50:20 +00:00
Nathan Gray
0571ac47e2 Get basic HTML formattings working in word 2003, formattings inside table working in word documents 2011-08-25 20:28:24 +00:00
Nathan Gray
005b483487 Replace extra XML declaration 2011-08-25 15:46:54 +00:00
Nathan Gray
bb00c4217d Don't fail if table has properties, support table borders in docx files 2011-08-24 17:29:03 +00:00
Nathan Gray
42af1f2db6 Fix line breaks in xmlWord.Documents 2011-08-23 19:56:46 +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
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
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
Ralf Becker
e474b0f0d4 - insert in document action:
+ one submenu with default document (if set) on top
  + if more then 9 documents, show them in submenus by mime type
- added copy address as second point to add submenu, beside new
- icons for move to addressbook
- fixed icons for org views
--> addressbook context menu should now be fully functional - let me know if not ;-)
2011-04-25 11:30:37 +00:00
Ralf Becker
dfeedf64c5 make prefix for documents a parameter and properly decode file names 2011-04-17 08:42:07 +00:00
Ralf Becker
806d3d604c added context menu for nextmatch widget: first implemenation in timesheet
- legacy actions column and multiple action row below table is switched off by default, but can be switched on again
- legacy action button is NOT yet working
- "whole query" checkbox need to go into context menu too
2011-04-16 21:45:13 +00:00
Christian Binder
a1b44f8df7 projectmanager: added a moreOptions dropdown list to the link add widget in elements view to be able to assign eRoles to added elements quick; added a preference to give a downloaded merge document a default name 2011-04-08 19:32:17 +00:00
Nathan Gray
eb337b7dec Don't throw an exception, just leave the cells as text and log it. 2011-04-06 20:57:40 +00:00
Nathan Gray
1d41d567a0 Iteratively increase backtrack limit to try to handle preg_replace limitations on larger files 2011-04-06 20:45:14 +00:00
Nathan Gray
64cf625403 Avoid weird problem with account_id & preg_replace clearing content 2011-03-31 18:13:46 +00:00
Nathan Gray
9056a41ebf Fix autodetection of numeric fields 2011-03-29 17:46:07 +00:00
Nathan Gray
9b072a81a7 Command processing needs to do escaping for XML too 2011-03-28 20:36:15 +00:00
Nathan Gray
e13ef7c892 Get automatic number formatting working for Excel 2003 xml files 2011-03-21 14:53:41 +00:00
Ralf Becker
6c05070aa0 fixed warning: implode(): Invalid arguments passed in /var/www/epl-trunk/etemplate/inc/class.bo_merge.inc.php on line 569 2011-03-18 15:14:55 +00:00
Nathan Gray
62a856b1c9 Force . as decimal separator for OO.o spreadsheet 2011-03-15 15:31:21 +00:00
Nathan Gray
fe18d21f4b Export limit does not apply to admins 2011-03-15 15:13:46 +00:00
Nathan Gray
4831a34ffa Add ability for extending class to specify its own numeric fields 2011-03-14 22:06:23 +00:00
Nathan Gray
dffb0b87dd Fix linefeed for NELF + application/xml mimetype 2011-03-10 17:23:28 +00:00
Nathan Gray
22b4e56958 Add a LF for excel 2003 2011-03-10 16:50:40 +00:00
Nathan Gray
c2c42cfa92 Use text:line-break, no guarantee that there will be a span 2011-03-03 18:22:49 +00:00
Nathan Gray
57fa8b5504 Automagically detect & set type for numbers when merging into a OO.o calc spreadsheet 2011-03-03 00:15:27 +00:00
Nathan Gray
e81802d0cd Promote number_format() to base class so it's available for all extending classes 2011-02-28 20:31:56 +00:00
Nathan Gray
830fcad2f6 Fix commands for table repeats 2011-02-28 19:16:58 +00:00
Nathan Gray
d6aa239e62 Make merge respect export limit 2011-02-24 00:08:12 +00:00
Nathan Gray
e100e423d8 Move special flags IF, NELF, etc to function so they can be used in a table 2011-02-23 21:01:37 +00:00