git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1061 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index d0592e30de6e8ab6c8ad5313dd81555bd59cde21..59e3d31416919b91d306b252411d0f25ee2e7128 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-05-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+       * UI/MailerUI/UIxMailAddressbook.m: removed obsolete module.
+
        * UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView
        -contactSearchAction]): simplified method to use the facilities
        provided by the LDAPUserManager. No longer takes care of the

diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile
index 285a419a77dbe83aedc20e6a94b78ccf5b721797..8b3f2108daa1151605d98dc62fbffb3bf0572bc4 100644 (file)
--- a/UI/MailerUI/GNUmakefile
+++ b/UI/MailerUI/GNUmakefile
@@ -35,7 +35,6 @@ MailerUI_OBJC_FILES += \
        UIxMailReplyAction.m            \
        UIxMailForwardAction.m          \
        UIxMailToSelection.m            \
-       UIxMailAddressbook.m            \
        UIxMailWindowCloser.m           \
        \
        UIxFilterList.m                 \

diff --git a/UI/MailerUI/UIxMailAddressbook.m b/UI/MailerUI/UIxMailAddressbook.m
deleted file mode 100644 (file)
index 1c44412..0000000
--- a/UI/MailerUI/UIxMailAddressbook.m
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-  Copyright (C) 2000-2004 SKYRIX Software AG
-
-  This file is part of OGo
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-// $Id$
-
-
-#include <SOGoUI/UIxComponent.h>
-
-
-@interface UIxMailAddressbook : UIxComponent
-{
-
-}
-
-- (NSString *)contactsPath;
-- (NSString *)anaisPath;
-
-@end
-
-#include "common.h"
-
-@implementation UIxMailAddressbook
-
-- (NSString *)contactsPath {
-  return [[self userFolderPath]
-                stringByAppendingPathComponent:@"Contacts/select"];
-}
-
-- (NSString *)anaisPath {
-  return @"/anais/Admin/Autres/aideFonc.php";
-}
-
-- (id)defaultAction {
-  NSString *path = [self contactsPath];
-  path = [path stringByAppendingString:@"?callback=addAddress"];
-  return [self redirectToLocation:path];
-}
-
-- (id)anaisAction {
-  NSString *path, *param;
-    
-
-    param = @"?m_fonc=addAddress&m_data=datawebmail&m_type=Pour&m_nom=,&m_champ=mail,uid,sn,cn,dn&m_agenda0#mon_etiquette";
-    path  = [[self anaisPath] stringByAppendingString:param];
-    return [self redirectToLocation:path];
-}
-
-@end /* UIxMailAddressbook */

diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist
index a1934d2f8fdf54ee0fcce9faaf8c121454c2db72..0979d877f10b21d2eb01cb0dcaec2ac2ab945528 100644 (file)
--- a/UI/MailerUI/product.plist
+++ b/UI/MailerUI/product.plist
@@ -263,15 +263,6 @@
           protectedBy = "View";
           pageName    = "UIxMailAccountView";
         };
-        addressbook = {
-          protectedBy = "View";
-          pageName    = "UIxMailAddressbook";
-        };
-        anais = {
-          protectedBy = "View";
-          pageName    = "UIxMailAddressbook";
-          actionName  = "anais";
-        };
         compose = {
           protectedBy = "View";
           actionClass = "UIxMailEditorAction";
@@ -369,15 +360,6 @@
           pageName    = "UIxMailEditor";
           actionName  = "send";
         };
-        addressbook = {
-          protectedBy = "View";
-          pageName    = "UIxMailAddressbook";
-        };
-        anais = {
-          protectedBy = "View";
-          pageName    = "UIxMailAddressbook";
-          actionName  = "anais";
-        };
       };
     };
 

diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 214be585c6b5e7fcda36a9052aab7c7fea83cd18..5d1bb55440688202792ee652b2411d9b191df05d 100644 (file)
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -372,7 +372,8 @@ function onMailboxTreeItemClick(event) {
   this.select();
   topNode.selectedEntry = this;
 
-  openMailbox(mailbox);
+  if (this.parentNode.getAttribute("datatype") != "account")
+     openMailbox(mailbox);
   event.preventDefault();
 }