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

5159 Commits

Author SHA1 Message Date
Ralf Becker
b5818b931f patched PHPMailer to allow to use STARTTLS and TLS version>=1, enhanced wizard to autodetect hosted 1-and-1 domains by using Mozilla ISPDB on MX or domain-part of MX, fixed folder detection to not require folders below INBOX 2014-04-04 08:31:28 +00:00
Ralf Becker
97dc98453c Horde_iCalendar::newComponent(): include relative from current dir, as we no longer set (old) Horde dir in include path 2014-04-01 13:41:45 +00:00
Ralf Becker
71b97568e5 restore include_path after include of (old) Horde lib/core.php to not conflict wth new Horde code installed in include-path 2014-04-01 12:33:14 +00:00
Ralf Becker
28a819926c fixed fatal error class Horde_String not found when trying to save a new compose with attached vCard as draft 
caused be previous include include of phpgwapi/inc/horde/Horde/String.php via use of vCard and old Horde code uses just String instead of Horde_String as class-name
 2014-04-01 10:37:36 +00:00
Nathan Gray
5be831d9dc Fix broken cache update when deleting a preference. 
Before, it would only store the preference for the updated app instead of all.
 2014-03-31 16:59:01 +00:00
Klaus Leithoff
f495345550 add some more examples for imap_rfc822_parse_adrlist 2014-03-28 09:48:09 +00:00
Ralf Becker
ca3f43838c fixed IDE warnings 2014-03-28 07:49:49 +00:00
Klaus Leithoff
5547753502 first step for a workaround when there is no imap extension available; ToDo: implement imap_rfc822_parse_adrlist (used quite often) 2014-03-27 14:03:06 +00:00
Ralf Becker
9a10af6fe5 missed to commit parameter to parse CN from url 2014-03-25 12:22:00 +00:00
Ralf Becker
659ad40b50 display old html::form_1button like a button inline-block 2014-03-25 12:17:46 +00:00
Ralf Becker
1f0dd46118 as we use now etemplate_new for eTemplate2 and etemplate for old eTemplate class, there is no need to switch etemplate class between new and old 2014-03-23 08:41:31 +00:00
Nathan Gray
764d7f99a5 Update CSS order so apps can customize theme: 
Libs < etemplate2 < framework/theme < app < print
 2014-03-18 15:29:03 +00:00
