From a2292a8078244195f612114c4432c890444f75e2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Thu, 24 Oct 2013 15:54:41 +0200
Subject: [PATCH] =?utf8?q?Mise=20=C3=A0=20jour=20du=20profil=20par=20d?=
 =?utf8?q?=C3=A9faut.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 profiles/default/actions.xml            | 17 ++++++++
 profiles/default/componentregistry.xml  | 54 ++++++++++++-------------
 profiles/default/cookieauth.xml         |  3 --
 profiles/default/mailhost.xml           |  3 +-
 profiles/default/memberdata.xml         | 12 ++++++
 profiles/default/properties.xml         |  3 +-
 profiles/default/skins.xml              |  8 ++--
 profiles/default/types/Plinn_Folder.xml |  2 +-
 profiles/default/typestool.xml          | 30 --------------
 profiles/default/workflows.xml          |  3 --
 10 files changed, 63 insertions(+), 72 deletions(-)
 create mode 100644 profiles/default/memberdata.xml
 delete mode 100644 profiles/default/typestool.xml

diff --git a/profiles/default/actions.xml b/profiles/default/actions.xml
index aa0c82c..5794d32 100644
--- a/profiles/default/actions.xml
+++ b/profiles/default/actions.xml
@@ -11,6 +11,7 @@
    <property name="title" i18n:translate="">Login</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:${portal_url}/login_form</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property name="available_expr">not: member</property>
    <property name="permissions">
@@ -23,6 +24,7 @@
    <property name="description" i18n:translate=""></property>
    <property
       name="url_expr">string:${portal/portal_membership/getHomeUrl}/folder_contents</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property
       name="available_expr">python: member and portal.portal_membership.getHomeFolder()</property>
@@ -35,6 +37,7 @@
    <property name="title" i18n:translate="">Add to favorites</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:${object_url}/addtoFavorites</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property
       name="available_expr">portal/portal_membership/getHomeFolder</property>
@@ -48,6 +51,7 @@
    <property name="description" i18n:translate=""></property>
    <property
       name="url_expr">string:${portal/portal_membership/getHomeUrl}/Favorites/folder_contents</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property
       name="available_expr">python: member and hasattr(portal.portal_membership.getHomeFolder(), "Favorites")</property>
@@ -60,6 +64,7 @@
    <property name="title" i18n:translate="">Preferences</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:${portal_url}/personalize_form</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property name="available_expr">member</property>
    <property name="permissions">
@@ -71,6 +76,7 @@
    <property name="title" i18n:translate="">Log out</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:${portal_url}/logout?noajax=1</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property name="available_expr">member</property>
    <property name="permissions">
@@ -82,6 +88,7 @@
    <property name="title" i18n:translate="">Logged in</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:${portal_url}/index_html</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property name="available_expr"></property>
    <property name="permissions">
@@ -93,6 +100,7 @@
    <property name="title" i18n:translate="">Join</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:${portal_url}/join_form</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property name="available_expr">not: member</property>
    <property name="permissions">
@@ -107,6 +115,7 @@
    <property name="title" i18n:translate="">List</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:${folder_url}/folder_contents</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property
       name="available_expr">python:member and folder is not object and object.portal_type !='Event'</property>
@@ -123,6 +132,7 @@
    <property name="description" i18n:translate=""></property>
    <property
       name="url_expr">string:${portal_url}/manage_boxes?noajax=1</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property name="available_expr"></property>
    <property name="permissions">
@@ -134,6 +144,7 @@
    <property name="title" i18n:translate="">Send an email</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:${object_url}/send_email_form</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property name="available_expr">member</property>
    <property name="permissions">
@@ -145,6 +156,7 @@
    <property name="title" i18n:translate="">Undo</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:${portal_url}/undo_form</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property name="available_expr">member</property>
    <property name="permissions">
@@ -156,6 +168,7 @@
    <property name="title" i18n:translate="">Configure Portal</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:${portal_url}/reconfig_form</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property name="available_expr"></property>
    <property name="permissions">
@@ -167,6 +180,7 @@
    <property name="title" i18n:translate="">Directory</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:${portal_url}/groups_members</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property name="available_expr"></property>
    <property name="permissions">
