From: rich Date: Sat, 23 Oct 2004 15:00:13 +0000 (+0000) Subject: Multiple changes and improvements to the handling of users: X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=529b55fe61e017417faae092fe221bbd41368aa5;p=cocanwiki.git Multiple changes and improvements to the handling of users: User preferences. User can change their email address, and it is verified. User can change their email notification status. Invite user to join is now much less of a hack. This option has moved to the front page. Don't send email notifications to non-accepting users. Administrator can see who has not yet accepted their invitations. Delete user works again. Stylesheet fixes throughout user management. In the database: Added users.invite Added pending_email_changes table. Updated MANIFEST. --- diff --git a/MANIFEST b/MANIFEST index 7232ac0..91fec43 100644 --- a/MANIFEST +++ b/MANIFEST @@ -103,6 +103,7 @@ scripts/edit_page_title_form.ml scripts/edit_sitemenu.ml scripts/edit_user.ml scripts/edit_user_form.ml +scripts/email_change.ml scripts/file.ml scripts/files.ml scripts/forgot_password.ml @@ -183,6 +184,8 @@ scripts/upload_file.ml scripts/upload_file_form.ml scripts/upload_image.ml scripts/upload_image_form.ml +scripts/user_prefs.ml +scripts/user_prefs_form.ml scripts/users.ml scripts/visualise_links.ml. scripts/what_links_here.ml @@ -262,6 +265,8 @@ templates/undelete_file_form.html templates/undelete_image_form.html templates/upload_file_form.html templates/upload_image_form.html +templates/user_prefs_email_change.txt +templates/user_prefs_form.html templates/users.html templates/visualise_links.html templates/what_links_here.html diff --git a/Makefile.config b/Makefile.config index 72db2a9..c757f68 100644 --- a/Makefile.config +++ b/Makefile.config @@ -1,7 +1,7 @@ -# $Id: Makefile.config,v 1.11 2004/10/22 17:18:12 rich Exp $ +# $Id: Makefile.config,v 1.12 2004/10/23 15:00:13 rich Exp $ PACKAGE := cocanwiki -VERSION := 1.3.1 +VERSION := 1.3.2 # Normally ignored. However, if you are installing centrally (using # 'make pkg-install'), then the components are installed in the diff --git a/cocanwiki.sql b/cocanwiki.sql index 0f720f3..8d20a39 100644 --- a/cocanwiki.sql +++ b/cocanwiki.sql @@ -48,7 +48,7 @@ GRANT ALL ON TABLE pages TO "www-data"; -- --- TOC entry 48 (OID 536004) +-- TOC entry 50 (OID 536004) -- Name: pages_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -81,7 +81,7 @@ GRANT ALL ON TABLE contents TO "www-data"; -- --- TOC entry 49 (OID 536021) +-- TOC entry 51 (OID 536021) -- Name: contents_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -121,7 +121,7 @@ GRANT ALL ON TABLE hosts TO "www-data"; -- --- TOC entry 50 (OID 536371) +-- TOC entry 52 (OID 536371) -- Name: hosts_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -185,7 +185,7 @@ GRANT ALL ON TABLE images TO "www-data"; -- --- TOC entry 51 (OID 537151) +-- TOC entry 53 (OID 537151) -- Name: images_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -220,7 +220,7 @@ GRANT ALL ON TABLE files TO "www-data"; -- --- TOC entry 52 (OID 537166) +-- TOC entry 54 (OID 537166) -- Name: files_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -247,7 +247,8 @@ CREATE TABLE users ( can_edit_global_css boolean DEFAULT false NOT NULL, force_password_change boolean DEFAULT false NOT NULL, can_import_mail boolean DEFAULT false NOT NULL, - email_notify boolean DEFAULT true NOT NULL + email_notify boolean DEFAULT true NOT NULL, + invite text ); @@ -261,7 +262,7 @@ GRANT ALL ON TABLE users TO "www-data"; -- --- TOC entry 53 (OID 540816) +-- TOC entry 55 (OID 540816) -- Name: users_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -334,7 +335,7 @@ GRANT ALL ON TABLE contacts TO "www-data"; -- --- TOC entry 54 (OID 542605) +-- TOC entry 56 (OID 542605) -- Name: contacts_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -499,7 +500,7 @@ GRANT SELECT ON TABLE templates TO "www-data"; -- --- TOC entry 55 (OID 547939) +-- TOC entry 57 (OID 547939) -- Name: templates_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -552,7 +553,7 @@ GRANT ALL ON TABLE messages TO "www-data"; -- --- TOC entry 56 (OID 551675) +-- TOC entry 58 (OID 551675) -- Name: messages_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -603,7 +604,29 @@ GRANT SELECT ON TABLE powered_by TO "www-data"; -- --- TOC entry 63 (OID 536388) +-- TOC entry 48 (OID 607136) +-- Name: pending_email_changes; Type: TABLE; Schema: public; Owner: rich +-- + +CREATE TABLE pending_email_changes ( + "key" text NOT NULL, + change_date date DEFAULT ('now'::text)::date NOT NULL, + userid integer NOT NULL, + email text NOT NULL +); + + +-- +-- TOC entry 49 (OID 607136) +-- Name: pending_email_changes; Type: ACL; Schema: public; Owner: rich +-- + +REVOKE ALL ON TABLE pending_email_changes FROM PUBLIC; +GRANT ALL ON TABLE pending_email_changes TO "www-data"; + + +-- +-- TOC entry 65 (OID 536388) -- Name: hostnames_hostid_name_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -611,7 +634,7 @@ CREATE UNIQUE INDEX hostnames_hostid_name_uq ON hostnames USING btree (hostid, n -- --- TOC entry 64 (OID 536389) +-- TOC entry 66 (OID 536389) -- Name: hostnams_name_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -619,7 +642,7 @@ CREATE UNIQUE INDEX hostnams_name_uq ON hostnames USING btree (name); -- --- TOC entry 60 (OID 536419) +-- TOC entry 62 (OID 536419) -- Name: pages_url_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -627,7 +650,7 @@ CREATE UNIQUE INDEX pages_url_uq ON pages USING btree (hostid, url); -- --- TOC entry 65 (OID 540251) +-- TOC entry 67 (OID 540251) -- Name: images_name_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -635,7 +658,7 @@ CREATE UNIQUE INDEX images_name_uq ON images USING btree (hostid, name); -- --- TOC entry 67 (OID 540252) +-- TOC entry 69 (OID 540252) -- Name: files_name_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -643,7 +666,7 @@ CREATE UNIQUE INDEX files_name_uq ON files USING btree (hostid, name); -- --- TOC entry 70 (OID 540831) +-- TOC entry 72 (OID 540831) -- Name: users_name_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -651,7 +674,7 @@ CREATE UNIQUE INDEX users_name_uq ON users USING btree (hostid, name); -- --- TOC entry 69 (OID 540946) +-- TOC entry 71 (OID 540946) -- Name: users_id_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -659,7 +682,7 @@ CREATE UNIQUE INDEX users_id_uq ON users USING btree (hostid, id); -- --- TOC entry 72 (OID 540970) +-- TOC entry 74 (OID 540970) -- Name: sitemenu_ordering_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -667,7 +690,7 @@ CREATE UNIQUE INDEX sitemenu_ordering_uq ON sitemenu USING btree (hostid, orderi -- --- TOC entry 73 (OID 540971) +-- TOC entry 75 (OID 540971) -- Name: sitemenu_url_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -675,7 +698,7 @@ CREATE UNIQUE INDEX sitemenu_url_uq ON sitemenu USING btree (hostid, url); -- --- TOC entry 76 (OID 542626) +-- TOC entry 78 (OID 542626) -- Name: contact_emails_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -683,7 +706,7 @@ CREATE UNIQUE INDEX contact_emails_uq ON contact_emails USING btree (contactid, -- --- TOC entry 77 (OID 543505) +-- TOC entry 79 (OID 543505) -- Name: themes_theme_css_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -691,7 +714,7 @@ CREATE UNIQUE INDEX themes_theme_css_uq ON themes USING btree (theme_css); -- --- TOC entry 78 (OID 543763) +-- TOC entry 80 (OID 543763) -- Name: page_emails_email_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -699,7 +722,7 @@ CREATE UNIQUE INDEX page_emails_email_uq ON page_emails USING btree (hostid, url -- --- TOC entry 79 (OID 543795) +-- TOC entry 81 (OID 543795) -- Name: mailing_lists_email_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -707,7 +730,7 @@ CREATE UNIQUE INDEX mailing_lists_email_uq ON mailing_lists USING btree (hostid, -- --- TOC entry 74 (OID 543880) +-- TOC entry 76 (OID 543880) -- Name: contacts_name_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -715,7 +738,7 @@ CREATE UNIQUE INDEX contacts_name_uq ON contacts USING btree (hostid, name); -- --- TOC entry 80 (OID 544454) +-- TOC entry 82 (OID 544454) -- Name: links_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -723,7 +746,7 @@ CREATE UNIQUE INDEX links_uq ON links USING btree (hostid, from_url, to_url); -- --- TOC entry 81 (OID 547951) +-- TOC entry 83 (OID 547951) -- Name: templates_ext_ord_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -731,7 +754,7 @@ CREATE UNIQUE INDEX templates_ext_ord_uq ON templates USING btree (extension, or -- --- TOC entry 83 (OID 547952) +-- TOC entry 85 (OID 547952) -- Name: templates_title_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -739,7 +762,7 @@ CREATE UNIQUE INDEX templates_title_uq ON templates USING btree (title_regexp); -- --- TOC entry 84 (OID 547953) +-- TOC entry 86 (OID 547953) -- Name: templates_url_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -747,7 +770,7 @@ CREATE UNIQUE INDEX templates_url_uq ON templates USING btree (url_regexp); -- --- TOC entry 85 (OID 551151) +-- TOC entry 87 (OID 551151) -- Name: recently_visited_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -755,7 +778,7 @@ CREATE UNIQUE INDEX recently_visited_uq ON recently_visited USING btree (userid, -- --- TOC entry 86 (OID 552155) +-- TOC entry 88 (OID 552155) -- Name: messages_inet_message_id_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -763,7 +786,7 @@ CREATE UNIQUE INDEX messages_inet_message_id_uq ON messages USING btree (hostid, -- --- TOC entry 59 (OID 552684) +-- TOC entry 61 (OID 552684) -- Name: pages_url_ix; Type: INDEX; Schema: public; Owner: rich -- @@ -771,7 +794,7 @@ CREATE INDEX pages_url_ix ON pages USING btree (url); -- --- TOC entry 58 (OID 552685) +-- TOC entry 60 (OID 552685) -- Name: pages_redirect_ix; Type: INDEX; Schema: public; Owner: rich -- @@ -779,7 +802,7 @@ CREATE INDEX pages_redirect_ix ON pages USING btree (redirect); -- --- TOC entry 57 (OID 536012) +-- TOC entry 59 (OID 536012) -- Name: pages_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -788,7 +811,7 @@ ALTER TABLE ONLY pages -- --- TOC entry 61 (OID 536027) +-- TOC entry 63 (OID 536027) -- Name: contents_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -797,7 +820,7 @@ ALTER TABLE ONLY contents -- --- TOC entry 62 (OID 536377) +-- TOC entry 64 (OID 536377) -- Name: hosts_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -806,7 +829,7 @@ ALTER TABLE ONLY hosts -- --- TOC entry 66 (OID 537158) +-- TOC entry 68 (OID 537158) -- Name: images_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -815,7 +838,7 @@ ALTER TABLE ONLY images -- --- TOC entry 68 (OID 537173) +-- TOC entry 70 (OID 537173) -- Name: files_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -824,7 +847,7 @@ ALTER TABLE ONLY files -- --- TOC entry 71 (OID 540825) +-- TOC entry 73 (OID 540825) -- Name: users_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -833,7 +856,7 @@ ALTER TABLE ONLY users -- --- TOC entry 75 (OID 542611) +-- TOC entry 77 (OID 542611) -- Name: contacts_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -842,7 +865,7 @@ ALTER TABLE ONLY contacts -- --- TOC entry 82 (OID 547945) +-- TOC entry 84 (OID 547945) -- Name: templates_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -851,7 +874,7 @@ ALTER TABLE ONLY templates -- --- TOC entry 87 (OID 551681) +-- TOC entry 89 (OID 551681) -- Name: messages_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -860,7 +883,7 @@ ALTER TABLE ONLY messages -- --- TOC entry 88 (OID 607081) +-- TOC entry 90 (OID 607081) -- Name: powered_by_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -869,7 +892,16 @@ ALTER TABLE ONLY powered_by -- --- TOC entry 93 (OID 536029) +-- TOC entry 91 (OID 607141) +-- Name: pending_email_changes_pkey; Type: CONSTRAINT; Schema: public; Owner: rich +-- + +ALTER TABLE ONLY pending_email_changes + ADD CONSTRAINT pending_email_changes_pkey PRIMARY KEY ("key"); + + +-- +-- TOC entry 96 (OID 536029) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -878,7 +910,7 @@ ALTER TABLE ONLY contents -- --- TOC entry 97 (OID 536384) +-- TOC entry 100 (OID 536384) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -887,7 +919,7 @@ ALTER TABLE ONLY hostnames -- --- TOC entry 94 (OID 536394) +-- TOC entry 97 (OID 536394) -- Name: hosts_hostname_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -896,7 +928,7 @@ ALTER TABLE ONLY hosts -- --- TOC entry 89 (OID 536404) +-- TOC entry 92 (OID 536404) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -905,7 +937,7 @@ ALTER TABLE ONLY pages -- --- TOC entry 98 (OID 537160) +-- TOC entry 101 (OID 537160) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -914,7 +946,7 @@ ALTER TABLE ONLY images -- --- TOC entry 99 (OID 537175) +-- TOC entry 102 (OID 537175) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -923,7 +955,7 @@ ALTER TABLE ONLY files -- --- TOC entry 90 (OID 539155) +-- TOC entry 93 (OID 539155) -- Name: pages_redirect_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -932,7 +964,7 @@ ALTER TABLE ONLY pages -- --- TOC entry 100 (OID 540827) +-- TOC entry 103 (OID 540827) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -941,7 +973,7 @@ ALTER TABLE ONLY users -- --- TOC entry 101 (OID 540837) +-- TOC entry 104 (OID 540837) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -950,7 +982,7 @@ ALTER TABLE ONLY usercookies -- --- TOC entry 91 (OID 540942) +-- TOC entry 94 (OID 540942) -- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -959,7 +991,7 @@ ALTER TABLE ONLY pages -- --- TOC entry 92 (OID 540947) +-- TOC entry 95 (OID 540947) -- Name: pages_user_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -968,7 +1000,7 @@ ALTER TABLE ONLY pages -- --- TOC entry 102 (OID 540966) +-- TOC entry 105 (OID 540966) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -977,7 +1009,7 @@ ALTER TABLE ONLY sitemenu -- --- TOC entry 103 (OID 540972) +-- TOC entry 106 (OID 540972) -- Name: sitemenu_url_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -986,7 +1018,7 @@ ALTER TABLE ONLY sitemenu -- --- TOC entry 104 (OID 542613) +-- TOC entry 107 (OID 542613) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -995,7 +1027,7 @@ ALTER TABLE ONLY contacts -- --- TOC entry 105 (OID 542622) +-- TOC entry 108 (OID 542622) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -1004,7 +1036,7 @@ ALTER TABLE ONLY contact_emails -- --- TOC entry 95 (OID 543506) +-- TOC entry 98 (OID 543506) -- Name: hosts_theme_css_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -1013,7 +1045,7 @@ ALTER TABLE ONLY hosts -- --- TOC entry 106 (OID 543759) +-- TOC entry 109 (OID 543759) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -1022,7 +1054,7 @@ ALTER TABLE ONLY page_emails -- --- TOC entry 107 (OID 543764) +-- TOC entry 110 (OID 543764) -- Name: page_emails_url_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -1031,7 +1063,7 @@ ALTER TABLE ONLY page_emails -- --- TOC entry 108 (OID 543791) +-- TOC entry 111 (OID 543791) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -1040,7 +1072,7 @@ ALTER TABLE ONLY mailing_lists -- --- TOC entry 109 (OID 544450) +-- TOC entry 112 (OID 544450) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -1049,7 +1081,7 @@ ALTER TABLE ONLY links -- --- TOC entry 110 (OID 544455) +-- TOC entry 113 (OID 544455) -- Name: links_from_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -1058,7 +1090,7 @@ ALTER TABLE ONLY links -- --- TOC entry 111 (OID 551129) +-- TOC entry 114 (OID 551129) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -1067,7 +1099,7 @@ ALTER TABLE ONLY recently_visited -- --- TOC entry 112 (OID 551133) +-- TOC entry 115 (OID 551133) -- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -1076,7 +1108,7 @@ ALTER TABLE ONLY recently_visited -- --- TOC entry 113 (OID 551137) +-- TOC entry 116 (OID 551137) -- Name: recently_visited_url_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -1085,7 +1117,7 @@ ALTER TABLE ONLY recently_visited -- --- TOC entry 114 (OID 551141) +-- TOC entry 117 (OID 551141) -- Name: recently_visited_userid_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -1094,7 +1126,7 @@ ALTER TABLE ONLY recently_visited -- --- TOC entry 116 (OID 551690) +-- TOC entry 119 (OID 551690) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -1103,7 +1135,7 @@ ALTER TABLE ONLY msg_references -- --- TOC entry 115 (OID 551694) +-- TOC entry 118 (OID 551694) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -1112,7 +1144,7 @@ ALTER TABLE ONLY messages -- --- TOC entry 96 (OID 607083) +-- TOC entry 99 (OID 607083) -- Name: hosts_powered_by_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -1121,6 +1153,15 @@ ALTER TABLE ONLY hosts -- +-- TOC entry 120 (OID 607143) +-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich +-- + +ALTER TABLE ONLY pending_email_changes + ADD CONSTRAINT "$1" FOREIGN KEY (userid) REFERENCES users(id); + + +-- -- TOC entry 3 (OID 2200) -- Name: SCHEMA public; Type: COMMENT; Schema: -; Owner: postgres -- diff --git a/conf/cocanwiki.conf b/conf/cocanwiki.conf index 874a94b..a46300a 100644 --- a/conf/cocanwiki.conf +++ b/conf/cocanwiki.conf @@ -1,5 +1,5 @@ # Apache configuration for COCANWIKI. -# $Id: cocanwiki.conf,v 1.15 2004/10/18 13:34:21 rich Exp $ +# $Id: cocanwiki.conf,v 1.16 2004/10/23 15:00:14 rich Exp $ # Uncomment the following lines if necessary. You will probably need # to adjust the paths to reflect where cocanwiki is really installed. @@ -54,6 +54,7 @@ RewriteRule ^/robots.txt /robots.txt [PT,L] # Global scripts. RewriteRule ^/_admin$ /_bin/admin/admin.cmo [PT,L,QSA] RewriteRule ^/_contact$ /_bin/contact.cmo [PT,L,QSA] +RewriteRule ^/_email_change$ /_bin/email_change.cmo [PT,L,QSA] RewriteRule ^/_files$ /_bin/files.cmo [PT,L,QSA] RewriteRule ^/_global.css$ /_bin/hoststyle.cmo [PT,L,QSA] RewriteRule ^/_images$ /_bin/images.cmo [PT,L,QSA] @@ -67,6 +68,7 @@ RewriteRule ^/_pe_confirm$ /_bin/page_email_confirm.cmo [PT,L,QSA] RewriteRule ^/_pe_unsub$ /_bin/page_email_unsubscribe.cmo [PT,L,QSA] RewriteRule ^/_recent$ /_bin/recent.cmo [PT,L,QSA] RewriteRule ^/_sitemap$ /_bin/sitemap.cmo [PT,L,QSA] +RewriteRule ^/_userprefs$ /_bin/user_prefs_form.cmo [PT,L,QSA] RewriteRule ^/_users$ /_bin/users.cmo [PT,L,QSA] # Image and file downloads. diff --git a/debian/changelog b/debian/changelog index 94107c1..7890726 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -cocanwiki (1.3.1-1) unstable; urgency=low +cocanwiki (1.3.2-1) unstable; urgency=low * Initial Release. diff --git a/debian/control b/debian/control index 6036d0e..3eef237 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,15 @@ Source: cocanwiki Priority: optional Maintainer: Richard W.M. Jones -Build-Depends: debhelper (>= 4.0.0), libpcre-ocaml-dev, libpgsql-ocaml-dev, libextlib-ocaml-dev, ocaml-findlib, ocaml-nox-3.08, libapache-mod-caml, libtemplate-ocaml-dev, ocamldsort (>= 0.14.2) +Build-Depends: debhelper (>= 4.0.0), libpcre-ocaml-dev, libpgsql-ocaml-dev, libextlib-ocaml-dev, ocaml-findlib, ocaml-nox-3.08, libapache-mod-caml (>= 1.3.2), libtemplate-ocaml-dev (>= 1.3.2), ocamldsort (>= 0.14.2) Standards-Version: 3.6.1 Package: cocanwiki Section: web Architecture: all Depends: libpgsql-ocaml, libdbi-ocaml (>= 0.9.9), libpcre-ocaml, - ocaml-base-nox-3.08, libapache-mod-caml, libtemplate-ocaml-dev, + ocaml-base-nox-3.08, libapache-mod-caml (>= 1.3.2), + libtemplate-ocaml-dev (>= 1.3.2), libocamlnet-ocaml-dev (>= 0.98), imagemagick, curl (>= 7.12.1) Suggests: apache diff --git a/html/_css/users.css b/html/_css/users.css index 28e1a3d..8235c30 100644 --- a/html/_css/users.css +++ b/html/_css/users.css @@ -1,24 +1,8 @@ /* Stylesheet for COCANWIKI, derived from EWM. - * $Id: users.css,v 1.3 2004/09/08 12:45:37 rich Exp $ + * $Id: users.css,v 1.4 2004/10/23 15:00:14 rich Exp $ */ -table#users { - border-collapse: collapse; -} - -table#users th { - border: 1px solid #000; - vertical-align: top; - text-align: center; - padding: 6px; -} - -table#users td { - border: 1px solid #eee; - padding: 6px; -} - -table#edit_user th { - vertical-align: top; - text-align: right; +span.pending { + font-weight: bold; + color: #f00; } diff --git a/scripts/delete_user.ml b/scripts/delete_user.ml index ab2b8a4..469e45c 100644 --- a/scripts/delete_user.ml +++ b/scripts/delete_user.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: delete_user.ml,v 1.2 2004/09/23 11:56:47 rich Exp $ + * $Id: delete_user.ml,v 1.3 2004/10/23 15:00:14 rich Exp $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -55,6 +55,17 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} self = | _ -> () in (* Delete the user. *) + let sth = + dbh#prepare_cached "delete from recently_visited + where userid = ? and hostid = ?" in + sth#execute [`Int userid; `Int hostid]; + + let sth = + dbh#prepare_cached "delete from pending_email_changes + where userid = ?" in + sth#execute [`Int userid]; + + let sth = dbh#prepare_cached "delete from usercookies where userid = ?" in sth#execute [`Int userid]; diff --git a/scripts/edit_user.ml b/scripts/edit_user.ml index 2f861c7..234c5a6 100644 --- a/scripts/edit_user.ml +++ b/scripts/edit_user.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: edit_user.ml,v 1.7 2004/10/11 14:13:04 rich Exp $ + * $Id: edit_user.ml,v 1.8 2004/10/23 15:00:14 rich Exp $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -66,10 +66,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ self = sth#execute [`String name; `Int hostid; `Int userid] ); - (* Change email address and permissions. *) - let email = trim (q#param "email") in - let email = if email = "" then `Null else `String email in - + (* Change permissions. *) let can_edit = q#param_true "can_edit" in let can_manage_users = q#param_true "can_manage_users" in let can_manage_contacts = q#param_true "can_manage_contacts" in @@ -87,14 +84,14 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ self = return () | _ -> ()); - let sth = dbh#prepare_cached "update users set email = ?, + let sth = dbh#prepare_cached "update users set can_edit = ?, can_manage_users = ?, can_manage_contacts = ?, can_manage_site = ?, can_edit_global_css = ?, can_import_mail = ? where hostid = ? and id = ?" in - sth#execute [email; `Bool can_edit; `Bool can_manage_users; + sth#execute [`Bool can_edit; `Bool can_manage_users; `Bool can_manage_contacts; `Bool can_manage_site; `Bool can_edit_global_css; `Bool can_import_mail; `Int hostid; `Int userid]; diff --git a/scripts/email_change.ml b/scripts/email_change.ml new file mode 100644 index 0000000..702bee8 --- /dev/null +++ b/scripts/email_change.ml @@ -0,0 +1,63 @@ +(* COCANWIKI - a wiki written in Objective CAML. + * Written by Richard W.M. Jones . + * Copyright (C) 2004 Merjis Ltd. + * $Id: email_change.ml,v 1.1 2004/10/23 15:00:14 rich Exp $ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *) + +open Apache +open Registry +open Cgi +open Printf + +open Cocanwiki +open Cocanwiki_ok + +let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ = + (* Get the key in the pending_email_changes table. *) + let key = q#param "key" in + + let sth = dbh#prepare_cached "select userid, email from pending_email_changes + where key = ?" in + sth#execute [`String key]; + + let userid, email = + try + (match sth#fetch1 () with + [ `Int userid; `String email ] -> userid, email + | _ -> assert false) + with + Not_found -> + error ~title:"Already verified" + q ("It looks like you have already verified this email address."); + return () in + + (* Update the database. *) + let sth = dbh#prepare_cached "delete from pending_email_changes + where key = ?" in + sth#execute [`String key]; + + let sth = dbh#prepare_cached "update users set email = ? where id = ?" in + sth#execute [`String email; `Int userid]; + + dbh#commit (); + + ok ~title:"Email address verified" + q "Thank you for verifying your new email address." + +let () = + register_script run diff --git a/scripts/invite_user.ml b/scripts/invite_user.ml index a2d3bab..bca130f 100644 --- a/scripts/invite_user.ml +++ b/scripts/invite_user.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: invite_user.ml,v 1.1 2004/10/14 15:57:15 rich Exp $ + * $Id: invite_user.ml,v 1.2 2004/10/23 15:00:15 rich Exp $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -68,32 +68,40 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname = hostname} user = *) List.iter (fun email -> - let sth = dbh#prepare_cached "select id from users + let sth = dbh#prepare_cached "select id, invite from users where hostid = ? and (email = ? or name = ?)" in sth#execute [`Int hostid; `String email; `String email]; - let userid = try Some (sth#fetch1int ()) with Not_found -> None in - let body = - match userid with - Some userid -> - (* Existing user account - send reminder. *) - template_exists#set "username" username; - template_exists#set "hostname" hostname; - template_exists#to_string - - | None -> + try + (match sth#fetch1 () with + [ `Int userid; `Null ] -> + (* Existing user account - send reminder. *) + template_exists#set "username" username; + template_exists#set "hostname" hostname; + template_exists#to_string + + | [ `Int userid; `String invite ] -> + (* Existing user account - resend the invite. *) + template#set "username" username; + template#set "hostname" hostname; + template#set "invite" invite; + template#to_string + + | _ -> assert false) + with + Not_found -> (* Add user account. *) - let password = random_sessionid () in + let invite = random_sessionid () in let sth = dbh#prepare_cached "insert into users (hostid, name, - password, email) values (?, ?, ?, ?)" in - sth#execute [`Int hostid; `String email; `String password; - `String email]; + password, email, invite) values (?, ?, ?, ?, ?)" in + sth#execute [`Int hostid; `String email; `String invite; + `String email; `String invite]; template#set "username" username; template#set "hostname" hostname; - template#set "password" password; + template#set "invite" invite; template#to_string in (* Send the email. *) diff --git a/scripts/invite_user_confirm.ml b/scripts/invite_user_confirm.ml index 3f45c34..45374c5 100644 --- a/scripts/invite_user_confirm.ml +++ b/scripts/invite_user_confirm.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: invite_user_confirm.ml,v 1.1 2004/10/14 15:57:15 rich Exp $ + * $Id: invite_user_confirm.ml,v 1.2 2004/10/23 15:00:15 rich Exp $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,16 +33,13 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ = let template = _get_template "invite_user_confirm.txt" in let username = q#param "username" in - let old_password = q#param "old_password" in + let invite = q#param "invite" in - assert (String.length old_password = 32 && - string_for_all isxdigit old_password); - - (* Verify the username, old_password combination. *) + (* Verify the username, invite combination. *) let sth = dbh#prepare_cached "select email, id from users where hostid = ? and - name = ? and password = ?" in - sth#execute [`Int hostid; `String username; `String old_password]; + name = ? and invite = ?" in + sth#execute [`Int hostid; `String username; `String invite]; let email, userid = try @@ -51,9 +48,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ = | [ `Null; `Int userid ] -> None, userid | _ -> assert false with Not_found -> - error ~title:"Bad password" - ~back_button:true - q "The password you gave is wrong."; + error ~title:"Already signed up" + q "It looks like you have already used your invitation."; return () in let password1 = q#param "password1" in @@ -76,7 +72,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ = (* Change the password. *) let sth = dbh#prepare_cached - "update users set password = ?, force_password_change = false + "update users set password = ?, invite = null, + force_password_change = false where hostid = ? and id = ?" in sth#execute [`String password; `Int hostid; `Int userid]; diff --git a/scripts/invite_user_confirm_form.ml b/scripts/invite_user_confirm_form.ml index 93e6dd8..a61726d 100644 --- a/scripts/invite_user_confirm_form.ml +++ b/scripts/invite_user_confirm_form.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: invite_user_confirm_form.ml,v 1.1 2004/10/14 15:57:15 rich Exp $ + * $Id: invite_user_confirm_form.ml,v 1.2 2004/10/23 15:00:15 rich Exp $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,28 +27,30 @@ open Printf open Cocanwiki open Cocanwiki_ok open Cocanwiki_template -open Cocanwiki_strings let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ = let template = get_template dbh hostid "invite_user_confirm_form.html" in - (* Get the password. It's supposed to be unique so we can look up the - * user by this. Do a bit of sanity checking on it, however, to make - * sure we can't just use it to search for passwords, or some other type - * of strange exploit. - *) - let password = q#param "p" in - assert (String.length password = 32 && string_for_all isxdigit password); + (* Get the invite ID. *) + let invite = q#param "p" in let sth = dbh#prepare_cached "select name from users - where hostid = ? and password = ?" in - sth#execute [`Int hostid; `String password]; - - let username = sth#fetch1string () in + where hostid = ? and invite = ?" in + sth#execute [`Int hostid; `String invite]; + + let username = + try sth#fetch1string () + with + Not_found -> + error ~title:"Already signed up" + q ("It looks like you have already used your invitation. If " ^ + "you cannot get to your account, please contact the " ^ + "administrator."); + return () in (* Update the template so that the user can set their preferred password. *) template#set "username" username; - template#set "old_password" password; + template#set "invite" invite; q#template template diff --git a/scripts/lib/cocanwiki_emailnotify.ml b/scripts/lib/cocanwiki_emailnotify.ml index 648a746..07e7597 100644 --- a/scripts/lib/cocanwiki_emailnotify.ml +++ b/scripts/lib/cocanwiki_emailnotify.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: cocanwiki_emailnotify.ml,v 1.2 2004/10/21 19:54:29 rich Exp $ + * $Id: cocanwiki_emailnotify.ml,v 1.3 2004/10/23 15:00:16 rich Exp $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -43,11 +43,13 @@ let email_notify ~subject ~body ?user (dbh : Dbi.connection) hostid = (* Send a change email to everyone who hasn't opted out using * their preferences. This behaviour replaces the old - * 'email_notify' table. + * 'email_notify' table. Don't send email to invited accounts + * who have not yet confirmed. *) let sth = dbh#prepare_cached "select email, name from users where hostid = ? and id <> ? and email_notify - and email is not null" in + and email is not null + and invite is null" in sth#execute [`Int hostid; `Int own_userid]; let to_addr = sth#map (function diff --git a/scripts/page.ml b/scripts/page.ml index 496efe8..bf3fd30 100644 --- a/scripts/page.ml +++ b/scripts/page.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: page.ml,v 1.35 2004/10/23 12:00:23 rich Exp $ + * $Id: page.ml,v 1.36 2004/10/23 15:00:15 rich Exp $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -76,8 +76,9 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid navigation | _ -> assert false in - (* Can the user edit? *) + (* User permissions. *) let can_edit = can_edit host user in + let can_manage_users = can_manage_users host user in (* Do we have a stats page set up? *) let has_stats = server_settings_stats_page dbh <> None in @@ -198,6 +199,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid t#conditional "navigation" navigation; t#conditional "can_edit" can_edit; + t#conditional "can_manage_users" can_manage_users; t#conditional "has_stats" has_stats; (* Pull out the sections in this page. *) @@ -376,6 +378,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid t#conditional "has_host_css" has_host_css; t#conditional "can_edit" can_edit; + t#conditional "can_manage_users" can_manage_users; t#conditional "has_stats" has_stats; q#template t diff --git a/scripts/user_prefs.ml b/scripts/user_prefs.ml new file mode 100644 index 0000000..41d2f9d --- /dev/null +++ b/scripts/user_prefs.ml @@ -0,0 +1,109 @@ +(* COCANWIKI - a wiki written in Objective CAML. + * Written by Richard W.M. Jones . + * Copyright (C) 2004 Merjis Ltd. + * $Id: user_prefs.ml,v 1.1 2004/10/23 15:00:16 rich Exp $ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *) + +open Apache +open Registry +open Cgi +open Printf + +open Cocanwiki +open Cocanwiki_ok +open Cocanwiki_template +open Cocanwiki_strings + +let run r (q : cgi) (dbh : Dbi.connection) hostid {hostname=hostname} user = + let email_change_template = _get_template "user_prefs_email_change.txt" in + + (* Get the fields. *) + let new_email = trim (q#param "email") in + let email_notify = q#param_true "email_notify" in + + let userid = + match user with + Anonymous -> assert false + | User (userid, _, _) -> userid in + + (* Update the email notify field. *) + let sth = + dbh#prepare_cached "update users set email_notify = ? + where hostid = ? and id = ?" in + sth#execute [`Bool email_notify; `Int hostid; `Int userid]; + + (* Have we changed the email address? *) + let confirm_needed = + if new_email = "" then ( + (* Set the email field in the database to null. No need for + * any confirmation. + *) + let sth = dbh#prepare_cached "update users set email = null + where hostid = ? and id = ?" in + sth#execute [`Int hostid; `Int userid]; + + false + ) else ( + (* Is the new email address different from the one currently recorded + * in the database? + *) + let sth = dbh#prepare_cached "select ? = coalesce (email, '') + from users where hostid = ? and id = ?" in + sth#execute [`Int hostid; `Int userid]; + + let changed = + match sth#fetch1 () with [ `Bool b ] -> b | _ -> assert false in + + if changed then ( + let key = random_sessionid () in + (* Changed, so we add to the pending_email_changes table. *) + let sth = dbh#prepare_cached "insert into pending_email_changes + (key, userid, email) values (?, ?, ?)" in + sth#execute [`String key; `Int userid; `String new_email]; + + (* Send the confirm email. *) + email_change_template#set "hostname" hostname; + email_change_template#set "key" key; + let body = email_change_template#to_string in + + let subject = "Please verify your new email address at " ^ hostname in + Sendmail.send_mail ~subject ~to_addr:[new_email] ~body () + ); + + changed + ) in + + (* Good place to remove old rows in the pending_email_changes table. *) + let sth = dbh#prepare_cached "delete from pending_email_changes + where change_date - current_date > 7" in + sth#execute []; + + (* Commit and finish off. *) + dbh#commit (); + + ok ~title:"Preferences updated" + q ("Your user preferences were updated. " ^ + if confirm_needed then + ("Because you changed your email address, we have sent a " ^ + "confirmation email to your new address. You will need to " ^ + "click on the link in that email to verify your new address.") + else + "") + +let () = + register_script ~anonymous:false run diff --git a/scripts/user_prefs_form.ml b/scripts/user_prefs_form.ml new file mode 100644 index 0000000..c346f17 --- /dev/null +++ b/scripts/user_prefs_form.ml @@ -0,0 +1,68 @@ +(* COCANWIKI - a wiki written in Objective CAML. + * Written by Richard W.M. Jones . + * Copyright (C) 2004 Merjis Ltd. + * $Id: user_prefs_form.ml,v 1.1 2004/10/23 15:00:16 rich Exp $ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *) + +open Apache +open Registry +open Cgi +open Printf + +open Cocanwiki +open Cocanwiki_template +open Cocanwiki_date + +let run r (q : cgi) (dbh : Dbi.connection) hostid _ user = + let template = get_template dbh hostid "user_prefs_form.html" in + + let userid = + match user with + | Anonymous -> assert false + | User (userid, _, _) -> userid in + + (* Pull out the preferences. *) + let sth = + dbh#prepare_cached + "select name, email, registration_date, can_edit, email_notify + from users where hostid = ? and id = ?" in + sth#execute [`Int hostid; `Int userid]; + + let name, email, has_email, registration_date, can_edit, email_notify = + match sth#fetch1 () with + [ `String name; (`Null | `String _) as email; + `Date registration_date; `Bool can_edit; `Bool email_notify ] -> + let email, has_email = + match email with + `Null -> "", false + | `String email -> email, true in + name, email, has_email, registration_date, + can_edit, email_notify + | _ -> assert false in + + template#set "name" name; + template#set "email" email; + template#conditional "has_email" has_email; + template#set "registration_date" (printable_date' registration_date); + template#conditional "can_edit" can_edit; + template#conditional "email_notify" email_notify; + + q#template template + +let () = + register_script ~anonymous:false run diff --git a/scripts/users.ml b/scripts/users.ml index b16d817..5af40e5 100644 --- a/scripts/users.ml +++ b/scripts/users.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: users.ml,v 1.7 2004/10/11 14:13:04 rich Exp $ + * $Id: users.ml,v 1.8 2004/10/23 15:00:16 rich Exp $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,7 +33,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ = let sth = dbh#prepare_cached - "select id, name, email, registration_date, can_edit, can_manage_users, + "select id, name, email, registration_date, invite is not null, + can_edit, can_manage_users, can_manage_contacts, can_manage_site, can_edit_global_css, can_import_mail from users where hostid = ? order by name" in @@ -43,7 +44,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ = sth#map (function [`Int userid; `String name; (`Null | `String _) as email; - `Date registration_date; + `Date registration_date; `Bool invite_pending; `Bool can_edit; `Bool can_manage_users; `Bool can_manage_contacts; `Bool can_manage_site; `Bool can_edit_global_css; `Bool can_import_mail] -> @@ -53,6 +54,8 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ = "email", Template.VarString email; "registration_date", Template.VarString (printable_date' registration_date); + "invite_pending", + Template.VarConditional invite_pending; "can_edit", Template.VarConditional can_edit; "can_manage_users", Template.VarConditional can_manage_users; "can_manage_contacts", diff --git a/templates/create_user_form.html b/templates/create_user_form.html index 1231dbf..9e6ce17 100644 --- a/templates/create_user_form.html +++ b/templates/create_user_form.html @@ -5,13 +5,12 @@ -

