summaryrefslogtreecommitdiff
path: root/inc/plugincontroller.class.php
diff options
context:
space:
mode:
Diffstat (limited to 'inc/plugincontroller.class.php')
-rw-r--r--inc/plugincontroller.class.php28
1 files changed, 14 insertions, 14 deletions
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index f8ba58563..8d20f885d 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -177,7 +177,7 @@ class Doku_Plugin_Controller {
// disabling mechanism was changed back very soon again
// to keep everything simple we just skip the plugin completely
continue;
- } elseif (@file_exists(DOKU_PLUGIN.$plugin.'/disabled')) {
+ } elseif (file_exists(DOKU_PLUGIN.$plugin.'/disabled')) {
/**
* treat this as a default disabled plugin(over-rideable by the plugin manager)
* @deprecated 2011-09-10 (usage of disabled files)
@@ -247,9 +247,9 @@ class Doku_Plugin_Controller {
$out .= "\$plugins['$plugin'] = $value;\n";
}
// backup current file (remove any existing backup)
- if (@file_exists($file)) {
+ if (file_exists($file)) {
$backup = $file.'.bak';
- if (@file_exists($backup)) @unlink($backup);
+ if (file_exists($backup)) @unlink($backup);
if (!@copy($file,$backup)) return false;
if (!empty($conf['fperm'])) chmod($backup, $conf['fperm']);
}
@@ -282,7 +282,7 @@ class Doku_Plugin_Controller {
/**
* Build the list of plugins and cascade
- *
+ *
*/
protected function loadConfig() {
global $config_cascade;
@@ -310,28 +310,28 @@ class Doku_Plugin_Controller {
protected function _getListByType($type, $enabled) {
$master_list = $enabled ? array_keys(array_filter($this->tmp_plugins)) : array_keys(array_filter($this->tmp_plugins,array($this,'negate')));
$plugins = array();
-
+
foreach ($master_list as $plugin) {
-
- $dir = $this->get_directory($plugin);
- if (@file_exists(DOKU_PLUGIN."$dir/$type.php")){
+
+ $basedir = $this->get_directory($plugin);
+ if (file_exists(DOKU_PLUGIN."$basedir/$type.php")){
$plugins[] = $plugin;
continue;
}
-
- $dir2 = DOKU_PLUGIN."$dir/$type/";
- if (is_dir($dir2)) {
- if ($dp = opendir($dir2)) {
+
+ $typedir = DOKU_PLUGIN."$basedir/$type/";
+ if (is_dir($typedir)) {
+ if ($dp = opendir($typedir)) {
while (false !== ($component = readdir($dp))) {
if (substr($component,0,1) == '.' || strtolower(substr($component, -4)) != ".php") continue;
- if (is_file($dir2.$component)) {
+ if (is_file($typedir.$component)) {
$plugins[] = $plugin.'_'.substr($component, 0, -4);
}
}
closedir($dp);
}
}
-
+
}//foreach
return $plugins;