openinteract-commits — CVS updates for OpenInteract/SPOPS

[Openinteract-commits] CVS: OpenInteract2/sample/website/template form_begin,1.2,1.3

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/sample/website/template
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6578

Modified Files:
	form_begin 
Log Message:
OIN-90: allow the form_url to be set externally instead of always contextualizing it

Index: form_begin
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/sample/website/template/form_begin,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** form_begin	6 Jun 2003 05:22:57 -0000	1.2
--- form_begin	5 Oct 2004 02:00:55 -0000	1.3
***************
*** 1,6 ****
  [%- DEFAULT method = 'POST';
!     form_url = OI.make_url( BASE   = BASE,
!                             ACTION = ACTION,
!                             TASK   = TASK ); -%]
  <form action="[% form_url %]" method="[% method %]"
        [%- IF onsubmit %] onsubmit="[% onsubmit %]"[% END -%]
--- 1,6 ----
  [%- DEFAULT method = 'POST';
!     DEFAULT form_url = OI.make_url( BASE   = BASE,
!                                     ACTION = ACTION,
!                                     TASK   = TASK ); -%]
  <form action="[% form_url %]" method="[% method %]"
        [%- IF onsubmit %] onsubmit="[% onsubmit %]"[% END -%]

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 Auth.pm,1.19,1.20

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31534/lib/OpenInteract2

Modified Files:
	Auth.pm 
Log Message:
cosmetic

