+ Macros for formatting timerange output +

Log Message: ----------- [1.6] New methods determine which child of the root document is an ancestor and lay out lists of children with percentages. Tags: ---- mkdoc-1-6 Modified Files: -------------- mkd/flo/Record: Document.pm -------------- next part -------------- Index: Document.pm =================================================================== RCS file: /var/spool/cvs/mkd/flo/Record/Document.pm,v retrieving revision 1.25.2.68 retrieving revision 1.25.2.69 diff -Lflo/Record/Document.pm -Lflo/Record/Document.pm -u -r1.25.2.68 -r1.25.2.69 --- flo/Record/Document.pm +++ flo/Record/Document.pm @@ -1093,6 +1093,21 @@ ## +# $self->root_child(); +# -------------------- +# Returns the ancestor of this document that is a child of the root document. +## +sub root_child +{ + my $self = shift; + my $ancestors = $self->ancestors; + return unless $ancestors; + return $self unless $ancestors->[1]; + return $ancestors->[1]; +} + + +## # $self->position(); # ------------------ # Gets the sibling position of that document, i.e. where it @@ -1682,6 +1697,22 @@ ## +# $self->children_showable_percent_each() +# --------------------------------------- +# returns 25% if there are 4 children, 12.5% if there are eight etc.. +# css percentages are decimal numbers, not necessarily integers +# http://www.w3.org/TR/REC-CSS2/syndata.html#value-def-number +## +sub children_showable_percent_each +{ + my $self = shift; + my $children_showable = $self->children_showable; + my $number = @$children_showable || return; + return (100 / $number) . '%'; +} + + +## # $self->cousins_homonyms(); # -------------------------- # Returns a list of cousins which are also homonyms. From bruno at mkdoc.demon.co.uk Wed Jan 5 15:29:44 2005 From: bruno at mkdoc.demon.co.uk (bruno@mkdoc.demon.co.uk) Date: Wed Jan 5 15:29:26 2005 Subject: [MKDoc-commit] New Directory Message-ID: <20050105152944.C45A12E28E2@mkdoc.demon.co.uk> Update of /var/spool/cvs/Petal/t/data/test_attributes_chars In directory devil.webarch.net:/tmp/cvs-serv5810/t/data/test_attributes_chars Log Message: Directory /var/spool/cvs/Petal/t/data/test_attributes_chars added to the repository From bruno at mkdoc.demon.co.uk Wed Jan 5 15:33:48 2005 From: bruno at mkdoc.demon.co.uk (bruno@mkdoc.demon.co.uk) Date: Wed Jan 5 15:33:29 2005 Subject: [MKDoc-commit] release 2.15. Message-ID: <20050105153348.C19752E28E2@mkdoc.demon.co.uk> Log Message: ----------- release 2.15. Added support for non-alphanumeric xml attribute names in tal:attributes + tests. Modified Files: -------------- Petal: Changes MANIFEST META.yml README Petal/lib/Petal/Canonicalizer: XML.pm Added Files: ----------- Petal: .cvsignore Petal/t: 083_test_attributes_chars.t Petal/t/data/test_attributes_chars: test_attributes_chars1.xml -------------- next part -------------- --- /dev/null +++ .cvsignore @@ -0,0 +1,5 @@ +.swp +Makefile +blib +pm_to_blib + Index: MANIFEST =================================================================== RCS file: /var/spool/cvs/Petal/MANIFEST,v retrieving revision 1.45 retrieving revision 1.46 diff -LMANIFEST -LMANIFEST -u -r1.45 -r1.46 --- MANIFEST +++ MANIFEST @@ -1,3 +1,4 @@ +.cvsignore Changes lib/Petal.pm lib/Petal/Cache/Disk.pm @@ -85,6 +86,7 @@ t/080_Petal_TranslationService_h4x0r.t t/081_Petal_I18NProcessor.t t/082_Petal_Gettext.t +t/083_test_attributes_chars.t t/benchmark.pl t/data/access_obj_array.html t/data/access_obj_hash.html @@ -178,6 +180,7 @@ t/data/string_count.html t/data/style_andamp.html t/data/test_attributes2.xml +t/data/test_attributes_chars/test_attributes_chars1.xml t/data/test_ns_attributes/test_ns_attributes1.xml t/data/test_ns_attributes/test_ns_attributes2.xml t/data/test_ns_attributes/test_ns_attributes3.xml Index: META.yml =================================================================== RCS file: /var/spool/cvs/Petal/META.yml,v retrieving revision 1.7 retrieving revision 1.8 diff -LMETA.yml -LMETA.yml -u -r1.7 -r1.8 --- META.yml +++ META.yml @@ -1,7 +1,7 @@ # http://module-build.sourceforge.net/META-spec.html #XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# name: Petal -version: 2.14 +version: 2.15 version_from: lib/Petal.pm installdirs: site requires: Index: Changes =================================================================== RCS file: /var/spool/cvs/Petal/Changes,v retrieving revision 1.123 retrieving revision 1.124 diff -LChanges -LChanges -u -r1.123 -r1.124 --- Changes +++ Changes @@ -1,7 +1,9 @@ Revision history for Petal. -2.15 +2.15 Wed Jan 5 15:31:00 2005 - Fixed some 'used of uninitialized values' warnings + - Added support for non-alphanumeric xml attribute names in tal:attributes + - removed defunct email address 2.14 Thu Sep 2 15:07:39 2004 - Fixed broken I18N attributes parsing Index: README =================================================================== RCS file: /var/spool/cvs/Petal/README,v retrieving revision 1.41 retrieving revision 1.42 diff -LREADME -LREADME -u -r1.41 -r1.42 --- README +++ README @@ -48,6 +48,7 @@ Sean M. Burke Chris Croome Paul Arzul +Bruno Postle Kurt Stephens Steve Purkis Holland, Mark Index: XML.pm =================================================================== RCS file: /var/spool/cvs/Petal/lib/Petal/Canonicalizer/XML.pm,v retrieving revision 1.34 retrieving revision 1.35 diff -Llib/Petal/Canonicalizer/XML.pm -Llib/Petal/Canonicalizer/XML.pm -u -r1.34 -r1.35 --- lib/Petal/Canonicalizer/XML.pm +++ lib/Petal/Canonicalizer/XML.pm @@ -544,7 +544,7 @@ { next unless (defined $string); next if ($string =~ /^\s*$/); - my ($attr, $expr) = $string =~ /^\s*((?:\w|\:)+)\s+(.*?)\s*$/; + my ($attr, $expr) = $string =~ /^\s*([A-Za-z_:][A-Za-z0-9_:.-]*)\s+(.*?)\s*$/; if (not defined $attr or not defined $expr) { warn "Attributes expression '$string' does not seem valid - Skipped"; --- /dev/null +++ t/083_test_attributes_chars.t @@ -0,0 +1,24 @@ +#!/usr/bin/perl +use warnings; +use strict; +use lib ('lib'); +use Test::More 'no_plan'; +use Petal; + +$Petal::DISK_CACHE = 0; +$Petal::MEMORY_CACHE = 0; +$Petal::TAINT = 1; +$Petal::BASE_DIR = './t/data/test_attributes_chars/'; + +my $template; + + +##### + +$template = new Petal('test_attributes_chars1.xml'); + +my $string = $template->process (value1 => 'new_value1', value2 => 'new_value2'); +like ($string => qr/new_value1/); +like ($string => qr/new_value2/); + +__END__ --- /dev/null +++ t/data/test_attributes_chars/test_attributes_chars1.xml @@ -0,0 +1,4 @@ + + + + From bruno at mkdoc.demon.co.uk Fri Jan 7 13:14:37 2005 From: bruno at mkdoc.demon.co.uk (bruno@mkdoc.demon.co.uk) Date: Fri Jan 7 13:14:19 2005 Subject: [MKDoc-commit] New Directory Message-ID: <20050107131437.925A62E28E2@mkdoc.demon.co.uk> Update of /var/spool/cvs/mkd/templates/macros/timerange In directory devil.webarch.net:/tmp/cvs-serv12657/templates/macros/timerange Log Message: Directory /var/spool/cvs/mkd/templates/macros/timerange added to the repository --> Using per-directory sticky tag `mkdoc-1-6' From bruno at mkdoc.demon.co.uk Fri Jan 7 13:25:48 2005 From: bruno at mkdoc.demon.co.uk (bruno@mkdoc.demon.co.uk) Date: Fri Jan 7 13:25:30 2005 Subject: [MKDoc-commit] [1.6] Methods and templates to make timeranges easier on the eye Message-ID: <20050107132548.4C6302E28E2@mkdoc.demon.co.uk> Log Message: ----------- [1.6] Methods and templates to make timeranges easier on the eye Tags: ---- mkdoc-1-6 Modified Files: -------------- mkd/flo/editor: TimeRange.pm mkd/templates/component/headlines: en.html mkd/templates/component/timerange: en.html Added Files: ----------- mkd/templates/macros/timerange: en.html -------------- next part -------------- Index: TimeRange.pm =================================================================== RCS file: /var/spool/cvs/mkd/flo/editor/TimeRange.pm,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -Lflo/editor/TimeRange.pm -Lflo/editor/TimeRange.pm -u -r1.1.2.1 -r1.1.2.2 --- flo/editor/TimeRange.pm +++ flo/editor/TimeRange.pm @@ -471,6 +471,52 @@ } } DateTime::TimeZone->all_names ]; } +=item C<< $self->same_day() >> + +This method returns true if both the start and end times of the event are on +the same day and are in the same timezone. + +=cut + +sub same_day +{ + my $self = shift; + return 0 unless ($self->{'from_day'} eq $self->{'to_day'}); + return 0 unless ($self->{'from_month'} eq $self->{'to_month'}); + return 0 unless ($self->{'from_year'} eq $self->{'to_year'}); + return 0 unless ($self->{'from_tz'} eq $self->{'to_tz'}); + return 1; +} + +=item C<< $self->different_year() >> + +This method returns true if the start and end times of the event are in +different years. + +=cut + +sub different_year +{ + my $self = shift; + return 0 if ($self->{'from_year'} eq $self->{'to_year'}); + return 1; +} + +=item C<< $self->same_year_different_day() >> + +This method returns true if the start and end times of the event are in +the same year but on different days. + +=cut + +sub same_year_different_day +{ + my $self = shift; + return 0 if $self->different_year; + return 0 if $self->same_day; + return 1; +} + =item C<< $self->generate_xml() >> This class overrides generate_xml() in order to update the Index: en.html =================================================================== RCS file: /var/spool/cvs/mkd/templates/component/headlines/Attic/en.html,v retrieving revision 1.1.2.24 retrieving revision 1.1.2.25 diff -Ltemplates/component/headlines/en.html -Ltemplates/component/headlines/en.html -u -r1.1.2.24 -r1.1.2.25 --- templates/component/headlines/en.html +++ templates/component/headlines/en.html @@ -14,6 +14,7 @@ align_opposite self/align_opposite; " xmlns:petal="http://purl.org/petal/1.0/" + xmlns:metal="http://xml.zope.org/namespaces/metal" >