@@ -182,6 +196,7 @@
    <property name="description" i18n:translate=""></property>
    <property
       name="url_expr">string:${object_url}/discussion_reply_form</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property
       name="available_expr">python: object is not None and object.meta_type != 'Discussion Item' and portal.portal_discussion.isDiscussionAllowedFor(object)</property>
@@ -197,6 +212,7 @@
    <property name="title" i18n:translate="">Syndicate</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:${folder_url}/synPropertiesForm</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property
       name="available_expr">python: folder is object and portal.portal_syndication.isSiteSyndicationAllowed()</property>
@@ -209,6 +225,7 @@
    <property name="title" i18n:translate="">Calendar View</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:${folder_url}/calendar_view</property>
+   <property name="link_target"></property>
    <property name="icon_expr"></property>
    <property
       name="available_expr">python:member and folder is object and object.portal_type in ['Huge Plinn Folder', 'Portfolio']</property>
diff --git a/profiles/default/componentregistry.xml b/profiles/default/componentregistry.xml
index d3fab0b..fbbb6cf 100644
--- a/profiles/default/componentregistry.xml
+++ b/profiles/default/componentregistry.xml
@@ -1,55 +1,53 @@
 <?xml version="1.0"?>
 <componentregistry>
  <adapters/>
+ <subscribers/>
  <utilities>
-   <utility interface="Products.CMFCore.interfaces.IActionsTool"
-      object="portal_actions"/>
+  <utility interface="Products.CMFCore.interfaces.IActionsTool"
+     object="portal_actions"/>
   <utility interface="Products.CMFCore.interfaces.ICachingPolicyManager"
      object="caching_policy_manager"/>
+  <utility interface="Products.CMFCore.interfaces.ICatalogTool"
+     object="portal_catalog"/>
   <utility interface="Products.CMFCore.interfaces.IContentTypeRegistry"
-    object="content_type_registry"/>
+     object="content_type_registry"/>
   <utility interface="Products.CMFCore.interfaces.ICookieCrumbler"
      object="cookie_authentication"/>
+  <utility interface="Products.CMFCore.interfaces.IDiscussionTool"
+     object="portal_discussion"/>
   <utility interface="Products.CMFCore.interfaces.IMemberDataTool"
-    object="portal_memberdata"/>
+     object="portal_memberdata"/>
   <utility interface="Products.CMFCore.interfaces.IMembershipTool"
      object="portal_membership"/>
-  <utility interface="Products.CMFCore.interfaces.IRegistrationTool"
-    object="portal_registration"/>
-  <utility interface="Products.CMFCore.interfaces.ITypesTool"
-     object="portal_types"/>
-  <utility interface="Products.CMFCore.interfaces.IURLTool"
-    object="portal_url"/>
-  <utility interface="Products.CMFCore.interfaces.IWorkflowTool"
-     object="portal_workflow"/>
-  <utility interface="Products.CMFCore.interfaces.IDiscussionTool"
-     object="portal_discussion"/>
   <utility interface="Products.CMFCore.interfaces.IMetadataTool"
      object="portal_metadata"/>
   <utility interface="Products.CMFCore.interfaces.IPropertiesTool"
      object="portal_properties"/>
+  <utility interface="Products.CMFCore.interfaces.IRegistrationTool"
+     object="portal_registration"/>
   <utility interface="Products.CMFCore.interfaces.ISiteRoot" object=""/>
+  <utility interface="Products.CMFCore.interfaces.ISkinsTool"
+     object="portal_skins"/>
   <utility interface="Products.CMFCore.interfaces.ISyndicationTool"
      object="portal_syndication"/>
+  <utility interface="Products.CMFCore.interfaces.ITypesTool"
+     object="portal_types"/>
+  <utility interface="Products.CMFCore.interfaces.IURLTool"
+     object="portal_url"/>
   <utility interface="Products.CMFCore.interfaces.IUndoTool"
      object="portal_undo"/>
-  <utility interface="Products.GenericSetup.interfaces.ISetupTool"
-     object="portal_setup"/>
-  <utility interface="Products.MailHost.interfaces.IMailHost"
-     object="MailHost"/>
-  <utility
-     interface="Products.CMFUid.interfaces.IUniqueIdGenerator"
-     object="portal_uidgenerator"/>
+  <utility interface="Products.CMFCore.interfaces.IWorkflowTool"
+     object="portal_workflow"/>
   <utility
      interface="Products.CMFUid.interfaces.IUniqueIdAnnotationManagement"
      object="portal_uidannotation"/>
