From 6709605ca4712d669ec9b82eb50a2781aa8d2b38 Mon Sep 17 00:00:00 2001 From: Eliot Whalan Date: Sun, 19 Jun 2016 18:01:24 +1000 Subject: UploadException: Correct license header to CC BY 3.0+ The PHP license only applies to the PHP software itself. The choice to use the PHP license for this was just a best guess for the license, and a questionable move. With further investigation, the PHP manuals are licensed under the free Creative Commons Attribution 3.0 license or later. It doesn't say which version of that license, so I will assume unported. This fixes copyright licensing issues with UploadException. See: https://secure.php.net/manual/en/copyright.php Credit to Juuso Lapinlampi for this patch. --- php/classes/UploadException.class.php | 77 +++++------------------------------ 1 file changed, 10 insertions(+), 67 deletions(-) (limited to 'php/classes') diff --git a/php/classes/UploadException.class.php b/php/classes/UploadException.class.php index 7740ee6..8c9e4f6 100755 --- a/php/classes/UploadException.class.php +++ b/php/classes/UploadException.class.php @@ -5,77 +5,20 @@ * * @author Dan Brown * @author Michiel Thalen - * @copyright - * -------------------------------------------------------------------- - * The PHP License, version 3.01 - * Copyright (c) 1999 - 2014 The PHP Group. All rights reserved. - * -------------------------------------------------------------------- + * @copyright Copyright © 1997 - 2016 by the PHP Documentation Group + * @license + * UploadException is licensed under a Creative Commons Attribution 3.0 License + * or later. * - * Redistribution and use in source and binary forms, with or without - * modification, is permitted provided that the following conditions - * are met: + * Based on a work at + * https://secure.php.net/manual/en/features.file-upload.errors.php#89374. * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The name "PHP" must not be used to endorse or promote products - * derived from this software without prior written permission. For - * written permission, please contact group@php.net. - * - * 4. Products derived from this software may not be called "PHP", nor - * may "PHP" appear in their name, without prior written permission - * from group@php.net. You may indicate that your software works in - * conjunction with PHP by saying "Foo for PHP" instead of calling - * it "PHP Foo" or "phpfoo" - * - * 5. The PHP Group may publish revised and/or new versions of the - * license from time to time. Each version will be given a - * distinguishing version number. - * Once covered code has been published under a particular version - * of the license, you may always continue to use it under the terms - * of that version. You may also choose to use such covered code - * under the terms of any subsequent version of the license - * published by the PHP Group. No one other than the PHP Group has - * the right to modify the terms applicable to covered code created - * under this License. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes PHP software, freely available from - * ". - * - * THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND - * ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP - * DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * - * -------------------------------------------------------------------- - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the PHP Group. - * - * The PHP Group can be contacted via Email at group@php.net. - * - * For more information on the PHP Group and the PHP project, - * please see . - * - * PHP includes the Zend Engine, freely available at - * . + * You should have received a copy of the Creative Commons Attribution 3.0 + * License with this program. If not, see + * . */ + class UploadException extends Exception { public function __construct($code) -- cgit v1.2.3