- Starts - - DATE - - - TZ - -
-
- Ends - - DATE - - - DATE - + + 10:11am to 5:10pm Monday December 18 2005 +

ID	Name	Phone	Active
No elements
ID	First Last	Phone	x

Name

Phone

Active

No elements

First Last

Phone

Advanced - Using CGI.pm to generate forms

Checkbox group	Select group	Radio button group
+ + Test + +	+ + Test + +	+ + Test + +

Checkbox group

Select group

Radio button group

+ + Test + +

) and xmllint. In +addition, you can use the page validation services at W3C +(L). Alternatively, you could use the +L module which will parse non well-formed HTML documents +using L. + +HTML Tidy will rewrite your document into valid XHTML and, if requested, even +replace legacy formatting tags with their CSS counterparts. You can safely +ignore the warnings about proprietary attributes. Be sure to read the output +of what HTML Tidy is doing or else you may find it removing important tags +which it thinks are empty or invalid (e.g., inline elements outside of a +block). One of the important options that should be set is output_xhtml +(-asxhtml from the command-line). Here's an example of how to use it (see the +documentation for complete details): + + tidy --asxhtml original_file.html > new_file.html + +Once your document is well-formed, you can use xmllint to do day-to-day +checking that it stays well-formed without having to wade through the warnings +that HTML Tidy will generate about proprietary attributes. The following command will check that a document is well-formed: + + xmllint --noout + +To prevent errors about undefined namespace prefix, be sure to include these +in your template like so: + + + +You may receive errors from xmllint about unknown entities such as nbsp. These +can be safely ignored. If you find a way to suppress these warnings, please +let us know. In the meantime, you can pass the output through grep to ignore +these bogus warnings:. + + xmllint --noout tmpl/contact_info.tmpl >& grep -v 'Entity' + +Now you have no excuse for not creating well-formed XHTML documents. =head2 Passing a hashreference to Petal::process From chris at mkdoc.demon.co.uk Mon Jan 24 01:02:13 2005 From: chris at mkdoc.demon.co.uk (chris@mkdoc.demon.co.uk) Date: Mon Jan 24 01:01:53 2005 Subject: [MKDoc-commit] Added missing : from true Message-ID: <20050124010213.4CCA72E28E2@mkdoc.demon.co.uk> Log Message: ----------- Added missing : from true Tags: ---- mkdoc-1-6 Modified Files: -------------- mkd/templates/fragments/head_public: en.html mkd/templates/metadata: rss100sitemap.rdf.xml -------------- next part -------------- Index: en.html =================================================================== RCS file: /var/spool/cvs/mkd/templates/fragments/head_public/Attic/en.html,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -Ltemplates/fragments/head_public/en.html -Ltemplates/fragments/head_public/en.html -u -r1.1.2.13 -r1.1.2.14 --- templates/fragments/head_public/en.html +++ templates/fragments/head_public/en.html @@ -65,7 +65,7 @@ title="Document Parent Title" type="text/html" petal:attributes="href parent_uri; hreflang parent_lang; title parent_title" - petal:condition="true parent_uri" + petal:condition="true: parent_uri" /> Index: rss100sitemap.rdf.xml =================================================================== RCS file: /var/spool/cvs/mkd/templates/metadata/Attic/rss100sitemap.rdf.xml,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -Ltemplates/metadata/rss100sitemap.rdf.xml -Ltemplates/metadata/rss100sitemap.rdf.xml -u -r1.2.2.1 -r1.2.2.2 --- templates/metadata/rss100sitemap.rdf.xml +++ templates/metadata/rss100sitemap.rdf.xml @@ -141,7 +141,7 @@ in the same order in the XHTML child lists and XHTML sitemap. --> + petal:condition="true: children"> Log Message: ----------- Added requirement for HTML::Parser 3.45 (William McKee) Modified Files: -------------- Petal-Parser-HTB: Changes Makefile.PL -------------- next part -------------- Index: Changes =================================================================== RCS file: /var/spool/cvs/Petal-Parser-HTB/Changes,v retrieving revision 1.5 retrieving revision 1.6 diff -LChanges -LChanges -u -r1.5 -r1.6 --- Changes +++ Changes @@ -1,6 +1,9 @@ Revision history for Petal::Parser::HTB. -1.04 +1.04 Wed Jan 26 11:00:00 2005 + - Add requirement for HTML::Parser v3.45 which fixes problems with entity + encoding that resulted in the mysterious appearance of Â characters in + the output (William McKee). - Removed defunct email address - Fixed Name in Makefile.PL Index: Makefile.PL =================================================================== RCS file: /var/spool/cvs/Petal-Parser-HTB/Makefile.PL,v retrieving revision 1.4 retrieving revision 1.5 diff -LMakefile.PL -LMakefile.PL -u -r1.4 -r1.5 --- Makefile.PL +++ Makefile.PL @@ -7,6 +7,7 @@ 'PREREQ_PM' => { 'Petal' => '1.10', 'HTML::TreeBuilder' => '3.12', + 'HTML::Parser' => '3.45', }, ($] >= 5.005 ? ## Add these new keywords supported since 5.005 (ABSTRACT_FROM => 'lib/Petal/Parser/HTB.pm', # retrieve abstract from module From chris at mkdoc.demon.co.uk Wed Jan 26 11:08:14 2005 From: chris at mkdoc.demon.co.uk (chris@mkdoc.demon.co.uk) Date: Wed Jan 26 11:07:55 2005 Subject: [MKDoc-commit] Commented out stuff that doesn't work Message-ID: <20050126110814.055D22E28E2@mkdoc.demon.co.uk> Log Message: ----------- Commented out stuff that doesn't work Tags: ---- mkdoc-1-6 Modified Files: -------------- mkd/templates/component/headlines: en.html -------------- next part -------------- Index: en.html =================================================================== RCS file: /var/spool/cvs/mkd/templates/component/headlines/Attic/en.html,v retrieving revision 1.1.2.25 retrieving revision 1.1.2.26 diff -Ltemplates/component/headlines/en.html -Ltemplates/component/headlines/en.html -u -r1.1.2.25 -r1.1.2.26 --- templates/component/headlines/en.html +++ templates/component/headlines/en.html @@ -26,8 +26,10 @@ petal:content="self/title" >Demain, on rase gratis! - - +

