version 1.1021, 2011/10/17 12:41:30
|
version 1.1029, 2011/12/04 16:27:05
|
Line 4446 sub get_legacy_domconf {
|
Line 4446 sub get_legacy_domconf {
|
close($fh); |
close($fh); |
} |
} |
} |
} |
if (-e '/home/httpd/html/adm/lonDomLogos/'.$udom.'.gif') { |
if (-e $Apache::lonnet::perlvar{'lonDocRoot'}.'/adm/lonDomLogos/'.$udom.'.gif') { |
$legacyhash{$udom.'.login.domlogo'} = "/adm/lonDomLogos/$udom.gif"; |
$legacyhash{$udom.'.login.domlogo'} = "/adm/lonDomLogos/$udom.gif"; |
} |
} |
return %legacyhash; |
return %legacyhash; |
Line 4532 sub designparm {
|
Line 4532 sub designparm {
|
|
|
=item * &authorspace() |
=item * &authorspace() |
|
|
Inputs: ./. |
Inputs: $url (usually will be undef). |
|
|
Returns: Path to the Construction Space of the current user's |
Returns: Path to Construction Space containing the resource or |
accessed author space |
directory being viewed (or for which action is being taken). |
The author space will be that of the current user |
If $url is provided, and begins /priv/<domain>/<uname> |
when accessing the own author space |
the path will be that portion of the $context argument. |
and that of the co-author/assistent co-author |
Otherwise the path will be for the author space of the current |
when accessing the co-author's/assistent co-author's |
user when the current role is author, or for that of the |
space |
co-author/assistant co-author space when the current role |
|
is co-author or assistant co-author. |
|
|
=cut |
=cut |
|
|
sub authorspace { |
sub authorspace { |
|
my ($url) = @_; |
|
if ($url ne '') { |
|
if ($url =~ m{^(/priv/$match_domain/$match_username/)}) { |
|
return $1; |
|
} |
|
} |
my $caname = ''; |
my $caname = ''; |
if ($env{'request.role'} =~ /^ca|^aa/) { |
my $cadom = ''; |
(undef,$caname) = |
if ($env{'request.role'} =~ /^(?:ca|aa)/) { |
|
($cadom,$caname) = |
($env{'request.role'}=~/($match_domain)\/($match_username)$/); |
($env{'request.role'}=~/($match_domain)\/($match_username)$/); |
} else { |
} elsif ($env{'request.role'} =~ m{^au\./($match_domain)/}) { |
$caname = $env{'user.name'}; |
$caname = $env{'user.name'}; |
|
$cadom = $env{'user.domain'}; |
} |
} |
return '/priv/'.$caname.'/'; |
if (($caname ne '') && ($cadom ne '')) { |
|
return "/priv/$cadom/$caname/"; |
|
} |
|
return; |
} |
} |
|
|
############################################## |
############################################## |
Line 4580 sub head_subbox {
|
Line 4592 sub head_subbox {
|
|
|
=item * &CSTR_pageheader() |
=item * &CSTR_pageheader() |
|
|
Inputs: ./. |
Input: (optional) filename from which breadcrumb trail is built. |
|
In most cases no input as needed, as $env{'request.filename'} |
|
is appropriate for use in building the breadcrumb trail. |
|
|
Returns: HTML div with CSTR path and recent box |
Returns: HTML div with CSTR path and recent box |
To be included on Construction Space pages |
To be included on Construction Space pages |
Line 4588 Returns: HTML div with CSTR path and rec
|
Line 4602 Returns: HTML div with CSTR path and rec
|
=cut |
=cut |
|
|
sub CSTR_pageheader { |
sub CSTR_pageheader { |
# this is for resources; directories have customtitle, and crumbs |
my ($trailfile) = @_; |
# and select recent are created in lonpubdir.pm |
if ($trailfile eq '') { |
my ($uname,$thisdisfn)= |
$trailfile = $env{'request.filename'}; |
($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|); |
} |
my $formaction='/priv/'.$uname.'/'.$thisdisfn; |
|
$formaction=~s/\/+/\//g; |
# this is for resources; directories have customtitle, and crumbs |
|
# and select recent are created in lonpubdir.pm |
|
|
|
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
|
my ($udom,$uname,$thisdisfn)= |
|
($trailfile =~ m{^\Q$londocroot\E/priv/([^/]+)/([^/]+)/(.*)$}); |
|
my $formaction = "/priv/$udom/$uname/$thisdisfn"; |
|
$formaction =~ s{/+}{/}g; |
|
|
my $parentpath = ''; |
my $parentpath = ''; |
my $lastitem = ''; |
my $lastitem = ''; |
Line 4610 sub CSTR_pageheader {
|
Line 4631 sub CSTR_pageheader {
|
.'<b>'.&mt('Construction Space:').'</b> ' |
.'<b>'.&mt('Construction Space:').'</b> ' |
.'<form name="dirs" method="post" action="'.$formaction |
.'<form name="dirs" method="post" action="'.$formaction |
.'" target="_top">' #FIXME lonpubdir: target="_parent" |
.'" target="_top">' #FIXME lonpubdir: target="_parent" |
.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv',undef,undef); |
.&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv/'.$udom,undef,undef); |
|
|
if ($lastitem) { |
if ($lastitem) { |
$output .= |
$output .= |
Line 5503 span.LC_current_location {
|
Line 5524 span.LC_current_location {
|
background: $pgbg; |
background: $pgbg; |
} |
} |
|
|
|
span.LC_current_nav_location { |
|
font-weight:bold; |
|
background: $sidebg; |
|
} |
|
|
span.LC_parm_menu_item { |
span.LC_parm_menu_item { |
font-size: larger; |
font-size: larger; |
} |
} |
Line 7124 sub get_users_function {
|
Line 7150 sub get_users_function {
|
$function='admin'; |
$function='admin'; |
} |
} |
if (($env{'request.role'}=~/^(au|ca|aa)/) || |
if (($env{'request.role'}=~/^(au|ca|aa)/) || |
($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) { |
($ENV{'REQUEST_URI'}=~ m{/^(/priv)})) { |
$function='author'; |
$function='author'; |
} |
} |
return $function; |
return $function; |
Line 8448 sub ask_for_embedded_content {
|
Line 8474 sub ask_for_embedded_content {
|
$getpropath = 1; |
$getpropath = 1; |
} elsif (($actionurl eq '/adm/upload') || ($actionurl eq '/adm/testbank') || |
} elsif (($actionurl eq '/adm/upload') || ($actionurl eq '/adm/testbank') || |
($actionurl eq '/adm/imsimport')) { |
($actionurl eq '/adm/imsimport')) { |
($uname,my $rest) = ($args->{'current_path'} =~ m{/priv/($match_username)/?(.*)$}); |
my ($udom,$uname,$rest) = ($args->{'current_path'} =~ m{/priv/($match_domain)/($match_username)/?(.*)$}); |
$url = '/home/'.$uname.'/public_html/'; |
$url = $Apache::lonnet::perlvar{'lonDocRoot'}."/priv/$udom/$uname/"; |
$toplevel = $url; |
$toplevel = $url; |
if ($rest ne '') { |
if ($rest ne '') { |
$url .= $rest; |
$url .= $rest; |
Line 8813 sub upload_embedded {
|
Line 8839 sub upload_embedded {
|
my $fullpath = $dir_root.$dirpath.'/'.$path; |
my $fullpath = $dir_root.$dirpath.'/'.$path; |
my $dest = $fullpath.$fname; |
my $dest = $fullpath.$fname; |
my $url = $url_root.$dirpath.'/'.$path.$fname; |
my $url = $url_root.$dirpath.'/'.$path.$fname; |
my @parts=split(/\//,$fullpath); |
my @parts=split(/\//,"$dirpath/$path"); |
my $count; |
my $count; |
my $filepath = $dir_root; |
my $filepath = $dir_root; |
for ($count=4;$count<=$#parts;$count++) { |
foreach my $subdir (@parts) { |
$filepath .= "/$parts[$count]"; |
$filepath .= "/$subdir"; |
if ((-e $filepath)!=1) { |
if (!-e $filepath) { |
mkdir($filepath,0770); |
mkdir($filepath,0770); |
} |
} |
} |
} |
Line 8937 sub modify_html_refs {
|
Line 8963 sub modify_html_refs {
|
} elsif ($context eq 'coursedoc') { |
} elsif ($context eq 'coursedoc') { |
$container = $env{'form.primaryurl'}; |
$container = $env{'form.primaryurl'}; |
} else { |
} else { |
$container = $env{'form.filename'}; |
$container = $Apache::lonnet::perlvar{'lonDocRoot'}.$env{'form.filename'}; |
$container =~ s{^/priv/(\Q$uname\E)/(.*)}{/home/$1/public_html/$2}; |
|
} |
} |
my (%allfiles,%codebase,$output,$content); |
my (%allfiles,%codebase,$output,$content); |
my @changes = &get_env_multiple('form.namechange'); |
my @changes = &get_env_multiple('form.namechange'); |