openinteract-commits — CVS updates for OpenInteract/SPOPS

[Openinteract-commits] CVS: OpenInteract/pkg/base_user Changes,1.25,1.26 package.conf,1.25,1.26

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

Update of /cvsroot/openinteract/OpenInteract/pkg/base_user
In directory usw-pr-cvs1:/tmp/cvs-serv30905/pkg/base_user

Modified Files:
	Changes package.conf 
Log Message:
fix the LDAP user to check the password in the right datasource


Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_user/Changes,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Changes	2001/10/23 14:28:45	1.25
--- Changes	2001/10/25 15:29:10	1.26
***************
*** 1,4 ****
--- 1,9 ----
  Revision history for OpenInteract package base_user.
  
+ 1.40  Tue Oct 23 13:20:57 EDT 2001
+ 
+       Minor change so that the connection can be made to check the
+       password in OI/User/LDAP.pm
+ 
  1.39  Tue Oct 23 09:13:32 EDT 2001
  

Index: package.conf
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_user/package.conf,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** package.conf	2001/10/23 14:28:45	1.25
--- package.conf	2001/10/25 15:29:10	1.26
***************
*** 1,4 ****
  name           base_user
! version        1.39
  author         Chris Winters (ch...@cw...)
  url            http://www.openinteract.org/
--- 1,4 ----
  name           base_user
! version        1.40
  author         Chris Winters (ch...@cw...)
  url            http://www.openinteract.org/

[Openinteract-commits] CVS: OpenInteract/template label_form_date_row,1.2,1.3 label_form_textarea_row,1.2,1.3 table_bordered_begin,1.1,1.2

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

Update of /cvsroot/openinteract/OpenInteract/template
In directory usw-pr-cvs1:/tmp/cvs-serv30246/template

Modified Files:
	label_form_date_row label_form_textarea_row 
	table_bordered_begin 
Log Message:
template changes


Index: label_form_date_row
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/template/label_form_date_row,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** label_form_date_row	2001/10/18 12:12:44	1.2
--- label_form_date_row	2001/10/25 15:27:01	1.3
***************
*** 7,11 ****
  [%- INCLUDE label_row_begin( colspan = 1 ) -%]
  [%- INCLUDE data_cell_begin -%]
! [%- PROCESS date_select( object = OI.date_info_object( value ),
                           field_prefix = name ) -%]
  [% field_label -%]
--- 7,11 ----
  [%- INCLUDE label_row_begin( colspan = 1 ) -%]
  [%- INCLUDE data_cell_begin -%]
! [%- PROCESS date_select( object = OI.date_into_object( value ),
                           field_prefix = name ) -%]
  [% field_label -%]

Index: label_form_textarea_row
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/template/label_form_textarea_row,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** label_form_textarea_row	2001/10/09 00:52:45	1.2
--- label_form_textarea_row	2001/10/25 15:27:01	1.3
***************
*** 14,18 ****
  <tr bgcolor="[% INCLUDE row_color %]" align="[% align %]">
    [% END -%]
!     <td align="left" colspan="[% colspan %]">
        [%- INCLUDE form_textarea -%]
      </td>
--- 14,18 ----
  <tr bgcolor="[% INCLUDE row_color %]" align="[% align %]">
    [% END -%]
!     <td align="center" colspan="[% colspan %]">
        [%- INCLUDE form_textarea -%]
      </td>

Index: table_bordered_begin
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/template/table_bordered_begin,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** table_bordered_begin	2001/10/08 20:20:00	1.1
--- table_bordered_begin	2001/10/25 15:27:01	1.2
***************
*** 9,13 ****
      DEFAULT border_color = theme.border_color;
      DEFAULT bgcolor      = theme.bgcolor;
!     SET width = ( table_width ) ? "width='$table_width'" : ''  -%]
  <table border="0" cellspacing="0" [% width -%]
         bgcolor="[% border_color %]" 
--- 9,15 ----
      DEFAULT border_color = theme.border_color;
      DEFAULT bgcolor      = theme.bgcolor;
!     DEFAULT internal_padding = 5;
!     SET internal_padding = '0' IF internal_padding == 'none';
!     SET width = ( table_width ) ? "width='$table_width'" : '' -%]
  <table border="0" cellspacing="0" [% width -%]
         bgcolor="[% border_color %]" 
***************
*** 16,19 ****
  
    <table border="0" width="100%"          
!          cellpadding="5" cellspacing="0"
           bgcolor="[% bgcolor %]">
--- 18,21 ----
  
    <table border="0" width="100%"          
!          cellpadding="[% internal_padding %]" cellspacing="0"
           bgcolor="[% bgcolor %]">

[Openinteract-commits] CVS: OpenInteract/OpenInteract/Template Process.pm,1.16,1.17

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

Update of /cvsroot/openinteract/OpenInteract/OpenInteract/Template
In directory usw-pr-cvs1:/tmp/cvs-serv29890/OpenInteract/Template

Modified Files:
	Process.pm 
Log Message:
just a debugging item to tell whether we're using a scalar ref or not


Index: Process.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/Template/Process.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Process.pm	2001/10/24 21:54:00	1.16
--- Process.pm	2001/10/25 15:25:51	1.17
***************
*** 93,97 ****
                          ? $template_source->{text} : \$template_source->{text};
          $name       = '_anonymous_';
!         $R->DEBUG && $R->scrib( 1, "Using raw template source for processing" );
      }
      elsif ( $template_source->{object} ) {
--- 93,98 ----
                          ? $template_source->{text} : \$template_source->{text};
          $name       = '_anonymous_';
!         $R->DEBUG && $R->scrib( 1, "Using raw template source (",
!                                    ref $template_source->{text}, ") for processing" );
      }
      elsif ( $template_source->{object} ) {

[Openinteract-commits] CVS: OpenInteract/OpenInteract/SPOPS DBI.pm,1.7,1.8

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

Update of /cvsroot/openinteract/OpenInteract/OpenInteract/SPOPS
In directory usw-pr-cvs1:/tmp/cvs-serv29728/OpenInteract/SPOPS

Modified Files:
	DBI.pm 
Log Message:
check the server config for the datasource name too


Index: DBI.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/SPOPS/DBI.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DBI.pm	2001/10/17 04:47:07	1.7
--- DBI.pm	2001/10/25 15:25:14	1.8
***************
*** 11,16 ****
  sub global_datasource_handle {
      my ( $self, $connect_key ) = @_;
!     $connect_key ||= $self->CONFIG->{datasource};
!     return OpenInteract::Request->instance->db( $connect_key );
  }
  
--- 11,18 ----
  sub global_datasource_handle {
      my ( $self, $connect_key ) = @_;
!     my $R = OpenInteract::Request->instance;
!     $connect_key ||= $self->CONFIG->{datasource} ||
!                      $R->CONFIG->{datasource}{default_connection_db};
!     return $R->db( $connect_key );
  }
  

[Openinteract-commits] CVS: OpenInteract MANIFEST,1.67,1.68

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

Update of /cvsroot/openinteract/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv29144

Modified Files:
	MANIFEST 
Log Message:
added templates


Index: MANIFEST
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/MANIFEST,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** MANIFEST	2001/10/18 13:49:41	1.67
--- MANIFEST	2001/10/25 15:23:46	1.68
***************
*** 29,33 ****
  conf/sample-Stash.pm
  doc/README
! doc/fruit-0.07.tar.gz
  doc/database.html
  doc/data_import.html
--- 29,33 ----
  conf/sample-Stash.pm
  doc/README
! doc/fruit-0.09.tar.gz
  doc/database.html
  doc/data_import.html
***************
*** 49,53 ****
  doc/templates.html
  doc/template_widgets.html
! eg/fruit-0.07.tar.gz
  eg/new_package_repository.pl
  OpenInteract.pm
--- 49,53 ----
  doc/templates.html
  doc/template_widgets.html
! eg/fruit-0.09.tar.gz
  eg/new_package_repository.pl
  OpenInteract.pm
***************
*** 109,112 ****
--- 109,115 ----
  template/date_select
  template/error_message
+ template/error_not_found
+ template/error_task_forbidden
+ template/error_task_no_default
  template/form_checkbox
  template/form_hidden
***************
*** 124,127 ****
--- 127,131 ----
  template/form_text
  template/form_textarea
+ template/form_upload
  template/global_javascript
  template/header_cell

[Openinteract-commits] CVS: OpenInteract OpenInteract.pm,1.14,1.15

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

Update of /cvsroot/openinteract/OpenInteract
In directory usw-pr-cvs1:/tmp/cvs-serv29059

Modified Files:
	OpenInteract.pm 
Log Message:
add the 'is_admin' check in setup_authentication()


Index: OpenInteract.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** OpenInteract.pm	2001/10/17 04:47:07	1.14
--- OpenInteract.pm	2001/10/25 15:23:29	1.15
***************
*** 9,13 ****
  @OpenInteract::ISA      = ();
  $OpenInteract::VERSION  = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);
! $OpenInteract::DIST_VERSION = '1.28';
  
  # Generic separator used in display
--- 9,13 ----
  @OpenInteract::ISA      = ();
  $OpenInteract::VERSION  = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);
! $OpenInteract::DIST_VERSION = '1.31';
  
  # Generic separator used in display
