--- loncom/interface/Attic/londropadd.pm	2007/08/29 04:12:33	1.168
+++ loncom/interface/Attic/londropadd.pm	2007/10/09 17:33:57	1.171
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.168 2007/08/29 04:12:33 raeburn Exp $
+# $Id: londropadd.pm,v 1.171 2007/10/09 17:33:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -262,8 +262,9 @@ sub print_upload_manager_header {
         $password_choice = 'int';        
     }
     #
-    my $javascript_validations=&javascript_validations('auth',$krbdefdom,
-                                    $password_choice);
+    my $javascript_validations = 
+        &javascript_validations('auth',$krbdefdom,$password_choice,undef,
+                                $env{'request.role.domain'});
     my $checked=(($env{'form.noFirstLine'})?' checked="checked" ':'');
     $r->print('<h3>'.&mt('Uploading Class List')."</h3>\n".
               "<hr>\n".
@@ -293,7 +294,7 @@ sub print_upload_manager_header {
 ###############################################################
 ###############################################################
 sub javascript_validations {
-    my ($mode,$krbdefdom,$curr_authtype,$curr_authfield)=@_;
+    my ($mode,$krbdefdom,$curr_authtype,$curr_authfield,$domain)=@_;
     my $authheader;
     if ($mode eq 'auth') {
         my %param = ( formname => 'studentform',
@@ -302,7 +303,7 @@ sub javascript_validations {
         $authheader = &Apache::loncommon::authform_header(%param);
     } elsif ($mode eq 'createcourse') {
         my %param = ( formname => 'ccrs',
-                  kerb_def_dom => $krbdefdom,
+                      kerb_def_dom => $krbdefdom,
                       curr_authtype => $curr_authtype );
         $authheader = &Apache::loncommon::authform_header(%param);
     } elsif ($mode eq 'modifycourse') {
@@ -331,6 +332,7 @@ sub javascript_validations {
     my $function_name =(<<END);
 function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) {
 END
+    my ($authnum,%can_assign) =  &Apache::loncommon::get_assignable_auth($domain);
     my $auth_checks;
     if ($mode eq 'createcourse') {
         $auth_checks .= (<<END);
@@ -345,9 +347,13 @@ END
         $auth_checks .= (<<END);
     var foundatype=0;
     if (founduname==0) {
-	alert('$alert{'username'}');
+        alert('$alert{'username'}');
         return;
     }
+
+END
+        if ($authnum > 1) {
+            $auth_checks .= (<<END);
     // alert('current.radiovalue = '+current.radiovalue);
     if (current.radiovalue == null || current.radiovalue == '' || current.radiovalue == 'nochange') {
         // They did not check any of the login radiobuttons.
@@ -355,6 +361,7 @@ END
         return;
     }
 END
+        }
     }
     if ($mode eq 'createcourse') {
         $auth_checks .= "
@@ -984,6 +991,7 @@ sub get_student_username_domain_form {
 $jscript
 <h3>$lt{'eos'}</h3>
 END
+    $r->print($response);
     $r->print(&single_user_entry_form($defdom,$srch,$forcenewuser));
     return;
 }
@@ -1057,7 +1065,8 @@ sub print_enroll_single_student_form {
         # Set up authentication forms
         my ($krbdef,$krbdefdom) =
             &Apache::loncommon::get_kerberos_defaults($ccdomain);
-        $javascript_validations=&javascript_validations('auth',$krbdefdom);
+        $javascript_validations = 
+            &javascript_validations('auth',$krbdefdom,undef,undef,$ccdomain);
         my %param = ( formname => 'document.studentform',
                       kerb_def_dom => $krbdefdom,
                       kerb_def_auth => $krbdef
@@ -1079,13 +1088,13 @@ sub print_enroll_single_student_form {
         #
         #
 	my %lt=&Apache::lonlocal::texthash(
-		       'udf'  => "User Data for",
+		       'udf'  => "Personal Data",
                        'fn'   => "First Name",
                        'mn'   => "Middle Name",
                        'ln'   => "Last Name",
                        'gen'  => "Generation",
                        'hs'   => "Home Server",
-                       'pswd' => "Password",
+                       'pswd' => "Login Data",
 		       'psam' => "Please select an authentication mechanism",
                        'mail' => "Email Address"
 					   );
@@ -1108,15 +1117,18 @@ sub print_enroll_single_student_form {
 </table>
 <h3>$lt{'pswd'}</h3>
 $lt{'psam'}$authhelp
-<table>
 <p>
-$krbform
-<br />
-$intform
-<br />
-$locform
-</p>
 END
+        if ($krbform ne '') {
+            $user_data_html .= $krbform.'<br />';
+        }
+        if ($intform ne '') {
+            $user_data_html .= $intform.'<br />';
+        }
+        if ($locform ne '') {
+            $user_data_html .= $locform.'<br />';
+        }
+        $user_data_html .= "\n</p>\n"
     } else {
         # User already exists.  Do not worry about authentication
         my %uenv = &Apache::lonnet::dump('environment',$ccdomain,$ccuname);
@@ -1364,6 +1376,11 @@ sub show_class_list {
     }
     my $displayphotos = $env{'form.displayphotos'};
 
+    if (! exists($env{'form.displayclickers'})) {
+        $env{'form.displayclickers'} = 'off';
+    }
+    my $displayclickers = $env{'form.displayclickers'};
+
     # Print out header 
     unless ($mode eq 'autoenroll') {
         $r->print(<<END);
@@ -1373,6 +1390,7 @@ END
     $r->print(<<END);
 <input type="hidden" name="sortby" value="$sortby" />
 <input type="hidden" name="displayphotos" value="$displayphotos" />
+<input type="hidden" name="displayclickers" value="$displayclickers" />
 END
     if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll') {
         if ($linkto eq 'aboutme') {
@@ -1390,6 +1408,7 @@ END
                                            'end'    => "end date",
                                            'type'   => "enroll type/action",
 					   'email'  => "email address",
+                                           'clicker'=> "clicker id",
                                            'photo'  => "photo",
 					   );
         unless ($mode eq 'autoenroll') {
@@ -1446,6 +1465,24 @@ function photowindow(photolink) {
        <a href="javascript:document.studentform.sortby.value='email';document.studentform.submit();">$lt{'email'}</a>
     </th>
 END
+
+# Clicker display on or off?
+
+        my %clicker_options = &Apache::lonlocal::texthash(
+                                                          'on' => 'Show',
+                                                          'off' => 'Hide',
+                                                         );
+        my $clickerchg = 'on';
+        if ($displayclickers eq 'on') {
+            $clickerchg = 'off';
+        }
+        $r->print('    <th>'."\n".'     '.
+            '<a href="javascript:document.studentform.displayclickers.value='.
+                      "'".$clickerchg."'".';document.studentform.submit();">'.
+                      $clicker_options{$clickerchg}.'</a>&nbsp;'.$lt{'clicker'}."\n".
+                      '    </th>'."\n");
+
+# Photo display on or off?
         if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
             my %photo_options = &Apache::lonlocal::texthash(
                                                             'on' => 'Show',
@@ -1462,6 +1499,9 @@ END
                       '    </th>'."\n");
         }
         $r->print("  </tr>\n");
+
+# Done with the HTML header line
+
     } elsif ($mode eq 'csv') {
 	#
 	# Open a file
@@ -1514,6 +1554,9 @@ END
                                       "active groups","email address"],
                             $format->{'bold'});
     }
+
+# Done with header lines in all formats
+
     #
     # Sort the students
     my %index;
@@ -1622,6 +1665,19 @@ END
     <td>$active_groups</td>
     <td>$email</td>
 END
+
+# Clickers
+            if ($displayclickers eq 'on') {
+               my $clickers =
+               (&Apache::lonnet::userenvironment($domain,$username,'clickers'))[1];
+               if ($clickers!~/\w/) { $clickers='-'; }
+               $r->print('<td>'.$clickers.'</td>');
+            } else {
+                $r->print('    <td>&nbsp;</td>  ');
+            }
+
+# Photos
+
             if ($env{'course.'.$env{'request.course.id'}.
 			 '.internal.showphoto'}) {
                 if ($displayphotos eq 'on') {
@@ -2709,6 +2765,9 @@ sub handler {
             if ($env{'form.phase'} eq 'get_user_info') {
                 my ($currstate,$response,$forcenewuser,$results) =
                     &Apache::loncreateuser::user_search_result($srch);
+                if ($env{'form.currstate'} eq 'modify') {
+                    $currstate = $env{'form.currstate'};
+                }
                 if ($currstate eq 'select') {
                     $r->print(&header());
                     &Apache::lonhtmlcommon::add_breadcrumb