Index: Auth.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Auth.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Auth.pm	2 Jun 2004 20:12:21 -0000	1.19
--- Auth.pm	5 Oct 2004 01:27:51 -0000	1.20
***************
*** 163,167 ****
      $log->is_debug &&
          $log->debug( "Custom login handler/method being used: ",
!                      "[$CUSTOM_CLASS] [$CUSTOM_METHOD]" );
      eval {
          $CUSTOM_CLASS->$CUSTOM_METHOD( $self );
--- 163,167 ----
      $log->is_debug &&
          $log->debug( "Custom login handler/method being used: ",
!                      "'$CUSTOM_CLASS' '$CUSTOM_METHOD'" );
      eval {
          $CUSTOM_CLASS->$CUSTOM_METHOD( $self );
***************
*** 172,176 ****
              $log->is_debug &&
                  $log->debug( "Custom login handler failure method: ",
!                              "[$CUSTOM_CLASS] [$CUSTOM_FAIL_METHOD]" );
              eval {
                  $CUSTOM_CLASS->$CUSTOM_FAIL_METHOD( $self );
--- 172,176 ----
              $log->is_debug &&
                  $log->debug( "Custom login handler failure method: ",
!                              "'$CUSTOM_CLASS' '$CUSTOM_FAIL_METHOD'" );
              eval {
                  $CUSTOM_CLASS->$CUSTOM_FAIL_METHOD( $self );
***************
*** 215,219 ****
      eval "require $CUSTOM_CLASS";
      if ( $@ ) {
!         $log->error( "Tried to use custom login handler [$CUSTOM_CLASS]",
                       "but requiring the class failed: $@" );
          return 'no';
--- 215,219 ----
      eval "require $CUSTOM_CLASS";
      if ( $@ ) {
!         $log->error( "Tried to use custom login handler '$CUSTOM_CLASS'",
                       "but requiring the class failed: $@" );
          return 'no';

[Openinteract-commits] CVS: OpenInteract2/t utils.pl,1.69,1.70

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/t
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29539/t

Modified Files:
	utils.pl 
Log Message:
pkg update

Index: utils.pl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/t/utils.pl,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** utils.pl	2 Oct 2004 23:15:57 -0000	1.69
--- utils.pl	5 Oct 2004 01:19:12 -0000	1.70
***************
*** 48,52 ****
           base_error      => '2.10',
           base_group      => '2.14',
!          base_page       => '2.25',
           base_security   => '2.17',
           base_template   => '3.12',
--- 48,52 ----
           base_error      => '2.10',
           base_group      => '2.14',
!          base_page       => '2.26',
           base_security   => '2.17',
           base_template   => '3.12',

[Openinteract-commits] CVS: OpenInteract2 MANIFEST,1.90,1.91

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29539

Modified Files:
	MANIFEST 
Log Message:
pkg update

Index: MANIFEST
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/MANIFEST,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** MANIFEST	2 Oct 2004 23:15:57 -0000	1.90
--- MANIFEST	5 Oct 2004 01:19:12 -0000	1.91
***************
*** 161,165 ****
  pkg/base_error-2.10.zip
  pkg/base_group-2.14.zip
! pkg/base_page-2.25.zip
  pkg/base_security-2.17.zip
  pkg/base_template-3.12.zip
--- 161,165 ----
  pkg/base_error-2.10.zip
  pkg/base_group-2.14.zip
! pkg/base_page-2.26.zip
  pkg/base_security-2.17.zip
  pkg/base_template-3.12.zip

[Openinteract-commits] CVS: OpenInteract2/pkg/base_page/OpenInteract2/Action Page.pm,1.21,1.22

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page/OpenInteract2/Action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29439/OpenInteract2/Action

Modified Files:
	Page.pm 
Log Message:
OIN-89: fix bug introduced with last fix...

Index: Page.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/OpenInteract2/Action/Page.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Page.pm	2 Oct 2004 23:15:11 -0000	1.21
--- Page.pm	5 Oct 2004 01:18:51 -0000	1.22
***************
*** 750,757 ****
      # Use page metadata to modify display
  
!     $page->{boxes} ||= [];
      my @box_add    = ();
      my @box_remove = ();
!     foreach ( @{ $page->{boxes} } ) {
          s/^\s+//;
          s/\s+$//;
--- 750,757 ----
      # Use page metadata to modify display
  
!     $page->{boxes} ||= "";
      my @box_add    = ();
      my @box_remove = ();
!     foreach ( split /\s+/, $page->{boxes} ) {
          s/^\s+//;
          s/\s+$//;

[Openinteract-commits] CVS: OpenInteract2/pkg/base_page Changes,1.24,1.25 package.conf,1.25,1.26

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29439

Modified Files:
	Changes package.conf 
Log Message:
OIN-89: fix bug introduced with last fix...

Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/Changes,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Changes	2 Oct 2004 23:15:11 -0000	1.24
--- Changes	5 Oct 2004 01:18:51 -0000	1.25
***************
*** 1,4 ****
--- 1,9 ----
  Revision history for OpenInteract package base_page.
  
+ 2.26  Mon Oct  4 21:15:03 EDT 2004
+ 
+       OIN-89: Fix stupid bug introduced with last update, thanks to
+       Heiko Klein for spotting.
+ 
  2.25  Sat Oct  2 19:12:18 EDT 2004
  

Index: package.conf
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/package.conf,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** package.conf	2 Oct 2004 23:15:11 -0000	1.25
--- package.conf	5 Oct 2004 01:18:51 -0000	1.26
***************
*** 1,4 ****
  name             base_page
! version          2.25
  author           Chris Winters <ch...@cw...>
  module           File::Basename
--- 1,4 ----
  name             base_page
! version          2.26
  author           Chris Winters <ch...@cw...>
  module           File::Basename

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 URL.pm,1.24,1.25

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14693

Modified Files:
	URL.pm 
Log Message:
OIN-79: allow the URL escaping to not happen based on an input parameter

Index: URL.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/URL.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** URL.pm	4 Oct 2004 04:06:22 -0000	1.24
--- URL.pm	4 Oct 2004 12:54:32 -0000	1.25
***************
*** 75,79 ****
  
  sub create {
!     my ( $class, $url_base, $params ) = @_;
      $log ||= get_logger( LOG_OI );
      my $param_info = ( $log->is_debug )
--- 75,79 ----
  
  sub create {
!     my ( $class, $url_base, $params, $do_not_escape ) = @_;
      $log ||= get_logger( LOG_OI );
      my $param_info = ( $log->is_debug )
***************
*** 86,90 ****
              $log->debug( "Creating image URL from '$url_base' ",
                           "and params '$param_info'" );
!         return $class->create_image( $url_base, $params );
      }
      elsif ( $params->{STATIC} ) {
--- 86,90 ----
              $log->debug( "Creating image URL from '$url_base' ",
                           "and params '$param_info'" );
!         return $class->create_image( $url_base, $params, $do_not_escape );
      }
      elsif ( $params->{STATIC} ) {
***************
*** 93,114 ****
              $log->debug( "Creating static URL from '$url_base' ",
                           "and params '$param_info'" );
!         return $class->create_image( $url_base, $params );
      }
      $log->is_debug &&
      $log->debug( "Creating deployment URL from '$url_base' ",
                   "and params '$param_info'" );
!     return $class->_create_deployment( DEPLOY_URL, $url_base, $params );
  }
  
  sub create_image {
!     my ( $class, $url_base, $params ) = @_;
      return $class->_create_deployment(
!                DEPLOY_IMAGE_URL, $url_base, $params );
  }
  
  sub create_static {
!     my ( $class, $url_base, $params ) = @_;
      return $class->_create_deployment(
!                DEPLOY_STATIC_URL, $url_base, $params );
  }
  
--- 93,115 ----
              $log->debug( "Creating static URL from '$url_base' ",
                           "and params '$param_info'" );
!         return $class->create_image( $url_base, $params, $do_not_escape );
      }
      $log->is_debug &&
      $log->debug( "Creating deployment URL from '$url_base' ",
                   "and params '$param_info'" );
!     return $class->_create_deployment(
!         DEPLOY_URL, $url_base, $params, $do_not_escape );
  }
  
  sub create_image {
!     my ( $class, $url_base, $params, $do_not_escape ) = @_;
      return $class->_create_deployment(
!                DEPLOY_IMAGE_URL, $url_base, $params, $do_not_escape );
  }
  
  sub create_static {
!     my ( $class, $url_base, $params, $do_not_escape ) = @_;
      return $class->_create_deployment(
!                DEPLOY_STATIC_URL, $url_base, $params, $do_not_escape );
  }
  
***************
*** 117,122 ****
  
  sub _create_deployment {
!     my ( $class, $deploy_under, $url_base, $params ) = @_;
!     $url_base = _url_escape( $url_base );
      if ( $deploy_under ) {
          $url_base = join( '', $deploy_under, $url_base );
--- 118,125 ----
  
  sub _create_deployment {
!     my ( $class, $deploy_under, $url_base, $params, $do_not_escape ) = @_;
!     unless ( $do_not_escape ) {
!         $url_base = _url_escape( $url_base );
!     }
      if ( $deploy_under ) {
          $url_base = join( '', $deploy_under, $url_base );
***************
*** 140,144 ****
  
  sub create_from_action {
!     my ( $class, $action, $task, $params ) = @_;
      $log ||= get_logger( LOG_OI );
  
--- 143,147 ----
  
  sub create_from_action {
!     my ( $class, $action, $task, $params, $do_not_escape ) = @_;
      $log ||= get_logger( LOG_OI );
  
***************
*** 165,169 ****
          $log->debug( uchk( "Creating URL from action '%s' and task " .
                             "'%s' -- '%s'", $action, $task, $url_base ) );
!     return $class->create( $url_base, $params );
  }
  
--- 168,172 ----
          $log->debug( uchk( "Creating URL from action '%s' and task " .
                             "'%s' -- '%s'", $action, $task, $url_base ) );
!     return $class->create( $url_base, $params, $do_not_escape );
  }
  
***************
*** 314,318 ****
  Returns: URL with leading server context.
  
! B<create( $base_url, \%params )>
  
  Create a URL using the deployed context (if any), a C<$base_url> and
--- 317,321 ----
  Returns: URL with leading server context.
  
! B<create( $base_url, [ \%params, $do_not_escape ] )>
  
  Create a URL using the deployed context (if any), a C<$base_url> and
***************
*** 324,328 ****
  have a trailing '?' to indicate the start of a query string. This is
  important to note if you are doing further manipulation of the URL,
! such as you with if you were embedding it in generated Javascript.
  
  Return: URL formed from the deployed context, C<$base_url> and
--- 327,342 ----
  have a trailing '?' to indicate the start of a query string. This is
  important to note if you are doing further manipulation of the URL,
! such as you with if you were embedding it in generated
! Javascript. Note that the parameter names and values are URI-escaped.
! 
! Unless C<$do_not_escape> is set to a true value we also escape the
! C<$base_url>. (This makes URL-escaping the default.) So if you
! specify:
! 
!   $url->create( '/foo/bar is baz/' );
! 
! You'll get in return:
! 
!   /foo/bar%20is%20baz/
  
  Return: URL formed from the deployed context, C<$base_url> and
***************
*** 365,369 ****
   # $url = '/cgi-bin/oi.cgi/Public/foo?name=Mario%20Lemiux'
  
! B<create_image( $base_url, \%params )>
  
  Create a URL using the deployed image context (if any), a C<$base_url>
--- 379,383 ----
   # $url = '/cgi-bin/oi.cgi/Public/foo?name=Mario%20Lemiux'
  
! B<create_image( $base_url, [ \%params, $do_not_escape ] )>
  
  Create a URL using the deployed image context (if any), a C<$base_url>
***************
*** 377,380 ****
--- 391,398 ----
  such as you with if you were embedding it in generated Javascript.
  
+ Unless C<$do_not_escape> is set to a true value we URI-escape the
+ C<$base_url>. (We always URI-escape the query arguments and values
+ created from C<\%params>.)
+ 
  Return: URL formed from the deployed context, C<$base_url> and
  C<\%params>.
***************
*** 411,414 ****
--- 429,436 ----
  such as you with if you were embedding it in generated Javascript.
  
+ Unless C<$do_not_escape> is set to a true value we URI-escape the
+ C<$base_url>. (We always URI-escape the query arguments and values
+ created from C<\%params>.)
+ 
  Return: URL formed from the deployed context, C<$base_url> and
  C<\%params>.
***************
*** 430,434 ****
   # $url = '/STAT/reports/q1-2003-01.pdf'
  
! B<create_from_action( $action, $task, \%params )>
  
  Similar to C<create()>, except first we find the primary URL for
--- 452,456 ----
   # $url = '/STAT/reports/q1-2003-01.pdf'
  
! B<create_from_action( $action, [ $task, \%params, $do_not_escape ] )>
  
  Similar to C<create()>, except first we find the primary URL for
***************
*** 441,444 ****
--- 463,470 ----
  C<undef>.
  
+ Unless C<$do_not_escape> is set to a true value we URI-escape the URL
+ created from the action name and task. (We always URI-escape the query
+ arguments and values created from C<\%params>.)
+ 
  See discussion in L<OpenInteract2::Action|OpenInteract2::Action> under
  C<MAPPING URL TO ACTION> for what the 'primary URL' is and other

[Openinteract-commits] CVS: OpenInteract2/t url.t,1.10,1.11

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/t
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23932/t

Modified Files:
	url.t 
Log Message:
OIN-79: update OI2::URL to escape the given base URL as well as the query arguments; update tests to check

Index: url.t
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/t/url.t,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** url.t	17 Nov 2003 05:05:42 -0000	1.10
--- url.t	4 Oct 2004 04:06:22 -0000	1.11
***************
*** 7,11 ****
  require 'utils.pl';
  use OpenInteract2::Context qw( CTX );
! use Test::More  tests => 86;
  
  initialize_context();
--- 7,11 ----
  require 'utils.pl';
  use OpenInteract2::Context qw( CTX );
! use Test::More  tests => 96;
  
  initialize_context();
***************
*** 17,21 ****
  {
      my ( $relative_url );
- 
      $relative_url = $UCL->parse_absolute_to_relative( '/foo/bar' );
      is( $relative_url, '/foo/bar',
--- 17,20 ----
***************
*** 25,29 ****
  {
      my ( $action_name, $task );
- 
      ( $action_name, $task ) = $UCL->parse( 'http://www.infocom.com/games/explore/' );
      is( $action_name, 'games',
--- 24,27 ----
***************
*** 141,144 ****
--- 139,158 ----
      compare_urls( '/foo', \%multiple_q, $create_url,
                    'Multiple query items' );
+ 
+     my @unescaped = ( '~', '.', '-', '*', "'", '(', ')', '/' );
+     foreach my $c ( @unescaped ) {
+         $create_url = $UCL->create( '/' . $c . 'lachoy/foo' );
+         is( $create_url, '/' . $c . 'lachoy/foo',
+             qq{..."$c" not escaped } );
+     }
+ 
+     $create_url = $UCL->create( '/some path/to/La Choy' );
+     is( $create_url, '/some%20path/to/La%20Choy',
+         '...spaces escaped with "%20" in path' );
+ 
+     $create_url = $UCL->create( '/some path/to/La Choy',
+                                 { emulate => 'Stan Granite' } );
+     is( $create_url, '/some%20path/to/La%20Choy?emulate=Stan%20Granite',
+         'Path with spaces, query item with space' );
  }
  

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 URL.pm,1.23,1.24

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23932/lib/OpenInteract2

Modified Files:
	URL.pm 
Log Message:
OIN-79: update OI2::URL to escape the given base URL as well as the query arguments; update tests to check

Index: URL.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/URL.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** URL.pm	2 Oct 2004 22:24:15 -0000	1.23
--- URL.pm	4 Oct 2004 04:06:22 -0000	1.24
***************
*** 85,89 ****
          $log->is_debug &&
              $log->debug( "Creating image URL from '$url_base' ",
!                          "and params [$param_info]" );
          return $class->create_image( $url_base, $params );
      }
--- 85,89 ----
          $log->is_debug &&
              $log->debug( "Creating image URL from '$url_base' ",
!                          "and params '$param_info'" );
          return $class->create_image( $url_base, $params );
      }
***************
*** 92,101 ****
          $log->is_debug &&
              $log->debug( "Creating static URL from '$url_base' ",
!                          "and params [$param_info]" );
          return $class->create_image( $url_base, $params );
      }
      $log->is_debug &&
      $log->debug( "Creating deployment URL from '$url_base' ",
!                  "and params [$param_info]" );
      return $class->_create_deployment( DEPLOY_URL, $url_base, $params );
  }
--- 92,101 ----
          $log->is_debug &&
              $log->debug( "Creating static URL from '$url_base' ",
!                          "and params '$param_info'" );
          return $class->create_image( $url_base, $params );
      }
      $log->is_debug &&
      $log->debug( "Creating deployment URL from '$url_base' ",
!                  "and params '$param_info'" );
      return $class->_create_deployment( DEPLOY_URL, $url_base, $params );
  }
***************
*** 118,121 ****
--- 118,122 ----
  sub _create_deployment {
      my ( $class, $deploy_under, $url_base, $params ) = @_;
+     $url_base = _url_escape( $url_base );
      if ( $deploy_under ) {
          $url_base = join( '', $deploy_under, $url_base );
***************
*** 153,157 ****
      # ...if a URL for the action isn't found
      unless ( $info->{url_primary} ) {
!         $log->warn( "Request URL for action [$action] but ",
                      "primary URL was not found in action info; ",
                      "probably means it's not URL-accessible" );
--- 154,158 ----
      # ...if a URL for the action isn't found
      unless ( $info->{url_primary} ) {
!         $log->warn( "Request URL for action '$action' but ",
                      "primary URL was not found in action info; ",
                      "probably means it's not URL-accessible" );
***************
*** 170,174 ****
      my ( $to_encode ) = shift;
      return undef unless defined( $to_encode );
!     $to_encode =~ s/([^a-zA-Z0-9_.-])/uc sprintf("%%%02x",ord($1))/eg;
      return $to_encode;
  }
--- 171,176 ----
      my ( $to_encode ) = shift;
      return undef unless defined( $to_encode );
!     $to_encode =~ s/([^a-zA-Z0-9_~\.\-\*\'\(\)\/\s])/uc sprintf("%%%02x",ord($1))/eg;
!     $to_encode =~ s/\s/%20/g;
      return $to_encode;
  }
***************
*** 200,204 ****
  
  to see under what context the application is deployed. Many times this
! will be empty, which means the application sits at the root.
  
  =head1 METHODS
--- 202,208 ----
  
  to see under what context the application is deployed. Many times this
! will be empty, which means the application sits at the root. This
! value may also set by the L<OpenInteract2::Context> method
! C<assign_deploy_url()>.
  
  =head1 METHODS
***************
*** 319,323 ****
  If no C<\%params> are specified then the resulting URL will B<not>
  have a trailing '?' to indicate the start of a query string. This is
! important to note if you're doing further manipulation of the URL,
  such as you with if you were embedding it in generated Javascript.
  
--- 323,327 ----
  If no C<\%params> are specified then the resulting URL will B<not>
  have a trailing '?' to indicate the start of a query string. This is
! important to note if you are doing further manipulation of the URL,
  such as you with if you were embedding it in generated Javascript.
  
***************
*** 370,374 ****
  If no C<\%params> are specified then the resulting URL will B<not>
  have a trailing '?' to indicate the start of a query string. This is
! important to note if you're doing further manipulation of the URL,
  such as you with if you were embedding it in generated Javascript.
  
--- 374,378 ----
  If no C<\%params> are specified then the resulting URL will B<not>
  have a trailing '?' to indicate the start of a query string. This is
! important to note if you are doing further manipulation of the URL,
  such as you with if you were embedding it in generated Javascript.
  
***************
*** 404,408 ****
  If no C<\%params> are specified then the resulting URL will B<not>
  have a trailing '?' to indicate the start of a query string. This is
! important to note if you're doing further manipulation of the URL,
  such as you with if you were embedding it in generated Javascript.
  
--- 408,412 ----
  If no C<\%params> are specified then the resulting URL will B<not>
  have a trailing '?' to indicate the start of a query string. This is
! important to note if you are doing further manipulation of the URL,
  such as you with if you were embedding it in generated Javascript.
  
***************
*** 484,488 ****
   $url = OpenInteract2::URL->create_from_action(
                      'foo', 'detail', { name => 'Mario Lemieux' } );
!  # $url = '/cgi-bin/oi.cgi/Public/Foo/detail/?name=Mario%20Lemiux'
  
  =head1 SEE ALSO
--- 488,492 ----
   $url = OpenInteract2::URL->create_from_action(
                      'foo', 'detail', { name => 'Mario Lemieux' } );
!  # $url = '/cgi-bin/oi.cgi/Public/Foo/detail/?name=Mario%20Lemieux'
  
  =head1 SEE ALSO

[Openinteract-commits] CVS: OpenInteract2/doc/Manual Changes.pod,1.48,1.49

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/doc/Manual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2048/Manual

Modified Files:
	Changes.pod 
Log Message:
latest changes

Index: Changes.pod
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/doc/Manual/Changes.pod,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** Changes.pod	27 Sep 2004 05:18:53 -0000	1.48
--- Changes.pod	3 Oct 2004 00:17:57 -0000	1.49
***************
*** 441,444 ****
--- 441,470 ----
  =back
  
+ L<OpenInteract::Response>
+ 
+ =over 4
+ 
+ =item *
+ 
+ OIN-56: Add 'charset' property and a 'content_type_header' method
+ which adds the charset (if specified) to the content type.
+ 
+ =back
+ 
+ L<OpenInteract2::Response::*>
+ 
+ =over 4
+ 
+ =item *
+ 
+ OIN-48: ensure we store the session before doing a redirect
+ 
+ =item *
+ 
+ OIN-56: use the 'content_type_header' for the 'Content-Type' as it
+ includes the charset if specified.
+ 
+ =back
+ 
  L<OpenInteract2::Response::CGI>
  
***************
*** 1005,1008 ****
--- 1031,1044 ----
  =back
  
+ L<OpenInteract::TT2::Provider>
+ 
+ =over 4
+ 
+ =item *
+ 
+ Sync up with how TT2 manages the linked list of stuff to refresh.
+ 
+ =back
+ 
  C<sample/README>
  

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Response Apache.pm,1.19,1.20 Apache2.pm,1.5,1.6 CGI.pm,1.18,1.19 LWP.pm,1.20,1.21 Standalone.pm,1.13,1.14

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Response
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1532/OpenInteract2/Response

Modified Files:
	Apache.pm Apache2.pm CGI.pm LWP.pm Standalone.pm 
Log Message:
OIN-56: add 'charset' property to response; add 'content_type_header()' which will include the charset in the content-type header if the charset is set; modify all response implementations to call this header method and ignore the content-type header

Index: Apache.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Response/Apache.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Apache.pm	2 Oct 2004 22:13:19 -0000	1.19
--- Apache.pm	3 Oct 2004 00:15:24 -0000	1.20
***************
*** 88,92 ****
              'X-Powered-By', "OpenInteract " . CTX->version );
      }
!     $apache->send_http_header( $self->content_type );
  }
  
--- 88,92 ----
              'X-Powered-By', "OpenInteract " . CTX->version );
      }
!     $apache->send_http_header( $self->content_type_header );
  }
  

Index: Apache2.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Response/Apache2.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Apache2.pm	2 Oct 2004 22:13:19 -0000	1.5
--- Apache2.pm	3 Oct 2004 00:15:24 -0000	1.6
***************
*** 82,86 ****
              'X-Powered-By', "OpenInteract " . CTX->version );
      }
!     $apache->content_type( $self->content_type );
      # From 1.x...
      #$apache->send_http_header( $self->content_type );
--- 82,86 ----
              'X-Powered-By', "OpenInteract " . CTX->version );
      }
!     $apache->content_type( $self->content_type_header );
      # From 1.x...
      #$apache->send_http_header( $self->content_type );

Index: CGI.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Response/CGI.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** CGI.pm	2 Oct 2004 22:13:19 -0000	1.18
--- CGI.pm	3 Oct 2004 00:15:24 -0000	1.19
***************
*** 83,87 ****
          push @header, "$key: $value";
      }
