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

1717 Commits

Author SHA1 Message Date
Ralf Becker
eec0972bc0 share cookie with regular EGroupware (required for Stylite hosting) 2013-09-12 15:23:38 +00:00
Ralf Becker
cfd0923c97 need to tell php session to use secure and httponly cookies too 2013-09-11 12:39:32 +00:00
Ralf Becker
ee3544d3d1 fixed language selection got lost 2013-09-11 12:18:40 +00:00
Ralf Becker
eb06a2adee setup uses now sessions too and password-hashes in header.inc.php use most secure hashing type 2013-09-11 11:35:20 +00:00
Ralf Becker
892500fee3 change cli detection to use php_sapi_name() 2013-09-10 17:29:58 +00:00
Klaus Leithoff
0abc706463 commit some french lang file stuff; provided by Thomas Chaillot, Spirea 2013-08-30 07:09:32 +00:00
Klaus Leithoff
dae7123c77 commit some lang file stuff; mostly french 2013-08-26 09:39:33 +00:00
Klaus Leithoff
95e18fd5a7 merge russian lang files provided by MBCGroup 2013-08-16 11:01:33 +00:00
Ralf Becker
30d6d76d7a allow to set smtp auth options via setup-cli 2013-07-15 15:27:14 +00:00
Ralf Becker
5caa242314 * Admin/Active Directory: create new users with CN=<username> as Windows does and allow to configure profilePath, homeDirectory, homeDrive and scriptPath for new users 2013-07-09 15:26:59 +00:00
Ralf Becker
809aa0c63c fixed setup-cmd-ldap copy2ad to fix samba-tool clasicupgrade wrong set never expiring accounts to correct value 2013-07-09 13:47:47 +00:00
Ralf Becker
71489f3eda * Setup/Active Directory: setup_cmd_ldap sub_command=copy2ad now checks multivalue attributes caseinsensitive for doublicate values and new parameter no_sid_check=1 allow to use it for migrating mail-attributes without Samaba checks 2013-07-09 09:56:32 +00:00
Ralf Becker
ed24fa796d allow to copy uid and just set an attribute eg. "attributes={\\server\\homes\\}homeDirectory=uid,{H:}homeDrive=" 2013-07-06 09:37:08 +00:00
Ralf Becker
d522bbd808 * Debian/RPM: fixed "PHP Fatal error: Call to a member function drop_add_all_langs() on a non-object" on install/update of a non-default package 2013-06-28 14:15:28 +00:00
Ralf Becker
aa1426b8de * Admin: split password strength config in minimum length and number of character types, allow account backends specially AD to report password policy failures 2013-06-25 16:37:44 +00:00
Ralf Becker
c44be3ee6d handle not available AD or LDAP connection with an exception, caught and just displayed within setup, so one can change ip or credentials 2013-06-23 09:58:08 +00:00
Ralf Becker
8d93ebb01e * Setup: allow to enable account in AD via setup-cli.php and renamed --postfix and --cyrus options to more generic names --smtp and --imap 2013-06-20 14:48:53 +00:00
Ralf Becker
025c6a4c22 need to report expired accounts as NOT active and add ability to copy shadowExpire attribute from LDAP to AD (not done by samba-tool classicupgrade!) 2013-06-20 09:54:08 +00:00
Ralf Becker
6291318635 * Setup/LDAP/ADS: script to copy from samba-tool classicupgrade not copied inetOrgPerson and mail-server attributes 2013-06-19 20:29:41 +00:00
Ralf Becker
014a273908 * Setup/LDAP/ADS: script to change uidNumber and gidNumber in LDAP to match relative id (last part of SID) in preparation of Samba4 migration and using ActiveDirectory 2013-06-18 18:14:08 +00:00
Klaus Leithoff
079b919bbe russian translations provided by Vladimir Gavrilov (MBC-Group) 2013-06-17 12:30:44 +00:00
Ralf Becker
da74bf4210 prefering mysqli for new installs 2013-05-26 09:43:10 +00:00
Ralf Becker
3996f8a936 * MySQL: got mysqli extension working and make it default for EGroupware, as mysql is now officially deprecated, existing installs need to be switched manually in header.inc.php or Setup >> Manage header 2013-05-26 09:32:41 +00:00
Ralf Becker
b8ce46782c re-order ADS above CAS, as it now also allowed for account storage and translations 2013-05-25 09:15:17 +00:00
Ralf Becker
8c6fd8d936 changes to create users and set passwords on win2008r2 2013-05-24 17:08:15 +00:00
Ralf Becker
eaf3e6e1a5 offer to delete all existing accounts from SQL tables, before migration to it 2013-05-23 14:33:14 +00:00
Ralf Becker
4e1a2bc048 fixed typo causing admin account creation to fail, if "delete all users and acl" was checked 2013-05-22 18:30:04 +00:00
Ralf Becker
4037993dc5 * API: full support of active directory as account storage, tested so far with Samba4 2013-05-22 17:22:20 +00:00
Klaus Leithoff
c9e8e0b115 replace old sieveport 2000 with new default 4190 2013-05-21 14:54:01 +00:00
Ralf Becker
93710e09e1 * Setup/API: improved diagnostics about db connection problem and not installed EGroupware 
- removed deprecated egw_db->Halt_On_Error handling in favor of just exceptions
- added a couple of exceptions extending egw_exception_db to be able to detect different problem areas
- fixed setup to use / catch exceptions
- new egw_exception_db_setup displays link to setup below exception message, to cope with no longer allowed html in exception messages
 2013-03-05 10:50:43 +00:00
