From f1de18993839569ebfb1897731cfcacf019153de Mon Sep 17 00:00:00 2001 From: JT Smith Date: Mon, 21 Nov 2005 14:39:05 +0000 Subject: [PATCH] removed spectre updated credits --- docs/credits.txt | 2 +- docs/upgrades/upgrade_6.7.8-6.8.0.pl | 1 + lib/WebGUI/Asset.pm | 13 +- lib/WebGUI/Operation/WebGUI.pm | 2 +- lib/WebGUI/Workflow.pm | 64 -------- sbin/spectre.pl | 230 --------------------------- 6 files changed, 15 insertions(+), 297 deletions(-) delete mode 100644 lib/WebGUI/Workflow.pm delete mode 100644 sbin/spectre.pl diff --git a/docs/credits.txt b/docs/credits.txt index ab19c6d67..057593996 100644 --- a/docs/credits.txt +++ b/docs/credits.txt @@ -23,7 +23,7 @@ Contributing Developers..............Peter Beardsley / Appropriate Solutions Chris Gebhardt / OpenServe Andy Grundman Chris Jackson - Roy Johnson / Sparton + Roy Johnson / Ocean View Creations Koen de Jonge / ProcoliX Martin Kamerbeek / ProcoliX Christian Kocourek diff --git a/docs/upgrades/upgrade_6.7.8-6.8.0.pl b/docs/upgrades/upgrade_6.7.8-6.8.0.pl index 84d59108e..9c0709fa8 100644 --- a/docs/upgrades/upgrade_6.7.8-6.8.0.pl +++ b/docs/upgrades/upgrade_6.7.8-6.8.0.pl @@ -111,6 +111,7 @@ sub updateConfigFile { } push(@{$newConfig{assets}}, "WebGUI::Asset::Wobject::Matrix"); push(@{$newConfig{assets}}, "WebGUI::Asset::Wobject::InOutBoard"); + push(@{$newConfig{assets}}, "WebGUI::Asset::File::ZipArchive"); $conf->purge; $conf->set(%newConfig); $conf->write; diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index a086ce9c6..77d3584c7 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -784,7 +784,18 @@ Returns the not found object. The not found object is set in the settings. =cut sub getNotFound { - if ($session{wguri} eq "/abcdefghijklmnopqrstuvwxyz") { + if ($session{wguri} eq "/*give-credit-where-credit-is-due*") { + my $content = ""; + open(FILE,"<".$session{config}{webguiRoot}."/docs/credits.txt"); + while () { + $content .= $_; + } + close(FILE); + return WebGUI::Asset->newByPropertyHashRef({ + className=>"WebGUI::Asset::Snippet", + snippet=> '
'.$content.'
' + }); + } elsif ($session{wguri} eq "/abcdefghijklmnopqrstuvwxyz") { return WebGUI::Asset->newByPropertyHashRef({ className=>"WebGUI::Asset::Snippet", snippet=>q|
Why would you type in this URL? Really. What were you expecting to see here? You really need to get a life. Are you still here? Seriously, you need to go do something else. I think your boss is calling.
| diff --git a/lib/WebGUI/Operation/WebGUI.pm b/lib/WebGUI/Operation/WebGUI.pm index b0d096fd8..07be94b9b 100644 --- a/lib/WebGUI/Operation/WebGUI.pm +++ b/lib/WebGUI/Operation/WebGUI.pm @@ -95,7 +95,7 @@ sub www_setup { WebGUI::Setting::set('companyURL',WebGUI::FormProcessor::url("companyURL")); WebGUI::Setting::set('companyEmail',WebGUI::FormProcessor::email("companyEmail")); WebGUI::Setting::remove('specialState'); - WebGUI::HTTP::setRedirect($session{wguri}); + WebGUI::HTTP::setRedirect("/"); return ""; } else { $output .= 'Admin Account'; diff --git a/lib/WebGUI/Workflow.pm b/lib/WebGUI/Workflow.pm deleted file mode 100644 index 49ef2bc8b..000000000 --- a/lib/WebGUI/Workflow.pm +++ /dev/null @@ -1,64 +0,0 @@ -package WebGUI::Workflow; - - -=head1 LEGAL - - ------------------------------------------------------------------- - WebGUI is Copyright 2001-2005 Plain Black Corporation. - ------------------------------------------------------------------- - Please read the legal notices (docs/legal.txt) and the license - (docs/license.txt) that came with this distribution before using - this software. - ------------------------------------------------------------------- - http://www.plainblack.com info@plainblack.com - ------------------------------------------------------------------- - -=cut - -use strict; -use WebGUI::Session; - -=head1 NAME - -Package WebGUI::Workflow - -=head1 DESCRIPTION - -This package provides global utility functions for workflows. - -=head1 SYNOPSIS - - use WebGUI::Workflow; - - $arrayRef = getSchedules(); - -=head1 FUNCTIONS - -These subroutines are available from this package: - -=cut - -#------------------------------------------------------------------- - -=head2 getSchedules - -Returns an array reference of hashes containing the workflow schedule data for this site. - -=cut - -sub getSchedules { - my @schedules; - my $sth = WebGUI::SQL->read("select * from WorkflowSchedule where enabled=1"); - while (my $event = $sth->hashRef) { - my $schedule = join(" ",$event->{minuteOfHour},$event->{hourOfDay},$event->{dayOfMonth},$event->{monthOfYear},$event->{dayOfWeek}); - push(@schedules,{ - schedule=>$schedule, - workflowId=>$event->{workflowId} - }); - } - return \@schedules; -} - -1; - - diff --git a/sbin/spectre.pl b/sbin/spectre.pl deleted file mode 100644 index fe55ea240..000000000 --- a/sbin/spectre.pl +++ /dev/null @@ -1,230 +0,0 @@ -#------------------------------------------------------------------- -# WebGUI is Copyright 2001-2005 Plain Black Corporation. -#------------------------------------------------------------------- -# Please read the legal notices (docs/legal.txt) and the license -# (docs/license.txt) that came with this distribution before using -# this software. -#------------------------------------------------------------------- -# http://www.plainblack.com info@plainblack.com -#------------------------------------------------------------------- - -use strict; -use warnings; -use lib '../lib'; -use DateTime; -use DateTime::Cron::Simple; -use Getopt::Long; -use POE qw(Session); -use POE::Component::IKC::ClientLite; -use POE::Component::IKC::Server; -use POE::Component::IKC::Specifier; -use POE::Component::JobQueue; -use WebGUI::Session; -use WebGUI::Workflow; - -$|=1; # disable output buffering -my $help; -my $shutdown; - -GetOptions( - 'help'=>\$help, - 'shutdown'=>\$shutdown - ); - -if ($help) { - print <32133, - ip=>'127.0.0.1', - name=>rand(100000), - timeout=>10 - ); - die $POE::Component::IKC::ClientLite::error unless $remote; - my $result = $remote->post('scheduler/shutdown'); - die $POE::Component::IKC::ClientLite::error unless defined $result; - undef $remote; - exit; -} - -fork and exit; - - -create_ikc_server( - port => 32133, - name => 'Spectre', - ); - -POE::Session->create( - inline_states => { - _start => \&initializeScheduler, - _stop => \&shutdown, - "shutdown" => \&shutdown, - loadSchedule => \&loadSchedule, - checkSchedule => \&checkSchedule, - checkEvent => \&checkEvent, - } - ); - -POE::Session->create( - inline_states => { - _start => \&initializeJobQueue, - _stop => \&shutdown, - } - ); - -POE::Component::JobQueue->spawn ( - Alias => 'queuer', - WorkerLimit => 10, - Worker => \&spawnWorker, - Passive => { - Prioritizer => \&prioritizeJobs, - }, - ); - -POE::Kernel->run(); -exit 0; - - -#------------------------------------------------------------------- -sub checkEvent { - my ($kernel, $schedule, $workflowId, $time) = @_[KERNEL, ARG0, ARG1, ARG2]; - my $cron = DateTime::Cron::Simple->new($schedule); - if ($cron->validate_time(DateTime->from_epoch(epoch=>$time))) { - print "Supposed to run task ".$workflowId." now!!\n"; - } -} - -#------------------------------------------------------------------- -sub checkSchedule { - my ($kernel, $heap) = @_[KERNEL, HEAP]; - my $now = time(); - foreach my $config (keys %{$heap->{workflowSchedules}}) { - foreach my $event (@{$heap->{workflowSchedules}{$config}}) { - $kernel->yield("checkEvent",$event->{schedule},$event->{workflowId},$now); - } - } - $kernel->delay_set("checkSchedule",60); -} - -#------------------------------------------------------------------- -sub initializeJobQueue { - print "Starting WebGUI Spectre Job Queue..."; - my $kernel = $_[KERNEL]; - my $serviceName = "queue"; - $kernel->alias_set($serviceName); - $kernel->call( IKC => publish => $serviceName, ["shutdown"] ); - print "OK\n"; - foreach my $config (keys %{WebGUI::Config::readAllConfigs("..")}) { - $kernel->yield("loadJobs", $config); - } -} - -#------------------------------------------------------------------- -sub initializeScheduler { - print "Starting WebGUI Spectre Scheduler..."; - my ( $kernel, $heap) = @_[ KERNEL, HEAP ]; - my $serviceName = "scheduler"; - $kernel->alias_set($serviceName); - $kernel->call( IKC => publish => $serviceName, ["shutdown", "loadSchedule"] ); - foreach my $config (keys %{WebGUI::Config::readAllConfigs("..")}) { - $kernel->yield("loadSchedule", $config); - } - print "OK\n"; - $kernel->yield("checkSchedule"); -} - -#------------------------------------------------------------------- -sub loadJobs { - my ($heap, $config) = @_[HEAP, ARG0]; - sessionOpen($config); -} - -#------------------------------------------------------------------- -sub loadSchedule { - my ($heap, $config) = @_[HEAP, ARG0]; - sessionOpen($config); - $heap->{workflowSchedules}{$config} = WebGUI::Workflow::getSchedules(); - sessionClose(); -} - -#------------------------------------------------------------------- -sub performJob { - -} - -#------------------------------------------------------------------- -sub prioritizeJobs { - return 1; # FIFO queue, but let's add priorities at some point -} - -#------------------------------------------------------------------- -sub sessionOpen { - WebGUI::Session::open("..",shift); - WebGUI::Session::refreshUserInfo("pbuser_________spectre"); -} - -#------------------------------------------------------------------- -sub sessionClose { - WebGUI::Session::end(); - WebGUI::Session::close(); -} - -#------------------------------------------------------------------- -sub shutdown { - my $kernel = $_[KERNEL]; - print "Stopping WebGUI Spectre..."; - if ($session{var}{userId}) { - sessionClose(); - } - print "OK\n"; - $kernel->stop; -} - -#------------------------------------------------------------------- -sub spawnWorker { - my ($postback, @jobParams) = @_; - POE::Session->create ( - inline_states => { - _start => \&startWorker, - _stop => \&stopWorker, - performJob => \&performJob - }, - args => [ - $postback, - @jobParams, - ], - ); -} - -#------------------------------------------------------------------- -sub startWorker { - -} - -#------------------------------------------------------------------- -sub stopWorker { - -} - - - - -