--- loncom/publisher/londiff.pm 2001/05/09 17:38:12 1.5 +++ loncom/publisher/londiff.pm 2001/12/13 14:02:54 1.7 @@ -1,6 +1,31 @@ # The LearningOnline Network with CAPA # Handler to show differences between file versions # +# $Id: londiff.pm,v 1.7 2001/12/13 14:02:54 harris41 Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# +# # (Handler to retrieve an old version of a file # # (Publication Handler @@ -16,6 +41,9 @@ # 03/31,04/03 Gerd Kortemeyer) # # 05/02/01,05/09 Gerd Kortemeyer +# 12/13 Scott Harrison +# +### package Apache::londiff; @@ -25,6 +53,8 @@ use File::Copy; use Algorithm::Diff qw(diff); use Apache::Constants qw(:common :http :methods); use Apache::loncacc; +use Apache::lonnet(); +use Apache::loncommon(); sub handler { @@ -32,7 +62,7 @@ sub handler { # Get query string for limited number of parameters - map { + foreach (split(/&/,$ENV{'QUERY_STRING'})) { my ($name, $value) = split(/=/,$_); $value =~ tr/+/ /; $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; @@ -42,7 +72,7 @@ sub handler { $ENV{'form.'.$name}=$value; } } - } (split(/&/,$ENV{'QUERY_STRING'})); + } # Get the files @@ -82,7 +112,7 @@ sub handler { } - if (&Apache::lonnet::fileembstyle(($efn=~/\.(\w+)$/)) eq + if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi') { if ($ENV{'form.versionone'} eq 'priv') { my $fn='/home/'.$cuname.'/public_html/'.$efn;