Ralf Becker
b46770872e new German translations from Stefan 2013-02-18 15:52:43 +00:00
Ralf Becker
4e77413fe9 new english phrases 2013-02-18 15:36:57 +00:00
Ralf Becker
be6845b4d0 * All apps: merged missing translations from other apps or branches 2013-01-18 13:48:34 +00:00
Nathan Gray
6cae734945 Fix historylog, links & categories sticking around if app is deleted 2013-01-14 20:25:37 +00:00
Ralf Becker
2fed3637be migrate mailbox name (mailMessageStore) when migrating mail accounts, otherwise default get created, which might differ 2012-11-23 09:17:32 +00:00
Ralf Becker
0649db0901 added a warning if account-migration to SQL of certain groups will fail, because they have identical IDs as existing users 2012-11-20 16:02:53 +00:00
Ralf Becker
fc074d0856 account migration changes now account_repository and auth_type to migration type (no need to store that type first) 2012-11-20 15:32:23 +00:00
Ralf Becker
7cd9685d71 mail account and addressbook migration in all directions and for dbmailuser schema too 2012-11-20 09:13:16 +00:00
Ralf Becker
67f71992ee first take on migrating mail accounts from LDAP to SQL (only qmailUser schema) 2012-11-19 09:59:00 +00:00
Ralf Becker
ec2ce0f943 * Setup: when migrating accounts from SQL to LDAP or back, also migrate addressbook data 2012-11-19 08:23:09 +00:00
Ralf Becker
000f51f704 remove - no longer existing - call to setup_translation::drop_add_all_langs() 2012-11-08 09:30:56 +00:00
Ralf Becker
a709f6104f * Setup/API: translations are no longer installed in database, but loaded directly from lang-files into tree-level cache 2012-11-05 12:18:22 +00:00
Ralf Becker
3625cfb855 setup too: new function "Clear cache and register hooks", also called automatic when restoring a backup 2012-10-31 17:17:28 +00:00
Ralf Becker
186bd29e0d manually including traditional.css, as setup does not resolve commented @include in css files 2012-10-26 09:06:34 +00:00
Ralf Becker
a81d7126aa setting and checking required PHP version of 5.3 2012-10-26 08:50:07 +00:00
Ralf Becker
03fe6356cb allow to create an instance specific admin, user- or group-context 2012-10-12 13:35:20 +00:00
Ralf Becker
1093103856 fixed not working account migration: need to invalidate cache: otherwise no migration takes place, if cached results says account already exists 2012-10-12 12:55:19 +00:00
Ralf Becker
f3574b59bc allow to specify grant host for database creation 2012-10-12 10:57:21 +00:00
Ralf Becker
86a8ce1839 disable PHP 5.4 E_STRICT warnings in setup, as already done inside EGroupware 2012-09-14 16:38:17 +00:00
Ralf Becker
e64013f413 a little more sophisticated test if we have a functioning database, before trying to store a setup_cmd object, otherwise it stalls the update 2012-08-13 12:14:37 +00:00
Ralf Becker
e913a6a263 pending translations from translation.stylite.de 2012-08-08 12:11:04 +00:00
Ralf Becker
e23996a45b using new syntax 2012-06-19 17:43:37 +00:00
Ralf Becker
34ad2c9722 check if date.timezone is set, report it and set something if not, as it gives tons of errors in install log 2012-06-13 13:36:57 +00:00
Ralf Becker
c3e0a2ab15 * Setup/Admin: restoring 10 rows per sql statement to speed up restore 2012-06-10 12:38:35 +00:00
Klaus Leithoff
254fc0e565 fix issue for changed default param for emailadmin_bo contructor; always use setDefaultProfile if there is NO profile available at all; fix issue regarding missing control of group ownership on edit.general 2012-04-25 10:08:53 +00:00
Ralf Becker
5e76d4197e * EMailAdmin/Setup: fixed wrong created default profile, user profiles and signatures were ot allowed, due to changed default parameter -1 --> false 2012-04-24 17:45:19 +00:00
Ralf Becker
a3ada52adf * Admin/ImportExport: fixed import of already hashed passwords 2012-03-29 18:33:33 +00:00
Ralf Becker
508c3c5517 * Admin/Setup: button to mount backup directory under /backup into VFS 2012-03-27 11:20:08 +00:00
Ralf Becker
6c4a1e0b72 adding Mac ports location of tnef 2012-03-11 09:39:19 +00:00
Ralf Becker
43092fea2e setting recommended php version to 5.3, not sure why we havnt done that already 2012-03-11 09:37:38 +00:00
Ralf Becker
163ca468f8 quieten message that "jdots" is not installed 2012-01-09 10:25:56 +00:00
Klaus Leithoff
d2f4d36355 more work regarding the implementation of the new feature that allows to specify smtp auth credentials for alarms/notifications only (otherwise credentials of corrent user are used) 2011-10-06 09:13:48 +00:00
Ralf Becker
2ed73047df fixed serveral issues around cached config: 
- changing config in setup did not update or unset the cache --> instance was NOT using it
- new installs failed, because cache was not configured
- cache command to not configured cache gave fatal error, now they throw a (catchable) exception
 2011-09-13 09:25:25 +00:00