***************
*** 264,282 ****
  sub setup_authentication {
      my ( $class, $R ) = @_;
!     unless ( $R->auth ) {
!         my $error_msg = "Authentication cannot be setup! Please ensure 'auth' is setup in your " .
!                         "server configuration under 'system_alias'";
!         $R->send_html( $R->apache, $error_msg, $R );
!         die OK . "\n";
      }
!     eval {
!         $R->auth->user;
!         $R->auth->group;
!     };
!     if ( $@ ) {
!         $R->send_html( $R->apache, $@, $R );
!         die OK . "\n";
      }
!     return undef;
  }
  
--- 264,284 ----
  sub setup_authentication {
      my ( $class, $R ) = @_;
!     my ( $error_msg );
!     if ( my $auth_class = $R->auth ) {
!         eval {
!             $auth_class->user;
!             $auth_class->group;
!             $auth_class->is_admin;
!         };
!         $error_msg = $@;
      }
!     else {
!         $error_msg = "Authentication cannot be setup! Please ensure 'auth' " .
!                      "is setup in your server configuration under 'system_alias'";
      }
!     return undef unless ( $error_msg );
! 
!     $R->send_html( $R->apache, $error_msg, $R );
!     die OK . "\n";
  }
  
***************
*** 455,459 ****
  
  B<setup_authentication( $R )>: Authenticate the user and get the
! groups the user belongs to.
  
  Return: nothing
--- 457,462 ----
  
  B<setup_authentication( $R )>: Authenticate the user and get the
! groups the user belongs to, plus set for this request whether the user
! is an administrator.
  
  Return: nothing

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

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

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/template
In directory usw-pr-cvs1:/tmp/cvs-serv28359/template

Modified Files:
	page_form.tmpl 
Log Message:
works with non-html files now, so you can upload PDFs (or whatever) to
your site in the same tree as everything else


Index: page_form.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/template/page_form.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** page_form.tmpl	2001/10/25 14:58:28	1.4
--- page_form.tmpl	2001/10/25 15:21:32	1.5
***************
*** 59,66 ****
--- 59,71 ----
  
  [%- count = count + 1 -%]
+ [% IF non_editable %]
+ [% INCLUDE label_text_row( label = 'Document',
+                             text = 'This is a non-editable document. To modify the content, upload a new version.' ) -%]
+ [% ELSE -%]
  [% INCLUDE label_form_textarea_row( label = 'Document', name = 'content',
                                      value = OI.html_encode( page.content ),
                                      cols = 70, rows = 18,
                                      colspan = 2, wrap = 'virtual' ) -%]
+ [% END -%]
  
  [%- count = count + 1 -%]

[Openinteract-commits] CVS: OpenInteract/pkg/base_page/OpenInteract/Handler Page.pm,1.5,1.6

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

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Handler
In directory usw-pr-cvs1:/tmp/cvs-serv28359/OpenInteract/Handler

Modified Files:
	Page.pm 
Log Message:
works with non-html files now, so you can upload PDFs (or whatever) to
your site in the same tree as everything else


Index: Page.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Handler/Page.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Page.pm	2001/10/25 14:58:50	1.5
--- Page.pm	2001/10/25 15:21:32	1.6
***************
*** 146,153 ****
--- 146,160 ----
                                     $upload->size, ") Type: (", $upload->type, ")" );
          $page->{content} = $upload->fh;
+         $page->{mime_type} = $upload->type;
      }
  
      $page->{mime_type} ||= 'text/html';
  
+     # Non-displayable docs always get saved to the filesystem (for now)
+ 
+     unless ( $class->_is_displayable( $page->{mime_type} ) ) {
+         $page->{is_file} = 'yes';
+     }
+ 
      return ( OK, \%opts );
  }
***************
*** 192,196 ****
      }
  
!     $page ||= $R->page->new;
  
      # If we specified that we're going to send a separate file to the
--- 199,220 ----
      }
  
!     # Now we have a page; just check to see if we were instructed to
!     # display the editable form for this page, and if so ensure this
!     # user can do so.
! 
!     if ( $do_edit ) {
!         if ( $class->_is_displayable( $page->{mime_type} ) ) {
!             $page->content;
!         }
!         else {
!             $params->{non_editable} = 1;
!         }
!         $R->DEBUG && $R->scrib( 1, "This page should be in an editable form" );
!         $page ||= $R->page->new;
!         $page->{is_file} ||= 'yes' if ( $page->CONFIG->{default_storage} eq 'file' );
!         $params->{page} = $page;
!         $R->{page}{title}   = 'Edit a Document';
!         return $R->template->handler( {}, $params, { name => 'base_page::page_form' } );
!     }
  
      # If we specified that we're going to send a separate file to the
***************
*** 198,203 ****
      # quit processing
  
!     unless ( $class->_is_displayable( $page ) ) {
!         $R->{page}{send_file} = $page->{location};
          $R->DEBUG && $R->scrib( 1, "File being retrieved is not directly displayable.",
                                     "Set 'send_file' to ($page->{location})" );
--- 222,228 ----
      # quit processing
  
!     unless ( $class->_is_displayable( $page->{mime_type} ) ) {
!         $R->{page}{content_type} = $page->{mime_type};
!         $R->{page}{send_file}    = join( '', $R->CONFIG->get_dir( 'html' ), $page->{location} );
          $R->DEBUG && $R->scrib( 1, "File being retrieved is not directly displayable.",
                                     "Set 'send_file' to ($page->{location})" );
***************
*** 209,227 ****
      $page->content;
  
-     # Now figure out if we're editing or not
- 
-     # Now we have a page; just check to see if we were instructed to
-     # display the editable form for this page, and if so ensure this
-     # user can do so.
- 
-     if ( $do_edit ) {
-         $R->DEBUG && $R->scrib( 1, "This page should be in an editable form" );
-         $page ||= $R->page->new;
-         $page->{is_file} ||= 'yes' if ( $page->CONFIG->{default_storage} eq 'file' );
-         $params->{page} = $page;
-         $R->{page}{title}   = 'Edit a Document';
-         return $R->template->handler( {}, $params, { name => 'base_page::page_form' } );
-     }
- 
      # Otherwise, ensure the page is active, set metadata and send it
      # off to be displayed
--- 234,237 ----
***************
*** 258,264 ****
  
  sub _is_displayable {
!     my ( $class, $page ) = @_;
!     return 1 unless ( $page->{mime_type} );
!     return 1 if ( $DISPLAY_TYPES{ $page->{mime_type} } );
      return undef;
  }
--- 268,274 ----
  
  sub _is_displayable {
!     my ( $class, $mime_type) = @_;
!     return 1 unless ( $mime_type );
!     return 1 if ( $DISPLAY_TYPES{ $mime_type } );
      return undef;
  }

[Openinteract-commits] CVS: OpenInteract/pkg/base_page Changes,1.4,1.5 package.conf,1.4,1.5

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

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page
In directory usw-pr-cvs1:/tmp/cvs-serv28359

Modified Files:
	Changes package.conf 
Log Message:
works with non-html files now, so you can upload PDFs (or whatever) to
your site in the same tree as everything else


Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/Changes,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Changes	2001/10/25 14:57:46	1.4
--- Changes	2001/10/25 15:21:32	1.5
***************
*** 1,4 ****
--- 1,11 ----
  Revision history for OpenInteract package base_page.
  
+ 0.16  Thu Oct 25 11:35:39 EDT 2001
+ 
+ 0.15  Thu Oct 25 11:21:50 EDT 2001
+ 
+       Enable the mime-type to be retrieved from an upload, and all
+       non-displayable pages get put into the filesystem.
+ 
  0.14  Thu Oct 25 11:00:43 EDT 2001
  

Index: package.conf
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/package.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** package.conf	2001/10/25 14:57:46	1.4
--- package.conf	2001/10/25 15:21:32	1.5
***************
*** 1,4 ****
  name             base_page
! version          0.14
  author           Chris Winters <ch...@cw...>
  module           File::Basename
--- 1,4 ----
  name             base_page
! version          0.16
  author           Chris Winters <ch...@cw...>
  module           File::Basename

[Openinteract-commits] CVS: OpenInteract/pkg/base_page/OpenInteract/Page Database.pm,1.3,1.4 File.pm,1.3,1.4

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

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Page
In directory usw-pr-cvs1:/tmp/cvs-serv22007/OpenInteract/Page

Modified Files:
	Database.pm File.pm 
Log Message:
deal with uploaded files


Index: Database.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Page/Database.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Database.pm	2001/10/24 23:04:14	1.3
--- Database.pm	2001/10/25 14:58:50	1.4
***************
*** 23,27 ****
      my $page_content = eval { $self->page_content } || $R->page_content->new;
      $page_content->{location} = $self->{location};
!     $page_content->{content}  = $content;
      return $page_content->save;
  }
--- 23,40 ----
      my $page_content = eval { $self->page_content } || $R->page_content->new;
      $page_content->{location} = $self->{location};
! 
!     if ( ! ref $content ) {
!         $page_content->{content} = $content;
!     }
! 
!     elsif ( ref $content eq 'SCALAR' ) {
!         $page_content->{content} = $$content;
!     }
! 
!     else {
!         local $/ = undef;
!         $page_content->{content} = <$content>;
!     }
! 
      return $page_content->save;
  }

Index: File.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Page/File.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** File.pm	2001/10/24 23:04:15	1.3
--- File.pm	2001/10/25 14:58:50	1.4
***************
*** 4,7 ****
--- 4,9 ----
  
  use strict;
+ use File::Basename;
+ use File::Path;
  
  # Use this to mark the beginning and end of the "good" content in a
