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.1172.2.34 and 1.1172.2.35

-version 1.1172.2.34, 2013/09/02 14:41:53
+version 1.1172.2.35, 2013/10/16 19:06:28
  Line 352  sub get_remote_globals {
  }
  sub remote_devalidate_cache {
-     my ($lonhost,$name,$id) = @_;
+     my ($lonhost,$cachekeys) = @_;
-     my $response = &reply('devalidatecache:'.&escape($name).':'.&escape($id),$lonhost);
+     my $items;
-     return $response;
+     return unless (ref($cachekeys) eq 'ARRAY');
+     my $cachestr = join('&',@{$cachekeys});
+     return &reply('devalidatecache:'.&escape($cachestr),$lonhost);
  }
  # -------------------------------------------------- Non-critical communication
- Line 1321  sub check_loadbalancing {
+ Line 1323  sub check_loadbalancing {
              }
          }
      } elsif (($homeintdom) && ($udom ne $serverhomedom)) {
-         my ($result,$cached)=&is_cached_new('loadbalancing',$serverhomedom);
+         ($result,$cached)=&is_cached_new('loadbalancing',$serverhomedom);
          unless (defined($cached)) {
              my %domconfig =
                  &Apache::lonnet::get_dom('configuration',['loadbalancing'],$serverhomedom);
- Line 1982  sub inst_userrules {
+ Line 1984  sub inst_userrules {
  # ------------- Get Authentication, Language and User Tools Defaults for Domain
  sub get_domain_defaults {
-     my ($domain) = @_;
+     my ($domain,$ignore_cache) = @_;
+     return if (($domain eq '') || ($domain eq 'public'));
      my $cachetime = 60*60*24;
-     my ($result,$cached)=&is_cached_new('domdefaults',$domain);
+     unless ($ignore_cache) {
-     if (defined($cached)) {
+         my ($result,$cached)=&is_cached_new('domdefaults',$domain);
-         if (ref($result) eq 'HASH') {
+         if (defined($cached)) {
-             return %{$result};
+             if (ref($result) eq 'HASH') {
+                 return %{$result};
+             }
          }
      }
      my %domdefaults;
- Line 3490  sub extract_embedded_items {
+ Line 3495  sub extract_embedded_items {
                      }
                  }
  	    }
+             if (lc($tagname) eq 'iframe') {
+                 my $src = $attr->{'src'} ;
+                 if (($src ne '') && ($src !~ m{^(/|https?://)})) {
+                     &add_filetype($allfiles,$src,'src');
+                 } elsif ($src =~ m{^/}) {
+                     if ($env{'request.course.id'}) {
+                         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                         my $url = &hreflocation('',$fullpath);
+                         if ($url =~ m{^/uploaded/$cdom/$cnum/docs/(\w+/\d+)/}) {
+                             my $relpath = $1;
+                             if ($src =~ m{^/uploaded/$cdom/$cnum/docs/\Q$relpath\E/(.+)$}) {
+                                 &add_filetype($allfiles,$1,'src');
+                             }
+                         }
+                     }
+                 }
+             }
              if ($t->[4] =~ m{/>$}) {
                  pop(@state);
              }
  	} elsif ($t->[0] eq 'E') {
  	    my ($tagname) = ($t->[1]);
- Line 6269  sub usertools_access {
+ Line 6292  sub usertools_access {
      }
      return if (!defined($tools{$tool}));
-     if ((!defined($udom)) || (!defined($uname))) {
+     if (($udom eq '') || ($uname eq '')) {
          $udom = $env{'user.domain'};
          $uname = $env{'user.name'};
      }
- Line 13289  server ($udom and $uhome are optional)
+ Line 13312  server ($udom and $uhome are optional)
  =item *
- get_domain_defaults($target_domain) : returns hash with defaults for
+ get_domain_defaults($target_domain,$ignore_cache) : returns hash with defaults
- authentication and language in the domain. Keys are: auth_def, auth_arg_def,
+ for: authentication, language, quotas, timezone, date locale, and portal URL in
- lang_def; corresponsing values are authentication type (internal, krb4, krb5,
+ the target domain.
- or localauth), initial password or a kerberos realm, language (e.g., en-us).
- Values are retrieved from cache (if current), or from domain's configuration.db
+ May also include additional key => value pairs for the following groups:
- (if available), or lastly from values in lonTabs/dns_domain,tab,
- or lonTabs/domain.tab.
+ =over
+ =item
+ disk quotas (MB allocated by default to portfolios and authoring spaces).
+ =over
+ =item defaultquota, authorquota
+ =back
+ =item
+ tools (availability of aboutme page, blog, webDAV access for authoring spaces,
+ portfolio for users).
+ =over
+ =item
+ aboutme, blog, webdav, portfolio
+ =back
+ =item
+ requestcourses: ability to request courses, and how requests are processed.
+ =over
+ =item
+ official, unofficial, community
+ =back
+ =item
+ inststatus: types of institutional affiliation, and order in which they are displayed.
+ =over
+ =item
+ inststatustypes, inststatusorder
+ =back
+ =item
+ coursedefaults: can PDF forms can be created, default credits for courses, default quotas (MB)
+ for course's uploaded content.
+ =over
+ =item
+ canuse_pdfforms, officialcredits, unofficialcredits, officialquota, unofficialquota, communityquota
+ =back
+ =item
+ usersessions: set options for hosting of your users in other domains, and hosting of users from other domains
+ on your servers.
+ =over
+ =item
+ remotesessions, hostedsessions
+ =back
+ =back
+ In cases where a domain coordinator has never used the "Set Domain Configuration"
+ utility to create a configuration.db file on a domain's primary library server
+ only the following domain defaults: auth_def, auth_arg_def, lang_def
+ -- corresponding values are authentication type (internal, krb4, krb5,
+ or localauth), initial password or a kerberos realm, language (e.g., en-us) --
+ will be available. Values are retrieved from cache (if current), unless the
+ optional $ignore_cache arg is true, or from domain's configuration.db (if available),
+ or lastly from values in lonTabs/dns_domain,tab, or lonTabs/domain.tab.
+ Typical usage:
- %domdefaults = &get_auth_defaults($target_domain);
+ %domdefaults = &get_domain_defaults($target_domain);
  =back

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

Removed from v.1.1172.2.34
changed lines
	Added in v.1.1172.2.35