Ralf Becker
a363919485 added check for tidy and xmlreader extension 2011-09-06 09:53:28 +00:00
Hans-Jürgen Tappe
c563830c4a Fix a typo. 2011-09-03 17:04:02 +00:00
Ralf Becker
54bf7a3d2d - fixed image map was empty created when not loged in (now directories are used and not $GLOBALS['egw_info']['apps']) 
- fixed not working vfs-image-dir
- deleteing image-maps when:
  + apps get installed, updated or removed
  + admin >> register hooks
  + admin >> site configuration: vfs-image-dir get changed
- fixed not displayed validation errors (thought there were no validation) in admin >> site config
--> you need to register hooks, in order to get the admin >> site configuration validation hook ;-)
 2011-08-31 10:16:12 +00:00
Ralf Becker
da3ce46d14 added Laotian language to setup 2011-08-09 07:29:08 +00:00
Ralf Becker
e2b385ed9c new setup command (object) to register all hooks and adding it to setup-cli.php 2011-06-29 08:40:24 +00:00
Oscar Manuel Gómez Senovilla
164871ec02 Update Czech translation for trunk. Tracker #2886 2011-06-23 13:53:19 +00:00
Klaus Leithoff
d32809bb90 * emailadmin: restored capability of storing setup mail server settings to first default emailadmin profile (no app, no group, no user) 2011-06-20 09:56:39 +00:00
Ralf Becker
17ce63390c setup-cli / post_install command to install/update a single (non-default) app 2011-06-18 10:44:56 +00:00
Ralf Becker
8e7c73dd84 some fixes for English and Suomi translation, from our Suomi resident here as Stylite 2011-06-16 13:01:29 +00:00
Ralf Becker
c2feef73de using preferences class to set preferences 2011-06-11 11:53:43 +00:00
Ralf Becker
fcfbd038bc some fixes for the English translation, from our Suomi resident here as Stylite 2011-06-10 06:19:36 +00:00
Ralf Becker
c0cf0788e2 fixed not working new trunk installs 2011-06-07 08:02:06 +00:00
Ralf Becker
562343a4dd disabling permanent error_log and missing translation 2011-06-06 06:39:07 +00:00
Ralf Becker
fae1d29e68 - implemented more secure password hashing types: sha512_crypt, sha256_crypt and blowfish_crypt (later was only just broken) 
- DB schema update for account_pwd to varchar(128) to accomodate sha512_crypt hashes
- enable automatic migration to sha512_crypt, if on SQL or LDAP (but only on Linux, as OpenLDAP has not native support for it)
 2011-06-05 23:22:51 +00:00