Ralf Becker
77579f364f fixe funny "Group, Name" label, should not contain a comma 2014-03-18 13:34:59 +00:00
Ralf Becker
804df769d5 fixed IDE warnings 2014-03-12 17:15:48 +00:00
Ralf Becker
f87e456be2 do not send/set extra data twice for multiple etemplate (eg. CRM view) 2014-03-10 15:20:27 +00:00
Ralf Becker
04442bb0cf move actions stuff to api bundle, as loading just it fails with etemplate bundle split in two parts (fixes error reported on devel list) 2014-03-04 09:10:58 +00:00
Ralf Becker
11d77f3dab fixed a couple of problems with automatic switch to idots template from mobile browsers: csp-error, wrong icons 2014-03-03 17:35:48 +00:00
Ralf Becker
f45c1e7d53 fixed all methods of common class are static 2014-03-03 17:33:55 +00:00
Ralf Becker
876a14ff52 new 4th parameter to egw_framework::includeCSS() to tell framework NOT to load any default CSS and make send_headers public 2014-03-03 14:54:03 +00:00
Ralf Becker
aa850d24fc implemented account_type: (accounts|groups|both) option for taglist-account as available in select-account widget 2014-02-28 16:52:42 +00:00
Ralf Becker
f218f9412c added note about certificate validation and some more diagnostics to error_log, for failed ADS auth 2014-02-27 12:05:37 +00:00
Klaus Leithoff
a46398da52 move groupdav to_ascii to translation class; unify content_header and content_disposition_header to be used by all downloads; adapt vfs_webdav_server thereof; try to improve replaceTagsCompletley 2014-02-25 15:48:23 +00:00
Ralf Becker
516713589f * WebDAV/Filemanager: reject to save files by clients using chunked transfer-encoding on servers which does not support that (eg. OS X Finder with server using FastCGI PHP) 2014-02-24 12:40:10 +00:00
Ralf Becker
4ff1a4efd1 fixed after new shutdown handling broken autoloading of tree nodes: json.php is used to send arbitrary JSON data, instead using egw_json_response methods (egw_json_request::isJSONRequest(false) turns that off now) 2014-02-22 15:51:14 +00:00
Ralf Becker
2f3add4ce9 hook to allow apps to add addional domains to CSP frame-src, eg. used by sitemgr to allow access to its sites, also fixed not displayed sidebox menu of old apps 2014-02-21 17:06:11 +00:00
Ralf Becker
a786894c27 new egw::on_shutdown($callback, $args) method to register shutdonw handlers to run after output send back to user, thought only really working with fastCGI, Apache mod_php waits ... 2014-02-21 15:38:38 +00:00
Ralf Becker
796663c2a6 fixed modified translations were not automatic loaded after new login 2014-02-21 11:10:11 +00:00
Ralf Becker
a9b6c6e9b4 * CalDAV/CardDAV: fixed support for limited sync-collection report used eg. by Marten Gajdas Android apps 2014-02-20 17:46:15 +00:00
Nathan Gray
5949016faa Move reading of favorites into a separate function from rendering list 2014-02-20 17:44:53 +00:00
Ralf Becker
3cbf1d24fb * eTemplate/all apps: limit displayed history to 500 entries 2014-02-20 12:47:06 +00:00
Ralf Becker
a7f65672c8 * All apps: run link notifications after processing and returning control to user to speed up saving of entries with links to (big) projects 2014-02-20 11:29:51 +00:00
Ralf Becker
2f8b7064d8 allow to send a redirect from server-side via client-side egw.link_handler(url, app) allowing to specify which tab to use and a top-level (ajax=true) url 2014-02-19 15:08:51 +00:00
Ralf Becker
5734d2e143 fix some html markup IE complains about 2014-02-19 11:49:53 +00:00
Ralf Becker
e22df1b7e2 fixed user agent detection to report correct IE version to fix not longer used svg images after last fix, also fixed all IDE warnings 2014-02-18 19:21:34 +00:00
Ralf Becker
e6052f9704 automatic split bundles with more then 50 files into chunks, as IE11 does NOT cache them otherwise 2014-02-17 17:15:37 +00:00
Klaus Leithoff
0d458c8119 disable transaction for mysql for restore, as a failure during restore may lead to an empty database, as drop table is not transactional for mysql 2014-02-17 16:16:44 +00:00
Klaus Leithoff
1c013e92f0 IE changed its USER_AGENT string; html:: report trident; change this to msie when detected, to match the use of msie throughout egroupware; use moonocolor as fallback skin, when ie anf ff are detected 2014-02-17 13:56:17 +00:00
Klaus Leithoff
597e8fdeac we allow filtered style sections now throughout egroupware 2014-02-17 11:35:25 +00:00
Klaus Leithoff
acd8b742e8 make sure that request parameters is array before binding/passing them to handle_request 2014-02-17 09:44:13 +00:00
Ralf Becker
ca12321613 fixed sitemgr-links show no navbar icon in Stylite/Pixelegg template 2014-02-16 09:12:08 +00:00
Ralf Becker
5e0ac9b76f moved favorites code to new class egw_favorites 2014-02-14 13:48:45 +00:00
Ralf Becker
be60a5036e older group-favorites have just true as their group and are not deletable, if we dont find correct group 2014-02-14 13:26:32 +00:00
Ralf Becker
0fa215c9e8 fixed sometimes not deletable favorites 2014-02-14 12:46:49 +00:00
Ralf Becker
e4d65ae94d do NOT check for run rights of preferences app, as we want to be able to store implicit preferences 2014-02-13 16:34:09 +00:00
Ralf Becker
476f33af23 until home works again, we use default_app from prefs (if set and not home) or calendar, if allowed, or first app found 2014-02-13 13:18:48 +00:00
Ralf Becker
80d74f863e fixed typo in adding classes causing image to be lost and cleaned up adding of classes 2014-02-13 11:00:29 +00:00
Ralf Becker
f0d7751496 removed caret from group favorites, fixed prefered favorite was not show correct initialy nor updated 2014-02-12 21:51:25 +00:00
Nathan Gray
1ca01da9b0 Fix missing group ID when deleting group favorites, fixes unable to delete group favorites 2014-02-12 17:33:22 +00:00
Ralf Becker
197b999d35 adding a css class for cancel, delete or yes/no buttons to "old" etemplate 2014-02-12 15:36:47 +00:00
Ralf Becker
384756ff71 explicitly allow svg for logo in navbar 2014-02-12 08:34:33 +00:00
Ralf Becker
0a5001ea11 explicitly allow svg for logo in login screen 2014-02-12 08:14:07 +00:00
Ralf Becker
28df2d8125 fixed buttons with just an image from html::submit_button() were shown like a button after changing tag from <input type="submit" to <button 2014-02-11 16:52:45 +00:00
Ralf Becker
436fe041e0 switching svg images off for everything but application icons in Stylite or Pixelegg template 2014-02-11 14:41:17 +00:00
Ralf Becker
a4c1c5ad72 include addressbook preferences in user.php, as some et2 widgets need this prefs and we dont want to block until they are loaded 2014-02-11 12:48:20 +00:00
Ralf Becker
6d17e87b0a use egw_json_response::call() instead of deprecated script() 2014-02-11 12:16:16 +00:00
Ralf Becker
486303cde5 only allow caching, if login succeeds, otherwise we get a cached redirect to login 2014-02-10 09:15:29 +00:00
Ralf Becker
f97f223026 * CalDAV/Calendar: fixed invalid ics file for alarm exactly at the event 2014-02-10 08:53:16 +00:00
Ralf Becker
ca334ad13b moving egw_preferences (handler to call preferenes, acl or categories) from jsapi.js to egw_preferences.js show_preferences() method 2014-02-07 14:04:12 +00:00
Ralf Becker
899c04abb5 using correct bit not just any overload setting 2014-02-07 14:02:48 +00:00
Ralf Becker
1b9c5d1363 display configuration with et2 like [save] [apply] [cancel] buttons, incl. old eTemplate apps 2014-02-05 16:25:35 +00:00
Ralf Becker
84d20661c2 fixed problem reported by Pedro Ribeiro 2014-02-04 13:50:23 +00:00
Ralf Becker
327123a588 preparing to use egroupware with mbstring.func_overload=0 by using mb_(strlen|substr) where necessary and providing an implementation for mb_*, if mbstring is not available 2014-02-03 19:57:50 +00:00
Hadi Nategh
7f222b165d Remove "BLACK DIAMOND SUIT" character from global categories 2014-02-03 09:19:59 +00:00
Ralf Becker
a7724dc6e5 remove Expires header from egw_session::cache_control(true), so have same behavior as session_cache_limiter("private_no_expire") 2014-01-28 15:06:47 +00:00
Ralf Becker
60e3037bf8 * CalDAV/Resources: fixed only first N resources were available in CalDAV (N = common preference how many entries to show) 2014-01-28 14:44:52 +00:00
Ralf Becker
d40025f732 allow to specify app for redirects (for Stylite or Pixelegg template) 2014-01-28 11:00:39 +00:00
Ralf Becker
55df2f5bb3 fix typo causing common::show_date to only work with default $adjust_to_usertime = true 2014-01-28 09:52:19 +00:00
Hadi Nategh
fbccbb87a3 Fix wrong styling in egw_tail log 2014-01-28 08:33:28 +00:00
Ralf Becker
99ce5b41f9 allow to optionally specify app for redirect instead of always using current app 2014-01-27 16:28:39 +00:00
Hadi Nategh
ea20648d39 Remove inline-scripts from egw_tail. Additionally, add a new library to jsapi related to egw_tail 2014-01-27 14:29:24 +00:00
Ralf Becker
8b3b5c84fc fixed can NOT unset last (forced) preference of an app, also fixed not working delete_(user|group) code 2014-01-23 12:33:25 +00:00
Ralf Becker
d20ce47a8d allways add "account_lid" to order of accounts, as groups only have that, also at ASC/DESC sort to each order criteria 2014-01-21 17:18:29 +00:00
Ralf Becker
ad04ba821d allways add "account_lid" to order of accounts, as groups only have that, also at ASC/DESC sort to each order criteria 2014-01-21 17:15:08 +00:00
Ralf Becker
3418b002bf move smbhash class to sambaadmin app, which is only user of it 2014-01-19 10:37:07 +00:00
Ralf Becker
6f5fea84f3 remove not used sessions_db class, was never converted to new egw_sessions 2014-01-19 10:30:23 +00:00
Ralf Becker
f07e51790a removed outdated xmlrpc and soap service, it is off by default since couple of versions 2014-01-19 10:28:06 +00:00
Ralf Becker
6d87d0c1cf remove never used rssparser from API 2014-01-19 10:27:15 +00:00
Ralf Becker
04b6349044 remove not used old fpdf stuff 2014-01-19 10:26:09 +00:00
Ralf Becker
192a0382ef remove not used old fpdf stuff 2014-01-19 10:24:41 +00:00
Ralf Becker
4128514f04 removed outdated xmlrpc and soap service, it is off by default since couple of versions 2014-01-19 10:22:38 +00:00
Ralf Becker
edd07a9729 removed outdated xmlrpc and soap service, it is off by default since couple of versions 2014-01-19 10:19:49 +00:00
Ralf Becker
28673080f1 remove old API interserver class, drop its table and commented out functionality from admin 2014-01-19 09:54:14 +00:00
Ralf Becker
156000a5d5 remove not used http class 2014-01-19 09:41:45 +00:00
Ralf Becker
1d7e097ca3 remove not used PclZip class 2014-01-19 09:41:26 +00:00
Ralf Becker
c51337bdb5 removed old db class, which is since many version only extending egw_db class 2014-01-19 09:32:55 +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
Ralf Becker
5a8b145b7f fixed caching in a couple of places: 
- user.php was not reloaded if (session-)preferences changed eg. language via select-box in login, because we used Expires header, but did not force a different url
- (user|config|images).php now has etag on url, to force reload by browser as we use an Expires header (changed images still need Admin >> clear cache to rebuild image cache)
- preferences are now loaded via a cachable GET request
 2014-01-18 17:43:15 +00:00
