holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,690 Commits 27 Branches 330 Tags 157 MiB
bff2bdc6d6
Commit Graph

310 Commits

Author SHA1 Message Date
Nathan Gray
1657114628 - Add 'Add' button to add a new condition 
- Matching conditions stop by default now
 2011-11-03 20:23:04 +00:00
Nathan Gray
9158834db3 Add ability for user to override definition's delimiter when importing 2011-11-03 16:18:26 +00:00
Nathan Gray
89ecce38bf Fix SQL error preventing multiple users/groups allowed to share their own definitions 2011-10-31 19:36:21 +00:00
Nathan Gray
a3ad2a0392 Add options tab to export dialog so user can change delimiter when exporting 2011-10-31 19:18:06 +00:00
Nathan Gray
41493e7c51 Move preserve to allow for clearing conditions 2011-10-31 16:30:57 +00:00
Nathan Gray
79baa55fe2 Fix some problems with read-only wizard: 
- New definitions aren't read-only
- Hide 'Just me' checkbox when read-only, to avoid confusion
- Wizard stays read-only if you go to previous step
- Disable Change context menu for definitions the user has no permission to change
 2011-10-26 19:54:15 +00:00
Nathan Gray
df44d80c60 Make wizard steps read-only if user is not owner or admin 2011-10-25 21:55:55 +00:00
Nathan Gray
3e194b16fe Add convert option, affects how date/times & categories are parsed 2011-10-25 18:54:23 +00:00
Nathan Gray
f0b86e7cbe Fix 12 hour time format (missing am/pm) when exporting 2011-10-25 17:18:17 +00:00
Nathan Gray
93b9d99cd5 Don't treat numeric category names as IDs 2011-10-25 17:09:31 +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
f616b34f58 API: introduce register_single_app_hook to be able to add or update one hook for an required app. register added/updated hooks with ->location; calendar and addressbook are using this to insert export_limit hook if not available. use app hook to fetch app specific export limit with import_export side_menu additions too 2011-09-15 16:53:20 +00:00
Klaus Leithoff
a2730516fe silence some error log statements 2011-09-13 10:16:29 +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
Klaus Leithoff
25fcf25bdb code cleanup: as bo_merge::is_export_limit_excepted checks for ->is Admin<- already 2011-08-30 15:27:47 +00:00
Klaus Leithoff
6a2d5d8b36 using new bo_merge static function to check for is_export_limit_excepted; fixing an off but vone error regarding the limit of rows returned 2011-08-29 15:02:00 +00:00
Nathan Gray
0264b70a0b Silence warning when export exception is not set 2011-08-22 14:20:44 +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
9de3b4afc9 Use similar_text() to try to automatically match import field names to application fields when there's no exact match 2011-08-09 18:19:58 +00:00
Nathan Gray
89c2097894 Add new import translation function list(sep,field,index) to explode a field and pick one part 2011-08-05 22:04:05 +00:00
Nathan Gray
63caf59444 Use admin/preferences as appname for sidebox links 2011-07-04 15:35:53 +00:00
Nathan Gray
341bf0e8c4 Enable import CSV plugin, but remove default definition. Admin can create it if needed 2011-07-04 14:34:44 +00:00
Ralf Becker
03e379e570 * jQuery: changed $ to $j to work around mootools use in Joomla templates and other js code in imported projects 
required to change $ --> $j:
phpgwapi/*
jdots/*
etemplate/*
stylite/*
felamimail/*
admin/*
news_admin/*
projectmanager/*
importexport/*
infolog/*
ranking/*

required, but not automatic:
importexport/setup/etemplates.inc.php
phpgwapi/js/jquery/*

negative, not to touch or revert later:
phpgwapi/inc/savant2/Savant2/Savant2_Compiler_basic.php:		'(\$(.+))'            => 'print $1',
phpgwapi/js/dhtmlxtree/libCompiler/core.js
sitemgr/*
phpfreechat/*
gallery/*
activesync/include/smb.php:        '^\tIPC\\\$(.*)[ ]+IPC' => 'skip',
etemplate/inc/class.bo_merge.inc.php: if ($this->table_plugins && preg_match_all('/\\$\\$table\\/([A-Za-z0-9_]+)\\$\\$(.*?)\\$\\$endtable\\$\\$/s',$content,$matches,PREG_SET_ORDER))

find phpgwapi jdots etemplate stylite felamimail admin news_admin projectmanager importexport infolog ranking \
	\( -name '*.php' -o -name '*.js' \) -exec grep -q '\$(' {} \; -print \
	-exec sed -i '' 's|\$(|$j(|g' {} \;
svn revert phpgwapi/inc/savant2/Savant2/Savant2_Compiler_basic.php phpgwapi/js/dhtmlxtree/libCompiler/core.js \
	importexport/setup/etemplates.inc.php phpgwapi/js/jquery/jquery.js etemplate/inc/class.bo_merge.inc.php
	
additional changes:
phpgwapi/js/jquery/jquery.js:	window.$ --> window.$j
phpgwapi/js/egw_json.js:291	this.request = $j.ajax({url: this.url,
jdots/templates/jdots/head.tpl:59			$j(document).ready(function() {
phpgwapi/js/egw_action/egw_grid_view.js: $.browser --> $j.browser
importexport/setup/etemplates.inc.php: etemplate editor importexport.wizard_basic_export_csv.choose_fields onclick of check icon changed
phpgwapi/js/egw_action/tests/*.html
phpgwapi/js/egw_action/tests/js/jquery.js:	window.$ --> window.$j
 2011-07-03 09:00:36 +00:00
Nathan Gray
fe05c1cb03 Change selectbox back after 2011-06-28 15:52:26 +00:00
Nathan Gray
203fb83f0d Don't try to select all if the current search filters give no results, give an alert to select something 2011-06-27 17:23:59 +00:00
Nathan Gray
039e351d8b 'Disable' Export & merge spreadsheet in sidebox for addressbook view 2011-06-22 18:14:52 +00:00
Nathan Gray
615ea171c2 If automatically using 'select all', turn it back off again after merge 2011-06-20 16:36:51 +00:00
Ralf Becker
8e53f21349 using bo_merge::get_documents to get export documents 2011-06-17 14:07:10 +00:00
Nathan Gray
768859718f Update selection tab if definition is changed. 2011-06-09 14:42:58 +00:00
Nathan Gray
483069d970 Use nextmatch preferred definition as pre-selected export definition 2011-06-08 15:01:27 +00:00
Nathan Gray
7ee8739394 For calendar & sitemgr, use labels 'Import' & 'Export' instead of 'Import CSV' & 'Export CSV' 2011-06-08 14:55:25 +00:00
Ralf Becker
469f938967 consider running in setup (install/update of app) as run by an admin 2011-06-08 10:59:45 +00:00
Nathan Gray
42af223052 - Fix select all confirm message 
- When copying and name exists, try again with user lid.  If that fails, give nice error message
- When done editing a definition, send to definition index instead of reload + send POST again
 2011-06-06 16:08:57 +00:00
Nathan Gray
e7e424e1fc Get spreadsheet box working again 2011-06-03 22:00:18 +00:00
Nathan Gray
265a6d307e Use widthxheight for popup dimensions 2011-06-02 20:10:20 +00:00
Nathan Gray
0bb2f77376 Add some more icons to actions 2011-06-02 18:41:51 +00:00
Nathan Gray
8820c41c3d Add context menu 2011-06-02 16:50:41 +00:00
Nathan Gray
0cd5da6be9 Fix bulk delete / export 2011-06-01 13:56:24 +00:00
Nathan Gray
eeda69071f Pass definition to plugin 2011-05-30 17:51:57 +00:00
Nathan Gray
da20e2ea06 Add check all button 2011-05-24 17:04:16 +00:00
Nathan Gray
eed3385496 Allow admin to choose when to update default definitions: never, manual or auto 2011-05-24 16:13:51 +00:00
Nathan Gray
8af97a3c10 Add an option for charset to use the current user's preferred charset 2011-05-24 15:50:38 +00:00
Nathan Gray
7f06d6af00 If user chooses a name already in use, give a nice message with some alternate suggestions 2011-05-24 15:33:00 +00:00
Nathan Gray
6e26b80c1e Add special case for Calendar, non-list views need special handling 2011-05-24 14:53:23 +00:00
Nathan Gray
3ad9f4d932 Hide export link if admin disabled export site-wide 2011-05-20 16:55:34 +00:00
Nathan Gray
3808f6d5e0 Make sure users can access their own definitions 2011-05-19 16:11:26 +00:00
Nathan Gray
86ced579db Apply ACL to definition list - only show definitions user can use 2011-05-18 14:46:57 +00:00
Nathan Gray
d0d105b937 Disable delete using checkboxes too 2011-05-18 14:22:31 +00:00
Nathan Gray
614882c347 Disable edit / delete buttons for definitions you have no access to 2011-05-17 23:27:42 +00:00
Nathan Gray
785c484b4e If user didn't select any records to export, select all 2011-05-16 21:50:54 +00:00
Nathan Gray
06626b4cfc Skip spreadsheets shown in other selectbox 2011-05-16 18:42:49 +00:00
Nathan Gray
5101ac5c03 Translate select options 2011-05-16 16:02:20 +00:00
Nathan Gray
a63bcaa4d3 Avoid warnings from in_array() 2011-05-10 14:43:16 +00:00
Nathan Gray
e6ecb5415c Selectbox now works with jdots framework 2011-05-09 16:56:52 +00:00
Nathan Gray
f6f9617261 Make spreadsheet list useful, fakes a call to merge with the chosen document and the currently selected items 2011-05-05 21:40:15 +00:00
Nathan Gray
87c960b6ea Only show spreadsheet link if app has spreadsheets to show 2011-05-02 17:21:26 +00:00
Nathan Gray
9786f03980 Add a link to list of spreadsheets available for merging into 2011-04-26 20:30:26 +00:00
Nathan Gray
bbf3778172 Use a nextmatch for definition list 2011-04-19 16:00:43 +00:00
Nathan Gray
61862bf50d Trim any extra space off name / account login, it breaks the searching 2011-04-18 15:09:03 +00:00
Nathan Gray
e9d5ae4216 Special formatting for date custom fields 2011-04-14 16:58:28 +00:00
Nathan Gray
39faba482e Make sure selects is an array, if passed 2011-04-13 14:34:12 +00:00
Nathan Gray
dc270e8bae Change title of links for all apps from Import & Export to Import CSV & Export CSV in the correct place 2011-04-11 21:20:32 +00:00
Nathan Gray
9d722f1cf8 Change title of links for all apps from Import & Export to Import CSV & Export CSV 2011-04-11 20:55:20 +00:00
Ralf Becker
82bb3f8044 * ImportExport/PostgreSQL: fixed SQL error "wrong operator !" when defining a profil 2011-04-11 15:45:29 +00:00
Nathan Gray
459e6be4d2 Blacklist calendar CSV import because it doesn't work the same as the others, and you should use iCal. If someone needs it, they can put it back in. 2011-04-11 15:21:10 +00:00
Nathan Gray
927528e2ad If user does not have permission for Import / Export, skip all importexport sidebox links 2011-04-06 22:47:49 +00:00
Nathan Gray
b6e79184a2 Allow plugin selection settings to override preferences 2011-04-06 22:24:46 +00:00
Nathan Gray
49f8cc3258 Convert date/time to timestamp 2011-04-06 17:22:14 +00:00
Nathan Gray
7b804f41a4 Recognize empty as != 0 2011-04-06 15:40:30 +00:00
Nathan Gray
630720a662 Used passed appname when creating new categories 2011-04-04 19:05:15 +00:00
Nathan Gray
15bac6b211 Don't clear cat_id if it wasn't found, let app have the original 2011-04-04 17:28:35 +00:00
Nathan Gray
cd5bcab6b6 Add function to do automatic conversions from human friendly values, similar to the one in export. 2011-04-04 17:00:13 +00:00
Nathan Gray
ee0e75f283 Fix for exporting custom fields in user format - CFs are stored as text, not timestamp 2011-04-04 16:09:22 +00:00
Nathan Gray
af7ad5bec1 If there's only one option for plugin or definition, select it 2011-04-04 14:31:37 +00:00
Nathan Gray
ce38993281 Don't cast to array, it's often scalar 2011-03-28 21:51:35 +00:00
Nathan Gray
55ba81f0de Give user preference for selection precidence over plugin setting 2011-03-28 21:12:44 +00:00
Nathan Gray
e9c7e8b84d Make link to definitions work in Stylite template 2011-03-24 17:36:02 +00:00
Nathan Gray
e12406b486 Show link to define imports | exports in sidebox for apps that support it 2011-03-24 15:17:59 +00:00
Nathan Gray
89905fe2e8 If appname is passed in on URL, make appname read-only 2011-03-24 15:17:15 +00:00
Nathan Gray
58248a252d Add default 'Select...' option each time, make sure definition is cleared when changing definition list 2011-03-21 19:05:33 +00:00
Nathan Gray
9f20d116b6 Fix date comparison when importing definitions 2011-03-21 17:35:53 +00:00
Nathan Gray
bba2a4c2bb Make sure options is an array before trying to unset a sub-key 2011-03-21 17:13:25 +00:00
Nathan Gray
f43c3c7c13 Avoid warnings if no definitions found in file 2011-03-21 14:12:37 +00:00
Nathan Gray
2d20b29cee Fix automatic field mapping when a mapping field is an array (addressbook categories) 2011-03-17 14:34:10 +00:00
Nathan Gray
66f120ff2e Add optional parent parameter for new categories 2011-03-16 23:29:42 +00:00
Nathan Gray
83bbea7669 Try to set some default values for export definitions 2011-03-16 17:07:32 +00:00
Nathan Gray
2e752e17b6 Enhance account name -> ID to be able to handle user names in Lastname, Firstname format 2011-03-16 16:50:28 +00:00
Nathan Gray
d02eec55fb Trim extra whitespace from category name 2011-03-16 15:53:11 +00:00
Nathan Gray
f3536a72bf Improve error message for import errors. Just because there was an error doesn't mean the record wasn't imported using default info 2011-03-15 16:18:13 +00:00
Nathan Gray
9f32100656 Make account name->id translator able to handle full usernames and groups listed as Group, name 2011-03-15 00:01:23 +00:00
Nathan Gray
c94a591fee Make account name->id translator able to handle any IDs that are passed 2011-03-14 23:42:24 +00:00
Nathan Gray
da16cd319c Set default export-<appname> definitions as the site-wide default if no default is set 2011-03-14 23:07:46 +00:00
Nathan Gray
49bf54aace More agressive filtering on schedule options - all subsequent options start filtered 2011-03-14 20:55:42 +00:00
Nathan Gray
93241a65c5 Merge recursive to preserve sub-arrays 2011-03-14 20:39:54 +00:00
Nathan Gray
4b18c05ec3 Fix definition filter to allow admins access to their own private definitions 2011-03-14 17:35:01 +00:00
Ralf Becker
ed60695cd5 * fixed not working scheduled import from vfs 2011-03-11 16:03:08 +00:00
Nathan Gray
bd03ec245f Remove some deprecated ereg functions 2011-03-09 18:18:26 +00:00
Nathan Gray
a58a7892c9 Adjust the export to remove some fields not needed, only export owner if there is one. 2011-03-09 15:47:11 +00:00
Nathan Gray
738966ca68 Better handling of shifting to avoid deleted fields 2011-03-04 19:02:41 +00:00
Nathan Gray
a47732d530 Make category name->id translator able to handle any IDs that are passed 2011-03-04 18:53:02 +00:00
Ralf Becker
5344d0a0ae * ImportExport: fixed translation default value not working (eg. "1|>one||2|>two||other") 2011-03-04 17:42:53 +00:00
Nathan Gray
c99e804d8d Add 'All custom fields' field option, that will cause all custom fields to be exported 2011-03-02 17:08:43 +00:00
Nathan Gray
398185f525 Don't hide exports from admins, even if exporting is disabled for users. 2011-02-24 15:47:43 +00:00
Nathan Gray
9bd38bb45f Resize popup if step changes size 2011-02-24 00:13:42 +00:00
Nathan Gray
34354a2a6b Change config options, admin can now allow users to create their own definitions, and can choose which users are allowed to share their definitions with others 2011-02-23 23:44:20 +00:00
Nathan Gray
75ba2fc475 Hide exporting for admins too, if they've disabled exporting site-wide 2011-02-23 16:45:19 +00:00
Nathan Gray
127976b1ef Enforce export limit for csv exports 2011-02-22 18:17:13 +00:00
Nathan Gray
a019e94e55 Respect global setting export_limit = 'no' -> disable exporting 2011-02-22 17:43:33 +00:00
Nathan Gray
838f4664f1 * Add ability for users to define their own definitions 
- Permissions set by admin in the Site configuration
 2011-02-22 17:13:03 +00:00
Nathan Gray
880dd678d1 Set update_cat to saved value on first load 2011-02-14 16:04:18 +00:00
Nathan Gray
1cedf20503 Wrap definition constructor in a try/catch to catch & ignore permission errors 2011-02-14 15:54:28 +00:00
Nathan Gray
c6e285558e Fix for unable to clear translation field 2011-02-11 18:34:24 +00:00
Nathan Gray
ededa8f092 Use _bo is_permitted() function for consistency, fixes occasional exceptions due to group permissions 2011-02-11 18:03:44 +00:00
Nathan Gray
94c616bf12 Catch exception thrown when trying to instanciate a definition the user has no rights for, and discard it. 2011-02-10 20:45:32 +00:00
Nathan Gray
2ca0c13b34 Cast to array to prevent warnings 2011-02-08 16:01:55 +00:00
Nathan Gray
37417195eb Add auto-import of definitions in appname/setup/*.xml 2011-02-03 18:09:39 +00:00
Nathan Gray
a0d7bde2fb By default, don't show apps user doesn't have access to any definitions for 2011-02-03 16:49:49 +00:00
Nathan Gray
ae035df727 Actually use definition permissions 2011-02-03 16:42:03 +00:00
Nathan Gray
ae07ff2331 Use new sidebox_all hook to add importexport links to other apps' sideboxes 2011-02-03 16:32:03 +00:00
Nathan Gray
bd28fed482 - Hide expert options until they get worked out 
- Add caching function has_definitions() to see if there are any definitions for the user
- Fix permissions check
 2011-01-28 19:44:24 +00:00
Nathan Gray
a62484d106 If there's only one export definition, select it by default 2011-01-26 01:00:41 +00:00
Nathan Gray
0efb958fa1 Load the translations for the app for headings 2011-01-12 17:02:43 +00:00
Nathan Gray
8615b3c9fa Translation of field labels 2011-01-11 22:09:25 +00:00
Nathan Gray
5e9d01e176 Check if get_errors() exists before calling it to prevent fatal error 2011-01-11 18:06:28 +00:00
Nathan Gray
af918a2945 Use common::egw_exit() instead of just exit for extra cleanup 2010-12-20 22:00:19 +00:00
Nathan Gray
6246b1b58b Try to avoid extra output after file 2010-12-17 18:24:24 +00:00
Nathan Gray
806a5aec91 - Escape double qoutes 
- Allow to pass extra select/lookup values to convert()
 2010-12-17 16:39:11 +00:00
Klaus Leithoff
6afc97236e * ImportExport: Replace CRLF with LF so excel does not break lines early (myStylite#974) 2010-12-16 14:49:13 +00:00
Nathan Gray
8f05a9f411 Revert 33366, replacing \n doesn't help Excel 2010-12-15 22:51:07 +00:00
Nathan Gray
bbd874dc05 Replace all CRLF in values with CR so Excel doesn't break lines early. 2010-12-10 21:11:15 +00:00
Klaus Leithoff
b72fb5e76b code alignment 2010-11-24 11:25:37 +00:00
Nathan Gray
46a90c13f9 Fix field indexing in import definition wizard (causes confusion in translations) 2010-11-23 20:52:50 +00:00
Nathan Gray
fdfff16b55 Make the type icon in the definition list clickable, it will 'run' that definition 2010-11-23 20:15:51 +00:00
Nathan Gray
61c0654d17 Fix custom field multi-select export into one field 2010-11-23 15:29:57 +00:00
Ralf Becker
3ccf4a3587 fixed not working importexport: preferences can NOT store arrays, they need to be serialized before 2010-11-23 15:25:22 +00:00
Nathan Gray
4769db9539 Cast preference to array to prevent blanks 2010-11-23 15:15:48 +00:00
Nathan Gray
b522daf825 Keep user choices for next time they use the same export definition 2010-11-23 00:48:16 +00:00
Nathan Gray
84e99bbe25 Fix export conversion options 2010-11-23 00:02:40 +00:00
Nathan Gray
22441f3112 Add new option to convert to human friendly values 2010-11-22 23:34:06 +00:00
Nathan Gray
d8f79014f8 Fix merging of custom fields with provided fields 2010-11-19 15:55:08 +00:00
Nathan Gray
dcf7ce486f - Fix bug in field conversion where sometimes the first record would not be changed 
- Only try to convert dates / times if they are timestamps.  Some apps convert to user time already (calendar series)
 2010-11-09 19:07:47 +00:00
Nathan Gray
47ff785588 - Add an option for export header: use field names or human labels 
- Fix missing first field
 2010-11-09 18:14:49 +00:00
Nathan Gray
3b286a2fed Add more custom fields for parsing into conversion fields, move cf parsing into seperate function 2010-11-08 17:17:21 +00:00
Nathan Gray
c22440eea8 Add select & link entry conversion to custom fields 2010-11-05 20:22:28 +00:00
Nathan Gray
58231dfad1 Call functions in common statically 2010-11-05 19:31:53 +00:00
Nathan Gray
5fc2ffaba6 Use server's temp directory instead of /tmp 
Only pass filename, entire path is not needed (and a security issue)
 2010-11-05 19:29:45 +00:00
Nathan Gray
70d0e8dad1 Add export data conversion to a parent class so it can be used by other apps 2010-11-04 17:26:30 +00:00
Nathan Gray
edf5759a50 Check protocol to prevent direct file system access. Use VFS to access files on the server instead. 2010-10-19 17:29:11 +00:00
Nathan Gray
e4884335af Add option to choose to update or replace categories 2010-10-19 17:27:10 +00:00
Nathan Gray
845d8f533c Make sure field_mapping is an array before trying to index into it 2010-10-13 17:26:34 +00:00