Ralf Becker
574911d077 * Setup/API: new option to enforce ssl (without specifying a domain in Webserver-URL) 2011-05-31 13:33:26 +00:00
Ralf Becker
9fe576f050 fix for bug #2965 - "setup-cli.php --check" prints additional unintended lines on exit code 14 2011-05-28 07:23:02 +00:00
Ralf Becker
c95df01460 add importexport and activesync to apps of Default group, when creating a new admin user 2011-05-07 12:36:46 +00:00
Ralf Becker
99910cd62e historically crypt is called des in ldap 2011-05-04 20:19:59 +00:00
Ralf Becker
e0614a8a6a keeping the old defaults to not break existing installs 2011-05-04 17:57:12 +00:00
Ralf Becker
ceb9cf34f6 fixed broken password hashes hook (default label was in option value) 2011-05-04 16:30:19 +00:00
Ralf Becker
86be53f4a3 showing ssha as default and sorting it as top option 2011-05-04 13:47:44 +00:00
Klaus Leithoff
f0aa9131d1 fix bug on failed install of new instances 2011-05-04 13:45:01 +00:00
Ralf Becker
57fc9c63fc - fixed with ssha not working migration from sql <--> ldap 
- using 16 char salt for ssha and smd5 as eclipse ldap admin does
- remove auth::hash_sql2ldap() method, as it is now in setup/inc/class.setup_cmd_ldap.inc.php
- added ability to create uid dn in setup_cmd_ldap subcommand create_ldap
 2011-05-04 09:42:50 +00:00
Ralf Becker
457e79454d * Setup: making SSHA (salted sha1) hashes the default password hash for SQL and LDAP 
- fixing not working ssha hashes if mb_string.func_overload > 0 set
 2011-05-04 07:52:45 +00:00
Ralf Becker
5ea2945538 allow to return passwords hashes as array 2011-04-01 14:00:25 +00:00
Ralf Becker
4039fdf415 * give everyone implicit rights for home app, as taking them away makes to many support problems 2011-03-30 07:54:29 +00:00
Ralf Becker
70c105d2ec only register hooks for installed applications 2011-03-28 17:54:02 +00:00
Ralf Becker
4c9b620657 missing auth_type_activesync hook 2011-03-28 17:29:07 +00:00
Philip Herbert
ea1ef050b8 allow to set auth type used for activesync in setup 2011-03-28 09:45:28 +00:00
Nathan Gray
374b65e0b8 Add link to find and register all application hooks 2011-03-23 16:19:32 +00:00
Klaus Leithoff
e33aa2978c * API/Authentication: add fallback to sql for mail authentication. 2011-03-23 13:19:48 +00:00
Stefan Becker
b2ef231049 adding German Translations 2011-03-21 14:19:02 +00:00
Ralf Becker
ea989a2af8 dont show vfs_storage_mode "custom", if not custom 2011-03-07 14:15:44 +00:00
Ralf Becker
403600fdd9 * removing memory limit from backup download, by switching off output buffering and zlib output compression 2011-02-25 13:13:40 +00:00
Ralf Becker
68e369cdd7 use /usr/bin/tnef if available, before search tnef or ytnef via which in the path, to cope with system having it NOT in the path, but at its standard location 2011-02-22 13:09:09 +00:00
Ralf Becker
d5a4b78bae * fixed "undefined function lang_select" issue, if no cookies are allowed, also showing again language selection for new installs 2011-02-03 02:01:48 +00:00
Nathan Gray
792e0af077 Remove configuration when removing an app 2011-02-02 15:53:45 +00:00
Nathan Gray
18882c57c7 Remove an app's categories when removing the app 2011-02-02 00:45:54 +00:00
Oscar Manuel Gómez Senovilla
28d2b6b072 Update for translations in trunk 2011-01-30 12:53:49 +00:00
Ralf Becker
3afe73c701 do NOT allow to change backup_files config if backup is called outside of setup, as it can have a huge impact on the server 2011-01-20 22:17:06 +00:00
Ralf Becker
dbfb13ce5c fix broken alternating line colors 2010-12-19 21:16:43 +00:00
Klaus Leithoff
ac431bfbcf extending check install for optional tnef/ytnef check used by FeLaMiMail to decode winmail.dat files/attachments; Provided by HJTappe; Adding check for PEAR::MailMime and PEAR::Mail_mimeDecode used by FeLaMiMail to import message/rfc files to a mailbox 2010-10-20 09:42:32 +00:00
Ralf Becker
8be6483a2a * added valid timezone set in php.ini check 2010-09-29 09:15:29 +00:00
Ralf Becker
453945c9c9 fix an other PHP5.3 deprecated error 2010-09-27 14:28:36 +00:00
Ralf Becker
83a9c7253c several fixes around jpgraph: 
- fixed wrongly reported jpgraph path "/jpgraph", if open_basedir is active and parent of EGroupware dir not accessible
- detect if jpgraph.php is direct in jpraph directory or in src subdirectory
- allow to specifiy arbitrary jpgraph path via defining EGW_JPGRAPH_PATH (eg. in header.inc.php)
--> should fix most jpgraph related issues
 2010-09-25 07:38:27 +00:00