Log Message: ----------- Updated metafile for 1.04 release Modified Files: -------------- Petal-Parser-HTB: META.yml -------------- next part -------------- Index: META.yml =================================================================== RCS file: /var/spool/cvs/Petal-Parser-HTB/META.yml,v retrieving revision 1.2 retrieving revision 1.3 diff -LMETA.yml -LMETA.yml -u -r1.2 -r1.3 --- META.yml +++ META.yml @@ -5,6 +5,7 @@ version_from: lib/Petal/Parser/HTB.pm installdirs: site requires: + HTML::Parser: 3.45 HTML::TreeBuilder: 3.12 Petal: 1.10 From bruno at mkdoc.demon.co.uk Wed Jan 26 13:19:54 2005 From: bruno at mkdoc.demon.co.uk (bruno@mkdoc.demon.co.uk) Date: Wed Jan 26 13:19:36 2005 Subject: [MKDoc-commit] Patch to add user-group functionality (Sam Tregar). Message-ID: <20050126131954.E71632E28E2@mkdoc.demon.co.uk> Log Message: ----------- Patch to add user-group functionality (Sam Tregar). Note: 3 SQL tables need to be created to avoid breaking existing sites. Tags: ---- mkdoc-1-6 Modified Files: -------------- mkd/MKDoc/Site/ConfigWriter: Httpd_Conf.pm mkd/MKDoc/Site/Deploy/DB: Schema.pm mkd/flo/plugin/Admin: UserDelete.pm UserInsert.pm UserModify.pm mkd/templates/admin/user_insert: en.html mkd/templates/admin/user_modify: en.html Added Files: ----------- mkd/MKDoc/Handler: GroupAuthz.pm -------------- next part -------------- --- /dev/null +++ MKDoc/Handler/GroupAuthz.pm @@ -0,0 +1,123 @@ +# ---------------------------------------------------------------------------- +# MKDoc::Handler::GroupAuthz +# ---------------------------------------------------------------------------- +# Author: Sam Tregar +# Copyright: (c) MKDoc Holdings Ltd, 2005 +# +# This file is part of MKDoc. +# +# MKDoc is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# MKDoc is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with MKDoc; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# --------------------------------------------------------------------------- +package MKDoc::Handler::GroupAuthz; +use strict; +use warnings; +use Apache::Constants qw/:common/; +use flo::Standard; +use strict; +use Carp; + +=head1 NAME + +MKDoc::Handler::GroupAuthz - enforce group-based security + +=head1 SYNOPSIS + +In httpd.conf for an authenticating host (like the default users.* setup): + + PerlAuthzHandler MKDoc::Handler::GroupAuthz + +In httpd.conf for a non-authenticating host (like the default www.* setup): + + + PerlModule MKDoc::Handler::GroupAuthz + PerlAuthenHandler MKDoc::Handler::GroupAuthz->null_authen_handler + PerlAuthzHandler MKDoc::Handler::GroupAuthz + AuthName "Group Authorization" + AuthType GroupAuthz + require valid-group + + +=head1 DESCRIPTION + +Checks for group authorization in MKDoc's Grp tables. If the document +requested is assigned to one or more groups in Document_Grp then the +user must be assigned to one of the groups in Editor_Grp. + +Users may be assigned to groups in the user editor by the admin. +Groups are managed directly in the database (for now). + +=head1 AUTHOR + +Sam Tregar + +=cut + +sub handler { + my $r = shift; + my $user = $::MKD_USER; + + # get the current document, locally setting PATH_INFO which is + # needed by the current_document() code but not yet setup by + # Apache at this stage + my $document = do { + local $ENV{PATH_INFO} = $r->path_info; + flo::Standard::current_document(); + }; + + # if it wasn't found then this request can't be group protected + # (could be a CSS link, an image, etc) + return OK unless $document; + + # check if this document is assigned to one or more groups + my $document_grp_t = flo::Standard::table('Document_Grp'); + my @res = $document_grp_t->select ( + cols => 'Grp_ID', + where => lib::sql::Condition->new(Document_ID => $document->id) + )->fetch_all(); + + # no results means this document is available to all + return OK unless @res; + + # if the user isn't correctly logged in then they can't see this + # page + return FORBIDDEN unless $user and ref $user and $user->can('id'); + + # get a list of the user's groups. (It would be nice to just do a + # query against Editor_Grp like (editor_id = ? AND (grp_id = ? OR + # ...)) but I can't figure out how to get lib::sql to do anything + # that complicated. SQL replacements are great, huh?) + my $editor_grp_t = flo::Standard::table('Editor_Grp'); + my $con = lib::sql::Condition->new(Editor_ID => $user->id); + my @groups = $editor_grp_t->select(cols => 'Grp_ID', + where => $con)->fetch_all; + + # no results means the user wasn't in any of the groups, denied + return FORBIDDEN unless @groups; + + # allow through if the user is in one of the document's groups + my %groups = map { ($_->{Grp_ID}, 1) } @groups; + return OK if grep { $groups{$_->{Grp_ID}} } @res; + + # otherwise, no dice + return FORBIDDEN; +} + +# an authen handler that does nothing. This is needed to allow the +# group authz mechanism to work on www.* which doesn't do +# authentication. +sub null_authen_handler ($$) { OK } + +1; Index: Httpd_Conf.pm =================================================================== RCS file: /var/spool/cvs/mkd/MKDoc/Site/ConfigWriter/Httpd_Conf.pm,v retrieving revision 1.1.2.28 retrieving revision 1.1.2.29 diff -LMKDoc/Site/ConfigWriter/Httpd_Conf.pm -LMKDoc/Site/ConfigWriter/Httpd_Conf.pm -u -r1.1.2.28 -r1.1.2.29 --- MKDoc/Site/ConfigWriter/Httpd_Conf.pm +++ MKDoc/Site/ConfigWriter/Httpd_Conf.pm @@ -208,6 +208,7 @@ #Editor: vim:syn=apache PerlAuthenHandler MKDoc::Handler::Authenticate + PerlAuthzHandler MKDoc::Handler::GroupAuthz AuthName "Please enter your user credentials" AuthType Basic require valid-user @@ -239,6 +240,16 @@ PerlInitHandler MKDoc::Handler::Initialize Include $SITE_DIR/httpd/httpd-static.conf Include $SITE_DIR/httpd/httpd-mkdoc.conf + + + PerlModule MKDoc::Handler::GroupAuthz + PerlAuthenHandler MKDoc::Handler::GroupAuthz->null_authen_handler + PerlAuthzHandler MKDoc::Handler::GroupAuthz + AuthName "Group Authorization" + AuthType GroupAuthz + require valid-group + + Index: Schema.pm =================================================================== RCS file: /var/spool/cvs/mkd/MKDoc/Site/Deploy/DB/Schema.pm,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -LMKDoc/Site/Deploy/DB/Schema.pm -LMKDoc/Site/Deploy/DB/Schema.pm -u -r1.1.2.6 -r1.1.2.7 --- MKDoc/Site/Deploy/DB/Schema.pm +++ MKDoc/Site/Deploy/DB/Schema.pm @@ -364,6 +364,63 @@ fk => { Document => { Document_ID => 'ID' } }, ); +## GRP TABLE - holds user groups. (The table can't be named Group +## because group is a reserved word in SQL.) +new lib::sql::Table + ( + name => 'Grp', + pk => [ 'ID' ], + ai => 1, + cols => [ + { name => 'ID', + type => lib::sql::type::Int->new( not_null => 1 ) }, + { name => 'Name', + type => lib::sql::type::Char->new( size => 255 ) }, + { name => 'Description', + type => lib::sql::type::Char->new( size => 255 ) }, + ] + ); + +## EDITOR GRP TABLE - holds assignments of editors (users) to +## groups. When a user is assigned to a group she can access +## documents assigned to that group. +new lib::sql::Table + ( + name => 'Editor_Grp', + pk => [ 'Editor_ID', 'Grp_ID' ], + cols => [ + { name => 'Editor_ID', + type => lib::sql::type::Int->new( not_null => 1 ) }, + { name => 'Grp_ID', + type => lib::sql::type::Int->new( not_null => 1 ) }, + ], + fk => { + Grp => { Grp_ID => 'ID' }, + Editor => { Editor_ID => 'ID' }, + }, + index => { ReverseGrpEditorIndex => [ 'Grp_ID', 'Editor_ID' ] }, + ); + +## DOCUMENT GRP TABLE - holds assignments of documents to groups. +## When a document is assigned to one or more groups only members of +## that group can access the document. +new lib::sql::Table + ( + name => 'Document_Grp', + pk => [ 'Document_ID', 'Grp_ID' ], + cols => [ + { name => 'Document_ID', + type => lib::sql::type::Int->new( not_null => 1 ) }, + { name => 'Grp_ID', + type => lib::sql::type::Int->new( not_null => 1 ) }, + ], + fk => { + Grp => { Grp_ID => 'ID' }, + Document => { Document_ID => 'ID' }, + }, + index => { ReverseGrpDocumentIndex => [ 'Grp_ID', 'Document_ID' ] }, + ); + 1; __END__ Index: UserDelete.pm =================================================================== RCS file: /var/spool/cvs/mkd/flo/plugin/Admin/UserDelete.pm,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -Lflo/plugin/Admin/UserDelete.pm -Lflo/plugin/Admin/UserDelete.pm -u -r1.1.2.4 -r1.1.2.5 --- flo/plugin/Admin/UserDelete.pm +++ flo/plugin/Admin/UserDelete.pm @@ -47,6 +47,11 @@ { my $self = shift; my $user_edit = $self->user_edit(); + + # clear grp assignments + my $editor_group_t = flo::Standard::table ('Editor_Grp'); + $editor_group_t->delete(Editor_ID => $user_edit->id); + $user_edit->delete(); use flo::plugin::Admin::UserList; Index: UserModify.pm =================================================================== RCS file: /var/spool/cvs/mkd/flo/plugin/Admin/UserModify.pm,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -Lflo/plugin/Admin/UserModify.pm -Lflo/plugin/Admin/UserModify.pm -u -r1.1.2.5 -r1.1.2.6 --- flo/plugin/Admin/UserModify.pm +++ flo/plugin/Admin/UserModify.pm @@ -70,6 +70,7 @@ $user_edit->save(); $self->insert_base_document ($user_edit->id()); + $self->insert_groups ($user_edit->id()); $self->{ok} = 1; return $self->http_get(); } @@ -88,6 +89,19 @@ $base_document_t->insert (Editor_ID => $id, Document_ID => $_) for (@base_documents); } +# create entries in Editor_Grp for group choices +sub insert_groups +{ + my ($self, $id) = @_; + my $cgi = flo::Standard::cgi(); + my @groups = $cgi->param('groups'); + + my $editor_group_t = flo::Standard::table ('Editor_Grp'); + $editor_group_t->delete(Editor_ID => $id); + $editor_group_t->insert(Editor_ID => $id, Grp_ID => $_) + for @groups; +} + sub documents { @@ -102,7 +116,20 @@ return wantarray ? @res : \@res; } +# return list of available groups for template +sub groups { + my $self = shift; + my $document_t = flo::Standard::table ('Grp'); + my @res = $document_t->select ( + cols => ['ID', 'Name' ], + sort => [ 'Name' ], + desc => 0, + )->fetch_all(); + return wantarray ? @res : \@res; +} + +# returns true if the document is selected, false if not sub is_selected { my $self = shift; @@ -114,5 +141,21 @@ return; } +# returns true if the group is selected, false if not +sub is_group_selected { + my ($self, $id) = @_; + + # look for a row for this editor and group in the Editor_Grp table + my $grp_t = flo::Standard::table ('Editor_Grp'); + my @res = $grp_t->select ( + cols => ['Grp_ID'], + where => lib::sql::Condition->new(Grp_ID => $id, + Editor_ID => $self->user_edit->id) + )->fetch_all(); + + return 1 if @res; + return; +} + 1; Index: UserInsert.pm =================================================================== RCS file: /var/spool/cvs/mkd/flo/plugin/Admin/UserInsert.pm,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -Lflo/plugin/Admin/UserInsert.pm -Lflo/plugin/Admin/UserInsert.pm -u -r1.1.2.3 -r1.1.2.4 --- flo/plugin/Admin/UserInsert.pm +++ flo/plugin/Admin/UserInsert.pm @@ -45,6 +45,7 @@ $self->has_errors() and return $self->http_get(); $self->insert_base_document ($user->id()); + $self->insert_groups ($user->id()); $self->{ok} = 1; $cgi->delete ($cgi->param()); @@ -64,6 +65,18 @@ $base_document_t->insert (Editor_ID => $id, Document_ID => $_) for (@base_documents); } +# create entries in Editor_Grp for group choices +sub insert_groups +{ + my ($self, $id) = @_; + my $cgi = flo::Standard::cgi(); + my @groups = $cgi->param('groups'); + + my $editor_group_t = flo::Standard::table ('Editor_Grp'); + $editor_group_t->delete(Editor_ID => $id); + $editor_group_t->insert(Editor_ID => $id, Grp_ID => $_) + for @groups; +} sub documents { @@ -78,6 +91,18 @@ return wantarray ? @res : \@res; } +# return list of available groups for template +sub groups { + my $self = shift; + my $document_t = flo::Standard::table ('Grp'); + my @res = $document_t->select ( + cols => ['ID', 'Name' ], + sort => [ 'Name' ], + desc => 0, + )->fetch_all(); + + return wantarray ? @res : \@res; +} sub is_selected { Index: en.html =================================================================== RCS file: /var/spool/cvs/mkd/templates/admin/user_insert/Attic/en.html,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -Ltemplates/admin/user_insert/en.html -Ltemplates/admin/user_insert/en.html -u -r1.1.2.16 -r1.1.2.17 --- templates/admin/user_insert/en.html +++ templates/admin/user_insert/en.html @@ -292,6 +292,43 @@ + Users may belong to one or more groups. + You can use groups to restrict access to areas + of your site to groups of users. This restriction affects + both editing and viewing. To select multiple groups or + select no groups you might need to use the + Ctrl key. + + Group(s) +
+ +

