diff --git a/addons/caldav/doc/iPhone.rst b/addons/caldav/doc/iPhone.rst index 4a3af7724d2..76941bfeb8b 100644 --- a/addons/caldav/doc/iPhone.rst +++ b/addons/caldav/doc/iPhone.rst @@ -11,34 +11,6 @@ that data to calendar clients. That said, the full features that would be accessible through the Gtk or Web OpenERP clients cannot be crammed into the Calendar clients (such as the iPhone). -OpenERP server Setup --------------------- -Some modules need to be installed at the OpenERP server. These are: - - caldav: Required, has the reference setup and the necessary - underlying code. Will also cause document, document_webdav - to be installed. - - crm_caldav: Optional, will export the CRM Meetings as a calendar. - - project_caldav: Optional, will export project tasks as calendar. - - http_well_known: Optional, experimental. Will ease bootstrapping, - but only when a DNS srv record is also used. - -These will also install a reference setup of the folders, ready to go. -The administrator of OpenERP can add more calendars and structure, if -needed. - -DNS server setup ------------------- -To be documented. - -SSL setup ----------- -It is highly advisable that you also setup SSL to work for the OpenERP -server. HTTPS is a server-wide feature in OpenERP, which means a -certificate will be set at the openerp-server.conf and will be the same -for XML-RPC, HTTP, WebDAV and CalDAV. -The iPhone also supports secure connections with SSL, although it does -not expect a self-signed certificate (or one that is not verified by -one of the "big" certificate authorities [1] ). Phone setup ------------- @@ -90,8 +62,7 @@ Now, to setup the calendars, you need to: -[1] I remember one guy that made *lots* of money selling his CA business -off, and since then uses this money to create a software monopoly. + [2] This may not happen if the SRV records at DNS and the well-known URIs are setup right. But we appreciate that a default OpenERP installation will not have the DNS server of the company's domain configured. diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py index ab7b1dbf5db..dd46d8959ae 100644 --- a/addons/document_webdav/dav_fs.py +++ b/addons/document_webdav/dav_fs.py @@ -277,7 +277,9 @@ class openerp_dav_handler(dav_interface): ua = self.parent.headers.get('User-Agent', False) ctx = {} if ua: + print ua if 'iPhone' in ua: + print "iphone" ctx['DAV-client'] = 'iPhone' elif 'Konqueror' in ua: ctx['DAV-client'] = 'GroupDAV'