Ralf Becker
22392e54b0 fixed SQL error in install from backup, as suggested by Hans-Jürgen 2010-09-18 17:10:35 +00:00
Ralf Becker
409b8dd552 removed old jpgraph version and added setup and pm level checks asking user to install a recent one 2010-09-17 17:25:44 +00:00
Ralf Becker
856c19553c As suggest by Hans-Jürgen: Warn if some required apps are NOT installed: phpgwapi, etemplate, egw-pear, home, admin, preferences 
Should also remind people about the required egw-pear app ;-)
 2010-09-17 09:45:55 +00:00
Ralf Becker
6154863394 remove hooks of apps, when deleting them (event if sources are no longer there) 2010-09-15 20:09:57 +00:00
Ralf Becker
699ce1b1a9 facilitate downgrade, if supported by "update" scripts: run downgrades automatic 2010-09-15 19:10:00 +00:00
Ralf Becker
86237f991b mark row of apps with deleted sources with color of delete column 2010-09-15 19:08:29 +00:00
Ralf Becker
1e879b3353 do NOT complain about regulary disabled egw-pear 2010-09-15 18:33:32 +00:00
Ralf Becker
871e5718af using one list of auth-types (in order of importance) and detecting additional ones in the filesystem 2010-09-10 09:26:17 +00:00
Ralf Becker
7706645423 check if app is either installed or supports the used database (before installed, but not supported apps where not updated) 2010-09-08 12:24:05 +00:00
Ralf Becker
48a21f74de fixed PHP Warning: fclose(): 146 is not a valid stream resource in setup-cli.php --update 2010-09-08 08:55:06 +00:00
Ralf Becker
26ed58af98 need to setup ldap data in setup_cmd_ldap, before calling the hook 2010-09-02 08:50:48 +00:00
Ralf Becker
20912e702d upps, fixed wrong parameter order 2010-08-31 10:26:43 +00:00
Ralf Becker
bfc3b262b3 rest to implement support for different mailbox names types / mail_login_types 2010-08-31 10:13:28 +00:00
Ralf Becker
2ebd10efba new command to set mailbox attribute 2010-08-31 09:33:29 +00:00
Ralf Becker
d6822d9564 - fixed not working accounts::cache_invalidate(): cache is now in regular egw_cache on session level 
- calling static methods static: accounts::cache_invalidate() or egw::invalidate_session_cache()
- fixed wrong number of deleted items in setup_cmd_ldap sub-comand=delete_ldap
- only use create, if we have an ldap_admin_pw set
- call an add_account hook for each created account, if specified (not by default)
 2010-08-29 08:16:27 +00:00
