From b1730bd21bd9ce8807b80c4cfb044858c7af60d8 Mon Sep 17 00:00:00 2001
From: Tom N Harris <tnharris@whoopdedo.org>
Date: Tue, 17 Jul 2012 19:45:48 -0400
Subject: Translatable string for "None" license selection

The position of the option was moved to the end of the list so
the English label "None of the above" will make sense.
---
 install.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'install.php')

diff --git a/install.php b/install.php
index 488cf58ab..07e0451ea 100644
--- a/install.php
+++ b/install.php
@@ -210,12 +210,12 @@ function print_form($d){
         <fieldset>
             <p><?php echo $lang['i_license']?></p>
             <?php
-            array_unshift($license,array('name' => 'None', 'url'=>''));
+            array_push($license,array('name' => $lang['i_license_none'], 'url'=>''));
             if(empty($d['license'])) $d['license'] = 'cc-by-sa';
             foreach($license as $key => $lic){
                 echo '<label for="lic_'.$key.'">';
                 echo '<input type="radio" name="d[license]" value="'.htmlspecialchars($key).'" id="lic_'.$key.'"'.
-                     (($d['license'] == $key)?' checked="checked"':'').'>';
+                     (($d['license'] === $key)?' checked="checked"':'').'>';
                 echo htmlspecialchars($lic['name']);
                 if($lic['url']) echo ' <a href="'.$lic['url'].'" target="_blank"><sup>[?]</sup></a>';
                 echo '</label>';
-- 
cgit v1.2.3


From 3a0852d932a09ba01dcbcf2d371febf451f9f00c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 7 Dec 2012 17:46:16 +0100
Subject: added option to enable automatic popularity data in installer

---
 install.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'install.php')

diff --git a/install.php b/install.php
index f2bc1a26d..8f00d9746 100644
--- a/install.php
+++ b/install.php
@@ -167,6 +167,7 @@ function print_form($d){
     $d = array_map('htmlspecialchars',$d);
 
     if(!isset($d['acl'])) $d['acl']=1;
+    if(!isset($d['pop'])) $d['pop']=1;
 
     ?>
     <form action="" method="post">
@@ -223,6 +224,14 @@ function print_form($d){
             ?>
         </fieldset>
 
+        <fieldset>
+            <p><?php echo $lang['i_pop_field']?></p>
+            <label for="pop">
+                <input type="checkbox" name="d[pop]" id="pop" <?php echo(($d['pop'] ? ' checked="checked"' : ''));?> />
+                <?php echo $lang['i_pop_label']?> <a href="http://www.dokuwiki.org/plugin:popularity" target="_blank"><sup>[?]</sup></a>
+            </label>
+        </fieldset>
+
     </fieldset>
     <fieldset id="process">
         <input class="button" type="submit" name="submit" value="<?php echo $lang['btn_save']?>" />
@@ -376,6 +385,12 @@ EOT;
         }
         $ok = $ok && fileWrite(DOKU_LOCAL.'acl.auth.php', $output);
     }
+
+    // enable popularity submission
+    if($d['pop']){
+        @touch(DOKU_INC.'data/cache/autosubmit.txt');
+    }
+
     return $ok;
 }
 
-- 
cgit v1.2.3


From e93f702b5fe5b7ec5a39c1a080669c8a4eb7d965 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 16 Dec 2012 20:25:46 +0100
Subject: changed popularity link

---
 install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'install.php')

diff --git a/install.php b/install.php
index 8f00d9746..f54c25207 100644
--- a/install.php
+++ b/install.php
@@ -228,7 +228,7 @@ function print_form($d){
             <p><?php echo $lang['i_pop_field']?></p>
             <label for="pop">
                 <input type="checkbox" name="d[pop]" id="pop" <?php echo(($d['pop'] ? ' checked="checked"' : ''));?> />
-                <?php echo $lang['i_pop_label']?> <a href="http://www.dokuwiki.org/plugin:popularity" target="_blank"><sup>[?]</sup></a>
+                <?php echo $lang['i_pop_label']?> <a href="http://www.dokuwiki.org/popularity" target="_blank"><sup>[?]</sup></a>
             </label>
         </fieldset>
 
-- 
cgit v1.2.3