--- loncom/interface/domainprefs.pm 2007/03/08 01:58:44 1.5 +++ loncom/interface/domainprefs.pm 2007/07/28 21:23:53 1.24 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.5 2007/03/08 01:58:44 albertel Exp $ +# $Id: domainprefs.pm,v 1.24 2007/07/28 21:23:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,6 +37,8 @@ use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonlocal; use LONCAPA(); +use LONCAPA::Enrollment; +use File::Copy; sub handler { my $r=shift; @@ -64,15 +66,26 @@ sub handler { $phase = $env{'form.phase'}; } my %domconfig = - &Apache::lonnet::get_dom('configuration',['login','quotas', - 'autoenroll','autoupdate'],$dom); - + &Apache::lonnet::get_dom('configuration',['login','rolecolors', + 'quotas','autoenroll','autoupdate','directorysrch'],$dom); my @prefs = ( + { text => 'Default color schemes', + help => 'Default_Color_Schemes', + action => 'rolecolors', + header => [{col1 => 'Student Settings', + col2 => '',}, + {col1 => 'Coordinator Settings', + col2 => '',}, + {col1 => 'Author Settings', + col2 => '',}, + {col1 => 'Administrator Settings', + col2 => '',}], + }, { text => 'Log-in page options', help => 'Domain_Log-in_Page', action => 'login', header => [{col1 => 'Item', - col2 => 'Selection',}], + col2 => '',}], }, { text => 'Default quotas for user portfolios', help => 'Default_User_Quota', @@ -93,11 +106,19 @@ sub handler { col2 => 'Value',}, {col1 => 'User Population', col2 => 'Updataeable user data'}], - }, + }, + { text => 'Institutional directory searches', + help => 'Domain_Directory_Search', + action => 'directorysrch', + header => [{col1 => 'Setting', + col2 => 'Value',}], + }, ); + my @roles = ('student','coordinator','author','admin'); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'display')", text=>"Domain Configuration"}); + my $confname = $dom.'-domainconfig'; if ($phase eq 'process') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", @@ -105,7 +126,8 @@ sub handler { &print_header($r,$phase); foreach my $item (@prefs) { $r->print('

'.&mt($item->{'text'}).'

'. - &process_changes($dom,$item->{'action'},%domconfig)); + &process_changes($r,$dom,$confname, + $item->{'action'},\@roles,%domconfig)); } $r->print('

'); &print_footer($r,$phase,'display','Back to actions menu'); @@ -117,60 +139,95 @@ sub handler { my %helphash; my $numprefs = @prefs; &print_header($r,$phase); + if (keys(%domconfig) == 0) { + my $primarylibserv = &Apache::lonnet::domain($dom,'primary'); + my $perlvarref = &LONCAPA::Configuration::read_conf('loncapa.conf'); + my $hostid = $perlvarref->{'lonHostID'}; + if ($hostid ne $primarylibserv) { + my %designhash = &Apache::loncommon::get_domainconf($dom); + my @loginimages = ('img','logo','domlogo'); + my $custom_img_count = 0; + foreach my $img (@loginimages) { + if ($designhash{$dom.'.login.'.$img} ne '') { + $custom_img_count ++; + } + } + foreach my $role (@roles) { + if ($designhash{$dom.'.'.$role.'.img'} ne '') { + $custom_img_count ++; + } + } + if ($custom_img_count > 0) { + my $switch_server = &check_switchserver($dom,$confname); + $r->print(&mt('Domain configuration settings have yet to be saved for this domain via the web-based domain preferences interface.').'
'.&mt("While this remains so, you must switch to the domain's primary library server in order to update settings.").'

'.&mt("Thereafter, you will be able to update settings from this screen when logged in to any server in the LON-CAPA network (with a DC role selected in the domain), although you will still need to switch to the domain's primary library server to upload new images or logos.").'

