Permalink
Browse files

adding new license file (OSL 3.0) and updating readme to ReST

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...
1 parent fbc4c5d commit f4a4bd8fac188ebc9cda822ffc811c218fd92b45 @derekjones derekjones committed Oct 20, 2011
Showing with 4,014 additions and 692 deletions.
  1. +26 −0 application/config/autoload.php
  2. +25 −0 application/config/config.php
  3. +25 −0 application/config/constants.php
  4. +25 −0 application/config/database.php
  5. +26 −1 application/config/doctypes.php
  6. +26 −0 application/config/foreign_chars.php
  7. +26 −0 application/config/hooks.php
  8. +27 −1 application/config/migration.php
  9. +26 −0 application/config/mimes.php
  10. +26 −0 application/config/profiler.php
  11. +26 −0 application/config/routes.php
  12. +26 −0 application/config/smileys.php
  13. +26 −0 application/config/user_agents.php
  14. +26 −1 application/controllers/welcome.php
  15. +28 −0 application/errors/error_404.php
  16. +28 −0 application/errors/error_db.php
  17. +28 −0 application/errors/error_general.php
  18. +28 −0 application/errors/error_php.php
  19. +28 −0 application/views/welcome_message.php
  20. +25 −0 index.php
  21. +245 −0 license.rst
  22. +172 −51 license.txt
  23. +245 −0 license_afl.rst
  24. +172 −0 license_afl.txt
  25. +0 −99 readme.md
  26. +196 −0 readme.rst
  27. +16 −4 system/core/Benchmark.php
  28. +17 −5 system/core/CodeIgniter.php
  29. +16 −4 system/core/Common.php
  30. +16 −4 system/core/Config.php
  31. +16 −4 system/core/Controller.php
  32. +16 −4 system/core/Exceptions.php
  33. +16 −4 system/core/Hooks.php
  34. +16 −4 system/core/Input.php
  35. +16 −4 system/core/Lang.php
  36. +16 −4 system/core/Loader.php
  37. +16 −4 system/core/Model.php
  38. +16 −4 system/core/Output.php
  39. +16 −4 system/core/Router.php
  40. +16 −4 system/core/Security.php
  41. +16 −4 system/core/URI.php
  42. +16 −4 system/core/Utf8.php
  43. +16 −4 system/database/DB.php
  44. +16 −4 system/database/DB_active_rec.php
  45. +16 −4 system/database/DB_cache.php
  46. +16 −4 system/database/DB_driver.php
  47. +17 −5 system/database/DB_forge.php
  48. +16 −4 system/database/DB_result.php
  49. +17 −5 system/database/DB_utility.php
  50. +16 −4 system/database/drivers/cubrid/cubrid_driver.php
  51. +16 −4 system/database/drivers/cubrid/cubrid_forge.php
  52. +16 −4 system/database/drivers/cubrid/cubrid_result.php
  53. +16 −4 system/database/drivers/cubrid/cubrid_utility.php
  54. +16 −4 system/database/drivers/mssql/mssql_driver.php
  55. +16 −4 system/database/drivers/mssql/mssql_forge.php
  56. +16 −4 system/database/drivers/mssql/mssql_result.php
  57. +16 −4 system/database/drivers/mssql/mssql_utility.php
  58. +16 −4 system/database/drivers/mysql/mysql_driver.php
  59. +16 −4 system/database/drivers/mysql/mysql_forge.php
  60. +16 −4 system/database/drivers/mysql/mysql_result.php
  61. +16 −4 system/database/drivers/mysql/mysql_utility.php
  62. +16 −4 system/database/drivers/mysqli/mysqli_driver.php
  63. +16 −4 system/database/drivers/mysqli/mysqli_forge.php
  64. +16 −4 system/database/drivers/mysqli/mysqli_result.php
  65. +16 −4 system/database/drivers/mysqli/mysqli_utility.php
  66. +16 −4 system/database/drivers/oci8/oci8_driver.php
  67. +16 −4 system/database/drivers/oci8/oci8_forge.php
  68. +16 −4 system/database/drivers/oci8/oci8_result.php
  69. +16 −4 system/database/drivers/oci8/oci8_utility.php
  70. +16 −4 system/database/drivers/odbc/odbc_driver.php
  71. +16 −4 system/database/drivers/odbc/odbc_forge.php
  72. +16 −4 system/database/drivers/odbc/odbc_result.php
  73. +16 −4 system/database/drivers/odbc/odbc_utility.php
  74. +16 −4 system/database/drivers/pdo/pdo_driver.php
  75. +16 −4 system/database/drivers/pdo/pdo_forge.php
  76. +16 −4 system/database/drivers/pdo/pdo_result.php
  77. +16 −4 system/database/drivers/pdo/pdo_utility.php
  78. +16 −4 system/database/drivers/postgre/postgre_driver.php
  79. +16 −4 system/database/drivers/postgre/postgre_forge.php
  80. +16 −4 system/database/drivers/postgre/postgre_result.php
  81. +16 −4 system/database/drivers/postgre/postgre_utility.php
  82. +16 −4 system/database/drivers/sqlite/sqlite_driver.php
  83. +16 −4 system/database/drivers/sqlite/sqlite_forge.php
  84. +16 −4 system/database/drivers/sqlite/sqlite_result.php
  85. +16 −4 system/database/drivers/sqlite/sqlite_utility.php
  86. +16 −4 system/database/drivers/sqlsrv/sqlsrv_driver.php
  87. +16 −4 system/database/drivers/sqlsrv/sqlsrv_forge.php
  88. +16 −4 system/database/drivers/sqlsrv/sqlsrv_result.php
  89. +16 −4 system/database/drivers/sqlsrv/sqlsrv_utility.php
  90. +16 −4 system/helpers/array_helper.php
  91. +16 −4 system/helpers/captcha_helper.php
  92. +16 −4 system/helpers/cookie_helper.php
  93. +16 −4 system/helpers/date_helper.php
  94. +16 −4 system/helpers/directory_helper.php
  95. +16 −4 system/helpers/download_helper.php
  96. +16 −4 system/helpers/email_helper.php
  97. +16 −4 system/helpers/file_helper.php
  98. +16 −4 system/helpers/form_helper.php
  99. +16 −4 system/helpers/html_helper.php
  100. +16 −4 system/helpers/inflector_helper.php
  101. +16 −4 system/helpers/language_helper.php
  102. +16 −4 system/helpers/number_helper.php
  103. +16 −4 system/helpers/path_helper.php
  104. +16 −4 system/helpers/security_helper.php
  105. +16 −4 system/helpers/smiley_helper.php
  106. +16 −4 system/helpers/string_helper.php
  107. +16 −4 system/helpers/text_helper.php
  108. +16 −4 system/helpers/typography_helper.php
  109. +16 −4 system/helpers/url_helper.php
  110. +16 −4 system/helpers/xml_helper.php
  111. +25 −0 system/language/english/calendar_lang.php
  112. +25 −0 system/language/english/date_lang.php
  113. +25 −0 system/language/english/db_lang.php
  114. +25 −0 system/language/english/email_lang.php
  115. +25 −0 system/language/english/form_validation_lang.php
  116. +25 −0 system/language/english/ftp_lang.php
  117. +25 −0 system/language/english/imglib_lang.php
  118. +25 −0 system/language/english/migration_lang.php
  119. +25 −0 system/language/english/number_lang.php
  120. +25 −0 system/language/english/profiler_lang.php
  121. +25 −0 system/language/english/unit_test_lang.php
  122. +25 −0 system/language/english/upload_lang.php
  123. +17 −5 system/libraries/Cache/Cache.php
  124. +16 −4 system/libraries/Cache/drivers/Cache_apc.php
  125. +17 −5 system/libraries/Cache/drivers/Cache_dummy.php
  126. +17 −5 system/libraries/Cache/drivers/Cache_file.php
  127. +17 −5 system/libraries/Cache/drivers/Cache_memcached.php
  128. +16 −4 system/libraries/Calendar.php
  129. +16 −4 system/libraries/Cart.php
  130. +14 −2 system/libraries/Driver.php
  131. +16 −4 system/libraries/Email.php
  132. +16 −4 system/libraries/Encrypt.php
  133. +16 −4 system/libraries/Form_validation.php
  134. +16 −4 system/libraries/Ftp.php
  135. +16 −4 system/libraries/Image_lib.php
  136. +16 −4 system/libraries/Javascript.php
  137. +16 −4 system/libraries/Log.php
  138. +16 −4 system/libraries/Migration.php
  139. +16 −4 system/libraries/Pagination.php
  140. +16 −4 system/libraries/Parser.php
  141. +16 −4 system/libraries/Profiler.php
  142. +16 −4 system/libraries/Session.php
  143. +16 −4 system/libraries/Sha1.php
  144. +16 −4 system/libraries/Table.php
  145. +16 −4 system/libraries/Trackback.php
  146. +16 −4 system/libraries/Typography.php
  147. +16 −4 system/libraries/Unit_test.php
  148. +16 −4 system/libraries/Upload.php
  149. +16 −4 system/libraries/User_agent.php
  150. +20 −8 system/libraries/Xmlrpc.php
  151. +16 −4 system/libraries/Xmlrpcs.php
  152. +16 −4 system/libraries/Zip.php
  153. +21 −8 system/libraries/javascript/Jquery.php
  154. +22 −0 user_guide_src/cilexer/cilexer/cilexer.py
  155. +1 −1 user_guide_src/source/_themes/eldocs/layout.html
  156. +22 −0 user_guide_src/source/_themes/eldocs/static/asset/css/common.css
  157. +11 −1 user_guide_src/source/changelog.rst
  158. +2 −2 user_guide_src/source/conf.py
  159. +245 −62 user_guide_src/source/license.rst
