more session related changes

This commit is contained in:
JT Smith 2006-01-09 19:56:26 +00:00
parent 16b9675b0c
commit 024514c549
106 changed files with 1498 additions and 1313 deletions

View file

@ -88,7 +88,7 @@ sub www_viewActiveSessions {
$output .= $p->getPage($session->form->process("pn"));
$output .= '</table>';
$output .= $p->getBarTraditional($session->form->process("pn"));
return WebGUI::AdminConsole->new("activeSessions")->render($output);
return WebGUI::AdminConsole->new($session,"activeSessions")->render($output);
}
1;

View file

@ -51,7 +51,7 @@ sub _submenu {
my $workarea = shift;
my $title = shift;
$title = WebGUI::International::get($title) if ($title);
my $ac = WebGUI::AdminConsole->new("cache");
my $ac = WebGUI::AdminConsole->new($session,"cache");
if ($session->setting->get("trackPageStatistics")) {
$ac->addSubmenuItem( $session->url->page('op=manageCache'), WebGUI::International::get('manage cache'));
}
@ -77,7 +77,7 @@ Text description of how long the subscription lasts.
sub www_flushCache {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $cache = WebGUI::Cache->new();
my $cache = WebGUI::Cache->new($session,);
$cache->flush;
return www_manageCache();
}
@ -95,7 +95,7 @@ sub www_manageCache {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my ($output, $data);
my $cache = WebGUI::Cache->new();
my $cache = WebGUI::Cache->new($session,);
my $flushURL = $session->url->page('op=flushCache');
$output .= '<table>';
$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get('cache type').':</td><td class="tableData">'.ref($cache).'</td></tr>';

View file

@ -34,7 +34,7 @@ sub _submenu {
my $title = shift;
$title = $i18n->get($title) if ($title);
my $help = shift;
my $ac = WebGUI::AdminConsole->new("commerce");
my $ac = WebGUI::AdminConsole->new($session,"commerce");
if ($help) {
$ac->setHelp($help, 'Commerce');
}

View file

@ -16,13 +16,8 @@ use WebGUI::AdminConsole;
use WebGUI::DatabaseLink;
use WebGUI::Grouping;
use WebGUI::Icon;
use WebGUI::Id;
use WebGUI::International;
use WebGUI::Paginator;
use WebGUI::Privilege;
use WebGUI::Session;
use WebGUI::SQL;
use WebGUI::URL;
#-------------------------------------------------------------------
sub _submenu {
@ -31,7 +26,7 @@ sub _submenu {
my $title = shift;
$title = WebGUI::International::get($title) if ($title);
my $help = shift;
my $ac = WebGUI::AdminConsole->new("databases");
my $ac = WebGUI::AdminConsole->new($session,"databases");
if ($help) {
$ac->setHelp($help);
}
@ -49,11 +44,7 @@ sub _submenu {
sub www_copyDatabaseLink {
my $session = shift;
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(3));
my (%db);
tie %db, 'Tie::CPHash';
%db = $session->db->quickHash("select * from databaseLink where databaseLinkId=".$session->db->quote($session->form->process("dlid")));
$session->db->write("insert into databaseLink (databaseLinkId,title,DSN,username,identifier) values (".$session->db->quote(WebGUI::Id::generate()).",
".$session->db->quote($db{title}." (copy)").", ".$session->db->quote($db{DSN}).", ".$session->db->quote($db{username}).", ".$session->db->quote($db{identifier}).")");
WebGUI::DatabaseLink->new($session,$session->form->process("dlid"))->copy;
return www_listDatabaseLinks();
}
@ -75,7 +66,7 @@ sub www_deleteDatabaseLink {
sub www_deleteDatabaseLinkConfirm {
my $session = shift;
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(3));
$session->db->write("delete from databaseLink where databaseLinkId=".$session->db->quote($session->form->process("dlid")));
WebGUI::DatabaseLink->new($session,$session->form->process("dlid"))->delete;
return www_listDatabaseLinks();
}
@ -88,7 +79,7 @@ sub www_editDatabaseLink {
if ($session->form->process("dlid") eq "new") {
} else {
%db = $session->db->quickHash("select * from databaseLink where databaseLinkId=".$session->db->quote($session->form->process("dlid")));
%db = %{WebGUI::DatabaseLink->new($session,$session->form->process("dlid"))->get};
}
$f = WebGUI::HTMLForm->new(
-extras=>'autocomplete="off"'
@ -139,12 +130,17 @@ sub www_editDatabaseLink {
sub www_editDatabaseLinkSave {
my $session = shift;
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(3));
my $params = {
title=>$session->form->process("title"),
username=>$session->form->process("dbusername"),
identifier=>$session->form->process("dbidentifier")
DSN=>$session->form->process("DSN")
});
if ($session->form->process("dlid") eq "new") {
$session->form->process("dlid") = WebGUI::Id::generate();
$session->db->write("insert into databaseLink (databaseLinkId) values (".$session->db->quote($session->form->process("dlid")).")");
WebGUI::DatabaseLink->create($session,$params);
} else {
WebGUI::DatabaseLink->new($session,$session->form->process("dlid"))->set($params);
}
$session->db->write("update databaseLink set title=".$session->db->quote($session->form->process("title")).", DSN=".$session->db->quote($session->form->process("DSN")).",
username=".$session->db->quote($session->form->process("dbusername")).", identifier=".$session->db->quote($session->form->process("dbidentifier"))." where databaseLinkId=".$session->db->quote($session->form->process("dlid")));
return www_listDatabaseLinks();
}
@ -152,26 +148,18 @@ sub www_editDatabaseLinkSave {
sub www_listDatabaseLinks {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless(WebGUI::Grouping::isInGroup(3));
my ($output, $p, $sth, %data, @row, $i);
$sth = $session->db->read("select * from databaseLink order by title");
$row[$i] = '<tr><td valign="top" class="tableData"></td><td valign="top" class="tableData">'.WebGUI::International::get(1076).'</td></tr>';
$i++;
while (%data = $sth->hash) {
$row[$i] = '<tr><td valign="top" class="tableData">'
.deleteIcon('op=deleteDatabaseLink;dlid='.$data{databaseLinkId})
.editIcon('op=editDatabaseLink;dlid='.$data{databaseLinkId})
.copyIcon('op=copyDatabaseLink;dlid='.$data{databaseLinkId})
my $links = WebGUI::DatabaseLinks->getList($session);
my $output = '<table border="1" cellpadding="3" cellspacing="0" align="center">';
foreach my $id (keys %{$links}) {
$output .= '<tr><td valign="top" class="tableData"></td><td valign="top" class="tableData">'.WebGUI::International::get(1076).'</td></tr>';
$output = '<tr><td valign="top" class="tableData">'
.deleteIcon('op=deleteDatabaseLink;dlid='.$id)
.editIcon('op=editDatabaseLink;dlid='.$id)
.copyIcon('op=copyDatabaseLink;dlid='.$id)
.'</td>';
$row[$i] .= '<td valign="top" class="tableData">'.$data{title}.'</td></tr>';
$i++;
$output .= '<td valign="top" class="tableData">'.$links->{$id}.'</td></tr>';
}
$sth->finish;
$p = WebGUI::Paginator->new($session->url->page('op=listDatabaseLinks'));
$p->setDataByArrayRef(\@row);
$output .= '<table border="1" cellpadding="3" cellspacing="0" align="center">';
$output .= $p->getPage;
$output .= '</table>';
$output .= $p->getBarTraditional;
return _submenu($output,"database links manage");
}

View file

@ -13,7 +13,6 @@ package WebGUI::Operation::Group;
use strict;
use Tie::CPHash;
use WebGUI::AdminConsole;
use WebGUI::DatabaseLink;
use WebGUI::DateTime;
use WebGUI::Group;
use WebGUI::Grouping;
@ -46,7 +45,7 @@ sub _submenu {
my $title = shift;
$title = WebGUI::International::get($title) if ($title);
my $help = shift;
my $ac = WebGUI::AdminConsole->new("groups");
my $ac = WebGUI::AdminConsole->new($session,"groups");
if ($help) {
$ac->setHelp($help);
}
@ -181,7 +180,7 @@ sub www_addUsersToGroupSave {
#-------------------------------------------------------------------
sub www_autoAddToGroup {
my $session = shift;
return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::insufficient()) unless ($session->user->profileField("userId") ne 1);
return WebGUI::AdminConsole->new($session,"groups")->render(WebGUI::Privilege::insufficient()) unless ($session->user->profileField("userId") ne 1);
my $group = WebGUI::Group->new($session->form->process("groupId"));
if ($group->autoAdd) {
WebGUI::Grouping::addUsersToGroups([$session->user->profileField("userId")],[$session->form->process("groupId")]);
@ -192,7 +191,7 @@ sub www_autoAddToGroup {
#-------------------------------------------------------------------
sub www_autoDeleteFromGroup {
my $session = shift;
return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::insufficient()) unless ($session->user->profileField("userId") ne 1);
return WebGUI::AdminConsole->new($session,"groups")->render(WebGUI::Privilege::insufficient()) unless ($session->user->profileField("userId") ne 1);
my $group = WebGUI::Group->new($session->form->process("groupId"));
if ($group->autoDelete) {
WebGUI::Grouping::deleteUsersFromGroups([$session->user->profileField("userId")],[$session->form->process("groupId")]);

View file

@ -100,7 +100,7 @@ sub _getHelpName {
sub www_viewHelp {
my $session = shift;
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(7));
my $ac = WebGUI::AdminConsole->new("help");
my $ac = WebGUI::AdminConsole->new($session,"help");
my $namespace = $session->form->process("namespace") || "WebGUI";
my $i18n = WebGUI::International->new($namespace);
my $help = _get($session->form->process("hid"),$namespace);
@ -118,7 +118,7 @@ sub www_viewHelp {
my $body = WebGUI::Asset::Template->new("PBtmplHelp000000000001")->process(\%vars);
$ac->addSubmenuItem($session->url->page('op=viewHelpIndex'),WebGUI::International::get(95));
$ac->addSubmenuItem($session->url->page('op=viewHelpTOC'),WebGUI::International::get('help contents'));
WebGUI::Macro::process(\$body);
WebGUI::Macro::process($session,\$body);
return $ac->render(
$body,
WebGUI::International::get(93).': '.$i18n->get($help->{title})
@ -154,7 +154,7 @@ sub www_viewHelpIndex {
}
}
$output .= '</td></tr></table>';
my $ac = WebGUI::AdminConsole->new("help");
my $ac = WebGUI::AdminConsole->new($session,"help");
$ac->addSubmenuItem($session->url->page('op=viewHelpTOC'),WebGUI::International::get('help contents'));
return $ac->render($output, join ': ',WebGUI::International::get(93), WebGUI::International::get('help index'));
}
@ -184,7 +184,7 @@ sub www_viewHelpTOC {
}
}
$output .= '</td></tr></table>';
my $ac = WebGUI::AdminConsole->new("help");
my $ac = WebGUI::AdminConsole->new($session,"help");
$ac->addSubmenuItem($session->url->page('op=viewHelpIndex'),WebGUI::International::get(95));
return $ac->render($output, join ': ',WebGUI::International::get(93), WebGUI::International::get('help toc'));
}
@ -200,7 +200,7 @@ sub www_viewHelpChapter {
foreach my $id (@entries) {
$output .= '<p><a href="'._link($id,$namespace).'">'.WebGUI::International::get($help->{$id}{title},$namespace).'</a></p>';
}
my $ac = WebGUI::AdminConsole->new("help");
my $ac = WebGUI::AdminConsole->new($session,"help");
$ac->addSubmenuItem($session->url->page('op=viewHelpIndex'),WebGUI::International::get(95));
$ac->addSubmenuItem($session->url->page('op=viewHelpTOC'),WebGUI::International::get('help contents'));
return $ac->render($output, join ': ',WebGUI::International::get(93), _getHelpName($namespace));

View file

@ -31,7 +31,7 @@ sub _submenu {
my $title = shift;
$title = WebGUI::International::get($title,"AuthLDAP") if ($title);
my $help = shift;
my $ac = WebGUI::AdminConsole->new("ldapconnections");
my $ac = WebGUI::AdminConsole->new($session,"ldapconnections");
if ($help) {
$ac->setHelp($help,"AuthLDAP");
}

View file

@ -64,7 +64,7 @@ sub www_viewLoginHistory {
$output .= $p->getPage($session->form->process("pn"));
$output .= '</table>';
$output .= $p->getBar($session->form->process("pn"));
return WebGUI::AdminConsole->new("loginHistory")->render($output);
return WebGUI::AdminConsole->new($session,"loginHistory")->render($output);
}
1;

View file

@ -25,7 +25,7 @@ sub _submenu {
my $title = shift;
$title = $i18n->get($title) if ($title);
my $help = shift;
my $ac = WebGUI::AdminConsole->new("productManager");
my $ac = WebGUI::AdminConsole->new($session,"productManager");
if ($help) {
$ac->setHelp($help, 'ProductManager');
}

View file

@ -31,7 +31,7 @@ sub _submenu {
my $help = shift;
my $namespace = shift;
$title = WebGUI::International::get($title,$namespace) if ($title);
my $ac = WebGUI::AdminConsole->new("userProfiling");
my $ac = WebGUI::AdminConsole->new($session,"userProfiling");
if ($help) {
$ac->setHelp($help,"WebGUIProfile");
}
@ -54,7 +54,7 @@ sub www_deleteProfileCategoryConfirm {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $category = WebGUI::ProfileCategory->new($session->form->process("cid"));
return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::vitalComponent()) if ($category->isProtected);
return WebGUI::AdminConsole->new($session,"userProfiling")->render(WebGUI::Privilege::vitalComponent()) if ($category->isProtected);
$category->delete;
return www_editProfileSettings();
}
@ -64,7 +64,7 @@ sub www_deleteProfileFieldConfirm {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $field = WebGUI::ProfileField->new($session->form->process("fid"));
return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::vitalComponent()) if ($field->isProtected);
return WebGUI::AdminConsole->new($session,"userProfiling")->render(WebGUI::Privilege::vitalComponent()) if ($field->isProtected);
$field->delete;
return www_editProfileSettings();
}

View file

@ -27,7 +27,7 @@ sub _submenu {
my $title = shift;
$title = WebGUI::International::get($title) if ($title);
my $help = shift;
my $ac = WebGUI::AdminConsole->new("contentFilters");
my $ac = WebGUI::AdminConsole->new($session,"contentFilters");
if ($help) {
$ac->setHelp($help);
}

View file

@ -289,7 +289,7 @@ sub www_editSettings {
$tabform->getTab("auth")->raw('<tr id="'.$_.$style.'"><td colspan="2" width="100%"><table border="0" cellspacing="0" cellpadding="0" width="100%">'.$authInstance->editUserSettingsForm.'<tr><td width="304">&nbsp;</td><td width="496">&nbsp;</td></tr></table></td></tr>');
}
$tabform->submit();
my $ac = WebGUI::AdminConsole->new("settings");
my $ac = WebGUI::AdminConsole->new($session,"settings");
$ac->setHelp("settings");
return $ac->render($tabform->print);
}

View file

@ -25,7 +25,7 @@ sub _submenu {
my $workarea = shift;
my $title = shift;
$title = WebGUI::International::get($title) if ($title);
my $ac = WebGUI::AdminConsole->new("statistics");
my $ac = WebGUI::AdminConsole->new($session,"statistics");
if ($session->setting->get("trackPageStatistics")) {
$ac->addSubmenuItem( $session->url->page('op=viewStatistics'), WebGUI::International::get(144));
}
@ -39,7 +39,7 @@ sub www_viewStatistics {
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my ($output, $data);
my $url = "http://www.plainblack.com/downloads/latest-version.txt";
my $cache = WebGUI::Cache->new($url,"URL");
my $cache = WebGUI::Cache->new($session,$url,"URL");
my $version = $cache->get;
if (not defined $version) {
$version = $cache->setByHTTP($url,43200);

View file

@ -40,7 +40,7 @@ sub _submenu {
my $title = shift;
$title = $i18n->get($title) if ($title);
my $help = shift;
my $ac = WebGUI::AdminConsole->new("subscriptions");
my $ac = WebGUI::AdminConsole->new($session,"subscriptions");
if ($help) {
$ac->setHelp($help, 'Subscription');
}

View file

@ -69,7 +69,7 @@ sub _submenu {
my $title = shift;
$title = WebGUI::International::get($title) if ($title);
my $help = shift;
my $ac = WebGUI::AdminConsole->new("users");
my $ac = WebGUI::AdminConsole->new($session,"users");
if ($help) {
$ac->setHelp($help);
}
@ -274,7 +274,7 @@ sub www_deleteUserConfirm {
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my ($u);
if ($session->form->process("uid") eq '1' || $session->form->process("uid") eq '3') {
return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::vitalComponent());
return WebGUI::AdminConsole->new($session,"users")->render(WebGUI::Privilege::vitalComponent());
} else {
$u = WebGUI::User->new($session->form->process("uid"));
$u->delete;