Menu
▾
▴
openinteract-commits — CVS updates for OpenInteract/SPOPS
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(381) |
Nov
(176) |
Dec
(310) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(334) |
Feb
(96) |
Mar
(149) |
Apr
(214) |
May
(120) |
Jun
(56) |
Jul
(10) |
Aug
(273) |
Sep
(182) |
Oct
(56) |
Nov
(125) |
Dec
(22) |
| 2003 |
Jan
(63) |
Feb
(181) |
Mar
(498) |
Apr
(433) |
May
(39) |
Jun
(512) |
Jul
(276) |
Aug
(156) |
Sep
(101) |
Oct
(66) |
Nov
(24) |
Dec
(161) |
| 2004 |
Jan
(1) |
Feb
(377) |
Mar
(68) |
Apr
(26) |
May
(107) |
Jun
(333) |
Jul
(13) |
Aug
|
Sep
(76) |
Oct
(88) |
Nov
(170) |
Dec
(91) |
| 2005 |
Jan
(52) |
Feb
(239) |
Mar
(402) |
Apr
(15) |
May
(2) |
Jun
(1) |
Jul
(13) |
Aug
|
Sep
(71) |
Oct
(34) |
Nov
|
Dec
|
| 2006 |
Jan
(5) |
Feb
(5) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(7) |
Oct
(2) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Chris W. <la...@us...> - 2004-11-29 02:59:01
|
Update of /cvsroot/openinteract/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9606 Modified Files: MANIFEST Log Message: fix small bug in finding count of all comments Index: MANIFEST =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/MANIFEST,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** MANIFEST 28 Nov 2004 20:29:09 -0000 1.101 --- MANIFEST 29 Nov 2004 02:58:51 -0000 1.102 *************** *** 166,170 **** pkg/base_theme-2.09.zip pkg/base_user-2.33.zip ! pkg/comments-1.16.zip pkg/full_text-2.57.zip pkg/lookup-2.06.zip --- 166,170 ---- pkg/base_theme-2.09.zip pkg/base_user-2.33.zip ! pkg/comments-1.17.zip pkg/full_text-2.57.zip pkg/lookup-2.06.zip |
|
From: Chris W. <la...@us...> - 2004-11-29 02:59:01
|
Update of /cvsroot/openinteract/OpenInteract2/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9606/t Modified Files: utils.pl Log Message: fix small bug in finding count of all comments Index: utils.pl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/t/utils.pl,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** utils.pl 28 Nov 2004 20:29:09 -0000 1.80 --- utils.pl 29 Nov 2004 02:58:51 -0000 1.81 *************** *** 53,57 **** base_theme => '2.09', base_user => '2.33', ! comments => '1.16', full_text => '2.57', lookup => '2.06', --- 53,57 ---- base_theme => '2.09', base_user => '2.33', ! comments => '1.17', full_text => '2.57', lookup => '2.06', |
|
From: Chris W. <la...@us...> - 2004-11-28 20:29:20
|
Update of /cvsroot/openinteract/OpenInteract2/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19384/t Modified Files: utils.pl Added Files: 00_manage_create_website.t Removed Files: manage_create_website.t Log Message: OIN-107: order the tests so that the management task to create a website runs first and leaves the website in a usable state for other tests that need it --- NEW FILE: 00_manage_create_website.t --- # -*-perl-*- # $Id: 00_manage_create_website.t,v 1.1 2004/11/28 20:29:09 lachoy Exp $ # Odd name rationale: we try to run this test first to get the test # site created and available for other tests that need it. # See: http://jira.openinteract.org/browse/OIN-107 use strict; use lib 't/'; require 'utils.pl'; use File::Spec::Functions qw( :ALL ); use Test::More tests => 45; require_ok( 'OpenInteract2::Manage' ); my $website_dir = get_test_site_dir(); # If the testing site already exists it's history if ( -d $website_dir ) { rmtree( $website_dir ); } my $source_dir = get_source_dir(); create_tmp_dir(); my $task = eval { OpenInteract2::Manage->new( 'create_website', { website_dir => $website_dir, source_dir => $source_dir }) }; ok( ! $@, 'Task created' ) || diag "Error: $@"; is( ref $task, 'OpenInteract2::Manage::Website::Create', 'Correct type of task created' ); # TODO: Add observer here to ensure we get all the fired # observations... warn "\nCreating website... this may take a while\n"; my @status = eval { $task->execute }; ok( ! $@, 'Task executed' ) || diag "Error: $@"; is( scalar @status, 109, 'Number of status messages' ); # Look at the directories we should have created and see they're there my @check_dir_pieces = qw( cache cache/tt cache/content cache/sessions cache/sessions_lock conf error html html/images html/images/icons logs mail msg overflow pkg template uploads ); foreach my $piece ( @check_dir_pieces ) { my $check_dir = catdir( $website_dir, split( '/', $piece ) ); ok( -d $check_dir, "Created directory $piece" ); } # Now just count up the directories and files where it matters is( count_dirs( $website_dir ), 12, "Number of top-level directories" ); is( first_dir( $website_dir ), 'cache', 'First dir in top-level' ); is( last_dir( $website_dir ), 'uploads', 'Last dir in top-level' ); is( count_files( $website_dir ), 0, "Number of top-level files" ); is( count_dirs( catdir( $website_dir, 'cache' ) ), 4, 'Number of directories in cache/' ); my $site_conf_dir = catdir( $website_dir, 'conf' ); is( count_files( $site_conf_dir ), 16, "Number of files in conf/" ); is( first_file( $site_conf_dir ), 'base.conf', "First file in conf/" ); is( last_file( $site_conf_dir ), 'startup_mp2.pl', "Last file in conf/" ); my $site_html_dir = catdir( $website_dir, 'html' ); is( count_dirs( $site_html_dir ), 1, "Number of directories in html/" ); is( count_files( $site_html_dir ), 5, "Number of files in html/" ); is( first_file( $site_html_dir ), '.no_overwrite', "First file in html/" ); is( last_file( $site_html_dir ), 'main.css', "Last file in html/" ); my $site_images_dir = catdir( $website_dir, 'html', 'images' ); is( count_dirs( $site_images_dir ), 1, "Number of directories in html/images/" ); is( count_files( $site_images_dir ), 14, "Number of files in html/images/" ); my $site_icons_dir = catdir( $website_dir, 'html', 'images', 'icons' ); is( count_files( $site_icons_dir ), 27, "Number of files in html/images/icons/" ); my $site_msg_dir = catdir( $website_dir, 'msg' ); is( count_files( $site_msg_dir ), 1, 'Number of files in msg/' ); my $site_pkg_dir = catdir( $website_dir, 'pkg' ); is( count_dirs( $site_pkg_dir ), 16, 'Number of directories in pkg/' ); my $site_template_dir = catdir( $website_dir, 'template' ); is( count_files( $site_template_dir ), 58, "Number of files in template/" ); is( first_file( $site_template_dir ), '.no_overwrite', 'First file in template/' ); is( last_file( $site_template_dir ), 'to_group', 'Last file in template/' ); # Open up the repository and see that all the files are there my $repository = OpenInteract2::Repository->new({ website_dir => $website_dir, }); is( $repository->full_config_dir, $site_conf_dir, 'Repository reports proper config dir' ); is( $repository->full_package_dir, $site_pkg_dir, 'Repository reports proper config dir' ); my $packages = $repository->fetch_all_packages; is( scalar @{ $packages }, 16, 'Repository contains correct number of packages' ); # These operations done for the rest of the tests (not optimal for # design, but good for speed) write_website_check_file(); initialize_website_libraries(); modify_website_post_creation( $website_dir ); Index: utils.pl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/t/utils.pl,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** utils.pl 28 Nov 2004 06:46:09 -0000 1.79 --- utils.pl 28 Nov 2004 20:29:09 -0000 1.80 *************** *** 106,109 **** --- 106,117 ---- } + sub main::create_tmp_dir { + my $tmp_dir = get_tmp_dir(); + unless ( -d $tmp_dir ) { + LOG()->debug( "Creating temp dir '$tmp_dir'" ); + mkdir( $tmp_dir, 0777 ); + } + } + # Get the base website directory for testing *************** *** 182,190 **** # WEBSITE INSTALL/CONTEXT INIT ! sub main::install_website { ! my $source_dir = get_source_dir(); ! my $website_dir = get_test_site_dir(); ! my $is_recent = _is_recent_website( $website_dir ); ! eval { require SPOPS::DBI::SQLite; --- 190,194 ---- # WEBSITE INSTALL/CONTEXT INIT ! sub main::initialize_website_libraries { eval { require SPOPS::DBI::SQLite; *************** *** 201,204 **** --- 205,216 ---- die "Failed to require file session modules: $@"; } + } + + sub main::install_website { + my $source_dir = get_source_dir(); + my $website_dir = get_test_site_dir(); + my $is_recent = _is_recent_website( $website_dir ); + + initialize_website_libraries(); if ( -d $website_dir and $is_recent ) { *************** *** 220,228 **** unlink( $db_file ); } ! my $tmp_dir = get_tmp_dir(); ! unless ( -d $tmp_dir ) { ! LOG()->debug( "Creating temp dir '$tmp_dir'" ); ! mkdir( $tmp_dir, 0777 ); ! } # let any errors bubble up --- 232,236 ---- unlink( $db_file ); } ! create_tmp_dir(); # let any errors bubble up *************** *** 234,246 **** LOG()->debug( "Executed management task ok" ); ! _write_website_check_file(); ! _modify_server_config(); ! ! CTX->setup({ skip => 'activate spops' }); ! OpenInteract2::Manage->new( 'install_sql', ! { website_dir => $website_dir, ! package => [ 'SYSTEM' ] } ) ! ->execute; ! OpenInteract2::Setup->activate_spops_classes; return $website_dir; } --- 242,247 ---- LOG()->debug( "Executed management task ok" ); ! write_website_check_file(); ! modify_website_post_creation( $website_dir ); return $website_dir; } *************** *** 255,259 **** } ! sub _write_website_check_file { my $check_recent = _get_website_check_file(); open( RECENT, '>', $check_recent ) --- 256,260 ---- } ! sub main::write_website_check_file { my $check_recent = _get_website_check_file(); open( RECENT, '>', $check_recent ) *************** *** 268,276 **** } # Write out SQLite information so that the Context gets read in # properly (SPOPS classes need this); use file-based sessions and # write the appropriate directories ! sub _modify_server_config { my $site_dir = get_test_site_dir(); my $config_file = catfile( $site_dir, 'conf', 'server.ini' ); --- 269,289 ---- } + sub main::modify_website_post_creation { + my ( $website_dir ) = @_; + modify_server_config(); + CTX->setup({ skip => 'activate spops' }); + OpenInteract2::Manage->new( + 'install_sql', { + website_dir => $website_dir, + package => [ 'SYSTEM' ], + })->execute(); + OpenInteract2::Setup->activate_spops_classes; + } + # Write out SQLite information so that the Context gets read in # properly (SPOPS classes need this); use file-based sessions and # write the appropriate directories ! sub main::modify_server_config { my $site_dir = get_test_site_dir(); my $config_file = catfile( $site_dir, 'conf', 'server.ini' ); --- manage_create_website.t DELETED --- |
|
From: Chris W. <la...@us...> - 2004-11-28 20:29:18
|
Update of /cvsroot/openinteract/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19384 Modified Files: MANIFEST Log Message: OIN-107: order the tests so that the management task to create a website runs first and leaves the website in a usable state for other tests that need it Index: MANIFEST =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/MANIFEST,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** MANIFEST 28 Nov 2004 16:18:17 -0000 1.100 --- MANIFEST 28 Nov 2004 20:29:09 -0000 1.101 *************** *** 279,282 **** --- 279,283 ---- t/README t/TODO + t/00_manage_create_website.t t/action.t t/action_common_add.t *************** *** 318,322 **** t/manage_create_password.t t/manage_create_security.t - t/manage_create_website.t t/manage_export_package.t t/manage_install_all_sql.t --- 319,322 ---- |
|
From: Chris W. <la...@us...> - 2004-11-28 19:34:41
|
Update of /cvsroot/openinteract/OpenInteract2/doc/Manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30046 Modified Files: Conversion.pod Log Message: resolve conflict Index: Conversion.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/doc/Manual/Conversion.pod,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Conversion.pod 28 Nov 2004 15:04:13 -0000 1.12 --- Conversion.pod 28 Nov 2004 16:19:25 -0000 1.13 *************** *** 172,178 **** C<OpenInteract2::Conversion>. They work on STDIN and STDOUT: ! $ cd /path/to/OpenInteract-2.00-source/script ! $ perl translate_action_to_ini.pl < ~/pkg/mypkg/conf/action.perl > action.ini ! $ perl translate_spops_to_ini.pl < ~/pkg/mypkg/conf/spops.perl > spops.ini In addition to doing the fairly simple conversion from the Perl data --- 172,178 ---- C<OpenInteract2::Conversion>. They work on STDIN and STDOUT: ! $ cd /path/to/OpenInteract-2.00-source/script ! $ perl translate_action_to_ini.pl < ~/pkg/mypkg/conf/action.perl > action.ini ! $ perl translate_spops_to_ini.pl < ~/pkg/mypkg/conf/spops.perl > spops.ini In addition to doing the fairly simple conversion from the Perl data |
|
From: Chris W. <la...@us...> - 2004-11-28 19:34:40
|
Update of /cvsroot/openinteract/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30207 Modified Files: META.yml Log Message: update module versions Index: META.yml =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/META.yml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** META.yml 26 Sep 2004 01:50:12 -0000 1.9 --- META.yml 28 Nov 2004 16:20:02 -0000 1.10 *************** *** 28,31 **** --- 28,32 ---- LWP::Simple: 0 Lingua::Stem: 0.5 + Locale::Maketext: 1.06 Log::Dispatch: 2 Log::Log4perl: 0.34 *************** *** 56,63 **** OpenInteract2::Action: file: lib/OpenInteract2/Action.pm ! version: 1.50 OpenInteract2::Action::Common: file: lib/OpenInteract2/Action/Common.pm ! version: 1.16 OpenInteract2::Action::CommonAdd: file: lib/OpenInteract2/Action/CommonAdd.pm --- 57,64 ---- OpenInteract2::Action: file: lib/OpenInteract2/Action.pm ! version: 1.62 OpenInteract2::Action::Common: file: lib/OpenInteract2/Action/Common.pm ! version: 1.18 OpenInteract2::Action::CommonAdd: file: lib/OpenInteract2/Action/CommonAdd.pm *************** *** 68,72 **** OpenInteract2::Action::CommonSearch: file: lib/OpenInteract2/Action/CommonSearch.pm ! version: 1.14 OpenInteract2::Action::CommonUpdate: file: lib/OpenInteract2/Action/CommonUpdate.pm --- 69,73 ---- OpenInteract2::Action::CommonSearch: file: lib/OpenInteract2/Action/CommonSearch.pm ! version: 1.15 OpenInteract2::Action::CommonUpdate: file: lib/OpenInteract2/Action/CommonUpdate.pm *************** *** 76,80 **** OpenInteract2::Auth: file: lib/OpenInteract2/Auth.pm ! version: 1.19 OpenInteract2::Auth::AdminCheck: file: lib/OpenInteract2/Auth/AdminCheck.pm --- 77,81 ---- OpenInteract2::Auth: file: lib/OpenInteract2/Auth.pm ! version: 1.20 OpenInteract2::Auth::AdminCheck: file: lib/OpenInteract2/Auth/AdminCheck.pm *************** *** 85,97 **** OpenInteract2::Auth::User: file: lib/OpenInteract2/Auth/User.pm ! version: 1.20 OpenInteract2::Cache: file: lib/OpenInteract2/Cache.pm OpenInteract2::Cache::File: file: lib/OpenInteract2/Cache/File.pm ! version: 1.09 OpenInteract2::Config: file: lib/OpenInteract2/Config.pm ! version: 1.13 OpenInteract2::Config::Base: file: lib/OpenInteract2/Config/Base.pm --- 86,98 ---- OpenInteract2::Auth::User: file: lib/OpenInteract2/Auth/User.pm ! version: 1.21 OpenInteract2::Cache: file: lib/OpenInteract2/Cache.pm OpenInteract2::Cache::File: file: lib/OpenInteract2/Cache/File.pm ! version: 1.11 OpenInteract2::Config: file: lib/OpenInteract2/Config.pm ! version: 1.14 OpenInteract2::Config::Base: file: lib/OpenInteract2/Config/Base.pm *************** *** 99,118 **** OpenInteract2::Config::GlobalOverride: file: lib/OpenInteract2/Config/GlobalOverride.pm ! version: 1.07 OpenInteract2::Config::Ini: file: lib/OpenInteract2/Config/Ini.pm ! version: 1.15 OpenInteract2::Config::IniFile: file: lib/OpenInteract2/Config/IniFile.pm ! version: 1.07 OpenInteract2::Config::Initializer: file: lib/OpenInteract2/Config/Initializer.pm ! version: 1.15 OpenInteract2::Config::Package: file: lib/OpenInteract2/Config/Package.pm ! version: 1.18 OpenInteract2::Config::PackageChanges: file: lib/OpenInteract2/Config/PackageChanges.pm ! version: 1.09 OpenInteract2::Config::PerlFile: file: lib/OpenInteract2/Config/PerlFile.pm --- 100,119 ---- OpenInteract2::Config::GlobalOverride: file: lib/OpenInteract2/Config/GlobalOverride.pm ! version: 1.10 OpenInteract2::Config::Ini: file: lib/OpenInteract2/Config/Ini.pm ! version: 1.18 OpenInteract2::Config::IniFile: file: lib/OpenInteract2/Config/IniFile.pm ! version: 1.08 OpenInteract2::Config::Initializer: file: lib/OpenInteract2/Config/Initializer.pm ! version: 1.19 OpenInteract2::Config::Package: file: lib/OpenInteract2/Config/Package.pm ! version: 1.19 OpenInteract2::Config::PackageChanges: file: lib/OpenInteract2/Config/PackageChanges.pm ! version: 1.11 OpenInteract2::Config::PerlFile: file: lib/OpenInteract2/Config/PerlFile.pm *************** *** 134,138 **** OpenInteract2::ContentGenerator::TT2Process: file: lib/OpenInteract2/ContentGenerator/TT2Process.pm ! version: 1.18 OpenInteract2::ContentGenerator::TemplateSource: file: |- --- 135,139 ---- OpenInteract2::ContentGenerator::TT2Process: file: lib/OpenInteract2/ContentGenerator/TT2Process.pm ! version: 1.20 OpenInteract2::ContentGenerator::TemplateSource: file: |- *************** *** 144,151 **** OpenInteract2::Context: file: lib/OpenInteract2/Context.pm ! version: 1.71 OpenInteract2::Controller: file: lib/OpenInteract2/Controller.pm ! version: 1.22 OpenInteract2::Controller::MainTemplate: file: lib/OpenInteract2/Controller/MainTemplate.pm --- 145,152 ---- OpenInteract2::Context: file: lib/OpenInteract2/Context.pm ! version: 1.76 OpenInteract2::Controller: file: lib/OpenInteract2/Controller.pm ! version: 1.23 OpenInteract2::Controller::MainTemplate: file: lib/OpenInteract2/Controller/MainTemplate.pm *************** *** 156,160 **** OpenInteract2::Controller::ManageTemplates: file: lib/OpenInteract2/Controller/ManageTemplates.pm ! version: 1.08 OpenInteract2::Controller::Raw: file: lib/OpenInteract2/Controller/Raw.pm --- 157,161 ---- OpenInteract2::Controller::ManageTemplates: file: lib/OpenInteract2/Controller/ManageTemplates.pm ! version: 1.09 OpenInteract2::Controller::Raw: file: lib/OpenInteract2/Controller/Raw.pm *************** *** 171,178 **** OpenInteract2::Cookie: file: lib/OpenInteract2/Cookie.pm ! version: 1.10 OpenInteract2::Datasource::DBI: file: lib/OpenInteract2/Datasource/DBI.pm ! version: 1.12 OpenInteract2::Datasource::LDAP: file: lib/OpenInteract2/Datasource/LDAP.pm --- 172,179 ---- OpenInteract2::Cookie: file: lib/OpenInteract2/Cookie.pm ! version: 1.11 OpenInteract2::Datasource::DBI: file: lib/OpenInteract2/Datasource/DBI.pm ! version: 1.14 OpenInteract2::Datasource::LDAP: file: lib/OpenInteract2/Datasource/LDAP.pm *************** *** 180,184 **** OpenInteract2::DatasourceManager: file: lib/OpenInteract2/DatasourceManager.pm ! version: 1.14 OpenInteract2::Exception: file: lib/OpenInteract2/Exception.pm --- 181,185 ---- OpenInteract2::DatasourceManager: file: lib/OpenInteract2/DatasourceManager.pm ! version: 1.16 OpenInteract2::Exception: file: lib/OpenInteract2/Exception.pm *************** *** 193,199 **** file: lib/OpenInteract2/File.pm version: 1.11 ! OpenInteract2::Filter: ! file: lib/OpenInteract2/Filter.pm ! version: 1.06 OpenInteract2::FullTextIndexer: file: lib/OpenInteract2/FullTextIndexer.pm --- 194,200 ---- file: lib/OpenInteract2/File.pm version: 1.11 ! OpenInteract2::Filter::AllCaps: ! file: lib/OpenInteract2/Filter/AllCaps.pm ! version: 1.01 OpenInteract2::FullTextIndexer: file: lib/OpenInteract2/FullTextIndexer.pm *************** *** 203,207 **** OpenInteract2::FullTextRules: file: lib/OpenInteract2/FullTextRules.pm ! version: 1.02 OpenInteract2::I18N: file: lib/OpenInteract2/I18N.pm --- 204,208 ---- OpenInteract2::FullTextRules: file: lib/OpenInteract2/FullTextRules.pm ! version: 1.03 OpenInteract2::I18N: file: lib/OpenInteract2/I18N.pm *************** *** 209,213 **** OpenInteract2::I18N::Initializer: file: lib/OpenInteract2/I18N/Initializer.pm ! version: 1.07 OpenInteract2::Log: file: lib/OpenInteract2/Log.pm --- 210,214 ---- OpenInteract2::I18N::Initializer: file: lib/OpenInteract2/I18N/Initializer.pm ! version: 1.08 OpenInteract2::Log: file: lib/OpenInteract2/Log.pm *************** *** 216,220 **** OpenInteract2::Manage: file: lib/OpenInteract2/Manage.pm ! version: 1.40 OpenInteract2::Manage::CreateSourceDirectory: file: lib/OpenInteract2/Manage/CreateSourceDirectory.pm --- 217,221 ---- OpenInteract2::Manage: file: lib/OpenInteract2/Manage.pm ! version: 1.41 OpenInteract2::Manage::CreateSourceDirectory: file: lib/OpenInteract2/Manage/CreateSourceDirectory.pm *************** *** 252,259 **** file: |- lib/OpenInteract2/Manage/Website/CreateSuperuserPassword.pm ! version: 1.10 OpenInteract2::Manage::Website::InstallPackage: file: lib/OpenInteract2/Manage/Website/InstallPackage.pm ! version: 1.13 OpenInteract2::Manage::Website::InstallPackageData: file: |- --- 253,260 ---- file: |- lib/OpenInteract2/Manage/Website/CreateSuperuserPassword.pm ! version: 1.11 OpenInteract2::Manage::Website::InstallPackage: file: lib/OpenInteract2/Manage/Website/InstallPackage.pm ! version: 1.14 OpenInteract2::Manage::Website::InstallPackageData: file: |- *************** *** 308,312 **** OpenInteract2::Manage::Website::ThemeInstall: file: lib/OpenInteract2/Manage/Website/ThemeInstall.pm ! version: 1.10 ? |- OpenInteract2::Manage::Website::UpdatePackageFromWebsite --- 309,313 ---- OpenInteract2::Manage::Website::ThemeInstall: file: lib/OpenInteract2/Manage/Website/ThemeInstall.pm ! version: 1.11 ? |- OpenInteract2::Manage::Website::UpdatePackageFromWebsite *************** *** 317,324 **** OpenInteract2::Manage::Website::Upgrade: file: lib/OpenInteract2/Manage/Website/Upgrade.pm ! version: 1.13 OpenInteract2::Manage::Website::ViewSession: file: lib/OpenInteract2/Manage/Website/ViewSession.pm version: 1.10 OpenInteract2::Package: file: lib/OpenInteract2/Package.pm --- 318,328 ---- OpenInteract2::Manage::Website::Upgrade: file: lib/OpenInteract2/Manage/Website/Upgrade.pm ! version: 1.14 OpenInteract2::Manage::Website::ViewSession: file: lib/OpenInteract2/Manage/Website/ViewSession.pm version: 1.10 + OpenInteract2::Observer: + file: lib/OpenInteract2/Observer.pm + version: 1.02 OpenInteract2::Package: file: lib/OpenInteract2/Package.pm *************** *** 329,333 **** OpenInteract2::Request: file: lib/OpenInteract2/Request.pm ! version: 1.44 OpenInteract2::Request::Apache: file: lib/OpenInteract2/Request/Apache.pm --- 333,337 ---- OpenInteract2::Request: file: lib/OpenInteract2/Request.pm ! version: 1.47 OpenInteract2::Request::Apache: file: lib/OpenInteract2/Request/Apache.pm *************** *** 338,375 **** OpenInteract2::Request::CGI: file: lib/OpenInteract2/Request/CGI.pm ! version: 1.18 OpenInteract2::Request::LWP: file: lib/OpenInteract2/Request/LWP.pm ! version: 1.19 OpenInteract2::Request::Standalone: file: lib/OpenInteract2/Request/Standalone.pm ! version: 1.11 OpenInteract2::Response: file: lib/OpenInteract2/Response.pm ! version: 1.22 OpenInteract2::Response::Apache: file: lib/OpenInteract2/Response/Apache.pm ! version: 1.17 OpenInteract2::Response::Apache2: file: lib/OpenInteract2/Response/Apache2.pm ! version: 1.03 OpenInteract2::Response::CGI: file: lib/OpenInteract2/Response/CGI.pm ! version: 1.16 OpenInteract2::Response::LWP: file: lib/OpenInteract2/Response/LWP.pm ! version: 1.18 OpenInteract2::Response::Standalone: file: lib/OpenInteract2/Response/Standalone.pm ! version: 1.11 OpenInteract2::ResultsIterator: file: lib/OpenInteract2/ResultsIterator.pm ! version: 1.04 OpenInteract2::ResultsManage: file: lib/OpenInteract2/ResultsManage.pm ! version: 1.10 OpenInteract2::SPOPS: file: lib/OpenInteract2/SPOPS.pm ! version: 1.25 OpenInteract2::SPOPS::DBI: file: lib/OpenInteract2/SPOPS/DBI.pm --- 342,379 ---- OpenInteract2::Request::CGI: file: lib/OpenInteract2/Request/CGI.pm ! version: 1.19 OpenInteract2::Request::LWP: file: lib/OpenInteract2/Request/LWP.pm ! version: 1.20 OpenInteract2::Request::Standalone: file: lib/OpenInteract2/Request/Standalone.pm ! version: 1.12 OpenInteract2::Response: file: lib/OpenInteract2/Response.pm ! version: 1.27 OpenInteract2::Response::Apache: file: lib/OpenInteract2/Response/Apache.pm ! version: 1.20 OpenInteract2::Response::Apache2: file: lib/OpenInteract2/Response/Apache2.pm ! version: 1.06 OpenInteract2::Response::CGI: file: lib/OpenInteract2/Response/CGI.pm ! version: 1.19 OpenInteract2::Response::LWP: file: lib/OpenInteract2/Response/LWP.pm ! version: 1.21 OpenInteract2::Response::Standalone: file: lib/OpenInteract2/Response/Standalone.pm ! version: 1.14 OpenInteract2::ResultsIterator: file: lib/OpenInteract2/ResultsIterator.pm ! version: 1.06 OpenInteract2::ResultsManage: file: lib/OpenInteract2/ResultsManage.pm ! version: 1.12 OpenInteract2::SPOPS: file: lib/OpenInteract2/SPOPS.pm ! version: 1.26 OpenInteract2::SPOPS::DBI: file: lib/OpenInteract2/SPOPS/DBI.pm *************** *** 377,381 **** OpenInteract2::SPOPS::LDAP: file: lib/OpenInteract2/SPOPS/LDAP.pm ! version: 1.06 OpenInteract2::SQLInstall: file: lib/OpenInteract2/SQLInstall.pm --- 381,385 ---- OpenInteract2::SPOPS::LDAP: file: lib/OpenInteract2/SPOPS/LDAP.pm ! version: 1.07 OpenInteract2::SQLInstall: file: lib/OpenInteract2/SQLInstall.pm *************** *** 383,399 **** OpenInteract2::SessionManager: file: lib/OpenInteract2/SessionManager.pm ! version: 1.07 OpenInteract2::SessionManager::DBI: file: lib/OpenInteract2/SessionManager/DBI.pm ! version: 1.03 OpenInteract2::SessionManager::File: file: lib/OpenInteract2/SessionManager/File.pm ! version: 1.05 OpenInteract2::SessionManager::SQLite: file: lib/OpenInteract2/SessionManager/SQLite.pm ! version: 1.03 OpenInteract2::Setup: file: lib/OpenInteract2/Setup.pm ! version: 1.50 OpenInteract2::TT2::Context: file: lib/OpenInteract2/TT2/Context.pm --- 387,403 ---- OpenInteract2::SessionManager: file: lib/OpenInteract2/SessionManager.pm ! version: 1.08 OpenInteract2::SessionManager::DBI: file: lib/OpenInteract2/SessionManager/DBI.pm ! version: 1.04 OpenInteract2::SessionManager::File: file: lib/OpenInteract2/SessionManager/File.pm ! version: 1.06 OpenInteract2::SessionManager::SQLite: file: lib/OpenInteract2/SessionManager/SQLite.pm ! version: 1.04 OpenInteract2::Setup: file: lib/OpenInteract2/Setup.pm ! version: 1.53 OpenInteract2::TT2::Context: file: lib/OpenInteract2/TT2/Context.pm *************** *** 401,408 **** OpenInteract2::TT2::Plugin: file: lib/OpenInteract2/TT2/Plugin.pm ! version: 1.11 OpenInteract2::TT2::Provider: file: lib/OpenInteract2/TT2/Provider.pm ! version: 1.04 OpenInteract2::URL: file: lib/OpenInteract2/URL.pm --- 405,412 ---- OpenInteract2::TT2::Plugin: file: lib/OpenInteract2/TT2/Plugin.pm ! version: 1.16 OpenInteract2::TT2::Provider: file: lib/OpenInteract2/TT2/Provider.pm ! version: 1.05 OpenInteract2::URL: file: lib/OpenInteract2/URL.pm |
|
From: Chris W. <la...@us...> - 2004-11-28 19:34:34
|
Update of /cvsroot/openinteract/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29795 Modified Files: MANIFEST Log Message: add included config for test to listing (thought I did this earlier) Index: MANIFEST =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/MANIFEST,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** MANIFEST 28 Nov 2004 06:46:09 -0000 1.99 --- MANIFEST 28 Nov 2004 16:18:17 -0000 1.100 *************** *** 355,358 **** --- 355,359 ---- t/use/Changes t/use/fruit-1.00.zip + t/use/included_config.ini t/use/test_config.ini t/use/test_config.perl |
|
From: Chris W. <la...@us...> - 2004-11-28 19:31:49
|
Update of /cvsroot/openinteract/OpenInteract2/doc/Manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16462/doc/Manual Modified Files: Changes.pod Log Message: update OI2::Request implementations to pass the full URL -- with GET query arguments -- to assign_request_url() Index: Changes.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/doc/Manual/Changes.pod,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** Changes.pod 28 Nov 2004 04:34:24 -0000 1.53 --- Changes.pod 28 Nov 2004 17:50:28 -0000 1.54 *************** *** 1122,1125 **** --- 1122,1141 ---- request. Generally used when loggin a user out. + =item * + + Document that the C<assign_request_url()> method should take the + B<full> request URL, including the query string. + + =back + + L<OpenInteract2::Request::Apache> + + =over 4 + + =item * + + Ensure parent C<assign_request_url()> gets the request URL with query + arguments. + =back *************** *** 1136,1139 **** --- 1152,1171 ---- parameter/upload parsing from L<OpenInteract2::Request::CGI>. + =item * + + Ensure parent C<assign_request_url()> gets the request URL with query + arguments. + + =back + + L<OpenInteract2::Request::CGI> + + =over 4 + + =item * + + Ensure parent C<assign_request_url()> gets the request URL with query + arguments. + =back |
|
From: Chris W. <la...@us...> - 2004-11-28 19:31:48
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16462/lib/OpenInteract2/Request Modified Files: Apache.pm Apache2.pm CGI.pm LWP.pm Standalone.pm Log Message: update OI2::Request implementations to pass the full URL -- with GET query arguments -- to assign_request_url() Index: Apache.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request/Apache.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Apache.pm 7 Jun 2004 01:19:18 -0000 1.15 --- Apache.pm 28 Nov 2004 17:50:46 -0000 1.16 *************** *** 38,44 **** # Set the URI and parse it ! $self->assign_request_url( $apache->uri ); ! # Setup the GET/SET params my $num_param = 0; --- 38,49 ---- # Set the URI and parse it ! my $full_uri = $apache->uri; ! my $query_args = $apache->args; ! if ( $query_args ) { ! $full_uri .= "?$query_args"; ! } ! $self->assign_request_url( $full_uri ); ! # Setup the GET/POST params my $num_param = 0; *************** *** 61,70 **** foreach my $upload ( $self->apache->upload() ) { my $oi_upload = OpenInteract2::Upload->new({ ! name => $upload->name, ! content_type => $upload->type, ! size => $upload->size, ! filehandle => $upload->fh, ! filename => $upload->filename, ! tmp_name => $upload->tempname }); $self->_set_upload( $upload->name, $oi_upload ); $num_uploads++; --- 66,76 ---- foreach my $upload ( $self->apache->upload() ) { my $oi_upload = OpenInteract2::Upload->new({ ! name => $upload->name, ! content_type => $upload->type, ! size => $upload->size, ! filehandle => $upload->fh, ! filename => $upload->filename, ! tmp_name => $upload->tempname ! }); $self->_set_upload( $upload->name, $oi_upload ); $num_uploads++; Index: Apache2.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request/Apache2.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Apache2.pm 19 Feb 2004 04:10:37 -0000 1.1 --- Apache2.pm 28 Nov 2004 17:50:46 -0000 1.2 *************** *** 44,51 **** } ! my $request_path = $r->parsed_uri->path; ! $log->is_debug && ! $log->debug( "Got URL from apache '$request_path'" ); ! $self->assign_request_url( $request_path ); # HACK! --- 44,55 ---- } ! my $apache_uri = $r->parsed_uri; ! my $full_url = $apache_uri->path; ! my $query_args = $apache_uri->query; ! if ( $query_args ) { ! $full_url .= "?$query_args"; ! } ! $log->is_debug && $log->debug( "Got URL from apache2 '$full_url'" ); ! $self->assign_request_url( $full_url ); # HACK! Index: CGI.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request/CGI.pm,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** CGI.pm 22 Sep 2004 03:09:34 -0000 1.19 --- CGI.pm 28 Nov 2004 17:50:46 -0000 1.20 *************** *** 42,47 **** my $full_url = join( '', $base_url, $cgi->path_info ); ! $log->is_debug && ! $log->debug( "Full OI URL '$full_url'" ); $self->assign_request_url( $full_url ); --- 42,50 ---- my $full_url = join( '', $base_url, $cgi->path_info ); ! my $query_args = $cgi->query_string; ! if ( $query_args ) { ! $full_url .= "?$query_args"; ! } ! $log->is_debug && $log->debug( "Full OI URL from CGI: $full_url" ); $self->assign_request_url( $full_url ); Index: LWP.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request/LWP.pm,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** LWP.pm 22 Sep 2004 03:09:34 -0000 1.20 --- LWP.pm 28 Nov 2004 17:50:46 -0000 1.21 *************** *** 31,34 **** --- 31,35 ---- $self->lwp( $lwp_request ); + # TODO: check to see that this has the query args on it $self->assign_request_url( $lwp_request->uri ); Index: Standalone.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request/Standalone.pm,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Standalone.pm 22 Sep 2004 03:09:34 -0000 1.12 --- Standalone.pm 28 Nov 2004 17:50:46 -0000 1.13 *************** *** 28,33 **** $self->_check_properties( $props ); ! $log->is_debug && ! $log->debug( "Full OI URL [$props->{url}]" ); $self->assign_request_url( $props->{url} ); --- 28,32 ---- $self->_check_properties( $props ); ! $log->is_debug && $log->debug( "Full URL from property: $props->{url}" ); $self->assign_request_url( $props->{url} ); |
|
From: Chris W. <la...@us...> - 2004-11-28 19:31:48
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16462/lib/OpenInteract2 Modified Files: Request.pm Log Message: update OI2::Request implementations to pass the full URL -- with GET query arguments -- to assign_request_url() Index: Request.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request.pm,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Request.pm 28 Nov 2004 07:22:45 -0000 1.47 --- Request.pm 28 Nov 2004 17:50:46 -0000 1.48 *************** *** 660,667 **** This method is normally only called by the implementing subclass. The ! subclass should pass the full, absolute URL path (no protocol, host or ! port) so the C<url_absolute> and C<url_relative> properties are ! properly set. This also sets the action name and task for use by the ! controller. If you want to do any behind-the-scenes redirection before the --- 660,668 ---- This method is normally only called by the implementing subclass. The ! subclass should pass the full, absolute URL path -- no protocol, host ! or port, but query arguments should be included. With this the ! C<url_absolute> and C<url_relative> properties are properly set. The ! method also sets the action name and task for use by the controller, ! delegating the actual work to L<OpenInteract2::URL>. If you want to do any behind-the-scenes redirection before the *************** *** 669,673 **** instantiated, you can pass a path to this and the correct action will be processed. For instance, you can configure your site to force users ! to login, so no matter what URL is requested by a user who is not logged in they will always get your login page. This is done in the L<OpenInteract2::Auth|OpenInteract2::Auth> class -- if the user is not --- 670,674 ---- instantiated, you can pass a path to this and the correct action will be processed. For instance, you can configure your site to force users ! to login so no matter what URL is requested by a user who is not logged in they will always get your login page. This is done in the L<OpenInteract2::Auth|OpenInteract2::Auth> class -- if the user is not *************** *** 883,886 **** --- 884,892 ---- =head2 Parent initialization + The following methods are available for subclasses -- the idea is they + get the relevant data in a platform-dependent manner (parsing a + header, reading an envionment variable, whatever) and pass it to this + class to parse the data and place them in the right structure. + B<_parse_cookies()> *************** *** 901,909 **** create the session, which is stored in the C<session> property. - B<_find_language()> - - ... - - =head1 SEE ALSO --- 907,910 ---- *************** *** 912,915 **** --- 913,918 ---- L<OpenInteract2::Request::Apache|OpenInteract2::Request::Apache> + L<OpenInteract2::Request::Apache2|OpenInteract2::Request::Apache2> + L<OpenInteract2::Request::CGI|OpenInteract2::Request::CGI> |
|
From: Salve J. N. <sj...@us...> - 2004-11-28 15:04:26
|
Update of /cvsroot/openinteract/OpenInteract2/doc/Manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14927/doc/Manual Modified Files: Conversion.pod Log Message: Inline examples/conversion_conf_script_execute (which has been deleted) Index: Conversion.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/doc/Manual/Conversion.pod,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Conversion.pod 28 Feb 2004 16:40:25 -0000 1.11 --- Conversion.pod 28 Nov 2004 15:04:13 -0000 1.12 *************** *** 172,176 **** C<OpenInteract2::Conversion>. They work on STDIN and STDOUT: ! [% INCLUDE examples/conversion_conf_script_execute | indent 2 %] In addition to doing the fairly simple conversion from the Perl data --- 172,178 ---- C<OpenInteract2::Conversion>. They work on STDIN and STDOUT: ! $ cd /path/to/OpenInteract-2.00-source/script ! $ perl translate_action_to_ini.pl < ~/pkg/mypkg/conf/action.perl > action.ini ! $ perl translate_spops_to_ini.pl < ~/pkg/mypkg/conf/spops.perl > spops.ini In addition to doing the fairly simple conversion from the Perl data |
|
From: Chris W. <la...@us...> - 2004-11-28 08:28:10
|
Update of /cvsroot/openinteract/OpenInteract2/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12116/t Modified Files: utils.pl Log Message: update base_template package: don't send '_anonymous_' templates to used box Index: utils.pl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/t/utils.pl,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** utils.pl 28 Nov 2004 06:02:53 -0000 1.77 --- utils.pl 28 Nov 2004 06:40:18 -0000 1.78 *************** *** 50,54 **** base_page => '2.28', base_security => '2.17', ! base_template => '3.13', base_theme => '2.09', base_user => '2.33', --- 50,54 ---- base_page => '2.28', base_security => '2.17', ! base_template => '3.14', base_theme => '2.09', base_user => '2.33', |
|
From: Chris W. <la...@us...> - 2004-11-28 08:15:30
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/comments/template In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5466/template Modified Files: comment_list.tmpl Log Message: ensure we actually have the object info for the description Index: comment_list.tmpl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/comments/template/comment_list.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** comment_list.tmpl 16 Feb 2004 16:19:49 -0000 1.2 --- comment_list.tmpl 28 Nov 2004 05:58:25 -0000 1.3 *************** *** 2,10 **** PROCESS status_message %] ! [% IF standalone and summary -%] <p class="commentObject"> ! [%- object_desc = PROCESS comments::comment_object( url = obj_info.url, ! title = obj_info.title ); ! MSG( 'comments.info.object', object_desc ) -%] </p> [% END -%] --- 2,11 ---- PROCESS status_message %] ! [% IF standalone and summary; ! DEFAULT obj_info = OI.object_description( object ) -%] <p class="commentObject"> ! [%- object_desc = PROCESS comments::comment_object( url = obj_info.url, ! title = obj_info.title ); ! MSG( 'comments.info.object', object_desc ) -%] </p> [% END -%] *************** *** 15,17 **** [% END -%] ! [% OI.comp( 'new_comment_form', object = object ) %] \ No newline at end of file --- 16,18 ---- [% END -%] ! [% OI.action_execute( 'new_comment_form', object = object ) %] \ No newline at end of file |
|
From: Chris W. <la...@us...> - 2004-11-28 08:07:40
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/comments/template In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5377/template Modified Files: notification_email.tmpl Log Message: remove TODO and poster's email Index: notification_email.tmpl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/comments/template/notification_email.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** notification_email.tmpl 17 May 2004 14:21:53 -0000 1.3 --- notification_email.tmpl 28 Nov 2004 05:57:54 -0000 1.4 *************** *** 3,12 **** [% summary.object_title %] - TODO: Ensure that this URL has the deployment information in it. - http://[% server_name %][% summary.object_url %] [% MSG( 'comments.info.name' ) %]: [% comment.poster_name %] - [% MSG( 'comments.info.email' ) %]: [% comment.poster_email %] [% MSG( 'comments.info.url' ) %]: [% comment.poster_url %] [% MSG( 'comments.info.comments' ) %] --- 3,9 ---- |
|
From: Chris W. <la...@us...> - 2004-11-28 07:51:40
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_template In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12116/pkg/base_template Modified Files: Changes package.conf Log Message: update base_template package: don't send '_anonymous_' templates to used box Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_template/Changes,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Changes 27 Nov 2004 19:00:28 -0000 1.14 --- Changes 28 Nov 2004 06:40:19 -0000 1.15 *************** *** 1,4 **** --- 1,8 ---- Revision history for OpenInteract package base_template. + 3.14 Sun Nov 28 01:38:51 EST 2004 + + Don't send templates named '_anonymous_' to box. + 3.13 Wed Nov 24 10:01:32 EST 2004 Index: package.conf =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_template/package.conf,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** package.conf 27 Nov 2004 19:00:28 -0000 1.15 --- package.conf 28 Nov 2004 06:40:19 -0000 1.16 *************** *** 1,4 **** name base_template ! version 3.13 author Chris Winters (ch...@cw...) url http://www.openinteract.org/ --- 1,4 ---- name base_template ! version 3.14 author Chris Winters (ch...@cw...) url http://www.openinteract.org/ |
|
From: Chris W. <la...@us...> - 2004-11-28 07:32:16
|
Update of /cvsroot/openinteract/OpenInteract2/extra_packages/classified/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21743/conf Modified Files: action.ini Log Message: OIN-101: get it passing package check at least; most of conversion to OI2 common actions done, but _edit_customize() needs to be separated into add + update Index: action.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/classified/conf/action.ini,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** action.ini 28 Mar 2003 00:54:17 -0000 1.1 --- action.ini 28 Nov 2004 07:31:43 -0000 1.2 *************** *** 5,8 **** --- 5,33 ---- default_expire = 90 + c_object_type = classified + c_search_form_template = classified::classified_search_form + @,c_search_fields = title, organization, location, description + c_search_results_template = classified::classified_search_results + c_display_template = classified::classified_detail + c_display_fail_task = search_form + c_display_form_template = classified::classified_form + c_display_form_fail_task = search_form + c_display_add_template = classified::classified_form + @,c_update_fields = title, organization, description, location + @,c_update_fields = required_skills, recommended_skills, application_info + @,c_update_fields = contact, phone, fax, email, url + c_update_fields_date = deadline + c_update_task = display + c_update_fail_task = display_form + @,c_add_fields = title, organization, description, location + @,c_add_fields = required_skills, recommended_skills, application_info + @,c_add_fields = contact, phone, fax, email, url + c_add_fields_date = deadline + c_add_task = display + c_add_fail_task = display_form + c_remove_task = search_form + c_remove_fail_task = search_form + + [classified security] DEFAULT = NONE |
|
From: Chris W. <la...@us...> - 2004-11-28 07:32:11
|
Update of /cvsroot/openinteract/OpenInteract2/extra_packages/classified/OpenInteract2/Action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21743/OpenInteract2/Action Modified Files: Classified.pm Log Message: OIN-101: get it passing package check at least; most of conversion to OI2 common actions done, but _edit_customize() needs to be separated into add + update Index: Classified.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/classified/OpenInteract2/Action/Classified.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Classified.pm 28 Mar 2003 00:54:17 -0000 1.1 --- Classified.pm 28 Nov 2004 07:31:43 -0000 1.2 *************** *** 4,50 **** use strict; ! use base qw( OpenInteract2::Action ); ! use OpenInteract2::Constants qw( :log ); ! use OpenInteract2::Context qw( CTX DEBUG LOG ); ! use Time::Piece; ! use Time::Seconds; $OpenInteract2::Action::Classified::VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/); $OpenInteract2::Action::Classified::author = 'ch...@cw...'; - sub MY_PACKAGE { return 'classified' } - sub MY_HANDLER_PATH { return '/Classified' } - sub MY_OBJECT_TYPE { return 'classified' } - sub MY_OBJECT_CLASS { return CTX->lookup_object( 'classified' ) } - sub MY_SEARCH_FIELDS { return qw( title organization location description ) } - sub MY_SEARCH_FORM_TEMPLATE { return 'classified::classified_search_form' } - sub MY_SEARCH_RESULTS_TEMPLATE { return 'classified::classified_search_results' } - #sub MY_OBJECT_CREATE_SECURITY { return SEC_LEVEL_READ } - - sub MY_OBJECT_FORM_TEMPLATE { - my ( $class, $params ) = @_; - return ( $params->{do_edit} ) ? 'classified_form' : 'classified_detail'; - } - - sub MY_EDIT_RETURN_URL { - return '/Classified/search_form/'; - } - - sub MY_EDIT_FIELDS { - return qw( title organization description location - required_skills recommended_skills - application_info contact phone fax email url ); - } - - sub MY_EDIT_FIELDS_DATE { return qw( deadline ) } - sub MY_ALLOW_SEARCH_FORM { return 1 } - sub MY_ALLOW_SEARCH { return 1 } - sub MY_ALLOW_CREATE { return 1 } - sub MY_ALLOW_SHOW { return 1 } - sub MY_ALLOW_EDIT { return 1 } - sub MY_ALLOW_REMOVE { return 1 } - sub MY_ALLOW_WIZARD { return undef } - - # Read in the 'keyword' search field and set both title and # description; also read in the 'posted_after' date and find dates --- 4,19 ---- use strict; ! use base qw( ! OpenInteract2::Action::CommonSearch ! OpenInteract2::Action::CommonAdd ! OpenInteract2::Action::CommonUpdate ! OpenInteract2::Action::CommonDisplay ! OpenInteract2::Action::CommonRemove ! ); ! use OpenInteract2::Context qw( CTX ); $OpenInteract2::Action::Classified::VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/); $OpenInteract2::Action::Classified::author = 'ch...@cw...'; # Read in the 'keyword' search field and set both title and # description; also read in the 'posted_after' date and find dates *************** *** 53,58 **** sub _search_build_where_customize { my ( $self, $tables, $where, $value ) = @_; ! my $request = $self->request; ! my $keyword = $self->param( 'keyword' ); if ( $keyword ) { push @{ $where }, --- 22,27 ---- sub _search_build_where_customize { my ( $self, $tables, $where, $value ) = @_; ! my $request = CTX->request; ! my $keyword = $self->param( 'keyword' ) || $request->param( 'keyword' ); if ( $keyword ) { push @{ $where }, *************** *** 61,65 **** } ! my $post_after = $self->_read_field_date_object( 'posted_after' ); if ( $post_after ) { push @{ $where }, 'posted_on >= ?'; --- 30,35 ---- } ! ! my $post_after = $request->param_date( 'posted_after' ); if ( $post_after ) { push @{ $where }, 'posted_on >= ?'; *************** *** 81,85 **** my ( $self, $classified, $old_data ) = @_; my $request = $self->request; ! my $now = $classified->now; # Set the 'posted_by' and 'posted_on' if a new item --- 51,55 ---- my ( $self, $classified, $old_data ) = @_; my $request = $self->request; ! my $now = CTX->create_date(); # Set the 'posted_by' and 'posted_on' if a new item *************** *** 93,135 **** return unless ( $request->auth_is_admin ); ! $classified->{active} = $request->param( 'active' ); ! $classified->{active_on} ||= $now; unless ( $classified->{expires_on} ) { ! my $expire_date = Time::Piece->new() + ! ( ONE_DAY * $self->param( 'default_expire' ) ); $classified->{expires_on} = $expire_date->strftime( '%Y-%m-%d' );; } } - - sub notify { - my ( $self ) = @_; - my $request = $self->request; - my @classified_id = $request->param( 'classified_id' ); - my $email = $request->param( 'email' ); - unless ( $email and scalar @classified_id ) { - return '<h2 align="center">Error</h2>' . - '<p>Error: Cannot notify anyone about an object when no ' . - 'ID/email is given.</p>'; - } - my $classified_class = CTX->lookup_object( 'classified' ); - my @classified_list = (); - foreach my $notify_id ( @classified_id ) { - my $classified = $classified_class->fetch( $notify_id ); - push @classified_list, $classified if ( $classified ); - } - my $rv = $classified_class->notify( - { email => $email, - subject => 'Classified notification', - object => \@classified_list, - type => 'classified' }); - if ( $rv ) { - return '<h2 align="center">Success!</h2>' . - '<p>Notification sent properly!</p>'; - } - return '<h2 align="center">Error</h2>' . - '<p>Error sending email. Please check error logs!</p>'; - } - - 1; --- 63,77 ---- return unless ( $request->auth_is_admin ); ! $classified->{active} = $request->param( 'active' ); ! $classified->{active_on} ||= $now; unless ( $classified->{expires_on} ) { ! my $expire_time = time + 60 * 60 * 24 * $self->param( 'default_expire' ); ! my $expire_date = DateTime->from_epoch( ! epoch => $expire_time, ! time_zone => CTX->timezone_object, ! ); $classified->{expires_on} = $expire_date->strftime( '%Y-%m-%d' );; } } 1; |
|
From: Chris W. <la...@us...> - 2004-11-28 07:31:54
|
Update of /cvsroot/openinteract/OpenInteract2/extra_packages/classified In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21743 Modified Files: package.conf MANIFEST.SKIP MANIFEST Changes Log Message: OIN-101: get it passing package check at least; most of conversion to OI2 common actions done, but _edit_customize() needs to be separated into add + update Index: package.conf =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/classified/package.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** package.conf 28 Mar 2003 00:54:17 -0000 1.1 --- package.conf 28 Nov 2004 07:31:43 -0000 1.2 *************** *** 1,4 **** name classified ! version 2.00 author Chris Winters <ch...@cw...> author Marcus Baker <mb...@in...> --- 1,4 ---- name classified ! version 2.01 author Chris Winters <ch...@cw...> author Marcus Baker <mb...@in...> Index: MANIFEST.SKIP =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/classified/MANIFEST.SKIP,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MANIFEST.SKIP 28 Mar 2003 00:54:17 -0000 1.1 --- MANIFEST.SKIP 28 Nov 2004 07:31:43 -0000 1.2 *************** *** 4,7 **** --- 4,8 ---- \.bak$ \.backup$ + \.log$ ^MANIFEST\. ^tmp Index: MANIFEST =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/classified/MANIFEST,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MANIFEST 28 Mar 2003 00:54:17 -0000 1.1 --- MANIFEST 28 Nov 2004 07:31:43 -0000 1.2 *************** *** 4,8 **** package.conf conf/action.ini ! conf/spops.perl data/install_security.dat doc/classified.pod --- 4,8 ---- package.conf conf/action.ini ! conf/spops_classified.ini data/install_security.dat doc/classified.pod Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/classified/Changes,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Changes 28 Mar 2003 00:54:17 -0000 1.1 --- Changes 28 Nov 2004 07:31:43 -0000 1.2 *************** *** 1,4 **** --- 1,8 ---- Revision history for OpenInteract package classified. + 2.01 Sun Nov 28 02:30:26 EST 2004 + + OIN-101: Add to initial OI2 conversion. + 2.00 Thu Mar 27 17:30:56 EST 2003 |
|
From: Chris W. <la...@us...> - 2004-11-28 07:25:35
|
Update of /cvsroot/openinteract/OpenInteract2/sample/website/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21739/sample/website/conf Modified Files: server.ini Log Message: move the 'dir.cache_tt' to 'content_generator.TT.compile_dir'; fix confusing labels in TT 'cache_' params Index: server.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/website/conf/server.ini,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** server.ini 26 Sep 2004 19:26:19 -0000 1.47 --- server.ini 28 Nov 2004 04:28:59 -0000 1.48 *************** *** 440,444 **** error = $WEBSITE/error log = $WEBSITE/logs - cache_tt = $WEBSITE/cache/tt config = $WEBSITE/conf data = $WEBSITE/data --- 440,443 ---- *************** *** 480,485 **** # for files with a given name and no extension # ! # cache_*: How many templates the Template Toolkit should cache in ! # memory (size); expiration time of Template in cache (expire) # # compile_cleanup: If true, will remove all compiled files on server --- 479,485 ---- # for files with a given name and no extension # ! # cache_size: How many templates TT should cache in memory ! # ! # cache_size: How long TT should keep cached templates in memory (seconds) # # compile_cleanup: If true, will remove all compiled files on server *************** *** 487,490 **** --- 487,493 ---- # costs aren't so heavy) # + # compile_dir: Directory where compiled files are stored; this is + # resolved at runtime under the website directory. + # # compile_ext: Extension for compiled TT files. Most people won't (or # shouldn't) care about this. *************** *** 508,511 **** --- 511,515 ---- cache_expire = 900 compile_cleanup = 1 + compile_dir = cache/tt compile_ext = .ttc custom_init_class = |
|
From: Chris W. <la...@us...> - 2004-11-28 07:23:14
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20055/lib/OpenInteract2 Modified Files: Request.pm Log Message: small: use CTX datetime creator (with timezone) Index: Request.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request.pm,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Request.pm 26 Sep 2004 19:26:18 -0000 1.46 --- Request.pm 28 Nov 2004 07:22:45 -0000 1.47 *************** *** 67,71 **** $self->_create_session; ! $self->now( DateTime->now() ); CTX->request( $self ); --- 67,71 ---- $self->_create_session; ! $self->now( CTX->create_date() ); CTX->request( $self ); |
|
From: Chris W. <la...@us...> - 2004-11-28 07:05:02
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/comments/OpenInteract2/Action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5931/OpenInteract2/Action Modified Files: Comments.pm Log Message: move all error/status messages to resource file; fix notification email template name; actually add the cookie to the header so we can remember email/name/url info; use CTX DateTime creation so we get the benefit of the configured timezone; cosmetic code cleanup; Index: Comments.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/comments/OpenInteract2/Action/Comments.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Comments.pm 16 Jun 2004 01:03:44 -0000 1.6 --- Comments.pm 28 Nov 2004 06:00:56 -0000 1.7 *************** *** 5,9 **** use strict; use base qw( OpenInteract2::Action ); - use DateTime; use HTML::Entities; use Log::Log4perl qw( get_logger ); --- 5,8 ---- *************** *** 30,34 **** $log->warn( "Cannot display summary: no object or ", "object class + ID given" ); ! return "No object or class/ID given for which to fetch a summary."; } --- 29,33 ---- $log->warn( "Cannot display summary: no object or ", "object class + ID given" ); ! return $self->_msg( 'comments.error.summary_data_missing' ); } *************** *** 43,49 **** $log->debug( "Fetching summary for '$obj_class: $obj_id'" ); my $summaries = eval { ! OpenInteract2::CommentSummary->fetch_group( ! { where => 'class = ? AND object_id = ?', ! value => [ $obj_class, scalar $obj_id ] }) }; if ( $@ ) { --- 42,49 ---- $log->debug( "Fetching summary for '$obj_class: $obj_id'" ); my $summaries = eval { ! OpenInteract2::CommentSummary->fetch_group({ ! where => 'class = ? AND object_id = ?', ! value => [ $obj_class, scalar $obj_id ], ! }) }; if ( $@ ) { *************** *** 59,66 **** $log->is_info && $log->info( "No summary available, creating transient one" ); ! $summary = OpenInteract2::CommentSummary->new( ! { num_comments => 0, ! class => $obj_class, ! obj_id => $obj_id }); $object = eval { $obj_class->fetch( $obj_id ) }; if ( $@ ) { --- 59,67 ---- $log->is_info && $log->info( "No summary available, creating transient one" ); ! $summary = OpenInteract2::CommentSummary->new({ ! num_comments => 0, ! class => $obj_class, ! obj_id => $obj_id ! }); $object = eval { $obj_class->fetch( $obj_id ) }; if ( $@ ) { *************** *** 101,117 **** # ...but we pass 1-based figures to the template (how humane) ! my %params = ( lower_bound => $lower_bound + 1, ! upper_bound => $upper_bound + 1, ! page_num => $page_num, ! page_size => $page_size, ! num_comments => $request->param( 'num_comments' ) ); my $comments = eval { ! OpenInteract2::Comment->fetch_group( ! { limit => "$lower_bound,$upper_bound", ! order => 'posted_on DESC', ! column_group => 'summary' }) }; if ( $@ ) { ! $self->param_add( error_msg => "Failed to fetch comments: $@" ); $log->error( "Cannot fetch comments: $@" ); } --- 102,122 ---- # ...but we pass 1-based figures to the template (how humane) ! my %params = ( ! lower_bound => $lower_bound + 1, ! upper_bound => $upper_bound + 1, ! page_num => $page_num, ! page_size => $page_size, ! num_comments => $request->param( 'num_comments' ), ! ); my $comments = eval { ! OpenInteract2::Comment->fetch_group({ ! limit => "$lower_bound,$upper_bound", ! order => 'posted_on DESC', ! column_group => 'summary', ! }) }; if ( $@ ) { ! $self->param_add( ! error_msg => $self->_msg( 'comments.error.cannot_fetch_listing', "$@" ) ); $log->error( "Cannot fetch comments: $@" ); } *************** *** 161,186 **** unless ( $obj_class and $obj_id ) { $log->error( 'Class/object_id not given to find object' ); ! return "Insufficient data supplied to fetch comments by object."; } $object = eval { $obj_class->fetch( $obj_id ) }; if ( $@ ) { $log->error( "Failed to fetch '$obj_class: $obj_id': $@" ); ! return "Failed to fetch object with supplied information. " . ! "Error logged."; } } ! my %params = ( object => $object, ! summary => $self->param( 'summary' ), ! standalone => $self->param( 'standalone' ) ); my $comments = eval { ! OpenInteract2::Comment->fetch_group( ! { where => 'class = ? and object_id = ?', ! value => [ ref $object, scalar( $object->id ) ], ! order => 'posted_on ASC' }) }; if ( $@ ) { $log->error( "Error fetching comments: $@" ); $self->param_add( ! error_msg => "Failed to fetch comments for listing: $@" ); } else { --- 166,194 ---- unless ( $obj_class and $obj_id ) { $log->error( 'Class/object_id not given to find object' ); ! return $self->_msg( 'comments.error.list_for_object_data_missing' ); } + $object = eval { $obj_class->fetch( $obj_id ) }; if ( $@ ) { $log->error( "Failed to fetch '$obj_class: $obj_id': $@" ); ! return $self->_msg( 'comments.error.cannot_fetch_object_for_listing' ); } } ! my %params = ( ! object => $object, ! summary => $self->param( 'summary' ), ! standalone => $self->param( 'standalone' ), ! ); my $comments = eval { ! OpenInteract2::Comment->fetch_group({ ! where => 'class = ? and object_id = ?', ! value => [ ref $object, scalar( $object->id ) ], ! order => 'posted_on ASC' ! }) }; if ( $@ ) { $log->error( "Error fetching comments: $@" ); $self->param_add( ! error_msg => $self->_msg( 'comments.error.cannot_fetch_by_object', "$@" ) ); } else { *************** *** 209,213 **** $log->error( "Error retrieving comment '$comment_id': $@" ); $self->param_add( ! error_msg => "Error fetching comment: $@" ); } if ( $comment ) { --- 217,221 ---- $log->error( "Error retrieving comment '$comment_id': $@" ); $self->param_add( ! error_msg => $self->_msg( 'comments.error.cannot_fetch', "$@" ) ); } if ( $comment ) { *************** *** 217,226 **** $log->error( "No comment found for given ID '$comment_id'" ); $self->param_add( ! error_msg => "No comment found for specified ID." ); } } else { $self->param_add( ! error_msg => "Cannot display comment without a comment ID." ); } --- 225,234 ---- $log->error( "No comment found for given ID '$comment_id'" ); $self->param_add( ! error_msg => $self->_msg( 'comments.error.not_found' ) ); } } else { $self->param_add( ! error_msg => $self->_msg( 'comments.error.no_id' ) ); } *************** *** 275,287 **** $object = eval { $obj_class->fetch( $comment->{object_id} ) }; if ( $@ ) { ! my $msg = "Cannot fetch object to which comment is attached: $@"; ! $self->param_add( error_msg => $msg ); $object = undef; } } else { ! my $msg = 'Cannot fetch object to which comment is attached: ' . ! 'no class specified in comment'; ! $self->param_add( error_msg => $msg ); } return $object; --- 283,294 ---- $object = eval { $obj_class->fetch( $comment->{object_id} ) }; if ( $@ ) { ! $self->param_add( ! error_msg => $self->_msg( 'comments.error.cannot_fetch_object', "$@" ) ); $object = undef; } } else { ! $self->param_add( ! error_msg => $self->_msg( 'comments.error.no_class_for_object' ) ); } return $object; *************** *** 338,344 **** } ! # Stick in right now... ! $comment->{posted_on} = DateTime->now(); # Ensure URLs at least start with HTTP... --- 345,351 ---- } ! # Stick in right now (with timezone)... ! $comment->{posted_on} = CTX->create_date(); # Ensure URLs at least start with HTTP... *************** *** 355,359 **** # Escape any remaining HTMLisms ! my $pre_escaped = $comment->{content}; $comment->{content} = HTML::Entities::encode( $comment->{content} ); --- 362,369 ---- # Escape any remaining HTMLisms ! # ...but store the unescaped version for the re-editing (if this ! # is a preview) ! ! $self->param( pre_escaped => $comment->{content} ); $comment->{content} = HTML::Entities::encode( $comment->{content} ); *************** *** 385,395 **** } - $self->param( pre_escaped => $pre_escaped ); $self->param( comment => $comment ); $self->param( form_settings => \%form_settings ); if ( scalar @required_missing ) { ! my $msg = q{Data are required for the following fields: } . ! join( ', ', @required_missing ); $self->param_add( error_msg => $msg ); return $self->_show_editable; --- 395,403 ---- } $self->param( comment => $comment ); $self->param( form_settings => \%form_settings ); if ( scalar @required_missing ) { ! my $msg = $self->_msg( 'comments.error.data_missing', join( ', ', @required_missing ) ); $self->param_add( error_msg => $msg ); return $self->_show_editable; *************** *** 417,423 **** $self->param( 'default_cookie_name' ) || 'comment_info'; ! OpenInteract2::Cookie->create({ name => $cookie_name, ! value => $cookie_info, ! expires => '+6M' }); $log->is_info && $log->info( "Created 'remember' cookie with '$cookie_info'" ); --- 425,434 ---- $self->param( 'default_cookie_name' ) || 'comment_info'; ! OpenInteract2::Cookie->create({ ! name => $cookie_name, ! value => $cookie_info, ! expires => '+6M', ! HEADER => 'yes', ! }); $log->is_info && $log->info( "Created 'remember' cookie with '$cookie_info'" ); *************** *** 427,434 **** if ( $@ ) { $log->error( "Failed to add comment: $@" ); ! $self->param_add( error_msg => "Error adding comment: $@" ); } else { ! $self->param_add( status_msg => "Comment successfully added." ); # These are used for the listing page we go to next... --- 438,447 ---- if ( $@ ) { $log->error( "Failed to add comment: $@" ); ! $self->param_add( ! error_msg => $self->_msg( 'comments.error.cannot_add', "$@" ) ); } else { ! $self->param_add( ! status_msg => $self->_msg( 'comments.status.add_ok' ) ); # These are used for the listing page we go to next... *************** *** 488,495 **** eval { OpenInteract2::CommentNotify->new({ ! class => $comment->{class}, ! object_id => $comment->{object_id}, ! name => $name, ! email => lc $email })->save() }; if ( $@ ) { --- 501,509 ---- eval { OpenInteract2::CommentNotify->new({ ! class => $comment->{class}, ! object_id => $comment->{object_id}, ! name => $name, ! email => lc $email ! })->save() }; if ( $@ ) { *************** *** 539,545 **** $log->info( "Posted wants to be notified but provided a bad ", "email address: '$comment->{poster_email}'" ); ! return join( '', 'Could not add notification since the email ' . ! "address you gave ($comment->{poster_email}) ", ! "seems to be invalid. Sorry." ); } --- 553,558 ---- $log->info( "Posted wants to be notified but provided a bad ", "email address: '$comment->{poster_email}'" ); ! return $self->_msg( 'comments.error.cannot_add_notify_bad_email', ! $comment->{poster_email} ); } *************** *** 549,561 **** my $notes = eval { OpenInteract2::CommentNotify->fetch_group({ ! where => 'class = ? AND object_id = ?', ! value => [ $comment->{class}, ! $comment->{object_id} ] }) }; if ( $@ ) { $log->error( "Error fetching notifications for: ", "'$comment->{class}: $comment->{object_id}': $@" ); ! return 'Failed to fetch existing notifications for dupe check, ' . ! 'so I could not add yours.'; } --- 562,573 ---- my $notes = eval { OpenInteract2::CommentNotify->fetch_group({ ! where => 'class = ? AND object_id = ?', ! value => [ $comment->{class}, $comment->{object_id} ], ! }) }; if ( $@ ) { $log->error( "Error fetching notifications for: ", "'$comment->{class}: $comment->{object_id}': $@" ); ! return $self->_msg( 'comments.error.cannot_add_notify_error_dupe_check' ); } *************** *** 564,583 **** $log->is_info && $log->info( "No notification added: already exists in thread" ); ! return 'Did not add a notification to this thread since one ' . ! 'already exists for the given email address.'; } eval { OpenInteract2::CommentNotify->new({ ! class => $comment->{class}, ! object_id => $comment->{object_id}, ! name => $comment->{poster_name}, ! email => lc $comment->{poster_email} })->save() }; if ( $@ ) { $log->error( "Failed to save notification: $@" ); ! return 'Your notification entry addition failed, sorry.'; } ! return 'Your notification entry added successfully.'; } --- 576,595 ---- $log->is_info && $log->info( "No notification added: already exists in thread" ); ! return $self->_msg( 'comments.error.cannot_add_notify_is_dupe' ); } eval { OpenInteract2::CommentNotify->new({ ! class => $comment->{class}, ! object_id => $comment->{object_id}, ! name => $comment->{poster_name}, ! email => lc $comment->{poster_email} ! })->save() }; if ( $@ ) { $log->error( "Failed to save notification: $@" ); ! return $self->_msg( 'comments.error.cannot_add_notify_persist', "$@" ); } ! return $self->_msg( 'comments.status.add_notify_ok' ); } *************** *** 587,594 **** my $notes = eval { ! OpenInteract2::CommentNotify->fetch_group( ! { where => 'class = ? AND object_id = ?', ! value => [ $comment->{class}, ! $comment->{object_id} ] }) }; if ( $@ ) { --- 599,606 ---- my $notes = eval { ! OpenInteract2::CommentNotify->fetch_group({ ! where => 'class = ? AND object_id = ?', ! value => [ $comment->{class}, $comment->{object_id} ], ! }) }; if ( $@ ) { *************** *** 609,613 **** server_name => $server_name ); my $message = $self->generate_content( ! \%params, { name => 'comment::notification_email' } ); my $subject = $self->_create_email_subject; my $success = 0; --- 621,625 ---- server_name => $server_name ); my $message = $self->generate_content( ! \%params, { name => 'comments::notification_email' }); my $subject = $self->_create_email_subject; my $success = 0; *************** *** 621,629 **** : $note->{email}; eval { ! OpenInteract2::Util->send_email( ! { to => $to, ! from => $from_address, ! subject => $subject, ! message => $message }) }; if ( $@ ) { --- 633,642 ---- : $note->{email}; eval { ! OpenInteract2::Util->send_email({ ! to => $to, ! from => $from_address, ! subject => $subject, ! message => $message ! }) }; if ( $@ ) { *************** *** 679,696 **** $params{notes} = eval { ! OpenInteract2::CommentNotify->fetch_group( ! { where => 'class = ? AND object_id = ?', ! value => [ $obj_class, $obj_id ] }) }; if ( $@ ) { $log->error( "Error fetching notifications for ", "[$obj_class: $obj_id]: $@" ); ! $self->param_add( error_msg => "Failed to fetch notifications: $@" ); } else { my $summaries = eval { ! OpenInteract2::CommentSummary->fetch_group( ! { where => 'class = ? AND object_id = ?', ! value => [ $obj_class, $obj_id ] }) }; $params{summary} = $summaries->[0]; --- 692,712 ---- $params{notes} = eval { ! OpenInteract2::CommentNotify->fetch_group({ ! where => 'class = ? AND object_id = ?', ! value => [ $obj_class, $obj_id ] ! }) }; if ( $@ ) { $log->error( "Error fetching notifications for ", "[$obj_class: $obj_id]: $@" ); ! $self->param_add( ! error_msg => $self->_msg( 'comments.error.cannot_fetch_notify', "$@" ) ); } else { my $summaries = eval { ! OpenInteract2::CommentSummary->fetch_group({ ! where => 'class = ? AND object_id = ?', ! value => [ $obj_class, $obj_id ] ! }) }; $params{summary} = $summaries->[0]; *************** *** 707,716 **** my %params = (); my $comments = eval { ! OpenInteract2::Comment->fetch_group({ limit => $recent_num, ! order => 'posted_on DESC', ! column_group => 'summary' }) }; if ( $@ ) { ! $self->param_add( error_msg => "Failed to get recent comments: $@" ); } else { --- 723,735 ---- my %params = (); my $comments = eval { ! OpenInteract2::Comment->fetch_group({ ! limit => $recent_num, ! order => 'posted_on DESC', ! column_group => 'summary', ! }) }; if ( $@ ) { ! $self->param_add( ! error_msg => $self->_msg( 'comments.error.cannot_fetch_recent', "$@" ) ); } else { |
|
From: Chris W. <la...@us...> - 2004-11-28 07:03:31
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/comments/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7016 Modified Files: comments.pod Log Message: small updates Index: comments.pod =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/comments/doc/comments.pod,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** comments.pod 30 Sep 2003 19:46:29 -0000 1.1 --- comments.pod 28 Nov 2004 06:07:46 -0000 1.2 *************** *** 5,9 **** =head1 SYNOPSIS ! # Tell an SPOPS class you want to enable comments for it (optional): [news] --- 5,10 ---- =head1 SYNOPSIS ! # Tell an SPOPS class you want to enable comments for it (optional -- ! # you can still add comments to an object if you don't do this): [news] *************** *** 28,31 **** --- 29,38 ---- [% OI.action_execute( 'show_comment_by_object', object => news ) %] + + # Show most recently added comments, default number + [% OI.action_execute( 'comment_recent' ) %] + + # Show 10 most recently added comments + [% OI.action_execute( 'comment_recent', comment_count = 10 ) %] =head1 DEPENDENCY NOTE *************** *** 111,115 **** B<comment_recent> ! Box that lists the last n comments posted in descending date order. The number is controlled by the parameter 'comment_count' action parameter (a default is specified in the configuration). --- 118,122 ---- B<comment_recent> ! Component that lists the last n comments posted in descending date order. The number is controlled by the parameter 'comment_count' action parameter (a default is specified in the configuration). *************** *** 164,168 **** =head1 SEE ALSO ! Movable Type: http://www.movabletype.org/ =head1 AUTHORS --- 171,175 ---- =head1 SEE ALSO ! Movable Type: L<http://www.movabletype.org/> =head1 AUTHORS |
|
From: Chris W. <la...@us...> - 2004-11-28 06:57:27
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/comments/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5320/conf Modified Files: action.ini Log Message: don't reference recent comment action by URL Index: action.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/comments/conf/action.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** action.ini 22 May 2004 01:43:59 -0000 1.3 --- action.ini 28 Nov 2004 05:57:31 -0000 1.4 *************** *** 35,38 **** --- 35,39 ---- class = OpenInteract2::Action::Comments task = comment_recent + url_none = yes is_secure = no default_comment_count = 5 \ No newline at end of file |
|
From: Chris W. <la...@us...> - 2004-11-28 06:54:50
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17401 Modified Files: Observer.pm Log Message: update docs with examples and more explanation of what an observer is Index: Observer.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Observer.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Observer.pm 27 Sep 2004 12:53:27 -0000 1.1 --- Observer.pm 28 Nov 2004 04:07:52 -0000 1.2 *************** *** 213,218 **** =head1 SYNOPSIS ! # Declare a filter 'allcaps' in the server-wide file for registering ! # observers, referring to a class somewhere in @INC # # File: $WEBSITE_DIR/conf/observer.ini --- 213,218 ---- =head1 SYNOPSIS ! # Declare an observer 'allcaps' in the server-wide file for ! # registering observers, referring to a class somewhere in @INC # # File: $WEBSITE_DIR/conf/observer.ini *************** *** 221,225 **** allcaps = OpenInteract2::Filter::AllCaps ! # You can also declare it in your package's package.conf file # File: pkg/mypackage-2.00/package.conf --- 221,231 ---- allcaps = OpenInteract2::Filter::AllCaps ! # Associate the filter with an action in the same file ! ! [map] ! allcaps = news ! ! # You can also declare the observer in your package's package.conf ! # file; it's mapped the same no matter where it's declared # File: pkg/mypackage-2.00/package.conf *************** *** 229,237 **** observer allcaps OpenInteract2::Filter::AllCaps - # Associate the filter with an action in the same file - - [map] - allcaps = news - # Create the filter -- see OpenInteract2::Filter::AllCaps shipped # with the distribution: --- 235,238 ---- *************** *** 256,259 **** --- 257,331 ---- them to action objects or action classes. + Observers are registered at server startup and sit around waiting for + actions to post events. When an action posts an event the data is + passed around to all the observers watching that action. The observer + can react to the data if it wants or it can pass. + + Most observers react to one or two types of events. For instance, if + you're using the C<delicious_tags> package there's an observer that + looks like this: + + sub update { + my ( $class, $action, $type ) = @_; + return unless ( $type =~ /^post (add|update)$/ ); + # ... tag the object ... + } + + This observer only reacts to 'post add' and 'post update' + observations and ignores all others. + + =head2 Observation Types + + Actions can independently declare their own observation + types. However, there are a few built-in to OpenInteract classes: + + =over 4 + + =item * + + B<filter>: Issued after an action has generated its content but before + that content is cached and returned. + + Signature: C<$action>, C<'filter'>, C<\$content> + + =item * + + B<cache hit>: Issued after an action has successfully loaded data from + the cache but before that content is returned. + + Signature: C<$action>, C<'cache hit'>, C<\$content> + + =item * + + B<pre add>/B<post add>: Issued before/after an object is added by the + action to long-term storage. Currently used by + L<OpenInteract2::Action::CommonAdd>, but you can use it as well. + + Signature: C<$action>, C<'pre add'>, C<$object>, C<\%save_options> + + Signature: C<$action>, C<'post add'>, C<$object> + + =item * + + B<pre update>/B<post update>: Issued before/after an object is updated + by the action to long-term storage. Currently used by + L<OpenInteract2::Action::CommonUpdate>, but you can use it as well. + + Signature: C<$action>, C<'pre update'>, C<$object>, C<\%old_data>, C<\%save_options> + + Signature: C<$action>, C<'post update'>, C<$object>, C<\%old_data> + + =item * + + B<pre remove>/B<post remove>: Issued before/after an object is remove + by the action from long-term storage. Currently used by + L<OpenInteract2::Action::CommonRemove>, but you can use it as well. + + Signature: C<$action>, C<'pre remove'>, C<$object> + + Signature: C<$action>, C<'post remove'>, C<$object> + + =back + =head1 METHODS *************** *** 304,332 **** Returns: nothing ! =head2 Configuring ! You can also register a particular subroutine or object instance ! The general configuration to declare a observer is: ! [observer filtername] observation-type = value ! The observation types are 'class', 'object' and 'sub' (see L<Class::Observable|Class::Observable> for what these mean and how they are setup), so you could have: ! [observer foo_obj] object = OpenInteract2::FooFilter ! [observer foo_sub] sub = OpenInteract2::FooFilter::other_sub - - [observer action] - foo_obj = news - foo_sub = page ! Most of the time you will use the class shortcut since it is the ! easiest. =head1 SEE ALSO --- 376,453 ---- Returns: nothing ! =head1 CONFIGURATION ! Configuration is split into two parts: declaring the observer and ! mapping the observer to one or more actions for it to watch. ! Both parts are typically done in the ! C<$WEBSITE_DIR/conf/observer.ini>, although you can also do the ! observer declaration from a package. ! =head2 Configuration: Declaring the Observer ! ! Most of the time you'll register an observer name with a class. The ! following registers two observers to classes under the names 'wiki' ! and 'delicious_tag': ! ! [observer] ! wiki = OpenInteract2::Observer::Wikify ! delicious_tag = OpenInteract2::Observer::AddDeliciousTags ! ! This standard usage is actually a shortcut for: ! ! [observer wiki] ! class = OpenInteract2::Observer::Wikify ! ! [observer delicious_tag] ! class = OpenInteract2::Observer::AddDeliciousTags ! ! Or more generically: ! ! [observer observer-name] observation-type = value ! In addition to assigning class observers register a particular ! subroutine or object instance. The three observation types are ! 'class', 'object' and 'sub' (see L<Class::Observable|Class::Observable> for what these mean and how they are setup), so you could have: ! [observer myobject] object = OpenInteract2::FooFilter ! [observer myroutine] sub = OpenInteract2::FooFilter::other_sub ! Using the object is fairly rare and you should probably use the class observer for ! its simplicity. ! ! =head2 Configuration: Mapping the Observer to an Action ! ! Mapping an observer to an action is exclusively done in ! C<$WEBSITE_DIR/conf/observer.ini>. Under the 'map' section you assign ! an observer to one or more actions. Here as assign the observer 'wiki' ! to 'news' and 'page' and 'delicious_tag' to 'news': ! ! [map] ! wiki = news ! wiki = page ! delicious_tag = news ! ! Note that the mapping is ignorant of: ! ! =over 4 ! ! =item * ! ! B<Observer type>: The mapping doesn't care if 'wiki' is a class, ! object or subroutine. ! ! =item * ! ! B<Observer declaration>: The mapping also doesn't care where 'wiki' ! was declared. ! ! =back =head1 SEE ALSO |
|
From: Chris W. <la...@us...> - 2004-11-28 06:50:28
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6496/OpenInteract2 Modified Files: Cookie.pm Log Message: cosmetic Index: Cookie.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Cookie.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Cookie.pm 17 Feb 2004 04:30:13 -0000 1.10 --- Cookie.pm 28 Nov 2004 06:03:58 -0000 1.11 *************** *** 58,72 **** # Create a new cookie and add it to the response manually ! my $cookie = OpenInteract2::Cookie->create({ name => 'session_id', ! value => $session->id, ! expires => '+3M' }); $response->add_cookie( $cookie ); # Create the cookie and add it to the response automatically ! OpenInteract2::Cookie->create({ name => 'session_id', ! value => $session->id, ! expires => '+3M', ! HEADER => 'yes' }); # Expire a cookie named 'comment_memory' --- 58,76 ---- # Create a new cookie and add it to the response manually ! my $cookie = OpenInteract2::Cookie->create({ ! name => 'session_id', ! value => $session->id, ! expires => '+3M' ! }); $response->add_cookie( $cookie ); # Create the cookie and add it to the response automatically ! OpenInteract2::Cookie->create({ ! name => 'session_id', ! value => $session->id, ! expires => '+3M', ! HEADER => 'yes', ! }); # Expire a cookie named 'comment_memory' *************** *** 133,136 **** --- 137,142 ---- outbound response automatically. Otherwise you need to do so manually. + TODO: should this be the default? + =back *************** *** 142,153 **** browser to clear out any cookies under this name. - =head1 BUGS - - None known. - - =head1 TO DO - - Nothing known. - =head1 SEE ALSO --- 148,151 ---- |
4 messages has been excluded from this view by a project administrator.