Klaus Leithoff
8276a2a448 fix for problem with style fragments on triggering mail compose build in html validation 2014-01-18 17:02:29 +00:00
Ralf Becker
496c34614d switch on private (browser only) caching for read mail bodys, plus fix to switch it on after session was started 2014-01-18 14:52:47 +00:00
Ralf Becker
7879e7ac2e disabling choosen by default, as we did in et2 2014-01-18 11:08:06 +00:00
Ralf Becker
bcba09973f pass an id to _add_topmenu_info_item, so templates can use that to generate an id for each div 2014-01-17 09:23:23 +00:00
Ralf Becker
699b614ac1 re-adding cache buster to javascript urls, if debug_minify=True 2014-01-14 17:59:33 +00:00
Nathan Gray
16c922c199 Pay attention to user application permissions when going through link registry. 
Fixes not available applications registering conflicting mimes with allowed applications.
 2014-01-14 17:16:08 +00:00
Nathan Gray
ae491c0810 Enable symlinking VFS files to not yet existing entries 2014-01-14 12:11:13 +00:00
Ralf Becker
57240d4e8a fixed typo causing preferences not to be deleted, when users or groups get deleted 2014-01-14 11:53:53 +00:00
Ralf Becker
3bef4b2a26 * Tracker: dropping unique index(es) on escalations to not limit creating same escalations eg. on different queues 
Was previously done by modifying index to contain more columns in update, but not new installations.
Now droping all existing unique indexes completly.
 2014-01-14 11:06:31 +00:00
