removed page stats system, fixed stats page, fixed admin console templating on all admin console error messages

docs/changelog/6.x.x.txt

@@ -64,6 +64,14 @@
  - Added an asset picker form control.
  - Shortcuts can now proxy every type of asset, not just wobjects.
  - Added a codearea form control.
+ - fix [ 1055362 ] Trash items show up in Search resultsA
+ - fix [ 1049367 ] /uploads/temp/templates/ shouldn't be public
+ - fix [ 1052801 ] wobjectproxy throws security error on editSubmission
+ - fix [ 1028921 ] Cannot drag n drop proxy wobjects
+ - fix [ 1003509 ] Admin mode breaks page layout with users not in Admin Group
+ - Removed the page stats tracking function as it was killing people's sites.
+   We recommend AWStats instead (www.awstats.org)
+
 
 
 6.2.11

docs/upgrades/upgrade_6.2.11-6.3.0.sql

@@ -242,3 +242,6 @@ alter table IndexedSearch_docInfo drop page_groupIdView;
 alter table IndexedSearch_docInfo change wobject_special_groupIdView special_groupIdView varchar(22);
 alter table IndexedSearch_docInfo change wobject_groupIdView groupIdView varchar(22);
 update USS set sortBy='lineage' where sortBy='sequenceNumber';
+delete from settings where name='trackPageStatistics';
+drop table pageStatistics;
+

lib/WebGUI/Asset/Wobject.pm

@@ -268,15 +268,6 @@ sub logView {
 # not sure what this will do in the new model
 #		WebGUI::PassiveProfiling::addPage();	# add wobjects on asset to passive profile log
 	}
- # disabled for the time being because it's dangerous
-                #       if ($session{form}{op} eq "" && $session{setting}{trackPageStatistics} && $session{form}{wid} ne "new") {
-                #               WebGUI::SQL->write("insert into pageStatistics (dateStamp, userId, username, ipAddress, userAgent, referer,
-                #                       assetId, assetTitle, wobjectId, wobjectFunction) values (".time().",".quote($session{user}{userId})
-                #                       .",".quote($session{user}{username}).",
-                #                       ".quote($session{env}{REMOTE_ADDR}).", ".quote($session{env}{HTTP_USER_AGENT}).",
-                #                       ".quote($session{env}{HTTP_REFERER}).", ".quote($session{asset}{assetId}).",
-                #                       ".quote($session{asset}{title}).", ".quote($session{form}{wid}).", ".quote($session{form}{func}).")");
-                #       }
 	return;
 }
 
