Index: openacs-4/packages/lars-blogger/lars-blogger.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/lars-blogger.info,v diff -u -N -r1.8.2.4 -r1.8.2.5 --- openacs-4/packages/lars-blogger/lars-blogger.info 13 Mar 2003 14:28:47 -0000 1.8.2.4 +++ openacs-4/packages/lars-blogger/lars-blogger.info 13 Mar 2003 17:03:47 -0000 1.8.2.5 @@ -6,124 +6,35 @@ Lars Bloggers f f - - - - oracle - postgresql - + + Lars Pind Write your own web log - 2003-01-30 + 2003-03-13 Collaboraid Manages multiple web logs for your site. Just mount multiple instances, and you can do all the blogging you want. - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + Index: openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-create.sql,v diff -u -N -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-create.sql 13 Mar 2003 14:29:03 -0000 1.2.2.1 +++ openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-create.sql 13 Mar 2003 17:04:18 -0000 1.2.2.2 @@ -33,6 +33,7 @@ package_id constraint pinds_blog_entry_package_id_fk references apm_packages(package_id), title varchar(500), + title_url varchar(500), content clob, content_format varchar(50) default 'text/html' Index: openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-package-create.sql,v diff -u -N -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-package-create.sql 13 Mar 2003 14:29:03 -0000 1.1.2.1 +++ openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-package-create.sql 13 Mar 2003 17:04:18 -0000 1.1.2.2 @@ -14,6 +14,7 @@ entry_id in pinds_blog_entries.entry_id%TYPE default null, package_id in pinds_blog_entries.package_id%TYPE, title in pinds_blog_entries.title%TYPE default null, + title_url in pinds_blog_entries.title_url%TYPE default null, content in varchar default null, content_format in varchar default 'text/html', entry_date in pinds_blog_entries.entry_date%TYPE default null, @@ -41,6 +42,7 @@ entry_id in pinds_blog_entries.entry_id%TYPE default null, package_id in pinds_blog_entries.package_id%TYPE, title in pinds_blog_entries.title%TYPE default null, + title_url in pinds_blog_entries.title_url%TYPE default null, content in varchar default null, content_format in varchar default 'text/html', entry_date in pinds_blog_entries.entry_date%TYPE default null, @@ -65,6 +67,7 @@ entry_id, package_id, title, + title_url, content, content_format, entry_date, @@ -75,6 +78,7 @@ v_entry_id, pinds_blog_entry.new.package_id, pinds_blog_entry.new.title, + pinds_blog_entry.new.title_url, pinds_blog_entry.new.content, pinds_blog_entry.new.content_format, pinds_blog_entry.new.entry_date, Index: openacs-4/packages/lars-blogger/sql/oracle/notifications-init.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/oracle/notifications-init.sql,v diff -u -N -r1.1 -r1.1.2.1 --- openacs-4/packages/lars-blogger/sql/oracle/notifications-init.sql 14 Sep 2002 21:43:33 -0000 1.1 +++ openacs-4/packages/lars-blogger/sql/oracle/notifications-init.sql 13 Mar 2003 17:04:18 -0000 1.1.2.1 @@ -56,7 +56,7 @@ insert into notification_types_intervals (type_id, interval_id) select v_foo, interval_id - from notification_intervals where name in ('instant','hourly','daily'); + from notification_intervals where name in ('instant','hourly','daily', 'weekly'); insert into notification_types_del_methods (type_id, delivery_method_id) Index: openacs-4/packages/lars-blogger/sql/oracle/upgrade/upgrade-0.8.4-0.8.5.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/oracle/upgrade/upgrade-0.8.4-0.8.5.sql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/lars-blogger/sql/oracle/upgrade/upgrade-0.8.4-0.8.5.sql 13 Mar 2003 17:04:42 -0000 1.1.2.1 @@ -0,0 +1,134 @@ +-- +-- Upgrade script +-- +-- Adds the title_url column to blog entries and __new function +-- +-- @author Lars Pind (lars@pinds.com) +-- @creation-date 2003-03-13 +-- + +alter table pinds_blog_entries add ( + title_url varchar(500) +); + + +create or replace package pinds_blog_entry +as + + function new ( + entry_id in pinds_blog_entries.entry_id%TYPE default null, + package_id in pinds_blog_entries.package_id%TYPE, + title in pinds_blog_entries.title%TYPE default null, + title_url in pinds_blog_entries.title_url%TYPE default null, + content in varchar default null, + content_format in varchar default 'text/html', + entry_date in pinds_blog_entries.entry_date%TYPE default null, + draft_p in pinds_blog_entries.draft_p%TYPE default 'f', + creation_user in acs_objects.creation_user%TYPE default null, + creation_ip in acs_objects.creation_ip%TYPE default null + ) return pinds_blog_entries.entry_id%TYPE; + + procedure delete ( + entry_id in pinds_blog_entries.entry_id%TYPE + ); + + function title ( + entry_id in pinds_blog_entries.entry_id%TYPE + ) return pinds_blog_entries.title%TYPE; + +end pinds_blog_entry; +/ +show errors + +create or replace package body pinds_blog_entry +as + + function new ( + entry_id in pinds_blog_entries.entry_id%TYPE default null, + package_id in pinds_blog_entries.package_id%TYPE, + title in pinds_blog_entries.title%TYPE default null, + title_url in pinds_blog_entries.title_url%TYPE default null, + content in varchar default null, + content_format in varchar default 'text/html', + entry_date in pinds_blog_entries.entry_date%TYPE default null, + draft_p in pinds_blog_entries.draft_p%TYPE default 'f', + creation_user in acs_objects.creation_user%TYPE default null, + creation_ip in acs_objects.creation_ip%TYPE default null + ) return pinds_blog_entries.entry_id%TYPE + is + v_entry_id pinds_blog_entries.entry_id%TYPE; + begin + + v_entry_id := acs_object.new( + object_id => pinds_blog_entry.new.entry_id, + object_type => 'pinds_blog_entry', + creation_date => sysdate, + creation_user => pinds_blog_entry.new.creation_user, + creation_ip => pinds_blog_entry.new.creation_ip, + context_id => pinds_blog_entry.new.package_id + ); + + insert into pinds_blog_entries ( + entry_id, + package_id, + title, + title_url, + content, + content_format, + entry_date, + posted_date, + draft_p, + deleted_p + ) values ( + v_entry_id, + pinds_blog_entry.new.package_id, + pinds_blog_entry.new.title, + pinds_blog_entry.new.title_url, + pinds_blog_entry.new.content, + pinds_blog_entry.new.content_format, + pinds_blog_entry.new.entry_date, + sysdate, + pinds_blog_entry.new.draft_p, + 'f' + ); + + return v_entry_id; + + end new; + + procedure delete ( + entry_id in pinds_blog_entries.entry_id%TYPE + ) + is + begin + + delete + from pinds_blog_entries + where entry_id = pinds_blog_entry.delete.entry_id; + + acs_object.delete(pinds_blog_entry.delete.entry_id); + + end delete; + + function title ( + entry_id in pinds_blog_entries.entry_id%TYPE + ) return pinds_blog_entries.title%TYPE + is + v_title pinds_blog_entries.title%TYPE; + begin + + select title + into v_title + from pinds_blog_entries + where entry_id = pinds_blog_entry.title.entry_id; + + return v_title; + + exception when no_data_found then + return ''; + + end title; + +end pinds_blog_entry; +/ +show errors Index: openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-create.sql,v diff -u -N -r1.2.2.4 -r1.2.2.5 --- openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-create.sql 13 Mar 2003 14:29:31 -0000 1.2.2.4 +++ openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-create.sql 13 Mar 2003 17:05:07 -0000 1.2.2.5 @@ -29,6 +29,7 @@ constraint pinds_blog_entry_package_id_kf references apm_packages(package_id), title varchar(500), + title_url varchar(500), content varchar(32000), content_format varchar(50) default 'text/html' @@ -61,26 +62,28 @@ create or replace function pinds_blog_entry__new ( - integer, -- entry_id - integer, -- package_id - varchar, -- title - varchar, -- content - varchar, -- content_format + integer, -- entry_id + integer, -- package_id + varchar, -- title + varchar, -- title_url + varchar, -- content + varchar, -- content_format timestamptz, -- entry_date - char, -- draft_p - integer, -- creation_user - varchar -- creation_ip + char, -- draft_p + integer, -- creation_user + varchar -- creation_ip ) returns integer as ' declare p_entry_id alias for $1; p_package_id alias for $2; p_title alias for $3; - p_content alias for $4; - p_content_format alias for $5; - p_entry_date alias for $6; - p_draft_p alias for $7; - p_creation_user alias for $8; - p_creation_ip alias for $9; + p_title_url alias for $4; + p_content alias for $5; + p_content_format alias for $6; + p_entry_date alias for $7; + p_draft_p alias for $8; + p_creation_user alias for $9; + p_creation_ip alias for $10; v_entry_id integer; begin v_entry_id := acs_object__new ( @@ -96,6 +99,7 @@ entry_id, package_id, title, + title_url, content, content_format, entry_date, @@ -106,6 +110,7 @@ v_entry_id, p_package_id, p_title, + p_title_url, p_content, p_content_format, p_entry_date, Index: openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-drop.sql,v diff -u -N -r1.2.2.2 -r1.2.2.3 --- openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-drop.sql 2 Mar 2003 22:45:31 -0000 1.2.2.2 +++ openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-drop.sql 13 Mar 2003 17:05:07 -0000 1.2.2.3 @@ -37,14 +37,16 @@ drop function pinds_blog_entry__title (integer); drop function pinds_blog_entry__new( - integer, -- entry_id - integer, -- package_id - varchar, -- title - varchar, -- content + integer, -- entry_id + integer, -- package_id + varchar, -- title + varchar, -- title_url + varchar, -- content + varchar, -- content_format timestamptz, -- entry_date - char, -- draft_p - integer, -- creation_user - varchar -- creation_ip + char, -- draft_p + integer, -- creation_user + varchar -- creation_ip ); drop function pinds_blog_entry__delete (integer); Index: openacs-4/packages/lars-blogger/sql/postgresql/notifications-init.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/postgresql/notifications-init.sql,v diff -u -N -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/lars-blogger/sql/postgresql/notifications-init.sql 13 Mar 2003 14:29:31 -0000 1.1.2.1 +++ openacs-4/packages/lars-blogger/sql/postgresql/notifications-init.sql 13 Mar 2003 17:05:07 -0000 1.1.2.2 @@ -56,7 +56,7 @@ insert into notification_types_intervals (type_id, interval_id) select v_foo, interval_id - from notification_intervals where name in (''instant'',''hourly'',''daily''); + from notification_intervals where name in (''instant'',''hourly'',''daily'',''weekly''); insert into notification_types_del_methods (type_id, delivery_method_id) Index: openacs-4/packages/lars-blogger/sql/postgresql/upgrade/upgrade-0.8.4-0.8.5.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/sql/postgresql/upgrade/upgrade-0.8.4-0.8.5.sql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/lars-blogger/sql/postgresql/upgrade/upgrade-0.8.4-0.8.5.sql 13 Mar 2003 17:05:24 -0000 1.1.2.1 @@ -0,0 +1,74 @@ +-- +-- Upgrade script +-- +-- Adds the title_url column to blog entries and __new function +-- +-- @author Lars Pind (lars@pinds.com) +-- @creation-date 2003-03-13 +-- + +alter table pinds_blog_entries add + title_url varchar(500); + +create or replace function pinds_blog_entry__new ( + integer, -- entry_id + integer, -- package_id + varchar, -- title + varchar, -- title_url + varchar, -- content + varchar, -- content_format + timestamptz, -- entry_date + char, -- draft_p + integer, -- creation_user + varchar -- creation_ip +) returns integer as ' +declare + p_entry_id alias for $1; + p_package_id alias for $2; + p_title alias for $3; + p_title_url alias for $4; + p_content alias for $5; + p_content_format alias for $6; + p_entry_date alias for $7; + p_draft_p alias for $8; + p_creation_user alias for $9; + p_creation_ip alias for $10; + v_entry_id integer; +begin + v_entry_id := acs_object__new ( + p_entry_id, + ''pinds_blog_entry'', + current_timestamp, + p_creation_user, + p_creation_ip, + p_package_id + ); + + insert into pinds_blog_entries ( + entry_id, + package_id, + title, + title_url, + content, + content_format, + entry_date, + posted_date, + draft_p, + deleted_p + ) values ( + v_entry_id, + p_package_id, + p_title, + p_title_url, + p_content, + p_content_format, + p_entry_date, + current_timestamp, + p_draft_p, + ''f'' + ); + + return v_entry_id; +end; +' language 'plpgsql'; + Index: openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql,v diff -u -N -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql 13 Mar 2003 14:30:03 -0000 1.1.2.2 +++ openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql 13 Mar 2003 17:05:38 -0000 1.1.2.3 @@ -7,6 +7,7 @@ select b.entry_id, b.title, + b.title_url, b.content, b.content_format, b.draft_p, Index: openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql,v diff -u -N -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql 13 Mar 2003 14:30:03 -0000 1.1.2.2 +++ openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql 13 Mar 2003 17:05:38 -0000 1.1.2.3 @@ -7,6 +7,7 @@ select b.entry_id, b.title, + b.title_url, b.content, b.content_format, b.draft_p, Index: openacs-4/packages/lars-blogger/tcl/entry-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/entry-procs.tcl,v diff -u -N -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/lars-blogger/tcl/entry-procs.tcl 13 Mar 2003 14:30:03 -0000 1.1.2.1 +++ openacs-4/packages/lars-blogger/tcl/entry-procs.tcl 13 Mar 2003 17:05:38 -0000 1.1.2.2 @@ -2,7 +2,6 @@ Entry procs for blogger. } - namespace eval lars_blogger::entry {} ad_proc -public lars_blogger::entry::get { @@ -16,7 +15,39 @@ } -ad_proc -public do_notifications { +ad_proc -public lars_blogger::entry::htmlify { + -array:required +} { + Make the entry displayable in an HTML page +} { + upvar $array row + + set row(title) [ad_quotehtml $row(title)] + + # LARS: + # Not sure we should do the ns_adp_parse thing here, but heck, why not + # It should be safe, given the standard HTML filter security checks, which + # wouldn't let unsafe tags slip through, anyway + + set row(content) [ad_html_text_convert -from $row(content_format) -to "text/html" $row(content)] + + # We wrap this in a catch so if it bombs, at least we won't break any pages + catch { + set row(content) [ns_adp_parse -string $row(content)] + } + + # look for the base site name in the url + if {[regexp {^https?://([^ /]+)} $row(title_url) initial base_url] } { + set row(title_url_base) $base_url + } else { + set row(title_url_base) {} + } +} + + + + +ad_proc -public lars_blogger::entry::do_notifications { {-entry_id:required} } { # Select all the important information Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-oracle.xql,v diff -u -N -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-oracle.xql 13 Mar 2003 14:30:03 -0000 1.2.2.1 +++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-oracle.xql 13 Mar 2003 17:05:38 -0000 1.2.2.2 @@ -10,6 +10,7 @@ entry_id => :entry_id, package_id => :package_id, title => :title, + title_url => :title_url, content => :content, content_format => :content_format, entry_date => to_date(:entry_date, 'YYYY-MM-DD'), Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-postgresql.xql,v diff -u -N -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-postgresql.xql 13 Mar 2003 14:30:03 -0000 1.2.2.1 +++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-postgresql.xql 13 Mar 2003 17:05:38 -0000 1.2.2.2 @@ -9,6 +9,7 @@ :entry_id, :package_id, :title, + :title_url, :content, :content_format, to_date(:entry_date, 'YYYY-MM-DD'), Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl,v diff -u -N -r1.7.2.1 -r1.7.2.2 --- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl 13 Mar 2003 14:30:03 -0000 1.7.2.1 +++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl 13 Mar 2003 17:05:38 -0000 1.7.2.2 @@ -9,6 +9,7 @@ {-entry_id:required} {-package_id:required} {-title:required} + {-title_url ""} {-content:required} {-content_format:required} {-entry_date:required} @@ -21,6 +22,14 @@ set entry_id [db_exec_plsql entry_add { *SQL* }] + # If publish directly + if { [string equal $draft_p "f"] } { + # do notifications + lars_blogger::entry::do_notifications -entry_id $entry_id + # and ping weblogs.com + lars_blog_weblogs_com_update_ping + } + lars_blog_flush_cache $package_id return $entry_id Index: openacs-4/packages/lars-blogger/www/blog-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog-oracle.xql,v diff -u -N -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/lars-blogger/www/blog-oracle.xql 13 Mar 2003 14:30:31 -0000 1.2.2.1 +++ openacs-4/packages/lars-blogger/www/blog-oracle.xql 13 Mar 2003 17:05:51 -0000 1.2.2.2 @@ -3,25 +3,38 @@ oracle8.1.6 - + - trunc(entry_date, :archive_interval) = :archive_date + trunc(entry_date, 'MONTH') = :archive_date + + + trunc(entry_date, 'DD') = :archive_date + + + entry_date > sysdate - 30 + + + and rownum < 3 + + + select entry_id, to_char(entry_date, 'fmDayfm, Month fmDDfm, YYYY') as entry_date_pretty, to_char(entry_date, 'YYYY/MM/DD/') as entry_archive_url, to_char(entry_date, 'YYYY-MM-DD') as entry_date, title, + title_url, content, content_format, draft_p, @@ -41,6 +54,7 @@ and $date_clause and draft_p = 'f' and deleted_p = 'f' + $limit_clause order by entry_date desc, posted_date desc Index: openacs-4/packages/lars-blogger/www/blog-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog-postgresql.xql,v diff -u -N -r1.3.2.2 -r1.3.2.3 --- openacs-4/packages/lars-blogger/www/blog-postgresql.xql 13 Mar 2003 14:30:31 -0000 1.3.2.2 +++ openacs-4/packages/lars-blogger/www/blog-postgresql.xql 13 Mar 2003 17:05:51 -0000 1.3.2.3 @@ -3,25 +3,38 @@ postgresql7.1 - + date_trunc(:archive_interval, entry_date) = :archive_date + + + date_trunc(:archive_interval, entry_date) = :archive_date + + + entry_date > current_timestamp - interval '30 days' + + + limit 3 + + + select entry_id, to_char(entry_date, 'fmDayfm, Month fmDDfm, YYYY') as entry_date_pretty, to_char(entry_date, 'YYYY/MM/DD/') as entry_archive_url, to_char(entry_date, 'YYYY-MM-DD') as entry_date, title, + title_url, content, content_format, draft_p, @@ -40,6 +53,7 @@ and draft_p = 'f' and deleted_p = 'f' order by entry_date desc, posted_date desc + $limit_clause Index: openacs-4/packages/lars-blogger/www/blog.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog.tcl,v diff -u -N -r1.8.2.1 -r1.8.2.2 --- openacs-4/packages/lars-blogger/www/blog.tcl 13 Mar 2003 14:30:31 -0000 1.8.2.1 +++ openacs-4/packages/lars-blogger/www/blog.tcl 13 Mar 2003 17:05:51 -0000 1.8.2.2 @@ -1,9 +1,9 @@ -# Expects: -# package_id:optional -# url:optional -# type:optional (current, archive) -# archive_interval:optional -# archive_date:optional +# no ad_page_contract because this is intended to be included in other files +# package_id:integer,optional +# url:optional +# {type "current"} (allowed values: current archive) +# {archive_interval ""} +# {archive_date ""} # If the caller specified a URL, then we gather the package_id from that URL if { [info exists url] } { @@ -22,14 +22,14 @@ switch -exact $type { archive { - set date_clause "[db_map date_clause_archive]" + set date_clause "[db_map date_clause_archive_$archive_interval]" } default { set date_clause "[db_map date_clause_default]" } } -set show_poster_p [ad_parameter "ShowPosterP" "" "1"] +set show_poster_p [parameter::get -package_id $package_id -parameter "ShowPosterP" -default "1"] set package_url [lars_blog_public_package_url -package_id $package_id] @@ -43,10 +43,17 @@ set admin_p [ad_permission_p $package_id admin] -set count 0 +set num_entries [db_string num_entries {}] -db_multirow blog blog { *SQL* } +if { $num_entries < 3 } { + set date_clause {1=1} + set limit_clause [db_map limit_clause] +} else { + set limit_clause {} +} +db_multirow blog blog {} + set archive_url "${package_url}archive/" set arrow_url "${package_url}graphics/arrow-box.gif" Index: openacs-4/packages/lars-blogger/www/entry-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.adp,v diff -u -N -r1.2.2.2 -r1.2.2.3 --- openacs-4/packages/lars-blogger/www/entry-chunk.adp 13 Mar 2003 14:30:31 -0000 1.2.2.2 +++ openacs-4/packages/lars-blogger/www/entry-chunk.adp 13 Mar 2003 17:05:51 -0000 1.2.2.3 @@ -1,6 +1,14 @@ - -