Ralf Becker
7be62b431f moved logic of account-migration to setup_cmd_ldap and using setup_cmd_ldap for account_migration.php, that way we can also create the ldap-structur during the migration 2010-08-26 20:22:02 +00:00
Oscar Manuel Gómez Senovilla
65f1702caa Tracker #2657 2010-08-25 16:23:17 +00:00
Oscar Manuel Gómez Senovilla
2f0df89b4f Tracker #2703 2010-08-25 16:14:29 +00:00
Ralf Becker
6c885b31fb - setting set_defaults also with values containing (now replaced) replacements like $domain 
- shorten db-name/-user to self::MAX_DB_NAME_LEN chars
 2010-08-25 12:24:11 +00:00
Ralf Becker
442bdbe564 - new admin-cli command --add-user like --edit-user, but runs addaccount hook for existing accounts too 
- using --add-user instead of --edit-user in setup_cmd_admin
 2010-08-20 20:28:59 +00:00
Ralf Becker
9df4f2e93b setup_cmd_admin execs "admin/admin-cli.php --edit-user" to run all hooks, which can NOT run in setup 2010-08-20 19:28:08 +00:00
Ralf Becker
aee5936945 some fixes for base deletion and counting of active users 2010-08-20 14:18:21 +00:00
Ralf Becker
c71ffc8646 new sub-command to delete ldap tree 2010-08-20 13:27:37 +00:00
Ralf Becker
19a25d392d some more adapting to current emailadmin: sieve host is not yet used, but defaulting to NULL is what emailadmin does too 2010-08-20 11:15:59 +00:00
Ralf Becker
ebc83beb06 updated mail config to match current emailadmin 2010-08-20 10:18:29 +00:00
Ralf Becker
a65406b88b * restore to current system charset, to force all restores to utf-8, and do NOT halt on sql errors in restore 2010-08-19 08:07:06 +00:00
Ralf Becker
5af87bf976 using organizationalRole instead of namedObject which seems to be suse specific 2010-08-18 09:14:30 +00:00
Ralf Becker
10cf1b2b8e * not overwriting system configuration (eg. pathes) on restore, which break a running system and if called from within EGroupware update the restored backup, in case it is an older version 2010-08-15 15:46:23 +00:00
Ralf Becker
5d6e6cdc9c new parameter $make_db_name_unique to append a decrementing numeric postfix to db_name and db_user, if db already exists 2010-07-31 09:23:41 +00:00
Ralf Becker
d02badfed5 using functions moved to setup_translation class and modernising setup_html 2010-07-29 08:29:54 +00:00
Ralf Becker
b71035b529 marking all static methods static and moving method to query supported languages into setup_translation class 2010-07-29 08:14:15 +00:00
Ralf Becker
77982bb646 fixed typo 2010-07-29 07:49:38 +00:00
Ralf Becker
58993cfb7b - using EGW_*_ROOT instead of .., to allow running from different directories 
- allow running setup_cmd_admin directly via the command line with regular syntax (was already possible under special syntax)
- limiting database names to 16 chars, which is the limit in mysql
 2010-07-26 08:20:14 +00:00
Ralf Becker
f0488300c8 avoiding deprecated warning under php5.3 2010-07-25 09:08:24 +00:00
Ralf Becker
ab9e549d38 always enable history logging for calendar, addressbook and infolog 2010-06-16 08:57:40 +00:00
Ralf Becker
83206fd03f added a check for json extension 2010-06-11 13:36:11 +00:00
Ralf Becker
9c837c57f9 always enable spellchecker, ckeditor now uses spell-as-you-type via a public webservice 2010-06-10 05:55:15 +00:00
Klaus Leithoff
963b99ea5b removing the defaultvalue for the imap_server, as we do not require imap_server for setup anymore 2010-05-28 13:19:23 +00:00
Stefan Becker
911cba0189 added some German translations 2010-05-21 12:23:15 +00:00
Ralf Becker
eb35aaf20b "adding 'bookmarks' & 'phpfreechat' to apps of Admins group" 2010-05-20 18:43:09 +00:00
Ralf Becker
0bb075abcd "adding 'notifications' & 'syncml' to apps of Default group" 2010-05-20 18:24:48 +00:00
Klaus Leithoff
f7e70b5feb remove pop3/pop3s from setup_cmd_config, as it is not supported anymore 2010-05-20 12:59:49 +00:00