|
version 1.518, 2004/07/02 21:14:36
|
version 1.533, 2004/08/27 18:37:03
|
|
Line 1047 sub currentversion {
|
Line 1047 sub currentversion {
|
| sub subscribe { |
sub subscribe { |
| my $fname=shift; |
my $fname=shift; |
| if ($fname=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) { return ''; } |
if ($fname=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) { return ''; } |
| |
$fname=~s/[\n\r]//g; |
| my $author=$fname; |
my $author=$fname; |
| $author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/; |
$author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/; |
| my ($udom,$uname)=split(/\//,$author); |
my ($udom,$uname)=split(/\//,$author); |
|
Line 1067 sub repcopy {
|
Line 1068 sub repcopy {
|
| my $filename=shift; |
my $filename=shift; |
| $filename=~s/\/+/\//g; |
$filename=~s/\/+/\//g; |
| if ($filename=~/^\/home\/httpd\/html\/adm\//) { return OK; } |
if ($filename=~/^\/home\/httpd\/html\/adm\//) { return OK; } |
| |
$filename=~s/[\n\r]//g; |
| my $transname="$filename.in.transfer"; |
my $transname="$filename.in.transfer"; |
| if ((-e $filename) || (-e $transname)) { return OK; } |
if ((-e $filename) || (-e $transname)) { return OK; } |
| my $remoteurl=subscribe($filename); |
my $remoteurl=subscribe($filename); |
|
Line 1131 sub ssi_body {
|
Line 1133 sub ssi_body {
|
| my ($filelink,%form)=@_; |
my ($filelink,%form)=@_; |
| my $output=($filelink=~/^http\:/?&externalssi($filelink): |
my $output=($filelink=~/^http\:/?&externalssi($filelink): |
| &ssi($filelink,%form)); |
&ssi($filelink,%form)); |
| $output=~s/^.*?\<body[^\>]*\>//si; |
|
| $output=~s/(.*)\<\/body\s*\>.*?$/$1/si; |
|
| $output=~ |
$output=~ |
| s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs; |
s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs; |
| |
$output=~s/^.*?\<body[^\>]*\>//si; |
| |
$output=~s/(.*)\<\/body\s*\>.*?$/$1/si; |
| return $output; |
return $output; |
| } |
} |
| |
|
|
Line 1267 sub process_coursefile {
|
Line 1269 sub process_coursefile {
|
| # input: name of form element, coursedoc=1 means this is for the course |
# input: name of form element, coursedoc=1 means this is for the course |
| # output: url of file in userspace |
# output: url of file in userspace |
| |
|
| sub userfileupload { |
sub clean_filename { |
| my ($formname,$coursedoc,$subdir)=@_; |
my ($fname)=@_; |
| if (!defined($subdir)) { $subdir='unknown'; } |
|
| my $fname=$ENV{'form.'.$formname.'.filename'}; |
|
| # Replace Windows backslashes by forward slashes |
# Replace Windows backslashes by forward slashes |
| $fname=~s/\\/\//g; |
$fname=~s/\\/\//g; |
| # Get rid of everything but the actual filename |
# Get rid of everything but the actual filename |
|
Line 1279 sub userfileupload {
|
Line 1279 sub userfileupload {
|
| $fname=~s/\s+/\_/g; |
$fname=~s/\s+/\_/g; |
| # Replace all other weird characters by nothing |
# Replace all other weird characters by nothing |
| $fname=~s/[^\w\.\-]//g; |
$fname=~s/[^\w\.\-]//g; |
| |
return $fname; |
| |
} |
| |
|
| |
sub userfileupload { |
| |
my ($formname,$coursedoc,$subdir)=@_; |
| |
if (!defined($subdir)) { $subdir='unknown'; } |
| |
my $fname=$ENV{'form.'.$formname.'.filename'}; |
| |
$fname=&clean_filename($fname); |
| # See if there is anything left |
# See if there is anything left |
| unless ($fname) { return 'error: no uploaded file'; } |
unless ($fname) { return 'error: no uploaded file'; } |
| chop($ENV{'form.'.$formname}); |
chop($ENV{'form.'.$formname}); |
| |
if (($formname eq 'screenshot') && ($subdir eq 'helprequests')) { #files uploaded to help request form are handled differently |
| |
my $now = time; |
| |
my $filepath = 'tmp/helprequests/'.$now; |
| |
my @parts=split(/\//,$filepath); |
| |
my $fullpath = $perlvar{'lonDaemons'}; |
| |
for (my $i=0;$i<@parts;$i++) { |
| |
$fullpath .= '/'.$parts[$i]; |
| |
if ((-e $fullpath)!=1) { |
| |
mkdir($fullpath,0777); |
| |
} |
| |
} |
| |
open(my $fh,'>'.$fullpath.'/'.$fname); |
| |
print $fh $ENV{'form.'.$formname}; |
| |
close($fh); |
| |
return $fullpath.'/'.$fname; |
| |
} |
| # Create the directory if not present |
# Create the directory if not present |
| my $docuname=''; |
my $docuname=''; |
| my $docudom=''; |
my $docudom=''; |
|
Line 1356 sub removeuserfile {
|
Line 1380 sub removeuserfile {
|
| return &reply("removeuserfile:$docudom/$docuname/$fname",$home); |
return &reply("removeuserfile:$docudom/$docuname/$fname",$home); |
| } |
} |
| |
|
| |
sub mkdiruserfile { |
| |
my ($docuname,$docudom,$dir)=@_; |
| |
my $home=&homeserver($docuname,$docudom); |
| |
return &reply("mkdiruserfile:".&escape("$docudom/$docuname/$dir"),$home); |
| |
} |
| |
|
| |
sub renameuserfile { |
| |
my ($docuname,$docudom,$old,$new)=@_; |
| |
my $home=&homeserver($docuname,$docudom); |
| |
return &reply("renameuserfile:$docudom:$docuname:".&escape("$old").':'. |
| |
&escape("$new"),$home); |
| |
} |
| |
|
| # ------------------------------------------------------------------------- Log |
# ------------------------------------------------------------------------- Log |
| |
|
| sub log { |
sub log { |
|
Line 2575 sub put {
|
Line 2612 sub put {
|
| return &reply("put:$udomain:$uname:$namespace:$items",$uhome); |
return &reply("put:$udomain:$uname:$namespace:$items",$uhome); |
| } |
} |
| |
|
| |
# ---------------------------------------------------------- putstore interface |
| |
|
| |
sub putstore { |
| |
my ($namespace,$storehash,$udomain,$uname)=@_; |
| |
if (!$udomain) { $udomain=$ENV{'user.domain'}; } |
| |
if (!$uname) { $uname=$ENV{'user.name'}; } |
| |
my $uhome=&homeserver($uname,$udomain); |
| |
my $items=''; |
| |
my %allitems = (); |
| |
foreach (keys %$storehash) { |
| |
if ($_ =~ m/^([^\:]+):([^\:]+):([^\:]+)$/) { |
| |
my $key = $1.':keys:'.$2; |
| |
$allitems{$key} .= $3.':'; |
| |
} |
| |
$items.=$_.'='.&escape($$storehash{$_}).'&'; |
| |
} |
| |
foreach (keys %allitems) { |
| |
$allitems{$_} =~ s/\:$//; |
| |
$items.= $_.'='.$allitems{$_}.'&'; |
| |
} |
| |
$items=~s/\&$//; |
| |
return &reply("put:$udomain:$uname:$namespace:$items",$uhome); |
| |
} |
| |
|
| # ------------------------------------------------------ critical put interface |
# ------------------------------------------------------ critical put interface |
| |
|
| sub cput { |
sub cput { |
|
Line 2657 sub allowed {
|
Line 2718 sub allowed {
|
| |
|
| if (defined($ENV{'allowed.'.$priv})) { return $ENV{'allowed.'.$priv}; } |
if (defined($ENV{'allowed.'.$priv})) { return $ENV{'allowed.'.$priv}; } |
| # Free bre access to adm and meta resources |
# Free bre access to adm and meta resources |
| |
if (((($uri=~/^adm\//) && ($uri !~ m|/bulletinboard$|)) |
| if ((($uri=~/^adm\//) || ($uri=~/\.meta$/)) && ($priv eq 'bre')) { |
|| ($uri=~/\.meta$/)) && ($priv eq 'bre')) { |
| return 'F'; |
return 'F'; |
| } |
} |
| |
|
|
Line 3077 sub fetch_enrollment_query {
|
Line 3138 sub fetch_enrollment_query {
|
| $cmd = &escape($cmd); |
$cmd = &escape($cmd); |
| my $query = 'fetchenrollment'; |
my $query = 'fetchenrollment'; |
| my $queryid=&reply("querysend:".$query.':'.$dom.':'.$ENV{'user.name'}.':'.$cmd,$homeserver); |
my $queryid=&reply("querysend:".$query.':'.$dom.':'.$ENV{'user.name'}.':'.$cmd,$homeserver); |
| unless ($queryid=~/^\Q$host\E\_/) { return 'error: '.$queryid; } |
unless ($queryid=~/^\Q$host\E\_/) { |
| |
&logthis('fetch_enrollment_query: invalid queryid: '.$queryid.' for host: '.$host.' and homeserver: '.$homeserver.' context: '.$context.' '.$cnum); |
| |
return 'error: '.$queryid; |
| |
} |
| my $reply = &get_query_reply($queryid); |
my $reply = &get_query_reply($queryid); |
| unless ( ($reply =~/^timeout/) || ($reply =~/^error/) ) { |
if ( ($reply =~/^timeout/) || ($reply =~/^error/) ) { |
| |
&logthis('fetch_enrollment_query error: '.$reply.' for '.$dom.' '.$ENV{'user.name'}.' for '.$queryid.' context: '.$context.' '.$cnum); |
| |
} else { |
| my @responses = split/:/,$reply; |
my @responses = split/:/,$reply; |
| if ($homeserver eq $perlvar{'lonHostID'}) { |
if ($homeserver eq $perlvar{'lonHostID'}) { |
| foreach (@responses) { |
foreach (@responses) { |
|
Line 3096 sub fetch_enrollment_query {
|
Line 3162 sub fetch_enrollment_query {
|
| my $filename = $dom.'_'.$key.'_'.$_.'_classlist.xml'; |
my $filename = $dom.'_'.$key.'_'.$_.'_classlist.xml'; |
| my $destname = $pathname.'/'.$filename; |
my $destname = $pathname.'/'.$filename; |
| my $xml_classlist = &reply("autoretrieve:".$filename,$homeserver); |
my $xml_classlist = &reply("autoretrieve:".$filename,$homeserver); |
| unless ($xml_classlist =~ /^error/) { |
if ($xml_classlist =~ /^error/) { |
| |
&logthis('fetch_enrollment_query - autoretrieve error: '.$xml_classlist.' for '.$filename.' from server: '.$homeserver.' '.$context.' '.$cnum); |
| |
} else { |
| if ( open(FILE,">$destname") ) { |
if ( open(FILE,">$destname") ) { |
| print FILE &unescape($xml_classlist); |
print FILE &unescape($xml_classlist); |
| close(FILE); |
close(FILE); |
| |
} else { |
| |
&logthis('fetch_enrollment_query - error opening classlist file '.$destname.' '.$context.' '.$cnum); |
| } |
} |
| } |
} |
| } |
} |
|
Line 3203 sub auto_create_password {
|
Line 3273 sub auto_create_password {
|
| return ($authparam,$create_passwd,$authchk); |
return ($authparam,$create_passwd,$authchk); |
| } |
} |
| |
|
| |
sub auto_instcode_format { |
| |
my ($caller,$codedom,$instcodes,$codes,$codetitles,$cat_titles,$cat_order) = @_; |
| |
my $courses = ''; |
| |
my $homeserver; |
| |
if ($caller eq 'global') { |
| |
$homeserver = $perlvar{'lonHostID'}; |
| |
} else { |
| |
$homeserver = &homeserver($caller,$codedom); |
| |
} |
| |
my $host=$hostname{$homeserver}; |
| |
foreach (keys %{$instcodes}) { |
| |
$courses .= &escape($_).'='.&escape($$instcodes{$_}).'&'; |
| |
} |
| |
chop($courses); |
| |
my $response=&reply('autoinstcodeformat:'.$codedom.':'.$courses,$homeserver); |
| |
unless ($response =~ /(con_lost|error|no_such_host|refused)/) { |
| |
my ($codes_str,$codetitles_str,$cat_titles_str,$cat_order_str) = split/:/,$response; |
| |
%{$codes} = &str2hash($codes_str); |
| |
@{$codetitles} = &str2array($codetitles_str); |
| |
%{$cat_titles} = &str2hash($cat_titles_str); |
| |
%{$cat_order} = &str2hash($cat_order_str); |
| |
return 'ok'; |
| |
} |
| |
return $response; |
| |
} |
| |
|
| # ------------------------------------------------------------------ Plain Text |
# ------------------------------------------------------------------ Plain Text |
| |
|
| sub plaintext { |
sub plaintext { |
|
Line 3583 sub revokecustomrole {
|
Line 3679 sub revokecustomrole {
|
| $deleteflag); |
$deleteflag); |
| } |
} |
| |
|
| |
# ------------------------------------------------------------ Disk usage |
| # ------------------------------------------------------------ Portfolio Director Lister |
sub diskusage{ |
| sub portfoliolist { |
my ($udom,$uname,$directoryRoot)=@_; |
| #FIXME us the ls: command instead please |
$directoryRoot =~ s/\/$//; |
| #FIXME uhome should never be an argument to any lonnet functions |
my $listing=reply('du:'.$directoryRoot,homeserver($uname,$udom)) |
| # returns listing of contents of user's /userfiles/portfolio/ directory |
|
| # |
|
| my ($udom,$uname,$uhome); |
|
| $uname=$ENV{'user.name'}; |
|
| $udom=$ENV{'user.domain'}; |
|
| $uhome=$ENV{'user.home'}; |
|
| my $listing = &reply('portls:'.$uname.':'.$udom, $uhome); |
|
| return $listing; |
|
| } |
|
| |
|
| sub portfoliomanage { |
|
| |
|
| #FIXME please user the existing remove userfile function instead and |
|
| #add a userfilerename functions. |
|
| #FIXME uhome should never be an argument to any lonnet functions |
|
| |
|
| # handles deleting and renaming files in user's userfiles/portfolio/ directory |
|
| # |
|
| my ($filename, $fileaction, $filenewname) = @_; |
|
| my ($udom, $uname, $uhome); |
|
| $uname=$ENV{'user.name'}; |
|
| $udom=$ENV{'user.domain'}; |
|
| $uhome=$ENV{'user.home'}; |
|
| my $listing = reply('portfoliomanage:'.$uname.':'.$udom.':'.$filename.':'.$fileaction.':'.$filenewname, $uhome); |
|
| return $listing; |
return $listing; |
| } |
} |
| |
|
|
Line 4119 sub metadata {
|
Line 4191 sub metadata {
|
| my ($uri,$what,$liburi,$prefix,$depthcount)=@_; |
my ($uri,$what,$liburi,$prefix,$depthcount)=@_; |
| $uri=&declutter($uri); |
$uri=&declutter($uri); |
| # if it is a non metadata possible uri return quickly |
# if it is a non metadata possible uri return quickly |
| if (($uri eq '') || (($uri =~ m|^/*adm/|) && ($uri !~ m|^adm/includes|)) || |
if (($uri eq '') || |
| |
(($uri =~ m|^/*adm/|) && |
| |
($uri !~ m|^adm/includes|) && ($uri !~ m|/bulletinboard$|)) || |
| ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^~/) || |
($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^~/) || |
| ($uri =~ m|home/[^/]+/public_html/|)) { |
($uri =~ m|home/[^/]+/public_html/|)) { |
| return undef; |
return undef; |
|
Line 4899 sub getfile {
|
Line 4973 sub getfile {
|
| } |
} |
| } else { |
} else { |
| $lwpresp = &getuploaded('GET',$file,$cdom,$cnum,\$info,\$rtncode); |
$lwpresp = &getuploaded('GET',$file,$cdom,$cnum,\$info,\$rtncode); |
| &logthis("return is $lwpresp"); |
|
| if ($lwpresp ne 'ok') { |
if ($lwpresp ne 'ok') { |
| my $ua=new LWP::UserAgent; |
my $ua=new LWP::UserAgent; |
| my $request=new HTTP::Request('GET',&tokenwrapper($file)); |
my $request=new HTTP::Request('GET',&tokenwrapper($file)); |
|
Line 4983 sub filelocation {
|
Line 5056 sub filelocation {
|
| $location = $file; |
$location = $file; |
| $location =~ s:/~(.*?)/(.*):/home/$1/public_html/$2:; |
$location =~ s:/~(.*?)/(.*):/home/$1/public_html/$2:; |
| } elsif ($file=~/^\/*uploaded/) { # is an uploaded file |
} elsif ($file=~/^\/*uploaded/) { # is an uploaded file |
| $location=$file; |
if ($file=~/^\/uploaded\/([^\/]+)\/([^\/]+)\/(\/)?simplepage\/([^\/]+)$/) { |
| |
$location=&Apache::loncommon::propath($1,$2).'/userfiles/simplepage/'.$4; |
| |
if (not -e $location) { |
| |
$file=~/^\/uploaded\/(.*)$/; |
| |
$location=$Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles/'.$1; |
| |
} |
| |
} elsif ($file=~/^\/uploaded\/([^\/]+)\/([^\/]+)\/aboutme\/([^\/]+)$/) { |
| |
$location=&Apache::loncommon::propath($1,$2).'/userfiles/aboutme/'.$3; |
| |
if (not -e $location) { |
| |
$file=~/^\/uploaded\/(.*)$/; |
| |
$location=$Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles/'.$1; |
| |
} |
| |
} else { |
| |
$location=$file; |
| |
} |
| } else { |
} else { |
| $file=~s/^\Q$perlvar{'lonDocRoot'}\E//; |
$file=~s/^\Q$perlvar{'lonDocRoot'}\E//; |
| $file=~s:^/res/:/:; |
$file=~s:^/res/:/:; |
|
Line 5874 put($namespace,$storehash,$udom,$uname)
|
Line 5961 put($namespace,$storehash,$udom,$uname)
|
| |
|
| =item * |
=item * |
| |
|
| |
putstore($namespace,$storehash,$udomain,$uname) : stores hash in namesp |
| |
keys used in storehash include version information (e.g., 1:$symb:message etc.) as |
| |
used in records written by &store and retrieved by &restore. This function |
| |
was created for use in editing discussion posts, without incrementing the |
| |
version number included in the key for a particular post. The colon |
| |
separated list of attribute names (e.g., the value associated with the key |
| |
1:keys:$symb) is also generated and passed in the ampersand separated |
| |
items sent to lonnet::reply(). |
| |
|
| |
=item * |
| |
|
| cput($namespace,$storehash,$udom,$uname) : critical put |
cput($namespace,$storehash,$udom,$uname) : critical put |
| ($udom and $uname are optional) |
($udom and $uname are optional) |
| |
|
![[BACK]](/icons/back.gif){kind=icon}
Return to lonnet.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / lonnet / perl