--- loncom/interface/createaccount.pm	2019/07/29 13:54:02	1.72.4.2
+++ loncom/interface/createaccount.pm	2017/08/03 16:22:08	1.74
@@ -4,7 +4,7 @@
 # kerberos, or SSO) or an e-mail address. Requests to use an e-mail address as
 # username may be processed automatically, or may be queued for approval.
 #
-# $Id: createaccount.pm,v 1.72.4.2 2019/07/29 13:54:02 raeburn Exp $
+# $Id: createaccount.pm,v 1.74 2017/08/03 16:22:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -328,7 +328,7 @@ sub handler {
         &print_header($r,$start_page,$courseid,$pagetitle);
         my $now=time;
         if ((grep(/^login$/,@{$cancreate})) && (!grep(/^email$/,@{$cancreate}))) {
-            if (open(my $jsh,"<","$include/londes.js")) {
+            if (open(my $jsh,"<$include/londes.js")) {
                 while(my $line = <$jsh>) {
                     $r->print($line);
                 }
@@ -634,7 +634,7 @@ sub print_username_form {
                     push(@posstypes,'default');
                 }
                 $output .= '<p>'.&mt('Choose your affiliation at [_1]',$domdesc).'</p>'."\n".
-                           '<form name="reportstatus" id="LC_reportstatus" action="/adm/createaccount" method="post" '.
+                           '<form name="reportstatus" id="LC_reportstatus" action="" method="post" '.
                            'onsubmit="return checkVerification();"><p>';
                 foreach my $type (@posstypes) {
                     my $name;
@@ -648,11 +648,7 @@ sub print_username_form {
                             }
                         }
                     }
-                    my $checked;
-                    if ($env{'form.type'} eq $type) {
-                        $checked = ' checked="checked"';
-                    }
-                    $output .= '<label><input type="radio" name="type" value="'.$type.'"'.$checked.' />'.
+                    $output .= '<label><input type="radio" name="type" value="'.$type.'" />'.
                                $name.'</label>'.('&nbsp;'x2);
                 }
                 if ($env{'form.courseid'} =~ /^$match_domain\_$match_courseid$/) {
@@ -691,18 +687,6 @@ sub print_username_form {
                     }
                     if ($usertype eq '') {
                         $usertype = 'default';
-                    } elsif (ref($usertypes) eq 'HASH') {
-                        my $usertitle;
-                        if ($usertype eq 'default') {
-                            $usertitle = $othertitle;
-                        } elsif (exists($usertypes->{$usertype})) {
-                            $usertitle = $usertypes->{$usertype};
-                        }
-                        if ($usertitle ne '') {
-                            $output .= &mt('Self-reported affiliation: [_1]',
-                                           '<span style="font-style: italic;">'.$usertitle.'</span>').
-                                       '<br />';
-                        }
                     }
                     $output .= &print_dataentry_form($r,$domain,$lonhost,$include,$now,$captchaform,
                                                      $courseid,$emailusername,$captcha,$usertype,
@@ -1089,7 +1073,7 @@ sub print_dataentry_form {
     my ($r,$domain,$lonhost,$include,$now,$captchaform,$courseid,$emailusername,$captcha,
         $usertype,$recaptchaversion,$usernameset,$condition,$excluded) = @_;
     my ($error,$output);
-    if (open(my $jsh,"<","$include/londes.js")) {
+    if (open(my $jsh,"<$include/londes.js")) {
         while(my $line = <$jsh>) {
             $r->print($line);
         }
@@ -1886,14 +1870,14 @@ sub sso_logout_frag {
     if (defined($r->dir_config('lonSSOUserLogoutMessageFile_'.$domain))) {
         my $msgfile = $r->dir_config('lonSSOUserLogoutMessageFile_'.$domain);
         if (-e $msgfile) {
-            open(my $fh,"<",$msgfile);
+            open(my $fh,"<$msgfile");
             $endsessionmsg = join('',<$fh>);
             close($fh);
         }
     } elsif (defined($r->dir_config('lonSSOUserLogoutMessageFile'))) {
         my $msgfile = $r->dir_config('lonSSOUserLogoutMessageFile');
         if (-e $msgfile) {     
-            open(my $fh,"<",$msgfile);
+            open(my $fh,"<$msgfile");
             $endsessionmsg = join('',<$fh>);
             close($fh);
         }
@@ -2012,7 +1996,6 @@ function checkVerification() {
             if (curr == types[j]) {
                 if (!cancreate) {
                     alert('Creation of an account via verification by e-mail unavailable for user type: "'+names[j]+'"');
-                    setElements();
                 }
                 break;
             }