use common method to check for internet access

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@702 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/MailerUI/ChangeLog b/SOGo/UI/MailerUI/ChangeLog
index 1855f6f3ecc20d647b5baf576830d30da43083de..e16806c5659db4413207585fa0fbd8a3ef210bbf 100644 (file)
--- a/SOGo/UI/MailerUI/ChangeLog
+++ b/SOGo/UI/MailerUI/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-08  Helge Hess  <helge.hess@opengroupware.org>
+
+       * UIxMailEditor.m: use WOContext method from libSOGo to detect
+         Internet access (v0.9.134)
+
 2005-07-08  Helge Hess  <helge.hess@opengroupware.org>
 
        * UIxMailMainFrame.m: added help button and extra space for that in the

diff --git a/SOGo/UI/MailerUI/UIxMailEditor.m b/SOGo/UI/MailerUI/UIxMailEditor.m
index a10dd378d8650eaff106a5843ad1b41f51e9dd71..551d2491fb0a53e649b8fc0b66dd76ea1339beb2 100644 (file)
--- a/SOGo/UI/MailerUI/UIxMailEditor.m
+++ b/SOGo/UI/MailerUI/UIxMailEditor.m
@@ -45,6 +45,7 @@
 #include <SoObjects/Mailer/SOGoDraftObject.h>
 #include <SoObjects/Mailer/SOGoMailFolder.h>
 #include <SoObjects/Mailer/SOGoMailAccount.h>
+#include <SoObjects/SOGo/WOContext+Agenor.h>
 #include <NGMail/NGMimeMessage.h>
 #include <NGMail/NGMimeMessageGenerator.h>
 #include "common.h"
@@ -169,11 +170,7 @@ static NSArray      *infoKeys = nil;
 /* detect webmail being accessed from the outside */
 
 - (BOOL)isInternetRequest {
-  WORequest *rq;
-  
-  rq = [[self context] request];
-  return [(id<EOQualifierEvaluation>)internetDetectQualifier
-                                    evaluateWithObject:[rq headers]];
+  return [[self context] isAccessFromIntranet] ? NO : YES;
 }
 
 - (BOOL)showInternetMarker {

diff --git a/SOGo/UI/MailerUI/Version b/SOGo/UI/MailerUI/Version
index 119da9308351b44199643872c9a38b1011d4c705..2b0ec3eb3b5a462ef67c9095804569d9cd788d0d 100644 (file)
--- a/SOGo/UI/MailerUI/Version
+++ b/SOGo/UI/MailerUI/Version
@@ -1,7 +1,8 @@
 # version file
 
-SUBMINOR_VERSION:=133
+SUBMINOR_VERSION:=134
 
+# v0.9.134 requires libSOGo          v0.9.41
 # v0.9.100 requires libNGMime        v4.5.213
 # v0.9.99  requires libNGMime        v4.5.212
 # v0.9.97  requires SoObjects/Mailer v0.9.71