[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm

[raeburn]

raeburn		Thu May 28 03:14:25 2015 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm 
  Log:
  - WebDAV help topic link only shown if SSL is in use with Apache.
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.433 loncom/interface/lonmenu.pm:1.434
--- loncom/interface/lonmenu.pm:1.433	Thu May 28 02:53:29 2015
+++ loncom/interface/lonmenu.pm	Thu May 28 03:14:25 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.433 2015/05/28 02:53:29 raeburn Exp $
+# $Id: lonmenu.pm,v 1.434 2015/05/28 03:14:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -927,7 +927,9 @@
     }
     my ($topic_help,$topic_help_text);
     if ($is_const_dir == 2) {
-        if (&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},'webdav')) {
+        if ((($ENV{'SERVER_PORT'} == 443) || 
+             ($Apache::lonnet::protocol{$Apache::lonnet::perlvar{'lonHostID'}} eq 'https')) && 
+            (&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},'webdav'))) {
             $topic_help = 'Authoring_WebDAV,Authoring_WebDAV_Mac_10v6,Authoring_WebDAV_Mac_10v10,'.
                           'Authoring_WebDAV_Windows_v7,Authoring_WebDAV_Linux_Centos';
             $topic_help_text = 'About WebDAV access';