Merge branch 'master' into proxyconnect

* master: (169 commits)
  added PCRE UTF-8 checks to do=check FS#2636
  avoid multiple paralell update checks
  fix regression bug in HTTPClient FS#2621
  changed PAGEUTILS_ID_HIDEPAGE to has BEFORE/AFTER
  TarLib code cleanup
  TarLib: fixed appending in non-dynamic mode
  fixed third method of adding files in TarLib
  fix lone zero block in TarLib created archives
  fix use of constructor in TarLib
  Slovak language update
  Korean language update
  Latvian language update
  added event PAGEUTILS_ID_HIDEPAGE
  added test for isHiddenPage()
  removed redundant variables in tpl_include_page() (because of 3ff8773b)
  added cut off points for mobile devices as parameters to style.ini
  Corrected typo: ruke -> rule
  Persian language update
  Spanish language update
  russian language update
  ...

14 files changed, 46 insertions, 17 deletions

diff --git a/lib/plugins/plugin/classes/ap_download.class.php b/lib/plugins/plugin/classes/ap_download.class.php
index 2d5ead400..d1b518d9d 100644
--- a/lib/plugins/plugin/classes/ap_download.class.php
+++ b/lib/plugins/plugin/classes/ap_download.class.php
@@ -8,8 +8,9 @@ class ap_download extends ap_manage {
      */
     function process() {
         global $lang;
+        global $INPUT;
 
-        $plugin_url = $_REQUEST['url'];
+        $plugin_url = $INPUT->str('url');
         $this->download($plugin_url, $this->overwrite);
         return '';
     }
diff --git a/lib/plugins/plugin/classes/ap_enable.class.php b/lib/plugins/plugin/classes/ap_enable.class.php
index 35450a907..a25c7ede8 100644
--- a/lib/plugins/plugin/classes/ap_enable.class.php
+++ b/lib/plugins/plugin/classes/ap_enable.class.php
@@ -6,9 +6,11 @@ class ap_enable extends ap_manage {
 
     function process() {
         global $plugin_protected;
+        global $INPUT;
+
         $count_enabled = $count_disabled = 0;
 
-        $this->enabled = isset($_REQUEST['enabled']) ? $_REQUEST['enabled'] : array();
+        $this->enabled = $INPUT->arr('enabled');
 
         foreach ($this->manager->plugin_list as $plugin) {
             if (in_array($plugin, $plugin_protected)) continue;
diff --git a/lib/plugins/plugin/classes/ap_manage.class.php b/lib/plugins/plugin/classes/ap_manage.class.php
index 12480e922..28579cbe9 100644
--- a/lib/plugins/plugin/classes/ap_manage.class.php
+++ b/lib/plugins/plugin/classes/ap_manage.class.php
@@ -141,9 +141,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;
         }
diff --git a/lib/plugins/plugin/lang/eo/lang.php b/lib/plugins/plugin/lang/eo/lang.php
index 36e7eadff..67553454c 100644
--- a/lib/plugins/plugin/lang/eo/lang.php
+++ b/lib/plugins/plugin/lang/eo/lang.php
@@ -10,6 +10,7 @@
  * @author Erik Pedersen <erik.pedersen@shaw.ca>
  * @author Robert BOGENSCHNEIDER <robog@gmx.de>
  * @author Robert Bogenschneider <bogi@uea.org>
+ * @author Robert Bogenschneider <robog@gmx.de>
  */
 $lang['menu']                  = 'Administri Kromaĵojn';
 $lang['download']              = 'Elŝuti kaj instali novan kromaĵon';
diff --git a/lib/plugins/plugin/lang/es/lang.php b/lib/plugins/plugin/lang/es/lang.php
index ac548245b..ded7d7369 100644
--- a/lib/plugins/plugin/lang/es/lang.php
+++ b/lib/plugins/plugin/lang/es/lang.php
@@ -22,6 +22,8 @@
  * @author emezeta <emezeta@infoprimo.com>
  * @author Oscar Ciudad <oscar@jacho.net>
  * @author Ruben Figols <ruben.figols@gmail.com>
+ * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
+ * @author Mercè López mercelz@gmail.com
  */
 $lang['menu']                  = 'Administración de Plugins';
 $lang['download']              = 'Descargar e instalar un nuevo plugin';
@@ -65,6 +67,6 @@ $lang['error_copy']            = 'Hubo un error al copiar el fichero mientras se
 $lang['error_delete']          = 'Hubo un error al intentar eliminar el plugin <em>%s</em>. La causa más probable es que no se cuente con los permisos necesarios en el fichero o en el directorio';
 $lang['enabled']               = 'Plugin %s habilitado.';
 $lang['notenabled']            = 'Plugin %s no puede ser habilitado, verifica los permisos del archivo.';
-$lang['disabled']              = 'Plugin %s desabilitado.';
-$lang['notdisabled']           = 'Plugin %s no puede ser desabilitado, verifica los permisos de archivo.';
+$lang['disabled']              = 'Plugin %s deshabilitado.';
+$lang['notdisabled']           = 'Plugin %s no puede ser deshabilitado, verifica los permisos de archivo.';
 $lang['packageinstalled']      = 'Plugin (%d plugin(s): %s) instalado exitosamente.';
diff --git a/lib/plugins/plugin/lang/eu/lang.php b/lib/plugins/plugin/lang/eu/lang.php
index 56c03325f..2fc07fef9 100644
--- a/lib/plugins/plugin/lang/eu/lang.php
+++ b/lib/plugins/plugin/lang/eu/lang.php
@@ -3,6 +3,7 @@
  * Basque language file
  *
  * @author Inko Illarramendi <inko.i.a@gmail.com>
+ * @author Zigor Astarbe <astarbe@gmail.com>
  */
 $lang['menu']                  = 'Plugin-ak Kudeatu';
 $lang['download']              = 'Plugin berri bat deskargatu eta instalatu';
diff --git a/lib/plugins/plugin/lang/fa/lang.php b/lib/plugins/plugin/lang/fa/lang.php
index dbfe9ef9a..bc43ee3ef 100644
--- a/lib/plugins/plugin/lang/fa/lang.php
+++ b/lib/plugins/plugin/lang/fa/lang.php
@@ -8,6 +8,7 @@
  * @author Omid Mottaghi <omidmr@gmail.com>
  * @author Mohammad Reza Shoaei <shoaei@gmail.com>
  * @author Milad DZand <M.DastanZand@gmail.com>
+ * @author AmirH Hassaneini <mytechmix@gmail.com>
  */
 $lang['menu']                  = 'مدیریت افزونه‌ها';
 $lang['download']              = 'دریافت و نصب افزونه';
diff --git a/lib/plugins/plugin/lang/fr/lang.php b/lib/plugins/plugin/lang/fr/lang.php
index bf7a3739a..31d524cc6 100644
--- a/lib/plugins/plugin/lang/fr/lang.php
+++ b/lib/plugins/plugin/lang/fr/lang.php
@@ -18,6 +18,7 @@
  * @author schplurtz@laposte.net
  * @author skimpax@gmail.com
  * @author Yannick Aure <yannick.aure@gmail.com>
+ * @author Olivier DUVAL <zorky00@gmail.com>
  */
 $lang['menu']                  = 'Gestion des modules externes';
 $lang['download']              = 'Télécharger et installer un nouveau module';
diff --git a/lib/plugins/plugin/lang/it/lang.php b/lib/plugins/plugin/lang/it/lang.php
index 3994948a0..9ae55c5de 100644
--- a/lib/plugins/plugin/lang/it/lang.php
+++ b/lib/plugins/plugin/lang/it/lang.php
@@ -14,6 +14,7 @@
  * @author Osman Tekin osman.tekin93@hotmail.it
  * @author Jacopo Corbetta <jacopo.corbetta@gmail.com>
  * @author Matteo Pasotti <matteo@xquiet.eu>
+ * @author snarchio@gmail.com
  */
 $lang['menu']                  = 'Gestione Plugin';
 $lang['download']              = 'Scarica e installa un nuovo plugin';
diff --git a/lib/plugins/plugin/lang/lv/lang.php b/lib/plugins/plugin/lang/lv/lang.php
index 0f6103899..9a8727875 100644
--- a/lib/plugins/plugin/lang/lv/lang.php
+++ b/lib/plugins/plugin/lang/lv/lang.php
@@ -48,3 +48,4 @@ $lang['enabled']               = 'Modulis %s pieslēgts.';
 $lang['notenabled']            = 'Moduli %s nevar pieslēgt, pārbaudi failu tiesības.';
 $lang['disabled']              = 'Modulis %s atslēgts.';
 $lang['notdisabled']           = 'Moduli %s nevar atslēgt, pārbaudi failu tiesības.';
+$lang['packageinstalled']      = 'Moduļu paka (pavisam kopā %d: %s) veiksmīgi uzstādīti.';
diff --git a/lib/plugins/plugin/lang/nl/lang.php b/lib/plugins/plugin/lang/nl/lang.php
index 0599c3184..10db78411 100644
--- a/lib/plugins/plugin/lang/nl/lang.php
+++ b/lib/plugins/plugin/lang/nl/lang.php
@@ -13,6 +13,7 @@
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
  * @author Ricardo Guijt <ricardoguijt@gmail.com>
+ * @author Gerrit <klapinklapin@gmail.com>
  */
 $lang['menu']                  = 'Plugins beheren';
 $lang['download']              = 'Download en installeer een nieuwe plugin';
@@ -58,4 +59,4 @@ $lang['enabled']               = 'Plugin %s ingeschakeld.';
 $lang['notenabled']            = 'Plugin %s kon niet worden ingeschakeld, controleer bestandsrechten.';
 $lang['disabled']              = 'Plugin %s uitgeschakeld.';
 $lang['notdisabled']           = 'Plugin %s kon niet worden uitgeschakeld, controleer bestandsrechten.';
-$lang['packageinstalled']      = 'Plugin package (%d plugin%s: %s) succesvol geïnstalleerd.';
+$lang['packageinstalled']      = 'Plugin package (%d plugin(s): %s) succesvol geïnstalleerd.';
diff --git a/lib/plugins/plugin/lang/zh-tw/lang.php b/lib/plugins/plugin/lang/zh-tw/lang.php
index 54234212d..8fa3efb0a 100644
--- a/lib/plugins/plugin/lang/zh-tw/lang.php
+++ b/lib/plugins/plugin/lang/zh-tw/lang.php
@@ -9,6 +9,7 @@
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin
  * @author Shuo-Ting Jian <shoting@gmail.com>
+ * @author syaoranhinata@gmail.com
  */
 $lang['menu']                  = '管理插件 (Plugins)';
 $lang['download']              = '下載與安裝插件';
@@ -20,8 +21,8 @@ $lang['btn_settings']          = '設定';
 $lang['btn_download']          = '下載';
 $lang['btn_enable']            = '儲存';
 $lang['url']                   = 'URL';
-$lang['installed']             = '安裝:';
-$lang['lastupdate']            = '上次更新:';
+$lang['installed']             = '安裝：';
+$lang['lastupdate']            = '上次更新：';
 $lang['source']                = '來源：';
 $lang['unknown']               = '未知';
 $lang['updating']              = '更新中 ...';
@@ -34,17 +35,17 @@ $lang['downloading']           = '下載中 ...';
 $lang['downloaded']            = '插件 %s 已成功地安裝';
 $lang['downloads']             = '以下的插件已成功地安裝:';
 $lang['download_none']         = '找不到插件，或在下載與安裝時發生了未知的問題';
-$lang['plugin']                = '插件:';
+$lang['plugin']                = '插件：';
 $lang['components']            = '元件';
 $lang['noinfo']                = '此插件沒有回傳任何資訊，可能是無效的';
-$lang['name']                  = '名稱:';
-$lang['date']                  = '日期:';
-$lang['type']                  = '類型:';
-$lang['desc']                  = '描述:';
-$lang['author']                = '作者:';
+$lang['name']                  = '名稱：';
+$lang['date']                  = '日期：';
+$lang['type']                  = '類型：';
+$lang['desc']                  = '描述：';
+$lang['author']                = '作者：';
 $lang['www']                   = '網頁:';
 $lang['error']                 = '一個未知的錯誤發生。';
-$lang['error_download']        = '無法下載插件檔案: %s';
+$lang['error_download']        = '無法下載插件檔案： %s';
 $lang['error_badurl']          = 'URL 可能有問題 - 從 URL 中無法得知文件名';
 $lang['error_dircreate']       = '無法建立暫存目錄來接收下載的內容';
 $lang['error_decompress']      = '插件管理器無法解壓下載的文件。這可能是由於下載出現錯誤，遇到這種情況，請您再次嘗試;或者是壓縮格式無法識別，遇到這種情況，您需要手動下載並安裝該插件。';
diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php
index 58f05fbd9..473d31ead 100644
--- a/lib/plugins/plugin/lang/zh/lang.php
+++ b/lib/plugins/plugin/lang/zh/lang.php
@@ -60,4 +60,4 @@ $lang['enabled']               = '%s 插件启用';
 $lang['notenabled']            = '%s插件启用失败，请检查文件权限。';
 $lang['disabled']              = '%s 插件禁用';
 $lang['notdisabled']           = '%s插件禁用失败，请检查文件权限。';
-$lang['packageinstalled']      = '插件  (%d plugin%s: %s) 已成功安装。';
+$lang['packageinstalled']      = '插件  (%d 插件: %s) 已成功安装。';
diff --git a/lib/plugins/plugin/plugin.info.txt b/lib/plugins/plugin/plugin.info.txt
new file mode 100644
index 000000000..c2f72d998
--- /dev/null
+++ b/lib/plugins/plugin/plugin.info.txt
@@ -0,0 +1,7 @@
+base   plugin
+author Christopher Smith
+email  chris@jalakai.co.uk
+date   2012-09-08
+name   Plugin Manager plugin
+desc   Manage and install plugins
+url    http://www.dokuwiki.org/plugin:plugin