!     push @header, "Content-Type: " . $self->content_type;
      if ( CTX->server_config->{promote_oi} eq 'yes' ) {
          push @header, join( '', 'X-Powered-By: ', 'OpenInteract ', CTX->version );
--- 83,87 ----
          push @header, "$key: $value";
      }
!     push @header, "Content-Type: " . $self->content_type_header;
      if ( CTX->server_config->{promote_oi} eq 'yes' ) {
          push @header, join( '', 'X-Powered-By: ', 'OpenInteract ', CTX->version );

Index: LWP.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Response/LWP.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** LWP.pm	2 Oct 2004 22:13:19 -0000	1.20
--- LWP.pm	3 Oct 2004 00:15:24 -0000	1.21
***************
*** 53,74 ****
          $self->_set_lwp_headers;
          my $fh = IO::File->new( "< $filename" )
!                     || oi_error "Cannot open file [$filename]: $!";
          $self->client->send_file( $fh );
          $log->is_info &&
!             $log->info( "Sent file [$filename] directly to client" );
!         return;
!     }
!     $self->_set_lwp_headers;
!     $self->lwp_response->content(
!           ( ref $self->content ) ? ${ $self->content } : $self->content
!     );
!     if ( my $client = $self->client ) {
!         $client->send_response( $self->lwp_response );
!         $log->is_info &&
!             $log->info( "Sent response ok" );
      }
      else {
!         $log->is_info &&
!             $log->info( "Set content/headers but did not send content" );
      }
  }