-  <utility
-     interface="Products.CMFUid.interfaces.IUniqueIdHandler"
+  <utility interface="Products.CMFUid.interfaces.IUniqueIdGenerator"
+     object="portal_uidgenerator"/>
+  <utility interface="Products.CMFUid.interfaces.IUniqueIdHandler"
      object="portal_uidhandler"/>
-  <utility interface="Products.CMFCore.interfaces.ICatalogTool"
-     object="portal_catalog"/>
-  <utility interface="Products.CMFCore.interfaces.ISkinsTool"
-     object="portal_skins"/>
-
+  <utility interface="Products.GenericSetup.interfaces.ISetupTool"
+     object="portal_setup"/>
+  <utility interface="Products.MailHost.interfaces.IMailHost"
+     object="MailHost"/>
  </utilities>
 </componentregistry>
diff --git a/profiles/default/cookieauth.xml b/profiles/default/cookieauth.xml
index 6c64558..6a2d2fc 100644
--- a/profiles/default/cookieauth.xml
+++ b/profiles/default/cookieauth.xml
@@ -4,9 +4,6 @@
  <property name="name_cookie">__ac_name</property>
  <property name="pw_cookie">__ac_password</property>
  <property name="persist_cookie">__ac_persistent</property>
- <property name="auto_login_page">login_form</property>
- <property name="logout_page">logged_out</property>
- <property name="unauth_page"></property>
  <property name="local_cookie_path">False</property>
  <property name="cache_header_value">private</property>
  <property name="log_username">True</property>
diff --git a/profiles/default/mailhost.xml b/profiles/default/mailhost.xml
index b00cae5..6e93278 100644
--- a/profiles/default/mailhost.xml
+++ b/profiles/default/mailhost.xml
@@ -1,3 +1,4 @@
 <?xml version="1.0"?>
 <object name="MailHost" meta_type="Mail Host" smtp_host="localhost"
-   smtp_port="25" smtp_pwd="" smtp_uid=""/>
+   smtp_port="25" smtp_pwd="" smtp_queue="False" smtp_queue_directory="/tmp"
+   smtp_uid=""/>
diff --git a/profiles/default/memberdata.xml b/profiles/default/memberdata.xml
new file mode 100644
index 0000000..0817858
--- /dev/null
+++ b/profiles/default/memberdata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<object name="portal_memberdata" meta_type="Plinn Member Data Tool">
+ <property name="email"></property>
+ <property name="portal_skin"></property>
+ <property name="listed">False</property>
+ <property name="login_time">1970/01/01 00:00:00 UTC</property>
+ <property name="last_login_time">1970/01/01 00:00:00 UTC</property>
+ <property name="fullname"></property>
+ <property name="name" type="string"></property>
+ <property name="given_name" type="string"></property>
+ <property name="photo_width" type="int">800</property>
+</object>
diff --git a/profiles/default/properties.xml b/profiles/default/properties.xml
index f63d5d7..ab496f7 100644
--- a/profiles/default/properties.xml
+++ b/profiles/default/properties.xml
@@ -30,8 +30,7 @@
   <element value="end"/>
   <element value="start"/>
  </property>
- <property name="keywords" type="lines">
- </property>
+ <property name="keywords" type="lines"/>
  <property name="ajax_config" type="int">2</property>
  <property name="copyright_notice"
     type="string"></property>
diff --git a/profiles/default/skins.xml b/profiles/default/skins.xml
index 451f7c3..70037c6 100644
--- a/profiles/default/skins.xml
+++ b/profiles/default/skins.xml
@@ -4,6 +4,8 @@
    request_varname="portal_skin">
  <object name="Images" meta_type="Filesystem Directory View"
     directory="Products.CMFDefault:skins/Images"/>
+ <object name="ckeditor" meta_type="Filesystem Directory View"
+    directory="Products.ckeditor:skins"/>
  <object name="custom" meta_type="Folder"/>
  <object name="custom_content" meta_type="Filesystem Directory View"
     directory="Products.Plinn:skins/custom_content"/>
