From 38479cbba628ee76a92ff5f3c974cfa8e6ce9e61 Mon Sep 17 00:00:00 2001
From: Dominik Eckelmann <deckelmann@gmail.com>
Date: Thu, 29 Nov 2012 16:06:43 +0100
Subject: some coding style improvements

  - removed some dead/unused code
  - fixed phpdoc
  - added typing on methods
---
 lib/plugins/plugin/classes/ap_download.class.php | 4 +---
 lib/plugins/plugin/classes/ap_manage.class.php   | 6 +-----
 lib/plugins/plugin/classes/ap_update.class.php   | 2 --
 3 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'lib/plugins/plugin/classes')

diff --git a/lib/plugins/plugin/classes/ap_download.class.php b/lib/plugins/plugin/classes/ap_download.class.php
index 0eb567c80..3cc455867 100644
--- a/lib/plugins/plugin/classes/ap_download.class.php
+++ b/lib/plugins/plugin/classes/ap_download.class.php
@@ -7,7 +7,6 @@ class ap_download extends ap_manage {
      * Initiate the plugin download
      */
     function process() {
-        global $lang;
         global $INPUT;
 
         $plugin_url = $INPUT->str('url');
@@ -45,7 +44,6 @@ class ap_download extends ap_manage {
      * Process the downloaded file
      */
     function download($url, $overwrite=false) {
-        global $lang;
         // check the url
         $matches = array();
         if (!preg_match("/[^\/]*$/", $url, $matches) || !$matches[0]) {
@@ -241,7 +239,7 @@ class ap_download extends ap_manage {
      * if neither bz, gz or zip are recognized, tar is assumed.
      *
      * @author Andreas Gohr <andi@splitbrain.org>
-     * @returns false if the file can't be read, otherwise an "extension"
+     * @returns boolean|string false if the file can't be read, otherwise an "extension"
      */
     function guess_archive($file){
         $fh = fopen($file,'rb');
diff --git a/lib/plugins/plugin/classes/ap_manage.class.php b/lib/plugins/plugin/classes/ap_manage.class.php
index 28579cbe9..3ec740dae 100644
--- a/lib/plugins/plugin/classes/ap_manage.class.php
+++ b/lib/plugins/plugin/classes/ap_manage.class.php
@@ -69,7 +69,6 @@ class ap_manage {
     }
 
     function html_pluginlist() {
-        global $ID;
         global $plugin_protected;
 
         foreach ($this->manager->plugin_list as $plugin) {
@@ -195,11 +194,8 @@ class ap_manage {
 
             closedir($dh);
             return @rmdir($path);
-        } else {
-            return @unlink($path);
         }
-
-        return false;
+        return @unlink($path);
     }
 
 
diff --git a/lib/plugins/plugin/classes/ap_update.class.php b/lib/plugins/plugin/classes/ap_update.class.php
index c43429a1b..5d7f6cb08 100644
--- a/lib/plugins/plugin/classes/ap_update.class.php
+++ b/lib/plugins/plugin/classes/ap_update.class.php
@@ -5,8 +5,6 @@ class ap_update extends ap_download {
     var $overwrite = true;
 
     function process() {
-        global $lang;
-
         $plugin_url = $this->plugin_readlog($this->plugin, 'url');
         $this->download($plugin_url, $this->overwrite);
         return '';
-- 
cgit v1.2.3