"; + my ($key, $log, $cgi, $logfile, $config); + if (exists $session{cgi}) { + $cgi = $session{cgi}; + } else { + use CGI; + $cgi = CGI->new; + } + print $cgi->header; + if (exists $session{config}{logfile}) { + $logfile = $session{config}{logfile}; + } else { + use Data::Config; + $config = new Data::Config '../etc/WebGUI.conf'; + $logfile = $config->param('logfile'); + } + $log = FileHandle->new(">>$logfile") or die "Can't open log file."; + print "
";
print $0." at ".localtime(time)." reported:
";
+ print $log localtime(time)." ".$0." ".$_[0]."\n";
print $_[0];
print "
| ";
print "Level 1 ".join(" ",caller(1)); + print $log "\t".join(",",caller(1))."\n"; print " | "."Level 2 ".join(" ",caller(2)); + print $log "\t".join(",",caller(2))."\n"; print " | "."Level 3 ".join(" ",caller(3)); - print " | "."Level 4 ".join(" ",caller(4)); - print " |
  | ';
- $output .= ''.$data[1].' | '; - $output .= ''.$data[2].' |
| ';
+ $row[$i] .= ''.$data[1].' | '; + $row[$i] .= ''.$data[2].' |
| ';
- $output .= ''.$data[1].' | '; + $row[$i] = '
| ';
+ $row[$i] .= ''.$data[1].' |
'; + $output .= '
| ';
- #$output .= ''.$data[1].' | '; - $output .= ''.$data[1].' | '; - $output .= ''.$data[2].' |
| ';
+ #$row[$i] .= ''.$data[1].' | '; + $row[$i] .= ''.$data[1].' | '; + $row[$i] .= ''.$data[2].' |
'.$data{linkTitle}.''; diff --git a/lib/WebGUI/Widget/EventsCalendar.pm b/lib/WebGUI/Widget/EventsCalendar.pm index 7a7f19393..b7666fab3 100644 --- a/lib/WebGUI/Widget/EventsCalendar.pm +++ b/lib/WebGUI/Widget/EventsCalendar.pm @@ -18,6 +18,12 @@ use WebGUI::SQL; use WebGUI::Utility; use WebGUI::Widget; +#------------------------------------------------------------------- +sub purge { + WebGUI::SQL->write("delete from event where widgetId=$_[0]",$_[1]); + purgeWidget($_[0],$_[1]); +} + #------------------------------------------------------------------- sub widgetName { return "Events Calendar"; @@ -193,12 +199,12 @@ sub www_view { %data = WebGUI::SQL->quickHash("select * from widget where widget.widgetId='$widgetId'",$session{dbh}); if (defined %data) { if ($data{displayTitle}) { - $output = "
';
}
- $sth = WebGUI::SQL->read("select name, description, date_format(startDate,'%M'), date_format(startDate,'%e'), date_format(startDate,'%Y'), date_format(endDate,'%e') from event where widgetId='$widgetId' and startDate>now() order by startDate",$session{dbh});
+ $sth = WebGUI::SQL->read("select name, description, date_format(startDate,'%M'), date_format(startDate,'%e'), date_format(startDate,'%Y'), date_format(endDate,'%e') from event where widgetId='$widgetId' and to_days(startDate)>(to_days(now())-1) order by startDate",$session{dbh});
while (@event = $sth->array) {
$output .= "$event[2] $event[3]";
if ($event[3] ne $event[5]) {
diff --git a/lib/WebGUI/Widget/ExtraColumn.pm b/lib/WebGUI/Widget/ExtraColumn.pm
index cee9ff7a1..3339d2371 100644
--- a/lib/WebGUI/Widget/ExtraColumn.pm
+++ b/lib/WebGUI/Widget/ExtraColumn.pm
@@ -17,6 +17,12 @@ use WebGUI::SQL;
use WebGUI::Utility;
use WebGUI::Widget;
+#-------------------------------------------------------------------
+sub purge {
+ WebGUI::SQL->write("delete from ExtraColumn where widgetId=$_[0]",$_[1]);
+ purgeWidget($_[0],$_[1]);
+}
+
#-------------------------------------------------------------------
sub widgetName {
return "Extra Column";
diff --git a/lib/WebGUI/Widget/FAQ.pm b/lib/WebGUI/Widget/FAQ.pm
index d01a37a69..61538d4d6 100644
--- a/lib/WebGUI/Widget/FAQ.pm
+++ b/lib/WebGUI/Widget/FAQ.pm
@@ -29,6 +29,12 @@ sub _reorderQuestions {
$sth->finish;
}
+#-------------------------------------------------------------------
+sub purge {
+ WebGUI::SQL->write("delete from faqQuestion where widgetId=$_[0]",$_[1]);
+ purgeWidget($_[0],$_[1]);
+}
+
#-------------------------------------------------------------------
sub widgetName {
return "F.A.Q.";
@@ -103,7 +109,7 @@ sub www_deleteQuestion {
my ($output);
if (WebGUI::Privilege::canEditPage()) {
$output = 'Please Confirm
';
- $output = 'Are you certain that you want to delete this question?
'; diff --git a/lib/WebGUI/Widget/MessageBoard.pm b/lib/WebGUI/Widget/MessageBoard.pm index dbfd8aa33..051a1c93d 100644 --- a/lib/WebGUI/Widget/MessageBoard.pm +++ b/lib/WebGUI/Widget/MessageBoard.pm @@ -43,6 +43,13 @@ sub _traverseReplyTree { return $html; } +#------------------------------------------------------------------- +sub purge { + WebGUI::SQL->write("delete from message where widgetId=$_[0]",$_[1]); + WebGUI::SQL->write("delete from MessageBoard where widgetId=$_[0]",$_[1]); + purgeWidget($_[0],$_[1]); +} + #------------------------------------------------------------------- sub widgetName { return "Message Board"; @@ -310,18 +317,12 @@ sub www_showMessage { #------------------------------------------------------------------- sub www_view { - my ($sth, @data, $html, %board, $itemsPerPage, $currentPage, $totalItems); + my ($sth, @data, $html, %board, $itemsPerPage, $i, @row, $pn); %board = _getBoardProperties($_[0]); $itemsPerPage = $board{messagesPerPage}; - if ($session{form}{pageNumber} < 1) { - $currentPage = 1; - } else { - $currentPage = $session{form}{pageNumber}; - } if ($board{description} ne "") { $html .= $board{description}.'
'; } - ($totalItems) = WebGUI::SQL->quickArray("select count(*) from message where widgetId=$_[0]",$session{dbh}); $html .= '
| '; if ($board{displayTitle}) { $html .= $board{title}; @@ -329,32 +330,34 @@ sub www_view { $html .= ' | Post New Message |
| Subject | Author | Thread Started | Replies | Last Reply |
| '.$data[1].' | '.$data[3].' | '.$data[4].' | '.$data[2].' | '.$data[5].' |
'; @@ -52,7 +52,7 @@ sub _viewResults { %poll = WebGUI::SQL->quickHash("select * from widget,Poll where widget.widgetId=Poll.widgetId and widget.widgetId='$widgetId'",$session{dbh}); if (defined %poll) { if ($poll{displayTitle} == 1) { - $output = "
'; @@ -73,6 +73,13 @@ sub _viewResults { return $output; } +#------------------------------------------------------------------- +sub purge { + WebGUI::SQL->write("delete from pollAnswer where widgetId=$_[0]",$_[1]); + WebGUI::SQL->write("delete from Poll where widgetId=$_[0]",$_[1]); + purgeWidget($_[0],$_[1]); +} + #------------------------------------------------------------------- sub widgetName { return "Poll"; diff --git a/lib/WebGUI/Widget/SQLReport.pm b/lib/WebGUI/Widget/SQLReport.pm index d3cc01968..c96009501 100644 --- a/lib/WebGUI/Widget/SQLReport.pm +++ b/lib/WebGUI/Widget/SQLReport.pm @@ -11,6 +11,7 @@ package WebGUI::Widget::SQLReport; #------------------------------------------------------------------- use strict; +use WebGUI::ErrorHandler; use WebGUI::Macro; use WebGUI::Privilege; use WebGUI::Session; @@ -18,6 +19,12 @@ use WebGUI::SQL; use WebGUI::Utility; use WebGUI::Widget; +#------------------------------------------------------------------- +sub purge { + WebGUI::SQL->write("delete from SQLReport where widgetId=$_[0]",$_[1]); + purgeWidget($_[0],$_[1]); +} + #------------------------------------------------------------------- sub widgetName { return "SQL Report"; @@ -108,7 +115,7 @@ sub www_view { %data = WebGUI::SQL->quickHash("select * from widget,SQLReport where widget.widgetId=$widgetId and widget.widgetId=SQLReport.widgetId",$session{dbh}); if (defined %data) { if ($data{displayTitle} == 1) { - $output = "
'; @@ -119,9 +126,15 @@ sub www_view { $dbh = DBI->connect($data{DSN},$data{username},$data{identifier}); } else { $output .= 'Error: The DSN specified is of an improper format.
'; + WebGUI::ErrorHandler::warn("SQLReport [$widgetId] The DSN specified is of an improper format."); } if (defined $dbh) { - $sth = WebGUI::SQL->read($data{dbQuery},$dbh); + if ($data{dbQuery} =~ /select/i) { + $sth = WebGUI::SQL->read($data{dbQuery},$dbh); + } else { + $output .= 'Error: The SQL query is improperly formatted.
'; + WebGUI::ErrorHandler::warn("SQLReport [$widgetId] The SQL query is improperly formatted."); + } if (defined $sth) { while (@result = $sth->array) { $temp = $template[1]; @@ -133,11 +146,13 @@ sub www_view { } $sth->finish; } else { - $output .= 'Error: There was a problem with the query.'; + $output .= 'Error: There was a problem with the query.
'; + WebGUI::ErrorHandler::warn("SQLReport [$widgetId] There was a problem with the query."); } $dbh->disconnect(); } else { - $output .= 'Error: Could not connect to remote database.'; + $output .= 'Error: Could not connect to remote database.
'; + WebGUI::ErrorHandler::warn("SQLReport [$widgetId] Could not connect to remote database."); } $output .= $template[2]; } diff --git a/lib/WebGUI/Widget/SearchMnoGo.pm b/lib/WebGUI/Widget/SearchMnoGo.pm index 5a235c125..6599cee8b 100644 --- a/lib/WebGUI/Widget/SearchMnoGo.pm +++ b/lib/WebGUI/Widget/SearchMnoGo.pm @@ -27,6 +27,7 @@ sub _mnogoSearch { $dbh = DBI->connect($data{DSN},$data{username},$data{identifier}); } else { $output .= 'Error: The DSN specified is of an improper format.
'; + WebGUI::ErrorHandler::warn("Search (MnoGo) The DSN specified is of an improper format."); } if (defined $dbh) { foreach $word (@keyword) { @@ -38,6 +39,7 @@ sub _mnogoSearch { $sth->finish; } else { $output .= 'Error: There was a problem with the query.
'; + WebGUI::ErrorHandler::warn("Search (MnoGo) There was a problem with the query."); } } foreach $key (sort {$result{$b} <=> $result{$a}} keys %result) { @@ -50,10 +52,17 @@ sub _mnogoSearch { $dbh->disconnect(); } else { $output .= 'Error: Could not connect to remote database.
'; + WebGUI::ErrorHandler::warn("Search (MnoGo) Could not connect to remote database."); } return $output; } +#------------------------------------------------------------------- +sub purge { + WebGUI::SQL->write("delete from SearchMnoGo where widgetId=$_[0]",$_[1]); + purgeWidget($_[0],$_[1]); +} + #------------------------------------------------------------------- sub widgetName { return "Search (MnoGo)"; @@ -63,7 +72,7 @@ sub widgetName { sub www_add { my ($output); if (WebGUI::Privilege::canEditPage()) { - $output = '