--- rat/lonpageflip.pm 2021/12/31 20:03:33 1.80.8.13.2.1 +++ rat/lonpageflip.pm 2016/02/22 03:36:52 1.90 @@ -2,7 +2,7 @@ # # Page flip handler # -# $Id: lonpageflip.pm,v 1.80.8.13.2.1 2021/12/31 20:03:33 raeburn Exp $ +# $Id: lonpageflip.pm,v 1.90 2016/02/22 03:36:52 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,7 +36,6 @@ use LONCAPA; use Apache::Constants qw(:common :http REDIRECT); use Apache::lonnet; use Apache::loncommon(); -use Apache::lonnavmaps(); use Apache::lonuserstate; use Apache::lonlocal; use HTML::TokeParser; @@ -99,14 +98,9 @@ sub hash_src { } sub move { - my ($next,$endupmap,$direction,$firstres) = @_; + my ($next,$endupmap,$direction) = @_; my $safecount=0; my $allowed=0; - my $deeplinkonly=0; - my $deeplinkchecked; - my $deeplink_login_pc; - my $prev=$next; - my ($prevmapid)=split(/\./,$next); do { ($next,$endupmap)=&get_next_possible_move($next,$endupmap,$direction); @@ -117,83 +111,9 @@ sub move { if ($url eq '' || $symb eq '') { $allowed = 0; } else { - my $nodeeplinkcheck = 0; - if ($hash{'is_map_'.$next}) { - $nodeeplinkcheck = 1; - } - my $priv = &Apache::lonnet::allowed('bre',$url,$symb,'','','','',$nodeeplinkcheck); - $allowed = (($priv eq 'F') || ($priv eq '2') || ($priv eq 'A')); + my $priv = &Apache::lonnet::allowed('bre',$url,$symb); + $allowed = (($priv eq 'F') || ($priv eq '2')); } - $deeplinkonly = 0; - if ($hash{'deeplinkonly_'.$next}) { - my ($value,$level) = map { &unescape($_); } split(/:/,$hash{'deeplinkonly_'.$next}); - my ($state,$others,$listed,$scope,$protect) = split(/,/,$value); - unless (($state eq 'both') || ($hash{'is_map_'.$next})) { - if ($level eq 'resource') { - $deeplinkonly = 1; - } elsif ($level eq 'map') { - if ($scope eq 'rec') { - unless ($mapid == $prevmapid) { - unless ($deeplinkchecked) { - $deeplink_login_pc = &get_deeplink_login_pc(); - $deeplinkchecked = 1; - } - if ($deeplink_login_pc) { - my $poss_map_pc; - if ($hash{'is_map_'.$next}) { - $poss_map_pc = $hash{'map_pc_'.$url}; - } else { - $poss_map_pc = $hash{'map_pc_'.$hash{'map_id_'.$mapid}}; - } - unless ($deeplink_login_pc == $poss_map_pc) { - unless (grep(/^$deeplink_login_pc$/,split(/,/,$hash{'map_hierarchy_'.$poss_map_pc}))) { - $deeplinkonly = 1; - } - } - } else { - $deeplinkonly = 1; - } - } - } elsif ($mapid != $prevmapid) { - $deeplinkonly = 1; - } - } - } - } elsif (($hash{'deeplinkonly_'.$prev}) && (!$firstres)) { - my ($value,$level) = map { &unescape($_); } split(/:/,$hash{'deeplinkonly_'.$prev}); - my ($state,$others,$listed,$scope,$protect) = split(/,/,$value); - unless (($state eq 'both') || ($hash{'is_map_'.$prev})) { - if ($level eq 'resource') { - $deeplinkonly = 1; - } elsif ($level eq 'map') { - if ($scope eq 'rec') { - unless ($mapid == $prevmapid) { - unless ($deeplinkchecked) { - $deeplink_login_pc = &get_deeplink_login_pc(); - $deeplinkchecked = 1; - } - if ($deeplink_login_pc) { - my $poss_map_pc; - if ($hash{'is_map_'.$prev}) { - $poss_map_pc = $hash{'map_pc_'.$url}; - } else { - $poss_map_pc = $hash{'map_pc_'.$hash{'map_id_'.$mapid}}; - } - unless ($deeplink_login_pc == $poss_map_pc) { - unless (grep(/^$deeplink_login_pc$/,split(/,/,$hash{'map_hierarchy_'.$poss_map_pc}))) { - $deeplinkonly = 1; - } - } - } - } - } else { - if ($mapid != $prevmapid) { - $deeplinkonly = 1; - } - } - } - } - } $safecount++; } while ( ($next) && ($next!~/\,/) @@ -201,9 +121,7 @@ sub move { (!$hash{'src_'.$next}) || ( (!$env{'request.role.adv'}) - && (($hash{'randomout_'.$next}) - || ($deeplinkonly) - || ($hash{'deeplinkout_'.$next})) + && $hash{'randomout_'.$next} ) || (!$allowed) ) @@ -238,7 +156,7 @@ sub get_next_possible_move { } if ($thiscond>$mincond) { $mincond=$thiscond; } } - } + } foreach my $id (split(/\,/,$posnext)) { my ($linkid,$condval)=split(/\:/,$id); if ($condval>=$mincond) { @@ -280,7 +198,7 @@ sub get_next_possible_move { } if ($thiscond>$mincond) { $mincond=$thiscond; } } - } + } foreach my $id (split(/\,/,$posnext)) { my ($linkid,$condval)=split(/\:/,$id); if ($condval>=$mincond) { @@ -313,33 +231,23 @@ sub first_accessible_resource { if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db', &GDBM_READER(),0640)) { $furl=$hash{'first_url'}; - my (%args,$url,$argstr); - if ($furl =~ m{^/enc/}) { - ($url,$argstr) = split(/\?/,&Apache::lonenc::unencrypted($furl)); - } else { - ($url,$argstr) = split(/\?/,$furl); - } - foreach my $pair (split(/\&/,$argstr)) { + my %args; + my ($url,$args) = split(/\?/,$furl); + foreach my $pair (split(/\&/,$args)) { my ($name,$value) = split(/=/,$pair); $args{&unescape($name)} = &unescape($value); } - my $priv = &Apache::lonnet::allowed('bre',$url,$args{'symb'}); - my $allowed = (($priv eq 'F') || ($priv eq '2') || ($priv eq 'A')); - if (!$allowed) { + if (!&Apache::lonnet::allowed('bre',$url,$args{'symb'})) { # Wow, we cannot see this ... move forward to the next one that we can see - my ($newrid,$newmap)=&move($hash{'first_rid'},$hash{'first_mapurl'},'forward',1); + my ($newrid,$newmap)=&move($hash{'first_rid'},$hash{'first_mapurl'},'forward'); # Build the new URL - if ($newrid eq '') { - $furl = '/adm/navmaps'; - } else { - my ($newmapid,$newresid)=split(/\./,$newrid); - my $symb=&Apache::lonnet::encode_symb($newmap,$newresid,$hash{'src_'.$newrid}); - $furl=&add_get_param($hash{'src_'.$newrid},{ 'symb' => $symb }); - if ($hash{'encrypted_'.$newrid}) { - $furl=&Apache::lonenc::encrypted($furl); - } - } - } + my ($newmapid,$newresid)=split(/\./,$newrid); + my $symb=&Apache::lonnet::encode_symb($newmap,$newresid,$hash{'src_'.$newrid}); + $furl=&add_get_param($hash{'src_'.$newrid},{ 'symb' => $symb }); + if ($hash{'encrypted_'.$newrid}) { + $furl=&Apache::lonenc::encrypted($furl); + } + } untie(%hash); return $furl; } else { @@ -347,75 +255,6 @@ sub first_accessible_resource { } } -sub check_http_req { - my ($srcref,$hostname) = @_; - return unless (ref($srcref) eq 'SCALAR'); - my $usehttp; - if ($env{'request.course.id'}) { - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - if (($$srcref =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) && - ($ENV{'SERVER_PORT'} == 443) && - ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { - unless ((&Apache::lonnet::uses_sts()) || - (&Apache::lonnet::waf_allssl($hostname))) { - $$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1'; - $usehttp = 1; - } - } elsif (($$srcref =~ m{^\Q/adm/wrapper/ext/\E(?!https:)}) && - ($ENV{'SERVER_PORT'} == 443)) { - unless ((&Apache::lonnet::uses_sts()) || - (&Apache::lonnet::waf_allssl($hostname))) { - my ($url,$anchor) = ($$srcref =~ /^([^\#]+)(?:|(\#[^\#]+))$/); - $$srcref = $url . (($$srcref =~/\?/)? '&':'?') . 'usehttp=1' .$anchor; - $usehttp = 1; - } - } - } - return $usehttp; -} - -sub reinited_js { - my ($url,$cid,$timeout) = @_; - if (!$timeout) { - $timeout = 0; - } - return <<"END"; - -END -} - -sub get_deeplink_login_pc { - my $deeplink_login_pc; - if (($env{'request.deeplink.login'}) && ($env{'request.course.id'})) { - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - my $deeplink_symb = &Apache::loncommon::deeplink_login_symb($cnum,$cdom); - if ($deeplink_symb) { - my $loginmap; - if ($deeplink_symb =~ /\.(page|sequence)$/) { - $loginmap = &Apache::lonnet::clutter((&Apache::lonnet::decode_symb($deeplink_symb))[2]); - } else { - $loginmap = &Apache::lonnet::clutter((&Apache::lonnet::decode_symb($deeplink_symb))[0]); - } - $deeplink_login_pc = $hash{'map_pc_'.$loginmap}; - } - } - return $deeplink_login_pc; -} - # ================================================================ Main Handler sub handler { @@ -432,10 +271,8 @@ sub handler { my %cachehash=(); my $multichoice=0; my %multichoicehash=(); - my %prog_state=(); - my ($redirecturl,$redirectsymb,$enc,$anchor,$deeplinklevel); + my ($redirecturl,$redirectsymb,$enc,$anchor); my $next=''; - my $hostname = $r->hostname(); my @possibilities=(); &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['postdata']); if (($env{'form.postdata'})&&($env{'request.course.fn'})) { @@ -474,20 +311,8 @@ sub handler { untie(%hash); } } - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - $r->print(&Apache::loncommon::start_page('Content Changed')); - my $preamble = '
'. - '
'. - &mt('Your course session is being updated because of recent changes by course personnel.'). - ' '.&mt('Please be patient').'.
'. - '
'; - %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble); - &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course')); my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum"); - &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!')); if ($ferr) { - &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); my $requrl = $r->uri; $env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized"; $env{'user.reinit'} = 1; @@ -504,42 +329,22 @@ sub handler { } if ($direction eq 'firstres') { my $furl=&first_accessible_resource(); - my $usehttp = &check_http_req(\$furl,$hostname); - if (($usehttp) && ($hostname ne '')) { - $furl='http://'.$hostname.$furl; - } else { - $furl=&Apache::lonnet::absolute_url().$furl; - } - if ($reinitcheck eq 'update') { - &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - $r->print(&reinited_js($furl,$env{'request.course.id'},100)); - $r->print(&Apache::loncommon::end_page()); - return OK; - } else { - &Apache::loncommon::content_type($r,'text/html'); - $r->header_out(Location => $furl); - return REDIRECT; - } + &Apache::loncommon::content_type($r,'text/html'); + $r->header_out(Location => + &Apache::lonnet::absolute_url().$furl); + + return REDIRECT; } - if ($direction eq 'return') { + if ($direction eq 'return') { # -------------------------------------------------------- Return to last known - my ($newloc,$usehttp); + my $newloc; if (($last) && (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db', &GDBM_READER(),0640))) { my ($murl,$id,$fn)=&Apache::lonnet::decode_symb($last); $id=$hash{'map_pc_'.&Apache::lonnet::clutter($murl)}.'.'.$id; $newloc=$hash{'src_'.$id}; if ($newloc) { - $usehttp = &check_http_req(\$newloc,$hostname); - if ($hash{'encrypted_'.$id}) { - $newloc=&Apache::lonenc::encrypted($newloc); - } - if ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)(?:|(\#[^\#]+))$}) { - my ($url,$anchor) = ($1,$2); - if ($anchor) { - $newloc = $url.(($url=~/\?/)?'&':'?').'symb='.&escape($last).$anchor; - } - } + if ($hash{'encrypted_'.$id}) { $newloc=&Apache::lonenc::encrypted($newloc); } } else { $newloc='/adm/navmaps'; } @@ -547,20 +352,11 @@ sub handler { } else { $newloc='/adm/navmaps'; } - if (($usehttp) && ($hostname ne '')) { - $newloc='http://'.$hostname.$newloc; - } else { - $newloc=&Apache::lonnet::absolute_url().$newloc - } - if ($reinitcheck eq 'update') { - $r->print(&reinited_js($newloc,$env{'request.course.id'},100)); - $r->print(&Apache::loncommon::end_page()); - return OK; - } else { - &Apache::loncommon::content_type($r,'text/html'); - $r->header_out(Location => $newloc); - return REDIRECT; - } + &Apache::loncommon::content_type($r,'text/html'); + $r->header_out(Location => + &Apache::lonnet::absolute_url().$newloc); + + return REDIRECT; } # # Is the current URL on the map? If not, start with last known URL @@ -574,21 +370,15 @@ sub handler { $last=$hash{'last_known'}; untie(%hash); } + my $newloc; if ($last) { $currenturl=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($last))[2]); } else { - my $newloc = &Apache::lonnet::absolute_url(). - '/adm/navmaps'; - if ($reinitcheck eq 'update') { - &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - $r->print(&reinited_js($newloc,$env{'request.course.id'},100)); - $r->print(&Apache::loncommon::end_page()); - return OK; - } else { - &Apache::loncommon::content_type($r,'text/html'); - $r->header_out(Location => $newloc); - return REDIRECT; - } + &Apache::loncommon::content_type($r,'text/html'); + $r->header_out(Location => + &Apache::lonnet::absolute_url(). + '/adm/navmaps'); + return REDIRECT; } } # ------------------------------------------- Do we have any idea where we are? @@ -646,15 +436,6 @@ sub handler { } else { # -------------------------------------------------------------- No place to go $multichoice=-1; - if ($position && $env{'request.deeplink.login'}) { - my ($map,$resid,$url) = &Apache::lonnet::decode_symb($position); - my $mapid = $hash{'map_pc_'.&Apache::lonnet::clutter($map)}; - my $position_deeplink = $hash{'deeplinkonly_'.$mapid.'.'.$resid}; - if ($position_deeplink) { - (my $value,$deeplinklevel) = map { &unescape($_); } - split(/:/,$position_deeplink); - } - } } # ----------------- The program must come past this point to untie the big hash untie(%hash); @@ -676,14 +457,9 @@ sub handler { &Apache::lonnet::linklog($redirecturl,$currenturl); } # ------------------------------------- Check for and display critical messages - my ($redirect, $url) = &Apache::loncommon::critical_redirect(300.'flip'); + my ($redirect, $url) = &Apache::loncommon::critical_redirect(300); unless ($redirect) { - my $usehttp = &check_http_req(\$redirecturl,$hostname); - if (($usehttp) && ($hostname ne '')) { - $url='http://'.$hostname.$redirecturl; - } else { - $url=&Apache::lonnet::absolute_url().$redirecturl; - } + $url=&Apache::lonnet::absolute_url().$redirecturl; my $addanchor; if (($anchor ne '') && (!$enc || $env{'request.role.adv'})) { $addanchor = 1; @@ -694,26 +470,14 @@ sub handler { $url .= $anchor; } } - if ($reinitcheck eq 'update') { - &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - $r->print(&reinited_js($url,$env{'request.course.id'},100)); - $r->print(&Apache::loncommon::end_page()); - return OK; - } else { - &Apache::loncommon::content_type($r,'text/html'); - $r->header_out(Location => $url); - return REDIRECT; - } + &Apache::loncommon::content_type($r,'text/html'); + $r->header_out(Location => $url); + return REDIRECT; } else { # --------------------------------------------------------- There was a problem &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; my %lt=&Apache::lonlocal::texthash('title' => 'End of Sequence', - 'deeplink' => 'No link available', - 'deeplinkres' => - 'Navigation to other content is unavailable when accessing content via deep-linking', - 'deeplinkmap' => - 'You have reached the end of the sequence of available materials for access via deep-linking', 'explain' => 'You have reached the end of the sequence of materials.', 'back' => 'Go Back', @@ -743,14 +507,9 @@ $lt{'pick'}: $lt{'titleheader'}$lt{'type'} ENDSTART foreach my $id (@possibilities) { - my $src = $multichoicehash{'src_'.$id}; - my $usehttp = &check_http_req(\$src,$hostname); - if (($usehttp) && ($hostname ne '')) { - $src = 'http://'.$hostname.$src; - } $r->print( ''. @@ -773,24 +532,12 @@ ENDSTART .$lt{'gonav'}.'

'); } else { $r->print( - &Apache::loncommon::start_page('No Resource')); - if ($deeplinklevel eq 'resource') { - $r->print('

'.$lt{'deeplink'}.'

' - .'

'.$lt{'deeplinkres'}.'

'); - } elsif ($deeplinklevel eq 'map') { - $r->print('

'.$lt{'title'}.'

' - .'

'.$lt{'deeplinkmap'}.'

'); - } else { - $r->print('

'.$lt{'title'}.'

' - .'

'.$lt{'explain'}.'

'); - } + &Apache::loncommon::start_page('No Resource') + .'

'.$lt{'title'}.'

' + .'

'.$lt{'explain'}.'

'); } } - if ($deeplinklevel) { - $r->print( - &Apache::lonhtmlcommon::actionbox( - [''.$lt{'back'}.''])); - } elsif ((!@possibilities) && ($reinitcheck)) { + if ((!@possibilities) && ($reinitcheck)) { $r->print( &Apache::lonhtmlcommon::actionbox( [''.$lt{'nav'}.'' @@ -808,23 +555,12 @@ ENDSTART } } else { # ------------------------------------------------- Problem, could not tie hash - if ($reinitcheck eq 'update') { - &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - $r->print(&Apache::loncommon::end_page()); - } $env{'user.error.msg'}="/adm/flip:bre:0:1:Course Data Missing"; return HTTP_NOT_ACCEPTABLE; } } else { # ---------------------------------------- No, could not determine where we are - my $newloc = '/adm/ambiguous'; - if ($reinitcheck eq 'update') { - &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - $r->print(&reinited_js($newloc,$env{'request.course.id'},100)); - $r->print(&Apache::loncommon::end_page()); - } else { - $r->internal_redirect($newloc); - } + $r->internal_redirect('/adm/ambiguous'); return OK; } } else {