--- loncom/interface/domainprefs.pm	2011/09/14 02:59:33	1.155
+++ loncom/interface/domainprefs.pm	2012/06/01 11:39:24	1.162
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.155 2011/09/14 02:59:33 raeburn Exp $
+# $Id: domainprefs.pm,v 1.162 2012/06/01 11:39:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -247,7 +247,7 @@ sub handler {
                                   col2 => 'Value'}],
                     },
         'quotas' => 
-                    { text => 'User blogs, personal information pages, portfolios',
+                    { text => 'Blogs, personal web pages, webDAV, portfolios',
                       help => 'Domain_Configuration_Quotas',
                       header => [{col1 => 'User affiliation',
                                   col2 => 'Available tools',
@@ -1058,6 +1058,7 @@ sub print_rolecolors {
 sub display_color_options {
     my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs,
         $images,$bgs,$links,$alt_text,$rowtotal,$logintext) = @_;
+    my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
     my $css_class = $itemcount%2?' class="LC_odd_row"':'';
     my $datatable = '<tr'.$css_class.'>'.
         '<td>'.$choices->{'font'}.'</td>';
@@ -1135,11 +1136,11 @@ sub display_color_options {
                 $showfile = $imgfile;
                 my $imgdir = $1;
                 my $filename = $2;
-                if (-e "/home/httpd/html/$imgdir/tn-".$filename) {
+                if (-e "$londocroot/$imgdir/tn-".$filename) {
                     $showfile = "/$imgdir/tn-".$filename;
                 } else {
-                    my $input = "/home/httpd/html".$imgfile;
-                    my $output = '/home/httpd/html/'.$imgdir.'/tn-'.$filename;
+                    my $input = $londocroot.$imgfile;
+                    my $output = "$londocroot/$imgdir/tn-".$filename;
                     if (!-e $output) {
                         my ($width,$height) = &thumb_dimensions();
                         my ($fullwidth,$fullheight) = &check_dimensions($input);
@@ -1147,7 +1148,7 @@ sub display_color_options {
                             if ($fullwidth > $width && $fullheight > $height) { 
                                 my $size = $width.'x'.$height;
                                 system("convert -sample $size $input $output");
-                                $showfile = '/'.$imgdir.'/tn-'.$filename;
+                                $showfile = "/$imgdir/tn-".$filename;
                             }
                         }
                     }
@@ -1376,7 +1377,7 @@ sub print_quotas {
         %validations = &Apache::lonnet::auto_courserequest_checks($dom);
         %titles = &courserequest_titles();
     } else {
-        @usertools = ('aboutme','blog','portfolio');
+        @usertools = ('aboutme','blog','webdav','portfolio');
         %titles = &tool_titles();
     }
     if (ref($types) eq 'ARRAY') {
@@ -2913,6 +2914,7 @@ sub loadbalance_rule_row {
     } else {
         push(@rulenames,'specific');
     }
+    push(@rulenames,'none');
     my $style = $targets_div_style;
     if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) {
         $style = $homedom_div_style;
@@ -2969,6 +2971,7 @@ sub offloadtype_text {
            'homeserver'       => "Offloads to user's home server",
            'externalbalancer' => "Offloads to Load Balancer in user's domain",
            'specific'         => 'Offloads to specific server',
+           'none'             => 'No offload',
     );
     return %ruletitles;
 }
@@ -3000,8 +3003,9 @@ sub contact_titles {
 
 sub tool_titles {
     my %titles = &Apache::lonlocal::texthash (
-                     aboutme    => 'Personal Information Page',
+                     aboutme    => 'Personal web page',
                      blog       => 'Blog',
+                     webdav     => 'WebDAV',
                      portfolio  => 'Portfolio',
                      official   => 'Official courses (with institutional codes)',
                      unofficial => 'Unofficial courses',
@@ -3866,7 +3870,7 @@ sub print_serverstatuses {
 sub serverstatus_pages {
     return ('userstatus','lonstatus','loncron','server-status','codeversions',
             'clusterstatus','metadata_keywords','metadata_harvest',
-            'takeoffline','takeonline','showenv','toggledebug');
+            'takeoffline','takeonline','showenv','toggledebug','ping','domconf');
 }
 
 sub coursecategories_javascript {
@@ -4934,7 +4938,7 @@ sub publishlogo {
 # See if there is anything left
     unless ($fname) { return ('error: no uploaded file'); }
     $fname="$subdir/$fname";
-    my $filepath='/home/'.$confname.'/public_html';
+    my $filepath=$r->dir_config('lonDocRoot')."/priv/$dom/$confname";
     my ($fnamepath,$file,$fetchthumb);
     $file=$fname;
     if ($fname=~m|/|) {
@@ -5161,7 +5165,7 @@ sub notifysubscribed {
                     print $logfh $reply;
                 }
                 print $logfh "\n============ Done ============\n";
-                close(logfh);
+                close($logfh);
             }
         }
     }
@@ -5218,7 +5222,7 @@ sub modify_quotas {
         $toolregexp = join('|',@usertools);
         %conditions = &courserequest_conditions();
     } else {
-        @usertools = ('aboutme','blog','portfolio');
+        @usertools = ('aboutme','blog','webdav','portfolio');
         %titles = &tool_titles();
     }
     my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);