+ +

+ Accounts can be enabled, which means that they can be used, or disabled which means that they can't be used. Index: en.html =================================================================== RCS file: /var/spool/cvs/mkd/templates/admin/user_modify/Attic/en.html,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -Ltemplates/admin/user_modify/en.html -Ltemplates/admin/user_modify/en.html -u -r1.1.2.16 -r1.1.2.17 --- templates/admin/user_modify/en.html +++ templates/admin/user_modify/en.html @@ -288,6 +288,44 @@ >/foo/bar/

+ +

+ + Users may belong to one or more groups. + You can use groups to restrict access to areas + of your site to groups of users. This restriction affects + both editing and viewing. To select multiple groups or + select no groups you might need to use the + Ctrl key. + + Group(s) +
+ +

Log Message: ----------- Add note about xmllint preferring numeric entities rather than html entities. Modified Files: -------------- Petal/lib/Petal: Cookbook.pod -------------- next part -------------- Index: Cookbook.pod =================================================================== RCS file: /var/spool/cvs/Petal/lib/Petal/Cookbook.pod,v retrieving revision 1.3 retrieving revision 1.4 diff -Llib/Petal/Cookbook.pod -Llib/Petal/Cookbook.pod -u -r1.3 -r1.4 --- lib/Petal/Cookbook.pod +++ lib/Petal/Cookbook.pod @@ -71,10 +71,11 @@ xmlns:petal="http://purl.org/petal/1.0/" xmlns:metal="http://purl.org/petal/1.0/"> -You may receive errors from xmllint about unknown entities such as nbsp. These -can be safely ignored. If you find a way to suppress these warnings, please -let us know. In the meantime, you can pass the output through grep to ignore -these bogus warnings:. +You may receive errors from xmllint about unknown entities such as . +These can be safely ignored, though you can use the numeric version +instead to keep xmllint happy. If you find a way to suppress these warnings, +please let us know. In the meantime, you can pass the output through grep to +ignore these bogus warnings:. xmllint --noout tmpl/contact_info.tmpl >& grep -v 'Entity' From bruno at mkdoc.demon.co.uk Wed Jan 26 15:47:48 2005 From: bruno at mkdoc.demon.co.uk (bruno@mkdoc.demon.co.uk) Date: Wed Jan 26 15:47:30 2005 Subject: [MKDoc-commit] HTML::TreeBuilder hasn't been required for a loooong time Message-ID: <20050126154748.6D3972E28E2@mkdoc.demon.co.uk> Log Message: ----------- HTML::TreeBuilder hasn't been required for a loooong time Tags: ---- mkdoc-1-6 Modified Files: -------------- mkd: INSTALL.TXT -------------- next part -------------- Index: INSTALL.TXT =================================================================== RCS file: /var/spool/cvs/mkd/INSTALL.TXT,v retrieving revision 1.3.2.30 retrieving revision 1.3.2.31 diff -LINSTALL.TXT -LINSTALL.TXT -u -r1.3.2.30 -r1.3.2.31 --- INSTALL.TXT +++ INSTALL.TXT @@ -160,7 +160,6 @@ Text::Unidecode Unicode::String Mail::IMAPClient - HTML::TreeBuilder Time::ParseDate XML::RSS Cache::Cache From chris at mkdoc.demon.co.uk Thu Jan 27 10:14:52 2005 From: chris at mkdoc.demon.co.uk (chris@mkdoc.demon.co.uk) Date: Thu Jan 27 10:14:34 2005 Subject: [MKDoc-commit] New Directory Message-ID: <20050127101452.D2A0F2E28E2@mkdoc.demon.co.uk> Update of /var/spool/cvs/mkd/templates/account/preferences/audiences In directory devil.webarch.net:/tmp/cvs-serv14325/audiences Log Message: Directory /var/spool/cvs/mkd/templates/account/preferences/audiences added to the repository --> Using per-directory sticky tag `mkdoc-1-6' From chris at mkdoc.demon.co.uk Thu Jan 27 10:15:15 2005 From: chris at mkdoc.demon.co.uk (chris@mkdoc.demon.co.uk) Date: Thu Jan 27 10:14:57 2005 Subject: [MKDoc-commit] Audiences split into a seperate file Message-ID: <20050127101515.F05FB2E28E2@mkdoc.demon.co.uk> Log Message: ----------- Audiences split into a seperate file Tags: ---- mkdoc-1-6 Modified Files: -------------- mkd/templates/account/preferences: en.html Added Files: ----------- mkd/templates/account/preferences/audiences: en.html -------------- next part -------------- Index: en.html =================================================================== RCS file: /var/spool/cvs/mkd/templates/account/preferences/Attic/en.html,v retrieving revision 1.3.2.34 retrieving revision 1.3.2.35 diff -Ltemplates/account/preferences/en.html -Ltemplates/account/preferences/en.html -u -r1.3.2.34 -r1.3.2.35 --- templates/account/preferences/en.html +++ templates/account/preferences/en.html @@ -557,74 +557,8 @@ -

- - - Audience Preferences - - -

- This section of the form allows you to indicate which audience keywords - best describe your interests. This information is used to generate - customised email newsletters and listings of documents on the site. -

- - -

- Audience -
- - -

- -

+ +

+ + + Audience Preferences + + +

+ This section of the form allows you to indicate which audience keywords + best describe your interests. This information is used to generate + customised email newsletters and listings of documents on the site. +

+ + +

+ Audience +
+ + +

+ +

From chris at mkdoc.demon.co.uk Thu Jan 27 10:33:52 2005 From: chris at mkdoc.demon.co.uk (chris@mkdoc.demon.co.uk) Date: Thu Jan 27 10:33:35 2005 Subject: [MKDoc-commit] Omit tag on span added for XHTML validity Message-ID: <20050127103352.E1FF92E28E2@mkdoc.demon.co.uk> Log Message: ----------- Omit tag on span added for XHTML validity Tags: ---- mkdoc-1-6 Modified Files: -------------- mkd/templates/account/preferences/audiences: en.html -------------- next part -------------- Index: en.html =================================================================== RCS file: /var/spool/cvs/mkd/templates/account/preferences/audiences/Attic/en.html,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -Ltemplates/account/preferences/audiences/en.html -Ltemplates/account/preferences/audiences/en.html -u -r1.1.2.1 -r1.1.2.2 --- templates/account/preferences/audiences/en.html +++ templates/account/preferences/audiences/en.html @@ -51,6 +51,7 @@

From chris at mkdoc.demon.co.uk Fri Jan 28 11:16:51 2005 From: chris at mkdoc.demon.co.uk (chris@mkdoc.demon.co.uk) Date: Fri Jan 28 11:16:32 2005 Subject: [MKDoc-commit] Audiences preferences moved to the end of the form Message-ID: <20050128111651.E93AB2E28E2@mkdoc.demon.co.uk> Log Message: ----------- Audiences preferences moved to the end of the form Tags: ---- mkdoc-1-6 Modified Files: -------------- mkd/templates/account/preferences: en.html -------------- next part -------------- Index: en.html =================================================================== RCS file: /var/spool/cvs/mkd/templates/account/preferences/Attic/en.html,v retrieving revision 1.3.2.35 retrieving revision 1.3.2.36 diff -Ltemplates/account/preferences/en.html -Ltemplates/account/preferences/en.html -u -r1.3.2.35 -r1.3.2.36 --- templates/account/preferences/en.html +++ templates/account/preferences/en.html @@ -209,20 +209,20 @@ href="#newsletter-preferences" >Newsletter Preferences | Audience Preferences | + href="#language-preferences" + >Language Preferences | Language Preferences + href="#audience-preferences" + >Audience Preferences

@@ -557,9 +557,6 @@ - - -

+ + +

Log Message: ----------- Moved prefixed audiences into seperate fieldsets but un prefixed ones not in an extra fieldset now... Tags: ---- mkdoc-1-6 Modified Files: -------------- mkd/templates/account/preferences/audiences: en.html -------------- next part -------------- Index: en.html =================================================================== RCS file: /var/spool/cvs/mkd/templates/account/preferences/audiences/Attic/en.html,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -Ltemplates/account/preferences/audiences/en.html -Ltemplates/account/preferences/audiences/en.html -u -r1.1.2.3 -r1.1.2.4 --- templates/account/preferences/audiences/en.html +++ templates/account/preferences/audiences/en.html @@ -25,70 +25,119 @@ customised email newsletters and listings of documents on the site.

- Fruit + +

+ Audience +
+ + +

+ +

- Miscellaneous +

- Audience -
- - -

- + Audience +
+ + +

+ - + From chris at mkdoc.demon.co.uk Fri Jan 28 11:51:22 2005 From: chris at mkdoc.demon.co.uk (chris@mkdoc.demon.co.uk) Date: Fri Jan 28 11:51:01 2005 Subject: [MKDoc-commit] true: added Message-ID: <20050128115122.20A8C2E28E2@mkdoc.demon.co.uk> Log Message: ----------- true: added Tags: ---- mkdoc-1-6 Modified Files: -------------- mkd/templates/account/preferences/audiences: en.html -------------- next part -------------- Index: en.html =================================================================== RCS file: /var/spool/cvs/mkd/templates/account/preferences/audiences/Attic/en.html,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -Ltemplates/account/preferences/audiences/en.html -Ltemplates/account/preferences/audiences/en.html -u -r1.1.2.4 -r1.1.2.5 --- templates/account/preferences/audiences/en.html +++ templates/account/preferences/audiences/en.html @@ -58,15 +58,15 @@ petal:repeat="option self/preferences/audience_options $current_val" > @@ -122,15 +122,15 @@ petal:repeat="option self/preferences/audience_options $current_val" > From bruno at mkdoc.demon.co.uk Fri Jan 28 18:52:26 2005 From: bruno at mkdoc.demon.co.uk (bruno@mkdoc.demon.co.uk) Date: Fri Jan 28 18:52:06 2005 Subject: [MKDoc-commit] [1.6] fix config: petal errors Message-ID: <20050128185226.3B0C82E28E2@mkdoc.demon.co.uk> Log Message: ----------- [1.6] fix config: petal errors Tags: ---- mkdoc-1-6 Modified Files: -------------- mkd/flo: Object.pm -------------- next part -------------- Index: Object.pm =================================================================== RCS file: /var/spool/cvs/mkd/flo/Attic/Object.pm,v retrieving revision 1.4.2.4 retrieving revision 1.4.2.5 diff -Lflo/Object.pm -Lflo/Object.pm -u -r1.4.2.4 -r1.4.2.5 --- flo/Object.pm +++ flo/Object.pm @@ -32,6 +32,12 @@ use strict; use CGI::Carp; +$Petal::Hash::MODIFIERS->{'config:'} = sub { + my $hash = shift; + my $key = shift; + return MKDoc::Config->$key(); +}; + ## # $class->config; From chris at mkdoc.demon.co.uk Mon Jan 31 14:11:16 2005 From: chris at mkdoc.demon.co.uk (chris@mkdoc.demon.co.uk) Date: Mon Jan 31 14:10:56 2005 Subject: [MKDoc-commit] Bug fix to make copyright info appear in the rdf metedata file Message-ID: <20050131141116.B3ADD2E28E2@mkdoc.demon.co.uk> Log Message: ----------- Bug fix to make copyright info appear in the rdf metedata file Tags: ---- mkdoc-1-6 Modified Files: -------------- mkd/templates/metadata: dcq.rdf.xml -------------- next part -------------- Index: dcq.rdf.xml =================================================================== RCS file: /var/spool/cvs/mkd/templates/metadata/Attic/dcq.rdf.xml,v retrieving revision 1.9.2.9 retrieving revision 1.9.2.10 diff -Ltemplates/metadata/dcq.rdf.xml -Ltemplates/metadata/dcq.rdf.xml -u -r1.9.2.9 -r1.9.2.10 --- templates/metadata/dcq.rdf.xml +++ templates/metadata/dcq.rdf.xml @@ -180,9 +180,9 @@

- Starts - - DATE - - - TZ - -
-
- Ends - - DATE - - - DATE - + + 10:11am to 5:10pm Monday December 18 2005 +

Petal Test

Basic - Passing a hashreference to Petal::process

Advanced - Invoking methods on objects

Advanced - Using CGI.pm to generate forms

- Starts - - DATE - - - TZ - - - - Ends - - DATE - - - DATE - + + 10:11am to 5:10pm Monday December 18 2005 +

Petal Test

Basic - Passing a hashreference to Petal::process

Advanced - Invoking methods on objects

Advanced - Using CGI.pm to generate forms

- Starts - - DATE - - - TZ - -
-
- Ends - - DATE - - - DATE - + + 10:11am to 5:10pm Monday December 18 2005 +