diff --git a/cvs-php.php b/cvs-php.php index 090f24d50..44198b840 100644 --- a/cvs-php.php +++ b/cvs-php.php @@ -37,7 +37,6 @@ $groups = array( // We have a form submitted, and the user have read all the comments if (count($_POST) && (!is_array($_POST['purpose']) || !count($_POST['purpose']))) { - // Clean up incoming POST vars if (get_magic_quotes_gpc()) { foreach ($_POST as $k => $v) { @@ -76,6 +75,9 @@ if (count($_POST) && (!is_array($_POST['purpose']) || !count($_POST['purpose'])) if (empty($_POST['group']) || !isset($groups[$_POST['group']])) { $error .= "You did not fill out where to send the request. "; } + if (!isset($_POST['guidelines']) || !$_POST['guidelines']) { + $error .= "You did not agree to follow the contribution guidelines. "; + } // Post the request if there is no error if (!$error) { @@ -305,16 +307,6 @@ EOT; here, make sure to mention them here!
-- One last thing, before you fill in the form you should also understand the principles under which PHP itself is developed. These are summarised in the next paragraph.
-Any code contributed to PHP will be received under the PHP (or a compatible) license. PHP will be redistributed under the PHP license (currently version 3.01, http://www.php.net/license/). This includes implementation code, test cases, utility scripts and tools - that is, all code associated with the PHP project. If you contribute code that isn't entirely your own (for example it may be partially derived from other Open Source software) you are asked to add a comment into the source code to indicate the origin and the license of the original code. If you are unsure of the license you are asked to confirm with the owner of the code that they are happy for it to be contributed to PHP under the PHP license. Specifically regarding GPL and LGPL source code: -
The CVS account, once granted and activated (which could take a while, so be patient!), gives you access to a number of things. First, and most @@ -376,6 +368,10 @@ foreach ($purposes as $i => $p) { ?>
+ Before you complete the form to request a CVS id, you must understand and accept the principles under which PHP + itself is developed. These are summarised in the next paragraph. +
++ Any code contributed to PHP must be contributed under the PHP license (or a compatible BSD-style license). + PHP will be redistributed under the PHP license (currently + version 3.01). + This includes implementation code, test cases, utility scripts and tools - that is, all code associated + with the PHP project. If you contribute code that isn't entirely your own + (for example it may be partially derived from other Open Source software) you are asked to add a comment + into the source code to indicate the origin and the license of the original code. + If you are unsure of the license you are asked to confirm with the owner of the code that they are + happy for it to be contributed to PHP under the PHP license. +
++ Specifically regarding GPL and LGPL source code: +
++ For related projects, please refer to the Project websites: +
+ + + ++ The PHP code can be redistributed in source or binary form provided that + the terms of the PHP license are respected (see + version 3.01). +
++ In plain English, this means that you have to include the full license text + in human-readable form with every distributed copy of PHP, whether source + or binary. One way of doing this is to put a copy of the PHP license into a + text file that you include with the source or binary package before + distribution. This ensures that the license information can be read + properly even when a binary is shipped. + A text file containing license and copyright information is sometimes + given the filename "Notices", and may be referred to as a "Notices file". +
++ Some files in the PHP codebase have been contributed under other licenses. + If you want to distribute these files, you also need to respect the terms + of those licenses. + To check, look for the terms indicated in the license + copyright comment + block at the top of the source file. +
++ The license terms for such a file may require that its own license and copyright + information must be included with every distributed copy (including binaries). + This is quite a common requirement, which can be satisfied by adding the + appropriate license text into a text file for distribution purposes, like the + "Notices"-type of file suggested above. +
++ A single "Notices" file could be used to hold the collection of license + and copyright information that applies to PHP in general (the PHP license) and + any files with additional licenses that you want to distribute (for example + Zend, TSRM etc.) + It is good practice to indicate which source file(s) a particular license + applies to. +
+ ++ You can distribute your own software product which has been derived + from PHP, in source or binary form, provided that: +
+- You can download the text of the latest version (3.01) - of the PHP license. -
+For licensing and copyright information on the PHP project materials, please see the following links: + -Q. I've written a project in PHP that I'm going to release as open source, and I'd like to call it PHPTransmogrifier. Is that @@ -21,15 +90,18 @@ site_header("License Information");
- A. We cannot really stop you from using PHP in the name of
+ A.
+ We cannot really stop you from using PHP in the name of
your project unless you include any code from the PHP distribution, in
- which case you would be violating the license. But we would really
- prefer if people would come up with their own names independent of the
- PHP name.
+ which case you would be violating the license.
+ See Clause 4 in the
+ PHP License v3.01.
+
But we would really prefer if people would come up with their own names
+ independent of the PHP name.
- Why you ask? You are only trying to contribute to the PHP + "Why?" you ask. You are only trying to contribute to the PHP community. That may be true, but by using the PHP name you are explicitly linking your efforts to those of the entire PHP development community and the years of work that has gone into the PHP project. @@ -51,6 +123,7 @@ site_header("License Information"); in the name and does quite well.
+Q. Why is PHP 4 not dual-licensed under the GNU General Public License (GPL) like PHP 3 was? @@ -63,80 +136,21 @@ site_header("License Information"); PHP become as popular as possible.
-- - Note: the following questions and answers only apply to version - 2.01 and 2.02 of the PHP license. Ignore for 3.x versions. - -
+- Q. What does the PHP license mean then, in simple words? -
++ For related projects, please refer to licensing information on the Project websites: +
+ +- A. (Note: This answer should in no way be taken to replace - the PHP license, it is intended to give you a general impression - of what the license means.) Essentially, the PHP license gives you - the right to use, distribute and modify PHP as much as you want, - for both commercial and non-commercial use. You just have to make - it clear to the user that what you have distributed contains PHP. -
+ - Q. The Zend license says I may not charge money for stuff - I sell along with Zend. Does that mean I cannot sell PHP scripts - or web sites that I build? - - -- A. No. Not at all. This clause only - concerns software built around the Zend scripting engine library, - not scripts that PHP executes, using that library. You are free - to distribute PHP source code you write freely or commercially, - without any concern about the PHP or Zend licenses. You may also - package PHP as a whole with your commercial applications as much - as you want. You just can't build commercial applications that use - the Zend scripting engine library directly. -
- -- Q. So, what's the point of the Zend license? - When should I be concerned about it? -
- -- A. You should be aware of the Zend license in two cases. - First, if you publish patches to the Zend scripting engine library. - The Zend license allows Zend Technologies, Ltd. to use those - patches royalty-free (see the license for exact details). Second, - the license prevents commercial use of the Zend scripting engine - library to build commercial applications. If you want to use the - Zend scripting engine library commercially (for example, as a macro - language in a commercial word processor you're writing), you must - contact Zend Technologies, - Ltd. for licensing information. -
- -- Q. Where can I get more information on the QPL? -
- -- A. The authors of the QPL, Troll Tech AS, - have published an annotated version of the license which - makes it easier to understand. You can view it online here. -
- -- Q. You suck! I'm going to take the last version of PHP 3 - that was distributed under the GPL and fork! How would you like - that? -
- -- A. With fries. -
- -