***************
*** 64,69 ****
          }
      }
      open( NEW, "> $tmp_location" ) || die "Cannot open temp file for writing: $!";
!     print NEW $content;
      close( NEW );
      $R->DEBUG && $R->scrib( 1, "Wrote content to file ok." );
--- 66,94 ----
          }
      }
+ 
+     # Ensure the directory where this will go exists
+ 
+     _create_location_path( $full_location );
+ 
      open( NEW, "> $tmp_location" ) || die "Cannot open temp file for writing: $!";
! 
!     $R->DEBUG && $R->scrib( 1, "Content isa: ", ref $content );
! 
!     if ( ! ref $content ) {
!         print NEW $content;
!     }
! 
!     elsif ( ref $content eq 'SCALAR' ) {
!         print NEW $$content;
!     }
! 
!     else {
!         my ( $data );
!         binmode $content;
!         while ( read( $content, $data, 1024 ) ) {
!             print NEW $data;
!         }
!     }
! 
      close( NEW );
      $R->DEBUG && $R->scrib( 1, "Wrote content to file ok." );
***************
*** 99,102 ****
--- 124,147 ----
      $R->DEBUG && $R->scrib( 1, "Trying to find filesystem location for ($html_dir) ($self->{location})" );
      return join( '', $html_dir, $self->{location} );
+ }
+ 
+ sub _create_location_path {
+     my ( $location ) = @_;
+     my $R = OpenInteract::Request->instance;
+     $R->DEBUG && $R->scrib( 1, "See if ($location) exists or needs created" );
+ 
+     my $dirname = File::Basename::dirname( $location );
+     if ( -d $dirname ) {
+         $R->DEBUG && $R->scrib( 1, "Path for ($location) already exists" );
+         return 1;
+     }
+ 
+     eval { File::Path::mkpath( $dirname, undef, 0775 ) };
+     unless ( $@ ) {
+         $R->DEBUG && $R->scrib( 1, "Path for ($location) created ok" );
+         return 1;
+     }
+     $R->scrib( 0, "Cannot create path ($dirname): $@" );
+     die $@;
  }
  

[Openinteract-commits] CVS: OpenInteract/pkg/base_page/OpenInteract/Handler Page.pm,1.4,1.5

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

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Handler
In directory usw-pr-cvs1:/tmp/cvs-serv22007/OpenInteract/Handler

Modified Files:
	Page.pm 
Log Message:
deal with uploaded files


Index: Page.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Handler/Page.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Page.pm	2001/10/24 23:04:14	1.4
--- Page.pm	2001/10/25 14:58:50	1.5
***************
*** 46,49 ****
--- 46,52 ----
  sub MY_ALLOW_SEARCH_FORM       { return 1 }
  sub MY_ALLOW_SEARCH            { return 1 }
+ sub MY_ALLOW_CREATE            { return 1 }
+ sub MY_OBJECT_CREATE_SECURITY  { return SEC_LEVEL_WRITE }
+ sub MY_ALLOW_SHOW              { return 1 }
  sub MY_ALLOW_EDIT              { return 1 }
  sub MY_ALLOW_REMOVE            { return 1 }
***************
*** 106,109 ****
--- 109,114 ----
  sub _edit_customize {
      my ( $class, $page, $old_data ) = @_;
+     my $R = OpenInteract::Request->instance;
+ 
      my %opts = ();
  
***************
*** 121,124 ****
--- 126,153 ----
          $page->{expires_on} = $expire_date->strftime( '%Y-%m-%d' );;
      }
+ 
+     # See if the upload should be there
+ 
+     # TODO: Modify the save() methods in OI::Page::Blah to take a
+     # filehandle in 'content' as well as plain old text.
+ 
+     my $has_upload = $class->_read_field_toggled( $R->apache, 'use_upload' );
+     if ( $has_upload eq 'yes' ) {
+         $R->DEBUG && $R->scrib( 1, "User is requesting content from uploaded file..." );
+         my $upload  = $R->apache->upload( 'content_upload' );
+         unless ( $upload ) {
+             my $error_msg = 'You checked off that you wanted to upload a ' .
+                             'file but did not upload one. Why are you teasing me?';
+             my %error_opts = ( method => 'show', error_msg => $error_msg, edit => 1 );
+             return ( ERROR, \%error_opts );
+         }
+         $R->DEBUG && $R->scrib( 1, "Upload seems to be retrieved ok. Here is some info:\n",
+                                    "Filename: (", $upload->filename, ") Size: (",
+                                    $upload->size, ") Type: (", $upload->type, ")" );
+         $page->{content} = $upload->fh;
+     }
+ 
+     $page->{mime_type} ||= 'text/html';
+ 
      return ( OK, \%opts );
  }
***************
*** 161,166 ****
          $R->{page}{content_type} = 'text/html';
          return $class->_notfound_message( $location );
!      }
  
  
      # If we specified that we're going to send a separate file to the
--- 190,196 ----
          $R->{page}{content_type} = 'text/html';
          return $class->_notfound_message( $location );
!     }
  
+     $page ||= $R->page->new;
  
      # If we specified that we're going to send a separate file to the
***************
*** 185,229 ****
      # user can do so.
  
-     my $text_params = {};
- 
      if ( $do_edit ) {
          $page ||= $R->page->new;
          $page->{is_file} ||= 'yes' if ( $page->CONFIG->{default_storage} eq 'file' );
          $params->{page} = $page;
-         $text_params = { name => 'base_page::page_form' };
          $R->{page}{title}   = 'Edit a Document';
      }
-     else {
-         $R->DEBUG && $R->scrib( 1, "Display ($page->{location}) as normal HTML" );
-         unless ( $class->_is_active( $page ) ) {
-             $R->DEBUG && $R->scrib( 1, "Page is not currently active; return error" );
-             $R->{page}{title} = 'Page not active';
-             return '<h2 align="center">Not Active</h2><p>Sorry, this page is not active.</p>';
-         }
  
!         $R->{page}{title} = $page->{title};
  
!         # Allows the page to define the main template it will use; if
!         # the page doesn't define one then the main UI module will use
!         # the default for the current theme
  
!         $R->{page}{_template_name_} = $page->{main_template};
  
!         # You can split your page into multiple viewable pages -- see
!         # _split_pages() for more info
  
!         $text_params = { text => $class->_split_pages( $page ) };
!         $class->_add_object_boxes( $page, $p );
!     }
  
!     # If the page has told us not to run it through TT, just return
!     # its content.
  
!     return $page->{content} if ( $page->{template_parse} eq 'no' );
  
!     return $R->template->handler( {}, $params, $text_params );
  }
  
  
  sub _is_displayable {
      my ( $class, $page ) = @_;
--- 215,260 ----
      # user can do so.
  
      if ( $do_edit ) {
+         $R->DEBUG && $R->scrib( 1, "This page should be in an editable form" );
          $page ||= $R->page->new;
          $page->{is_file} ||= 'yes' if ( $page->CONFIG->{default_storage} eq 'file' );
          $params->{page} = $page;
          $R->{page}{title}   = 'Edit a Document';
+         return $R->template->handler( {}, $params, { name => 'base_page::page_form' } );
      }
  
!     # Otherwise, ensure the page is active, set metadata and send it
!     # off to be displayed
  
!     $R->DEBUG && $R->scrib( 1, "Display ($page->{location}) as normal HTML" );
!     unless ( $class->_is_active( $page ) ) {
!         $R->DEBUG && $R->scrib( 1, "Page is not currently active; return error" );
!         $R->{page}{title} = 'Page not active';
!         return '<h2 align="center">Not Active</h2><p>Sorry, this page is not active.</p>';
!     }
  
!     $R->{page}{title} = $page->{title};
  
!     # Allows the page to define the main template it will use; if
!     # the page doesn't define one then the main UI module will use
!     # the default for the current theme
  
!     $R->{page}{_template_name_} = $page->{main_template};
  
!     $class->_add_object_boxes( $page, $p );
  
!     # You can split your page into multiple viewable pages -- see
!     # _split_pages() for more info
  
!     my $display_content = $class->_split_pages( $page );
! 
!     return $display_content if ( $page->{template_parse} eq 'no' );
!     return $R->template->handler( {}, $params, { text => \$display_content } );
  }
  
  
+ # True means page is displayable in browser, false means it's not. We
+ # treat an empty mime_type as an HTML page. (Might change)
+ 
  sub _is_displayable {
      my ( $class, $page ) = @_;
***************
*** 234,238 ****
  
  
! # Find the location from whatever paramters, information we need
  
  sub _find_location {
--- 265,270 ----
  
  
! # Find the location from whatever is available -- passed parameters,
! # GET/POST parameters, or the original path
  
  sub _find_location {
***************
*** 313,316 ****
--- 345,351 ----
          }
      }
+ 
+     # Returning undef means there were no errors, we just didn't find the page
+ 
      return undef unless ( $error_type );
      die $error_type;
***************
*** 318,321 ****
--- 353,358 ----
  
  
+ # Lop off the query string from $text
+ 
  sub _remove_query_string {
      my ( $class, $text ) = @_;
***************
*** 325,328 ****
--- 362,369 ----
  
  
+ # A page can have one or more tags that declare it wants itself split
+ # into multiple pieces for display. This routine does the
+ # splitting. This is still under development...
+ 
  sub _split_pages {
      my ( $class, $page ) = @_;
***************
*** 345,351 ****
       </font></p>
  PCOUNT
!        return \$this_page;
      }
!     return \$page->{content};
  }
  
--- 386,392 ----
       </font></p>
  PCOUNT
!        return $this_page;
      }
