[LON-CAPA-cvs] cvs: loncom / lond

albertel lon-capa-cvs@mail.lon-capa.org
Thu, 21 Oct 2004 16:05:50 -0000 

This is a MIME encoded message

--albertel1098374750
Content-Type: text/plain

albertel		Thu Oct 21 12:05:50 2004 EDT

  Modified files:              
    /loncom	lond 
  Log:
  - cleanup some ws and &
  
  
  
--albertel1098374750
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20041021120550.txt"

Index: loncom/lond
diff -u loncom/lond:1.262 loncom/lond:1.263
--- loncom/lond:1.262	Tue Oct 19 06:57:06 2004
+++ loncom/lond	Thu Oct 21 12:05:50 2004
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.262 2004/10/19 10:57:06 foxr Exp $
+# $Id: lond,v 1.263 2004/10/21 16:05:50 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,7 +57,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.262 $'; #' stupid emacs
+my $VERSION='$Revision: 1.263 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -1130,7 +1130,6 @@
 #      0       - Program should exit.
 #  Side effects:
 #      Reply information is sent to the client.
-
 sub ping_handler {
     my ($cmd, $tail, $client) = @_;
     Debug("$cmd $tail $client .. $currenthostid:");
@@ -1158,7 +1157,6 @@
 #      0       - Program should exit.
 #  Side effects:
 #      Reply information is sent to the client.
-
 sub pong_handler {
     my ($cmd, $tail, $replyfd) = @_;
 
@@ -1213,7 +1211,6 @@
 }
 &register_handler("ekey", \&establish_key_handler, 0, 1,1);
 
-
 #     Handler for the load command.  Returns the current system load average
 #     to the requestor.
 #
@@ -1248,7 +1245,7 @@
    
     return 1;
 }
-register_handler("load", \&load_handler, 0, 1, 0);
+&register_handler("load", \&load_handler, 0, 1, 0);
 
 #
 #   Process the userload request.  This sub returns to the client the current
@@ -1278,7 +1275,7 @@
     
     return 1;
 }
-register_handler("userload", \&user_load_handler, 0, 1, 0);
+&register_handler("userload", \&user_load_handler, 0, 1, 0);
 
 #   Process a request for the authorization type of a user:
 #   (userauth).
@@ -1335,7 +1332,6 @@
 #      0       - Program should exit
 # Implicit Output:
 #    a reply is written to the client.
-
 sub push_file_handler {
     my ($cmd, $tail, $client) = @_;
 
@@ -1378,7 +1374,6 @@
 # Side Effects:
 #   The reply is written to  $client.
 #
-
 sub du_handler {
     my ($cmd, $ududir, $client) = @_;
     my ($ududir) = split(/:/,$ududir); # Make 'telnet' testing easier.
@@ -1412,7 +1407,6 @@
 }
 &register_handler("du", \&du_handler, 0, 1, 0);
 
-
 #
 #   ls  - list the contents of a directory.  For each file in the
 #    selected directory the filename followed by the full output of
@@ -1476,9 +1470,6 @@
 }
 &register_handler("ls", \&ls_handler, 0, 1, 0);
 
-
-
-
 #   Process a reinit request.  Reinit requests that either
 #   lonc or lond be reinitialized so that an updated 
 #   host.tab or domain.tab can be processed.
@@ -1508,7 +1499,6 @@
     }
     return 1;
 }
-
 &register_handler("reinit", \&reinit_process_handler, 1, 0, 1);
 
 #  Process the editing script for a table edit operation.
@@ -1550,8 +1540,7 @@
     }
     return 1;
 }
-register_handler("edit", \&edit_table_handler, 1, 0, 1);
-
+&register_handler("edit", \&edit_table_handler, 1, 0, 1);
 
 #
 #   Authenticate a user against the LonCAPA authentication
@@ -1606,8 +1595,7 @@
 
     return 1;
 }
-
-register_handler("auth", \&authenticate_handler, 1, 1, 0);
+&register_handler("auth", \&authenticate_handler, 1, 1, 0);
 
 #
 #   Change a user's password.  Note that this function is complicated by
@@ -1698,8 +1686,7 @@
 
     return 1;
 }
-register_handler("passwd", \&change_password_handler, 1, 1, 0);
-
+&register_handler("passwd", \&change_password_handler, 1, 1, 0);
 
 #
 #   Create a new user.  User in this case means a lon-capa user.
@@ -2038,7 +2025,6 @@
 #
 # Returns:
 #    1    - Continue processing.
-
 sub remove_user_file_handler {
     my ($cmd, $tail, $client) = @_;
 
@@ -2091,7 +2077,6 @@
 #
 # Returns:
 #    1    - Continue processing.
-
 sub mkdir_user_file_handler {
     my ($cmd, $tail, $client) = @_;
 
@@ -2140,7 +2125,6 @@
 #
 # Returns:
 #    1    - Continue processing.
-
 sub rename_user_file_handler {
     my ($cmd, $tail, $client) = @_;
 
@@ -2174,10 +2158,9 @@
 }
 &register_handler("renameuserfile", \&rename_user_file_handler, 0,1,0);
 
-
 #
-#  Authenticate access to a user file by checking the user's 
-#  session token(?)
+#  Authenticate access to a user file by checking that the token the user's 
+#  passed also exists in their session file
 #
 # Parameters:
 #   cmd      - The request keyword that dispatched to tus.
@@ -2185,7 +2168,6 @@
 #   client   - Filehandle open on the client.
 # Return:
 #    1.
-
 sub token_auth_user_file_handler {
     my ($cmd, $tail, $client) = @_;
 
@@ -2206,10 +2188,8 @@
     return 1;
 
 }
-
 &register_handler("tokenauthuserfile", \&token_auth_user_file_handler, 0,1,0);
 
-
 #
 #   Unsubscribe from a resource.
 #
@@ -2238,6 +2218,7 @@
     return 1;
 }
 &register_handler("unsub", \&unsubscribe_handler, 0, 1, 0);
+
 #   Subscribe to a resource
 #
 # Parameters:
@@ -2316,7 +2297,7 @@
 
     return 1;
 }