Create a user account

- +
diff --git a/templates/delete_user_form.html b/templates/delete_user_form.html index 2776f9c..dafd850 100644 --- a/templates/delete_user_form.html +++ b/templates/delete_user_form.html @@ -5,7 +5,6 @@ -

Delete user: ::username_html::

@@ -14,7 +13,7 @@ Are you sure you want to delete this user?

-
Username:
+
diff --git a/templates/edit_user_form.html b/templates/edit_user_form.html index 14c9a5a..cd02152 100644 --- a/templates/edit_user_form.html +++ b/templates/edit_user_form.html @@ -3,8 +3,8 @@ User: ::name_html:: - - + +

User: ::name_html::

@@ -18,7 +18,7 @@ -
Username: ::username_html::
+
@@ -26,7 +26,7 @@ - + diff --git a/templates/invite_user.txt b/templates/invite_user.txt index 9a7f58a..4001b53 100644 --- a/templates/invite_user.txt +++ b/templates/invite_user.txt @@ -3,4 +3,4 @@ To accept this invitation, click here: -http://::hostname::/_invite?p=::password:: \ No newline at end of file +http://::hostname::/_invite?p=::invite:: \ No newline at end of file diff --git a/templates/invite_user_confirm_form.html b/templates/invite_user_confirm_form.html index 36c659e..7b6af52 100644 --- a/templates/invite_user_confirm_form.html +++ b/templates/invite_user_confirm_form.html @@ -16,7 +16,7 @@ Please choose a password for your account: - +
Username:
Email: ::email_html::
Permissions:
diff --git a/templates/page.html b/templates/page.html index c15b307..c1cd142 100644 --- a/templates/page.html +++ b/templates/page.html @@ -62,7 +62,7 @@ diff --git a/templates/set_password_form.html b/templates/set_password_form.html index 3e1558e..65f1107 100644 --- a/templates/set_password_form.html +++ b/templates/set_password_form.html @@ -5,14 +5,13 @@ -