!     return $page->{content};
  }
  
***************
*** 426,437 ****
--- 467,487 ----
  1;
  
+ __END__
+ 
  =pod
  
  =head1 NAME
  
+ OpenInteract::Handler::Page - Display HTML pages and other documents from the database and/or filesystem
+ 
  =head1 SYNOPSIS
  
  =head1 DESCRIPTION
  
+ Displays a 'static' page from information in the database. The URL to
+ the page looks like a normal page rather than a database call or other
+ GET request, although it B<can> look like a GET request if you want it
+ to.
+ 
  =head2 Error Content-Type Forcing
  
***************
*** 445,448 ****
--- 495,520 ----
  =head1 METHODS
  
+ We use L<OpenInteract::CommonHandler|OpenInteract::CommonHandler> but
+ override the C<show()> method for our special needs.
+ 
+ B<directory_list>: implemented in this class
+ 
+ B<search_form>: implemented in
+ L<OpenInteract::CommonHandler|OpenInteract::CommonHandler>
+ 
+ B<search>: implemented in
+ L<OpenInteract::CommonHandler|OpenInteract::CommonHandler>
+ 
+ B<show>: implemented in this class
+ 
+ B<edit>: implemented in
+ L<OpenInteract::CommonHandler|OpenInteract::CommonHandler>
+ 
+ B<remove>: implemented in
+ L<OpenInteract::CommonHandler|OpenInteract::CommonHandler>
+ 
+ B<notify>: implemented in
+ L<OpenInteract::CommonHandler|OpenInteract::CommonHandler>
+ 
  =head1 BUGS
  
***************
*** 454,457 ****
--- 526,531 ----
  
  =head1 SEE ALSO
+ 
+ L<OpenInteract::CommonHandler|OpenInteract::CommonHandler>
  
  =head1 COPYRIGHT

[Openinteract-commits] CVS: OpenInteract/pkg/base_page/template page_form.tmpl,1.3,1.4

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

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/template
In directory usw-pr-cvs1:/tmp/cvs-serv21944/template

Modified Files:
	page_form.tmpl 
Log Message:
add the ability to upload a file


Index: page_form.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/template/page_form.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** page_form.tmpl	2001/10/24 23:04:21	1.3
--- page_form.tmpl	2001/10/25 14:58:28	1.4
***************
*** 12,16 ****
  made instantly.</p>
  
! <form name="page" method="POST" action="/Page/edit/">
  
  [% INCLUDE table_bordered_begin( table_width = '90%' ) -%]
--- 12,17 ----
  made instantly.</p>
  
! <form name="page" method="POST" action="/Page/edit/"
!       enctype="multipart/form-data">
  
  [% INCLUDE table_bordered_begin( table_width = '90%' ) -%]
***************
*** 62,65 ****
--- 63,74 ----
                                      cols = 70, rows = 18,
                                      colspan = 2, wrap = 'virtual' ) -%]
+ 
+ [%- count = count + 1 -%]
+ [%- INCLUDE label_row_begin( label = 'Upload' ) -%]
+   <td>[% INCLUDE form_checkbox( name = 'use_upload', value = 'yes' ) %] 
+       Check if you want to upload the content (will replace existing content)<br>
+       [% INCLUDE form_upload( name = 'content_upload' ) -%]
+   </td>
+ </tr>
  
  [%- count = count + 1 -%]

[Openinteract-commits] CVS: OpenInteract/pkg/base_page/template page_directory_list.tmpl,1.2,1.3

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

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/template
In directory usw-pr-cvs1:/tmp/cvs-serv21868/template

Modified Files:
	page_directory_list.tmpl 
Log Message:
fix syntax, logic bugs


Index: page_directory_list.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/template/page_directory_list.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** page_directory_list.tmpl	2001/10/24 23:04:21	1.2
--- page_directory_list.tmpl	2001/10/25 14:58:08	1.3
***************
*** 59,63 ****
  <div align="center">
  
