fixed some missing config_cascade occurrences (FS#2235)

3 files changed, 40 insertions, 37 deletions

diff --git a/inc/infoutils.php b/inc/infoutils.php
index ab9fe47ad..786661d01 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -176,7 +176,8 @@ function check(){
     }
 
     if($conf['authtype'] == 'plain'){
-        if(is_writable(DOKU_CONF.'users.auth.php')){
+        global $config_cascade;
+        if(is_writable($config_cascade['plainauth.users']['default'])){
             msg('conf/users.auth.php is writable',1);
         }else{
             msg('conf/users.auth.php is not writable',0);
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 5f376ee24..b2ae3f7fe 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -188,9 +188,11 @@ function js_cacheok($cache,$files){
     $ctime = @filemtime($cache);
     if(!$ctime) return false; //There is no cache
 
+    global $config_cascade;
+
     // some additional files to check
     $files = array_merge($files, getConfigFiles('main'));
-    $files[] = DOKU_CONF.'userscript.js';
+    $files[] = $config_cascade['userscript']['default'];
     $files[] = __FILE__;
 
     // now walk the files
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index c8b7b1e6e..ea4184ca3 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -72,7 +72,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         global $config_cascade;
 
         // fresh 1:1 copy without replacements
-        $AUTH_ACL = file(DOKU_CONF.'acl.auth.php');
+        $AUTH_ACL = file($config_cascade['acl']['default']);
 
 
         // namespace given?
@@ -711,7 +711,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
 
         $new_config = $acl_config.$new_acl;
 
-        return io_saveFile(DOKU_CONF.'acl.auth.php', $new_config);
+        return io_saveFile($config_cascade['acl']['default'], $new_config);
     }
 
     /**
@@ -729,7 +729,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         // save all non!-matching
         $new_config = preg_grep("/$acl_pattern/", $acl_config, PREG_GREP_INVERT);
 
-        return io_saveFile(DOKU_CONF.'acl.auth.php', join('',$new_config));
+        return io_saveFile($config_cascade['acl']['default'], join('',$new_config));
     }
 
     /**
@@ -801,40 +801,40 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         echo '  <option value="__g__" class="aclgroup"'.$gsel.'>'.$this->getLang('acl_group').':</option>'.NL;
         echo '  <option value="__u__"  class="acluser"'.$usel.'>'.$this->getLang('acl_user').':</option>'.NL;
         if (!empty($this->specials)) {
-	        echo '  <optgroup label="&nbsp;">'.NL;
-	        foreach($this->specials as $ug){
-	            if($ug == $this->who){
-	                $sel    = ' selected="selected"';
-	                $inlist = true;
-	            }else{
-	                $sel = '';
-	            }
-
-	            if($ug{0} == '@'){
-	                    echo '  <option value="'.hsc($ug).'" class="aclgroup"'.$sel.'>'.hsc($ug).'</option>'.NL;
-	            }else{
-	                    echo '  <option value="'.hsc($ug).'" class="acluser"'.$sel.'>'.hsc($ug).'</option>'.NL;
-	            }
-	        }
-	        echo '  </optgroup>'.NL;
+            echo '  <optgroup label="&nbsp;">'.NL;
+            foreach($this->specials as $ug){
+                if($ug == $this->who){
+                    $sel    = ' selected="selected"';
+                    $inlist = true;
+                }else{
+                    $sel = '';
+                }
+
+                if($ug{0} == '@'){
+                        echo '  <option value="'.hsc($ug).'" class="aclgroup"'.$sel.'>'.hsc($ug).'</option>'.NL;
+                }else{
+                        echo '  <option value="'.hsc($ug).'" class="acluser"'.$sel.'>'.hsc($ug).'</option>'.NL;
+                }
+            }
+            echo '  </optgroup>'.NL;
         }
         if (!empty($this->usersgroups)) {
-	        echo '  <optgroup label="&nbsp;">'.NL;
-	        foreach($this->usersgroups as $ug){
-	            if($ug == $this->who){
-	                $sel    = ' selected="selected"';
-	                $inlist = true;
-	            }else{
-	                $sel = '';
-	            }
-
-	            if($ug{0} == '@'){
-	                    echo '  <option value="'.hsc($ug).'" class="aclgroup"'.$sel.'>'.hsc($ug).'</option>'.NL;
-	            }else{
-	                    echo '  <option value="'.hsc($ug).'" class="acluser"'.$sel.'>'.hsc($ug).'</option>'.NL;
-	            }
-	        }
-	        echo '  </optgroup>'.NL;
+            echo '  <optgroup label="&nbsp;">'.NL;
+            foreach($this->usersgroups as $ug){
+                if($ug == $this->who){
+                    $sel    = ' selected="selected"';
+                    $inlist = true;
+                }else{
+                    $sel = '';
+                }
+
+                if($ug{0} == '@'){
+                        echo '  <option value="'.hsc($ug).'" class="aclgroup"'.$sel.'>'.hsc($ug).'</option>'.NL;
+                }else{
+                        echo '  <option value="'.hsc($ug).'" class="acluser"'.$sel.'>'.hsc($ug).'</option>'.NL;
+                }
+            }
+            echo '  </optgroup>'.NL;
         }
         echo '</select>'.NL;
         return $inlist;