-register_handler("log", \&activity_log_handler, 0, 1, 0);
+&register_handler("log", \&activity_log_handler, 0, 1, 0);
 
 #
 #   Put a namespace entry in a user profile hash.
@@ -2421,7 +2402,6 @@
 }
 &register_handler("inc", \&increment_user_value_handler, 0, 1, 0);
 
-
 #
 #   Put a new role for a user.  Roles are LonCAPA's packaging of permissions.
 #   Each 'role' a user has implies a set of permissions.  Adding a new role
@@ -2629,6 +2609,7 @@
     return 1;
 }
 &register_handler("eget", \&get_profile_entry_encrypted, 0, 1, 0);
+
 #
 #   Deletes a key in a user profile database.
 #   
@@ -2647,7 +2628,6 @@
 #     0   - Exit server.
 #
 #
-
 sub delete_profile_entry {
     my ($cmd, $tail, $client) = @_;
 
@@ -2676,6 +2656,7 @@
     return 1;
 }
 &register_handler("del", \&delete_profile_entry, 0, 1, 0);
+
 #
 #  List the set of keys that are defined in a profile database file.
 #  A successful reply from this will contain an & separated list of
@@ -2854,7 +2835,6 @@
 
     return 1;
 }
-
 &register_handler("dump", \&dump_with_regexp, 0, 1, 0);
 
 #  Store a set of key=value pairs associated with a versioned name.
@@ -2920,6 +2900,7 @@
     return 1;
 }
 &register_handler("store", \&store_handler, 0, 1, 0);
+
 #
 #  Dump out all versions of a resource that has key=value pairs associated
 # with it for each version.  These resources are built up via the store
@@ -3020,6 +3001,7 @@
     return 1;
 }
 &register_handler("chatsend", \&send_chat_handler, 0, 1, 0);
+
 #
 #   Retrieve the set of chat messagss from a discussion board.
 #
@@ -3314,8 +3296,8 @@
 
     return 1;
 }
-
 &register_handler("idput", \&put_id_handler, 0, 1, 0);
+
 #
 #  Retrieves a set of id values from the id database.
 #  Returns an & separated list of results, one for each requested id to the
@@ -3364,8 +3346,7 @@
     
     return 1;
 }
-
-register_handler("idget", \&get_id_handler, 0, 1, 0);
+&register_handler("idget", \&get_id_handler, 0, 1, 0);
 
 #
 #  Process the tmpput command I'm not sure what this does.. Seems to
@@ -3408,6 +3389,7 @@
   
 }
 &register_handler("tmpput", \&tmp_put_handler, 0, 1, 0);
+
 #   Processes the tmpget command.  This command returns the contents
 #  of a temporary resource file(?) created via tmpput.
 #
@@ -3420,7 +3402,6 @@
 #    1         - Inidcating processing can continue.
 # Side effects:
 #   A reply is sent to the client.
-
 #
 sub tmp_get_handler {
     my ($cmd, $id, $client) = @_;
@@ -3443,6 +3424,7 @@
     return 1;
 }
 &register_handler("tmpget", \&tmp_get_handler, 0, 1, 0);
+
 #
 #  Process the tmpdel command.  This command deletes a temp resource
 #  created by the tmpput command.
@@ -3476,6 +3458,7 @@
 
 }
 &register_handler("tmpdel", \&tmp_del_handler, 0, 1, 0);
+
 #
 #   Processes the setannounce command.  This command
 #   creates a file named announce.txt in the top directory of
@@ -3514,6 +3497,7 @@
     return 1;
 }
 &register_handler("setannounce", \&set_announce_handler, 0, 1, 0);
+
 #
 #  Return the version of the daemon.  This can be used to determine
 #  the compatibility of cross version installations or, alternatively to
@@ -3538,6 +3522,7 @@
     return 1;
 }
 &register_handler("version", \&get_version_handler, 0, 1, 0);
+
 #  Set the current host and domain.  This is used to support
 #  multihomed systems.  Each IP of the system, or even separate daemons
 #  on the same IP can be treated as handling a separate lonCAPA virtual
@@ -3674,6 +3659,7 @@
     return 1;
 }
 &register_handler("autonewcourse", \&validate_course_owner_handler, 0, 1, 0);
+
 #
 #   Validate a course section in the official schedule of classes
 #   from the institutions point of view (part of autoenrollment).
@@ -3754,7 +3740,6 @@
 #
 # Returns:
 #   1     - Continue processing.
-
 sub retrieve_auto_file_handler {
     my ($cmd, $tail, $client)    = @_;
     my $userinput                = "cmd:$tail";
@@ -3852,7 +3837,6 @@
 #
 #   Getting, decoding and dispatching requests:
 #
-
 #
 #   Get a Request:
 #   Gets a Request message from the client.  The transaction

--albertel1098374750--