--- 53,74 ----
          $self->_set_lwp_headers;
          my $fh = IO::File->new( "< $filename" )
!                     || oi_error "Cannot open file '$filename': $!";
          $self->client->send_file( $fh );
          $log->is_info &&
!             $log->info( "Sent file '$filename' directly to client" );
      }
      else {
!         $self->_set_lwp_headers;
!         $self->lwp_response->content(
!             ( ref $self->content ) ? ${ $self->content } : $self->content
!         );
!         if ( my $client = $self->client ) {
!             $client->send_response( $self->lwp_response );
!             $log->is_info && $log->info( "Sent response ok" );
!         }
!         else {
!             $log->is_info &&
!                 $log->info( "Set content/headers but did not send content" );
!         }
      }
  }
***************
*** 111,118 ****
--- 111,124 ----
      my $lwp_response = $self->lwp_response;
      $lwp_response->code( $self->status );
+ 
+     $self->content_type( 'text/html' ) unless ( $self->content_type );
+ 
      while ( my ( $name, $value ) = each %{ $self->header } ) {
          if ( ref $value eq 'ARRAY' ) {
              $lwp_response->push_header( $name => $_ ) for ( @{ $value } );
          }
+         elsif ( $name eq 'Content-Type' ) {
+             $lwp_response->header( $name => $self->content_type_header );
+         }
          else {
              $lwp_response->header( $name => $value );
***************
*** 122,126 ****
          $lwp_response->header( 'X-Powered-By' => 'OpenInteract ' . CTX->version );
      }
!     $log->debug( "Set response headers ok" );
      $self->_set_lwp_cookies;
  }
