com web/wiki: Reapply our hacks: dokuwiki/inc/lang/en/password.txt dokuwiki/inc/lang/en/register.txt dokuwiki/inc/lang/en/resendpwd.txt
dokuwiki/inc/mail.php

Commit: d51e9dccc3c64156265e1ef65cd3b8d3b3f2522a Author: Hannes Magnusson <bjori@mongodb.com> Wed, 27 Nov 2013 14:26:32 -0800 Parents: 525df7b4d52bd6d54817e3acc36467627ca3ad69 Branches: master Link: http://git.php.net/?p=web/wiki.git;a=commitdiff;h=d51e9dccc3c64156265e1ef65cd3b8d3b3f2522a Log: Reapply our hacks Changed paths: M dokuwiki/inc/lang/en/password.txt M dokuwiki/inc/lang/en/register.txt M dokuwiki/inc/lang/en/resendpwd.txt M dokuwiki/inc/mail.php Diff: diff --git a/dokuwiki/inc/lang/en/password.txt b/dokuwiki/inc/lang/en/password.txt index 6d5cbe6..bb71810 100644 --- a/dokuwiki/inc/lang/en/password.txt +++ b/dokuwiki/inc/lang/en/password.txt @@ -2,6 +2,12 @@ Hi @FULLNAME@! Here is your userdata for @TITLE@ at @DOKUWIKIURL@ +Note: This doesn't help you at all. The wiki is read-only. +If you need to edit some page, read the registration page again. + +If you had a php.net VCS account before, please use your php.net +credentials to login. + Login : @LOGIN@ Password : @PASSWORD@ diff --git a/dokuwiki/inc/lang/en/register.txt b/dokuwiki/inc/lang/en/register.txt index db68d4f..4d0c9e8 100644 --- a/dokuwiki/inc/lang/en/register.txt +++ b/dokuwiki/inc/lang/en/register.txt @@ -1,4 +1,21 @@ -====== Register as new user ====== +====== Register as a new wiki user ====== + +Welcome and thank you for desiring a PHP.net wiki account! + +To create a new wiki account, please fill out all of the information below. +Make sure you supply a **valid e-mail address** - if you are not asked to enter a password here, a new one will be sent to that address. +The login name should be a valid [[doku>wiki:pagename|pagename]]. + +Once you register with this form and receive your wiki username you still **won't** be able to edit the wiki until we manually authorize access. +This reduces wiki vandalism. To get authorization you must send a quick introduction to the [[php-webmaster@lists.php.net|php-webmaster]] mailing list. +Mention your wiki username and say what you're planning to do. +This email lets us know you're a human (and not a robot) and what you'll be working on. +Approval may take several hours or days. + +**Note**: If you find a minor problem with the wiki (like a typo or invalid grammar) then please email the [[php-webmaster@lists.php.net|php-webmaster]] mailing list with the URL, and suggested change. + +**Note**: All information here is readable without registering. Write access is controlled however. All users with a php.net vcs account have full write access to the wiki, and may simply login with their SVN credentials. + +**Note**: After submitting this registration form, your information (name and email) is sent to the publicly viewable [[http://news.php.net/php.webmaster|php-webmaster]] mailing list, along with your IP address, hostname, and user agent (browser info). -Fill in all the information below to create a new account in this wiki. Make sure you supply a **valid e-mail address** - if you are not asked to enter a password here, a new one will be sent to that address. The login name should be a valid [[doku>pagename|pagename]]. diff --git a/dokuwiki/inc/lang/en/resendpwd..txt b/dokuwiki/inc/lang/en/resendpwd.txt index 98c8c75..59387b0 100644 --- a/dokuwiki/inc/lang/en/resendpwd.txt +++ b/dokuwiki/inc/lang/en/resendpwd.txt @@ -2,3 +2,6 @@ Please enter your user name in the form below to request a new password for your account in this wiki. A confirmation link will be sent to your registered email address. +Do you have an php.net VCS account? - Then this form wont work. Please use https://master.php.net/forgot.php + + diff --git a/dokuwiki/inc/mail.php b/dokuwiki/inc/mail.php index 0b60c0a..e757219 100644 --- a/dokuwiki/inc/mail.php +++ b/dokuwiki/inc/mail.php @@ -158,6 +158,11 @@ function _mail_send_action($data) { $body = mail_quotedprintable_encode($body); + // TODO: fixme hack .. this needs to be in a plugin or config file + if (substr($to, -7) === 'php.net') { + $params = '-fnoreply@php.net'; + } + if($params == null){ return @mail($to,$subject,$body,$header); }else{