oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

oodles of fixes.

Browse source
This commit is contained in:
Matthew Wilson 2006-01-21 02:01:15 +00:00
parent 73b38f5498
commit 3d740cdfac
4 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/WebGUI/Operation/DatabaseLink.pm
View file

@ -58,7 +58,7 @@ sub www_deleteDatabaseLink {
.'">'.$i18n->get(44).'</a>'; .'">'.$i18n->get(44).'</a>';
$output .= '&nbsp;&nbsp;&nbsp;&nbsp;<a href="'.$session->url->page('op=listDatabaseLinks'). $output .= '&nbsp;&nbsp;&nbsp;&nbsp;<a href="'.$session->url->page('op=listDatabaseLinks').
'">'.$i18n->get(45).'</a></div>'; '">'.$i18n->get(45).'</a></div>';
return _submenu($output,"987","database link delete"); return _submenu($session,$output,"987","database link delete");
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -76,7 +76,9 @@ sub www_editDatabaseLink {
my ($output, %db, $f); my ($output, %db, $f);
tie %db, 'Tie::CPHash'; tie %db, 'Tie::CPHash';
if ($session->form->process("dlid") eq "new") { if ($session->form->process("dlid") eq "new") {
} elsif ($session->form->process("dlid") eq "0") {
} else { } else {
%db = %{WebGUI::DatabaseLink->new($session,$session->form->process("dlid"))->get}; %db = %{WebGUI::DatabaseLink->new($session,$session->form->process("dlid"))->get};
} }
@ -123,7 +125,7 @@ sub www_editDatabaseLink {
); );
$f->submit; $f->submit;
$output .= $f->print; $output .= $f->print;
return _submenu($output,"990","database link add/edit"); return _submenu($session,$output,"990","database link add/edit");
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -148,7 +150,7 @@ sub www_editDatabaseLinkSave {
sub www_listDatabaseLinks { sub www_listDatabaseLinks {
my $session = shift; use WebGUI; WebGUI::dumpSession($session); my $session = shift; use WebGUI; WebGUI::dumpSession($session);
return $session->privilege->adminOnly() unless($session->user->isInGroup(3)); return $session->privilege->adminOnly() unless($session->user->isInGroup(3));
my $links = WebGUI::DatabaseLinks->getList($session); my $links = WebGUI::DatabaseLink->getList($session);
my $output = '<table border="1" cellpadding="3" cellspacing="0" align="center">'; my $output = '<table border="1" cellpadding="3" cellspacing="0" align="center">';
my $i18n = WebGUI::International->new($session); my $i18n = WebGUI::International->new($session);
foreach my $id (keys %{$links}) { foreach my $id (keys %{$links}) {
@ -161,7 +163,7 @@ sub www_listDatabaseLinks {
$output .= '<td valign="top" class="tableData">'.$links->{$id}.'</td></tr>'; $output .= '<td valign="top" class="tableData">'.$links->{$id}.'</td></tr>';
} }
$output .= '</table>'; $output .= '</table>';
return _submenu($output,"database links manage"); return _submenu($session,$output,"database links manage");
} }

26
lib/WebGUI/Operation/User.pm
View file

@ -37,7 +37,7 @@ Operation for creating, deleting, editing and many other user related functions.
=cut =cut
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 _submenu ( $workarea [, $title, $help] ) =head2 _submenu ( $session, $workarea [, $title, $help] )
Internal utility routine for setting up the Admin Console for User functions. Internal utility routine for setting up the Admin Console for User functions.
@ -84,7 +84,7 @@ sub _submenu {
return $ac->render($workarea, $title); return $ac->render($workarea, $title);
} }
=head2 doUserSearch ( $op, $returnPaginator, $userFilter ) =head2 doUserSearch ( $session, $op, $returnPaginator, $userFilter )
Subroutine that actually performs the SQL search for users. Subroutine that actually performs the SQL search for users.
@ -141,7 +141,7 @@ sub doUserSearch {
} }
} }
=head2 doUserSearchForm ( $op, $params ) =head2 doUserSearchForm ( $session, $op, $params )
Form front-end and display for searching for users. Form front-end and display for searching for users.
@ -223,6 +223,8 @@ sub www_becomeUser {
my $session = shift; use WebGUI; WebGUI::dumpSession($session); my $session = shift; use WebGUI; WebGUI::dumpSession($session);
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3)); return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
$session->user({userId=>$session->form->process("uid")}); $session->user({userId=>$session->form->process("uid")});
$session->var->end($session->var->get("sessionId"));
$session->var->start($session->form->process("uid"),$session->getId);
return ""; return "";
} }
@ -243,14 +245,14 @@ sub www_deleteUser {
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3)); return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
my $i18n = WebGUI::International->new($session); my $i18n = WebGUI::International->new($session);
if ($session->form->process("uid") eq '1' || $session->form->process("uid") eq '3') { if ($session->form->process("uid") eq '1' || $session->form->process("uid") eq '3') {
return _submenu($session->privilege->vitalComponent()); return _submenu($session,$session->privilege->vitalComponent());
} else { } else {
$output .= $i18n->get(167).'<p>'; $output .= $i18n->get(167).'<p>';
$output .= '<div align="center"><a href="'.$session->url->page('op=deleteUserConfirm;uid='.$session->form->process("uid")). $output .= '<div align="center"><a href="'.$session->url->page('op=deleteUserConfirm;uid='.$session->form->process("uid")).
'">'.$i18n->get(44).'</a>'; '">'.$i18n->get(44).'</a>';
$output .= '&nbsp;&nbsp;&nbsp;&nbsp;<a href="'.$session->url->page('op=listUsers').'">'. $output .= '&nbsp;&nbsp;&nbsp;&nbsp;<a href="'.$session->url->page('op=listUsers').'">'.
$i18n->get(45).'</a></div>'; $i18n->get(45).'</a></div>';
return _submenu($output,'42',"user delete"); return _submenu($session,$output,'42',"user delete");
} }
} }
@ -382,7 +384,7 @@ sub www_editUser {
-size=>15, -size=>15,
-value=>\@groupsToDelete -value=>\@groupsToDelete
); );
return _submenu($error.$tabform->print,'168',"user add/edit"); return _submenu($session,$error.$tabform->print,'168',"user add/edit");
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -419,7 +421,7 @@ sub www_editUserSave {
$error = '<ul><li>'.$i18n->get(77).' '.$session->form->process("username").'Too or '.$session->form->process("username").'02</li></ul>'; $error = '<ul><li>'.$i18n->get(77).' '.$session->form->process("username").'Too or '.$session->form->process("username").'02</li></ul>';
} }
if ($isSecondary) { if ($isSecondary) {
return _submenu($i18n->get(978)); return _submenu($session,$i18n->get(978));
} else { } else {
return www_editUser($error); return www_editUser($error);
} }
@ -452,7 +454,7 @@ sub www_editUserKarma {
); );
$f->submit; $f->submit;
$output .= $f->print; $output .= $f->print;
return _submenu($output,'558',"edit user karma"); return _submenu($session,$output,'558',"edit user karma");
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -477,9 +479,9 @@ sub www_listUsers {
} }
my %status; my %status;
my $i18n = WebGUI::International->new($session); my $i18n = WebGUI::International->new($session);
my $output = getUserSearchForm("listUsers"); my $output = getUserSearchForm($session,"listUsers");
my ($userCount) = $session->db->quickArray("select count(*) from users"); my ($userCount) = $session->db->quickArray("select count(*) from users");
return _submenu($output) unless ($session->form->process("doit") || $userCount<250 || $session->form->process("pn") > 1); return _submenu($session,$output) unless ($session->form->process("doit") || $userCount<250 || $session->form->process("pn") > 1);
tie %status, 'Tie::IxHash'; tie %status, 'Tie::IxHash';
%status = ( %status = (
Active => $i18n->get(817), Active => $i18n->get(817),
@ -496,7 +498,7 @@ sub www_listUsers {
<td class="tableHeader">'.$i18n->get(429).'</td> <td class="tableHeader">'.$i18n->get(429).'</td>
<td class="tableHeader">'.$i18n->get(434).'</td> <td class="tableHeader">'.$i18n->get(434).'</td>
</tr>'; </tr>';
my $p = doUserSearch("listUsers",1); my $p = doUserSearch($session,"listUsers",1);
foreach my $data (@{$p->getPageData}) { foreach my $data (@{$p->getPageData}) {
$output .= '<tr class="tableData">'; $output .= '<tr class="tableData">';
$output .= '<td>'.$status{$data->{status}}.'</td>'; $output .= '<td>'.$status{$data->{status}}.'</td>';
@ -521,7 +523,7 @@ sub www_listUsers {
} }
$output .= '</table>'; $output .= '</table>';
$output .= $p->getBarTraditional; $output .= $p->getBarTraditional;
return _submenu($output,undef,"users manage"); return _submenu($session,$output,undef,"users manage");
} }
1; 1;

4
lib/WebGUI/Paginator.pm
View file

@ -538,10 +538,10 @@ sub setDataByQuery {
my ($self, $sql, $dbh, $unconditional, $placeholders, $dynamicPageNumberKey, $dynamicPageNumberValue) = @_; my ($self, $sql, $dbh, $unconditional, $placeholders, $dynamicPageNumberKey, $dynamicPageNumberValue) = @_;
$dbh ||= $self->session->dbSlave; $dbh ||= $self->session->dbSlave;
if ($unconditional) { if ($unconditional) {
$sth = $dbh->unconditionalRead($sql,$placeholders); $sth = $dbh->unconditionalRead($sql,undef,$placeholders);
return $sth->errorMessage if ($sth->errorCode > 0); return $sth->errorMessage if ($sth->errorCode > 0);
} else { } else {
$sth = $dbh->read($sql,$placeholders); $sth = $dbh->read($sql,undef,$placeholders);
} }
my $defaultPageNumber = $self->getPageNumber; my $defaultPageNumber = $self->getPageNumber;
$self->{_totalRows} = $sth->rows; $self->{_totalRows} = $sth->rows;

6
lib/WebGUI/Session/DateTime.pm
View file

@ -60,7 +60,7 @@ This package provides easy to use date math functions, which are normally a comp
($interval, $units) = $dt->secondsToInterval($seconds); ($interval, $units) = $dt->secondsToInterval($seconds);
$timeString = $dt->secondsToTime($seconds); $timeString = $dt->secondsToTime($seconds);
$epoch = $dt-$self->session->datetime->setToEpoch($setString); $epoch = $dt-$self->session->datetime->setToEpoch($setString);
$epoch = $dt-$self->session->datetime->time(); $epoch = $dt-$self->time();
$seconds = $dt->timeToSeconds($timeString); $seconds = $dt->timeToSeconds($timeString);
=head1 METHODS =head1 METHODS
@ -223,7 +223,7 @@ A string representing the output format for the date. Defaults to '%z %Z'. You c
sub epochToHuman { sub epochToHuman {
my $self = shift; my $self = shift;
my $epoch = shift || $self->session->datetime->time(); my $epoch = shift || $self->time();
my $i18n = WebGUI::International->new($self->session); my $i18n = WebGUI::International->new($self->session);
my $language = $i18n->getLanguage($self->session->user->profileField("language")); my $language = $i18n->getLanguage($self->session->user->profileField("language"));
my $locale = $language->{languageAbbreviation} || "en"; my $locale = $language->{languageAbbreviation} || "en";
@ -560,7 +560,7 @@ The number of seconds since January 1, 1970. Defaults to now.
sub localtime { sub localtime {
my $self = shift; my $self = shift;
my $dt = DateTime->from_epoch( epoch => shift ||$self->session->datetime->time() ); my $dt = DateTime->from_epoch( epoch => shift ||$self->time() );
$dt->set_time_zone($self->session->user->profileField("timeZone")|| "America/Chicago"); # assign the user's timezone $dt->set_time_zone($self->session->user->profileField("timeZone")|| "America/Chicago"); # assign the user's timezone
return ( $dt->year, $dt->month, $dt->day, $dt->hour, $dt->minute, $dt->second, $dt->day_of_year, $dt->day_of_week, $dt->is_dst ); return ( $dt->year, $dt->month, $dt->day, $dt->hour, $dt->minute, $dt->second, $dt->day_of_year, $dt->day_of_week, $dt->is_dst );
} }