Set password for this user

-
Username:
+
diff --git a/templates/user_prefs_email_change.txt b/templates/user_prefs_email_change.txt new file mode 100644 index 0000000..92bf7c3 --- /dev/null +++ b/templates/user_prefs_email_change.txt @@ -0,0 +1,7 @@ +You (or someone claiming to be you) requested a change of email +address at ::hostname::. + +To proceed with this change of email address, please verify by +clicking on the link below: + +http://::hostname::/_email_change?key=::invite:: \ No newline at end of file diff --git a/templates/user_prefs_form.html b/templates/user_prefs_form.html new file mode 100644 index 0000000..ee204a6 --- /dev/null +++ b/templates/user_prefs_form.html @@ -0,0 +1,47 @@ + + + +Your preferences + + + + + +

Your preferences

+ + +
Username:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Username: ::name_html::
Password: Change your password ...
Email address:
User since: ::registration_date_html::
Edit permission: ::if(can_edit)::Yes::else::No::end::
+
+ +::include(footer.html):: + + \ No newline at end of file diff --git a/templates/users.html b/templates/users.html index 420f5cb..39ab050 100644 --- a/templates/users.html +++ b/templates/users.html @@ -15,10 +15,9 @@
  • Create a user account
    • - +
    - - + @@ -33,9 +32,13 @@ ::table(users):: - - - + + @@ -44,9 +47,13 @@ ::end:: -
    Username Email address Username, email address Registration Permissions
    ::name_html:: ::email_html:: ::registration_date_html:: + ::name_html::
    + ::email_html:: +    		 + ::registration_date_html::::if(invite_pending)::*::end:: + ::if(can_edit)::Can edit::end:: ::if(can_manage_users)::Can manage users::end:: ::if(can_manage_contacts)::Can manage contacts::end:: ::if(can_import_mail)::Can import mail::end::
    +

    +* User has been invited, but has not yet +accepted the invitation. +

    +

    Explanation of permissions