! [% INCLUDE table_bordered_begin( internal_padding = 1, table_width = '90%' ) -%]
  
  [%- last_dir_index = dir_list.max;
--- 59,63 ----
  <div align="center">
  
! [% INCLUDE table_bordered_begin( internal_padding = 'none', table_width = '90%' ) -%]
  
  [%- last_dir_index = dir_list.max;
***************
*** 78,82 ****
  </tr>
    [%- IF is_chosen -%]
!       [%- show_files_in_directory( count = loop.count ) -%]
    [% END -%]
  [%- END -%]
--- 78,83 ----
  </tr>
    [%- IF is_chosen -%]
!       [%- show_files_in_directory( count = loop.count, is_chosen = is_chosen,
!                                    is_last = is_last ) -%]
    [% END -%]
  [%- END -%]

[Openinteract-commits] CVS: OpenInteract/pkg/base_page Changes,1.3,1.4 package.conf,1.3,1.4

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

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page
In directory usw-pr-cvs1:/tmp/cvs-serv21749

Modified Files:
	Changes package.conf 
Log Message:
meta


Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/Changes,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Changes	2001/10/24 23:03:08	1.3
--- Changes	2001/10/25 14:57:46	1.4
***************
*** 1,4 ****
--- 1,30 ----
  Revision history for OpenInteract package base_page.
  
+ 0.14  Thu Oct 25 11:00:43 EDT 2001
+ 
+ 0.13  Thu Oct 25 10:48:56 EDT 2001
+ 
+ 0.12  Thu Oct 25 10:37:45 EDT 2001
+ 
+ 0.11  Thu Oct 25 10:14:49 EDT 2001
+ 
+ 0.10  Thu Oct 25 10:07:20 EDT 2001
+ 
+       Allow File and Database serializers to read from scalar, scalar
+       ref or filehandle. Also fix the template to allow uploads (duh)
+ 
+ 0.09  Thu Oct 25 10:01:31 EDT 2001
+ 
+       Ensure the file serializer can create a path for the file (duh)
+ 
+ 0.08  Thu Oct 25 09:53:40 EDT 2001
+ 
+       Added security and other items to allow 'create()' requests to
+       work; other fixes.
+ 
+ 0.07  Thu Oct 25 01:02:41 EDT 2001
+ 
+       Added the upload field for content
+ 
  0.06  Wed Oct 24 18:57:36 EDT 2001
  

Index: package.conf
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/package.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** package.conf	2001/10/24 23:03:13	1.3
--- package.conf	2001/10/25 14:57:46	1.4
***************
*** 1,6 ****
  name             base_page
! version          0.06
  author           Chris Winters <ch...@cw...>
  module           File::Basename
  module           Class::Date
  template_plugin
--- 1,7 ----
  name             base_page
! version          0.14
  author           Chris Winters <ch...@cw...>
  module           File::Basename
+ module           File::Path
  module           Class::Date
  template_plugin

[Openinteract-commits] CVS: OpenInteract/eg fruit-0.09.tar.gz,NONE,1.1 fruit-0.07.tar.gz,1.1.1.1,NONE

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

Update of /cvsroot/openinteract/OpenInteract/eg
In directory usw-pr-cvs1:/tmp/cvs-serv24508

Added Files:
	fruit-0.09.tar.gz 
Removed Files:
	fruit-0.07.tar.gz 
Log Message:
upgraded simple sample package


--- NEW FILE: fruit-0.09.tar.gz ---
‹
Öj}¾ß~ý
¾êÍã†'‡ÇǵÚ1ü+D£vR?ùBÔ¾x+…ùF€ÒpŠâçÚ}ì=M¥&²ß“k×.´8?
G,]"žéYÜ2ŽÅÙ¹pof*ì ä0iµº¦¯»¿ÒQˆ‘¯¯¯#OEØñGñËü@0=ø/5Lú¾'⡞)þ—n
¸~ T ÄÏëp“H†ñHGÓ¾§F2
’~¢±/\4Œk¡¹îM¨`ß¹Ä~¢Loz]ÅÓjçW'ÿ%ÇÝõ}áÎ]üGG4×G~¶sã×t>ü5›¿¦3ÎyŒ‘t}éMý°?Žt:ƒg_ý“Óÿ-àþFpšƒóó+ç‹ßÕ5Êõÿ»‹ëΛv·÷›ñý/šÇõLÿÕaG8ªmõÿË\vÑûGµû[çr"ñŠ™Þ˱ªu8rðŸ_‡Õ™Š~@[ߓÁå‡~âË ‚Ð†pžµ.O¹Su¦=ºKü$€Á‹2zð­½@Eo¸åtùm÷?ßvvÞ N¢^
#%UIä P'þ%p5ðÂàëù1Ü.ªS•ÈçÞ%ðôw&þEù_Z‡”ÿúa3·ÿNjMxr|Xolåÿ%®³‰’^]\_¼k;­¾¨ˆ®œ®„ú»¤_£Ç4îþp}sÛítG|)ŒØIÔ
-x²Ýf:JÄÍmûºsÝkß]\öÎf2™$ú` ceÕ@±qçûö7ÝN¯·œ.pÆ6ÚïOe«?F¢R1õG~ Îrf®Â¢VÇÿXî-g³`±Þ—»m4ÅZCœõB¶IÄB§‘
P‚!TI¹šMæ›÷í
ǹ֡•ü){Ñ»W7ø"™ üŒ…Úmqñ¶oޞ.›bïd˜Êà¿7=<Ϻ_¼ï}{sx9‰€jß³hŠÓ!Þ¾¶¢
»Öôü÷¦°?£þ~÷þÌößQ3ÓÿÍzüÿãÚVÿ¿ˆÿKŒ¾¿ó)¿ñ“œg}ü’åT‰DÆàRÏ"¨D™¼i-ü(v.@	«}±þx’ZÔ«µÚŽuÖ å7 ŠCIMçJ%›š\NT-ðM¤<ü
F>*6èé©L4¾Y¨µ³U³v«´¾5)Òè|RŽžO®d¸Ùˆ¿;ÏoMþ?`õ~^û¯~˜ÙG‡lÔõúVþ_â:ÔÏIª‘ý»‰ŽÔé
<rœÓÙ¹5Jæ™à¯[‰¥W„zÞ:=˜a{Ïd:<Û*$Õ<ýqOt®/ß¾¿jrÀúRÊëÔØKæéÜ÷ÀZ9îQmύQÙûy©/îú*êGL *ˆ)\év€g1\s¥âaäÏPnñö–O	ð
ôP"…í,.cX/ýææ®}qù­Qgü÷ý°ÏóÃv§I$̜=ÛƒñP::Û

"í‹AJáC1”!b±.€ÐІZÌ ™Ç{£S“p½ýÑ80=§6蝧
 Ì"=S‹äàpáƒô43òÑW|þ‚»X®ÉÜÇUçKhv­ÁLMÐ5@ª2Ùç>ü9@Ï_U+Ïú$À±³PÓ}pü
´ÊHÒ
°ðT8ü«Ž3]ˆ=ãL”(K+N4 K×`
4a$Üî;ÐßÓ

z‚ÒÊ·;VZ,8ýlW@Ú<.!T°¼Ý†úªç®Gã÷#mú¤k
ä.Qê‘ÅøI<q}““e¹ŠÜ¼	Ÿb»
ì°|±
‘"Ó¼"vÄäÇú+çgÿ/U€¼¬ÿö£Öh6'˜ÿ©5Ž·öÿK\?
.¿ëþ4pþg×ù©ªò~×ù[29ëoÃxù75_¿ý“ÿãÚI^ÿwHñ¿úñVþ_äºS~Œ† ˜MdX¢ÙU´óJ2ôyEˆÞ$7ð¶q$j_·jV­)ÚW=ѨÕêŽÙ˜/<´r³=¬³ƒcYJ‹H¡yå‘I·äwãæÌc}µ<ÖW­£ÃVípm¬÷3臐´˜ëèž=ᛎ¨WkX¬›†àµ>ˆú×¢^o5k`Ô,#
 á†iL¾
&Ì…¹p›—ÍUñc=Ïm#Œ)ðˆPà-0jîûApÚ."„U0+ä
◑²{‚ý	s‹¦)]‚&”ö/A‘?ŃJTZ?˜	Ù?h9
ÀsŠbšËW¦F× ¹/d
l® ¡t;òEHÇmZÜ}·¸˜Í\³ö¸˜ Ð"{.†Öà‚£³´s~.ÞÃ#q‰mZâô´ÐåœáܤÉ,MZÂ]kKõZøðüÜ¥Ö¤—ç’Ù;ZÂgéér†ŒØtÁ·†ÓF*NJÂ_W~E=qP¹bùMßr¡(‰Š ±RSMT:œ¬–
‘¦AÇ
dSϹöø„óúÒ˂.…e¥•òã¥5­:Ké].± <01)¯DΛ88?+B²»Ñ}¨ç!Ht•¨š+Bxx!z«4íœMÙV×É%ý.®ô}WJ¦¨EÙYÉO3zæzþléOõͧH*â÷0±SòЁ—ç¶Ñ¹ByÁ¥D°vD`Dm”tŽ=©wÔÈDVæ+3ÿ?_¼ýþâ‡îŸë…_ïĞnum"zf"ŒµËlAh=fÙ(^E ý ÀµçþÞÐ
«Á_¨Ù0.uVwÒ'oTv¯PXVx𮡝RÁì*\ÿÓ}|P¨Ì³´a†]E’û¯"	"¼vÊG´
^ߎz`€b4…Þ­ÑÂö±œé{fIÃaD¤Í`öHÓ½PŽ#ÓDW²Æh挔¤ºG”µt†ŠŸsYYZI¦Æf
•Q
£:¡jå
eXÏ"­dæ¦û,d1²`6KMœk©ïrª”[“¹|ê+œ`Y
¤”ËiS ÎXðû
MÇg £ùÜOC°½
ôwùœ¸\mdÆBM‹„(Ctå¤&)G’F§Ï–&ÏӘ	ä€Æ
â±¢BVÃÚ`[\̘¢ ØÝ_Ýb¨tk!LCÿªXqaB<c3Ïl+³£U.“tt',ªÙ&`
j€ˆ©
mÁʼnʨ
"¹@dô(ÛÆÉ¢ª’Ó›?
°Ð¤|brtrW8ßéšœarà3“¸‘ûOp1…õ“˜~,DË.Á¦
pOcu2hqŠøHÅ2äöAPž\+:x²T@UE©«Tæuæ*‘ýNôJGÆ孖׸’Ù/çÊÇ'âJ,KÇïõ-1&=¬$úxÓºŸÈ›d$O%•ýƒéíÃбƒ RA·ûc^u>ǵ)fsYž"o:Ì«`q®†»8Bc_ 3kk,r†?‡Âq™DZ»›WeɎÝब!A×ZImj”Ô÷w^{S)îؖÚ­VK	¨»öÅÕ$&
HüðÈñ=ïÁô†Ìy
!¿²,¾fañ„²‘-²;ÕdnÀ.Õ|cP3ITÎhŒ,m‡ه4:üimD`Ü÷wo)ŒeºúI¬‚Ñ:ŸØ÷„ÖU •Ìg„\3<‰mE´}â_Yf¬Ÿ'_¢yll ãÓéÅYÆ-å©?ࣗàG…¤•ŽuÓ#jø‡Ë^ˆÑ»ÜzÈ$EŽu\±kq\劧WÛÓošÿùàçö>cþ·~X;Îò¿õ}ÿã°¶ýþϋ\›ÏšÕÏOt:»jÜj}×¾ëvn®ñsÀW
÷ÕÇ:˜Ò²3̬~¿z;`áP²‹Äp+š.DIì{hw&ÊÐõuÿ¿Ù½ƒ»åñîøsl•skϿʀ€½¬£þ4cP”ûó‡@
{ö°©:
cìó9mgz
t¿–º-( È'’½àÙõ–[Œ Ù“¥ò È	ènPÁ+Ù>UÄRQeˆ„g“ý¹Z¯:³›ð¿„Ÿƒ
--- fruit-0.07.tar.gz DELETED ---

[Openinteract-commits] CVS: OpenInteract/doc fruit-0.09.tar.gz,NONE,1.1

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

Update of /cvsroot/openinteract/OpenInteract/doc
In directory usw-pr-cvs1:/tmp/cvs-serv23022

Added Files:
	fruit-0.09.tar.gz 
Log Message:
updated to new version...


--- NEW FILE: fruit-0.09.tar.gz ---
‹
Öj}¾ß~ý
¾êÍã†'‡ÇǵÚ1ü+D£vR?ùBÔ¾x+…ùF€ÒpŠâçÚ}ì=M¥&²ß“k×.´8?
G,]"žéYÜ2ŽÅÙ¹pof*ì ä0iµº¦¯»¿ÒQˆ‘¯¯¯#OEØñGñËü@0=ø/5Lú¾'⡞)þ—n
¸~ T ÄÏëp“H†ñHGÓ¾§F2
’~¢±/\4Œk¡¹îM¨`ß¹Ä~¢Loz]ÅÓjçW'ÿ%ÇÝõ}áÎ]üGG4×G~¶sã×t>ü5›¿¦3ÎyŒ‘t}éMý°?Žt:ƒg_ý“Óÿ-àþFpšƒóó+ç‹ßÕ5Êõÿ»‹ëΛv·÷›ñý/šÇõLÿÕaG8ªmõÿË\vÑûGµû[çr"ñŠ™Þ˱ªu8rðŸ_‡Õ™Š~@[ߓÁå‡~âË ‚Ð†pžµ.O¹Su¦=ºKü$€Á‹2zð­½@Eo¸åtùm÷?ßvvÞ N¢^
#%UIä P'þ%p5ðÂàëù1Ü.ªS•ÈçÞ%ðôw&þEù_Z‡”ÿúa3·ÿNjMxr|Xolåÿ%®³‰’^]\_¼k;­¾¨ˆ®œ®„ú»¤_£Ç4îþp}sÛítG|)ŒØIÔ
-x²Ýf:JÄÍmûºsÝkß]\öÎf2™$ú` ceÕ@±qçûö7ÝN¯·œ.pÆ6ÚïOe«?F¢R1õG~ Îrf®Â¢VÇÿXî-g³`±Þ—»m4ÅZCœõB¶IÄB§‘
P‚!TI¹šMæ›÷í
ǹ֡•ü){Ñ»W7ø"™ üŒ…Úmqñ¶oޞ.›bïd˜Êà¿7=<Ϻ_¼ï}{sx9‰€jß³hŠÓ!Þ¾¶¢
»Öôü÷¦°?£þ~÷þÌößQ3ÓÿÍzüÿãÚVÿ¿ˆÿKŒ¾¿ó)¿ñ“œg}ü’åT‰DÆàRÏ"¨D™¼i-ü(v.@	«}±þx’ZÔ«µÚŽuÖ å7 ŠCIMçJ%›š\NT-ðM¤<ü
F>*6èé©L4¾Y¨µ³U³v«´¾5)Òè|RŽžO®d¸Ùˆ¿;ÏoMþ?`õ~^û¯~˜ÙG‡lÔõúVþ_â:ÔÏIª‘ý»‰ŽÔé
<rœÓÙ¹5Jæ™à¯[‰¥W„zÞ:=˜a{Ïd:<Û*$Õ<ýqOt®/ß¾¿jrÀúRÊëÔØKæéÜ÷ÀZ9îQmύQÙûy©/îú*êGL *ˆ)\év€g1\s¥âaäÏPnñö–O	ð
ôP"…í,.cX/ýææ®}qù­Qgü÷ý°ÏóÃv§I$̜=ÛƒñP::Û

"í‹AJáC1”!b±.€ÐІZÌ ™Ç{£S“p½ýÑ80=§6蝧
 Ì"=S‹äàpáƒô43òÑW|þ‚»X®ÉÜÇUçKhv­ÁLMÐ5@ª2Ùç>ü9@Ï_U+Ïú$À±³PÓ}pü
´ÊHÒ
°ðT8ü«Ž3]ˆ=ãL”(K+N4 K×`
4a$Üî;ÐßÓ

z‚ÒÊ·;VZ,8ýlW@Ú<.!T°¼Ý†úªç®Gã÷#mú¤k
ä.Qê‘ÅøI<q}““e¹ŠÜ¼	Ÿb»
ì°|±
‘"Ó¼"vÄäÇú+çgÿ/U€¼¬ÿö£Öh6'˜ÿ©5Ž·öÿK\?
.¿ëþ4pþg×ù©ªò~×ù[29ëoÃxù75_¿ý“ÿãÚI^ÿwHñ¿úñVþ_äºS~Œ† ˜MdX¢ÙU´óJ2ôyEˆÞ$7ð¶q$j_·jV­)ÚW=ѨÕêŽÙ˜/<´r³=¬³ƒcYJ‹H¡yå‘I·äwãæÌc}µ<ÖW­£ÃVípm¬÷3臐´˜ëèž=ᛎ¨WkX¬›†àµ>ˆú×¢^o5k`Ô,#
 á†iL¾
&Ì…¹p›—ÍUñc=Ïm#Œ)ðˆPà-0jîûApÚ."„U0+ä
◑²{‚ý	s‹¦)]‚&”ö/A‘?ŃJTZ?˜	Ù?h9
ÀsŠbšËW¦F× ¹/d
l® ¡t;òEHÇmZÜ}·¸˜Í\³ö¸˜ Ð"{.†Öà‚£³´s~.ÞÃ#q‰mZâô´ÐåœáܤÉ,MZÂ]kKõZøðüÜ¥Ö¤—ç’Ù;ZÂgéér†ŒØtÁ·†ÓF*NJÂ_W~E=qP¹bùMßr¡(‰Š ±RSMT:œ¬–
‘¦AÇ
dSϹöø„óúÒ˂.…e¥•òã¥5­:Ké].± <01)¯DΛ88?+B²»Ñ}¨ç!Ht•¨š+Bxx!z«4íœMÙV×É%ý.®ô}WJ¦¨EÙYÉO3zæzþléOõͧH*â÷0±SòЁ—ç¶Ñ¹ByÁ¥D°vD`Dm”tŽ=©wÔÈDVæ+3ÿ?_¼ýþâ‡îŸë…_ïĞnum"zf"ŒµËlAh=fÙ(^E ý ÀµçþÞÐ
«Á_¨Ù0.uVwÒ'oTv¯PXVx𮡝RÁì*\ÿÓ}|P¨Ì³´a†]E’û¯"	"¼vÊG´
^ߎz`€b4…Þ­ÑÂö±œé{fIÃaD¤Í`öHÓ½PŽ#ÓDW²Æh挔¤ºG”µt†ŠŸsYYZI¦Æf
•Q
£:¡jå
eXÏ"­dæ¦û,d1²`6KMœk©ïrª”[“¹|ê+œ`Y
¤”ËiS ÎXðû
MÇg £ùÜOC°½
ôwùœ¸\mdÆBM‹„(Ctå¤&)G’F§Ï–&ÏӘ	ä€Æ
â±¢BVÃÚ`[\̘¢ ØÝ_Ýb¨tk!LCÿªXqaB<c3Ïl+³£U.“tt',ªÙ&`
j€ˆ©
mÁʼnʨ
"¹@dô(ÛÆÉ¢ª’Ó›?
°Ð¤|brtrW8ßéšœarà3“¸‘ûOp1…õ“˜~,DË.Á¦
pOcu2hqŠøHÅ2äöAPž\+:x²T@UE©«Tæuæ*‘ýNôJGÆ孖׸’Ù/çÊÇ'âJ,KÇïõ-1&=¬$úxÓºŸÈ›d$O%•ýƒéíÃбƒ RA·ûc^u>ǵ)fsYž"o:Ì«`q®†»8Bc_ 3kk,r†?‡Âq™DZ»›WeɎÝब!A×ZImj”Ô÷w^{S)îؖÚ­VK	¨»öÅÕ$&
HüðÈñ=ïÁô†Ìy
!¿²,¾fañ„²‘-²;ÕdnÀ.Õ|cP3ITÎhŒ,m‡ه4:üimD`Ü÷wo)ŒeºúI¬‚Ñ:ŸØ÷„ÖU •Ìg„\3<‰mE´}â_Yf¬Ÿ'_¢yll ãÓéÅYÆ-å©?ࣗàG…¤•ŽuÓ#jø‡Ë^ˆÑ»ÜzÈ$EŽu\±kq\劧WÛÓošÿùàçö>cþ·~X;Îò¿õ}ÿã°¶ýþϋ\›ÏšÕÏOt:»jÜj}×¾ëvn®ñsÀW
÷ÕÇ:˜Ò²3̬~¿z;`áP²‹Äp+š.DIì{hw&ÊÐõuÿ¿Ù½ƒ»åñîøsl•skϿʀ€½¬£þ4cP”ûó‡@
{ö°©:
cìó9mgz
t¿–º-( È'’½àÙõ–[Œ Ù“¥ò È	ènPÁ+Ù>UÄRQeˆ„g“ý¹Z¯:³›ð¿„Ÿƒ

[Openinteract-commits] CVS: OpenInteract/doc fruit-0.07.tar.gz,1.1.1.1,NONE

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

Update of /cvsroot/openinteract/OpenInteract/doc
In directory usw-pr-cvs1:/tmp/cvs-serv22887

Removed Files:
	fruit-0.07.tar.gz 
Log Message:
updated to new version...


--- fruit-0.07.tar.gz DELETED ---

[Openinteract-commits] CVS: OpenInteract/conf sample-spops.perl,1.2,1.3

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

Update of /cvsroot/openinteract/OpenInteract/conf
In directory usw-pr-cvs1:/tmp/cvs-serv17860

Modified Files:
	sample-spops.perl 
Log Message:
added 'increment_field' to sample


Index: sample-spops.perl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/conf/sample-spops.perl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sample-spops.perl	2001/09/17 05:03:38	1.2
--- sample-spops.perl	2001/10/25 12:28:56	1.3
***************
*** 82,85 ****
--- 82,90 ----
  #              id_field     => 'user_id',
  
+ # increment_field - Whether to use (or be aware of) auto-incrementing
+ # features of your database driver.
+ 
+                increment_field => 1,
+ 
  # no_insert - Fields for which we should not try to insert
  # information, ever. If you're using a SPOPS implementation (e.g.,

[Openinteract-commits] CVS: OpenInteract/conf sample-server.ini,1.3,1.4

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

Update of /cvsroot/openinteract/OpenInteract/conf
In directory usw-pr-cvs1:/tmp/cvs-serv17758

Modified Files:
	sample-server.ini 
Log Message:
change default 'none' and 'not_found' actions to 'page' (vs. basicpage)


Index: sample-server.ini
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/conf/sample-server.ini,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sample-server.ini	2001/10/17 04:53:47	1.3
--- sample-server.ini	2001/10/25 12:28:17	1.4
***************
*** 391,396 ****
  
  [action_info none]
! redir = basicpage
  
  [action_info not_found]
! redir = basicpage
--- 391,396 ----
  
  [action_info none]
! redir = page
  
  [action_info not_found]
! redir = page

[Openinteract-commits] CVS: SPOPS/SPOPS/LDAP MultiDatasource.pm,1.8,1.9

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

Update of /cvsroot/openinteract/SPOPS/SPOPS/LDAP
In directory usw-pr-cvs1:/tmp/cvs-serv14807

Modified Files:
	MultiDatasource.pm 
Log Message:
override fetch_by_dn to work with multiple datasources 


Index: MultiDatasource.pm
===================================================================
RCS file: /cvsroot/openinteract/SPOPS/SPOPS/LDAP/MultiDatasource.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MultiDatasource.pm	2001/10/23 14:21:42	1.8
--- MultiDatasource.pm	2001/10/25 12:08:57	1.9
***************
*** 45,50 ****
      my ( $class, $id, $p ) = @_;
  
-     my $R = OpenInteract::Request->instance;
- 
      # If passed in a handle, we will always use only that
  
--- 45,48 ----
***************
*** 52,77 ****
          return $class->SUPER::fetch( $id, $p );
      }
- 
-     my $ds_list = $class->CONFIG->{datasource};
- 
-     # If only one datasource is specified in the configuration, then
-     # use it
  
!     unless ( ref $ds_list eq 'ARRAY' and scalar @{ $ds_list } ) {
!         DEBUG && _w( 1, "No datasources in configuration for ($class).",
!                         "Using SPOPS::LDAP->fetch()" );
!         return $class->SUPER::fetch( $id, $p );
!     }
  
!     # Otherwise step through the datasource listing and try to
!     # retrieve each one in turn
  
!     foreach my $ds ( @{ $ds_list } ) {
!         $R->scrib( 1, "Trying to use datasource ($ds) for class ($class)" );
          $p->{connect_key} = $ds;
- 
-         # Trap security errors; if we don't fetch an object, we'll
-         # just return undef.
- 
          my $object = eval { $class->SUPER::fetch( $id, $p ) };
          if ( $object ) {
--- 50,62 ----
          return $class->SUPER::fetch( $id, $p );
      }
  
!     my @ds_list = $class->_get_datasource_list( 'fetch', $id, $p );
  
!     # Step through the datasource listing and try to retrieve each one
!     # in turn
  
!     foreach my $ds ( @ds_list ) {
!         DEBUG && _w( 1, "(fetch) Trying to use datasource ($ds) for class ($class)" );
          $p->{connect_key} = $ds;
          my $object = eval { $class->SUPER::fetch( $id, $p ) };
          if ( $object ) {
***************
*** 84,87 ****
--- 69,93 ----
  
  
+ sub fetch_by_dn {
+     my ( $class, $dn, $p ) = @_;
+     if ( $p->{ldap} ) {
+         return $class->SUPER::fetch_by_dn( $dn, $p );
+     }
+     my @ds_list = $class->_get_datasource_list( 'fetch_by_dn', $dn, $p );
+ 
+     # Step through the datasource listing and try to retrieve each one
+     # in turn
+ 
+     foreach my $ds ( @ds_list ) {
+         DEBUG && _w( 1, "(fetch_by_dn) Trying to use datasource ($ds) for class ($class)" );
+         $p->{connect_key} = $ds;
+         my $object = eval { $class->SUPER::fetch_by_dn( $dn, $p ) };
+         if ( $object ) {
+             $object->{_datasource} = $ds;
+             return $object
+         }
+     }
+ }
+ 
  sub fetch_group_all {
      my ( $class, $p ) = @_;
***************
*** 90,101 ****
          return $class->SUPER::fetch_group( $p );
      }
!     my $ds_list = $class->CONFIG->{datasource};
!     unless ( ref $ds_list eq 'ARRAY' and scalar @{ $ds_list } ) {
!         DEBUG && _w( 1, "No datasources in configuration for ($class).",
!                         "Using SPOPS::LDAP->fetch_group()" );
!         return $class->SUPER::fetch_group( $p );
!     }
      my @all_objects = ();
!     foreach my $ds ( @{ $ds_list } ) {
          $p->{connect_key} = $ds;
          DEBUG && _w( 1, "Trying to fetch from datasource ($ds)" );
--- 96,102 ----
          return $class->SUPER::fetch_group( $p );
      }
!     my @ds_list = $class->_get_datasource_list( 'fetch_group', $p );
      my @all_objects = ();
!     foreach my $ds ( @ds_list ) {
          $p->{connect_key} = $ds;
          DEBUG && _w( 1, "Trying to fetch from datasource ($ds)" );
***************
*** 127,130 ****
--- 128,153 ----
      $p->{ldap} ||= $self->global_datasource_handle( $self->{_datasource} );
      return $self->SUPER::remove( $p );
+ }
+ 
+ 
+ # Retrieve a datasource list from the class configuration. If it
+ # doesn't work (no list or the list is empty), run a specified method
+ # in the parent class.
+ 
+ sub _get_datasource_list {
+     my ( $class, $method, @args ) = @_;
+     my $ds_list = $class->CONFIG->{datasource};
+ 
+     # If there are not multiple datasources specified, then bounce
+     # back to the SPOPS::LDAP-version of th method we were trying to
+     # call in the first place.
+ 
+     unless ( ref $ds_list eq 'ARRAY' and scalar @{ $ds_list } ) {
+         DEBUG && _w( 1, "No datasources in configuration for ($class).",
+                         "Using SPOPS::LDAP->$method()" );
+         my $full_method = "SUPER::$method";
+         return $class->$full_method( @args );
+     }
+     return @{ $ds_list };
  }
  

[Openinteract-commits] CVS: OpenInteract/template form_upload,NONE,1.1

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

Update of /cvsroot/openinteract/OpenInteract/template
In directory usw-pr-cvs1:/tmp/cvs-serv19105

Added Files:
	form_upload 
Log Message:
added upload field


--- NEW FILE: form_upload ---
[%########################################
  form_upload( name, field_pre_label, field_label )
     Generate a form upload field.
  ########################################-%]
[%- field_pre_label -%]
<input type="file" name="[% name %]" >
[%- field_label -%]

[Openinteract-commits] CVS: OpenInteract/pkg/base_page/conf action.perl,1.3,1.4 spops.perl,1.3,1.4

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

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/conf
In directory usw-pr-cvs1:/tmp/cvs-serv22705/conf

Modified Files:
	action.perl spops.perl 
Log Message:
more updates (stability! functionality!)


Index: action.perl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/conf/action.perl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** action.perl	2001/10/24 20:55:37	1.3
--- action.perl	2001/10/24 23:04:17	1.4
***************
*** 1,5 ****
  $action = {
   'page' => {
!      'class'           => 'OpenInteract::Handler::BasePage',
       'security'        => 'yes',
       'directory_index' => [ 'index.html', 'home.html', 'index', 'home' ],
--- 1,5 ----
  $action = {
   'page' => {
!      'class'           => 'OpenInteract::Handler::Page',
       'security'        => 'yes',
       'directory_index' => [ 'index.html', 'home.html', 'index', 'home' ],
***************
*** 10,14 ****
       'weight'    => 4,
       'title'     => 'Document Info',
!      'template'  => 'static_page::edit_document_box',
       'security'  => 'no',
   },
--- 10,14 ----
       'weight'    => 4,
       'title'     => 'Document Info',
!      'template'  => 'base_page::edit_document_box',
       'security'  => 'no',
   },

Index: spops.perl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/conf/spops.perl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** spops.perl	2001/10/24 20:55:37	1.3
--- spops.perl	2001/10/24 23:04:19	1.4
***************
*** 7,11 ****
                                SPOPS::Utility SPOPS::DBI / ],
          field        => [ qw/ location directory title author keywords 
!                               boxes main_template mime_type
                                active_on expires_on is_active is_file / ],
          column_group => {},
--- 7,11 ----
                                SPOPS::Utility SPOPS::DBI / ],
          field        => [ qw/ location directory title author keywords 
!                               boxes main_template mime_type template_parse
                                active_on expires_on is_active is_file / ],
          column_group => {},
***************
*** 27,39 ****
          hierarchy_field     => 'location',
        },
        'page_content' => {
          class        => 'OpenInteract::PageContent',
!         code_class   => '',
!         isa          => [ qw/ SPOPS::DBI / ],
          field        => [ qw/ location content / ],
          id_field     => 'location',
          base_table   => 'page_content',
          has_a        => { 'OpenInteract::Page' => 'location' },
-         links_to     => {},
          object_name  => 'Document',
        },
--- 27,38 ----
          hierarchy_field     => 'location',
        },
+ 
        'page_content' => {
          class        => 'OpenInteract::PageContent',
!         isa          => [ 'OpenInteract::SPOPS::DBI', 'SPOPS::DBI' ],
          field        => [ qw/ location content / ],
          id_field     => 'location',
          base_table   => 'page_content',
          has_a        => { 'OpenInteract::Page' => 'location' },
          object_name  => 'Document',
        },

[Openinteract-commits] CVS: OpenInteract/pkg/base_page/OpenInteract/Page Database.pm,1.2,1.3 File.pm,1.2,1.3

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

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Page
In directory usw-pr-cvs1:/tmp/cvs-serv22705/OpenInteract/Page

Modified Files:
	Database.pm File.pm 
Log Message:
more updates (stability! functionality!)


Index: Database.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Page/Database.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Database.pm	2001/10/24 20:55:37	1.2
--- Database.pm	2001/10/24 23:04:14	1.3
***************
*** 7,11 ****
--- 7,17 ----
  sub load {
      my ( $self ) = @_;
+     my $R = OpenInteract::Request->instance;
      my $page_content = eval { $self->page_content };
+     if ( $@ ) {
+         $R->scrib( 0, "Error retrieving content from database. Error: $@\n",
+                       SPOPS::Error->get->{system_msg} );
+     }
+     $R->DEBUG && $R->scrib( 1, "Page content location fetched from DB: ($page_content->{location})" );
      return $page_content->{content};
  }

Index: File.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Page/File.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** File.pm	2001/10/24 20:55:37	1.2
--- File.pm	2001/10/24 23:04:15	1.3
***************
*** 16,23 ****
  sub load {
      my ( $self ) = @_;
-     my $full_location = $self->_create_file_location;
-     return undef unless ( -f $full_location );
- 
      my $R = OpenInteract::Request->instance;
      $R->DEBUG && $R->scrib( 1, "File ($full_location) exists. Trying to read file." );
  
--- 16,27 ----
  sub load {
      my ( $self ) = @_;
      my $R = OpenInteract::Request->instance;
+ 
+     my $full_location = _create_file_location( $self );
+     unless ( -f $full_location ) {
+         $R->scrib( 1, "File ($full_location) does not exist! Bailing on load()..." );
+         return undef;
+     }
+ 
      $R->DEBUG && $R->scrib( 1, "File ($full_location) exists. Trying to read file." );
  
***************
*** 49,53 ****
      my ( $self, $content ) = @_;
      my $R = OpenInteract::Request->instance;
!     my $full_location = $self->_create_file_location;
      $R->DEBUG && $R->scrib( 1, "Trying to save content to ($full_location)" );
  
--- 53,57 ----
      my ( $self, $content ) = @_;
      my $R = OpenInteract::Request->instance;
!     my $full_location = _create_file_location( $self );
      $R->DEBUG && $R->scrib( 1, "Trying to save content to ($full_location)" );
  
***************
*** 78,82 ****
  sub remove {
      my ( $self ) = @_;
!     my $full_location = $self->_create_file_location;
      my $R = OpenInteract::Request->instance;
      $R->DEBUG && $R->scrib( 1, "Trying to delete content file ($full_location)" );
--- 82,86 ----
  sub remove {
      my ( $self ) = @_;
!     my $full_location = _create_file_location( $self );
      my $R = OpenInteract::Request->instance;
      $R->DEBUG && $R->scrib( 1, "Trying to delete content file ($full_location)" );
***************
*** 93,96 ****
--- 97,101 ----
      my $html_dir = $R->CONFIG->get_dir( 'html' );
      $html_dir =~ s|/$||;
+     $R->DEBUG && $R->scrib( 1, "Trying to find filesystem location for ($html_dir) ($self->{location})" );
      return join( '', $html_dir, $self->{location} );
  }

[Openinteract-commits] CVS: OpenInteract/pkg/base_page/OpenInteract/Handler Page.pm,1.3,1.4

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

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Handler
In directory usw-pr-cvs1:/tmp/cvs-serv22705/OpenInteract/Handler

Modified Files:
	Page.pm 
Log Message:
more updates (stability! functionality!)


Index: Page.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/OpenInteract/Handler/Page.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Page.pm	2001/10/24 20:55:37	1.3
--- Page.pm	2001/10/24 23:04:14	1.4
***************
*** 9,18 ****
  use SPOPS::Secure qw( :level );
  
! @OpenInteract::Handler::BasePage::ISA     = qw( OpenInteract::CommonHandler  SPOPS::Secure );
! $OpenInteract::Handler::BasePage::VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);
! $OpenInteract::Handler::BasePage::author            = 'ch...@cw...';
! $OpenInteract::Handler::BasePage::default_method    = 'show';
! @OpenInteract::Handler::BasePage::forbidden_methods = ();
! %OpenInteract::Handler::BasePage::security          = (
     DEFAULT_SECURITY_KEY() => SEC_LEVEL_WRITE,
     show   => SEC_LEVEL_NONE, notify  => SEC_LEVEL_READ,
--- 9,18 ----
  use SPOPS::Secure qw( :level );
  
! @OpenInteract::Handler::Page::ISA     = qw( OpenInteract::CommonHandler  SPOPS::Secure );
! $OpenInteract::Handler::Page::VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);
! $OpenInteract::Handler::Page::author            = 'ch...@cw...';
! $OpenInteract::Handler::Page::default_method    = 'show';
! @OpenInteract::Handler::Page::forbidden_methods = ();
! %OpenInteract::Handler::Page::security          = (
     DEFAULT_SECURITY_KEY() => SEC_LEVEL_WRITE,
     show   => SEC_LEVEL_NONE, notify  => SEC_LEVEL_READ,
***************
*** 41,45 ****
  sub MY_EDIT_DISPLAY_TASK       { return 'show' }
  sub MY_EDIT_FIELDS             { return qw( location title author keywords
!                                             boxes main_template notes ) }
  sub MY_EDIT_FIELDS_TOGGLED     { return qw( is_active is_file template_parse ) }
  sub MY_EDIT_FIELDS_DATE        { return qw( active_on expires_on ) }
--- 41,45 ----
  sub MY_EDIT_DISPLAY_TASK       { return 'show' }
  sub MY_EDIT_FIELDS             { return qw( location title author keywords
!                                             boxes main_template notes content ) }
  sub MY_EDIT_FIELDS_TOGGLED     { return qw( is_active is_file template_parse ) }
  sub MY_EDIT_FIELDS_DATE        { return qw( active_on expires_on ) }
***************
*** 97,101 ****
      $R->{page}{title} = 'Document Listing';
      return $R->template->handler( {}, $params,
!                                   { name => 'page::page_directory_list' } );
  }
  
--- 97,101 ----
      $R->{page}{title} = 'Document Listing';
      return $R->template->handler( {}, $params,
!                                   { name => 'base_page::page_directory_list' } );
  }
  
***************
*** 191,198 ****
          $page->{is_file} ||= 'yes' if ( $page->CONFIG->{default_storage} eq 'file' );
          $params->{page} = $page;
!         $text_params = { name => 'page::page_form' };
          $R->{page}{title}   = 'Edit a Document';
      }
      else {
          unless ( $class->_is_active( $page ) ) {
              $R->DEBUG && $R->scrib( 1, "Page is not currently active; return error" );
--- 191,199 ----
          $page->{is_file} ||= 'yes' if ( $page->CONFIG->{default_storage} eq 'file' );
          $params->{page} = $page;
!         $text_params = { name => 'base_page::page_form' };
          $R->{page}{title}   = 'Edit a Document';
      }
      else {
+         $R->DEBUG && $R->scrib( 1, "Display ($page->{location}) as normal HTML" );
          unless ( $class->_is_active( $page ) ) {
              $R->DEBUG && $R->scrib( 1, "Page is not currently active; return error" );
***************
*** 212,216 ****
          # _split_pages() for more info
  
!         $text_params = $class->_split_pages( $page );
          $class->_add_object_boxes( $page, $p );
      }
--- 213,217 ----
          # _split_pages() for more info
  
!         $text_params = { text => $class->_split_pages( $page ) };
          $class->_add_object_boxes( $page, $p );
      }
***************
*** 225,229 ****
  
  
! sub _is_page_displayable {
      my ( $class, $page ) = @_;
      return 1 unless ( $page->{mime_type} );
--- 226,230 ----
  
  
! sub _is_displayable {
      my ( $class, $page ) = @_;
      return 1 unless ( $page->{mime_type} );
***************
*** 307,311 ****
              $error_type = SPOPS::Error->get->{type};
          }
!         return $page if ( $page );
      }
      return undef unless ( $error_type );
--- 308,315 ----
              $error_type = SPOPS::Error->get->{type};
          }
!         if ( $page ) {
!             $R->DEBUG && $R->scrib( 1, "Found matching location: ($page->{location})" );
!             return $page;
!         }
      }
      return undef unless ( $error_type );
***************
*** 341,347 ****
       </font></p>
  PCOUNT
!        return { text => $this_page };
      }
!     return { text => $page->{content} };
  }
  
--- 345,351 ----
       </font></p>
  PCOUNT
!        return \$this_page;
      }
!     return \$page->{content};
  }
  

[Openinteract-commits] CVS: OpenInteract/pkg/base_page Changes,1.2,1.3 MANIFEST,1.4,1.5 package.conf,1.2,1.3

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

Update of /cvsroot/openinteract/OpenInteract/pkg/base_page
In directory usw-pr-cvs1:/tmp/cvs-serv22476

Modified Files:
	Changes MANIFEST package.conf 
Log Message:
meta


Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/Changes,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Changes	2001/10/24 20:55:37	1.2
--- Changes	2001/10/24 23:03:08	1.3
***************
*** 1,4 ****
--- 1,16 ----
  Revision history for OpenInteract package base_page.
  
+ 0.06  Wed Oct 24 18:57:36 EDT 2001
+ 
+ 0.05  Wed Oct 24 18:33:12 EDT 2001
+ 
+       Cool - things basically work; now to the details...
+ 
+ 0.04  Wed Oct 24 18:15:01 EDT 2001
+ 
+ 0.03  Wed Oct 24 17:52:39 EDT 2001
+ 
+ 0.02  Wed Oct 24 17:47:15 EDT 2001
+ 
  0.01  Wed Oct 24 16:47:01 EDT 2001
  

Index: MANIFEST
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/MANIFEST,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MANIFEST	2001/10/24 21:04:56	1.4
--- MANIFEST	2001/10/24 23:03:11	1.5
***************
*** 22,26 ****
  template/page_form.tmpl
  template/page_search_form.meta
! template/page_search_form.tmpl
! template/static_page_form.meta
! template/static_page_form.tmpl
\ No newline at end of file
--- 22,24 ----
  template/page_form.tmpl
  template/page_search_form.meta
! template/page_search_form.tmpl
\ No newline at end of file

Index: package.conf
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/pkg/base_page/package.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** package.conf	2001/10/24 20:55:37	1.2
--- package.conf	2001/10/24 23:03:13	1.3
***************
*** 1,4 ****
  name             base_page
! version          0.01
  author           Chris Winters <ch...@cw...>
  module           File::Basename
--- 1,4 ----
  name             base_page
! version          0.06
  author           Chris Winters <ch...@cw...>
  module           File::Basename