Merge branch 'master' into subscription

* master: (175 commits)
  some coding style improvements
  added .idea project folder to gitignore
  use correct setUp method and parent calls.
  Correct German plugin manager translation (download != install)
  correct return in sendDigest()
  Fix case-insensitive match in ACL checking
  GeSHi update to 1.0.8.11
  ignore empty header on mail sending
  remove empty BCC/CC mail headers
  Galician language update
  some welcome page changes
  Combine subsequent calls to strtr into a single transformation
  changed semicolon to colon in link to welcome page to make it less confusing
  fixed wrong sidebar showing in namespaces when sidebar is disabled
  Typo fix for TL;DR
  removed a bunch of outdated and irrelevant networking acronyms
  added another place to look for logo to make it more consistent (FS#2656)
  French language update
  Czech language update
  compat js findPosX/y more closely mimic historical function
  ...

Conflicts:
	inc/auth.php
	inc/common.php
	inc/subscription.php
	lib/exe/indexer.php

1 files changed, 12 insertions, 7 deletions

diff --git a/lib/plugins/plugin/classes/ap_manage.class.php b/lib/plugins/plugin/classes/ap_manage.class.php
index 12480e922..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) {
@@ -141,9 +140,18 @@ class ap_manage {
                 break;
 
             case 'update' :
+                $url = $data[0];
                 $date = date('r');
-                if (!$fp = @fopen($file, 'a')) return;
-                fwrite($fp, "updated=$date\n");
+                if (!$fp = @fopen($file, 'r+')) return;
+                $buffer = "";
+                while (($line = fgets($fp)) !== false) {
+                    $urlFound = strpos($line,"url");
+                    if($urlFound !== false) $line="url=$url\n";
+                    $buffer .= $line;
+                }
+                $buffer .= "updated=$date\n";
+                fseek($fp, 0);
+                fwrite($fp, $buffer);
                 fclose($fp);
                 break;
         }
@@ -186,11 +194,8 @@ class ap_manage {
 
             closedir($dh);
             return @rmdir($path);
-        } else {
-            return @unlink($path);
         }
-
-        return false;
+        return @unlink($path);
     }