@@ -17,8 +19,6 @@
     directory="Products.Epoz:epoz/epoz_i18n"/>
  <object name="epoz_images" meta_type="Filesystem Directory View"
     directory="Products.Epoz:epoz/epoz_images"/>
- <object name="ckeditor" meta_type="Filesystem Directory View"
-    directory="Products.ckeditor:skins"/>
  <object name="jscalendar" meta_type="Filesystem Directory View"
     directory="Products.Plinn:skins/jscalendar"/>
  <object name="mimetypes_icons" meta_type="Filesystem Directory View"
@@ -45,6 +45,8 @@
     directory="Products.Plinn:skins/images"/>
  <object name="portfolio" meta_type="Filesystem Directory View"
     directory="Products.Portfolio:skins"/>
+ <object name="zpt_calendar" meta_type="Filesystem Directory View"
+    directory="Products.CMFCalendar:skins/zpt_calendar"/>
  <object name="zpt_content" meta_type="Filesystem Directory View"
     directory="Products.CMFDefault:skins/zpt_content"/>
  <object name="zpt_control" meta_type="Filesystem Directory View"
@@ -53,8 +55,6 @@
     directory="Products.CMFDefault:skins/zpt_generic"/>
  <object name="zpt_topic" meta_type="Filesystem Directory View"
     directory="Products.CMFTopic:skins/zpt_topic"/>
- <object name="zpt_calendar" meta_type="Filesystem Directory View"
-    directory="Products.CMFCalendar:skins/zpt_calendar"/>
  <skin-path name="Plinn Basic">
   <layer name="custom"/>
   <layer name="photoprint"/>
diff --git a/profiles/default/types/Plinn_Folder.xml b/profiles/default/types/Plinn_Folder.xml
index c33863b..bdcf384 100644
--- a/profiles/default/types/Plinn_Folder.xml
+++ b/profiles/default/types/Plinn_Folder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<object name="Huge Plinn Folder" meta_type="Factory-based Type Information"
+<object name="Plinn Folder" meta_type="Factory-based Type Information"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Folder</property>
  <property
diff --git a/profiles/default/typestool.xml b/profiles/default/typestool.xml
deleted file mode 100644
index dcedfbf..0000000
--- a/profiles/default/typestool.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<types-tool>
- <type id="CMF Site" filename="types/CMF_Site.xml"/>
- <type id="Calendar"/>
- <type id="Discussion Item"
-       filename="types/Discussion_Item.xml"/>
- <type id="Document"/>
- <type id="Event"/>
- <type id="Favorite"/>
- <type id="File"/>
- <type id="File Slot" filename="types/File_Slot.xml"/>
- <type id="Huge Plinn Folder"
-       filename="types/Huge_Plinn_Folder.xml"/>
- <type id="Image Slot" filename="types/Image_Slot.xml"/>
- <type id="Lightbox"/>
- <type id="Link"/>
- <type id="List Slot" filename="types/List_Slot.xml"/>
- <type id="Mosaic Document"
-       filename="types/Mosaic_Document.xml"/>
- <type id="News Item" filename="types/News_Item.xml"/>
- <type id="Photo"/>
- <type id="Plinn Document"
-       filename="types/Plinn_Document.xml"/>
- <type id="Plinn Folder" filename="types/Plinn_Folder.xml"/>
- <type id="Portfolio"/>
- <type id="Spacer Slot" filename="types/Spacer_Slot.xml"/>
- <type id="String Slot" filename="types/String_Slot.xml"/>
- <type id="Text Slot" filename="types/Text_Slot.xml"/>
- <type id="Topic"/>
-</types-tool>
diff --git a/profiles/default/workflows.xml b/profiles/default/workflows.xml
index 5686c60..cc5bf54 100644
--- a/profiles/default/workflows.xml
+++ b/profiles/default/workflows.xml
@@ -26,9 +26,6 @@
   </type>
   <type type_id="Order Folder"/>
   <type type_id="Photo"/>
-  <type type_id="Huge Plinn Folder">
-   <bound-workflow workflow_id="folder_workflow"/>
-  </type>
   <type type_id="Portfolio">
    <bound-workflow workflow_id="portfolio_workflow"/>
   </type>
-- 
2.20.1