--- 128,132 ----
          $lwp_response->header( 'X-Powered-By' => 'OpenInteract ' . CTX->version );
      }
!     $log->is_debug && $log->debug( "Set response headers ok" );
      $self->_set_lwp_cookies;
  }
***************
*** 133,137 ****
          $self->lwp_response->push_header( 'Set-Cookie' => $_->as_string );
      }
!     $log->debug( "Set response cookies ok" );
  }
  
--- 139,143 ----
          $self->lwp_response->push_header( 'Set-Cookie' => $_->as_string );
      }
!     $log->is_debug && $log->debug( "Set response cookies ok" );
  }
  
***************
*** 150,161 ****
  =head1 METHODS
  
- =head1 BUGS
- 
- None known.
- 
- =head1 TO DO
- 
- Nothing known.
- 
  =head1 SEE ALSO
  
--- 156,159 ----

Index: Standalone.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Response/Standalone.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Standalone.pm	2 Oct 2004 22:13:19 -0000	1.13
--- Standalone.pm	3 Oct 2004 00:15:24 -0000	1.14
***************
*** 81,85 ****
          push @header, "$key: $value";
      }
!     push @header, "Content-Type: " . $self->content_type;
      if ( CTX->server_config->{promote_oi} eq 'yes' ) {
          push @header, join( '', 'X-Powered-By: ', 'OpenInteract ', CTX->version );
--- 81,85 ----
          push @header, "$key: $value";
      }
!     push @header, "Content-Type: " . $self->content_type_header;
      if ( CTX->server_config->{promote_oi} eq 'yes' ) {
          push @header, join( '', 'X-Powered-By: ', 'OpenInteract ', CTX->version );

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 Response.pm,1.24,1.25

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1532/OpenInteract2

Modified Files:
	Response.pm 
Log Message:
OIN-56: add 'charset' property to response; add 'content_type_header()' which will include the charset in the content-type header if the charset is set; modify all response implementations to call this header method and ignore the content-type header

Index: Response.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Response.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Response.pm	26 Sep 2004 19:26:18 -0000	1.24
--- Response.pm	3 Oct 2004 00:15:24 -0000	1.25
***************
*** 21,25 ****
  # back to the template worked out
  
! my @FIELDS = qw( status controller send_file send_filehandle content );
  __PACKAGE__->mk_accessors( @FIELDS, 'error_hold' );
  
--- 21,27 ----
  # back to the template worked out
  
! my @FIELDS = qw(
!     status controller send_file send_filehandle content charset
! );
  __PACKAGE__->mk_accessors( @FIELDS, 'error_hold' );
  
***************
*** 68,71 ****
--- 70,83 ----
  
  
+ sub content_type_header {
+     my ( $self ) = @_;
+     my $content_type = $self->content_type;
+     if ( $self->charset ) {
+         $content_type += "; " . $self->charset;
+     }
+     return $content_type;
+ }
+ 
+ 
  # TODO: We may want to dereference $self->{_header} before sending it
  # back, otherwise people can add headers directly to the hash. OTOH,
***************
*** 271,278 ****
--- 283,305 ----
  B<content_type( [ $content_type ] )>
  
+ Get/set the content type. This will be used in the header.
+ 
+ B<content_type_header>
+ 
+ Retrieve a content type usable for the header. This includes the
+ C<charset> if it has been set.
+ 
  B<header( [ $name, $value ] )>
  
+ If both arguments passed in, set the header C<$name> to C<$value>.
+ 
+ If only C<$name>, return its header value.
+ 
+ If neither, pass a hashref with all set headers.
+ 
  B<remove_header( $name )>
  
+ Deletes the header C<$name> from the response.
+ 
  B<is_redirect>
  
***************
*** 332,335 ****
--- 359,365 ----
   $response->content( \$foo );
  
+ B<charset> - Set the character set for this response. If unset we do
+ not pass it along with the content type.
+ 
  =head1 SUBCLASSING
  

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Manage/Website CreateSuperuserPassword.pm,1.10,1.11

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24246/lib/OpenInteract2/Manage/Website

Modified Files:
	CreateSuperuserPassword.pm 
Log Message:
OIN-44: die if the user class is using LDAP

Index: CreateSuperuserPassword.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage/Website/CreateSuperuserPassword.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CreateSuperuserPassword.pm	13 Jun 2004 18:19:54 -0000	1.10
--- CreateSuperuserPassword.pm	2 Oct 2004 23:22:28 -0000	1.11
***************
*** 56,59 ****
--- 56,64 ----
                   "is disabled. See administrator and/or docs for details.";
      }
