[LON-CAPA-cvs] cvs: loncom(version_2_1_X) / lond
albertel
lon-capa-cvs@mail.lon-capa.org
Fri, 10 Feb 2006 09:48:18 -0000
albertel Fri Feb 10 04:48:18 2006 EDT
Modified files: (Branch: version_2_1_X)
/loncom lond
Log:
- backport 1.320
Index: loncom/lond
diff -u loncom/lond:1.305.2.3 loncom/lond:1.305.2.4
--- loncom/lond:1.305.2.3 Tue Feb 7 11:43:22 2006
+++ loncom/lond Fri Feb 10 04:48:17 2006
@@ -2,7 +2,7 @@
# The LearningOnline Network
# lond "LON Daemon" Server (port "LOND" 5663)
#
-# $Id: lond,v 1.305.2.3 2006/02/07 16:43:22 albertel Exp $
+# $Id: lond,v 1.305.2.4 2006/02/10 09:48:17 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -61,7 +61,7 @@
my $lastlog='';
my $lond_max_wait_time = 13;
-my $VERSION='$Revision: 1.305.2.3 $'; #' stupid emacs
+my $VERSION='$Revision: 1.305.2.4 $'; #' stupid emacs
my $remoteVERSION;
my $currenthostid="default";
my $currentdomainid;
@@ -4330,10 +4330,19 @@
my $userinput = "$cmd:$tail";
my $cdom = $tail;
my ($perm_reqd,$conditions);
- my $outcome = &localenroll::photo_permission($cdom,\$perm_reqd,
- \$conditions);
- &Reply($client, &escape($outcome.':'.$perm_reqd.':'. $conditions)."\n",
- $userinput);
+ my $outcome;
+ eval {
+ local($SIG{__DIE__})='DEFAULT';
+ $outcome = &localenroll::photo_permission($cdom,\$perm_reqd,
+ \$conditions);
+ };
+ if (!$@) {
+ &Reply($client, &escape($outcome.':'.$perm_reqd.':'. $conditions)."\n",
+ $userinput);
+ } else {
+ &Failure($client,"unknown_cmd\n",$userinput);
+ }
+ return 1;
}
®ister_handler("autophotopermission",\&photo_permission_handler,0,1,0);
@@ -4358,6 +4367,7 @@
my $result = &localstudentphoto::fetch($udom,$uname,$pid,\$response);
$result .= ':'.$response;
&Reply($client, &escape($result)."\n",$userinput);
+ return 1;
}
®ister_handler("autophotocheck",\&photo_check_handler,0,1,0);
@@ -4371,8 +4381,17 @@
my ($cmd, $tail, $client) = @_;
my $userinput = "$cmd:$tail";
my $cdom = &unescape($tail);
- my ($update,$comment) = &localenroll::manager_photo_update($cdom);
- &Reply($client,&escape($update).':'.&escape($comment)."\n",$userinput);
+ my ($update,$comment);
+ eval {
+ local($SIG{__DIE__})='DEFAULT';
+ ($update,$comment) = &localenroll::manager_photo_update($cdom);
+ };
+ if (!$@) {
+ &Reply($client,&escape($update).':'.&escape($comment)."\n",$userinput);
+ } else {
+ &Failure($client,"unknown_cmd\n",$userinput);
+ }
+ return 1;
}
®ister_handler("autophotochoice",\&photo_choice_handler,0,1,0);
@@ -4405,7 +4424,10 @@
&mkpath($path);
my $file;
if ($type eq 'thumbnail') {
- $file=&localstudentphoto::fetch_thumbnail($domain,$uname);
+ eval {
+ local($SIG{__DIE__})='DEFAULT';
+ $file=&localstudentphoto::fetch_thumbnail($domain,$uname);
+ };
} else {
$file=&localstudentphoto::fetch($domain,$uname);
}