@blog.title@

+ +
+ @blog.title@@blog.title_url@ +   [@blog.title_url_base@] +
+ + +
@blog.title@
+ +

@blog.content@

Index: openacs-4/packages/lars-blogger/www/entry-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.tcl,v diff -u -N -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/lars-blogger/www/entry-chunk.tcl 13 Mar 2003 14:30:31 -0000 1.3.2.1 +++ openacs-4/packages/lars-blogger/www/entry-chunk.tcl 13 Mar 2003 17:05:51 -0000 1.3.2.2 @@ -23,15 +23,10 @@ set general_comments_package_url [general_comments_package_url] -set show_poster_p [ad_parameter "ShowPosterP" "" "1"] +set show_poster_p [parameter::get -package_id $package_id -parameter "ShowPosterP" -default "1"] -set blog(title) [ad_quotehtml $blog(title)] +lars_blogger::entry::htmlify -array blog -# LARS: -# Not sure we should do the ns_adp_parse thing here, but heck, why not -# It should be safe, given the security checks -set blog(content) [ns_adp_parse -string [ad_html_text_convert -from $blog(content_format) -to "text/html" $blog(content)]] - set entry_id $blog(entry_id) set blog(edit_url) "${package_url}admin/entry-edit?[export_vars { entry_id return_url }]" @@ -53,4 +48,4 @@ set comments_html [general_comments_get_comments -print_content_p 1 $entry_id] } -ad_return_template \ No newline at end of file +ad_return_template Index: openacs-4/packages/lars-blogger/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.adp,v diff -u -N -r1.9.2.3 -r1.9.2.4 --- openacs-4/packages/lars-blogger/www/index.adp 13 Mar 2003 14:30:31 -0000 1.9.2.3 +++ openacs-4/packages/lars-blogger/www/index.adp 13 Mar 2003 17:05:51 -0000 1.9.2.4 @@ -92,7 +92,7 @@ - + RSS 1.0/RDF/XML Index: openacs-4/packages/lars-blogger/www/one-entry.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/one-entry.adp,v diff -u -N -r1.6 -r1.6.2.1 --- openacs-4/packages/lars-blogger/www/one-entry.adp 14 Sep 2002 22:05:25 -0000 1.6 +++ openacs-4/packages/lars-blogger/www/one-entry.adp 13 Mar 2003 17:05:51 -0000 1.6.2.1 @@ -1,6 +1,6 @@ @page_title@ -@context_bar@ +@context@ @@ -10,4 +10,4 @@
- \ No newline at end of file + Index: openacs-4/packages/lars-blogger/www/one-entry.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/one-entry.tcl,v diff -u -N -r1.5 -r1.5.2.1 --- openacs-4/packages/lars-blogger/www/one-entry.tcl 14 Sep 2002 22:05:25 -0000 1.5 +++ openacs-4/packages/lars-blogger/www/one-entry.tcl 13 Mar 2003 17:05:51 -0000 1.5.2.1 @@ -2,13 +2,10 @@ entry_id:integer {return_url ""} } -properties { - context_bar - title_html - content_html - draft_p_checked - entry_date_html - form_export_vars - return_url + context + blog:onerow + header_background_color + page_title } set package_id [ad_conn package_id] @@ -19,14 +16,12 @@ set return_url "[ad_conn url]?[ad_conn query]" } -set show_poster_p [ad_parameter "ShowPosterP" "" "1"] - lars_blogger::entry::get -entry_id $entry_id -array blog set page_title $blog(title) -set context_bar [ad_context_bar $page_title] +set context [list $page_title] set header_background_color [lars_blog_header_background_color] -ad_return_template \ No newline at end of file +ad_return_template Index: openacs-4/packages/lars-blogger/www/admin/drafts.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/drafts.adp,v diff -u -N -r1.5 -r1.5.2.1 --- openacs-4/packages/lars-blogger/www/admin/drafts.adp 16 Sep 2002 13:01:34 -0000 1.5 +++ openacs-4/packages/lars-blogger/www/admin/drafts.adp 13 Mar 2003 17:06:07 -0000 1.5.2.1 @@ -1,6 +1,6 @@ @page_title@ -@context_bar@ +@context@ No draft entries. @@ -12,15 +12,16 @@ - - - +
DateTitle Content Action
@draft_entries.entry_date_pretty@@draft_entries.title@@draft_entries.content@ + @draft_entries.title@ + @draft_entries.content@ + Preview Publish Index: openacs-4/packages/lars-blogger/www/admin/drafts.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/drafts.tcl,v diff -u -N -r1.4 -r1.4.2.1 --- openacs-4/packages/lars-blogger/www/admin/drafts.tcl 16 Sep 2002 13:01:34 -0000 1.4 +++ openacs-4/packages/lars-blogger/www/admin/drafts.tcl 13 Mar 2003 17:06:07 -0000 1.4.2.1 @@ -9,22 +9,25 @@ set page_title "Draft Entries" -set context_bar [ad_context_bar $page_title] +set context [list $page_title] -db_multirow -extend { edit_url publish_url delete_url preview_url } draft_entries draft_entries { *SQL* } { +db_multirow -extend { edit_url publish_url delete_url preview_url } draft_entries draft_entries {} { set return_url "[ad_conn url][ad_decode [ad_conn query] "" "" "?[ad_conn query]"]" set edit_url "[ad_conn package_url]admin/entry-edit?[export_vars { entry_id return_url }]" set delete_url "[ad_conn package_url]admin/entry-delete?[export_vars { entry_id return_url }]" set preview_url "[ad_conn package_url]one-entry?[export_vars { entry_id return_url }]" set publish_url "[ad_conn package_url]admin/entry-publish?[export_vars { entry_id return_url }]" - set content [ns_adp_parse -string $content] } +for { set i 1 } { $i <= ${draft_entries:rowcount} } { incr i } { + lars_blogger::entry::htmlify -array "draft_entries:$i" +} + + set entry_add_url "entry-edit" set arrow_url "[ad_conn package_url]graphics/arrow-box.gif" set header_background_color [lars_blog_header_background_color] -ad_return_template Index: openacs-4/packages/lars-blogger/www/admin/drafts.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/drafts.xql,v diff -u -N -r1.2 -r1.2.2.1 --- openacs-4/packages/lars-blogger/www/admin/drafts.xql 14 Sep 2002 16:40:35 -0000 1.2 +++ openacs-4/packages/lars-blogger/www/admin/drafts.xql 13 Mar 2003 17:06:07 -0000 1.2.2.1 @@ -7,7 +7,9 @@ select entry_id, to_char(entry_date, 'YYYY-MM-DD') as entry_date_pretty, title, - content + title_url, + content, + content_format from pinds_blog_entries where package_id = :package_id and draft_p = 't' Index: openacs-4/packages/lars-blogger/www/admin/entry-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/entry-edit.adp,v diff -u -N -r1.2 -r1.2.2.1 --- openacs-4/packages/lars-blogger/www/admin/entry-edit.adp 8 Sep 2002 11:29:23 -0000 1.2 +++ openacs-4/packages/lars-blogger/www/admin/entry-edit.adp 13 Mar 2003 17:06:07 -0000 1.2.2.1 @@ -1,7 +1,7 @@ @page_title@ entry.title -@context_bar@ +@context@