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 -r1.8.2.9 -r1.8.2.10 --- openacs-4/packages/lars-blogger/lars-blogger.info 17 Jun 2003 07:29:32 -0000 1.8.2.9 +++ openacs-4/packages/lars-blogger/lars-blogger.info 1 Jul 2003 13:28:25 -0000 1.8.2.10 @@ -29,7 +29,7 @@ - + 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 -r1.2.2.4 -r1.2.2.5 --- openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-create.sql 13 Jun 2003 13:51:00 -0000 1.2.2.4 +++ openacs-4/packages/lars-blogger/sql/oracle/lars-blogger-create.sql 1 Jul 2003 13:28:25 -0000 1.2.2.5 @@ -73,7 +73,9 @@ primary key, package_id constraint weblogger_channels_pid_kf references apm_packages(package_id), - user_id integer + user_id integer, + constraint weblogger_chnls_package_user_un + unique (package_id, user_id) ); 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 -r1.2.2.7 -r1.2.2.8 --- openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-create.sql 13 Jun 2003 13:51:00 -0000 1.2.2.7 +++ openacs-4/packages/lars-blogger/sql/postgresql/lars-blogger-create.sql 1 Jul 2003 13:28:25 -0000 1.2.2.8 @@ -165,7 +165,9 @@ package_id integer constraint weblogger_channels_package_id_kf references apm_packages(package_id), - user_id integer + user_id integer, + constraint weblogger_chnls_package_user_un + unique (package_id, user_id) ); 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 -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql 11 May 2003 22:51:15 -0000 1.1.2.4 +++ openacs-4/packages/lars-blogger/tcl/entry-procs-oracle.xql 1 Jul 2003 13:28:26 -0000 1.1.2.5 @@ -11,6 +11,7 @@ b.content, b.content_format, b.draft_p, + o.creation_user as user_id, to_char(b.entry_date, 'YYYY-MM-DD') as entry_date, to_char(b.entry_date, 'fmDayfm, fmMonthfm fmDDfm, YYYY') as entry_date_pretty, p.first_names as poster_first_names, @@ -30,4 +31,14 @@ + + + update pinds_blog_entries + set entry_date = trunc(sysdate), + draft_p = 'f', + posted_date = sysdate + where entry_id = :entry_id + + + 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 -r1.1.2.5 -r1.1.2.6 --- openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql 13 Jun 2003 09:15:01 -0000 1.1.2.5 +++ openacs-4/packages/lars-blogger/tcl/entry-procs-postgresql.xql 1 Jul 2003 13:28:26 -0000 1.1.2.6 @@ -31,4 +31,14 @@ + + + update pinds_blog_entries + set entry_date = date_trunc('day', current_timestamp), + draft_p = 'f', + posted_date = current_timestamp + where entry_id = :entry_id + + + 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 -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/lars-blogger/tcl/entry-procs.tcl 11 May 2003 22:51:15 -0000 1.1.2.4 +++ openacs-4/packages/lars-blogger/tcl/entry-procs.tcl 1 Jul 2003 13:28:26 -0000 1.1.2.5 @@ -14,7 +14,55 @@ db_1row select_entry {} -column_array row } +ad_proc -public lars_blogger::entry::require_write_permission { + {-entry_id:required} +} { + permission::require_permission -object_id $entry_id -privilege write + + set admin_p [permission::permission_p -privilege "admin" -object_id $entry_id] + + if { !$admin_p && [ad_conn user_id] != [db_string creation_user {}] } { + ad_return_forbidden "Security Violation" "
+ You don't have permission to modify this entry. +
+ This incident has been logged. +
" + ad_script_abort + } +} +ad_proc -public lars_blogger::entry::publish { + {-entry_id:required} + {-package_id ""} + {-no_update:boolean} + {-redirect_url ""} +} { + if { !$no_update_p } { + # Set draft_p = 'f' + db_dml update_entry { *SQL* } + # Flush cache + lars_blog_flush_cache + } + + if { ![empty_string_p $redirect_url] } { + ad_returnredirect $redirect_url + ns_conn close + } + + # Setup instance feed if needed + lars_blog_setup_feed -package_id $package_id + + # Setup user feed if needed + lars_blog_setup_feed -user -package_id $package_id + + # Notifications + lars_blogger::entry::do_notifications -entry_id $entry_id + + # Ping weblogs.com + lars_blog_weblogs_com_update_ping +} + + ad_proc -public lars_blogger::entry::htmlify { -array:required } { Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/tcl/entry-procs.xql'. Fisheye: No comparison available. Pass `N' to diff? 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 -r1.2.2.2 -r1.2.2.3 --- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-oracle.xql 13 Mar 2003 17:05:38 -0000 1.2.2.2 +++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-oracle.xql 1 Jul 2003 13:28:26 -0000 1.2.2.3 @@ -5,21 +5,69 @@ - begin - :1 := pinds_blog_entry.new ( - entry_id => :entry_id, - package_id => :package_id, - title => :title, + begin + :1 := pinds_blog_entry.new ( + 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'), - draft_p => :draft_p, - creation_user => :creation_user, - creation_ip => :creation_ip - ); - end; + content => :content, + content_format => :content_format, + entry_date => to_date(:entry_date, 'YYYY-MM-DD'), + draft_p => :draft_p, + creation_user => :creation_user, + creation_ip => :creation_ip + ); + end; + + + begin + :1 := weblogger_channel.new ( + null, + :package_id, + NULL, + :creation_user, + :creation_ip + ); + end; + + + + + + begin + :1 := weblogger_channel.new ( + null, + :package_id, + :creation_user, + :creation_user, + :creation_ip + ); + end; + + + + + + begin + :1 := rss_gen_subscr.new ( + null, -- subscr_id + acs_sc_impl.get_id('RssGenerationSubscriber','pinds_blog_entries'), + -- impl_id + :summary_context_id, -- summary_context_id + :timeout, -- timeout + null, -- lastbuild + 'rss_gen_subscr', -- object_type + sysdate, -- creation_date + :creation_user, -- creation_user + :creation_ip, -- creation_ip + :package_id -- context_id + ); + end; + + + 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 -r1.2.2.4 -r1.2.2.5 --- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-postgresql.xql 30 Jun 2003 09:02:25 -0000 1.2.2.4 +++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs-postgresql.xql 1 Jul 2003 13:28:26 -0000 1.2.2.5 @@ -20,10 +20,10 @@ - + select weblogger_channel__new ( - :channel_id, + null, :package_id, NULL, :creation_user, @@ -32,10 +32,10 @@ - + select weblogger_channel__new ( - :channel_id, + null, :package_id, :creation_user, :creation_user, @@ -44,4 +44,22 @@ + + + select rss_gen_subscr__new ( + null, -- subscr_id + acs_sc_impl__get_id('RssGenerationSubscriber','pinds_blog_entries'), + -- impl_id + :summary_context_id, -- summary_context_id + :timeout, -- timeout + null, -- lastbuild + 'rss_gen_subscr', -- object_type + now(), -- creation_date + :creation_user, -- creation_user + :creation_ip, -- creation_ip + :package_id -- context_id + ) + + + 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 -r1.7.2.3 -r1.7.2.4 --- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl 13 Jun 2003 09:15:01 -0000 1.7.2.3 +++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl 1 Jul 2003 13:28:26 -0000 1.7.2.4 @@ -20,82 +20,88 @@ set creation_user [ad_conn user_id] set creation_ip [ns_conn peeraddr] - set entry_id [db_exec_plsql entry_add {}] + db_transaction { + # Create the entry + set entry_id [db_exec_plsql entry_add {}] + lars_blog_flush_cache $package_id + } - # If publish directly + # If publish directly, fire off notifications and ping weblogs.com 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_blogger::entry::publish \ + -entry_id $entry_id \ + -package_id $package_id \ + -no_update } - lars_blog_flush_cache $package_id + return $entry_id +} +ad_proc lars_blog_setup_feed { + -user:boolean + {-package_id ""} +} { + if { [empty_string_p $package_id] } { + set package_id [ad_conn package_id] + } + set timeout [expr 30*60] set channel_title [lars_blog_name] - - if { [parameter::get -parameter "package_rss_feed_p" -default 1]} { - # check whether there's been a feed setup for this instance - - set exists_instance_feed_p [db_string exists_instance_feed_p {}] - - if { [string equal $exists_instance_feed_p "0"] } { - - #setup an RSS feed for this instance - - db_transaction { - - set channel_link [lars_blog_public_package_url] - - set channel_id [db_nextval "acs_object_id_seq"] - - set summary_context_id [db_string create_instance_channel {}] - - set subscr_id [db_string create_subscr {}] - - db_dml update_subscr {} - + set creation_user [ad_conn user_id] + set creation_ip [ns_conn peeraddr] + + if { !$user_p } { + if { [parameter::get -parameter "package_rss_feed_p" -default 1]} { + + # check whether there's been a channel setup for this instance + set summary_context_id [db_string select_instance_channel {} -default {}] + + if { [empty_string_p $summary_context_id] } { + # Setup a channel for this instance + set summary_context_id [db_exec_plsql create_instance_channel {}] + } + + # check whether there's been a feed setup for this instance + set exists_instance_feed_p [db_string exists_instance_feed_p {}] + + if { [string equal $exists_instance_feed_p "0"] } { + # Setup an RSS feed for this instance + set channel_link [lars_blog_public_package_url] + + set subscr_id [db_exec_plsql create_subscr {}] + db_dml update_subscr {} + # Run it now rss_gen_report $subscr_id - - } - } - } - - if {[parameter::get -parameter "user_rss_feed_p" -default 0]} { + } + } + } else { + if {[parameter::get -parameter "user_rss_feed_p" -default 0]} { - # check whether there's been a feed setup for this user - - ns_log "Notice" "SIMON" + # check whether there's been a channel setup for this instance + set summary_context_id [db_string select_user_channel {} -default {}] - set exists_user_feed_p [db_string exists_user_feed_p {}] - - set screen_name [db_string screen_name {}] + if { [empty_string_p $summary_context_id] } { + # Setup a channel for this instance + set summary_context_id [db_exec_plsql create_user_channel {}] + } - if { [string equal $exists_user_feed_p "0"] && ![empty_string_p $screen_name] } { - - #setup an RSS feed for the user - - db_transaction { + # check whether there's been a feed setup for this user + set exists_user_feed_p [db_string exists_user_feed_p {}] + set screen_name [db_string screen_name {}] + if { [string equal $exists_user_feed_p "0"] && ![empty_string_p $screen_name] } { + # Setup an RSS feed for the user set channel_link "[lars_blog_public_package_url]user/$screen_name/" - set channel_id [db_nextval "acs_object_id_seq"] - - set summary_context_id [db_string create_user_channel {}] - - set subscr_id [db_string create_subscr {}] - + set subscr_id [db_exec_plsql create_subscr {}] db_dml update_subscr {} # Run it now rss_gen_report $subscr_id - } - } + } } - return $entry_id } Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql 13 Jun 2003 09:15:01 -0000 1.1.2.1 +++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.xql 1 Jul 2003 13:28:26 -0000 1.1.2.2 @@ -2,23 +2,41 @@ - + + select w.channel_id + from weblogger_channels w + where w.package_id = :package_id + and w.user_id is null + + + + + select count(*) from rss_gen_subscrs s, acs_sc_impls i, weblogger_channels w where s.summary_context_id = w.channel_id and w.package_id = :package_id - and w.user_id = '0' + and w.user_id is null and s.impl_id = i.impl_id and i.impl_name = 'pinds_blog_entries' and i.impl_owner_name = 'lars-blogger' - + + select w.channel_id + from weblogger_channels w + where w.package_id = :package_id + and w.user_id = :creation_user + + + + + select count(*) from rss_gen_subscrs s, acs_sc_impls i, @@ -32,34 +50,16 @@ - + - select rss_gen_subscr__new ( - null, -- subscr_id - acs_sc_impl__get_id('RssGenerationSubscriber','pinds_blog_entries'), - -- impl_id - :summary_context_id, -- summary_context_id - :timeout, -- timeout - null, -- lastbuild - 'rss_gen_subscr', -- object_type - now(), -- creation_date - :creation_user, -- creation_user - :creation_ip, -- creation_ip - :package_id -- context_id - ) - - - - - update rss_gen_subscrs set channel_title = :channel_title, channel_link = :channel_link where subscr_id = :subscr_id - + select screen_name from users where user_id = :creation_user Index: openacs-4/packages/lars-blogger/tcl/rss-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/rss-procs-oracle.xql,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/lars-blogger/tcl/rss-procs-oracle.xql 13 Jun 2003 09:15:01 -0000 1.1.2.3 +++ openacs-4/packages/lars-blogger/tcl/rss-procs-oracle.xql 1 Jul 2003 13:28:26 -0000 1.1.2.4 @@ -46,13 +46,15 @@ 0 as tzoffset_minute, to_char(entry_date, 'DD Mon YYYY hh12:MI am') as entry_date_pretty, to_char(entry_date, 'YYYY/MM/') as entry_archive_url - from pinds_blog_entries e join - acs_objects o on (o.object_id = e.entry_id) join - users u on (u.user_id = o.creation_user) + from pinds_blog_entries e, + acs_objects o, + users u where e.package_id = :package_id - and o.creation_user = :user_id - and e.draft_p = 'f' - and e.deleted_p = 'f' + and o.object_id = e.entry_id + and o.creation_user = :user_id + and u.user_id = o.creation_user + and e.draft_p = 'f' + and e.deleted_p = 'f' order by e.entry_date desc, e.posted_date desc) where rownum < 11 Index: openacs-4/packages/lars-blogger/tcl/rss-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/rss-procs.tcl,v diff -u -r1.2.2.3 -r1.2.2.4 --- openacs-4/packages/lars-blogger/tcl/rss-procs.tcl 13 Jun 2003 09:15:01 -0000 1.2.2.3 +++ openacs-4/packages/lars-blogger/tcl/rss-procs.tcl 1 Jul 2003 13:28:26 -0000 1.2.2.4 @@ -16,7 +16,7 @@ db_transaction { - db_1row package_id {} + db_1row select_package_id_user_id {} set package_url [lars_blog_public_package_url -package_id $package_id] @@ -50,7 +50,7 @@ set counter 0 - if { [string equal $user_id 0] } { + if { [empty_string_p $user_id] } { set statement "blog_rss_items" } else { set statement "user_blog_rss_items" @@ -99,9 +99,9 @@ @author Lars Pind (lars@pinds.com) } { - db_1row package_id {} + db_1row select_package_id_user_id {} - if { [string equal $user_id 0] } { + if { [empty_string_p $user_id] } { db_0or1row get_last_update {} } else { db_0or1row get_last_user_update {} Index: openacs-4/packages/lars-blogger/tcl/rss-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/rss-procs.xql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/lars-blogger/tcl/rss-procs.xql 13 Jun 2003 09:15:01 -0000 1.1.2.1 +++ openacs-4/packages/lars-blogger/tcl/rss-procs.xql 1 Jul 2003 13:28:26 -0000 1.1.2.2 @@ -2,7 +2,7 @@ - + select package_id, user_id from weblogger_channels where channel_id = :summary_context_id @@ -14,7 +14,7 @@ - + select package_id, user_id from weblogger_channels where channel_id = :summary_context_id Index: openacs-4/packages/lars-blogger/tcl/weblogs-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/weblogs-procs.tcl,v diff -u -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/lars-blogger/tcl/weblogs-procs.tcl 13 Jun 2003 09:15:01 -0000 1.3.2.1 +++ openacs-4/packages/lars-blogger/tcl/weblogs-procs.tcl 1 Jul 2003 13:28:26 -0000 1.3.2.2 @@ -106,7 +106,7 @@ return -code error -errorinfo $errorInfo $errMsg } } errmsg ] { - ns_log error "lars_blog_weblogs_com_update_ping error: $errmsg" + ns_log warning "lars_blog_weblogs_com_update_ping error: $errmsg" return -1 } else { ns_log notice "lars_blog_weblogs_com_update_ping: $page" Index: openacs-4/packages/lars-blogger/www/blog-months-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog-months-oracle.xql,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/lars-blogger/www/blog-months-oracle.xql 13 Jun 2003 09:15:01 -0000 1.2.2.1 +++ openacs-4/packages/lars-blogger/www/blog-months-oracle.xql 1 Jul 2003 13:28:26 -0000 1.2.2.2 @@ -25,11 +25,14 @@ as date_pretty, to_char(trunc(entry_date, 'month'), 'YYYY/MM/') as month_url_stub - from pinds_blog_entries e, users u - where draft_p = 'f' - and package_id = :package_id - and screen_name = :screen_name - and u.user_id = e.user_id + from pinds_blog_entries e, + acs_objects o, + users u + where e.draft_p = 'f' + and e.package_id = :package_id + and u.screen_name = :screen_name + and o.object_id = e.entry_id + and u.user_id = o.creation_user group by trunc(entry_date, 'month') order by month_date desc 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 -r1.2.2.3 -r1.2.2.4 --- openacs-4/packages/lars-blogger/www/blog-oracle.xql 13 Jun 2003 09:15:01 -0000 1.2.2.3 +++ openacs-4/packages/lars-blogger/www/blog-oracle.xql 1 Jul 2003 13:28:26 -0000 1.2.2.4 @@ -15,6 +15,38 @@ + + + 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, + p.first_names as poster_first_names, + p.last_name as poster_last_name, + o.creation_user as user_id, + to_char(posted_date , 'HH24:MI') as posted_time_pretty, + (select count(gc.comment_id) + from general_comments gc, cr_revisions cr + where gc.object_id = entry_id + and content_item.get_live_revision(gc.comment_id) = cr.revision_id) as num_comments + from pinds_blog_entries e, + acs_objects o, + persons p + where e.entry_id = o.object_id + and p.person_id = o.creation_user + and package_id = :package_id + and $date_clause + and draft_p = 'f' + and deleted_p = 'f' + order by entry_date desc, posted_date desc + + + select entry_id, @@ -27,6 +59,7 @@ draft_p, p.first_names as poster_first_names, p.last_name as poster_last_name, + o.creation_user as user_id, to_char(posted_date , 'HH24:MI') as posted_time_pretty, (select count(gc.comment_id) from general_comments gc, cr_revisions cr Index: openacs-4/packages/lars-blogger/www/blog.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog.adp,v diff -u -r1.9.2.5 -r1.9.2.6 --- openacs-4/packages/lars-blogger/www/blog.adp 13 Jun 2003 09:15:01 -0000 1.9.2.5 +++ openacs-4/packages/lars-blogger/www/blog.adp 1 Jul 2003 13:28:26 -0000 1.9.2.6 @@ -33,7 +33,7 @@ » Archive
- + » Add entry 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 -r1.8.2.5 -r1.8.2.6 --- openacs-4/packages/lars-blogger/www/blog.tcl 13 Jun 2003 09:15:01 -0000 1.8.2.5 +++ openacs-4/packages/lars-blogger/www/blog.tcl 1 Jul 2003 13:28:26 -0000 1.8.2.6 @@ -4,7 +4,9 @@ # type:optional (current, archive) # archive_interval:optional # archive_date:optional +# screen_name:optional + # If the caller specified a URL, then we gather the package_id from that URL if { [info exists url] } { array set blog_site_node [site_node $url] @@ -16,6 +18,12 @@ set package_id [ad_conn package_id] } +set write_p [permission::permission_p -object_id $package_id -privilege write] + +if { ![info exists screen_name] } { + set screen_name "" +} + if { ![info exists type] } { set type "current" } @@ -43,7 +51,7 @@ set count 0 -if [empty_string_p $screen_name] { +if { ![exists_and_not_null screen_name] } { db_multirow blog all_blogs { *SQL* } set archive_url "${package_url}archive/" Index: openacs-4/packages/lars-blogger/www/calendar-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/calendar-oracle.xql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/lars-blogger/www/calendar-oracle.xql 13 Mar 2003 14:30:31 -0000 1.1.2.1 +++ openacs-4/packages/lars-blogger/www/calendar-oracle.xql 1 Jul 2003 13:28:26 -0000 1.1.2.2 @@ -3,7 +3,7 @@ oracle8.1.6 - + select to_char(entry_date, 'J') as entry_date_julian from pinds_blog_entries @@ -13,4 +13,21 @@ group by to_char(entry_date, 'J') + + + + + select to_char(entry_date, 'J') as entry_date_julian + from pinds_blog_entries e, + acs_objects o, + users u + where package_id = :package_id + and o.object_id = e.entry_id + and u.user_id = o.creation_user + and u.screen_name = :screen_name + and draft_p = 'f' + and deleted_p = 'f' + group by to_char(entry_date, 'J') + + Index: openacs-4/packages/lars-blogger/www/calendar-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/calendar-postgresql.xql,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/lars-blogger/www/calendar-postgresql.xql 13 Jun 2003 09:15:01 -0000 1.1.2.2 +++ openacs-4/packages/lars-blogger/www/calendar-postgresql.xql 1 Jul 2003 13:28:26 -0000 1.1.2.3 @@ -14,6 +14,7 @@ + select to_char(entry_date, 'J') as entry_date_julian Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/calendar.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lars-blogger/www/drafts-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/Attic/drafts-oracle.xql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/lars-blogger/www/drafts-oracle.xql 13 Jun 2003 09:15:01 -0000 1.1.2.1 +++ openacs-4/packages/lars-blogger/www/drafts-oracle.xql 1 Jul 2003 13:28:26 -0000 1.1.2.2 @@ -10,8 +10,11 @@ title_url, content, content_format - from pinds_blog_entries + from pinds_blog_entries e, + acs_objects o where package_id = :package_id + and o.object_id = e.entry_id + and o.creation_user = :user_id and draft_p = 't' and deleted_p = 'f' order by entry_date desc, posted_date desc Index: openacs-4/packages/lars-blogger/www/drafts.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/drafts.tcl,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/lars-blogger/www/drafts.tcl 13 Jun 2003 09:15:01 -0000 1.1.2.1 +++ openacs-4/packages/lars-blogger/www/drafts.tcl 1 Jul 2003 13:28:26 -0000 1.1.2.2 @@ -4,7 +4,6 @@ } set package_id [ad_conn package_id] - set user_id [ad_conn user_id] if { [ad_permission_p $package_id admin] } { Index: openacs-4/packages/lars-blogger/www/entry-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-delete.tcl,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/lars-blogger/www/entry-delete.tcl 13 Jun 2003 09:15:01 -0000 1.1.2.1 +++ openacs-4/packages/lars-blogger/www/entry-delete.tcl 1 Jul 2003 13:28:26 -0000 1.1.2.2 @@ -3,12 +3,13 @@ {return_url ""} } -ad_require_permission [ad_conn package_id] write +lars_blogger::entry::require_write_permission -entry_id $entry_id db_dml delete { update pinds_blog_entries set deleted_p = 't' where entry_id = :entry_id } + ad_returnredirect $return_url Index: openacs-4/packages/lars-blogger/www/entry-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-edit.tcl,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/lars-blogger/www/entry-edit.tcl 13 Jun 2003 09:15:01 -0000 1.1.2.1 +++ openacs-4/packages/lars-blogger/www/entry-edit.tcl 1 Jul 2003 13:28:26 -0000 1.1.2.2 @@ -5,11 +5,9 @@ {content:allhtml ""} } -set package_id [ad_conn package_id] +permission::require_permission -object_id [ad_conn package_id] -privilege write -ad_maybe_redirect_for_registration -ad_require_permission $package_id write - +set package_id [ad_conn package_id] set today [db_string today { *SQL* }] set today_html [ad_quotehtml $today] @@ -45,6 +43,8 @@ } else { set insert_or_update update + lars_blogger::entry::require_write_permission -entry_id $entry_id + db_1row entry { *SQL* } element set_value entry title $title @@ -88,6 +88,8 @@ -entry_date $entry_date \ -draft_p "$draft_p" } else { + lars_blogger::entry::require_write_permission -entry_id $entry_id + set set_clauses { "title = :title" "title_url = :title_url" Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-publish-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/entry-publish-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lars-blogger/www/entry-publish.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-publish.tcl,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/lars-blogger/www/entry-publish.tcl 13 Jun 2003 09:15:01 -0000 1.1.2.1 +++ openacs-4/packages/lars-blogger/www/entry-publish.tcl 1 Jul 2003 13:28:26 -0000 1.1.2.2 @@ -3,15 +3,9 @@ {return_url "index"} } -db_dml update_entry { *SQL* } +lars_blogger::entry::require_write_permission -entry_id $entry_id -# Notifications -lars_blogger::entry::do_notifications -entry_id $entry_id +lars_blogger::entry::publish \ + -entry_id $entry_id \ + -redirect_url $return_url -# Ping weblogs.com -lars_blog_weblogs_com_update_ping - -# Flush cache -lars_blog_flush_cache - -ad_returnredirect $return_url 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 -r1.9.2.5 -r1.9.2.6 --- openacs-4/packages/lars-blogger/www/index.adp 13 Jun 2003 09:15:01 -0000 1.9.2.5 +++ openacs-4/packages/lars-blogger/www/index.adp 1 Jul 2003 13:28:26 -0000 1.9.2.6 @@ -24,7 +24,7 @@ - + Index: openacs-4/packages/lars-blogger/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.tcl,v diff -u -r1.4.2.8 -r1.4.2.9 --- openacs-4/packages/lars-blogger/www/index.tcl 30 Jun 2003 08:58:49 -0000 1.4.2.8 +++ openacs-4/packages/lars-blogger/www/index.tcl 1 Jul 2003 13:28:26 -0000 1.4.2.9 @@ -33,14 +33,9 @@ set package_url [ad_conn package_url] -set write_p [ad_permission_p $package_id write] +set write_p [permission::permission_p -object_id $package_id -privilege write] +set admin_p [permission::permission_p -object_id $package_id -privilege admin] -if {[parameter::get -parameter "AllowUsersToPost" -default 0] || $write_p} { - set registered_p [ad_conn user_id] -} else { - set registered_p 0 -} - set display_users_p [parameter::get -parameter "DisplayUsersP" -default 0] if {$display_users_p && ![exists_and_not_null screen_name]} { Index: openacs-4/packages/lars-blogger/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/index.adp,v diff -u -r1.3.2.4 -r1.3.2.5 --- openacs-4/packages/lars-blogger/www/admin/index.adp 13 Jun 2003 09:15:02 -0000 1.3.2.4 +++ openacs-4/packages/lars-blogger/www/admin/index.adp 1 Jul 2003 13:28:26 -0000 1.3.2.5 @@ -26,17 +26,18 @@ Set parameters

- +

» - Setup an RSS feed + Manage your RSS feeds (View instance feed XML)

- + +

» - Manage your RSS feed (View feed XML) + Setup instance RSS feed

- + Index: openacs-4/packages/lars-blogger/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/index.tcl,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/lars-blogger/www/admin/index.tcl 13 Jun 2003 09:15:02 -0000 1.1.2.3 +++ openacs-4/packages/lars-blogger/www/admin/index.tcl 1 Jul 2003 13:28:27 -0000 1.1.2.4 @@ -15,7 +15,7 @@ set arrow_url "[lars_blog_public_package_url -package_id $package_id]graphics/arrow-box.gif" -set rss_feed_p [db_string rss_feed_p {}] +set instance_feed_p [db_string rss_feed_p {}] set rss_setup_url "rss-setup" Index: openacs-4/packages/lars-blogger/www/admin/rss-setup.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/rss-setup.tcl,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/lars-blogger/www/admin/rss-setup.tcl 13 Jun 2003 09:15:02 -0000 1.1.2.3 +++ openacs-4/packages/lars-blogger/www/admin/rss-setup.tcl 1 Jul 2003 13:28:27 -0000 1.1.2.4 @@ -2,30 +2,7 @@ Setup an RSS feed for this blogger. } -set creation_user [ad_conn user_id] -set creation_ip [ns_conn peeraddr] +# Setup instance feed if needed +lars_blog_setup_feed -# by default, we timout in 30 minutes -set timeout [expr 30*60] - -set package_id [ad_conn package_id] - -set channel_title [lars_blog_name] -set channel_link [lars_blog_public_package_url] - -db_transaction { - - if { [empty_string_p [parameter::get -parameter "rss_file_name"]] } { - parameter::set_value -parameter "rss_file_name" -value "rss/rss.xml" - } - - set subscr_id [db_exec_plsql create_subscr {}] - - db_dml update_subscr {} - -} - -# Run it now -rss_gen_report $subscr_id - ad_returnredirect . Index: openacs-4/packages/lars-blogger/www/rss/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/rss/index.vuh,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/lars-blogger/www/rss/index.vuh 13 Jun 2003 09:15:02 -0000 1.1.2.2 +++ openacs-4/packages/lars-blogger/www/rss/index.vuh 1 Jul 2003 13:28:27 -0000 1.1.2.3 @@ -2,11 +2,11 @@ set package_id [ad_conn package_id] -set sql "select channel_id as summary_context_id - from weblogger_channels w - where w.package_id = :package_id - and w.user_id = '0'" +set summary_context_id [db_string package_id { + select channel_id as summary_context_id + from weblogger_channels w + where w.package_id = :package_id + and w.user_id is null +}] -set summary_context_id [db_string package_id $sql] - ns_returnfile 200 text/xml [rss_gen_report_file -summary_context_id $summary_context_id -impl_name pinds_blog_entries]
- + @@ -45,7 +45,7 @@
Actions @@ -55,8 +55,8 @@ Add entry
Draft entries - -
Administer + +
Administer