Ralf Becker
b08b507edb fix egw_link::link to accept an array of links as 3. parameter, even if we dont have an $id1 yet 2014-01-13 17:52:19 +00:00
Nathan Gray
71f0fcdda0 Implement refresh type 'update' to _only_ update the data of a row - sorting is not considered, so make sure to use 'edit' if sorting might be affected. 2014-01-13 09:40:23 +00:00
Ralf Becker
4c105718a8 fixed uncaught exeption "Serialization of Closure is not allowed", when minifying is enabled 2014-01-11 19:32:38 +00:00
Ralf Becker
8c9034b3e9 using now 3 minified and concatinated javascript file-bundles: 
1. api: egw, jquery, old jsapi and egw_json plus its dependences
2. et2: etemplate2.js plus dependencies
3. jdots: files from Stylite or new pixelegg template
all other javascript files are loaded on there own. 
Bundle-configuration is dynamicly created and cached.
EGw configuration allows to disable minifying and concatination of javascript and css files for deverloping purpose
or to just concatinate but not minify them aka "debug".
 2014-01-11 18:49:51 +00:00
Ralf Becker
ee378ec6b9 Remove all "use strict" as we have a mixure of strict and non-strict code (mostly externals libs) 2014-01-11 18:39:55 +00:00
Ralf Becker
f49cdf4d85 update minify to version 2.1.7 and reapplying our patches r40512 and r45055 2014-01-11 16:39:17 +00:00
Ralf Becker
942f54b4de remove no longer used wz_dragdrop 2014-01-11 12:59:31 +00:00
Ralf Becker
3fe9c78c26 do NOT load egw.js a second time via minifyier 2014-01-10 16:58:50 +00:00
Ralf Becker
e3dc74eef6 enabling minifying of javascript again and added new option to debug concatination by setting debug flag for minify 2014-01-10 16:08:13 +00:00
Ralf Becker
6927f61614 quieten permanent error-log 2014-01-10 09:01:41 +00:00
Ralf Becker
400240f1e4 caching translations for 10days and changing translation url, when translations are changing --> saves server-roundtrip for each translation 2014-01-09 15:32:07 +00:00
Ralf Becker
90edb55ec5 add async include and et2 render times to page-generation-times shown 2014-01-09 12:20:13 +00:00
Ralf Becker
faecfb326b * CalDAV/calendar: fixed permanent auth request in iCal, if accountselection is set to "selectbox with groupmembers" and rights granted from group without being a member 
expand-property report now ignores the url instead of throwing an exception
 2014-01-07 17:32:34 +00:00
