Index: openacs-4/contrib/obsolete-packages/postcard/postcard.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/postcard.info,v diff -u -r1.5 -r1.5.8.1 --- openacs-4/contrib/obsolete-packages/postcard/postcard.info 23 Sep 2002 23:32:26 -0000 1.5 +++ openacs-4/contrib/obsolete-packages/postcard/postcard.info 7 Oct 2004 18:58:02 -0000 1.5.8.1 @@ -1,62 +1,25 @@ - + - postcard - postcards + Post Card + Post Cards f f - - - - oracle - postgresql - - kapil thangavelu + + + Jade Rubick Henry Minsky + kapil thangavelu Send electronics postcards - 2001-08-22 - allows users to send postcards (images w/ text) + 2004-10-07 + Allows users to send postcards (images w/ text). It is an adaptation of Henry Minsky's postcard tutorial application. -adaptation of henry minsky's postcard tutorial application. + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Index: openacs-4/contrib/obsolete-packages/postcard/sql/postgresql/postcard-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/sql/postgresql/postcard-create.sql,v diff -u -r1.4 -r1.4.4.1 --- openacs-4/contrib/obsolete-packages/postcard/sql/postgresql/postcard-create.sql 23 Feb 2003 18:22:05 -0000 1.4 +++ openacs-4/contrib/obsolete-packages/postcard/sql/postgresql/postcard-create.sql 7 Oct 2004 18:58:03 -0000 1.4.4.1 @@ -1,94 +1,5 @@ -- electronic postcard - -/* first we create the permissions model for postcards - - defining these basic actions - - - upload images - - view postcard - - moderate images - - create card to send - - and then define the base security privileges that we - want to have. applications that want to designate - to the end user fine grained permission control, should - designate appropiate basic privileges as the atomic level - of an applications/services security. - -*/ -begin; - - select acs_privilege__create_privilege('postcard_create_image',null,null); - select acs_privilege__create_privilege('postcard_create_card',null,null); - select acs_privilege__create_privilege('postcard_read',null,null); - select acs_privilege__create_privilege('postcard_admin',null,null); - - - -- bind privileges to privilege heirarchy - - select acs_privilege__add_child('create', 'postcard_create_image'); - select acs_privilege__add_child('create', 'postcard_create_card'); - select acs_privilege__add_child('read', 'postcard_read'); - - select acs_privilege__add_child('admin','postcard_admin'); -end; - - -/* - Creating permissions basically involves binding the - privilege to the object system. - - permissions involve binding a particular privilege - to a user in a given context. - - We grant the permissions to the public - - inline function - inline funcs are used to allow - calling pl/pgsql. -*/ - -create function inline_0 () -returns integer as ' -declare - default_context integer; - registered_users integer; - the_public integer; -begin - - default_context := acs__magic_object_id(''default_context''); - registered_users := acs__magic_object_id(''registered_users''); - the_public := acs__magic_object_id(''the_public''); - - -- give registered users the power to post by default - - perform acs_permission__grant_permission ( - default_context, - registered_users, - ''postcard_create_card'' - ); - - perform acs_permission__grant_permission ( - default_context, - registered_users, - ''postcard_create_image'' - ); - - -- give the public the power to read by default - - perform acs_permission__grant_permission ( - default_context, - the_public, - ''postcard_read'' - ); - - return 0; -end; -' language 'plpgsql'; - -select inline_0 (); -drop function inline_0 (); - /* basic data model this needs to get migrated to the content-repository Index: openacs-4/contrib/obsolete-packages/postcard/sql/postgresql/postcard-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/sql/postgresql/postcard-drop.sql,v diff -u -r1.3 -r1.3.10.1 --- openacs-4/contrib/obsolete-packages/postcard/sql/postgresql/postcard-drop.sql 21 Aug 2001 22:50:55 -0000 1.3 +++ openacs-4/contrib/obsolete-packages/postcard/sql/postgresql/postcard-drop.sql 7 Oct 2004 18:58:03 -0000 1.3.10.1 @@ -7,28 +7,3 @@ drop sequence postcard_seq; drop sequence postcard_image_seq; - --- Drop permission metadata -delete from acs_permissions - where privilege in - ('postcard_create_card', 'postcard_create_image', - 'postcard_read', 'postcard_admin'); - - -delete from acs_privilege_hierarchy - where privilege in - ('postcard_create_card', 'postcard_create_image', - 'postcard_read', 'postcard_admin'); - -delete from acs_privilege_hierarchy - where child_privilege in - ('postcard_create_card', 'postcard_create_image', - 'postcard_read', 'postcard_admin'); - -delete from acs_privileges - where privilege in - ('postcard_create_card', 'postcard_create_image', - 'postcard_read', 'postcard_admin'); - - - Index: openacs-4/contrib/obsolete-packages/postcard/www/add-picture-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/www/add-picture-2.tcl,v diff -u -r1.6 -r1.6.8.1 --- openacs-4/contrib/obsolete-packages/postcard/www/add-picture-2.tcl 5 Sep 2002 12:57:45 -0000 1.6 +++ openacs-4/contrib/obsolete-packages/postcard/www/add-picture-2.tcl 7 Oct 2004 18:58:03 -0000 1.6.8.1 @@ -13,9 +13,13 @@ {description:notnull} } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] +set package_id [ad_conn package_id] -ad_require_permission [ad_conn package_id] "postcard_create_image" +permission::require_permission \ + -party_id $user_id \ + -privilege create \ + -object_id $package_id set tmp_filename [ns_queryget upload_file.tmpfile] Index: openacs-4/contrib/obsolete-packages/postcard/www/add-picture.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/www/add-picture.adp,v diff -u -r1.2 -r1.2.8.1 --- openacs-4/contrib/obsolete-packages/postcard/www/add-picture.adp 5 Sep 2002 12:57:45 -0000 1.2 +++ openacs-4/contrib/obsolete-packages/postcard/www/add-picture.adp 7 Oct 2004 18:58:03 -0000 1.2.8.1 @@ -5,18 +5,18 @@
-Add a picture
- +

Add a picture

+
- + - + - + Index: openacs-4/contrib/obsolete-packages/postcard/www/add-picture.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/www/add-picture.tcl,v diff -u -r1.3 -r1.3.8.1 --- openacs-4/contrib/obsolete-packages/postcard/www/add-picture.tcl 5 Sep 2002 12:57:45 -0000 1.3 +++ openacs-4/contrib/obsolete-packages/postcard/www/add-picture.tcl 7 Oct 2004 18:58:03 -0000 1.3.8.1 @@ -9,8 +9,14 @@ } { } -ad_require_permission [ad_conn package_id] "postcard_create_image" +set user_id [ad_conn user_id] +set package_id [ad_conn package_id] +permission::require_permission \ + -party_id $user_id \ + -privilege create \ + -object_id $package_id + set image_id [db_nextval postcard_image_sequence] Index: openacs-4/contrib/obsolete-packages/postcard/www/confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/www/confirm.adp,v diff -u -r1.4 -r1.4.8.1 --- openacs-4/contrib/obsolete-packages/postcard/www/confirm.adp 5 Sep 2002 12:57:45 -0000 1.4 +++ openacs-4/contrib/obsolete-packages/postcard/www/confirm.adp 7 Oct 2004 18:58:03 -0000 1.4.8.1 @@ -2,45 +2,33 @@ Confirmconfirm -

Confirm Your Message

-

-

- -

- -<%= [export_form_vars image_id] %> -<%= [export_form_vars recipient] %> -<%= [export_form_vars subject] %> -<%= [export_form_vars message] %> -<%= [export_form_vars card_id] %> +

Confirm Your Message

+

+

+ +

+ + @export_vars;noquote@ - -

Select ImageSelect Image
TitleTitle
DescriptionDescription
- - - - - - - - - - - - -
- To: @recipient@ -
- From: @email@ -
- Subject: @subject@ -
- Message:
- <% - regsub -all "\n" $message "
" formatted_message - adp_puts $formatted_message - %> -
- -
-
+ + + + + + + + + + + + + + + + + + +
To:@recipient@
From:@email@
Subject:@subject@
Message:@formatted_message;noquote@
+ + + Index: openacs-4/contrib/obsolete-packages/postcard/www/confirm.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/www/confirm.tcl,v diff -u -r1.5 -r1.5.8.1 --- openacs-4/contrib/obsolete-packages/postcard/www/confirm.tcl 5 Sep 2002 12:57:45 -0000 1.5 +++ openacs-4/contrib/obsolete-packages/postcard/www/confirm.tcl 7 Oct 2004 18:58:03 -0000 1.5.8.1 @@ -21,7 +21,21 @@ message:onevalue } +set user_id [ad_conn user_id] +set package_id [ad_conn package_id] + +permission::require_permission \ + -party_id $user_id \ + -privilege create \ + -object_id $package_id + +set export_vars [export_vars -form {image_id recipient subject message card_id}] + # Insert a new postcard in the database, set card_id to the card id value -ad_require_permission [ad_conn package_id] "postcard_create_card" ad_get_user_info set sender $email + + +set formatted_message $message +regsub -all "\n" $message "
" formatted_message + Index: openacs-4/contrib/obsolete-packages/postcard/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/www/index.tcl,v diff -u -r1.3 -r1.3.8.1 --- openacs-4/contrib/obsolete-packages/postcard/www/index.tcl 5 Sep 2002 12:57:45 -0000 1.3 +++ openacs-4/contrib/obsolete-packages/postcard/www/index.tcl 7 Oct 2004 18:58:03 -0000 1.3.8.1 @@ -19,3 +19,4 @@ } set message "Select image and send a Card" + Index: openacs-4/contrib/obsolete-packages/postcard/www/postcard-picture-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/www/postcard-picture-postgresql.xql,v diff -u -r1.2 -r1.2.10.1 --- openacs-4/contrib/obsolete-packages/postcard/www/postcard-picture-postgresql.xql 21 Aug 2001 22:22:29 -0000 1.2 +++ openacs-4/contrib/obsolete-packages/postcard/www/postcard-picture-postgresql.xql 7 Oct 2004 18:58:03 -0000 1.2.10.1 @@ -1,7 +1,7 @@ - postgresql7.1 + postgresql7.3 Index: openacs-4/contrib/obsolete-packages/postcard/www/send-card.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/www/send-card.tcl,v diff -u -r1.4 -r1.4.8.1 --- openacs-4/contrib/obsolete-packages/postcard/www/send-card.tcl 18 Sep 2002 12:02:33 -0000 1.4 +++ openacs-4/contrib/obsolete-packages/postcard/www/send-card.tcl 7 Oct 2004 18:58:03 -0000 1.4.8.1 @@ -18,8 +18,14 @@ url:onevalue } -ad_require_permission [ad_conn package_id] "postcard_create_card" +set user_id [ad_conn user_id] +set package_id [ad_conn package_id] +permission::require_permission \ + -party_id $user_id \ + -privilege create \ + -object_id $package_id + set pickup_code [ns_crypt $card_id foobar] # Don't take the email from the poster. Pull it out of the db instead. @@ -57,10 +63,13 @@ set message " You have received a postcard from $first_names $last_name ($sender). -You may go to $url to pick up your card! +You may go to $url to pick up your card!" -" -ns_sendmail $recipient $sender $subject $message +acs_mail_lite::send \ + -to_addr $recipient \ + -from_addr $sender \ + -subject $subject \ + -body $message Index: openacs-4/contrib/obsolete-packages/postcard/www/write-card.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/www/write-card.adp,v diff -u -r1.4 -r1.4.8.1 --- openacs-4/contrib/obsolete-packages/postcard/www/write-card.adp 5 Sep 2002 12:57:45 -0000 1.4 +++ openacs-4/contrib/obsolete-packages/postcard/www/write-card.adp 7 Oct 2004 18:58:03 -0000 1.4.8.1 @@ -7,8 +7,7 @@

-<%= [export_form_vars image_id] %> -<%= [export_form_vars card_id] %> +@export_vars;noquote@ Index: openacs-4/contrib/obsolete-packages/postcard/www/write-card.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/www/write-card.tcl,v diff -u -r1.3 -r1.3.8.1 --- openacs-4/contrib/obsolete-packages/postcard/www/write-card.tcl 5 Sep 2002 12:57:45 -0000 1.3 +++ openacs-4/contrib/obsolete-packages/postcard/www/write-card.tcl 7 Oct 2004 18:58:03 -0000 1.3.8.1 @@ -9,11 +9,18 @@ } { image_id:integer,notnull } -properties { - image_id:onevalue - image_value:onevalue + image_id:onevalue + image_value:onevalue } -ad_require_permission [ad_conn package_id] "postcard_create_card" +set user_id [ad_conn user_id] +set package_id [ad_conn package_id] +permission::require_permission \ + -party_id $user_id \ + -privilege create \ + -object_id $package_id + set card_id [db_nextval postcard_sequence] +set export_vars [export_vars -form {image_id card_id}] Index: openacs-4/packages/postcard/postcard.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/postcard.info,v diff -u -r1.5 -r1.5.8.1 --- openacs-4/packages/postcard/postcard.info 23 Sep 2002 23:32:26 -0000 1.5 +++ openacs-4/packages/postcard/postcard.info 7 Oct 2004 18:58:02 -0000 1.5.8.1 @@ -1,62 +1,25 @@ - + - postcard - postcards + Post Card + Post Cards f f - - - - oracle - postgresql - - kapil thangavelu + + + Jade Rubick Henry Minsky + kapil thangavelu Send electronics postcards - 2001-08-22 - allows users to send postcards (images w/ text) + 2004-10-07 + Allows users to send postcards (images w/ text). It is an adaptation of Henry Minsky's postcard tutorial application. -adaptation of henry minsky's postcard tutorial application. + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Index: openacs-4/packages/postcard/sql/postgresql/postcard-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/sql/postgresql/postcard-create.sql,v diff -u -r1.4 -r1.4.4.1 --- openacs-4/packages/postcard/sql/postgresql/postcard-create.sql 23 Feb 2003 18:22:05 -0000 1.4 +++ openacs-4/packages/postcard/sql/postgresql/postcard-create.sql 7 Oct 2004 18:58:03 -0000 1.4.4.1 @@ -1,94 +1,5 @@ -- electronic postcard - -/* first we create the permissions model for postcards - - defining these basic actions - - - upload images - - view postcard - - moderate images - - create card to send - - and then define the base security privileges that we - want to have. applications that want to designate - to the end user fine grained permission control, should - designate appropiate basic privileges as the atomic level - of an applications/services security. - -*/ -begin; - - select acs_privilege__create_privilege('postcard_create_image',null,null); - select acs_privilege__create_privilege('postcard_create_card',null,null); - select acs_privilege__create_privilege('postcard_read',null,null); - select acs_privilege__create_privilege('postcard_admin',null,null); - - - -- bind privileges to privilege heirarchy - - select acs_privilege__add_child('create', 'postcard_create_image'); - select acs_privilege__add_child('create', 'postcard_create_card'); - select acs_privilege__add_child('read', 'postcard_read'); - - select acs_privilege__add_child('admin','postcard_admin'); -end; - - -/* - Creating permissions basically involves binding the - privilege to the object system. - - permissions involve binding a particular privilege - to a user in a given context. - - We grant the permissions to the public - - inline function - inline funcs are used to allow - calling pl/pgsql. -*/ - -create function inline_0 () -returns integer as ' -declare - default_context integer; - registered_users integer; - the_public integer; -begin - - default_context := acs__magic_object_id(''default_context''); - registered_users := acs__magic_object_id(''registered_users''); - the_public := acs__magic_object_id(''the_public''); - - -- give registered users the power to post by default - - perform acs_permission__grant_permission ( - default_context, - registered_users, - ''postcard_create_card'' - ); - - perform acs_permission__grant_permission ( - default_context, - registered_users, - ''postcard_create_image'' - ); - - -- give the public the power to read by default - - perform acs_permission__grant_permission ( - default_context, - the_public, - ''postcard_read'' - ); - - return 0; -end; -' language 'plpgsql'; - -select inline_0 (); -drop function inline_0 (); - /* basic data model this needs to get migrated to the content-repository Index: openacs-4/packages/postcard/sql/postgresql/postcard-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/sql/postgresql/postcard-drop.sql,v diff -u -r1.3 -r1.3.10.1 --- openacs-4/packages/postcard/sql/postgresql/postcard-drop.sql 21 Aug 2001 22:50:55 -0000 1.3 +++ openacs-4/packages/postcard/sql/postgresql/postcard-drop.sql 7 Oct 2004 18:58:03 -0000 1.3.10.1 @@ -7,28 +7,3 @@ drop sequence postcard_seq; drop sequence postcard_image_seq; - --- Drop permission metadata -delete from acs_permissions - where privilege in - ('postcard_create_card', 'postcard_create_image', - 'postcard_read', 'postcard_admin'); - - -delete from acs_privilege_hierarchy - where privilege in - ('postcard_create_card', 'postcard_create_image', - 'postcard_read', 'postcard_admin'); - -delete from acs_privilege_hierarchy - where child_privilege in - ('postcard_create_card', 'postcard_create_image', - 'postcard_read', 'postcard_admin'); - -delete from acs_privileges - where privilege in - ('postcard_create_card', 'postcard_create_image', - 'postcard_read', 'postcard_admin'); - - - Index: openacs-4/packages/postcard/www/add-picture-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/www/add-picture-2.tcl,v diff -u -r1.6 -r1.6.8.1 --- openacs-4/packages/postcard/www/add-picture-2.tcl 5 Sep 2002 12:57:45 -0000 1.6 +++ openacs-4/packages/postcard/www/add-picture-2.tcl 7 Oct 2004 18:58:03 -0000 1.6.8.1 @@ -13,9 +13,13 @@ {description:notnull} } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] +set package_id [ad_conn package_id] -ad_require_permission [ad_conn package_id] "postcard_create_image" +permission::require_permission \ + -party_id $user_id \ + -privilege create \ + -object_id $package_id set tmp_filename [ns_queryget upload_file.tmpfile] Index: openacs-4/packages/postcard/www/add-picture.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/www/add-picture.adp,v diff -u -r1.2 -r1.2.8.1 --- openacs-4/packages/postcard/www/add-picture.adp 5 Sep 2002 12:57:45 -0000 1.2 +++ openacs-4/packages/postcard/www/add-picture.adp 7 Oct 2004 18:58:03 -0000 1.2.8.1 @@ -5,18 +5,18 @@
-Add a picture
-
+

Add a picture

+
- + - + - + Index: openacs-4/packages/postcard/www/add-picture.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/www/add-picture.tcl,v diff -u -r1.3 -r1.3.8.1 --- openacs-4/packages/postcard/www/add-picture.tcl 5 Sep 2002 12:57:45 -0000 1.3 +++ openacs-4/packages/postcard/www/add-picture.tcl 7 Oct 2004 18:58:03 -0000 1.3.8.1 @@ -9,8 +9,14 @@ } { } -ad_require_permission [ad_conn package_id] "postcard_create_image" +set user_id [ad_conn user_id] +set package_id [ad_conn package_id] +permission::require_permission \ + -party_id $user_id \ + -privilege create \ + -object_id $package_id + set image_id [db_nextval postcard_image_sequence] Index: openacs-4/packages/postcard/www/confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/www/confirm.adp,v diff -u -r1.4 -r1.4.8.1 --- openacs-4/packages/postcard/www/confirm.adp 5 Sep 2002 12:57:45 -0000 1.4 +++ openacs-4/packages/postcard/www/confirm.adp 7 Oct 2004 18:58:03 -0000 1.4.8.1 @@ -2,45 +2,33 @@ Confirmconfirm -

Confirm Your Message

-

-

- -

- -<%= [export_form_vars image_id] %> -<%= [export_form_vars recipient] %> -<%= [export_form_vars subject] %> -<%= [export_form_vars message] %> -<%= [export_form_vars card_id] %> +

Confirm Your Message

+

+

+ +

+ + @export_vars;noquote@ - -

Select ImageSelect Image
TitleTitle
DescriptionDescription
- - - - - - - - - - - - -
- To: @recipient@ -
- From: @email@ -
- Subject: @subject@ -
- Message:
- <% - regsub -all "\n" $message "
" formatted_message - adp_puts $formatted_message - %> -
- -
- + + + + + + + + + + + + + + + + + + +
To:@recipient@
From:@email@
Subject:@subject@
Message:@formatted_message;noquote@
+ + + Index: openacs-4/packages/postcard/www/confirm.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/www/confirm.tcl,v diff -u -r1.5 -r1.5.8.1 --- openacs-4/packages/postcard/www/confirm.tcl 5 Sep 2002 12:57:45 -0000 1.5 +++ openacs-4/packages/postcard/www/confirm.tcl 7 Oct 2004 18:58:03 -0000 1.5.8.1 @@ -21,7 +21,21 @@ message:onevalue } +set user_id [ad_conn user_id] +set package_id [ad_conn package_id] + +permission::require_permission \ + -party_id $user_id \ + -privilege create \ + -object_id $package_id + +set export_vars [export_vars -form {image_id recipient subject message card_id}] + # Insert a new postcard in the database, set card_id to the card id value -ad_require_permission [ad_conn package_id] "postcard_create_card" ad_get_user_info set sender $email + + +set formatted_message $message +regsub -all "\n" $message "
" formatted_message + Index: openacs-4/packages/postcard/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/www/index.tcl,v diff -u -r1.3 -r1.3.8.1 --- openacs-4/packages/postcard/www/index.tcl 5 Sep 2002 12:57:45 -0000 1.3 +++ openacs-4/packages/postcard/www/index.tcl 7 Oct 2004 18:58:03 -0000 1.3.8.1 @@ -19,3 +19,4 @@ } set message "Select image and send a Card" + Index: openacs-4/packages/postcard/www/postcard-picture-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/www/postcard-picture-postgresql.xql,v diff -u -r1.2 -r1.2.10.1 --- openacs-4/packages/postcard/www/postcard-picture-postgresql.xql 21 Aug 2001 22:22:29 -0000 1.2 +++ openacs-4/packages/postcard/www/postcard-picture-postgresql.xql 7 Oct 2004 18:58:03 -0000 1.2.10.1 @@ -1,7 +1,7 @@ - postgresql7.1 + postgresql7.3 Index: openacs-4/packages/postcard/www/send-card.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/www/send-card.tcl,v diff -u -r1.4 -r1.4.8.1 --- openacs-4/packages/postcard/www/send-card.tcl 18 Sep 2002 12:02:33 -0000 1.4 +++ openacs-4/packages/postcard/www/send-card.tcl 7 Oct 2004 18:58:03 -0000 1.4.8.1 @@ -18,8 +18,14 @@ url:onevalue } -ad_require_permission [ad_conn package_id] "postcard_create_card" +set user_id [ad_conn user_id] +set package_id [ad_conn package_id] +permission::require_permission \ + -party_id $user_id \ + -privilege create \ + -object_id $package_id + set pickup_code [ns_crypt $card_id foobar] # Don't take the email from the poster. Pull it out of the db instead. @@ -57,10 +63,13 @@ set message " You have received a postcard from $first_names $last_name ($sender). -You may go to $url to pick up your card! +You may go to $url to pick up your card!" -" -ns_sendmail $recipient $sender $subject $message +acs_mail_lite::send \ + -to_addr $recipient \ + -from_addr $sender \ + -subject $subject \ + -body $message Index: openacs-4/packages/postcard/www/write-card.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/www/write-card.adp,v diff -u -r1.4 -r1.4.8.1 --- openacs-4/packages/postcard/www/write-card.adp 5 Sep 2002 12:57:45 -0000 1.4 +++ openacs-4/packages/postcard/www/write-card.adp 7 Oct 2004 18:58:03 -0000 1.4.8.1 @@ -7,8 +7,7 @@

-<%= [export_form_vars image_id] %> -<%= [export_form_vars card_id] %> +@export_vars;noquote@ Index: openacs-4/packages/postcard/www/write-card.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/www/write-card.tcl,v diff -u -r1.3 -r1.3.8.1 --- openacs-4/packages/postcard/www/write-card.tcl 5 Sep 2002 12:57:45 -0000 1.3 +++ openacs-4/packages/postcard/www/write-card.tcl 7 Oct 2004 18:58:03 -0000 1.3.8.1 @@ -9,11 +9,18 @@ } { image_id:integer,notnull } -properties { - image_id:onevalue - image_value:onevalue + image_id:onevalue + image_value:onevalue } -ad_require_permission [ad_conn package_id] "postcard_create_card" +set user_id [ad_conn user_id] +set package_id [ad_conn package_id] +permission::require_permission \ + -party_id $user_id \ + -privilege create \ + -object_id $package_id + set card_id [db_nextval postcard_sequence] +set export_vars [export_vars -form {image_id card_id}]