@@ -570,7 +561,7 @@ Renders self->view based upon current style, subject to timeouts. Returns Privil
 sub www_view {
 	my $self = shift;
 	$self->logView();
-	return WebGUI::Privilege::noAccess() unless $self->canView;
+	return $self->processStyle(WebGUI::Privilege::noAccess()) unless $self->canView;
 	my $cache;
 	my $output;
         my $useCache = (

lib/WebGUI/Operation.pm

@@ -145,9 +145,7 @@ sub getOperations {
           'deleteScratch' => 'WebGUI::Operation::Scratch',
           'saveSettings' => 'WebGUI::Operation::Settings',
           'editSettings' => 'WebGUI::Operation::Settings',
-          'viewPageReport' => 'WebGUI::Operation::Statistics',
           'viewStatistics' => 'WebGUI::Operation::Statistics',
-          'viewTrafficReport' => 'WebGUI::Operation::Statistics',
           'killSession' => 'WebGUI::Operation::ActiveSessions',
           'viewLoginHistory' => 'WebGUI::Operation::LoginHistory',
           'viewActiveSessions' => 'WebGUI::Operation::ActiveSessions',

lib/WebGUI/Operation/ActiveSessions.pm

@@ -23,14 +23,14 @@ use WebGUI::SQL;
 
 #-------------------------------------------------------------------
 sub www_killSession {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("activeSessions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	WebGUI::Session::end($session{form}{sid});
 	return www_viewActiveSessions();
 }
 
 #-------------------------------------------------------------------
 sub www_viewActiveSessions {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("activeSessions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my ($output, $p, @row, $i, $sth, %data);
 	tie %data, 'Tie::CPHash';
 	$sth = WebGUI::SQL->read("select users.username,users.userId,userSession.sessionId,userSession.expires,

lib/WebGUI/Operation/Commerce.pm

@@ -217,7 +217,7 @@ sub www_checkoutSubmit {
 
 #-------------------------------------------------------------------
 sub www_completePendingTransaction {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("commerce")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 
 	WebGUI::Commerce::Transaction->new($session{form}{tid})->completeTransaction;
 
@@ -247,7 +247,7 @@ sub www_confirmTransaction {
 #-------------------------------------------------------------------
 sub www_editCommerceSettings {
 	my (%tabs, $tabform, $jscript, $currentPlugin, $ac, $jscript, $i18n, $paymentPlugin, @paymentPlugins, %paymentPlugins, @failedPaymentPlugins, $plugin);
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("commerce")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	
 	$i18n = WebGUI::International->new('Commerce');
 	
@@ -342,7 +342,7 @@ sub www_editCommerceSettings {
 
 #-------------------------------------------------------------------
 sub www_editCommerceSettingsSave {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("commerce")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	
 	foreach (keys(%{$session{form}})) {
 		# Store the plugin confiuration data in a special table for security and the general settings in the
@@ -365,7 +365,7 @@ sub www_editCommerceSettingsSave {
 #-------------------------------------------------------------------
 sub www_listPendingTransactions {
 	my ($p, $transactions, $output, $properties, $i18n);
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("commerce")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	
 	$i18n = WebGUI::International->new("Commerce");
 

lib/WebGUI/Operation/DatabaseLink.pm

@@ -120,7 +120,7 @@ sub www_editDatabaseLinkSave {
 
 #-------------------------------------------------------------------
 sub www_listDatabaseLinks {
-        return WebGUI::Privilege::adminOnly() unless(WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("databases")->render(WebGUI::Privilege::adminOnly()) unless(WebGUI::Grouping::isInGroup(3));
         my ($output, $p, $sth, %data, @row, $i);
         $sth = WebGUI::SQL->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>';

lib/WebGUI/Operation/Group.pm

@@ -137,7 +137,7 @@ sub getGroupSearchForm {
 
 #-------------------------------------------------------------------
 sub www_addGroupsToGroupSave {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
         my @groups = $session{cgi}->param('groups');
 	WebGUI::Grouping::addGroupsToGroups(\@groups,[$session{form}{gid}]);
         return www_manageGroupsInGroup();
@@ -145,7 +145,7 @@ sub www_addGroupsToGroupSave {
 
 #-------------------------------------------------------------------
 sub www_addUsersToGroupSave {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
         my @users = $session{cgi}->param('users');
 	WebGUI::Grouping::addUsersToGroups(\@users,[$session{form}{gid}]);
         return www_manageUsersInGroup();
@@ -153,7 +153,7 @@ sub www_addUsersToGroupSave {
 
 #-------------------------------------------------------------------
 sub www_addUsersToGroupSecondarySave {
-        return WebGUI::Privilege::adminOnly() unless _hasSecondaryPrivilege($session{form}{gid});
+        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless _hasSecondaryPrivilege($session{form}{gid});
         my @users = $session{cgi}->param('users');
 	WebGUI::Grouping::addUsersToGroups(\@users,[$session{form}{gid}]);
         return www_manageUsersInGroupSecondary();
@@ -161,7 +161,7 @@ sub www_addUsersToGroupSecondarySave {
 
 #-------------------------------------------------------------------
 sub www_autoAddToGroup {
-        return WebGUI::Privilege::insufficient() unless ($session{user}{userId} != 1);
+        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::insufficient()) unless ($session{user}{userId} != 1);
 	my $group = WebGUI::Group->new($session{form}{groupId});
 	if ($group->autoAdd) {
 		WebGUI::Grouping::addUsersToGroups([$session{user}{userId}],[$session{form}{groupId}]);
@@ -171,7 +171,7 @@ sub www_autoAddToGroup {
 
 #-------------------------------------------------------------------
 sub www_autoDeleteFromGroup {
-        return WebGUI::Privilege::insufficient() unless ($session{user}{userId} != 1);
+        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::insufficient()) unless ($session{user}{userId} != 1);
 	my $group = WebGUI::Group->new($session{form}{groupId});
 	if ($group->autoDelete) {
 		WebGUI::Grouping::deleteUsersFromGroups([$session{user}{userId}],[$session{form}{groupId}]);
@@ -181,9 +181,9 @@ sub www_autoDeleteFromGroup {
 
 #-------------------------------------------------------------------
 sub www_deleteGroup {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
         my ($output);
-        return WebGUI::Privilege::vitalComponent() if ($session{form}{gid} < 26 && $session{form}{gid} > 0);
+        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::vitalComponent()) if ($session{form}{gid} < 26 && $session{form}{gid} > 0);
         $output .= WebGUI::International::get(86).'<p>';
         $output .= '<div align="center"><a href="'.WebGUI::URL::page('op=deleteGroupConfirm&gid='.$session{form}{gid}).
 		'">'.WebGUI::International::get(44).'</a>';
@@ -194,8 +194,8 @@ sub www_deleteGroup {
 
 #-------------------------------------------------------------------
 sub www_deleteGroupConfirm {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
-        return WebGUI::Privilege::vitalComponent() if ($session{form}{gid} < 26 && $session{form}{gid} > 0);
+        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::vitalComponent()) if ($session{form}{gid} < 26 && $session{form}{gid} > 0);
 	my $g = WebGUI::Group->new($session{form}{gid});
 	$g->delete;
         return www_listGroups();
@@ -203,14 +203,14 @@ sub www_deleteGroupConfirm {
 
 #-------------------------------------------------------------------
 sub www_deleteGroupGrouping {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	WebGUI::Grouping::deleteGroupsFromGroups([$session{form}{delete}],[$session{form}{gid}]);
         return www_manageGroupsInGroup();
 }
 
 #-------------------------------------------------------------------
 sub www_deleteGrouping {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
         if (($session{user}{userId} == $session{form}{uid} || $session{form}{uid} == 3) && $session{form}{gid} == 3) {
                 return _submenu(WebGUI::Privilege::vitalComponent());
         }
@@ -225,9 +225,9 @@ sub www_deleteGrouping {
                                                                                                                                                        
 #-------------------------------------------------------------------
 sub www_deleteGroupingSecondary {
-        return WebGUI::Privilege::adminOnly() unless _hasSecondaryPrivilege($session{form}{gid});
+        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless _hasSecondaryPrivilege($session{form}{gid});
         if ($session{user}{userId} eq $session{form}{uid}) {
-                return WebGUI::Privilege::vitalComponent();
+                return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::vitalComponent());
         }
         WebGUI::Grouping::deleteUsersFromGroups([$session{form}{uid}],[$session{form}{gid}]);
         return www_manageUsersInGroupSecondary();
@@ -235,7 +235,7 @@ sub www_deleteGroupingSecondary {
 
 #-------------------------------------------------------------------
 sub www_editGroup {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
         my ($output, $f, $g);
 	if ($session{form}{gid} eq "new") {
 		$g = WebGUI::Group->new("");
@@ -312,7 +312,7 @@ sub www_editGroup {
 
 #-------------------------------------------------------------------
 sub www_editGroupSave {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my $g = WebGUI::Group->new($session{form}{gid});
 	$g->description($session{form}{description});
 	$g->name($session{form}{groupName});
@@ -334,7 +334,7 @@ sub www_editGroupSave {
 
 #-------------------------------------------------------------------
 sub www_editGrouping {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my $f = WebGUI::HTMLForm->new;
         $f->hidden("op","editGroupingSave");
         $f->hidden("uid",$session{form}{uid});
@@ -355,7 +355,7 @@ sub www_editGrouping {
 
 #-------------------------------------------------------------------
 sub www_editGroupingSave {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
         WebGUI::Grouping::userGroupExpireDate($session{form}{uid},$session{form}{gid},setToEpoch($session{form}{expireDate}));
         WebGUI::Grouping::userGroupAdmin($session{form}{uid},$session{form}{gid},$session{form}{groupAdmin});
         return www_manageUsersInGroup();
@@ -363,7 +363,7 @@ sub www_editGroupingSave {
 
 #-------------------------------------------------------------------
 sub www_emailGroup {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my ($output,$f);
 	$f = WebGUI::HTMLForm->new;
 	$f->hidden("op","emailGroupSend");
@@ -389,7 +389,7 @@ sub www_emailGroup {
 
 #-------------------------------------------------------------------
 sub www_emailGroupSend {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my ($sth, $email);
 	$sth = WebGUI::SQL->read("select b.fieldData from groupings a left join userProfileData b 
 		on a.userId=b.userId and b.fieldName='email' where a.groupId=".quote($session{form}{gid}));
@@ -404,7 +404,7 @@ sub www_emailGroupSend {
 
 #-------------------------------------------------------------------
 sub www_listGroups {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my $output = getGroupSearchForm("listGroups");
 	my ($groupCount) = WebGUI::SQL->quickArray("select count(*) from groups");
         return _submenu($output) unless ($session{form}{doit} || $groupCount<250 || $session{form}{pn} > 1);
@@ -431,7 +431,7 @@ sub www_listGroups {
 
 #-------------------------------------------------------------------
 sub www_listGroupsSecondary {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(11));
+	return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(11));
         my ($output, $p, $sth, @data, @row, $i, $userCount);
 	my @editableGroups = WebGUI::SQL->buildArray("select groupId from groupings where userId=".quote($session{user}{userId})." and groupAdmin=1");
 	push (@editableGroups,0);
@@ -462,7 +462,7 @@ sub www_listGroupsSecondary {
 
 #-------------------------------------------------------------------
 sub www_manageGroupsInGroup {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my ($output, $p, $group, $groups, $f);
         $f = WebGUI::HTMLForm->new;
         $f->hidden("op","addGroupsToGroupSave");
@@ -498,7 +498,7 @@ sub www_manageGroupsInGroup {
 
 #-------------------------------------------------------------------
 sub www_manageUsersInGroup {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my $output = WebGUI::Form::formHeader()
 		.WebGUI::Form::hidden({
 			name=>"gid",
@@ -561,7 +561,7 @@ sub www_manageUsersInGroup {
 
 #-------------------------------------------------------------------
 sub www_manageUsersInGroupSecondary {
-        return WebGUI::Privilege::adminOnly() unless _hasSecondaryPrivilege($session{form}{gid});
+        return WebGUI::AdminConsole->new("groups")->render(WebGUI::Privilege::adminOnly()) unless _hasSecondaryPrivilege($session{form}{gid});
         my ($output, $sth, %hash);
         tie %hash, 'Tie::CPHash';
 	my $group = WebGUI::Group->new($session{form}{gid});

lib/WebGUI/Operation/Help.pm

@@ -46,7 +46,7 @@ sub _seeAlso {
 
 #-------------------------------------------------------------------
 sub www_viewHelp {
-	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(12));
+	return WebGUI::AdminConsole->new("help")->render(WebGUI::Privilege::insufficient()) unless (WebGUI::Grouping::isInGroup(12));
 	my $ac = WebGUI::AdminConsole->new("help");
 	my $namespace = $session{form}{namespace} || "WebGUI";
 	my $help = _get($session{form}{hid},$namespace);
@@ -63,7 +63,7 @@ sub www_viewHelp {
 
 #-------------------------------------------------------------------
 sub www_viewHelpIndex {
-	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(12));
+	return WebGUI::AdminConsole->new("help")->render(WebGUI::Privilege::insufficient()) unless (WebGUI::Grouping::isInGroup(12));
 	my %helpIndex;
 	tie %helpIndex, "Tie::IxHash";
 	my $i;

lib/WebGUI/Operation/LoginHistory.pm

@@ -23,7 +23,7 @@ use WebGUI::SQL;
 
 #-------------------------------------------------------------------
 sub www_viewLoginHistory {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("loginHistory")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my ($output, $p, @row, $i, $sth, %data);
 	tie %data, 'Tie::CPHash';
 	$sth = WebGUI::SQL->read("select * from users,userLoginLog where users.userId=userLoginLog.userId order by userLoginLog.timeStamp desc");	

lib/WebGUI/Operation/MessageLog.pm

@@ -33,7 +33,7 @@ sub _status {
 #-------------------------------------------------------------------
 sub www_viewMessageLog {
    my (@msg, $vars);
-   WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(2,$session{user}{userId}));
+   return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(2,$session{user}{userId}));
    $vars->{displayTitle} = '<h1>'.WebGUI::International::get(159).'</h1>';
    my $p = WebGUI::Paginator->new(WebGUI::URL::page('op=viewMessageLog'));
    my $query = "select messageLogId,subject,url,dateOfEntry,status from messageLog where userId=".quote($session{user}{userId})." order by dateOfEntry desc";

lib/WebGUI/Operation/ProfileSettings.pm

@@ -71,8 +71,8 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_deleteProfileCategoryConfirm {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
-        return WebGUI::Privilege::vitalComponent() if ($session{form}{cid} < 1000 && $session{form}{cid} > 0);
+        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::vitalComponent()) if ($session{form}{cid} < 1000 && $session{form}{cid} > 0);
 	WebGUI::SQL->write("delete from userProfileCategory where profileCategoryId=".quote($session{form}{cid}));
 	WebGUI::SQL->write("update userProfileField set profileCategoryId='1' where profileCategoryId=".quote($session{form}{cid}));
         return www_editProfileSettings();
@@ -80,10 +80,10 @@ sub www_deleteProfileCategoryConfirm {
 
 #-------------------------------------------------------------------
 sub www_deleteProfileFieldConfirm {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my ($protected);
 	($protected) = WebGUI::SQL->quickArray("select protected from userProfileField where fieldname=".quote($session{form}{fid}));
-        return WebGUI::Privilege::vitalComponent() if ($protected);
+        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::vitalComponent()) if ($protected);
 	WebGUI::SQL->write("delete from userProfileField where fieldName=".quote($session{form}{fid}));
 	WebGUI::SQL->write("delete from userProfileData where fieldName=".quote($session{form}{fid}));
         return www_editProfileSettings(); 
@@ -91,7 +91,7 @@ sub www_deleteProfileFieldConfirm {
 
 #-------------------------------------------------------------------
 sub www_editProfileCategory {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my ($output, $f, %data);
 	tie %data, 'Tie::CPHash';
 	$f = WebGUI::HTMLForm->new;
@@ -121,7 +121,7 @@ sub www_editProfileCategory {
 
 #-------------------------------------------------------------------
 sub www_editProfileCategorySave {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my ($sequenceNumber, $test);
 	$session{form}{categoryName} = 'Unamed' if ($session{form}{categoryName} eq "" || $session{form}{categoryName} eq "''");
 	$test = eval($session{form}{categoryName});
@@ -140,7 +140,7 @@ sub www_editProfileCategorySave {
 
 #-------------------------------------------------------------------
 sub www_editProfileField {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my ($output, $f, %data, %hash, $key);
 	tie %data, 'Tie::CPHash';
         $f = WebGUI::HTMLForm->new;
@@ -194,7 +194,7 @@ sub www_editProfileField {
 
 #-------------------------------------------------------------------
 sub www_editProfileFieldSave {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my ($sequenceNumber, $fieldName, $test);
         $session{form}{fieldLabel} = 'Unamed' if ($session{form}{fieldLabel} eq "" || $session{form}{fieldLabel} eq "''");
         $test = eval($session{form}{fieldLabel});
@@ -233,7 +233,7 @@ sub www_editProfileFieldSave {
 
 #-------------------------------------------------------------------
 sub www_editProfileSettings {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my ($output, $a, %category, %field, $b);
 	tie %category, 'Tie::CPHash';
 	tie %field, 'Tie::CPHash';
@@ -266,7 +266,7 @@ sub www_editProfileSettings {
 
 #-------------------------------------------------------------------
 sub www_moveProfileCategoryDown {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
         my ($id, $thisSeq);
         ($thisSeq) = WebGUI::SQL->quickArray("select sequenceNumber from userProfileCategory where profileCategoryId=".quote($session{form}{cid}));
         ($id) = WebGUI::SQL->quickArray("select profileCategoryId from userProfileCategory where sequenceNumber=$thisSeq+1");
@@ -280,7 +280,7 @@ sub www_moveProfileCategoryDown {
 
 #-------------------------------------------------------------------
 sub www_moveProfileCategoryUp {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
         my ($id, $thisSeq);
         ($thisSeq) = WebGUI::SQL->quickArray("select sequenceNumber from userProfileCategory where profileCategoryId=".quote($session{form}{cid}));
         ($id) = WebGUI::SQL->quickArray("select profileCategoryId from userProfileCategory where sequenceNumber=$thisSeq-1");
@@ -294,7 +294,7 @@ sub www_moveProfileCategoryUp {
 
 #-------------------------------------------------------------------
 sub www_moveProfileFieldDown {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
         my ($id, $thisSeq, $profileCategoryId);
         ($thisSeq,$profileCategoryId) = WebGUI::SQL->quickArray("select sequenceNumber,profileCategoryId from userProfileField where fieldName=".quote($session{form}{fid}));
         ($id) = WebGUI::SQL->quickArray("select fieldName from userProfileField where profileCategoryId=".quote($profileCategoryId)." and sequenceNumber=$thisSeq+1");
@@ -308,7 +308,7 @@ sub www_moveProfileFieldDown {
 
 #-------------------------------------------------------------------
 sub www_moveProfileFieldUp {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("userProfiling")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
         my ($id, $thisSeq, $profileCategoryId);
         ($thisSeq,$profileCategoryId) = WebGUI::SQL->quickArray("select sequenceNumber,profileCategoryId from userProfileField where fieldName=".quote($session{form}{fid}));
         ($id) = WebGUI::SQL->quickArray("select fieldName from userProfileField where profileCategoryId=".quote($profileCategoryId)." and sequenceNumber=$thisSeq-1");

lib/WebGUI/Operation/Replacements.pm

@@ -38,14 +38,14 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_deleteReplacement {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("contentFilters")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	WebGUI::SQL->write("delete from replacements where replacementId=".quote($session{form}{replacementId}));
 	return www_listReplacements();
 }
 
 #-------------------------------------------------------------------
 sub www_editReplacement {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("contentFilters")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my $data = WebGUI::SQL->getRow("replacements","replacementId",$session{form}{replacementId});
 	my $f = WebGUI::HTMLForm->new;
 	$f->hidden(
@@ -76,7 +76,7 @@ sub www_editReplacement {
 
 #-------------------------------------------------------------------
 sub www_editReplacementSave {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("contentFilters")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	WebGUI::SQL->setRow("replacements","replacementId",{
 		replacementId=>$session{form}{replacementId},
 		searchFor=>$session{form}{searchFor},
@@ -87,7 +87,7 @@ sub www_editReplacementSave {
 
 #-------------------------------------------------------------------
 sub www_listReplacements {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("contentFilters")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my $output = '<table>';
 	my $sth = WebGUI::SQL->read("select replacementId,searchFor from replacements order by searchFor");
 	while (my $data = $sth->hashRef) {

lib/WebGUI/Operation/Settings.pm

@@ -26,7 +26,7 @@ use WebGUI::URL;
 
 #-------------------------------------------------------------------
 sub www_editSettings {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("settings")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my $i18n = WebGUI::International->new("WebGUI");
 	my %tabs;
 	tie %tabs, 'Tie::IxHash';
@@ -164,11 +164,6 @@ sub www_editSettings {
 		-label=>$i18n->get(707),
 		-value=>$session{setting}{showDebug}
 		);
-	$tabform->getTab("misc")->yesNo(
-		-name=>"trackPageStatistics",
-		-label=>$i18n->get(749),
-		-value=>$session{setting}{trackPageStatistics}
-		);
 	$tabform->getTab("misc")->selectList(
 		-name=>"hostToUse",
 		-value=>[$session{setting}{hostToUse}],
@@ -250,7 +245,7 @@ sub www_editSettings {
 
 #-------------------------------------------------------------------
 sub www_saveSettings {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("settings")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my ($key, $value);
 	foreach $key (keys %{$session{form}}) {
 		$value = $session{form}{$key};

lib/WebGUI/Operation/Statistics.pm

@@ -26,58 +26,15 @@ sub _submenu {
 	$title = WebGUI::International::get($title) if ($title);
 	my $ac = WebGUI::AdminConsole->new("statistics");
 	if ($session{setting}{trackPageStatistics}) {
-		$ac->addSubmenuItem( WebGUI::URL::page("op=viewPageReport"), WebGUI::International::get(796));
-#		$ac->addSubmenuItem( WebGUI::URL::page("op=viewTrafficReport"), WebGUI::International::get(797));
 		$ac->addSubmenuItem( WebGUI::URL::page('op=viewStatistics'), WebGUI::International::get(144));
 	}
         return $ac->render($workarea, $title);
 }
 
-#-------------------------------------------------------------------
-sub www_viewPageReport {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
-	my ($output, $count, $user, $data, $sth, %page, $pageId);
-	tie %page, "Tie::IxHash";
-	unless ($session{setting}{trackPageStatistics}) {
-		$output .= WebGUI::International::get(802);
-	} else {
-		$sth = WebGUI::SQL->read("select pageTitle,pageId,userId,ipAddress,wobjectId 
-			from pageStatistics order by pageTitle,userId,ipAddress");
-		while ($data = $sth->hashRef) {
-			if ($data->{userId} eq '1') {
-				$user = $data->{ipAddress};
-			} else {
-				$user = $data->{userId};
-			}
-			$page{$data->{pageId}}{pageTitle} = $data->{pageTitle};
-			$page{$data->{pageId}}{users}{$user}++;
-			$page{$data->{pageId}}{views}++;
-			$page{$data->{pageId}}{interact}++ if ($data->{wobjectId});
-		}
-		$sth->finish;
-		$output .= '<table width="100%" cellpadding="3" cellspacing="0" border="1">
-			<tr><td class="tableHeader">'.WebGUI::International::get(798).'</td>
-			<td class="tableHeader">'.WebGUI::International::get(799).'</td>
-			<td class="tableHeader">'.WebGUI::International::get(800).'</td>
-			<td class="tableHeader">'.WebGUI::International::get(801).'</td></tr>';
-		foreach $pageId (keys %page) {
-			$output .= '<tr><td class="tableData">'.$page{$pageId}{pageTitle}.'</td>';
-			$output .= '<td class="tableData">'.$page{$pageId}{views}.'</td>';
-			$count = 0;
-			foreach (keys %{$page{$pageId}{users}}) {
-				$count++;
-			}
-			$output .= '<td class="tableData">'.$count.'</td>';
-			$output .= '<td class="tableData">'.$page{$pageId}{interact}.'</td></tr>';
-		}
-		$output .= '</table>';
-	}
-	return _submenu($output,"page statistics");
-}
 
 #-------------------------------------------------------------------
 sub www_viewStatistics {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+        return WebGUI::AdminConsole->new("statistics")->render(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");
@@ -94,20 +51,12 @@ sub www_viewStatistics {
 		$version = '<a href="http://files.plainblack.com/downloads/'.$rev[0].'.x.x/webgui-'.$version.'.tar.gz">'.$version.'</a>';
 	}
 	$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(349).':</td><td class="tableData">'.$version.'</td></tr>';
-	($data) = WebGUI::SQL->quickArray("select count(*) from page where parentId<>'3'");
+	($data) = WebGUI::SQL->quickArray("select count(*) from asset where state='published'");
 	$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(147).':</td><td class="tableData">'.$data.'</td></tr>';
-	($data) = WebGUI::SQL->quickArray("select count(*) from page where parentId='0'");
+	($data) = WebGUI::SQL->quickArray("select count(*) from asset where isPackage=1");
-	$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(795).':</td><td class="tableData">'.$data.'</td></tr>';
-	($data) = WebGUI::SQL->quickArray("select count(*) from page where parentId='5'");
 	$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(794).':</td><td class="tableData">'.$data.'</td></tr>';
-	($data) = WebGUI::SQL->quickArray("select count(*) from wobject where pageId<>'3'");
+	($data) = WebGUI::SQL->quickArray("select count(*) from template");
-	$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(148).':</td><td class="tableData">'.$data.'</td></tr>';
-	($data) = WebGUI::SQL->quickArray("select count(*) from template where namespace='style'");
-	$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(427).':</td><td class="tableData">'.$data.'</td></tr>';
-	($data) = WebGUI::SQL->quickArray("select count(*) from template where namespace<>'style'");
 	$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(792).':</td><td class="tableData">'.$data.'</td></tr>';
-	($data) = WebGUI::SQL->quickArray("select count(*) from collateral");
-	$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(793).':</td><td class="tableData">'.$data.'</td></tr>';
 	($data) = WebGUI::SQL->quickArray("select count(*) from userSession");
 	$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(146).':</td><td class="tableData">'.$data.'</td></tr>';
 	($data) = WebGUI::SQL->quickArray("select count(*) from users");
@@ -118,29 +67,6 @@ sub www_viewStatistics {
         return _submenu($output);
 }
 
-#-------------------------------------------------------------------
-sub www_viewTrafficReport {
-        return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
-	my ($output, $data);
-	$output = '<h1>Pages</h1>';
-	($data) = WebGUI::SQL->quickArray("select count(*) from pageStatistics where dateStamp>=".(time()-2592000));
-	$output .= "Last 30 days: ".$data."<br>";
-	($data) = WebGUI::SQL->quickArray("select count(*) from pageStatistics where dateStamp>=".(time()-604800));
-	$output .= "Last 7 days: ".$data."<br>";
-        ($data) = WebGUI::SQL->quickArray("select count(*) from pageStatistics where dateStamp>=".(time()-86400));
-        $output .= "Last 24 hours: ".$data."<br>";
-        $output .= '<h1>Visitors</h1>';
-        ($data) = WebGUI::SQL->quickArray("select count(*) from pageStatistics where dateStamp>=".(time()-2592000)
-		." group by ipAddress,userId");
-        $output .= "Last 30 days: ".$data."<br>";
-        ($data) = WebGUI::SQL->quickArray("select count(*) from pageStatistics where dateStamp>=".(time()-604800)
-		." group by ipAddress,userId");
-        $output .= "Last 7 days: ".$data."<br>";
-        ($data) = WebGUI::SQL->quickArray("select count(*) from pageStatistics where dateStamp>=".(time()-86400)
-		." group by ipAddress,userId");
-        $output .= "Last 24 hours: ".$data."<br>";
-	return _submenu($output);
-}
 
 1;
 

lib/WebGUI/Operation/Subscription.pm

@@ -52,7 +52,7 @@ sub _submenu {
 #-------------------------------------------------------------------
 sub www_createSubscriptionCodeBatch {
 	my (%subscriptions, $f, $error, $errorMessage);
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	
 	$error = shift;
 	my $i18n = WebGUI::International->new("Subscription");
@@ -101,7 +101,7 @@ sub www_createSubscriptionCodeBatch {
 sub www_createSubscriptionCodeBatchSave {
 	my ($numberOfCodes, $description, $expires, $batchId, @codeElements, $currentCode, $code, $i, @subscriptions, 
 		@error, $creationEpoch);
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	
 	my $i18n = WebGUI::International->new("Subscription");	
 	
@@ -139,7 +139,7 @@ sub www_createSubscriptionCodeBatchSave {
 
 #-------------------------------------------------------------------
 sub www_deleteSubscription {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	
 	WebGUI::Subscription->new($session{form}{sid})->delete;
 	return www_listSubscriptions();
@@ -147,7 +147,7 @@ sub www_deleteSubscription {
 
 #-------------------------------------------------------------------
 sub www_deleteSubscriptionCodeBatch {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	
 	WebGUI::SQL->write("delete from subscriptionCodeBatch where batchId=".quote($session{form}{bid}));
 	WebGUI::SQL->write("delete from subscriptionCode where batchId=".quote($session{form}{bid}));
@@ -157,7 +157,7 @@ sub www_deleteSubscriptionCodeBatch {
 
 #-------------------------------------------------------------------
 sub www_deleteSubscriptionCodes {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	
 	if ($session{form}{selection} eq 'dc') {
 		WebGUI::SQL->write("delete from subscriptionCode where dateCreated >= ".quote($session{form}{dcStart}).
@@ -173,7 +173,7 @@ sub www_deleteSubscriptionCodes {
 #-------------------------------------------------------------------
 sub www_editSubscription {
 	my ($properties, $subscriptionId, $durationInterval, $durationUnits, $f);
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	
 	my $i18n = WebGUI::International->new("Subscription");
 	
@@ -236,7 +236,7 @@ sub www_editSubscription {
 #-------------------------------------------------------------------
 sub www_editSubscriptionSave {
 	my (@relevantFields);
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	
 	@relevantFields = qw(subscriptionId name price description subscriptionGroup duration executeOnSubscription karma);
 	WebGUI::Subscription->new($session{form}{sid})->set({map {$_ => $session{form}{$_}} @relevantFields});
@@ -247,7 +247,7 @@ sub www_editSubscriptionSave {
 #-------------------------------------------------------------------
 sub www_listSubscriptionCodeBatches {
 	my ($p, $batches, $output);
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	
 	my $i18n = WebGUI::International->new("Subscription");
 	
@@ -274,7 +274,7 @@ sub www_listSubscriptionCodeBatches {
 #-------------------------------------------------------------------
 sub www_listSubscriptionCodes {
 	my ($p, $codes, $output, $where, $ops, $delete);
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 
 	my $i18n = WebGUI::International->new("Subscription");
 	
@@ -355,7 +355,7 @@ sub www_listSubscriptionCodes {
 #-------------------------------------------------------------------
 sub www_listSubscriptions {
 	my ($p, $subscriptions, $output);
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("subscriptions")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	
 	my $i18n = WebGUI::International->new("Subscription");
 	

lib/WebGUI/Operation/Theme.pm

@@ -14,15 +14,12 @@ use strict;
 use Tie::IxHash;
 use Tie::CPHash;
 use WebGUI::AdminConsole;
-use WebGUI::Attachment;
-use WebGUI::Collateral;
 use WebGUI::Grouping;
 use WebGUI::HTMLForm;
 use WebGUI::HTTP;
 use WebGUI::Icon;
 use WebGUI::Id;
 use WebGUI::International;
-use WebGUI::Node;
 use WebGUI::Paginator;
 use WebGUI::Privilege;
 use WebGUI::Session;
@@ -389,6 +386,7 @@ sub www_importThemeSave {
 
 #-------------------------------------------------------------------
 sub www_listThemes {
+	return WebGUI::AdminConsole->new("themes")->render("Themes are disabled in this version of WebGUI. They will return in a future release.");
         return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(9));
         my ($output,@data, @row, $i, $p);
         my $sth = WebGUI::SQL->read("select themeId,name,original from theme order by name");

lib/WebGUI/Operation/User.pm

@@ -151,7 +151,7 @@ sub getUserSearchForm {
 
 #-------------------------------------------------------------------
 sub www_becomeUser {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
         WebGUI::Session::end($session{var}{sessionId});
 	WebGUI::Session::start($session{form}{uid});
 	return "";
@@ -159,7 +159,7 @@ sub www_becomeUser {
 
 #-------------------------------------------------------------------
 sub www_deleteGrouping {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	if (($session{user}{userId} eq $session{form}{uid} || $session{form}{uid} eq '3') && $session{form}{gid} eq '3') {
 		return _submenu(WebGUI::Privilege::vitalComponent());
         }
@@ -178,7 +178,7 @@ sub www_deleteGrouping {
 #-------------------------------------------------------------------
 sub www_deleteUser {
         my ($output);
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
         if ($session{form}{uid} eq '1' || $session{form}{uid} eq '3') {
 		return _submenu(WebGUI::Privilege::vitalComponent());
         } else {
@@ -193,10 +193,10 @@ sub www_deleteUser {
 
 #-------------------------------------------------------------------
 sub www_deleteUserConfirm {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
 	my ($u);
         if ($session{form}{uid} eq '1' || $session{form}{uid} eq '') {
-	   return WebGUI::Privilege::vitalComponent();
+	   return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::vitalComponent());
     } else {
 	   $u = WebGUI::User->new($session{form}{uid});
 	   $u->delete;
@@ -206,7 +206,7 @@ sub www_deleteUserConfirm {
 
 #-------------------------------------------------------------------
 sub www_editUser {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(11));
+	return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(11));
 	my $error = shift;
 	my $i18n = WebGUI::International->new("WebGUI");
 	my %tabs;
@@ -354,7 +354,7 @@ sub www_editUserSave {
 	unless ($isAdmin) {
 		$isSecondary = (WebGUI::Grouping::isInGroup(11) && $session{form}{uid} eq "new");
 	}
-	return WebGUI::Privilege::adminOnly() unless ($isAdmin || $isSecondary);
+	return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly()) unless ($isAdmin || $isSecondary);
 	my ($uid) = WebGUI::SQL->quickArray("select userId from users where username=".quote($session{form}{username}));
 	my $error;
 	if ($uid eq $session{form}{uid} || $uid eq "") {
@@ -390,7 +390,7 @@ sub www_editUserSave {
 
 #-------------------------------------------------------------------
 sub www_editUserKarma {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
         my ($output, $f, $a, %user, %data, $method, $values, $category, $label, $default, $previousCategory);
         $f = WebGUI::HTMLForm->new;
         $f->hidden("op","editUserKarmaSave");
@@ -404,7 +404,7 @@ sub www_editUserKarma {
 
 #-------------------------------------------------------------------
 sub www_editUserKarmaSave {
-	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
+	return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly()) unless (WebGUI::Grouping::isInGroup(3));
         my ($u);
         $u = WebGUI::User->new($session{form}{uid});
         $u->karma($session{form}{amount},$session{user}{username}." (".$session{user}{userId}.")",$session{form}{description});
@@ -418,7 +418,7 @@ sub www_listUsers {
 			$session{form}{uid} = "new";
 			return www_editUser();
 		}
-		return WebGUI::Privilege::adminOnly();
+		return WebGUI::AdminConsole->new("users")->render(WebGUI::Privilege::adminOnly());
 	}
 	my %status;
 	my $output = getUserSearchForm("listUsers");

lib/WebGUI/i18n/English/WebGUI.pm

@@ -81,11 +81,6 @@ our $I18N = {
 		lastUpdated => 1031514049
 	},
 
-	'798' => {
-		message => q|Page Title|,
-		lastUpdated => 1036978688
-	},
-
 	'1031' => {
 		message => q|Forum Template|,
 		lastUpdated => 1066034528
@@ -1441,11 +1436,6 @@ As with any delete operation, you are prompted to be sure you wish to proceed wi
 		lastUpdated => 1056151382
 	},
 
-	'800' => {
-		message => q|Unique Visitors|,
-		lastUpdated => 1036978829
-	},
-
 	'381' => {
 		message => q|WebGUI received a malformed request and was unable to continue. Proprietary characters being passed through a form typically cause this. Please feel free to hit your back button and try again.|,
 		lastUpdated => 1031514049
@@ -1551,11 +1541,6 @@ As with any delete operation, you are prompted to be sure you wish to proceed wi
 		lastUpdated => 1066034603
 	},
 
-	'796' => {
-		message => q|View page statistics.|,
-		lastUpdated => 1036978043
-	},
-
 	'445' => {
 		message => q|Preferences|,
 		lastUpdated => 1031514049
@@ -2073,11 +2058,6 @@ A message stating that the user is receiving the message because they subscribed
 		lastUpdated => 1031514049
 	},
 
-	'427' => {
-		message => q|Styles|,
-		lastUpdated => 1031514049
-	},
-
 	'677' => {
 		message => q|Wobject, Add/Edit|,
 		lastUpdated => 1047858650
@@ -2604,11 +2584,6 @@ The Groups page displays all groups that you are allowed to edit.  The form on t
 		lastUpdated => 1070899134
 	},
 
-	'797' => {
-		message => q|View traffic statistics.|,
-		lastUpdated => 1036978191
-	},
-
 	'510' => {
 		message => q|Flat|,
 		lastUpdated => 1031514049
@@ -3233,11 +3208,6 @@ The translated label for the link to the home page or the text that you supply t
 		lastUpdated => 1037580328
 	},
 
-	'795' => {
-		message => q|Roots|,
-		lastUpdated => 1036972103
-	},
-
 	'794' => {
 		message => q|Packages|,
 		lastUpdated => 1036971944
@@ -3630,11 +3600,6 @@ Large sites using external group data will be making many calls to the external
 		lastUpdated => 1031514049
 	},
 
-	'801' => {
-		message => q|Wobject Interactions|,
-		lastUpdated => 1036978843
-	},
-
 	'985' => {
 		message => q|Delete this database link.|,
 		lastUpdated => 1056151382
@@ -4899,11 +4864,6 @@ As with any delete operation, you are prompted to be sure you wish to proceed wi
 		lastUpdated => 1066492301
 	},
 
-	'148' => {
-		message => q|Wobjects|,
-		lastUpdated => 1045312362
-	},
-
 	'753' => {
 		message => q|Edit this group.|,
 		lastUpdated => 1036866979
@@ -5077,8 +5037,8 @@ Macros always begin with a caret (^) and follow with at least one other char
 	},
 
 	'147' => {
-		message => q|Pages|,
+		message => q|Assets|,
-		lastUpdated => 1031514049
+		lastUpdated => 1091514049
 	},
 
 	'973' => {
@@ -5101,11 +5061,6 @@ Macros always begin with a caret (^) and follow with at least one other char
 		lastUpdated => 1044126633
 	},
 
-	'749' => {
-		message => q|Track page statistics?|,
-		lastUpdated => 1036736182
-	},
-
 	'531' => {
 		message => q|with the <b>exact phrase</b>|,
 		lastUpdated => 1031514049
@@ -5816,11 +5771,6 @@ What group should be alerted when a new user registers?
 		lastUpdated => 1046638916
 	},
 
-	'799' => {
-		message => q|Page Views|,
-		lastUpdated => 1036978804
-	},
-
 	'925' => {
 		message => q|You already have another version of this theme installed. You must delete it before installing it again.|,
 		lastUpdated => 1050264954
@@ -5938,11 +5888,6 @@ A randomly generated number. This is often used on images (such as banner ads) t
 		lastUpdated => 1066394411
 	},
 
-	'802' => {
-		message => q|WebGUI is not currently tracking page statistics. You can enable this feature in the settings.|,
-		lastUpdated => 1036979395
-	},
-
 	'356' => {
 		message => q|Template|,
 		lastUpdated => 1031514049