Ralf Becker
c5191e3e01 * API/Admin: fixed SQL error on repairing filesystem, if one of required directories has wrong permissions 2014-01-07 09:55:07 +00:00
Ralf Becker
f075452ee3 first try of svg support: prefer svg over other image type for all browsers but IE<9 2014-01-03 18:49:24 +00:00
Hadi Nategh
1d14ecc80f Remove "drag-and-drop" and "IE dropdownmenu hack" from the common preferences 2013-12-19 10:19:14 +00:00
Ralf Becker
8ad1e7ed20 get navigation-calendar to use egw_link_handler too, so listview does not reload top window 2013-12-18 05:23:45 +00:00
Nathan Gray
9bb37f5ca0 Add IDs to topmenu items 2013-12-17 20:21:48 +00:00
Nathan Gray
a79f7b87a6 Continue moving most favorite functionality from favorite widget into framework. Favorite widget now uses framework. 2013-12-12 23:45:09 +00:00
Ralf Becker
01adf460f3 silently upgrade old calendar favorites 2013-12-12 22:25:56 +00:00
Nathan Gray
0d3a7b73cf Reorder CSS inclusion so theme can override jQuery-UI 
eTemplate2 does it right automatically, but it also needs to be done in framework, because framework included etemplate2.css
 2013-12-12 18:03:23 +00:00
Ralf Becker
2de3cdb780 fix encoding of favorites, so they can eg. contain single quotes 2013-12-12 02:40:31 +00:00
Nathan Gray
72c37e0849 non-et2 Favorites work in progress 
Handle states that are id_data objects for egw.open()
 2013-12-06 23:12:05 +00:00
Nathan Gray
d097a0bfa1 non-et2 Favorites work in progress 
New states now added to list immediately, can delete states
 2013-12-06 21:26:55 +00:00
Nathan Gray
79498c5ae5 non-et2 Favorites work in progress 
Can now save & restore state.  Still some UI needed, not fully integrated with et2 favorites.
 2013-12-06 18:24:29 +00:00