@@ -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
@kenjis
kenjis Oct 21, 2011

Academic Free License (AFL 3.0) ?

@derekjones
derekjones Oct 21, 2011

For files we distribute in the application folder, yes. Please see the comments at the bottom. :-D

@kenjis
kenjis Oct 21, 2011

What do you mean?

I mean, is the line like this?

This source file is subject to the Academic Free License (AFL 3.0) that is

+ * 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
@@ -1,4 +1,29 @@
<?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
+ * 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
+ */
/*
|--------------------------------------------------------------------------
@@ -1,4 +1,29 @@
<?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
+ * 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
+ */
/*
|--------------------------------------------------------------------------
@@ -1,4 +1,29 @@
<?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
+ * 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
+ */
/*
| -------------------------------------------------------------------
| DATABASE CONNECTIVITY SETTINGS
@@ -1,4 +1,29 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?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
+ * 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
+ */
$_doctypes = array(
'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
@@ -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
+ * 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
+ */
+
/*
| -------------------------------------------------------------------
| Foreign Characters
@@ -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
+ * 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
+ */
+
/*
| -------------------------------------------------------------------------
| Hooks
@@ -1,4 +1,30 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?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
+ * 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
+ */
+
/*
|--------------------------------------------------------------------------
| Enable/Disable Migrations
@@ -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
+ * 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
+ */
+
/*
| -------------------------------------------------------------------
| MIME TYPES
@@ -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
+ * 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
+ */
+
/*
| -------------------------------------------------------------------------
| Profiler Sections
@@ -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
+ * 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
+ */
+
/*
| -------------------------------------------------------------------------
| URI ROUTING
@@ -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
+ * 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
+ */
+
/*
| -------------------------------------------------------------------
| SMILEYS
Oops, something went wrong. Retry.

7 comments on commit f4a4bd8

@rhcom
rhcom commented on f4a4bd8 Oct 21, 2011

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.

@derekjones

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

@rhcom
rhcom commented on f4a4bd8 Oct 21, 2011

thanks derek for clarification … didn't understand the diff before.

@daylerees

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 :)

@rhcom
rhcom commented on f4a4bd8 Oct 21, 2011

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. :-)

@derekjones

@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.

@daylerees

@derekjones great :) thanks for clearing that up mate!

Please sign in to comment.