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...> - 2005-10-31 02:34:44
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_box In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24912 Modified Files: Changes package.ini Log Message: fix blank template declaration Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_box/Changes,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Changes 24 Sep 2005 14:00:52 -0000 1.24 --- Changes 31 Oct 2005 02:34:36 -0000 1.25 *************** *** 1,4 **** --- 1,9 ---- Revision history for OpenInteract package base_box. + 2.32 Mon Oct 17 20:58:08 EDT 2005 + + Small fix to OI2::Action::Box so that declaring a blank template + works properly. + 2.31 Sat Sep 24 09:59:13 EDT 2005 Index: package.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_box/package.ini,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** package.ini 24 Sep 2005 14:00:52 -0000 1.6 --- package.ini 31 Oct 2005 02:34:36 -0000 1.7 *************** *** 1,5 **** [package] name = base_box ! version = 2.31 author = Chris Winters <ch...@cw...> url = http://www.openinteract.org/ --- 1,5 ---- [package] name = base_box ! version = 2.32 author = Chris Winters <ch...@cw...> url = http://www.openinteract.org/ |
|
From: Chris W. <la...@us...> - 2005-10-31 02:34:44
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base_box/OpenInteract2/Action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24912/OpenInteract2/Action Modified Files: Box.pm Log Message: fix blank template declaration Index: Box.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_box/OpenInteract2/Action/Box.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Box.pm 30 Mar 2005 02:56:07 -0000 1.15 --- Box.pm 31 Oct 2005 02:34:36 -0000 1.16 *************** *** 187,191 **** } ! my $shell_template = $self->param( 'box_template' ) || $DEFAULT_SHELL; # user has requested to keep box naked... --- 187,192 ---- } ! my $shell_template = $action->param( 'box_template' ) ! || $DEFAULT_SHELL; # user has requested to keep box naked... *************** *** 193,198 **** push @content, $base_content; $log->is_debug && ! $log->debug( "No wrapper template used by request, ", ! "box is naked! (cover your eyes)" ); } else { --- 194,199 ---- push @content, $base_content; $log->is_debug && ! $log->debug( "Box ", $action->name, " has requested ", ! "that no wrapper template be used" ); } else { |
|
From: Chris W. <la...@us...> - 2005-10-31 02:33:18
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/system_doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24747 Modified Files: Changes package.ini Log Message: ensure that we're able to find all pod (even if it's not in a PM); also don't use command-line perldoc Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/system_doc/Changes,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Changes 23 Sep 2005 05:00:55 -0000 1.12 --- Changes 31 Oct 2005 02:33:07 -0000 1.13 *************** *** 1,4 **** --- 1,11 ---- Revision history for OpenInteract package system_doc. + 2.12 Tue Oct 18 16:15:53 EDT 2005 + + Use Pod::Perldoc to find POD to display, and don't display + anything unless a recent (~2002) version of Pod::Perldoc is + installed; also ensure that our POD viewer won't die with + certain '=over=' constructions. + 2.11 Fri Sep 23 00:09:40 EDT 2005 Index: package.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/system_doc/package.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** package.ini 23 Sep 2005 05:00:55 -0000 1.3 --- package.ini 31 Oct 2005 02:33:07 -0000 1.4 *************** *** 1,5 **** [package] name = system_doc ! version = 2.11 author = Chris Winters (ch...@cw...) url = http://www.openinteract.org/ --- 1,5 ---- [package] name = system_doc ! version = 2.12 author = Chris Winters (ch...@cw...) url = http://www.openinteract.org/ |
|
From: Chris W. <la...@us...> - 2005-10-31 02:33:17
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/system_doc/OpenInteract2/Action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24747/OpenInteract2/Action Modified Files: SystemDoc.pm Log Message: ensure that we're able to find all pod (even if it's not in a PM); also don't use command-line perldoc Index: SystemDoc.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/system_doc/OpenInteract2/Action/SystemDoc.pm,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** SystemDoc.pm 23 Sep 2005 05:00:55 -0000 1.16 --- SystemDoc.pm 31 Oct 2005 02:33:07 -0000 1.17 *************** *** 72,92 **** sub display { my ( $self ) = @_; $log ||= get_logger( LOG_APP ); - unless ( keys %POD_CACHE ) { - $self->_read_classpath(); - } my $module = $self->param( 'module' ) || CTX->request->param( 'module' ); ! my $pod_file = $POD_CACHE{ $module }; ! # Yuck -- running perldoc like this stinks: don't use it unless we ! # have to... ! # unless ( $pod_file ) { ! # $pod_file = `perldoc -l $module`; ! # chomp $pod_file; ! # } my ( $content ); --- 72,107 ---- + my $DISPLAY_INITIALIZED = 0; + sub display { my ( $self ) = @_; $log ||= get_logger( LOG_APP ); my $module = $self->param( 'module' ) || CTX->request->param( 'module' ); ! unless ( $DISPLAY_INITIALIZED ) { ! eval "require Pod::Perldoc"; ! if ( $@ ) { ! return "Sorry, cannot display module without Pod::Perldoc " . ! "installed."; ! } ! unless ( Pod::Perldoc->can( 'grand_search_init' ) ) { ! return "Sorry, cannot display module without a recent " . ! "version of Pod::Perldoc. (Where 'recent' means " . ! "'since 2002'."; ! } ! $DISPLAY_INITIALIZED++; ! } ! # NOTE: This is an undocumented use found by reading the ! # Pod::Perldoc source; if you just call $pod->process() it'll ! # print to STDOUT the file you're interested in rather than ! # returning it... ! ! ! my $pod = Pod::Perldoc->new(); ! my ( $pod_file ) = $pod->grand_search_init( [ $module ] ); ! $log->is_info && ! $log->info( "Found POD file '$pod_file' for module '$module'" ); my ( $content ); *************** *** 102,106 **** my $title = $self->_msg( 'sys_doc.module.doc_title', $module ); return $self->generate_content({ ! content => $content, title => $title }); } --- 117,121 ---- my $title = $self->_msg( 'sys_doc.module.doc_title', $module ); return $self->generate_content({ ! content => $content, title => $title, pod_file => $pod_file, }); } *************** *** 254,257 **** --- 269,277 ---- display title and other information on the listing page. + =head1 SEE ALSO + + L<Pod::Perldoc> - We use an undocumented method of this to find the + location of the requested POD. + =head1 COPYRIGHT |
|
From: Chris W. <la...@us...> - 2005-10-31 02:33:17
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/system_doc/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24747/OpenInteract2 Modified Files: PodView.pm Log Message: ensure that we're able to find all pod (even if it's not in a PM); also don't use command-line perldoc Index: PodView.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/system_doc/OpenInteract2/PodView.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PodView.pm 18 Mar 2005 04:09:47 -0000 1.7 --- PodView.pm 31 Oct 2005 02:33:07 -0000 1.8 *************** *** 27,31 **** sub view_over { my ( $self, $over ) = @_; ! my $first_title = ($over->content)[0]->title; my $list_type = 'ul'; if ( $first_title =~ /^(\d+)/ ) { --- 27,36 ---- sub view_over { my ( $self, $over ) = @_; ! my ( $first_title ); ! ! # this might die if there's no first item, but that's ok ! eval { ! $first_title = ($over->content)[0]->title; ! }; my $list_type = 'ul'; if ( $first_title =~ /^(\d+)/ ) { |
|
From: Chris W. <la...@us...> - 2005-10-28 03:20:26
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/news/OpenInteract2/Manage/Website In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20306/OpenInteract2/Manage/Website Added Files: UpdateNewsLinkedList.pm Log Message: move script that redoes previous/next pointers to management task --- NEW FILE: UpdateNewsLinkedList.pm --- package OpenInteract2::Manage::Website::UpdateNewsLinkedList; # $Id: UpdateNewsLinkedList.pm,v 1.1 2005/10/28 03:20:10 lachoy Exp $ use strict; use base qw( OpenInteract2::Manage::Website ); $OpenInteract2::Manage::Website::UpdateNewsLinkedList::VERSION = sprintf("%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/); sub get_name { return 'news_linked_list'; } sub get_brief_description { return "Update the news object fields 'previous_id' and 'next_id' to point to the correct items."; } sub run_task { my ( $self ) = @_; my $action = 'update links'; my $news_items = eval { OpenInteract2::News->fetch_group({ order => 'posted_on ASC' }) }; if ( $@ ) { $self->_fail( $action, "Error trying to fetch news items: $@" ); return; } my $num_items = scalar @{ $news_items }; unless ( $num_items > 0 ) { $self->_fail( "No news objects to update. All done." ); return; } $self->notify_observers( progress => "Updating $num_items news items" ); # Do the first item... $news_items->[0]->{next_id} = $news_items->[1]->id; eval { $news_items->[0]->save({ skip_security => 1 }) }; if ( $@ ) { my $error = "$@"; $self->_fail( sprintf( "Failed to modify the first item [ID: %s] Error: %s", $news_items->[0]->id, $error ) ); return; } # The middle items... for ( my $i = 1; $i < ( $num_items - 1 ); $i++ ) { $news_items->[ $i ]->{previous_id} = $news_items->[ $i - 1 ]->id; $news_items->[ $i ]->{next_id} = $news_items->[ $i + 1 ]->id; eval { $news_items->[ $i ]->save({ skip_security => 1 }) }; if ( $@ ) { my $error = "$@"; $self->_fail( sprintf( "Failed to modify news item $i [ID: %s] Error: %s", $news_items->[$i]->id, $error ) ); return; } } # And the last item $news_items->[ $num_items - 1 ]->{previous_id} = $news_items->[ $num_items - 2 ]->id; eval { $news_items->[ $num_items - 1 ]->save({ skip_security => 1 }) }; if ( $@ ) { my $error = "$@"; $self->_fail( sprintf( "Failed to modify last news item [ID: %s] Error: %s", $news_items->[ $num_items - 1 ]->id, $error ) ); } else { $self->_add_status({ is_ok => 'yes', action => $action, message => "Updated $num_items news objects", }); } } OpenInteract2::Manage->register_factory_type( get_name() => __PACKAGE__ ); 1; __END__ =head1 NAME OpenInteract2::Manage::Website::UpdateNewsLinkedList - Update all news items with the proper previous/next IDs =head1 SYNOPSIS #!/usr/bin/perl use strict; use OpenInteract2::Manage; my $website_dir = '/home/httpd/mysite'; my %PARAMS = ( website_dir => $website_dir ); my $task = OpenInteract2::Manage->new( 'news_linked_list', \%PARAMS ); my @status = $task->execute; foreach my $s ( @status ) { my $ok_label = ( $s->{is_ok} eq 'yes' ) ? 'OK' : 'NOT OK'; my $default_label = ( $s->{is_default} eq 'yes' ) ? ' (default) ' : ''; print "Status OK? $s->{is_ok}\n", "$s->{message}\n"; } =head1 REQUIRED OPTIONS Nothing beyond the website definition. =head1 STATUS INFORMATION Each status hashref includes nothing extra. =head1 COPYRIGHT Copyright (C) 2005 Chris Winters. All rights reserved. This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. =head1 AUTHORS Chris Winters, E<lt>ch...@cw...E<gt> |
|
From: Chris W. <la...@us...> - 2005-10-28 03:20:26
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/news/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20306/script Removed Files: update_to_linked_list.pl Log Message: move script that redoes previous/next pointers to management task --- update_to_linked_list.pl DELETED --- |
|
From: Chris W. <la...@us...> - 2005-10-28 03:20:25
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/news In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20306 Modified Files: Changes MANIFEST package.ini Log Message: move script that redoes previous/next pointers to management task Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/news/Changes,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Changes 21 Sep 2005 03:39:40 -0000 1.25 --- Changes 28 Oct 2005 03:20:10 -0000 1.26 *************** *** 1,4 **** --- 1,9 ---- Revision history for OpenInteract package news. + 2.29 Thu Oct 27 23:12:37 EDT 2005 + + Move script/update_to_linked_list.pl to management task, + OpenInteract2::Manage::Website::UpdateNewsLinkedList + 2.28 Mon Sep 19 22:12:12 EDT 2005 Index: MANIFEST =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/news/MANIFEST,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MANIFEST 2 Mar 2005 15:21:44 -0000 1.9 --- MANIFEST 28 Oct 2005 03:20:10 -0000 1.10 *************** *** 11,18 **** OpenInteract2/Action/News.pm OpenInteract2/App/News.pm OpenInteract2/SQLInstall/News.pm script/create_rss.pl script/find_by_email.pl - script/update_to_linked_list.pl struct/news.sql struct/news_generator.sql --- 11,18 ---- OpenInteract2/Action/News.pm OpenInteract2/App/News.pm + OpenInteract2/Manage/Website/UpdateNewsLinkedList.pm OpenInteract2/SQLInstall/News.pm script/create_rss.pl script/find_by_email.pl struct/news.sql struct/news_generator.sql Index: package.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/news/package.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** package.ini 21 Sep 2005 03:39:40 -0000 1.5 --- package.ini 28 Oct 2005 03:20:10 -0000 1.6 *************** *** 1,5 **** [package] name = news ! version = 2.28 author = Chris Winters (ch...@cw...) url = http://www.openinteract.org/ --- 1,5 ---- [package] name = news ! version = 2.29 author = Chris Winters (ch...@cw...) url = http://www.openinteract.org/ |
|
From: Chris W. <la...@us...> - 2005-10-28 03:18:58
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/news/OpenInteract2/Manage/Website In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20004/Manage/Website Log Message: Directory /cvsroot/openinteract/OpenInteract2/pkg/news/OpenInteract2/Manage/Website added to the repository |
|
From: Chris W. <la...@us...> - 2005-10-28 03:18:40
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/news/OpenInteract2/Manage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19976/Manage Log Message: Directory /cvsroot/openinteract/OpenInteract2/pkg/news/OpenInteract2/Manage added to the repository |
|
From: Chris W. <la...@us...> - 2005-10-22 22:11:29
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26813/lib/OpenInteract2 Modified Files: Brick.pm Log Message: OIN-166: add 'generated by' comment header to all generated brick files Index: Brick.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Brick.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Brick.pm 22 Oct 2005 21:54:40 -0000 1.6 --- Brick.pm 22 Oct 2005 22:11:14 -0000 1.7 *************** *** 374,377 **** --- 374,383 ---- sub get_brick_class_template { return <<'TEMPLATE'; + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: OpenInteract2::Brick->get_brick_class_template() + # using: OpenInteract2 version [% oi2_version %] + package OpenInteract2::Brick::[% brick_name %]; |
|
From: Chris W. <la...@us...> - 2005-10-22 22:10:45
|
Update of /cvsroot/openinteract/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26425 Modified Files: build_bricks Log Message: OIN-166: add 'generated by' comment header to all generated brick files Index: build_bricks =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/build_bricks,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** build_bricks 4 Mar 2005 20:26:48 -0000 1.9 --- build_bricks 22 Oct 2005 22:10:35 -0000 1.10 *************** *** 89,92 **** --- 89,95 ---- my @brick_params = (); + my $invocation = join( ' ', $0, @ARGV ); + my $date = scalar( localtime ); + while ( my ( $brick_dir, $brick_info ) = each %SPECS ) { my @brick_files = read_brick_files( $brick_dir ); *************** *** 103,106 **** --- 106,112 ---- brick_example => $brick_info->[3], brick_description => $full_description, + invocation => $invocation, + date => $date, + oi2_version => $OI2_VERSION, all_files => \@brick_files, ); *************** *** 115,118 **** --- 121,127 ---- brick_summary => "Base-64 encoded OI2 package '%s' shipped with distribution", brick_example => 'oi2_manage create_website --website_dir=/path/to/site', + invocation => $invocation, + date => $date, + oi2_version => $OI2_VERSION, ); |
|
From: Chris W. <la...@us...> - 2005-10-22 21:58:59
|
Update of /cvsroot/openinteract/OpenInteract2/sample/package_from_table In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22387/package_from_table Modified Files: spops.ini search_results.tmpl search_form.tmpl package.ini messages_en.msg form.tmpl display.tmpl action.ini SQLInstall.pm App.pm Action.pm Log Message: OIN-166: update package files to include information about when/how the file was generated Index: spops.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package_from_table/spops.ini,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** spops.ini 17 Feb 2005 05:09:36 -0000 1.1 --- spops.ini 22 Oct 2005 21:58:49 -0000 1.2 *************** *** 1,2 **** --- 1,8 ---- + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: [% source_template %] + # using: OpenInteract2 version [% oi2_version %] + [[% package_name %]] class = OpenInteract2::[% class_name %] Index: search_results.tmpl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package_from_table/search_results.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** search_results.tmpl 17 Feb 2005 05:09:36 -0000 1.1 --- search_results.tmpl 22 Oct 2005 21:58:49 -0000 1.2 *************** *** 1,3 **** --- 1,8 ---- [% TAGS star %] + [%# This OpenInteract2 file was generated + by: [* invocation *] + on: [* date *] + from: [* source_template *] + using: OpenInteract2 version [* oi2_version *] %] [%- title = MSG( '[* package_name *].title_search_results' ); Index: search_form.tmpl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package_from_table/search_form.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** search_form.tmpl 17 Feb 2005 05:09:36 -0000 1.1 --- search_form.tmpl 22 Oct 2005 21:58:49 -0000 1.2 *************** *** 1,3 **** --- 1,8 ---- [% TAGS star %] + [%# This OpenInteract2 file was generated + by: [* invocation *] + on: [* date *] + from: [* source_template *] + using: OpenInteract2 version [* oi2_version *] %] [%- title = MSG( '[* package_name *].title_search_form' ); Index: package.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package_from_table/package.ini,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** package.ini 1 Mar 2005 03:36:00 -0000 1.1 --- package.ini 22 Oct 2005 21:58:49 -0000 1.2 *************** *** 1,2 **** --- 1,8 ---- + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: [% source_template %] + # using: OpenInteract2 version [% oi2_version %] + [package] name = [% package_name %] Index: messages_en.msg =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package_from_table/messages_en.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** messages_en.msg 17 Feb 2005 05:09:36 -0000 1.1 --- messages_en.msg 22 Oct 2005 21:58:49 -0000 1.2 *************** *** 1,2 **** --- 1,8 ---- + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: [% source_template %] + # using: OpenInteract2 version [% oi2_version %] + [% package_name %].title_update = Update the Object [% package_name %].title_create = Create a New Object Index: form.tmpl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package_from_table/form.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** form.tmpl 17 Feb 2005 05:09:36 -0000 1.1 --- form.tmpl 22 Oct 2005 21:58:49 -0000 1.2 *************** *** 1,3 **** --- 1,8 ---- [% TAGS star %] + [%# This OpenInteract2 file was generated + by: [* invocation *] + on: [* date *] + from: [* source_template *] + using: OpenInteract2 version [* oi2_version *] %] [%- is_saved = object.id; Index: display.tmpl =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package_from_table/display.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** display.tmpl 17 Feb 2005 05:09:36 -0000 1.1 --- display.tmpl 22 Oct 2005 21:58:49 -0000 1.2 *************** *** 1,3 **** --- 1,8 ---- [% TAGS star %] + [%# This OpenInteract2 file was generated + by: [* invocation *] + on: [* date *] + from: [* source_template *] + using: OpenInteract2 version [* oi2_version *] %] [%- title = MSG( '[* package_name *].title_display' ); Index: action.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package_from_table/action.ini,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** action.ini 17 Feb 2005 05:09:36 -0000 1.1 --- action.ini 22 Oct 2005 21:58:49 -0000 1.2 *************** *** 1,2 **** --- 1,8 ---- + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: [% source_template %] + # using: OpenInteract2 version [% oi2_version %] + [[% package_name %]] class = OpenInteract2::Action::[% class_name %] Index: SQLInstall.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package_from_table/SQLInstall.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SQLInstall.pm 17 Feb 2005 05:09:36 -0000 1.1 --- SQLInstall.pm 22 Oct 2005 21:58:49 -0000 1.2 *************** *** 1,2 **** --- 1,8 ---- + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: [% source_template %] + # using: OpenInteract2 version [% oi2_version %] + package OpenInteract2::SQLInstall::[% class_name %]; Index: App.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package_from_table/App.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** App.pm 25 Mar 2005 16:45:22 -0000 1.4 --- App.pm 22 Oct 2005 21:58:49 -0000 1.5 *************** *** 1,2 **** --- 1,8 ---- + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: [% source_template %] + # using: OpenInteract2 version [% oi2_version %] + package OpenInteract2::App::[% class_name %]; Index: Action.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package_from_table/Action.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Action.pm 17 Feb 2005 05:09:36 -0000 1.1 --- Action.pm 22 Oct 2005 21:58:49 -0000 1.2 *************** *** 1,2 **** --- 1,8 ---- + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: [% source_template %] + # using: OpenInteract2 version [% oi2_version %] + package OpenInteract2::Action::[% class_name %]; |
|
From: Chris W. <la...@us...> - 2005-10-22 21:58:41
|
Update of /cvsroot/openinteract/OpenInteract2/sample/package_cpan In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22321/package_cpan Modified Files: module_include.t Makefile.PL Brick.pm Log Message: OIN-166: update package files to include information about when/how the file was generated Index: module_include.t =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package_cpan/module_include.t,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** module_include.t 8 Feb 2005 12:32:48 -0000 1.1 --- module_include.t 22 Oct 2005 21:58:33 -0000 1.2 *************** *** 1,4 **** --- 1,10 ---- # -*-perl-*- + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: [% source_template %] + # using: OpenInteract2 version [% oi2_version %] + use strict; use Test::More tests => [% package_modules.size + 2 %]; Index: Makefile.PL =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package_cpan/Makefile.PL,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.PL 8 Feb 2005 12:32:48 -0000 1.1 --- Makefile.PL 22 Oct 2005 21:58:33 -0000 1.2 *************** *** 1,2 **** --- 1,8 ---- + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: [% source_template %] + # using: OpenInteract2 version [% oi2_version %] + use ExtUtils::MakeMaker; *************** *** 8,13 **** 'PREREQ_PM' => { 'OpenInteract2::Action' => 1.66, # proxy for OI2 ! [% FOREACH module = required_modules -%] ! [% module %] => 0, [% END -%] }, --- 14,19 ---- 'PREREQ_PM' => { 'OpenInteract2::Action' => 1.66, # proxy for OI2 ! [% FOREACH req_module = required_modules -%] ! [% IF req_module %][% req_module %] => 0,[% END %] [% END -%] }, Index: Brick.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package_cpan/Brick.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Brick.pm 8 Feb 2005 12:32:48 -0000 1.1 --- Brick.pm 22 Oct 2005 21:58:33 -0000 1.2 *************** *** 1,2 **** --- 1,8 ---- + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: [% source_template %] + # using: OpenInteract2 version [% oi2_version %] + package [% full_brick_class %]; |
|
From: Chris W. <la...@us...> - 2005-10-22 21:58:30
|
Update of /cvsroot/openinteract/OpenInteract2/sample/package In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22241/package Modified Files: spops.ini package.ini action.ini SQLInstall.pm App.pm Action.pm Log Message: OIN-166: update package files to include information about when/how the file was generated Index: spops.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package/spops.ini,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** spops.ini 24 Jan 2005 11:08:59 -0000 1.8 --- spops.ini 22 Oct 2005 21:58:22 -0000 1.9 *************** *** 1,2 **** --- 1,8 ---- + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: [% source_template %] + # using: OpenInteract2 version [% oi2_version %] + # spops.ini: define an object to be used by your package Index: package.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package/package.ini,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** package.ini 1 Mar 2005 03:35:59 -0000 1.1 --- package.ini 22 Oct 2005 21:58:22 -0000 1.2 *************** *** 1,2 **** --- 1,8 ---- + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: [% source_template %] + # using: OpenInteract2 version [% oi2_version %] + [package] name = [% package_name %] Index: action.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package/action.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** action.ini 24 Jan 2005 11:09:42 -0000 1.4 --- action.ini 22 Oct 2005 21:58:22 -0000 1.5 *************** *** 1,2 **** --- 1,8 ---- + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: [% source_template %] + # using: OpenInteract2 version [% oi2_version %] + # This is a sample action.ini file. Its purpose is to define the # actions that OpenInteract2 can take based on the URL requested or Index: SQLInstall.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package/SQLInstall.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SQLInstall.pm 28 Jan 2005 15:37:09 -0000 1.6 --- SQLInstall.pm 22 Oct 2005 21:58:22 -0000 1.7 *************** *** 1,2 **** --- 1,8 ---- + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: [% source_template %] + # using: OpenInteract2 version [% oi2_version %] + package OpenInteract2::SQLInstall::[% class_name %]; Index: App.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package/App.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** App.pm 25 Mar 2005 16:45:22 -0000 1.5 --- App.pm 22 Oct 2005 21:58:22 -0000 1.6 *************** *** 1,2 **** --- 1,8 ---- + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: [% source_template %] + # using: OpenInteract2 version [% oi2_version %] + package OpenInteract2::App::[% class_name %]; Index: Action.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/sample/package/Action.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Action.pm 8 Feb 2005 16:33:31 -0000 1.6 --- Action.pm 22 Oct 2005 21:58:22 -0000 1.7 *************** *** 1,2 **** --- 1,8 ---- + # This OpenInteract2 file was generated + # by: [% invocation %] + # on: [% date %] + # from: [% source_template %] + # using: OpenInteract2 version [% oi2_version %] + package OpenInteract2::Action::[% class_name %]; |
|
From: Chris W. <la...@us...> - 2005-10-22 21:57:24
|
Update of /cvsroot/openinteract/OpenInteract2/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22036 Modified Files: oi2_manage Log Message: OIN-166: grab how oi2_manage was invoked and pass it along to the OI2::Manage creation Index: oi2_manage =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/script/oi2_manage,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** oi2_manage 29 Mar 2005 17:17:45 -0000 1.35 --- oi2_manage 22 Oct 2005 21:57:17 -0000 1.36 *************** *** 52,55 **** --- 52,56 ---- { + my $invocation = join( ' ', $0, @ARGV ); my @opt_defs = OpenInteract2::Manage->all_parameters_long_options; push @opt_defs, 'help|?', 'debug+', 'man', 'verbose', 'task=s'; *************** *** 64,67 **** --- 65,73 ---- } + # Ensure the original invocation is preserved for the management + # tasks + + $OPT{invocation} = $invocation; + # Do this before initializing the log so we can use the existing # category levels |
|
From: Chris W. <la...@us...> - 2005-10-22 21:56:12
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Package In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21789/Manage/Package Modified Files: CreatePackageFromTable.pm CreatePackage.pm CreateCPAN.pm Log Message: OIN-166: pass along additional information (invocation, OI2 version, date) to the procedures generating new files from templates Index: CreatePackageFromTable.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Package/CreatePackageFromTable.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CreatePackageFromTable.pm 18 Feb 2005 03:28:08 -0000 1.2 --- CreatePackageFromTable.pm 22 Oct 2005 21:56:03 -0000 1.3 *************** *** 130,135 **** --- 130,138 ---- my $package_name = $self->param( 'package' )->[0]; + my $invocation = $self->invocation; + $invocation =~ s/(password=?)\S+/password=XXX/; my $package = OpenInteract2::Package->create_skeleton({ name => $package_name, + invocation => $invocation, brick_name => 'package_from_table', brick_vars => { *************** *** 173,177 **** } unless ( $keys[0] ) { ! oi_error "Sorry, no primary key seems to be available table '$table'"; } return $keys[0]; --- 176,180 ---- } unless ( $keys[0] ) { ! oi_error "Sorry, no primary key seems to be available in table '$table'"; } return $keys[0]; Index: CreatePackage.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Package/CreatePackage.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** CreatePackage.pm 17 Mar 2005 14:58:03 -0000 1.15 --- CreatePackage.pm 22 Oct 2005 21:56:03 -0000 1.16 *************** *** 53,57 **** my $package_name = $self->param( 'package' )->[0]; my $package = OpenInteract2::Package->create_skeleton({ ! name => $package_name, }); my $msg = sprintf( 'Package %s created ok in %s', --- 53,58 ---- my $package_name = $self->param( 'package' )->[0]; my $package = OpenInteract2::Package->create_skeleton({ ! name => $package_name, ! invocation => $self->invocation, }); my $msg = sprintf( 'Package %s created ok in %s', Index: CreateCPAN.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Package/CreateCPAN.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CreateCPAN.pm 9 Mar 2005 20:26:23 -0000 1.3 --- CreateCPAN.pm 22 Oct 2005 21:56:03 -0000 1.4 *************** *** 116,119 **** --- 116,122 ---- package_files => \@brick_files, package_pod => '', + invocation => $self->invocation, + date => scalar( localtime ), + oi2_version => OpenInteract2::Context->version, ); |
|
From: Chris W. <la...@us...> - 2005-10-22 21:56:12
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21789 Modified Files: Package.pm Manage.pm Log Message: OIN-166: pass along additional information (invocation, OI2 version, date) to the procedures generating new files from templates Index: Package.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Package.pm,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** Package.pm 24 Sep 2005 19:20:58 -0000 1.61 --- Package.pm 22 Oct 2005 21:56:03 -0000 1.62 *************** *** 504,507 **** --- 504,512 ---- } + $params->{brick_vars} ||= {}; + $params->{brick_vars}{invocation} = $params->{invocation}; + $params->{brick_vars}{date} = scalar( localtime ); + $params->{brick_vars}{oi2_version} = OpenInteract2::Context->version; + eval { $class->_skel_create_subdirectories( $full_skeleton_dir ); Index: Manage.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage.pm,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** Manage.pm 21 Sep 2005 12:33:31 -0000 1.51 --- Manage.pm 22 Oct 2005 21:56:03 -0000 1.52 *************** *** 44,47 **** --- 44,52 ---- my $self = bless( { _status => [] }, $class ); + if ( $params->{invocation} ) { + $self->invocation( $params->{invocation} ); + delete $params->{invocation}; + } + if ( ref $params eq 'HASH' ) { while ( my ( $name, $value ) = each %{ $params } ) { *************** *** 401,404 **** --- 406,418 ---- + sub invocation { + my ( $self, $invocation ) = @_; + if ( $invocation ) { + $self->{invocation} = $invocation; + } + return $self->{invocation}; + } + + ######################################## # STATUS |
|
From: Chris W. <la...@us...> - 2005-10-22 21:54:48
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21450 Modified Files: Brick.pm Log Message: add the 'source_template' used to generate the file Index: Brick.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Brick.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Brick.pm 24 Mar 2005 05:13:47 -0000 1.5 --- Brick.pm 22 Oct 2005 21:54:40 -0000 1.6 *************** *** 272,276 **** foreach my $name ( @resource_names ) { my $info = $self->load_resource( $name ); - # First process any template keys in the destination... my ( $final_dest_spec ); --- 272,275 ---- *************** *** 296,299 **** --- 295,299 ---- unless ( 'no' eq lc $info->{evaluate} ) { my ( $new_content ); + $template_vars->{source_template} = $name; $TEMPLATE->process( \$content, $template_vars, \$new_content ) || oi_error "Cannot copy and replace tokens from resource '$name': ", |
|
From: Chris W. <la...@us...> - 2005-10-22 21:53:53
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Response In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21226/Response Modified Files: CGI.pm Log Message: remove old (?) reference to OI2::Exception->creation_location Index: CGI.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Response/CGI.pm,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** CGI.pm 17 Mar 2005 14:58:05 -0000 1.20 --- CGI.pm 22 Oct 2005 21:53:45 -0000 1.21 *************** *** 32,38 **** } elsif ( UNIVERSAL::isa( $_, 'OpenInteract2::Exception' ) ) { print "<h1>Exception!</h1>\n", "<p>Error: ", $_->message, "<br>", ! $_->creation_location, "</p>\n"; } else { --- 32,39 ---- } elsif ( UNIVERSAL::isa( $_, 'OpenInteract2::Exception' ) ) { + my $location = $_->file . " line " . $_->line; print "<h1>Exception!</h1>\n", "<p>Error: ", $_->message, "<br>", ! "$location</p>\n"; } else { |
|
From: Chris W. <la...@us...> - 2005-10-22 21:53:39
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21154/Request Modified Files: CGI.pm Log Message: be able to assign the deployment URL from externally Index: CGI.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Request/CGI.pm,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** CGI.pm 6 Apr 2005 20:54:31 -0000 1.24 --- CGI.pm 22 Oct 2005 21:53:26 -0000 1.25 *************** *** 33,42 **** my $req_type = $cgi->request_method || 'GET'; ! # Assign URL info from CGI... ! ! my $base_url = $cgi->script_name || ''; ! $log->is_info && $log->info( "Deployed as $req_type to $base_url" ); ! CTX->assign_deploy_url( $base_url ); my $full_url = join( '', $base_url, $cgi->path_info ); --- 33,47 ---- my $req_type = $cgi->request_method || 'GET'; ! # Assign URL info from CGI unless told otherwise ! my $base_url = ''; ! if ( defined $params->{deploy_url} ) { ! CTX->assign_deploy_url( $params->{deploy_url} ); ! } ! else { ! $base_url = $cgi->script_name || ''; ! $log->is_info && $log->info( "Deployed as $req_type to $base_url" ); ! CTX->assign_deploy_url( $base_url ); ! } my $full_url = join( '', $base_url, $cgi->path_info ); |
|
From: Chris W. <la...@us...> - 2005-10-20 19:36:12
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30733/OpenInteract2 Modified Files: Setup.pm Log Message: A::D was upgraded and did not include these functions, so we'll just always put them in unless they're already there Index: Setup.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup.pm,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** Setup.pm 18 Mar 2005 04:09:48 -0000 1.61 --- Setup.pm 20 Oct 2005 19:36:02 -0000 1.62 *************** *** 175,179 **** { require Algorithm::Dependency; ! if ( Algorithm::Dependency->VERSION <= 1.03 ) { eval <<'WITHOUT'; --- 175,179 ---- { require Algorithm::Dependency; ! unless ( Algorithm::Dependency->can( 'without' ) ) { eval <<'WITHOUT'; *************** *** 200,203 **** --- 200,209 ---- } + WITHOUT + } + + unless ( Algorithm::Dependency->can( 'dependent_on' ) ) { + eval <<'DEPENDENTON'; + sub Algorithm::Dependency::dependent_on { my $self = shift; *************** *** 217,221 **** } ! WITHOUT } --- 223,227 ---- } ! DEPENDENTON } |
|
From: Chris W. <la...@us...> - 2005-10-20 01:20:54
|
Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Auth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21827 Modified Files: User.pm Log Message: OIN-182: if cache_user is set to 0 we weren't correctly storing the user_id Index: User.pm =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Auth/User.pm,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** User.pm 17 Mar 2005 14:57:59 -0000 1.22 --- User.pm 20 Oct 2005 01:20:46 -0000 1.23 *************** *** 11,14 **** --- 11,15 ---- my ( $log ); + my $USER_ID_KEY = 'user_id'; sub get_user { *************** *** 80,84 **** my $session = CTX->request->session; if ( $session ) { ! delete $session->{user_id}; } $user = $class->_create_nologin_user; --- 81,85 ---- my $session = CTX->request->session; if ( $session ) { ! delete $session->{ $USER_ID_KEY }; } $user = $class->_create_nologin_user; *************** *** 120,123 **** --- 121,127 ---- } } + else { + $user_id = $session->{ $USER_ID_KEY }; + } return ( $user, $user_id ); } *************** *** 126,140 **** sub _set_cached_user { my ( $class, $user ) = @_; - my $user_refresh = CTX->lookup_session_config->{cache_user}; - return unless ( $user_refresh > 0 ); - $log ||= get_logger( LOG_AUTH ); - my $session = CTX->request->session; ! $session->{_oi_cache}{user} = $user; ! $session->{_oi_cache}{user_refresh_on} = time + ( $user_refresh * 60 ); ! $log->is_info && ! $log->info( "Set user to session cache, expires in ", ! "'$user_refresh' minutes" ); } --- 130,149 ---- sub _set_cached_user { my ( $class, $user ) = @_; $log ||= get_logger( LOG_AUTH ); my $session = CTX->request->session; ! my $user_refresh = CTX->lookup_session_config->{cache_user}; ! if ( $user_refresh > 0 ) { ! $session->{_oi_cache}{user} = $user; ! $session->{_oi_cache}{user_refresh_on} = time + ( $user_refresh * 60 ); ! $log->is_info && ! $log->info( "Set user to session cache, expires in ", ! "'$user_refresh' minutes" ); ! } ! else { ! my $user_id = $user->id; ! $session->{ $USER_ID_KEY } = $user_id; ! $log->is_info && ! $log->info( "Assigned user ID $user_id to session" ); ! } } *************** *** 144,148 **** my ( $class ) = @_; my $session = CTX->request->session; ! return ( $session ) ? $session->{user_id} : undef; } --- 153,157 ---- my ( $class ) = @_; my $session = CTX->request->session; ! return ( $session ) ? $session->{ $USER_ID_KEY } : undef; } *************** *** 164,168 **** $log ||= get_logger( LOG_AUTH ); $log->error( "Failed to fetch user '$user_id': $error" ); ! CTX->request->session->{user_id} = undef; $log->error( "Since user fetch failed, setting 'user_id' in ", "session to undef to prevent this from recurring" ); --- 173,177 ---- $log ||= get_logger( LOG_AUTH ); $log->error( "Failed to fetch user '$user_id': $error" ); ! CTX->request->session->{ $USER_ID_KEY } = undef; $log->error( "Since user fetch failed, setting 'user_id' in ", "session to undef to prevent this from recurring" ); *************** *** 200,204 **** ->fetch_by_login_name( $login_name, { skip_security => 1 } ) ! }; if ( $@ ) { $log->error( "Error fetching user by login name: $@" ); --- 209,213 ---- ->fetch_by_login_name( $login_name, { skip_security => 1 } ) ! }; if ( $@ ) { $log->error( "Error fetching user by login name: $@" ); *************** *** 215,219 **** my $password = $request->param( $password_field ); - unless ( $user->check_password( $password ) ) { $log->warn( "Password check for [$login_name] failed" ); --- 224,227 ---- |
|
From: Chris W. <la...@us...> - 2005-10-19 03:03:12
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18574 Modified Files: package.ini MANIFEST Changes Log Message: OIN-190: add 'emailtester' action to ensure email settings (SMTP host, primarily) are correct Index: package.ini =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base/package.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** package.ini 1 Mar 2005 03:28:32 -0000 1.3 --- package.ini 19 Oct 2005 03:03:00 -0000 1.4 *************** *** 1,5 **** [package] name = base ! version = 2.15 author = Chris Winters (ch...@cw...) url = http://www.openinteract.org/ --- 1,5 ---- [package] name = base ! version = 2.50 author = Chris Winters (ch...@cw...) url = http://www.openinteract.org/ Index: MANIFEST =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base/MANIFEST,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MANIFEST 1 Mar 2005 03:28:32 -0000 1.7 --- MANIFEST 19 Oct 2005 03:03:00 -0000 1.8 *************** *** 13,16 **** --- 13,17 ---- html/images/pw_by_tt2.gif msg/base-messages-en.msg + OpenInteract2/Action/EmailTester.pm OpenInteract2/Action/Logout.pm OpenInteract2/Action/Package.pm *************** *** 20,23 **** --- 21,25 ---- struct/sessions_interbase.sql struct/sessions_oracle.sql + template/email_tester.tmpl template/logout.tmpl template/package_detail.tmpl Index: Changes =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base/Changes,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Changes 1 Mar 2005 03:28:32 -0000 1.16 --- Changes 19 Oct 2005 03:03:00 -0000 1.17 *************** *** 1,4 **** --- 1,9 ---- Revision history for OpenInteract package base. + 2.50 Tue Oct 18 23:02:14 EDT 2005 + + OIN-190: Create a simple action and page for testing your email + settings. + 2.15 Mon Feb 28 20:33:57 EST 2005 |
|
From: Chris W. <la...@us...> - 2005-10-19 03:03:11
|
Update of /cvsroot/openinteract/OpenInteract2/pkg/base/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18574/data Modified Files: install_security.dat Log Message: OIN-190: add 'emailtester' action to ensure email settings (SMTP host, primarily) are correct Index: install_security.dat =================================================================== RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base/data/install_security.dat,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** install_security.dat 22 Apr 2003 23:00:32 -0000 1.3 --- install_security.dat 19 Oct 2005 03:03:00 -0000 1.4 *************** *** 4,7 **** field_order => [ qw/ class object_id scope scope_id security_level / ], transform_default => [ 'scope_id' ] }, ! [ 'OpenInteract2::Action::Package', 0, 'g', 'site_admin_group', 8 ], ]; --- 4,8 ---- field_order => [ qw/ class object_id scope scope_id security_level / ], transform_default => [ 'scope_id' ] }, ! [ 'OpenInteract2::Action::Package', 0, 'g', 'site_admin_group', 8 ], ! [ 'OpenInteract2::Action::EmailTester', 0, 'g', 'site_admin_group', 8 ], ]; |
4 messages has been excluded from this view by a project administrator.
