Merge branch 'master' into stable

24 files changed, 60 insertions, 30 deletions

diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php
index a04e98a66..474a09ef9 100644
--- a/lib/plugins/popularity/admin.php
+++ b/lib/plugins/popularity/admin.php
@@ -50,15 +50,17 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
      * handle user request
      */
     function handle() {
+        global $INPUT;
+
         //Send the data
-        if ( isset($_REQUEST['data']) ){
-            $this->sentStatus = $this->helper->sendData( $_REQUEST['data'] );
+        if ( $INPUT->has('data') ){
+            $this->sentStatus = $this->helper->sendData( $INPUT->str('data') );
             if ( $this->sentStatus === '' ){
                 //Update the last time we sent the data
                 touch ( $this->helper->popularityLastSubmitFile );
             }
             //Deal with the autosubmit option
-            $this->_enableAutosubmit( isset($_REQUEST['autosubmit']) );
+            $this->_enableAutosubmit( $INPUT->has('autosubmit') );
         }
     }
 
@@ -78,7 +80,9 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
      * Output HTML form
      */
     function html() {
-        if ( ! isset($_REQUEST['data']) ){
+        global $INPUT;
+
+        if ( ! $INPUT->has('data') ){
             echo $this->locale_xhtml('intro');
 
             //If there was an error the last time we tried to autosubmit, warn the user
@@ -106,7 +110,7 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
                 //If we failed to submit the data, try directly with the browser
                 echo $this->getLang('submissionFailed') . $this->sentStatus . '<br />';
                 echo $this->getLang('submitDirectly');
-                echo $this->buildForm('browser', $_REQUEST['data']);
+                echo $this->buildForm('browser', $INPUT->str('data'));
             }
         }
     }
@@ -135,7 +139,7 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
             $form .= '<label for="autosubmit">'
                 .'<input type="checkbox" name="autosubmit" id="autosubmit" '
                 .($this->helper->isAutosubmitEnabled() ? 'checked' : '' )
-                .'/>' . $this->getLang('autosubmit') .'<br />'
+                .'/> ' . $this->getLang('autosubmit') .'<br />'
                 .'</label>'
                 .'<input type="hidden" name="do" value="admin" />'
                 .'<input type="hidden" name="page" value="popularity" />';
diff --git a/lib/plugins/popularity/lang/cs/lang.php b/lib/plugins/popularity/lang/cs/lang.php
index 287bcf3b0..d7c58af2e 100644
--- a/lib/plugins/popularity/lang/cs/lang.php
+++ b/lib/plugins/popularity/lang/cs/lang.php
@@ -8,6 +8,7 @@
  * @author Lefty <lefty@multihost.cz>
  * @author Vojta Beran <xmamut@email.cz>
  * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com>
  */
 $lang['name']                  = 'Průzkum používání (může chviličku trvat, než se natáhne)';
 $lang['submit']                = 'Odeslat data';
diff --git a/lib/plugins/popularity/lang/da/lang.php b/lib/plugins/popularity/lang/da/lang.php
index 325fd6568..bbf2a1ab4 100644
--- a/lib/plugins/popularity/lang/da/lang.php
+++ b/lib/plugins/popularity/lang/da/lang.php
@@ -9,6 +9,12 @@
  * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
  * @author rasmus@kinnerup.com
  * @author Michael Pedersen subben@gmail.com
+ * @author Mikael Lyngvig <mikael@lyngvig.org>
  */
 $lang['name']                  = 'Tilbagemelding om popularitet (vil måske tage en del tid at indlæse)';
 $lang['submit']                = 'Send data';
+$lang['autosubmit']            = 'Automatisk sende data en gang om måneden';
+$lang['submissionFailed']      = 'Dataene kunne ikke sendes pga. følgende fejl:';
+$lang['submitDirectly']        = 'Du kan sende dataene manuelt ved at sende følgende formular.';
+$lang['autosubmitError']       = 'Den sidste automatiske fremsendelse fejlede pga. følgende fejl:';
+$lang['lastSent']              = 'Dataene er blevet sendt.';
diff --git a/lib/plugins/popularity/lang/da/submitted.txt b/lib/plugins/popularity/lang/da/submitted.txt
new file mode 100644
index 000000000..7d7d5429c
--- /dev/null
+++ b/lib/plugins/popularity/lang/da/submitted.txt
@@ -0,0 +1,3 @@
+====== Popularitetsfeeback ======
+
+Dataene er blevet sendt.
\ No newline at end of file
diff --git a/lib/plugins/popularity/lang/eo/intro.txt b/lib/plugins/popularity/lang/eo/intro.txt
index 8d9b3dde8..fd37efc70 100644
--- a/lib/plugins/popularity/lang/eo/intro.txt
+++ b/lib/plugins/popularity/lang/eo/intro.txt
@@ -1,9 +1,9 @@
 ====== Populareca enketo ======
 
-Tiu ĉi ilo prenas anoniman datenaron pri via vikio kaj ebligas al vi sendi ĝin reen al la kodumantoj de DokuWiki. Tio helpas ke ili komprenu kiel DokuWiki estas uzata kaj certigas ke estontaj disvolviĝaj decidoj estos subtenataj de statistikoj pri reala aplikado.
+Tiu ĉi ilo prenas anoniman datenaron pri via vikio kaj ebligas al vi sendi ĝin reen al la kodumantoj de DokuWiki. Tio helpas al ili kompreni kiel DokuWiki estas uzata kaj certigas ke estontaj disvolviĝaj decidoj estos subtenataj de statistikoj pri reala aplikado.
 
 Ni instigas vin ripeti tiun agon iam kaj tiam por teni la disvolvigantojn informitaj, dum via vikio kreskas. Viaj resendotaj datenaroj estos identigitaj per anonima ID.
 
-La kolektita datenaro enhavas informon pri versio de la instalita DokuWiki, nombro kaj grandeco de la paĝoj kaj dosieroj, instalitaj kromaĵoj kaj informoj pri via PHP-sistemo.
+La kolektita datumaro enhavas informon pri versio de la instalita DokuWiki, nombro kaj grandeco de la paĝoj kaj dosieroj, instalitaj kromaĵoj kaj informoj pri via PHP-sistemo.
 
-La kruda datenaro sendota estas montrita sube. Bonvole uzu la butonon &quot;Sendi datumaron&quot; por transŝuti tiun informaron.
\ No newline at end of file
+La kruda datumaro sendota estas montrita sube. Bonvolu uzi la butonon "Sendi datumaron" por transŝuti tiun informaron.
diff --git a/lib/plugins/popularity/lang/eo/lang.php b/lib/plugins/popularity/lang/eo/lang.php
index e992e12ce..c2bca23b1 100644
--- a/lib/plugins/popularity/lang/eo/lang.php
+++ b/lib/plugins/popularity/lang/eo/lang.php
@@ -7,14 +7,12 @@
  * @author Robert Bogenschneider <robog@gmx.de>
  * @author Erik Pedersen <erik pedersen@shaw.ca>
  * @author Erik Pedersen <erik.pedersen@shaw.ca>
- * @author Robert Bogenschneider <robog@GMX.de>
- * @author Robert BOGENSCHNEIDER <robog@gmx.de>
- * @author Robert BOGENSCHNEIDER <bogi@UEA.org>
+ * @author Robert Bogenschneider <bogi@uea.org>
  */
 $lang['name']                  = 'Populareca enketo (eble la ŝargo prokrastos iomete)';
 $lang['submit']                = 'Sendi datumaron';
 $lang['autosubmit']            = 'Aŭtomate sendi datumaron monate';
-$lang['submissionFailed']      = 'La datumaro ne povis esti sendata pro la jena eraro:';
+$lang['submissionFailed']      = 'La datumaro ne povis esti sendata tial:';
 $lang['submitDirectly']        = 'Vi povas sendi vi mem la datumaron per la sekva informilo.';
-$lang['autosubmitError']       = 'La lasta aŭtomata sendo malsukcesis, pro la jena eraro:';
-$lang['lastSent']              = 'La datumaro estas sendita';
+$lang['autosubmitError']       = 'La lasta aŭtomata sendo malsukcesis, tial:';
+$lang['lastSent']              = 'La datumaro sendiĝis';
diff --git a/lib/plugins/popularity/lang/eo/submitted.txt b/lib/plugins/popularity/lang/eo/submitted.txt
index c2bce4e9f..095439bf3 100644
--- a/lib/plugins/popularity/lang/eo/submitted.txt
+++ b/lib/plugins/popularity/lang/eo/submitted.txt
@@ -1,3 +1,3 @@
 ====== Enketo pri Populareco ======
 
-La datumoj estis senditaj sukcese.
\ No newline at end of file
+La datumoj sendiĝis sukcese.
diff --git a/lib/plugins/popularity/lang/es/lang.php b/lib/plugins/popularity/lang/es/lang.php
index 752fb7da4..2be2d4a04 100644
--- a/lib/plugins/popularity/lang/es/lang.php
+++ b/lib/plugins/popularity/lang/es/lang.php
@@ -19,6 +19,7 @@
  * @author emezeta <emezeta@infoprimo.com>
  * @author Oscar Ciudad <oscar@jacho.net>
  * @author Ruben Figols <ruben.figols@gmail.com>
+ * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
  */
 $lang['name']                  = 'Retroinformación (Feedback) plugin Popularity';
 $lang['submit']                = 'Enviar datos';
diff --git a/lib/plugins/popularity/lang/fa/lang.php b/lib/plugins/popularity/lang/fa/lang.php
index 70c65f1b3..600e68077 100644
--- a/lib/plugins/popularity/lang/fa/lang.php
+++ b/lib/plugins/popularity/lang/fa/lang.php
@@ -7,6 +7,7 @@
  * @author omidmr@gmail.com
  * @author Omid Mottaghi <omidmr@gmail.com>
  * @author Mohammad Reza Shoaei <shoaei@gmail.com>
+ * @author Milad DZand <M.DastanZand@gmail.com>
  */
 $lang['name']                  = 'بازخورد محبوبیت (ممکن است اندکی زمان ببرد)';
 $lang['submit']                = 'ارسال اطلاعات';
diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php
index 9ff7a7e8b..904987079 100644
--- a/lib/plugins/popularity/lang/fr/lang.php
+++ b/lib/plugins/popularity/lang/fr/lang.php
@@ -14,6 +14,8 @@
  * @author Johan Guilbaud <guilbaud.johan@gmail.com>
  * @author schplurtz@laposte.net
  * @author skimpax@gmail.com
+ * @author Yannick Aure <yannick.aure@gmail.com>
+ * @author Olivier DUVAL <zorky00@gmail.com>
  */
 $lang['name']                  = 'Enquête de popularité (peut nécessiter un certain temps pour être chargée)';
 $lang['submit']                = 'Envoyer les données';
diff --git a/lib/plugins/popularity/lang/it/lang.php b/lib/plugins/popularity/lang/it/lang.php
index a7852f22c..9bf4ca8c6 100644
--- a/lib/plugins/popularity/lang/it/lang.php
+++ b/lib/plugins/popularity/lang/it/lang.php
@@ -9,6 +9,7 @@
  * @author robocap <robocap1@gmail.com>
  * @author Osman Tekin osman.tekin93@hotmail.it
  * @author Jacopo Corbetta <jacopo.corbetta@gmail.com>
+ * @author Matteo Pasotti <matteo@xquiet.eu>
  */
 $lang['name']                  = 'Raccolta dati sul wiki (può impiegare del tempo per caricarsi)';
 $lang['submit']                = 'Invia dati';
diff --git a/lib/plugins/popularity/lang/ja/lang.php b/lib/plugins/popularity/lang/ja/lang.php
index 736924bb1..f5e280db5 100644
--- a/lib/plugins/popularity/lang/ja/lang.php
+++ b/lib/plugins/popularity/lang/ja/lang.php
@@ -6,6 +6,7 @@
  * @author Daniel Dupriest <kououken@gmail.com>
  * @author Kazutaka Miyasaka <kazmiya@gmail.com>
  * @author Yuji Takenaka <webmaster@davilin.com>
+ * @author Taisuke Shimamoto <dentostar@gmail.com>
  */
 $lang['name']                  = '利用状況調査（ロードに少し時間が掛かります）';
 $lang['submit']                = 'データ送信';
diff --git a/lib/plugins/popularity/lang/ko/intro.txt b/lib/plugins/popularity/lang/ko/intro.txt
index e979b71d5..0af7ee2cc 100644
--- a/lib/plugins/popularity/lang/ko/intro.txt
+++ b/lib/plugins/popularity/lang/ko/intro.txt
@@ -1,9 +1,9 @@
 ====== 인기도 조사 ======
 
-설치된 위키의 익명 정보를 DokuWiki 개발자들에게 보냅니다. 이 기능은 DokuWiki가 실제 사용자들에게 어떻게 사용되는지  DokuWiki 개발자들에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
+설치된 위키의 익명 정보를 DokuWiki 개발자에게 보냅니다. 이 [[doku>popularity|기능]]은 DokuWiki가 실제 사용자에게 어떻게 사용되는지  DokuWiki 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
 
 설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이타는 익명 ID로 구별되어집니다.
 
-전송 데이타는 설치 DokuWiki 버전, 페이지와 파일 수, 크기, 설치 플러그인, 설치 PHP 정보등을 포함하고 있습니다.
+전송 데이타는 설치 DokuWiki 버전, 문서와 파일 수, 크기, 설치 플러그인, 설치 PHP 정보등을 포함하고 있습니다.
 
-실제 보내질 자료는 아래와 같습니다. 정보를 보내려면 "자료 보내기" 버튼을 클릭합니다.
+실제 보내질 자료는 아래와 같습니다. 정보를 보내려면 "자료 보내기" 버튼을 클릭합니다.
\ No newline at end of file
diff --git a/lib/plugins/popularity/lang/ko/lang.php b/lib/plugins/popularity/lang/ko/lang.php
index 0f1442d53..5e6966402 100644
--- a/lib/plugins/popularity/lang/ko/lang.php
+++ b/lib/plugins/popularity/lang/ko/lang.php
@@ -7,11 +7,13 @@
  * @author Song Younghwan <purluno@gmail.com>
  * @author SONG Younghwan <purluno@gmail.com>
  * @author Seung-Chul Yoo  <dryoo@live.com>
+ * @author erial2@gmail.com
+ * @author Myeongjin <aranet100@gmail.com>
  */
 $lang['name']                  = '인기도 조사 (불러오는데 시간이 걸릴 수 있습니다.)';
 $lang['submit']                = '자료 보내기';
 $lang['autosubmit']            = '자료를 자동으로 매달 한번씩 보내기';
-$lang['submissionFailed']      = '다음과 같은 이유로 자료 전송에 실패했습니다 :';
+$lang['submissionFailed']      = '다음과 같은 이유로 자료 전송에 실패했습니다:';
 $lang['submitDirectly']        = '아래의 양식에 맞춰 수동으로 작성된 자료를 보낼 수 있습니다';
-$lang['autosubmitError']       = '다음과 같은 이유로 자동 자료 전송에 실패했습니다 :';
+$lang['autosubmitError']       = '다음과 같은 이유로 자동 자료 전송에 실패했습니다:';
 $lang['lastSent']              = '자료가 전송되었습니다';
diff --git a/lib/plugins/popularity/lang/ko/submitted.txt b/lib/plugins/popularity/lang/ko/submitted.txt
index e8b434dc5..12f0efe45 100644
--- a/lib/plugins/popularity/lang/ko/submitted.txt
+++ b/lib/plugins/popularity/lang/ko/submitted.txt
@@ -1,3 +1,3 @@
 ====== 인기도 조사 ======
 
-자료 전송이 성공적으로 완료되었습니다
\ No newline at end of file
+자료 전송이 성공적으로 완료되었습니다.
\ No newline at end of file
diff --git a/lib/plugins/popularity/lang/nl/lang.php b/lib/plugins/popularity/lang/nl/lang.php
index e5e94aab4..b32ad9eb6 100644
--- a/lib/plugins/popularity/lang/nl/lang.php
+++ b/lib/plugins/popularity/lang/nl/lang.php
@@ -12,6 +12,7 @@
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
  * @author Ricardo Guijt <ricardoguijt@gmail.com>
+ * @author Gerrit <klapinklapin@gmail.com>
  */
 $lang['name']                  = 'Populariteitsfeedback (kan even duren om in te laden)';
 $lang['submit']                = 'Verstuur';
diff --git a/lib/plugins/popularity/lang/pl/lang.php b/lib/plugins/popularity/lang/pl/lang.php
index 64d772d54..76a9464bd 100644
--- a/lib/plugins/popularity/lang/pl/lang.php
+++ b/lib/plugins/popularity/lang/pl/lang.php
@@ -12,6 +12,7 @@
  * @author Grzegorz Widła <dzesdzes@gmail.com>
  * @author Łukasz Chmaj <teachmeter@gmail.com>
  * @author Begina Felicysym <begina.felicysym@wp.eu>
+ * @author Aoi Karasu <aoikarasu@gmail.com>
  */
 $lang['name']                  = 'Informacja o popularności (ładowanie może zająć dłuższą chwilę)';
 $lang['submit']                = 'Wyślij dane';
diff --git a/lib/plugins/popularity/lang/ro/lang.php b/lib/plugins/popularity/lang/ro/lang.php
index f3ca8d37e..8ba119dcb 100644
--- a/lib/plugins/popularity/lang/ro/lang.php
+++ b/lib/plugins/popularity/lang/ro/lang.php
@@ -7,6 +7,7 @@
  * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro>
  * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
+ * @author Marius Olar <olarmariusalex@yahoo.com>
  * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro>
  */
 $lang['name']                  = 'Feedback de popularitate (încărcarea poate dura mai mult)';
diff --git a/lib/plugins/popularity/lang/ru/lang.php b/lib/plugins/popularity/lang/ru/lang.php
index 79b3e224d..0e29c795d 100644
--- a/lib/plugins/popularity/lang/ru/lang.php
+++ b/lib/plugins/popularity/lang/ru/lang.php
@@ -13,6 +13,7 @@
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  * @author Ladyko Andrey <fylh@succexy.spb.ru>
  * @author Eugene <windy.wanderer@gmail.com>
+ * @author Johnny Utah <pcpa@cyberpunk.su>
  */
 $lang['name']                  = 'Сбор информации о популярности (для загрузки может потребоваться некоторое время)';
 $lang['submit']                = 'Отправить данные';
diff --git a/lib/plugins/popularity/lang/sl/intro.txt b/lib/plugins/popularity/lang/sl/intro.txt
index ceb0e61e6..2c029db63 100644
--- a/lib/plugins/popularity/lang/sl/intro.txt
+++ b/lib/plugins/popularity/lang/sl/intro.txt
@@ -1,9 +1,9 @@
-====== Poro�ilo o uporabi ======
+====== Poročilo o uporabi ======
 
-To orodje je namenjeno zbiranju brezimnih podatkov o postavljeni Dokuwiki strani in omogo�a po�iljanje nekaterih podatkov neposredno razvijalcem sistema. S temi podatki lahko razvijalci razumejo na�ine uporabe sistema, zahteve uporabnikov in pogostost uporabe, kar s statisti�nimi podatki vpliva tudi na nadaljnji razvoj sistema.
+To orodje je namenjeno zbiranju brezimnih podatkov o postavljeni DokuWiki strani in omogoča pošiljanje nekaterih podatkov neposredno razvijalcem sistema. S temi podatki lahko razvijalci razumejo načine uporabe sistema, zahteve uporabnikov in pogostost uporabe, kar s statističnimi podatki vpliva tudi na nadaljnji razvoj sistema.
 
-Priporo�eno je, da poro�ilo o uporabi po�ljete vsake toliko �asa, saj lahko le tako razvijalci dobijo podatke o hitrosti rasti spleti��a in pogostosti uporabe. Vsi podatki so poslani ozna�eni s posebno vpisno �tevilko, ki omogo�a brezimno sledenje.
+Priporočeno je, da poročilo o uporabi pošljete vsake toliko časa, saj lahko le tako razvijalci dobijo podatke o hitrosti rasti spletišča in pogostosti uporabe. Vsi podatki so poslani označeni s posebno vpisno številko, ki omogoča brezimno sledenje.
 
-Zbrani podatki vsebujejo podrobnosti o razli�ici uporabljenega sistema DokuWiki, �tevilo in velikost wiki strani, datotekah, ki so nalo�ene na sistem in podatke o vstavkih ter PHP namestitvi in razli�ici.
+Zbrani podatki vsebujejo podrobnosti o različici uporabljenega sistema DokuWiki, število in velikost wiki strani, datotekah, ki so naložene na sistem in podatke o vstavkih ter PHP namestitvi in različici.
 
-Surovi podatki, ki bodo poslani so prikazani spodaj. S pritiskom na gumb "Po�lji podatke", bodo ti poslani na stre�nik razvijalcev.
+Surovi podatki, ki bodo poslani so prikazani spodaj. S pritiskom na gumb "Pošlji podatke", bodo ti poslani na strežnik razvijalcev.
diff --git a/lib/plugins/popularity/lang/sl/submitted.txt b/lib/plugins/popularity/lang/sl/submitted.txt
index 988afd837..11ae052f7 100644
--- a/lib/plugins/popularity/lang/sl/submitted.txt
+++ b/lib/plugins/popularity/lang/sl/submitted.txt
@@ -1,3 +1,3 @@
-====== Poro�ilo o uporabi ======
+====== Poročilo o uporabi ======
 
-Podatki so bili uspe�no poslani.
+Podatki so bili uspešno poslani.
diff --git a/lib/plugins/popularity/lang/vi/lang.php b/lib/plugins/popularity/lang/vi/lang.php
new file mode 100644
index 000000000..2933d8875
--- /dev/null
+++ b/lib/plugins/popularity/lang/vi/lang.php
@@ -0,0 +1,5 @@
+<?php
+/**
+ * Vietnamese language file
+ *
+ */
diff --git a/lib/plugins/popularity/lang/zh-tw/lang.php b/lib/plugins/popularity/lang/zh-tw/lang.php
index 3ced0ee5a..3d19ce53a 100644
--- a/lib/plugins/popularity/lang/zh-tw/lang.php
+++ b/lib/plugins/popularity/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['name']                  = '人氣回饋（載入可能需要一些時間）';
 $lang['submit']                = '發送資料';
diff --git a/lib/plugins/popularity/plugin.info.txt b/lib/plugins/popularity/plugin.info.txt
index 16b148f41..871259ee9 100644
--- a/lib/plugins/popularity/plugin.info.txt
+++ b/lib/plugins/popularity/plugin.info.txt
@@ -1,7 +1,7 @@
 base    popularity
 author  Andreas Gohr
 email   andi@splitbrain.org
-date    2011-08-18
+date    2012-09-08
 name    Popularity Feedback Plugin
 desc    Send anonymous data about your wiki to the developers.
 url     http://www.dokuwiki.org/plugin:popularity