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

diff --git a/ChangeLog b/ChangeLog
index 516357d9a8534634f12cb6942f02ce4d7101efca..68a071c6e5aa28edd90e90c194b0f716009a51cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-02-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * SoObjects/SOGo/SOGoAuthenticator.m ([SOGoAuthenticator
+       -checkLogin:_loginpassword:_pwd]): fixed a bug where a wrong
+       password would be accepted anyway as long as its length was > 0.
+       This can be the case ONLY when LDAP is disabled otherwise we have
+       a serious security issue...
+
+       * SoObjects/Appointments/SOGoAppointmentObject.m
+       ([SOGoAppointmentObject -roleOfUser:logininContext:context]): if a
+       user is not an organizer nor a participant, he is declared as
+       "Owner" if he owns the calendar the entry where the entry is
+       contained. Other cases should not be possible.
+
 2007-02-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
        * UI/Contacts/UIxContactEditor.m: display and handle the new

diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index cd2d90706bc22dd864a60389146ab161247a71ad..e9c9b73f59386f5180ac8e83ff65373f0d0afea1 100644 (file)
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -550,6 +550,8 @@
     role = @"Organizer";
   else if ([event isParticipant: email])
     role = @"Participant";
+  else if ([[[self container] ownerInContext: nil] isEqualToString: login])
+    role = @"SoRole_Owner";
   else
     role = nil;
 

diff --git a/SoObjects/SOGo/SOGoAuthenticator.m b/SoObjects/SOGo/SOGoAuthenticator.m
index a44d55325dcf9e9f34472a60862e48e7d8759cd5..18c00d2728d4cc63df332e11e240009338128dd1 100644 (file)
--- a/SoObjects/SOGo/SOGoAuthenticator.m
+++ b/SoObjects/SOGo/SOGoAuthenticator.m
@@ -72,11 +72,16 @@ static SOGoAuthenticator *auth = nil;
 - (BOOL) checkLogin: (NSString *) _login
           password: (NSString *) _pwd
 {
+  BOOL accept;
+
+  if ([authMethod isEqualToString: @"LDAP"])
+    accept = [self LDAPCheckLogin: _login password: _pwd];
+  else
+    accept = ([_login length] > 0);
+
   return (([_login isEqualToString: @"freebusy"]
            && [_pwd isEqualToString: @"freebusy"])
-          || ([authMethod isEqualToString: @"LDAP"]
-              && [self LDAPCheckLogin: _login password: _pwd])
-          || [_login length] > 0);
+          || accept);
 }
 
 - (BOOL) LDAPCheckLogin: (NSString *) _login

diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings
index 739f2a1db4d8977713633cb7f197479fb86f5f6c..8f237d5695da5def12e7c4ffd36c2ec0becb3610 100644 (file)
--- a/UI/Contacts/English.lproj/Localizable.strings
+++ b/UI/Contacts/English.lproj/Localizable.strings
@@ -30,7 +30,7 @@
 "invalidemailwarn" = "invalidemailwarn";
 "new" = "new";
 
-"Name or Address" = "Name or Address";
+"Name or Email" = "Name or Email";
 "Personal Addressbook" = "Personal Addressbook";
 "Search in Addressbook" = "Search in Addressbook";
 

diff --git a/UI/Contacts/French.lproj/Localizable.strings b/UI/Contacts/French.lproj/Localizable.strings
index 4892982f70384578549a688b7bd9c27758d8b88c..dd95584bdeab62f4d4de6f13d9a59f52def19488 100644 (file)
--- a/UI/Contacts/French.lproj/Localizable.strings
+++ b/UI/Contacts/French.lproj/Localizable.strings
@@ -28,7 +28,7 @@
 "invalidemailwarn"  = "Champ de l'email invalide, continuer quand même ?";
 "new"               = "Nouveau";
 
-"Name or Address" = "Le nom ou l'adresse";
+"Name or Email" = "Le nom ou l'adresse";
 "Personal Addressbook" = "Adresses personnelles";
 "Search in Addressbook" = "Carnet d'adresses...";
 

diff --git a/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox b/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox
index ae4985068f8010f4ba2e490dac9f2d34ed2127ff..54614dc0170a2434bec09811c16fd0acfccc1ca9 100644 (file)
--- a/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox
+++ b/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox
@@ -9,7 +9,7 @@
       <ul id="searchOptions">
         <li id="name_or_address"
           onmousedown="return false;"
-          onmouseup="setSearchCriteria(event);"><var:string label:value="Name or Address"/></li>
+          onmouseup="setSearchCriteria(event);"><var:string label:value="Name or Email"/></li>
       </ul>
     </div>