Commit
added notice of license to all source files. OSL to all except the few files we ship inside of the application folder, those are AFL. Updated license in user guide. incrementing next dev version to 3.0 due to licensing change
- Loading branch information
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,30 @@ | ||
| <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); | ||
| /** | ||
| * CodeIgniter | ||
| * | ||
| * An open source application development framework for PHP 5.1.6 or newer | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * Licensed under the Academic Free License version 3.0 | ||
| * | ||
| * This source file is subject to the Open Software License (OSL 3.0) that is | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
derekjones
Contributor
|
||
| * bundled with this package in the files license_afl.txt / license_afl.rst. | ||
| * It is also available through the world wide web at this URL: | ||
| * http://opensource.org/licenses/AFL-3.0 | ||
| * If you did not receive a copy of the license and are unable to obtain it | ||
| * through the world wide web, please send an email to | ||
| * licensing@ellislab.com so we can send you a copy immediately. | ||
| * | ||
| * @package CodeIgniter | ||
| * @author EllisLab Dev Team | ||
| * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) | ||
| * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0) | ||
| * @link http://codeigniter.com | ||
| * @since Version 1.0 | ||
| * @filesource | ||
| */ | ||
|
|
||
| /* | ||
| | ------------------------------------------------------------------- | ||
| | AUTO-LOADER | ||
|
|
||
7 comments
on commit f4a4bd8
There was a problem hiding this comment.
I appreciate the license change to free up the forthcoming developments based on CI but currently i'm a little bit confused … where is the difference between OSL and AFL? Thanks in advance.
There was a problem hiding this comment.
OSL = Open Software License 3.0
AFL = Academic Free License 3.0
The Academic Free License is identical to the Open Software License except for the latter portion of section 1(c). The Academic Free License allows distribution of original and derivative works "under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies". We have applied AFL to the files we distribute in the application folder (Welcome controller, error pages, config files) so that changes to those particular files do not burden you with having to make them available as OSL licensed code.
We refer to this in laymen's terms as: The Application folder is yours. Only the CodeIgniter system and ancillary files utilize the generous copyleft OSL license.
Here's a nice FAQ written by the author of both licenses: http://www.rosenlaw.com/OSL3.0-explained.pdf
There was a problem hiding this comment.
thanks derek for clarification … didn't understand the diff before.
There was a problem hiding this comment.
I hope the licensing change to the welcome/error pages you mention aren't related to my previous pull request. It was not my intention to create any hassle :)
There was a problem hiding this comment.
it was a misunderstanding in general (thought OSL and AFL were the same) … i've only realized the license change cause of the commits and was a little bit confused. :-)
There was a problem hiding this comment.
@daylerees - no not at all, the OFL and AFL are not very restrictive licenses, in fact, by licensing these files as AFL, it's actually less restrictive than our proprietary license for changes that you make to these particular files in your own distributions.
There was a problem hiding this comment.
@derekjones great :) thanks for clearing that up mate!
Academic Free License (AFL 3.0) ?