+     my $user_class = CTX->lookup_object( 'user' );
+     if ( $user_class->isa( 'SPOPS::LDAP' ) ) {
+         oi_error "Sorry, you cannot change passwords for a user in an LDAP ",
+                  "directory. Please use another tool to do change the password."
+     }
  }
  
***************
*** 132,135 ****
--- 137,143 ----
  not run.
  
+ Also, if you are using LDAP to store your users you cannot use this to
+ change the superuser password.
+ 
  =head1 REQUIRED OPTIONS
  

[Openinteract-commits] CVS: OpenInteract2 MANIFEST,1.89,1.90

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22715

Modified Files:
	MANIFEST 
Log Message:
update package versions

Index: MANIFEST
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/MANIFEST,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** MANIFEST	2 Oct 2004 22:41:00 -0000	1.89
--- MANIFEST	2 Oct 2004 23:15:57 -0000	1.90
***************
*** 161,165 ****
  pkg/base_error-2.10.zip
  pkg/base_group-2.14.zip
! pkg/base_page-2.24.zip
  pkg/base_security-2.17.zip
  pkg/base_template-3.12.zip
--- 161,165 ----
  pkg/base_error-2.10.zip
  pkg/base_group-2.14.zip
! pkg/base_page-2.25.zip
  pkg/base_security-2.17.zip
  pkg/base_template-3.12.zip

[Openinteract-commits] CVS: OpenInteract2/t utils.pl,1.68,1.69

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/t
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22715/t

Modified Files:
	utils.pl 
Log Message:
update package versions

Index: utils.pl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/t/utils.pl,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** utils.pl	2 Oct 2004 22:41:00 -0000	1.68
--- utils.pl	2 Oct 2004 23:15:57 -0000	1.69
***************
*** 48,52 ****
           base_error      => '2.10',
           base_group      => '2.14',
!          base_page       => '2.24',
           base_security   => '2.17',
           base_template   => '3.12',
--- 48,52 ----
           base_error      => '2.10',
           base_group      => '2.14',
!          base_page       => '2.25',
           base_security   => '2.17',
           base_template   => '3.12',

[Openinteract-commits] CVS: OpenInteract2/pkg/base_page/template page_displayable.tmpl,1.1,1.2

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page/template
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22552/template

Modified Files:
	page_displayable.tmpl 
Log Message:
OIN-60: parse out the box declarations for a page into add/remove

Index: page_displayable.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/template/page_displayable.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** page_displayable.tmpl	25 Mar 2003 02:40:22 -0000	1.1
--- page_displayable.tmpl	2 Oct 2004 23:15:11 -0000	1.2
***************
*** 1,11 ****
  [% OI.page_title( page.title );
!    OI.main_template( page.main_template ); -%]
! [%- FOREACH box_name = boxes;
!         IF box_name.match( '^-' );
!             OI.box_remove( box_name );
!         ELSE;
!             OI.box_add( box_name );
!         END;
!     END -%]
! 
  [% content %]
--- 1,10 ----
  [% OI.page_title( page.title );
!    OI.main_template( page.main_template );
!    FOREACH box_name = box_add;
!        OI.box_add( box_name );
!    END;
!    FOREACH box_name = box_remove;
!        OI.box_remove( box_name );
!    END;
! -%]
  [% content %]

[Openinteract-commits] CVS: OpenInteract2/pkg/base_page/OpenInteract2/Action Page.pm,1.20,1.21

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page/OpenInteract2/Action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22552/OpenInteract2/Action

Modified Files:
	Page.pm 
Log Message:
OIN-60: parse out the box declarations for a page into add/remove

Index: Page.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/OpenInteract2/Action/Page.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Page.pm	2 Oct 2004 22:38:34 -0000	1.20
--- Page.pm	2 Oct 2004 23:15:11 -0000	1.21
***************
*** 750,757 ****
      # Use page metadata to modify display
  
