--- loncom/lonnet/perl/lonnet.pm 2013/05/21 18:57:45 1.1223 +++ loncom/lonnet/perl/lonnet.pm 2013/05/29 17:53:50 1.1226 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.1223 2013/05/21 18:57:45 raeburn Exp $ +# $Id: lonnet.pm,v 1.1226 2013/05/29 17:53:50 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -4796,9 +4796,12 @@ sub restore { if ($stuname) { $home=&homeserver($stuname,$domain); } if (!$symb) { - unless ($symb=escape(&symbread())) { return ''; } + return if ($namespace eq 'courserequests'); + unless ($symb=escape(&symbread())) { return ''; } } else { - $symb=&escape(&symbclean($symb)); + unless ($namespace eq 'courserequests') { + $symb=&escape(&symbclean($symb)); + } } if (!$namespace) { unless ($namespace=$env{'request.course.id'}) { @@ -5495,7 +5498,7 @@ sub dump { if (grep { $_ eq $uhome } current_machine_ids()) { # user is hosted on this machine $reply = LONCAPA::Lond::dump_with_regexp(join(":", ($udomain, - $uname, $namespace, $regexp, $range)), $loncaparevs{$uhome}); + $uname, $namespace, $regexp, $range)), $perlvar{'lonVersion'}); return %{unserialize($reply, $escapedkeys)}; } if ($regexp) { @@ -8766,6 +8769,9 @@ sub store_userdata { $namevalue.=&escape($key).'='.&freeze_escape($$storehash{$key}).'&'; } $namevalue=~s/\&$//; + unless ($namespace eq 'courserequests') { + $datakey = &escape($datakey); + } $result = &reply("store:$udom:$uname:$namespace:$datakey:". $namevalue,$uhome); } @@ -12341,8 +12347,8 @@ were new keys. I.E. 1:foo will become 1: Calling convention: - my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$uname,$home); - &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$uname,$home); + my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$uname); + &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$uname); For more detailed information, see lonnet specific documentation.