diff options
Diffstat (limited to 'lib/plugins')
| -rw-r--r-- | lib/plugins/acl/admin.php | 4 | ||||
| -rw-r--r-- | lib/plugins/acl/style.css | 2 | ||||
| -rw-r--r-- | lib/plugins/config/settings/config.class.php | 2 | ||||
| -rw-r--r-- | lib/plugins/plugin/admin.php | 1 | ||||
| -rw-r--r-- | lib/plugins/plugin/classes/ap_info.class.php | 1 | ||||
| -rw-r--r-- | lib/plugins/popularity/action.php | 1 | ||||
| -rw-r--r-- | lib/plugins/revert/admin.php | 1 | ||||
| -rw-r--r-- | lib/plugins/syntax.php | 4 | ||||
| -rw-r--r-- | lib/plugins/usermanager/admin.php | 1 |
9 files changed, 2 insertions, 15 deletions
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index 50377da81..5ab73670d 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -61,7 +61,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { // fresh 1:1 copy without replacements $AUTH_ACL = file($config_cascade['acl']['default']); - // namespace given? if($INPUT->str('ns') == '*'){ $this->ns = '*'; @@ -386,7 +385,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo '<legend>'.$this->getLang('acl_mod').'</legend>'; } - echo $this->_html_checkboxes($current,empty($this->ns),'acl'); if(is_null($current)){ @@ -686,7 +684,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { if($acl_level > AUTH_EDIT) $acl_level = AUTH_EDIT; } - $new_acl = "$acl_scope\t$acl_user\t$acl_level\n"; $new_config = $acl_config.$new_acl; @@ -775,7 +772,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { $inlist = true; } - echo '<select name="acl_t" class="edit">'.NL; 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; diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css index d8f0b53f3..a53a03450 100644 --- a/lib/plugins/acl/style.css +++ b/lib/plugins/acl/style.css @@ -1,4 +1,3 @@ - #acl__tree { font-size: 90%; width: 25%; @@ -138,4 +137,3 @@ #acl_manager table tr:hover { background-color: __background_alt__; } - diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index 182a4c65f..1d2173706 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -176,12 +176,10 @@ if (!class_exists('configuration')) { for ($i=0; $i<count($matches); $i++) { $value = $matches[$i][2]; - // correct issues with the incoming data // FIXME ... for now merge multi-dimensional array indices using ____ $key = preg_replace('/.\]\[./',CM_KEYMARKER,$matches[$i][1]); - // handle arrays if(preg_match('/^array ?\((.*)\)/', $value, $match)){ $arr = explode(',', $match[1]); diff --git a/lib/plugins/plugin/admin.php b/lib/plugins/plugin/admin.php index 72c58620d..3f019d5e2 100644 --- a/lib/plugins/plugin/admin.php +++ b/lib/plugins/plugin/admin.php @@ -65,7 +65,6 @@ class admin_plugin_plugin extends DokuWiki_Admin_Plugin { // enable direct access to language strings $this->setupLocale(); - $fn = $INPUT->param('fn'); if (is_array($fn)) { $this->cmd = key($fn); diff --git a/lib/plugins/plugin/classes/ap_info.class.php b/lib/plugins/plugin/classes/ap_info.class.php index dfeb52b9d..b3826b944 100644 --- a/lib/plugins/plugin/classes/ap_info.class.php +++ b/lib/plugins/plugin/classes/ap_info.class.php @@ -13,7 +13,6 @@ class ap_info extends ap_manage { $component_list = $this->get_plugin_components($this->manager->plugin); usort($component_list, array($this,'component_sort')); - foreach ($component_list as $component) { if (($obj = &plugin_load($component['type'],$component['name'],false,true)) === null) continue; diff --git a/lib/plugins/popularity/action.php b/lib/plugins/popularity/action.php index f0cbb771b..9e2e78d11 100644 --- a/lib/plugins/popularity/action.php +++ b/lib/plugins/popularity/action.php @@ -35,7 +35,6 @@ class action_plugin_popularity extends Dokuwiki_Action_Plugin { //Actually send it $status = $this->helper->sendData( $this->helper->gatherAsString() ); - if ( $status !== '' ){ //If an error occured, log it io_saveFile( $this->helper->autosubmitErrorFile, $status ); diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php index b65472e4c..423d67449 100644 --- a/lib/plugins/revert/admin.php +++ b/lib/plugins/revert/admin.php @@ -120,7 +120,6 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin { $recents = getRecents(0,$this->max_lines); echo '<ul>'; - $cnt = 0; foreach($recents as $recent){ if($filter){ diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php index 6aa403b61..8df5abb08 100644 --- a/lib/plugins/syntax.php +++ b/lib/plugins/syntax.php @@ -216,12 +216,12 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode { global $conf; // definitely don't invoke "global $lang" $path = DOKU_PLUGIN.$this->getPluginName().'/lang/'; - + $lang = array(); // don't include once, in case several plugin components require the same language file @include($path.'en/lang.php'); if ($conf['lang'] != 'en') @include($path.$conf['lang'].'/lang.php'); - + $this->lang = $lang; $this->localised = true; } diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index 3dba5a86e..266a7dd64 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -342,7 +342,6 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { $autocomp = ''; } - echo "<tr $class>"; echo "<td><label for=\"$id\" >$label: </label></td>"; echo "<td>"; |