From 20aa97d937a545472ddb376ffdbefeea5aa0c497 Mon Sep 17 00:00:00 2001
From: Myron Turner <turnermm02@shaw.ca>
Date: Sun, 6 Feb 2011 13:45:23 +0100
Subject: Don't delete the contents of symbolically linked directories in the
 plugin manager

This patch makes the plugin manager not descend into symbolically linked
directories as this behaviour is not expected from a recursive delete.
---
 lib/plugins/plugin/classes/ap_manage.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/lib/plugins/plugin/classes/ap_manage.class.php b/lib/plugins/plugin/classes/ap_manage.class.php
index 2982a3ebb..fb148f263 100644
--- a/lib/plugins/plugin/classes/ap_manage.class.php
+++ b/lib/plugins/plugin/classes/ap_manage.class.php
@@ -176,7 +176,7 @@ class ap_manage {
     function dir_delete($path) {
         if (!is_string($path) || $path == "") return false;
 
-        if (is_dir($path)) {
+        if (is_dir($path) && !is_link($path)) {
             if (!$dh = @opendir($path)) return false;
 
             while ($f = readdir($dh)) {
-- 
cgit v1.2.3


From 7cb9f9eefb2ac37005e5cd31b175489157da3e34 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 6 Feb 2011 15:52:54 +0100
Subject: allow reinstall of plugins via plugin manager FS#2120

---
 lib/plugins/plugin/classes/ap_download.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 beba0ab07..784095aaf 100644
--- a/lib/plugins/plugin/classes/ap_download.class.php
+++ b/lib/plugins/plugin/classes/ap_download.class.php
@@ -1,7 +1,7 @@
 <?php
 class ap_download extends ap_manage {
 
-    var $overwrite = false;
+    var $overwrite = true;
 
     /**
      * Initiate the plugin download
-- 
cgit v1.2.3


From f4ca4fedd6f501293173d2ab4b4a730f75d4c467 Mon Sep 17 00:00:00 2001
From: Guy Brand <gb@unistra.fr>
Date: Sat, 16 Apr 2011 15:14:19 +0200
Subject: Removed hard coded strings from plugin manager

---
 lib/plugins/plugin/classes/ap_delete.class.php   | 2 +-
 lib/plugins/plugin/classes/ap_download.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/lib/plugins/plugin/classes/ap_delete.class.php b/lib/plugins/plugin/classes/ap_delete.class.php
index 231147479..581a6295f 100644
--- a/lib/plugins/plugin/classes/ap_delete.class.php
+++ b/lib/plugins/plugin/classes/ap_delete.class.php
@@ -6,7 +6,7 @@ class ap_delete extends ap_manage {
         if (!$this->dir_delete(DOKU_PLUGIN.plugin_directory($this->manager->plugin))) {
             $this->manager->error = sprintf($this->lang['error_delete'],$this->manager->plugin);
         } else {
-            msg("Plugin {$this->manager->plugin} successfully deleted.");
+            msg(sprintf($this->lang['deleted'],$this->plugin));
             $this->refresh();
         }
     }
diff --git a/lib/plugins/plugin/classes/ap_download.class.php b/lib/plugins/plugin/classes/ap_download.class.php
index 784095aaf..e3afd142a 100644
--- a/lib/plugins/plugin/classes/ap_download.class.php
+++ b/lib/plugins/plugin/classes/ap_download.class.php
@@ -114,7 +114,7 @@ class ap_download extends ap_manage {
         if ($tmp) $this->dir_delete($tmp);
 
         if (!$this->manager->error) {
-            msg('Plugin package ('.count($this->downloaded).' plugin'.(count($this->downloaded) != 1?'s':'').': '.join(',',$this->downloaded).') successfully installed.',1);
+            msg(sprintf($this->lang['packageinstalled'], count($this->downloaded), (count($this->downloaded) != 1?'s':''), join(',',$this->downloaded)),1);
             $this->refresh();
             return true;
         }
-- 
cgit v1.2.3