OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Jan-2005 16:47:42
Branch: HEAD Handle: 2005011415474200
Modified files:
openpkg-src/kwiki kwiki.patch
Log:
port Kwiki::Notify::Mail to latest Kwiki API world order (hell, for
how long do I have to patch this beast until it really works as
expected?)
Summary:
Revision Changes Path
1.12 +49 -11 openpkg-src/kwiki/kwiki.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kwiki/kwiki.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 kwiki.patch
--- openpkg-src/kwiki/kwiki.patch 14 Jan 2005 14:27:41 -0000 1.11
+++ openpkg-src/kwiki/kwiki.patch 14 Jan 2005 15:47:42 -0000 1.12
@@ -1,6 +1,6 @@
Index: Kwiki-0.37/lib/Kwiki/Command.pm
--- Kwiki-0.37/lib/Kwiki/Command.pm.orig 2005-01-11 11:16:11 +0100
-+++ Kwiki-0.37/lib/Kwiki/Command.pm 2005-01-14 14:42:23 +0100
++++ Kwiki-0.37/lib/Kwiki/Command.pm 2005-01-14 16:41:47 +0100
@@ -114,7 +114,7 @@
next unless $self->is_kwiki_dir($dir);
$self->msg('Updating ', $dir->absolute->pathname, "\n");
@@ -12,7 +12,7 @@
Index: Kwiki-0.37/lib/Kwiki/Config.pm
--- Kwiki-0.37/lib/Kwiki/Config.pm.orig 2005-01-11 16:51:34 +0100
-+++ Kwiki-0.37/lib/Kwiki/Config.pm 2005-01-14 14:42:23 +0100
++++ Kwiki-0.37/lib/Kwiki/Config.pm 2005-01-14 16:41:47 +0100
@@ -174,11 +174,11 @@
# Put overrides in the top level config.yaml
# See: http://www.kwiki.org/?ChangingConfigDotYaml
@@ -29,7 +29,7 @@
# file. Do not modify any of the files under the config/ directory as
Index: Kwiki-0.37/lib/Kwiki/Display.pm
--- Kwiki-0.37/lib/Kwiki/Display.pm.orig 2005-01-11 11:16:46 +0100
-+++ Kwiki-0.37/lib/Kwiki/Display.pm 2005-01-14 14:42:23 +0100
++++ Kwiki-0.37/lib/Kwiki/Display.pm 2005-01-14 16:41:47 +0100
@@ -84,7 +84,7 @@
__template/tt2/display_changed_by.html__
[% IF self.preferences.display_changed_by.value %]
@@ -41,7 +41,7 @@
</em>
Index: Kwiki-0.37/lib/Kwiki/Formatter.pm
--- Kwiki-0.37/lib/Kwiki/Formatter.pm.orig 2005-01-11 11:16:46 +0100
-+++ Kwiki-0.37/lib/Kwiki/Formatter.pm 2005-01-14 14:53:20 +0100
++++ Kwiki-0.37/lib/Kwiki/Formatter.pm 2005-01-14 16:41:47 +0100
@@ -322,7 +322,7 @@
package Kwiki::Formatter::HyperLink;
use base 'Spoon::Formatter::Unit';
@@ -62,7 +62,7 @@
my $text = $self->escape_html($self->matched);
Index: Kwiki-0.37/lib/Kwiki/Pages.pm
--- Kwiki-0.37/lib/Kwiki/Pages.pm.orig 2004-12-28 21:54:51 +0100
-+++ Kwiki-0.37/lib/Kwiki/Pages.pm 2005-01-14 14:51:46 +0100
++++ Kwiki-0.37/lib/Kwiki/Pages.pm 2005-01-14 16:41:47 +0100
@@ -287,17 +287,17 @@
__!database/HomePage__
=== Welcome to Your New Kwiki!
@@ -93,7 +93,7 @@
---[http://www.kwiki.org/?BrianIngerson Brian Ingerson]
Index: Kwiki-0.37/lib/Kwiki/Theme/Basic.pm
--- Kwiki-0.37/lib/Kwiki/Theme/Basic.pm.orig 2004-12-02 03:15:06 +0100
-+++ Kwiki-0.37/lib/Kwiki/Theme/Basic.pm 2005-01-14 14:42:23 +0100
++++ Kwiki-0.37/lib/Kwiki/Theme/Basic.pm 2005-01-14 16:41:47 +0100
@@ -42,6 +42,8 @@
</h1>
</div>
@@ -136,7 +136,7 @@
h1, h2, h3, h4, h5, h6 {
Index: Kwiki-Diff-0.01/lib/Kwiki/Diff.pm
--- Kwiki-Diff-0.01/lib/Kwiki/Diff.pm.orig 2004-08-25 18:01:20 +0200
-+++ Kwiki-Diff-0.01/lib/Kwiki/Diff.pm 2005-01-14 14:42:23 +0100
++++ Kwiki-Diff-0.01/lib/Kwiki/Diff.pm 2005-01-14 16:41:47 +0100
@@ -166,6 +166,11 @@
<img src="icons/gnome/image/diff.png" alt="Differences" />
<!-- END diff_button_icon.html -->
@@ -151,7 +151,7 @@
<a href="[% script_name %]?action=revisions&page_id=[% page_id
%]&revision_id=[% revision_id %]" accesskey="r" title="Revision [% revision_id
%]">
Index: Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm
--- Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm.orig 2005-01-11 17:03:22
+0100
-+++ Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm 2005-01-14 14:42:23
+0100
++++ Kwiki-Favorites-0.13/lib/Kwiki/Favorites.pm 2005-01-14 16:41:47
+0100
@@ -111,7 +111,7 @@
}
</script>
@@ -163,7 +163,45 @@
</form>
Index: Kwiki-Notify-Mail-0.02/lib/Kwiki/Notify/Mail.pm
--- Kwiki-Notify-Mail-0.02/lib/Kwiki/Notify/Mail.pm.orig 2004-09-01
02:11:53 +0200
-+++ Kwiki-Notify-Mail-0.02/lib/Kwiki/Notify/Mail.pm 2005-01-14 14:42:23
+0100
++++ Kwiki-Notify-Mail-0.02/lib/Kwiki/Notify/Mail.pm 2005-01-14 16:42:56
+0100
+@@ -14,30 +14,30 @@
+ const config_file => 'notify_mail.yaml';
+
+ sub debug {
+- my $debug = $self->config->notify_mail_debug || 0;
++ my $debug = $self->hub->config->notify_mail_debug || 0;
+ return $debug;
+ }
+
+ sub register {
+ my $registry = shift;
+- $registry->add(page_hook_store => 'notify');
++ $registry->add(hook => 'page:store', post => 'notify');
+ }
+
+ sub notify {
+ my $meta_data = $self->hub->edit->pages->current->metadata;
+- my $site_title = $self->config->site_title;
++ my $site_title = $self->hub->config->site_title;
+
+ my $edited_by = $meta_data->{edit_by} || 'unknown
name';
+ my $page_name = $meta_data->{id} || 'unknown
page';
+- my $to = $self->config->notify_mail_to || '[EMAIL
PROTECTED]';
+- my $from = $self->config->notify_mail_from || 'unknown';
+- my $subject = sprintf($self->config->notify_mail_subject,
++ my $to = $self->hub->config->notify_mail_to || '[EMAIL
PROTECTED]';
++ my $from = $self->hub->config->notify_mail_from ||
'unknown';
++ my $subject = sprintf($self->hub->config->notify_mail_subject,
+ $site_title,
+ $page_name,
+ $edited_by) || 'unknown';
+ my $body = "$site_title page $page_name edited by $edited_by\n";
+
+- $self->mail_it($to,$from,$subject,$body);
++ $self->hub->load_class('notify')->mail_it($to,$from,$subject,$body);
+ return $self;
+ }
+
@@ -58,7 +58,7 @@
$msg->print(\*TEMPFILE);
close TEMPFILE;
@@ -175,7 +213,7 @@
Index: Kwiki-RecentChangesRSS-0.05/lib/Kwiki/RecentChangesRSS.pm
--- Kwiki-RecentChangesRSS-0.05/lib/Kwiki/RecentChangesRSS.pm.orig
2004-12-11 22:50:42 +0100
-+++ Kwiki-RecentChangesRSS-0.05/lib/Kwiki/RecentChangesRSS.pm
2005-01-14 14:42:23 +0100
++++ Kwiki-RecentChangesRSS-0.05/lib/Kwiki/RecentChangesRSS.pm
2005-01-14 16:41:47 +0100
@@ -312,6 +312,7 @@
rss_skipHours:
rss_skipDays:
@@ -195,7 +233,7 @@
eNpjdDdgQAX/Gd9+QBP6w8SAAYBC/1YzcBdYr2eYvYG7ACTEAhQ98JVb9vRvBoG/DD+gqhga2Jmd
Index: Kwiki-Search-0.12/lib/Kwiki/Search.pm
--- Kwiki-Search-0.12/lib/Kwiki/Search.pm.orig 2004-12-16 00:38:12
+0100
-+++ Kwiki-Search-0.12/lib/Kwiki/Search.pm 2005-01-14 14:42:23 +0100
++++ Kwiki-Search-0.12/lib/Kwiki/Search.pm 2005-01-14 16:41:47 +0100
@@ -72,7 +72,7 @@
=cut
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