'.$switch_server.' '.&mt('to primary library server for domain: [_1]',$dom)); + return OK; + } + } + } $r->print('
'); foreach my $item (@prefs) { - if ($item->{'action'} eq 'autoupdate') { + if ($item->{'action'} eq 'login') { $r->print(' '); } - &print_config_box($r,$dom,$item->{'action'},$item, - $domconfig{$item->{'action'}}); + &print_config_box($r,$dom,$confname,$phase,$item->{'action'}, + $item,$domconfig{$item->{'action'}}); } $r->print(' -
- - - '); - &print_footer($r,$phase,'process','Store changes'); + &print_footer($r,$phase,'process','Save changes'); } return OK; } sub process_changes { - my ($dom,$action,%domconfig) = @_; + my ($r,$dom,$confname,$action,$roles,%domconfig) = @_; my $output; if ($action eq 'login') { - $output = &modify_login($dom,%domconfig); + $output = &modify_login($r,$dom,$confname,%domconfig); + } elsif ($action eq 'rolecolors') { + $output = &modify_rolecolors($r,$dom,$confname,$roles, + %domconfig); } elsif ($action eq 'quotas') { $output = &modify_quotas($dom,%domconfig); } elsif ($action eq 'autoenroll') { $output = &modify_autoenroll($dom,%domconfig); } elsif ($action eq 'autoupdate') { $output = &modify_autoupdate($dom,%domconfig); + } elsif ($action eq 'directorysrch') { + $output = &modify_directorysrch($dom,%domconfig); } return $output; } sub print_config_box { - my ($r,$dom,$action,$item,$settings) = @_; + my ($r,$dom,$confname,$phase,$action,$item,$settings) = @_; $r->print(' - - '); - if ($action eq 'autoupdate') { + '); +# +# FIXME - put the help link back in when the help files exist +# +# '); + if (($action eq 'autoupdate') || ($action eq 'rolecolors')) { + my $colspan = ($action eq 'rolecolors')?' colspan="2"':''; $r->print(' @@ -178,25 +235,60 @@ sub print_config_box { + + + + + + '; + return $datatable; +} + +sub display_color_options { + my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs, + $images,$bgs,$links,$alt_text) = @_; + my $css_class = $itemcount%2?' class="LC_odd_row"':''; + my $datatable = ''. + ''; + if (!$is_custom->{'font'}) { + $datatable .= ''; + } else { + $datatable .= ''; } + my $fontlink = &color_pick($phase,$role,'font',$choices->{'font'},$designs->{'font'}); + $datatable .= ''; + my $switchserver = &check_switchserver($dom,$confname); + foreach my $img (@{$images}) { + $itemcount ++; + $css_class = $itemcount%2?' class="LC_odd_row"':''; + $datatable .= ''. + ''; + my ($imgfile, $img_import); + if ($designs->{$img} ne '') { + $imgfile = $designs->{$img}; + $img_import = ($imgfile =~ m{^/adm/}); + } else { + $imgfile = $defaults->{$img}; + } + if ($imgfile) { + my ($showfile,$fullsize); + if ($imgfile =~ m-^(/res/\Q$dom\E/\Q$confname\E/\Q$img\E)/([^/]+)$-) { + my $urldir = $1; + my $filename = $2; + my @info = &Apache::lonnet::stat_file($designs->{$img}); + if (@info) { + my $thumbfile = 'tn-'.$filename; + my @thumb=&Apache::lonnet::stat_file($urldir.'/'.$thumbfile); + if (@thumb) { + $showfile = $urldir.'/'.$thumbfile; + } else { + $showfile = $imgfile; + } + } else { + $showfile = ''; + } + } elsif ($imgfile =~ m-^/(adm/[^/]+)/([^/]+)$-) { + $showfile = $imgfile; + my $imgdir = $1; + my $filename = $2; + if (-e "/home/httpd/html/$imgdir/tn-".$filename) { + $showfile = "/$imgdir/tn-".$filename; + } else { + my $input = "/home/httpd/html".$imgfile; + my $output = '/home/httpd/html/'.$imgdir.'/tn-'.$filename; + if (!-e $output) { + my ($width,$height) = &thumb_dimensions(); + my ($fullwidth,$fullheight) = &check_dimensions($input); + if ($fullwidth ne '' && $fullheight ne '') { + if ($fullwidth > $width && $fullheight > $height) { + my $size = $width.'x'.$height; + system("convert -sample $size $input $output"); + $showfile = '/'.$imgdir.'/tn-'.$filename; + } + } + } + } + } + if ($showfile) { + $showfile = &Apache::loncommon::lonhttpdurl($showfile); + $fullsize = &Apache::loncommon::lonhttpdurl($imgfile); + $datatable.= ''; + if ($is_custom->{$img}) { + $datatable.=''; + } + $itemcount ++; + $css_class = $itemcount%2?' class="LC_odd_row"':''; + $datatable .= ''. + ''; + my $bgs_def; + foreach my $item (@{$bgs}) { + if (!$is_custom->{$item}) { + $bgs_def .= ''; + } + } + if ($bgs_def) { + $datatable .= ''; + } else { + $datatable .= ''; + } + $datatable .= ''; + $itemcount ++; + $css_class = $itemcount%2?' class="LC_odd_row"':''; + $datatable .= ''. + ''; + my $links_def; + foreach my $item (@{$links}) { + if (!$is_custom->{$item}) { + $links_def .= ''; + } + } + if ($links_def) { + $datatable .= ''; + } else { + $datatable .= ''; + } + $datatable .= ''; } @@ -496,16 +1091,20 @@ sub usertype_update_row { } sub modify_login { - my ($dom,%domconfig) = @_; - my ($resulttext,%changes); + my ($r,$dom,$confname,%domconfig) = @_; + my ($resulttext,$errors,$colchgtext,%changes,%colchanges); my %title = ( coursecatalog => 'Display course catalog', adminmail => 'Display administrator E-mail address'); my @offon = ('off','on'); - my %loginhash = ( - login => { coursecatalog => $env{'form.coursecatalog'}, - adminmail => $env{'form.adminmail'}, - } - ); + my %loginhash; + ($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], + \%domconfig,\%loginhash); + $loginhash{login}{coursecatalog} = $env{'form.coursecatalog'}; + $loginhash{login}{adminmail} = $env{'form.adminmail'}; + if (ref($colchanges{'login'}) eq 'HASH') { + $colchgtext = &display_colorchgs($dom,\%colchanges,['login'], + \%loginhash); + } my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash, $dom); if ($putresult eq 'ok') { @@ -525,21 +1124,573 @@ sub modify_login { ($env{'form.adminmail'} eq '1')) { $changes{'adminmail'} = 1; } - if (keys(%changes) > 0) { + if (keys(%changes) > 0 || $colchgtext) { $resulttext = &mt('Changes made:').''; + $resulttext .= $colchgtext.''; } else { $resulttext = &mt('No changes made to log-in page settings'); } } else { - $resulttext = &mt('An error occurred: [_1]',$putresult); + $resulttext = ''. + &mt('An error occurred: [_1]',$putresult).''; + } + if ($errors) { + $resulttext .= '
'.&mt('The following errors occurred: ').''; } return $resulttext; } +sub color_font_choices { + my %choices = + &Apache::lonlocal::texthash ( + img => "Header", + bgs => "Background colors", + links => "Link colors", + font => "Font color", + pgbg => "Page", + tabbg => "Header", + sidebg => "Border", + link => "Link", + alink => "Active link", + vlink => "Visited link", + ); + return %choices; +} + +sub modify_rolecolors { + my ($r,$dom,$confname,$roles,%domconfig) = @_; + my ($resulttext,%rolehash); + $rolehash{'rolecolors'} = {}; + my ($errors,%changes) = &modify_colors($r,$dom,$confname,$roles, + $domconfig{'rolecolors'},$rolehash{'rolecolors'}); + my $putresult = &Apache::lonnet::put_dom('configuration',\%rolehash, + $dom); + if ($putresult eq 'ok') { + if (keys(%changes) > 0) { + $resulttext = &display_colorchgs($dom,\%changes,$roles, + $rolehash{'rolecolors'}); + } else { + $resulttext = &mt('No changes made to default color schemes'); + } + } else { + $resulttext = ''. + &mt('An error occurred: [_1]',$putresult).''; + } + if ($errors) { + $resulttext .= &mt('The following errors occurred: ').''; + } + return $resulttext; +} + +sub modify_colors { + my ($r,$dom,$confname,$roles,$domconfig,$confhash) = @_; + my (%changes,%choices); + my @bgs = ('pgbg','mainbg','sidebg'); + my @links = ('link','alink','vlink'); + my @images; + my $servadm = $r->dir_config('lonAdmEMail'); + my $errors; + foreach my $role (@{$roles}) { + if ($role eq 'login') { + %choices = &login_choices(); + } else { + %choices = &color_font_choices(); + } + if ($role eq 'login') { + @images = ('img','logo','domlogo'); + } else { + @images = ('img'); + } + $confhash->{$role}{'font'} = $env{'form.'.$role.'_font'}; + foreach my $item (@bgs,@links) { + $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item}; + } + my ($configuserok,$author_ok,$switchserver,%currroles); + my $uhome = &Apache::lonnet::homeserver($confname,$dom,1); + ($configuserok,%currroles) = &check_configuser($uhome,$dom, + $confname,$servadm); + if ($configuserok eq 'ok') { + $switchserver = &check_switchserver($dom,$confname); + if ($switchserver eq '') { + $author_ok = &check_authorstatus($dom,$confname,%currroles); + } + } + my ($width,$height) = &thumb_dimensions(); + foreach my $img (@images) { + if ( ! $env{'form.'.$role.'_'.$img.'.filename'} + && !defined($domconfig->{$role}{$img}) + && !$env{'form.'.$role.'_del_'.$img} + && $env{'form.'.$role.'_import_'.$img}) { + # import the old configured image from the .tab setting + # if they haven't provided a new one + $domconfig->{$role}{$img} = + $env{'form.'.$role.'_import_'.$img}; + } + if ($env{'form.'.$role.'_'.$img.'.filename'} ne '') { + my $error; + if ($configuserok eq 'ok') { + if ($switchserver) { + $error = &mt("Upload of [_1] image for $role page(s) is not permitted to this server: [_2]",$choices{$img},$switchserver); + } else { + if ($author_ok eq 'ok') { + my ($result,$logourl) = + &publishlogo($r,'upload',$role.'_'.$img, + $dom,$confname,$img,$width,$height); + if ($result eq 'ok') { + $confhash->{$role}{$img} = $logourl; + $changes{$role}{'images'}{$img} = 1; + } else { + $error = &mt("Upload of [_1] image for $role page(s) failed because an error occurred publishing the file in RES space. Error was: [_2].",$choices{img},$result); + } + } else { + $error = &mt("Upload of [_1] image for $role page(s) failed because an author role could not be assigned to a Domain Configuation user ([_2]) in domain: [_3]. Error was: [_4].",$choices{$img},$confname,$dom,$author_ok); + } + } + } else { + $error = &mt("Upload of [_1] image for $role page(s) failed because a Domain Configuation user ([_2]) could not be created in domain: [_3]. Error was: [_4].",$choices{$img},$confname,$dom,$configuserok); + } + if ($error) { + &Apache::lonnet::logthis($error); + $errors .= '
  • '.$error.'
    • '; + } + } elsif ($domconfig->{$role}{$img} ne '') { + if ($domconfig->{$role}{$img} !~ m-^(/res/\Q$dom\E/\Q$confname\E/\Q$img\E)/([^/]+)$-) { + my $error; + if ($configuserok eq 'ok') { +# is confname an author? + if ($switchserver eq '') { + if ($author_ok eq 'ok') { + my ($result,$logourl) = + &publishlogo($r,'copy',$domconfig->{$role}{$img}, + $dom,$confname,$img,$width,$height); + if ($result eq 'ok') { + $confhash->{$role}{$img} = $logourl; + $changes{$role}{'images'}{$img} = 1; + } + } + } + } + } + } + } + if (ref($domconfig) eq 'HASH') { + if (ref($domconfig->{$role}) eq 'HASH') { + foreach my $img (@images) { + if ($domconfig->{$role}{$img} ne '') { + if ($env{'form.'.$role.'_del_'.$img}) { + $confhash->{$role}{$img} = ''; + $changes{$role}{'images'}{$img} = 1; + } else { + if ($confhash->{$role}{$img} eq '') { + $confhash->{$role}{$img} = $domconfig->{$role}{$img}; + } + } + } else { + if ($env{'form.'.$role.'_del_'.$img}) { + $confhash->{$role}{$img} = ''; + $changes{$role}{'images'}{$img} = 1; + } + } + } + if ($domconfig->{$role}{'font'} ne '') { + if ($confhash->{$role}{'font'} ne $domconfig->{$role}{'font'}) { + $changes{$role}{'font'} = 1; + } + } else { + if ($confhash->{$role}{'font'}) { + $changes{$role}{'font'} = 1; + } + } + foreach my $item (@bgs) { + if ($domconfig->{$role}{$item} ne '') { + if ($confhash->{$role}{$item} ne $domconfig->{$role}{$item}) { + $changes{$role}{'bgs'}{$item} = 1; + } + } else { + if ($confhash->{$role}{$item}) { + $changes{$role}{'bgs'}{$item} = 1; + } + } + } + foreach my $item (@links) { + if ($domconfig->{$role}{$item} ne '') { + if ($confhash->{$role}{$item} ne $domconfig->{$role}{$item}) { + $changes{$role}{'links'}{$item} = 1; + } + } else { + if ($confhash->{$role}{$item}) { + $changes{$role}{'links'}{$item} = 1; + } + } + } + } else { + &default_change_checker($role,\@images,\@links,\@bgs, + $confhash,\%changes); + } + } else { + &default_change_checker($role,\@images,\@links,\@bgs, + $confhash,\%changes); + } + } + return ($errors,%changes); +} + +sub default_change_checker { + my ($role,$images,$links,$bgs,$confhash,$changes) = @_; + foreach my $item (@{$links}) { + if ($confhash->{$role}{$item}) { + $changes->{$role}{'links'}{$item} = 1; + } + } + foreach my $item (@{$bgs}) { + if ($confhash->{$role}{$item}) { + $changes->{$role}{'bgs'}{$item} = 1; + } + } + foreach my $img (@{$images}) { + if ($env{'form.'.$role.'_del_'.$img}) { + $confhash->{$role}{$img} = ''; + $changes->{$role}{'images'}{$img} = 1; + } + } + if ($confhash->{$role}{'font'}) { + $changes->{$role}{'font'} = 1; + } +} + +sub display_colorchgs { + my ($dom,$changes,$roles,$confhash) = @_; + my (%choices,$resulttext); + &Apache::loncommon::devalidate_domconfig_cache($dom); + if (!grep(/^login$/,@{$roles})) { + $resulttext = &mt('Changes made:').'
    '; + } + foreach my $role (@{$roles}) { + if ($role eq 'login') { + %choices = &login_choices(); + } else { + %choices = &color_font_choices(); + } + if (ref($changes->{$role}) eq 'HASH') { + if ($role ne 'login') { + $resulttext .= '

    '.&mt($role).'

    '; + } + foreach my $key (sort(keys(%{$changes->{$role}}))) { + if ($role ne 'login') { + $resulttext .= ''; + } + } + } + } + return $resulttext; +} + +sub thumb_dimensions { + return ('200','50'); +} + +sub check_dimensions { + my ($inputfile) = @_; + my ($fullwidth,$fullheight); + if ($inputfile =~ m|^[/\w.\-]+$|) { + if (open(PIPE,"identify $inputfile 2>&1 |")) { + my $imageinfo = ; + if (!close(PIPE)) { + &Apache::lonnet::logthis("Failed to close PIPE opened to retrieve image information for $inputfile"); + } + chomp($imageinfo); + my ($fullsize) = + ($imageinfo =~ /^\Q$inputfile\E\s+\w+\s+(\d+x\d+)/); + if ($fullsize) { + ($fullwidth,$fullheight) = split(/x/,$fullsize); + } + } + } + return ($fullwidth,$fullheight); +} + +sub check_configuser { + my ($uhome,$dom,$confname,$servadm) = @_; + my ($configuserok,%currroles); + if ($uhome eq 'no_host') { + srand( time() ^ ($$ + ($$ << 15)) ); # Seed rand. + my $configpass = &LONCAPA::Enrollment::create_password(); + $configuserok = + &Apache::lonnet::modifyuser($dom,$confname,'','internal', + $configpass,'','','','','',undef,$servadm); + } else { + $configuserok = 'ok'; + %currroles = + &Apache::lonnet::get_my_roles($confname,$dom,'userroles'); + } + return ($configuserok,%currroles); +} + +sub check_authorstatus { + my ($dom,$confname,%currroles) = @_; + my $author_ok; + if (!$currroles{':'.$dom.':au'}) { + my $start = time; + my $end = 0; + $author_ok = + &Apache::lonnet::assignrole($dom,$confname,'/'.$dom.'/', + 'au',$end,$start); + } else { + $author_ok = 'ok'; + } + return $author_ok; +} + +sub publishlogo { + my ($r,$action,$formname,$dom,$confname,$subdir,$thumbwidth,$thumbheight) = @_; + my ($output,$fname,$logourl); + if ($action eq 'upload') { + $fname=$env{'form.'.$formname.'.filename'}; + chop($env{'form.'.$formname}); + } else { + ($fname) = ($formname =~ /([^\/]+)$/); + } + $fname=&Apache::lonnet::clean_filename($fname); +# See if there is anything left + unless ($fname) { return ('error: no uploaded file'); } + $fname="$subdir/$fname"; + my $filepath='/home/'.$confname.'/public_html'; + my ($fnamepath,$file,$fetchthumb); + $file=$fname; + if ($fname=~m|/|) { + ($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|); + } + my @parts=split(/\//,$filepath.'/'.$fnamepath); + my $count; + for ($count=4;$count<=$#parts;$count++) { + $filepath.="/$parts[$count]"; + if ((-e $filepath)!=1) { + mkdir($filepath,02770); + } + } + # Check for bad extension and disallow upload + if ($file=~/\.(\w+)$/ && + (&Apache::loncommon::fileembstyle($1) eq 'hdn')) { + $output = + &mt('Invalid file extension ([_1]) - reserved for LONCAPA use.',$1); + } elsif ($file=~/\.(\w+)$/ && + !defined(&Apache::loncommon::fileembstyle($1))) { + $output = &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1); + } elsif ($file=~/\.(\d+)\.(\w+)$/) { + $output = &mt('File name not allowed a rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2); + } elsif (-d "$filepath/$file") { + $output = &mt('File name is a directory name - rename the file and re-upload'); + } else { + my $source = $filepath.'/'.$file; + my $logfile; + if (!open($logfile,">>$source".'.log')) { + return (&mt('No write permission to Construction Space')); + } + print $logfile +"\n================= Publish ".localtime()." ================\n". +$env{'user.name'}.':'.$env{'user.domain'}."\n"; +# Save the file + if (!open(FH,'>'.$source)) { + &Apache::lonnet::logthis('Failed to create '.$source); + return (&mt('Failed to create file')); + } + if ($action eq 'upload') { + if (!print FH ($env{'form.'.$formname})) { + &Apache::lonnet::logthis('Failed to write to '.$source); + return (&mt('Failed to write file')); + } + } else { + my $original = &Apache::lonnet::filelocation('',$formname); + if(!copy($original,$source)) { + &Apache::lonnet::logthis('Failed to copy '.$original.' to '.$source); + return (&mt('Failed to write file')); + } + } + close(FH); + chmod(0660, $source); # Permissions to rw-rw---. + + my $docroot=$r->dir_config('lonDocRoot'); + my $targetdir=$docroot.'/res/'.$dom.'/'.$confname .'/'.$fnamepath; + my $copyfile=$targetdir.'/'.$file; + + my @parts=split(/\//,$targetdir); + my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]"; + for (my $count=5;$count<=$#parts;$count++) { + $path.="/$parts[$count]"; + if (!-e $path) { + print $logfile "\nCreating directory ".$path; + mkdir($path,02770); + } + } + my $versionresult; + if (-e $copyfile) { + $versionresult = &logo_versioning($targetdir,$file,$logfile); + } else { + $versionresult = 'ok'; + } + if ($versionresult eq 'ok') { + if (copy($source,$copyfile)) { + print $logfile "\nCopied original source to ".$copyfile."\n"; + $output = 'ok'; + &write_metadata($dom,$confname,$formname,$targetdir,$file,$logfile); + $logourl = '/res/'.$dom.'/'.$confname.'/'.$fname; + } else { + print $logfile "\nUnable to write ".$copyfile.':'.$!."\n"; + $output = &mt('Failed to copy file to RES space').", $!"; + } + if (($thumbwidth =~ /^\d+$/) && ($thumbheight =~ /^\d+$/)) { + my $inputfile = $filepath.'/'.$file; + my $outfile = $filepath.'/'.'tn-'.$file; + my ($fullwidth,$fullheight) = &check_dimensions($inputfile); + if ($fullwidth ne '' && $fullheight ne '') { + if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) { + my $thumbsize = $thumbwidth.'x'.$thumbheight; + system("convert -sample $thumbsize $inputfile $outfile"); + chmod(0660, $filepath.'/tn-'.$file); + if (-e $outfile) { + my $copyfile=$targetdir.'/tn-'.$file; + if (copy($outfile,$copyfile)) { + print $logfile "\nCopied source to ".$copyfile."\n"; + &write_metadata($dom,$confname,$formname, + $targetdir,'tn-'.$file,$logfile); + } else { + print $logfile "\nUnable to write ".$copyfile. + ':'.$!."\n"; + } + } + } + } + } + } else { + $output = $versionresult; + } + } + return ($output,$logourl); +} + +sub logo_versioning { + my ($targetdir,$file,$logfile) = @_; + my $target = $targetdir.'/'.$file; + my ($maxversion,$fn,$extn,$output); + $maxversion = 0; + if ($file =~ /^(.+)\.(\w+)$/) { + $fn=$1; + $extn=$2; + } + opendir(DIR,$targetdir); + while (my $filename=readdir(DIR)) { + if ($filename=~/\Q$fn\E\.(\d+)\.\Q$extn\E$/) { + $maxversion=($1>$maxversion)?$1:$maxversion; + } + } + $maxversion++; + print $logfile "\nCreating old version ".$maxversion."\n"; + my $copyfile=$targetdir.'/'.$fn.'.'.$maxversion.'.'.$extn; + if (copy($target,$copyfile)) { + print $logfile "Copied old target to ".$copyfile."\n"; + $copyfile=$copyfile.'.meta'; + if (copy($target.'.meta',$copyfile)) { + print $logfile "Copied old target metadata to ".$copyfile."\n"; + $output = 'ok'; + } else { + print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n"; + $output = &mt('Failed to copy old meta').", $!, "; + } + } else { + print $logfile "Unable to write ".$copyfile.':'.$!."\n"; + $output = &mt('Failed to copy old target').", $!, "; + } + return $output; +} + +sub write_metadata { + my ($dom,$confname,$formname,$targetdir,$file,$logfile) = @_; + my (%metadatafields,%metadatakeys,$output); + $metadatafields{'title'}=$formname; + $metadatafields{'creationdate'}=time; + $metadatafields{'lastrevisiondate'}=time; + $metadatafields{'copyright'}='public'; + $metadatafields{'modifyinguser'}=$env{'user.name'}.':'. + $env{'user.domain'}; + $metadatafields{'authorspace'}=$confname.':'.$dom; + $metadatafields{'domain'}=$dom; + { + print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file; + my $mfh; + unless (open($mfh,'>'.$targetdir.'/'.$file.'.meta')) { + $output = &mt('Could not write metadata'); + } + foreach (sort keys %metadatafields) { + unless ($_=~/\./) { + my $unikey=$_; + $unikey=~/^([A-Za-z]+)/; + my $tag=$1; + $tag=~tr/A-Z/a-z/; + print $mfh "\n\<$tag"; + foreach (split(/\,/,$metadatakeys{$unikey})) { + my $value=$metadatafields{$unikey.'.'.$_}; + $value=~s/\"/\'\'/g; + print $mfh ' '.$_.'="'.$value.'"'; + } + print $mfh '>'. + &HTML::Entities::encode($metadatafields{$unikey},'<>&"') + .''; + } + } + $output = 'ok'; + print $logfile "\nWrote metadata"; + close($mfh); + } +} + +sub check_switchserver { + my ($dom,$confname) = @_; + my ($allowed,$switchserver); + my $home = &Apache::lonnet::homeserver($confname,$dom); + if ($home eq 'no_host') { + $home = &Apache::lonnet::domain($dom,'primary'); + } + my @ids=&Apache::lonnet::current_machine_ids(); + foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } + if (!$allowed) { + $switchserver=''.&mt('Switch Server').''; + } + return $switchserver; +} + sub modify_quotas { my ($dom,%domconfig) = @_; my ($resulttext,%changes); @@ -551,6 +1702,7 @@ sub modify_quotas { $formhash{$1} = $env{$key}; } } + $formhash{'default'} = $env{'form.defaultquota'}; if (ref($domconfig{'quotas'}) eq 'HASH') { foreach my $key (keys(%{$domconfig{'quotas'}})) { if (exists($formhash{$key})) { @@ -585,7 +1737,8 @@ sub modify_quotas { $resulttext = &mt('No changes made to default quotas'); } } else { - $resulttext = &mt('An error occurred: [_1]',$putresult); + $resulttext = ''. + &mt('An error occurred: [_1]',$putresult).''; } return $resulttext; } @@ -603,10 +1756,17 @@ sub modify_autoenroll { my %title = ( run => 'Auto-enrollment active', sender => 'Sender for notification messages'); my @offon = ('off','on'); + my $sender_uname = $env{'form.sender_uname'}; + my $sender_domain = $env{'form.sender_domain'}; + if ($sender_domain eq '') { + $sender_uname = ''; + } elsif ($sender_uname eq '') { + $sender_domain = ''; + } my %autoenrollhash = ( autoenroll => { run => $env{'form.autoenroll_run'}, - sender_uname => $env{'form.sender_uname'}, - sender_domain => $env{'form.sender_domain'}, + sender_uname => $sender_uname, + sender_domain => $sender_domain, } ); @@ -619,21 +1779,13 @@ sub modify_autoenroll { } } elsif ($autorun) { if ($env{'form.autoenroll_run'} ne '1') { - $changes{'run'} = 1; + $changes{'run'} = 1; } } - if (exists($currautoenroll{sender_uname})) { - if ($currautoenroll{'sender_uname'} ne $env{'form.sender_uname'}) { - $changes{'sender'} = 1; - } - } else { + if ($currautoenroll{'sender_uname'} ne $sender_uname) { $changes{'sender'} = 1; } - if (exists($currautoenroll{sender_domain})) { - if ($currautoenroll{'sender_domain'} ne $env{'form.sender_domain'}) { - $changes{'sender'} = 1; - } - } else { + if ($currautoenroll{'sender_domain'} ne $sender_domain) { $changes{'sender'} = 1; } if (keys(%changes) > 0) { @@ -642,14 +1794,19 @@ sub modify_autoenroll { $resulttext .= '
  • '.&mt("$title{'run'} set to $offon[$env{'form.autoenroll_run'}]").'
    • '; } if ($changes{'sender'}) { - $resulttext .= '
  • '.&mt("$title{'sender'} set to [_1]",$env{'form.sender_uname'}.':'.$env{'form.sender_domain'}).'
    • '; + if ($sender_uname eq '' || $sender_domain eq '') { + $resulttext .= '
  • '.&mt("$title{'sender'} set to default (course owner).").'
    • '; + } else { + $resulttext .= '
  • '.&mt("$title{'sender'} set to [_1]",$sender_uname.':'.$sender_domain).'
    • '; + } } $resulttext .= ''; } else { $resulttext = &mt('No changes made to auto-enrollment settings'); } } else { - $resulttext = &mt('An error occurred: [_1]',$putresult); + $resulttext = ''. + &mt('An error occurred: [_1]',$putresult).''; } return $resulttext; } @@ -670,7 +1827,7 @@ sub modify_autoupdate { my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom); my %fieldtitles = &Apache::lonlocal::texthash ( id => 'Student/Employee ID', - email => 'E-mail address', + permanentemail => 'E-mail address', lastname => 'Last Name', firstname => 'First Name', middlename => 'Middle Name', @@ -746,7 +1903,7 @@ sub modify_autoupdate { $newvaluestr = join(', ',@newvalues); } else { $newvaluestr = &mt('none'); - } + } if ($item eq 'default') { $resulttext .= '
  • '.&mt("Updates for $othertitle set to: [_1]",$newvaluestr).'
    • '; } else { @@ -768,7 +1925,152 @@ sub modify_autoupdate { $resulttext = &mt('No changes made to autoupdates'); } } else { - $resulttext = &mt('An error occurred: [_1]',$putresult); + $resulttext = ''. + &mt('An error occurred: [_1]',$putresult).''; + } + return $resulttext; +} + +sub modify_directorysrch { + my ($dom,%domconfig) = @_; + my ($resulttext,%changes); + my %currdirsrch; + if (ref($domconfig{'directorysrch'}) eq 'HASH') { + foreach my $key (keys(%{$domconfig{'directorysrch'}})) { + $currdirsrch{$key} = $domconfig{'directorysrch'}{$key}; + } + } + my %title = ( available => 'Directory search available', + cansearch => 'Users permitted to search', + localonly => 'Other domains can search', + searchby => 'Search types', + searchtypes => 'Search latitude'); + my @offon = ('off','on'); + my @otherdoms = ('Yes','No'); + + my @cansearch = &Apache::loncommon::get_env_multiple('form.cansearch'); + my @searchby = &Apache::loncommon::get_env_multiple('form.searchby'); + + if (ref($currdirsrch{'cansearch'}) eq 'ARRAY') { + foreach my $type (@{$currdirsrch{'cansearch'}}) { + if (!grep(/^\Q$type\E$/,@cansearch)) { + push(@{$changes{'cansearch'}},$type); + } + } + foreach my $type (@cansearch) { + if (!grep(/^\Q$type\E$/,@{$currdirsrch{'cansearch'}})) { + push(@{$changes{'cansearch'}},$type); + } + } + } else { + push(@{$changes{'cansearch'}},@cansearch); + } + + if (ref($currdirsrch{'searchby'}) eq 'ARRAY') { + foreach my $by (@{$currdirsrch{'searchby'}}) { + if (!grep(/^\Q$by\E$/,@searchby)) { + push(@{$changes{'searchby'}},$by); + } + } + foreach my $by (@searchby) { + if (!grep(/^\Q$by\E$/,@{$currdirsrch{'searchby'}})) { + push(@{$changes{'searchby'}},$by); + } + } + } else { + push(@{$changes{'searchby'}},@searchby); + } + + my %dirsrch_hash = ( + directorysrch => { available => $env{'form.dirsrch_available'}, + cansearch => \@cansearch, + localonly => $env{'form.dirsrch_localonly'}, + searchby => \@searchby, + searchtypes => $env{'form.searchtypes'}, + } + ); + my $putresult = &Apache::lonnet::put_dom('configuration',\%dirsrch_hash, + $dom); + if ($putresult eq 'ok') { + if (exists($currdirsrch{'available'})) { + if ($currdirsrch{'available'} ne $env{'form.dirsrch_available'}) { + $changes{'available'} = 1; + } + } else { + if ($env{'form.dirsrch_available'} eq '1') { + $changes{'available'} = 1; + } + } + if (exists($currdirsrch{'localonly'})) { + if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_localonly'}) { + $changes{'localonly'} = 1; + } + } else { + if ($env{'form.dirsrch_localonly'} eq '1') { + $changes{'localonly'} = 1; + } + } + if (exists($currdirsrch{'searchtypes'})) { + if ($currdirsrch{'searchtypes'} ne $env{'form.searchtypes'}) { + $changes{'searchtypes'} = 1; + } + } else { + if ($env{'form.searchtypes'}) { + $changes{'searchtypes'} = 1; + } + } + if (keys(%changes) > 0) { + $resulttext = &mt('Changes made:').''; + } else { + $resulttext = &mt('No changes made to institution directory search settings'); + } + } else { + $resulttext = ''. + &mt('An error occurred: [_1]',$putresult).''; } return $resulttext; }
    '.&mt($item->{text}).' '. - &Apache::loncommon::help_open_topic($item->{'help'}).'
    '.&mt($item->{text}).' 
    '.&mt($item->{text}).' '. +# &Apache::loncommon::help_open_topic($item->{'help'}).'
    - + - '. - &print_autoupdate('top',$dom,$settings).' + '); + if ($action eq 'autoupdate') { + $r->print(&print_autoupdate('top',$dom,$settings)); + } else { + $r->print(&print_rolecolors($phase,'student',$dom,$confname,$settings)); + } + $r->print('
    '.$item->{'header'}->[0]->{'col1'}.''.$item->{'header'}->[0]->{'col1'}.' '.$item->{'header'}->[0]->{'col2'}.'
    - + + '); + if ($action eq 'autoupdate') { + $r->print(&print_autoupdate('bottom',$dom,$settings)); + } else { + $r->print(&print_rolecolors($phase,'coordinator',$dom,$confname,$settings).' +
    '.$item->{'header'}->[1]->{'col1'}.''.$item->{'header'}->[1]->{'col1'}.' '.$item->{'header'}->[1]->{'col2'}.'
    +
    + + + + '. - &print_autoupdate('bottom',$dom,$settings)); + &print_rolecolors($phase,'author',$dom,$confname,$settings).' +
    '.$item->{'header'}->[2]->{'col1'}.''.$item->{'header'}->[2]->{'col2'}.'
    +
    + + + + + '. + &print_rolecolors($phase,'admin',$dom,$confname,$settings)); + } } else { $r->print(' '; return $datatable; } -sub print_quotas { - my ($dom,$settings) = @_; - my $datatable; - my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom); - my $othertitle = "All users"; - my @types; - if (ref($order) eq 'ARRAY') { - @types = @{$order}; +sub login_choices { + my %choices = + &Apache::lonlocal::texthash ( + coursecatalog => 'Display Course Catalog link?', + adminmail => "Display Administrator's E-mail Address?", + img => "Header", + logo => "Main Logo", + domlogo => "Domain Logo", + bgs => "Background colors", + links => "Link colors", + font => "Font color", + pgbg => "Page", + mainbg => "Main panel", + sidebg => "Side panel", + link => "Link", + alink => "Active link", + vlink => "Visited link", + ); + return %choices; +} + +sub print_rolecolors { + my ($phase,$role,$dom,$confname,$settings) = @_; + my %choices = &color_font_choices(); + my @bgs = ('pgbg','tabbg','sidebg'); + my @links = ('link','alink','vlink'); + my @images = ('img'); + my %alt_text = &Apache::lonlocal::texthash(img => "Banner for $role role"); + my %designhash = &Apache::loncommon::get_domainconf($dom); + my %defaultdesign = %Apache::loncommon::defaultdesign; + my (%is_custom,%designs); + my %defaults = ( + img => $defaultdesign{$role.'.img'}, + font => $defaultdesign{$role.'.font'}, + ); + foreach my $item (@bgs) { + $defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item}; } - if (@types == 0) { - if (ref($usertypes) eq 'HASH') { - @types = sort(keys(%{$usertypes})); + foreach my $item (@links) { + $defaults{'links'}{$item} = $defaultdesign{$role.'.'.$item}; + } + if (ref($settings) eq 'HASH') { + if (ref($settings->{$role}) eq 'HASH') { + if ($settings->{$role}->{'img'} ne '') { + $designs{'img'} = $settings->{$role}->{'img'}; + $is_custom{'img'} = 1; + } + if ($settings->{$role}->{'font'} ne '') { + $designs{'font'} = $settings->{$role}->{'font'}; + $is_custom{'font'} = 1; + } + foreach my $item (@bgs) { + if ($settings->{$role}->{$item} ne '') { + $designs{'bgs'}{$item} = $settings->{$role}->{$item}; + $is_custom{$item} = 1; + } + } + foreach my $item (@links) { + if ($settings->{$role}->{$item} ne '') { + $designs{'links'}{$item} = $settings->{$role}->{$item}; + $is_custom{$item} = 1; + } + } + } + } else { + if ($designhash{$dom.'.'.$role.'.img'} ne '') { + $designs{img} = $designhash{$dom.'.'.$role.'.img'}; + $is_custom{'img'} = 1; + } + if ($designhash{$dom.'.'.$role.'.font'} ne '') { + $designs{font} = $designhash{$dom.'.'.$role.'.font'}; + $is_custom{'font'} = 1; } + foreach my $item (@bgs) { + if ($designhash{$dom.'.'.$role.'.'.$item} ne '') { + $designs{'bgs'}{$item} = $designhash{$dom.'.'.$role.'.'.$item}; + $is_custom{$item} = 1; + + } + } + foreach my $item (@links) { + if ($designhash{$dom.'.'.$role.'.'.$item} ne '') { + $designs{'links'}{$item} = $designhash{$dom.'.'.$role.'.'.$item}; + $is_custom{$item} = 1; + } + } + } + my $itemcount = 1; + my $datatable = &display_color_options($dom,$confname,$phase,$role,$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text); + $datatable .= '
    '.$item->{'header'}->[3]->{'col1'}.''.$item->{'header'}->[3]->{'col2'}.'
    - - + '); + if (($action eq 'login') || ($action eq 'directorysrch')) { + $r->print(' + '); + } else { + $r->print(' + '); + } + $r->print(' '); if ($action eq 'login') { - $r->print(&print_login($settings)); + $r->print(&print_login($dom,$confname,$phase,$settings)); } elsif ($action eq 'quotas') { $r->print(&print_quotas($dom,$settings)); } elsif ($action eq 'autoenroll') { $r->print(&print_autoenroll($dom,$settings)); + } elsif ($action eq 'directorysrch') { + $r->print(&print_directorysrch($dom,$settings)); } } $r->print(' @@ -209,18 +301,28 @@ sub print_config_box { sub print_header { my ($r,$phase) = @_; - my $js = qq| + my $js = ' -|; +'; $r->print(&Apache::loncommon::start_page('View/Modify Domain Settings', $js)); $r->print(&Apache::lonhtmlcommon::breadcrumbs('Domain Settings')); - $r->print(''); + $r->print(' + + + + + +'); + $r->print(''); return; } @@ -241,11 +343,29 @@ sub print_footer { } sub print_login { - my ($settings) = @_; - my $catalogon = ' checked="checked" '; - my $catalogoff; - my $adminmailon = ' '; - my $adminmailoff = ' checked="checked" '; + my ($dom,$confname,$phase,$settings) = @_; + my %choices = &login_choices(); + my ($catalogon,$catalogoff,$adminmailon,$adminmailoff); + $catalogon = ' checked="checked" '; + $adminmailoff = ' checked="checked" '; + my @images = ('img','logo','domlogo'); + my @bgs = ('pgbg','mainbg','sidebg'); + my @links = ('link','alink','vlink'); + my %designhash = &Apache::loncommon::get_domainconf($dom); + my %defaultdesign = %Apache::loncommon::defaultdesign; + my (%is_custom,%designs); + my %defaults = ( + font => $defaultdesign{'login.font'}, + ); + foreach my $item (@images) { + $defaults{$item} = $defaultdesign{'login.'.$item}; + } + foreach my $item (@bgs) { + $defaults{'bgs'}{$item} = $defaultdesign{'login.'.$item}; + } + foreach my $item (@links) { + $defaults{'links'}{$item} = $defaultdesign{'login.'.$item}; + } if (ref($settings) eq 'HASH') { if ($settings->{'coursecatalog'} eq '0') { $catalogoff = $catalogon; @@ -255,60 +375,389 @@ sub print_login { $adminmailon = $adminmailoff; $adminmailoff = ' '; } + foreach my $item (@images) { + if ($settings->{$item} ne '') { + $designs{$item} = $settings->{$item}; + $is_custom{$item} = 1; + } + } + if ($settings->{'font'} ne '') { + $designs{'font'} = $settings->{'font'}; + $is_custom{'font'} = 1; + } + foreach my $item (@bgs) { + if ($settings->{$item} ne '') { + $designs{'bgs'}{$item} = $settings->{$item}; + $is_custom{$item} = 1; + } + } + foreach my $item (@links) { + if ($settings->{$item} ne '') { + $designs{'links'}{$item} = $settings->{$item}; + $is_custom{$item} = 1; + } + } + } else { + if ($designhash{$dom.'.login.font'} ne '') { + $designs{'font'} = $designhash{$dom.'.login.font'}; + $is_custom{'font'} = 1; + } + foreach my $item (@images) { + if ($designhash{$dom.'.login.'.$item} ne '') { + $designs{$item} = $designhash{$dom.'.login.'.$item}; + $is_custom{$item} = 1; + } + } + foreach my $item (@bgs) { + if ($designhash{$dom.'.login.'.$item} ne '') { + $designs{'bgs'}{$item} = $designhash{$dom.'.login.'.$item}; + $is_custom{$item} = 1; + } + } + foreach my $item (@links) { + if ($designhash{$dom.'.login.'.$item} ne '') { + $designs{'links'}{$item} = $designhash{$dom.'.login.'.$item}; + $is_custom{$item} = 1; + } + } } - my %choices = - &Apache::lonlocal::texthash( - coursecatalog => 'Display Course Catalog link?', - adminmail => "Display Administrator's E-mail Address?" - ); + my %alt_text = &Apache::lonlocal::texthash ( img => 'Log-in banner', + logo => 'Institution Logo', + domlogo => 'Domain Logo'); + my $itemcount = 1; + my $css_class = $itemcount%2?' class="LC_odd_row"':''; my $datatable = - ''. - ''. - ''. - ''. + ''. ''; + $itemcount ++; + $css_class = $itemcount%2?' class="LC_odd_row"':''; + $datatable .= ''. + ''. + ''; + $itemcount ++; + $datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text); + $datatable .= '
    '.$item->{'header'}->[0]->{'col1'}.'
    '.$item->{'header'}->[0]->{'col1'}.''.$item->{'header'}->[0]->{'col1'}.''.$item->{'header'}->[0]->{'col2'}.'
    '.$choices{'coursecatalog'}. - ''. - ''.&mt('Yes').' '. - ''.&mt('No').'
    '.$choices{'adminmail'}.''. - ''.&mt('Yes').' '. - ''.&mt('No').''.$choices{'coursecatalog'}. + ''. + ' '. + '
    '.$choices{'adminmail'}.''. + ' '. + '
    '.$choices->{'font'}.''.&mt('Default in use:').' '.$defaults->{'font'}.' '. + ' '.$fontlink. + '
    '.$choices->{$img}.''; + if (!$is_custom->{$img}) { + $datatable .= &mt('Default in use:').'
    '; + } + if ($img_import) { + $datatable.= ''; + } + $datatable.= ''.$alt_text->{$img}. + '    		 '.&mt('Replace:').'
    '; + } else { + $datatable.='    		'.&mt('Upload:').'
    '; + } + } else { + $datatable .= '
    '. + &mt('Upload:'); + } + } else { + $datatable .= '
    '. + &mt('Upload:'); + } + if ($switchserver) { + $datatable .= &mt('Upload to library server: [_1]',$switchserver); + } else { + $datatable .=' '; + } + $datatable .= '
    '.$choices->{'bgs'}.''.$choices->{$item}.'
    '.$defaults->{'bgs'}{$item}.'    		'.&mt('Default(s) in use:').'
    '.$bgs_def.'
    		 '. + ''; + foreach my $item (@{$bgs}) { + my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'bgs'}{$item}); + $datatable .= ''; + } + $datatable .= '
    '.$link; + if ($designs->{'bgs'}{$item}) { + $datatable .= ' '; + } + $datatable .= '
    '.$choices->{'links'}.''.$choices->{$item}.'
    '.$defaults->{'links'}{$item}.'    		'.&mt('Default(s) in use:').'
    '.$links_def.'
    		 '. + ''; + foreach my $item (@{$links}) { + $datatable .= ''; + } + return $datatable; +} + +sub color_pick { + my ($phase,$role,$item,$desc,$curcol) = @_; + my $link = ''.$desc.''; + return $link; +} + +sub color_pick_js { + my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition(); + my $output = <<"ENDCOL"; + function pclose() { + parmwin=window.open("/adm/rat/empty.html","LONCAPAparms","height=350,width=350,scrollbars=no,menubar=no"); + parmwin.close(); + } + + $pjump_def + + function psub() { + pclose(); + if (document.parmform.pres_marker.value!='') { + if (document.parmform.pres_type.value!='') { + eval('document.display.'+ + document.parmform.pres_marker.value+ + '.value=document.parmform.pres_value.value;'); + } + } else { + document.parmform.pres_value.value=''; + document.parmform.pres_marker.value=''; + } + } +ENDCOL + return $output; +} + +sub print_quotas { + my ($dom,$settings) = @_; + my $datatable; + my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom); my $typecount = 0; my $css_class; - if (@types > 0) { - foreach my $type (@types) { + if (@{$types} > 0) { + foreach my $type (@{$types}) { if (defined($usertypes->{$type})) { $typecount ++; $css_class = $typecount%2?' class="LC_odd_row"':''; $datatable .= ''. ''. - ''; + '" size="5" /> Mb'; } } - $othertitle = "Other users"; } my $defaultquota = '20'; if (ref($settings) eq 'HASH') { @@ -320,17 +769,16 @@ sub print_quotas { $css_class = $typecount%2?' class="LC_odd_row"':''; $datatable .= ''. ''. - ''; + ''; return $datatable; } sub print_autoenroll { my ($dom,$settings) = @_; - my $defdom = $dom; my $autorun = &Apache::lonnet::auto_run(undef,$dom), - my ($runon,$runoff); + my ($defdom,$runon,$runoff); if (ref($settings) eq 'HASH') { if (exists($settings->{'run'})) { if ($settings->{'run'} eq '0') { @@ -352,23 +800,31 @@ sub print_autoenroll { if (exists($settings->{'sender_domain'})) { $defdom = $settings->{'sender_domain'}; } + } else { + if ($autorun) { + $runon = ' checked="checked" '; + $runoff = ' '; + } else { + $runoff = ' checked="checked" '; + $runon = ' '; + } } my $domform = &Apache::loncommon::select_dom_form($defdom,'sender_domain',1); my $datatable=''. ''. - ''. + $runon.' value="1" />'.&mt('Yes').' '. + ''. ''. ''; + ': '.$domform.''; return $datatable; } @@ -396,48 +852,36 @@ sub print_autoupdate { ); $datatable = ''. ''. - ''. + $updateon.' value="1" />'.&mt('Yes').' '. + ''. ''. ''. - ''. + ''. ''; } else { - my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom); - my @types; - if (ref($order) eq 'ARRAY') { - @types = @{$order}; - } - if (@types == 0) { - if (ref($usertypes) eq 'HASH') { - @types = sort(keys(%{$usertypes})); - } - } - my $othertitle = &mt('All users'); - if (keys(%{$usertypes}) > 0) { - $othertitle = &mt('Other users'); - } - my @fields = ('lastname','firstname','middlename','gen','email','id'); + my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom); + my @fields = ('lastname','firstname','middlename','gen', + 'permanentemail','id'); my %fieldtitles = &Apache::lonlocal::texthash ( id => 'Student/Employee ID', - email => 'E-mail address', + permanentemail => 'E-mail address', lastname => 'Last Name', firstname => 'First Name', middlename => 'Middle Name', gen => 'Generation', ); my $numrows = 0; - if (@types > 0) { + if (@{$types} > 0) { $datatable = &usertype_update_row($settings,$usertypes,\%fieldtitles, - \@fields,\@types,\$numrows); + \@fields,$types,\$numrows); } $datatable .= &usertype_update_row($settings,{'default' => $othertitle}, @@ -447,6 +891,157 @@ sub print_autoupdate { return $datatable; } +sub print_directorysrch { + my ($dom,$settings) = @_; + my $srchon = ' '; + my $srchoff = ' checked="checked" '; + my $exacton = ''; + my $containson = ' checked="checked" '; + my $specifyon = ''; + my $localon = ' '; + my $localoff = ' checked="checked" '; + if (ref($settings) eq 'HASH') { + if ($settings->{'available'} eq '1') { + $srchon = $srchoff; + $srchoff = ' '; + } + if ($settings->{'localonly'} eq '1') { + $localon = $localoff; + $localoff = ' '; + } + if ($settings->{'searchtypes'} eq 'exact') { + $exacton = $containson; + $containson = ' '; + } + if ($settings->{'searchtypes'} eq 'specify') { + $specifyon = $containson; + $containson = ' '; + } + } + my ($searchtitles,$titleorder) = &sorted_searchtitles(); + my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom); + + my $numinrow = 4; + my $datatable=''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''; + + $datatable .= ''. + ''; + return $datatable; +} + +sub sorted_inst_types { + my ($dom) = @_; + my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom); + my $othertitle = "All users"; + my @types; + if (ref($order) eq 'ARRAY') { + @types = @{$order}; + } + if (@types == 0) { + if (ref($usertypes) eq 'HASH') { + @types = sort(keys(%{$usertypes})); + } + } + if (keys(%{$usertypes}) > 0) { + $othertitle = &mt('Other users'); + } + return ($othertitle,$usertypes,\@types); +} + +sub sorted_searchtitles { + my %searchtitles = &Apache::lonlocal::texthash( + 'uname' => 'username', + 'lastname' => 'last name', + 'lastfirst' => 'last name, first name', + ); + my @titleorder = ('uname','lastname','lastfirst'); + return (\%searchtitles,\@titleorder); +} + sub usertype_update_row { my ($settings,$usertypes,$fieldtitles,$fields,$types,$rownums) = @_; my $datatable; @@ -484,10 +1079,10 @@ sub usertype_update_row { } else { $datatable .= ''; + $datatable .= ''; } $datatable .= '
    '; + my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'links'}{$item}); + if ($designs->{'links'}{$item}) { + $datatable.=''. + $link.''; + } else { + $datatable .= $link; + } + $datatable .= '
    		'.$usertypes->{$type}.''. + ''. ' Mb
    '.&mt($othertitle).''. - ' Mb
    '. + ' Mb
    '.&mt('Auto-enrollment active?').''. - ''.&mt('Yes').' '. + '
    '.&mt('Notification messages - sender'). - ''. + ''. &mt('username').': '. '  '.&mt('domain'). - ': '.$domform.'
    '.&mt($title{'run'}).''. - ''.&mt('Yes').' '. + '
    '.&mt($title{'classlists'}).''. - ''.&mt('Yes').' '. - ''.&mt('No').''. + ' '. + '
    '.&mt('Directory search available?').' '. + '
    '.&mt('Search latitude').' '. + ''. + ' 
    '.&mt('Other domains can search').' '. + '
    '.&mt('Users allowed to search').' ('.$dom.')'. + ''; + for (my $i=0; $i<@{$types}; $i++) { + if (defined($usertypes->{$types->[$i]})) { + my $rem = $i%($numinrow); + if ($rem == 0) { + if ($i > 0) { + $datatable .= ''; + } + $datatable .= ''; + } + my $check = ' '; + if (ref($settings->{'cansearch'}) eq 'ARRAY') { + if (grep(/^\Q$types->[$i]\E$/,@{$settings->{'cansearch'}})) { + $check = ' checked="checked" '; + } + } + $datatable .= ''; + } + } + + my $rem = @{$types}%($numinrow); + my $colsleft = $numinrow - $rem; + if ($colsleft > 1) { + $datatable .= ''. + '
    '. + ''; + } else { + $datatable .= ''; + } + my $defcheck = ' '; + if (ref($settings->{'cansearch'}) eq 'ARRAY') { + if (grep(/^default$/,@{$settings->{'cansearch'}})) { + $defcheck = ' checked="checked" '; + } + } + $datatable .= '
    '.&mt('Supported search methods'). + ''; + foreach my $title (@{$titleorder}) { + if (defined($searchtitles->{$title})) { + my $check = ' '; + if (ref($settings->{'searchby'}) eq 'ARRAY') { + if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) { + $check = ' checked="checked" '; + } + } + $datatable .= ''; + } + } + $datatable .= '
    '. + '
    '; } - $datatable .= ''. - $fieldtitles->{$fields->[$i]}.'