Ralf Becker
b2c563e5aa restoring current app/tab, if pressing save or cancel, to do so let server know which is current app and run under that appname (otherwise redirect will happen to currently views app 2013-12-06 00:02:16 +00:00
Nathan Gray
cfefedc8f7 non-et2 Favorites work in progress 
Add current link shows popup with state details.
 2013-12-05 23:22:54 +00:00
Klaus Leithoff
50279607a6 only try replacement loading of classes, if there is a replacement available; if defaultimap, load emailadmin_oldimap 2013-12-05 09:23:58 +00:00
Ralf Becker
1ee480eaa3 remove configurable image-type preference in favor to hardcoded one always prefering png over gif, also removed all .gif images which have a png counterpart 2013-12-05 02:04:59 +00:00
Ralf Becker
9cba54fb63 calendar state handling via set/getState methods in calendar app.js 2013-12-04 23:28:31 +00:00
Klaus Leithoff
dd5ac9d70f * API/CKEditor: update to CKEditor Version 4.2.3 2013-11-28 09:41:31 +00:00
Ralf Becker
dbd15105e0 * CalDAV/CardDAV: do NOT use Content-Length header, if zlib.output_compression is enabled, fixes problems with iOS7 eg. eTask app 
Content-Length is size AFTER applying transfer encoding which compression is, as compression is done in PHP outside our control, we only set wrong (to big) size
 2013-11-20 14:12:47 +00:00
Ralf Becker
c68ae86a18 fixed check for template specific tree-images-directory in html::tree, jdots was using it, without having one 2013-11-18 22:05:04 +00:00
Ralf Becker
5dc6ae9728 remove inline script from login page: using html5 autofocus, instead of inline focus() and no chosen 2013-11-18 16:40:51 +00:00
Ralf Becker
2a52826ad2 loading jquery.js for login screen too 2013-11-18 16:23:12 +00:00
Ralf Becker
65b3cee7ab fix ckeditor config to allow string with css unit, also added some docu 2013-11-16 16:08:35 +00:00
Ralf Becker
8e69433829 use template specific images for foldertree, use "template" handler for all calls to template/framework object, NOT instanciating a new one using eg. a parent class 2013-11-15 16:28:24 +00:00
Ralf Becker
82d3ac1d2e fixed not working close of popups after handler change 2013-11-15 13:03:09 +00:00
Ralf Becker
9643d31dd1 loading template/theme and print css last, so they can overwrite anything 2013-11-14 16:23:50 +00:00
Ralf Becker
f51f7f5731 allow to use "default" or "forced" as parameter to preferences::set_account() to load default or forced preferences 2013-11-14 15:33:12 +00:00
Ralf Becker
74dd9f0e02 allow templates packed as apps to replace login screen template by setting it as default template (without setting it in header.inc.php) 2013-11-14 13:52:50 +00:00
Ralf Becker
6ae755b1aa added pixelegg template, to also delete image cache of it 2013-11-12 09:29:44 +00:00
Ralf Becker
6195a36a1a uncommited changes (class is not used anyway) 2013-11-11 08:32:46 +00:00
Ralf Becker
af8f7b2c35 uncommited changes 2013-11-11 08:31:33 +00:00
Ralf Becker
d4d0c13876 static method can not use $this, there is no need to anyway 2013-11-11 08:28:03 +00:00
Ralf Becker
b1f5649451 fixed egw_min_php_version to 5.3 2013-11-11 08:27:10 +00:00
Ralf Becker
aeced1ddae always check for read access too 2013-11-11 08:23:14 +00:00
Ralf Becker
e4ee379138 fix wrong sql produced by column_data_implode with param $use_key="VALUES" and numerical indexes in data 2013-11-11 08:21:54 +00:00
Ralf Becker
d7a1b12d96 normalize ./ away 2013-11-11 08:19:00 +00:00
Ralf Becker
12e8a3bbcd iterator to run arbitrary callbacks on a select 2013-11-08 19:54:08 +00:00
Ralf Becker
1dd3ad5e0a fixed ckeditor wont start with NOT expanded toolbar 2013-11-04 10:13:28 +00:00
Ralf Becker
b20bd49817 * CalDAV: fixed wrong http-status for delete in inbox and announce sync-report on inbox, so clients using it get events only once 2013-10-31 11:29:22 +00:00
Ralf Becker
e94502515d * Admin/Preferences: changepassword hook was called twice 
fixed by calling in now from API and not on every location in application code changing a password
 2013-10-25 19:24:01 +00:00
Klaus Leithoff
892f90205a work around ckeditor problem with default (kama) skin, by falling through to moonocolor 2013-10-24 14:42:40 +00:00