!     my @boxes = grep { $_ } map { s/^\s+// }
!                                 split( /\s+/, $page->{boxes} );
  
!     my %params = ( boxes => \@boxes, page => $page );
  
      # Grab content we're actually going to show
--- 750,773 ----
      # Use page metadata to modify display
  
!     $page->{boxes} ||= [];
!     my @box_add    = ();
!     my @box_remove = ();
!     foreach ( @{ $page->{boxes} } ) {
!         s/^\s+//;
!         s/\s+$//;
!         if ( /^\-/ ) {
!             push @box_remove, $_;
!         }
!         else {
!             s/^\+//;
!             push @box_add, $_;
!         }
!     }
  
!     my %params = (
!         box_add    => \@box_add,
!         box_remove => \@box_remove,
!         page       => $page,
!     );
  
      # Grab content we're actually going to show

[Openinteract-commits] CVS: OpenInteract2/pkg/base_page Changes,1.23,1.24 package.conf,1.24,1.25

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22552

Modified Files:
	Changes package.conf 
Log Message:
OIN-60: parse out the box declarations for a page into add/remove

Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/Changes,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Changes	2 Oct 2004 22:38:35 -0000	1.23
--- Changes	2 Oct 2004 23:15:11 -0000	1.24
***************
*** 1,4 ****
--- 1,9 ----
  Revision history for OpenInteract package base_page.
  
+ 2.25  Sat Oct  2 19:12:18 EDT 2004
+ 
+       OIN-60: have the page action put the box declarations attached
+       to a page in 'box_remove' and 'box_add' buckets
+ 
  2.24  Sat Oct  2 18:29:55 EDT 2004
  

Index: package.conf
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/package.conf,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** package.conf	2 Oct 2004 22:38:35 -0000	1.24
--- package.conf	2 Oct 2004 23:15:11 -0000	1.25
***************
*** 1,4 ****
  name             base_page
! version          2.24
  author           Chris Winters <ch...@cw...>
  module           File::Basename
--- 1,4 ----
  name             base_page
! version          2.25
  author           Chris Winters <ch...@cw...>
  module           File::Basename

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/TT2 Provider.pm,1.4,1.5

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/TT2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17440

Modified Files:
	Provider.pm 
Log Message:
OIN-73: sync up the HEAD/TAIL with how TT2 does it

Index: Provider.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/TT2/Provider.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Provider.pm	18 Feb 2004 05:25:28 -0000	1.4
--- Provider.pm	2 Oct 2004 22:59:00 -0000	1.5
***************
*** 215,220 ****
      $log ||= get_logger( LOG_TEMPLATE );
  
!     $log->is_debug &&
!         $log->debug( "_refresh([ @$slot ])" );
  
      # If the cache time has expired reload the entry
--- 215,219 ----
      $log ||= get_logger( LOG_TEMPLATE );
  
!     $log->is_debug && $log->debug( "_refresh([ @$slot ])" );
  
      # If the cache time has expired reload the entry
***************
*** 225,236 ****
                           || DEFAULT_MAX_CACHE_TIME;
  	my ( $data, $error );
! 	if ( ( $slot->[ DATA ]->{time} - time ) > $max_cache_time ) {
          $log->is_debug &&
!             $log->debug( "Refresh cache for: $slot->[ NAME ]" );
          ( $data, $error ) = $self->_load( $slot->[ NAME ] );
-         ( $data, $error ) = $self->_compile( $data )  unless ( $error );
          unless ( $error ) {
!             $slot->[ DATA ] = $data->{data};
!             $slot->[ LOAD ] = $data->{time};
          }
  	}
--- 224,239 ----
                           || DEFAULT_MAX_CACHE_TIME;
  	my ( $data, $error );
!     my $elapsed_time = $slot->[ DATA ]->{time} - time;
! 	if ( $elapsed_time > $max_cache_time ) {
          $log->is_debug &&
!             $log->debug( "Doing refresh for ", $slot->[ NAME ], " ",
!                          "because $elapsed_time > $max_cache_time" );
          ( $data, $error ) = $self->_load( $slot->[ NAME ] );
          unless ( $error ) {
!             ( $data, $error ) = $self->_compile( $data );
!             unless ( $error ) {
!                 $slot->[ DATA ] = $data->{data};
!                 $slot->[ LOAD ] = $data->{time};
!             }
          }
  	}
***************
*** 238,261 ****
  	# remove existing slot from usage chain...
  
! 	if ( $slot->[ PREV ] ) {
! 		$slot->[ PREV ][ NEXT ] = $slot->[ NEXT ];
! 	}
!     else {
! 		$self->{HEAD} = $slot->[ NEXT ];
! 	}
  
! 	if ( $slot->[ NEXT ] ) {
! 		$slot->[ NEXT ][ PREV ] = $slot->[ PREV ];
! 	}
!     else {
! 		$self->{TAIL} = $slot->[ PREV ];
! 	}
  
- 	# ... and add to start of list
- 	my $head = $self->{ HEAD };
- 	$head->[ PREV ] = $slot if ( $head );
- 	$slot->[ PREV ] = undef;
- 	$slot->[ NEXT ] = $head;
- 	$self->{HEAD} = $slot;
  	return ( $data, $error );
  }
--- 241,266 ----
  	# remove existing slot from usage chain...
  
!     unless( $self->{ HEAD } == $slot ) {
!         if ( $slot->[ PREV ] ) {
!             $slot->[ PREV ][ NEXT ] = $slot->[ NEXT ];
!         }
!         else {
!             $self->{HEAD} = $slot->[ NEXT ];
!         }
!         if ( $slot->[ NEXT ] ) {
!             $slot->[ NEXT ][ PREV ] = $slot->[ PREV ];
!         }
!         else {
!             $self->{TAIL} = $slot->[ PREV ];
!         }
  
!         # ... and add to start of list
!         my $head = $self->{HEAD};
!         $head->[ PREV ] = $slot if ( $head );
!         $slot->[ PREV ] = undef;
!         $slot->[ NEXT ] = $head;
!         $self->{HEAD} = $slot;
!     }
  
  	return ( $data, $error );
  }
***************
*** 428,430 ****
  Robert McArthur E<lt>mca...@ds...E<gt>
  
! Authors of Slashcode L<http://www.slashcode.com/|http://www.slashcode.com/>
\ No newline at end of file
--- 433,435 ----
  Robert McArthur E<lt>mca...@ds...E<gt>
  
! Authors of Slashcode L<http://www.slashcode.com/|http://www.slashcode.com/>

[Openinteract-commits] CVS: OpenInteract2/t utils.pl,1.67,1.68

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/t
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13539/t

Modified Files:
	utils.pl 
Log Message:
update package versions

Index: utils.pl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/t/utils.pl,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** utils.pl	27 Sep 2004 13:19:40 -0000	1.67
--- utils.pl	2 Oct 2004 22:41:00 -0000	1.68
***************
*** 48,52 ****
           base_error      => '2.10',
           base_group      => '2.14',
!          base_page       => '2.23',
           base_security   => '2.17',
           base_template   => '3.12',
--- 48,52 ----
           base_error      => '2.10',
           base_group      => '2.14',
!          base_page       => '2.24',
           base_security   => '2.17',
           base_template   => '3.12',

[Openinteract-commits] CVS: OpenInteract2 MANIFEST,1.88,1.89

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13539

Modified Files:
	MANIFEST 
Log Message:
update package versions

Index: MANIFEST
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/MANIFEST,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** MANIFEST	27 Sep 2004 13:19:40 -0000	1.88
--- MANIFEST	2 Oct 2004 22:41:00 -0000	1.89
***************
*** 161,165 ****
  pkg/base_error-2.10.zip
  pkg/base_group-2.14.zip
! pkg/base_page-2.23.zip
  pkg/base_security-2.17.zip
  pkg/base_template-3.12.zip
--- 161,165 ----
  pkg/base_error-2.10.zip
  pkg/base_group-2.14.zip
! pkg/base_page-2.24.zip
  pkg/base_security-2.17.zip
  pkg/base_template-3.12.zip

