loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.1491 and 1.1492

-version 1.1491, 2022/09/13 12:22:15
+version 1.1492, 2022/09/18 22:33:45
  Line 2707  sub get_domain_defaults {
          $domdefaults{'timezone_def'} = $domconfig{'defaults'}{'timezone_def'};
          $domdefaults{'datelocale_def'} = $domconfig{'defaults'}{'datelocale_def'};
          $domdefaults{'portal_def'} = $domconfig{'defaults'}{'portal_def'};
+         $domdefaults{'portal_def_email'} = $domconfig{'defaults'}{'portal_def_email'};
+         $domdefaults{'portal_def_web'} = $domconfig{'defaults'}{'portal_def_web'};
          $domdefaults{'intauth_cost'} = $domconfig{'defaults'}{'intauth_cost'};
          $domdefaults{'intauth_switch'} = $domconfig{'defaults'}{'intauth_switch'};
          $domdefaults{'intauth_check'} = $domconfig{'defaults'}{'intauth_check'};
- Line 2967  sub course_portal_url {
+ Line 2969  sub course_portal_url {
      return $firsturl;
  }
+ sub url_prefix {
+     my ($r,$dom,$home,$context) = @_;
+     my $prefix;
+     my %domdefs = &get_domain_defaults($dom);
+     if ($domdefs{'portal_def'} && $domdefs{'portal_def_'.$context}) {
+         if ($domdefs{'portal_def'} =~ m{^(https?://[^/]+)}) {
+             $prefix = $1;
+         }
+     }
+     if ($prefix eq '') {
+         my $hostname = &hostname($home);
+         my $protocol = $protocol{$home};
+         $protocol = 'http' if ($protocol{$home} ne 'https');
+         my $alias = &use_proxy_alias($r,$home);
+         $hostname = $alias if ($alias ne '');
+         $prefix = $protocol.'://'.$hostname;
+     }
+     return $prefix;
+ }
  # --------------------------------------------- Get domain config for passwords
  sub get_passwdconf {

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1491
changed lines
	Added in v.1.1492