Added license chooser to installer FS#1926

This adds a license chooser to the installer. The installer defaults to
the more free CC-BY-SA. CC-NC-BY-SA is still the default in dokuwiki.php
to keep backwards compatibility.

The license array was reordered and Non-Derivative licenses removed
(they don't make much sense for wiki content).

1 files changed, 16 insertions, 24 deletions

diff --git a/conf/license.php b/conf/license.php
index b97cb3cfd..89728ab57 100644
--- a/conf/license.php
+++ b/conf/license.php
@@ -5,30 +5,6 @@
  * license.local.php instead.
  */
 
-$license['cc-by'] = array(
-    'name' => 'CC Attribution 3.0 Unported',
-    'url'  => 'http://creativecommons.org/licenses/by/3.0/',
-);
-$license['cc-by-nc'] = array(
-    'name' => 'CC Attribution-Noncommercial 3.0 Unported',
-    'url'  => 'http://creativecommons.org/licenses/by-nc/3.0/',
-);
-$license['cc-by-nc-nd'] = array(
-    'name' => 'CC Attribution-Noncommercial-No Derivative Works 3.0 Unported',
-    'url'  => 'http://creativecommons.org/licenses/by-nc-nd/3.0/',
-);
-$license['cc-by-nc-sa'] = array(
-    'name' => 'CC Attribution-Noncommercial-Share Alike 3.0 Unported',
-    'url'  => 'http://creativecommons.org/licenses/by-nc-sa/3.0/',
-);
-$license['cc-by-nd'] = array(
-    'name' => 'CC Attribution-No Derivative Works 3.0 Unported',
-    'url'  => 'http://creativecommons.org/licenses/by-nd/3.0/',
-);
-$license['cc-by-sa'] = array(
-    'name' => 'CC Attribution-Share Alike 3.0 Unported',
-    'url'  => 'http://creativecommons.org/licenses/by-sa/3.0/',
-);
 $license['cc-zero'] = array(
     'name' => 'CC0 1.0 Universal',
     'url'  => 'http://creativecommons.org/publicdomain/zero/1.0/',
@@ -37,8 +13,24 @@ $license['publicdomain'] = array(
     'name' => 'Public Domain',
     'url'  => 'http://creativecommons.org/licenses/publicdomain/',
 );
+$license['cc-by'] = array(
+    'name' => 'CC Attribution 3.0 Unported',
+    'url'  => 'http://creativecommons.org/licenses/by/3.0/',
+);
+$license['cc-by-sa'] = array(
+    'name' => 'CC Attribution-Share Alike 3.0 Unported',
+    'url'  => 'http://creativecommons.org/licenses/by-sa/3.0/',
+);
 $license['gnufdl'] = array(
     'name' => 'GNU Free Documentation License 1.3',
     'url'  => 'http://www.gnu.org/licenses/fdl-1.3.html',
 );
+$license['cc-by-nc'] = array(
+    'name' => 'CC Attribution-Noncommercial 3.0 Unported',
+    'url'  => 'http://creativecommons.org/licenses/by-nc/3.0/',
+);
+$license['cc-by-nc-sa'] = array(
+    'name' => 'CC Attribution-Noncommercial-Share Alike 3.0 Unported',
+    'url'  => 'http://creativecommons.org/licenses/by-nc-sa/3.0/',
+);