diff --git a/lib/WebGUI/Wobject/Article.pm b/lib/WebGUI/Wobject/Article.pm index 74b71efbf..fd76afbc8 100644 --- a/lib/WebGUI/Wobject/Article.pm +++ b/lib/WebGUI/Wobject/Article.pm @@ -25,6 +25,7 @@ use WebGUI::Privilege; use WebGUI::Session; use WebGUI::URL; use WebGUI::Wobject; +use WebGUI::PassiveProfiling; our @ISA = qw(WebGUI::Wobject); @@ -60,6 +61,7 @@ sub new { } }, -useDiscussion=>1, + -useMetaData=>1, -useTemplate=>1 ); bless $self, $class; @@ -120,6 +122,7 @@ sub www_editSave { #------------------------------------------------------------------- sub www_view { my $self = shift; + $self->logView() if ($session{setting}{passiveProfilingEnabled}); my ($file, %var); if ($self->get("image") ne "") { $file = WebGUI::Attachment->new($self->get("image"),$self->get("wobjectId")); diff --git a/lib/WebGUI/Wobject/DataForm.pm b/lib/WebGUI/Wobject/DataForm.pm index 07e46214a..bd7761cd7 100644 --- a/lib/WebGUI/Wobject/DataForm.pm +++ b/lib/WebGUI/Wobject/DataForm.pm @@ -390,7 +390,8 @@ sub new { defaultValue=>0 } }, - -useTemplate=>1 + -useTemplate=>1, + -useMetaData=>1 ); bless $self, $class; } @@ -895,6 +896,7 @@ sub www_process { #------------------------------------------------------------------- sub www_view { + $_[0]->logView() if ($session{setting}{passiveProfilingEnabled}); my $var; $var->{entryId} = $session{form}{entryId} if ($_[0]->canEdit); if ($var->{entryId} eq "list" && $_[0]->canEdit) { diff --git a/lib/WebGUI/Wobject/EventsCalendar.pm b/lib/WebGUI/Wobject/EventsCalendar.pm index 7d912427f..41b391352 100644 --- a/lib/WebGUI/Wobject/EventsCalendar.pm +++ b/lib/WebGUI/Wobject/EventsCalendar.pm @@ -113,7 +113,8 @@ sub new { defaultValue=>0, } }, - -useTemplate=>1 + -useTemplate=>1, + -useMetaData=>1 ); bless $self, $class; } @@ -365,6 +366,7 @@ sub www_editEventSave { #------------------------------------------------------------------- sub www_view { + $_[0]->logView() if ($session{setting}{passiveProfilingEnabled}); my ( $junk, $sameDate, $p, @list, $date, $flag, %previous, $maxDate, $minDate); # figure out the date range tie %previous, 'Tie::CPHash'; @@ -537,6 +539,7 @@ sub www_view { #------------------------------------------------------------------- sub www_viewEvent { + $_[0]->logView() if ($session{setting}{passiveProfilingEnabled}); my ($output, %event, %var, $id); tie %event, 'Tie::CPHash'; %event = WebGUI::SQL->quickHash("select * from EventsCalendar_event where EventsCalendar_eventId=$session{form}{eid}",WebGUI::SQL->getSlave); diff --git a/lib/WebGUI/Wobject/FileManager.pm b/lib/WebGUI/Wobject/FileManager.pm index 41f36f676..aff736b5f 100644 --- a/lib/WebGUI/Wobject/FileManager.pm +++ b/lib/WebGUI/Wobject/FileManager.pm @@ -115,7 +115,8 @@ sub new { defaultValue=>50, } }, - -useTemplate=>1 + -useTemplate=>1, + -useMetaData=>1 ); bless $self, $class; } @@ -159,6 +160,7 @@ sub www_deleteDownloadConfirm { #------------------------------------------------------------------- sub www_download { + $_[0]->logView() if ($session{setting}{passiveProfilingEnabled}); my (%download, $file); tie %download,'Tie::CPHash'; %download = WebGUI::SQL->quickHash("select * from FileManager_file where FileManager_fileId=$session{form}{did}"); @@ -328,6 +330,7 @@ sub www_moveDownloadUp { #------------------------------------------------------------------- sub www_view { + $_[0]->logView() if ($session{setting}{passiveProfilingEnabled}); my ($sortDirection, %var, @fileloop, $files, $sort, $file, $p, $file1, $file2, $file3, $constraints, $url, $numResults, $sql, $flag); $url = WebGUI::URL::page("func=view&wid=".$_[0]->get("wobjectId")); diff --git a/lib/WebGUI/Wobject/HttpProxy.pm b/lib/WebGUI/Wobject/HttpProxy.pm index c808d468e..4a1be4c9b 100644 --- a/lib/WebGUI/Wobject/HttpProxy.pm +++ b/lib/WebGUI/Wobject/HttpProxy.pm @@ -69,7 +69,8 @@ sub new { defaultValue=>'' }, }, - -useTemplate=>1 + -useTemplate=>1, + -useMetaData=>1 ); bless $self, $class; } @@ -145,7 +146,7 @@ sub www_edit { #------------------------------------------------------------------- sub www_view { my (%var, %formdata, @formUpload, $redirect, $response, $header, $userAgent, $proxiedUrl, $request, $ttl); - + $_[0]->logView() if ($session{setting}{passiveProfilingEnabled}); my $node = WebGUI::Node->new("temp",$_[0]->get("namespace")."_cookies"); $node->create; my $cookiebox = WebGUI::URL::escape($session{var}{sessionId}); diff --git a/lib/WebGUI/Wobject/IndexedSearch.pm b/lib/WebGUI/Wobject/IndexedSearch.pm index 2c4ec675a..c2f4c4a53 100644 --- a/lib/WebGUI/Wobject/IndexedSearch.pm +++ b/lib/WebGUI/Wobject/IndexedSearch.pm @@ -30,6 +30,7 @@ sub new { my $property = shift; my $self = WebGUI::Wobject->new( -useTemplate=>1, + -useMetaData=>1, -properties=>$property, -extendedProperties=>{ indexName=>{ @@ -241,6 +242,7 @@ sub www_editSave { #------------------------------------------------------------------- sub www_view { my $self = shift; + $self->logView() if ($session{setting}{passiveProfilingEnabled}); my (%var, @resultsLoop); # Do some query handling diff --git a/lib/WebGUI/Wobject/MessageBoard.pm b/lib/WebGUI/Wobject/MessageBoard.pm index a8c4a78e2..a61e3f179 100644 --- a/lib/WebGUI/Wobject/MessageBoard.pm +++ b/lib/WebGUI/Wobject/MessageBoard.pm @@ -115,7 +115,8 @@ sub new { my $property = shift; my $self = WebGUI::Wobject->new( -properties=>$property, - -useTemplate=>1 + -useTemplate=>1, + -useMetaData=>1 ); bless $self, $class; } @@ -230,6 +231,7 @@ sub www_moveForumUp { #------------------------------------------------------------------- sub www_view { + $_[0]->logView() if ($session{setting}{passiveProfilingEnabled}); my %var; my $count = 1; my @forum_loop; diff --git a/lib/WebGUI/Wobject/Poll.pm b/lib/WebGUI/Wobject/Poll.pm index db75d4faf..5e9366ce4 100644 --- a/lib/WebGUI/Wobject/Poll.pm +++ b/lib/WebGUI/Wobject/Poll.pm @@ -135,7 +135,8 @@ sub new { a19=>{}, a20=>{} }, - -useTemplate=>1 + -useTemplate=>1, + -useMetaData=>1 ); bless $self, $class; } @@ -231,6 +232,7 @@ sub www_resetVotes { #------------------------------------------------------------------- sub www_view { + $_[0]->logView() if ($session{setting}{passiveProfilingEnabled}); my (%var, $answer, @answers, $showPoll, $f); $var{question} = $_[0]->get("question"); if ($_[0]->get("active") eq "0") { diff --git a/lib/WebGUI/Wobject/Product.pm b/lib/WebGUI/Wobject/Product.pm index 2267363d4..04d18fed0 100644 --- a/lib/WebGUI/Wobject/Product.pm +++ b/lib/WebGUI/Wobject/Product.pm @@ -143,7 +143,8 @@ sub new { brochure=>{}, warranty=>{} }, - -useTemplate=>1 + -useTemplate=>1, + -useMetaData=>1 ); bless $self, $class; } @@ -559,6 +560,7 @@ sub www_moveSpecificationUp { #------------------------------------------------------------------- sub www_view { + $_[0]->logView() if ($session{setting}{passiveProfilingEnabled}); my (%data, $sth, $file, $segment, %var, @featureloop, @benefitloop, @specificationloop, @accessoryloop, @relatedloop); tie %data, 'Tie::CPHash'; #---brochure diff --git a/lib/WebGUI/Wobject/SQLReport.pm b/lib/WebGUI/Wobject/SQLReport.pm index 1ca7e31e7..f4a6b8752 100644 --- a/lib/WebGUI/Wobject/SQLReport.pm +++ b/lib/WebGUI/Wobject/SQLReport.pm @@ -55,7 +55,8 @@ sub new { defaultValue=>0 } }, - -useTemplate=>1 + -useTemplate=>1, + -useMetaData=>1 ); bless $self, $class; } @@ -105,6 +106,7 @@ sub www_edit { #------------------------------------------------------------------- sub www_view { + $_[0]->logView() if ($session{setting}{passiveProfilingEnabled}); my ($query, %var, @debug); if ($_[0]->get("preprocessMacros")) { $query = WebGUI::Macro::process($_[0]->get("dbQuery")); diff --git a/lib/WebGUI/Wobject/SiteMap.pm b/lib/WebGUI/Wobject/SiteMap.pm index bf348bf7c..4ad008f41 100644 --- a/lib/WebGUI/Wobject/SiteMap.pm +++ b/lib/WebGUI/Wobject/SiteMap.pm @@ -88,7 +88,8 @@ sub new { defaultValue=>0 } }, - -useTemplate=>1 + -useTemplate=>1, + -useMetaData=>1 ); bless $self, $class; } @@ -136,6 +137,7 @@ sub www_edit { #------------------------------------------------------------------- sub www_view { + $_[0]->logView() if ($session{setting}{passiveProfilingEnabled}); my (%var); $var{page_loop} = _traversePageTree($_[0]->get("startAtThisLevel"),0,$_[0]->get("depth"),$_[0]->get("indent"),$_[0]->get("alphabetic")); return $_[0]->processTemplate($_[0]->get("templateId"),\%var); diff --git a/lib/WebGUI/Wobject/Survey.pm b/lib/WebGUI/Wobject/Survey.pm index 9304db2ed..c32b217de 100644 --- a/lib/WebGUI/Wobject/Survey.pm +++ b/lib/WebGUI/Wobject/Survey.pm @@ -387,7 +387,8 @@ sub new { defaultValue=>1 } }, - -useTemplate=>1 + -useTemplate=>1, + -useMetaData=>1 ); bless $self, $class; } @@ -865,12 +866,14 @@ sub www_respond { Survey_responseId=>$session{scratch}{$varname} }); } + $self->logView() if ($session{setting}{passiveProfilingEnabled}); return ""; } #------------------------------------------------------------------- sub www_view { my $self = shift; + $self->logView() if ($session{setting}{passiveProfilingEnabled}); my $var = $self->getMenuVars; $var->{'question.add.url'} = WebGUI::URL::page('wid='.$self->get("wobjectId").'&func=editQuestion&qid=new'); $var->{'question.add.label'} = WebGUI::International::get(30,$self->get("namespace")); @@ -939,6 +942,7 @@ sub www_view { sub www_viewGradebook { my $self = shift; return "" unless (WebGUI::Grouping::isInGroup($self->get("groupToViewReports"))); + $self->logView() if ($session{setting}{passiveProfilingEnabled}); my $var = $self->getMenuVars; $var->{title} = WebGUI::International::get(71,$self->get("namespace")); my $p = WebGUI::Paginator->new(WebGUI::URL::page('func=viewGradebook&wid='.$self->get("wobjectId"))); @@ -975,6 +979,7 @@ sub www_viewGradebook { sub www_viewIndividualSurvey { my $self = shift; return "" unless (WebGUI::Grouping::isInGroup($self->get("groupToViewReports"))); + $self->logView() if ($session{setting}{passiveProfilingEnabled}); my $var = $self->getMenuVars; $var->{'title'} = WebGUI::International::get(70,$self->get("namespace")); $var->{'delete.url'} = WebGUI::URL::page('func=deleteResponse&wid='.$self->get("wobjectId").'&responseId='.$session{form}{responseId}); @@ -1032,6 +1037,7 @@ sub www_viewIndividualSurvey { sub www_viewStatisticalOverview { my $self = shift; return "" unless (WebGUI::Grouping::isInGroup($self->get("groupToViewReports"))); + $self->logView() if ($session{setting}{passiveProfilingEnabled}); my $var = $self->getMenuVars; $var->{title} = WebGUI::International::get(58,$self->get("namespace")); my $p = WebGUI::Paginator->new(WebGUI::URL::page('func=viewStatisticalOverview&wid='.$self->get("wobjectId"))); diff --git a/lib/WebGUI/Wobject/SyndicatedContent.pm b/lib/WebGUI/Wobject/SyndicatedContent.pm index 76235a939..1f26fdf09 100644 --- a/lib/WebGUI/Wobject/SyndicatedContent.pm +++ b/lib/WebGUI/Wobject/SyndicatedContent.pm @@ -45,7 +45,8 @@ sub new { rssUrl=>{}, maxHeadlines=>{}, }, - -useTemplate=>1 + -useTemplate=>1, + -useMetaData=>1 ); bless $self, $class; } @@ -330,6 +331,7 @@ sub _view_single_feed { } sub www_view { + $_[0]->logView() if ($session{setting}{passiveProfilingEnabled}); my $maxHeadlines = $_[0]->get("maxHeadlines") || 1000000; my @urls = split(/\s+/,$_[0]->get("rssUrl")); diff --git a/lib/WebGUI/Wobject/USS.pm b/lib/WebGUI/Wobject/USS.pm index 698a6bd74..1e39aef47 100644 --- a/lib/WebGUI/Wobject/USS.pm +++ b/lib/WebGUI/Wobject/USS.pm @@ -166,6 +166,7 @@ sub new { my $self = WebGUI::Wobject->new( -properties=>$property, -useDiscussion=>1, + -useMetaData=>1, -extendedProperties=>{ submissionsPerPage=>{ defaultValue=>50 @@ -645,6 +646,7 @@ sub www_moveSubmissionUp { #------------------------------------------------------------------- sub www_view { + $_[0]->logView() if ($session{setting}{passiveProfilingEnabled}); my (%var, $row, $page, $p, $constraints, @submission, @content, $image, $i, $numResults, $thumbnail, $responses); $numResults = $_[0]->get("submissionsPerPage"); $var{"readmore.label"} = WebGUI::International::get(46,$_[0]->get("namespace")); @@ -747,7 +749,7 @@ sub www_view { #------------------------------------------------------------------- # print out RSS 2.0 feed describing the items visible on the first page sub www_viewRSS { - + $_[0]->logView() if ($session{setting}{passiveProfilingEnabled}); my $wid = $_[0]->get("wobjectId"); my $numResults = $_[0]->get("submissionsPerPage"); @@ -802,6 +804,7 @@ sub www_viewRSS { #------------------------------------------------------------------- sub www_viewSubmission { + $_[0]->logView() if ($session{setting}{passiveProfilingEnabled}); return "" unless ($session{form}{sid}); my ($file, @data, %var, $replies); my $submission = $_[0]->getCollateral("USS_submission","USS_submissionId",$session{form}{sid}); diff --git a/lib/WebGUI/Wobject/WSClient.pm b/lib/WebGUI/Wobject/WSClient.pm index 18754e79d..a95bd7503 100644 --- a/lib/WebGUI/Wobject/WSClient.pm +++ b/lib/WebGUI/Wobject/WSClient.pm @@ -64,6 +64,7 @@ sub new { $self = WebGUI::Wobject->new( -properties => $property, + -useMetaData => 1, -extendedProperties => { call => { fieldType => 'textarea', @@ -252,7 +253,7 @@ sub www_view { %var # HTML::Template variables ); my $self= shift; - + $self->logView() if ($session{setting}{passiveProfilingEnabled}); # this page, with important params $url = WebGUI::URL::page("func=view&wid=" . $self->get("wobjectId")); diff --git a/lib/WebGUI/Wobject/WobjectProxy.pm b/lib/WebGUI/Wobject/WobjectProxy.pm index 199f1a437..a75987c7d 100644 --- a/lib/WebGUI/Wobject/WobjectProxy.pm +++ b/lib/WebGUI/Wobject/WobjectProxy.pm @@ -37,6 +37,7 @@ sub new { my $property = shift; my $self = WebGUI::Wobject->new( -properties=>$property, + -useMetaData=>undef, # NO MetaData for wobject proxy -extendedProperties=>{ proxiedWobjectId=>{ fieldType=>"hidden"