[system] / branches / rel-2-1-a1 / webwork-modperl / lib / WeBWorK / Authen.pm Repository:
ViewVC logotype

Diff of /branches/rel-2-1-a1/webwork-modperl/lib/WeBWorK/Authen.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 817 Revision 825
101 my $debugPracticeUser = $ce->{debugPracticeUser}; 101 my $debugPracticeUser = $ce->{debugPracticeUser};
102 102
103 my $user = $r->param('user'); 103 my $user = $r->param('user');
104 my $passwd = $r->param('passwd'); 104 my $passwd = $r->param('passwd');
105 my $key = $r->param('key'); 105 my $key = $r->param('key');
106 my $force_passwd_authen = $r->param('force_passwd_authen');
106 107
107 my $error; 108 my $error;
108 my $failWithoutError = 0; 109 my $failWithoutError = 0;
109 110
110 VERIFY: { 111 VERIFY: {
115 unless (defined $user or defined $passwd or defined $key) { 116 unless (defined $user or defined $passwd or defined $key) {
116 $failWithoutError = 1; 117 $failWithoutError = 1;
117 last VERIFY; 118 last VERIFY;
118 } 119 }
119 120
120 # no user was supplied. 121 if (defined $user and $force_passwd_authen) {
122 $failWithoutError = 1;
123 last VERIFY;
124 }
125
126 # no user was supplied. somebody's building their own GET
121 unless ($user) { 127 unless ($user) {
122 $error = "You must specify a username."; 128 $error = "You must specify a username.";
123 last VERIFY; 129 last VERIFY;
124 } 130 }
125 131

Legend:
Removed from v.817  
changed lines
  Added in v.825

aubreyja at gmail dot com
ViewVC Help
Powered by ViewVC 1.0.9