[Openinteract-commits] CVS: OpenInteract2/pkg/base_page/template edit_document_box.tmpl,1.4,1.5

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page/template
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13015/template

Modified Files:
	edit_document_box.tmpl 
Log Message:
OIN-64: ensure that we don't display empty links when we don't have
access to a 'page' variable


Index: edit_document_box.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/template/edit_document_box.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** edit_document_box.tmpl	10 Jun 2003 04:17:19 -0000	1.4
--- edit_document_box.tmpl	2 Oct 2004 22:38:34 -0000	1.5
***************
*** 1,6 ****
  [%- DEFAULT theme  = OI.theme_properties;
      new_url        = OI.make_url( ACTION = 'page',
!                                   TASK   = 'display_add' );
!     edit_url       = OI.make_url( ACTION   = 'page',
                                    TASK     = 'display_form',
                                    location = page.location );
--- 1,9 ----
  [%- DEFAULT theme  = OI.theme_properties;
      new_url        = OI.make_url( ACTION = 'page',
!                                   TASK   = 'display_add' ); -%]
! [% theme.bullet %] <a href="[% new_url %]">Create a new document</a><br>
! [% IF page %]
! 
! [%- edit_url       = OI.make_url( ACTION   = 'page',
                                    TASK     = 'display_form',
                                    location = page.location );
***************
*** 12,20 ****
                                    TASK         = 'display',
                                    object_class = page_info.class,
!                                   object_id    = page.location  );
!  -%]
! [% theme.bullet %] <a href="[% new_url %]">Create a new document</a><br>
  Following actions apply to the document onscreen<br>
  [% theme.bullet %] <a href="[% edit_url %]">Edit this document</a><br>
  [% theme.bullet %] <a href="[% remove_url %]">Remove this document</a><br>
  [% theme.bullet %] <a href="[% security_url %]">Check document security</a>
--- 15,23 ----
                                    TASK         = 'display',
                                    object_class = page_info.class,
!                                   object_id    = page.location  ); -%]
  Following actions apply to the document onscreen<br>
  [% theme.bullet %] <a href="[% edit_url %]">Edit this document</a><br>
  [% theme.bullet %] <a href="[% remove_url %]">Remove this document</a><br>
  [% theme.bullet %] <a href="[% security_url %]">Check document security</a>
+ 
+ [% END %]
\ No newline at end of file

[Openinteract-commits] CVS: OpenInteract2/pkg/base_page/OpenInteract2/Action Page.pm,1.19,1.20

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page/OpenInteract2/Action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13015/OpenInteract2/Action

Modified Files:
	Page.pm 
Log Message:
OIN-64: ensure that we don't display empty links when we don't have
access to a 'page' variable


Index: Page.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/OpenInteract2/Action/Page.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Page.pm	6 Jun 2004 06:08:58 -0000	1.19
--- Page.pm	2 Oct 2004 22:38:34 -0000	1.20
***************
*** 1088,1111 ****
  B<directory_list>: implemented in this class
  
! B<search_form>: implemented in
! L<OpenInteract2::Action::Common|OpenInteract2::Action::Common>
  
! B<search>: implemented in
! L<OpenInteract2::Action::Common|OpenInteract2::Action::Common>
  
  B<display>: implemented in this class
  
! B<edit>: implemented in
! L<OpenInteract2::Action::Common|OpenInteract2::Action::Common>
  
! B<remove>: implemented in
! L<OpenInteract2::Action::Common|OpenInteract2::Action::Common>
  
! B<notify>: implemented in
! L<OpenInteract2::Action::Common|OpenInteract2::Action::Common>
  
  =head1 SEE ALSO
  
! L<OpenInteract2::Action::Common|OpenInteract2::Action::Common>
  
  =head1 COPYRIGHT
--- 1088,1106 ----
  B<directory_list>: implemented in this class
  
! B<search_form>: implemented in L<OpenInteract2::Action::CommonSearch>
  
! B<search>: implemented in L<OpenInteract2::Action::CommonSearch>
  
  B<display>: implemented in this class
  
! B<display_form>: implemented in L<OpenInteract2::Action::CommonUpdate>
  
! B<remove>: implemented in L<OpenInteract2::Action::CommonRemove>
  
! B<notify>: implemented in L<OpenInteract2::Action::Common>
  
  =head1 SEE ALSO
  
! L<OpenInteract2::Action::Common>
  
  =head1 COPYRIGHT

[Openinteract-commits] CVS: OpenInteract2/pkg/base_page package.conf,1.23,1.24 Changes,1.22,1.23

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/base_page
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13015

Modified Files:
	package.conf Changes 
Log Message:
OIN-64: ensure that we don't display empty links when we don't have
access to a 'page' variable


Index: package.conf
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/package.conf,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** package.conf	10 Jun 2004 22:13:33 -0000	1.23
--- package.conf	2 Oct 2004 22:38:35 -0000	1.24
***************
*** 1,4 ****
  name             base_page
! version          2.23
  author           Chris Winters <ch...@cw...>
  module           File::Basename
--- 1,4 ----
  name             base_page
! version          2.24
  author           Chris Winters <ch...@cw...>
  module           File::Basename

Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/base_page/Changes,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Changes	10 Jun 2004 22:13:33 -0000	1.22
--- Changes	2 Oct 2004 22:38:35 -0000	1.23
***************
*** 1,4 ****
--- 1,9 ----
  Revision history for OpenInteract package base_page.
  
+ 2.24  Sat Oct  2 18:29:55 EDT 2004
+ 
+       OIN-64: ensure the 'page' gets passed to the
+       'edit_document_box'.
+ 
  2.23  Tue Jun  8 21:17:42 EDT 2004
  

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 URL.pm,1.22,1.23

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9806

Modified Files:
	URL.pm 
Log Message:
OIN-79: escape query argument names in addition to the values

Index: URL.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/URL.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** URL.pm	27 Sep 2004 03:35:14 -0000	1.22
--- URL.pm	2 Oct 2004 22:24:15 -0000	1.23
***************
*** 125,129 ****
  
  	my $query = join( QUERY_ARG_SEPARATOR,
!                       map  { "$_=" . _url_escape( $params->{ $_ } ) }
                        grep { defined $params->{ $_ } }
                        keys %{ $params } );
--- 125,129 ----
  
  	my $query = join( QUERY_ARG_SEPARATOR,
!                       map  { _url_escape( $_ ) . "=" . _url_escape( $params->{ $_ } ) }
                        grep { defined $params->{ $_ } }
                        keys %{ $params } );