/[soft]/identity/CatDap/trunk/lib/CatDap/Controller/user.pm
ViewVC logotype

Diff of /identity/CatDap/trunk/lib/CatDap/Controller/user.pm

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

revision 560 by buchan, Tue Feb 15 23:01:21 2011 UTC revision 561 by buchan, Wed Feb 16 13:33:29 2011 UTC
# Line 223  sub index :Path :Args(0) { Line 223  sub index :Path :Args(0) {
223                grep /$attrname/,@attributes or                grep /$attrname/,@attributes or
224                grep /$attrname/,@{${$c->config}{'Controller::User'}{'uneditable_attrs'}} or                grep /$attrname/,@{${$c->config}{'Controller::User'}{'uneditable_attrs'}} or
225                grep /$attrname/,@{${$c->config}{'Controller::User'}{'skip_attrs'}} or                grep /$attrname/,@{${$c->config}{'Controller::User'}{'skip_attrs'}} or
226                  grep /$attrname/,@{${$c->config}{'Controller::User'}{'editable_attrs'}} and
227                push @may, $attrname;                push @may, $attrname;
228          }          }
229      }      }
# Line 247  sub add : Local  { Line 248  sub add : Local  {
248      my $entry = $mesg->entry;      my $entry = $mesg->entry;
249      $entry->add( $attr => $value);      $entry->add( $attr => $value);
250      $c->log->info("Adding $attr = $value to user $user");      $c->log->info("Adding $attr = $value to user $user");
251      $entry->update;      $mesg = $entry->update;
252      push @{${$c->stash}{'errors'}},$mesg->error if $mesg->code;      push @{${$c->stash}{'errors'}},$mesg->error if $mesg->code;
253      $c->log->info($mesg->error);      $c->log->info($mesg->error);
254      $c->res->redirect('/user');      $c->res->redirect('/user');
# Line 258  sub delete : Local : Args(2) { Line 259  sub delete : Local : Args(2) {
259      my ($mesg,$entry,$user,$userfilter);      my ($mesg,$entry,$user,$userfilter);
260      $user = $c->user->username;      $user = $c->user->username;
261      $userfilter = $c->user->store->user_filter;      $userfilter = $c->user->store->user_filter;
262      $userfilter =~ s/%s/$c->user->username/g;      $userfilter =~ s/%s/$user/g;
263      $c->log->debug("Searching for user $user");      $c->log->debug("Searching for user $user with filter $userfilter");
264      $mesg = $c->model('User')->search($userfilter);      $mesg = $c->model('User')->search($userfilter);
265        push @{${$c->stash}{'errors'}},$mesg->error if $mesg->code;
266        $c->log->info($mesg->error) if $mesg->code;
267      $entry = $mesg->entry;      $entry = $mesg->entry;
268      $c->log->info("Deleting $attrname = $attrvalue from user $user");      $c->log->info("Deleting $attrname: $attrvalue from dn " . $entry->dn);
269      $entry->delete($attrname => $attrvalue);      $entry->delete($attrname => $attrvalue);
270      $entry->update;      $mesg = $entry->update;
271      push @{${$c->stash}{'errors'}},$mesg->error if $mesg->code;      push @{${$c->stash}{'errors'}},$mesg->error if $mesg->code;
272      $c->log->info($mesg->error);      $c->log->info("Result of update: " . $mesg->error . "," . $mesg->code) if $mesg->code;
273      $c->res->redirect('/user');      $c->res->redirect('/user') unless $mesg->code;
274        $c->stash({ attrname => $attrname, attrvalue => $attrvalue});
275  }  }
276    
277  sub password : Local {  sub password : Local {
Legend:
Removed from v.560  
changed lines
  Added in v.561
  ViewVC Help
Powered by ViewVC 1.1.30