From 231b8c34be6825ff235f1b201f5176791f713f6c Mon Sep 17 00:00:00 2001
From: Pierre Spring <pierre.spring@caillou.ch>
Date: Thu, 23 Sep 2010 18:26:26 +0200
Subject: added a TODO

---
 inc/media.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 3dacd12b7..b54fd000f 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -788,6 +788,7 @@ function media_nstree_li($item){
         $img   = DOKU_BASE.'lib/images/plus.gif';
         $alt   = '+';
     }
+    // TODO: only deliver an image if it actually has a subtree...
     return '<li class="'.$class.'">'.
         '<img src="'.$img.'" alt="'.$alt.'" />';
 }
-- 
cgit v1.2.3


From 73ab87de7441c9c0eac123c1c44c2cf1ffdbe189 Mon Sep 17 00:00:00 2001
From: Gabriel Birke <birke@d-scribe.de>
Date: Sun, 2 Jan 2011 21:00:02 +0100
Subject: If cookiedir is configured, use it.

If $conf['cookiedir'] is set, use this setting instead of DOKU_REL.
---
 inc/auth.php | 10 ++++++----
 inc/init.php |  5 +++--
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'inc')

diff --git a/inc/auth.php b/inc/auth.php
index fd2a9c66d..834b63ec3 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -335,10 +335,11 @@ function auth_logoff($keepbc=false){
         unset($_SERVER['REMOTE_USER']);
     $USERINFO=null; //FIXME
 
+    $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir'];
     if (version_compare(PHP_VERSION, '5.2.0', '>')) {
-        setcookie(DOKU_COOKIE,'',time()-600000,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true);
+        setcookie(DOKU_COOKIE,'',time()-600000,$cookieDir,'',($conf['securecookie'] && is_ssl()),true);
     }else{
-        setcookie(DOKU_COOKIE,'',time()-600000,DOKU_REL,'',($conf['securecookie'] && is_ssl()));
+        setcookie(DOKU_COOKIE,'',time()-600000,$cookieDir,'',($conf['securecookie'] && is_ssl()));
     }
 
     if($auth) $auth->logOff();
@@ -1085,11 +1086,12 @@ function auth_setCookie($user,$pass,$sticky) {
 
     // set cookie
     $cookie = base64_encode($user).'|'.((int) $sticky).'|'.base64_encode($pass);
+    $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir'];
     $time = $sticky ? (time()+60*60*24*365) : 0; //one year
     if (version_compare(PHP_VERSION, '5.2.0', '>')) {
-        setcookie(DOKU_COOKIE,$cookie,$time,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true);
+        setcookie(DOKU_COOKIE,$cookie,$time,$cookieDir,'',($conf['securecookie'] && is_ssl()),true);
     }else{
-        setcookie(DOKU_COOKIE,$cookie,$time,DOKU_REL,'',($conf['securecookie'] && is_ssl()));
+        setcookie(DOKU_COOKIE,$cookie,$time,$cookieDir,'',($conf['securecookie'] && is_ssl()));
     }
     // set session
     $_SESSION[DOKU_COOKIE]['auth']['user'] = $user;
diff --git a/inc/init.php b/inc/init.php
index ed4409729..faf5f54e1 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -148,10 +148,11 @@ if ($conf['gzip_output'] &&
 // init session
 if (!headers_sent() && !defined('NOSESSION')){
     session_name("DokuWiki");
+    $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir'];
     if (version_compare(PHP_VERSION, '5.2.0', '>')) {
-        session_set_cookie_params(0,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true);
+        session_set_cookie_params(0,$cookieDir,'',($conf['securecookie'] && is_ssl()),true);
     }else{
-        session_set_cookie_params(0,DOKU_REL,'',($conf['securecookie'] && is_ssl()));
+        session_set_cookie_params(0,$cookieDir,'',($conf['securecookie'] && is_ssl()));
     }
     session_start();
 
-- 
cgit v1.2.3


From e4f389ef1728a0f86164a0e4b88626be9860dabb Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 26 May 2011 14:23:33 +0300
Subject: media version saving

---
 inc/changelog.php | 19 ++++++++++++++-----
 inc/init.php      |  2 ++
 inc/media.php     | 27 +++++++++++++++++++++++++++
 inc/pageutils.php | 22 ++++++++++++++++++++--
 4 files changed, 63 insertions(+), 7 deletions(-)

(limited to 'inc')

diff --git a/inc/changelog.php b/inc/changelog.php
index 15cd46d77..0bbb77540 100644
--- a/inc/changelog.php
+++ b/inc/changelog.php
@@ -138,6 +138,7 @@ function addMediaLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='',
     // add changelog lines
     $logline = implode("\t", $logline)."\n";
     io_saveFile($conf['media_changelog'],$logline,true); //global media changelog cache
+    io_saveFile(mediaMetaFN($id,'.changes'),$logline,true); //media file's changelog
 }
 
 /**
@@ -301,7 +302,7 @@ function _handleRecent($line,$ns,$flags,&$seen){
  *
  * @author Ben Coburn <btcoburn@silicodon.net>
  */
-function getRevisionInfo($id, $rev, $chunk_size=8192) {
+function getRevisionInfo($id, $rev, $chunk_size=8192, $media=false) {
     global $cache_revinfo;
     $cache =& $cache_revinfo;
     if (!isset($cache[$id])) { $cache[$id] = array(); }
@@ -312,7 +313,11 @@ function getRevisionInfo($id, $rev, $chunk_size=8192) {
         return $cache[$id][$rev];
     }
 
-    $file = metaFN($id, '.changes');
+    if ($media) {
+        $file = mediaMetaFN($id, '.changes');
+    } else {
+        $file = metaFN($id, '.changes');
+    }
     if (!@file_exists($file)) { return false; }
     if (filesize($file)<$chunk_size || $chunk_size==0) {
         // read whole file
@@ -398,7 +403,7 @@ function getRevisionInfo($id, $rev, $chunk_size=8192) {
  *
  * @author Ben Coburn <btcoburn@silicodon.net>
  */
-function getRevisions($id, $first, $num, $chunk_size=8192) {
+function getRevisions($id, $first, $num, $chunk_size=8192, $media=false) {
     global $cache_revinfo;
     $cache =& $cache_revinfo;
     if (!isset($cache[$id])) { $cache[$id] = array(); }
@@ -406,11 +411,15 @@ function getRevisions($id, $first, $num, $chunk_size=8192) {
     $revs = array();
     $lines = array();
     $count  = 0;
-    $file = metaFN($id, '.changes');
+    if ($media) {
+        $file = mediaMetaFN($id, '.changes');
+    } else {
+        $file = metaFN($id, '.changes');
+    }
     $num = max($num, 0);
     $chunk_size = max($chunk_size, 0);
     if ($first<0) { $first = 0; }
-    else if (@file_exists(wikiFN($id))) {
+    else if (!$media && @file_exists(wikiFN($id)) || $media && @file_exists(mediaFN($id))) {
         // skip current revision if the page exists
         $first = max($first+1, 0);
     }
diff --git a/inc/init.php b/inc/init.php
index 819d92bdc..e82e26efd 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -230,7 +230,9 @@ function init_paths(){
     $paths = array('datadir'   => 'pages',
             'olddir'    => 'attic',
             'mediadir'  => 'media',
+            'mediaolddir' => 'media_attic',
             'metadir'   => 'meta',
+            'mediametadir' => 'media_meta',
             'cachedir'  => 'cache',
             'indexdir'  => 'index',
             'lockdir'   => 'locks',
diff --git a/inc/media.php b/inc/media.php
index 3c9340d51..6be66dedc 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -346,6 +346,13 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov
     global $conf;
     global $lang;
 
+    $old = @filemtime($fn);
+    //
+    if(!@file_exists(mediaFN($id, $old)) && @file_exists($fn)) {
+        // add old revision to the attic if missing
+        saveOldMediaRevision($id);
+    }
+
     // prepare directory
     io_createNamespace($id, 'media');
 
@@ -368,6 +375,26 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov
     }
 }
 
+/**
+ * moves the current version to the media_attic and returns its
+ * revision date
+ */
+function saveOldMediaRevision($id, $move = 'copy'){
+    global $conf;
+    $oldf = mediaFN($id);
+    if(!@file_exists($oldf)) return '';
+    $date = filemtime($oldf);
+    $newf = mediaFN($id,$date);
+    io_makeFileDir($newf);
+    if($move($oldf, $newf)) {
+        // Set the correct permission here.
+        // Always chmod media because they may be saved with different permissions than expected from the php umask.
+        // (Should normally chmod to $conf['fperm'] only if $conf['fperm'] is set.)
+        chmod($newf, $conf['fmode']);
+    }
+    return $date;
+}
+
 /**
  * This function checks if the uploaded content is really what the
  * mimetype says it is. We also do spam checking for text types here.
diff --git a/inc/pageutils.php b/inc/pageutils.php
index c9bf60135..51567191e 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -307,6 +307,19 @@ function metaFN($id,$ext){
     return $fn;
 }
 
+/**
+ * returns the full path to the media's meta file specified by ID and extension
+ *
+ * The filename is URL encoded to protect Unicode chars
+ */
+function mediaMetaFN($id,$ext){
+    global $conf;
+    $id = cleanID($id);
+    $id = str_replace(':','/',$id);
+    $fn = $conf['mediametadir'].'/'.utf8_encodeFN($id).$ext;
+    return $fn;
+}
+
 /**
  * returns an array of full paths to all metafiles of a given ID
  *
@@ -327,11 +340,16 @@ function metaFiles($id){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function mediaFN($id){
+function mediaFN($id, $rev=''){
     global $conf;
     $id = cleanID($id);
     $id = str_replace(':','/',$id);
-    $fn = $conf['mediadir'].'/'.utf8_encodeFN($id);
+    if(empty($rev)){
+        $fn = $conf['mediadir'].'/'.utf8_encodeFN($id);
+    }else{
+    	list($name, $ext) = explode(".", $id);
+        $fn = $conf['mediaolddir'].'/'.utf8_encodeFN($name).'.'.$rev.'.'.utf8_encodeFN($ext);
+    }
     return $fn;
 }
 
-- 
cgit v1.2.3


From 7800517deb6ab16f8211f73adc961a5bcb1ea328 Mon Sep 17 00:00:00 2001
From: Rune Rasmussen <rra@vannavalen.no>
Date: Mon, 30 May 2011 19:10:40 +0200
Subject: Norwegian language update

---
 inc/lang/no/lang.php | 64 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 18 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index d2be945e6..e610db6bd 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -15,6 +15,7 @@
  * @author Knut Staring <knutst@gmail.com>
  * @author Lisa Ditlefsen <lisa@vervesearch.com>
  * @author Erik Pedersen <erik.pedersen@shaw.ca>
+ * @author Rune Rasmussen syntaxerror.no@gmail.com
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -48,9 +49,6 @@ $lang['btn_back']              = 'Tilbake';
 $lang['btn_backlink']          = 'Tilbakelenker';
 $lang['btn_backtomedia']       = 'Tilbake til valg av mediafil';
 $lang['btn_subscribe']         = 'Abonner på endringer';
-$lang['btn_unsubscribe']       = 'Ikke abonner på endringer';
-$lang['btn_subscribens']       = 'Abonner på endringer i navnerom';
-$lang['btn_unsubscribens']     = 'Stopp abonnement på endringer i navnerom';
 $lang['btn_profile']           = 'Oppdater profil';
 $lang['btn_reset']             = 'Tilbakestill';
 $lang['btn_resendpwd']         = 'Send nytt passord';
@@ -104,7 +102,38 @@ $lang['txt_overwrt']           = 'Overskriv eksisterende fil';
 $lang['lockedby']              = 'Stengt av';
 $lang['lockexpire']            = 'Avstengningen opphører';
 $lang['willexpire']            = 'Din redigeringslås for dette dokumentet kommer snart til å opphøre.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.';
-$lang['js']['notsavedyet']     = "Ulagrede endringer vil gå tapt.\nVil du fortsette?";
+$lang['js']['notsavedyet']     = 'Ulagrede endringer vil gå tapt.
+Vil du fortsette?';
+$lang['js']['searchmedia']     = 'Søk for filer';
+$lang['js']['keepopen']        = 'Hold vindu åpent ved valg';
+$lang['js']['hidedetails']     = 'Skjul detaljer';
+$lang['js']['mediatitle']      = 'Lenkeinnstillinger';
+$lang['js']['mediadisplay']    = 'Lenketype';
+$lang['js']['mediaalign']      = 'Justering';
+$lang['js']['mediasize']       = 'Bildestørrelse';
+$lang['js']['mediatarget']     = 'Lenkemål';
+$lang['js']['mediaclose']      = 'Lukk';
+$lang['js']['mediainsert']     = 'Sett inn';
+$lang['js']['mediadisplayimg'] = 'Vis bilde';
+$lang['js']['mediadisplaylnk'] = 'Vis bare lenken';
+$lang['js']['mediasmall']      = 'Liten versjon';
+$lang['js']['mediamedium']     = 'Medium versjon';
+$lang['js']['medialarge']      = 'Stor versjon';
+$lang['js']['mediaoriginal']   = 'Original versjon';
+$lang['js']['medialnk']        = 'Lenke til detaljeside';
+$lang['js']['mediadirect']     = 'Direktelenke til original';
+$lang['js']['medianolnk']      = 'Ingen lenke';
+$lang['js']['medianolink']     = 'Ikke lenk bilde';
+$lang['js']['medialeft']       = 'Venstrejuster bilde';
+$lang['js']['mediaright']      = 'Høyrejuster bilde';
+$lang['js']['mediacenter']     = 'Midtstill bilde';
+$lang['js']['medianoalign']    = 'Ingen justering';
+$lang['js']['nosmblinks']      = 'Lenker til Windows-ressurser fungerer bare i Microsoft sin Internet Explorer.
+Du kan fortsatt kopiere og lime inn lenken.';
+$lang['js']['linkwiz']         = 'guide til lenker';
+$lang['js']['linkto']          = 'Lenke til:';
+$lang['js']['del_confirm']     = 'Slett denne oppføringen?';
+$lang['js']['mu_btn']          = 'Last opp flere filer samtidig';
 $lang['rssfailed']             = 'En feil oppstod da denne kilden skulle hentes:';
 $lang['nothingfound']          = 'Ingen data funnet.';
 $lang['mediaselect']           = 'Valg av mediafil';
@@ -122,15 +151,7 @@ $lang['deletefail']            = '"%s" kunne ikke slettes - sjekk rettighetene.'
 $lang['mediainuse']            = 'Filen "%s" har ikke biltt slettet - den er fortsatt i bruk.';
 $lang['namespaces']            = 'Navnerom';
 $lang['mediafiles']            = 'Tilgjengelige filer i';
-$lang['js']['searchmedia']     = 'Søk for filer';
-$lang['js']['keepopen']        = 'Hold vindu åpent ved valg';
-$lang['js']['hidedetails']     = 'Skjul detaljer';
-$lang['js']['nosmblinks']      = 'Lenker til Windows-ressurser fungerer bare i Microsoft sin Internet Explorer.
-Du kan fortsatt kopiere og lime inn lenken.';
-$lang['js']['linkwiz']         = 'guide til lenker';
-$lang['js']['linkto']          = 'Lenke til:';
-$lang['js']['del_confirm']     = 'Slett denne oppføringen?';
-$lang['js']['mu_btn']          = 'Last opp flere filer samtidig';
+$lang['accessdenied']          = 'Du har ikke tilgang til å se denne siden';
 $lang['mediausage']            = 'Bruk følgende syntaks til å refferer til denne filen:';
 $lang['mediaview']             = 'Vis original fil';
 $lang['mediaroot']             = 'rot';
@@ -146,6 +167,9 @@ $lang['current']               = 'nåværende versjon';
 $lang['yours']                 = 'Din versjon';
 $lang['diff']                  = 'Vis forskjeller mot nåværende versjon';
 $lang['diff2']                 = 'Vis forskjeller mellom valgte versjoner';
+$lang['difflink']              = 'Lenk til denne sammenligningen';
+$lang['diff_type']             = 'Vis forskjeller:';
+$lang['diff_side']             = 'Side ved side';
 $lang['line']                  = 'Linje';
 $lang['breadcrumb']            = 'Spor';
 $lang['youarehere']            = 'Du er her';
@@ -160,6 +184,7 @@ $lang['noflash']               = 'For at dette innholdet skal vises må du ha <a
 $lang['download']              = 'Last ned utdraget';
 $lang['mail_newpage']          = 'side lagt til:';
 $lang['mail_changed']          = 'side endret:';
+$lang['mail_subscribe_list']   = 'side endret i \'namespace\':';
 $lang['mail_new_user']         = 'ny bruker:';
 $lang['mail_upload']           = 'fil opplastet:';
 $lang['qb_bold']               = 'Fet tekst';
@@ -202,11 +227,12 @@ $lang['img_copyr']             = 'Opphavsrett';
 $lang['img_format']            = 'Format';
 $lang['img_camera']            = 'Kamera';
 $lang['img_keywords']          = 'Nøkkelord';
-$lang['subscribe_success']     = 'Lagt til %s som abonnent av listen for %s';
-$lang['subscribe_error']       = 'En feil oppstod når %s skulle legges til som abonnent av listen for %s';
-$lang['subscribe_noaddress']   = 'Det er ingen adresse assosiert med din login. Du kan dermed ikke bli lagt til som abonnent av listen.';
-$lang['unsubscribe_success']   = 'Fjernet %s som abonnent for listen %s';
-$lang['unsubscribe_error']     = 'En feil oppstod når %s skulle fjernes som abonnent fra listen for %s';
+$lang['subscr_m_new_header']   = 'Legg til abonnement';
+$lang['subscr_m_current_header'] = 'Gjeldende abonnementer';
+$lang['subscr_m_unsubscribe']  = 'Avmeld';
+$lang['subscr_m_subscribe']    = 'Påmeld';
+$lang['subscr_m_receive']      = 'Motta';
+$lang['subscr_style_every']    = 'e-post for alle endringer';
 $lang['authmodfailed']         = 'Feilkonfigurert brukerautorisasjon. Vennligst innformer Wiki-admin.';
 $lang['authtempfail']          = 'Brukerautorisasjon er midlertidig utilgjengelig. Om dette vedvarer, vennligst informer Wiki-admin.';
 $lang['i_chooselang']          = 'Velg ditt språk';
@@ -234,6 +260,7 @@ $lang['i_pol0']                = 'Åpen Wiki (les, skriv og opplasting for alle)
 $lang['i_pol1']                = 'Offentlig Wiki (les for alle, skriving og opplasting bare for registrerte brukere)';
 $lang['i_pol2']                = 'Lukket Wiki (les, skriv og opplasting bare for registrerte brukere)';
 $lang['i_retry']               = 'Prøv igjen';
+$lang['i_license']             = 'Velg lisens som du vil legge ut innholdet under:';
 $lang['mu_intro']              = 'Her kan du laste opp flere filer samtidig. Klikk på utforsk-knappen for å legge dem til i køen. Klikk på "last opp" når du er ferdig med å velge filene. ';
 $lang['mu_gridname']           = 'Filnavn';
 $lang['mu_gridsize']           = 'Størrelse';
@@ -257,3 +284,4 @@ $lang['days']                  = '%d dager siden';
 $lang['hours']                 = '%d timer siden';
 $lang['minutes']               = '%d minutter siden';
 $lang['seconds']               = '%d sekunder siden';
+$lang['wordblock']             = 'Din endring ble ikke lagret ettersom den inneholder blokkert tekst (søppel).';
-- 
cgit v1.2.3


From 56815381cee694a20bb57eee07a6b3d9bd77fa4a Mon Sep 17 00:00:00 2001
From: Soroush Falahati <s_falahati@hotmail.com>
Date: Mon, 30 May 2011 19:11:41 +0200
Subject: Persian language update

---
 inc/lang/fa/lang.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php
index 4b9e9daa1..96374b409 100644
--- a/inc/lang/fa/lang.php
+++ b/inc/lang/fa/lang.php
@@ -164,9 +164,9 @@ $lang['yours']                 = 'نسخه‌ی شما';
 $lang['diff']                  = 'تفاوت‌ها را با نگارش کنونی نمایش بده.';
 $lang['diff2']                 = 'تفاوت‌ها را با نگارش انتخابی نمایش بده.';
 $lang['difflink']              = 'پیوند به صفحه‌ی تفاوت‌ها';
-$lang['diff_type']             = 'مشاهده‌ی تفاوت‌ها';
-$lang['diff_inline']           = 'داخلی';
-$lang['diff_side']             = 'کنارهم';
+$lang['diff_type']             = 'مشاهده تغییرات:';
+$lang['diff_inline']           = 'خطی';
+$lang['diff_side']             = 'کلی';
 $lang['line']                  = 'خط';
 $lang['breadcrumb']            = 'ردپا';
 $lang['youarehere']            = 'محل شما';
-- 
cgit v1.2.3


From 0f80b0bcd4ca247f7bc4c3830946741546ad6e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szab=C3=B3=20D=C3=A1vid?= <szabo.david@gyumolcstarhely.hu>
Date: Sat, 4 Jun 2011 00:38:05 +0200
Subject: Hungarian language update

---
 inc/lang/hu/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc')

diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php
index 52422b53c..35e810ff0 100644
--- a/inc/lang/hu/lang.php
+++ b/inc/lang/hu/lang.php
@@ -9,6 +9,7 @@
  * @author schilling.janos@gmail.com
  * @author Szabó Dávid <szabo.david@gyumolcstarhely.hu>
  * @author Sándor TIHANYI <stihanyi+dw@gmail.com>
+ * @author David Szabo <szabo.david@gyumolcstarhely.hu>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-- 
cgit v1.2.3


From cbe26ad6152c998c9a3290b0d321030c61dc7f1b Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sat, 4 Jun 2011 19:12:06 +0300
Subject: media version saving fix

---
 inc/media.php     | 20 +++++++++++++-------
 inc/pageutils.php | 10 +++++-----
 2 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index ac65603f1..be55f8044 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -341,16 +341,18 @@ function _media_upload_action($data) {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Michael Klier <chi@chimeric.de>
+ * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'move_uploaded_file') {
     global $conf;
     global $lang;
 
     $old = @filemtime($fn);
-    //
-    if(!@file_exists(mediaFN($id, $old)) && @file_exists($fn)) {
+    $oldRev = getRevisions($id, -1, 1, 1024, true); // from changelog
+    $oldRev = (int)(empty($oldRev)?0:$oldRev[0]);
+    if(!@file_exists(mediaFN($id, $old)) && @file_exists($fn) && $old>=$oldRev) {
         // add old revision to the attic if missing
-        saveOldMediaRevision($id);
+        media_saveOldRevision($id);
     }
 
     // prepare directory
@@ -376,17 +378,21 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov
 }
 
 /**
- * moves the current version to the media_attic and returns its
- * revision date
+ * Moves the current version of media file to the media_attic
+ * directory
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ * @param string $id
+ * @return int - revision date
  */
-function saveOldMediaRevision($id, $move = 'copy'){
+function media_saveOldRevision($id){
     global $conf;
     $oldf = mediaFN($id);
     if(!@file_exists($oldf)) return '';
     $date = filemtime($oldf);
     $newf = mediaFN($id,$date);
     io_makeFileDir($newf);
-    if($move($oldf, $newf)) {
+    if(copy($oldf, $newf)) {
         // Set the correct permission here.
         // Always chmod media because they may be saved with different permissions than expected from the php umask.
         // (Should normally chmod to $conf['fperm'] only if $conf['fperm'] is set.)
diff --git a/inc/pageutils.php b/inc/pageutils.php
index 51567191e..37b15a498 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -295,8 +295,6 @@ function wikiLockFN($id) {
 /**
  * returns the full path to the meta file specified by ID and extension
  *
- * The filename is URL encoded to protect Unicode chars
- *
  * @author Steven Danz <steven-danz@kc.rr.com>
  */
 function metaFN($id,$ext){
@@ -310,7 +308,7 @@ function metaFN($id,$ext){
 /**
  * returns the full path to the media's meta file specified by ID and extension
  *
- * The filename is URL encoded to protect Unicode chars
+ * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function mediaMetaFN($id,$ext){
     global $conf;
@@ -339,6 +337,7 @@ function metaFiles($id){
  * The filename is URL encoded to protect Unicode chars
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function mediaFN($id, $rev=''){
     global $conf;
@@ -347,8 +346,9 @@ function mediaFN($id, $rev=''){
     if(empty($rev)){
         $fn = $conf['mediadir'].'/'.utf8_encodeFN($id);
     }else{
-    	list($name, $ext) = explode(".", $id);
-        $fn = $conf['mediaolddir'].'/'.utf8_encodeFN($name).'.'.$rev.'.'.utf8_encodeFN($ext);
+    	$ext = mimetype($id);
+    	$name = substr($id, 0, strrpos($id, '.'));
+        $fn = $conf['mediaolddir'].'/'.utf8_encodeFN($name).'.'.(int)$rev.'.'.utf8_encodeFN($ext[0]);
     }
     return $fn;
 }
-- 
cgit v1.2.3


From 29778747fefc70b9f318ba91b47e9207aebc1a95 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sat, 4 Jun 2011 19:19:27 +0300
Subject: media revisions in recent changes

---
 inc/changelog.php | 50 ++++++++++++++++++++++++++++++++++++++++----------
 inc/common.php    |  1 +
 2 files changed, 41 insertions(+), 10 deletions(-)

(limited to 'inc')

diff --git a/inc/changelog.php b/inc/changelog.php
index 0bbb77540..d21c31198 100644
--- a/inc/changelog.php
+++ b/inc/changelog.php
@@ -152,6 +152,7 @@ function addMediaLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='',
  * RECENTS_SKIP_MINORS    - don't include minor changes
  * RECENTS_SKIP_SUBSPACES - don't include subspaces
  * RECENTS_MEDIA_CHANGES  - return media changes instead of page changes
+ * RECENTS_INCLUDE_MEDIA  - return both media changes and page changes
  *
  * @param int    $first   number of first entry returned (for paginating
  * @param int    $num     return $num entries
@@ -159,6 +160,7 @@ function addMediaLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='',
  * @param bool   $flags   see above
  *
  * @author Ben Coburn <btcoburn@silicodon.net>
+ * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function getRecents($first,$num,$ns='',$flags=0){
     global $conf;
@@ -174,20 +176,46 @@ function getRecents($first,$num,$ns='',$flags=0){
     } else {
         $lines = @file($conf['changelog']);
     }
+    $lines_position = count($lines)-1;
+
+    if ($flags & RECENTS_INCLUDE_MEDIA) {
+        $media_lines = @file($conf['media_changelog']);
+        $media_lines_position = count($media_lines)-1;
+    }
 
-    // handle lines
     $seen = array(); // caches seen lines, _handleRecent() skips them
-    for($i = count($lines)-1; $i >= 0; $i--){
-        $rec = _handleRecent($lines[$i], $ns, $flags, $seen);
-        if($rec !== false) {
-            if(--$first >= 0) continue; // skip first entries
-            $recent[] = $rec;
-            $count++;
-            // break when we have enough entries
-            if($count >= $num){ break; }
+
+    // handle lines
+    while ($lines_position >= 0 || (($flags & RECENTS_INCLUDE_MEDIA) && $media_lines_position >=0)) {
+        if (empty($rec) && $lines_position >= 0) {
+            $rec = _handleRecent(@$lines[$lines_position], $ns, $flags, $seen);
+            if (!$rec) {
+                $lines_position --;
+                continue;
+            }
+        }
+        if (($flags & RECENTS_INCLUDE_MEDIA) && empty($media_rec) && $media_lines_position >= 0) {
+            $media_rec = _handleRecent(@$media_lines[$media_lines_position], $ns, $flags, $seen);
+            if (!$media_rec) {
+            	$media_lines_position --;
+            	continue;
+            }
         }
+        if (($flags & RECENTS_INCLUDE_MEDIA) && @$media_rec['date'] >= @$rec['date']) {
+            $media_lines_position--;
+            $x = $media_rec;
+            $media_rec = false;
+        } else {
+            $lines_position--;
+            $x = $rec;
+            $rec = false;
+        }
+        if(--$first >= 0) continue; // skip first entries
+        $recent[] = $x;
+        $count++;
+        // break when we have enough entries
+        if($count >= $num){ break; }
     }
-
     return $recent;
 }
 
@@ -301,6 +329,7 @@ function _handleRecent($line,$ns,$flags,&$seen){
  * requested changelog line is read.
  *
  * @author Ben Coburn <btcoburn@silicodon.net>
+ * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function getRevisionInfo($id, $rev, $chunk_size=8192, $media=false) {
     global $cache_revinfo;
@@ -402,6 +431,7 @@ function getRevisionInfo($id, $rev, $chunk_size=8192, $media=false) {
  * lines are recieved.
  *
  * @author Ben Coburn <btcoburn@silicodon.net>
+ * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function getRevisions($id, $first, $num, $chunk_size=8192, $media=false) {
     global $cache_revinfo;
diff --git a/inc/common.php b/inc/common.php
index 7522095ab..e0405a735 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -15,6 +15,7 @@ define('RECENTS_SKIP_DELETED',2);
 define('RECENTS_SKIP_MINORS',4);
 define('RECENTS_SKIP_SUBSPACES',8);
 define('RECENTS_MEDIA_CHANGES',16);
+define('RECENTS_INCLUDE_MEDIA',32);
 
 /**
  * Wrapper around htmlspecialchars()
-- 
cgit v1.2.3


From 66c880eeb412047135a523819da6a6d99aff47f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rivo=20Z=C3=A4ngov?= <eraser@eraser.ee>
Date: Sun, 5 Jun 2011 10:04:24 +0200
Subject: Estonian language update

---
 inc/lang/et/lang.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'inc')

diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index c7060ebca..180a50c09 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -7,6 +7,7 @@
  * @author Aari Juhanson <aari@vmg.vil.ee>
  * @author Kaiko Kaur <kaiko@kultuur.edu.ee>
  * @author kristian.kankainen@kuu.la
+ * @author Rivo Zängov <eraser@eraser.ee>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -14,6 +15,7 @@ $lang['doublequoteopening']    = '„';
 $lang['doublequoteclosing']    = '“';
 $lang['singlequoteopening']    = '‚';
 $lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '\'';
 $lang['btn_edit']              = 'Toimeta seda lehte';
 $lang['btn_source']            = 'Näita lehepõhja';
 $lang['btn_show']              = 'Näita lehte';
@@ -36,6 +38,7 @@ $lang['btn_admin']             = 'Administreeri';
 $lang['btn_update']            = 'Uuenda';
 $lang['btn_delete']            = 'Kustuta';
 $lang['btn_back']              = 'Tagasi';
+$lang['btn_backlink']          = 'Tagasilingid';
 $lang['btn_backtomedia']       = 'Tagasi faili valikusse';
 $lang['btn_subscribe']         = 'Jälgi seda lehte (teated meilile)';
 $lang['btn_profile']           = 'Minu info';
@@ -143,6 +146,7 @@ $lang['mediaview']             = 'Vaata faili algsel kujul.';
 $lang['mediaroot']             = 'juur';
 $lang['mediaupload']           = 'Lae fail sellesse nimeruumi (kataloogi). Et tekitada veel alam nimeruum kasuta koolonit Wiki nimes.';
 $lang['mediaextchange']        = 'Faili laiend .%s-st %s-ks!';
+$lang['reference']             = 'Viited';
 $lang['ref_inuse']             = 'Seda faili ei saa kustutada, sest teda kasutavad järgmised lehed:';
 $lang['ref_hidden']            = 'Mõned viidad failile on lehtedel, millele sul ei ole ligipääsu';
 $lang['hits']                  = 'Päringu tabamused';
@@ -151,6 +155,10 @@ $lang['toc']                   = 'Sisujuht';
 $lang['current']               = 'Hetkel kehtiv';
 $lang['yours']                 = 'Sinu versioon';
 $lang['diff']                  = 'Näita erinevusi hetkel kehtiva versiooniga';
+$lang['diff2']                 = 'Näita valitud versioonide erinevusi';
+$lang['difflink']              = 'Lõlita võrdlemise vaatele';
+$lang['diff_type']             = 'Vaata erinevusi:';
+$lang['diff_side']             = 'Kõrvuti';
 $lang['line']                  = 'Rida';
 $lang['breadcrumb']            = 'Käidud rada';
 $lang['youarehere']            = 'Sa oled siin';
@@ -159,6 +167,7 @@ $lang['by']                    = 'persoon';
 $lang['deleted']               = 'eemaldatud';
 $lang['created']               = 'tekitatud';
 $lang['restored']              = 'vana versioon taastatud';
+$lang['external_edit']         = 'väline muutmine';
 $lang['summary']               = 'kokkuvõte muudatustest';
 $lang['mail_newpage']          = 'leht lisatud:';
 $lang['mail_changed']          = 'leht muudetud';
@@ -173,6 +182,11 @@ $lang['qb_h2']                 = '2. astme pealkiri';
 $lang['qb_h3']                 = '3. astme pealkiri';
 $lang['qb_h4']                 = '4. astme pealkiri';
 $lang['qb_h5']                 = '5. astme pealkiri';
+$lang['qb_h']                  = 'Pealkiri';
+$lang['qb_hs']                 = 'Vali pealkiri';
+$lang['qb_hplus']              = 'Kõrgem pealkiri';
+$lang['qb_hminus']             = 'Madalam pealkiri';
+$lang['qb_hequal']             = 'Sama taseme pealkiri';
 $lang['qb_link']               = 'Siselink';
 $lang['qb_extlink']            = 'Välislink';
 $lang['qb_hr']                 = 'Horisontaalne vahejoon';
@@ -193,6 +207,7 @@ $lang['img_date']              = 'Kuupäev';
 $lang['img_fname']             = 'Faili nimi';
 $lang['img_fsize']             = 'Suurus';
 $lang['img_artist']            = 'Autor';
+$lang['img_copyr']             = 'Autoriõigused';
 $lang['img_format']            = 'Formaat';
 $lang['img_camera']            = 'Kaamera';
 $lang['img_keywords']          = 'Võtmesõnad';
@@ -217,3 +232,13 @@ $lang['i_policy']              = 'Wiki õiguste algne poliitika';
 $lang['i_pol0']                = 'Avatud (lugemine, kirjutamine ja üleslaadimine kõigile lubatud)';
 $lang['i_pol1']                = 'Avalikuks lugemiseks (lugeda saavad kõik, kirjutada ja üles laadida vaid registreeritud kasutajad)';
 $lang['i_pol2']                = 'Suletud (kõik õigused, kaasaarvatud lugemine on lubatud vaid registreeritud kasutajatele)';
+$lang['i_retry']               = 'Proovi uuesti';
+$lang['mu_gridname']           = 'Failinimi';
+$lang['mu_gridsize']           = 'Suurus';
+$lang['mu_gridstat']           = 'Staatus';
+$lang['mu_browse']             = 'Sirvi';
+$lang['mu_toobig']             = 'liiga suur';
+$lang['mu_ready']              = 'valmis üleslaadimiseks';
+$lang['mu_done']               = 'valmis';
+$lang['mu_fail']               = 'ebaõnnestus';
+$lang['mu_lasterr']            = 'Viimane viga:';
-- 
cgit v1.2.3


From 61f1aad8f877bdf33a160812d88b60c56aed1040 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 5 Jun 2011 21:00:51 +0300
Subject: media version saving fixes

---
 inc/changelog.php | 10 +++++-----
 inc/common.php    |  2 +-
 inc/pageutils.php |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'inc')

diff --git a/inc/changelog.php b/inc/changelog.php
index d21c31198..937214a6a 100644
--- a/inc/changelog.php
+++ b/inc/changelog.php
@@ -151,7 +151,7 @@ function addMediaLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='',
  * RECENTS_SKIP_DELETED   - don't include deleted pages
  * RECENTS_SKIP_MINORS    - don't include minor changes
  * RECENTS_SKIP_SUBSPACES - don't include subspaces
- * RECENTS_MEDIA_CHANGES  - return media changes instead of page changes
+ * RECENTS_SKIP_PAGES  - return media changes instead of page changes
  * RECENTS_INCLUDE_MEDIA  - return both media changes and page changes
  *
  * @param int    $first   number of first entry returned (for paginating
@@ -171,7 +171,7 @@ function getRecents($first,$num,$ns='',$flags=0){
         return $recent;
 
     // read all recent changes. (kept short)
-    if ($flags & RECENTS_MEDIA_CHANGES) {
+    if ($flags & RECENTS_SKIP_PAGES) {
         $lines = @file($conf['media_changelog']);
     } else {
         $lines = @file($conf['changelog']);
@@ -229,7 +229,7 @@ function getRecents($first,$num,$ns='',$flags=0){
  * RECENTS_SKIP_DELETED   - don't include deleted pages
  * RECENTS_SKIP_MINORS    - don't include minor changes
  * RECENTS_SKIP_SUBSPACES - don't include subspaces
- * RECENTS_MEDIA_CHANGES  - return media changes instead of page changes
+ * RECENTS_SKIP_PAGES  - return media changes instead of page changes
  *
  * @param int    $from    date of the oldest entry to return
  * @param int    $to      date of the newest entry to return (for pagination, optional)
@@ -247,7 +247,7 @@ function getRecentsSince($from,$to=null,$ns='',$flags=0){
         return $recent;
 
     // read all recent changes. (kept short)
-    if ($flags & RECENTS_MEDIA_CHANGES) {
+    if ($flags & RECENTS_SKIP_PAGES) {
         $lines = @file($conf['media_changelog']);
     } else {
         $lines = @file($conf['changelog']);
@@ -314,7 +314,7 @@ function _handleRecent($line,$ns,$flags,&$seen){
     if ($recent['perms'] < AUTH_READ) return false;
 
     // check existance
-    $fn = (($flags & RECENTS_MEDIA_CHANGES) ? mediaFN($recent['id']) : wikiFN($recent['id']));
+    $fn = (($flags & RECENTS_SKIP_PAGES) ? mediaFN($recent['id']) : wikiFN($recent['id']));
     if((!@file_exists($fn)) && ($flags & RECENTS_SKIP_DELETED)) return false;
 
     return $recent;
diff --git a/inc/common.php b/inc/common.php
index e0405a735..acd3609d6 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -14,7 +14,7 @@ if(!defined('DOKU_INC')) die('meh.');
 define('RECENTS_SKIP_DELETED',2);
 define('RECENTS_SKIP_MINORS',4);
 define('RECENTS_SKIP_SUBSPACES',8);
-define('RECENTS_MEDIA_CHANGES',16);
+define('RECENTS_SKIP_PAGES',16);
 define('RECENTS_INCLUDE_MEDIA',32);
 
 /**
diff --git a/inc/pageutils.php b/inc/pageutils.php
index 37b15a498..09a23cbdd 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -347,8 +347,8 @@ function mediaFN($id, $rev=''){
         $fn = $conf['mediadir'].'/'.utf8_encodeFN($id);
     }else{
     	$ext = mimetype($id);
-    	$name = substr($id, 0, strrpos($id, '.'));
-        $fn = $conf['mediaolddir'].'/'.utf8_encodeFN($name).'.'.(int)$rev.'.'.utf8_encodeFN($ext[0]);
+    	$name = substr($id,0, -1*strlen($ext[0]));
+        $fn = $conf['mediaolddir'].'/'.utf8_encodeFN($name .'.'.( (int) $rev ).'.'.$ext[0]);
     }
     return $fn;
 }
-- 
cgit v1.2.3


From 8d40b4b6e74029367996c169aa3e67507a4cdfe1 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 5 Jun 2011 21:05:23 +0300
Subject: type of recent changes selection

---
 inc/html.php     | 36 +++++++++++++++++++++++++++++++++---
 inc/template.php |  3 ++-
 2 files changed, 35 insertions(+), 4 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 6e187ebe1..e8d6b98a5 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -567,8 +567,9 @@ function html_revisions($first=0){
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
  * @author Ben Coburn <btcoburn@silicodon.net>
+ * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function html_recent($first=0){
+function html_recent($first=0, $show_changes){
     global $conf;
     global $lang;
     global $ID;
@@ -576,10 +577,14 @@ function html_recent($first=0){
      * decide if this is the last page or is there another one.
      * This is the cheapest solution to get this information.
      */
-    $recents = getRecents($first,$conf['recent'] + 1,getNS($ID));
+    $flags = RECENTS_INCLUDE_MEDIA;
+    if ($show_changes == 'mediafiles') $flags = RECENTS_SKIP_PAGES;
+    if ($show_changes == 'pages') $flags = 0;
+
+    $recents = getRecents($first,$conf['recent'] + 1,getNS($ID),$flags);
     if(count($recents) == 0 && $first != 0){
         $first=0;
-        $recents = getRecents($first,$conf['recent'] + 1,getNS($ID));
+        $recents = getRecents($first,$conf['recent'] + 1,getNS($ID),$flags);
     }
     $hasNext = false;
     if (count($recents)>$conf['recent']) {
@@ -596,6 +601,31 @@ function html_recent($first=0){
     $form->addHidden('sectok', null);
     $form->addHidden('do', 'recent');
     $form->addHidden('id', $ID);
+
+    $form->addElement(form_makeOpenTag('div', array('class' => 'changestypenav')));
+    $attrs = array('name' => 'show_changes',
+                   'value' => 'pages',
+                   '_text' => $lang['pages_changes']);
+    if ($show_changes == 'pages') $attrs['checked'] = 'checked';
+    $form->addElement(form_radiofield($attrs));
+    $attrs = array('name' => 'show_changes',
+                   'value' => 'mediafiles',
+                   '_text' => $lang['media_changes']);
+    if ($show_changes == 'mediafiles') $attrs['checked'] = 'checked';
+    $form->addElement(form_radiofield($attrs));
+    $attrs = array('name' => 'show_changes',
+                   'value' => 'both',
+                   '_text' => $lang['both_changes'] );
+    if (empty($show_changes) || $show_changes == 'both') $attrs['checked'] = 'checked';
+    $form->addElement(form_radiofield($attrs));
+    $form->addElement(form_makeTag('input', array(
+                    'type'  => 'submit',
+                    'value' => $lang['btn_apply'],
+                    'title' => $lang['btn_apply'],
+                    'class' => 'button'
+                    )));
+    $form->addElement(form_makeCloseTag('div'));
+
     $form->addElement(form_makeOpenTag('ul'));
 
     foreach($recents as $recent){
diff --git a/inc/template.php b/inc/template.php
index b9b3951ff..d2d66220c 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -89,7 +89,8 @@ function tpl_content_core(){
                 $_REQUEST['first'] = $_REQUEST['first'][0];
             }
             $first = is_numeric($_REQUEST['first']) ? intval($_REQUEST['first']) : 0;
-            html_recent($first);
+            $show_changes = $_REQUEST['show_changes'];
+            html_recent($first, $show_changes);
             break;
         case 'index':
             html_index($IDX); #FIXME can this be pulled from globals? is it sanitized correctly?
-- 
cgit v1.2.3


From 0739a638a982a263e933052cdb31594f6bf378e6 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 5 Jun 2011 21:09:26 +0300
Subject: type of recent changes selection fix

---
 inc/html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index e8d6b98a5..06e9f3b0c 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -569,7 +569,7 @@ function html_revisions($first=0){
  * @author Ben Coburn <btcoburn@silicodon.net>
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function html_recent($first=0, $show_changes){
+function html_recent($first=0, $show_changes='both'){
     global $conf;
     global $lang;
     global $ID;
-- 
cgit v1.2.3


From ddcd5ab6a4c6b64d7948bd2d103c2ecd5a1ca618 Mon Sep 17 00:00:00 2001
From: Kazutaka Miyasaka <kazmiya@gmail.com>
Date: Mon, 6 Jun 2011 19:01:06 +0900
Subject: fixed email subject encoding bug ($enc_subj typo)

---
 inc/mail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/mail.php b/inc/mail.php
index bd6c0db6a..8742e17f6 100644
--- a/inc/mail.php
+++ b/inc/mail.php
@@ -114,7 +114,7 @@ function _mail_send_action($data) {
     if(!utf8_isASCII($subject)) {
         $enc_subj = '=?UTF-8?Q?'.mail_quotedprintable_encode($subject,0).'?=';
         // Spaces must be encoded according to rfc2047. Use the "_" shorthand
-        $enc_sub = preg_replace('/ /', '_', $enc_sub);
+        $enc_subj = preg_replace('/ /', '_', $enc_subj);
 
         // quoted printable has length restriction, use base64 if needed
         if(strlen($subject) > 74){
-- 
cgit v1.2.3


From d54ac87747635038aaaf9b4c7a2df7a8a0cd450d Mon Sep 17 00:00:00 2001
From: Adrian Lang <lang@cosmocode.de>
Date: Mon, 6 Jun 2011 16:20:29 +0200
Subject: Use autoloading for plugin classes

---
 inc/load.php                   | 13 ++++++++++++-
 inc/plugincontroller.class.php | 21 +++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'inc')

diff --git a/inc/load.php b/inc/load.php
index ef6f7f31c..d30397f6e 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -43,7 +43,7 @@ require_once(DOKU_INC.'inc/auth.php');
  * require()s their associated php files when an object is instantiated.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
- * @todo   add generic loading of plugins and other generically named classes
+ * @todo   add generic loading of renderers and auth backends
  */
 function load_autoload($name){
     static $classes = null;
@@ -87,5 +87,16 @@ function load_autoload($name){
         require_once($classes[$name]);
         return;
     }
+
+    // Plugin loading
+    if(preg_match('/^(helper|syntax|action|admin|renderer)_plugin_([^_]+)(?:_([^_]+))?$/',
+                  $name, $m)) {
+                //try to load the wanted plugin file
+        // include, but be silent. Maybe some other autoloader has an idea
+        // how to load this class.
+        $c = ((count($m) === 4) ? "/{$m[3]}" : '');
+        @include DOKU_PLUGIN . "{$m[2]}/{$m[1]}$c.php";
+        return;
+    }
 }
 
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index cec5c73a9..ea5725d47 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -72,32 +72,21 @@ class Doku_Plugin_Controller {
             return null;
         }
 
+        $class = $type.'_plugin_'.$name;
+
         //plugin already loaded?
         if(!empty($DOKU_PLUGINS[$type][$name])){
             if ($new || !$DOKU_PLUGINS[$type][$name]->isSingleton()) {
-                $class = $type.'_plugin_'.$name;
-                return class_exists($class) ? new $class : null;
+                return class_exists($class, true) ? new $class : null;
             } else {
                 return $DOKU_PLUGINS[$type][$name];
             }
         }
 
-        //try to load the wanted plugin file
-        $dir = $this->get_directory($plugin);
-        $file = $component ? "$type/$component.php" : "$type.php";
-
-        if(!is_file(DOKU_PLUGIN."$dir/$file")){
-            return null;
-        }
-
-        if (!include_once(DOKU_PLUGIN."$dir/$file")) {
-            return null;
-        }
-
         //construct class and instantiate
-        $class = $type.'_plugin_'.$name;
-        if (!class_exists($class)){
+        if (!class_exists($class, true)) {
             # the plugin might be in the wrong directory
+            $dir = $this->get_directory($plugin);
             $inf = confToHash(DOKU_PLUGIN."$dir/plugin.info.txt");
             if($inf['base'] && $inf['base'] != $plugin){
                 msg("Plugin installed incorrectly. Rename plugin directory '".
-- 
cgit v1.2.3


From 1c56be7bf617302cbe5a0541b492bae66c8a1b79 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Wed, 8 Jun 2011 00:27:33 +0200
Subject: Add missing return value to p_set_metadata

---
 inc/parserutils.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc')

diff --git a/inc/parserutils.php b/inc/parserutils.php
index abba89b5a..9ae835893 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -411,6 +411,7 @@ function p_set_metadata($id, $data, $render=false, $persistent=true){
         // set both keys individually as the renderer has references to the individual keys
         $METADATA_RENDERERS[$id]['current']    = $meta['current'];
         $METADATA_RENDERERS[$id]['persistent'] = $meta['persistent'];
+        return true;
     } else {
         return p_save_metadata($id, $meta);
     }
-- 
cgit v1.2.3


From d9162c6cd87643d7e7af8e37cd93aa48b8aecb96 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 9 Jun 2011 14:04:50 +0300
Subject: fullscreen media manager

---
 inc/actions.php  |   2 +-
 inc/media.php    | 401 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 inc/template.php |  89 +++++++++++-
 3 files changed, 459 insertions(+), 33 deletions(-)

(limited to 'inc')

diff --git a/inc/actions.php b/inc/actions.php
index ecf09036f..1a0ae4028 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -227,7 +227,7 @@ function act_clean($act){
                     'preview','search','show','check','index','revisions',
                     'diff','recent','backlink','admin','subscribe','revert',
                     'unsubscribe','profile','resendpwd','recover',
-                    'draftdel','subscribens','unsubscribens','sitemap')) && substr($act,0,7) != 'export_' ) {
+                    'draftdel','subscribens','unsubscribens','sitemap','media')) && substr($act,0,7) != 'export_' ) {
         msg('Command unknown: '.htmlspecialchars($act),-1);
         return 'show';
     }
diff --git a/inc/media.php b/inc/media.php
index be55f8044..d98e225b9 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -74,8 +74,9 @@ function media_metasave($id,$auth,$data){
  * Display the form to edit image meta data
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_metaform($id,$auth){
+function media_metaform($id,$auth,$fullscreen = false){
     if($auth < AUTH_UPLOAD) return false;
     global $lang, $config_cascade;
 
@@ -96,8 +97,13 @@ function media_metaform($id,$auth){
     $src = mediaFN($id);
 
     // output
-    echo '<h1>'.hsc(noNS($id)).'</h1>'.NL;
-    echo '<form action="'.DOKU_BASE.'lib/exe/mediamanager.php" accept-charset="utf-8" method="post" class="meta">'.NL;
+    if (!$fullscreen) {
+        echo '<h1>'.hsc(noNS($id)).'</h1>'.NL;
+        echo '<form action="'.DOKU_BASE.'lib/exe/mediamanager.php" accept-charset="utf-8" method="post" class="meta">'.NL;
+    } else {
+        echo '<form action="'.media_managerURL(array('tab_details' => 'view')).
+            '" accept-charset="utf-8" method="post" class="meta">'.NL;
+    }
     formSecurityToken();
     foreach($fields as $key => $field){
         // get current value
@@ -132,8 +138,11 @@ function media_metaform($id,$auth){
     }
     echo '<div class="buttons">'.NL;
     echo '<input type="hidden" name="img" value="'.hsc($id).'" />'.NL;
-    echo '<input name="do[save]" type="submit" value="'.$lang['btn_save'].
+    if (!$fullscreen) $do = 'do';
+    else $do = 'mediado';
+    echo '<input name="'.$do.'[save]" type="submit" value="'.$lang['btn_save'].
         '" title="'.$lang['btn_save'].' [S]" accesskey="s" class="button" />'.NL;
+    if (!$fullscreen)
     echo '<input name="do[cancel]" type="submit" value="'.$lang['btn_cancel'].
         '" title="'.$lang['btn_cancel'].' [C]" accesskey="c" class="button" />'.NL;
     echo '</div>'.NL;
@@ -476,7 +485,7 @@ function media_notify($id,$file,$mime){
 /**
  * List all files in a given Media namespace
  */
-function media_filelist($ns,$auth=null,$jump=''){
+function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false){
     global $conf;
     global $lang;
     $ns = cleanID($ns);
@@ -484,13 +493,13 @@ function media_filelist($ns,$auth=null,$jump=''){
     // check auth our self if not given (needed for ajax calls)
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    echo '<h1 id="media__ns">:'.hsc($ns).'</h1>'.NL;
+    if (!$fullscreenview) echo '<h1 id="media__ns">:'.hsc($ns).'</h1>'.NL;
 
     if($auth < AUTH_READ){
         // FIXME: print permission warning here instead?
         echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
     }else{
-        media_uploadform($ns, $auth);
+        if (!$fullscreenview) media_uploadform($ns, $auth);
 
         $dir = utf8_encodeFN(str_replace(':','/',$ns));
         $data = array();
@@ -500,10 +509,248 @@ function media_filelist($ns,$auth=null,$jump=''){
         if(!count($data)){
             echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
         }else foreach($data as $item){
-            media_printfile($item,$auth,$jump);
+            if (!$fullscreenview) media_printfile($item,$auth,$jump);
+            else if ($fullscreenview == 'thumbs') media_printfile_thumbs($item,$auth,$jump);
+        }
+    }
+    if (!$fullscreenview) media_searchform($ns);
+}
+
+/**
+ * Prints tabs for files list actions
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ * @param string $selected - opened tab
+ */
+function media_tabs_files($selected=false){
+    global $lang;
+
+    echo '<div class="mediamanager-tabs" id="id-mediamanager-tabs">';
+    $tab = '<a href="'.media_managerURL(array('tab_files' => 'files')).
+        '" rel=".mediamanager-tab-files"';
+    if (!empty($selected) && $selected == 'files') $class = 'files selected';
+    else $class = 'files';
+    $tab .= ' class="'.$class.'" >Files</a>';
+    echo $tab;
+
+    $tab = '<a href="'.media_managerURL(array('tab_files' => 'upload')).
+        '" rel=".mediamanager-tab-upload"';
+    if (!empty($selected) && $selected == 'upload') $class = 'upload selected';
+    else $class = 'upload';
+    $tab .= ' class="'.$class.'" >Upload</a>';
+    echo $tab;
+
+    $tab = '<a href="'.media_managerURL(array('tab_files' => 'search')).
+        '" rel=".mediamanager-tab-search"';
+    if (!empty($selected) && $selected == 'search') $class = 'search selected';
+    else $class = 'search';
+    $tab .= ' class="'.$class.'" >Search</a>';
+    echo $tab;
+
+    echo '<div class="mediamanager-clear">&nbsp;</div>';
+    echo '</div>';
+}
+
+/**
+ * Prints tabs for files details actions
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ * @param string $selected - opened tab
+ */
+function media_tabs_details($selected=false){
+    global $lang;
+
+    echo '<div class="mediamanager-tabs" id="id-mediamanager-tabs-detail">';
+    $tab = '<a href="'.media_managerURL(array('tab_details' => 'view')).
+        '" rel=".mediamanager-tab-view"';
+    if (!empty($selected) && $selected == 'view') $class = 'view selected';
+    else $class = 'view';
+    $tab .= ' class="'.$class.'" >View</a>';
+    echo $tab;
+
+    $tab = '<a href="'.media_managerURL(array('tab_details' => 'edit')).
+        '" rel=".mediamanager-tab-edit"';
+    if (!empty($selected) && $selected == 'edit') $class = 'edit selected';
+    else $class = 'edit';
+    $tab .= ' class="'.$class.'" >Edit</a>';
+    echo $tab;
+
+    $tab = '<a href="'.media_managerURL(array('tab_details' => 'history')).
+        '" rel=".mediamanager-tab-history"';
+    if (!empty($selected) && $selected == 'history') $class = 'history selected';
+    else $class = 'history';
+    $tab .= ' class="'.$class.'" >History</a>';
+    echo $tab;
+
+    echo '<div class="mediamanager-clear">&nbsp;</div>';
+    echo '</div>';
+}
+
+/**
+ * Prints options for the tab that displays a list of all files
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function media_tab_files_options(){
+    global $lang;
+
+    echo '<div class="background-container">';
+    echo '<div id="id-mediamanager-tabs-files" style="display: inline;">';
+    echo '<a href="'.media_managerURL(array('view' => 'thumbs')).'"
+        rel=".mediamanager-files-thumbnails-tab" class="mediamanager-link-thumbnails">
+        Thumbs</a>';
+    echo '<a href="'.media_managerURL(array('view' => 'list')).'"
+        rel=".mediamanager-files-list-tab" class="mediamanager-link-list"
+        title="View as list">List</a>';
+
+    echo '</div>';
+    echo '<div class="mediamanager-block-sort">Sort';
+    //select
+    echo '</div>';
+    echo '<div class="mediamanager-clear">&nbsp;</div>';
+    echo '</div>';
+}
+
+/**
+ * Prints tab that displays a list of all files
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function media_tab_files($ns,$auth=null,$jump='') {
+    global $lang;
+    if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
+
+    echo '<div class="mediamanager-tab-files">';
+    media_tab_files_options();
+    echo '<div class="scroll-container">';
+
+    $view = $_REQUEST['view'];
+    if($auth < AUTH_READ){
+        echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
+    }else{
+        if ($view == 'list') {
+            echo '<div class="mediamanager-files-list-tab">';
+            echo '</div>';
+        } else {
+            echo '<div class="mediamanager-files-thumbnails-tab">';
+            media_filelist($ns,$auth,$jump,'thumbs');
+            echo '</div>';
         }
     }
-    media_searchform($ns);
+    echo '</div>';
+    echo '</div>';
+}
+
+/**
+ * Prints tab that displays uploading form
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function media_tab_upload($ns,$auth=null,$jump='') {
+    global $lang;
+    if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
+
+    echo '<div class="mediamanager-tab-upload"">';
+    echo '<div class="background-container">';
+    echo $lang['mediaupload'];
+    echo '</div>';
+
+    echo '<div class="scroll-container">';
+    media_uploadform($ns, $auth, true);
+    echo '</div>';
+    echo '</div>';
+}
+
+/**
+ * Prints tab that displays search form
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function media_tab_search($ns,$auth=null) {
+    global $lang;
+
+    $do = $_REQUEST['mediado'];
+    $query = $_REQUEST['q'];
+    if (!$query) $query = '';
+
+    echo '<div class="mediamanager-tab-search">';
+    echo '<div class="background-container">';
+    echo 'Search';
+    echo'</div>';
+
+    echo '<div class="scroll-container">';
+    media_searchform($ns, $query, true);
+
+    if($do == 'searchlist'){
+        media_searchlist($query,$ns,$auth,true);
+    }
+    echo '</div>';
+    echo '</div>';
+}
+
+/**
+ * Prints tab that displays mediafile details
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function media_tab_view($image, $ns, $auth=null) {
+    global $lang, $conf;
+    if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
+
+    echo '<div class="mediamanager-tab-detail-view">';
+    echo '<div class="background-container">';
+    echo 'Preview of image';
+    echo '</div>';
+
+    echo '<div class="scroll-container">';
+    if($auth < AUTH_READ) return false;
+
+    $info = new JpegMeta(mediaFN($image));
+    $w = (int) $info->getField('File.Width');
+    $src = ml($image);
+    echo '<img src="'.$src.'" alt="" width="99%" style="max-width: '.$w.'px;" />';
+    echo '</div>';
+    echo '</div>';
+}
+
+/**
+ * Prints tab that displays form for editing mediafile metadata
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function media_tab_edit($image, $ns, $auth=null) {
+    global $lang;
+    if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
+
+    echo '<div class="mediamanager-tab-detail-edit">';
+    echo '<div class="background-container">';
+    echo 'Edit';
+    echo '</div>';
+
+    echo '<div class="scroll-container">';
+    media_metaform($image,$auth,true);
+    echo '</div>';
+    echo '</div>';
+}
+
+/**
+ * Prints tab that displays mediafile revisions
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function media_tab_history($image, $ns, $auth=null) {
+    global $lang;
+    if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
+
+    echo '<div class="mediamanager-tab-detail-history">';
+    echo '<div class="background-container">';
+    echo 'History';
+    echo '</div>';
+
+    echo '<div class="scroll-container">';
+
+    echo '</div>';
+    echo '</div>';
 }
 
 /**
@@ -511,9 +758,10 @@ function media_filelist($ns,$auth=null,$jump=''){
  *
  * @author Tobias Sarnowski <sarnowski@cosmocode.de>
  * @author Andreas Gohr <gohr@cosmocode.de>
+ * @author Kate Arzamastseva <pshns@ukr.net>
  * @triggers MEDIA_SEARCH
  */
-function media_searchlist($query,$ns,$auth=null){
+function media_searchlist($query,$ns,$auth=null,$fullscreen=false){
     global $conf;
     global $lang;
     $ns = cleanID($ns);
@@ -538,13 +786,16 @@ function media_searchlist($query,$ns,$auth=null){
         unset($evt);
     }
 
-    echo '<h1 id="media__ns">'.sprintf($lang['searchmedia_in'],hsc($ns).':*').'</h1>'.NL;
-    media_searchform($ns,$query);
+    if (!$fullscreen) {
+        echo '<h1 id="media__ns">'.sprintf($lang['searchmedia_in'],hsc($ns).':*').'</h1>'.NL;
+        media_searchform($ns,$query);
+    }
 
     if(!count($evdata['data'])){
         echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
     }else foreach($evdata['data'] as $item){
-        media_printfile($item,$item['perm'],'',true);
+        if (!$fullscreen) media_printfile($item,$item['perm'],'',true);
+        else media_printfile_thumbs($item,$item['perm'],'',true);
     }
 }
 
@@ -552,7 +803,7 @@ function media_searchlist($query,$ns,$auth=null){
  * Print action links for a file depending on filetype
  * and available permissions
  */
-function media_fileactions($item,$auth){
+function media_fileactions($item,$auth,$fullscreen=false){
     global $lang;
 
     // view button
@@ -565,15 +816,20 @@ function media_fileactions($item,$auth){
 
     // delete button
     if($auth >= AUTH_DELETE){
-        echo ' <a href="'.DOKU_BASE.'lib/exe/mediamanager.php?delete='.rawurlencode($item['id']).
-            '&amp;sectok='.getSecurityToken().'" class="btn_media_delete" title="'.$item['id'].'">'.
+        if (!$fullscreen) $link = DOKU_BASE.'lib/exe/mediamanager.php?delete='.rawurlencode($item['id']).
+            '&amp;sectok='.getSecurityToken();
+        else $link = media_managerURL(array('delete' => $item['id'],
+            'sectok' => getSecurityToken()));
+        echo ' <a href="'.$link.'" class="btn_media_delete" title="'.$item['id'].'">'.
             '<img src="'.DOKU_BASE.'lib/images/trash.png" alt="'.$lang['btn_delete'].'" '.
             'title="'.$lang['btn_delete'].'" class="btn" /></a>';
     }
 
     // edit button
     if($auth >= AUTH_UPLOAD && $item['isimg'] && $item['meta']->getField('File.Mime') == 'image/jpeg'){
-        echo ' <a href="'.DOKU_BASE.'lib/exe/mediamanager.php?edit='.rawurlencode($item['id']).'">'.
+        if (!$fullscreen) $link = DOKU_BASE.'lib/exe/mediamanager.php?edit='.rawurlencode($item['id']);
+        else $link = media_managerURL(array('edit' => $item['id']));
+        echo ' <a href="'.$link.'">'.
             '<img src="'.DOKU_BASE.'lib/images/pencil.png" alt="'.$lang['metaedit'].'" '.
             'title="'.$lang['metaedit'].'" class="btn" /></a>';
     }
@@ -637,15 +893,50 @@ function media_printfile($item,$auth,$jump,$display_namespace=false){
     echo '</div>'.NL;
 }
 
+/**
+ * Formats and prints one file in the list in the thumbnails view
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function media_printfile_thumbs($item,$auth,$jump){
+    global $lang;
+    global $conf;
+
+    // Prepare filename
+    $file = utf8_decodeFN($item['file']);
+
+    // Prepare info
+    $info = '';
+    if($item['isimg']){
+        $info .= (int) $item['meta']->getField('File.Width');
+        $info .= '&#215;';
+        $info .= (int) $item['meta']->getField('File.Height');
+        $info .= '<br/>';
+    }
+    $info .= '<i>'.dformat($item['mtime']).'</i><br/>';
+    $info .= filesize_h($item['size']);
+
+    // output
+    echo '<div class="float-image" >';
+    if($item['isimg']) media_printimgdetail($item, true);
+    echo '<br/><a href="'.media_managerURL(array('image' => hsc($item['id']))).'" name=
+        "h_:'.$item['id'].'"  >'.hsc($file).'</a><br/>';
+    echo '<span>'.$info.'</span><br/>';
+    media_fileactions($item,$auth,true);
+    echo '</div>'.NL;
+}
+
 /**
  * Prints a thumbnail and metainfos
  */
-function media_printimgdetail($item){
+function media_printimgdetail($item, $fullscreen=false){
     // prepare thumbnail
+    if (!$fullscreen) $size = 120;
+    else $size = 90;
     $w = (int) $item['meta']->getField('File.Width');
     $h = (int) $item['meta']->getField('File.Height');
-    if($w>120 || $h>120){
-        $ratio = $item['meta']->getResizeRatio(120);
+    if($w>$size || $h>$size){
+        $ratio = $item['meta']->getResizeRatio($size);
         $w = floor($w * $ratio);
         $h = floor($h * $ratio);
     }
@@ -658,6 +949,13 @@ function media_printimgdetail($item){
     $att = buildAttributes($p);
 
     // output
+    if ($fullscreen) {
+        echo '<a name="d_:'.$item['id'].'" >';
+        echo '<img src="'.$src.'" '.$att.' />';
+        echo '</a>';
+        return 1;
+    }
+
     echo '<div class="detail">';
     echo '<div class="thumb">';
     echo '<a name="d_:'.$item['id'].'" class="select">';
@@ -684,21 +982,59 @@ function media_printimgdetail($item){
     echo '</div>';
 }
 
+/**
+ * Build link based on the current, adding/rewriting
+ * parameters
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ * @param array $params
+ * @param string $amp - separator
+ * @return string - link
+ */
+function media_managerURL($params=false, $amp='&') {
+    global $conf;
+    global $ID;
+
+    $url = $_SERVER['REQUEST_URI'];
+
+    $urlArray = explode('?', $url, 2);
+    $gets = @$urlArray[1];
+    parse_str($gets, $gets);
+
+    if ($gets['edit']) $gets['image'] = $gets['edit'];
+    unset($gets['edit']);
+    unset($gets['sectok']);
+    unset($gets['delete']);
+
+    if ($params) {
+        foreach ($params as $k => $v) {
+            $gets[$k] = $v;
+        }
+    }
+    unset($gets['id']);
+
+    return wl($ID,$gets,false,$amp);
+}
+
 /**
  * Print the media upload form if permissions are correct
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_uploadform($ns, $auth){
+function media_uploadform($ns, $auth, $fullscreen = false){
     global $lang;
 
     if($auth < AUTH_UPLOAD) return; //fixme print info on missing permissions?
 
     // The default HTML upload form
-    $form = new Doku_Form(array('id'      => 'dw__upload',
-                                'action'  => DOKU_BASE.'lib/exe/mediamanager.php',
-                                'enctype' => 'multipart/form-data'));
-    $form->addElement('<div class="upload">' . $lang['mediaupload'] . '</div>');
+    $params = array('id'      => 'dw__upload',
+                    'enctype' => 'multipart/form-data');
+    if (!$fullscreen) $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php';
+    else $params['action'] = media_managerURL(array('tab_files' => 'files'));
+
+    $form = new Doku_Form($params);
+    if (!$fullscreen) $form->addElement('<div class="upload">' . $lang['mediaupload'] . '</div>');
     $form->addElement(formSecurityToken());
     $form->addHidden('ns', hsc($ns));
     $form->addElement(form_makeOpenTag('p'));
@@ -757,16 +1093,21 @@ function media_uploadform($ns, $auth){
  * Print the search field form
  *
  * @author Tobias Sarnowski <sarnowski@cosmocode.de>
+ * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_searchform($ns,$query=''){
+function media_searchform($ns,$query='',$fullscreen=false){
     global $lang;
 
     // The default HTML search form
-    $form = new Doku_Form(array('id' => 'dw__mediasearch', 'action' => DOKU_BASE.'lib/exe/mediamanager.php'));
-    $form->addElement('<div class="upload">' . $lang['mediasearch'] . '</div>');
+    $params = array('id' => 'dw__mediasearch');
+    if (!$fullscreen) $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php';
+    else $params['action'] = media_managerURL();
+    $form = new Doku_Form($params);
+    if (!$fullscreen) $form->addElement('<div class="upload">' . $lang['mediasearch'] . '</div>');
     $form->addElement(formSecurityToken());
     $form->addHidden('ns', $ns);
-    $form->addHidden('do', 'searchlist');
+    if (!$fullscreen) $form->addHidden('do', 'searchlist');
+    else $form->addHidden('mediado', 'searchlist');
     $form->addElement(form_makeOpenTag('p'));
     $form->addElement(form_makeTextField('q', $query,$lang['searchmedia'],'','',array('title'=>sprintf($lang['searchmedia_in'],hsc($ns).':*'))));
     $form->addElement(form_makeButton('submit', '', $lang['btn_search']));
@@ -820,7 +1161,9 @@ function media_nstree_item($item){
     if(!$item['label']) $item['label'] = $label;
 
     $ret  = '';
+    if (!($_REQUEST['do'] == 'media'))
     $ret .= '<a href="'.DOKU_BASE.'lib/exe/mediamanager.php?ns='.idfilter($item['id']).'" class="idx_dir">';
+    else $ret .= '<a href="'.media_managerURL(array('ns' => idfilter($item['id']))).'" class="idx_dir">';
     $ret .= $item['label'];
     $ret .= '</a>';
     return $ret;
diff --git a/inc/template.php b/inc/template.php
index d2d66220c..4bbb501fc 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -123,6 +123,9 @@ function tpl_content_core(){
         case 'subscribe':
             tpl_subscribe();
             break;
+        case 'media':
+            tpl_media();
+            break;
         default:
             $evt = new Doku_Event('TPL_ACT_UNKNOWN',$ACT);
             if ($evt->advise_before())
@@ -1123,6 +1126,56 @@ function tpl_mediaContent($fromajax=false){
 
 }
 
+/**
+ * Prints the central column in full-screen media manager
+ * Depending on the opened tab this may be a list of
+ * files in a namespace, upload form or search form
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function tpl_fileList(){
+    global $AUTH;
+    global $NS;
+    global $JUMPTO;
+
+    $opened_tab = $_REQUEST['tab_files'];
+    if (!$opened_tab) $opened_tab = 'files';
+
+    media_tabs_files($opened_tab);
+    if ($opened_tab == 'files') media_tab_files($NS,$AUTH,$JUMPTO);
+    if ($opened_tab == 'upload') media_tab_upload($NS,$AUTH,$JUMPTO);
+    if ($opened_tab == 'search') media_tab_search($NS,$AUTH);
+
+}
+
+/**
+ * Prints the third column in full-screen media manager
+ * Depending on the opened tab this may be details of the
+ * selected file, the meta editing dialog or
+ * list of file revisions
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function tpl_fileDetails(){
+    global $AUTH;
+    global $NS;
+    global $IMG;
+
+    $opened_tab = $_REQUEST['tab_details'];
+    if (!$opened_tab) $opened_tab = 'view';
+    if ($_REQUEST['edit']) $opened_tab = 'edit';
+    media_tabs_details($opened_tab);
+
+    $image = $_REQUEST['image'];
+    if (!$image && !$IMG) return false;
+    if ($opened_tab == 'view') media_tab_view($image, $NS, $AUTH);
+    if ($opened_tab == 'edit') {
+        if ($IMG) media_tab_edit($IMG, $NS, $AUTH);
+        else if ($image) media_tab_edit($image, $NS, $AUTH);
+    }
+    if ($opened_tab == 'history') media_tab_history($image,$NS,$AUTH);
+}
+
 /**
  * prints the namespace tree in the mediamanger popup
  *
@@ -1130,10 +1183,10 @@ function tpl_mediaContent($fromajax=false){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function tpl_mediaTree(){
+function tpl_mediaTree($fullscreen = false){
     global $NS;
-
-    ptln('<div id="media__tree">');
+    if ($fullscreen) ptln('<div id="media-menu">');
+    else ptln('<div id="media__tree">');
     media_nstree($NS);
     ptln('</div>');
 }
@@ -1359,6 +1412,36 @@ function tpl_getFavicon($abs=false) {
     return DOKU_TPL.'images/favicon.ico';
 }
 
+/**
+ * Prints full-screen media manager
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function tpl_media() {
+    //
+    global $DEL, $NS, $IMG, $AUTH, $JUMPTO;
+    require_once(DOKU_INC.'lib/exe/mediamanager.php');
+
+    echo '<div class="mediamanager" id="id-mediamanager">';
+    echo '<div class="mediamanager-slider" id="id-mediamanager-layout">';
+    echo '<div id="id-mediamanager-layout-namespaces" class="layout" style="width: 25%;">';
+    html_msgarea();
+    echo hsc('Namespaces:');
+    echo '<br /><br />';
+    echo '<div class="scroll-container">';
+    tpl_mediaTree(true);
+    echo '</div>';
+    echo '</div>';
+    echo '<div id="id-mediamanager-layout-list" class="layout" style="width: 40%;">';
+    tpl_fileList();
+    echo '</div>';
+    echo '<div id="id-mediamanager-layout-detail" class="layout" style="width: 30%;">';
+    tpl_fileDetails();
+    echo '</div>';
+    echo '<div class="mediamanager-clear">&nbsp;</div>';
+    echo '</div>';
+    echo '</div>';
+}
 
 //Setup VIM: ex: et ts=4 :
 
-- 
cgit v1.2.3


From 427fd3cc91f3a9d5ccfba4cfad402d45b40cf103 Mon Sep 17 00:00:00 2001
From: Guy Brand <gb@unistra.fr>
Date: Thu, 9 Jun 2011 23:05:06 +0200
Subject: Use mailprefix for media upload emails too (see also FS#2021)

---
 inc/media.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index dcef25cfd..10da501b0 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -435,7 +435,11 @@ function media_notify($id,$file,$mime){
     $text = str_replace('@MEDIA@',ml($id,'',true,'&',true),$text);
     $text = str_replace('@SIZE@',filesize_h(filesize($file)),$text);
 
-    $subject = '['.$conf['title'].'] '.$lang['mail_upload'].' '.$id;
+    if(empty($conf['mailprefix'])) {
+        $subject = '['.$conf['title'].'] '.$lang['mail_upload'].' '.$id;
+    } else {
+        $subject = '['.$conf['mailprefix'].'] '.$lang['mail_upload'].' '.$id;
+    }
 
     mail_send($conf['notify'],$subject,$text,$conf['mailfrom']);
 }
-- 
cgit v1.2.3


From 0b926329daf6b9cd03c01a4e5b26b968d6cb16a8 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 10 Jun 2011 13:19:28 +0300
Subject: recent changes fix

---
 inc/changelog.php | 20 ++++++++++----------
 inc/common.php    |  4 ++--
 inc/html.php      |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'inc')

diff --git a/inc/changelog.php b/inc/changelog.php
index 937214a6a..e9b271363 100644
--- a/inc/changelog.php
+++ b/inc/changelog.php
@@ -151,8 +151,8 @@ function addMediaLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='',
  * RECENTS_SKIP_DELETED   - don't include deleted pages
  * RECENTS_SKIP_MINORS    - don't include minor changes
  * RECENTS_SKIP_SUBSPACES - don't include subspaces
- * RECENTS_SKIP_PAGES  - return media changes instead of page changes
- * RECENTS_INCLUDE_MEDIA  - return both media changes and page changes
+ * RECENTS_MEDIA_CHANGES  - return media changes instead of page changes
+ * RECENTS_MEDIA_PAGES_MIXED  - return both media changes and page changes
  *
  * @param int    $first   number of first entry returned (for paginating
  * @param int    $num     return $num entries
@@ -171,14 +171,14 @@ function getRecents($first,$num,$ns='',$flags=0){
         return $recent;
 
     // read all recent changes. (kept short)
-    if ($flags & RECENTS_SKIP_PAGES) {
+    if ($flags & RECENTS_MEDIA_CHANGES) {
         $lines = @file($conf['media_changelog']);
     } else {
         $lines = @file($conf['changelog']);
     }
     $lines_position = count($lines)-1;
 
-    if ($flags & RECENTS_INCLUDE_MEDIA) {
+    if ($flags & RECENTS_MEDIA_PAGES_MIXED) {
         $media_lines = @file($conf['media_changelog']);
         $media_lines_position = count($media_lines)-1;
     }
@@ -186,7 +186,7 @@ function getRecents($first,$num,$ns='',$flags=0){
     $seen = array(); // caches seen lines, _handleRecent() skips them
 
     // handle lines
-    while ($lines_position >= 0 || (($flags & RECENTS_INCLUDE_MEDIA) && $media_lines_position >=0)) {
+    while ($lines_position >= 0 || (($flags & RECENTS_MEDIA_PAGES_MIXED) && $media_lines_position >=0)) {
         if (empty($rec) && $lines_position >= 0) {
             $rec = _handleRecent(@$lines[$lines_position], $ns, $flags, $seen);
             if (!$rec) {
@@ -194,14 +194,14 @@ function getRecents($first,$num,$ns='',$flags=0){
                 continue;
             }
         }
-        if (($flags & RECENTS_INCLUDE_MEDIA) && empty($media_rec) && $media_lines_position >= 0) {
+        if (($flags & RECENTS_MEDIA_PAGES_MIXED) && empty($media_rec) && $media_lines_position >= 0) {
             $media_rec = _handleRecent(@$media_lines[$media_lines_position], $ns, $flags, $seen);
             if (!$media_rec) {
             	$media_lines_position --;
             	continue;
             }
         }
-        if (($flags & RECENTS_INCLUDE_MEDIA) && @$media_rec['date'] >= @$rec['date']) {
+        if (($flags & RECENTS_MEDIA_PAGES_MIXED) && @$media_rec['date'] >= @$rec['date']) {
             $media_lines_position--;
             $x = $media_rec;
             $media_rec = false;
@@ -229,7 +229,7 @@ function getRecents($first,$num,$ns='',$flags=0){
  * RECENTS_SKIP_DELETED   - don't include deleted pages
  * RECENTS_SKIP_MINORS    - don't include minor changes
  * RECENTS_SKIP_SUBSPACES - don't include subspaces
- * RECENTS_SKIP_PAGES  - return media changes instead of page changes
+ * RECENTS_MEDIA_CHANGES  - return media changes instead of page changes
  *
  * @param int    $from    date of the oldest entry to return
  * @param int    $to      date of the newest entry to return (for pagination, optional)
@@ -247,7 +247,7 @@ function getRecentsSince($from,$to=null,$ns='',$flags=0){
         return $recent;
 
     // read all recent changes. (kept short)
-    if ($flags & RECENTS_SKIP_PAGES) {
+    if ($flags & RECENTS_MEDIA_CHANGES) {
         $lines = @file($conf['media_changelog']);
     } else {
         $lines = @file($conf['changelog']);
@@ -314,7 +314,7 @@ function _handleRecent($line,$ns,$flags,&$seen){
     if ($recent['perms'] < AUTH_READ) return false;
 
     // check existance
-    $fn = (($flags & RECENTS_SKIP_PAGES) ? mediaFN($recent['id']) : wikiFN($recent['id']));
+    $fn = (($flags & RECENTS_MEDIA_CHANGES) ? mediaFN($recent['id']) : wikiFN($recent['id']));
     if((!@file_exists($fn)) && ($flags & RECENTS_SKIP_DELETED)) return false;
 
     return $recent;
diff --git a/inc/common.php b/inc/common.php
index acd3609d6..6d707e704 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -14,8 +14,8 @@ if(!defined('DOKU_INC')) die('meh.');
 define('RECENTS_SKIP_DELETED',2);
 define('RECENTS_SKIP_MINORS',4);
 define('RECENTS_SKIP_SUBSPACES',8);
-define('RECENTS_SKIP_PAGES',16);
-define('RECENTS_INCLUDE_MEDIA',32);
+define('RECENTS_MEDIA_CHANGES',16);
+define('RECENTS_MEDIA_PAGES_MIXED',32);
 
 /**
  * Wrapper around htmlspecialchars()
diff --git a/inc/html.php b/inc/html.php
index 06e9f3b0c..29e40174c 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -577,8 +577,8 @@ function html_recent($first=0, $show_changes='both'){
      * decide if this is the last page or is there another one.
      * This is the cheapest solution to get this information.
      */
-    $flags = RECENTS_INCLUDE_MEDIA;
-    if ($show_changes == 'mediafiles') $flags = RECENTS_SKIP_PAGES;
+    if (!$show_changes || $show_changes == 'both') $flags = RECENTS_MEDIA_PAGES_MIXED;
+    if ($show_changes == 'mediafiles') $flags = RECENTS_MEDIA_CHANGES;
     if ($show_changes == 'pages') $flags = 0;
 
     $recents = getRecents($first,$conf['recent'] + 1,getNS($ID),$flags);
-- 
cgit v1.2.3


From 1ca2719c7488662ebd7964c0d026e0890f923ee9 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 11 Jun 2011 17:12:39 +0200
Subject: Only allow known protocols in RSS links

This fixes a security vulnerability where an attacker could introduce
JavaScript links into wiki pages by including a prepared RSS feed.
---
 inc/parser/xhtml.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'inc')

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 1041268b1..1af3a1ce1 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -40,6 +40,8 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     var $_counter   = array(); // used as global counter, introduced for table classes
     var $_codeblock = 0; // counts the code and file blocks, used to provide download links
 
+    private $schemes = null; // protocol schemes
+
     /**
      * Register a new edit section range
      *
@@ -867,6 +869,14 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
                 $this->doc .= '<li><div class="li">';
                 // support feeds without links
                 $lnkurl = $item->get_permalink();
+                if($lnkurl){
+                    // lnkurl might be an attack vector, only allow registered protocols
+                    if(is_null($this->schemes)) $this->schemes = getSchemes();
+                    list($scheme) = explode('://',$lnkurl);
+                    $scheme = strtolower($scheme);
+                    if(!in_array($scheme,$this->schemes)) $lnkurl = '';
+                }
+
                 if($lnkurl){
                     // title is escaped by SimplePie, we unescape here because it
                     // is escaped again in externallink() FS#1705
-- 
cgit v1.2.3


From 8e69fd30702f1101a9c70dbe6eac6f45f9af3970 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 13 Jun 2011 20:23:18 +0300
Subject: media manager

---
 inc/html.php         | 52 ++++++++++++++++++++++++++++++++++------------------
 inc/lang/en/lang.php | 16 ++++++++++++++++
 inc/media.php        | 50 +++++++++++++++++++++++++-------------------------
 inc/pageutils.php    |  2 +-
 4 files changed, 76 insertions(+), 44 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 29e40174c..738ee6d75 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -415,20 +415,28 @@ function html_locked(){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Ben Coburn <btcoburn@silicodon.net>
+ * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function html_revisions($first=0){
+function html_revisions($first=0, $media_id = false){
     global $ID;
     global $INFO;
     global $conf;
     global $lang;
+    $id = $ID;
     /* we need to get one additionally log entry to be able to
      * decide if this is the last page or is there another one.
      * see html_recent()
      */
-    $revisions = getRevisions($ID, $first, $conf['recent']+1);
+    if (!$media_id) $revisions = getRevisions($ID, $first, $conf['recent']+1);
+    else {
+        $revisions = getRevisions($media_id, $first, $conf['recent']+1, 8192, true);
+        $id = $media_id;
+    }
+
     if(count($revisions)==0 && $first!=0){
         $first=0;
-        $revisions = getRevisions($ID, $first, $conf['recent']+1);;
+        if (!$media_id) $revisions = getRevisions($ID, $first, $conf['recent']+1);
+        else $revisions = getRevisions($media_id, $first, $conf['recent']+1, 8192, true);
     }
     $hasNext = false;
     if (count($revisions)>$conf['recent']) {
@@ -436,14 +444,19 @@ function html_revisions($first=0){
         array_pop($revisions); // remove extra log entry
     }
 
-    $date = dformat($INFO['lastmod']);
+    if (!$media_id) $date = dformat($INFO['lastmod']);
+    else $date = dformat(@filemtime(mediaFN($id)));
 
-    print p_locale_xhtml('revisions');
+    if (!$media_id) print p_locale_xhtml('revisions');
 
     $form = new Doku_Form(array('id' => 'page__revisions'));
     $form->addElement(form_makeOpenTag('ul'));
-    if($INFO['exists'] && $first==0){
-        if (isset($INFO['meta']) && isset($INFO['meta']['last_change']) && $INFO['meta']['last_change']['type']===DOKU_CHANGE_TYPE_MINOR_EDIT)
+
+    if (!$media_id) $exists = $INFO['exists'];
+    else $exists = @file_exists(mediaFN($id));
+
+    if($exists && $first==0){
+        if (!$media_id && isset($INFO['meta']) && isset($INFO['meta']['last_change']) && $INFO['meta']['last_change']['type']===DOKU_CHANGE_TYPE_MINOR_EDIT)
             $form->addElement(form_makeOpenTag('li', array('class' => 'minor')));
         else
             $form->addElement(form_makeOpenTag('li'));
@@ -461,8 +474,8 @@ function html_revisions($first=0){
 
         $form->addElement(form_makeOpenTag('a', array(
                         'class' => 'wikilink1',
-                        'href'  => wl($ID))));
-        $form->addElement($ID);
+                        'href'  => wl($id))));
+        $form->addElement($id);
         $form->addElement(form_makeCloseTag('a'));
 
         $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
@@ -471,6 +484,7 @@ function html_revisions($first=0){
         $form->addElement(form_makeCloseTag('span'));
 
         $form->addElement(form_makeOpenTag('span', array('class' => 'user')));
+        ///
         $form->addElement((empty($INFO['editor']))?('('.$lang['external_edit'].')'):editorinfo($INFO['editor']));
         $form->addElement(form_makeCloseTag('span'));
 
@@ -481,8 +495,9 @@ function html_revisions($first=0){
 
     foreach($revisions as $rev){
         $date   = dformat($rev);
-        $info   = getRevisionInfo($ID,$rev,true);
-        $exists = page_exists($ID,$rev);
+        $info   = getRevisionInfo($id,$rev,true);
+        if (!$media_id) $exists = page_exists($id,$rev);
+        else $exists = @file_exists(mediaFN($id,$rev));
 
         if ($info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT)
             $form->addElement(form_makeOpenTag('li', array('class' => 'minor')));
@@ -503,7 +518,8 @@ function html_revisions($first=0){
         $form->addElement(form_makeCloseTag('span'));
 
         if($exists){
-            $form->addElement(form_makeOpenTag('a', array('href' => wl($ID,"rev=$rev,do=diff", false, '&'), 'class' => 'diff_link')));
+            ///
+            $form->addElement(form_makeOpenTag('a', array('href' => wl($id,"rev=$rev,do=diff", false, '&'), 'class' => 'diff_link')));
             $form->addElement(form_makeTag('img', array(
                             'src'    => DOKU_BASE.'lib/images/diff.png',
                             'width'  => 15,
@@ -511,13 +527,13 @@ function html_revisions($first=0){
                             'title'  => $lang['diff'],
                             'alt'    => $lang['diff'])));
             $form->addElement(form_makeCloseTag('a'));
-
-            $form->addElement(form_makeOpenTag('a', array('href' => wl($ID,"rev=$rev",false,'&'), 'class' => 'wikilink1')));
-            $form->addElement($ID);
+            ///
+            $form->addElement(form_makeOpenTag('a', array('href' => wl($id,"rev=$rev",false,'&'), 'class' => 'wikilink1')));
+            $form->addElement($id);
             $form->addElement(form_makeCloseTag('a'));
         }else{
             $form->addElement('<img src="'.DOKU_BASE.'lib/images/blank.gif" width="15" height="11" alt="" />');
-            $form->addElement($ID);
+            $form->addElement($id);
         }
 
         $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
@@ -549,12 +565,12 @@ function html_revisions($first=0){
         $first -= $conf['recent'];
         if ($first < 0) $first = 0;
         print '<div class="pagenav-prev">';
-        print html_btn('newer',$ID,"p",array('do' => 'revisions', 'first' => $first));
+        print html_btn('newer',$id,"p",array('do' => 'revisions', 'first' => $first));
         print '</div>';
     }
     if ($hasNext) {
         print '<div class="pagenav-next">';
-        print html_btn('older',$ID,"n",array('do' => 'revisions', 'first' => $last));
+        print html_btn('older',$id,"n",array('do' => 'revisions', 'first' => $last));
         print '</div>';
     }
     print '</div>';
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 51fd8f645..5dca273c3 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -48,6 +48,7 @@ $lang['btn_recover']  = 'Recover draft';
 $lang['btn_draftdel'] = 'Delete draft';
 $lang['btn_revert']   = 'Restore';
 $lang['btn_register'] = 'Register';
+$lang['btn_apply'] = 'Apply';
 
 $lang['loggedinas'] = 'Logged in as';
 $lang['user']       = 'Username';
@@ -179,6 +180,9 @@ $lang['external_edit'] = 'external edit';
 $lang['summary']    = 'Edit summary';
 $lang['noflash']    = 'The <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> is needed to display this content.';
 $lang['download']   = 'Download Snippet';
+$lang['pages_changes'] = 'Show pages changes';
+$lang['media_changes'] = 'Show media files changes';
+$lang['both_changes'] = 'Show both';
 
 $lang['mail_newpage']  = 'page added:';
 $lang['mail_changed']  = 'page changed:';
@@ -318,5 +322,17 @@ $lang['seconds'] = '%d seconds ago';
 
 $lang['wordblock'] = 'Your change was not saved because it contains blocked text (spam).';
 
+$lang['media_uploadtab'] = 'Upload';
+$lang['media_searchtab'] = 'Search';
+$lang['media_viewtab']   = 'View';
+$lang['media_edittab']   = 'Edit';
+$lang['media_historytab']   = 'History';
+$lang['media_thumbsview']   = 'Thumnails';
+$lang['media_listview']   = 'List';
+$lang['media_sort']   = 'Sort';
+$lang['media_search'] = 'Search';
+$lang['media_view']   = 'View';
+$lang['media_edit']   = 'Edit';
+$lang['media_history']   = 'These are the older revisons of the file.';
 
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/media.php b/inc/media.php
index d98e225b9..5f443a1f7 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -357,9 +357,7 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov
     global $lang;
 
     $old = @filemtime($fn);
-    $oldRev = getRevisions($id, -1, 1, 1024, true); // from changelog
-    $oldRev = (int)(empty($oldRev)?0:$oldRev[0]);
-    if(!@file_exists(mediaFN($id, $old)) && @file_exists($fn) && $old>=$oldRev) {
+    if(!@file_exists(mediaFN($id, $old)) && @file_exists($fn)) {
         // add old revision to the attic if missing
         media_saveOldRevision($id);
     }
@@ -530,21 +528,21 @@ function media_tabs_files($selected=false){
         '" rel=".mediamanager-tab-files"';
     if (!empty($selected) && $selected == 'files') $class = 'files selected';
     else $class = 'files';
-    $tab .= ' class="'.$class.'" >Files</a>';
+    $tab .= ' class="'.$class.'" >'.$lang['mediaselect'].'</a>';
     echo $tab;
 
     $tab = '<a href="'.media_managerURL(array('tab_files' => 'upload')).
         '" rel=".mediamanager-tab-upload"';
     if (!empty($selected) && $selected == 'upload') $class = 'upload selected';
     else $class = 'upload';
-    $tab .= ' class="'.$class.'" >Upload</a>';
+    $tab .= ' class="'.$class.'" >'.$lang['media_uploadtab'].'</a>';
     echo $tab;
 
     $tab = '<a href="'.media_managerURL(array('tab_files' => 'search')).
         '" rel=".mediamanager-tab-search"';
     if (!empty($selected) && $selected == 'search') $class = 'search selected';
     else $class = 'search';
-    $tab .= ' class="'.$class.'" >Search</a>';
+    $tab .= ' class="'.$class.'" >'.$lang['media_searchtab'].'</a>';
     echo $tab;
 
     echo '<div class="mediamanager-clear">&nbsp;</div>';
@@ -565,21 +563,21 @@ function media_tabs_details($selected=false){
         '" rel=".mediamanager-tab-view"';
     if (!empty($selected) && $selected == 'view') $class = 'view selected';
     else $class = 'view';
-    $tab .= ' class="'.$class.'" >View</a>';
+    $tab .= ' class="'.$class.'" >'.$lang['media_viewtab'].'</a>';
     echo $tab;
 
     $tab = '<a href="'.media_managerURL(array('tab_details' => 'edit')).
         '" rel=".mediamanager-tab-edit"';
     if (!empty($selected) && $selected == 'edit') $class = 'edit selected';
     else $class = 'edit';
-    $tab .= ' class="'.$class.'" >Edit</a>';
+    $tab .= ' class="'.$class.'" >'.$lang['media_edittab'].'</a>';
     echo $tab;
 
     $tab = '<a href="'.media_managerURL(array('tab_details' => 'history')).
         '" rel=".mediamanager-tab-history"';
     if (!empty($selected) && $selected == 'history') $class = 'history selected';
     else $class = 'history';
-    $tab .= ' class="'.$class.'" >History</a>';
+    $tab .= ' class="'.$class.'" >'.$lang['media_historytab'].'</a>';
     echo $tab;
 
     echo '<div class="mediamanager-clear">&nbsp;</div>';
@@ -597,14 +595,14 @@ function media_tab_files_options(){
     echo '<div class="background-container">';
     echo '<div id="id-mediamanager-tabs-files" style="display: inline;">';
     echo '<a href="'.media_managerURL(array('view' => 'thumbs')).'"
-        rel=".mediamanager-files-thumbnails-tab" class="mediamanager-link-thumbnails">
-        Thumbs</a>';
+        rel=".mediamanager-files-thumbnails-tab" class="mediamanager-link-thumbnails">'.
+        $lang['media_thumbsview'].'</a>';
     echo '<a href="'.media_managerURL(array('view' => 'list')).'"
         rel=".mediamanager-files-list-tab" class="mediamanager-link-list"
-        title="View as list">List</a>';
+        title="View as list">'.$lang['media_listview'].'</a>';
 
     echo '</div>';
-    echo '<div class="mediamanager-block-sort">Sort';
+    echo '<div class="mediamanager-block-sort">'.$lang['media_sort'];
     //select
     echo '</div>';
     echo '<div class="mediamanager-clear">&nbsp;</div>';
@@ -675,7 +673,7 @@ function media_tab_search($ns,$auth=null) {
 
     echo '<div class="mediamanager-tab-search">';
     echo '<div class="background-container">';
-    echo 'Search';
+    echo $lang['media_search'];
     echo'</div>';
 
     echo '<div class="scroll-container">';
@@ -699,16 +697,16 @@ function media_tab_view($image, $ns, $auth=null) {
 
     echo '<div class="mediamanager-tab-detail-view">';
     echo '<div class="background-container">';
-    echo 'Preview of image';
+    echo $lang['media_view'];
     echo '</div>';
 
     echo '<div class="scroll-container">';
-    if($auth < AUTH_READ) return false;
-
-    $info = new JpegMeta(mediaFN($image));
-    $w = (int) $info->getField('File.Width');
-    $src = ml($image);
-    echo '<img src="'.$src.'" alt="" width="99%" style="max-width: '.$w.'px;" />';
+    if ($auth >= AUTH_READ && $image) {
+        $info = new JpegMeta(mediaFN($image));
+        $w = (int) $info->getField('File.Width');
+        $src = ml($image);
+        echo '<img src="'.$src.'" alt="" width="99%" style="max-width: '.$w.'px;" />';
+    }
     echo '</div>';
     echo '</div>';
 }
@@ -724,11 +722,11 @@ function media_tab_edit($image, $ns, $auth=null) {
 
     echo '<div class="mediamanager-tab-detail-edit">';
     echo '<div class="background-container">';
-    echo 'Edit';
+    echo $lang['media_edit'];
     echo '</div>';
 
     echo '<div class="scroll-container">';
-    media_metaform($image,$auth,true);
+    if ($image) media_metaform($image,$auth,true);
     echo '</div>';
     echo '</div>';
 }
@@ -744,11 +742,12 @@ function media_tab_history($image, $ns, $auth=null) {
 
     echo '<div class="mediamanager-tab-detail-history">';
     echo '<div class="background-container">';
-    echo 'History';
+    echo $lang['media_history'];
     echo '</div>';
 
     echo '<div class="scroll-container">';
-
+    $first = isset($_REQUEST['first']) ? intval($_REQUEST['first']) : 0;
+    html_revisions($first, $image);
     echo '</div>';
     echo '</div>';
 }
@@ -764,6 +763,7 @@ function media_tab_history($image, $ns, $auth=null) {
 function media_searchlist($query,$ns,$auth=null,$fullscreen=false){
     global $conf;
     global $lang;
+
     $ns = cleanID($ns);
 
     if ($query) {
diff --git a/inc/pageutils.php b/inc/pageutils.php
index 09a23cbdd..81dcb66e7 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -347,7 +347,7 @@ function mediaFN($id, $rev=''){
         $fn = $conf['mediadir'].'/'.utf8_encodeFN($id);
     }else{
     	$ext = mimetype($id);
-    	$name = substr($id,0, -1*strlen($ext[0]));
+    	$name = substr($id,0, -1*strlen($ext[0])-1);
         $fn = $conf['mediaolddir'].'/'.utf8_encodeFN($name .'.'.( (int) $rev ).'.'.$ext[0]);
     }
     return $fn;
-- 
cgit v1.2.3


From dad6764e5f177713a165deee69b5a0e84b9548b8 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Tue, 14 Jun 2011 18:31:37 +0300
Subject: media history

---
 inc/html.php  | 42 +++++++++++++++++++++++++++++-------------
 inc/media.php | 13 ++++++++++---
 2 files changed, 39 insertions(+), 16 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 738ee6d75..cf0b00397 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -472,20 +472,30 @@ function html_revisions($first=0, $media_id = false){
 
         $form->addElement('<img src="'.DOKU_BASE.'lib/images/blank.gif" width="15" height="11" alt="" />');
 
+        if (!$media_id) $href = wl($id);
+        else $href = media_managerURL(array('image' => $id, 'tab_details' => 'view'));
         $form->addElement(form_makeOpenTag('a', array(
                         'class' => 'wikilink1',
-                        'href'  => wl($id))));
+                        'href'  => $href)));
         $form->addElement($id);
         $form->addElement(form_makeCloseTag('a'));
 
         $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
         $form->addElement(' &ndash; ');
-        $form->addElement(htmlspecialchars($INFO['sum']));
+        if (!$media_id) $form->addElement(htmlspecialchars($INFO['sum']));
         $form->addElement(form_makeCloseTag('span'));
 
         $form->addElement(form_makeOpenTag('span', array('class' => 'user')));
-        ///
-        $form->addElement((empty($INFO['editor']))?('('.$lang['external_edit'].')'):editorinfo($INFO['editor']));
+        if (!$media_id) $editor = $INFO['editor'];
+        else {
+            $revinfo = getRevisionInfo($id, @filemtime(fullpath(mediaFN($id))), 1024, true);
+            if($revinfo['user']){
+                $editor = $revinfo['user'];
+            }else{
+                $editor = $revinfo['ip'];
+            }
+        }
+        $form->addElement((empty($editor))?('('.$lang['external_edit'].')'):editorinfo($editor));
         $form->addElement(form_makeCloseTag('span'));
 
         $form->addElement('('.$lang['current'].')');
@@ -494,10 +504,14 @@ function html_revisions($first=0, $media_id = false){
     }
 
     foreach($revisions as $rev){
-        $date   = dformat($rev);
-        $info   = getRevisionInfo($id,$rev,true);
-        if (!$media_id) $exists = page_exists($id,$rev);
-        else $exists = @file_exists(mediaFN($id,$rev));
+        $date = dformat($rev);
+        if (!$media_id) {
+            $info = getRevisionInfo($id,$rev,true);
+            $exists = page_exists($id,$rev);
+        }  else {
+            $info = getRevisionInfo($id,$rev,true,true);
+            $exists = @file_exists(mediaFN($id,$rev));
+        }
 
         if ($info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT)
             $form->addElement(form_makeOpenTag('li', array('class' => 'minor')));
@@ -518,8 +532,9 @@ function html_revisions($first=0, $media_id = false){
         $form->addElement(form_makeCloseTag('span'));
 
         if($exists){
-            ///
-            $form->addElement(form_makeOpenTag('a', array('href' => wl($id,"rev=$rev,do=diff", false, '&'), 'class' => 'diff_link')));
+            if (!$media_id) $href = wl($id,"rev=$rev,do=diff", false, '&');
+            else $href = media_managerURL(array('image' => $id, 'tab_details' => 'view', 'rev' => $rev));
+            $form->addElement(form_makeOpenTag('a', array('href' => $href, 'class' => 'diff_link')));
             $form->addElement(form_makeTag('img', array(
                             'src'    => DOKU_BASE.'lib/images/diff.png',
                             'width'  => 15,
@@ -527,8 +542,9 @@ function html_revisions($first=0, $media_id = false){
                             'title'  => $lang['diff'],
                             'alt'    => $lang['diff'])));
             $form->addElement(form_makeCloseTag('a'));
-            ///
-            $form->addElement(form_makeOpenTag('a', array('href' => wl($id,"rev=$rev",false,'&'), 'class' => 'wikilink1')));
+            if (!$media_id) $href = wl($id,"rev=$rev",false,'&');
+            else $href = media_managerURL(array('image' => $id, 'tab_details' => 'view', 'rev' => $rev));
+            $form->addElement(form_makeOpenTag('a', array('href' => $href, 'class' => 'wikilink1')));
             $form->addElement($id);
             $form->addElement(form_makeCloseTag('a'));
         }else{
@@ -556,7 +572,7 @@ function html_revisions($first=0, $media_id = false){
         $form->addElement(form_makeCloseTag('li'));
     }
     $form->addElement(form_makeCloseTag('ul'));
-    $form->addElement(form_makeButton('submit', 'diff', $lang['diff2']));
+    if (!$media_id) $form->addElement(form_makeButton('submit', 'diff', $lang['diff2']));
     html_form('revisions', $form);
 
     print '<div class="pagenav">';
diff --git a/inc/media.php b/inc/media.php
index 5f443a1f7..b5c11fc2c 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -366,6 +366,7 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov
     io_createNamespace($id, 'media');
 
     if($move($fn_tmp, $fn)) {
+        $new = @filemtime($fn);
         // Set the correct permission here.
         // Always chmod media because they may be saved with different permissions than expected from the php umask.
         // (Should normally chmod to $conf['fperm'] only if $conf['fperm'] is set.)
@@ -374,9 +375,9 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov
         media_notify($id,$fn,$imime);
         // add a log entry to the media changelog
         if ($overwrite) {
-            addMediaLogEntry(time(), $id, DOKU_CHANGE_TYPE_EDIT);
+            addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_EDIT);
         } else {
-            addMediaLogEntry(time(), $id, DOKU_CHANGE_TYPE_CREATE);
+            addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_CREATE, $lang['created']);
         }
         return $id;
     }else{
@@ -704,7 +705,12 @@ function media_tab_view($image, $ns, $auth=null) {
     if ($auth >= AUTH_READ && $image) {
         $info = new JpegMeta(mediaFN($image));
         $w = (int) $info->getField('File.Width');
-        $src = ml($image);
+
+        $rev = $_REQUEST['rev'];
+        $more = '';
+        if (isset($rev)) $more = "rev=$rev";
+        $src = ml($image, $more);
+
         echo '<img src="'.$src.'" alt="" width="99%" style="max-width: '.$w.'px;" />';
     }
     echo '</div>';
@@ -1005,6 +1011,7 @@ function media_managerURL($params=false, $amp='&') {
     unset($gets['edit']);
     unset($gets['sectok']);
     unset($gets['delete']);
+    unset($gets['rev']);
 
     if ($params) {
         foreach ($params as $k => $v) {
-- 
cgit v1.2.3


From 5f27cb0eab98fa6b4856278436d6aacadc4a1acb Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Tue, 14 Jun 2011 20:29:56 +0200
Subject: Fix lowercasing of words in the indexer FS#2270

On certain PHP installations (it has been reproduced with PHP version
5.2.0-8+etch11) the indexer failed to lowercase words in the indexer
so the fulltext search was partially broken.
---
 inc/indexer.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/indexer.php b/inc/indexer.php
index 1f0094876..546b2a288 100644
--- a/inc/indexer.php
+++ b/inc/indexer.php
@@ -444,9 +444,12 @@ class Doku_Indexer {
             $text = utf8_stripspecials($text, ' ', '\._\-:'.$wc);
 
         $wordlist = explode(' ', $text);
-        foreach ($wordlist as $i => &$word) {
-            $word = (preg_match('/[^0-9A-Za-z]/u', $word)) ?
+        foreach ($wordlist as $i => $word) {
+            $wordlist[$i] = (preg_match('/[^0-9A-Za-z]/u', $word)) ?
                 utf8_strtolower($word) : strtolower($word);
+        }
+
+        foreach ($wordlist as $i => $word) {
             if ((!is_numeric($word) && strlen($word) < IDX_MINWORDLENGTH)
               || array_search($word, $stopwords) !== false)
                 unset($wordlist[$i]);
-- 
cgit v1.2.3


From b52b15965611fc865058c0331b55e4e9bccabd2e Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 14 Jun 2011 19:50:29 +0200
Subject: only allow configured URL schemes in external links

This fixes a problem where JavaScript could be introduced through
specially crafted RSS feeds on a lower level than the commit from
yesterday (1ca2719c7488662ebd7964c0d026e0890f923ee9)

This also fixes a problem where JavaScript links could be introduced by
specifying it as an RSS URL: the resulting error message displays a
link to the broken feed URL. This patch makes sure there's no working
link for unknown protocols.
---
 inc/parser/xhtml.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'inc')

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 1af3a1ce1..22dc58963 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -648,6 +648,19 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
         $name = $this->_getLinkTitle($name, $url, $isImage);
 
+        // url might be an attack vector, only allow registered protocols
+        if(is_null($this->schemes)) $this->schemes = getSchemes();
+        list($scheme) = explode('://',$url);
+        $scheme = strtolower($scheme);
+        if(!in_array($scheme,$this->schemes)) $url = '';
+
+        // is there still an URL?
+        if(!$url){
+            $this->doc .= $name;
+            return;
+        }
+
+        // set class
         if ( !$isImage ) {
             $class='urlextern';
         } else {
-- 
cgit v1.2.3


From 5a2f326fba4cd3f692b56807e5a169b54253fda9 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 14 Jun 2011 19:58:44 +0200
Subject: Revert "Only allow known protocols in RSS links"

This reverts commit 1ca2719c7488662ebd7964c0d026e0890f923ee9 as it is
now superseeded by a6b82e436e3d68a42a6556165d6aaf9249db44cd
---
 inc/parser/xhtml.php | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'inc')

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 22dc58963..83359cd55 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -40,8 +40,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     var $_counter   = array(); // used as global counter, introduced for table classes
     var $_codeblock = 0; // counts the code and file blocks, used to provide download links
 
-    private $schemes = null; // protocol schemes
-
     /**
      * Register a new edit section range
      *
@@ -882,14 +880,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
                 $this->doc .= '<li><div class="li">';
                 // support feeds without links
                 $lnkurl = $item->get_permalink();
-                if($lnkurl){
-                    // lnkurl might be an attack vector, only allow registered protocols
-                    if(is_null($this->schemes)) $this->schemes = getSchemes();
-                    list($scheme) = explode('://',$lnkurl);
-                    $scheme = strtolower($scheme);
-                    if(!in_array($scheme,$this->schemes)) $lnkurl = '';
-                }
-
                 if($lnkurl){
                     // title is escaped by SimplePie, we unescape here because it
                     // is escaped again in externallink() FS#1705
-- 
cgit v1.2.3


From 7d939e4ea58754a44f0e564ecb163cbfde5b6ae7 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Tue, 14 Jun 2011 20:44:53 +0200
Subject: Force search index update after fixing the lowercasing of words

This increases the indexer version in order to force a rebuild of the
search index in order to "repair" the search index that might contain
uppercase words
---
 inc/indexer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/indexer.php b/inc/indexer.php
index 546b2a288..9d8d6f99b 100644
--- a/inc/indexer.php
+++ b/inc/indexer.php
@@ -10,7 +10,7 @@
 if(!defined('DOKU_INC')) die('meh.');
 
 // Version tag used to force rebuild on upgrade
-define('INDEXER_VERSION', 4);
+define('INDEXER_VERSION', 5);
 
 // set the minimum token length to use in the index (note, this doesn't apply to numeric tokens)
 if (!defined('IDX_MINWORDLENGTH')) define('IDX_MINWORDLENGTH',2);
-- 
cgit v1.2.3


From 1eeeced2339756132a78e5f1893cb3677c0f6529 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 15 Jun 2011 18:09:26 +0300
Subject: media manager fixes

---
 inc/media.php    | 97 ++++++++++++++++++++++++++++++++++++++++++++------------
 inc/template.php |  5 +--
 2 files changed, 80 insertions(+), 22 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index b5c11fc2c..56f824cb6 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -702,17 +702,7 @@ function media_tab_view($image, $ns, $auth=null) {
     echo '</div>';
 
     echo '<div class="scroll-container">';
-    if ($auth >= AUTH_READ && $image) {
-        $info = new JpegMeta(mediaFN($image));
-        $w = (int) $info->getField('File.Width');
-
-        $rev = $_REQUEST['rev'];
-        $more = '';
-        if (isset($rev)) $more = "rev=$rev";
-        $src = ml($image, $more);
-
-        echo '<img src="'.$src.'" alt="" width="99%" style="max-width: '.$w.'px;" />';
-    }
+    media_preview($image, $auth);
     echo '</div>';
     echo '</div>';
 }
@@ -732,7 +722,11 @@ function media_tab_edit($image, $ns, $auth=null) {
     echo '</div>';
 
     echo '<div class="scroll-container">';
-    if ($image) media_metaform($image,$auth,true);
+    if ($image) {
+        $info = new JpegMeta(mediaFN($image));
+        if ($info->getField('File.Mime') == 'image/jpeg')
+            media_metaform($image,$auth,true);
+    }
     echo '</div>';
     echo '</div>';
 }
@@ -758,6 +752,68 @@ function media_tab_history($image, $ns, $auth=null) {
     echo '</div>';
 }
 
+/**
+ * Prints mediafile details
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function media_preview($image, $auth) {
+    global $lang;
+    if ($auth >= AUTH_READ && $image) {
+        $info = new JpegMeta(mediaFN($image));
+        $w = (int) $info->getField('File.Width');
+
+        $rev = $_REQUEST['rev'];
+        $more = '';
+        if (isset($rev)) $more = "rev=$rev";
+        $src = ml($image, $more);
+
+        echo '<img src="'.$src.'" alt="" width="99%" style="max-width: '.$w.'px;" /><br /><br />';
+
+        $link = ml($image,'',true);
+        echo $image.' <a href="'.$link.'" target="_blank"><img src="'.DOKU_BASE.'lib/images/magnifier.png" '.
+        'alt="'.$lang['mediaview'].'" title="'.$lang['mediaview'].'" class="btn" /></a>';
+
+        // delete button
+        if($auth >= AUTH_DELETE){
+           $link = media_managerURL(array('delete' => $image,'sectok' => getSecurityToken()));
+            echo ' <a href="'.$link.'" class="btn_media_delete" title="'.$image.'">'.
+                '<img src="'.DOKU_BASE.'lib/images/trash.png" alt="'.$lang['btn_delete'].'" '.
+                'title="'.$lang['btn_delete'].'" class="btn" /></a>';
+        }
+
+        echo '<br /><br />';
+
+        $tags = array(
+            array('simple.title','img_title','text'),
+            array('Date.EarliestTime','img_date','date'),
+            array('File.Name','img_fname','text'),
+            array(array('Iptc.Byline','Exif.TIFFArtist','Exif.Artist','Iptc.Credit'),'img_artist','text'),
+            array(array('Iptc.CopyrightNotice','Exif.TIFFCopyright','Exif.Copyright'),'img_copyr','text'),
+            array('File.Format','img_format','text'),
+            array('File.NiceSize','img_fsize','text'),
+            array('Simple.Camera','img_camera','text'),
+            array(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject'),'img_keywords','text')
+        );
+
+        $src = mediaFN($image);
+        echo '<dl class="img_tags">';
+        foreach($tags as $key => $tag){
+            $t = $tag[0];
+            if (!is_array($t)) $t = array($tag[0]);
+            $value = tpl_img_getTag($t,'',$src);
+            $value = cleanText($value);
+            if ($value) {
+                echo '<dt>'.$lang[$tag[1]].':</dt><dd>';
+                if ($tag[2] == 'text') echo hsc($value);
+                if ($tag[2] == 'date') echo dformat($value);
+                echo '</dd>';
+            }
+        }
+        echo '</dl>';
+    }
+}
+
 /**
  * List all files found by the search request
  *
@@ -809,7 +865,7 @@ function media_searchlist($query,$ns,$auth=null,$fullscreen=false){
  * Print action links for a file depending on filetype
  * and available permissions
  */
-function media_fileactions($item,$auth,$fullscreen=false){
+function media_fileactions($item,$auth){
     global $lang;
 
     // view button
@@ -822,10 +878,8 @@ function media_fileactions($item,$auth,$fullscreen=false){
 
     // delete button
     if($auth >= AUTH_DELETE){
-        if (!$fullscreen) $link = DOKU_BASE.'lib/exe/mediamanager.php?delete='.rawurlencode($item['id']).
+        $link = DOKU_BASE.'lib/exe/mediamanager.php?delete='.rawurlencode($item['id']).
             '&amp;sectok='.getSecurityToken();
-        else $link = media_managerURL(array('delete' => $item['id'],
-            'sectok' => getSecurityToken()));
         echo ' <a href="'.$link.'" class="btn_media_delete" title="'.$item['id'].'">'.
             '<img src="'.DOKU_BASE.'lib/images/trash.png" alt="'.$lang['btn_delete'].'" '.
             'title="'.$lang['btn_delete'].'" class="btn" /></a>';
@@ -833,8 +887,7 @@ function media_fileactions($item,$auth,$fullscreen=false){
 
     // edit button
     if($auth >= AUTH_UPLOAD && $item['isimg'] && $item['meta']->getField('File.Mime') == 'image/jpeg'){
-        if (!$fullscreen) $link = DOKU_BASE.'lib/exe/mediamanager.php?edit='.rawurlencode($item['id']);
-        else $link = media_managerURL(array('edit' => $item['id']));
+        $link = DOKU_BASE.'lib/exe/mediamanager.php?edit='.rawurlencode($item['id']);
         echo ' <a href="'.$link.'">'.
             '<img src="'.DOKU_BASE.'lib/images/pencil.png" alt="'.$lang['metaedit'].'" '.
             'title="'.$lang['metaedit'].'" class="btn" /></a>';
@@ -928,7 +981,6 @@ function media_printfile_thumbs($item,$auth,$jump){
     echo '<br/><a href="'.media_managerURL(array('image' => hsc($item['id']))).'" name=
         "h_:'.$item['id'].'"  >'.hsc($file).'</a><br/>';
     echo '<span>'.$info.'</span><br/>';
-    media_fileactions($item,$auth,true);
     echo '</div>'.NL;
 }
 
@@ -956,7 +1008,8 @@ function media_printimgdetail($item, $fullscreen=false){
 
     // output
     if ($fullscreen) {
-        echo '<a name="d_:'.$item['id'].'" >';
+        echo '<a name="d_:'.$item['id'].'" href="'.
+            media_managerURL(array('image' => hsc($item['id']))).'">';
         echo '<img src="'.$src.'" '.$att.' />';
         echo '</a>';
         return 1;
@@ -1019,6 +1072,10 @@ function media_managerURL($params=false, $amp='&') {
         }
     }
     unset($gets['id']);
+    if ($gets['delete']) {
+        unset($gets['image']);
+        unset($gets['tab_details']);
+    }
 
     return wl($ID,$gets,false,$amp);
 }
diff --git a/inc/template.php b/inc/template.php
index 4bbb501fc..1fb5490f5 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1161,13 +1161,14 @@ function tpl_fileDetails(){
     global $NS;
     global $IMG;
 
+    $image = $_REQUEST['image'];
+    if (!isset($IMG) && !isset($image)) return '';
+
     $opened_tab = $_REQUEST['tab_details'];
     if (!$opened_tab) $opened_tab = 'view';
     if ($_REQUEST['edit']) $opened_tab = 'edit';
     media_tabs_details($opened_tab);
 
-    $image = $_REQUEST['image'];
-    if (!$image && !$IMG) return false;
     if ($opened_tab == 'view') media_tab_view($image, $NS, $AUTH);
     if ($opened_tab == 'edit') {
         if ($IMG) media_tab_edit($IMG, $NS, $AUTH);
-- 
cgit v1.2.3


From 388f4f75942dac4bbbc0806ea703f10f23b660ea Mon Sep 17 00:00:00 2001
From: Kiril Velikov <neohidra@gmail.com>
Date: Thu, 16 Jun 2011 18:58:59 +0200
Subject: Bulgarian language update

---
 inc/lang/bg/diff.txt     | 1 -
 inc/lang/bg/install.html | 8 +++-----
 inc/lang/bg/login.txt    | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/bg/diff.txt b/inc/lang/bg/diff.txt
index b1d49de92..a22031e93 100644
--- a/inc/lang/bg/diff.txt
+++ b/inc/lang/bg/diff.txt
@@ -1,4 +1,3 @@
 ====== Разлики ======
 
 Тук са показани разликите между избраната и текущата версия на страницата.
-
diff --git a/inc/lang/bg/install.html b/inc/lang/bg/install.html
index 9d275d82a..44f02f4c2 100644
--- a/inc/lang/bg/install.html
+++ b/inc/lang/bg/install.html
@@ -1,17 +1,15 @@
-<p>Страницата помага при първа инсталация и настройване на
+<p>Страницата помага при инсталиране за първи път и настройване на
 <a href="http://dokuwiki.org">Dokuwiki</a>.  Повече информация 
 за инсталатора ще намерите в <a href="http://dokuwiki.org/installer">документацията му</a>.</p>
 
-<p>Dokuwiki ползва обикновени файлове за хранилище на страниците и друга 
-информация свързана с тях (примерно картинки, търсене, стари версии, и др.).
+<p>Dokuwiki ползва обикновени файлове за съхраняване на страниците и информацията свързана с тях (примерно картинки, търсения, стари версии, и др.).
 За да функционира нормално DokuWiki 
 <strong>трябва</strong> да има право за писане в директориите, които съдържат тези
 файлове. Инсталаторът не може да настройва правата на директориите. 
 Вие трябва да направите това директно от командният ред или ако ползвате хостинг през FTP или контролния панела на хоста (примерно cPanel).</p>
 
 <p>Инсталаторът ще настрои вашата DokuWiki конфигурация на
-<acronym title="списъка за достъп">ACL</acronym>, което ще позволи на администратора да се впише и ползва администраторското меню в DokuWiki за инсталиране на приставки, контрол 
-на потребители, управление на достъпа до страниците и промяна на останалите настройки. Това не е необходимо за функционирането на DokuWiki, но направи администрирането по-лесно.</p>
+<acronym title="списъка за достъп">ACL</acronym>, което ще позволи на администратора да се впише и ползва администраторското меню в DokuWiki за инсталиране на приставки, контрол на потребителите, управление на достъпа до страниците и промяна на останалите настройки. Това не е необходимо за функционирането на DokuWiki, но прави администрирането по-лесно.</p>
 
 <p>Опитните потребители и потребителите със специални изисквания към настройките имат на разположение допълнителна информация относно <a href="http://dokuwiki.org/install">инсталирането</a>
 и <a href="http://dokuwiki.org/config">настройването</a>.</p>
diff --git a/inc/lang/bg/login.txt b/inc/lang/bg/login.txt
index a6f53e95d..e5061c3d3 100644
--- a/inc/lang/bg/login.txt
+++ b/inc/lang/bg/login.txt
@@ -1,3 +1,3 @@
 ====== Вписване ======
 
-Не сте се вписали! Въведете данните си удостоверяване  отдолу, за да го направите. Бисквитките (cookies) трябва да са включени.
+Не сте се вписали! Въведете данните си за удостоверяване отдолу, за да го направите. Бисквитките (cookies) трябва да са включени.
-- 
cgit v1.2.3


From b9eb2e61ea959c1f8b3a5c58ad50a0f9c8c855ad Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 20 Jun 2011 10:51:48 +0300
Subject: media manager button

---
 inc/lang/en/lang.php | 5 +++--
 inc/template.php     | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 5dca273c3..dbd3ae9be 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -49,6 +49,7 @@ $lang['btn_draftdel'] = 'Delete draft';
 $lang['btn_revert']   = 'Restore';
 $lang['btn_register'] = 'Register';
 $lang['btn_apply'] = 'Apply';
+$lang['btn_media'] = 'Media Manager';
 
 $lang['loggedinas'] = 'Logged in as';
 $lang['user']       = 'Username';
@@ -327,12 +328,12 @@ $lang['media_searchtab'] = 'Search';
 $lang['media_viewtab']   = 'View';
 $lang['media_edittab']   = 'Edit';
 $lang['media_historytab']   = 'History';
-$lang['media_thumbsview']   = 'Thumnails';
+$lang['media_thumbsview']   = 'Thumbnails';
 $lang['media_listview']   = 'List';
 $lang['media_sort']   = 'Sort';
 $lang['media_search'] = 'Search';
 $lang['media_view']   = 'View';
 $lang['media_edit']   = 'Edit';
-$lang['media_history']   = 'These are the older revisons of the file.';
+$lang['media_history']   = 'These are the older revisions of the file.';
 
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/template.php b/inc/template.php
index 1fb5490f5..31320c876 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -630,6 +630,8 @@ function tpl_get_action($type) {
             // Superseded by subscribe/subscription
             return '';
             break;
+        case 'media':
+            break;
         default:
             return '[unknown %s type]';
             break;
-- 
cgit v1.2.3


From 2e55802c049a2388811419cc4acd287b29279928 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 20 Jun 2011 11:02:46 +0300
Subject: media history

---
 inc/html.php         |   9 ++-
 inc/lang/en/lang.php |   2 +
 inc/media.php        | 181 +++++++++++++++++++++++++++++++++++++--------------
 3 files changed, 140 insertions(+), 52 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index cf0b00397..809db30bd 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -533,7 +533,7 @@ function html_revisions($first=0, $media_id = false){
 
         if($exists){
             if (!$media_id) $href = wl($id,"rev=$rev,do=diff", false, '&');
-            else $href = media_managerURL(array('image' => $id, 'tab_details' => 'view', 'rev' => $rev));
+            else $href = media_managerURL(array('image' => $id, 'rev' => $rev, 'mediado' => 'diff'));
             $form->addElement(form_makeOpenTag('a', array('href' => $href, 'class' => 'diff_link')));
             $form->addElement(form_makeTag('img', array(
                             'src'    => DOKU_BASE.'lib/images/diff.png',
@@ -572,7 +572,12 @@ function html_revisions($first=0, $media_id = false){
         $form->addElement(form_makeCloseTag('li'));
     }
     $form->addElement(form_makeCloseTag('ul'));
-    if (!$media_id) $form->addElement(form_makeButton('submit', 'diff', $lang['diff2']));
+    if (!$media_id) {
+        $form->addElement(form_makeButton('submit', 'diff', $lang['diff2']));
+    } else {
+        $form->addHidden('mediado', 'diff');
+        $form->addElement(form_makeButton('submit', '', $lang['diff2']));
+    }
     html_form('revisions', $form);
 
     print '<div class="pagenav">';
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index dbd3ae9be..e0e2e6cf5 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -241,6 +241,8 @@ $lang['img_copyr']   = 'Copyright';
 $lang['img_format']  = 'Format';
 $lang['img_camera']  = 'Camera';
 $lang['img_keywords']= 'Keywords';
+$lang['img_width']   = 'Width';
+$lang['img_height']  = 'Height';
 
 $lang['subscr_subscribe_success']  = 'Added %s to subscription list for %s';
 $lang['subscr_subscribe_error']    = 'Error adding %s to subscription list for %s';
diff --git a/inc/media.php b/inc/media.php
index 56f824cb6..1bcb6a7b2 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -702,7 +702,9 @@ function media_tab_view($image, $ns, $auth=null) {
     echo '</div>';
 
     echo '<div class="scroll-container">';
-    media_preview($image, $auth);
+    $rev = (int) $_REQUEST['rev'];
+    media_preview($image, $auth, $rev);
+    media_details($image, $auth, $rev);
     echo '</div>';
     echo '</div>';
 }
@@ -739,6 +741,7 @@ function media_tab_edit($image, $ns, $auth=null) {
 function media_tab_history($image, $ns, $auth=null) {
     global $lang;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
+    $do = $_REQUEST['mediado'];
 
     echo '<div class="mediamanager-tab-detail-history">';
     echo '<div class="background-container">';
@@ -746,8 +749,14 @@ function media_tab_history($image, $ns, $auth=null) {
     echo '</div>';
 
     echo '<div class="scroll-container">';
-    $first = isset($_REQUEST['first']) ? intval($_REQUEST['first']) : 0;
-    html_revisions($first, $image);
+    if ($auth >= AUTH_READ && $image) {
+        if ($do == 'diff'){
+            media_diff($image, $ns, $auth);
+        } else {
+            $first = isset($_REQUEST['first']) ? intval($_REQUEST['first']) : 0;
+            html_revisions($first, $image);
+        }
+    }
     echo '</div>';
     echo '</div>';
 }
@@ -757,61 +766,132 @@ function media_tab_history($image, $ns, $auth=null) {
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_preview($image, $auth) {
+function media_preview($image, $auth, $rev=false) {
     global $lang;
-    if ($auth >= AUTH_READ && $image) {
-        $info = new JpegMeta(mediaFN($image));
-        $w = (int) $info->getField('File.Width');
+    if ($auth < AUTH_READ || !$image) return '';
+    $info = new JpegMeta(mediaFN($image));
+    $w = (int) $info->getField('File.Width');
 
-        $rev = $_REQUEST['rev'];
-        $more = '';
-        if (isset($rev)) $more = "rev=$rev";
-        $src = ml($image, $more);
+    $more = '';
+    if ($rev) $more = "rev=$rev";
+    $src = ml($image, $more);
 
-        echo '<img src="'.$src.'" alt="" width="99%" style="max-width: '.$w.'px;" /><br /><br />';
+    echo '<img src="'.$src.'" alt="" width="99%" style="max-width: '.$w.'px;" /><br /><br />';
 
-        $link = ml($image,'',true);
-        echo $image.' <a href="'.$link.'" target="_blank"><img src="'.DOKU_BASE.'lib/images/magnifier.png" '.
-        'alt="'.$lang['mediaview'].'" title="'.$lang['mediaview'].'" class="btn" /></a>';
+    $link = ml($image,$more,true);
+    echo $image.' <a href="'.$link.'" target="_blank"><img src="'.DOKU_BASE.'lib/images/magnifier.png" '.
+    'alt="'.$lang['mediaview'].'" title="'.$lang['mediaview'].'" class="btn" /></a>';
 
-        // delete button
-        if($auth >= AUTH_DELETE){
-           $link = media_managerURL(array('delete' => $image,'sectok' => getSecurityToken()));
-            echo ' <a href="'.$link.'" class="btn_media_delete" title="'.$image.'">'.
-                '<img src="'.DOKU_BASE.'lib/images/trash.png" alt="'.$lang['btn_delete'].'" '.
-                'title="'.$lang['btn_delete'].'" class="btn" /></a>';
-        }
+    // delete button
+    if($auth >= AUTH_DELETE && !$rev){
+       $link = media_managerURL(array('delete' => $image,'sectok' => getSecurityToken()));
+        echo ' <a href="'.$link.'" class="btn_media_delete" title="'.$image.'">'.
+            '<img src="'.DOKU_BASE.'lib/images/trash.png" alt="'.$lang['btn_delete'].'" '.
+            'title="'.$lang['btn_delete'].'" class="btn" /></a>';
+    }
 
-        echo '<br /><br />';
-
-        $tags = array(
-            array('simple.title','img_title','text'),
-            array('Date.EarliestTime','img_date','date'),
-            array('File.Name','img_fname','text'),
-            array(array('Iptc.Byline','Exif.TIFFArtist','Exif.Artist','Iptc.Credit'),'img_artist','text'),
-            array(array('Iptc.CopyrightNotice','Exif.TIFFCopyright','Exif.Copyright'),'img_copyr','text'),
-            array('File.Format','img_format','text'),
-            array('File.NiceSize','img_fsize','text'),
-            array('Simple.Camera','img_camera','text'),
-            array(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject'),'img_keywords','text')
-        );
-
-        $src = mediaFN($image);
-        echo '<dl class="img_tags">';
-        foreach($tags as $key => $tag){
-            $t = $tag[0];
-            if (!is_array($t)) $t = array($tag[0]);
-            $value = tpl_img_getTag($t,'',$src);
-            $value = cleanText($value);
-            if ($value) {
-                echo '<dt>'.$lang[$tag[1]].':</dt><dd>';
-                if ($tag[2] == 'text') echo hsc($value);
-                if ($tag[2] == 'date') echo dformat($value);
-                echo '</dd>';
-            }
+}
+
+/**
+ * Prints mediafile tags
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function media_details($image, $auth, $rev=false) {
+    global $lang;
+
+    $tags = array(
+        array('simple.title','img_title','text'),
+        array('Date.EarliestTime','img_date','date'),
+        array('File.Name','img_fname','text'),
+        array(array('Iptc.Byline','Exif.TIFFArtist','Exif.Artist','Iptc.Credit'),'img_artist','text'),
+        array(array('Iptc.CopyrightNotice','Exif.TIFFCopyright','Exif.Copyright'),'img_copyr','text'),
+        array('File.Format','img_format','text'),
+        array('File.NiceSize','img_fsize','text'),
+        array('File.Width','img_width','text'),
+        array('File.Height','img_height','text'),
+        array('Simple.Camera','img_camera','text'),
+        array(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject'),'img_keywords','text')
+    );
+
+    $src = mediaFN($image, $rev);
+    echo '<dl class="img_tags">';
+    foreach($tags as $key => $tag){
+        $t = $tag[0];
+        if (!is_array($t)) $t = array($tag[0]);
+        $value = media_getTag($t,$src);
+        $value = cleanText($value);
+        if (!$value) $value='-';
+        echo '<dt>'.$lang[$tag[1]].':</dt><dd>';
+        if ($tag[2] == 'text') echo hsc($value);
+        if ($tag[2] == 'date') echo dformat($value);
+        echo '</dd>';
+    }
+    echo '</dl>';
+}
+
+/**
+ * Returns the requested EXIF/IPTC tag from the current image
+ *
+ */
+function media_getTag($tags,$src,$alt=''){
+    $meta = new JpegMeta($src);
+    if($meta === false) return $alt;
+    $info = $meta->getField($tags);
+    if($info == false) return $alt;
+    return $info;
+}
+
+/**
+ * Shows difference between two revisions of file
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function media_diff($image, $ns, $auth) {
+    global $lang;
+    global $conf;
+
+    $rev1 = (int) $_REQUEST['rev'];
+
+    if(is_array($_REQUEST['rev2'])){
+        $rev1 = (int) $_REQUEST['rev2'][0];
+        $rev2 = (int) $_REQUEST['rev2'][1];
+
+        if(!$rev1){
+            $rev1 = $rev2;
+            unset($rev2);
+        }
+    }else{
+        $rev2 = (int) $_REQUEST['rev2'];
+    }
+    if($rev1 && $rev2){            // two specific revisions wanted
+        // make sure order is correct (older on the left)
+        if($rev1 < $rev2){
+            $l_rev = $rev1;
+            $r_rev = $rev2;
+        }else{
+            $l_rev = $rev2;
+            $r_rev = $rev1;
         }
-        echo '</dl>';
+    }elseif($rev1){                // single revision given, compare to current
+        $r_rev = '';
+        $l_rev = $rev1;
+    }else{                        // no revision was given, compare previous to current
+        $r_rev = '';
+        $revs = getRevisions($image, 0, 1, 8192, true);
+        $l_rev = $revs[0];
     }
+    echo '<table><tr><td>';
+    media_preview($image, $auth, $l_rev);
+    echo '</td>';
+    echo '<td>';
+    media_preview($image, $auth, $r_rev);
+    echo '</td></tr><tr><td>';
+    media_details($image, $auth, $l_rev);
+    echo '</td>';
+    echo '<td>';
+    media_details($image, $auth, $r_rev);
+    echo '</td></tr></table>';
 }
 
 /**
@@ -1065,6 +1145,7 @@ function media_managerURL($params=false, $amp='&') {
     unset($gets['sectok']);
     unset($gets['delete']);
     unset($gets['rev']);
+    unset($gets['mediado']);
 
     if ($params) {
         foreach ($params as $k => $v) {
-- 
cgit v1.2.3


From 030dd1d963bb7a0ab824b823d777a58fc105b1e5 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 20 Jun 2011 19:16:09 +0300
Subject: thumbnails and list view

---
 inc/media.php    | 45 ++++++++++++++++++++++-----------------------
 inc/template.php |  2 +-
 2 files changed, 23 insertions(+), 24 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 1bcb6a7b2..b4b62d2c5 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -546,7 +546,7 @@ function media_tabs_files($selected=false){
     $tab .= ' class="'.$class.'" >'.$lang['media_searchtab'].'</a>';
     echo $tab;
 
-    echo '<div class="mediamanager-clear">&nbsp;</div>';
+    echo '<div class="clearer"></div>';
     echo '</div>';
 }
 
@@ -581,7 +581,7 @@ function media_tabs_details($selected=false){
     $tab .= ' class="'.$class.'" >'.$lang['media_historytab'].'</a>';
     echo $tab;
 
-    echo '<div class="mediamanager-clear">&nbsp;</div>';
+    echo '<div class="clearer"></div>';
     echo '</div>';
 }
 
@@ -606,7 +606,7 @@ function media_tab_files_options(){
     echo '<div class="mediamanager-block-sort">'.$lang['media_sort'];
     //select
     echo '</div>';
-    echo '<div class="mediamanager-clear">&nbsp;</div>';
+    echo '<div class="clearer"></div>';
     echo '</div>';
 }
 
@@ -628,13 +628,12 @@ function media_tab_files($ns,$auth=null,$jump='') {
         echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
     }else{
         if ($view == 'list') {
-            echo '<div class="mediamanager-files-list-tab">';
-            echo '</div>';
+            echo '<ul class="mediamanager-file-list mediamanager-list" id="id-mediamanager-file-list">';
         } else {
-            echo '<div class="mediamanager-files-thumbnails-tab">';
-            media_filelist($ns,$auth,$jump,'thumbs');
-            echo '</div>';
+            echo '<ul class="mediamanager-file-list mediamanager-thumbs" id="id-mediamanager-file-list">';
         }
+        media_filelist($ns,$auth,$jump,'thumbs');
+        echo '</ul>';
     }
     echo '</div>';
     echo '</div>';
@@ -1044,24 +1043,24 @@ function media_printfile_thumbs($item,$auth,$jump){
     // Prepare filename
     $file = utf8_decodeFN($item['file']);
 
-    // Prepare info
-    $info = '';
+    // output
+    echo '<li><div>';
+    if($item['isimg']) media_printimgdetail($item, true);
+    echo '<a href="'.media_managerURL(array('image' => hsc($item['id']))).'" name=
+        "h_:'.$item['id'].'" class="info" >'.hsc($file).'</a>';
     if($item['isimg']){
+        $info = '';
         $info .= (int) $item['meta']->getField('File.Width');
         $info .= '&#215;';
         $info .= (int) $item['meta']->getField('File.Height');
-        $info .= '<br/>';
-    }
-    $info .= '<i>'.dformat($item['mtime']).'</i><br/>';
-    $info .= filesize_h($item['size']);
-
-    // output
-    echo '<div class="float-image" >';
-    if($item['isimg']) media_printimgdetail($item, true);
-    echo '<br/><a href="'.media_managerURL(array('image' => hsc($item['id']))).'" name=
-        "h_:'.$item['id'].'"  >'.hsc($file).'</a><br/>';
-    echo '<span>'.$info.'</span><br/>';
-    echo '</div>'.NL;
+        echo '<span class="info">'.$info.'</span>';
+    }
+    $info = '<i>'.dformat($item['mtime']).'</i>';
+    echo '<span class="info">'.$info.'</span>';
+    $info = filesize_h($item['size']);
+    echo '<span class="info">'.$info.'</span>';
+    echo '<div class="clearer"></div>';
+    echo '</div></li>'.NL;
 }
 
 /**
@@ -1088,7 +1087,7 @@ function media_printimgdetail($item, $fullscreen=false){
 
     // output
     if ($fullscreen) {
-        echo '<a name="d_:'.$item['id'].'" href="'.
+        echo '<a name="d_:'.$item['id'].'" class="image" href="'.
             media_managerURL(array('image' => hsc($item['id']))).'">';
         echo '<img src="'.$src.'" '.$att.' />';
         echo '</a>';
diff --git a/inc/template.php b/inc/template.php
index 31320c876..69ed61f7e 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1441,7 +1441,7 @@ function tpl_media() {
     echo '<div id="id-mediamanager-layout-detail" class="layout" style="width: 30%;">';
     tpl_fileDetails();
     echo '</div>';
-    echo '<div class="mediamanager-clear">&nbsp;</div>';
+    echo '<div class="clearer"></div>';
     echo '</div>';
     echo '</div>';
 }
-- 
cgit v1.2.3


From 0748b4c7cb6a4918212b51bdedad710322ab2a0b Mon Sep 17 00:00:00 2001
From: Nurgozha Kaliaskarov <astana08@gmail.com>
Date: Tue, 21 Jun 2011 20:43:11 +0200
Subject: Kazakh translation added

---
 inc/lang/kk/lang.php | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 inc/lang/kk/lang.php

(limited to 'inc')

diff --git a/inc/lang/kk/lang.php b/inc/lang/kk/lang.php
new file mode 100644
index 000000000..2b492ed1c
--- /dev/null
+++ b/inc/lang/kk/lang.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * kazakh language file
+ *
+ * @author Nurgozha Kaliaskarov astana08@gmail.com
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '"';
+$lang['doublequoteclosing']    = '"';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Бұл мақаланы өңдеү';
+$lang['btn_source']            = 'Бастапқы мәтінді көрсету';
+$lang['btn_show']              = 'Бетті көрсету';
+$lang['btn_create']            = 'Бұл бетті жасау';
+$lang['btn_search']            = 'Іздеу';
+$lang['btn_save']              = 'Сақтау';
+$lang['btn_preview']           = 'Қарап шығу';
+$lang['btn_top']               = 'Жоғары';
+$lang['btn_newer']             = '<<жаңарақ';
+$lang['btn_older']             = 'ескірек>>';
+$lang['btn_revs']              = 'Қайта қараулары';
+$lang['btn_recent']            = 'Жуырдағы өзгерістер';
+$lang['btn_upload']            = 'Еңгізу';
+$lang['btn_cancel']            = 'Болдырмау';
+$lang['btn_index']             = 'Барлық беттері';
+$lang['btn_secedit']           = 'Өңдеу';
+$lang['btn_login']             = 'Кіру';
+$lang['btn_logout']            = 'Шығу';
+$lang['btn_admin']             = 'Басқару';
+$lang['btn_update']            = 'Жаңарту';
+$lang['btn_delete']            = 'Жою';
+$lang['btn_back']              = 'Артқа';
+$lang['btn_backlink']          = 'Кері сілтемелері';
+$lang['btn_backtomedia']       = 'Медиафайлды таңдауға қайту';
+$lang['btn_subscribe']         = 'Жазылуларды басқару';
+$lang['btn_profile']           = 'Профильді жаңарту';
+$lang['btn_reset']             = 'Түсіру';
+$lang['btn_resendpwd']         = 'Жаңа құпиясөзді жіберу';
+$lang['btn_draft']             = 'Шимайды өңдеу';
+$lang['btn_recover']           = 'Шимайды қайтару';
+$lang['btn_draftdel']          = 'Шимайды өшіру';
+$lang['btn_revert']            = 'Қалпына келтіру';
+$lang['btn_register']          = 'Тіркеу';
+$lang['loggedinas']            = 'түпнұсқамен кірген';
+$lang['user']                  = 'Түпнұсқа';
+$lang['pass']                  = 'Құпиясөз';
+$lang['newpass']               = 'Жаңа құпиясөз';
+$lang['oldpass']               = 'Ағымдағы құпиясөзді растау';
+$lang['passchk']               = 'Тағы бір рет';
+$lang['remember']              = 'Мені сақтау';
+$lang['fullname']              = 'Шын аты';
+$lang['email']                 = 'Е-пошта';
+$lang['profile']               = 'Пайдаланушының профилі';
+$lang['badlogin']              = 'Кешріңіз, түпнұсқа әлде құпиясөз дұрыс емес';
+$lang['minoredit']             = 'Шағын өзгерістер';
+$lang['draftdate']             = 'Шимай сақталғаны';
+$lang['nosecedit']             = 'Бет өзгерді де бөлік тұралы ақпарат ескірді. Толық нұсқасы ашылды.';
+$lang['regmissing']            = 'Кешіріңіз, барлық тармақтары толтыруыңыз керек.';
+$lang['reguexists']            = 'Кешіріңіз, бұл түпнұскамен де пайдаланушы бар.';
+$lang['regsuccess']            = 'Пайдаланушы қосылды әрі құпиясөзін электрондық поштаға жіберді.';
+$lang['regsuccess2']           = 'Пайдаланушы қосылды.';
+$lang['regmailfail']           = 'Құпиясөз хатты жіберуде қате болған сияқты. Мархабат, әкімшімен хабарласыңыз.';
+$lang['regbadmail']            = 'Берілген электрондық пошта бұрыс деп көрінеді - егер бұл қателікті деп ойласаңыз, әкімшіге хабарлаңыз.';
+$lang['regbadpass']            = 'Берілген екі құпиясөз бірдей емес, мархабат. қайтадан көріңіз.';
+$lang['regpwmail']             = 'Сіздің DokuWiki құпиясөзіңіз';
+$lang['reghere']               = 'Есебіңіз әлі жоқ па? Біреуін оңай ашыңыз';
+$lang['profna']                = 'Бұл wiki профиль өзертуді қолдамайды';
+$lang['profnochange']          = 'Өзгеріс жоқ, істейтін ештеңе жоқ.';
+$lang['profnoempty']           = 'Бос есім не email рұқсат етілмейді.';
+$lang['profchanged']           = 'Пайдаланушы профилі сәтті жаңартылған.';
+$lang['pwdforget']             = 'Құпиясөзіңізді ұмыттыңызба? Жаңадан біреуін алыңыз';
+$lang['resendna']              = 'Бұл wiki құпиясөзді қайта жіберуді қолдамайды.';
+$lang['resendpwd']             = 'Келесіге жаңа құпиясөзді жіберу ';
+$lang['resendpwdmissing']      = 'Кешіріңіз, барлық тармақтары толтыруыңыз керек.';
+$lang['resendpwdnouser']       = 'Кешіріңіз, бұл пайдаланушыны дерекқорымызда тапқан жоқпыз.';
+$lang['resendpwdbadauth']      = 'Кешіріңіз, бұл түпнұсқалық коды бұрыс. Толық растау сілтемені пайдалануыңызды тексеріңіз.';
+$lang['resendpwdconfirm']      = 'Растау сілтеме email арқылы жіберілді.';
+$lang['resendpwdsuccess']      = 'Сіздің жаңа құпиясөзіңіз email арқылы жіберілді.';
+$lang['license']               = 'Басқаша көрсетілген болмаса, бұл wiki-дің мазмұны келесі лицензия бойынша беріледі:';
+$lang['licenseok']             = 'Ескерту: бұл бетті өңдеуіңізбен мазмұныңыз келесі лицензия бойынша беруге келесесіз:';
+$lang['searchmedia']           = 'Іздеу файлдың атауы:';
+$lang['searchmedia_in']        = '%-мен іздеу:';
+$lang['txt_upload']            = 'Еңгізетін файлды таңдау';
+$lang['txt_filename']          = 'Келесідей еңгізу (қалауынша)';
+$lang['txt_overwrt']           = 'Бар файлды қайта жазу';
+$lang['lockedby']              = 'Осы уақытта тойтарылған';
+$lang['lockexpire']            = 'Тойтару келесі уақытта бітеді';
+$lang['willexpire']            = 'Бұл бетті түзеу тойтаруыңыз бір минутта бітеді. Қақтығыс болмау және тойтару таймерді түсіру үшін қарап шығу пернені басыңыз.';
+$lang['js']['notsavedyet']     = 'Сақталмаған өзгерістер жоғалатын болады.';
+$lang['js']['searchmedia']     = 'Файлдарды іздеу';
+$lang['js']['keepopen']        = 'Таңдаған соң терезе жаппаңыз';
+$lang['js']['hidedetails']     = 'Ұсақтарды жасыру';
+$lang['js']['mediatitle']      = 'Султеме теңшелімдері';
+$lang['js']['mediadisplay']    = 'Сілтеме түрі';
+$lang['js']['mediaalign']      = 'Тегістеуі';
+$lang['js']['mediasize']       = 'Сүреттің өлшемі';
+$lang['js']['mediatarget']     = 'Сілтеме нысанасы';
+$lang['js']['mediaclose']      = 'Жабу';
+$lang['js']['mediainsert']     = 'Еңгізу';
+$lang['js']['mediadisplayimg'] = 'Бұл сүретті көрсету';
+$lang['js']['mediadisplaylnk'] = 'Бұл сілтемені ғана көрсету,';
+$lang['js']['mediasmall']      = 'Шағын нұсқасы';
+$lang['js']['mediamedium']     = 'Орташа нұсқасы';
+$lang['js']['medialarge']      = 'Үлкен нұсқасы';
+$lang['js']['mediaoriginal']   = 'Түпнұсқалық нұсқасы';
+$lang['js']['medialnk']        = 'Толық бетке сілтеме';
+$lang['js']['mediadirect']     = 'Түпнұсқалыққа тұра сілтемесі';
+$lang['js']['medianolnk']      = 'Сілтеме жоқ';
+$lang['js']['medianolink']     = 'Суретті сілтетпеу';
+$lang['js']['medialeft']       = 'Сүретті сол жаққа тегістеу';
+$lang['js']['mediaright']      = 'Сүретті оң жаққа тегістеу';
+$lang['js']['mediacenter']     = 'Сүретті ортаға тегістеу';
+$lang['js']['medianoalign']    = 'Тегістеусіз';
-- 
cgit v1.2.3


From 6b467722ce67ad489326798250cc5312efa70dcd Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 22 Jun 2011 23:16:31 +0300
Subject: mediamanager fixes

---
 inc/media.php    | 37 +++++++++++++++++++++++++------------
 inc/template.php | 14 ++++++++++----
 2 files changed, 35 insertions(+), 16 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index b4b62d2c5..c16665b13 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -697,7 +697,7 @@ function media_tab_view($image, $ns, $auth=null) {
 
     echo '<div class="mediamanager-tab-detail-view">';
     echo '<div class="background-container">';
-    echo $lang['media_view'];
+    echo $image;
     echo '</div>';
 
     echo '<div class="scroll-container">';
@@ -880,17 +880,17 @@ function media_diff($image, $ns, $auth) {
         $revs = getRevisions($image, 0, 1, 8192, true);
         $l_rev = $revs[0];
     }
-    echo '<table><tr><td>';
+    echo '<ul class="mediamanager-table-50"><li><div>';
     media_preview($image, $auth, $l_rev);
-    echo '</td>';
-    echo '<td>';
+    echo '</div></li>';
+    echo '<li><div>';
     media_preview($image, $auth, $r_rev);
-    echo '</td></tr><tr><td>';
+    echo '</div></li><li><div>';
     media_details($image, $auth, $l_rev);
-    echo '</td>';
-    echo '<td>';
+    echo '</div></li>';
+    echo '<li><div>';
     media_details($image, $auth, $r_rev);
-    echo '</td></tr></table>';
+    echo '</div></li></ul>';
 }
 
 /**
@@ -1045,7 +1045,14 @@ function media_printfile_thumbs($item,$auth,$jump){
 
     // output
     echo '<li><div>';
-    if($item['isimg']) media_printimgdetail($item, true);
+    if($item['isimg']) {
+        media_printimgdetail($item, true);
+    } else {
+        echo '<a name="d_:'.$item['id'].'" class="image" title="'.$item['id'].'" href="'.
+            media_managerURL(array('image' => hsc($item['id']))).'">';
+        echo '<img src="'.DOKU_BASE.'lib/images/icon-file.png" width="90px" />';
+        echo '</a>';
+    }
     echo '<a href="'.media_managerURL(array('image' => hsc($item['id']))).'" name=
         "h_:'.$item['id'].'" class="info" >'.hsc($file).'</a>';
     if($item['isimg']){
@@ -1054,6 +1061,8 @@ function media_printfile_thumbs($item,$auth,$jump){
         $info .= '&#215;';
         $info .= (int) $item['meta']->getField('File.Height');
         echo '<span class="info">'.$info.'</span>';
+    } else {
+        echo '<span class="info">&nbsp;</span>';
     }
     $info = '<i>'.dformat($item['mtime']).'</i>';
     echo '<span class="info">'.$info.'</span>';
@@ -1073,21 +1082,25 @@ function media_printimgdetail($item, $fullscreen=false){
     $w = (int) $item['meta']->getField('File.Width');
     $h = (int) $item['meta']->getField('File.Height');
     if($w>$size || $h>$size){
-        $ratio = $item['meta']->getResizeRatio($size);
+        if (!$fullscreen) {
+            $ratio = $item['meta']->getResizeRatio($size);
+        } else {
+            $ratio = $item['meta']->getResizeRatio($size,$size);
+        }
         $w = floor($w * $ratio);
         $h = floor($h * $ratio);
     }
     $src = ml($item['id'],array('w'=>$w,'h'=>$h));
     $p = array();
     $p['width']  = $w;
-    $p['height'] = $h;
+    if (!$fullscreen) $p['height'] = $h;
     $p['alt']    = $item['id'];
     $p['class']  = 'thumb';
     $att = buildAttributes($p);
 
     // output
     if ($fullscreen) {
-        echo '<a name="d_:'.$item['id'].'" class="image" href="'.
+        echo '<a name="d_:'.$item['id'].'" class="image" title="'.$item['id'].'" href="'.
             media_managerURL(array('image' => hsc($item['id']))).'">';
         echo '<img src="'.$src.'" '.$att.' />';
         echo '</a>';
diff --git a/inc/template.php b/inc/template.php
index 69ed61f7e..5d29f6950 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1163,8 +1163,9 @@ function tpl_fileDetails(){
     global $NS;
     global $IMG;
 
-    $image = $_REQUEST['image'];
+    if ($_REQUEST['image']) $image = cleanID($_REQUEST['image']);
     if (!isset($IMG) && !isset($image)) return '';
+    if (isset($NS) && getNS($image) != $NS) return '';
 
     $opened_tab = $_REQUEST['tab_details'];
     if (!$opened_tab) $opened_tab = 'view';
@@ -1422,15 +1423,20 @@ function tpl_getFavicon($abs=false) {
  */
 function tpl_media() {
     //
-    global $DEL, $NS, $IMG, $AUTH, $JUMPTO;
+    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $lang;
     require_once(DOKU_INC.'lib/exe/mediamanager.php');
 
     echo '<div class="mediamanager" id="id-mediamanager">';
     echo '<div class="mediamanager-slider" id="id-mediamanager-layout">';
     echo '<div id="id-mediamanager-layout-namespaces" class="layout" style="width: 25%;">';
     html_msgarea();
-    echo hsc('Namespaces:');
-    echo '<br /><br />';
+    echo '<div class="mediamanager-tabs">';
+    echo '<a href="#" class="selected">'.hsc($lang['namespaces']).'</a>';
+    echo '<div class="clearer"></div>';
+    echo '</div>';
+    echo '<div class="background-container">';
+    echo hsc($lang['namespaces']);
+    echo '</div>';
     echo '<div class="scroll-container">';
     tpl_mediaTree(true);
     echo '</div>';
-- 
cgit v1.2.3


From cf83278667fc82135e294c35d334a62318a1e39d Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 22 Jun 2011 23:59:11 +0300
Subject: media version saving metadata

---
 inc/lang/en/lang.php | 23 ++++++++++++-----------
 inc/media.php        | 15 ++++++++++++++-
 2 files changed, 26 insertions(+), 12 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index e0e2e6cf5..6fb387a89 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -325,17 +325,18 @@ $lang['seconds'] = '%d seconds ago';
 
 $lang['wordblock'] = 'Your change was not saved because it contains blocked text (spam).';
 
-$lang['media_uploadtab'] = 'Upload';
-$lang['media_searchtab'] = 'Search';
-$lang['media_viewtab']   = 'View';
-$lang['media_edittab']   = 'Edit';
-$lang['media_historytab']   = 'History';
-$lang['media_thumbsview']   = 'Thumbnails';
+$lang['media_uploadtab']  = 'Upload';
+$lang['media_searchtab']  = 'Search';
+$lang['media_viewtab']    = 'View';
+$lang['media_edittab']    = 'Edit';
+$lang['media_historytab'] = 'History';
+$lang['media_thumbsview'] = 'Thumbnails';
 $lang['media_listview']   = 'List';
-$lang['media_sort']   = 'Sort';
-$lang['media_search'] = 'Search';
-$lang['media_view']   = 'View';
-$lang['media_edit']   = 'Edit';
-$lang['media_history']   = 'These are the older revisions of the file.';
+$lang['media_sort']       = 'Sort';
+$lang['media_search']     = 'Search';
+$lang['media_view']       = 'View';
+$lang['media_edit']       = 'Edit';
+$lang['media_history']    = 'These are the older revisions of the file.';
+$lang['media_meta_edited']= 'metadata edited';
 
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/media.php b/inc/media.php
index c16665b13..68aab5415 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -40,6 +40,7 @@ function media_filesinuse($data,$id){
  * Handles the saving of image meta data
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function media_metasave($id,$auth,$data){
     if($auth < AUTH_UPLOAD) return false;
@@ -60,8 +61,19 @@ function media_metasave($id,$auth,$data){
         }
     }
 
+    $old = @filemtime($src);
+    if(!@file_exists(mediaFN($id, $old)) && @file_exists($src)) {
+        // add old revision to the attic
+        media_saveOldRevision($id);
+    }
+
     if($meta->save()){
         if($conf['fperm']) chmod($src, $conf['fperm']);
+
+        $new = @filemtime($src);
+        // add a log entry to the media changelog
+        addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_EDIT, $lang['media_meta_edited']);
+
         msg($lang['metasaveok'],1);
         return $id;
     }else{
@@ -834,7 +846,8 @@ function media_details($image, $auth, $rev=false) {
  *
  */
 function media_getTag($tags,$src,$alt=''){
-    $meta = new JpegMeta($src);
+    //$meta = new JpegMeta($src);
+    $meta = JpegMeta::Create($src);
     if($meta === false) return $alt;
     $info = $meta->getField($tags);
     if($info == false) return $alt;
-- 
cgit v1.2.3


From 532850ed047e0f35268eb1a5d4cf85c80f228dc5 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 23 Jun 2011 13:13:34 +0300
Subject: media getting metadata fix

---
 inc/media.php | 51 ++++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 68aab5415..461a13665 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -736,9 +736,8 @@ function media_tab_edit($image, $ns, $auth=null) {
 
     echo '<div class="scroll-container">';
     if ($image) {
-        $info = new JpegMeta(mediaFN($image));
-        if ($info->getField('File.Mime') == 'image/jpeg')
-            media_metaform($image,$auth,true);
+        list($ext, $mime) = mimetype($image);
+        if ($mime == 'image/jpeg') media_metaform($image,$auth,true);
     }
     echo '</div>';
     echo '</div>';
@@ -780,8 +779,8 @@ function media_tab_history($image, $ns, $auth=null) {
 function media_preview($image, $auth, $rev=false) {
     global $lang;
     if ($auth < AUTH_READ || !$image) return '';
-    $info = new JpegMeta(mediaFN($image));
-    $w = (int) $info->getField('File.Width');
+    $info = getimagesize(mediaFN($image));
+    $w = (int) $info[0];
 
     $more = '';
     if ($rev) $more = "rev=$rev";
@@ -809,30 +808,29 @@ function media_preview($image, $auth, $rev=false) {
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function media_details($image, $auth, $rev=false) {
-    global $lang;
+    global $lang, $config_cascade;;
 
-    $tags = array(
-        array('simple.title','img_title','text'),
-        array('Date.EarliestTime','img_date','date'),
-        array('File.Name','img_fname','text'),
-        array(array('Iptc.Byline','Exif.TIFFArtist','Exif.Artist','Iptc.Credit'),'img_artist','text'),
-        array(array('Iptc.CopyrightNotice','Exif.TIFFCopyright','Exif.Copyright'),'img_copyr','text'),
-        array('File.Format','img_format','text'),
-        array('File.NiceSize','img_fsize','text'),
-        array('File.Width','img_width','text'),
-        array('File.Height','img_height','text'),
-        array('Simple.Camera','img_camera','text'),
-        array(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject'),'img_keywords','text')
-    );
+    // load the field descriptions
+    static $tags = null;
+    if(is_null($tags)){
+        foreach (array('default','local') as $config_group) {
+            if (empty($config_cascade['mediameta'][$config_group])) continue;
+            foreach ($config_cascade['mediameta'][$config_group] as $config_file) {
+                if(@file_exists($config_file)){
+                    include($config_file);
+                }
+            }
+        }
+    }
 
     $src = mediaFN($image, $rev);
+    $meta = new JpegMeta($src);
     echo '<dl class="img_tags">';
     foreach($tags as $key => $tag){
         $t = $tag[0];
         if (!is_array($t)) $t = array($tag[0]);
-        $value = media_getTag($t,$src);
+        $value = media_getTag($t, $meta, '-');
         $value = cleanText($value);
-        if (!$value) $value='-';
         echo '<dt>'.$lang[$tag[1]].':</dt><dd>';
         if ($tag[2] == 'text') echo hsc($value);
         if ($tag[2] == 'date') echo dformat($value);
@@ -842,12 +840,15 @@ function media_details($image, $auth, $rev=false) {
 }
 
 /**
- * Returns the requested EXIF/IPTC tag from the current image
+ * Returns the requested EXIF/IPTC tag from the image meta
  *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ * @param array $tags
+ * @param JpegMeta $meta
+ * @param string $alt
+ * @return string
  */
-function media_getTag($tags,$src,$alt=''){
-    //$meta = new JpegMeta($src);
-    $meta = JpegMeta::Create($src);
+function media_getTag($tags,$meta,$alt=''){
     if($meta === false) return $alt;
     $info = $meta->getField($tags);
     if($info == false) return $alt;
-- 
cgit v1.2.3


From 88a71175e3de9e3ad8b20ca9eb710aaf773cb788 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 23 Jun 2011 14:16:15 +0300
Subject: media manager auth fix

---
 inc/lang/en/lang.php |  2 ++
 inc/media.php        | 27 +++++++++++++++++++++++----
 inc/template.php     |  3 ++-
 3 files changed, 27 insertions(+), 5 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 6fb387a89..a55981983 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -338,5 +338,7 @@ $lang['media_view']       = 'View';
 $lang['media_edit']       = 'Edit';
 $lang['media_history']    = 'These are the older revisions of the file.';
 $lang['media_meta_edited']= 'metadata edited';
+$lang['media_perm_read']  = 'Sorry, you don\'t have enough rights to read files.';
+$lang['media_perm_upload']= 'Sorry, you don\'t have enough rights to upload files.';
 
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/media.php b/inc/media.php
index 461a13665..fc7f72941 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -89,9 +89,13 @@ function media_metasave($id,$auth,$data){
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function media_metaform($id,$auth,$fullscreen = false){
-    if($auth < AUTH_UPLOAD) return false;
     global $lang, $config_cascade;
 
+    if($auth < AUTH_UPLOAD) {
+        echo '<div class="nothing">'.$lang['media_perm_upload'].'</div>'.NL;
+        return false;
+    }
+
     // load the field descriptions
     static $fields = null;
     if(is_null($fields)){
@@ -637,7 +641,7 @@ function media_tab_files($ns,$auth=null,$jump='') {
 
     $view = $_REQUEST['view'];
     if($auth < AUTH_READ){
-        echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
+        echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
     }else{
         if ($view == 'list') {
             echo '<ul class="mediamanager-file-list mediamanager-list" id="id-mediamanager-file-list">';
@@ -766,6 +770,8 @@ function media_tab_history($image, $ns, $auth=null) {
             $first = isset($_REQUEST['first']) ? intval($_REQUEST['first']) : 0;
             html_revisions($first, $image);
         }
+    } else {
+        echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
     }
     echo '</div>';
     echo '</div>';
@@ -778,7 +784,11 @@ function media_tab_history($image, $ns, $auth=null) {
  */
 function media_preview($image, $auth, $rev=false) {
     global $lang;
-    if ($auth < AUTH_READ || !$image) return '';
+    if (!$image) return '';
+    if ($auth < AUTH_READ) {
+        echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
+        return '';
+    }
     $info = getimagesize(mediaFN($image));
     $w = (int) $info[0];
 
@@ -810,6 +820,12 @@ function media_preview($image, $auth, $rev=false) {
 function media_details($image, $auth, $rev=false) {
     global $lang, $config_cascade;;
 
+    if (!$image) return '';
+    if ($auth < AUTH_READ) {
+        echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
+        return '';
+    }
+
     // load the field descriptions
     static $tags = null;
     if(is_null($tags)){
@@ -1196,7 +1212,10 @@ function media_managerURL($params=false, $amp='&') {
 function media_uploadform($ns, $auth, $fullscreen = false){
     global $lang;
 
-    if($auth < AUTH_UPLOAD) return; //fixme print info on missing permissions?
+    if($auth < AUTH_UPLOAD) {
+        echo '<div class="nothing">'.$lang['media_perm_upload'].'</div>'.NL;
+        return;
+    }
 
     // The default HTML upload form
     $params = array('id'      => 'dw__upload',
diff --git a/inc/template.php b/inc/template.php
index 5d29f6950..051679fb9 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1423,7 +1423,8 @@ function tpl_getFavicon($abs=false) {
  */
 function tpl_media() {
     //
-    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $lang;
+    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $lang, $fullscreen;
+    $fullscreen = true;
     require_once(DOKU_INC.'lib/exe/mediamanager.php');
 
     echo '<div class="mediamanager" id="id-mediamanager">';
-- 
cgit v1.2.3


From 70c3cc9a17d47d8986cba0805d943c1a68af1740 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 24 Jun 2011 00:41:47 +0300
Subject: media action buttons

---
 inc/lang/en/lang.php |  1 +
 inc/media.php        | 37 ++++++++++++++++++++++++++-----------
 inc/template.php     | 10 +++-------
 3 files changed, 30 insertions(+), 18 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index a55981983..abe59d0aa 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -340,5 +340,6 @@ $lang['media_history']    = 'These are the older revisions of the file.';
 $lang['media_meta_edited']= 'metadata edited';
 $lang['media_perm_read']  = 'Sorry, you don\'t have enough rights to read files.';
 $lang['media_perm_upload']= 'Sorry, you don\'t have enough rights to upload files.';
+$lang['media_update']     = 'Upload new version';
 
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/media.php b/inc/media.php
index fc7f72941..19aee0d06 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -795,21 +795,27 @@ function media_preview($image, $auth, $rev=false) {
     $more = '';
     if ($rev) $more = "rev=$rev";
     $src = ml($image, $more);
-
+    echo '<div class="mediamanager-preview">';
     echo '<img src="'.$src.'" alt="" width="99%" style="max-width: '.$w.'px;" /><br /><br />';
 
-    $link = ml($image,$more,true);
-    echo $image.' <a href="'.$link.'" target="_blank"><img src="'.DOKU_BASE.'lib/images/magnifier.png" '.
-    'alt="'.$lang['mediaview'].'" title="'.$lang['mediaview'].'" class="btn" /></a>';
+    $link = ml($image,$more,true,'&');
+
+    $form = new Doku_Form(array('action'=>$link, 'target'=>'_blank'));
+    $form->addElement(form_makeButton('submit','',$lang['mediaview']));
+    $form->printForm();
 
     // delete button
     if($auth >= AUTH_DELETE && !$rev){
-       $link = media_managerURL(array('delete' => $image,'sectok' => getSecurityToken()));
-        echo ' <a href="'.$link.'" class="btn_media_delete" title="'.$image.'">'.
-            '<img src="'.DOKU_BASE.'lib/images/trash.png" alt="'.$lang['btn_delete'].'" '.
-            'title="'.$lang['btn_delete'].'" class="btn" /></a>';
-    }
+        $form = new Doku_Form(array('action'=>media_managerURL(array('delete' => $image))));
+        $form->addElement(form_makeButton('submit','',$lang['btn_delete']));
+        $form->printForm();
 
+        $form = new Doku_Form(array('action'=>media_managerURL()));
+        $form->addHidden('mediado','update');
+        $form->addElement(form_makeButton('submit','',$lang['media_update']));
+        $form->printForm();
+    }
+    echo '</div>';
 }
 
 /**
@@ -1217,6 +1223,13 @@ function media_uploadform($ns, $auth, $fullscreen = false){
         return;
     }
 
+    $update = false;
+    $id = '';
+    if ($auth >= AUTH_DELETE && $fullscreen && $_REQUEST['mediado'] == 'update') {
+        $update = true;
+        $id = cleanID($_REQUEST['image']);
+    }
+
     // The default HTML upload form
     $params = array('id'      => 'dw__upload',
                     'enctype' => 'multipart/form-data');
@@ -1231,13 +1244,15 @@ function media_uploadform($ns, $auth, $fullscreen = false){
     $form->addElement(form_makeFileField('upload', $lang['txt_upload'].':', 'upload__file'));
     $form->addElement(form_makeCloseTag('p'));
     $form->addElement(form_makeOpenTag('p'));
-    $form->addElement(form_makeTextField('id', '', $lang['txt_filename'].':', 'upload__name'));
+    $form->addElement(form_makeTextField('id', $id, $lang['txt_filename'].':', 'upload__name'));
     $form->addElement(form_makeButton('submit', '', $lang['btn_upload']));
     $form->addElement(form_makeCloseTag('p'));
 
     if($auth >= AUTH_DELETE){
         $form->addElement(form_makeOpenTag('p'));
-        $form->addElement(form_makeCheckboxField('ow', 1, $lang['txt_overwrt'], 'dw__ow', 'check'));
+        $attrs = array();
+        if ($update) $attrs['checked'] = 'checked';
+        $form->addElement(form_makeCheckboxField('ow', 1, $lang['txt_overwrt'], 'dw__ow', 'check', $attrs));
         $form->addElement(form_makeCloseTag('p'));
     }
     html_form('upload', $form);
diff --git a/inc/template.php b/inc/template.php
index 051679fb9..4226c0e52 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1142,6 +1142,7 @@ function tpl_fileList(){
 
     $opened_tab = $_REQUEST['tab_files'];
     if (!$opened_tab) $opened_tab = 'files';
+    if ($_REQUEST['mediado'] == 'update') $opened_tab = 'upload';
 
     media_tabs_files($opened_tab);
     if ($opened_tab == 'files') media_tab_files($NS,$AUTH,$JUMPTO);
@@ -1161,11 +1162,9 @@ function tpl_fileList(){
 function tpl_fileDetails(){
     global $AUTH;
     global $NS;
-    global $IMG;
 
     if ($_REQUEST['image']) $image = cleanID($_REQUEST['image']);
-    if (!isset($IMG) && !isset($image)) return '';
-    if (isset($NS) && getNS($image) != $NS) return '';
+    if (!isset($image) || isset($NS) && getNS($image) != $NS) return '';
 
     $opened_tab = $_REQUEST['tab_details'];
     if (!$opened_tab) $opened_tab = 'view';
@@ -1173,10 +1172,7 @@ function tpl_fileDetails(){
     media_tabs_details($opened_tab);
 
     if ($opened_tab == 'view') media_tab_view($image, $NS, $AUTH);
-    if ($opened_tab == 'edit') {
-        if ($IMG) media_tab_edit($IMG, $NS, $AUTH);
-        else if ($image) media_tab_edit($image, $NS, $AUTH);
-    }
+    if ($opened_tab == 'edit') media_tab_edit($image, $NS, $AUTH);
     if ($opened_tab == 'history') media_tab_history($image,$NS,$AUTH);
 }
 
-- 
cgit v1.2.3


From 8c02f82246c8a991d795b4423f6d831e9e2f8807 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sun, 26 Jun 2011 14:59:32 +0200
Subject: Ignore warnings in the constructor of SimplePie_File

This ignores warnings because of the (intentionally) missing url
parameter for the constructor of SimplePie_File.
---
 inc/FeedParser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/FeedParser.php b/inc/FeedParser.php
index b98350da7..235bed46e 100644
--- a/inc/FeedParser.php
+++ b/inc/FeedParser.php
@@ -49,7 +49,7 @@ class FeedParser_File extends SimplePie_File {
      */
     function FeedParser_File($url, $timeout=10, $redirects=5,
                              $headers=null, $useragent=null, $force_fsockopen=false) {
-        parent::__construct();
+        @parent::__construct();
         $this->http    = new DokuHTTPClient();
         $this->success = $this->http->sendRequest($url);
 
-- 
cgit v1.2.3


From 96569d486b765a54033635135007a20bc4368868 Mon Sep 17 00:00:00 2001
From: Matthias Schulte <post@lupo49.de>
Date: Sun, 26 Jun 2011 16:54:34 +0200
Subject: The mail() function shouldn't be executed when no recipients are
 given. Empty to, cc or bcc fields could lead to an Internal Server Error:
 malformed header from script. Bad header=No recipient addresses found...

---
 inc/mail.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'inc')

diff --git a/inc/mail.php b/inc/mail.php
index 8742e17f6..01b2895e1 100644
--- a/inc/mail.php
+++ b/inc/mail.php
@@ -104,6 +104,9 @@ function _mail_send_action($data) {
     $headers = isset($data['headers']) ? $data['headers'] : null;
     $params = isset($data['params']) ? $data['params'] : null;
 
+    // discard mail request if no recipients are available
+    if(trim($to) === '' && trim($cc) === '' && trim($bcc) === '') return false;
+    
     // end additional code to support event ... original mail_send() code from here
 
     if(defined('MAILHEADER_ASCIIONLY')){
-- 
cgit v1.2.3


From 322111f0870d88a59b71258ce8410ae378441533 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Tue, 28 Jun 2011 15:52:02 +0300
Subject: css fix

---
 inc/media.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index f316bc34e..b2d608860 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1093,21 +1093,22 @@ function media_printfile_thumbs($item,$auth,$jump){
         echo '<img src="'.DOKU_BASE.'lib/images/icon-file.png" width="90px" />';
         echo '</a>';
     }
+    //echo '<input type=checkbox />';
     echo '<a href="'.media_managerURL(array('image' => hsc($item['id']))).'" name=
-        "h_:'.$item['id'].'" class="info" >'.hsc($file).'</a>';
+        "h_:'.$item['id'].'" class="name">'.hsc($file).'</a>';
     if($item['isimg']){
-        $info = '';
-        $info .= (int) $item['meta']->getField('File.Width');
-        $info .= '&#215;';
-        $info .= (int) $item['meta']->getField('File.Height');
-        echo '<span class="info">'.$info.'</span>';
+        $size = '';
+        $size .= (int) $item['meta']->getField('File.Width');
+        $size .= '&#215;';
+        $size .= (int) $item['meta']->getField('File.Height');
+        echo '<span class="size">'.$size.'</span>';
     } else {
-        echo '<span class="info">&nbsp;</span>';
+        echo '<span class="size">&nbsp;</span>';
     }
-    $info = '<i>'.dformat($item['mtime']).'</i>';
-    echo '<span class="info">'.$info.'</span>';
-    $info = filesize_h($item['size']);
-    echo '<span class="info">'.$info.'</span>';
+    $date = dformat($item['mtime']);
+    echo '<span class="date">'.$date.'</span>';
+    $filesize = filesize_h($item['size']);
+    echo '<span class="filesize">'.$filesize.'</span>';
     echo '<div class="clearer"></div>';
     echo '</div></li>'.NL;
 }
-- 
cgit v1.2.3


From 3e98e6857f2c48127d4169d02e341d1013c00bac Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 29 Jun 2011 16:59:18 +0300
Subject: media getting metadata fix

---
 inc/media.php | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index b2d608860..d90a13c81 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -99,14 +99,9 @@ function media_metaform($id,$auth,$fullscreen = false){
     // load the field descriptions
     static $fields = null;
     if(is_null($fields)){
-
-        foreach (array('default','local') as $config_group) {
-            if (empty($config_cascade['mediameta'][$config_group])) continue;
-            foreach ($config_cascade['mediameta'][$config_group] as $config_file) {
-                if(@file_exists($config_file)){
-                    include($config_file);
-                }
-            }
+        $config_files = getConfigFiles('mediameta');
+        foreach ($config_files as $config_file) {
+            if(@file_exists($config_file)) include($config_file);
         }
     }
 
@@ -123,6 +118,7 @@ function media_metaform($id,$auth,$fullscreen = false){
     formSecurityToken();
     foreach($fields as $key => $field){
         // get current value
+        if (empty($field[0])) continue;
         $tags = array($field[0]);
         if(is_array($field[3])) $tags = array_merge($tags,$field[3]);
         $value = tpl_img_getTag($tags,'',$src);
@@ -837,29 +833,26 @@ function media_details($image, $auth, $rev=false) {
     }
 
     // load the field descriptions
-    static $tags = null;
-    if(is_null($tags)){
-        foreach (array('default','local') as $config_group) {
-            if (empty($config_cascade['mediameta'][$config_group])) continue;
-            foreach ($config_cascade['mediameta'][$config_group] as $config_file) {
-                if(@file_exists($config_file)){
-                    include($config_file);
-                }
-            }
+    static $fields = null;
+    if(is_null($fields)){
+        $config_files = getConfigFiles('mediameta');
+        foreach ($config_files as $config_file) {
+            if(@file_exists($config_file)) include($config_file);
         }
     }
 
     $src = mediaFN($image, $rev);
     $meta = new JpegMeta($src);
     echo '<dl class="img_tags">';
-    foreach($tags as $key => $tag){
-        $t = $tag[0];
-        if (!is_array($t)) $t = array($tag[0]);
+    foreach($fields as $key => $tag){
+        $t = array();
+        if (!empty($tag[0])) $t = array($tag[0]);
+        if(is_array($tag[3])) $t = array_merge($t,$tag[3]);
         $value = media_getTag($t, $meta, '-');
         $value = cleanText($value);
         echo '<dt>'.$lang[$tag[1]].':</dt><dd>';
-        if ($tag[2] == 'text') echo hsc($value);
         if ($tag[2] == 'date') echo dformat($value);
+        else echo hsc($value);
         echo '</dd>';
     }
     echo '</dl>';
-- 
cgit v1.2.3


From 98f03b57e3bb6185cbbb815a71d254e28df79912 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 29 Jun 2011 17:04:16 +0300
Subject: media upload fix

---
 inc/media.php    | 20 ++++++++++++--------
 inc/template.php | 14 +++++++++-----
 2 files changed, 21 insertions(+), 13 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index d90a13c81..cba89b995 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -242,7 +242,7 @@ function media_upload($ns,$auth){
     global $lang;
 
     // get file and id
-    $id   = $_POST['id'];
+    $id   = $_POST['mediaid'];
     $file = $_FILES['upload'];
     if(empty($id)) $id = $file['name'];
 
@@ -572,25 +572,25 @@ function media_tabs_files($selected=false){
  * @author Kate Arzamastseva <pshns@ukr.net>
  * @param string $selected - opened tab
  */
-function media_tabs_details($selected=false){
+function media_tabs_details($image, $selected=false){
     global $lang;
 
     echo '<div class="mediamanager-tabs" id="id-mediamanager-tabs-detail">';
-    $tab = '<a href="'.media_managerURL(array('tab_details' => 'view')).
+    $tab = '<a href="'.media_managerURL(array('tab_details' => 'view', 'image' => $image)).
         '" rel=".mediamanager-tab-view"';
     if (!empty($selected) && $selected == 'view') $class = 'view selected';
     else $class = 'view';
     $tab .= ' class="'.$class.'" >'.$lang['media_viewtab'].'</a>';
     echo $tab;
 
-    $tab = '<a href="'.media_managerURL(array('tab_details' => 'edit')).
+    $tab = '<a href="'.media_managerURL(array('tab_details' => 'edit', 'image' => $image)).
         '" rel=".mediamanager-tab-edit"';
     if (!empty($selected) && $selected == 'edit') $class = 'edit selected';
     else $class = 'edit';
     $tab .= ' class="'.$class.'" >'.$lang['media_edittab'].'</a>';
     echo $tab;
 
-    $tab = '<a href="'.media_managerURL(array('tab_details' => 'history')).
+    $tab = '<a href="'.media_managerURL(array('tab_details' => 'history', 'image' => $image)).
         '" rel=".mediamanager-tab-history"';
     if (!empty($selected) && $selected == 'history') $class = 'history selected';
     else $class = 'history';
@@ -1231,8 +1231,12 @@ function media_uploadform($ns, $auth, $fullscreen = false){
     // The default HTML upload form
     $params = array('id'      => 'dw__upload',
                     'enctype' => 'multipart/form-data');
-    if (!$fullscreen) $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php';
-    else $params['action'] = media_managerURL(array('tab_files' => 'files'));
+    if (!$fullscreen) {
+        $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php';
+    } else {
+        $params['action'] = media_managerURL(array('tab_files' => 'files',
+            'tab_details' => 'view'));
+    }
 
     $form = new Doku_Form($params);
     if (!$fullscreen) $form->addElement('<div class="upload">' . $lang['mediaupload'] . '</div>');
@@ -1242,7 +1246,7 @@ function media_uploadform($ns, $auth, $fullscreen = false){
     $form->addElement(form_makeFileField('upload', $lang['txt_upload'].':', 'upload__file'));
     $form->addElement(form_makeCloseTag('p'));
     $form->addElement(form_makeOpenTag('p'));
-    $form->addElement(form_makeTextField('id', $id, $lang['txt_filename'].':', 'upload__name'));
+    $form->addElement(form_makeTextField('mediaid', noNS($id), $lang['txt_filename'].':', 'upload__name'));
     $form->addElement(form_makeButton('submit', '', $lang['btn_upload']));
     $form->addElement(form_makeCloseTag('p'));
 
diff --git a/inc/template.php b/inc/template.php
index 4226c0e52..e3d716c25 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1159,17 +1159,17 @@ function tpl_fileList(){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function tpl_fileDetails(){
+function tpl_fileDetails($image){
     global $AUTH;
     global $NS;
 
-    if ($_REQUEST['image']) $image = cleanID($_REQUEST['image']);
-    if (!isset($image) || isset($NS) && getNS($image) != $NS) return '';
+    if (!$image || !file_exists(mediaFN($image))) return '';
+    if (isset($NS) && getNS($image) != $NS) return '';
 
     $opened_tab = $_REQUEST['tab_details'];
     if (!$opened_tab) $opened_tab = 'view';
     if ($_REQUEST['edit']) $opened_tab = 'edit';
-    media_tabs_details($opened_tab);
+    media_tabs_details($image, $opened_tab);
 
     if ($opened_tab == 'view') media_tab_view($image, $NS, $AUTH);
     if ($opened_tab == 'edit') media_tab_edit($image, $NS, $AUTH);
@@ -1423,6 +1423,10 @@ function tpl_media() {
     $fullscreen = true;
     require_once(DOKU_INC.'lib/exe/mediamanager.php');
 
+    if ($_REQUEST['image']) $image = cleanID($_REQUEST['image']);
+    if (isset($IMG)) $image = $IMG;
+    if (isset($JUMPTO)) $image = $JUMPTO;
+
     echo '<div class="mediamanager" id="id-mediamanager">';
     echo '<div class="mediamanager-slider" id="id-mediamanager-layout">';
     echo '<div id="id-mediamanager-layout-namespaces" class="layout" style="width: 25%;">';
@@ -1442,7 +1446,7 @@ function tpl_media() {
     tpl_fileList();
     echo '</div>';
     echo '<div id="id-mediamanager-layout-detail" class="layout" style="width: 30%;">';
-    tpl_fileDetails();
+    tpl_fileDetails($image);
     echo '</div>';
     echo '<div class="clearer"></div>';
     echo '</div>';
-- 
cgit v1.2.3


From 9c1bd4bc9aa4b9ac3b9981543a14508091cd639a Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 30 Jun 2011 19:44:31 +0300
Subject: restoring old media revisions

---
 inc/lang/en/lang.php |  1 +
 inc/media.php        | 47 ++++++++++++++++++++++++++++++++++++++++++-----
 inc/template.php     | 10 ++++++----
 3 files changed, 49 insertions(+), 9 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index abe59d0aa..7a2050fac 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -341,5 +341,6 @@ $lang['media_meta_edited']= 'metadata edited';
 $lang['media_perm_read']  = 'Sorry, you don\'t have enough rights to read files.';
 $lang['media_perm_upload']= 'Sorry, you don\'t have enough rights to upload files.';
 $lang['media_update']     = 'Upload new version';
+$lang['media_restore']    = 'Restore this version';
 
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/media.php b/inc/media.php
index cba89b995..34bdec42b 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -367,6 +367,7 @@ function _media_upload_action($data) {
 function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'move_uploaded_file') {
     global $conf;
     global $lang;
+    global $REV;
 
     $old = @filemtime($fn);
     if(!@file_exists(mediaFN($id, $old)) && @file_exists($fn)) {
@@ -378,6 +379,7 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov
     io_createNamespace($id, 'media');
 
     if($move($fn_tmp, $fn)) {
+        clearstatcache(true,$fn);
         $new = @filemtime($fn);
         // Set the correct permission here.
         // Always chmod media because they may be saved with different permissions than expected from the php umask.
@@ -386,7 +388,9 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov
         msg($lang['uploadsucc'],1);
         media_notify($id,$fn,$imime);
         // add a log entry to the media changelog
-        if ($overwrite) {
+        if ($REV){
+            addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_REVERT, '', $REV);
+        } elseif ($overwrite) {
             addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_EDIT);
         } else {
             addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_CREATE, $lang['created']);
@@ -707,7 +711,7 @@ function media_tab_search($ns,$auth=null) {
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_tab_view($image, $ns, $auth=null) {
+function media_tab_view($image, $ns, $auth=null, $rev=false) {
     global $lang, $conf;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
@@ -717,7 +721,6 @@ function media_tab_view($image, $ns, $auth=null) {
     echo '</div>';
 
     echo '<div class="scroll-container">';
-    $rev = (int) $_REQUEST['rev'];
     media_preview($image, $auth, $rev);
     media_details($image, $auth, $rev);
     echo '</div>';
@@ -789,7 +792,7 @@ function media_preview($image, $auth, $rev=false) {
         echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
         return '';
     }
-    $info = getimagesize(mediaFN($image));
+    $info = getimagesize(mediaFN($image, $rev));
     $w = (int) $info[0];
 
     $more = '';
@@ -810,11 +813,18 @@ function media_preview($image, $auth, $rev=false) {
         $form->addElement(form_makeButton('submit','',$lang['btn_delete']));
         $form->printForm();
 
-        $form = new Doku_Form(array('action'=>media_managerURL()));
+        $form = new Doku_Form(array('action'=>media_managerURL(array('image' => $image))));
         $form->addHidden('mediado','update');
         $form->addElement(form_makeButton('submit','',$lang['media_update']));
         $form->printForm();
     }
+    if($auth >= AUTH_DELETE && $rev){
+        $form = new Doku_Form(array('action'=>media_managerURL(array('image' => $image))));
+        $form->addHidden('mediado','restore');
+        $form->addHidden('rev',$rev);
+        $form->addElement(form_makeButton('submit','',$lang['media_restore']));
+        $form->printForm();
+    }
     echo '</div>';
 }
 
@@ -926,6 +936,33 @@ function media_diff($image, $ns, $auth) {
     echo '</div></li></ul>';
 }
 
+/**
+ * Restores an old revision of a media file
+ *
+ * @param string $image
+ * @param int $rev
+ * @param int $auth
+ * @return string - file's id
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function media_restore($image, $rev, $auth){
+    if ($auth < AUTH_DELETE) return false;
+    if (!$image || !file_exists(mediaFN($image))) return false;
+    if (!$rev || !file_exists(mediaFN($image, $rev))) return false;
+    list($iext,$imime,$dl) = mimetype($image);
+    $res = media_upload_finish(mediaFN($image, $rev),
+        mediaFN($image),
+        $image,
+        $imime,
+        true,
+        'copy');
+    if (is_array($res)) {
+        msg($res[0], $res[1]);
+        return false;
+    }
+    return $res;
+}
+
 /**
  * List all files found by the search request
  *
diff --git a/inc/template.php b/inc/template.php
index e3d716c25..cb5004891 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1159,11 +1159,12 @@ function tpl_fileList(){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function tpl_fileDetails($image){
+function tpl_fileDetails($image, $rev){
     global $AUTH;
     global $NS;
 
     if (!$image || !file_exists(mediaFN($image))) return '';
+    if ($rev && !file_exists(mediaFN($image, $rev))) return '';
     if (isset($NS) && getNS($image) != $NS) return '';
 
     $opened_tab = $_REQUEST['tab_details'];
@@ -1171,7 +1172,7 @@ function tpl_fileDetails($image){
     if ($_REQUEST['edit']) $opened_tab = 'edit';
     media_tabs_details($image, $opened_tab);
 
-    if ($opened_tab == 'view') media_tab_view($image, $NS, $AUTH);
+    if ($opened_tab == 'view') media_tab_view($image, $NS, $AUTH, $rev);
     if ($opened_tab == 'edit') media_tab_edit($image, $NS, $AUTH);
     if ($opened_tab == 'history') media_tab_history($image,$NS,$AUTH);
 }
@@ -1419,13 +1420,14 @@ function tpl_getFavicon($abs=false) {
  */
 function tpl_media() {
     //
-    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $lang, $fullscreen;
+    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $REV, $lang, $fullscreen;
     $fullscreen = true;
     require_once(DOKU_INC.'lib/exe/mediamanager.php');
 
     if ($_REQUEST['image']) $image = cleanID($_REQUEST['image']);
     if (isset($IMG)) $image = $IMG;
     if (isset($JUMPTO)) $image = $JUMPTO;
+    if (isset($REV) && !$JUMPTO) $rev = $REV;
 
     echo '<div class="mediamanager" id="id-mediamanager">';
     echo '<div class="mediamanager-slider" id="id-mediamanager-layout">';
@@ -1446,7 +1448,7 @@ function tpl_media() {
     tpl_fileList();
     echo '</div>';
     echo '<div id="id-mediamanager-layout-detail" class="layout" style="width: 30%;">';
-    tpl_fileDetails($image);
+    tpl_fileDetails($image, $rev);
     echo '</div>';
     echo '<div class="clearer"></div>';
     echo '</div>';
-- 
cgit v1.2.3


From 29dc4f32ec672f86f16846b70a777990822d184c Mon Sep 17 00:00:00 2001
From: Mikael Mallander <micke@slashmail.org>
Date: Sat, 2 Jul 2011 13:19:32 +0200
Subject: Swedish language update

---
 inc/lang/sv/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php
index 801e2d879..06b21afe8 100644
--- a/inc/lang/sv/lang.php
+++ b/inc/lang/sv/lang.php
@@ -16,6 +16,7 @@
  * @author Emil Lind <emil@sys.nu>
  * @author Bogge Bogge <bogge@bogge.com>
  * @author Peter Åström <eaustreum@gmail.com>
+ * @author mikael@mallander.net
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -225,8 +226,8 @@ $lang['img_camera']            = 'Kamera';
 $lang['img_keywords']          = 'Nyckelord';
 $lang['subscr_m_new_header']   = 'Lägg till prenumeration';
 $lang['subscr_m_current_header'] = 'Nuvarande prenumerationer';
-$lang['subscr_m_unsubscribe']  = 'Prenumerera';
-$lang['subscr_m_subscribe']    = 'Avsluta prenumeration';
+$lang['subscr_m_unsubscribe']  = 'Avsluta prenumeration';
+$lang['subscr_m_subscribe']    = 'Prenumerera';
 $lang['subscr_m_receive']      = 'Ta emot';
 $lang['subscr_style_every']    = 'skicka epost vid varje ändring';
 $lang['authmodfailed']         = 'Felaktiga inställningar för användarautentisering. Var vänlig meddela wikiadministratören.';
-- 
cgit v1.2.3


From 6619f42eb475ad91a0b73d1aa6268ff41c6129a2 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Fri, 1 Jul 2011 16:49:28 +0200
Subject: Refactor CSS and JS caching

  * Increase HTTP cache time since the resources are timestamped on request
    anyway
  * Check userscript.js only once for JS cache validation
  * Use cache class
---
 inc/httputils.php | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

(limited to 'inc')

diff --git a/inc/httputils.php b/inc/httputils.php
index 8da42e3b7..0ad97a9a1 100644
--- a/inc/httputils.php
+++ b/inc/httputils.php
@@ -197,3 +197,55 @@ function http_gzip_valid($uncompressed_file) {
 
     return true;
 }
+
+/**
+ * Set HTTP headers and echo cachefile, if useable
+ *
+ * This function handles output of cacheable resource files. It ses the needed
+ * HTTP headers. If a useable cache is present, it is passed to the web server
+ * and the scrpt is terminated.
+ */
+function http_cached($cache, $cache_ok) {
+    global $conf;
+
+    // check cache age & handle conditional request
+    // since the resource files are timestamped, we can use a long max age: 1 year
+    header('Cache-Control: public, max-age=31536000');
+    header('Pragma: public');
+    if($cache_ok){
+        http_conditionalRequest(filemtime($cache));
+        if($conf['allowdebug']) header("X-CacheUsed: $cache");
+
+        // finally send output
+        if ($conf['gzip_output'] && http_gzip_valid($cache)) {
+            header('Vary: Accept-Encoding');
+            header('Content-Encoding: gzip');
+            readfile($cache.".gz");
+        } else {
+            if (!http_sendfile($cache)) readfile($cache);
+        }
+        exit;
+    }
+
+    http_conditionalRequest(time());
+}
+
+/**
+ * Cache content and print it
+ */
+function http_cached_finish($file, $content) {
+    global $conf;
+
+    // save cache file
+    io_saveFile($file, $content);
+    if(function_exists('gzopen')) io_saveFile("$file.gz",$content);
+
+    // finally send output
+    if ($conf['gzip_output']) {
+        header('Vary: Accept-Encoding');
+        header('Content-Encoding: gzip');
+        print gzencode($content,9,FORCE_GZIP);
+    } else {
+        print $content;
+    }
+}
-- 
cgit v1.2.3


From 23846a98488bec2aaade6d983b4c0b0db13af80c Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 3 Jul 2011 19:00:54 +0300
Subject: ajax mediamanager

---
 inc/media.php    | 64 +++++++++++++++++++++++---------------------------------
 inc/template.php | 55 +++++++++++++++++++++++++++++++++++-------------
 2 files changed, 67 insertions(+), 52 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 34bdec42b..fd917a5a0 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -379,7 +379,7 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov
     io_createNamespace($id, 'media');
 
     if($move($fn_tmp, $fn)) {
-        clearstatcache(true,$fn);
+        @clearstatcache(true,$fn);
         $new = @filemtime($fn);
         // Set the correct permission here.
         // Always chmod media because they may be saved with different permissions than expected from the php umask.
@@ -529,7 +529,7 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false){
             echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
         }else foreach($data as $item){
             if (!$fullscreenview) media_printfile($item,$auth,$jump);
-            else if ($fullscreenview == 'thumbs') media_printfile_thumbs($item,$auth,$jump);
+            else media_printfile_thumbs($item,$auth,$jump);
         }
     }
     if (!$fullscreenview) media_searchform($ns);
@@ -544,9 +544,8 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false){
 function media_tabs_files($selected=false){
     global $lang;
 
-    echo '<div class="mediamanager-tabs" id="id-mediamanager-tabs">';
-    $tab = '<a href="'.media_managerURL(array('tab_files' => 'files')).
-        '" rel=".mediamanager-tab-files"';
+    echo '<div class="mediamanager-tabs" id="mediamanager__tabs_files">';
+    $tab = '<a href="'.media_managerURL(array('tab_files' => 'files')).'"';
     if (!empty($selected) && $selected == 'files') $class = 'files selected';
     else $class = 'files';
     $tab .= ' class="'.$class.'" >'.$lang['mediaselect'].'</a>';
@@ -579,7 +578,7 @@ function media_tabs_files($selected=false){
 function media_tabs_details($image, $selected=false){
     global $lang;
 
-    echo '<div class="mediamanager-tabs" id="id-mediamanager-tabs-detail">';
+    echo '<div class="mediamanager-tabs" id="mediamanager__tabs_details">';
     $tab = '<a href="'.media_managerURL(array('tab_details' => 'view', 'image' => $image)).
         '" rel=".mediamanager-tab-view"';
     if (!empty($selected) && $selected == 'view') $class = 'view selected';
@@ -614,7 +613,7 @@ function media_tab_files_options(){
     global $lang;
 
     echo '<div class="background-container">';
-    echo '<div id="id-mediamanager-tabs-files" style="display: inline;">';
+    echo '<div id="mediamanager__tabs_list" style="display: inline;">';
     echo '<a href="'.media_managerURL(array('view' => 'thumbs')).'"
         rel=".mediamanager-files-thumbnails-tab" class="mediamanager-link-thumbnails">'.
         $lang['media_thumbsview'].'</a>';
@@ -639,24 +638,22 @@ function media_tab_files($ns,$auth=null,$jump='') {
     global $lang;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    echo '<div class="mediamanager-tab-files">';
     media_tab_files_options();
-    echo '<div class="scroll-container">';
 
+    echo '<div class="scroll-container" >';
     $view = $_REQUEST['view'];
     if($auth < AUTH_READ){
         echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
     }else{
         if ($view == 'list') {
-            echo '<ul class="mediamanager-file-list mediamanager-list" id="id-mediamanager-file-list">';
+            echo '<ul class="mediamanager-file-list mediamanager-list" id="mediamanager__file_list">';
         } else {
-            echo '<ul class="mediamanager-file-list mediamanager-thumbs" id="id-mediamanager-file-list">';
+            echo '<ul class="mediamanager-file-list mediamanager-thumbs" id="mediamanager__file_list">';
         }
-        media_filelist($ns,$auth,$jump,'thumbs');
+        media_filelist($ns,$auth,$jump,true);
         echo '</ul>';
     }
     echo '</div>';
-    echo '</div>';
 }
 
 /**
@@ -668,7 +665,6 @@ function media_tab_upload($ns,$auth=null,$jump='') {
     global $lang;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    echo '<div class="mediamanager-tab-upload"">';
     echo '<div class="background-container">';
     echo $lang['mediaupload'];
     echo '</div>';
@@ -676,7 +672,6 @@ function media_tab_upload($ns,$auth=null,$jump='') {
     echo '<div class="scroll-container">';
     media_uploadform($ns, $auth, true);
     echo '</div>';
-    echo '</div>';
 }
 
 /**
@@ -691,7 +686,6 @@ function media_tab_search($ns,$auth=null) {
     $query = $_REQUEST['q'];
     if (!$query) $query = '';
 
-    echo '<div class="mediamanager-tab-search">';
     echo '<div class="background-container">';
     echo $lang['media_search'];
     echo'</div>';
@@ -700,10 +694,16 @@ function media_tab_search($ns,$auth=null) {
     media_searchform($ns, $query, true);
 
     if($do == 'searchlist'){
+        $view = $_REQUEST['view'];
+        if ($view == 'list') {
+            echo '<ul class="mediamanager-file-list mediamanager-list" id="mediamanager__file_list">';
+        } else {
+            echo '<ul class="mediamanager-file-list mediamanager-thumbs" id="mediamanager__file_list">';
+        }
         media_searchlist($query,$ns,$auth,true);
+        echo '</ul>';
     }
     echo '</div>';
-    echo '</div>';
 }
 
 /**
@@ -715,7 +715,6 @@ function media_tab_view($image, $ns, $auth=null, $rev=false) {
     global $lang, $conf;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    echo '<div class="mediamanager-tab-detail-view">';
     echo '<div class="background-container">';
     echo $image;
     echo '</div>';
@@ -724,7 +723,6 @@ function media_tab_view($image, $ns, $auth=null, $rev=false) {
     media_preview($image, $auth, $rev);
     media_details($image, $auth, $rev);
     echo '</div>';
-    echo '</div>';
 }
 
 /**
@@ -736,7 +734,6 @@ function media_tab_edit($image, $ns, $auth=null) {
     global $lang;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    echo '<div class="mediamanager-tab-detail-edit">';
     echo '<div class="background-container">';
     echo $lang['media_edit'];
     echo '</div>';
@@ -747,7 +744,6 @@ function media_tab_edit($image, $ns, $auth=null) {
         if ($mime == 'image/jpeg') media_metaform($image,$auth,true);
     }
     echo '</div>';
-    echo '</div>';
 }
 
 /**
@@ -760,7 +756,6 @@ function media_tab_history($image, $ns, $auth=null) {
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
     $do = $_REQUEST['mediado'];
 
-    echo '<div class="mediamanager-tab-detail-history">';
     echo '<div class="background-container">';
     echo $lang['media_history'];
     echo '</div>';
@@ -777,7 +772,6 @@ function media_tab_history($image, $ns, $auth=null) {
         echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
     }
     echo '</div>';
-    echo '</div>';
 }
 
 /**
@@ -1006,7 +1000,7 @@ function media_searchlist($query,$ns,$auth=null,$fullscreen=false){
         echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
     }else foreach($evdata['data'] as $item){
         if (!$fullscreen) media_printfile($item,$item['perm'],'',true);
-        else media_printfile_thumbs($item,$item['perm'],'',true);
+        else media_printfile_thumbs($item,$item['perm']);
     }
 }
 
@@ -1106,7 +1100,7 @@ function media_printfile($item,$auth,$jump,$display_namespace=false){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_printfile_thumbs($item,$auth,$jump){
+function media_printfile_thumbs($item,$auth,$jump=false){
     global $lang;
     global $conf;
 
@@ -1217,18 +1211,11 @@ function media_managerURL($params=false, $amp='&') {
     global $conf;
     global $ID;
 
-    $url = $_SERVER['REQUEST_URI'];
-
-    $urlArray = explode('?', $url, 2);
-    $gets = @$urlArray[1];
-    parse_str($gets, $gets);
-
-    if ($gets['edit']) $gets['image'] = $gets['edit'];
-    unset($gets['edit']);
-    unset($gets['sectok']);
-    unset($gets['delete']);
-    unset($gets['rev']);
-    unset($gets['mediado']);
+    $gets = array('do' => 'media');
+    $media_manager_params = array('tab_files', 'tab_details', 'image', 'ns', 'view');
+    foreach ($media_manager_params as $x) {
+        if (isset($_REQUEST[$x])) $gets[$x] = $_REQUEST[$x];
+    }
 
     if ($params) {
         foreach ($params as $k => $v) {
@@ -1407,7 +1394,8 @@ function media_nstree_item($item){
     $ret  = '';
     if (!($_REQUEST['do'] == 'media'))
     $ret .= '<a href="'.DOKU_BASE.'lib/exe/mediamanager.php?ns='.idfilter($item['id']).'" class="idx_dir">';
-    else $ret .= '<a href="'.media_managerURL(array('ns' => idfilter($item['id']))).'" class="idx_dir">';
+    else $ret .= '<a href="'.media_managerURL(array('ns' => idfilter($item['id']), 'tab_files' => 'files'))
+        .'" class="idx_dir">';
     $ret .= $item['label'];
     $ret .= '</a>';
     return $ret;
diff --git a/inc/template.php b/inc/template.php
index cb5004891..c3b705421 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1135,7 +1135,7 @@ function tpl_mediaContent($fromajax=false){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function tpl_fileList(){
+function tpl_fileList($fromajax=false){
     global $AUTH;
     global $NS;
     global $JUMPTO;
@@ -1144,10 +1144,23 @@ function tpl_fileList(){
     if (!$opened_tab) $opened_tab = 'files';
     if ($_REQUEST['mediado'] == 'update') $opened_tab = 'upload';
 
-    media_tabs_files($opened_tab);
-    if ($opened_tab == 'files') media_tab_files($NS,$AUTH,$JUMPTO);
-    if ($opened_tab == 'upload') media_tab_upload($NS,$AUTH,$JUMPTO);
-    if ($opened_tab == 'search') media_tab_search($NS,$AUTH);
+    if(!$fromajax) media_tabs_files($opened_tab);
+
+    if ($opened_tab == 'files') {
+        if (!$fromajax) echo '<div class="mediamanager-tab-files" id="mediamanager__files">';
+        media_tab_files($NS,$AUTH,$JUMPTO);
+        if (!$fromajax) echo '</div>';
+
+    } elseif ($opened_tab == 'upload') {
+        if (!$fromajax) echo '<div class="mediamanager-tab-upload" id="mediamanager__files">';
+        media_tab_upload($NS,$AUTH,$JUMPTO);
+        if (!$fromajax) echo '</div>';
+
+    } elseif ($opened_tab == 'search') {
+        if (!$fromajax) echo '<div class="mediamanager-tab-search" id="mediamanager__files">';
+        media_tab_search($NS,$AUTH);
+        if (!$fromajax) echo '</div>';
+    }
 
 }
 
@@ -1159,22 +1172,37 @@ function tpl_fileList(){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function tpl_fileDetails($image, $rev){
+function tpl_fileDetails($image, $rev, $fromajax=false){
     global $AUTH;
     global $NS;
 
     if (!$image || !file_exists(mediaFN($image))) return '';
     if ($rev && !file_exists(mediaFN($image, $rev))) return '';
     if (isset($NS) && getNS($image) != $NS) return '';
+    $do = $_REQUEST['mediado'];
 
     $opened_tab = $_REQUEST['tab_details'];
     if (!$opened_tab) $opened_tab = 'view';
     if ($_REQUEST['edit']) $opened_tab = 'edit';
-    media_tabs_details($image, $opened_tab);
+    if ($do == 'restore') $opened_tab = 'view';
 
-    if ($opened_tab == 'view') media_tab_view($image, $NS, $AUTH, $rev);
-    if ($opened_tab == 'edit') media_tab_edit($image, $NS, $AUTH);
-    if ($opened_tab == 'history') media_tab_history($image,$NS,$AUTH);
+    if(!$fromajax) media_tabs_details($image, $opened_tab);
+
+    if ($opened_tab == 'view') {
+        if (!$fromajax) echo '<div class="mediamanager-tab-detail-view" id="mediamanager__details">';
+        media_tab_view($image, $NS, $AUTH, $rev);
+        if (!$fromajax) echo '</div>';
+
+    } elseif ($opened_tab == 'edit') {
+        if (!$fromajax) echo '<div class="mediamanager-tab-detail-edit" id="mediamanager__details">';
+        media_tab_edit($image, $NS, $AUTH);
+        if (!$fromajax) echo '</div>';
+
+    } elseif ($opened_tab == 'history') {
+        if (!$fromajax) echo '<div class="mediamanager-tab-detail-history" id="mediamanager__details">';
+        media_tab_history($image,$NS,$AUTH);
+        if (!$fromajax) echo '</div>';
+    }
 }
 
 /**
@@ -1186,8 +1214,7 @@ function tpl_fileDetails($image, $rev){
  */
 function tpl_mediaTree($fullscreen = false){
     global $NS;
-    if ($fullscreen) ptln('<div id="media-menu">');
-    else ptln('<div id="media__tree">');
+    ptln('<div id="media__tree">');
     media_nstree($NS);
     ptln('</div>');
 }
@@ -1444,10 +1471,10 @@ function tpl_media() {
     tpl_mediaTree(true);
     echo '</div>';
     echo '</div>';
-    echo '<div id="id-mediamanager-layout-list" class="layout" style="width: 40%;">';
+    echo '<div id="mediamanager__layout_list" class="layout" style="width: 40%;">';
     tpl_fileList();
     echo '</div>';
-    echo '<div id="id-mediamanager-layout-detail" class="layout" style="width: 30%;">';
+    echo '<div id="mediamanager__layout_detail" class="layout" style="width: 30%;">';
     tpl_fileDetails($image, $rev);
     echo '</div>';
     echo '<div class="clearer"></div>';
-- 
cgit v1.2.3


From ed69a2ae06c0707fdd5634e18d569c25f0cda6d5 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 3 Jul 2011 23:56:26 +0300
Subject: ajax mediamanager fix

---
 inc/media.php    |  4 ++--
 inc/template.php | 32 ++++++++++++++++----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index fd917a5a0..b668e7be2 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -807,8 +807,8 @@ function media_preview($image, $auth, $rev=false) {
         $form->addElement(form_makeButton('submit','',$lang['btn_delete']));
         $form->printForm();
 
-        $form = new Doku_Form(array('action'=>media_managerURL(array('image' => $image))));
-        $form->addHidden('mediado','update');
+        $form = new Doku_Form(array('id' => 'mediamanager__btn_update',
+            'action'=>media_managerURL(array('image' => $image, 'mediado' => 'update'))));
         $form->addElement(form_makeButton('submit','',$lang['media_update']));
         $form->printForm();
     }
diff --git a/inc/template.php b/inc/template.php
index c3b705421..70253bb90 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1135,7 +1135,7 @@ function tpl_mediaContent($fromajax=false){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function tpl_fileList($fromajax=false){
+function tpl_fileList(){
     global $AUTH;
     global $NS;
     global $JUMPTO;
@@ -1144,22 +1144,22 @@ function tpl_fileList($fromajax=false){
     if (!$opened_tab) $opened_tab = 'files';
     if ($_REQUEST['mediado'] == 'update') $opened_tab = 'upload';
 
-    if(!$fromajax) media_tabs_files($opened_tab);
+    media_tabs_files($opened_tab);
 
     if ($opened_tab == 'files') {
-        if (!$fromajax) echo '<div class="mediamanager-tab-files" id="mediamanager__files">';
+        echo '<div class="mediamanager-tab-files" id="mediamanager__files">';
         media_tab_files($NS,$AUTH,$JUMPTO);
-        if (!$fromajax) echo '</div>';
+        echo '</div>';
 
     } elseif ($opened_tab == 'upload') {
-        if (!$fromajax) echo '<div class="mediamanager-tab-upload" id="mediamanager__files">';
+        echo '<div class="mediamanager-tab-upload" id="mediamanager__files">';
         media_tab_upload($NS,$AUTH,$JUMPTO);
-        if (!$fromajax) echo '</div>';
+        echo '</div>';
 
     } elseif ($opened_tab == 'search') {
-        if (!$fromajax) echo '<div class="mediamanager-tab-search" id="mediamanager__files">';
+        echo '<div class="mediamanager-tab-search" id="mediamanager__files">';
         media_tab_search($NS,$AUTH);
-        if (!$fromajax) echo '</div>';
+        echo '</div>';
     }
 
 }
@@ -1172,7 +1172,7 @@ function tpl_fileList($fromajax=false){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function tpl_fileDetails($image, $rev, $fromajax=false){
+function tpl_fileDetails($image, $rev){
     global $AUTH;
     global $NS;
 
@@ -1186,22 +1186,22 @@ function tpl_fileDetails($image, $rev, $fromajax=false){
     if ($_REQUEST['edit']) $opened_tab = 'edit';
     if ($do == 'restore') $opened_tab = 'view';
 
-    if(!$fromajax) media_tabs_details($image, $opened_tab);
+    media_tabs_details($image, $opened_tab);
 
     if ($opened_tab == 'view') {
-        if (!$fromajax) echo '<div class="mediamanager-tab-detail-view" id="mediamanager__details">';
+        echo '<div class="mediamanager-tab-detail-view" id="mediamanager__details">';
         media_tab_view($image, $NS, $AUTH, $rev);
-        if (!$fromajax) echo '</div>';
+        echo '</div>';
 
     } elseif ($opened_tab == 'edit') {
-        if (!$fromajax) echo '<div class="mediamanager-tab-detail-edit" id="mediamanager__details">';
+        echo '<div class="mediamanager-tab-detail-edit" id="mediamanager__details">';
         media_tab_edit($image, $NS, $AUTH);
-        if (!$fromajax) echo '</div>';
+        echo '</div>';
 
     } elseif ($opened_tab == 'history') {
-        if (!$fromajax) echo '<div class="mediamanager-tab-detail-history" id="mediamanager__details">';
+        echo '<div class="mediamanager-tab-detail-history" id="mediamanager__details">';
         media_tab_history($image,$NS,$AUTH);
-        if (!$fromajax) echo '</div>';
+        echo '</div>';
     }
 }
 
-- 
cgit v1.2.3


From 7d7ab775ac0252d50835987b276a95b790cd1434 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 4 Jul 2011 22:35:44 +0300
Subject: mediamanager ajax forms

---
 inc/html.php  |  5 ++++-
 inc/media.php | 21 ++++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 809db30bd..ee0711b6a 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -449,7 +449,10 @@ function html_revisions($first=0, $media_id = false){
 
     if (!$media_id) print p_locale_xhtml('revisions');
 
-    $form = new Doku_Form(array('id' => 'page__revisions'));
+    $params = array('id' => 'page__revisions');
+    if ($media_id) $params['action'] = media_managerURL(array('image' => $media_id));
+
+    $form = new Doku_Form($params);
     $form->addElement(form_makeOpenTag('ul'));
 
     if (!$media_id) $exists = $INFO['exists'];
diff --git a/inc/media.php b/inc/media.php
index b668e7be2..5a1da55cd 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -110,11 +110,12 @@ function media_metaform($id,$auth,$fullscreen = false){
     // output
     if (!$fullscreen) {
         echo '<h1>'.hsc(noNS($id)).'</h1>'.NL;
-        echo '<form action="'.DOKU_BASE.'lib/exe/mediamanager.php" accept-charset="utf-8" method="post" class="meta">'.NL;
+        $action = DOKU_BASE.'lib/exe/mediamanager.php';
     } else {
-        echo '<form action="'.media_managerURL(array('tab_details' => 'view')).
-            '" accept-charset="utf-8" method="post" class="meta">'.NL;
+        $action = media_managerURL(array('tab_details' => 'view'));
     }
+    echo '<form action="'.$action.'" id="mediamanager__save_meta" accept-charset="utf-8" method="post" class="meta">'.NL;
+
     formSecurityToken();
     foreach($fields as $key => $field){
         // get current value
@@ -150,8 +151,12 @@ function media_metaform($id,$auth,$fullscreen = false){
     }
     echo '<div class="buttons">'.NL;
     echo '<input type="hidden" name="img" value="'.hsc($id).'" />'.NL;
-    if (!$fullscreen) $do = 'do';
-    else $do = 'mediado';
+    if (!$fullscreen) {
+        $do = 'do';
+    } else {
+        echo '<input type="hidden" name="mediado" value="save" />';
+        $do = 'mediado';
+    }
     echo '<input name="'.$do.'[save]" type="submit" value="'.$lang['btn_save'].
         '" title="'.$lang['btn_save'].' [S]" accesskey="s" class="button" />'.NL;
     if (!$fullscreen)
@@ -803,7 +808,8 @@ function media_preview($image, $auth, $rev=false) {
 
     // delete button
     if($auth >= AUTH_DELETE && !$rev){
-        $form = new Doku_Form(array('action'=>media_managerURL(array('delete' => $image))));
+        $form = new Doku_Form(array('id' => 'mediamanager__btn_delete',
+            'action'=>media_managerURL(array('delete' => $image))));
         $form->addElement(form_makeButton('submit','',$lang['btn_delete']));
         $form->printForm();
 
@@ -813,7 +819,8 @@ function media_preview($image, $auth, $rev=false) {
         $form->printForm();
     }
     if($auth >= AUTH_DELETE && $rev){
-        $form = new Doku_Form(array('action'=>media_managerURL(array('image' => $image))));
+        $form = new Doku_Form(array('id' => 'mediamanager__btn_restore',
+            'action'=>media_managerURL(array('image' => $image))));
         $form->addHidden('mediado','restore');
         $form->addHidden('rev',$rev);
         $form->addElement(form_makeButton('submit','',$lang['media_restore']));
-- 
cgit v1.2.3


From 6183fb05112cd318d9a6885d9405cff9917ee82f Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 8 Jul 2011 13:54:15 +0300
Subject: mediamanager fix

---
 inc/html.php         |  2 +-
 inc/lang/en/lang.php |  4 ++--
 inc/media.php        | 27 +++++++++++++++++----------
 3 files changed, 20 insertions(+), 13 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index ee0711b6a..59b4cb6a9 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -450,7 +450,7 @@ function html_revisions($first=0, $media_id = false){
     if (!$media_id) print p_locale_xhtml('revisions');
 
     $params = array('id' => 'page__revisions');
-    if ($media_id) $params['action'] = media_managerURL(array('image' => $media_id));
+    if ($media_id) $params['action'] = media_managerURL(array('image' => $media_id), '&');
 
     $form = new Doku_Form($params);
     $form->addElement(form_makeOpenTag('ul'));
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 7a2050fac..ea6bf2646 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -225,6 +225,7 @@ $lang['js']['linkwiz'] = 'Link Wizard';
 $lang['js']['linkto']  = 'Link to:';
 
 $lang['js']['del_confirm']= 'Really delete selected item(s)?';
+$lang['js']['restore_confirm']= 'Really restore this version?';
 $lang['admin_register']= 'Add new user';
 
 $lang['metaedit']    = 'Edit Metadata';
@@ -333,8 +334,7 @@ $lang['media_historytab'] = 'History';
 $lang['media_thumbsview'] = 'Thumbnails';
 $lang['media_listview']   = 'List';
 $lang['media_sort']       = 'Sort';
-$lang['media_search']     = 'Search';
-$lang['media_view']       = 'View';
+$lang['media_search']     = 'Search in the <b>%s</b> namespace.';
 $lang['media_edit']       = 'Edit';
 $lang['media_history']    = 'These are the older revisions of the file.';
 $lang['media_meta_edited']= 'metadata edited';
diff --git a/inc/media.php b/inc/media.php
index 5a1da55cd..fbbca401c 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -112,7 +112,7 @@ function media_metaform($id,$auth,$fullscreen = false){
         echo '<h1>'.hsc(noNS($id)).'</h1>'.NL;
         $action = DOKU_BASE.'lib/exe/mediamanager.php';
     } else {
-        $action = media_managerURL(array('tab_details' => 'view'));
+        $action = media_managerURL(array('tab_details' => 'view'), '&');
     }
     echo '<form action="'.$action.'" id="mediamanager__save_meta" accept-charset="utf-8" method="post" class="meta">'.NL;
 
@@ -204,6 +204,7 @@ define('DOKU_MEDIA_EMPTY_NS', 8);
                        DOKU_MEDIA_INUSE
  */
 function media_delete($id,$auth){
+    global $lang;
     if($auth < AUTH_DELETE) return DOKU_MEDIA_NOT_AUTH;
     if(media_inuse($id)) return DOKU_MEDIA_INUSE;
 
@@ -219,9 +220,15 @@ function media_delete($id,$auth){
     $data['del'] = false;
     $evt = new Doku_Event('MEDIA_DELETE_FILE',$data);
     if ($evt->advise_before()) {
+        $old = @filemtime($file);
+        if(!@file_exists(mediaFN($id, $old)) && @file_exists($file)) {
+            // add old revision to the attic
+            media_saveOldRevision($id);
+        }
+
         $data['unl'] = @unlink($file);
         if($data['unl']){
-            addMediaLogEntry(time(), $id, DOKU_CHANGE_TYPE_DELETE);
+            addMediaLogEntry(time(), $id, DOKU_CHANGE_TYPE_DELETE, $lang['deleted']);
             $data['del'] = io_sweepNS($id,'mediadir');
         }
     }
@@ -394,7 +401,7 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov
         media_notify($id,$fn,$imime);
         // add a log entry to the media changelog
         if ($REV){
-            addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_REVERT, '', $REV);
+            addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_REVERT, $lang['restored'], $REV);
         } elseif ($overwrite) {
             addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_EDIT);
         } else {
@@ -692,7 +699,7 @@ function media_tab_search($ns,$auth=null) {
     if (!$query) $query = '';
 
     echo '<div class="background-container">';
-    echo $lang['media_search'];
+    echo sprintf($lang['media_search'], $ns);
     echo'</div>';
 
     echo '<div class="scroll-container">';
@@ -809,18 +816,18 @@ function media_preview($image, $auth, $rev=false) {
     // delete button
     if($auth >= AUTH_DELETE && !$rev){
         $form = new Doku_Form(array('id' => 'mediamanager__btn_delete',
-            'action'=>media_managerURL(array('delete' => $image))));
+            'action'=>media_managerURL(array('delete' => $image), '&')));
         $form->addElement(form_makeButton('submit','',$lang['btn_delete']));
         $form->printForm();
 
         $form = new Doku_Form(array('id' => 'mediamanager__btn_update',
-            'action'=>media_managerURL(array('image' => $image, 'mediado' => 'update'))));
+            'action'=>media_managerURL(array('image' => $image, 'mediado' => 'update'), '&')));
         $form->addElement(form_makeButton('submit','',$lang['media_update']));
         $form->printForm();
     }
     if($auth >= AUTH_DELETE && $rev){
         $form = new Doku_Form(array('id' => 'mediamanager__btn_restore',
-            'action'=>media_managerURL(array('image' => $image))));
+            'action'=>media_managerURL(array('image' => $image), '&')));
         $form->addHidden('mediado','restore');
         $form->addHidden('rev',$rev);
         $form->addElement(form_makeButton('submit','',$lang['media_restore']));
@@ -1214,7 +1221,7 @@ function media_printimgdetail($item, $fullscreen=false){
  * @param string $amp - separator
  * @return string - link
  */
-function media_managerURL($params=false, $amp='&') {
+function media_managerURL($params=false, $amp='&amp;') {
     global $conf;
     global $ID;
 
@@ -1266,7 +1273,7 @@ function media_uploadform($ns, $auth, $fullscreen = false){
         $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php';
     } else {
         $params['action'] = media_managerURL(array('tab_files' => 'files',
-            'tab_details' => 'view'));
+            'tab_details' => 'view'), '&');
     }
 
     $form = new Doku_Form($params);
@@ -1339,7 +1346,7 @@ function media_searchform($ns,$query='',$fullscreen=false){
     // The default HTML search form
     $params = array('id' => 'dw__mediasearch');
     if (!$fullscreen) $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php';
-    else $params['action'] = media_managerURL();
+    else $params['action'] = media_managerURL(array(), '&');
     $form = new Doku_Form($params);
     if (!$fullscreen) $form->addElement('<div class="upload">' . $lang['mediasearch'] . '</div>');
     $form->addElement(formSecurityToken());
-- 
cgit v1.2.3


From 96dedb921014ef9601187c762d3070f46a0005bb Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sat, 9 Jul 2011 21:02:14 +0300
Subject: mediamanager without cache

---
 inc/media.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index fbbca401c..ced88f82a 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -802,7 +802,12 @@ function media_preview($image, $auth, $rev=false) {
     $w = (int) $info[0];
 
     $more = '';
-    if ($rev) $more = "rev=$rev";
+    if ($rev) {
+        $more = "rev=$rev";
+    } else {
+        $t = @filemtime(mediaFN($image));
+        $more = "t=$t";
+    }
     $src = ml($image, $more);
     echo '<div class="mediamanager-preview">';
     echo '<img src="'.$src.'" alt="" width="99%" style="max-width: '.$w.'px;" /><br /><br />';
@@ -1169,7 +1174,7 @@ function media_printimgdetail($item, $fullscreen=false){
         $w = floor($w * $ratio);
         $h = floor($h * $ratio);
     }
-    $src = ml($item['id'],array('w'=>$w,'h'=>$h));
+    $src = ml($item['id'],array('w'=>$w,'h'=>$h,'t'=>$item['mtime']));
     $p = array();
     $p['width']  = $w;
     if (!$fullscreen) $p['height'] = $h;
-- 
cgit v1.2.3


From de11c42f80968ac41dc4164829845c1e5dae25c2 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sat, 9 Jul 2011 23:21:50 +0300
Subject: media-manager fixes

---
 inc/html.php  | 6 +++---
 inc/media.php | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 59b4cb6a9..df28a2096 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -476,7 +476,7 @@ function html_revisions($first=0, $media_id = false){
         $form->addElement('<img src="'.DOKU_BASE.'lib/images/blank.gif" width="15" height="11" alt="" />');
 
         if (!$media_id) $href = wl($id);
-        else $href = media_managerURL(array('image' => $id, 'tab_details' => 'view'));
+        else $href = media_managerURL(array('image' => $id, 'tab_details' => 'view'), '&');
         $form->addElement(form_makeOpenTag('a', array(
                         'class' => 'wikilink1',
                         'href'  => $href)));
@@ -536,7 +536,7 @@ function html_revisions($first=0, $media_id = false){
 
         if($exists){
             if (!$media_id) $href = wl($id,"rev=$rev,do=diff", false, '&');
-            else $href = media_managerURL(array('image' => $id, 'rev' => $rev, 'mediado' => 'diff'));
+            else $href = media_managerURL(array('image' => $id, 'rev' => $rev, 'mediado' => 'diff'), '&');
             $form->addElement(form_makeOpenTag('a', array('href' => $href, 'class' => 'diff_link')));
             $form->addElement(form_makeTag('img', array(
                             'src'    => DOKU_BASE.'lib/images/diff.png',
@@ -546,7 +546,7 @@ function html_revisions($first=0, $media_id = false){
                             'alt'    => $lang['diff'])));
             $form->addElement(form_makeCloseTag('a'));
             if (!$media_id) $href = wl($id,"rev=$rev",false,'&');
-            else $href = media_managerURL(array('image' => $id, 'tab_details' => 'view', 'rev' => $rev));
+            else $href = media_managerURL(array('image' => $id, 'tab_details' => 'view', 'rev' => $rev), '&');
             $form->addElement(form_makeOpenTag('a', array('href' => $href, 'class' => 'wikilink1')));
             $form->addElement($id);
             $form->addElement(form_makeCloseTag('a'));
diff --git a/inc/media.php b/inc/media.php
index ced88f82a..341692f5f 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -621,10 +621,11 @@ function media_tabs_details($image, $selected=false){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_tab_files_options(){
+function media_tab_files_options($ns){
     global $lang;
 
     echo '<div class="background-container">';
+    echo $ns;
     echo '<div id="mediamanager__tabs_list" style="display: inline;">';
     echo '<a href="'.media_managerURL(array('view' => 'thumbs')).'"
         rel=".mediamanager-files-thumbnails-tab" class="mediamanager-link-thumbnails">'.
@@ -650,7 +651,7 @@ function media_tab_files($ns,$auth=null,$jump='') {
     global $lang;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    media_tab_files_options();
+    media_tab_files_options($ns);
 
     echo '<div class="scroll-container" >';
     $view = $_REQUEST['view'];
-- 
cgit v1.2.3


From 881f2ee268e95e0cdd02bf593d89ca9b42d03060 Mon Sep 17 00:00:00 2001
From: Andreas Haerter <development@andreas-haerter.com>
Date: Fri, 17 Jun 2011 02:41:10 +0200
Subject: updated doc for tpl_indexerWebBug()

---
 inc/template.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'inc')

diff --git a/inc/template.php b/inc/template.php
index b9b3951ff..a476e78ab 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -972,8 +972,7 @@ function _tpl_img_action($data, $param=NULL) {
 }
 
 /**
- * This function inserts a 1x1 pixel gif which in reality
- * is the indexer function.
+ * This function inserts a small gif which in reality is the indexer function.
  *
  * Should be called somewhere at the very end of the main.php
  * template
@@ -986,7 +985,7 @@ function tpl_indexerWebBug(){
     $p = array();
     $p['src']    = DOKU_BASE.'lib/exe/indexer.php?id='.rawurlencode($ID).
         '&'.time();
-    $p['width']  = 2;
+    $p['width']  = 2; //no more 1x1 px image because we live in times of ad blockers...
     $p['height'] = 1;
     $p['alt']    = '';
     $att = buildAttributes($p);
-- 
cgit v1.2.3


From 0cacf91f96aa51a4c66082fe6c9b034fe61a1290 Mon Sep 17 00:00:00 2001
From: Lucas <lists@x3ro.de>
Date: Sun, 10 Jul 2011 12:49:51 +0200
Subject: Add check for existing renderer class

---
 inc/parserutils.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/parserutils.php b/inc/parserutils.php
index 9ae835893..9384929bf 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -677,12 +677,16 @@ function & p_get_renderer($mode) {
     global $conf, $plugin_controller;
 
     $rname = !empty($conf['renderer_'.$mode]) ? $conf['renderer_'.$mode] : $mode;
+    $rclass = "Doku_Renderer_$rname";
+
+    if( class_exists($rclass) ) {
+        return new $rclass();
+    }
 
     // try default renderer first:
     $file = DOKU_INC."inc/parser/$rname.php";
     if(@file_exists($file)){
         require_once $file;
-        $rclass = "Doku_Renderer_$rname";
 
         if ( !class_exists($rclass) ) {
             trigger_error("Unable to resolve render class $rclass",E_USER_WARNING);
-- 
cgit v1.2.3


From a1dee2b998bc3dc8436bb076435d405ec412e054 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Mon, 11 Jul 2011 22:17:27 +0200
Subject: Fix some bugs and glitches in (mediamanager) tree

  * Fix selector in subtree loading callback
  * Remove HTML inconsistencies between AJAX and plain PHP lists
  * Unify icon and CSS class switching in dw_tree and dw_mediamanager
---
 inc/html.php  | 16 +++++++++++++---
 inc/media.php |  9 ++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 6e187ebe1..de860a0fe 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -737,7 +737,7 @@ function html_list_index($item){
 /**
  * Index List item
  *
- * This user function is used in html_build_lidt to build the
+ * This user function is used in html_buildlist to build the
  * <li> tags for namespaces when displaying the page index
  * it gives different classes to opened or closed "folders"
  *
@@ -778,10 +778,20 @@ function html_li_default($item){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function html_buildlist($data,$class,$func,$lifunc='html_li_default'){
-    $level = 0;
+    if (count($data) === 0) {
+        return '';
+    }
+
+    $level = $data[0]['level'];
     $opens = 0;
     $ret   = '';
 
+    if ($level < 2) {
+        // Trigger building a wrapper ul if the first level is
+        // 0 (we have a root object) or 1 (just the root content)
+        --$level;
+    }
+
     foreach ($data as $item){
 
         if( $item['level'] > $level ){
@@ -797,7 +807,7 @@ function html_buildlist($data,$class,$func,$lifunc='html_li_default'){
                 //close higher lists
                 $ret .= "</ul>\n</li>\n";
             }
-        }else{
+        } elseif ($ret !== '') {
             //close last item
             $ret .= "</li>\n";
         }
diff --git a/inc/media.php b/inc/media.php
index 10da501b0..731ba1668 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -767,15 +767,10 @@ function media_nstree($ns){
     search($data,$conf['mediadir'],'search_index',array('ns' => $ns, 'nofiles' => true));
 
     // wrap a list with the root level around the other namespaces
-    $item = array( 'level' => 0, 'id' => '',
-            'open' =>'true', 'label' => '['.$lang['mediaroot'].']');
+    array_unshift($data, array('level' => 0, 'id' => '', 'open' =>'true',
+                               'label' => '['.$lang['mediaroot'].']'));
 
-    echo '<ul class="idx">';
-    echo media_nstree_li($item);
-    echo media_nstree_item($item);
     echo html_buildlist($data,'idx','media_nstree_item','media_nstree_li');
-    echo '</li>';
-    echo '</ul>';
 }
 
 /**
-- 
cgit v1.2.3


From dd9ba38e965cfc3c06fbb80fed65556dbfbfda1c Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 14 Jul 2011 11:36:48 +0300
Subject: mediamanager tabs, upload form fix

---
 inc/lang/en/lang.php |   3 +-
 inc/media.php        | 101 ++++++++++++++++++++++++++-------------------------
 2 files changed, 54 insertions(+), 50 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index ea6bf2646..93f0f4ce7 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -334,7 +334,8 @@ $lang['media_historytab'] = 'History';
 $lang['media_thumbsview'] = 'Thumbnails';
 $lang['media_listview']   = 'List';
 $lang['media_sort']       = 'Sort';
-$lang['media_search']     = 'Search in the <b>%s</b> namespace.';
+$lang['media_upload']     = 'Upload to the <strong>%s</strong> namespace.';
+$lang['media_search']     = 'Search in the <strong>%s</strong> namespace.';
 $lang['media_edit']       = 'Edit';
 $lang['media_history']    = 'These are the older revisions of the file.';
 $lang['media_meta_edited']= 'metadata edited';
diff --git a/inc/media.php b/inc/media.php
index 341692f5f..d72b228d4 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -557,30 +557,30 @@ function media_tabs_files($selected=false){
     global $lang;
 
     echo '<div class="mediamanager-tabs" id="mediamanager__tabs_files">';
-    $tab = '<a href="'.media_managerURL(array('tab_files' => 'files')).'"';
-    if (!empty($selected) && $selected == 'files') $class = 'files selected';
-    else $class = 'files';
-    $tab .= ' class="'.$class.'" >'.$lang['mediaselect'].'</a>';
-    echo $tab;
-
-    $tab = '<a href="'.media_managerURL(array('tab_files' => 'upload')).
-        '" rel=".mediamanager-tab-upload"';
-    if (!empty($selected) && $selected == 'upload') $class = 'upload selected';
-    else $class = 'upload';
-    $tab .= ' class="'.$class.'" >'.$lang['media_uploadtab'].'</a>';
-    echo $tab;
 
-    $tab = '<a href="'.media_managerURL(array('tab_files' => 'search')).
-        '" rel=".mediamanager-tab-search"';
-    if (!empty($selected) && $selected == 'search') $class = 'search selected';
-    else $class = 'search';
-    $tab .= ' class="'.$class.'" >'.$lang['media_searchtab'].'</a>';
-    echo $tab;
+    media_tab(media_managerURL(array('tab_files' => 'files')), 'files', $lang['mediaselect'], $selected);
+    media_tab(media_managerURL(array('tab_files' => 'upload')), 'upload', $lang['media_uploadtab'], $selected);
+    media_tab(media_managerURL(array('tab_files' => 'search')), 'search', $lang['media_searchtab'], $selected);
 
     echo '<div class="clearer"></div>';
     echo '</div>';
 }
 
+/**
+ * Prints mediamanager tab
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ * @param string $link
+ * @param string $class
+ * @param string $name
+ * @param string $selected
+ */
+function media_tab($link, $class, $name, $selected=false) {
+    if (!empty($selected) && $selected == $class) $class .= ' selected';
+    $tab = '<a href="'.$link.'" class="'.$class.'" >'.$name.'</a>';
+    echo $tab;
+}
+
 /**
  * Prints tabs for files details actions
  *
@@ -591,26 +591,14 @@ function media_tabs_details($image, $selected=false){
     global $lang;
 
     echo '<div class="mediamanager-tabs" id="mediamanager__tabs_details">';
-    $tab = '<a href="'.media_managerURL(array('tab_details' => 'view', 'image' => $image)).
-        '" rel=".mediamanager-tab-view"';
-    if (!empty($selected) && $selected == 'view') $class = 'view selected';
-    else $class = 'view';
-    $tab .= ' class="'.$class.'" >'.$lang['media_viewtab'].'</a>';
-    echo $tab;
 
-    $tab = '<a href="'.media_managerURL(array('tab_details' => 'edit', 'image' => $image)).
-        '" rel=".mediamanager-tab-edit"';
-    if (!empty($selected) && $selected == 'edit') $class = 'edit selected';
-    else $class = 'edit';
-    $tab .= ' class="'.$class.'" >'.$lang['media_edittab'].'</a>';
-    echo $tab;
+    media_tab(media_managerURL(array('tab_details' => 'view')), 'view', $lang['media_viewtab'], $selected);
 
-    $tab = '<a href="'.media_managerURL(array('tab_details' => 'history', 'image' => $image)).
-        '" rel=".mediamanager-tab-history"';
-    if (!empty($selected) && $selected == 'history') $class = 'history selected';
-    else $class = 'history';
-    $tab .= ' class="'.$class.'" >'.$lang['media_historytab'].'</a>';
-    echo $tab;
+    list($ext, $mime) = mimetype($image);
+    if ($mime == 'image/jpeg') {
+        media_tab(media_managerURL(array('tab_details' => 'edit')), 'edit', $lang['media_edittab'], $selected);
+    }
+    media_tab(media_managerURL(array('tab_details' => 'history')), 'history', $lang['media_historytab'], $selected);
 
     echo '<div class="clearer"></div>';
     echo '</div>';
@@ -679,10 +667,11 @@ function media_tab_upload($ns,$auth=null,$jump='') {
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
     echo '<div class="background-container">';
-    echo $lang['mediaupload'];
+    echo sprintf($lang['media_upload'], $ns);
     echo '</div>';
 
     echo '<div class="scroll-container">';
+    if ($auth >= AUTH_UPLOAD) echo '<div class="upload">' . $lang['mediaupload'] . '</div>';
     media_uploadform($ns, $auth, true);
     echo '</div>';
 }
@@ -733,8 +722,9 @@ function media_tab_view($image, $ns, $auth=null, $rev=false) {
     echo '</div>';
 
     echo '<div class="scroll-container">';
-    media_preview($image, $auth, $rev);
-    media_details($image, $auth, $rev);
+    $meta = new JpegMeta(mediaFN($image, $rev));
+    media_preview($image, $auth, $rev, $meta);
+    media_details($image, $auth, $rev, $meta);
     echo '</div>';
 }
 
@@ -792,7 +782,7 @@ function media_tab_history($image, $ns, $auth=null) {
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_preview($image, $auth, $rev=false) {
+function media_preview($image, $auth, $rev=false, $meta=false) {
     global $lang;
     if (!$image) return '';
     if ($auth < AUTH_READ) {
@@ -801,6 +791,7 @@ function media_preview($image, $auth, $rev=false) {
     }
     $info = getimagesize(mediaFN($image, $rev));
     $w = (int) $info[0];
+    $h = (int) $info[1];
 
     $more = '';
     if ($rev) {
@@ -809,12 +800,20 @@ function media_preview($image, $auth, $rev=false) {
         $t = @filemtime(mediaFN($image));
         $more = "t=$t";
     }
+    $link = ml($image,$more,true,'&');
+
+    $size = 500;
+    if($meta && ($w > $size || $h > $size)){
+        $ratio = $meta->getResizeRatio($size, $size);
+        $w = floor($w * $ratio);
+        $h = floor($h * $ratio);
+        $more .= "&h=$h&w=$w";
+    }
+
     $src = ml($image, $more);
     echo '<div class="mediamanager-preview">';
     echo '<img src="'.$src.'" alt="" width="99%" style="max-width: '.$w.'px;" /><br /><br />';
 
-    $link = ml($image,$more,true,'&');
-
     $form = new Doku_Form(array('action'=>$link, 'target'=>'_blank'));
     $form->addElement(form_makeButton('submit','',$lang['mediaview']));
     $form->printForm();
@@ -847,7 +846,7 @@ function media_preview($image, $auth, $rev=false) {
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_details($image, $auth, $rev=false) {
+function media_details($image, $auth, $rev=false, $meta=false) {
     global $lang, $config_cascade;;
 
     if (!$image) return '';
@@ -865,8 +864,8 @@ function media_details($image, $auth, $rev=false) {
         }
     }
 
-    $src = mediaFN($image, $rev);
-    $meta = new JpegMeta($src);
+    if (!$meta) $meta = new JpegMeta(mediaFN($image, $rev));
+
     echo '<dl class="img_tags">';
     foreach($fields as $key => $tag){
         $t = array();
@@ -937,16 +936,20 @@ function media_diff($image, $ns, $auth) {
         $revs = getRevisions($image, 0, 1, 8192, true);
         $l_rev = $revs[0];
     }
+
+    $l_meta = new JpegMeta(mediaFN($image, $l_rev));
+    $r_meta = new JpegMeta(mediaFN($image, $r_rev));
+
     echo '<ul class="mediamanager-table-50"><li><div>';
-    media_preview($image, $auth, $l_rev);
+    media_preview($image, $auth, $l_rev, $l_meta);
     echo '</div></li>';
     echo '<li><div>';
-    media_preview($image, $auth, $r_rev);
+    media_preview($image, $auth, $r_rev, $r_meta);
     echo '</div></li><li><div>';
-    media_details($image, $auth, $l_rev);
+    media_details($image, $auth, $l_rev, $l_meta);
     echo '</div></li>';
     echo '<li><div>';
-    media_details($image, $auth, $r_rev);
+    media_details($image, $auth, $r_rev, $r_meta);
     echo '</div></li></ul>';
 }
 
-- 
cgit v1.2.3


From 23786fd7ff0ff9c41ba627bc43ba6a45d3b779cc Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 14 Jul 2011 23:37:38 +0300
Subject: mediamanager icons

---
 inc/media.php | 58 ++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 18 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index d72b228d4..ebdde0ec9 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -718,7 +718,10 @@ function media_tab_view($image, $ns, $auth=null, $rev=false) {
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
     echo '<div class="background-container">';
-    echo $image;
+    list($ext,$mime,$dl) = mimetype($image,false);
+    $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
+    $class = 'select mediafile mf_'.$class;
+    echo '<a class="'.$class.'" >'.$image.'</a>';
     echo '</div>';
 
     echo '<div class="scroll-container">';
@@ -789,9 +792,8 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
         echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
         return '';
     }
-    $info = getimagesize(mediaFN($image, $rev));
-    $w = (int) $info[0];
-    $h = (int) $info[1];
+
+    echo '<div class="mediamanager-preview">';
 
     $more = '';
     if ($rev) {
@@ -802,17 +804,22 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
     }
     $link = ml($image,$more,true,'&');
 
-    $size = 500;
-    if($meta && ($w > $size || $h > $size)){
-        $ratio = $meta->getResizeRatio($size, $size);
-        $w = floor($w * $ratio);
-        $h = floor($h * $ratio);
-        $more .= "&h=$h&w=$w";
-    }
+    if (preg_match("/\.(jpe?g|gif|png)$/", $image)) {
+        $info = getimagesize(mediaFN($image, $rev));
+        $w = (int) $info[0];
+        $h = (int) $info[1];
+
+        $size = 500;
+        if($meta && ($w > $size || $h > $size)){
+            $ratio = $meta->getResizeRatio($size, $size);
+            $w = floor($w * $ratio);
+            $h = floor($h * $ratio);
+            $more .= "&h=$h&w=$w";
+        }
 
-    $src = ml($image, $more);
-    echo '<div class="mediamanager-preview">';
-    echo '<img src="'.$src.'" alt="" width="99%" style="max-width: '.$w.'px;" /><br /><br />';
+        $src = ml($image, $more);
+        echo '<img src="'.$src.'" alt="" width="99%" style="max-width: '.$w.'px;" /><br /><br />';
+    }
 
     $form = new Doku_Form(array('action'=>$link, 'target'=>'_blank'));
     $form->addElement(form_makeButton('submit','',$lang['mediaview']));
@@ -1118,6 +1125,19 @@ function media_printfile($item,$auth,$jump,$display_namespace=false){
     echo '</div>'.NL;
 }
 
+function media_printicon($filename){
+    list($ext,$mime,$dl) = mimetype(mediaFN($filename),false);
+
+    if (@file_exists(DOKU_INC.'lib/images/fileicons/'.$ext.'.png')) {
+        $icon = DOKU_BASE.'lib/images/fileicons/'.$ext.'.png';
+    } else {
+        $icon = DOKU_BASE.'lib/images/fileicons/file.png';
+    }
+
+    echo '<img src="'.$icon.'" alt="'.$filename.'" class="icon" />';
+
+}
+
 /**
  * Formats and prints one file in the list in the thumbnails view
  *
@@ -1132,13 +1152,15 @@ function media_printfile_thumbs($item,$auth,$jump=false){
 
     // output
     echo '<li><div>';
+
     if($item['isimg']) {
         media_printimgdetail($item, true);
+
     } else {
         echo '<a name="d_:'.$item['id'].'" class="image" title="'.$item['id'].'" href="'.
-            media_managerURL(array('image' => hsc($item['id']))).'">';
-        echo '<img src="'.DOKU_BASE.'lib/images/icon-file.png" width="90px" />';
-        echo '</a>';
+            media_managerURL(array('image' => hsc($item['id']))).'"><div>';
+        media_printicon($item['id']);
+        echo '</div></a>';
     }
     //echo '<input type=checkbox />';
     echo '<a href="'.media_managerURL(array('image' => hsc($item['id']))).'" name=
@@ -1190,7 +1212,7 @@ function media_printimgdetail($item, $fullscreen=false){
     if ($fullscreen) {
         echo '<a name="d_:'.$item['id'].'" class="image" title="'.$item['id'].'" href="'.
             media_managerURL(array('image' => hsc($item['id']))).'">';
-        echo '<img src="'.$src.'" '.$att.' />';
+        echo '<div><img src="'.$src.'" '.$att.' /></div>';
         echo '</a>';
         return 1;
     }
-- 
cgit v1.2.3


From 59e81a438d23d92b656fe57878dab0e4b1560b73 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 14 Jul 2011 23:55:03 +0300
Subject: media diff event

---
 inc/media.php | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index ebdde0ec9..e0bf9bd62 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -722,6 +722,7 @@ function media_tab_view($image, $ns, $auth=null, $rev=false) {
     $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
     $class = 'select mediafile mf_'.$class;
     echo '<a class="'.$class.'" >'.$image.'</a>';
+    //echo '<span style="background: url(/lib/images/fileicons/pdf.png) 0 0 no-repeat; padding-left: 20px;">'.$image.'</span>';
     echo '</div>';
 
     echo '<div class="scroll-container">';
@@ -854,7 +855,7 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function media_details($image, $auth, $rev=false, $meta=false) {
-    global $lang, $config_cascade;;
+    global $lang, $config_cascade;
 
     if (!$image) return '';
     if ($auth < AUTH_READ) {
@@ -944,6 +945,32 @@ function media_diff($image, $ns, $auth) {
         $l_rev = $revs[0];
     }
 
+    // prepare event data
+    $data[0] = $image;
+    $data[1] = $l_rev;
+    $data[2] = $r_rev;
+    $data[3] = $ns;
+    $data[4] = $auth;
+
+    // trigger event
+    return trigger_event('MEDIA_DIFF', $data, '_media_image_diff', true);
+
+}
+
+function _media_image_diff($data) {
+    if(is_array($data) && count($data)===5) {
+        return media_image_diff($data[0], $data[1], $data[2], $data[3], $data[4]);
+    } else {
+        return false;
+    }
+}
+
+/**
+ * Shows difference between two revisions of image
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function media_image_diff($image, $l_rev, $r_rev, $ns, $auth){
     $l_meta = new JpegMeta(mediaFN($image, $l_rev));
     $r_meta = new JpegMeta(mediaFN($image, $r_rev));
 
-- 
cgit v1.2.3


From c439558b00bf5429e11461bc999b63a22f066ac1 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 15 Jul 2011 00:15:55 +0300
Subject: merging

---
 inc/media.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index e0bf9bd62..b4a0ad114 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -722,7 +722,6 @@ function media_tab_view($image, $ns, $auth=null, $rev=false) {
     $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
     $class = 'select mediafile mf_'.$class;
     echo '<a class="'.$class.'" >'.$image.'</a>';
-    //echo '<span style="background: url(/lib/images/fileicons/pdf.png) 0 0 no-repeat; padding-left: 20px;">'.$image.'</span>';
     echo '</div>';
 
     echo '<div class="scroll-container">';
-- 
cgit v1.2.3


From e136d6cc09a2c32050ecc37d7b0deebd0979c15d Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sat, 16 Jul 2011 23:48:48 +0300
Subject: mediamanager image diff

---
 inc/media.php | 279 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 226 insertions(+), 53 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 138eb26c2..5e12ac8a6 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -725,9 +725,15 @@ function media_tab_view($image, $ns, $auth=null, $rev=false) {
     echo '</div>';
 
     echo '<div class="scroll-container">';
-    $meta = new JpegMeta(mediaFN($image, $rev));
-    media_preview($image, $auth, $rev, $meta);
-    media_details($image, $auth, $rev, $meta);
+    if ($image && $auth >= AUTH_READ) {
+        $meta = new JpegMeta(mediaFN($image, $rev));
+        media_preview($image, $auth, $rev, $meta);
+        media_preview_buttons($image, $auth, $rev);
+        media_details($image, $auth, $rev, $meta);
+
+    } else {
+        echo '<div class="nothing">'.$lang['media_perm_read'].'</div>';
+    }
     echo '</div>';
 }
 
@@ -787,12 +793,37 @@ function media_tab_history($image, $ns, $auth=null) {
  */
 function media_preview($image, $auth, $rev=false, $meta=false) {
     global $lang;
-    if (!$image) return '';
-    if ($auth < AUTH_READ) {
-        echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
-        return '';
+
+    echo '<div class="mediamanager-preview">';
+
+    $size = media_image_preview_size($image, $rev, $meta);
+
+    if ($size) {
+        $more = '';
+        if ($rev) {
+            $more = "rev=$rev";
+        } else {
+            $t = @filemtime(mediaFN($image));
+            $more = "t=$t";
+        }
+
+        $more .= '&w='.$size[0].'&h='.$size[1];
+
+        $src = ml($image, $more);
+        echo '<img src="'.$src.'" alt="" width="99%" style="max-width: '.$size[0].'px;" />';
     }
 
+    echo '</div>';
+}
+
+/**
+ * Prints mediafile action buttons
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function media_preview_buttons($image, $auth, $rev=false) {
+    global $lang;
+
     echo '<div class="mediamanager-preview">';
 
     $more = '';
@@ -804,40 +835,29 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
     }
     $link = ml($image,$more,true,'&');
 
-    if (preg_match("/\.(jpe?g|gif|png)$/", $image)) {
-        $info = getimagesize(mediaFN($image, $rev));
-        $w = (int) $info[0];
-        $h = (int) $info[1];
-
-        $size = 500;
-        if($meta && ($w > $size || $h > $size)){
-            $ratio = $meta->getResizeRatio($size, $size);
-            $w = floor($w * $ratio);
-            $h = floor($h * $ratio);
-            $more .= "&h=$h&w=$w";
-        }
-
-        $src = ml($image, $more);
-        echo '<img src="'.$src.'" alt="" width="99%" style="max-width: '.$w.'px;" /><br /><br />';
-    }
-
+    // view original file button
     $form = new Doku_Form(array('action'=>$link, 'target'=>'_blank'));
     $form->addElement(form_makeButton('submit','',$lang['mediaview']));
     $form->printForm();
 
-    // delete button
     if($auth >= AUTH_DELETE && !$rev){
+
+        // delete button
         $form = new Doku_Form(array('id' => 'mediamanager__btn_delete',
             'action'=>media_managerURL(array('delete' => $image), '&')));
         $form->addElement(form_makeButton('submit','',$lang['btn_delete']));
         $form->printForm();
 
+        // upload new version button
         $form = new Doku_Form(array('id' => 'mediamanager__btn_update',
             'action'=>media_managerURL(array('image' => $image, 'mediado' => 'update'), '&')));
         $form->addElement(form_makeButton('submit','',$lang['media_update']));
         $form->printForm();
     }
+
     if($auth >= AUTH_DELETE && $rev){
+
+        // restore button
         $form = new Doku_Form(array('id' => 'mediamanager__btn_restore',
             'action'=>media_managerURL(array('image' => $image), '&')));
         $form->addHidden('mediado','restore');
@@ -845,22 +865,19 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
         $form->addElement(form_makeButton('submit','',$lang['media_restore']));
         $form->printForm();
     }
+
     echo '</div>';
 }
 
 /**
- * Prints mediafile tags
+ * Returns mediafile tags
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ * @param JpegMeta $meta
+ * @return array
  */
-function media_details($image, $auth, $rev=false, $meta=false) {
-    global $lang, $config_cascade;
-
-    if (!$image) return '';
-    if ($auth < AUTH_READ) {
-        echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
-        return '';
-    }
+function media_file_tags($meta) {
+    global $config_cascade;
 
     // load the field descriptions
     static $fields = null;
@@ -871,19 +888,39 @@ function media_details($image, $auth, $rev=false, $meta=false) {
         }
     }
 
-    if (!$meta) $meta = new JpegMeta(mediaFN($image, $rev));
+    $tags = array();
 
-    echo '<dl class="img_tags">';
     foreach($fields as $key => $tag){
         $t = array();
         if (!empty($tag[0])) $t = array($tag[0]);
         if(is_array($tag[3])) $t = array_merge($t,$tag[3]);
-        $value = media_getTag($t, $meta, '-');
-        $value = cleanText($value);
-        echo '<dt>'.$lang[$tag[1]].':</dt><dd>';
-        if ($tag[2] == 'date') echo dformat($value);
-        else echo hsc($value);
-        echo '</dd>';
+        $value = media_getTag($t, $meta);
+        $tags[] = array('tag' => $tag, 'value' => $value);
+    }
+
+    return $tags;
+}
+
+/**
+ * Prints mediafile tags
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function media_details($image, $auth, $rev=false, $meta=false) {
+    global $lang;
+
+    if (!$meta) $meta = new JpegMeta(mediaFN($image, $rev));
+    $tags = media_file_tags($meta);
+
+    echo '<dl class="img_tags">';
+    foreach($tags as $tag){
+        if ($tag['value']) {
+            $value = cleanText($tag['value']);
+            echo '<dt>'.$lang[$tag['tag'][1]].':</dt><dd>';
+            if ($tag['tag'][2] == 'date') echo dformat($value);
+            else echo hsc($value);
+            echo '</dd>';
+        }
     }
     echo '</dl>';
 }
@@ -970,20 +1007,156 @@ function _media_image_diff($data) {
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function media_image_diff($image, $l_rev, $r_rev, $ns, $auth){
-    $l_meta = new JpegMeta(mediaFN($image, $l_rev));
-    $r_meta = new JpegMeta(mediaFN($image, $r_rev));
+    global $lang, $config_cascade;
 
-    echo '<ul class="mediamanager-table-50"><li><div>';
+    echo '<ul class="mediamanager-table-50">';
+
+    echo '<li>';
     media_preview($image, $auth, $l_rev, $l_meta);
-    echo '</div></li>';
-    echo '<li><div>';
+    echo '</li>';
+
+    echo '<li>';
     media_preview($image, $auth, $r_rev, $r_meta);
-    echo '</div></li><li><div>';
-    media_details($image, $auth, $l_rev, $l_meta);
-    echo '</div></li>';
-    echo '<li><div>';
-    media_details($image, $auth, $r_rev, $r_meta);
-    echo '</div></li></ul>';
+    echo '</li>';
+
+    echo '<li>';
+    media_preview_buttons($image, $auth, $l_rev);
+    echo '</li>';
+
+    echo '<li>';
+    media_preview_buttons($image, $auth, $r_rev);
+    echo '</li>';
+
+    $l_meta = new JpegMeta(mediaFN($image, $l_rev));
+    $r_meta = new JpegMeta(mediaFN($image, $r_rev));
+
+    $l_tags = media_file_tags($l_meta);
+    $r_tags = media_file_tags($r_meta);
+    foreach ($l_tags as $key => $l_tag) {
+        if ($l_tag['value'] != $r_tags[$key]['value']) {
+            $r_tags[$key]['class'] = 'highlighted';
+            $l_tags[$key]['class'] = 'highlighted';
+        } else if (!$l_tag['value'] || !$r_tags[$key]['value']) {
+            unset($r_tags[$key]);
+            unset($l_tags[$key]);
+        }
+    }
+
+    foreach(array($l_tags,$r_tags) as $tags){
+        echo '<li><div>';
+
+        echo '<dl class="img_tags">';
+        foreach($tags as $tag){
+            $value = cleanText($tag['value']);
+            if (!$value) $value = '-';
+            echo '<dt>'.$lang[$tag['tag'][1]].':</dt>';
+            echo '<dd class="'.$tag['class'].'" >';
+            if ($tag['tag'][2] == 'date') echo dformat($value);
+            else echo hsc($value);
+            echo '</dd>';
+        }
+        echo '</dl>';
+
+        echo '</div></li>';
+    }
+
+    echo '</ul>';
+
+    media_image_diff_opacity($image, $l_rev, $r_rev, $l_meta);
+    media_image_diff_portions($image, $l_rev, $r_rev, $l_meta);
+}
+
+/**
+ * Returns image width and height for mediamanager preview panel
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ * @param string $image
+ * @param int $rev
+ * @param JpegMeta $meta
+ * @return array
+ */
+function media_image_preview_size($image, $rev, $meta) {
+    if (!preg_match("/\.(jpe?g|gif|png)$/", $image)) return false;
+
+    $info = getimagesize(mediaFN($image, $rev));
+    $w = (int) $info[0];
+    $h = (int) $info[1];
+
+    $size = 500;
+    if($meta && ($w > $size || $h > $size)){
+        $ratio = $meta->getResizeRatio($size, $size);
+        $w = floor($w * $ratio);
+        $h = floor($h * $ratio);
+    }
+    return array($w, $h);
+}
+
+/**
+ * Prints two images side by side
+ * and slider to change the opacity
+ * of one of the images
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ * @param string $image
+ * @param int $l_rev
+ * @param int $r_rev
+ * @param JpegMeta $meta
+ */
+function media_image_diff_opacity($image, $l_rev, $r_rev, $meta) {
+    $l_size = media_image_preview_size($image, $l_rev, $meta);
+    $r_size = media_image_preview_size($image, $r_rev, $meta);
+
+    if (!$l_size || !$r_size || $l_size != $r_size || $l_size[0] < 30) return '';
+
+    echo '<div class="mediamanager-preview">';
+
+    $l_more = 'rev='.$l_rev.'&h='.$l_size[1].'&w='.$l_size[0];
+    $r_more = 'rev='.$r_rev.'&h='.$l_size[1].'&w='.$l_size[0];
+
+    $l_src = ml($image, $l_more);
+    $r_src = ml($image, $r_more);
+
+    echo '<div id="mediamanager__diff_opacity_image1" style="background-image: url(\''.$l_src.'\'); max-width: '.$l_size[0].'px; height: '.$l_size[1].'px; " >';
+    echo '<div id="mediamanager__diff_opacity_image2" style="background-image: url(\''.$r_src.'\'); max-width: '.$l_size[0].'px; height: '.$l_size[1].'px; " >';
+    echo '</div>';
+    echo '</div>';
+
+    echo '<div id="mediamanager__opacity_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>';
+    echo '</div>';
+}
+
+/**
+ * Prints two images side by side
+ * and slider to change the width
+ * of one of the images
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ * @param string $image
+ * @param int $l_rev
+ * @param int $r_rev
+ * @param JpegMeta $meta
+ */
+function media_image_diff_portions($image, $l_rev, $r_rev, $meta) {
+    $l_size = media_image_preview_size($image, $l_rev, $meta);
+    $r_size = media_image_preview_size($image, $r_rev, $meta);
+
+    if (!$l_size || !$r_size || $l_size != $r_size || $l_size[0] < 30) return '';
+
+    echo '<div class="mediamanager-preview">';
+
+    $l_more = 'rev='.$l_rev.'&h='.$l_size[1].'&w='.$l_size[0];
+    $r_more = 'rev='.$r_rev.'&h='.$l_size[1].'&w='.$l_size[0];
+
+    $l_src = ml($image, $l_more);
+    $r_src = ml($image, $r_more);
+
+    echo '<div id="mediamanager__diff_portions_image1" style="background-image: url(\''.$l_src.'\'); max-width: '.$l_size[0].'px; height: '.$l_size[1].'px; " >';
+    echo '<div id="mediamanager__diff_portions_image2" style="background-image: url(\''.$r_src.'\'); max-width: '.$l_size[0].'px; height: '.$l_size[1].'px; " >';
+    echo '</div>';
+    echo '</div>';
+
+    echo '<div id="mediamanager__portions_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>';
+    echo '</div>';
 }
 
 /**
-- 
cgit v1.2.3


From fa8e5c7713944541c907aea2b81c6a44382a15f0 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 17 Jul 2011 18:42:43 +0300
Subject: mediamanager html, css reworking

---
 inc/media.php    | 208 ++++++++++++++++++++++++-------------------------------
 inc/template.php |  28 ++++----
 2 files changed, 105 insertions(+), 131 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 5e12ac8a6..141ba8c2c 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -547,6 +547,21 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false){
     if (!$fullscreenview) media_searchform($ns);
 }
 
+/**
+ * Prints mediamanager tab
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ * @param string $link
+ * @param string $class
+ * @param string $name
+ * @param string $selected
+ */
+function media_tab($link, $class, $name, $selected=false) {
+    if (!empty($selected) && $selected == $class) $class .= ' selected';
+    $tab = '<a href="'.$link.'" class="'.$class.'" >'.$name.'</a>';
+    echo $tab;
+}
+
 /**
  * Prints tabs for files list actions
  *
@@ -566,21 +581,6 @@ function media_tabs_files($selected=false){
     echo '</div>';
 }
 
-/**
- * Prints mediamanager tab
- *
- * @author Kate Arzamastseva <pshns@ukr.net>
- * @param string $link
- * @param string $class
- * @param string $name
- * @param string $selected
- */
-function media_tab($link, $class, $name, $selected=false) {
-    if (!empty($selected) && $selected == $class) $class .= ' selected';
-    $tab = '<a href="'.$link.'" class="'.$class.'" >'.$name.'</a>';
-    echo $tab;
-}
-
 /**
  * Prints tabs for files details actions
  *
@@ -614,18 +614,23 @@ function media_tab_files_options($ns){
 
     echo '<div class="background-container">';
     echo $ns;
-    echo '<div id="mediamanager__tabs_list" style="display: inline;">';
-    echo '<a href="'.media_managerURL(array('view' => 'thumbs')).'"
-        rel=".mediamanager-files-thumbnails-tab" class="mediamanager-link-thumbnails">'.
-        $lang['media_thumbsview'].'</a>';
-    echo '<a href="'.media_managerURL(array('view' => 'list')).'"
-        rel=".mediamanager-files-list-tab" class="mediamanager-link-list"
-        title="View as list">'.$lang['media_listview'].'</a>';
+
+    echo '<div id="mediamanager__tabs_list">';
+
+    echo '<a href="'.media_managerURL(array('view' => 'thumbs')).'" id="mediamanager__link_thumbs" >';
+    echo $lang['media_thumbsview'];
+    echo '</a>';
+
+    echo '<a href="'.media_managerURL(array('view' => 'list')).'" id="mediamanager__link_list" >';
+    echo $lang['media_listview'];
+    echo '</a>';
 
     echo '</div>';
-    echo '<div class="mediamanager-block-sort">'.$lang['media_sort'];
-    //select
+
+    echo '<div id="mediamanager__sort">';
+    echo $lang['media_sort'];
     echo '</div>';
+
     echo '<div class="clearer"></div>';
     echo '</div>';
 }
@@ -647,9 +652,9 @@ function media_tab_files($ns,$auth=null,$jump='') {
         echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
     }else{
         if ($view == 'list') {
-            echo '<ul class="mediamanager-file-list mediamanager-list" id="mediamanager__file_list">';
+            echo '<ul class="mediamanager-list" id="mediamanager__file_list">';
         } else {
-            echo '<ul class="mediamanager-file-list mediamanager-thumbs" id="mediamanager__file_list">';
+            echo '<ul class="mediamanager-thumbs" id="mediamanager__file_list">';
         }
         media_filelist($ns,$auth,$jump,true);
         echo '</ul>';
@@ -698,9 +703,9 @@ function media_tab_search($ns,$auth=null) {
     if($do == 'searchlist'){
         $view = $_REQUEST['view'];
         if ($view == 'list') {
-            echo '<ul class="mediamanager-file-list mediamanager-list" id="mediamanager__file_list">';
+            echo '<ul class="mediamanager-list" id="mediamanager__file_list">';
         } else {
-            echo '<ul class="mediamanager-file-list mediamanager-thumbs" id="mediamanager__file_list">';
+            echo '<ul class="mediamanager-thumbs" id="mediamanager__file_list">';
         }
         media_searchlist($query,$ns,$auth,true);
         echo '</ul>';
@@ -794,7 +799,7 @@ function media_tab_history($image, $ns, $auth=null) {
 function media_preview($image, $auth, $rev=false, $meta=false) {
     global $lang;
 
-    echo '<div class="mediamanager-preview">';
+    echo '<div id="mediamanager__preview">';
 
     $size = media_image_preview_size($image, $rev, $meta);
 
@@ -810,7 +815,7 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
         $more .= '&w='.$size[0].'&h='.$size[1];
 
         $src = ml($image, $more);
-        echo '<img src="'.$src.'" alt="" width="99%" style="max-width: '.$size[0].'px;" />';
+        echo '<img src="'.$src.'" alt="'.$image.'" style="max-width: '.$size[0].'px;" />';
     }
 
     echo '</div>';
@@ -824,7 +829,7 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
 function media_preview_buttons($image, $auth, $rev=false) {
     global $lang;
 
-    echo '<div class="mediamanager-preview">';
+    echo '<div id="mediamanager__preview_buttons">';
 
     $more = '';
     if ($rev) {
@@ -869,6 +874,47 @@ function media_preview_buttons($image, $auth, $rev=false) {
     echo '</div>';
 }
 
+/**
+ * Returns image width and height for mediamanager preview panel
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ * @param string $image
+ * @param int $rev
+ * @param JpegMeta $meta
+ * @return array
+ */
+function media_image_preview_size($image, $rev, $meta) {
+    if (!preg_match("/\.(jpe?g|gif|png)$/", $image)) return false;
+
+    $info = getimagesize(mediaFN($image, $rev));
+    $w = (int) $info[0];
+    $h = (int) $info[1];
+
+    $size = 500;
+    if($meta && ($w > $size || $h > $size)){
+        $ratio = $meta->getResizeRatio($size, $size);
+        $w = floor($w * $ratio);
+        $h = floor($h * $ratio);
+    }
+    return array($w, $h);
+}
+
+/**
+ * Returns the requested EXIF/IPTC tag from the image meta
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ * @param array $tags
+ * @param JpegMeta $meta
+ * @param string $alt
+ * @return string
+ */
+function media_getTag($tags,$meta,$alt=''){
+    if($meta === false) return $alt;
+    $info = $meta->getField($tags);
+    if($info == false) return $alt;
+    return $info;
+}
+
 /**
  * Returns mediafile tags
  *
@@ -925,22 +971,6 @@ function media_details($image, $auth, $rev=false, $meta=false) {
     echo '</dl>';
 }
 
-/**
- * Returns the requested EXIF/IPTC tag from the image meta
- *
- * @author Kate Arzamastseva <pshns@ukr.net>
- * @param array $tags
- * @param JpegMeta $meta
- * @param string $alt
- * @return string
- */
-function media_getTag($tags,$meta,$alt=''){
-    if($meta === false) return $alt;
-    $info = $meta->getField($tags);
-    if($info == false) return $alt;
-    return $info;
-}
-
 /**
  * Shows difference between two revisions of file
  *
@@ -989,13 +1019,13 @@ function media_diff($image, $ns, $auth) {
     $data[4] = $auth;
 
     // trigger event
-    return trigger_event('MEDIA_DIFF', $data, '_media_image_diff', true);
+    return trigger_event('MEDIA_DIFF', $data, '_media_file_diff', true);
 
 }
 
-function _media_image_diff($data) {
+function _media_file_diff($data) {
     if(is_array($data) && count($data)===5) {
-        return media_image_diff($data[0], $data[1], $data[2], $data[3], $data[4]);
+        return media_file_diff($data[0], $data[1], $data[2], $data[3], $data[4]);
     } else {
         return false;
     }
@@ -1006,10 +1036,10 @@ function _media_image_diff($data) {
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_image_diff($image, $l_rev, $r_rev, $ns, $auth){
+function media_file_diff($image, $l_rev, $r_rev, $ns, $auth){
     global $lang, $config_cascade;
 
-    echo '<ul class="mediamanager-table-50">';
+    echo '<ul id="mediamanager__diff_table">';
 
     echo '<li>';
     media_preview($image, $auth, $l_rev, $l_meta);
@@ -1062,73 +1092,13 @@ function media_image_diff($image, $l_rev, $r_rev, $ns, $auth){
 
     echo '</ul>';
 
-    media_image_diff_opacity($image, $l_rev, $r_rev, $l_meta);
-    media_image_diff_portions($image, $l_rev, $r_rev, $l_meta);
-}
-
-/**
- * Returns image width and height for mediamanager preview panel
- *
- * @author Kate Arzamastseva <pshns@ukr.net>
- * @param string $image
- * @param int $rev
- * @param JpegMeta $meta
- * @return array
- */
-function media_image_preview_size($image, $rev, $meta) {
-    if (!preg_match("/\.(jpe?g|gif|png)$/", $image)) return false;
-
-    $info = getimagesize(mediaFN($image, $rev));
-    $w = (int) $info[0];
-    $h = (int) $info[1];
-
-    $size = 500;
-    if($meta && ($w > $size || $h > $size)){
-        $ratio = $meta->getResizeRatio($size, $size);
-        $w = floor($w * $ratio);
-        $h = floor($h * $ratio);
-    }
-    return array($w, $h);
-}
-
-/**
- * Prints two images side by side
- * and slider to change the opacity
- * of one of the images
- *
- * @author Kate Arzamastseva <pshns@ukr.net>
- * @param string $image
- * @param int $l_rev
- * @param int $r_rev
- * @param JpegMeta $meta
- */
-function media_image_diff_opacity($image, $l_rev, $r_rev, $meta) {
-    $l_size = media_image_preview_size($image, $l_rev, $meta);
-    $r_size = media_image_preview_size($image, $r_rev, $meta);
-
-    if (!$l_size || !$r_size || $l_size != $r_size || $l_size[0] < 30) return '';
-
-    echo '<div class="mediamanager-preview">';
-
-    $l_more = 'rev='.$l_rev.'&h='.$l_size[1].'&w='.$l_size[0];
-    $r_more = 'rev='.$r_rev.'&h='.$l_size[1].'&w='.$l_size[0];
-
-    $l_src = ml($image, $l_more);
-    $r_src = ml($image, $r_more);
-
-    echo '<div id="mediamanager__diff_opacity_image1" style="background-image: url(\''.$l_src.'\'); max-width: '.$l_size[0].'px; height: '.$l_size[1].'px; " >';
-    echo '<div id="mediamanager__diff_opacity_image2" style="background-image: url(\''.$r_src.'\'); max-width: '.$l_size[0].'px; height: '.$l_size[1].'px; " >';
-    echo '</div>';
-    echo '</div>';
-
-    echo '<div id="mediamanager__opacity_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>';
-    echo '</div>';
+    media_image_diff($image, $l_rev, $r_rev, $l_meta, 'opacity');
+    media_image_diff($image, $l_rev, $r_rev, $l_meta, 'portions');
 }
 
 /**
  * Prints two images side by side
- * and slider to change the width
- * of one of the images
+ * and slider
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  * @param string $image
@@ -1136,7 +1106,7 @@ function media_image_diff_opacity($image, $l_rev, $r_rev, $meta) {
  * @param int $r_rev
  * @param JpegMeta $meta
  */
-function media_image_diff_portions($image, $l_rev, $r_rev, $meta) {
+function media_image_diff($image, $l_rev, $r_rev, $meta, $type) {
     $l_size = media_image_preview_size($image, $l_rev, $meta);
     $r_size = media_image_preview_size($image, $r_rev, $meta);
 
@@ -1150,12 +1120,12 @@ function media_image_diff_portions($image, $l_rev, $r_rev, $meta) {
     $l_src = ml($image, $l_more);
     $r_src = ml($image, $r_more);
 
-    echo '<div id="mediamanager__diff_portions_image1" style="background-image: url(\''.$l_src.'\'); max-width: '.$l_size[0].'px; height: '.$l_size[1].'px; " >';
-    echo '<div id="mediamanager__diff_portions_image2" style="background-image: url(\''.$r_src.'\'); max-width: '.$l_size[0].'px; height: '.$l_size[1].'px; " >';
+    echo '<div id="mediamanager__diff_'.$type.'_image1" style="background-image: url(\''.$l_src.'\'); max-width: '.$l_size[0].'px; height: '.$l_size[1].'px; " >';
+    echo '<div id="mediamanager__diff_'.$type.'_image2" style="background-image: url(\''.$r_src.'\'); max-width: '.$l_size[0].'px; height: '.$l_size[1].'px; " >';
     echo '</div>';
     echo '</div>';
 
-    echo '<div id="mediamanager__portions_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>';
+    echo '<div id="mediamanager__'.$type.'_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>';
     echo '</div>';
 }
 
diff --git a/inc/template.php b/inc/template.php
index 81b3795ac..13cec438c 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1146,17 +1146,17 @@ function tpl_fileList(){
     media_tabs_files($opened_tab);
 
     if ($opened_tab == 'files') {
-        echo '<div class="mediamanager-tab-files" id="mediamanager__files">';
+        echo '<div id="mediamanager__files">';
         media_tab_files($NS,$AUTH,$JUMPTO);
         echo '</div>';
 
     } elseif ($opened_tab == 'upload') {
-        echo '<div class="mediamanager-tab-upload" id="mediamanager__files">';
+        echo '<div id="mediamanager__files">';
         media_tab_upload($NS,$AUTH,$JUMPTO);
         echo '</div>';
 
     } elseif ($opened_tab == 'search') {
-        echo '<div class="mediamanager-tab-search" id="mediamanager__files">';
+        echo '<div id="mediamanager__files">';
         media_tab_search($NS,$AUTH);
         echo '</div>';
     }
@@ -1188,17 +1188,17 @@ function tpl_fileDetails($image, $rev){
     media_tabs_details($image, $opened_tab);
 
     if ($opened_tab == 'view') {
-        echo '<div class="mediamanager-tab-detail-view" id="mediamanager__details">';
+        echo '<div id="mediamanager__details">';
         media_tab_view($image, $NS, $AUTH, $rev);
         echo '</div>';
 
     } elseif ($opened_tab == 'edit') {
-        echo '<div class="mediamanager-tab-detail-edit" id="mediamanager__details">';
+        echo '<div id="mediamanager__details">';
         media_tab_edit($image, $NS, $AUTH);
         echo '</div>';
 
     } elseif ($opened_tab == 'history') {
-        echo '<div class="mediamanager-tab-detail-history" id="mediamanager__details">';
+        echo '<div id="mediamanager__details">';
         media_tab_history($image,$NS,$AUTH);
         echo '</div>';
     }
@@ -1211,7 +1211,7 @@ function tpl_fileDetails($image, $rev){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function tpl_mediaTree($fullscreen = false){
+function tpl_mediaTree(){
     global $NS;
     ptln('<div id="media__tree">');
     media_nstree($NS);
@@ -1456,8 +1456,9 @@ function tpl_media() {
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
     echo '<div class="mediamanager" id="id-mediamanager">';
-    echo '<div class="mediamanager-slider" id="id-mediamanager-layout">';
-    echo '<div id="id-mediamanager-layout-namespaces" class="layout" style="width: 25%;">';
+    echo '<div id="mediamanager__layout">';
+
+    echo '<div id="mediamanager__layout_namespaces" class="layout resizable" >';
     html_msgarea();
     echo '<div class="mediamanager-tabs">';
     echo '<a href="#" class="selected">'.hsc($lang['namespaces']).'</a>';
@@ -1467,15 +1468,18 @@ function tpl_media() {
     echo hsc($lang['namespaces']);
     echo '</div>';
     echo '<div class="scroll-container">';
-    tpl_mediaTree(true);
+    tpl_mediaTree();
     echo '</div>';
     echo '</div>';
-    echo '<div id="mediamanager__layout_list" class="layout" style="width: 40%;">';
+
+    echo '<div id="mediamanager__layout_list" class="layout resizable" >';
     tpl_fileList();
     echo '</div>';
-    echo '<div id="mediamanager__layout_detail" class="layout" style="width: 30%;">';
+
+    echo '<div id="mediamanager__layout_detail" class="layout" >';
     tpl_fileDetails($image, $rev);
     echo '</div>';
+
     echo '<div class="clearer"></div>';
     echo '</div>';
     echo '</div>';
-- 
cgit v1.2.3


From 68ef894250134bcd8eec98765592c6564bc7e759 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 18 Jul 2011 13:47:16 +0300
Subject: notification mails

---
 inc/lang/en/uploadmail.txt | 17 +++++++++--------
 inc/media.php              |  9 +++++++--
 2 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/uploadmail.txt b/inc/lang/en/uploadmail.txt
index 6fa196730..932a1b704 100644
--- a/inc/lang/en/uploadmail.txt
+++ b/inc/lang/en/uploadmail.txt
@@ -1,13 +1,14 @@
 A file was uploaded to your DokuWiki. Here are the details:
 
-File        : @MEDIA@
-Date        : @DATE@
-Browser     : @BROWSER@
-IP-Address  : @IPADDRESS@
-Hostname    : @HOSTNAME@
-Size        : @SIZE@
-MIME Type   : @MIME@
-User        : @USER@
+File         : @MEDIA@
+Old revision : @OLD@
+Date         : @DATE@
+Browser      : @BROWSER@
+IP-Address   : @IPADDRESS@
+Hostname     : @HOSTNAME@
+Size         : @SIZE@
+MIME Type    : @MIME@
+User         : @USER@
 
 -- 
 This mail was generated by DokuWiki at
diff --git a/inc/media.php b/inc/media.php
index 141ba8c2c..76d25acd6 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -398,7 +398,7 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov
         // (Should normally chmod to $conf['fperm'] only if $conf['fperm'] is set.)
         chmod($fn, $conf['fmode']);
         msg($lang['uploadsucc'],1);
-        media_notify($id,$fn,$imime);
+        media_notify($id,$fn,$imime,$old);
         // add a log entry to the media changelog
         if ($REV){
             addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_REVERT, $lang['restored'], $REV);
@@ -485,7 +485,7 @@ function media_contentcheck($file,$mime){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function media_notify($id,$file,$mime){
+function media_notify($id,$file,$mime,$old_rev=false){
     global $lang;
     global $conf;
     global $INFO;
@@ -503,6 +503,11 @@ function media_notify($id,$file,$mime){
     $text = str_replace('@MIME@',$mime,$text);
     $text = str_replace('@MEDIA@',ml($id,'',true,'&',true),$text);
     $text = str_replace('@SIZE@',filesize_h(filesize($file)),$text);
+    if ($old_rev) {
+        $text = str_replace('@OLD@', ml($id, "rev=$old_rev", true, '&', true), $text);
+    } else {
+        $text = str_replace('@OLD@', '', $text);
+    }
 
     if(empty($conf['mailprefix'])) {
         $subject = '['.$conf['title'].'] '.$lang['mail_upload'].' '.$id;
-- 
cgit v1.2.3


From 80291f9e4256d8bd01f0b0a0589aab2ea402ab64 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 18 Jul 2011 16:51:47 +0300
Subject: mediamanager resize

---
 inc/template.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'inc')

diff --git a/inc/template.php b/inc/template.php
index 13cec438c..2a840a01b 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1455,10 +1455,10 @@ function tpl_media() {
     if (isset($JUMPTO)) $image = $JUMPTO;
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
-    echo '<div class="mediamanager" id="id-mediamanager">';
+    echo '<div id="mediamanager__page">';
     echo '<div id="mediamanager__layout">';
 
-    echo '<div id="mediamanager__layout_namespaces" class="layout resizable" >';
+    echo '<div id="mediamanager__layout_namespaces" class="layout-resizable" >';
     html_msgarea();
     echo '<div class="mediamanager-tabs">';
     echo '<a href="#" class="selected">'.hsc($lang['namespaces']).'</a>';
@@ -1472,7 +1472,7 @@ function tpl_media() {
     echo '</div>';
     echo '</div>';
 
-    echo '<div id="mediamanager__layout_list" class="layout resizable" >';
+    echo '<div id="mediamanager__layout_list" class="layout-resizable" >';
     tpl_fileList();
     echo '</div>';
 
-- 
cgit v1.2.3


From 6316bc7147a7ef1e90e2040d46bd40d034a09f13 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Tue, 19 Jul 2011 18:32:21 +0300
Subject: mediamanager list view thumbnails

---
 inc/media.php | 58 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 25 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 76d25acd6..43a3a07ca 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1361,35 +1361,43 @@ function media_printfile_thumbs($item,$auth,$jump=false){
  */
 function media_printimgdetail($item, $fullscreen=false){
     // prepare thumbnail
-    if (!$fullscreen) $size = 120;
-    else $size = 90;
-    $w = (int) $item['meta']->getField('File.Width');
-    $h = (int) $item['meta']->getField('File.Height');
-    if($w>$size || $h>$size){
+    if (!$fullscreen) {
+        $size_array[] = 120;
+    } else {
+        $size_array = array(90, 40);
+    }
+    foreach ($size_array as $index => $size) {
+        $w = (int) $item['meta']->getField('File.Width');
+        $h = (int) $item['meta']->getField('File.Height');
+        if($w>$size || $h>$size){
+            if (!$fullscreen) {
+                $ratio = $item['meta']->getResizeRatio($size);
+            } else {
+                $ratio = $item['meta']->getResizeRatio($size,$size);
+            }
+            $w = floor($w * $ratio);
+            $h = floor($h * $ratio);
+        }
+        $src = ml($item['id'],array('w'=>$w,'h'=>$h,'t'=>$item['mtime']));
+        $p = array();
         if (!$fullscreen) {
-            $ratio = $item['meta']->getResizeRatio($size);
-        } else {
-            $ratio = $item['meta']->getResizeRatio($size,$size);
+            $p['width']  = $w;
+            $p['height'] = $h;
+        }
+        $p['alt']    = $item['id'];
+        $p['class']  = 'thumb';
+        $att = buildAttributes($p);
+
+        // output
+        if ($fullscreen) {
+            echo '<a name="d_:'.$item['id'].'" class="image'.$index.'" title="'.$item['id'].'" href="'.
+                media_managerURL(array('image' => hsc($item['id']))).'">';
+            echo '<div><img src="'.$src.'" '.$att.' /></div>';
+            echo '</a>';
         }
-        $w = floor($w * $ratio);
-        $h = floor($h * $ratio);
     }
-    $src = ml($item['id'],array('w'=>$w,'h'=>$h,'t'=>$item['mtime']));
-    $p = array();
-    $p['width']  = $w;
-    if (!$fullscreen) $p['height'] = $h;
-    $p['alt']    = $item['id'];
-    $p['class']  = 'thumb';
-    $att = buildAttributes($p);
 
-    // output
-    if ($fullscreen) {
-        echo '<a name="d_:'.$item['id'].'" class="image" title="'.$item['id'].'" href="'.
-            media_managerURL(array('image' => hsc($item['id']))).'">';
-        echo '<div><img src="'.$src.'" '.$att.' /></div>';
-        echo '</a>';
-        return 1;
-    }
+    if ($fullscreen) return '';
 
     echo '<div class="detail">';
     echo '<div class="thumb">';
-- 
cgit v1.2.3


From 67c8cda19c0bf26a746d5c5cf9c82ee7ae5f23ca Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Tue, 19 Jul 2011 18:36:15 +0300
Subject: mediamanager revisions form

---
 inc/html.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index b4cf27d61..e256291ee 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -483,8 +483,10 @@ function html_revisions($first=0, $media_id = false){
         $form->addElement($id);
         $form->addElement(form_makeCloseTag('a'));
 
+        if ($media_id) $form->addElement(form_makeOpenTag('div'));
+
         $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
-        $form->addElement(' &ndash; ');
+        if (!$media_id) $form->addElement(' &ndash; ');
         if (!$media_id) $form->addElement(htmlspecialchars($INFO['sum']));
         $form->addElement(form_makeCloseTag('span'));
 
@@ -502,6 +504,9 @@ function html_revisions($first=0, $media_id = false){
         $form->addElement(form_makeCloseTag('span'));
 
         $form->addElement('('.$lang['current'].')');
+
+        if ($media_id) $form->addElement(form_makeCloseTag('div'));
+
         $form->addElement(form_makeCloseTag('div'));
         $form->addElement(form_makeCloseTag('li'));
     }
@@ -555,8 +560,10 @@ function html_revisions($first=0, $media_id = false){
             $form->addElement($id);
         }
 
+        if ($media_id) $form->addElement(form_makeOpenTag('div'));
+
         $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
-        $form->addElement(' &ndash; ');
+        if (!$media_id) $form->addElement(' &ndash; ');
         $form->addElement(htmlspecialchars($info['sum']));
         $form->addElement(form_makeCloseTag('span'));
 
@@ -571,6 +578,8 @@ function html_revisions($first=0, $media_id = false){
         }
         $form->addElement(form_makeCloseTag('span'));
 
+        if ($media_id) $form->addElement(form_makeCloseTag('div'));
+
         $form->addElement(form_makeCloseTag('div'));
         $form->addElement(form_makeCloseTag('li'));
     }
-- 
cgit v1.2.3


From b5941dfab8516bd445afebc91d6a4942cab4d5f0 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 25 Jul 2011 14:06:25 +0300
Subject: Recent Changes integration of media changes

---
 inc/changelog.php    |  1 +
 inc/html.php         | 78 +++++++++++++++++++++++++++++++---------------------
 inc/lang/en/lang.php |  8 ++++--
 3 files changed, 53 insertions(+), 34 deletions(-)

(limited to 'inc')

diff --git a/inc/changelog.php b/inc/changelog.php
index e9b271363..578a04298 100644
--- a/inc/changelog.php
+++ b/inc/changelog.php
@@ -204,6 +204,7 @@ function getRecents($first,$num,$ns='',$flags=0){
         if (($flags & RECENTS_MEDIA_PAGES_MIXED) && @$media_rec['date'] >= @$rec['date']) {
             $media_lines_position--;
             $x = $media_rec;
+            $x['media'] = true;
             $media_rec = false;
         } else {
             $lines_position--;
diff --git a/inc/html.php b/inc/html.php
index e256291ee..4bbfe6a31 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -626,9 +626,14 @@ function html_recent($first=0, $show_changes='both'){
      * decide if this is the last page or is there another one.
      * This is the cheapest solution to get this information.
      */
-    if (!$show_changes || $show_changes == 'both') $flags = RECENTS_MEDIA_PAGES_MIXED;
-    if ($show_changes == 'mediafiles') $flags = RECENTS_MEDIA_CHANGES;
-    if ($show_changes == 'pages') $flags = 0;
+    if ($show_changes == 'mediafiles') {
+        $flags = RECENTS_MEDIA_CHANGES;
+    } elseif ($show_changes == 'pages') {
+        $flags = 0;
+    } else {
+        $show_changes = 'both';
+        $flags = RECENTS_MEDIA_PAGES_MIXED;
+    }
 
     $recents = getRecents($first,$conf['recent'] + 1,getNS($ID),$flags);
     if(count($recents) == 0 && $first != 0){
@@ -651,29 +656,18 @@ function html_recent($first=0, $show_changes='both'){
     $form->addHidden('do', 'recent');
     $form->addHidden('id', $ID);
 
-    $form->addElement(form_makeOpenTag('div', array('class' => 'changestypenav')));
-    $attrs = array('name' => 'show_changes',
-                   'value' => 'pages',
-                   '_text' => $lang['pages_changes']);
-    if ($show_changes == 'pages') $attrs['checked'] = 'checked';
-    $form->addElement(form_radiofield($attrs));
-    $attrs = array('name' => 'show_changes',
-                   'value' => 'mediafiles',
-                   '_text' => $lang['media_changes']);
-    if ($show_changes == 'mediafiles') $attrs['checked'] = 'checked';
-    $form->addElement(form_radiofield($attrs));
-    $attrs = array('name' => 'show_changes',
-                   'value' => 'both',
-                   '_text' => $lang['both_changes'] );
-    if (empty($show_changes) || $show_changes == 'both') $attrs['checked'] = 'checked';
-    $form->addElement(form_radiofield($attrs));
-    $form->addElement(form_makeTag('input', array(
-                    'type'  => 'submit',
-                    'value' => $lang['btn_apply'],
-                    'title' => $lang['btn_apply'],
-                    'class' => 'button'
-                    )));
-    $form->addElement(form_makeCloseTag('div'));
+    $form->addElement(form_makeListboxField(
+                'show_changes',
+                array(
+                    'pages'      => $lang['pages_changes'],
+                    'mediafiles' => $lang['media_changes'],
+                    'both'       => $lang['both_changes']),
+                $show_changes,
+                $lang['changes_type'],
+                '','',
+                array('class'=>'quickselect')));
+
+    $form->addElement(form_makeButton('submit', 'recent', $lang['btn_apply']));
 
     $form->addElement(form_makeOpenTag('ul'));
 
@@ -690,7 +684,13 @@ function html_recent($first=0, $show_changes='both'){
         $form->addElement($date);
         $form->addElement(form_makeCloseTag('span'));
 
-        $form->addElement(form_makeOpenTag('a', array('class' => 'diff_link', 'href' => wl($recent['id'],"do=diff", false, '&'))));
+        if ($recent['media']) {
+            $href = media_managerURL(array('tab_details' => 'history',
+                'mediado' => 'diff', 'image' => $recent['id']), '&');
+        } else {
+            $href = wl($recent['id'],"do=diff", false, '&');
+        }
+        $form->addElement(form_makeOpenTag('a', array('class' => 'diff_link', 'href' => $href)));
         $form->addElement(form_makeTag('img', array(
                         'src'   => DOKU_BASE.'lib/images/diff.png',
                         'width' => 15,
@@ -700,7 +700,12 @@ function html_recent($first=0, $show_changes='both'){
                         )));
         $form->addElement(form_makeCloseTag('a'));
 
-        $form->addElement(form_makeOpenTag('a', array('class' => 'revisions_link', 'href' => wl($recent['id'],"do=revisions",false,'&'))));
+        if ($recent['media']) {
+            $href = media_managerURL(array('tab_details' => 'history', 'image' => $recent['id']), '&');
+        } else {
+            $href = wl($recent['id'],"do=revisions",false,'&');
+        }
+        $form->addElement(form_makeOpenTag('a', array('class' => 'revisions_link', 'href' => $href)));
         $form->addElement(form_makeTag('img', array(
                         'src'   => DOKU_BASE.'lib/images/history.png',
                         'width' => 12,
@@ -710,8 +715,19 @@ function html_recent($first=0, $show_changes='both'){
                         )));
         $form->addElement(form_makeCloseTag('a'));
 
-        $form->addElement(html_wikilink(':'.$recent['id'],useHeading('navigation')?null:$recent['id']));
+        if ($recent['media']) {
+            // Prepare fileicons
+            list($ext,$mime,$dl) = mimetype($recent['id'],false);
+            $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
+            $class = 'mediafile mf_'.$class;
 
+            $href = media_managerURL(array('tab_details' => 'view', 'image' => $recent['id']), '&');
+            $form->addElement(form_makeOpenTag('a', array('class' => 'wikilink1 '.$class, 'href' => $href)));
+            $form->addElement($recent['id']);
+            $form->addElement(form_makeCloseTag('a'));
+        } else {
+            $form->addElement(html_wikilink(':'.$recent['id'],useHeading('navigation')?null:$recent['id']));
+        }
         $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
         $form->addElement(' &ndash; '.htmlspecialchars($recent['sum']));
         $form->addElement(form_makeCloseTag('span'));
@@ -744,7 +760,7 @@ function html_recent($first=0, $show_changes='both'){
                     'value' => $lang['btn_newer'],
                     'accesskey' => 'n',
                     'title' => $lang['btn_newer'].' [N]',
-                    'class' => 'button'
+                    'class' => 'button not_hide'
                     )));
         $form->addElement(form_makeCloseTag('div'));
     }
@@ -756,7 +772,7 @@ function html_recent($first=0, $show_changes='both'){
                         'value' => $lang['btn_older'],
                         'accesskey' => 'p',
                         'title' => $lang['btn_older'].' [P]',
-                        'class' => 'button'
+                        'class' => 'button not_hide'
                         )));
         $form->addElement(form_makeCloseTag('div'));
     }
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 93f0f4ce7..b9d4bf2a3 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -181,9 +181,11 @@ $lang['external_edit'] = 'external edit';
 $lang['summary']    = 'Edit summary';
 $lang['noflash']    = 'The <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> is needed to display this content.';
 $lang['download']   = 'Download Snippet';
-$lang['pages_changes'] = 'Show pages changes';
-$lang['media_changes'] = 'Show media files changes';
-$lang['both_changes'] = 'Show both';
+
+$lang['changes_type']  = 'View changes of';
+$lang['pages_changes'] = 'Pages';
+$lang['media_changes'] = 'Media files';
+$lang['both_changes']  = 'Both pages and media files';
 
 $lang['mail_newpage']  = 'page added:';
 $lang['mail_changed']  = 'page changed:';
-- 
cgit v1.2.3


From abc306f45f2ace038967bf7c51abd6ea53f56170 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 25 Jul 2011 16:23:24 +0300
Subject: mediamanager sort button

---
 inc/lang/en/lang.php |  2 ++
 inc/media.php        | 23 +++++++++++++++++------
 inc/search.php       | 10 ++++++++--
 3 files changed, 27 insertions(+), 8 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index b9d4bf2a3..2435f9771 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -336,6 +336,8 @@ $lang['media_historytab'] = 'History';
 $lang['media_thumbsview'] = 'Thumbnails';
 $lang['media_listview']   = 'List';
 $lang['media_sort']       = 'Sort';
+$lang['media_sort_name']  = 'by name';
+$lang['media_sort_date']  = 'by date';
 $lang['media_upload']     = 'Upload to the <strong>%s</strong> namespace.';
 $lang['media_search']     = 'Search in the <strong>%s</strong> namespace.';
 $lang['media_edit']       = 'Edit';
diff --git a/inc/media.php b/inc/media.php
index 43a3a07ca..a249e9b54 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -521,7 +521,7 @@ function media_notify($id,$file,$mime,$old_rev=false){
 /**
  * List all files in a given Media namespace
  */
-function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false){
+function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=false){
     global $conf;
     global $lang;
     $ns = cleanID($ns);
@@ -540,7 +540,7 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false){
         $dir = utf8_encodeFN(str_replace(':','/',$ns));
         $data = array();
         search($data,$conf['mediadir'],'search_media',
-                array('showmsg'=>true,'depth'=>1),$dir);
+                array('showmsg'=>true,'depth'=>1),$dir,1,$sort);
 
         if(!count($data)){
             echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
@@ -614,7 +614,7 @@ function media_tabs_details($image, $selected=false){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_tab_files_options($ns){
+function media_tab_files_options($ns, $sort){
     global $lang;
 
     echo '<div class="background-container">';
@@ -633,7 +633,16 @@ function media_tab_files_options($ns){
     echo '</div>';
 
     echo '<div id="mediamanager__sort">';
-    echo $lang['media_sort'];
+    $form = new Doku_Form(array('action'=>media_managerURL(array(), '&'), 'id' => 'mediamanager__form_sort'));
+    $form->addElement(form_makeListboxField(
+                        'sort',
+                        array(
+                            'name' => $lang['media_sort_name'],
+                            'date' => $lang['media_sort_date']),
+                        $sort,
+                        $lang['media_sort']));
+    $form->addElement(form_makeButton('submit', '', $lang['btn_apply']));
+    $form->printForm();
     echo '</div>';
 
     echo '<div class="clearer"></div>';
@@ -649,10 +658,12 @@ function media_tab_files($ns,$auth=null,$jump='') {
     global $lang;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    media_tab_files_options($ns);
+    $sort = $_REQUEST['sort'];
+    media_tab_files_options($ns, $sort);
 
     echo '<div class="scroll-container" >';
     $view = $_REQUEST['view'];
+
     if($auth < AUTH_READ){
         echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
     }else{
@@ -661,7 +672,7 @@ function media_tab_files($ns,$auth=null,$jump='') {
         } else {
             echo '<ul class="mediamanager-thumbs" id="mediamanager__file_list">';
         }
-        media_filelist($ns,$auth,$jump,true);
+        media_filelist($ns,$auth,$jump,true,$sort);
         echo '</ul>';
     }
     echo '</div>';
diff --git a/inc/search.php b/inc/search.php
index 7b53edabe..c11111efc 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -21,9 +21,10 @@ if(!defined('DOKU_INC')) die('meh.');
  * @param   int       $lvl  Recursion Level
  * @author  Andreas Gohr <andi@splitbrain.org>
  */
-function search(&$data,$base,$func,$opts,$dir='',$lvl=1){
+function search(&$data,$base,$func,$opts,$dir='',$lvl=1,$sort=false){
     $dirs   = array();
     $files  = array();
+    $filepaths = array();
 
     //read in directories and files
     $dh = @opendir($base.'/'.$dir);
@@ -35,9 +36,14 @@ function search(&$data,$base,$func,$opts,$dir='',$lvl=1){
             continue;
         }
         $files[] = $dir.'/'.$file;
+        $filepaths[] = $base.'/'.$dir.'/'.$file;
     }
     closedir($dh);
-    sort($files);
+    if ($sort == 'date') {
+        @array_multisort(array_map('filemtime', $filepaths), SORT_NUMERIC, SORT_ASC, $files);
+    } else {
+        sort($files);
+    }
     sort($dirs);
 
     //give directories to userfunction then recurse
-- 
cgit v1.2.3


From 9ee7fd095e8cb3c84ad95dd52c35630147333ecb Mon Sep 17 00:00:00 2001
From: Sami Olmari <sami@olmari.fi>
Date: Mon, 25 Jul 2011 20:17:44 +0200
Subject: Finish language update

---
 inc/lang/fi/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc')

diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index 35f7b3c09..cce597fe7 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -7,6 +7,7 @@
  * @author Matti Pöllä <mpo@iki.fi>
  * @author Otto Vainio <otto@valjakko.net>
  * @author Teemu Mattila <ghcsystems@gmail.com>
+ * @author Sami Olmari <sami@olmari.fi>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-- 
cgit v1.2.3


From c4241309cc2c5ed1d2675cf234f9b59ded0019f4 Mon Sep 17 00:00:00 2001
From: Dejan Igrec <dejan.igrec@gmail.com>
Date: Mon, 25 Jul 2011 20:19:01 +0200
Subject: Croatian language update

---
 inc/lang/hr/lang.php      | 114 ++++++++++++++++++++++++++++++++++++++++------
 inc/lang/hr/read.txt      |   2 +-
 inc/lang/hr/resendpwd.txt |   2 +-
 3 files changed, 101 insertions(+), 17 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php
index a42e8c96f..a76bde2e8 100644
--- a/inc/lang/hr/lang.php
+++ b/inc/lang/hr/lang.php
@@ -6,6 +6,7 @@
  * @author Tomo Krajina <aaa@puzz.info>
  * @author Branko Rihtman <theney@gmail.com>
  * @author Dražen Odobašić <dodobasic@gmail.com>
+ * @author Dejan Igrec dejan.igrec@gmail.com
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -19,7 +20,7 @@ $lang['btn_source']            = 'Prikaži kod dokumenta';
 $lang['btn_show']              = 'Prikaži dokument';
 $lang['btn_create']            = 'Novi dokument';
 $lang['btn_search']            = 'Pretraži';
-$lang['btn_save']              = 'Snimi';
+$lang['btn_save']              = 'Spremi';
 $lang['btn_preview']           = 'Prikaži';
 $lang['btn_top']               = 'Na vrh';
 $lang['btn_newer']             = '<< noviji';
@@ -39,15 +40,13 @@ $lang['btn_back']              = 'Povratak';
 $lang['btn_backlink']          = 'Povratni linkovi';
 $lang['btn_backtomedia']       = 'Povratak na Mediafile izbornik';
 $lang['btn_subscribe']         = 'Pretplati se na promjene dokumenta';
-$lang['btn_unsubscribe']       = 'Odjavi pretplatu o promjenama dokumenta';
-$lang['btn_subscribens']       = 'Pretplati se na promjene imenskog prostora';
-$lang['btn_unsubscribens']     = 'Odjavi pretplatu o promjenama imenskog prostora';
 $lang['btn_profile']           = 'Ažuriraj profil';
 $lang['btn_reset']             = 'Poništi promjene';
 $lang['btn_resendpwd']         = 'Pošalji novu lozinku';
 $lang['btn_draft']             = 'Uredi nacrt dokumenta';
 $lang['btn_recover']           = 'Vrati prijašnji nacrt dokumenta';
 $lang['btn_draftdel']          = 'Obriši nacrt dokumenta';
+$lang['btn_revert']            = 'Vrati';
 $lang['btn_register']          = 'Registracija';
 $lang['loggedinas']            = 'Prijavljen kao';
 $lang['user']                  = 'Korisničko ime';
@@ -86,13 +85,45 @@ $lang['resendpwdconfirm']      = 'Potvrdni link je poslan emailom.';
 $lang['resendpwdsuccess']      = 'Nova lozinka je poslana emailom.';
 $lang['license']               = 'Osim na mjestima gdje je naznačeno drugačije, sadržaj ovog wikija je licenciran sljedećom licencom:';
 $lang['licenseok']             = 'Pažnja: promjenom ovog dokumenta pristajete licencirati sadržaj sljedećom licencom: ';
+$lang['searchmedia']           = 'Traži naziv datoteke:';
+$lang['searchmedia_in']        = 'Traži u %s';
 $lang['txt_upload']            = 'Odaberite datoteku za postavljanje';
 $lang['txt_filename']          = 'Postaviti kao (nije obavezno)';
 $lang['txt_overwrt']           = 'Prepiši postojeću datoteku';
 $lang['lockedby']              = 'Zaključao';
 $lang['lockexpire']            = 'Zaključano do';
 $lang['willexpire']            = 'Dokument kojeg mijenjate će biti zaključan još 1 minutu.\n Ukoliko želite i dalje raditi izmjene na dokumentu - kliknite na "Pregled".';
-$lang['js']['notsavedyet']     = "Vaše izmjene će se izgubiti.\nŽelite li nastaviti?";
+$lang['js']['notsavedyet']     = 'Vaše izmjene će se izgubiti.
+Želite li nastaviti?';
+$lang['js']['searchmedia']     = 'Traži datoteke';
+$lang['js']['keepopen']        = 'Ostavi prozor otvoren nakon izbora';
+$lang['js']['hidedetails']     = 'Sakrij detalje';
+$lang['js']['mediatitle']      = 'Postavke poveznice';
+$lang['js']['mediadisplay']    = 'Vrsta poveznice';
+$lang['js']['mediaalign']      = 'Poravnanje';
+$lang['js']['mediasize']       = 'Veličina slike';
+$lang['js']['mediatarget']     = 'Cilj poveznice';
+$lang['js']['mediaclose']      = 'Zatvori';
+$lang['js']['mediainsert']     = 'Umetni';
+$lang['js']['mediadisplayimg'] = 'Prikaži sliku.';
+$lang['js']['mediadisplaylnk'] = 'Prikaži samo poveznicu.';
+$lang['js']['mediasmall']      = 'Mala verzija.';
+$lang['js']['mediamedium']     = 'Srednja verzija.';
+$lang['js']['medialarge']      = 'Velika verzija.';
+$lang['js']['mediaoriginal']   = 'Originalna verzija.';
+$lang['js']['medialnk']        = 'Poveznica na stranicu s detaljima';
+$lang['js']['mediadirect']     = 'Direktna poveznica na original';
+$lang['js']['medianolnk']      = 'Bez poveznice';
+$lang['js']['medianolink']     = 'Nemoj povezati sliku';
+$lang['js']['medialeft']       = 'Poravnaj sliku lijevo.';
+$lang['js']['mediaright']      = 'Poravnaj sliku desno.';
+$lang['js']['mediacenter']     = 'Poravnaj sliku u sredinu.';
+$lang['js']['medianoalign']    = 'Bez poravnanja.';
+$lang['js']['nosmblinks']      = 'Linkovi na dijeljene Windows mape rade samo s Internet Explorerom. Link je još uvijek moguće kopirati i zalijepiti.';
+$lang['js']['linkwiz']         = 'Čarobnjak za poveznice';
+$lang['js']['linkto']          = 'Poveznica na:';
+$lang['js']['del_confirm']     = 'Zbilja želite obrisati odabrane stavke?';
+$lang['js']['mu_btn']          = 'Postavi više datoteka odjednom';
 $lang['rssfailed']             = 'Došlo je do greške prilikom preuzimanja feed-a: ';
 $lang['nothingfound']          = 'Traženi dokumetni nisu pronađeni.';
 $lang['mediaselect']           = 'Mediafile datoteke';
@@ -110,10 +141,7 @@ $lang['deletefail']            = '"%s" se ne može obrisati - provjerite dozvole
 $lang['mediainuse']            = 'Datoteka "%s" nije obrisana - još uvijek se koristi.';
 $lang['namespaces']            = 'Imenski prostori';
 $lang['mediafiles']            = 'Datoteke u';
-$lang['js']['keepopen']        = 'Ostavi prozor otvoren nakon izbora';
-$lang['js']['hidedetails']     = 'Sakrij detalje';
-$lang['js']['nosmblinks']      = 'Linkovi na dijeljene Windows mape rade samo s Internet Explorerom. Link je još uvijek moguće kopirati i zalijepiti.';
-$lang['js']['mu_btn']          = 'Postavi više datoteka odjednom';
+$lang['accessdenied']          = 'Nemate potrebne dozvole za pregled ove stranice.';
 $lang['mediausage']            = 'Koristi sljedeću sintaksu za referenciranje ove datoteke:';
 $lang['mediaview']             = 'Pregledaj originalnu datoteku';
 $lang['mediaroot']             = 'root';
@@ -129,6 +157,10 @@ $lang['current']               = 'trenutno';
 $lang['yours']                 = 'Vaša inačica';
 $lang['diff']                  = 'Prikaži razlike u odnosu na trenutnu inačicu';
 $lang['diff2']                 = 'Pokaži razlike između odabranih inačica';
+$lang['difflink']              = 'Poveznica na ovaj prikaz usporedbe';
+$lang['diff_type']             = 'Razlike u prikazu:';
+$lang['diff_inline']           = 'U istoj razini';
+$lang['diff_side']             = 'Usporedo';
 $lang['line']                  = 'Redak';
 $lang['breadcrumb']            = 'Putanja';
 $lang['youarehere']            = 'Vi ste ovdje';
@@ -140,8 +172,10 @@ $lang['restored']              = 'vraćena prijašnja inačica';
 $lang['external_edit']         = 'vanjsko uređivanje';
 $lang['summary']               = 'Sažetak izmjena';
 $lang['noflash']               = 'Za prikazivanje ovog sadržaja potreban je <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>';
+$lang['download']              = 'Preuzmi isječak';
 $lang['mail_newpage']          = 'stranica dodana:';
 $lang['mail_changed']          = 'stranica izmjenjena:';
+$lang['mail_subscribe_list']   = 'stranice promijenjene u imenskom prostoru:';
 $lang['mail_new_user']         = 'novi korisnik:';
 $lang['mail_upload']           = 'datoteka postavljena:';
 $lang['qb_bold']               = 'Podebljani tekst';
@@ -168,7 +202,7 @@ $lang['qb_media']              = 'Dodaj slike i ostale datoteke';
 $lang['qb_sig']                = 'Potpis';
 $lang['qb_smileys']            = 'Smiješkići';
 $lang['qb_chars']              = 'Posebni znakovi';
-$lang['js']['del_confirm']           = 'Zbilja želite obrisati odabrane stavke?';
+$lang['upperns']               = 'Skoči u nadređeni imenski prostor';
 $lang['admin_register']        = 'Dodaj novog korisnika';
 $lang['metaedit']              = 'Uredi metapodatake';
 $lang['metasaveerr']           = 'Neuspješno zapisivanje metapodataka';
@@ -184,11 +218,22 @@ $lang['img_copyr']             = 'Autorsko pravo';
 $lang['img_format']            = 'Format';
 $lang['img_camera']            = 'Kamera';
 $lang['img_keywords']          = 'Ključne riječi';
-$lang['subscribe_success']     = 'Dodan %s na listu preplata za %s';
-$lang['subscribe_error']       = 'Greška prilikom dodavanju %s na listu pretplata za %s';
-$lang['subscribe_noaddress']   = 'Nije postavljena email adresa za vaš korisnički profil, nije Vas moguće dodati na listu pretplata';
-$lang['unsubscribe_success']   = 'Izbrisan %s s liste pretplata za %s';
-$lang['unsubscribe_error']     = 'Greška prilikom brisanja %s s liste pretplatnika za %s';
+$lang['subscr_subscribe_success'] = 'Dodan %s u listu pretplatnika za %s';
+$lang['subscr_subscribe_error'] = 'Greška kod dodavanja %s u listu pretplatnika za %s';
+$lang['subscr_subscribe_noaddress'] = 'Ne postoji adresa povezana sa vašim podacima za prijavu, stoga ne možete biti dodani u listu pretplatnika';
+$lang['subscr_unsubscribe_success'] = 'Uklonjen %s iz liste pretplatnika za %s';
+$lang['subscr_unsubscribe_error'] = 'Greška prilikom uklanjanja %s iz liste pretplatnika za %s';
+$lang['subscr_already_subscribed'] = '%s je već pretplaćen na %s';
+$lang['subscr_not_subscribed'] = '%s nije pretplaćen na %s';
+$lang['subscr_m_not_subscribed'] = 'Trenutno niste pretplaćeni na trenutnu stranicu ili imenski prostor.';
+$lang['subscr_m_new_header']   = 'Dodaj pretplatu';
+$lang['subscr_m_current_header'] = 'Trenutne pretplate';
+$lang['subscr_m_unsubscribe']  = 'Odjavi pretplatu';
+$lang['subscr_m_subscribe']    = 'Pretplati se';
+$lang['subscr_m_receive']      = 'Primaj';
+$lang['subscr_style_every']    = 'email za svaku promjenu';
+$lang['subscr_style_digest']   = 'email s kratakim prikazom promjena za svaku stranicu (svaka %.2f dana)';
+$lang['subscr_style_list']     = 'listu promijenjenih stranica od zadnjeg primljenog email-a (svaka %.2f dana)';
 $lang['authmodfailed']         = 'Greška u konfiguraciji korisničke autentifikacije. Molimo Vas da kontaktirate administratora.';
 $lang['authtempfail']          = 'Autentifikacija korisnika je privremeno nedostupna. Molimo Vas da kontaktirate administratora.';
 $lang['i_chooselang']          = 'Izaberite vaš jezik';
@@ -198,3 +243,42 @@ $lang['i_enableacl']           = 'Omogući ACL (preporučeno)';
 $lang['i_superuser']           = 'Superkorisnik';
 $lang['i_problems']            = 'Instalacija je pronašla probleme koji su naznačeni ispod. Nije moguće nastaviti dok se ti problemi ne riješe.';
 $lang['i_modified']            = 'Zbog sigurnosnih razlog, ova skripta ce raditi samo sa novim i nepromijenjenim instalacijama dokuWikija. Preporucujemo da ili re-ekstraktirate fajlove iz downloadovanog paketa ili konsultujete pune a href="http://dokuwiki.org/install">Instrukcije za instalaciju Dokuwikija</a>';
+$lang['i_funcna']              = 'PHP funkcija <code>%s</code> nije dostupna. Možda ju je vaš pružatelj hostinga onemogućio iz nekog razloga?';
+$lang['i_phpver']              = 'Vaša PHP verzija <code>%s</code> je niža od potrebne <code>%s</code>. Trebate nadograditi vašu PHP instalaciju.';
+$lang['i_permfail']            = '<code>%s</code> nema dozvolu pisanja od strane DokuWiki. Trebate podesiti dozvole pristupa tom direktoriju.';
+$lang['i_confexists']          = '<code>%s</code> već postoji';
+$lang['i_writeerr']            = 'Ne može se kreirati <code>%s</code>. Trebate provjeriti dozvole direktorija/datoteke i kreirati dokument ručno.';
+$lang['i_badhash']             = 'neprepoznat ili promijenjen dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - nedozvoljena ili prazna vrijednost';
+$lang['i_success']             = 'Konfiguracija je uspješno završena. Sada možete obrisati install.php datoteku. Nastavite na <a href="doku.php">vaš novi DokuWiki</a>.';
+$lang['i_failure']             = 'Pojavile su se neke greške prilikom pisanja konfiguracijskih datoteka. Morati ćete ih ručno ispraviti da bi mogli koristiti <a href="doku.php">vaš novi DokuWiki</a>.';
+$lang['i_policy']              = 'Inicijalna ACL politika';
+$lang['i_pol0']                = 'Otvoreni Wiki (čitanje, pisanje, učitavanje za sve)';
+$lang['i_pol1']                = 'Javni Wiki (čitanje za sve, pisanje i učitavanje za registrirane korisnike)';
+$lang['i_pol2']                = 'Zatvoreni Wiki (čitanje, pisanje, učitavanje samo za registrirane korisnike)';
+$lang['i_retry']               = 'Pokušaj ponovo';
+$lang['i_license']             = 'Molim odaberite licencu pod kojom želite postavljati vaš sadržaj:';
+$lang['mu_intro']              = 'Ovdje možeš učitati više datoteka odjednom. Klikni gumb pregled te ih dodajte u red. Pritisnite učitaj kad ste gotovi.';
+$lang['mu_gridname']           = 'Naziv datoteke';
+$lang['mu_gridsize']           = 'Veličina';
+$lang['mu_gridstat']           = 'Status';
+$lang['mu_namespace']          = 'Imenski prostor';
+$lang['mu_browse']             = 'Pregled';
+$lang['mu_toobig']             = 'prevelik';
+$lang['mu_ready']              = 'spremno za učitavanje';
+$lang['mu_done']               = 'gotovo';
+$lang['mu_fail']               = 'nije uspio';
+$lang['mu_authfail']           = 'sjednica istekla';
+$lang['mu_progress']           = '@PCT@% učitan';
+$lang['mu_filetypes']          = 'Dozvoljeni tipovi datoteka';
+$lang['mu_info']               = 'datoteke učitane.';
+$lang['mu_lasterr']            = 'Posljednja greška:';
+$lang['recent_global']         = 'Trenutno gledate promjene unutar <b>%s</b> imenskog prostora. Također možete <a href="%s">vidjeti zadnje promjene cijelog wiki-a</a>';
+$lang['years']                 = '%d godina prije';
+$lang['months']                = '%d mjeseci prije';
+$lang['weeks']                 = '%d tjedana prije';
+$lang['days']                  = '%d dana prije';
+$lang['hours']                 = '%d sati prije';
+$lang['minutes']               = '%d minuta prije';
+$lang['seconds']               = '%d sekundi prije';
+$lang['wordblock']             = 'Vaša promjena nije spremljena jer sadrži blokirani tekst (spam).';
diff --git a/inc/lang/hr/read.txt b/inc/lang/hr/read.txt
index d036c0a7b..221f1b200 100644
--- a/inc/lang/hr/read.txt
+++ b/inc/lang/hr/read.txt
@@ -1 +1 @@
-Nije dopušteno mijenjati sadržaj ove stranice.
+Ova stranica se može samo čitati. Možete vidjeti kod, ali ga ne možete mijenjati. Javite se vašem administratoru ako se s tim ne slažete.
\ No newline at end of file
diff --git a/inc/lang/hr/resendpwd.txt b/inc/lang/hr/resendpwd.txt
index fe2c72bf3..ed25f985c 100644
--- a/inc/lang/hr/resendpwd.txt
+++ b/inc/lang/hr/resendpwd.txt
@@ -1,3 +1,3 @@
 ====== Slanje nove lozinke ======
 
-Ispunite potrebne podatke da biste dobili novu lozinku za Vaš korisnički račun.
+Ispunite potrebne podatke da biste dobili novu lozinku za Vaš korisnički račun. Link za potvrdu biti će poslan na Vašu email adresu.
-- 
cgit v1.2.3


From 4ee1558545059fa73700709a9ef4c0ab22ce8f92 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Tue, 26 Jul 2011 11:55:38 +0300
Subject: image diffs fixes

---
 inc/lang/en/lang.php |  5 +++++
 inc/media.php        | 23 +++++++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 2435f9771..ba80c493c 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -348,4 +348,9 @@ $lang['media_perm_upload']= 'Sorry, you don\'t have enough rights to upload file
 $lang['media_update']     = 'Upload new version';
 $lang['media_restore']    = 'Restore this version';
 
+$lang['js']['media_diff']          = 'View differences:';
+$lang['js']['media_diff_both']     = 'Both images';
+$lang['js']['media_diff_opacity']  = 'Changeable opacity of images';
+$lang['js']['media_diff_portions'] = 'Portions of images';
+
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/media.php b/inc/media.php
index a249e9b54..a08d394ef 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -996,6 +996,8 @@ function media_diff($image, $ns, $auth) {
     global $lang;
     global $conf;
 
+    if ($auth < AUTH_READ || !$image) return '';
+
     $rev1 = (int) $_REQUEST['rev'];
 
     if(is_array($_REQUEST['rev2'])){
@@ -1054,6 +1056,24 @@ function _media_file_diff($data) {
  */
 function media_file_diff($image, $l_rev, $r_rev, $ns, $auth){
     global $lang, $config_cascade;
+    $is_img = preg_match("/\.(jpe?g|gif|png)$/", $image);
+
+    if ($is_img) {
+        $difftype = $_REQUEST['difftype'];
+
+        $form = new Doku_Form(array('action'=>media_managerURL(array(), '&'),
+            'id' => 'mediamanager__form_diffview'));
+        $form->addElement('<input type=hidden name=rev2[] value='.$l_rev.' ></input>');
+        $form->addElement('<input type=hidden name=rev2[] value='.$r_rev.' ></input>');
+        $form->addHidden('mediado', 'diff');
+        $form->printForm();
+
+        echo '<div id="mediamanager__diff" >';
+
+        if ($difftype == 'opacity') return media_image_diff($image, $l_rev, $r_rev, $l_meta, 'opacity');
+        if ($difftype == 'portions') return media_image_diff($image, $l_rev, $r_rev, $l_meta, 'portions');
+
+    }
 
     echo '<ul id="mediamanager__diff_table">';
 
@@ -1108,8 +1128,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth){
 
     echo '</ul>';
 
-    media_image_diff($image, $l_rev, $r_rev, $l_meta, 'opacity');
-    media_image_diff($image, $l_rev, $r_rev, $l_meta, 'portions');
+    if ($is_img) echo '</div>';
 }
 
 /**
-- 
cgit v1.2.3


From fbe7c76fbed81d1b87ee829c36aa2c1b9e494faf Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 30 Jul 2011 12:43:09 +0100
Subject: added solidus to character picker and moved multiplication sign to
 other mathmatical symbols

---
 inc/toolbar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/toolbar.php b/inc/toolbar.php
index 58d80043c..02172510e 100644
--- a/inc/toolbar.php
+++ b/inc/toolbar.php
@@ -213,7 +213,7 @@ function toolbar_JSdefines($varname){
                 'type'   => 'picker',
                 'title'  => $lang['qb_chars'],
                 'icon'   => 'chars.png',
-                'list'   => explode(' ','À à Á á  â à ã Ä ä Ǎ ǎ Ă ă Å å Ā ā Ą ą Æ æ Ć ć Ç ç Č č Ĉ ĉ Ċ ċ Ð đ ð Ď ď È è É é Ê ê Ë ë Ě ě Ē ē Ė ė Ę ę Ģ ģ Ĝ ĝ Ğ ğ Ġ ġ Ĥ ĥ Ì ì Í í Î î Ï ï Ǐ ǐ Ī ī İ ı Į į Ĵ ĵ Ķ ķ Ĺ ĺ Ļ ļ Ľ ľ Ł ł Ŀ ŀ Ń ń Ñ ñ Ņ ņ Ň ň Ò ò Ó ó Ô ô Õ õ Ö ö Ǒ ǒ Ō ō Ő ő Œ œ Ø ø Ŕ ŕ Ŗ ŗ Ř ř Ś ś Ş ş Š š Ŝ ŝ Ţ ţ Ť ť Ù ù Ú ú Û û Ü ü Ǔ ǔ Ŭ ŭ Ū ū Ů ů ǖ ǘ ǚ ǜ Ų ų Ű ű Ŵ ŵ Ý ý Ÿ ÿ Ŷ ŷ Ź ź Ž ž Ż ż Þ þ ß Ħ ħ ¿ ¡ ¢ £ ¤ ¥ € ¦ § ª ¬ ¯ ° ± ÷ ‰ ¼ ½ ¾ ¹ ² ³ µ ¶ † ‡ · • º ∀ ∂ ∃ Ə ə ∅ ∇ ∈ ∉ ∋ ∏ ∑ ‾ − ∗ √ ∝ ∞ ∠ ∧ ∨ ∩ ∪ ∫ ∴ ∼ ≅ ≈ ≠ ≡ ≤ ≥ ⊂ ⊃ ⊄ ⊆ ⊇ ⊕ ⊗ ⊥ ⋅ ◊ ℘ ℑ ℜ ℵ ♠ ♣ ♥ ♦ α β Γ γ Δ δ ε ζ η Θ θ ι κ Λ λ μ Ξ ξ Π π ρ Σ σ Τ τ υ Φ φ χ Ψ ψ Ω ω ★ ☆ ☎ ☚ ☛ ☜ ☝ ☞ ☟ ☹ ☺ ✔ ✘ × „ “ ” ‚ ‘ ’ « » ‹ › — – … ← ↑ → ↓ ↔ ⇐ ⇑ ⇒ ⇓ ⇔ © ™ ® ′ ″ [ ] { } ~ ( ) % § $ # | @'),
+                'list'   => explode(' ','À à Á á  â à ã Ä ä Ǎ ǎ Ă ă Å å Ā ā Ą ą Æ æ Ć ć Ç ç Č č Ĉ ĉ Ċ ċ Ð đ ð Ď ď È è É é Ê ê Ë ë Ě ě Ē ē Ė ė Ę ę Ģ ģ Ĝ ĝ Ğ ğ Ġ ġ Ĥ ĥ Ì ì Í í Î î Ï ï Ǐ ǐ Ī ī İ ı Į į Ĵ ĵ Ķ ķ Ĺ ĺ Ļ ļ Ľ ľ Ł ł Ŀ ŀ Ń ń Ñ ñ Ņ ņ Ň ň Ò ò Ó ó Ô ô Õ õ Ö ö Ǒ ǒ Ō ō Ő ő Œ œ Ø ø Ŕ ŕ Ŗ ŗ Ř ř Ś ś Ş ş Š š Ŝ ŝ Ţ ţ Ť ť Ù ù Ú ú Û û Ü ü Ǔ ǔ Ŭ ŭ Ū ū Ů ů ǖ ǘ ǚ ǜ Ų ų Ű ű Ŵ ŵ Ý ý Ÿ ÿ Ŷ ŷ Ź ź Ž ž Ż ż Þ þ ß Ħ ħ ¿ ¡ ¢ £ ¤ ¥ € ¦ § ª ¬ ¯ ° ± ÷ ‰ ¼ ½ ¾ ¹ ² ³ µ ¶ † ‡ · • º ∀ ∂ ∃ Ə ə ∅ ∇ ∈ ∉ ∋ ∏ ∑ ‾ − ∗ × ⁄ √ ∝ ∞ ∠ ∧ ∨ ∩ ∪ ∫ ∴ ∼ ≅ ≈ ≠ ≡ ≤ ≥ ⊂ ⊃ ⊄ ⊆ ⊇ ⊕ ⊗ ⊥ ⋅ ◊ ℘ ℑ ℜ ℵ ♠ ♣ ♥ ♦ α β Γ γ Δ δ ε ζ η Θ θ ι κ Λ λ μ Ξ ξ Π π ρ Σ σ Τ τ υ Φ φ χ Ψ ψ Ω ω ★ ☆ ☎ ☚ ☛ ☜ ☝ ☞ ☟ ☹ ☺ ✔ ✘ „ “ ” ‚ ‘ ’ « » ‹ › — – … ← ↑ → ↓ ↔ ⇐ ⇑ ⇒ ⇓ ⇔ © ™ ® ′ ″ [ ] { } ~ ( ) % § $ # | @'),
                 'block'  => false
                ),
           array(
-- 
cgit v1.2.3


From 421ec38e1988e77c10f4c97aa48edfbf7aadd402 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sat, 30 Jul 2011 16:13:23 +0300
Subject: issue #38 links and icons in recent changes

---
 inc/changelog.php |  1 +
 inc/html.php      | 21 ++++++++++++---------
 inc/media.php     |  4 ++--
 3 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'inc')

diff --git a/inc/changelog.php b/inc/changelog.php
index 578a04298..188670397 100644
--- a/inc/changelog.php
+++ b/inc/changelog.php
@@ -209,6 +209,7 @@ function getRecents($first,$num,$ns='',$flags=0){
         } else {
             $lines_position--;
             $x = $rec;
+            if ($flags & RECENTS_MEDIA_CHANGES) $x['media'] = true;
             $rec = false;
         }
         if(--$first >= 0) continue; // skip first entries
diff --git a/inc/html.php b/inc/html.php
index 4bbfe6a31..1df61dc7e 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -680,13 +680,20 @@ function html_recent($first=0, $show_changes='both'){
 
         $form->addElement(form_makeOpenTag('div', array('class' => 'li')));
 
+        if ($recent['media']) {
+            $form->addElement(media_printicon($recent['id']));
+        } else {
+            $icon = DOKU_BASE.'lib/images/fileicons/file.png';
+            $form->addElement('<img src="'.$icon.'" alt="'.$filename.'" class="icon" />');
+        }
+
         $form->addElement(form_makeOpenTag('span', array('class' => 'date')));
         $form->addElement($date);
         $form->addElement(form_makeCloseTag('span'));
 
         if ($recent['media']) {
             $href = media_managerURL(array('tab_details' => 'history',
-                'mediado' => 'diff', 'image' => $recent['id']), '&');
+                'mediado' => 'diff', 'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&');
         } else {
             $href = wl($recent['id'],"do=diff", false, '&');
         }
@@ -701,7 +708,8 @@ function html_recent($first=0, $show_changes='both'){
         $form->addElement(form_makeCloseTag('a'));
 
         if ($recent['media']) {
-            $href = media_managerURL(array('tab_details' => 'history', 'image' => $recent['id']), '&');
+            $href = media_managerURL(array('tab_details' => 'history',
+                'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&');
         } else {
             $href = wl($recent['id'],"do=revisions",false,'&');
         }
@@ -716,13 +724,8 @@ function html_recent($first=0, $show_changes='both'){
         $form->addElement(form_makeCloseTag('a'));
 
         if ($recent['media']) {
-            // Prepare fileicons
-            list($ext,$mime,$dl) = mimetype($recent['id'],false);
-            $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
-            $class = 'mediafile mf_'.$class;
-
-            $href = media_managerURL(array('tab_details' => 'view', 'image' => $recent['id']), '&');
-            $form->addElement(form_makeOpenTag('a', array('class' => 'wikilink1 '.$class, 'href' => $href)));
+            $href = media_managerURL(array('tab_details' => 'view', 'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&');
+            $form->addElement(form_makeOpenTag('a', array('class' => 'wikilink1', 'href' => $href)));
             $form->addElement($recent['id']);
             $form->addElement(form_makeCloseTag('a'));
         } else {
diff --git a/inc/media.php b/inc/media.php
index a08d394ef..5f9fb63de 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1338,7 +1338,7 @@ function media_printicon($filename){
         $icon = DOKU_BASE.'lib/images/fileicons/file.png';
     }
 
-    echo '<img src="'.$icon.'" alt="'.$filename.'" class="icon" />';
+    return '<img src="'.$icon.'" alt="'.$filename.'" class="icon" />';
 
 }
 
@@ -1363,7 +1363,7 @@ function media_printfile_thumbs($item,$auth,$jump=false){
     } else {
         echo '<a name="d_:'.$item['id'].'" class="image" title="'.$item['id'].'" href="'.
             media_managerURL(array('image' => hsc($item['id']))).'"><div>';
-        media_printicon($item['id']);
+        echo media_printicon($item['id']);
         echo '</div></a>';
     }
     //echo '<input type=checkbox />';
-- 
cgit v1.2.3


From d971ea8b02ccca4dd879a5db966670e0f3b4f102 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sat, 30 Jul 2011 20:50:49 +0300
Subject: issue #39 sort by date desc, saved in cookie

---
 inc/media.php  | 6 ++++++
 inc/search.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 5f9fb63de..bb3fc22dc 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -659,6 +659,12 @@ function media_tab_files($ns,$auth=null,$jump='') {
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
     $sort = $_REQUEST['sort'];
+    if (!$sort && @strpos($_COOKIE['DOKU_PREFS'], 'sort')) {
+        $parts = explode('#', $_COOKIE['DOKU_PREFS']);
+            for ($i = 0; $i < count($parts); $i+=2){
+                if ($parts[$i] == 'sort') $sort = $parts[$i+1];
+            }
+    }
     media_tab_files_options($ns, $sort);
 
     echo '<div class="scroll-container" >';
diff --git a/inc/search.php b/inc/search.php
index c11111efc..a6089c479 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -40,7 +40,7 @@ function search(&$data,$base,$func,$opts,$dir='',$lvl=1,$sort=false){
     }
     closedir($dh);
     if ($sort == 'date') {
-        @array_multisort(array_map('filemtime', $filepaths), SORT_NUMERIC, SORT_ASC, $files);
+        @array_multisort(array_map('filemtime', $filepaths), SORT_NUMERIC, SORT_DESC, $files);
     } else {
         sort($files);
     }
-- 
cgit v1.2.3


From 4f616b5f20590d5f3a592bd53f2fc932968940d8 Mon Sep 17 00:00:00 2001
From: Christophe Martin <Schplurtz@laposte.net>
Date: Sat, 30 Jul 2011 20:33:43 +0200
Subject: French language update

---
 inc/lang/fr/lang.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 40384fecb..047019baf 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -21,6 +21,7 @@
  * @author Florian Gaub <floriang@floriang.net>
  * @author Samuel Dorsaz <samuel.dorsaz@novelion.net>
  * @author Johan Guilbaud <guilbaud.johan@gmail.com>
+ * @author schplurtz@laposte.net
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -121,10 +122,10 @@ $lang['js']['mediaclose']      = 'Fermer';
 $lang['js']['mediainsert']     = 'Insérer';
 $lang['js']['mediadisplayimg'] = 'Afficher l\'image.';
 $lang['js']['mediadisplaylnk'] = 'N\'afficher que le lien.';
-$lang['js']['mediasmall']      = 'Petite version';
-$lang['js']['mediamedium']     = 'Version moyenne';
-$lang['js']['medialarge']      = 'Grande version';
-$lang['js']['mediaoriginal']   = 'Version originale';
+$lang['js']['mediasmall']      = 'Petite taille';
+$lang['js']['mediamedium']     = 'taille moyenne';
+$lang['js']['medialarge']      = 'Grande taille';
+$lang['js']['mediaoriginal']   = 'taille d\'origine';
 $lang['js']['medialnk']        = 'Lien vers la page de détail';
 $lang['js']['mediadirect']     = 'Lien direct vers l\'original';
 $lang['js']['medianolnk']      = 'Aucun lien';
-- 
cgit v1.2.3


From 872a6d295eacbfa8abad2877ec4e367930da3692 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 31 Jul 2011 00:52:10 +0100
Subject: added apple-touch-icon (aka 'mobile favicon')

---
 inc/template.php | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

(limited to 'inc')

diff --git a/inc/template.php b/inc/template.php
index a476e78ab..5184929b8 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1340,21 +1340,50 @@ function tpl_flush(){
 
 
 /**
- * Use favicon.ico from data/media root directory if it exists, otherwise use
+ * Returns icon from data/media root directory if it exists, otherwise
  * the one in the template's image directory.
  *
+ * @param  bool $abs        - if to use absolute URL
+ * @param  string $fileName - file name of icon
  * @author Anika Henke <anika@selfthinker.org>
  */
-function tpl_getFavicon($abs=false) {
-    if (file_exists(mediaFN('favicon.ico'))) {
-        return ml('favicon.ico', '', true, '', $abs);
+function tpl_getFavicon($abs=false, $fileName='favicon.ico') {
+    if (file_exists(mediaFN($fileName))) {
+        return ml($fileName, '', true, '', $abs);
     }
 
     if($abs) {
-        return DOKU_URL.substr(DOKU_TPL.'images/favicon.ico', strlen(DOKU_REL));
+        return DOKU_URL.substr(DOKU_TPL.'images/'.$fileName, strlen(DOKU_REL));
+    }
+    return DOKU_TPL.'images/'.$fileName;
+}
+
+/**
+ * Returns <link> tag for various icon types (favicon|mobile|generic)
+ *
+ * @param  array $types - list of icon types to display (favicon|mobile|generic)
+ * @author Anika Henke <anika@selfthinker.org>
+ */
+function tpl_favicon($types=array('favicon')) {
+
+    $return = '';
+
+    foreach ($types as $type) {
+        switch($type) {
+            case 'favicon':
+                $return .= '<link rel="shortcut icon" href="'.tpl_getFavicon().'" />'.NL;
+                break;
+            case 'mobile':
+                $return .= '<link rel="apple-touch-icon" href="'.tpl_getFavicon(false, 'apple-touch-icon.png').'" />'.NL;
+                break;
+            case 'generic':
+                // ideal world solution, which doesn't work in any browser yet
+                $return .= '<link rel="icon" href="'.tpl_getFavicon(false, 'icon.svg').'" type="image/svg+xml" />'.NL;
+                break;
+        }
     }
 
-    return DOKU_TPL.'images/favicon.ico';
+    return $return;
 }
 
 
-- 
cgit v1.2.3


From 56c92de61fb92487744205a372fc66ecb489039a Mon Sep 17 00:00:00 2001
From: Eivind Morland <eivind.morland@gmail.com>
Date: Mon, 1 Aug 2011 00:15:48 +0200
Subject: Transliteration for Sanskrit diacritics FS#2246

---
 inc/utf8.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'inc')

diff --git a/inc/utf8.php b/inc/utf8.php
index 3d4de2289..303987e4f 100644
--- a/inc/utf8.php
+++ b/inc/utf8.php
@@ -1261,6 +1261,7 @@ if(empty($UTF8_SPECIAL_CHARS2)) $UTF8_SPECIAL_CHARS2 =
  * @link   http://www.btranslations.com/resources/romanization/korean.asp
  * @author Arthit Suriyawongkul <arthit@gmail.com>
  * @author Denis Scheither <amorphis@uni-bremen.de>
+ * @author Eivind Morland <eivind.morland@gmail.com>
  */
 global $UTF8_ROMANIZATION;
 if(empty($UTF8_ROMANIZATION)) $UTF8_ROMANIZATION = array(
@@ -1293,6 +1294,11 @@ if(empty($UTF8_ROMANIZATION)) $UTF8_ROMANIZATION = array(
   'ड'=>'dq','ढ'=>'dqh','ण'=>'nq','त'=>'t','थ'=>'th','द'=>'d','ध'=>'dh',
   'न'=>'n','प'=>'p','फ'=>'ph','ब'=>'b','भ'=>'bh','म'=>'m','य'=>'z','र'=>'r',
   'ल'=>'l','व'=>'v','श'=>'sh','ष'=>'sqh','स'=>'s','ह'=>'x',
+  //Sanskrit diacritics
+  'Ā'=>'A','Ī'=>'I','Ū'=>'U','Ṛ'=>'R','Ṝ'=>'R','Ṅ'=>'N','Ñ'=>'N','Ṭ'=>'T',
+  'Ḍ'=>'D','Ṇ'=>'N','Ś'=>'S','Ṣ'=>'S','Ṁ'=>'M','Ṃ'=>'M','Ḥ'=>'H','Ḷ'=>'L','Ḹ'=>'L',
+  'ā'=>'a','ī'=>'i','ū'=>'u','ṛ'=>'r','ṝ'=>'r','ṅ'=>'n','ñ'=>'n','ṭ'=>'t',
+  'ḍ'=>'d','ṇ'=>'n','ś'=>'s','ṣ'=>'s','ṁ'=>'m','ṃ'=>'m','ḥ'=>'h','ḷ'=>'l','ḹ'=>'l',
   //Hebrew
   'א'=>'a', 'ב'=>'b','ג'=>'g','ד'=>'d','ה'=>'h','ו'=>'v','ז'=>'z','ח'=>'kh','ט'=>'th',
   'י'=>'y','ך'=>'h','כ'=>'k','ל'=>'l','ם'=>'m','מ'=>'m','ן'=>'n','נ'=>'n',
-- 
cgit v1.2.3


From 69143ff27bdf2a979818367613e604f8ee4aef88 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 1 Aug 2011 01:21:21 +0300
Subject: issue #40 image resized in all diff views

---
 inc/media.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index bb3fc22dc..99567632c 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1161,12 +1161,19 @@ function media_image_diff($image, $l_rev, $r_rev, $meta, $type) {
     $l_src = ml($image, $l_more);
     $r_src = ml($image, $r_more);
 
-    echo '<div id="mediamanager__diff_'.$type.'_image1" style="background-image: url(\''.$l_src.'\'); max-width: '.$l_size[0].'px; height: '.$l_size[1].'px; " >';
-    echo '<div id="mediamanager__diff_'.$type.'_image2" style="background-image: url(\''.$r_src.'\'); max-width: '.$l_size[0].'px; height: '.$l_size[1].'px; " >';
+    // slider
+    echo '<div id="mediamanager__'.$type.'_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>';
+
+    // two image's in div's
+    echo '<div id="mediamanager__diff_layout">';
+    echo '<div id="mediamanager__diff_'.$type.'_image1" style="max-width: '.$l_size[0].'px;">'; //  height: '.$l_size[1].'px;
+    echo '<img src="'.$l_src.'" />';
+    echo '</div>';
+    echo '<div id="mediamanager__diff_'.$type.'_image2" style="max-width: '.$l_size[0].'px;">'; // height: '.$l_size[1].'px;
+    echo '<img src="'.$r_src.'" />';
     echo '</div>';
     echo '</div>';
 
-    echo '<div id="mediamanager__'.$type.'_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>';
     echo '</div>';
 }
 
-- 
cgit v1.2.3


From d5daba103cb1ed14fd07618ef936ca8d5cffb50c Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 1 Aug 2011 01:39:36 +0300
Subject: css class name fix

---
 inc/html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 1df61dc7e..a225f8503 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -763,7 +763,7 @@ function html_recent($first=0, $show_changes='both'){
                     'value' => $lang['btn_newer'],
                     'accesskey' => 'n',
                     'title' => $lang['btn_newer'].' [N]',
-                    'class' => 'button not_hide'
+                    'class' => 'button show'
                     )));
         $form->addElement(form_makeCloseTag('div'));
     }
@@ -775,7 +775,7 @@ function html_recent($first=0, $show_changes='both'){
                         'value' => $lang['btn_older'],
                         'accesskey' => 'p',
                         'title' => $lang['btn_older'].' [P]',
-                        'class' => 'button not_hide'
+                        'class' => 'button show'
                         )));
         $form->addElement(form_makeCloseTag('div'));
     }
-- 
cgit v1.2.3


From 507a2aebd7d8bede509a97e12e2a0f208030ee15 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 1 Aug 2011 21:11:01 +0100
Subject: fixed empty target in license link

---
 inc/html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index de860a0fe..64999ed98 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1258,7 +1258,7 @@ function html_edit(){
         $form->addElement(form_makeOpenTag('div', array('class'=>'license')));
         $out  = $lang['licenseok'];
         $out .= ' <a href="'.$license[$conf['license']]['url'].'" rel="license" class="urlextern"';
-        if(isset($conf['target']['extern'])) $out .= ' target="'.$conf['target']['extern'].'"';
+        if($conf['target']['extern']) $out .= ' target="'.$conf['target']['extern'].'"';
         $out .= '>'.$license[$conf['license']]['name'].'</a>';
         $form->addElement($out);
         $form->addElement(form_makeCloseTag('div'));
-- 
cgit v1.2.3


From 6dd095f599ed20044f98d324cda37bedd57b3d3e Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Tue, 2 Aug 2011 19:15:11 +0300
Subject: issue #10 media revisions/changes in RSS feed

---
 inc/changelog.php |  3 +--
 inc/media.php     | 11 +++++++----
 inc/template.php  |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'inc')

diff --git a/inc/changelog.php b/inc/changelog.php
index 188670397..395e793c1 100644
--- a/inc/changelog.php
+++ b/inc/changelog.php
@@ -316,8 +316,7 @@ function _handleRecent($line,$ns,$flags,&$seen){
     if ($recent['perms'] < AUTH_READ) return false;
 
     // check existance
-    $fn = (($flags & RECENTS_MEDIA_CHANGES) ? mediaFN($recent['id']) : wikiFN($recent['id']));
-    if((!@file_exists($fn)) && ($flags & RECENTS_SKIP_DELETED)) return false;
+    if(!@file_exists(wikiFN($recent['id'])) && !@file_exists(mediaFN($recent['id'])) && $flags & RECENTS_SKIP_DELETED) return false;
 
     return $recent;
 }
diff --git a/inc/media.php b/inc/media.php
index 99567632c..c57afedfb 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -905,14 +905,13 @@ function media_preview_buttons($image, $auth, $rev=false) {
  * @param JpegMeta $meta
  * @return array
  */
-function media_image_preview_size($image, $rev, $meta) {
+function media_image_preview_size($image, $rev, $meta, $size = 500) {
     if (!preg_match("/\.(jpe?g|gif|png)$/", $image)) return false;
 
     $info = getimagesize(mediaFN($image, $rev));
     $w = (int) $info[0];
     $h = (int) $info[1];
 
-    $size = 500;
     if($meta && ($w > $size || $h > $size)){
         $ratio = $meta->getResizeRatio($size, $size);
         $w = floor($w * $ratio);
@@ -1017,6 +1016,10 @@ function media_diff($image, $ns, $auth) {
     }else{
         $rev2 = (int) $_REQUEST['rev2'];
     }
+
+    if ($rev1 && !file_exists(mediaFN($image, $rev1))) $rev1 = false;
+    if ($rev2 && !file_exists(mediaFN($image, $rev2))) $rev2 = false;
+
     if($rev1 && $rev2){            // two specific revisions wanted
         // make sure order is correct (older on the left)
         if($rev1 < $rev2){
@@ -1477,7 +1480,7 @@ function media_printimgdetail($item, $fullscreen=false){
  * @param string $amp - separator
  * @return string - link
  */
-function media_managerURL($params=false, $amp='&amp;') {
+function media_managerURL($params=false, $amp='&amp;', $abs=false) {
     global $conf;
     global $ID;
 
@@ -1498,7 +1501,7 @@ function media_managerURL($params=false, $amp='&amp;') {
         unset($gets['tab_details']);
     }
 
-    return wl($ID,$gets,false,$amp);
+    return wl($ID,$gets,$abs,$amp);
 }
 
 /**
diff --git a/inc/template.php b/inc/template.php
index 2a840a01b..a48a099e0 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1176,7 +1176,7 @@ function tpl_fileDetails($image, $rev){
     global $NS;
 
     if (!$image || !file_exists(mediaFN($image))) return '';
-    if ($rev && !file_exists(mediaFN($image, $rev))) return '';
+    if ($rev && !file_exists(mediaFN($image, $rev))) $rev = false;
     if (isset($NS) && getNS($image) != $NS) return '';
     $do = $_REQUEST['mediado'];
 
-- 
cgit v1.2.3


From e5d185e17e613b7a9737fc76310f1e78008f71ec Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Tue, 2 Aug 2011 20:25:17 +0300
Subject: issue #9 config option to disable media revisions, auth

---
 inc/html.php     | 31 +++++++++++++++++--------------
 inc/media.php    | 33 ++++++++++++++++++++++++---------
 inc/template.php | 21 +++++++++++++++------
 3 files changed, 56 insertions(+), 29 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index a225f8503..2b4e2835e 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -626,11 +626,12 @@ function html_recent($first=0, $show_changes='both'){
      * decide if this is the last page or is there another one.
      * This is the cheapest solution to get this information.
      */
-    if ($show_changes == 'mediafiles') {
+    $flags = 0;
+    if ($show_changes == 'mediafiles' && $conf['mediarevisions']) {
         $flags = RECENTS_MEDIA_CHANGES;
     } elseif ($show_changes == 'pages') {
         $flags = 0;
-    } else {
+    } elseif ($conf['mediarevisions']) {
         $show_changes = 'both';
         $flags = RECENTS_MEDIA_PAGES_MIXED;
     }
@@ -656,18 +657,20 @@ function html_recent($first=0, $show_changes='both'){
     $form->addHidden('do', 'recent');
     $form->addHidden('id', $ID);
 
-    $form->addElement(form_makeListboxField(
-                'show_changes',
-                array(
-                    'pages'      => $lang['pages_changes'],
-                    'mediafiles' => $lang['media_changes'],
-                    'both'       => $lang['both_changes']),
-                $show_changes,
-                $lang['changes_type'],
-                '','',
-                array('class'=>'quickselect')));
-
-    $form->addElement(form_makeButton('submit', 'recent', $lang['btn_apply']));
+    if ($conf['mediarevisions']) {
+        $form->addElement(form_makeListboxField(
+                    'show_changes',
+                    array(
+                        'pages'      => $lang['pages_changes'],
+                        'mediafiles' => $lang['media_changes'],
+                        'both'       => $lang['both_changes']),
+                    $show_changes,
+                    $lang['changes_type'],
+                    '','',
+                    array('class'=>'quickselect')));
+
+        $form->addElement(form_makeButton('submit', 'recent', $lang['btn_apply']));
+    }
 
     $form->addElement(form_makeOpenTag('ul'));
 
diff --git a/inc/media.php b/inc/media.php
index c57afedfb..8c23dc115 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -331,7 +331,8 @@ function media_save($file, $id, $ow, $auth, $move) {
 
     //check for overwrite
     $overwrite = @file_exists($fn);
-    if($overwrite && (!$ow || $auth < AUTH_DELETE)) {
+    $auth_ow = (($conf['mediarevisions']) ? AUTH_UPLOAD : AUTH_DELETE);
+    if($overwrite && (!$ow || $auth < $auth_ow)) {
         return array($lang['uploadexist'], 0);
     }
     // check for valid content
@@ -426,6 +427,8 @@ function media_saveOldRevision($id){
     $oldf = mediaFN($id);
     if(!@file_exists($oldf)) return '';
     $date = filemtime($oldf);
+    if (!$conf['mediarevisions']) return $date;
+
     $newf = mediaFN($id,$date);
     io_makeFileDir($newf);
     if(copy($oldf, $newf)) {
@@ -503,7 +506,7 @@ function media_notify($id,$file,$mime,$old_rev=false){
     $text = str_replace('@MIME@',$mime,$text);
     $text = str_replace('@MEDIA@',ml($id,'',true,'&',true),$text);
     $text = str_replace('@SIZE@',filesize_h(filesize($file)),$text);
-    if ($old_rev) {
+    if ($old_rev && $conf['mediarevisions']) {
         $text = str_replace('@OLD@', ml($id, "rev=$old_rev", true, '&', true), $text);
     } else {
         $text = str_replace('@OLD@', '', $text);
@@ -593,7 +596,7 @@ function media_tabs_files($selected=false){
  * @param string $selected - opened tab
  */
 function media_tabs_details($image, $selected=false){
-    global $lang;
+    global $lang, $conf;
 
     echo '<div class="mediamanager-tabs" id="mediamanager__tabs_details">';
 
@@ -603,7 +606,9 @@ function media_tabs_details($image, $selected=false){
     if ($mime == 'image/jpeg') {
         media_tab(media_managerURL(array('tab_details' => 'edit')), 'edit', $lang['media_edittab'], $selected);
     }
-    media_tab(media_managerURL(array('tab_details' => 'history')), 'history', $lang['media_historytab'], $selected);
+    if ($conf['mediarevisions']) {
+        media_tab(media_managerURL(array('tab_details' => 'history')), 'history', $lang['media_historytab'], $selected);
+    }
 
     echo '<div class="clearer"></div>';
     echo '</div>';
@@ -849,7 +854,7 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function media_preview_buttons($image, $auth, $rev=false) {
-    global $lang;
+    global $lang, $conf;
 
     echo '<div id="mediamanager__preview_buttons">';
 
@@ -875,6 +880,11 @@ function media_preview_buttons($image, $auth, $rev=false) {
         $form->addElement(form_makeButton('submit','',$lang['btn_delete']));
         $form->printForm();
 
+    }
+
+    $auth_ow = (($conf['mediarevisions']) ? AUTH_UPLOAD : AUTH_DELETE);
+    if($auth >= $auth_ow && !$rev){
+
         // upload new version button
         $form = new Doku_Form(array('id' => 'mediamanager__btn_update',
             'action'=>media_managerURL(array('image' => $image, 'mediado' => 'update'), '&')));
@@ -882,7 +892,7 @@ function media_preview_buttons($image, $auth, $rev=false) {
         $form->printForm();
     }
 
-    if($auth >= AUTH_DELETE && $rev){
+    if($auth >= AUTH_DELETE && $rev && $conf['mediarevisions']){
 
         // restore button
         $form = new Doku_Form(array('id' => 'mediamanager__btn_restore',
@@ -1001,7 +1011,7 @@ function media_diff($image, $ns, $auth) {
     global $lang;
     global $conf;
 
-    if ($auth < AUTH_READ || !$image) return '';
+    if ($auth < AUTH_READ || !$image || !$conf['mediarevisions']) return '';
 
     $rev1 = (int) $_REQUEST['rev'];
 
@@ -1035,7 +1045,11 @@ function media_diff($image, $ns, $auth) {
     }else{                        // no revision was given, compare previous to current
         $r_rev = '';
         $revs = getRevisions($image, 0, 1, 8192, true);
-        $l_rev = $revs[0];
+        if (file_exists(mediaFN($image, $revs[0]))) {
+            $l_rev = $revs[0];
+        } else {
+            $l_rev = '';
+        }
     }
 
     // prepare event data
@@ -1190,7 +1204,8 @@ function media_image_diff($image, $l_rev, $r_rev, $meta, $type) {
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function media_restore($image, $rev, $auth){
-    if ($auth < AUTH_DELETE) return false;
+    global $conf;
+    if ($auth < AUTH_DELETE || !$conf['mediarevisions']) return false;
     if (!$image || !file_exists(mediaFN($image))) return false;
     if (!$rev || !file_exists(mediaFN($image, $rev))) return false;
     list($iext,$imime,$dl) = mimetype($image);
diff --git a/inc/template.php b/inc/template.php
index a48a099e0..e6673c3f3 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1140,7 +1140,7 @@ function tpl_fileList(){
     global $JUMPTO;
 
     $opened_tab = $_REQUEST['tab_files'];
-    if (!$opened_tab) $opened_tab = 'files';
+    if (!$opened_tab || !in_array($opened_tab, array('files', 'upload', 'search'))) $opened_tab = 'files';
     if ($_REQUEST['mediado'] == 'update') $opened_tab = 'upload';
 
     media_tabs_files($opened_tab);
@@ -1172,8 +1172,7 @@ function tpl_fileList(){
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function tpl_fileDetails($image, $rev){
-    global $AUTH;
-    global $NS;
+    global $AUTH, $NS, $conf;
 
     if (!$image || !file_exists(mediaFN($image))) return '';
     if ($rev && !file_exists(mediaFN($image, $rev))) $rev = false;
@@ -1181,7 +1180,17 @@ function tpl_fileDetails($image, $rev){
     $do = $_REQUEST['mediado'];
 
     $opened_tab = $_REQUEST['tab_details'];
-    if (!$opened_tab) $opened_tab = 'view';
+
+    $tab_array = array('view');
+    list($ext, $mime) = mimetype($image);
+    if ($mime == 'image/jpeg') {
+        $tab_array[] = 'edit';
+    }
+    if ($conf['mediarevisions']) {
+        $tab_array[] = 'history';
+    }
+
+    if (!$opened_tab || !in_array($opened_tab, $tab_array)) $opened_tab = 'view';
     if ($_REQUEST['edit']) $opened_tab = 'edit';
     if ($do == 'restore') $opened_tab = 'view';
 
@@ -1197,7 +1206,7 @@ function tpl_fileDetails($image, $rev){
         media_tab_edit($image, $NS, $AUTH);
         echo '</div>';
 
-    } elseif ($opened_tab == 'history') {
+    } elseif ($opened_tab == 'history' && $conf['mediarevisions']) {
         echo '<div id="mediamanager__details">';
         media_tab_history($image,$NS,$AUTH);
         echo '</div>';
@@ -1446,7 +1455,7 @@ function tpl_getFavicon($abs=false) {
  */
 function tpl_media() {
     //
-    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $REV, $lang, $fullscreen;
+    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $REV, $lang, $fullscreen, $conf;
     $fullscreen = true;
     require_once(DOKU_INC.'lib/exe/mediamanager.php');
 
-- 
cgit v1.2.3


From 92cac9a97ee63d9c3c9bb8b0da1e3eb0604ba04f Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 3 Aug 2011 15:19:52 +0300
Subject: issue #38 diff links only if diff available; deleted files

---
 inc/html.php     | 30 +++++++++++++++++++-----------
 inc/media.php    | 31 ++++++++++++++++++-------------
 inc/template.php |  5 +++--
 3 files changed, 40 insertions(+), 26 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 2b4e2835e..c58fd64ad 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -695,20 +695,28 @@ function html_recent($first=0, $show_changes='both'){
         $form->addElement(form_makeCloseTag('span'));
 
         if ($recent['media']) {
-            $href = media_managerURL(array('tab_details' => 'history',
-                'mediado' => 'diff', 'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&');
+            $diff = (count(getRevisions($recent['id'], 0, 1, 8192, true)) && @file_exists(mediaFN($recent['id'])));
+            if ($diff) {
+                $href = media_managerURL(array('tab_details' => 'history',
+                    'mediado' => 'diff', 'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&');
+            }
         } else {
             $href = wl($recent['id'],"do=diff", false, '&');
         }
-        $form->addElement(form_makeOpenTag('a', array('class' => 'diff_link', 'href' => $href)));
-        $form->addElement(form_makeTag('img', array(
-                        'src'   => DOKU_BASE.'lib/images/diff.png',
-                        'width' => 15,
-                        'height'=> 11,
-                        'title' => $lang['diff'],
-                        'alt'   => $lang['diff']
-                        )));
-        $form->addElement(form_makeCloseTag('a'));
+
+        if ($recent['media'] && !$diff) {
+            $form->addElement('<img src="'.DOKU_BASE.'lib/images/blank.gif" width="15" height="11" alt="" />');
+        } else {
+            $form->addElement(form_makeOpenTag('a', array('class' => 'diff_link', 'href' => $href)));
+            $form->addElement(form_makeTag('img', array(
+                            'src'   => DOKU_BASE.'lib/images/diff.png',
+                            'width' => 15,
+                            'height'=> 11,
+                            'title' => $lang['diff'],
+                            'alt'   => $lang['diff']
+                            )));
+            $form->addElement(form_makeCloseTag('a'));
+        }
 
         if ($recent['media']) {
             $href = media_managerURL(array('tab_details' => 'history',
diff --git a/inc/media.php b/inc/media.php
index 8c23dc115..c009785fd 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -313,7 +313,7 @@ function media_save($file, $id, $ow, $auth, $move) {
         }
     }
 
-    global $lang;
+    global $lang, $conf;
 
     // get filename
     $id   = cleanID($id,false,true);
@@ -603,7 +603,7 @@ function media_tabs_details($image, $selected=false){
     media_tab(media_managerURL(array('tab_details' => 'view')), 'view', $lang['media_viewtab'], $selected);
 
     list($ext, $mime) = mimetype($image);
-    if ($mime == 'image/jpeg') {
+    if ($mime == 'image/jpeg' && @file_exists(mediaFN($image))) {
         media_tab(media_managerURL(array('tab_details' => 'edit')), 'edit', $lang['media_edittab'], $selected);
     }
     if ($conf['mediarevisions']) {
@@ -867,12 +867,15 @@ function media_preview_buttons($image, $auth, $rev=false) {
     }
     $link = ml($image,$more,true,'&');
 
-    // view original file button
-    $form = new Doku_Form(array('action'=>$link, 'target'=>'_blank'));
-    $form->addElement(form_makeButton('submit','',$lang['mediaview']));
-    $form->printForm();
+    if (@file_exists(mediaFN($image, $rev))) {
+
+        // view original file button
+        $form = new Doku_Form(array('action'=>$link, 'target'=>'_blank'));
+        $form->addElement(form_makeButton('submit','',$lang['mediaview']));
+        $form->printForm();
+    }
 
-    if($auth >= AUTH_DELETE && !$rev){
+    if($auth >= AUTH_DELETE && !$rev && @file_exists(mediaFN($image))){
 
         // delete button
         $form = new Doku_Form(array('id' => 'mediamanager__btn_delete',
@@ -892,7 +895,7 @@ function media_preview_buttons($image, $auth, $rev=false) {
         $form->printForm();
     }
 
-    if($auth >= AUTH_DELETE && $rev && $conf['mediarevisions']){
+    if($auth >= AUTH_DELETE && $rev && $conf['mediarevisions'] && @file_exists(mediaFN($image, $rev))){
 
         // restore button
         $form = new Doku_Form(array('id' => 'mediamanager__btn_restore',
@@ -916,7 +919,7 @@ function media_preview_buttons($image, $auth, $rev=false) {
  * @return array
  */
 function media_image_preview_size($image, $rev, $meta, $size = 500) {
-    if (!preg_match("/\.(jpe?g|gif|png)$/", $image)) return false;
+    if (!preg_match("/\.(jpe?g|gif|png)$/", $image) || !file_exists(mediaFN($image, $rev))) return false;
 
     $info = getimagesize(mediaFN($image, $rev));
     $w = (int) $info[0];
@@ -1206,7 +1209,8 @@ function media_image_diff($image, $l_rev, $r_rev, $meta, $type) {
 function media_restore($image, $rev, $auth){
     global $conf;
     if ($auth < AUTH_DELETE || !$conf['mediarevisions']) return false;
-    if (!$image || !file_exists(mediaFN($image))) return false;
+    $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')));
+    if (!$image || (!file_exists(mediaFN($image)) && !$removed)) return false;
     if (!$rev || !file_exists(mediaFN($image, $rev))) return false;
     list($iext,$imime,$dl) = mimetype($image);
     $res = media_upload_finish(mediaFN($image, $rev),
@@ -1526,16 +1530,17 @@ function media_managerURL($params=false, $amp='&amp;', $abs=false) {
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function media_uploadform($ns, $auth, $fullscreen = false){
-    global $lang;
+    global $lang, $conf;
 
     if($auth < AUTH_UPLOAD) {
         echo '<div class="nothing">'.$lang['media_perm_upload'].'</div>'.NL;
         return;
     }
+    $auth_ow = (($conf['mediarevisions']) ? AUTH_UPLOAD : AUTH_DELETE);
 
     $update = false;
     $id = '';
-    if ($auth >= AUTH_DELETE && $fullscreen && $_REQUEST['mediado'] == 'update') {
+    if ($auth >= $auth_ow && $fullscreen && $_REQUEST['mediado'] == 'update') {
         $update = true;
         $id = cleanID($_REQUEST['image']);
     }
@@ -1562,7 +1567,7 @@ function media_uploadform($ns, $auth, $fullscreen = false){
     $form->addElement(form_makeButton('submit', '', $lang['btn_upload']));
     $form->addElement(form_makeCloseTag('p'));
 
-    if($auth >= AUTH_DELETE){
+    if($auth >= $auth_ow){
         $form->addElement(form_makeOpenTag('p'));
         $attrs = array();
         if ($update) $attrs['checked'] = 'checked';
diff --git a/inc/template.php b/inc/template.php
index e6673c3f3..04e3e79cc 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1174,7 +1174,8 @@ function tpl_fileList(){
 function tpl_fileDetails($image, $rev){
     global $AUTH, $NS, $conf;
 
-    if (!$image || !file_exists(mediaFN($image))) return '';
+    $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')) && $conf['mediarevisions']);
+    if (!$image || (!file_exists(mediaFN($image)) && !$removed)) return '';
     if ($rev && !file_exists(mediaFN($image, $rev))) $rev = false;
     if (isset($NS) && getNS($image) != $NS) return '';
     $do = $_REQUEST['mediado'];
@@ -1201,7 +1202,7 @@ function tpl_fileDetails($image, $rev){
         media_tab_view($image, $NS, $AUTH, $rev);
         echo '</div>';
 
-    } elseif ($opened_tab == 'edit') {
+    } elseif ($opened_tab == 'edit' && !$removed) {
         echo '<div id="mediamanager__details">';
         media_tab_edit($image, $NS, $AUTH);
         echo '</div>';
-- 
cgit v1.2.3


From dbf57c9615246b406f46ee1bfcff2742536ed05d Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 3 Aug 2011 16:28:51 +0300
Subject: issue #41 old version saved in the case of external edits

---
 inc/media.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index c009785fd..e8a537fd5 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -423,12 +423,23 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov
  * @return int - revision date
  */
 function media_saveOldRevision($id){
-    global $conf;
+    global $conf, $lang;
+
     $oldf = mediaFN($id);
     if(!@file_exists($oldf)) return '';
     $date = filemtime($oldf);
     if (!$conf['mediarevisions']) return $date;
 
+    if (!getRevisionInfo($id, $date, 8192, true)) {
+        // there was an external edit,
+        // there is no log entry for current version of file
+        if (!@file_exists(mediaMetaFN($id,'.changes'))) {
+            addMediaLogEntry($date, $id, DOKU_CHANGE_TYPE_CREATE, $lang['created']);
+        } else {
+            addMediaLogEntry($date, $id, DOKU_CHANGE_TYPE_EDIT);
+        }
+    }
+
     $newf = mediaFN($id,$date);
     io_makeFileDir($newf);
     if(copy($oldf, $newf)) {
-- 
cgit v1.2.3


From a1a02ef6d327f2de7ffc7db57a7907465761b407 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 3 Aug 2011 19:10:16 +0300
Subject: issue #43 diff slider

---
 inc/media.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index e8a537fd5..aa3ae66c5 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1197,10 +1197,10 @@ function media_image_diff($image, $l_rev, $r_rev, $meta, $type) {
 
     // two image's in div's
     echo '<div id="mediamanager__diff_layout">';
-    echo '<div id="mediamanager__diff_'.$type.'_image1" style="max-width: '.$l_size[0].'px;">'; //  height: '.$l_size[1].'px;
+    echo '<div id="mediamanager__diff_'.$type.'_image1" style="max-width: '.$l_size[0].'px;">';
     echo '<img src="'.$l_src.'" />';
     echo '</div>';
-    echo '<div id="mediamanager__diff_'.$type.'_image2" style="max-width: '.$l_size[0].'px;">'; // height: '.$l_size[1].'px;
+    echo '<div id="mediamanager__diff_'.$type.'_image2" style="max-width: '.$l_size[0].'px;">';
     echo '<img src="'.$r_src.'" />';
     echo '</div>';
     echo '</div>';
-- 
cgit v1.2.3


From 09063cc66339d6e5daa12af4896a2457c03cfaf3 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 4 Aug 2011 20:32:16 +0300
Subject: issue #44 multi file uploader

---
 inc/media.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index aa3ae66c5..c991104da 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1587,6 +1587,11 @@ function media_uploadform($ns, $auth, $fullscreen = false){
     }
     html_form('upload', $form);
 
+    if ($fullscreen) {
+        echo '<div id="mediamanager__uploader" style="display:none"></div>';
+        return '';
+    }
+
     // prepare flashvars for multiupload
     $opt = array(
             'L_gridname'  => $lang['mu_gridname'] ,
-- 
cgit v1.2.3


From b4b31bac3276c93277a8b70368aee135b7fdde09 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sat, 6 Aug 2011 16:21:06 +0300
Subject: issue #43 images align

---
 inc/media.php | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index c991104da..bc80f64d6 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1021,7 +1021,7 @@ function media_details($image, $auth, $rev=false, $meta=false) {
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_diff($image, $ns, $auth) {
+function media_diff($image, $ns, $auth, $fromajax = false) {
     global $lang;
     global $conf;
 
@@ -1072,6 +1072,7 @@ function media_diff($image, $ns, $auth) {
     $data[2] = $r_rev;
     $data[3] = $ns;
     $data[4] = $auth;
+    $data[5] = $fromajax;
 
     // trigger event
     return trigger_event('MEDIA_DIFF', $data, '_media_file_diff', true);
@@ -1079,8 +1080,8 @@ function media_diff($image, $ns, $auth) {
 }
 
 function _media_file_diff($data) {
-    if(is_array($data) && count($data)===5) {
-        return media_file_diff($data[0], $data[1], $data[2], $data[3], $data[4]);
+    if(is_array($data) && count($data)===6) {
+        return media_file_diff($data[0], $data[1], $data[2], $data[3], $data[4], $data[5]);
     } else {
         return false;
     }
@@ -1091,24 +1092,34 @@ function _media_file_diff($data) {
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_file_diff($image, $l_rev, $r_rev, $ns, $auth){
+function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
     global $lang, $config_cascade;
     $is_img = preg_match("/\.(jpe?g|gif|png)$/", $image);
 
     if ($is_img) {
         $difftype = $_REQUEST['difftype'];
 
-        $form = new Doku_Form(array('action'=>media_managerURL(array(), '&'),
-            'id' => 'mediamanager__form_diffview'));
-        $form->addElement('<input type=hidden name=rev2[] value='.$l_rev.' ></input>');
-        $form->addElement('<input type=hidden name=rev2[] value='.$r_rev.' ></input>');
-        $form->addHidden('mediado', 'diff');
-        $form->printForm();
+        if (!$fromajax) {
+            $form = new Doku_Form(array('action'=>media_managerURL(array(), '&'),
+                'id' => 'mediamanager__form_diffview'));
+            $form->addElement('<input type=hidden name=rev2[] value='.$l_rev.' ></input>');
+            $form->addElement('<input type=hidden name=rev2[] value='.$r_rev.' ></input>');
+            $form->addHidden('mediado', 'diff');
+            $form->printForm();
+
+            echo '<div id="mediamanager__diff" >';
+        }
+
+        $l_meta = new JpegMeta(mediaFN($image, $l_rev));
+        $r_meta = new JpegMeta(mediaFN($image, $r_rev));
 
-        echo '<div id="mediamanager__diff" >';
+        if ($difftype == 'opacity' || $difftype == 'portions') {
+            media_image_diff($image, $l_rev, $r_rev, $l_meta, $difftype);
+            if (!$fromajax) echo '</div>';
+            return '';
+        }
 
-        if ($difftype == 'opacity') return media_image_diff($image, $l_rev, $r_rev, $l_meta, 'opacity');
-        if ($difftype == 'portions') return media_image_diff($image, $l_rev, $r_rev, $l_meta, 'portions');
+        echo '<div class="mediamanager-preview">';
 
     }
 
@@ -1165,6 +1176,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth){
 
     echo '</ul>';
 
+    if ($is_img && !$fromajax) echo '</div>';
     if ($is_img) echo '</div>';
 }
 
-- 
cgit v1.2.3


From 50fc55fe69fc348d3679981cc088c57b35c47571 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sat, 6 Aug 2011 17:00:19 +0300
Subject: issue #48 alternative diff views for images with different size

---
 inc/media.php | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index bc80f64d6..ce3f797e6 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1094,9 +1094,16 @@ function _media_file_diff($data) {
  */
 function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
     global $lang, $config_cascade;
-    $is_img = preg_match("/\.(jpe?g|gif|png)$/", $image);
 
+    $l_meta = new JpegMeta(mediaFN($image, $l_rev));
+    $r_meta = new JpegMeta(mediaFN($image, $r_rev));
+
+    $is_img = preg_match("/\.(jpe?g|gif|png)$/", $image);
     if ($is_img) {
+        $l_size = media_image_preview_size($image, $l_rev, $l_meta);
+        $r_size = media_image_preview_size($image, $r_rev, $r_meta);
+        $is_img = ($l_size && $r_size && ($l_size[0] >= 30 || $r_size[0] >= 30));
+
         $difftype = $_REQUEST['difftype'];
 
         if (!$fromajax) {
@@ -1110,19 +1117,14 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
             echo '<div id="mediamanager__diff" >';
         }
 
-        $l_meta = new JpegMeta(mediaFN($image, $l_rev));
-        $r_meta = new JpegMeta(mediaFN($image, $r_rev));
-
         if ($difftype == 'opacity' || $difftype == 'portions') {
-            media_image_diff($image, $l_rev, $r_rev, $l_meta, $difftype);
+            media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $difftype);
             if (!$fromajax) echo '</div>';
             return '';
         }
-
-        echo '<div class="mediamanager-preview">';
-
     }
 
+    echo '<div class="mediamanager-preview">';
     echo '<ul id="mediamanager__diff_table">';
 
     echo '<li>';
@@ -1141,9 +1143,6 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
     media_preview_buttons($image, $auth, $r_rev);
     echo '</li>';
 
-    $l_meta = new JpegMeta(mediaFN($image, $l_rev));
-    $r_meta = new JpegMeta(mediaFN($image, $r_rev));
-
     $l_tags = media_file_tags($l_meta);
     $r_tags = media_file_tags($r_meta);
     foreach ($l_tags as $key => $l_tag) {
@@ -1175,9 +1174,9 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
     }
 
     echo '</ul>';
+    echo '</div>';
 
     if ($is_img && !$fromajax) echo '</div>';
-    if ($is_img) echo '</div>';
 }
 
 /**
@@ -1188,13 +1187,16 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
  * @param string $image
  * @param int $l_rev
  * @param int $r_rev
- * @param JpegMeta $meta
+ * @param array $l_size
+ * @param array $r_size
+ * @param string $type
  */
-function media_image_diff($image, $l_rev, $r_rev, $meta, $type) {
-    $l_size = media_image_preview_size($image, $l_rev, $meta);
-    $r_size = media_image_preview_size($image, $r_rev, $meta);
-
-    if (!$l_size || !$r_size || $l_size != $r_size || $l_size[0] < 30) return '';
+function media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $type) {
+    if ($l_size != $r_size) {
+        if ($r_size[0] > $l_size[0]) {
+            $l_size = $r_size;
+        }
+    }
 
     echo '<div class="mediamanager-preview">';
 
-- 
cgit v1.2.3


From 92c93223d0fce2c5de1f4d3d134be56d1d9f3bc0 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 7 Aug 2011 15:12:12 +0300
Subject: issue #44 new fileuploader completely replaces the old one

---
 inc/media.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index ce3f797e6..acffc4759 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1599,10 +1599,14 @@ function media_uploadform($ns, $auth, $fullscreen = false){
         $form->addElement(form_makeCheckboxField('ow', 1, $lang['txt_overwrt'], 'dw__ow', 'check', $attrs));
         $form->addElement(form_makeCloseTag('p'));
     }
+    if ($fullscreen) {
+        echo '<div id="mediamanager__uploader"><noscript>';
+    }
+
     html_form('upload', $form);
 
     if ($fullscreen) {
-        echo '<div id="mediamanager__uploader" style="display:none"></div>';
+        echo '</noscript></div>';
         return '';
     }
 
-- 
cgit v1.2.3


From f517998ad64483b6394211a971db2d3a660518c6 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 7 Aug 2011 22:14:10 +0300
Subject: issue #45 browser testing

---
 inc/media.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index acffc4759..16defc7af 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1422,9 +1422,9 @@ function media_printfile_thumbs($item,$auth,$jump=false){
 
     } else {
         echo '<a name="d_:'.$item['id'].'" class="image" title="'.$item['id'].'" href="'.
-            media_managerURL(array('image' => hsc($item['id']))).'"><div>';
+            media_managerURL(array('image' => hsc($item['id']))).'"><span>';
         echo media_printicon($item['id']);
-        echo '</div></a>';
+        echo '</span></a>';
     }
     //echo '<input type=checkbox />';
     echo '<a href="'.media_managerURL(array('image' => hsc($item['id']))).'" name=
@@ -1482,7 +1482,7 @@ function media_printimgdetail($item, $fullscreen=false){
         if ($fullscreen) {
             echo '<a name="d_:'.$item['id'].'" class="image'.$index.'" title="'.$item['id'].'" href="'.
                 media_managerURL(array('image' => hsc($item['id']))).'">';
-            echo '<div><img src="'.$src.'" '.$att.' /></div>';
+            echo '<span><img src="'.$src.'" '.$att.' /></span>';
             echo '</a>';
         }
     }
-- 
cgit v1.2.3


From 6bdff0836f4bc1eee19aa8c30d03ba4bfc876733 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 8 Aug 2011 19:37:09 +0300
Subject: issue #44 overwrite checkbox added to uploader

---
 inc/media.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 16defc7af..768026b54 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1600,13 +1600,13 @@ function media_uploadform($ns, $auth, $fullscreen = false){
         $form->addElement(form_makeCloseTag('p'));
     }
     if ($fullscreen) {
-        echo '<div id="mediamanager__uploader"><noscript>';
+        echo '<div id="mediamanager__uploader">';
     }
 
     html_form('upload', $form);
 
     if ($fullscreen) {
-        echo '</noscript></div>';
+        echo '</div>';
         return '';
     }
 
-- 
cgit v1.2.3


From fe165917474a912ed1c531a5a3711709527fadc1 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Wed, 10 Aug 2011 23:19:56 +0200
Subject: Hide hidden and deleted pages from the backlinks

Sometimes pages aren't deleted from the index (that should be fixed,
too) and appear in the backlinks although they don't exist anymore.
This change hides them and hidden pages that shouldn't appear at all as
the backlinks view is an automatic listing. Hidden pages had been hidden
before the transition to the metadata index, too.
---
 inc/fulltext.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/fulltext.php b/inc/fulltext.php
index 6ab710d54..620237296 100644
--- a/inc/fulltext.php
+++ b/inc/fulltext.php
@@ -135,7 +135,7 @@ function ft_backlinks($id){
 
     // check ACL permissions
     foreach(array_keys($result) as $idx){
-        if(auth_quickaclcheck($result[$idx]) < AUTH_READ){
+        if(isHiddenPage($result[$idx]) || auth_quickaclcheck($result[$idx]) < AUTH_READ || !page_exists($result[$idx], '', false)){
             unset($result[$idx]);
         }
     }
-- 
cgit v1.2.3


From 2d6cc64fdb73879f54aa25b2122f36631c654e3c Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 12 Aug 2011 12:50:34 +0300
Subject: issue #44, #52 media_upload reused, error handling

---
 inc/media.php | 41 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 768026b54..abdb33bcb 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -242,6 +242,43 @@ function media_delete($id,$auth){
     return $data['unl'] ? DOKU_MEDIA_DELETED : 0;
 }
 
+/**
+ * Handle file uploads via XMLHttpRequest
+ *
+ * @return mixed false on error, id of the new file on success
+ */
+function media_upload_xhr($ns,$auth){
+    $id = $_GET['qqfile'];
+    list($ext,$mime,$dl) = mimetype($id);
+    $input = fopen("php://input", "r");
+    $temp = tmpfile();
+    $realSize = stream_copy_to_stream($input, $temp);
+    fclose($input);
+    if ($realSize != (int)$_SERVER["CONTENT_LENGTH"]) return false;
+    if (!($tmp = io_mktmpdir())) return false;
+    $path = $tmp.'/'.$id;
+    $target = fopen($path, "w");
+    fseek($temp, 0, SEEK_SET);
+    stream_copy_to_stream($temp, $target);
+    fclose($target);
+    $res = media_save(
+        array('name' => $path,
+            'mime' => $mime,
+            'ext'  => $ext),
+        $ns.':'.$id,
+        (($_REQUEST['ow'] == 'true') ? true : false),
+        $auth,
+        'copy'
+    );
+    unlink($path);
+    if ($tmp) dir_delete($tmp);
+    if (is_array($res)) {
+        msg($res[0], $res[1]);
+        return false;
+    }
+    return $res;
+}
+
 /**
  * Handles media file uploads
  *
@@ -249,13 +286,13 @@ function media_delete($id,$auth){
  * @author Michael Klier <chi@chimeric.de>
  * @return mixed false on error, id of the new file on success
  */
-function media_upload($ns,$auth){
+function media_upload($ns,$auth,$file=false){
     if(!checkSecurityToken()) return false;
     global $lang;
 
     // get file and id
     $id   = $_POST['mediaid'];
-    $file = $_FILES['upload'];
+    if (!$file) $file = $_FILES['upload'];
     if(empty($id)) $id = $file['name'];
 
     // check for errors (messages are done in lib/exe/mediamanager.php)
-- 
cgit v1.2.3


From 44d638d049d687159666813023108e0fa9f32181 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 12 Aug 2011 14:18:03 +0300
Subject: issue #50 partly styling the new uploader

---
 inc/lang/en/lang.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index ba80c493c..4f5367ecf 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -353,4 +353,10 @@ $lang['js']['media_diff_both']     = 'Both images';
 $lang['js']['media_diff_opacity']  = 'Changeable opacity of images';
 $lang['js']['media_diff_portions'] = 'Portions of images';
 
+$lang['js']['media_select']     = 'Select files';
+$lang['js']['media_upload_btn'] = 'Start uploading';
+$lang['js']['media_drop']       = 'Drop files here to upload';
+$lang['js']['media_cancel']     = 'remove';
+$lang['js']['media_overwrt']    = 'Overwrite existing files';
+
 //Setup VIM: ex: et ts=2 :
-- 
cgit v1.2.3


From e9eba4b18be81444014e59c83ee6c5cf004a7ad7 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 12 Aug 2011 17:04:27 +0300
Subject: issue #51 link from detail view to fullscreen manager

---
 inc/lang/en/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 4f5367ecf..f06315a77 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -246,6 +246,7 @@ $lang['img_camera']  = 'Camera';
 $lang['img_keywords']= 'Keywords';
 $lang['img_width']   = 'Width';
 $lang['img_height']  = 'Height';
+$lang['img_manager'] = 'View in media manager';
 
 $lang['subscr_subscribe_success']  = 'Added %s to subscription list for %s';
 $lang['subscr_subscribe_error']    = 'Error adding %s to subscription list for %s';
-- 
cgit v1.2.3


From 873cd06e1bda38e0decce16d6ec7d3bdaece612e Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 15 Aug 2011 14:22:19 +0300
Subject: issue #50 styling the new uploader

---
 inc/lang/en/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index f06315a77..d10f523ef 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -354,7 +354,7 @@ $lang['js']['media_diff_both']     = 'Both images';
 $lang['js']['media_diff_opacity']  = 'Changeable opacity of images';
 $lang['js']['media_diff_portions'] = 'Portions of images';
 
-$lang['js']['media_select']     = 'Select files';
+$lang['js']['media_select']     = 'Select files...';
 $lang['js']['media_upload_btn'] = 'Start uploading';
 $lang['js']['media_drop']       = 'Drop files here to upload';
 $lang['js']['media_cancel']     = 'remove';
-- 
cgit v1.2.3


From 5b9353fa4e818ffe50c9fbc1094b01fe30b96758 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 15 Aug 2011 16:29:14 +0300
Subject: mediamanager html bug fixes

---
 inc/lang/en/lang.php |  6 ++--
 inc/media.php        | 86 +++++++++++++++++++++++++++++-----------------------
 2 files changed, 51 insertions(+), 41 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index d10f523ef..88fbadbd2 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -350,9 +350,9 @@ $lang['media_update']     = 'Upload new version';
 $lang['media_restore']    = 'Restore this version';
 
 $lang['js']['media_diff']          = 'View differences:';
-$lang['js']['media_diff_both']     = 'Both images';
-$lang['js']['media_diff_opacity']  = 'Changeable opacity of images';
-$lang['js']['media_diff_portions'] = 'Portions of images';
+$lang['js']['media_diff_both']     = 'Side by Side';
+$lang['js']['media_diff_opacity']  = 'Overlay';
+$lang['js']['media_diff_portions'] = 'Slider';
 
 $lang['js']['media_select']     = 'Select files...';
 $lang['js']['media_upload_btn'] = 'Start uploading';
diff --git a/inc/media.php b/inc/media.php
index abdb33bcb..b8aa4d04e 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -595,9 +595,23 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=fals
 
         if(!count($data)){
             echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
-        }else foreach($data as $item){
-            if (!$fullscreenview) media_printfile($item,$auth,$jump);
-            else media_printfile_thumbs($item,$auth,$jump);
+        }else {
+            if ($fullscreenview) {
+                $view = $_REQUEST['view'];
+                if ($view == 'list') {
+                    echo '<ul class="mediamanager-list" id="mediamanager__file_list">';
+                } else {
+                    echo '<ul class="mediamanager-thumbs" id="mediamanager__file_list">';
+                }
+            }
+            foreach($data as $item){
+                if (!$fullscreenview) {
+                    media_printfile($item,$auth,$jump);
+                } else {
+                    media_printfile_thumbs($item,$auth,$jump);
+                }
+            }
+            if ($fullscreenview) echo '</ul>';
         }
     }
     if (!$fullscreenview) media_searchform($ns);
@@ -721,18 +735,10 @@ function media_tab_files($ns,$auth=null,$jump='') {
     media_tab_files_options($ns, $sort);
 
     echo '<div class="scroll-container" >';
-    $view = $_REQUEST['view'];
-
     if($auth < AUTH_READ){
         echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
     }else{
-        if ($view == 'list') {
-            echo '<ul class="mediamanager-list" id="mediamanager__file_list">';
-        } else {
-            echo '<ul class="mediamanager-thumbs" id="mediamanager__file_list">';
-        }
         media_filelist($ns,$auth,$jump,true,$sort);
-        echo '</ul>';
     }
     echo '</div>';
 }
@@ -774,17 +780,7 @@ function media_tab_search($ns,$auth=null) {
 
     echo '<div class="scroll-container">';
     media_searchform($ns, $query, true);
-
-    if($do == 'searchlist'){
-        $view = $_REQUEST['view'];
-        if ($view == 'list') {
-            echo '<ul class="mediamanager-list" id="mediamanager__file_list">';
-        } else {
-            echo '<ul class="mediamanager-thumbs" id="mediamanager__file_list">';
-        }
-        media_searchlist($query,$ns,$auth,true);
-        echo '</ul>';
-    }
+    if ($do == 'searchlist') media_searchlist($query,$ns,$auth,true);
     echo '</div>';
 }
 
@@ -874,21 +870,21 @@ function media_tab_history($image, $ns, $auth=null) {
 function media_preview($image, $auth, $rev=false, $meta=false) {
     global $lang;
 
-    echo '<div id="mediamanager__preview">';
+    echo '<div class="mediamanager__preview">';
 
     $size = media_image_preview_size($image, $rev, $meta);
 
     if ($size) {
-        $more = '';
+        $more = array();
         if ($rev) {
-            $more = "rev=$rev";
+            $more['rev'] = $rev;
         } else {
             $t = @filemtime(mediaFN($image));
-            $more = "t=$t";
+            $more['t'] = $t;
         }
 
-        $more .= '&w='.$size[0].'&h='.$size[1];
-
+        $more['w'] = $size[0];
+        $more['h'] = $size[1];
         $src = ml($image, $more);
         echo '<img src="'.$src.'" alt="'.$image.'" style="max-width: '.$size[0].'px;" />';
     }
@@ -904,7 +900,7 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
 function media_preview_buttons($image, $auth, $rev=false) {
     global $lang, $conf;
 
-    echo '<div id="mediamanager__preview_buttons">';
+    echo '<div class="mediamanager__preview_buttons">';
 
     $more = '';
     if ($rev) {
@@ -1146,8 +1142,8 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
         if (!$fromajax) {
             $form = new Doku_Form(array('action'=>media_managerURL(array(), '&'),
                 'id' => 'mediamanager__form_diffview'));
-            $form->addElement('<input type=hidden name=rev2[] value='.$l_rev.' ></input>');
-            $form->addElement('<input type=hidden name=rev2[] value='.$r_rev.' ></input>');
+            $form->addElement('<input type="hidden" name="rev2[]" value="'.$l_rev.'" ></input>');
+            $form->addElement('<input type="hidden" name="rev2[]" value="'.$r_rev.'" ></input>');
             $form->addHidden('mediado', 'diff');
             $form->printForm();
 
@@ -1237,8 +1233,8 @@ function media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $type) {
 
     echo '<div class="mediamanager-preview">';
 
-    $l_more = 'rev='.$l_rev.'&h='.$l_size[1].'&w='.$l_size[0];
-    $r_more = 'rev='.$r_rev.'&h='.$l_size[1].'&w='.$l_size[0];
+    $l_more = array('rev' => $l_rev, 'h' => $l_size[1], 'w' => $l_size[0]);
+    $r_more = array('rev' => $r_rev, 'h' => $l_size[1], 'w' => $l_size[0]);
 
     $l_src = ml($image, $l_more);
     $r_src = ml($image, $r_more);
@@ -1249,10 +1245,10 @@ function media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $type) {
     // two image's in div's
     echo '<div id="mediamanager__diff_layout">';
     echo '<div id="mediamanager__diff_'.$type.'_image1" style="max-width: '.$l_size[0].'px;">';
-    echo '<img src="'.$l_src.'" />';
+    echo '<img src="'.$l_src.'" alt="" />';
     echo '</div>';
     echo '<div id="mediamanager__diff_'.$type.'_image2" style="max-width: '.$l_size[0].'px;">';
-    echo '<img src="'.$r_src.'" />';
+    echo '<img src="'.$r_src.'" alt="" />';
     echo '</div>';
     echo '</div>';
 
@@ -1329,9 +1325,20 @@ function media_searchlist($query,$ns,$auth=null,$fullscreen=false){
 
     if(!count($evdata['data'])){
         echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
-    }else foreach($evdata['data'] as $item){
-        if (!$fullscreen) media_printfile($item,$item['perm'],'',true);
-        else media_printfile_thumbs($item,$item['perm']);
+    }else {
+        if ($fullscreen) {
+            $view = $_REQUEST['view'];
+            if ($view == 'list') {
+                echo '<ul class="mediamanager-list" id="mediamanager__file_list">';
+            } else {
+                echo '<ul class="mediamanager-thumbs" id="mediamanager__file_list">';
+            }
+        }
+        foreach($evdata['data'] as $item){
+            if (!$fullscreen) media_printfile($item,$item['perm'],'',true);
+            else media_printfile_thumbs($item,$item['perm']);
+        }
+        if ($fullscreen) echo '</ul>';
     }
 }
 
@@ -1736,6 +1743,9 @@ function media_nstree($ns){
                                'label' => '['.$lang['mediaroot'].']'));
 
     echo html_buildlist($data,'idx','media_nstree_item','media_nstree_li');
+    echo '</li>';
+
+    echo '</ul>';
 }
 
 /**
-- 
cgit v1.2.3


From 7e6b49bbbfd05509233484c1cddc2352e9246b94 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 15 Aug 2011 19:30:48 +0300
Subject: media revisions form less/more recent buttons fix

---
 inc/html.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index c58fd64ad..60189d4fe 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -598,12 +598,22 @@ function html_revisions($first=0, $media_id = false){
         $first -= $conf['recent'];
         if ($first < 0) $first = 0;
         print '<div class="pagenav-prev">';
-        print html_btn('newer',$id,"p",array('do' => 'revisions', 'first' => $first));
+        if ($media_id) {
+            echo '<form class="button btn_newer" method="post" action="'.media_managerURL(array('first' => $first)).'">';
+            echo '<input type="submit" value="'.$lang['btn_newer'].'" class="button" /></form>';
+        } else {
+            print html_btn('newer',$id,"p",array('do' => 'revisions', 'first' => $first));
+        }
         print '</div>';
     }
     if ($hasNext) {
         print '<div class="pagenav-next">';
-        print html_btn('older',$id,"n",array('do' => 'revisions', 'first' => $last));
+        if ($media_id) {
+            echo '<form class="button btn_older" method="post" action="'.media_managerURL(array('first' => $last)).'">';
+            echo '<input type="submit" value="'.$lang['btn_older'].'" class="button" /></form>';
+        } else {
+            print html_btn('older',$id,"n",array('do' => 'revisions', 'first' => $last));
+        }
         print '</div>';
     }
     print '</div>';
-- 
cgit v1.2.3


From db738de5fbc2a3f983d224a151fde8dab8f87b3c Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Mon, 15 Aug 2011 21:01:17 +0300
Subject: issue #55 Search results are clickable now

---
 inc/media.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index b8aa4d04e..abd817767 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1336,7 +1336,7 @@ function media_searchlist($query,$ns,$auth=null,$fullscreen=false){
         }
         foreach($evdata['data'] as $item){
             if (!$fullscreen) media_printfile($item,$item['perm'],'',true);
-            else media_printfile_thumbs($item,$item['perm']);
+            else media_printfile_thumbs($item,$item['perm'],false,true);
         }
         if ($fullscreen) echo '</ul>';
     }
@@ -1451,7 +1451,7 @@ function media_printicon($filename){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_printfile_thumbs($item,$auth,$jump=false){
+function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false){
     global $lang;
     global $conf;
 
@@ -1466,13 +1466,19 @@ function media_printfile_thumbs($item,$auth,$jump=false){
 
     } else {
         echo '<a name="d_:'.$item['id'].'" class="image" title="'.$item['id'].'" href="'.
-            media_managerURL(array('image' => hsc($item['id']))).'"><span>';
+            media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']))).'"><span>';
         echo media_printicon($item['id']);
         echo '</span></a>';
     }
     //echo '<input type=checkbox />';
-    echo '<a href="'.media_managerURL(array('image' => hsc($item['id']))).'" name=
-        "h_:'.$item['id'].'" class="name">'.hsc($file).'</a>';
+    if (!$display_namespace) {
+        $name = hsc($file);
+    } else {
+        $name = hsc($item['id']);
+    }
+    echo '<a href="'.media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']))).'" name=
+        "h_:'.$item['id'].'" class="name">'.$name.'</a>';
+
     if($item['isimg']){
         $size = '';
         $size .= (int) $item['meta']->getField('File.Width');
@@ -1525,7 +1531,7 @@ function media_printimgdetail($item, $fullscreen=false){
         // output
         if ($fullscreen) {
             echo '<a name="d_:'.$item['id'].'" class="image'.$index.'" title="'.$item['id'].'" href="'.
-                media_managerURL(array('image' => hsc($item['id']))).'">';
+                media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']))).'">';
             echo '<span><img src="'.$src.'" '.$att.' /></span>';
             echo '</a>';
         }
-- 
cgit v1.2.3


From da45d8839c94444f8e89f45ef290516542976ee8 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Thu, 18 Aug 2011 15:03:33 +0300
Subject: issue #50 styling uploader

---
 inc/lang/en/lang.php | 6 +++---
 inc/media.php        | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 88fbadbd2..58a7d56ed 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -129,7 +129,7 @@ $lang['js']['hidedetails'] = 'Hide Details';
 $lang['mediausage']  = 'Use the following syntax to reference this file:';
 $lang['mediaview']   = 'View original file';
 $lang['mediaroot']   = 'root';
-$lang['mediaupload'] = 'Upload a file to the current namespace here. To create subnamespaces, prepend them to your "Upload as" filename separated by colons.';
+$lang['mediaupload'] = 'Upload a file to the current namespace here. To create subnamespaces, prepend them to your "Upload as" filename separated by colons. Files also can be selected by drag and drop.';
 $lang['mediaextchange'] = 'Filextension changed from .%s to .%s!';
 
 $lang['js']['mediatitle']       = 'Link settings';
@@ -354,8 +354,8 @@ $lang['js']['media_diff_both']     = 'Side by Side';
 $lang['js']['media_diff_opacity']  = 'Overlay';
 $lang['js']['media_diff_portions'] = 'Slider';
 
-$lang['js']['media_select']     = 'Select files...';
-$lang['js']['media_upload_btn'] = 'Start uploading';
+$lang['js']['media_select']     = 'Select files…';
+$lang['js']['media_upload_btn'] = 'Upload';
 $lang['js']['media_drop']       = 'Drop files here to upload';
 $lang['js']['media_cancel']     = 'remove';
 $lang['js']['media_overwrt']    = 'Overwrite existing files';
diff --git a/inc/media.php b/inc/media.php
index abd817767..8ef075f17 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -248,6 +248,8 @@ function media_delete($id,$auth){
  * @return mixed false on error, id of the new file on success
  */
 function media_upload_xhr($ns,$auth){
+    if(!checkSecurityToken()) return false;
+
     $id = $_GET['qqfile'];
     list($ext,$mime,$dl) = mimetype($id);
     $input = fopen("php://input", "r");
@@ -685,7 +687,7 @@ function media_tab_files_options($ns, $sort){
     global $lang;
 
     echo '<div class="background-container">';
-    echo $ns;
+    echo $ns ? $ns : '['.$lang['mediaroot'].']';
 
     echo '<div id="mediamanager__tabs_list">';
 
@@ -753,7 +755,7 @@ function media_tab_upload($ns,$auth=null,$jump='') {
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
     echo '<div class="background-container">';
-    echo sprintf($lang['media_upload'], $ns);
+    echo sprintf($lang['media_upload'], $ns ? $ns : '['.$lang['mediaroot'].']');
     echo '</div>';
 
     echo '<div class="scroll-container">';
@@ -775,7 +777,7 @@ function media_tab_search($ns,$auth=null) {
     if (!$query) $query = '';
 
     echo '<div class="background-container">';
-    echo sprintf($lang['media_search'], $ns);
+    echo sprintf($lang['media_search'], $ns ? $ns : '['.$lang['mediaroot'].']');
     echo'</div>';
 
     echo '<div class="scroll-container">';
-- 
cgit v1.2.3


From 99e7bfd4c733d81cd01dd2d97e10bb4dda62df66 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 19 Aug 2011 11:35:58 +0200
Subject: jqueryized locktimer

---
 inc/lang/ar/lang.php          | 2 +-
 inc/lang/az/lang.php          | 2 +-
 inc/lang/bg/lang.php          | 2 +-
 inc/lang/ca-valencia/lang.php | 2 +-
 inc/lang/ca/lang.php          | 2 +-
 inc/lang/cs/lang.php          | 2 +-
 inc/lang/da/lang.php          | 2 +-
 inc/lang/de-informal/lang.php | 2 +-
 inc/lang/de/lang.php          | 2 +-
 inc/lang/el/lang.php          | 2 +-
 inc/lang/en/lang.php          | 2 +-
 inc/lang/eo/lang.php          | 2 +-
 inc/lang/es/lang.php          | 2 +-
 inc/lang/et/lang.php          | 2 +-
 inc/lang/eu/lang.php          | 2 +-
 inc/lang/fa/lang.php          | 2 +-
 inc/lang/fi/lang.php          | 2 +-
 inc/lang/fo/lang.php          | 2 +-
 inc/lang/fr/lang.php          | 2 +-
 inc/lang/gl/lang.php          | 2 +-
 inc/lang/he/lang.php          | 2 +-
 inc/lang/hr/lang.php          | 2 +-
 inc/lang/hu/lang.php          | 2 +-
 inc/lang/ia/lang.php          | 2 +-
 inc/lang/id/lang.php          | 2 +-
 inc/lang/it/lang.php          | 2 +-
 inc/lang/ja/lang.php          | 2 +-
 inc/lang/kk/lang.php          | 2 +-
 inc/lang/km/lang.php          | 2 +-
 inc/lang/ko/lang.php          | 2 +-
 inc/lang/ku/lang.php          | 2 +-
 inc/lang/la/lang.php          | 2 +-
 inc/lang/lb/lang.php          | 2 +-
 inc/lang/lt/lang.php          | 2 +-
 inc/lang/lv/lang.php          | 2 +-
 inc/lang/mg/lang.php          | 2 +-
 inc/lang/mk/lang.php          | 2 +-
 inc/lang/mr/lang.php          | 2 +-
 inc/lang/ne/lang.php          | 2 +-
 inc/lang/nl/lang.php          | 2 +-
 inc/lang/no/lang.php          | 2 +-
 inc/lang/pl/lang.php          | 2 +-
 inc/lang/pt-br/lang.php       | 2 +-
 inc/lang/pt/lang.php          | 2 +-
 inc/lang/ro/lang.php          | 2 +-
 inc/lang/ru/lang.php          | 2 +-
 inc/lang/sk/lang.php          | 2 +-
 inc/lang/sl/lang.php          | 2 +-
 inc/lang/sq/lang.php          | 2 +-
 inc/lang/sr/lang.php          | 2 +-
 inc/lang/sv/lang.php          | 2 +-
 inc/lang/th/lang.php          | 2 +-
 inc/lang/tr/lang.php          | 2 +-
 inc/lang/uk/lang.php          | 2 +-
 inc/lang/vi/lang.php          | 2 +-
 inc/lang/zh-tw/lang.php       | 2 +-
 inc/lang/zh/lang.php          | 2 +-
 57 files changed, 57 insertions(+), 57 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index e5606c456..ee330099b 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'رفع كـ (اختياري)';
 $lang['txt_overwrt']           = 'اكتب على ملف موجود';
 $lang['lockedby']              = 'مقفلة حاليا لـ';
 $lang['lockexpire']            = 'ينتهي القفل في';
-$lang['willexpire']            = 'سينتهي قفل تحرير هذه الصفحه خلال دقيقة.\nلتجنب التعارض استخدم زر المعاينة لتصفير مؤقت القفل.';
+$lang['js']['willexpire']            = 'سينتهي قفل تحرير هذه الصفحه خلال دقيقة.\nلتجنب التعارض استخدم زر المعاينة لتصفير مؤقت القفل.';
 $lang['js']['notsavedyet']     = 'التعديلات غير المحفوظة ستفقد.';
 $lang['js']['searchmedia']     = 'ابحث عن ملفات';
 $lang['js']['keepopen']        = 'أبقي النافذة مفتوحة أثناء الاختيار';
diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php
index 35b18d3a7..302f24c16 100644
--- a/inc/lang/az/lang.php
+++ b/inc/lang/az/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Faylın wiki-də olan adını daxil edin (müt
 $lang['txt_overwrt']           = 'Mövcud olan faylın üstündən yaz';
 $lang['lockedby']              = 'В данный момент заблокирован Bu an blokdadır';
 $lang['lockexpire']            = 'Blok bitir:';
-$lang['willexpire']            = 'Sizin bu səhifədə dəyişik etmək üçün blokunuz bir dəqiqə ərzində bitəcək.\nMünaqişələrdən yayınmaq və blokun taymerini sıfırlamaq üçün, baxış düyməsini sıxın.';
+$lang['js']['willexpire']            = 'Sizin bu səhifədə dəyişik etmək üçün blokunuz bir dəqiqə ərzində bitəcək.\nMünaqişələrdən yayınmaq və blokun taymerini sıfırlamaq üçün, baxış düyməsini sıxın.';
 $lang['notsavedyet']           = 'Yaddaşa yazılmamış dəyişiklər itəcəklər.\nSiz davam etmək istəyirsiz?';
 $lang['rssfailed']             = 'Aşağıda göstərilmiş xəbər lentini əldə edən zaman xəta baş verdi: ';
 $lang['nothingfound']          = 'Heçnə tapılmadı.';
diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php
index 3f8460286..580f6d963 100644
--- a/inc/lang/bg/lang.php
+++ b/inc/lang/bg/lang.php
@@ -91,7 +91,7 @@ $lang['txt_filename']          = 'Качи като (незадължителн
 $lang['txt_overwrt']           = 'Презапиши съществуващите файлове';
 $lang['lockedby']              = 'В момента е заключена от';
 $lang['lockexpire']            = 'Ще бъде отключена на';
-$lang['willexpire']            = 'Страницата ще бъде отключена за редактиране след минута.\nЗа предотвратяване на конфликти, ползвайте бутона "Преглед", за рестартиране на брояча за заключване.';
+$lang['js']['willexpire']            = 'Страницата ще бъде отключена за редактиране след минута.\nЗа предотвратяване на конфликти, ползвайте бутона "Преглед", за рестартиране на брояча за заключване.';
 $lang['js']['notsavedyet']     = 'Незаписаните промени ще бъдат загубени. Желаете ли да продължите?';
 $lang['js']['searchmedia']     = 'Търсене на файлове';
 $lang['js']['keepopen']        = 'Без затваряне на прозореца след избор';
diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php
index c6a7dc27e..c9c15b12d 100644
--- a/inc/lang/ca-valencia/lang.php
+++ b/inc/lang/ca-valencia/lang.php
@@ -93,7 +93,7 @@ $lang['txt_filename']          = 'Enviar com (opcional)';
 $lang['txt_overwrt']           = 'Sobreescriure archius existents';
 $lang['lockedby']              = 'Actualment bloquejat per';
 $lang['lockexpire']            = 'El bloqueig venç a les';
-$lang['willexpire']            = 'El seu bloqueig per a editar esta pàgina vencerà en un minut.\nPer a evitar conflictes utilise el botó de vista prèvia i reiniciarà el contador.';
+$lang['js']['willexpire']            = 'El seu bloqueig per a editar esta pàgina vencerà en un minut.\nPer a evitar conflictes utilise el botó de vista prèvia i reiniciarà el contador.';
 $lang['js']['notsavedyet']     = "Els canvis no guardats es perdran.\n¿Segur que vol continuar?";
 $lang['rssfailed']             = 'Ha ocorregut un erro al solicitar este canal: ';
 $lang['nothingfound']          = 'No s\'ha trobat res.';
diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php
index 342257d11..fbd1cb18a 100644
--- a/inc/lang/ca/lang.php
+++ b/inc/lang/ca/lang.php
@@ -93,7 +93,7 @@ $lang['txt_filename']          = 'Introduïu el nom wiki (opcional)';
 $lang['txt_overwrt']           = 'Sobreescriu el fitxer actual';
 $lang['lockedby']              = 'Actualment blocat per:';
 $lang['lockexpire']            = 'Venciment del blocatge:';
-$lang['willexpire']            = 'El blocatge per a editar aquesta pàgina venç d\'aquí a un minut.\nUtilitzeu la visualització prèvia per reiniciar el rellotge i evitar conflictes.';
+$lang['js']['willexpire']            = 'El blocatge per a editar aquesta pàgina venç d\'aquí a un minut.\nUtilitzeu la visualització prèvia per reiniciar el rellotge i evitar conflictes.';
 $lang['js']['notsavedyet']     = "Heu fet canvis que es perdran si no els deseu.\nVoleu continuar?";
 $lang['rssfailed']             = 'S\'ha produït un error en recollir aquesta alimentació: ';
 $lang['nothingfound']          = 'No s\'ha trobat res.';
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index e1c45e0c9..eaefaadb5 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -95,7 +95,7 @@ $lang['txt_filename']          = 'Wiki jméno (volitelné)';
 $lang['txt_overwrt']           = 'Přepsat existující soubor';
 $lang['lockedby']              = 'Právě zamknuto:';
 $lang['lockexpire']            = 'Zámek vyprší:';
-$lang['willexpire']            = 'Váš zámek pro editaci za chvíli vyprší.\nAbyste předešli konfliktům, stiskněte tlačítko Náhled a zámek se prodlouží.';
+$lang['js']['willexpire']            = 'Váš zámek pro editaci za chvíli vyprší.\nAbyste předešli konfliktům, stiskněte tlačítko Náhled a zámek se prodlouží.';
 $lang['js']['notsavedyet']     = 'Jsou tu neuložené změny, které budou ztraceny.
 Chcete opravdu pokračovat?';
 $lang['js']['searchmedia']     = 'Hledat soubory';
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index 80d55d6f5..614f2bdf2 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -98,7 +98,7 @@ $lang['txt_filename']          = 'Indtast wikinavn (valgfrit)';
 $lang['txt_overwrt']           = 'Overskriv eksisterende fil';
 $lang['lockedby']              = 'Midlertidig låst af';
 $lang['lockexpire']            = 'Lås udløber kl.';
-$lang['willexpire']            = 'Din lås på dette dokument udløber om et minut.\nTryk på Forhåndsvisning-knappen for at undgå konflikter.';
+$lang['js']['willexpire']            = 'Din lås på dette dokument udløber om et minut.\nTryk på Forhåndsvisning-knappen for at undgå konflikter.';
 $lang['js']['notsavedyet']     = 'Ugemte ændringer vil blive mistet
 Fortsæt alligevel?';
 $lang['js']['searchmedia']     = 'Søg efter filer';
diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index d39bf8152..16686bc4c 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -103,7 +103,7 @@ $lang['txt_filename']          = 'Hochladen als (optional)';
 $lang['txt_overwrt']           = 'Bestehende Datei überschreiben';
 $lang['lockedby']              = 'Momentan gesperrt von';
 $lang['lockexpire']            = 'Sperre läuft ab am';
-$lang['willexpire']            = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, solltest du sie durch einen Klick auf den Vorschau-Knopf verlängern.';
+$lang['js']['willexpire']            = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, solltest du sie durch einen Klick auf den Vorschau-Knopf verlängern.';
 $lang['js']['notsavedyet']     = 'Nicht gespeicherte Änderungen gehen verloren!';
 $lang['js']['searchmedia']     = 'Suche nach Dateien';
 $lang['js']['keepopen']        = 'Fenster nach Auswahl nicht schließen';
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index f9f250994..3ae06dc71 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -103,7 +103,7 @@ $lang['txt_filename']          = 'Hochladen als (optional)';
 $lang['txt_overwrt']           = 'Bestehende Datei überschreiben';
 $lang['lockedby']              = 'Momentan gesperrt von';
 $lang['lockexpire']            = 'Sperre läuft ab am';
-$lang['willexpire']            = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, sollten Sie sie durch einen Klick auf den Vorschau-Knopf verlängern.';
+$lang['js']['willexpire']            = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, sollten Sie sie durch einen Klick auf den Vorschau-Knopf verlängern.';
 $lang['js']['notsavedyet']     = 'Nicht gespeicherte Änderungen gehen verloren!';
 $lang['js']['searchmedia']     = 'Suche Dateien';
 $lang['js']['keepopen']        = 'Fenster nach Auswahl nicht schließen';
diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php
index 11c64285e..373dc5463 100644
--- a/inc/lang/el/lang.php
+++ b/inc/lang/el/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Επιλέξτε νέο όνομα αρχεί
 $lang['txt_overwrt']           = 'Αντικατάσταση υπάρχοντος αρχείου';
 $lang['lockedby']              = 'Προσωρινά κλειδωμένο από';
 $lang['lockexpire']            = 'Το κλείδωμα λήγει στις';
-$lang['willexpire']            = 'Το κλείδωμά σας για την επεξεργασία αυτής της σελίδας θα λήξει σε ένα λεπτό.\n Για να το ανανεώσετε χρησιμοποιήστε την Προεπισκόπηση.';
+$lang['js']['willexpire']            = 'Το κλείδωμά σας για την επεξεργασία αυτής της σελίδας θα λήξει σε ένα λεπτό.\n Για να το ανανεώσετε χρησιμοποιήστε την Προεπισκόπηση.';
 $lang['js']['notsavedyet']     = 'Οι μη αποθηκευμένες αλλαγές θα χαθούν.
 Θέλετε να συνεχίσετε;';
 $lang['js']['searchmedia']     = 'Αναζήτηση για αρχεία';
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 51fd8f645..95356f7b4 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -98,7 +98,7 @@ $lang['txt_filename'] = 'Upload as (optional)';
 $lang['txt_overwrt']  = 'Overwrite existing file';
 $lang['lockedby']     = 'Currently locked by';
 $lang['lockexpire']   = 'Lock expires at';
-$lang['willexpire']   = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
+$lang['js']['willexpire']   = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
 
 $lang['js']['notsavedyet'] = "Unsaved changes will be lost.";
 $lang['rssfailed']   = 'An error occurred while fetching this feed: ';
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index 4bb1c005d..14bc56405 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -94,7 +94,7 @@ $lang['txt_filename']          = 'Alŝuti kiel (laŭvole)';
 $lang['txt_overwrt']           = 'Anstataŭigi ekzistantan dosieron';
 $lang['lockedby']              = 'Nune ŝlosita de';
 $lang['lockexpire']            = 'Ŝlosado ĉesos en';
-$lang['willexpire']            = 'Vi povos redakti ĉi tiun paĝon post unu minuto.\nSe vi volas nuligi tempkontrolon de la ŝlosado, do premu butonon "Antaŭrigardi".';
+$lang['js']['willexpire']            = 'Vi povos redakti ĉi tiun paĝon post unu minuto.\nSe vi volas nuligi tempkontrolon de la ŝlosado, do premu butonon "Antaŭrigardi".';
 $lang['js']['notsavedyet']     = 'Ne konservitaj modifoj perdiĝos.
 Ĉu vi certe volas daŭrigi la procezon?';
 $lang['js']['searchmedia']     = 'Serĉi dosierojn';
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index aad93c075..5dc6834e6 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -109,7 +109,7 @@ $lang['txt_filename']          = 'Subir como (opcional)';
 $lang['txt_overwrt']           = 'Sobreescribir archivo existente';
 $lang['lockedby']              = 'Actualmente bloqueado por';
 $lang['lockexpire']            = 'El bloqueo expira en';
-$lang['willexpire']            = 'Tu bloqueo para editar esta página expira en un minuto.\nPara evitar conflictos usa el botón previsualizar para reiniciar el contador de tiempo.';
+$lang['js']['willexpire']            = 'Tu bloqueo para editar esta página expira en un minuto.\nPara evitar conflictos usa el botón previsualizar para reiniciar el contador de tiempo.';
 $lang['js']['notsavedyet']     = 'Los cambios que no se han guardado se perderán.
 ¿Realmente quieres continuar?';
 $lang['js']['searchmedia']     = 'Buscar archivos';
diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index 180a50c09..66fab3f9a 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Siseta oma Wikinimi (soovituslik)';
 $lang['txt_overwrt']           = 'Kirjutan olemasoleva faili üle';
 $lang['lockedby']              = 'Praegu on selle lukustanud';
 $lang['lockexpire']            = 'Lukustus aegub';
-$lang['willexpire']            = 'Teie lukustus selle lehe toimetamisele aegub umbes minuti pärast.\nIgasugu  probleemide vältimiseks kasuta eelvaate nuppu, et lukustusarvesti taas tööle panna.';
+$lang['js']['willexpire']            = 'Teie lukustus selle lehe toimetamisele aegub umbes minuti pärast.\nIgasugu  probleemide vältimiseks kasuta eelvaate nuppu, et lukustusarvesti taas tööle panna.';
 $lang['js']['notsavedyet']     = 'Sul on seal salvestamata muudatusi, mis kohe kõige kaduva teed lähevad.
 Kas Sa ikka tahad edasi liikuda?';
 $lang['js']['searchmedia']     = 'Otsi faile';
diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php
index e49290e5e..30dfe9e5b 100644
--- a/inc/lang/eu/lang.php
+++ b/inc/lang/eu/lang.php
@@ -90,7 +90,7 @@ $lang['txt_filename']          = 'Idatzi wikiname-a (aukerazkoa)';
 $lang['txt_overwrt']           = 'Oraingo fitxategiaren gainean idatzi';
 $lang['lockedby']              = 'Momentu honetan blokeatzen:';
 $lang['lockexpire']            = 'Blokeaketa iraungitzen da:';
-$lang['willexpire']            = 'Zure blokeaketa orri hau aldatzeko minutu batean iraungitzen da.\nGatazkak saihesteko, aurreikusi botoia erabili blokeaketa denboragailua berrabiarazteko.';
+$lang['js']['willexpire']            = 'Zure blokeaketa orri hau aldatzeko minutu batean iraungitzen da.\nGatazkak saihesteko, aurreikusi botoia erabili blokeaketa denboragailua berrabiarazteko.';
 $lang['js']['notsavedyet']     = 'Gorde gabeko aldaketak galdu egingo dira.
 Benetan jarraitu nahi duzu?';
 $lang['js']['searchmedia']     = 'Bilatu fitxategiak';
diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php
index 96374b409..1a7467431 100644
--- a/inc/lang/fa/lang.php
+++ b/inc/lang/fa/lang.php
@@ -97,7 +97,7 @@ $lang['txt_filename']          = 'ارسال به صورت (اختیاری)';
 $lang['txt_overwrt']           = 'بر روی فایل موجود بنویس';
 $lang['lockedby']              = 'در حال حاضر قفل شده است';
 $lang['lockexpire']            = 'قفل منقضی شده است';
-$lang['willexpire']            = 'حالت قفل شما مدتی است منقضی شده است \n برای جلوگیری از تداخل دکمه‌ی پیش‌نمایش را برای صفر شدن ساعت قفل بزنید.';
+$lang['js']['willexpire']            = 'حالت قفل شما مدتی است منقضی شده است \n برای جلوگیری از تداخل دکمه‌ی پیش‌نمایش را برای صفر شدن ساعت قفل بزنید.';
 $lang['js']['notsavedyet']     = 'تغییرات ذخیره شده از بین خواهد رفت. 
  می‌خواهید ادامه دهید؟';
 $lang['js']['searchmedia']     = 'جستجو برای فایل';
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index cce597fe7..a2f2e2027 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -93,7 +93,7 @@ $lang['txt_filename']          = 'Lähetä nimellä (valinnainen)';
 $lang['txt_overwrt']           = 'Ylikirjoita olemassa oleva';
 $lang['lockedby']              = 'Tällä hetkellä tiedoston on lukinnut';
 $lang['lockexpire']            = 'Lukitus päättyy';
-$lang['willexpire']            = 'Lukituksesi tämän sivun muokkaukseen päättyy minuutin kuluttua.\nRistiriitojen välttämiseksi paina esikatselu-nappia nollataksesi lukitusajan.';
+$lang['js']['willexpire']            = 'Lukituksesi tämän sivun muokkaukseen päättyy minuutin kuluttua.\nRistiriitojen välttämiseksi paina esikatselu-nappia nollataksesi lukitusajan.';
 $lang['js']['notsavedyet']     = 'Dokumentissa on tallentamattomia muutoksia, jotka häviävät.
  Haluatko varmasti jatkaa?';
 $lang['js']['searchmedia']     = 'Etsi tiedostoja';
diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php
index 3d4d0455b..4cb895f72 100644
--- a/inc/lang/fo/lang.php
+++ b/inc/lang/fo/lang.php
@@ -90,7 +90,7 @@ $lang['txt_filename']          = 'Sláa inn wikinavn (valfrítt)';
 $lang['txt_overwrt']           = 'Yvurskriva verandi fílu';
 $lang['lockedby']              = 'Fyribils læst av';
 $lang['lockexpire']            = 'Lásið ferð úr gildi kl.';
-$lang['willexpire']            = 'Títt lás á hetta skjalið ferð úr gildi um ein minnutt.\nTrýst á Forskoðan-knappin fyri at sleppa undan trupulleikum.';
+$lang['js']['willexpire']            = 'Títt lás á hetta skjalið ferð úr gildi um ein minnutt.\nTrýst á Forskoðan-knappin fyri at sleppa undan trupulleikum.';
 $lang['js']['notsavedyet']     = 'Tað eru gjørdar broytingar í skjalinum, um tú haldur fram vilja broytingar fara fyri skeytið.
 Ynskir tú at halda fram?';
 $lang['js']['searchmedia']     = 'Leita eftir dátufílum';
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 047019baf..ae082e9e7 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -107,7 +107,7 @@ $lang['txt_filename']          = 'Donnez un « wikiname » (optionnel) ';
 $lang['txt_overwrt']           = 'Écraser le fichier cible';
 $lang['lockedby']              = 'Actuellement bloqué par';
 $lang['lockexpire']            = 'Le blocage expire à';
-$lang['willexpire']            = 'Votre blocage pour modifier cette page expire dans une minute.\nPour éviter les conflits, utiliser le bouton « Aperçu » pour réinitialiser le minuteur.';
+$lang['js']['willexpire']            = 'Votre blocage pour modifier cette page expire dans une minute.\nPour éviter les conflits, utiliser le bouton « Aperçu » pour réinitialiser le minuteur.';
 $lang['js']['notsavedyet']     = 'Les modifications non enregistrées seront perdues.
 Voulez-vous vraiment continuer ?';
 $lang['js']['searchmedia']     = 'Chercher des fichiers';
diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php
index 37cf55d22..a3caeff6d 100644
--- a/inc/lang/gl/lang.php
+++ b/inc/lang/gl/lang.php
@@ -89,7 +89,7 @@ $lang['txt_filename']          = 'Subir como (opcional)';
 $lang['txt_overwrt']           = 'Sobrescribir arquivo existente';
 $lang['lockedby']              = 'Bloqueado actualmente por';
 $lang['lockexpire']            = 'O bloqueo remata o';
-$lang['willexpire']            = 'O teu bloqueo para editares esta páxina vai caducar nun minuto.\nPara de evitar conflitos, emprega o botón de previsualización para reiniciares o contador do tempo de bloqueo.';
+$lang['js']['willexpire']            = 'O teu bloqueo para editares esta páxina vai caducar nun minuto.\nPara de evitar conflitos, emprega o botón de previsualización para reiniciares o contador do tempo de bloqueo.';
 $lang['js']['notsavedyet']     = "Perderanse os trocos non gardados.\nEstá certo de quereres continuar?";
 $lang['rssfailed']             = 'Houbo un erro ao tentar obter esta corrente RSS: ';
 $lang['nothingfound']          = 'Non se atopou nada.';
diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 1a47ebcb8..589088320 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -95,7 +95,7 @@ $lang['txt_filename']          = 'העלאה בשם (נתון לבחירה)';
 $lang['txt_overwrt']           = 'שכתוב על קובץ קיים';
 $lang['lockedby']              = 'נעול על ידי';
 $lang['lockexpire']            = 'הנעילה פגה';
-$lang['willexpire']            = 'הנעילה תחלוף עוד זמן קצר. \nלמניעת התנגשויות יש להשתמש בכפתור הרענון מטה כדי לאפס את מד משך הנעילה.';
+$lang['js']['willexpire']            = 'הנעילה תחלוף עוד זמן קצר. \nלמניעת התנגשויות יש להשתמש בכפתור הרענון מטה כדי לאפס את מד משך הנעילה.';
 $lang['js']['notsavedyet']     = 'שינויים שלא נשמרו ילכו לאיבוד.';
 $lang['js']['searchmedia']     = 'חיפוש אחר קבצים';
 $lang['js']['keepopen']        = 'השארת חלון פתוח על הבחירה';
diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php
index a76bde2e8..a85214cf7 100644
--- a/inc/lang/hr/lang.php
+++ b/inc/lang/hr/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Postaviti kao (nije obavezno)';
 $lang['txt_overwrt']           = 'Prepiši postojeću datoteku';
 $lang['lockedby']              = 'Zaključao';
 $lang['lockexpire']            = 'Zaključano do';
-$lang['willexpire']            = 'Dokument kojeg mijenjate će biti zaključan još 1 minutu.\n Ukoliko želite i dalje raditi izmjene na dokumentu - kliknite na "Pregled".';
+$lang['js']['willexpire']            = 'Dokument kojeg mijenjate će biti zaključan još 1 minutu.\n Ukoliko želite i dalje raditi izmjene na dokumentu - kliknite na "Pregled".';
 $lang['js']['notsavedyet']     = 'Vaše izmjene će se izgubiti.
 Želite li nastaviti?';
 $lang['js']['searchmedia']     = 'Traži datoteke';
diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php
index 35e810ff0..89ad77948 100644
--- a/inc/lang/hu/lang.php
+++ b/inc/lang/hu/lang.php
@@ -95,7 +95,7 @@ $lang['txt_filename']          = 'feltöltési név (elhagyható)';
 $lang['txt_overwrt']           = 'Létező fájl felülírása';
 $lang['lockedby']              = 'Jelenleg zárolta:';
 $lang['lockexpire']            = 'A zárolás lejár:';
-$lang['willexpire']            = 'Az oldalszerkesztési zárolásod körülbelül egy percen belül lejár.\nAz ütközések elkerülése végett használd az előnézet gombot a zárolási időzítés frissítéséhez.';
+$lang['js']['willexpire']            = 'Az oldalszerkesztési zárolásod körülbelül egy percen belül lejár.\nAz ütközések elkerülése végett használd az előnézet gombot a zárolási időzítés frissítéséhez.';
 $lang['js']['notsavedyet']     = 'Elmentetlen változások vannak, amelyek el fognak veszni.
 Tényleg ezt akarod?';
 $lang['js']['searchmedia']     = 'Fájlok keresése';
diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php
index bdfef88f4..abf1e6786 100644
--- a/inc/lang/ia/lang.php
+++ b/inc/lang/ia/lang.php
@@ -95,7 +95,7 @@ $lang['txt_filename']          = 'Incargar como (optional)';
 $lang['txt_overwrt']           = 'Reimplaciar le file existente';
 $lang['lockedby']              = 'Actualmente serrate per';
 $lang['lockexpire']            = 'Serratura expira le';
-$lang['willexpire']            = 'Tu serratura super le modification de iste pagina expirara post un minuta.\nPro evitar conflictos, usa le button Previsualisar pro reinitialisar le timer del serratura.';
+$lang['js']['willexpire']            = 'Tu serratura super le modification de iste pagina expirara post un minuta.\nPro evitar conflictos, usa le button Previsualisar pro reinitialisar le timer del serratura.';
 $lang['js']['notsavedyet']     = "Le modificationes non salveguardate essera perdite.\nRealmente continuar?";
 $lang['rssfailed']             = 'Un error occurreva durante le obtention de iste syndication:';
 $lang['nothingfound']          = 'Nihil ha essite trovate.';
diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php
index c1480f518..e8026acee 100644
--- a/inc/lang/id/lang.php
+++ b/inc/lang/id/lang.php
@@ -85,7 +85,7 @@ $lang['txt_filename']          = 'Masukkan nama wiki (opsional)';
 $lang['txt_overwrt']           = 'File yang telah ada akan ditindih';
 $lang['lockedby']              = 'Sedang dikunci oleh';
 $lang['lockexpire']            = 'Penguncian artikel sampai dengan';
-$lang['willexpire']            = 'Halaman yang sedang Anda kunci akan berakhir dalam waktu kurang lebih satu menit.\nUntuk menghindari konflik, gunakan tombol Preview untuk me-reset timer pengunci.';
+$lang['js']['willexpire']            = 'Halaman yang sedang Anda kunci akan berakhir dalam waktu kurang lebih satu menit.\nUntuk menghindari konflik, gunakan tombol Preview untuk me-reset timer pengunci.';
 $lang['js']['notsavedyet']     = "Perubahan yang belum disimpan akan hilang.\nYakin akan dilanjutkan?";
 $lang['rssfailed']             = 'Error terjadi saat mengambil feed: ';
 $lang['nothingfound']          = 'Tidak menemukan samasekali.';
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index 682f5b8c2..8812b148d 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -98,7 +98,7 @@ $lang['txt_filename']          = 'Carica come (opzionale)';
 $lang['txt_overwrt']           = 'Sovrascrivi file esistente';
 $lang['lockedby']              = 'Attualmente bloccato da';
 $lang['lockexpire']            = 'Il blocco scade alle';
-$lang['willexpire']            = 'Il tuo blocco su questa pagina scadrà tra circa un minuto.\nPer evitare incongruenze usa il pulsante di anteprima per prolungare il periodo di blocco.';
+$lang['js']['willexpire']            = 'Il tuo blocco su questa pagina scadrà tra circa un minuto.\nPer evitare incongruenze usa il pulsante di anteprima per prolungare il periodo di blocco.';
 $lang['js']['notsavedyet']     = 'Le modifiche non salvate andranno perse.';
 $lang['js']['searchmedia']     = 'Cerca file';
 $lang['js']['keepopen']        = 'Tieni la finestra aperta durante la selezione';
diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index e8999e05b..b0b93450e 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = '名前を変更してアップロード（オ
 $lang['txt_overwrt']           = '既存のファイルを上書き';
 $lang['lockedby']              = 'この文書は次のユーザによってロックされています';
 $lang['lockexpire']            = 'ロック期限：';
-$lang['willexpire']            = '編集中の文書はロック期限を過ぎようとしています。このままロックする場合は、一度文書の確認を行って期限をリセットしてください。';
+$lang['js']['willexpire']            = '編集中の文書はロック期限を過ぎようとしています。このままロックする場合は、一度文書の確認を行って期限をリセットしてください。';
 $lang['js']['notsavedyet']     = '変更は保存されません。このまま処理を続けてよろしいですか？';
 $lang['js']['searchmedia']     = 'ファイル検索';
 $lang['js']['keepopen']        = '選択中はウィンドウを閉じない';
diff --git a/inc/lang/kk/lang.php b/inc/lang/kk/lang.php
index 2b492ed1c..f9ea0bced 100644
--- a/inc/lang/kk/lang.php
+++ b/inc/lang/kk/lang.php
@@ -88,7 +88,7 @@ $lang['txt_filename']          = 'Келесідей еңгізу (қалауы
 $lang['txt_overwrt']           = 'Бар файлды қайта жазу';
 $lang['lockedby']              = 'Осы уақытта тойтарылған';
 $lang['lockexpire']            = 'Тойтару келесі уақытта бітеді';
-$lang['willexpire']            = 'Бұл бетті түзеу тойтаруыңыз бір минутта бітеді. Қақтығыс болмау және тойтару таймерді түсіру үшін қарап шығу пернені басыңыз.';
+$lang['js']['willexpire']            = 'Бұл бетті түзеу тойтаруыңыз бір минутта бітеді. Қақтығыс болмау және тойтару таймерді түсіру үшін қарап шығу пернені басыңыз.';
 $lang['js']['notsavedyet']     = 'Сақталмаған өзгерістер жоғалатын болады.';
 $lang['js']['searchmedia']     = 'Файлдарды іздеу';
 $lang['js']['keepopen']        = 'Таңдаған соң терезе жаппаңыз';
diff --git a/inc/lang/km/lang.php b/inc/lang/km/lang.php
index 90cad3133..68587e90f 100644
--- a/inc/lang/km/lang.php
+++ b/inc/lang/km/lang.php
@@ -88,7 +88,7 @@ $lang['txt_filename'] = 'រុញឡើងជា (ស្រេច​ចិត
 $lang['txt_overwrt']  = 'កត់ពីលើ';//'Overwrite existing file';
 $lang['lockedby']     = 'ឥឡូវនេះចកជាប់​';
 $lang['lockexpire']   = 'សោជាប់ផុត​កំណត់ម៉ោង';
-$lang['willexpire']   = 'សោអ្នកចំពោះកែតម្រូវទំព័រនេះ ហួសពែលក្នុងមួយនាទី។\nកុំឲ្យមានជម្លោះ ប្រើ «បង្ហាញ»​ ទៅកំណត់​ឡើង​វិញ។';
+$lang['js']['willexpire']   = 'សោអ្នកចំពោះកែតម្រូវទំព័រនេះ ហួសពែលក្នុងមួយនាទី។\nកុំឲ្យមានជម្លោះ ប្រើ «បង្ហាញ»​ ទៅកំណត់​ឡើង​វិញ។';
 
 $lang['js']['notsavedyet'] = "កម្រែមិនទានរុក្សាទកត្រូវបោះបង់។\nបន្តទៅទាឬទេ?";
 $lang['rssfailed']   = 'មានកំហុសពេលទៅ​ប្រមូល​យកមតិ​ព័ត៌មាន៖ ';
diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index c85a66d38..7b55ebe71 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -93,7 +93,7 @@ $lang['txt_filename']          = '업로드 파일 이름을 입력합니다.(
 $lang['txt_overwrt']           = '새로운 파일로 이전 파일을 교체합니다.';
 $lang['lockedby']              = '현재 잠금 사용자';
 $lang['lockexpire']            = '잠금 해제 시간';
-$lang['willexpire']            = '잠시 후 편집 잠금이 해제됩니다.\n편집 충돌을 피하려면 미리보기를 눌러 잠금 시간을 다시 설정하기 바랍니다.';
+$lang['js']['willexpire']            = '잠시 후 편집 잠금이 해제됩니다.\n편집 충돌을 피하려면 미리보기를 눌러 잠금 시간을 다시 설정하기 바랍니다.';
 $lang['js']['notsavedyet']     = '저장하지 않은 변경은 지워집니다.
 계속하시겠습니까?';
 $lang['js']['searchmedia']     = '파일 찾기';
diff --git a/inc/lang/ku/lang.php b/inc/lang/ku/lang.php
index 9bed43cd1..63ccafa35 100644
--- a/inc/lang/ku/lang.php
+++ b/inc/lang/ku/lang.php
@@ -60,7 +60,7 @@ $lang['txt_filename'] = 'Enter wikiname (optional)';
 $lang['txt_overwrt']  = 'Overwrite existing file';
 $lang['lockedby']     = 'Currently locked by';
 $lang['lockexpire']   = 'Lock expires at';
-$lang['willexpire']   = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
+$lang['js']['willexpire']   = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
 
 $lang['js']['notsavedyet'] = "Unsaved changes will be lost.\nReally continue?";
 
diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php
index d10c094f8..00312f7a1 100644
--- a/inc/lang/la/lang.php
+++ b/inc/lang/la/lang.php
@@ -94,7 +94,7 @@ $lang['txt_filename']          = 'Onerare (optio):';
 $lang['txt_overwrt']           = 'Documento ueteri imponere:';
 $lang['lockedby']              = 'Nunc hoc intercludit';
 $lang['lockexpire']            = 'Hoc apertum';
-$lang['willexpire']            = 'Interclusio paginae recensendae uno minuto finita est.\nUt errores uites, \'praeuisio\' preme ut interclusionem ripristines.';
+$lang['js']['willexpire']            = 'Interclusio paginae recensendae uno minuto finita est.\nUt errores uites, \'praeuisio\' preme ut interclusionem ripristines.';
 $lang['js']['notsavedyet']     = 'Res non seruatae amissurae sunt.';
 $lang['js']['searchmedia']     = 'Quaere inter documenta';
 $lang['js']['keepopen']        = 'Fenestram apertam tene';
diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php
index 09fc41f08..191a9bab5 100644
--- a/inc/lang/lb/lang.php
+++ b/inc/lang/lb/lang.php
@@ -84,7 +84,7 @@ $lang['txt_filename']          = 'Eroplueden als (optional)';
 $lang['txt_overwrt']           = 'Bestehend Datei iwwerschreiwen';
 $lang['lockedby']              = 'Am Moment gespaart vun';
 $lang['lockexpire']            = 'D\'Spär leeft of ëm';
-$lang['willexpire']            = 'Deng Spär fir d\'Säit ze änneren leeft an enger Minutt of.\nFir Konflikter ze verhënneren, dréck op Kucken ouni ofzespäicheren.';
+$lang['js']['willexpire']            = 'Deng Spär fir d\'Säit ze änneren leeft an enger Minutt of.\nFir Konflikter ze verhënneren, dréck op Kucken ouni ofzespäicheren.';
 $lang['js']['notsavedyet']     = "Net gespäicher Ännerunge gi verluer.\nWierklech weiderfueren?";
 $lang['rssfailed']             = 'Et ass e Feeler virkomm beim erofluede vun dësem Feed: ';
 $lang['nothingfound']          = 'Näischt fond.';
diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php
index 6ae5f6c73..121e25308 100644
--- a/inc/lang/lt/lang.php
+++ b/inc/lang/lt/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Įveskite wikivardą (nebūtina)';
 $lang['txt_overwrt']           = 'Perrašyti egzistuojančią bylą';
 $lang['lockedby']              = 'Užrakintas vartotojo';
 $lang['lockexpire']            = 'Užraktas bus nuimtas';
-$lang['willexpire']            = 'Šio puslapio redagavimo užrakto galiojimo laikas baigsis po minutės.\nNorėdami išvengti nesklandumų naudokite peržiūros mygtuką ir užraktas atsinaujins.';
+$lang['js']['willexpire']            = 'Šio puslapio redagavimo užrakto galiojimo laikas baigsis po minutės.\nNorėdami išvengti nesklandumų naudokite peržiūros mygtuką ir užraktas atsinaujins.';
 $lang['js']['notsavedyet']     = "Pakeitimai nebus išsaugoti.\nTikrai tęsti?";
 $lang['rssfailed']             = 'Siunčiant šį feed\'ą įvyko klaida: ';
 $lang['nothingfound']          = 'Paieškos rezultatų nėra.';
diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php
index 519ca231a..64e22c56a 100644
--- a/inc/lang/lv/lang.php
+++ b/inc/lang/lv/lang.php
@@ -89,7 +89,7 @@ $lang['txt_filename']          = 'Ievadi vikivārdu (nav obligāts)';
 $lang['txt_overwrt']           = 'Aizstāt esošo failu';
 $lang['lockedby']              = 'Patlaban bloķējis ';
 $lang['lockexpire']            = 'Bloķējums beigsies ';
-$lang['willexpire']            = 'Tavs bloķējums uz šo lapu pēc minūtes beigsies.\nLai izvairītos no konflikta, nospied Iepriekšapskata pogu\n un bloķējuma laiku sāks skaitīt no jauna.';
+$lang['js']['willexpire']            = 'Tavs bloķējums uz šo lapu pēc minūtes beigsies.\nLai izvairītos no konflikta, nospied Iepriekšapskata pogu\n un bloķējuma laiku sāks skaitīt no jauna.';
 $lang['js']['notsavedyet']     = 'Veiktas bet nav saglabātas izmaiņas.
 Vai tiešām tās nevajag?';
 $lang['js']['searchmedia']     = 'Meklēt failus';
diff --git a/inc/lang/mg/lang.php b/inc/lang/mg/lang.php
index 8c95a9e02..4142f00d0 100644
--- a/inc/lang/mg/lang.php
+++ b/inc/lang/mg/lang.php
@@ -54,7 +54,7 @@ $lang['txt_filename'] = 'Ampidiro ny anaran\'ny wiki (tsy voatery)';
 $lang['txt_overwrt']  = 'Fafana izay rakitra efa misy?';
 $lang['lockedby']     = 'Mbola voahidin\'i';
 $lang['lockexpire']   = 'Afaka ny hidy amin\'ny';
-$lang['willexpire']   = 'Efa ho lany fotoana afaka iray minitra ny hidy ahafahanao manova ny pejy.\nMba hialana amin\'ny conflit dia ampiasao ny bokotra topi-maso hamerenana ny timer-n\'ny hidy.';
+$lang['js']['willexpire']   = 'Efa ho lany fotoana afaka iray minitra ny hidy ahafahanao manova ny pejy.\nMba hialana amin\'ny conflit dia ampiasao ny bokotra topi-maso hamerenana ny timer-n\'ny hidy.';
 
 $lang['js']['notsavedyet'] = "Misy fiovana tsy voarakitra, ho very izany ireo.\nAzo antoka fa hotohizana?";
 $lang['rssfailed']   = 'An error occured while fetching this feed: ';
diff --git a/inc/lang/mk/lang.php b/inc/lang/mk/lang.php
index 456a5a3d4..b7d433092 100644
--- a/inc/lang/mk/lang.php
+++ b/inc/lang/mk/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Качи како (неморално)';
 $lang['txt_overwrt']           = 'Пребриши ја веќе постоечката датотека';
 $lang['lockedby']              = 'Моментално заклучена од';
 $lang['lockexpire']            = 'Клучот истекува на';
-$lang['willexpire']            = 'Вашиот клуч за уредување на оваа страница ќе истече за една минута.\nЗа да избегнете конфликти и да го ресетирате бројачот за време, искористете го копчето за преглед.';
+$lang['js']['willexpire']            = 'Вашиот клуч за уредување на оваа страница ќе истече за една минута.\nЗа да избегнете конфликти и да го ресетирате бројачот за време, искористете го копчето за преглед.';
 $lang['js']['notsavedyet']     = "Незачуваните промени ќе бидат изгубени.\nСакате да продолжите?";
 $lang['rssfailed']             = 'Се појави грешка при повлекувањето на овој канал:';
 $lang['nothingfound']          = 'Ништо не е пронајдено.';
diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php
index d991d46cf..ae9d05bfd 100644
--- a/inc/lang/mr/lang.php
+++ b/inc/lang/mr/lang.php
@@ -96,7 +96,7 @@ $lang['txt_filename']          = 'अपलोड उर्फ़ ( वैकल्
 $lang['txt_overwrt']           = 'अस्तित्वात असलेल्या फाइलवरच सुरक्षित करा.';
 $lang['lockedby']              = 'सध्या लॉक करणारा :';
 $lang['lockexpire']            = 'सध्या लॉक करणारा :';
-$lang['willexpire']            = 'हे पृष्ठ संपादित करण्यासाठी मिळालेले लॉक एखाद्या मिनिटात संपणार आहे.\n चुका होऊ नयेत म्हणुन कृपया प्रीव्यू बटन दाबुन लॉक ची वेळ पुन्हा चालू करा.';
+$lang['js']['willexpire']            = 'हे पृष्ठ संपादित करण्यासाठी मिळालेले लॉक एखाद्या मिनिटात संपणार आहे.\n चुका होऊ नयेत म्हणुन कृपया प्रीव्यू बटन दाबुन लॉक ची वेळ पुन्हा चालू करा.';
 $lang['js']['notsavedyet']     = "सुरक्षित न केलेले बदल नष्ट होतील. नक्की करू का ?";
 $lang['rssfailed']             = 'ही पुरवणी आणण्यात काही चूक झाली:';
 $lang['nothingfound']          = 'काही सापडला नाही.';
diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php
index e5b30ceaf..53c701b23 100644
--- a/inc/lang/ne/lang.php
+++ b/inc/lang/ne/lang.php
@@ -89,7 +89,7 @@ $lang['txt_filename']          = 'अर्को रुपमा अपलो
 $lang['txt_overwrt']           = 'रहेको उहि नामको फाइललाई मेटाउने';
 $lang['lockedby']              = 'अहिले ताल्चा लगाइएको';
 $lang['lockexpire']            = 'ताल्चा अवधि सकिने :';
-$lang['willexpire']            = 'तपाईलले यो पृष्ठ सम्पादन गर्न लगाउनु भएको ताल्चाको अवधि एक मिनेट भित्र सकिदै छ। \n द्वन्द हुन नदिन  पूर्वरुप वा ताल्चा समय परिवर्तन गर्नुहोस् ।';
+$lang['js']['willexpire']            = 'तपाईलले यो पृष्ठ सम्पादन गर्न लगाउनु भएको ताल्चाको अवधि एक मिनेट भित्र सकिदै छ। \n द्वन्द हुन नदिन  पूर्वरुप वा ताल्चा समय परिवर्तन गर्नुहोस् ।';
 $lang['js']['notsavedyet']     = "तपाईले वचन गर्नु नभएको परिवर्रन हराउने छ। \n साच्चै जारी गर्नुहुन्छ ।";
 $lang['rssfailed']             = 'यो फिड लिइ आउदा गल्ति भयो ।';
 $lang['nothingfound']          = 'केहि पनि भेटिएन ।';
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index 7dbde5ac8..6090babd9 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -99,7 +99,7 @@ $lang['txt_filename']          = 'Vul nieuwe naam in (optioneel)';
 $lang['txt_overwrt']           = 'Overschrijf bestaand bestand';
 $lang['lockedby']              = 'Momenteel in gebruik door';
 $lang['lockexpire']            = 'Exclusief gebruiksrecht vervalt op';
-$lang['willexpire']            = 'Je exclusieve gebruiksrecht voor het aanpassen van deze pagina verloopt over een minuut.\nKlik op de Voorbeeld-knop om het exclusieve gebruiksrecht te verlengen.';
+$lang['js']['willexpire']            = 'Je exclusieve gebruiksrecht voor het aanpassen van deze pagina verloopt over een minuut.\nKlik op de Voorbeeld-knop om het exclusieve gebruiksrecht te verlengen.';
 $lang['js']['notsavedyet']     = 'Nog niet bewaarde wijzigingen zullen verloren gaan.
 Weet je zeker dat je wilt doorgaan?';
 $lang['js']['searchmedia']     = 'Zoek naar bestanden';
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index e610db6bd..fa946ca02 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -101,7 +101,7 @@ $lang['txt_filename']          = 'Skriv inn wikinavn (alternativt)';
 $lang['txt_overwrt']           = 'Overskriv eksisterende fil';
 $lang['lockedby']              = 'Stengt av';
 $lang['lockexpire']            = 'Avstengningen opphører';
-$lang['willexpire']            = 'Din redigeringslås for dette dokumentet kommer snart til å opphøre.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.';
+$lang['js']['willexpire']            = 'Din redigeringslås for dette dokumentet kommer snart til å opphøre.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.';
 $lang['js']['notsavedyet']     = 'Ulagrede endringer vil gå tapt.
 Vil du fortsette?';
 $lang['js']['searchmedia']     = 'Søk for filer';
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index bc0509df3..32e5bf80c 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -96,7 +96,7 @@ $lang['txt_filename']          = 'Nazwa pliku (opcjonalnie)';
 $lang['txt_overwrt']           = 'Nadpisać istniejący plik?';
 $lang['lockedby']              = 'Aktualnie zablokowane przez';
 $lang['lockexpire']            = 'Blokada wygasa';
-$lang['willexpire']            = 'Za minutę Twoja blokada tej strony wygaśnie.\nW celu uniknięcia konfliktów wyświetl podgląd aby odnowić blokadę.';
+$lang['js']['willexpire']            = 'Za minutę Twoja blokada tej strony wygaśnie.\nW celu uniknięcia konfliktów wyświetl podgląd aby odnowić blokadę.';
 $lang['js']['notsavedyet']     = 'Nie zapisane zmiany zostaną utracone.
 Czy na pewno kontynuować?';
 $lang['js']['searchmedia']     = 'Szukaj plików';
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index f3b012521..0abe8a6b6 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -103,7 +103,7 @@ $lang['txt_filename']          = 'Enviar como (opcional)';
 $lang['txt_overwrt']           = 'Substituir o arquivo existente';
 $lang['lockedby']              = 'Atualmente bloqueada por';
 $lang['lockexpire']            = 'O bloqueio expira em';
-$lang['willexpire']            = 'O seu bloqueio de edição deste página irá expirar em um minuto.\nPara evitar conflitos de edição, clique no botão de visualização para reiniciar o temporizador de bloqueio.';
+$lang['js']['willexpire']            = 'O seu bloqueio de edição deste página irá expirar em um minuto.\nPara evitar conflitos de edição, clique no botão de visualização para reiniciar o temporizador de bloqueio.';
 $lang['js']['notsavedyet']     = 'As alterações não salvas serão perdidas.
 Deseja realmente continuar?';
 $lang['js']['searchmedia']     = 'Buscar por arquivos';
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 41406ee60..dba379df5 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -94,7 +94,7 @@ $lang['txt_filename']          = 'Carregar como (opcional)';
 $lang['txt_overwrt']           = 'Escrever por cima do ficheiro já existente';
 $lang['lockedby']              = 'Bloqueado por';
 $lang['lockexpire']            = 'Expira em';
-$lang['willexpire']            = 'O bloqueio de edição para este documento irá expirar num minuto.\nPara evitar conflitos de edição, clique no botão <Prever> para re-iniciar o temporizador de bloqueio.';
+$lang['js']['willexpire']            = 'O bloqueio de edição para este documento irá expirar num minuto.\nPara evitar conflitos de edição, clique no botão <Prever> para re-iniciar o temporizador de bloqueio.';
 $lang['js']['notsavedyet']     = 'Existem alterações não gravadas, que serão perdidas se continuar.
 Deseja realmente continuar?';
 $lang['js']['searchmedia']     = 'Procurar por ficheiros';
diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index cbecf6f6c..b8d7520e6 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Încarcă fişierul ca (opţional)';
 $lang['txt_overwrt']           = 'Suprascrie fişierul existent';
 $lang['lockedby']              = 'Momentan blocat de';
 $lang['lockexpire']            = 'Blocarea expiră la';
-$lang['willexpire']            = 'Blocarea pentru editarea paginii expiră intr-un minut.\nPentru a preveni conflictele foloseşte butonul de previzualizare pentru resetarea blocării.';
+$lang['js']['willexpire']            = 'Blocarea pentru editarea paginii expiră intr-un minut.\nPentru a preveni conflictele foloseşte butonul de previzualizare pentru resetarea blocării.';
 $lang['js']['notsavedyet']     = 'Există modificări nesalvate, care se vor pierde.
 Doreşti să continui?';
 $lang['js']['searchmedia']     = 'Caută fişiere';
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 1eaa488ec..ce9e54819 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -104,7 +104,7 @@ $lang['txt_filename']          = 'Введите имя файла в вики (
 $lang['txt_overwrt']           = 'Перезаписать существующий файл';
 $lang['lockedby']              = 'В данный момент заблокирован';
 $lang['lockexpire']            = 'Блокировка истекает в';
-$lang['willexpire']            = 'Ваша блокировка редактирования этой страницы истекает в течение минуты.\nЧтобы избежать конфликтов и сбросить таймер блокировки, нажмите кнопку просмотра.';
+$lang['js']['willexpire']            = 'Ваша блокировка редактирования этой страницы истекает в течение минуты.\nЧтобы избежать конфликтов и сбросить таймер блокировки, нажмите кнопку просмотра.';
 $lang['js']['notsavedyet']     = 'Несохранённые изменения будут потеряны. Вы действительно хотите продолжить?';
 $lang['js']['searchmedia']     = 'Поиск файлов';
 $lang['js']['keepopen']        = 'Не закрывать окно после выбора';
diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index 4a2520abd..4dab977b9 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Uložiť ako (voliteľné)';
 $lang['txt_overwrt']           = 'Prepísať existujúci súbor';
 $lang['lockedby']              = 'Práve zamknuté:';
 $lang['lockexpire']            = 'Zámok stratí platnosť:';
-$lang['willexpire']            = 'Váš zámok pre editáciu za chvíľu stratí platnosť.\nAby ste predišli konfliktom, stlačte tlačítko Náhľad a zámok sa predĺži.';
+$lang['js']['willexpire']            = 'Váš zámok pre editáciu za chvíľu stratí platnosť.\nAby ste predišli konfliktom, stlačte tlačítko Náhľad a zámok sa predĺži.';
 $lang['js']['notsavedyet']     = 'Neuložené zmeny budú stratené.
 Chcete naozaj pokračovať?';
 $lang['js']['searchmedia']     = 'Hľadať súbory';
diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php
index 0e6c0a706..55c895b2d 100644
--- a/inc/lang/sl/lang.php
+++ b/inc/lang/sl/lang.php
@@ -93,7 +93,7 @@ $lang['txt_filename']          = 'Pošlji z imenom (izborno)';
 $lang['txt_overwrt']           = 'Prepiši obstoječo datoteko';
 $lang['lockedby']              = 'Trenutno je zaklenjeno s strani';
 $lang['lockexpire']            = 'Zaklep preteče ob';
-$lang['willexpire']            = 'Zaklep za urejevanje bo pretekel čez eno minuto.\nV izogib sporom, uporabite predogled, da se merilnik časa za zaklep ponastavi.';
+$lang['js']['willexpire']            = 'Zaklep za urejevanje bo pretekel čez eno minuto.\nV izogib sporom, uporabite predogled, da se merilnik časa za zaklep ponastavi.';
 $lang['js']['notsavedyet']     = 'Neshranjene spremembe bodo izgubljene.';
 $lang['js']['searchmedia']     = 'Poišči datoteke';
 $lang['js']['keepopen']        = 'Od izbiri ohrani okno odprto';
diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php
index 47a54d2ea..ea2f018b3 100644
--- a/inc/lang/sq/lang.php
+++ b/inc/lang/sq/lang.php
@@ -94,7 +94,7 @@ $lang['txt_filename']          = 'Ngarko si (alternative)';
 $lang['txt_overwrt']           = 'Zëvendëso skedarin ekzistues';
 $lang['lockedby']              = 'Kyçur momentalisht nga';
 $lang['lockexpire']            = 'Kyçi skadon në';
-$lang['willexpire']            = 'Kyçi juaj për redaktimin e kësaj faqeje është duke skaduar.\nPër të shmangur konflikte përdorni butonin Shiko Paraprakisht për të rivendosur kohën e kyçjes.';
+$lang['js']['willexpire']            = 'Kyçi juaj për redaktimin e kësaj faqeje është duke skaduar.\nPër të shmangur konflikte përdorni butonin Shiko Paraprakisht për të rivendosur kohën e kyçjes.';
 $lang['js']['notsavedyet']     = "Ndryshimet e paruajtura do të humbasin.\nVazhdo me të vërtetë?";
 $lang['rssfailed']             = 'Ndoshi një gabim gjatë kapjes së këtij lajmi:';
 $lang['nothingfound']          = 'Nuk u gjet asgjë.';
diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php
index b35956f03..a868f1d81 100644
--- a/inc/lang/sr/lang.php
+++ b/inc/lang/sr/lang.php
@@ -91,7 +91,7 @@ $lang['txt_filename']          = 'Унесите вики-име (опционо
 $lang['txt_overwrt']           = 'Препишите тренутни фајл';
 $lang['lockedby']              = 'Тренутно закључано од стране';
 $lang['lockexpire']            = 'Закључавање истиче';
-$lang['willexpire']            = 'Ваше закључавање за измену ове странице ће да истекне за један минут.\nДа би сте избегли конфликте, искористите дугме за преглед како би сте ресетовали тајмер закључавања.';
+$lang['js']['willexpire']            = 'Ваше закључавање за измену ове странице ће да истекне за један минут.\nДа би сте избегли конфликте, искористите дугме за преглед како би сте ресетовали тајмер закључавања.';
 $lang['js']['notsavedyet']     = 'Несачуване измене ће бити изгубљене.
 Да ли стварно желите да наставите?';
 $lang['js']['searchmedia']     = 'Потражи фајлове';
diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php
index 06b21afe8..d6f90a5f4 100644
--- a/inc/lang/sv/lang.php
+++ b/inc/lang/sv/lang.php
@@ -102,7 +102,7 @@ $lang['txt_filename']          = 'Ladda upp som (ej obligatoriskt)';
 $lang['txt_overwrt']           = 'Skriv över befintlig fil';
 $lang['lockedby']              = 'Låst av';
 $lang['lockexpire']            = 'Lås upphör att gälla';
-$lang['willexpire']            = 'Ditt redigeringslås för detta dokument kommer snart att upphöra.\nFör att undvika versionskonflikter bör du förhandsgranska ditt dokument för att förlänga redigeringslåset.';
+$lang['js']['willexpire']            = 'Ditt redigeringslås för detta dokument kommer snart att upphöra.\nFör att undvika versionskonflikter bör du förhandsgranska ditt dokument för att förlänga redigeringslåset.';
 $lang['js']['notsavedyet']     = 'Det finns ändringar som inte är sparade.
 Är du säker på att du vill fortsätta?';
 $lang['js']['searchmedia']     = 'Sök efter filer';
diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php
index d40f30f4a..e9dffa2c1 100644
--- a/inc/lang/th/lang.php
+++ b/inc/lang/th/lang.php
@@ -100,7 +100,7 @@ $lang['txt_filename']          = 'อัพโหลดเป็น(ตัวเ
 $lang['txt_overwrt']           = 'เขียนทับไฟล์ที่มีอยู่แล้ว';
 $lang['lockedby']              = 'ตอนนี้ถูกล๊อคโดย';
 $lang['lockexpire']            = 'การล๊อคจะหมดอายุเมื่อ';
-$lang['willexpire']            = 'การล๊อคเพื่อแก้ไขหน้านี้กำลังจะหมดเวลาในอีก \n นาที เพื่อที่จะหลีกเลี่ยงข้อขัดแย้งให้ใช้ปุ่ม "Preview" เพื่อรีเซ็ทเวลาใหม่';
+$lang['js']['willexpire']            = 'การล๊อคเพื่อแก้ไขหน้านี้กำลังจะหมดเวลาในอีก \n นาที เพื่อที่จะหลีกเลี่ยงข้อขัดแย้งให้ใช้ปุ่ม "Preview" เพื่อรีเซ็ทเวลาใหม่';
 $lang['js']['notsavedyet']     = "การแก้ไขที่ไม่ได้บันทึกจะสูญหาย \n ต้องการทำต่อจริงๆหรือ?";
 $lang['rssfailed']             = 'มีข้อผิดพลาดขณะดูดฟีดนี้';
 $lang['nothingfound']          = 'ไม่พบสิ่งใด';
diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php
index 0509113b0..0b76a6e81 100644
--- a/inc/lang/tr/lang.php
+++ b/inc/lang/tr/lang.php
@@ -93,7 +93,7 @@ $lang['txt_filename']          = 'Dosya adı (zorunlu değil)';
 $lang['txt_overwrt']           = 'Mevcut dosyanın üstüne yaz';
 $lang['lockedby']              = 'Şu an şunun tarafından kilitli:';
 $lang['lockexpire']            = 'Kilitin açılma tarihi:';
-$lang['willexpire']            = 'Bu sayfayı değiştirme kilidinin süresi yaklaşık bir dakika içinde geçecek.\nÇakışmaları önlemek için önizleme tuşunu kullanarak kilit sayacını sıfırla.';
+$lang['js']['willexpire']            = 'Bu sayfayı değiştirme kilidinin süresi yaklaşık bir dakika içinde geçecek.\nÇakışmaları önlemek için önizleme tuşunu kullanarak kilit sayacını sıfırla.';
 $lang['js']['notsavedyet']     = 'Kaydedilmemiş değişiklikler kaybolacak.
 Devam etmek istiyor musunuz?';
 $lang['js']['searchmedia']     = 'Dosyalar için Ara';
diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php
index 7bda02501..6b80bc75c 100644
--- a/inc/lang/uk/lang.php
+++ b/inc/lang/uk/lang.php
@@ -94,7 +94,7 @@ $lang['txt_filename']          = 'Завантажити як (не обов\'я
 $lang['txt_overwrt']           = 'Перезаписати існуючий файл';
 $lang['lockedby']              = 'Заблоковано';
 $lang['lockexpire']            = 'Блокування завершується в';
-$lang['willexpire']            = 'Блокування редагування цієї сторінки закінчується через хвилину.\n Щоб уникнути конфліктів використовуйте кнопку перегляду для продовження блокування.';
+$lang['js']['willexpire']            = 'Блокування редагування цієї сторінки закінчується через хвилину.\n Щоб уникнути конфліктів використовуйте кнопку перегляду для продовження блокування.';
 $lang['js']['notsavedyet']     = 'Незбережені зміни будуть втрачені.
  Дійсно продовжити?';
 $lang['js']['searchmedia']     = 'Шукати файли';
diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php
index 89c9e9cfc..361e51e84 100644
--- a/inc/lang/vi/lang.php
+++ b/inc/lang/vi/lang.php
@@ -49,7 +49,7 @@ $lang['txt_upload']   = 'Chọn tệp để tải lên';
 $lang['txt_filename'] = 'Điền wikiname (tuỳ ý)';
 $lang['lockedby']     = 'Đang khoá bởi';
 $lang['lockexpire']   = 'Khoá sẽ hết hạn vào lúc';
-$lang['willexpire']   = 'Khoá của bạn để biên soạn trang này sẽ hết hạn trong vòng 1 phút.\nĐể tránh xung đột, bạn nên bấm nút xem trước để lập lại thời gian khoá';
+$lang['js']['willexpire']   = 'Khoá của bạn để biên soạn trang này sẽ hết hạn trong vòng 1 phút.\nĐể tránh xung đột, bạn nên bấm nút xem trước để lập lại thời gian khoá';
 
 $lang['js']['notsavedyet'] = "Hiện có những thay đổi chưa được bảo lưu, và sẽ mất.\nBạn thật sự muốn tiếp tục?";
 $lang['rssfailed']   = 'Rút nguồn này gặp phải lỗi';
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index 074c510e9..2222125f5 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -95,7 +95,7 @@ $lang['txt_filename']          = '請輸入要存在維基內的檔案名稱 (
 $lang['txt_overwrt']           = '是否要覆蓋原有檔案';
 $lang['lockedby']              = '目前已被下列人員鎖定';
 $lang['lockexpire']            = '預計解除鎖定於';
-$lang['willexpire']            = '本頁的編輯鎖定將在一分鐘內到期。要避免發生衝突，請按「預覽」鍵重設鎖定計時。';
+$lang['js']['willexpire']            = '本頁的編輯鎖定將在一分鐘內到期。要避免發生衝突，請按「預覽」鍵重設鎖定計時。';
 $lang['js']['notsavedyet']     = '未儲存的變更將會遺失，繼續嗎？';
 $lang['js']['searchmedia']     = '搜尋檔案';
 $lang['js']['keepopen']        = '選擇時保持視窗開啟';
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 14c92c4b3..31e6dc238 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -98,7 +98,7 @@ $lang['txt_filename']          = '上传并重命名为（可选）';
 $lang['txt_overwrt']           = '覆盖已存在的同名文件';
 $lang['lockedby']              = '目前已被下列人员锁定';
 $lang['lockexpire']            = '预计锁定解除于';
-$lang['willexpire']            = '您对本页的独有编辑权将于一分钟之后解除。\n为了防止与其他人的编辑冲突，请使用预览按钮重设计时器。';
+$lang['js']['willexpire']            = '您对本页的独有编辑权将于一分钟之后解除。\n为了防止与其他人的编辑冲突，请使用预览按钮重设计时器。';
 $lang['js']['notsavedyet']     = '未保存的更改将丢失。
 真的要继续？';
 $lang['js']['searchmedia']     = '查找文件';
-- 
cgit v1.2.3


From 9e4f7880b1e2dfece064b313f5ad1c56b0fdc3d6 Mon Sep 17 00:00:00 2001
From: Adrian Lang <lang@cosmocode.de>
Date: Fri, 19 Aug 2011 15:48:22 +0200
Subject: Fix tree HTML (closes FS#2299)

---
 inc/html.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 64999ed98..6e9cce7df 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -782,16 +782,17 @@ function html_buildlist($data,$class,$func,$lifunc='html_li_default'){
         return '';
     }
 
-    $level = $data[0]['level'];
-    $opens = 0;
+    $start_level = $data[0]['level'];
     $ret   = '';
 
-    if ($level < 2) {
+    if ($start_level < 2) {
         // Trigger building a wrapper ul if the first level is
         // 0 (we have a root object) or 1 (just the root content)
-        --$level;
+        --$start_level;
     }
 
+    $level = $start_level;
+
     foreach ($data as $item){
 
         if( $item['level'] > $level ){
@@ -824,7 +825,7 @@ function html_buildlist($data,$class,$func,$lifunc='html_li_default'){
     }
 
     //close remaining items and lists
-    for ($i=0; $i < $level; $i++){
+    while(--$level >= $start_level) {
         $ret .= "</li></ul>\n";
     }
 
-- 
cgit v1.2.3


From c5f927421e944bfe2ed61a7d50177e7a04c7a079 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Fri, 19 Aug 2011 16:10:08 +0200
Subject: Don't delete meta files when pages are deleted, fixes FS#2301

As we need to keep all core meta files anyway (the only core file that
had been deleted but shouldn't be deleted is the .indexed file) and
plugins can keep care of their own metadata files using the
IO_WIKIPAGE_WRITE event there is no reason for using the expensive
metaFiles() function during the deletion of pages.
---
 inc/common.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'inc')

diff --git a/inc/common.php b/inc/common.php
index 7522095ab..239cfcf99 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -1007,16 +1007,8 @@ function saveWikiText($id,$text,$summary,$minor=false){
         $newRev = saveOldRevision($id);
         // remove empty file
         @unlink($file);
-        // remove old meta info...
-        $mfiles = metaFiles($id);
-        $changelog = metaFN($id, '.changes');
-        $metadata  = metaFN($id, '.meta');
-        $subscribers = metaFN($id, '.mlist');
-        foreach ($mfiles as $mfile) {
-            // but keep per-page changelog to preserve page history, keep subscriber list and keep meta data
-            if (@file_exists($mfile) && $mfile!==$changelog && $mfile!==$metadata && $mfile!==$subscribers) { @unlink($mfile); }
-        }
-        // purge meta data
+        // don't remove old meta info as it should be saved, plugins can use IO_WIKIPAGE_WRITE for removing their metadata...
+        // purge non-persistant meta data
         p_purge_metadata($id);
         $del = true;
         // autoset summary on deletion
-- 
cgit v1.2.3


From 96a7ba82ad21ad7bd7cd5f677d85042da7733605 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 19 Aug 2011 18:48:19 +0300
Subject: issue #56 ajax deleting images

---
 inc/template.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'inc')

diff --git a/inc/template.php b/inc/template.php
index 04e3e79cc..d5320c5dd 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1172,10 +1172,10 @@ function tpl_fileList(){
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function tpl_fileDetails($image, $rev){
-    global $AUTH, $NS, $conf;
+    global $AUTH, $NS, $conf, $DEL;
 
     $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')) && $conf['mediarevisions']);
-    if (!$image || (!file_exists(mediaFN($image)) && !$removed)) return '';
+    if (!$image || (!file_exists(mediaFN($image)) && !$removed) || $DEL) return '';
     if ($rev && !file_exists(mediaFN($image, $rev))) $rev = false;
     if (isset($NS) && getNS($image) != $NS) return '';
     $do = $_REQUEST['mediado'];
@@ -1209,7 +1209,7 @@ function tpl_fileDetails($image, $rev){
 
     } elseif ($opened_tab == 'history' && $conf['mediarevisions']) {
         echo '<div id="mediamanager__details">';
-        media_tab_history($image,$NS,$AUTH);
+        media_tab_history($image,$NS,$AUTH,$removed);
         echo '</div>';
     }
 }
@@ -1465,6 +1465,7 @@ function tpl_media() {
     if (isset($JUMPTO)) $image = $JUMPTO;
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
+    echo '<div id="test"></div>';
     echo '<div id="mediamanager__page">';
     echo '<div id="mediamanager__layout">';
 
-- 
cgit v1.2.3


From d06c626c5f4a79cb833facf40bff089af2fcaa18 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 19 Aug 2011 20:49:49 +0300
Subject: html fix

---
 inc/html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 60189d4fe..1c38104d7 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -600,7 +600,7 @@ function html_revisions($first=0, $media_id = false){
         print '<div class="pagenav-prev">';
         if ($media_id) {
             echo '<form class="button btn_newer" method="post" action="'.media_managerURL(array('first' => $first)).'">';
-            echo '<input type="submit" value="'.$lang['btn_newer'].'" class="button" /></form>';
+            echo '<div class="no"><input type="submit" value="'.$lang['btn_newer'].'" class="button" /></div></form>';
         } else {
             print html_btn('newer',$id,"p",array('do' => 'revisions', 'first' => $first));
         }
@@ -610,7 +610,7 @@ function html_revisions($first=0, $media_id = false){
         print '<div class="pagenav-next">';
         if ($media_id) {
             echo '<form class="button btn_older" method="post" action="'.media_managerURL(array('first' => $last)).'">';
-            echo '<input type="submit" value="'.$lang['btn_older'].'" class="button" /></form>';
+            echo '<div class="no"><input type="submit" value="'.$lang['btn_older'].'" class="button" /></div></form>';
         } else {
             print html_btn('older',$id,"n",array('do' => 'revisions', 'first' => $last));
         }
-- 
cgit v1.2.3


From c472bad9de398442c30ec1410d07284f0db8b821 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 19 Aug 2011 20:56:43 +0300
Subject: issue #44 new uploader in the media popup

---
 inc/lang/en/lang.php |  1 +
 inc/media.php        | 50 ++++----------------------------------------------
 2 files changed, 5 insertions(+), 46 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 58a7d56ed..3406927fe 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -356,6 +356,7 @@ $lang['js']['media_diff_portions'] = 'Slider';
 
 $lang['js']['media_select']     = 'Select files…';
 $lang['js']['media_upload_btn'] = 'Upload';
+$lang['js']['media_done_btn']   = 'Done';
 $lang['js']['media_drop']       = 'Drop files here to upload';
 $lang['js']['media_cancel']     = 'remove';
 $lang['js']['media_overwrt']    = 'Overwrite existing files';
diff --git a/inc/media.php b/inc/media.php
index 8ef075f17..d083fd2b2 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1626,14 +1626,14 @@ function media_uploadform($ns, $auth, $fullscreen = false){
     $params = array('id'      => 'dw__upload',
                     'enctype' => 'multipart/form-data');
     if (!$fullscreen) {
-        $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php';
+        $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php?ns='.$ns;
     } else {
         $params['action'] = media_managerURL(array('tab_files' => 'files',
             'tab_details' => 'view'), '&');
     }
 
     $form = new Doku_Form($params);
-    if (!$fullscreen) $form->addElement('<div class="upload">' . $lang['mediaupload'] . '</div>');
+    if (!$fullscreen) echo '<div class="upload">' . $lang['mediaupload'] . '</div>';
     $form->addElement(formSecurityToken());
     $form->addHidden('ns', hsc($ns));
     $form->addElement(form_makeOpenTag('p'));
@@ -1651,52 +1651,10 @@ function media_uploadform($ns, $auth, $fullscreen = false){
         $form->addElement(form_makeCheckboxField('ow', 1, $lang['txt_overwrt'], 'dw__ow', 'check', $attrs));
         $form->addElement(form_makeCloseTag('p'));
     }
-    if ($fullscreen) {
-        echo '<div id="mediamanager__uploader">';
-    }
 
+    echo '<div id="mediamanager__uploader">';
     html_form('upload', $form);
-
-    if ($fullscreen) {
-        echo '</div>';
-        return '';
-    }
-
-    // prepare flashvars for multiupload
-    $opt = array(
-            'L_gridname'  => $lang['mu_gridname'] ,
-            'L_gridsize'  => $lang['mu_gridsize'] ,
-            'L_gridstat'  => $lang['mu_gridstat'] ,
-            'L_namespace' => $lang['mu_namespace'] ,
-            'L_overwrite' => $lang['txt_overwrt'],
-            'L_browse'    => $lang['mu_browse'],
-            'L_upload'    => $lang['btn_upload'],
-            'L_toobig'    => $lang['mu_toobig'],
-            'L_ready'     => $lang['mu_ready'],
-            'L_done'      => $lang['mu_done'],
-            'L_fail'      => $lang['mu_fail'],
-            'L_authfail'  => $lang['mu_authfail'],
-            'L_progress'  => $lang['mu_progress'],
-            'L_filetypes' => $lang['mu_filetypes'],
-            'L_info'      => $lang['mu_info'],
-            'L_lasterr'   => $lang['mu_lasterr'],
-
-            'O_ns'        => ":$ns",
-            'O_backend'   => 'mediamanager.php?'.session_name().'='.session_id(),
-            'O_maxsize'   => php_to_byte(ini_get('upload_max_filesize')),
-            'O_extensions'=> join('|',array_keys(getMimeTypes())),
-            'O_overwrite' => ($auth >= AUTH_DELETE),
-            'O_sectok'    => getSecurityToken(),
-            'O_authtok'   => auth_createToken(),
-            );
-    $var = buildURLparams($opt);
-    // output the flash uploader
-    ?>
-        <div id="dw__flashupload" style="display:none">
-        <div class="upload"><?php echo $lang['mu_intro']?></div>
-        <?php echo html_flashobject('multipleUpload.swf','500','190',null,$opt); ?>
-        </div>
-        <?php
+    echo '</div>';
 }
 
 /**
-- 
cgit v1.2.3


From 10799f9c522a9847ebf5f2f7c91d4af7f160e4b8 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 19 Aug 2011 21:11:04 +0300
Subject: issue #44 removing drop-area after upload

---
 inc/template.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/template.php b/inc/template.php
index d5320c5dd..569e211b1 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1209,7 +1209,7 @@ function tpl_fileDetails($image, $rev){
 
     } elseif ($opened_tab == 'history' && $conf['mediarevisions']) {
         echo '<div id="mediamanager__details">';
-        media_tab_history($image,$NS,$AUTH,$removed);
+        media_tab_history($image,$NS,$AUTH);
         echo '</div>';
     }
 }
@@ -1465,7 +1465,6 @@ function tpl_media() {
     if (isset($JUMPTO)) $image = $JUMPTO;
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
-    echo '<div id="test"></div>';
     echo '<div id="mediamanager__page">';
     echo '<div id="mediamanager__layout">';
 
-- 
cgit v1.2.3


From b838050e5828b5cbf32b9e82ce11c9cc54592809 Mon Sep 17 00:00:00 2001
From: Piyush Mishra <me@piyushmishra.com>
Date: Sat, 20 Aug 2011 19:11:52 +0530
Subject: added new plugins config cascade and added plugin.info.txt

---
 inc/config_cascade.php         |   5 ++
 inc/infoutils.php              |   4 +-
 inc/lang/en/lang.php           |   2 +-
 inc/plugincontroller.class.php | 167 ++++++++++++++++++++++++++++++++++-------
 inc/pluginutils.php            |  33 +++++++-
 5 files changed, 179 insertions(+), 32 deletions(-)

(limited to 'inc')

diff --git a/inc/config_cascade.php b/inc/config_cascade.php
index 48ed5a000..c01778e99 100644
--- a/inc/config_cascade.php
+++ b/inc/config_cascade.php
@@ -64,6 +64,11 @@ $config_cascade = array_merge(
         'plainauth.users' => array(
             'default' => DOKU_CONF.'users.auth.php',
             ),
+        
+        'plugins' => array(
+            'local'     => array(DOKU_CONF.'plugins.local.php'),
+            'protected' => array(DOKU_CONF.'plugins.protected.php'),
+            ),
         ),
         $config_cascade
 );
diff --git a/inc/infoutils.php b/inc/infoutils.php
index 786661d01..f1deec66b 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -66,8 +66,8 @@ function getVersionData(){
             $chunk = fread($fh,2000);
             fclose($fh);
             $chunk = trim($chunk);
-            $chunk = array_pop(explode("\n",$chunk));   //last log line
-            $chunk = array_shift(explode("\t",$chunk)); //strip commit msg
+            $chunk = @array_pop(explode("\n",$chunk));   //last log line
+            $chunk = @array_shift(explode("\t",$chunk)); //strip commit msg
             $chunk = explode(" ",$chunk);
             array_pop($chunk); //strip timezone
             $date = date('Y-m-d',array_pop($chunk));
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 95356f7b4..02dff5cb7 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -318,5 +318,5 @@ $lang['seconds'] = '%d seconds ago';
 
 $lang['wordblock'] = 'Your change was not saved because it contains blocked text (spam).';
 
-
+$lang['plugin_insterr'] = "Plugin installed incorrectly. Rename plugin directory '%s' to '%s'.";
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index ea5725d47..6dcdcdfff 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -11,11 +11,18 @@ if(!defined('DOKU_PLUGIN'))  define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
 
 class Doku_Plugin_Controller {
 
-    var $list_enabled = array();
-    var $list_disabled = array();
     var $list_bytype = array();
+    var $tmp_plugins = array();
+    var $plugin_cascade = array('default'=>array(),'local'=>array(),'protected'=>array());
+    var $last_local = '';
+    //backup of tmp_plugins needed for write check
+    var $tmp_bak =array();
 
-    function Doku_Plugin_Controller() {
+    /**
+     * Populates the master list of plugins
+     */
+    function __construct() {
+        $this->loadConfig();
         $this->_populateMasterList();
     }
 
@@ -37,7 +44,7 @@ class Doku_Plugin_Controller {
 
         // request the complete list
         if (!$type) {
-            return $all ? array_merge($this->list_enabled,$this->list_disabled) : $this->list_enabled;
+            return $all ? array_keys($this->tmp_plugins) : array_keys(array_filter($this->tmp_plugins));
         }
 
         if (!isset($this->list_bytype[$type]['enabled'])) {
@@ -61,9 +68,10 @@ class Doku_Plugin_Controller {
      * @param  $disabled bool   true to load even disabled plugins
      * @return objectreference  the plugin object or null on failure
      */
-    function &load($type,$name,$new=false,$disabled=false){
+    function load($type,$name,$new=false,$disabled=false){
+
         //we keep all loaded plugins available in global scope for reuse
-        global $DOKU_PLUGINS;
+        global $DOKU_PLUGINS,$lang;
 
         list($plugin,$component) = $this->_splitName($name);
 
@@ -85,12 +93,12 @@ class Doku_Plugin_Controller {
 
         //construct class and instantiate
         if (!class_exists($class, true)) {
+
             # the plugin might be in the wrong directory
             $dir = $this->get_directory($plugin);
             $inf = confToHash(DOKU_PLUGIN."$dir/plugin.info.txt");
             if($inf['base'] && $inf['base'] != $plugin){
-                msg("Plugin installed incorrectly. Rename plugin directory '".
-                    hsc($plugin)."' to '".hsc($inf['base'])."'.",-1);
+                msg(sprintf($lang['plugin_insterr'],hsc($plugin),hsc($inf['base'])),-1);
             }
             return null;
         }
@@ -100,30 +108,27 @@ class Doku_Plugin_Controller {
     }
 
     function isdisabled($plugin) {
-        return (array_search($plugin, $this->list_enabled) === false);
+        return empty($this->tmp_plugins[$plugin]);
     }
 
-    function enable($plugin) {
-        if (array_search($plugin, $this->list_disabled) !== false) {
-            return @unlink(DOKU_PLUGIN.$plugin.'/disabled');
-        }
-        return false;
+    function disable($plugin) {
+        if(array_key_exists($plugin,$this->plugin_cascade['protected'])) return false;
+        $this->tmp_plugins[$plugin] = 0;
+        return $this->saveList();
     }
 
-    function disable($plugin) {
-        if (array_search($plugin, $this->list_enabled) !== false) {
-            return @touch(DOKU_PLUGIN.$plugin.'/disabled');
-        }
-        return false;
+    function enable($plugin) {
+        if(array_key_exists($plugin,$this->plugin_cascade['protected'])) return false;
+        $this->tmp_plugins[$plugin] = 1;
+        return $this->saveList();
     }
 
     function get_directory($plugin) {
         return $plugin;
     }
 
-    function _populateMasterList() {
-        global $conf;
-        if ($dh = opendir(DOKU_PLUGIN)) {
+    protected function _populateMasterList() {
+        if ($dh = @opendir(DOKU_PLUGIN)) {
             while (false !== ($plugin = readdir($dh))) {
                 if ($plugin[0] == '.') continue;               // skip hidden entries
                 if (is_file(DOKU_PLUGIN.$plugin)) continue;    // skip files, we're only interested in directories
@@ -132,19 +137,123 @@ class Doku_Plugin_Controller {
                     // the plugin was disabled by rc2009-01-26
                     // disabling mechanism was changed back very soon again
                     // to keep everything simple we just skip the plugin completely
-                }elseif(@file_exists(DOKU_PLUGIN.$plugin.'/disabled') ||
+                }elseif(@file_exists(DOKU_PLUGIN.$plugin.'/disabled')) {
+                    if(empty($this->plugin_cascade['local'][$plugin]))
+                        $all_plugins[$plugin] = 0;
+                    else
+                        $all_plugins[$plugin] = 1;
+                    //treat this as a default disabled plugin(over-rideable by the plugin manager)
+                    $this->plugin_cascade['default'][$plugin] = 0;
+                    //TODO take this out before final release, 
+                    //it is here only for other developers to be able to switch branches easily
+                    //@unlink(DOKU_PLUGIN.$plugin.'/disabled');
+                    continue;
+                }
+                elseif((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 0) ||
                         ($plugin === 'plugin' && isset($conf['pluginmanager']) &&
                          !$conf['pluginmanager'])){
-                    $this->list_disabled[] = $plugin;
+                    $all_plugins[$plugin] = 0;
+                } elseif((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 1)) {
+                    $all_plugins[$plugin] = 1;
                 } else {
-                    $this->list_enabled[] = $plugin;
+                    $all_plugins[$plugin] = 1;
                 }
             }
+            $this->tmp_plugins = $all_plugins;
+            $this->saveList();
         }
     }
 
+    protected function checkRequire($files) {
+        $plugins = array();
+        foreach($files as $file) {
+            if(file_exists($file)) {
+                @include_once($file);
+            }
+        }
+        return $plugins;
+    }
+
+    function getCascade() {
+        return $this->plugin_cascade;
+    }
+    /**
+     * Save the current list of plugins
+     */
+    function saveList() {
+        if(!empty($this->tmp_plugins)) {
+            //quick check to ensure rewrite is necessary
+            if($this->tmp_plugins != $this->tmp_bak) {
+                //Rebuild local for better check and saving
+                $local_plugins = $this->rebuildLocal();
+                //only write if the list has changed
+                if($local_plugins != $this->plugin_cascade['local']) {
+                    $file = $this->last_local;
+                    $out = "<?php\n";
+                    foreach ($local_plugins as $plugin => $value) {
+                        $out .= "\$plugins['$plugin'] = $value;\n";
+                    }
+                    // backup current file (remove any existing backup)
+                    if (@file_exists($file)) {
+                        if (@file_exists($file.'.bak')) @unlink($file.'.bak');
+                        if (!io_rename($file, $file.'.bak')) return false;
+                    }
+                    //check if can open for writing, else restore
+                    if (!$fh = @fopen($file, 'wb')) {
+                        io_rename($file.'.bak', $file);// problem opening, restore the backup
+                        return false;
+                    }
+                    @fwrite($fh, $out);
+                    fclose($fh);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Rebuild the set of local plugins
+     * @return array array of plugins to be saved in end($config_cascade['plugins']['local'])
+     */
+    function rebuildLocal() {
+        //assign to local variable to avoid overwriting
+        $backup = $this->tmp_plugins;
+        //Can't do anything about protected one so rule them out completely
+        $local_default = array_diff_key($backup,$this->plugin_cascade['protected']);
+        //Diff between local+default and default
+        //gives us the ones we need to check and save
+        $diffed_ones = array_diff_key($local_default,$this->plugin_cascade['default']);
+        //The ones which we are sure of (list of 0s not in default)
+        $sure_plugins = array_filter($diffed_ones,array($this,'negate'));
+        //the ones in need of diff
+        $conflicts = array_diff_key($local_default,$diffed_ones);
+        //The final list
+        return array_merge($sure_plugins,array_diff_assoc($conflicts,$this->plugin_cascade['default']));
+    }
+
+    /**
+     * Build the list of plugins and cascade
+     * 
+     */
+    function loadConfig() {
+        global $config_cascade;
+        foreach(array('default','protected') as $type) {
+            if(array_key_exists($type,$config_cascade['plugins']))
+                $this->plugin_cascade[$type] = $this->checkRequire($config_cascade['plugins'][$type]);
+        }
+        $local = $config_cascade['plugins']['local'];
+        $this->last_local = array_pop($local);
+        $this->plugin_cascade['local'] = $this->checkRequire(array($this->last_local));
+        if(is_array($local)) {
+            $this->plugin_cascade['default'] = array_merge($this->plugin_cascade['default'],$this->checkRequire($local));
+        }
+        $this->tmp_plugins = array_merge($this->plugin_cascade['default'],$this->plugin_cascade['local'],$this->plugin_cascade['protected']);
+        $this->tmp_bak = $this->tmp_plugins;
+    }
+
     function _getListByType($type, $enabled) {
-        $master_list = $enabled ? $this->list_enabled : $this->list_disabled;
+        $master_list = $enabled ? array_keys(array_filter($this->tmp_plugins)) : array_keys(array_filter($this->tmp_plugins,array($this,'negate')));
 
         $plugins = array();
         foreach ($master_list as $plugin) {
@@ -169,11 +278,13 @@ class Doku_Plugin_Controller {
     }
 
     function _splitName($name) {
-        if (array_search($name, $this->list_enabled + $this->list_disabled) === false) {
+        if (array_search($name, array_keys($this->tmp_plugins)) === false) {
             return explode('_',$name,2);
         }
 
         return array($name,'');
     }
-
+    function negate($input) {
+        return !(bool) $input;
+    }
 }
diff --git a/inc/pluginutils.php b/inc/pluginutils.php
index 85bcaee1e..897020a6c 100644
--- a/inc/pluginutils.php
+++ b/inc/pluginutils.php
@@ -16,7 +16,7 @@ function plugin_list($type='',$all=false) {
     global $plugin_controller;
     return $plugin_controller->getList($type,$all);
 }
-function &plugin_load($type,$name,$new=false,$disabled=false) {
+function plugin_load($type,$name,$new=false,$disabled=false) {
     global $plugin_controller;
     return $plugin_controller->load($type,$name,$new,$disabled);
 }
@@ -36,3 +36,34 @@ function plugin_directory($plugin) {
     global $plugin_controller;
     return $plugin_controller->get_directory($plugin);
 }
+function plugin_getcascade() {
+    global $plugin_controller;
+    return $plugin_controller->getCascade();
+}
+/**
+ * return a list (name & type) of all the component plugins that make up this plugin
+ *
+ */
+function get_plugin_components($plugin) {
+    global $plugin_types;
+    static $plugins;
+    if(empty($plugins[$plugin])) {
+        $components = array();
+        $path = DOKU_PLUGIN.plugin_directory($plugin).'/';
+
+        foreach ($plugin_types as $type) {
+            if (@file_exists($path.$type.'.php')) { $components[] = array('name'=>$plugin, 'type'=>$type); continue; }
+
+            if ($dh = @opendir($path.$type.'/')) {
+                while (false !== ($cp = readdir($dh))) {
+                    if ($cp == '.' || $cp == '..' || strtolower(substr($cp,-4)) != '.php') continue;
+
+                    $components[] = array('name'=>$plugin.'_'.substr($cp, 0, -4), 'type'=>$type);
+                }
+                closedir($dh);
+            }
+        }
+        $plugins[$plugin] = $components;
+    }
+    return $plugins[$plugin];
+}
-- 
cgit v1.2.3


From 9de3b5710719658ef75740c0bd930423cc7c209c Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 21 Aug 2011 02:16:39 +0300
Subject: issue #44 uploader fixes, #45 browser testing

---
 inc/media.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index d083fd2b2..7e8caa19c 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -268,7 +268,7 @@ function media_upload_xhr($ns,$auth){
             'mime' => $mime,
             'ext'  => $ext),
         $ns.':'.$id,
-        (($_REQUEST['ow'] == 'true') ? true : false),
+        (($_REQUEST['ow'] == 'checked') ? true : false),
         $auth,
         'copy'
     );
@@ -1626,7 +1626,7 @@ function media_uploadform($ns, $auth, $fullscreen = false){
     $params = array('id'      => 'dw__upload',
                     'enctype' => 'multipart/form-data');
     if (!$fullscreen) {
-        $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php?ns='.$ns;
+        $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php';
     } else {
         $params['action'] = media_managerURL(array('tab_files' => 'files',
             'tab_details' => 'view'), '&');
-- 
cgit v1.2.3


From 42025dfd31bb5f331c665ae7dbb016fac993d52d Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sun, 21 Aug 2011 01:01:59 +0200
Subject: Fix the permission and file existence check in the recent changes

Before it was possible that changes for media files the user can't
access were shown if the user could access a page with the same name.
This also reverts the file existence check so it now really checks for
media changes that the media file exists and for page changes the page
and that not one of the two suffice for both.
---
 inc/changelog.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'inc')

diff --git a/inc/changelog.php b/inc/changelog.php
index 395e793c1..fea39f9f7 100644
--- a/inc/changelog.php
+++ b/inc/changelog.php
@@ -188,14 +188,14 @@ function getRecents($first,$num,$ns='',$flags=0){
     // handle lines
     while ($lines_position >= 0 || (($flags & RECENTS_MEDIA_PAGES_MIXED) && $media_lines_position >=0)) {
         if (empty($rec) && $lines_position >= 0) {
-            $rec = _handleRecent(@$lines[$lines_position], $ns, $flags, $seen);
+            $rec = _handleRecent(@$lines[$lines_position], $ns, $flags & ~RECENTS_MEDIA_CHANGES, $seen);
             if (!$rec) {
                 $lines_position --;
                 continue;
             }
         }
         if (($flags & RECENTS_MEDIA_PAGES_MIXED) && empty($media_rec) && $media_lines_position >= 0) {
-            $media_rec = _handleRecent(@$media_lines[$media_lines_position], $ns, $flags, $seen);
+            $media_rec = _handleRecent(@$media_lines[$media_lines_position], $ns, $flags | RECENTS_MEDIA_CHANGES, $seen);
             if (!$media_rec) {
             	$media_lines_position --;
             	continue;
@@ -312,11 +312,16 @@ function _handleRecent($line,$ns,$flags,&$seen){
     if (($flags & RECENTS_SKIP_SUBSPACES) && (getNS($recent['id']) != $ns)) return false;
 
     // check ACL
-    $recent['perms'] = auth_quickaclcheck($recent['id']);
+    if ($flags & RECENTS_MEDIA_CHANGES) {
+        $recent['perms'] = auth_quickaclcheck(getNS($recent['id']).':*');
+    } else {
+        $recent['perms'] = auth_quickaclcheck($recent['id']);
+    }
     if ($recent['perms'] < AUTH_READ) return false;
 
     // check existance
-    if(!@file_exists(wikiFN($recent['id'])) && !@file_exists(mediaFN($recent['id'])) && $flags & RECENTS_SKIP_DELETED) return false;
+    $fn = (($flags & RECENTS_MEDIA_CHANGES) ? mediaFN($recent['id']) : wikiFN($recent['id']));
+    if((!@file_exists($fn)) && ($flags & RECENTS_SKIP_DELETED)) return false;
 
     return $recent;
 }
-- 
cgit v1.2.3


From 56e27257eef4a54d4fba170088589dccb39f5bb3 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 21 Aug 2011 16:59:48 +0200
Subject: avoid 100% cpu usage when reading HTTP headers FS#2304

---
 inc/HTTPClient.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc')

diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index 372769b71..fdf95d113 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -368,6 +368,7 @@ class HTTPClient {
                 unset($this->connections[$connectionId]);
                 return false;
             }
+            usleep(1000);
             $r_headers .= fgets($socket,1024);
         }while(!preg_match('/\r?\n\r?\n$/',$r_headers));
 
-- 
cgit v1.2.3


From 035e07f1301d5d7a13de017640d80db14d300ac3 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 24 Aug 2011 22:34:06 +0300
Subject: issue #57, function names, params, html fixes

---
 inc/html.php     | 29 ++++++++++++++++-------------
 inc/media.php    | 46 +++++++++++++++++++++++++++-------------------
 inc/template.php |  8 ++++----
 3 files changed, 47 insertions(+), 36 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 1c38104d7..51afe24f4 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -485,10 +485,12 @@ function html_revisions($first=0, $media_id = false){
 
         if ($media_id) $form->addElement(form_makeOpenTag('div'));
 
-        $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
-        if (!$media_id) $form->addElement(' &ndash; ');
-        if (!$media_id) $form->addElement(htmlspecialchars($INFO['sum']));
-        $form->addElement(form_makeCloseTag('span'));
+        if (!$media_id) {
+            $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
+            $form->addElement(' &ndash; ');
+            $form->addElement(htmlspecialchars($INFO['sum']));
+            $form->addElement(form_makeCloseTag('span'));
+        }
 
         $form->addElement(form_makeOpenTag('span', array('class' => 'user')));
         if (!$media_id) $editor = $INFO['editor'];
@@ -562,10 +564,12 @@ function html_revisions($first=0, $media_id = false){
 
         if ($media_id) $form->addElement(form_makeOpenTag('div'));
 
-        $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
-        if (!$media_id) $form->addElement(' &ndash; ');
-        $form->addElement(htmlspecialchars($info['sum']));
-        $form->addElement(form_makeCloseTag('span'));
+        if ($info['sum']) {
+            $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
+            if (!$media_id) $form->addElement(' &ndash; ');
+            $form->addElement(htmlspecialchars($info['sum']));
+            $form->addElement(form_makeCloseTag('span'));
+        }
 
         $form->addElement(form_makeOpenTag('span', array('class' => 'user')));
         if($info['user']){
@@ -599,8 +603,7 @@ function html_revisions($first=0, $media_id = false){
         if ($first < 0) $first = 0;
         print '<div class="pagenav-prev">';
         if ($media_id) {
-            echo '<form class="button btn_newer" method="post" action="'.media_managerURL(array('first' => $first)).'">';
-            echo '<div class="no"><input type="submit" value="'.$lang['btn_newer'].'" class="button" /></div></form>';
+            print html_btn('newer',$media_id,"p",media_managerURL(array('first' => $first), '&amp;', false, true));
         } else {
             print html_btn('newer',$id,"p",array('do' => 'revisions', 'first' => $first));
         }
@@ -609,8 +612,7 @@ function html_revisions($first=0, $media_id = false){
     if ($hasNext) {
         print '<div class="pagenav-next">';
         if ($media_id) {
-            echo '<form class="button btn_older" method="post" action="'.media_managerURL(array('first' => $last)).'">';
-            echo '<div class="no"><input type="submit" value="'.$lang['btn_older'].'" class="button" /></div></form>';
+            print html_btn('older',$media_id,"n",media_managerURL(array('first' => $last), '&amp;', false, true));
         } else {
             print html_btn('older',$id,"n",array('do' => 'revisions', 'first' => $last));
         }
@@ -746,7 +748,8 @@ function html_recent($first=0, $show_changes='both'){
 
         if ($recent['media']) {
             $href = media_managerURL(array('tab_details' => 'view', 'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&');
-            $form->addElement(form_makeOpenTag('a', array('class' => 'wikilink1', 'href' => $href)));
+            $class = (file_exists(mediaFN($recent['id']))) ? 'wikilink1' : $class = 'wikilink2';
+            $form->addElement(form_makeOpenTag('a', array('class' => $class, 'href' => $href)));
             $form->addElement($recent['id']);
             $form->addElement(form_makeCloseTag('a'));
         } else {
diff --git a/inc/media.php b/inc/media.php
index 7e8caa19c..37d8275f5 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -112,7 +112,7 @@ function media_metaform($id,$auth,$fullscreen = false){
         echo '<h1>'.hsc(noNS($id)).'</h1>'.NL;
         $action = DOKU_BASE.'lib/exe/mediamanager.php';
     } else {
-        $action = media_managerURL(array('tab_details' => 'view'), '&');
+        $action = media_managerURL(array('tab_details' => 'view'));
     }
     echo '<form action="'.$action.'" id="mediamanager__save_meta" accept-charset="utf-8" method="post" class="meta">'.NL;
 
@@ -623,13 +623,13 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=fals
  * Prints mediamanager tab
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
- * @param string $link
- * @param string $class
- * @param string $name
- * @param string $selected
+ * @param string $link - tab href
+ * @param string $class - tab css class
+ * @param string $name - tab caption
+ * @param boolean $selected - is tab selected
  */
 function media_tab($link, $class, $name, $selected=false) {
-    if (!empty($selected) && $selected == $class) $class .= ' selected';
+    if ($selected) $class .= ' selected';
     $tab = '<a href="'.$link.'" class="'.$class.'" >'.$name.'</a>';
     echo $tab;
 }
@@ -638,16 +638,19 @@ function media_tab($link, $class, $name, $selected=false) {
  * Prints tabs for files list actions
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
- * @param string $selected - opened tab
+ * @param string $selected_tab - opened tab
  */
-function media_tabs_files($selected=false){
+function media_tabs_files($selected_tab = ''){
     global $lang;
 
     echo '<div class="mediamanager-tabs" id="mediamanager__tabs_files">';
 
-    media_tab(media_managerURL(array('tab_files' => 'files')), 'files', $lang['mediaselect'], $selected);
-    media_tab(media_managerURL(array('tab_files' => 'upload')), 'upload', $lang['media_uploadtab'], $selected);
-    media_tab(media_managerURL(array('tab_files' => 'search')), 'search', $lang['media_searchtab'], $selected);
+    media_tab(media_managerURL(array('tab_files' => 'files')),
+        'files', $lang['mediaselect'], ($selected_tab == 'files'));
+    media_tab(media_managerURL(array('tab_files' => 'upload')),
+        'upload', $lang['media_uploadtab'], ($selected_tab == 'upload'));
+    media_tab(media_managerURL(array('tab_files' => 'search')),
+        'search', $lang['media_searchtab'], ($selected_tab == 'search'));
 
     echo '<div class="clearer"></div>';
     echo '</div>';
@@ -657,21 +660,24 @@ function media_tabs_files($selected=false){
  * Prints tabs for files details actions
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
- * @param string $selected - opened tab
+ * @param string $selected_tab - opened tab
  */
-function media_tabs_details($image, $selected=false){
+function media_tabs_details($image, $selected_tab = ''){
     global $lang, $conf;
 
     echo '<div class="mediamanager-tabs" id="mediamanager__tabs_details">';
 
-    media_tab(media_managerURL(array('tab_details' => 'view')), 'view', $lang['media_viewtab'], $selected);
+    media_tab(media_managerURL(array('tab_details' => 'view')),
+        'view', $lang['media_viewtab'], ($selected_tab == 'view'));
 
     list($ext, $mime) = mimetype($image);
     if ($mime == 'image/jpeg' && @file_exists(mediaFN($image))) {
-        media_tab(media_managerURL(array('tab_details' => 'edit')), 'edit', $lang['media_edittab'], $selected);
+        media_tab(media_managerURL(array('tab_details' => 'edit')),
+            'edit', $lang['media_edittab'], ($selected_tab == 'edit'));
     }
     if ($conf['mediarevisions']) {
-        media_tab(media_managerURL(array('tab_details' => 'history')), 'history', $lang['media_historytab'], $selected);
+        media_tab(media_managerURL(array('tab_details' => 'history')),
+            'history', $lang['media_historytab'], ($selected_tab == 'history'));
     }
 
     echo '<div class="clearer"></div>';
@@ -799,7 +805,7 @@ function media_tab_view($image, $ns, $auth=null, $rev=false) {
     list($ext,$mime,$dl) = mimetype($image,false);
     $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
     $class = 'select mediafile mf_'.$class;
-    echo '<a class="'.$class.'" >'.$image.'</a>';
+    echo '<span class="'.$class.'" >'.$image.'</span>';
     echo '</div>';
 
     echo '<div class="scroll-container">';
@@ -1532,7 +1538,7 @@ function media_printimgdetail($item, $fullscreen=false){
 
         // output
         if ($fullscreen) {
-            echo '<a name="d_:'.$item['id'].'" class="image'.$index.'" title="'.$item['id'].'" href="'.
+            echo '<a name="'.($index ? 'd' : 'l').'_:'.$item['id'].'" class="image'.$index.'" title="'.$item['id'].'" href="'.
                 media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']))).'">';
             echo '<span><img src="'.$src.'" '.$att.' /></span>';
             echo '</a>';
@@ -1576,7 +1582,7 @@ function media_printimgdetail($item, $fullscreen=false){
  * @param string $amp - separator
  * @return string - link
  */
-function media_managerURL($params=false, $amp='&amp;', $abs=false) {
+function media_managerURL($params=false, $amp='&amp;', $abs=false, $params_array=false) {
     global $conf;
     global $ID;
 
@@ -1597,6 +1603,8 @@ function media_managerURL($params=false, $amp='&amp;', $abs=false) {
         unset($gets['tab_details']);
     }
 
+    if ($params_array) return $gets;
+
     return wl($ID,$gets,$abs,$amp);
 }
 
diff --git a/inc/template.php b/inc/template.php
index 569e211b1..c0c83d640 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1134,7 +1134,7 @@ function tpl_mediaContent($fromajax=false){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function tpl_fileList(){
+function tpl_mediaFileList(){
     global $AUTH;
     global $NS;
     global $JUMPTO;
@@ -1171,7 +1171,7 @@ function tpl_fileList(){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function tpl_fileDetails($image, $rev){
+function tpl_mediaFileDetails($image, $rev){
     global $AUTH, $NS, $conf, $DEL;
 
     $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')) && $conf['mediarevisions']);
@@ -1483,11 +1483,11 @@ function tpl_media() {
     echo '</div>';
 
     echo '<div id="mediamanager__layout_list" class="layout-resizable" >';
-    tpl_fileList();
+    tpl_mediaFileList();
     echo '</div>';
 
     echo '<div id="mediamanager__layout_detail" class="layout" >';
-    tpl_fileDetails($image, $rev);
+    tpl_mediaFileDetails($image, $rev);
     echo '</div>';
 
     echo '<div class="clearer"></div>';
-- 
cgit v1.2.3


From 80525638759a0bfe0ca5d83d9b06430f0d94c2ac Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Wed, 24 Aug 2011 22:52:12 +0300
Subject: issue #9 permission for restore

---
 inc/media.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 37d8275f5..20b69efca 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -947,7 +947,7 @@ function media_preview_buttons($image, $auth, $rev=false) {
         $form->printForm();
     }
 
-    if($auth >= AUTH_DELETE && $rev && $conf['mediarevisions'] && @file_exists(mediaFN($image, $rev))){
+    if($auth >= AUTH_UPLOAD && $rev && $conf['mediarevisions'] && @file_exists(mediaFN($image, $rev))){
 
         // restore button
         $form = new Doku_Form(array('id' => 'mediamanager__btn_restore',
@@ -1274,7 +1274,7 @@ function media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $type) {
  */
 function media_restore($image, $rev, $auth){
     global $conf;
-    if ($auth < AUTH_DELETE || !$conf['mediarevisions']) return false;
+    if ($auth < AUTH_UPLOAD || !$conf['mediarevisions']) return false;
     $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')));
     if (!$image || (!file_exists(mediaFN($image)) && !$removed)) return false;
     if (!$rev || !file_exists(mediaFN($image, $rev))) return false;
-- 
cgit v1.2.3


From 87deddfa454164964c2fb71481cf480b3d2d92df Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sat, 27 Aug 2011 00:59:47 +0300
Subject: issue #54 listview switch/sorting on search

---
 inc/media.php | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index cbb17ac21..e18144eba 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -725,21 +725,32 @@ function media_tab_files_options($ns, $sort){
 }
 
 /**
- * Prints tab that displays a list of all files
+ * Returns type of sorting for the list of files in media manager
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ * @return string - sort type
  */
-function media_tab_files($ns,$auth=null,$jump='') {
-    global $lang;
-    if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
-
+function _media_get_sort_type() {
     $sort = $_REQUEST['sort'];
-    if (!$sort && @strpos($_COOKIE['DOKU_PREFS'], 'sort')) {
+    if (!$sort && (strpos($_COOKIE['DOKU_PREFS'], 'sort') >= 0)) {
         $parts = explode('#', $_COOKIE['DOKU_PREFS']);
             for ($i = 0; $i < count($parts); $i+=2){
                 if ($parts[$i] == 'sort') $sort = $parts[$i+1];
             }
     }
+    return $sort;
+}
+
+/**
+ * Prints tab that displays a list of all files
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ */
+function media_tab_files($ns,$auth=null,$jump='') {
+    global $lang;
+    if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
+
+    $sort = _media_get_sort_type();
     media_tab_files_options($ns, $sort);
 
     echo '<div class="scroll-container" >';
@@ -782,13 +793,12 @@ function media_tab_search($ns,$auth=null) {
     $query = $_REQUEST['q'];
     if (!$query) $query = '';
 
-    echo '<div class="background-container">';
-    echo sprintf($lang['media_search'], $ns ? $ns : '['.$lang['mediaroot'].']');
-    echo'</div>';
+    $sort = _media_get_sort_type();
+    media_tab_files_options($ns, $sort);
 
     echo '<div class="scroll-container">';
     media_searchform($ns, $query, true);
-    if ($do == 'searchlist') media_searchlist($query,$ns,$auth,true);
+    if ($do == 'searchlist') media_searchlist($query,$ns,$auth,true,$sort);
     echo '</div>';
 }
 
@@ -1300,7 +1310,7 @@ function media_restore($image, $rev, $auth){
  * @author Kate Arzamastseva <pshns@ukr.net>
  * @triggers MEDIA_SEARCH
  */
-function media_searchlist($query,$ns,$auth=null,$fullscreen=false){
+function media_searchlist($query,$ns,$auth=null,$fullscreen=false,$sort=''){
     global $conf;
     global $lang;
 
@@ -1322,6 +1332,14 @@ function media_searchlist($query,$ns,$auth=null,$fullscreen=false){
                     array('showmsg'=>false,'pattern'=>$pattern),
                     $dir);
         }
+        if ($sort == 'date') {
+            $data = array();
+            foreach ($evdata['data'] as $k => $v) {
+                $data[$k]  = $v['mtime'];
+            }
+            array_multisort($data, SORT_DESC, SORT_NUMERIC, $evdata['data']);
+        }
+
         $evt->advise_after();
         unset($evt);
     }
@@ -1685,7 +1703,7 @@ function media_searchform($ns,$query='',$fullscreen=false){
     if (!$fullscreen) $form->addHidden('do', 'searchlist');
     else $form->addHidden('mediado', 'searchlist');
     $form->addElement(form_makeOpenTag('p'));
-    $form->addElement(form_makeTextField('q', $query,$lang['searchmedia'],'','',array('title'=>sprintf($lang['searchmedia_in'],hsc($ns).':*'))));
+    $form->addElement(form_makeTextField('q', $query,$lang['searchmedia'],'mediamanager__sort_textfield','',array('title'=>sprintf($lang['searchmedia_in'],hsc($ns).':*'))));
     $form->addElement(form_makeButton('submit', '', $lang['btn_search']));
     $form->addElement(form_makeCloseTag('p'));
     html_form('searchmedia', $form);
-- 
cgit v1.2.3


From e7f921dcad959dc0d27e53da4d77f5b1211c030a Mon Sep 17 00:00:00 2001
From: Oscar Ciudad <oscar@jacho.net>
Date: Sat, 27 Aug 2011 13:53:11 +0200
Subject: Spanish language update

---
 inc/lang/es/lang.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 5dc6834e6..4c83f5d96 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -24,6 +24,7 @@
  * @author Victor Castelan <victorcastelan@gmail.com>
  * @author Mauro Javier Giamberardino <mgiamberardino@gmail.com>
  * @author emezeta <emezeta@infoprimo.com>
+ * @author Oscar Ciudad <oscar@jacho.net>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -109,7 +110,7 @@ $lang['txt_filename']          = 'Subir como (opcional)';
 $lang['txt_overwrt']           = 'Sobreescribir archivo existente';
 $lang['lockedby']              = 'Actualmente bloqueado por';
 $lang['lockexpire']            = 'El bloqueo expira en';
-$lang['js']['willexpire']            = 'Tu bloqueo para editar esta página expira en un minuto.\nPara evitar conflictos usa el botón previsualizar para reiniciar el contador de tiempo.';
+$lang['willexpire']            = 'Tu bloqueo para editar esta página expira en un minuto.\nPara evitar conflictos usa el botón previsualizar para reiniciar el contador de tiempo.';
 $lang['js']['notsavedyet']     = 'Los cambios que no se han guardado se perderán.
 ¿Realmente quieres continuar?';
 $lang['js']['searchmedia']     = 'Buscar archivos';
-- 
cgit v1.2.3


From ab8fecc6efc832771505467be33a88e0cafec04e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Chmaj?= <teachmeter@gmail.com>
Date: Sat, 27 Aug 2011 13:54:16 +0200
Subject: Polish language update

---
 inc/lang/pl/lang.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index 32e5bf80c..f9bf57852 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -11,6 +11,7 @@
  * @author Leszek Stachowski <shazarre@gmail.com>
  * @author maros <dobrimaros@yahoo.pl>
  * @author Grzegorz Widła <dzesdzes@gmail.com>
+ * @author Łukasz Chmaj <teachmeter@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -96,7 +97,7 @@ $lang['txt_filename']          = 'Nazwa pliku (opcjonalnie)';
 $lang['txt_overwrt']           = 'Nadpisać istniejący plik?';
 $lang['lockedby']              = 'Aktualnie zablokowane przez';
 $lang['lockexpire']            = 'Blokada wygasa';
-$lang['js']['willexpire']            = 'Za minutę Twoja blokada tej strony wygaśnie.\nW celu uniknięcia konfliktów wyświetl podgląd aby odnowić blokadę.';
+$lang['willexpire']            = 'Za minutę Twoja blokada tej strony wygaśnie.\nW celu uniknięcia konfliktów wyświetl podgląd aby odnowić blokadę.';
 $lang['js']['notsavedyet']     = 'Nie zapisane zmiany zostaną utracone.
 Czy na pewno kontynuować?';
 $lang['js']['searchmedia']     = 'Szukaj plików';
@@ -163,6 +164,9 @@ $lang['yours']                 = 'Twoja wersja';
 $lang['diff']                  = 'Pokaż różnice między wersjami';
 $lang['diff2']                 = 'Pokaż różnice między zaznaczonymi wersjami';
 $lang['difflink']              = 'Odnośnik do tego porównania';
+$lang['diff_type']             = 'Zobacz różnice:';
+$lang['diff_inline']           = 'W linii';
+$lang['diff_side']             = 'Jeden obok drugiego';
 $lang['line']                  = 'Linia';
 $lang['breadcrumb']            = 'Ślad';
 $lang['youarehere']            = 'Jesteś tutaj';
-- 
cgit v1.2.3


From bac359731f2a41c83df273795b9001d0d545488c Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 2 Sep 2011 14:43:29 +0300
Subject: issue #54 sorting on search

---
 inc/media.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index e18144eba..74907b957 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1332,13 +1332,12 @@ function media_searchlist($query,$ns,$auth=null,$fullscreen=false,$sort=''){
                     array('showmsg'=>false,'pattern'=>$pattern),
                     $dir);
         }
-        if ($sort == 'date') {
-            $data = array();
-            foreach ($evdata['data'] as $k => $v) {
-                $data[$k]  = $v['mtime'];
-            }
-            array_multisort($data, SORT_DESC, SORT_NUMERIC, $evdata['data']);
+
+        $data = array();
+        foreach ($evdata['data'] as $k => $v) {
+            $data[$k] = ($sort == 'date') ? $v['mtime'] : $v['id'];
         }
+        array_multisort($data, SORT_DESC, SORT_NUMERIC, $evdata['data']);
 
         $evt->advise_after();
         unset($evt);
-- 
cgit v1.2.3


From 30fd72fbc3c8bd3fbcae4f7041aa0e001a719c6a Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 2 Sep 2011 14:50:19 +0300
Subject: issue #47 Changes to old media manager popup: removing edit and
 delete functionality

---
 inc/media.php    | 73 +++++++++++++-------------------------------------------
 inc/template.php |  4 +---
 2 files changed, 18 insertions(+), 59 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 74907b957..4db23ed8d 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -88,7 +88,7 @@ function media_metasave($id,$auth,$data){
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_metaform($id,$auth,$fullscreen = false){
+function media_metaform($id,$auth){
     global $lang, $config_cascade;
 
     if($auth < AUTH_UPLOAD) {
@@ -108,12 +108,7 @@ function media_metaform($id,$auth,$fullscreen = false){
     $src = mediaFN($id);
 
     // output
-    if (!$fullscreen) {
-        echo '<h1>'.hsc(noNS($id)).'</h1>'.NL;
-        $action = DOKU_BASE.'lib/exe/mediamanager.php';
-    } else {
-        $action = media_managerURL(array('tab_details' => 'view'));
-    }
+    $action = media_managerURL(array('tab_details' => 'view'));
     echo '<form action="'.$action.'" id="mediamanager__save_meta" accept-charset="utf-8" method="post" class="meta">'.NL;
 
     formSecurityToken();
@@ -151,17 +146,11 @@ function media_metaform($id,$auth,$fullscreen = false){
     }
     echo '<div class="buttons">'.NL;
     echo '<input type="hidden" name="img" value="'.hsc($id).'" />'.NL;
-    if (!$fullscreen) {
-        $do = 'do';
-    } else {
-        echo '<input type="hidden" name="mediado" value="save" />';
-        $do = 'mediado';
-    }
+    echo '<input type="hidden" name="mediado" value="save" />';
+
+    $do = 'mediado';
     echo '<input name="'.$do.'[save]" type="submit" value="'.$lang['btn_save'].
         '" title="'.$lang['btn_save'].' [S]" accesskey="s" class="button" />'.NL;
-    if (!$fullscreen)
-    echo '<input name="do[cancel]" type="submit" value="'.$lang['btn_cancel'].
-        '" title="'.$lang['btn_cancel'].' [C]" accesskey="c" class="button" />'.NL;
     echo '</div>'.NL;
     echo '</form>'.NL;
 }
@@ -847,7 +836,7 @@ function media_tab_edit($image, $ns, $auth=null) {
     echo '<div class="scroll-container">';
     if ($image) {
         list($ext, $mime) = mimetype($image);
-        if ($mime == 'image/jpeg') media_metaform($image,$auth,true);
+        if ($mime == 'image/jpeg') media_metaform($image,$auth);
     }
     echo '</div>';
 }
@@ -1367,40 +1356,6 @@ function media_searchlist($query,$ns,$auth=null,$fullscreen=false,$sort=''){
     }
 }
 
-/**
- * Print action links for a file depending on filetype
- * and available permissions
- */
-function media_fileactions($item,$auth){
-    global $lang;
-
-    // view button
-    $link = ml($item['id'],'',true);
-    echo ' <a href="'.$link.'" target="_blank"><img src="'.DOKU_BASE.'lib/images/magnifier.png" '.
-        'alt="'.$lang['mediaview'].'" title="'.$lang['mediaview'].'" class="btn" /></a>';
-
-    // no further actions if not writable
-    if(!$item['writable']) return;
-
-    // delete button
-    if($auth >= AUTH_DELETE){
-        $link = DOKU_BASE.'lib/exe/mediamanager.php?delete='.rawurlencode($item['id']).
-            '&amp;sectok='.getSecurityToken();
-        echo ' <a href="'.$link.'" class="btn_media_delete" title="'.$item['id'].'">'.
-            '<img src="'.DOKU_BASE.'lib/images/trash.png" alt="'.$lang['btn_delete'].'" '.
-            'title="'.$lang['btn_delete'].'" class="btn" /></a>';
-    }
-
-    // edit button
-    if($auth >= AUTH_UPLOAD && $item['isimg'] && $item['meta']->getField('File.Mime') == 'image/jpeg'){
-        $link = DOKU_BASE.'lib/exe/mediamanager.php?edit='.rawurlencode($item['id']);
-        echo ' <a href="'.$link.'">'.
-            '<img src="'.DOKU_BASE.'lib/images/pencil.png" alt="'.$lang['metaedit'].'" '.
-            'title="'.$lang['metaedit'].'" class="btn" /></a>';
-    }
-
-}
-
 /**
  * Formats and prints one file in the list
  */
@@ -1449,7 +1404,12 @@ function media_printfile($item,$auth,$jump,$display_namespace=false){
         echo '<a name="h_:'.$item['id'].'" class="'.$class.'">'.hsc($item['id']).'</a><br/>';
     }
     echo '<span class="info">('.$info.')</span>'.NL;
-    media_fileactions($item,$auth);
+
+    // view button
+    $link = ml($item['id'],'',true);
+    echo ' <a href="'.$link.'" target="_blank"><img src="'.DOKU_BASE.'lib/images/magnifier.png" '.
+        'alt="'.$lang['mediaview'].'" title="'.$lang['mediaview'].'" class="btn" /></a>';
+
     echo '<div class="example" id="ex_'.str_replace(':','_',$item['id']).'">';
     echo $lang['mediausage'].' <code>{{:'.$item['id'].'}}</code>';
     echo '</div>';
@@ -1491,7 +1451,8 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
 
     } else {
         echo '<a name="d_:'.$item['id'].'" class="image" title="'.$item['id'].'" href="'.
-            media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']))).'"><span>';
+            media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']),
+            'tab_details' => 'view')).'"><span>';
         echo media_printicon($item['id']);
         echo '</span></a>';
     }
@@ -1501,8 +1462,8 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
     } else {
         $name = hsc($item['id']);
     }
-    echo '<a href="'.media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']))).'" name=
-        "h_:'.$item['id'].'" class="name">'.$name.'</a>';
+    echo '<a href="'.media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']),
+        'tab_details' => 'view')).'" name="h_:'.$item['id'].'" class="name">'.$name.'</a>';
 
     if($item['isimg']){
         $size = '';
@@ -1556,7 +1517,7 @@ function media_printimgdetail($item, $fullscreen=false){
         // output
         if ($fullscreen) {
             echo '<a name="'.($index ? 'd' : 'l').'_:'.$item['id'].'" class="image'.$index.'" title="'.$item['id'].'" href="'.
-                media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']))).'">';
+                media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']), 'tab_details' => 'view')).'">';
             echo '<span><img src="'.$src.'" '.$att.' /></span>';
             echo '</a>';
         }
diff --git a/inc/template.php b/inc/template.php
index 0dfc5a526..37c31e328 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1109,9 +1109,7 @@ function tpl_mediaContent($fromajax=false){
     $evt = new Doku_Event('MEDIAMANAGER_CONTENT_OUTPUT', $data);
     if ($evt->advise_before()) {
         $do = $data['do'];
-        if($do == 'metaform'){
-            media_metaform($IMG,$AUTH);
-        }elseif($do == 'filesinuse'){
+        if($do == 'filesinuse'){
             media_filesinuse($INUSE,$IMG);
         }elseif($do == 'filelist'){
             media_filelist($NS,$AUTH,$JUMPTO);
-- 
cgit v1.2.3


From 4a24b45986919be03b551e34be6931eb88a37ec0 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 2 Sep 2011 14:52:25 +0300
Subject: issue #46 Render links to missing media files as link to the media
 manager

---
 inc/parser/xhtml.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 83359cd55..ea1756803 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -805,8 +805,10 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         if($hash) $link['url'] .= '#'.$hash;
 
         //markup non existing files
-        if (!$exists)
-          $link['class'] .= ' wikilink2';
+        if (!$exists) {
+            $link['class'] .= ' wikilink2';
+            $link['url'] = media_managerURL(array('tab_details' => 'view', 'image' => $src, 'ns' => getNS($src)), '&');
+        }
 
         //output formatted
         if ($linking == 'nolink' || $noLink) $this->doc .= $link['name'];
-- 
cgit v1.2.3


From 783d2e49b2d8e12ed3bc0693b56c013215099a4c Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sun, 4 Sep 2011 12:35:38 +0200
Subject: Use search_universal in search_index

---
 inc/search.php | 49 +++++++++++++------------------------------------
 1 file changed, 13 insertions(+), 36 deletions(-)

(limited to 'inc')

diff --git a/inc/search.php b/inc/search.php
index 7b53edabe..bc7c35482 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -78,8 +78,8 @@ function search_callback($func,&$data,$base,$file,$type,$lvl,$opts){
  * return values for files are ignored
  *
  * All functions should check the ACL for document READ rights
- * namespaces (directories) are NOT checked as this would break
- * the recursion (You can have an nonreadable dir over a readable
+ * namespaces (directories) are NOT checked (when sneaky_index is 0) as this
+ * would break the recursion (You can have an nonreadable dir over a readable
  * one deeper nested) also make sure to check the file type (for example
  * in case of lockfiles).
  */
@@ -101,45 +101,22 @@ function search_qsearch(&$data,$base,$file,$type,$lvl,$opts){
 /**
  * Build the browsable index of pages
  *
- * $opts['ns'] is the current namespace
+ * $opts['ns'] is the currently viewed namespace
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
  */
 function search_index(&$data,$base,$file,$type,$lvl,$opts){
     global $conf;
-    $return = true;
-
-    $item = array();
-
-    if($type == 'd' && !preg_match('#^'.$file.'(/|$)#','/'.$opts['ns'])){
-        //add but don't recurse
-        $return = false;
-    }elseif($type == 'f' && ($opts['nofiles'] || substr($file,-4) != '.txt')){
-        //don't add
-        return false;
-    }
-
-    $id = pathID($file,($type == 'd'));
-
-    if($type=='d' && $conf['sneaky_index'] && auth_quickaclcheck($id.':') < AUTH_READ){
-        return false;
-    }
-
-    //check hidden
-    if(isHiddenPage($id)){
-        return false;
-    }
-
-    //check ACL
-    if($type=='f' && auth_quickaclcheck($id) < AUTH_READ){
-        return false;
-    }
-
-    $data[]=array( 'id'    => $id,
-            'type'  => $type,
-            'level' => $lvl,
-            'open'  => $return );
-    return $return;
+    $opts = array(
+        'pagesonly' => true,
+        'listdirs' => true,
+        'listfiles' => !$opts['nofiles'],
+        'sneakyacl' => $conf['sneaky_index'],
+        // Hacky, should rather use recmatch
+        'depth' => preg_match('#^'.$file.'(/|$)#','/'.$opts['ns']) ? 0 : -1
+    );
+
+    return search_universal($data, $base, $file, $type, $lvl, $opts);
 }
 
 /**
-- 
cgit v1.2.3


From 923510088dda99cb2790b15308593e47369d4f01 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sun, 4 Sep 2011 13:52:26 +0200
Subject: tmp: Introduce sneaky2

---
 inc/search.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'inc')

diff --git a/inc/search.php b/inc/search.php
index bc7c35482..5ba28a1fc 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -596,6 +596,25 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){
         if($opts['firsthead']) $item['title'] = p_get_first_heading($item['id'],METADATA_DONT_RENDER);
     }
 
+    if($type == 'd' && !$opts['skipacl'] && $opts['sneakyacl'] && $item['perm'] < AUTH_READ) {
+        if ($opts['sneakyacl'] === 2) {
+            // Perform shy sneaking, i. e. just show the ns if it contains
+            // something accessible
+            $old_data_count = count($data);
+            search($data,$base,'search_universal',$opts,$file,$lvl+1);
+            if (count($data) > $old_data_count) {
+                // Contains something visible
+                array_splice($data, $old_data_count, $return ? 0 : count($data),
+                             array($item));
+            } else {
+                // Contains nothing visible, so hide
+                $data = array_slice($data, 0, $old_data_count);
+            }
+        }
+        // Stop recursing in any case since we did it ourself
+        return false;
+    }
+
     // finally add the item
     $data[] = $item;
     return $return;
-- 
cgit v1.2.3


From 1ffc211ddb46bfabe649bbacd1e36bc8e035afa3 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sun, 4 Sep 2011 15:32:41 +0200
Subject: Revert tmp commits

This reverts commit ba6c070edd92ca0fc8a6ee85d51769d64a19ee7c.
This reverts commit 923510088dda99cb2790b15308593e47369d4f01.
---
 inc/search.php | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'inc')

diff --git a/inc/search.php b/inc/search.php
index 5ba28a1fc..bc7c35482 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -596,25 +596,6 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){
         if($opts['firsthead']) $item['title'] = p_get_first_heading($item['id'],METADATA_DONT_RENDER);
     }
 
-    if($type == 'd' && !$opts['skipacl'] && $opts['sneakyacl'] && $item['perm'] < AUTH_READ) {
-        if ($opts['sneakyacl'] === 2) {
-            // Perform shy sneaking, i. e. just show the ns if it contains
-            // something accessible
-            $old_data_count = count($data);
-            search($data,$base,'search_universal',$opts,$file,$lvl+1);
-            if (count($data) > $old_data_count) {
-                // Contains something visible
-                array_splice($data, $old_data_count, $return ? 0 : count($data),
-                             array($item));
-            } else {
-                // Contains nothing visible, so hide
-                $data = array_slice($data, 0, $old_data_count);
-            }
-        }
-        // Stop recursing in any case since we did it ourself
-        return false;
-    }
-
     // finally add the item
     $data[] = $item;
     return $return;
-- 
cgit v1.2.3


From 62231793d3f25f1cc59d328ee5d4e28c483f7962 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Tue, 6 Sep 2011 19:19:35 +0300
Subject: issue #59 security fix

---
 inc/media.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 4db23ed8d..80d066c8d 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -247,7 +247,7 @@ function media_upload_xhr($ns,$auth){
     fclose($input);
     if ($realSize != (int)$_SERVER["CONTENT_LENGTH"]) return false;
     if (!($tmp = io_mktmpdir())) return false;
-    $path = $tmp.'/'.$id;
+    $path = $tmp.'/'.md5($id);
     $target = fopen($path, "w");
     fseek($temp, 0, SEEK_SET);
     stream_copy_to_stream($temp, $target);
-- 
cgit v1.2.3


From 98aafb569ee3413b93cd9c25844b6494d6490693 Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sat, 10 Sep 2011 10:59:10 +0200
Subject: Code cleanup documentation before merge

Function get_plugin_components() moved to extantion manager
---
 inc/lang/en/lang.php           |  2 +-
 inc/plugincontroller.class.php | 14 ++++++++------
 inc/pluginutils.php            | 27 ---------------------------
 3 files changed, 9 insertions(+), 34 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 02dff5cb7..de8385dd9 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -318,5 +318,5 @@ $lang['seconds'] = '%d seconds ago';
 
 $lang['wordblock'] = 'Your change was not saved because it contains blocked text (spam).';
 
-$lang['plugin_insterr'] = "Plugin installed incorrectly. Rename plugin directory '%s' to '%s'.";
+$lang['plugin_install_err'] = "Plugin installed incorrectly. Rename plugin directory '%s' to '%s'.";
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index 6dcdcdfff..a6685ca2f 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -14,7 +14,7 @@ class Doku_Plugin_Controller {
     var $list_bytype = array();
     var $tmp_plugins = array();
     var $plugin_cascade = array('default'=>array(),'local'=>array(),'protected'=>array());
-    var $last_local = '';
+    var $last_local_config_file = '';
     //backup of tmp_plugins needed for write check
     var $tmp_bak =array();
 
@@ -71,7 +71,8 @@ class Doku_Plugin_Controller {
     function load($type,$name,$new=false,$disabled=false){
 
         //we keep all loaded plugins available in global scope for reuse
-        global $DOKU_PLUGINS,$lang;
+        global $DOKU_PLUGINS;
+        global $lang;
 
         list($plugin,$component) = $this->_splitName($name);
 
@@ -98,7 +99,7 @@ class Doku_Plugin_Controller {
             $dir = $this->get_directory($plugin);
             $inf = confToHash(DOKU_PLUGIN."$dir/plugin.info.txt");
             if($inf['base'] && $inf['base'] != $plugin){
-                msg(sprintf($lang['plugin_insterr'],hsc($plugin),hsc($inf['base'])),-1);
+                msg(sprintf($lang['plugin_install_err'],hsc($plugin),hsc($inf['base'])),-1);
             }
             return null;
         }
@@ -129,6 +130,7 @@ class Doku_Plugin_Controller {
 
     protected function _populateMasterList() {
         if ($dh = @opendir(DOKU_PLUGIN)) {
+            $all_plugins = array();
             while (false !== ($plugin = readdir($dh))) {
                 if ($plugin[0] == '.') continue;               // skip hidden entries
                 if (is_file(DOKU_PLUGIN.$plugin)) continue;    // skip files, we're only interested in directories
@@ -188,7 +190,7 @@ class Doku_Plugin_Controller {
                 $local_plugins = $this->rebuildLocal();
                 //only write if the list has changed
                 if($local_plugins != $this->plugin_cascade['local']) {
-                    $file = $this->last_local;
+                    $file = $this->last_local_config_file;
                     $out = "<?php\n";
                     foreach ($local_plugins as $plugin => $value) {
                         $out .= "\$plugins['$plugin'] = $value;\n";
@@ -243,8 +245,8 @@ class Doku_Plugin_Controller {
                 $this->plugin_cascade[$type] = $this->checkRequire($config_cascade['plugins'][$type]);
         }
         $local = $config_cascade['plugins']['local'];
-        $this->last_local = array_pop($local);
-        $this->plugin_cascade['local'] = $this->checkRequire(array($this->last_local));
+        $this->last_local_config_file = array_pop($local);
+        $this->plugin_cascade['local'] = $this->checkRequire(array($this->last_local_config_file));
         if(is_array($local)) {
             $this->plugin_cascade['default'] = array_merge($this->plugin_cascade['default'],$this->checkRequire($local));
         }
diff --git a/inc/pluginutils.php b/inc/pluginutils.php
index 897020a6c..53cfedf82 100644
--- a/inc/pluginutils.php
+++ b/inc/pluginutils.php
@@ -40,30 +40,3 @@ function plugin_getcascade() {
     global $plugin_controller;
     return $plugin_controller->getCascade();
 }
-/**
- * return a list (name & type) of all the component plugins that make up this plugin
- *
- */
-function get_plugin_components($plugin) {
-    global $plugin_types;
-    static $plugins;
-    if(empty($plugins[$plugin])) {
-        $components = array();
-        $path = DOKU_PLUGIN.plugin_directory($plugin).'/';
-
-        foreach ($plugin_types as $type) {
-            if (@file_exists($path.$type.'.php')) { $components[] = array('name'=>$plugin, 'type'=>$type); continue; }
-
-            if ($dh = @opendir($path.$type.'/')) {
-                while (false !== ($cp = readdir($dh))) {
-                    if ($cp == '.' || $cp == '..' || strtolower(substr($cp,-4)) != '.php') continue;
-
-                    $components[] = array('name'=>$plugin.'_'.substr($cp, 0, -4), 'type'=>$type);
-                }
-                closedir($dh);
-            }
-        }
-        $plugins[$plugin] = $components;
-    }
-    return $plugins[$plugin];
-}
-- 
cgit v1.2.3


From 9036904c40c369c2dffd8d0bc44b1239013e8eb5 Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sat, 10 Sep 2011 14:27:48 +0200
Subject: Usage of 'disabled' file to control plugins deprecated

Plugins with a disabled file will be treated as having an entry (=0) in
conf/plugins.default.php overridable by conf/plugins.local.php
---
 inc/plugincontroller.class.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'inc')

diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index a6685ca2f..2910e6de0 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -140,21 +140,20 @@ class Doku_Plugin_Controller {
                     // disabling mechanism was changed back very soon again
                     // to keep everything simple we just skip the plugin completely
                 }elseif(@file_exists(DOKU_PLUGIN.$plugin.'/disabled')) {
+                    // treat this as a default disabled plugin(over-rideable by the plugin manager)
+                    // deprecated 2011-09-10 (usage of disabled files)
                     if(empty($this->plugin_cascade['local'][$plugin]))
                         $all_plugins[$plugin] = 0;
                     else
                         $all_plugins[$plugin] = 1;
-                    //treat this as a default disabled plugin(over-rideable by the plugin manager)
                     $this->plugin_cascade['default'][$plugin] = 0;
-                    //TODO take this out before final release, 
-                    //it is here only for other developers to be able to switch branches easily
-                    //@unlink(DOKU_PLUGIN.$plugin.'/disabled');
-                    continue;
+
                 }
                 elseif((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 0) ||
                         ($plugin === 'plugin' && isset($conf['pluginmanager']) &&
                          !$conf['pluginmanager'])){
                     $all_plugins[$plugin] = 0;
+
                 } elseif((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 1)) {
                     $all_plugins[$plugin] = 1;
                 } else {
@@ -162,7 +161,6 @@ class Doku_Plugin_Controller {
                 }
             }
             $this->tmp_plugins = $all_plugins;
-            $this->saveList();
         }
     }
 
-- 
cgit v1.2.3


From 48e46d886a3fbb772a8a64be7ff642ccd7613701 Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sat, 10 Sep 2011 14:32:04 +0200
Subject: Whitespace and brackets cleanup

---
 inc/plugincontroller.class.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'inc')

diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index 2910e6de0..632814d3c 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -139,22 +139,21 @@ class Doku_Plugin_Controller {
                     // the plugin was disabled by rc2009-01-26
                     // disabling mechanism was changed back very soon again
                     // to keep everything simple we just skip the plugin completely
-                }elseif(@file_exists(DOKU_PLUGIN.$plugin.'/disabled')) {
+                } elseif (@file_exists(DOKU_PLUGIN.$plugin.'/disabled')) {
                     // treat this as a default disabled plugin(over-rideable by the plugin manager)
                     // deprecated 2011-09-10 (usage of disabled files)
-                    if(empty($this->plugin_cascade['local'][$plugin]))
+                    if (empty($this->plugin_cascade['local'][$plugin])) {
                         $all_plugins[$plugin] = 0;
-                    else
+                    } else {
                         $all_plugins[$plugin] = 1;
+                    }
                     $this->plugin_cascade['default'][$plugin] = 0;
 
-                }
-                elseif((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 0) ||
-                        ($plugin === 'plugin' && isset($conf['pluginmanager']) &&
-                         !$conf['pluginmanager'])){
+                } elseif ((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 0) ||
+                          ($plugin === 'plugin' && isset($conf['pluginmanager']) && !$conf['pluginmanager'])){
                     $all_plugins[$plugin] = 0;
 
-                } elseif((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 1)) {
+                } elseif ((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 1)) {
                     $all_plugins[$plugin] = 1;
                 } else {
                     $all_plugins[$plugin] = 1;
-- 
cgit v1.2.3


From 4645e48889676e072a61645e5c6f0664dd5d906c Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sat, 10 Sep 2011 15:03:11 +0200
Subject: Now using io_savefile with locking and added header when saving
 plugin.local

---
 inc/plugincontroller.class.php | 48 +++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

(limited to 'inc')

diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index 632814d3c..3ad0676d7 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -176,37 +176,33 @@ class Doku_Plugin_Controller {
     function getCascade() {
         return $this->plugin_cascade;
     }
+
     /**
      * Save the current list of plugins
      */
     function saveList() {
-        if(!empty($this->tmp_plugins)) {
-            //quick check to ensure rewrite is necessary
-            if($this->tmp_plugins != $this->tmp_bak) {
-                //Rebuild local for better check and saving
-                $local_plugins = $this->rebuildLocal();
-                //only write if the list has changed
-                if($local_plugins != $this->plugin_cascade['local']) {
-                    $file = $this->last_local_config_file;
-                    $out = "<?php\n";
-                    foreach ($local_plugins as $plugin => $value) {
-                        $out .= "\$plugins['$plugin'] = $value;\n";
-                    }
-                    // backup current file (remove any existing backup)
-                    if (@file_exists($file)) {
-                        if (@file_exists($file.'.bak')) @unlink($file.'.bak');
-                        if (!io_rename($file, $file.'.bak')) return false;
-                    }
-                    //check if can open for writing, else restore
-                    if (!$fh = @fopen($file, 'wb')) {
-                        io_rename($file.'.bak', $file);// problem opening, restore the backup
-                        return false;
-                    }
-                    @fwrite($fh, $out);
-                    fclose($fh);
-                    return true;
-                }
+        global $conf;
+
+        if (empty($this->tmp_plugins)) return false;
+        if ($this->tmp_plugins == $this->tmp_bak) return false;
+
+        // Rebuild list of local settings
+        $local_plugins = $this->rebuildLocal();
+        if($local_plugins != $this->plugin_cascade['local']) {
+            $file = $this->last_local_config_file;
+            $out = "<?php\n/*\n * Local plugin enable/disable settings\n * Auto-generated through plugin/extension manager\n */\n";
+            foreach ($local_plugins as $plugin => $value) {
+                $out .= "\$plugins['$plugin'] = $value;\n";
+            }
+            // backup current file (remove any existing backup)
+            if (@file_exists($file)) {
+                $backup = $file.'.bak';
+                if (@file_exists($backup)) @unlink($backup);
+                if (!@copy($file,$backup)) return false;
+                if ($conf['fperm']) chmod($backup, $conf['fperm']);
             }
+            //check if can open for writing, else restore
+            return io_saveFile($file,$out);
         }
         return false;
     }
-- 
cgit v1.2.3


From 812c5e8caaef8afdeb000439ec99404f7a83e681 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 10 Sep 2011 16:17:30 +0100
Subject: media manager design: added headline

---
 inc/template.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc')

diff --git a/inc/template.php b/inc/template.php
index 37c31e328..96e0668c2 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1493,6 +1493,7 @@ function tpl_media() {
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
     echo '<div id="mediamanager__page">';
+    echo '<h1>'.$lang['btn_media'].'</h1>';
     echo '<div id="mediamanager__layout">';
 
     echo '<div id="mediamanager__layout_namespaces" class="layout-resizable" >';
-- 
cgit v1.2.3


From 1264397e06c4d2d61c390022dea56f63c333d05c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 10 Sep 2011 17:41:33 +0100
Subject: media manager design: improved some spacing

---
 inc/media.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 80d066c8d..451a205db 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -682,7 +682,10 @@ function media_tab_files_options($ns, $sort){
     global $lang;
 
     echo '<div class="background-container">';
+
+    echo '<strong class="namespace">';
     echo $ns ? $ns : '['.$lang['mediaroot'].']';
+    echo '</strong>';
 
     echo '<div id="mediamanager__tabs_list">';
 
-- 
cgit v1.2.3


From 25b1f51433d8d2643fae1754ecaf3b8ec986ffe2 Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sat, 10 Sep 2011 18:48:15 +0200
Subject: Removed tmp_bak array, no need for checking before save if anything
 changed

---
 inc/plugincontroller.class.php | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'inc')

diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index 3ad0676d7..aa5d0af57 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -15,8 +15,6 @@ class Doku_Plugin_Controller {
     var $tmp_plugins = array();
     var $plugin_cascade = array('default'=>array(),'local'=>array(),'protected'=>array());
     var $last_local_config_file = '';
-    //backup of tmp_plugins needed for write check
-    var $tmp_bak =array();
 
     /**
      * Populates the master list of plugins
@@ -184,7 +182,6 @@ class Doku_Plugin_Controller {
         global $conf;
 
         if (empty($this->tmp_plugins)) return false;
-        if ($this->tmp_plugins == $this->tmp_bak) return false;
 
         // Rebuild list of local settings
         $local_plugins = $this->rebuildLocal();
@@ -244,7 +241,6 @@ class Doku_Plugin_Controller {
             $this->plugin_cascade['default'] = array_merge($this->plugin_cascade['default'],$this->checkRequire($local));
         }
         $this->tmp_plugins = array_merge($this->plugin_cascade['default'],$this->plugin_cascade['local'],$this->plugin_cascade['protected']);
-        $this->tmp_bak = $this->tmp_plugins;
     }
 
     function _getListByType($type, $enabled) {
-- 
cgit v1.2.3


From c8f071abd276c4c381eacabead655799db4a7a2f Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sat, 10 Sep 2011 18:54:23 +0200
Subject: Added comment in conf/plugins.local about how disabled files work

---
 inc/plugincontroller.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index aa5d0af57..cdaee2e8f 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -187,7 +187,8 @@ class Doku_Plugin_Controller {
         $local_plugins = $this->rebuildLocal();
         if($local_plugins != $this->plugin_cascade['local']) {
             $file = $this->last_local_config_file;
-            $out = "<?php\n/*\n * Local plugin enable/disable settings\n * Auto-generated through plugin/extension manager\n */\n";
+            $out = "<?php\n/*\n * Local plugin enable/disable settings\n * Auto-generated through plugin/extension manager\n".
+                   " * NOTE: plugins with a 'disabled' file will not be added to this file unless they are enabled which overrides the 'disabled' file\n */\n";
             foreach ($local_plugins as $plugin => $value) {
                 $out .= "\$plugins['$plugin'] = $value;\n";
             }
-- 
cgit v1.2.3


From a95a7bf3a77d3c38a54af67b2f7584c480381691 Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sat, 10 Sep 2011 19:47:00 +0200
Subject: empty conf/plugins.local is created if not existing

---
 inc/plugincontroller.class.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'inc')

diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php
index cdaee2e8f..734331c94 100644
--- a/inc/plugincontroller.class.php
+++ b/inc/plugincontroller.class.php
@@ -158,6 +158,9 @@ class Doku_Plugin_Controller {
                 }
             }
             $this->tmp_plugins = $all_plugins;
+            if (!file_exists($this->last_local_config_file)) {
+                $this->saveList(true);
+            }
         }
     }
 
@@ -178,17 +181,18 @@ class Doku_Plugin_Controller {
     /**
      * Save the current list of plugins
      */
-    function saveList() {
+    function saveList($forceSave = false) {
         global $conf;
 
         if (empty($this->tmp_plugins)) return false;
 
         // Rebuild list of local settings
         $local_plugins = $this->rebuildLocal();
-        if($local_plugins != $this->plugin_cascade['local']) {
+        if($local_plugins != $this->plugin_cascade['local'] || $forceSave) {
             $file = $this->last_local_config_file;
-            $out = "<?php\n/*\n * Local plugin enable/disable settings\n * Auto-generated through plugin/extension manager\n".
-                   " * NOTE: plugins with a 'disabled' file will not be added to this file unless they are enabled which overrides the 'disabled' file\n */\n";
+            $out = "<?php\n/*\n * Local plugin enable/disable settings\n * Auto-generated through plugin/extension manager\n *\n".
+                   " * NOTE: Plugins will not be added to this file unless there is a need to override a default setting. Plugins are\n".
+                   " *       enabled by default, unless having a 'disabled' file in their plugin folder.\n */\n";
             foreach ($local_plugins as $plugin => $value) {
                 $out .= "\$plugins['$plugin'] = $value;\n";
             }
-- 
cgit v1.2.3


From 8bfdbb5efd72c2e708d005a977444400c7affcfa Mon Sep 17 00:00:00 2001
From: Matthias Schulte <post@lupo49.de>
Date: Sun, 11 Sep 2011 14:18:04 +0200
Subject: de/de-informal/en language file updates

This commit adds new strings to the de/de-informals files which
have been introduced through the new Media-Manager.

All lang.php-files in inside en/de/de-informal have been
reordered and reformatted.
---
 inc/lang/de-informal/lang.php       |  73 +++-
 inc/lang/de-informal/uploadmail.txt |  17 +-
 inc/lang/de/lang.php                | 116 ++++--
 inc/lang/de/uploadmail.txt          |  17 +-
 inc/lang/en/lang.php                | 693 ++++++++++++++++++------------------
 inc/lang/en/uploadmail.txt          |  18 +-
 6 files changed, 534 insertions(+), 400 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index 16686bc4c..4f762b55d 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -16,9 +16,10 @@
  * @author Alexander Fischer <tbanus@os-forge.net>
  * @author Juergen Schwarzer <jschwarzer@freenet.de>
  * @author Marcel Metz <marcel_metz@gmx.de>
- * @author Matthias Schulte <post@lupo49.de>
+ * @author Matthias Schulte <mailinglist@lupo49.de>
  * @author Christian Wichmann <nospam@zone0.de>
  */
+ 
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
 $lang['doublequoteopening']    = '„';
@@ -26,6 +27,7 @@ $lang['doublequoteclosing']    = '“';
 $lang['singlequoteopening']    = '‚';
 $lang['singlequoteclosing']    = '‘';
 $lang['apostrophe']            = '’';
+
 $lang['btn_edit']              = 'Diese Seite bearbeiten';
 $lang['btn_source']            = 'Zeige Quelltext';
 $lang['btn_show']              = 'Seite anzeigen';
@@ -59,6 +61,9 @@ $lang['btn_recover']           = 'Entwurf wiederherstellen';
 $lang['btn_draftdel']          = 'Entwurf löschen';
 $lang['btn_revert']            = 'Wiederherstellen';
 $lang['btn_register']          = 'Registrieren';
+$lang['btn_apply']             = 'Übernehmen';
+$lang['btn_media']             = 'Medien-Manager';
+
 $lang['loggedinas']            = 'Angemeldet als';
 $lang['user']                  = 'Benutzername';
 $lang['pass']                  = 'Passwort';
@@ -73,6 +78,7 @@ $lang['badlogin']              = 'Nutzername oder Passwort sind falsch.';
 $lang['minoredit']             = 'kleine Änderung';
 $lang['draftdate']             = 'Entwurf gespeichert am';
 $lang['nosecedit']             = 'Diese Seite wurde in der Zwischenzeit geändert, da das Sektionsinfo veraltet ist. Die ganze Seite wird stattdessen geladen.';
+
 $lang['regmissing']            = 'Alle Felder müssen ausgefüllt werden';
 $lang['reguexists']            = 'Der Nutzername existiert leider schon.';
 $lang['regsuccess']            = 'Der neue Nutzer wurde angelegt und das Passwort per E-Mail versandt.';
@@ -82,10 +88,12 @@ $lang['regbadmail']            = 'Die angegebene Mail-Adresse scheint ungültig
 $lang['regbadpass']            = 'Die beiden eingegeben Passwörter stimmen nicht überein. Bitte versuche es noch einmal.';
 $lang['regpwmail']             = 'Ihr DokuWiki Passwort';
 $lang['reghere']               = 'Du hast noch keinen Zugang? Hier registrieren';
+
 $lang['profna']                = 'Änderung des Benutzerprofils in diesem Wiki nicht möglich.';
 $lang['profnochange']          = 'Keine Änderungen, nichts zu tun.';
 $lang['profnoempty']           = 'Es muss ein Name oder eine E-Mail Adresse angegeben werden.';
 $lang['profchanged']           = 'Benutzerprofil erfolgreich geändert.';
+
 $lang['pwdforget']             = 'Passwort vergessen? Fordere ein neues an';
 $lang['resendna']              = 'Passwörter versenden ist in diesem Wiki nicht möglich.';
 $lang['resendpwd']             = 'Neues Passwort senden für';
@@ -94,8 +102,10 @@ $lang['resendpwdnouser']       = 'Es tut mir Leid, aber der Benutzer existiert n
 $lang['resendpwdbadauth']      = 'Es tut mir Leid, aber dieser Authentifizierungscode ist ungültig. Stelle sicher, dass du den kompletten Bestätigungslink verwendet haben.';
 $lang['resendpwdconfirm']      = 'Ein Bestätigungslink wurde per E-Mail versandt.';
 $lang['resendpwdsuccess']      = 'Dein neues Passwort wurde per E-Mail versandt.';
+
 $lang['license']               = 'Falls nicht anders bezeichnet, ist der Inhalt dieses Wikis unter der folgenden Lizenz veröffentlicht:';
 $lang['licenseok']             = 'Hinweis: Durch das Bearbeiten dieser Seite gibst du dein Einverständnis, dass dein Inhalt unter der folgenden Lizenz veröffentlicht wird:';
+
 $lang['searchmedia']           = 'Suche nach Datei:';
 $lang['searchmedia_in']        = 'Suche in %s';
 $lang['txt_upload']            = 'Datei zum Hochladen auswählen';
@@ -103,6 +113,7 @@ $lang['txt_filename']          = 'Hochladen als (optional)';
 $lang['txt_overwrt']           = 'Bestehende Datei überschreiben';
 $lang['lockedby']              = 'Momentan gesperrt von';
 $lang['lockexpire']            = 'Sperre läuft ab am';
+
 $lang['js']['willexpire']            = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, solltest du sie durch einen Klick auf den Vorschau-Knopf verlängern.';
 $lang['js']['notsavedyet']     = 'Nicht gespeicherte Änderungen gehen verloren!';
 $lang['js']['searchmedia']     = 'Suche nach Dateien';
@@ -134,8 +145,21 @@ $lang['js']['linkwiz']         = 'Link-Assistent';
 $lang['js']['linkto']          = 'Link zu:';
 $lang['js']['del_confirm']     = 'Die ausgewählten Dateien wirklich löschen?';
 $lang['js']['mu_btn']          = 'Mehrere Dateien gleichzeitig hochladen';
+$lang['js']['restore_confirm'] = 'Really restore this version?';
+$lang['js']['media_diff']          = 'Unterschiede anzeigen:';
+$lang['js']['media_diff_both']     = 'Side by Side';
+$lang['js']['media_diff_opacity']  = 'Überblenden';
+$lang['js']['media_diff_portions'] = 'Übergang';
+$lang['js']['media_select']        = 'Dateien auswählen…';
+$lang['js']['media_upload_btn']    = 'Hochladen';
+$lang['js']['media_done_btn']      = 'Fertig';
+$lang['js']['media_drop']          = 'Dateien hier draufziehen um sie hochzuladen';
+$lang['js']['media_cancel']        = 'Entfernen';
+$lang['js']['media_overwrt']       = 'Existierende Dateien überschreiben';
+
 $lang['rssfailed']             = 'Es ist ein Fehler beim Laden des Feeds aufgetreten: ';
 $lang['nothingfound']          = 'Nichts gefunden.';
+
 $lang['mediaselect']           = 'Dateiauswahl';
 $lang['fileupload']            = 'Datei hochladen';
 $lang['uploadsucc']            = 'Datei wurde erfolgreich hochgeladen';
@@ -160,6 +184,7 @@ $lang['mediaextchange']        = 'Dateiendung vom .%s nach .%s geändert!';
 $lang['reference']             = 'Verwendung von';
 $lang['ref_inuse']             = 'Diese Datei kann nicht gelöscht werden, da sie noch von folgenden Seiten benutzt wird:';
 $lang['ref_hidden']            = 'Einige Verweise sind auf Seiten, für die du keine Leseberechtigung hast.';
+
 $lang['hits']                  = 'Treffer';
 $lang['quickhits']             = 'Passende Seitennamen';
 $lang['toc']                   = 'Inhaltsverzeichnis';
@@ -183,11 +208,18 @@ $lang['external_edit']         = 'Externe Bearbeitung';
 $lang['summary']               = 'Zusammenfassung';
 $lang['noflash']               = 'Das <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> wird benötigt, um diesen Inhalt anzuzeigen.';
 $lang['download']              = 'Download-Teil';
+
 $lang['mail_newpage']          = 'Neue Seite:';
 $lang['mail_changed']          = 'Seite geändert:';
 $lang['mail_subscribe_list']   = 'Seite hat sich im Namespace geändert:';
 $lang['mail_new_user']         = 'Neuer Benutzer:';
 $lang['mail_upload']           = 'Datei hochgeladen:';
+
+$lang['changes_type']          = 'Änderungen anzeigen von';
+$lang['pages_changes']         = 'Seiten';
+$lang['media_changes']         = 'Mediendateien';
+$lang['both_changes']          = 'Beides, Seiten- und Mediendateien';
+
 $lang['qb_bold']               = 'Fetter Text';
 $lang['qb_italic']             = 'Kursiver Text';
 $lang['qb_underl']             = 'Unterstrichener Text';
@@ -212,8 +244,11 @@ $lang['qb_media']              = 'Bilder und andere Dateien hinzufügen';
 $lang['qb_sig']                = 'Unterschrift einfügen';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Sonderzeichen';
+
 $lang['upperns']               = 'Gehe zum übergeordneten Namensraum';
+
 $lang['admin_register']        = 'Neuen Benutzer anmelden';
+
 $lang['metaedit']              = 'Metadaten bearbeiten';
 $lang['metasaveerr']           = 'Die Metadaten konnten nicht gesichert werden';
 $lang['metasaveok']            = 'Metadaten gesichert';
@@ -228,6 +263,10 @@ $lang['img_copyr']             = 'Copyright';
 $lang['img_format']            = 'Format';
 $lang['img_camera']            = 'Kamera';
 $lang['img_keywords']          = 'Schlagwörter';
+$lang['img_width']             = 'Breite';
+$lang['img_height']            = 'Höhe';
+$lang['img_manager']           = 'Im Medien-Manager anzeigen';
+
 $lang['subscr_subscribe_success'] = 'Die Seite %s wurde zur Abonnementenliste von %s hinzugefügt';
 $lang['subscr_subscribe_error'] = 'Fehler beim Hinzufügen von %s zur Abonnementenliste von %s';
 $lang['subscr_subscribe_noaddress'] = 'In deinem Account ist keine E-Mail-Adresse hinterlegt. Dadurch kann die Seite nicht abonniert werden';
@@ -235,6 +274,7 @@ $lang['subscr_unsubscribe_success'] = 'Die Seite %s wurde von der Abonnementenli
 $lang['subscr_unsubscribe_error'] = 'Fehler beim Entfernen von %s von der Abonnementenliste von %s';
 $lang['subscr_already_subscribed'] = '%s ist bereits auf der Abonnementenliste von %s';
 $lang['subscr_not_subscribed'] = '%s ist nicht auf der Abonnementenliste von %s';
+// Manage page for subscriptions
 $lang['subscr_m_not_subscribed'] = 'Du hast kein Abonnement von dieser Seite oder dem Namensraum.';
 $lang['subscr_m_new_header']   = 'Abonnementen hinzufügen';
 $lang['subscr_m_current_header'] = 'Aktive Abonnements';
@@ -244,8 +284,12 @@ $lang['subscr_m_receive']      = 'Erhalten';
 $lang['subscr_style_every']    = 'E-Mail bei jeder Änderung';
 $lang['subscr_style_digest']   = 'E-Mail mit zusammengefasster Übersicht der Seitenänderungen (alle %.2f Tage)';
 $lang['subscr_style_list']     = 'Auflistung aller geänderten Seiten seit der letzten E-Mail (alle %.2f Tage)';
+
+/* auth.class language support */
 $lang['authmodfailed']         = 'Benutzerüberprüfung nicht möglich. Bitte wende dich an den Admin.';
 $lang['authtempfail']          = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wende dich an den Admin.';
+
+/* installer strings */
 $lang['i_chooselang']          = 'Wähle deine Sprache';
 $lang['i_installer']           = 'DokuWiki-Installation';
 $lang['i_wikiname']            = 'Wiki-Name';
@@ -268,6 +312,7 @@ $lang['i_pol1']                = 'Öffentliches Wiki (lesen für alle, schreiben
 $lang['i_pol2']                = 'Geschlossenes Wiki (lesen, schreiben, hochladen nur für registrierte Nutzer)';
 $lang['i_retry']               = 'Wiederholen';
 $lang['i_license']             = 'Bitte wähle die Lizenz aus unter der die Wiki-Inhalte veröffentlicht werden sollen:';
+
 $lang['mu_intro']              = 'In diesem Bereich kannst du mehrere Dateien gleichzeitig hochladen. Benutze die Schaltfläche "Durchsuchen", um sie der Warteschlange zuzufügen. Betätige die Schaltfläche "Hochladen", um die Übertragung zu starten.';
 $lang['mu_gridname']           = 'Dateiname';
 $lang['mu_gridsize']           = 'Größe';
@@ -283,6 +328,7 @@ $lang['mu_progress']           = '@PCT@% hochgeladen';
 $lang['mu_filetypes']          = 'Erlaubte Dateitypen';
 $lang['mu_info']               = 'Dateien hochgeladen.';
 $lang['mu_lasterr']            = 'Letzter Fehler:';
+
 $lang['recent_global']         = 'Im Moment siehst du die Änderungen im Namensraum <b>%s</b>. Du kannst auch <a href="%s">die Änderungen im gesamten Wiki sehen</a>.';
 $lang['years']                 = 'vor %d Jahren';
 $lang['months']                = 'vor %d Monaten';
@@ -291,4 +337,29 @@ $lang['days']                  = 'vor %d Tagen';
 $lang['hours']                 = 'vor %d Stunden';
 $lang['minutes']               = 'vor %d Minuten';
 $lang['seconds']               = 'vor %d Sekunden';
+
 $lang['wordblock']             = 'Deine Bearbeitung wurde nicht gespeichert, da sie gesperrten Text enthielt (Spam).';
+
+$lang['media_uploadtab']       = 'Hochladen';
+$lang['media_searchtab']       = 'Suchen';
+$lang['media_viewtab']         = 'Anzeigen';
+$lang['media_edittab']         = 'Bearbeiten';
+$lang['media_historytab']      = 'Verlauf';
+$lang['media_thumbsview']      = 'Miniaturansicht';
+$lang['media_listview']        = 'Detailansicht';
+$lang['media_sort']            = 'Sortieren';
+$lang['media_sort_name']       = 'nach Name';
+$lang['media_sort_date']       = 'nach Datum';
+$lang['media_upload']          = 'In den <strong>%s</strong> Namespace hochladen.';
+$lang['media_search']          = 'Im Namespace <strong>%s</strong> suchen.';
+$lang['media_edit']            = 'Bearbeiten';
+$lang['media_history']         = 'Versionsverlauf der Datei.';
+$lang['media_meta_edited']     = 'Meta-Informationen bearbeitet';
+$lang['media_perm_read']       = 'Du besitzt nicht die notwendigen Berechtigungen um die Datei anzuzeigen.';
+$lang['media_perm_upload']     = 'Du besitzt nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
+$lang['media_update']          = 'Neue Version hochladen';
+$lang['media_restore']         = 'Diese Version wiederherstellen';
+
+$lang['plugin_install_err']    = "Plugin nicht korrekt installiert. Plugin-Verzeichnis von '%s' nach '%s' umbenennen.";
+
+//Setup VIM: ex: et ts=2 :
\ No newline at end of file
diff --git a/inc/lang/de-informal/uploadmail.txt b/inc/lang/de-informal/uploadmail.txt
index 7239cc10c..69f11400f 100644
--- a/inc/lang/de-informal/uploadmail.txt
+++ b/inc/lang/de-informal/uploadmail.txt
@@ -1,13 +1,14 @@
 Eine Datei wurde in deinem Wiki hochgeladen. Hier sind die Details:
 
-Datei      : @MEDIA@
-Datum      : @DATE@
-Browser    : @BROWSER@
-IP-Adresse : @IPADDRESS@
-Hostname   : @HOSTNAME@
-Größe      : @SIZE@
-MIME-Typ   : @MIME@
-Benutzer   : @USER@
+Datei       : @MEDIA@
+Alte Version: @OLD@
+Datum       : @DATE@
+Browser     : @BROWSER@
+IP-Adresse  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Größe       : @SIZE@
+MIME-Typ    : @MIME@
+Benutzer    : @USER@
 
 -- 
 Diese Mail wurde vom DokuWiki auf
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 3ae06dc71..a289f9987 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -18,14 +18,16 @@
  * @author Robert Bogenschneider <robog@gmx.de>
  * @author Niels Lange <niels@boldencursief.nl>
  * @author Christian Wichmann <nospam@zone0.de>
+ * @author Matthias Schulte <mailinglist@lupo49.de>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '„';
-$lang['doublequoteclosing']    = '“';
-$lang['singlequoteopening']    = '‚';
-$lang['singlequoteclosing']    = '‘';
-$lang['apostrophe']            = '’';
+$lang['doublequoteopening']    = '„'; //&ldquo;
+$lang['doublequoteclosing']    = '“'; //&rdquo;
+$lang['singlequoteopening']    = '‚'; //&lsquo;
+$lang['singlequoteclosing']    = '‘'; //&rsquo;
+$lang['apostrophe']            = '’'; //&rsquo;
+
 $lang['btn_edit']              = 'Diese Seite bearbeiten';
 $lang['btn_source']            = 'Zeige Quelltext';
 $lang['btn_show']              = 'Seite anzeigen';
@@ -59,6 +61,9 @@ $lang['btn_recover']           = 'Entwurf wiederherstellen';
 $lang['btn_draftdel']          = 'Entwurf löschen';
 $lang['btn_revert']            = 'Wiederherstellen';
 $lang['btn_register']          = 'Registrieren';
+$lang['btn_apply']             = 'Übernehmen';
+$lang['btn_media']             = 'Medien-Manager';
+
 $lang['loggedinas']            = 'Angemeldet als';
 $lang['user']                  = 'Benutzername';
 $lang['pass']                  = 'Passwort';
@@ -71,8 +76,9 @@ $lang['email']                 = 'E-Mail';
 $lang['profile']               = 'Benutzerprofil';
 $lang['badlogin']              = 'Nutzername oder Passwort sind falsch.';
 $lang['minoredit']             = 'kleine Änderung';
-$lang['draftdate']             = 'Entwurf gespeichert am';
+$lang['draftdate']             = 'Entwurf gespeichert am'; // full dformat date will be added
 $lang['nosecedit']             = 'Diese Seite wurde in der Zwischenzeit geändert, Sektionsinfo ist veraltet, lade stattdessen volle Seite.';
+
 $lang['regmissing']            = 'Alle Felder müssen ausgefüllt werden.';
 $lang['reguexists']            = 'Der Nutzername existiert leider schon.';
 $lang['regsuccess']            = 'Der neue Nutzer wurde angelegt und das Passwort per E-Mail versandt.';
@@ -82,10 +88,12 @@ $lang['regbadmail']            = 'Die angegebene E-Mail-Adresse scheint ungülti
 $lang['regbadpass']            = 'Die beiden eingegeben Passwörter stimmen nicht überein. Bitte versuchen Sie es noch einmal.';
 $lang['regpwmail']             = 'Ihr DokuWiki Passwort';
 $lang['reghere']               = 'Sie haben noch keinen Zugang? Hier registrieren';
+
 $lang['profna']                = 'Änderung des Benutzerprofils in diesem Wiki nicht möglich.';
 $lang['profnochange']          = 'Keine Änderungen, nichts zu tun.';
 $lang['profnoempty']           = 'Es muss ein Name und eine E-Mail-Adresse angegeben werden.';
 $lang['profchanged']           = 'Benutzerprofil erfolgreich geändert.';
+
 $lang['pwdforget']             = 'Passwort vergessen? Fordere ein neues an';
 $lang['resendna']              = 'Passwörter versenden ist in diesem Wiki nicht möglich.';
 $lang['resendpwd']             = 'Neues Passwort senden für';
@@ -94,8 +102,10 @@ $lang['resendpwdnouser']       = 'Es tut mir Leid, aber der Benutzer existiert n
 $lang['resendpwdbadauth']      = 'Es tut mir Leid, aber dieser Authentifizierungscode ist ungültig. Stellen Sie sicher, dass Sie den kompletten Bestätigungslink verwendet haben.';
 $lang['resendpwdconfirm']      = 'Ein Bestätigungslink wurde per E-Mail versandt.';
 $lang['resendpwdsuccess']      = 'Ihr neues Passwort wurde per E-Mail versandt.';
+
 $lang['license']               = 'Falls nicht anders bezeichnet, ist der Inhalt dieses Wikis unter der folgenden Lizenz veröffentlicht:';
 $lang['licenseok']             = 'Hinweis: Durch das Bearbeiten dieser Seite geben Sie Ihr Einverständnis, dass Ihr Inhalt unter der folgenden Lizenz veröffentlicht wird:';
+
 $lang['searchmedia']           = 'Suche Dateinamen:';
 $lang['searchmedia_in']        = 'Suche in %s';
 $lang['txt_upload']            = 'Datei zum Hochladen auswählen';
@@ -103,7 +113,8 @@ $lang['txt_filename']          = 'Hochladen als (optional)';
 $lang['txt_overwrt']           = 'Bestehende Datei überschreiben';
 $lang['lockedby']              = 'Momentan gesperrt von';
 $lang['lockexpire']            = 'Sperre läuft ab am';
-$lang['js']['willexpire']            = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, sollten Sie sie durch einen Klick auf den Vorschau-Knopf verlängern.';
+
+$lang['js']['willexpire']      = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, sollten Sie sie durch einen Klick auf den Vorschau-Knopf verlängern.';
 $lang['js']['notsavedyet']     = 'Nicht gespeicherte Änderungen gehen verloren!';
 $lang['js']['searchmedia']     = 'Suche Dateien';
 $lang['js']['keepopen']        = 'Fenster nach Auswahl nicht schließen';
@@ -129,14 +140,26 @@ $lang['js']['medialeft']       = 'Das Bild links anordnen.';
 $lang['js']['mediaright']      = 'Das Bild rechts anordnen.';
 $lang['js']['mediacenter']     = 'Das Bild in der Mitte anordnen.';
 $lang['js']['medianoalign']    = 'Keine Anordnung benutzen.';
-$lang['js']['nosmblinks']      = 'Das Verlinken von Windows-Freigaben funktioniert nur im Microsoft Internet Explorer.
-Der Link kann jedoch durch Kopieren und Einfügen verwendet werden.';
+$lang['js']['nosmblinks']      = 'Das Verlinken von Windows-Freigaben funktioniert nur im Microsoft Internet Explorer.\nDer Link kann jedoch durch Kopieren und Einfügen verwendet werden.';
 $lang['js']['linkwiz']         = 'Link-Assistent';
 $lang['js']['linkto']          = 'Link nach:';
 $lang['js']['del_confirm']     = 'Eintrag wirklich löschen?';
 $lang['js']['mu_btn']          = 'Mehrere Dateien gleichzeitig hochladen';
+$lang['js']['restore_confirm'] = 'Really restore this version?';
+$lang['js']['media_diff']          = 'Unterschiede anzeigen:';
+$lang['js']['media_diff_both']     = 'Side by Side';
+$lang['js']['media_diff_opacity']  = 'Überblenden';
+$lang['js']['media_diff_portions'] = 'Übergang';
+$lang['js']['media_select']        = 'Dateien auswählen…';
+$lang['js']['media_upload_btn']    = 'Hochladen';
+$lang['js']['media_done_btn']      = 'Fertig';
+$lang['js']['media_drop']          = 'Dateien hier draufziehen um sie hochzuladen';
+$lang['js']['media_cancel']        = 'Entfernen';
+$lang['js']['media_overwrt']       = 'Existierende Dateien überschreiben';
+
 $lang['rssfailed']             = 'Es ist ein Fehler beim Laden des Feeds aufgetreten: ';
 $lang['nothingfound']          = 'Nichts gefunden.';
+
 $lang['mediaselect']           = 'Dateiauswahl';
 $lang['fileupload']            = 'Datei hochladen';
 $lang['uploadsucc']            = 'Datei wurde erfolgreich hochgeladen';
@@ -161,6 +184,7 @@ $lang['mediaextchange']        = 'Dateiendung vom .%s nach .%s geändert!';
 $lang['reference']             = 'Verwendung von';
 $lang['ref_inuse']             = 'Diese Datei kann nicht gelöscht werden, da sie noch von folgenden Seiten benutzt wird:';
 $lang['ref_hidden']            = 'Einige Verweise sind auf Seiten, für die Sie keine Leseberechtigung haben.';
+
 $lang['hits']                  = 'Treffer';
 $lang['quickhits']             = 'Passende Seitennamen';
 $lang['toc']                   = 'Inhaltsverzeichnis';
@@ -184,11 +208,18 @@ $lang['external_edit']         = 'Externe Bearbeitung';
 $lang['summary']               = 'Zusammenfassung';
 $lang['noflash']               = 'Das <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> wird benötigt, um diesen Inhalt anzuzeigen.';
 $lang['download']              = 'Schnipsel herunterladen';
+
 $lang['mail_newpage']          = 'Neue Seite:';
 $lang['mail_changed']          = 'Seite geändert:';
 $lang['mail_subscribe_list']   = 'Geänderte Seiten im Namensraum:';
 $lang['mail_new_user']         = 'Neuer Benutzer:';
 $lang['mail_upload']           = 'Datei hochgeladen:';
+
+$lang['changes_type']          = 'Änderungen anzeigen von';
+$lang['pages_changes']         = 'Seiten';
+$lang['media_changes']         = 'Mediendateien';
+$lang['both_changes']          = 'Beides, Seiten- und Mediendateien';
+
 $lang['qb_bold']               = 'Fetter Text';
 $lang['qb_italic']             = 'Kursiver Text';
 $lang['qb_underl']             = 'Unterstrichener Text';
@@ -213,8 +244,11 @@ $lang['qb_media']              = 'Bilder und andere Dateien hinzufügen';
 $lang['qb_sig']                = 'Unterschrift einfügen';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Sonderzeichen';
+
 $lang['upperns']               = 'zum übergeordneten Namensraum springen';
+
 $lang['admin_register']        = 'Neuen Benutzer anmelden';
+
 $lang['metaedit']              = 'Metadaten bearbeiten';
 $lang['metasaveerr']           = 'Die Metadaten konnten nicht gesichert werden';
 $lang['metasaveok']            = 'Metadaten gesichert';
@@ -229,24 +263,33 @@ $lang['img_copyr']             = 'Copyright';
 $lang['img_format']            = 'Format';
 $lang['img_camera']            = 'Kamera';
 $lang['img_keywords']          = 'Schlagwörter';
-$lang['subscr_subscribe_success'] = '%s hat nun Änderungen der Seite %s abonniert';
-$lang['subscr_subscribe_error'] = '%s kann die Änderungen der Seite %s nicht abonnieren';
+$lang['img_width']             = 'Breite';
+$lang['img_height']            = 'Höhe';
+$lang['img_manager']           = 'Im Medien-Manager anzeigen';
+
+$lang['subscr_subscribe_success']   = '%s hat nun Änderungen der Seite %s abonniert';
+$lang['subscr_subscribe_error']     = '%s kann die Änderungen der Seite %s nicht abonnieren';
 $lang['subscr_subscribe_noaddress'] = 'Weil Ihre E-Mail-Adresse fehlt, können Sie das Thema nicht abonnieren';
 $lang['subscr_unsubscribe_success'] = 'Das Abonnement von %s für die Seite %s wurde aufgelöst';
-$lang['subscr_unsubscribe_error'] = 'Das Abonnement von %s für die Seite %s konnte nicht aufgelöst werden';
-$lang['subscr_already_subscribed'] = '%s hat %s bereits abonniert';
-$lang['subscr_not_subscribed'] = '%s hat %s nicht abonniert';
-$lang['subscr_m_not_subscribed'] = 'Sie haben die aktuelle Seite und ihre Namensräume nicht abonniert.';
-$lang['subscr_m_new_header']   = 'Abonnement hinzufügen';
-$lang['subscr_m_current_header'] = 'Aktuelle Abonnements';
-$lang['subscr_m_unsubscribe']  = 'Löschen';
-$lang['subscr_m_subscribe']    = 'Abonnieren';
-$lang['subscr_m_receive']      = 'Benachrichtigung';
-$lang['subscr_style_every']    = 'E-Mail bei jeder Bearbeitung';
-$lang['subscr_style_digest']   = 'Zusammenfassung der Änderungen für jede veränderte Seite (Alle %.2f Tage)';
-$lang['subscr_style_list']     = 'Liste der geänderten Seiten (Alle %.2f Tage)';
+$lang['subscr_unsubscribe_error']   = 'Das Abonnement von %s für die Seite %s konnte nicht aufgelöst werden';
+$lang['subscr_already_subscribed']  = '%s hat %s bereits abonniert';
+$lang['subscr_not_subscribed']      = '%s hat %s nicht abonniert';
+// Manage page for subscriptions
+$lang['subscr_m_not_subscribed']    = 'Sie haben die aktuelle Seite und ihre Namensräume nicht abonniert.';
+$lang['subscr_m_new_header']        = 'Abonnement hinzufügen';
+$lang['subscr_m_current_header']    = 'Aktuelle Abonnements';
+$lang['subscr_m_unsubscribe']       = 'Löschen';
+$lang['subscr_m_subscribe']         = 'Abonnieren';
+$lang['subscr_m_receive']           = 'Benachrichtigung';
+$lang['subscr_style_every']         = 'E-Mail bei jeder Bearbeitung';
+$lang['subscr_style_digest']        = 'Zusammenfassung der Änderungen für jede veränderte Seite (Alle %.2f Tage)';
+$lang['subscr_style_list']          = 'Liste der geänderten Seiten (Alle %.2f Tage)';
+
+/* auth.class language support */
 $lang['authmodfailed']         = 'Benutzerüberprüfung nicht möglich. Bitte wenden Sie sich an den Systembetreuer.';
 $lang['authtempfail']          = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wenden Sie sich an den Systembetreuer.';
+
+/* installer strings */
 $lang['i_chooselang']          = 'Wählen Sie Ihre Sprache';
 $lang['i_installer']           = 'DokuWiki Installation';
 $lang['i_wikiname']            = 'Wiki-Name';
@@ -269,6 +312,7 @@ $lang['i_pol1']                = 'Öffentliches Wiki (lesen für alle, schreiben
 $lang['i_pol2']                = 'Geschlossenes Wiki (lesen, schreiben, hochladen nur für registrierte Nutzer)';
 $lang['i_retry']               = 'Wiederholen';
 $lang['i_license']             = 'Bitte wählen Sie die Lizenz, unter die Sie Ihre Inhalte stellen möchten:';
+
 $lang['mu_intro']              = 'In diesem Bereich können Sie mehrere Dateien gleichzeitig hochladen. Benutzen Sie die Schaltfläche "Durchsuchen" um sie der Warteschlange zuzufügen. Betätigen Sie die Schaltfläche "Hochladen" um die Übertragung zu starten.';
 $lang['mu_gridname']           = 'Dateiname';
 $lang['mu_gridsize']           = 'Größe';
@@ -284,6 +328,7 @@ $lang['mu_progress']           = '@PCT@% hochgeladen';
 $lang['mu_filetypes']          = 'Erlaubte Dateitypen';
 $lang['mu_info']               = 'Dateien hochgeladen!';
 $lang['mu_lasterr']            = 'Letzter Fehler:';
+
 $lang['recent_global']         = 'Im Moment sehen Sie die Änderungen im Namensraum <b>%s</b>. Sie können auch <a href="%s">die Änderungen im gesamten Wiki sehen</a>.';
 $lang['years']                 = 'vor %d Jahren';
 $lang['months']                = 'vor %d Monaten';
@@ -292,4 +337,29 @@ $lang['days']                  = 'vor %d Tagen';
 $lang['hours']                 = 'vor %d Stunden';
 $lang['minutes']               = 'vor %d Minuten';
 $lang['seconds']               = 'vor %d Sekunden';
+
 $lang['wordblock']             = 'Ihre Bearbeitung wurde nicht gespeichert, da sie gesperrten Text enthielt (Spam).';
+
+$lang['media_uploadtab']       = 'Hochladen';
+$lang['media_searchtab']       = 'Suchen';
+$lang['media_viewtab']         = 'Anzeigen';
+$lang['media_edittab']         = 'Bearbeiten';
+$lang['media_historytab']      = 'Verlauf';
+$lang['media_thumbsview']      = 'Miniaturansicht';
+$lang['media_listview']        = 'Detailansicht';
+$lang['media_sort']            = 'Sortieren';
+$lang['media_sort_name']       = 'nach Name';
+$lang['media_sort_date']       = 'nach Datum';
+$lang['media_upload']          = 'In den <strong>%s</strong> Namespace hochladen.';
+$lang['media_search']          = 'Im Namespace <strong>%s</strong> suchen.';
+$lang['media_edit']            = 'Bearbeiten';
+$lang['media_history']         = 'Versionsverlauf der Datei.';
+$lang['media_meta_edited']     = 'Meta-Informationen bearbeitet';
+$lang['media_perm_read']       = 'Sie besitzen nicht die notwendigen Berechtigungen um die Datei anzuzeigen.';
+$lang['media_perm_upload']     = 'Sie besitzen nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
+$lang['media_update']          = 'Neue Version hochladen';
+$lang['media_restore']         = 'Diese Version wiederherstellen';
+
+$lang['plugin_install_err']    = "Plugin nicht korrekt installiert. Plugin-Verzeichnis von '%s' nach '%s' umbenennen.";
+
+//Setup VIM: ex: et ts=2 :
\ No newline at end of file
diff --git a/inc/lang/de/uploadmail.txt b/inc/lang/de/uploadmail.txt
index 757729804..977e7561c 100644
--- a/inc/lang/de/uploadmail.txt
+++ b/inc/lang/de/uploadmail.txt
@@ -1,13 +1,14 @@
 Eine Datei wurde in Ihrem Wiki hochgeladen. Hier sind die Details:
 
-Datei      : @MEDIA@
-Datum      : @DATE@
-Browser    : @BROWSER@
-IP-Adresse : @IPADDRESS@
-Hostname   : @HOSTNAME@
-Größe      : @SIZE@
-MIME-Typ   : @MIME@
-Benutzer   : @USER@
+Datei       : @MEDIA@
+Alte Version: @OLD@
+Datum       : @DATE@
+Browser     : @BROWSER@
+IP-Adresse  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Größe       : @SIZE@
+MIME-Typ    : @MIME@
+Benutzer    : @USER@
 
 -- 
 Diese Mail kommt vom DokuWiki auf
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index ab6a88497..d97de87d5 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -6,361 +6,352 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  * @author     Anika Henke <anika@selfthinker.org>
  * @author     Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ * @author     Matthias Schulte <mailinglist@lupo49.de>
  */
-$lang['encoding']   = 'utf-8';
-$lang['direction']  = 'ltr';
-$lang['doublequoteopening']  = '“';//&ldquo;
-$lang['doublequoteclosing']  = '”';//&rdquo;
-$lang['singlequoteopening']  = '‘';//&lsquo;
-$lang['singlequoteclosing']  = '’';//&rsquo;
-$lang['apostrophe']          = '’';//&rsquo;
-
-$lang['btn_edit']   = 'Edit this page';
-$lang['btn_source'] = 'Show pagesource';
-$lang['btn_show']   = 'Show page';
-$lang['btn_create'] = 'Create this page';
-$lang['btn_search'] = 'Search';
-$lang['btn_save']   = 'Save';
-$lang['btn_preview']= 'Preview';
-$lang['btn_top']    = 'Back to top';
-$lang['btn_newer']  = '<< more recent';
-$lang['btn_older']  = 'less recent >>';
-$lang['btn_revs']   = 'Old revisions';
-$lang['btn_recent'] = 'Recent changes';
-$lang['btn_upload'] = 'Upload';
-$lang['btn_cancel'] = 'Cancel';
-$lang['btn_index']  = 'Sitemap';
-$lang['btn_secedit']= 'Edit';
-$lang['btn_login']  = 'Login';
-$lang['btn_logout'] = 'Logout';
-$lang['btn_admin']  = 'Admin';
-$lang['btn_update'] = 'Update';
-$lang['btn_delete'] = 'Delete';
-$lang['btn_back']   = 'Back';
-$lang['btn_backlink']    = "Backlinks";
-$lang['btn_backtomedia'] = 'Back to Mediafile Selection';
-$lang['btn_subscribe']   = 'Manage Subscriptions';
-$lang['btn_profile']     = 'Update Profile';
-$lang['btn_reset']       = 'Reset';
-$lang['btn_resendpwd']   = 'Send new password';
-$lang['btn_draft']    = 'Edit draft';
-$lang['btn_recover']  = 'Recover draft';
-$lang['btn_draftdel'] = 'Delete draft';
-$lang['btn_revert']   = 'Restore';
-$lang['btn_register'] = 'Register';
-$lang['btn_apply'] = 'Apply';
-$lang['btn_media'] = 'Media Manager';
-
-$lang['loggedinas'] = 'Logged in as';
-$lang['user']       = 'Username';
-$lang['pass']       = 'Password';
-$lang['newpass']    = 'New password';
-$lang['oldpass']    = 'Confirm current password';
-$lang['passchk']    = 'once again';
-$lang['remember']   = 'Remember me';
-$lang['fullname']   = 'Real name';
-$lang['email']      = 'E-Mail';
-$lang['profile']    = 'User Profile';
-$lang['badlogin']   = 'Sorry, username or password was wrong.';
-$lang['minoredit']  = 'Minor Changes';
-$lang['draftdate']  = 'Draft autosaved on'; // full dformat date will be added
-$lang['nosecedit']  = 'The page was changed in the meantime, section info was out of date loaded full page instead.';
-
-$lang['regmissing'] = 'Sorry, you must fill in all fields.';
-$lang['reguexists'] = 'Sorry, a user with this login already exists.';
-$lang['regsuccess'] = 'The user has been created and the password was sent by email.';
-$lang['regsuccess2']= 'The user has been created.';
-$lang['regmailfail']= 'Looks like there was an error on sending the password mail. Please contact the admin!';
-$lang['regbadmail'] = 'The given email address looks invalid - if you think this is an error, contact the admin';
-$lang['regbadpass'] = 'The two given passwords are not identical, please try again.';
-$lang['regpwmail']  = 'Your DokuWiki password';
-$lang['reghere']    = 'You don\'t have an account yet? Just get one';
-
-$lang['profna']       = 'This wiki does not support profile modification';
-$lang['profnochange'] = 'No changes, nothing to do.';
-$lang['profnoempty']  = 'An empty name or email address is not allowed.';
-$lang['profchanged']  = 'User profile successfully updated.';
-
-$lang['pwdforget'] = 'Forgotten your password? Get a new one';
-$lang['resendna']  = 'This wiki does not support password resending.';
-$lang['resendpwd'] = 'Send new password for';
-$lang['resendpwdmissing'] = 'Sorry, you must fill in all fields.';
-$lang['resendpwdnouser']  = 'Sorry, we can\'t find this user in our database.';
-$lang['resendpwdbadauth'] = 'Sorry, this auth code is not valid. Make sure you used the complete confirmation link.';
-$lang['resendpwdconfirm'] = 'A confirmation link has been sent by email.';
-$lang['resendpwdsuccess'] = 'Your new password has been sent by email.';
-
-$lang['license']   = 'Except where otherwise noted, content on this wiki is licensed under the following license:';
-$lang['licenseok'] = 'Note: By editing this page you agree to license your content under the following license:';
-
-$lang['searchmedia']  = 'Search file name:';
-$lang['searchmedia_in']  = 'Search in %s';
-$lang['txt_upload']   = 'Select file to upload';
-$lang['txt_filename'] = 'Upload as (optional)';
-$lang['txt_overwrt']  = 'Overwrite existing file';
-$lang['lockedby']     = 'Currently locked by';
-$lang['lockexpire']   = 'Lock expires at';
-$lang['js']['willexpire']   = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
-
-$lang['js']['notsavedyet'] = "Unsaved changes will be lost.";
-$lang['rssfailed']   = 'An error occurred while fetching this feed: ';
-$lang['nothingfound']= 'Nothing was found.';
-
-$lang['mediaselect'] = 'Media Files';
-$lang['fileupload']  = 'Media File Upload';
-$lang['uploadsucc']  = 'Upload successful';
-$lang['uploadfail']  = 'Upload failed. Maybe wrong permissions?';
-$lang['uploadwrong'] = 'Upload denied. This file extension is forbidden!';
-$lang['uploadexist'] = 'File already exists. Nothing done.';
-$lang['uploadbadcontent'] = 'The uploaded content did not match the %s file extension.';
-$lang['uploadspam']  = 'The upload was blocked by the spam blacklist.';
-$lang['uploadxss']   = 'The upload was blocked for possibly malicious content.';
-$lang['uploadsize']  = 'The uploaded file was too big. (max. %s)';
-$lang['deletesucc']  = 'The file "%s" has been deleted.';
-$lang['deletefail']  = '"%s" couldn\'t be deleted - check permissions.';
-$lang['mediainuse']  = 'The file "%s" hasn\'t been deleted - it is still in use.';
-$lang['namespaces']  = 'Namespaces';
-$lang['mediafiles']  = 'Available files in';
-$lang['accessdenied'] = 'You are not allowed to view this page.';
-
-$lang['js']['searchmedia']    = 'Search for files';
-$lang['js']['keepopen']    = 'Keep window open on selection';
-$lang['js']['hidedetails'] = 'Hide Details';
-$lang['mediausage']  = 'Use the following syntax to reference this file:';
-$lang['mediaview']   = 'View original file';
-$lang['mediaroot']   = 'root';
-$lang['mediaupload'] = 'Upload a file to the current namespace here. To create subnamespaces, prepend them to your "Upload as" filename separated by colons. Files also can be selected by drag and drop.';
-$lang['mediaextchange'] = 'Filextension changed from .%s to .%s!';
-
-$lang['js']['mediatitle']       = 'Link settings';
-$lang['js']['mediadisplay']     = 'Link type';
-$lang['js']['mediaalign']       = 'Alignment';
-$lang['js']['mediasize']        = 'Image size';
-$lang['js']['mediatarget']      = 'Link target';
-$lang['js']['mediaclose']       = 'Close';
-$lang['js']['mediainsert']      = 'Insert';
-$lang['js']['mediadisplayimg']  = 'Show the image.';
-$lang['js']['mediadisplaylnk']  = 'Show only the link.';
-$lang['js']['mediasmall']       = 'Small version';
-$lang['js']['mediamedium']      = 'Medium version';
-$lang['js']['medialarge']       = 'Large version';
-$lang['js']['mediaoriginal']    = 'Original version';
-$lang['js']['medialnk']         = 'Link to detail page';
-$lang['js']['mediadirect']      = 'Direct link to original';
-$lang['js']['medianolnk']       = 'No link';
-$lang['js']['medianolink']      = 'Do not link the image';
-$lang['js']['medialeft']        = 'Align the image on the left.';
-$lang['js']['mediaright']       = 'Align the image on the right.';
-$lang['js']['mediacenter']      = 'Align the image in the middle.';
-$lang['js']['medianoalign']     = 'Use no align.';
-
-$lang['reference']   = 'References for';
-$lang['ref_inuse']   = 'The file can\'t be deleted, because it\'s still used by the following pages:';
-$lang['ref_hidden']  = 'Some references  are on pages you don\'t have permission to read';
-
-$lang['hits']       = 'Hits';
-$lang['quickhits']  = 'Matching pagenames';
-$lang['toc']        = 'Table of Contents';
-$lang['current']    = 'current';
-$lang['yours']      = 'Your Version';
-$lang['diff']       = 'Show differences to current revisions';
-$lang['diff2']      = 'Show differences between selected revisions';
-$lang['difflink']   = 'Link to this comparison view';
-$lang['diff_type']  = 'View differences:';
-$lang['diff_inline']= 'Inline';
-$lang['diff_side']  = 'Side by Side';
-$lang['line']       = 'Line';
-$lang['breadcrumb'] = 'Trace';
-$lang['youarehere'] = 'You are here';
-$lang['lastmod']    = 'Last modified';
-$lang['by']         = 'by';
-$lang['deleted']    = 'removed';
-$lang['created']    = 'created';
-$lang['restored']   = 'old revision restored';
-$lang['external_edit'] = 'external edit';
-$lang['summary']    = 'Edit summary';
-$lang['noflash']    = 'The <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> is needed to display this content.';
-$lang['download']   = 'Download Snippet';
-
-$lang['changes_type']  = 'View changes of';
-$lang['pages_changes'] = 'Pages';
-$lang['media_changes'] = 'Media files';
-$lang['both_changes']  = 'Both pages and media files';
-
-$lang['mail_newpage']  = 'page added:';
-$lang['mail_changed']  = 'page changed:';
-$lang['mail_subscribe_list'] = 'pages changed in namespace:';
-$lang['mail_new_user'] = 'new user:';
-$lang['mail_upload']   = 'file uploaded:';
-
-$lang['js']['nosmblinks'] = "Linking to Windows shares only works in Microsoft Internet Explorer.\nYou still can copy and paste the link.";
-
-$lang['qb_bold']    = 'Bold Text';
-$lang['qb_italic']  = 'Italic Text';
-$lang['qb_underl']  = 'Underlined Text';
-$lang['qb_code']    = 'Code Text';
-$lang['qb_strike']  = 'Strike-through Text';
-$lang['qb_h1']      = 'Level 1 Headline';
-$lang['qb_h2']      = 'Level 2 Headline';
-$lang['qb_h3']      = 'Level 3 Headline';
-$lang['qb_h4']      = 'Level 4 Headline';
-$lang['qb_h5']      = 'Level 5 Headline';
-
-$lang['qb_h']       = 'Headline';
-$lang['qb_hs']      = 'Select Headline';
-$lang['qb_hplus']   = 'Higher Headline';
-$lang['qb_hminus']  = 'Lower Headline';
-$lang['qb_hequal']  = 'Same Level Headline';
-
-$lang['qb_link']    = 'Internal Link';
-$lang['qb_extlink'] = 'External Link';
-$lang['qb_hr']      = 'Horizontal Rule';
-$lang['qb_ol']      = 'Ordered List Item';
-$lang['qb_ul']      = 'Unordered List Item';
-$lang['qb_media']   = 'Add Images and other files';
-$lang['qb_sig']     = 'Insert Signature';
-$lang['qb_smileys'] = 'Smileys';
-$lang['qb_chars']   = 'Special Chars';
-
-$lang['upperns']       = 'jump to parent namespace';
-$lang['js']['linkwiz'] = 'Link Wizard';
-$lang['js']['linkto']  = 'Link to:';
-
-$lang['js']['del_confirm']= 'Really delete selected item(s)?';
-$lang['js']['restore_confirm']= 'Really restore this version?';
-$lang['admin_register']= 'Add new user';
-
-$lang['metaedit']    = 'Edit Metadata';
-$lang['metasaveerr'] = 'Writing metadata failed';
-$lang['metasaveok']  = 'Metadata saved';
-$lang['img_backto']  = 'Back to';
-$lang['img_title']   = 'Title';
-$lang['img_caption'] = 'Caption';
-$lang['img_date']    = 'Date';
-$lang['img_fname']   = 'Filename';
-$lang['img_fsize']   = 'Size';
-$lang['img_artist']  = 'Photographer';
-$lang['img_copyr']   = 'Copyright';
-$lang['img_format']  = 'Format';
-$lang['img_camera']  = 'Camera';
-$lang['img_keywords']= 'Keywords';
-$lang['img_width']   = 'Width';
-$lang['img_height']  = 'Height';
-$lang['img_manager'] = 'View in media manager';
-
-$lang['subscr_subscribe_success']  = 'Added %s to subscription list for %s';
-$lang['subscr_subscribe_error']    = 'Error adding %s to subscription list for %s';
-$lang['subscr_subscribe_noaddress']= 'There is no address associated with your login, you cannot be added to the subscription list';
-$lang['subscr_unsubscribe_success']= 'Removed %s from subscription list for %s';
-$lang['subscr_unsubscribe_error']  = 'Error removing %s from subscription list for %s';
-$lang['subscr_already_subscribed'] = '%s is already subscribed to %s';
-$lang['subscr_not_subscribed']     = '%s is not subscribed to %s';
-// Manage page for subscriptions
-$lang['subscr_m_not_subscribed']   = 'You are currently not subscribed to the current page or namespace.';
-$lang['subscr_m_new_header']       = 'Add subscription';
-$lang['subscr_m_current_header']   = 'Current subscriptions';
-$lang['subscr_m_unsubscribe']      = 'Unsubscribe';
-$lang['subscr_m_subscribe']        = 'Subscribe';
-$lang['subscr_m_receive']          = 'Receive';
-$lang['subscr_style_every']        = 'email on every change';
-$lang['subscr_style_digest']       = 'digest email of changes for each page (every %.2f days)';
-$lang['subscr_style_list']         = 'list of changed pages since last email (every %.2f days)';
-
-
-/* auth.class language support */
-$lang['authmodfailed']   = 'Bad user authentication configuration. Please inform your Wiki Admin.';
-$lang['authtempfail']    = 'User authentication is temporarily unavailable. If this situation persists, please inform your Wiki Admin.';
-
-/* installer strings */
-$lang['i_chooselang'] = 'Choose your language';
-$lang['i_installer']  = 'DokuWiki Installer';
-$lang['i_wikiname']   = 'Wiki Name';
-$lang['i_enableacl']  = 'Enable ACL (recommended)';
-$lang['i_superuser']  = 'Superuser';
-$lang['i_problems']   = 'The installer found some problems, indicated below. You can not continue until you have fixed them.';
-$lang['i_modified']   = 'For security reasons this script will only work with a new and unmodified Dokuwiki installation.
-                         You should either re-extract the files from the downloaded package or consult the complete
-                         <a href="http://dokuwiki.org/install">Dokuwiki installation instructions</a>';
-$lang['i_funcna']     = 'PHP function <code>%s</code> is not available. Maybe your hosting provider disabled it for some reason?';
-$lang['i_phpver']     = 'Your PHP version <code>%s</code> is lower than the needed <code>%s</code>. You need to upgrade your PHP install.';
-$lang['i_permfail']   = '<code>%s</code> is not writable by DokuWiki. You need to fix the permission settings of this directory!';
-$lang['i_confexists'] = '<code>%s</code> already exists';
-$lang['i_writeerr']   = 'Unable to create <code>%s</code>. You will need to check directory/file permissions and create the file manually.';
-$lang['i_badhash']    = 'unrecognised or modified dokuwiki.php (hash=<code>%s</code>)';
-$lang['i_badval']     = '<code>%s</code> - illegal or empty value';
-$lang['i_success']    = 'The configuration was finished successfully. You may delete the install.php file now. Continue to
-                        <a href="doku.php">your new DokuWiki</a>.';
-$lang['i_failure']    = 'Some errors occurred while writing the configuration files. You may need to fix them manually before
-                         you can use <a href="doku.php">your new DokuWiki</a>.';
-$lang['i_policy']     = 'Initial ACL policy';
-$lang['i_pol0']       = 'Open Wiki (read, write, upload for everyone)';
-$lang['i_pol1']       = 'Public Wiki (read for everyone, write and upload for registered users)';
-$lang['i_pol2']       = 'Closed Wiki (read, write, upload for registered users only)';
-
-$lang['i_retry']      = 'Retry';
-$lang['i_license']    = 'Please choose the license you want to put your content under:';
-
-$lang['mu_intro']     = 'Here you can upload multiple files at once. Click the browse button to add them to the queue. Press upload when done.';
-$lang['js']['mu_btn'] = 'Upload multiple files at once';
-$lang['mu_gridname']  = 'Filename';
-$lang['mu_gridsize']  = 'Size';
-$lang['mu_gridstat']  = 'Status';
-$lang['mu_namespace'] = 'Namespace';
-$lang['mu_browse']    = 'Browse';
-$lang['mu_toobig']    = 'too big';
-$lang['mu_ready']     = 'ready for upload';
-$lang['mu_done']      = 'complete';
-$lang['mu_fail']      = 'failed';
-$lang['mu_authfail']  = 'session expired';
-$lang['mu_progress']  = '@PCT@% uploaded';
-$lang['mu_filetypes'] = 'Allowed Filetypes';
-$lang['mu_info']      = 'files uploaded.';
-$lang['mu_lasterr']   = 'Last error:';
-
-$lang['recent_global'] = 'You\'re currently watching the changes inside the <b>%s</b> namespace. You can also <a href="%s">view the recent changes of the whole wiki</a>.';
-
-$lang['years']   = '%d years ago';
-$lang['months']  = '%d months ago';
-$lang['weeks']   = '%d weeks ago';
-$lang['days']    = '%d days ago';
-$lang['hours']   = '%d hours ago';
-$lang['minutes'] = '%d minutes ago';
-$lang['seconds'] = '%d seconds ago';
-
-$lang['wordblock'] = 'Your change was not saved because it contains blocked text (spam).';
-
-$lang['media_uploadtab']  = 'Upload';
-$lang['media_searchtab']  = 'Search';
-$lang['media_viewtab']    = 'View';
-$lang['media_edittab']    = 'Edit';
-$lang['media_historytab'] = 'History';
-$lang['media_thumbsview'] = 'Thumbnails';
-$lang['media_listview']   = 'List';
-$lang['media_sort']       = 'Sort';
-$lang['media_sort_name']  = 'by name';
-$lang['media_sort_date']  = 'by date';
-$lang['media_upload']     = 'Upload to the <strong>%s</strong> namespace.';
-$lang['media_search']     = 'Search in the <strong>%s</strong> namespace.';
-$lang['media_edit']       = 'Edit';
-$lang['media_history']    = 'These are the older revisions of the file.';
-$lang['media_meta_edited']= 'metadata edited';
-$lang['media_perm_read']  = 'Sorry, you don\'t have enough rights to read files.';
-$lang['media_perm_upload']= 'Sorry, you don\'t have enough rights to upload files.';
-$lang['media_update']     = 'Upload new version';
-$lang['media_restore']    = 'Restore this version';
-
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“'; //&ldquo;
+$lang['doublequoteclosing']    = '”'; //&rdquo;
+$lang['singlequoteopening']    = '‘'; //&lsquo;
+$lang['singlequoteclosing']    = '’'; //&rsquo;
+$lang['apostrophe']            = '’'; //&rsquo;
+
+$lang['btn_edit']              = 'Edit this page';
+$lang['btn_source']            = 'Show pagesource';
+$lang['btn_show']              = 'Show page';
+$lang['btn_create']            = 'Create this page';
+$lang['btn_search']            = 'Search';
+$lang['btn_save']              = 'Save';
+$lang['btn_preview']           = 'Preview';
+$lang['btn_top']               = 'Back to top';
+$lang['btn_newer']             = '<< more recent';
+$lang['btn_older']             = 'less recent >>';
+$lang['btn_revs']              = 'Old revisions';
+$lang['btn_recent']            = 'Recent changes';
+$lang['btn_upload']            = 'Upload';
+$lang['btn_cancel']            = 'Cancel';
+$lang['btn_index']             = 'Sitemap';
+$lang['btn_secedit']           = 'Edit';
+$lang['btn_login']             = 'Login';
+$lang['btn_logout']            = 'Logout';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Update';
+$lang['btn_delete']            = 'Delete';
+$lang['btn_back']              = 'Back';
+$lang['btn_backlink']          = "Backlinks";
+$lang['btn_backtomedia']       = 'Back to Mediafile Selection';
+$lang['btn_subscribe']         = 'Manage Subscriptions';
+$lang['btn_profile']           = 'Update Profile';
+$lang['btn_reset']             = 'Reset';
+$lang['btn_resendpwd']         = 'Send new password';
+$lang['btn_draft']             = 'Edit draft';
+$lang['btn_recover']           = 'Recover draft';
+$lang['btn_draftdel']          = 'Delete draft';
+$lang['btn_revert']            = 'Restore';
+$lang['btn_register']          = 'Register';
+$lang['btn_apply']             = 'Apply';
+$lang['btn_media']             = 'Media Manager';
+
+$lang['loggedinas']            = 'Logged in as';
+$lang['user']                  = 'Username';
+$lang['pass']                  = 'Password';
+$lang['newpass']               = 'New password';
+$lang['oldpass']               = 'Confirm current password';
+$lang['passchk']               = 'once again';
+$lang['remember']              = 'Remember me';
+$lang['fullname']              = 'Real name';
+$lang['email']                 = 'E-Mail';
+$lang['profile']               = 'User Profile';
+$lang['badlogin']              = 'Sorry, username or password was wrong.';
+$lang['minoredit']             = 'Minor Changes';
+$lang['draftdate']             = 'Draft autosaved on'; // full dformat date will be added
+$lang['nosecedit']             = 'The page was changed in the meantime, section info was out of date loaded full page instead.';
+
+$lang['regmissing']            = 'Sorry, you must fill in all fields.';
+$lang['reguexists']            = 'Sorry, a user with this login already exists.';
+$lang['regsuccess']            = 'The user has been created and the password was sent by email.';
+$lang['regsuccess2']           = 'The user has been created.';
+$lang['regmailfail']           = 'Looks like there was an error on sending the password mail. Please contact the admin!';
+$lang['regbadmail']            = 'The given email address looks invalid - if you think this is an error, contact the admin';
+$lang['regbadpass']            = 'The two given passwords are not identical, please try again.';
+$lang['regpwmail']             = 'Your DokuWiki password';
+$lang['reghere']               = 'You don\'t have an account yet? Just get one';
+
+$lang['profna']                = 'This wiki does not support profile modification';
+$lang['profnochange']          = 'No changes, nothing to do.';
+$lang['profnoempty']           = 'An empty name or email address is not allowed.';
+$lang['profchanged']           = 'User profile successfully updated.';
+
+$lang['pwdforget']             = 'Forgotten your password? Get a new one';
+$lang['resendna']              = 'This wiki does not support password resending.';
+$lang['resendpwd']             = 'Send new password for';
+$lang['resendpwdmissing']      = 'Sorry, you must fill in all fields.';
+$lang['resendpwdnouser']       = 'Sorry, we can\'t find this user in our database.';
+$lang['resendpwdbadauth']      = 'Sorry, this auth code is not valid. Make sure you used the complete confirmation link.';
+$lang['resendpwdconfirm']      = 'A confirmation link has been sent by email.';
+$lang['resendpwdsuccess']      = 'Your new password has been sent by email.';
+
+$lang['license']               = 'Except where otherwise noted, content on this wiki is licensed under the following license:';
+$lang['licenseok']             = 'Note: By editing this page you agree to license your content under the following license:';
+
+$lang['searchmedia']           = 'Search file name:';
+$lang['searchmedia_in']        = 'Search in %s';
+$lang['txt_upload']            = 'Select file to upload';
+$lang['txt_filename']          = 'Upload as (optional)';
+$lang['txt_overwrt']           = 'Overwrite existing file';
+$lang['lockedby']              = 'Currently locked by';
+$lang['lockexpire']            = 'Lock expires at';
+
+$lang['js']['willexpire']      = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
+$lang['js']['notsavedyet']     = "Unsaved changes will be lost.";
+$lang['js']['searchmedia']     = 'Search for files';
+$lang['js']['keepopen']        = 'Keep window open on selection';
+$lang['js']['hidedetails']     = 'Hide Details';
+$lang['js']['mediatitle']      = 'Link settings';
+$lang['js']['mediadisplay']    = 'Link type';
+$lang['js']['mediaalign']      = 'Alignment';
+$lang['js']['mediasize']       = 'Image size';
+$lang['js']['mediatarget']     = 'Link target';
+$lang['js']['mediaclose']      = 'Close';
+$lang['js']['mediainsert']     = 'Insert';
+$lang['js']['mediadisplayimg'] = 'Show the image.';
+$lang['js']['mediadisplaylnk'] = 'Show only the link.';
+$lang['js']['mediasmall']      = 'Small version';
+$lang['js']['mediamedium']     = 'Medium version';
+$lang['js']['medialarge']      = 'Large version';
+$lang['js']['mediaoriginal']   = 'Original version';
+$lang['js']['medialnk']        = 'Link to detail page';
+$lang['js']['mediadirect']     = 'Direct link to original';
+$lang['js']['medianolnk']      = 'No link';
+$lang['js']['medianolink']     = 'Do not link the image';
+$lang['js']['medialeft']       = 'Align the image on the left.';
+$lang['js']['mediaright']      = 'Align the image on the right.';
+$lang['js']['mediacenter']     = 'Align the image in the middle.';
+$lang['js']['medianoalign']    = 'Use no align.';
+$lang['js']['nosmblinks']      = "Linking to Windows shares only works in Microsoft Internet Explorer.\nYou still can copy and paste the link.";
+$lang['js']['linkwiz']         = 'Link Wizard';
+$lang['js']['linkto']          = 'Link to:';
+$lang['js']['del_confirm']     = 'Really delete selected item(s)?';
+$lang['js']['mu_btn']          = 'Upload multiple files at once';
+$lang['js']['restore_confirm'] = 'Really restore this version?';
 $lang['js']['media_diff']          = 'View differences:';
 $lang['js']['media_diff_both']     = 'Side by Side';
 $lang['js']['media_diff_opacity']  = 'Overlay';
 $lang['js']['media_diff_portions'] = 'Slider';
+$lang['js']['media_select']        = 'Select files…';
+$lang['js']['media_upload_btn']    = 'Upload';
+$lang['js']['media_done_btn']      = 'Done';
+$lang['js']['media_drop']          = 'Drop files here to upload';
+$lang['js']['media_cancel']        = 'remove';
+$lang['js']['media_overwrt']       = 'Overwrite existing files';
+
+$lang['rssfailed']             = 'An error occurred while fetching this feed: ';
+$lang['nothingfound']          = 'Nothing was found.';
+
+$lang['mediaselect']           = 'Media Files';
+$lang['fileupload']            = 'Media File Upload';
+$lang['uploadsucc']            = 'Upload successful';
+$lang['uploadfail']            = 'Upload failed. Maybe wrong permissions?';
+$lang['uploadwrong']           = 'Upload denied. This file extension is forbidden!';
+$lang['uploadexist']           = 'File already exists. Nothing done.';
+$lang['uploadbadcontent']      = 'The uploaded content did not match the %s file extension.';
+$lang['uploadspam']            = 'The upload was blocked by the spam blacklist.';
+$lang['uploadxss']             = 'The upload was blocked for possibly malicious content.';
+$lang['uploadsize']            = 'The uploaded file was too big. (max. %s)';
+$lang['deletesucc']            = 'The file "%s" has been deleted.';
+$lang['deletefail']            = '"%s" couldn\'t be deleted - check permissions.';
+$lang['mediainuse']            = 'The file "%s" hasn\'t been deleted - it is still in use.';
+$lang['namespaces']            = 'Namespaces';
+$lang['mediafiles']            = 'Available files in';
+$lang['accessdenied']          = 'You are not allowed to view this page.';
+$lang['mediausage']            = 'Use the following syntax to reference this file:';
+$lang['mediaview']             = 'View original file';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Upload a file to the current namespace here. To create subnamespaces, prepend them to your "Upload as" filename separated by colons. Files also can be selected by drag and drop.';
+$lang['mediaextchange']        = 'Filextension changed from .%s to .%s!';
+$lang['reference']             = 'References for';
+$lang['ref_inuse']             = 'The file can\'t be deleted, because it\'s still used by the following pages:';
+$lang['ref_hidden']            = 'Some references  are on pages you don\'t have permission to read';
+
+$lang['hits']                  = 'Hits';
+$lang['quickhits']             = 'Matching pagenames';
+$lang['toc']                   = 'Table of Contents';
+$lang['current']               = 'current';
+$lang['yours']                 = 'Your Version';
+$lang['diff']                  = 'Show differences to current revisions';
+$lang['diff2']                 = 'Show differences between selected revisions';
+$lang['difflink']              = 'Link to this comparison view';
+$lang['diff_type']             = 'View differences:';
+$lang['diff_inline']           = 'Inline';
+$lang['diff_side']             = 'Side by Side';
+$lang['line']                  = 'Line';
+$lang['breadcrumb']            = 'Trace';
+$lang['youarehere']            = 'You are here';
+$lang['lastmod']               = 'Last modified';
+$lang['by']                    = 'by';
+$lang['deleted']               = 'removed';
+$lang['created']               = 'created';
+$lang['restored']              = 'old revision restored';
+$lang['external_edit']         = 'external edit';
+$lang['summary']               = 'Edit summary';
+$lang['noflash']               = 'The <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> is needed to display this content.';
+$lang['download']              = 'Download Snippet';
+
+$lang['mail_newpage']          = 'page added:';
+$lang['mail_changed']          = 'page changed:';
+$lang['mail_subscribe_list']   = 'pages changed in namespace:';
+$lang['mail_new_user']         = 'new user:';
+$lang['mail_upload']           = 'file uploaded:';
+
+$lang['changes_type']          = 'View changes of';
+$lang['pages_changes']         = 'Pages';
+$lang['media_changes']         = 'Media files';
+$lang['both_changes']          = 'Both pages and media files';
+
+$lang['qb_bold']               = 'Bold Text';
+$lang['qb_italic']             = 'Italic Text';
+$lang['qb_underl']             = 'Underlined Text';
+$lang['qb_code']               = 'Code Text';
+$lang['qb_strike']             = 'Strike-through Text';
+$lang['qb_h1']                 = 'Level 1 Headline';
+$lang['qb_h2']                 = 'Level 2 Headline';
+$lang['qb_h3']                 = 'Level 3 Headline';
+$lang['qb_h4']                 = 'Level 4 Headline';
+$lang['qb_h5']                 = 'Level 5 Headline';
+$lang['qb_h']                  = 'Headline';
+$lang['qb_hs']                 = 'Select Headline';
+$lang['qb_hplus']              = 'Higher Headline';
+$lang['qb_hminus']             = 'Lower Headline';
+$lang['qb_hequal']             = 'Same Level Headline';
+$lang['qb_link']               = 'Internal Link';
+$lang['qb_extlink']            = 'External Link';
+$lang['qb_hr']                 = 'Horizontal Rule';
+$lang['qb_ol']                 = 'Ordered List Item';
+$lang['qb_ul']                 = 'Unordered List Item';
+$lang['qb_media']              = 'Add Images and other files';
+$lang['qb_sig']                = 'Insert Signature';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Special Chars';
+
+$lang['upperns']               = 'jump to parent namespace';
+
+$lang['admin_register']        = 'Add new user';
+
+$lang['metaedit']              = 'Edit Metadata';
+$lang['metasaveerr']           = 'Writing metadata failed';
+$lang['metasaveok']            = 'Metadata saved';
+$lang['img_backto']            = 'Back to';
+$lang['img_title']             = 'Title';
+$lang['img_caption']           = 'Caption';
+$lang['img_date']              = 'Date';
+$lang['img_fname']             = 'Filename';
+$lang['img_fsize']             = 'Size';
+$lang['img_artist']            = 'Photographer';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Camera';
+$lang['img_keywords']          = 'Keywords';
+$lang['img_width']             = 'Width';
+$lang['img_height']            = 'Height';
+$lang['img_manager']           = 'View in media manager';
+
+$lang['subscr_subscribe_success']   = 'Added %s to subscription list for %s';
+$lang['subscr_subscribe_error']     = 'Error adding %s to subscription list for %s';
+$lang['subscr_subscribe_noaddress'] = 'There is no address associated with your login, you cannot be added to the subscription list';
+$lang['subscr_unsubscribe_success'] = 'Removed %s from subscription list for %s';
+$lang['subscr_unsubscribe_error']   = 'Error removing %s from subscription list for %s';
+$lang['subscr_already_subscribed']  = '%s is already subscribed to %s';
+$lang['subscr_not_subscribed']      = '%s is not subscribed to %s';
+// Manage page for subscriptions
+$lang['subscr_m_not_subscribed']    = 'You are currently not subscribed to the current page or namespace.';
+$lang['subscr_m_new_header']        = 'Add subscription';
+$lang['subscr_m_current_header']    = 'Current subscriptions';
+$lang['subscr_m_unsubscribe']       = 'Unsubscribe';
+$lang['subscr_m_subscribe']         = 'Subscribe';
+$lang['subscr_m_receive']           = 'Receive';
+$lang['subscr_style_every']         = 'email on every change';
+$lang['subscr_style_digest']        = 'digest email of changes for each page (every %.2f days)';
+$lang['subscr_style_list']          = 'list of changed pages since last email (every %.2f days)';
 
-$lang['js']['media_select']     = 'Select files…';
-$lang['js']['media_upload_btn'] = 'Upload';
-$lang['js']['media_done_btn']   = 'Done';
-$lang['js']['media_drop']       = 'Drop files here to upload';
-$lang['js']['media_cancel']     = 'remove';
-$lang['js']['media_overwrt']    = 'Overwrite existing files';
-
-$lang['plugin_install_err'] = "Plugin installed incorrectly. Rename plugin directory '%s' to '%s'.";
+/* auth.class language support */
+$lang['authmodfailed']         = 'Bad user authentication configuration. Please inform your Wiki Admin.';
+$lang['authtempfail']          = 'User authentication is temporarily unavailable. If this situation persists, please inform your Wiki Admin.';
 
-//Setup VIM: ex: et ts=2 :
+/* installer strings */
+$lang['i_chooselang']          = 'Choose your language';
+$lang['i_installer']           = 'DokuWiki Installer';
+$lang['i_wikiname']            = 'Wiki Name';
+$lang['i_enableacl']           = 'Enable ACL (recommended)';
+$lang['i_superuser']           = 'Superuser';
+$lang['i_problems']            = 'The installer found some problems, indicated below. You can not continue until you have fixed them.';
+$lang['i_modified']            = 'For security reasons this script will only work with a new and unmodified Dokuwiki installation.
+                                  You should either re-extract the files from the downloaded package or consult the complete
+                                  <a href="http://dokuwiki.org/install">Dokuwiki installation instructions</a>';
+$lang['i_funcna']              = 'PHP function <code>%s</code> is not available. Maybe your hosting provider disabled it for some reason?';
+$lang['i_phpver']              = 'Your PHP version <code>%s</code> is lower than the needed <code>%s</code>. You need to upgrade your PHP install.';
+$lang['i_permfail']            = '<code>%s</code> is not writable by DokuWiki. You need to fix the permission settings of this directory!';
+$lang['i_confexists']          = '<code>%s</code> already exists';
+$lang['i_writeerr']            = 'Unable to create <code>%s</code>. You will need to check directory/file permissions and create the file manually.';
+$lang['i_badhash']             = 'unrecognised or modified dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - illegal or empty value';
+$lang['i_success']             = 'The configuration was finished successfully. You may delete the install.php file now. Continue to
+                                 <a href="doku.php">your new DokuWiki</a>.';
+$lang['i_failure']             = 'Some errors occurred while writing the configuration files. You may need to fix them manually before
+                                  you can use <a href="doku.php">your new DokuWiki</a>.';
+$lang['i_policy']              = 'Initial ACL policy';
+$lang['i_pol0']                = 'Open Wiki (read, write, upload for everyone)';
+$lang['i_pol1']                = 'Public Wiki (read for everyone, write and upload for registered users)';
+$lang['i_pol2']                = 'Closed Wiki (read, write, upload for registered users only)';
+$lang['i_retry']               = 'Retry';
+$lang['i_license']             = 'Please choose the license you want to put your content under:';
+
+$lang['mu_intro']              = 'Here you can upload multiple files at once. Click the browse button to add them to the queue. Press upload when done.';
+$lang['mu_gridname']           = 'Filename';
+$lang['mu_gridsize']           = 'Size';
+$lang['mu_gridstat']           = 'Status';
+$lang['mu_namespace']          = 'Namespace';
+$lang['mu_browse']             = 'Browse';
+$lang['mu_toobig']             = 'too big';
+$lang['mu_ready']              = 'ready for upload';
+$lang['mu_done']               = 'complete';
+$lang['mu_fail']               = 'failed';
+$lang['mu_authfail']           = 'session expired';
+$lang['mu_progress']           = '@PCT@% uploaded';
+$lang['mu_filetypes']          = 'Allowed Filetypes';
+$lang['mu_info']               = 'files uploaded.';
+$lang['mu_lasterr']            = 'Last error:';
+
+$lang['recent_global']         = 'You\'re currently watching the changes inside the <b>%s</b> namespace. You can also <a href="%s">view the recent changes of the whole wiki</a>.';
+$lang['years']                 = '%d years ago';
+$lang['months']                = '%d months ago';
+$lang['weeks']                 = '%d weeks ago';
+$lang['days']                  = '%d days ago';
+$lang['hours']                 = '%d hours ago';
+$lang['minutes']               = '%d minutes ago';
+$lang['seconds']               = '%d seconds ago';
+
+$lang['wordblock']             = 'Your change was not saved because it contains blocked text (spam).';
+
+$lang['media_uploadtab']       = 'Upload';
+$lang['media_searchtab']       = 'Search';
+$lang['media_viewtab']         = 'View';
+$lang['media_edittab']         = 'Edit';
+$lang['media_historytab']      = 'History';
+$lang['media_thumbsview']      = 'Thumbnails';
+$lang['media_listview']        = 'List';
+$lang['media_sort']            = 'Sort';
+$lang['media_sort_name']       = 'by name';
+$lang['media_sort_date']       = 'by date';
+$lang['media_upload']          = 'Upload to the <strong>%s</strong> namespace.';
+$lang['media_search']          = 'Search in the <strong>%s</strong> namespace.';
+$lang['media_edit']            = 'Edit';
+$lang['media_history']         = 'These are the older revisions of the file.';
+$lang['media_meta_edited']     = 'metadata edited';
+$lang['media_perm_read']       = 'Sorry, you don\'t have enough rights to read files.';
+$lang['media_perm_upload']     = 'Sorry, you don\'t have enough rights to upload files.';
+$lang['media_update']          = 'Upload new version';
+$lang['media_restore']         = 'Restore this version';
+
+$lang['plugin_install_err']    = "Plugin installed incorrectly. Rename plugin directory '%s' to '%s'.";
+
+//Setup VIM: ex: et ts=2 :
\ No newline at end of file
diff --git a/inc/lang/en/uploadmail.txt b/inc/lang/en/uploadmail.txt
index 932a1b704..16bb6989c 100644
--- a/inc/lang/en/uploadmail.txt
+++ b/inc/lang/en/uploadmail.txt
@@ -1,14 +1,14 @@
 A file was uploaded to your DokuWiki. Here are the details:
 
-File         : @MEDIA@
-Old revision : @OLD@
-Date         : @DATE@
-Browser      : @BROWSER@
-IP-Address   : @IPADDRESS@
-Hostname     : @HOSTNAME@
-Size         : @SIZE@
-MIME Type    : @MIME@
-User         : @USER@
+File        : @MEDIA@
+Old revision: @OLD@
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Size        : @SIZE@
+MIME Type   : @MIME@
+User        : @USER@
 
 -- 
 This mail was generated by DokuWiki at
-- 
cgit v1.2.3


From c939320d3623ba558917a2d933abd4f536d21162 Mon Sep 17 00:00:00 2001
From: aneves <drakferion@gmail.com>
Date: Sun, 11 Sep 2011 22:02:13 +0200
Subject: pt language file updates

This commit adds new strings to the pt files which
have been introduced through the new Media-Manager.
(commit fb46ebd87eb43d5cd9f67f353f6656d0e3a0b196)
---
 inc/lang/pt/lang.php       | 70 ++++++++++++++++++++++++++++++++++++++++------
 inc/lang/pt/uploadmail.txt | 22 +++++++--------
 2 files changed, 72 insertions(+), 20 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index dba379df5..ef67a284c 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -12,11 +12,12 @@
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '“';
-$lang['doublequoteclosing']    = '”';
-$lang['singlequoteopening']    = '‘';
-$lang['singlequoteclosing']    = '’';
-$lang['apostrophe']            = '´';
+$lang['doublequoteopening']    = '“';//&ldquo;
+$lang['doublequoteclosing']    = '”';//&rdquo;
+$lang['singlequoteopening']    = '‘';//&lsquo;
+$lang['singlequoteclosing']    = '’';//&rsquo;
+$lang['apostrophe']            = '’';//&rsquo;
+
 $lang['btn_edit']              = 'Editar página';
 $lang['btn_source']            = 'Ver fonte';
 $lang['btn_show']              = 'Ver página';
@@ -50,6 +51,9 @@ $lang['btn_recover']           = 'Recuperar rascunho';
 $lang['btn_draftdel']          = 'Apagar rascunho';
 $lang['btn_revert']            = 'Restaurar';
 $lang['btn_register']          = 'Registar';
+$lang['btn_apply']             = 'Aplicar';
+$lang['btn_media']             = 'Gestor de Media';
+
 $lang['loggedinas']            = 'Está em sessão como';
 $lang['user']                  = 'Utilizador';
 $lang['pass']                  = 'Senha';
@@ -64,6 +68,7 @@ $lang['badlogin']              = 'O utilizador inválido ou senha inválida.';
 $lang['minoredit']             = 'Alterações Menores';
 $lang['draftdate']             = 'Rascunho automaticamente gravado em';
 $lang['nosecedit']             = 'A página foi modificada entretanto. Como a informação da secção estava desactualizada, foi carregada a página inteira.';
+
 $lang['regmissing']            = 'Por favor, preencha todos os campos.';
 $lang['reguexists']            = 'Este utilizador já está inscrito. Por favor escolha outro nome de utilizador.';
 $lang['regsuccess']            = 'O utilizador foi criado e a senha foi enviada para o endereço de correio electrónico usado na inscrição.';
@@ -73,10 +78,12 @@ $lang['regbadmail']            = 'O endereço de correio electrónico é inváli
 $lang['regbadpass']            = 'As duas senhas não são idênticas, por favor tente de novo.';
 $lang['regpwmail']             = 'A sua senha DokuWiki';
 $lang['reghere']               = 'Para se registar, clique em';
+
 $lang['profna']                = 'Este Wiki não suporta modificações aos perfis.';
 $lang['profnochange']          = 'Nada alteração, nada a fazer.';
 $lang['profnoempty']           = 'Não são permitidos nomes ou endereços em branco.';
 $lang['profchanged']           = 'Perfil do utilizador actualizado com sucesso.';
+
 $lang['pwdforget']             = 'Esqueceu a sua senha? Pedir nova senha';
 $lang['resendna']              = 'Este wiki não suporta reenvio de senhas.';
 $lang['resendpwd']             = 'Enviar nova senha para';
@@ -85,8 +92,10 @@ $lang['resendpwdnouser']       = 'Não foi possível encontrar este utilizador.'
 $lang['resendpwdbadauth']      = 'O código de autenticação não é válido. Por favor, assegure-se de que o link de confirmação está completo.';
 $lang['resendpwdconfirm']      = 'O link de confirmação foi enviado por e-mail.';
 $lang['resendpwdsuccess']      = 'A nova senha foi enviada por e-mail.';
+
 $lang['license']               = 'Excepto menção em contrário, o conteúdo neste wiki está sob a seguinte licença:';
 $lang['licenseok']             = 'Nota: Ao editar esta página você aceita disponibilizar o seu conteúdo sob a seguinte licença:';
+
 $lang['searchmedia']           = 'Procurar nome de ficheiro:';
 $lang['searchmedia_in']        = 'Procurar em %s';
 $lang['txt_upload']            = 'Escolha ficheiro para carregar';
@@ -94,9 +103,10 @@ $lang['txt_filename']          = 'Carregar como (opcional)';
 $lang['txt_overwrt']           = 'Escrever por cima do ficheiro já existente';
 $lang['lockedby']              = 'Bloqueado por';
 $lang['lockexpire']            = 'Expira em';
-$lang['js']['willexpire']            = 'O bloqueio de edição para este documento irá expirar num minuto.\nPara evitar conflitos de edição, clique no botão <Prever> para re-iniciar o temporizador de bloqueio.';
-$lang['js']['notsavedyet']     = 'Existem alterações não gravadas, que serão perdidas se continuar.
-Deseja realmente continuar?';
+$lang['js']['willexpire']      = 'O bloqueio de edição para este documento irá expirar num minuto.\nPara evitar conflitos use o botão Prever para re-iniciar o temporizador de bloqueio.';
+
+$lang['js']['notsavedyet']     = 'Alterações não gravadas serão perdidas.';
+
 $lang['js']['searchmedia']     = 'Procurar por ficheiros';
 $lang['js']['keepopen']        = 'Mantenha a janela aberta durante a selecção';
 $lang['js']['hidedetails']     = 'Esconder Detalhes';
@@ -125,7 +135,8 @@ $lang['js']['nosmblinks']      = 'Ligação a pastas Windows partilhadas apenas
 Pode no entanto copiar e colar o link.';
 $lang['js']['linkwiz']         = 'Assistente de Criação de Ligação';
 $lang['js']['linkto']          = 'Ligação para:';
-$lang['js']['del_confirm']     = 'Remover esta entrada?';
+$lang['js']['del_confirm']     = 'Remover o(s) item(s) selecionados?';
+$lang['js']['restore_confirm'] = 'Restaurar esta versão?';
 $lang['js']['mu_btn']          = 'Enviar múltiplos ficheiros de uma vez';
 $lang['rssfailed']             = 'Ocorreu um erro neste canal RSS: ';
 $lang['nothingfound']          = 'Nada foi encontrado.';
@@ -176,6 +187,10 @@ $lang['external_edit']         = 'Edição externa';
 $lang['summary']               = 'Sumário da Edição';
 $lang['noflash']               = 'O <a href="http://www.adobe.com/products/flashplayer/">Plugin Adobe Flash</a> é necessário para exibir este conteúdo.';
 $lang['download']              = 'Descarregar Snippet';
+$lang['changes_type']          = 'Ver alterações de';
+$lang['pages_changes']         = 'Páginas';
+$lang['media_changes']         = 'Ficheiros Media';
+$lang['both_changes']          = 'Tanto páginas como ficheiros media';
 $lang['mail_newpage']          = 'documento adicionado:';
 $lang['mail_changed']          = 'documento modificado:';
 $lang['mail_subscribe_list']   = 'páginas alteradas no espaço de nome:';
@@ -221,6 +236,9 @@ $lang['img_copyr']             = 'Copyright';
 $lang['img_format']            = 'Formato';
 $lang['img_camera']            = 'Câmara';
 $lang['img_keywords']          = 'Palavras-Chave';
+$lang['img_width']             = 'Largura';
+$lang['img_height']            = 'Altura';
+$lang['img_manager']           = 'Ver em gestor de media';
 $lang['subscr_subscribe_success'] = 'Adicionado %s à lista de subscrição para %s';
 $lang['subscr_subscribe_error'] = 'Erro ao adicionar %s à lista de subscrição para %s';
 $lang['subscr_subscribe_noaddress'] = 'Não existe endereço algum associado com o seu nome de utilizador, não pode ser adicionado à lista de subscrição';
@@ -285,3 +303,37 @@ $lang['hours']                 = '%d horas atrás';
 $lang['minutes']               = '%d minutos atrás';
 $lang['seconds']               = '%d segundos atrás';
 $lang['wordblock']             = 'A sua alteração não foi guardada porque contém texto bloqueado (spam).';
+
+$lang['media_uploadtab']  = 'Enviar';
+$lang['media_searchtab']  = 'Procurar';
+$lang['media_viewtab']    = 'Ver';
+$lang['media_edittab']    = 'Editar';
+$lang['media_historytab'] = 'Histórico';
+$lang['media_thumbsview'] = 'Miniaturas';
+$lang['media_listview']   = 'Lista';
+$lang['media_sort']       = 'Ordenar';
+$lang['media_sort_name']  = 'por nome';
+$lang['media_sort_date']  = 'por data';
+$lang['media_upload']     = 'Enviar para o grupo <strong>%s</strong>.';
+$lang['media_search']     = 'Procurar no grupo <strong>%s</strong>.';
+$lang['media_edit']       = 'Editar';
+$lang['media_history']    = 'Estas são as revisões anteriores do ficheiro.';
+$lang['media_meta_edited']= 'metadata editada';
+$lang['media_perm_read']  = 'Perdão, não tem permissão para ler ficheiros.';
+$lang['media_perm_upload']= 'Perdão, não tem permissão para enviar ficheiros.';
+$lang['media_update']     = 'enviar nova versão';
+$lang['media_restore']    = 'Restaurar esta versão';
+
+$lang['js']['media_diff']          = 'Ver diferenças:';
+$lang['js']['media_diff_both']     = 'Lado a Lado';
+$lang['js']['media_diff_opacity']  = 'Sobreposição';
+$lang['js']['media_diff_portions'] = 'Slider'; // Needs translation. 'Deslizador' ?
+
+$lang['js']['media_select']     = 'Selecione ficheiros…';
+$lang['js']['media_upload_btn'] = 'Enviar';
+$lang['js']['media_done_btn']   = 'Feito';
+$lang['js']['media_drop']       = 'Largue ficheiros aqui para enviar';
+$lang['js']['media_cancel']     = 'remover';
+$lang['js']['media_overwrt']    = 'Escrever por cima de ficheiros existentes';
+
+$lang['plugin_install_err'] = "Plugin instalado incorrectamente. Renomeie a pasta do plugin de '%s' para '%s'.";
diff --git a/inc/lang/pt/uploadmail.txt b/inc/lang/pt/uploadmail.txt
index 597ba4a01..bb571ffae 100644
--- a/inc/lang/pt/uploadmail.txt
+++ b/inc/lang/pt/uploadmail.txt
@@ -1,15 +1,15 @@
 Um ficheiro foi carregado. Aqui estão os detalhes:
 
-Ficheiro : @MEDIA@
-Data : @DATE@
-Browser : @BROWSER@
-Endereço IP : @IPADDRESS@
-Hostname : @HOSTNAME@
-Tamanho : @SIZE@
-MIME Type : @MIME@
-Utilizador : @USER@
-
-----
+Ficheiro       : @MEDIA@
+Revisão antiga : @OLD@
+Data           : @DATE@
+Navegador      : @BROWSER@
+Endereço IP    : @IPADDRESS@
+Hostname       : @HOSTNAME@
+Tamanho        : @SIZE@
+MIME Type      : @MIME@
+Utilizador     : @USER@
 
+-- 
 Esta mensagem foi gerada pelo DokuWiki em
-@DOKUWIKIURL@
\ No newline at end of file
+@DOKUWIKIURL@
-- 
cgit v1.2.3


From e9817dc9e1c6a68fe3c176b81b3f2c96c5923c22 Mon Sep 17 00:00:00 2001
From: FELTZ Vincent <psycho@feltzv.fr>
Date: Mon, 12 Sep 2011 18:39:34 +0200
Subject: en/fr: language updates (new strings of the Media Manager)

---
 inc/lang/en/lang.php |   4 +-
 inc/lang/fr/lang.php | 117 ++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 95 insertions(+), 26 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index d97de87d5..360af235b 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -103,7 +103,7 @@ $lang['lockedby']              = 'Currently locked by';
 $lang['lockexpire']            = 'Lock expires at';
 
 $lang['js']['willexpire']      = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
-$lang['js']['notsavedyet']     = "Unsaved changes will be lost.";
+$lang['js']['notsavedyet']     = 'Unsaved changes will be lost.';
 $lang['js']['searchmedia']     = 'Search for files';
 $lang['js']['keepopen']        = 'Keep window open on selection';
 $lang['js']['hidedetails']     = 'Hide Details';
@@ -128,7 +128,7 @@ $lang['js']['medialeft']       = 'Align the image on the left.';
 $lang['js']['mediaright']      = 'Align the image on the right.';
 $lang['js']['mediacenter']     = 'Align the image in the middle.';
 $lang['js']['medianoalign']    = 'Use no align.';
-$lang['js']['nosmblinks']      = "Linking to Windows shares only works in Microsoft Internet Explorer.\nYou still can copy and paste the link.";
+$lang['js']['nosmblinks']      = 'Linking to Windows shares only works in Microsoft Internet Explorer.\nYou still can copy and paste the link.';
 $lang['js']['linkwiz']         = 'Link Wizard';
 $lang['js']['linkto']          = 'Link to:';
 $lang['js']['del_confirm']     = 'Really delete selected item(s)?';
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index ae082e9e7..53d3b7665 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -25,11 +25,12 @@
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '“';
-$lang['doublequoteclosing']    = '”';
-$lang['singlequoteopening']    = '‘';
-$lang['singlequoteclosing']    = '’';
-$lang['apostrophe']            = '’';
+$lang['doublequoteopening']    = '“'; //&ldquo;
+$lang['doublequoteclosing']    = '”'; //&rdquo;
+$lang['singlequoteopening']    = '‘'; //&lsquo;
+$lang['singlequoteclosing']    = '’'; //&rsquo;
+$lang['apostrophe']            = '’'; //&rsquo;
+
 $lang['btn_edit']              = 'Modifier cette page';
 $lang['btn_source']            = 'Afficher le texte source';
 $lang['btn_show']              = 'Afficher la page';
@@ -63,6 +64,9 @@ $lang['btn_recover']           = 'Récupérer le brouillon';
 $lang['btn_draftdel']          = 'Effacer le brouillon';
 $lang['btn_revert']            = 'Restaurer';
 $lang['btn_register']          = 'S\'enregistrer';
+$lang['btn_apply']             = 'Appliquer';
+$lang['btn_media']             = 'Gestionnaire de médias';
+
 $lang['loggedinas']            = 'Connecté en tant que ';
 $lang['user']                  = 'Utilisateur';
 $lang['pass']                  = 'Mot de passe';
@@ -75,8 +79,9 @@ $lang['email']                 = 'Adresse de courriel';
 $lang['profile']               = 'Profil utilisateur';
 $lang['badlogin']              = 'L\'utilisateur ou le mot de passe est incorrect.';
 $lang['minoredit']             = 'Modification mineure';
-$lang['draftdate']             = 'Brouillon auto-enregistré le';
+$lang['draftdate']             = 'Brouillon auto-enregistré le'; // full dformat date will be added
 $lang['nosecedit']             = 'La page a changé entre temps, les informations de la section sont obsolètes ; la page complète a été chargée à la place.';
+
 $lang['regmissing']            = 'Désolé, vous devez remplir tous les champs.';
 $lang['reguexists']            = 'Désolé, ce nom d\'utilisateur est déjà pris.';
 $lang['regsuccess']            = 'L\'utilisateur a été créé. Le mot de passe a été expédié par courriel.';
@@ -86,10 +91,12 @@ $lang['regbadmail']            = 'L\'adresse de courriel semble incorrecte. Si v
 $lang['regbadpass']            = 'Les deux mots de passe fournis sont différents, veuillez recommencez.';
 $lang['regpwmail']             = 'Votre mot de passe DokuWiki';
 $lang['reghere']               = 'Vous n\'avez pas encore de compte ? Enregistrez-vous ici ';
+
 $lang['profna']                = 'Ce wiki ne permet pas de modifier les profils';
 $lang['profnochange']          = 'Pas de changement, rien à faire.';
 $lang['profnoempty']           = 'Un nom ou une adresse de courriel vide n\'est pas permis.';
 $lang['profchanged']           = 'Mise à jour du profil réussie.';
+
 $lang['pwdforget']             = 'Mot de passe oublié ? Faites-vous envoyer votre mot de passe ';
 $lang['resendna']              = 'Ce wiki ne permet pas le renvoi de mot de passe.';
 $lang['resendpwd']             = 'Renvoyer le mot de passe de';
@@ -98,8 +105,10 @@ $lang['resendpwdnouser']       = 'Désolé, cet utilisateur est introuvable dans
 $lang['resendpwdbadauth']      = 'Désolé, ce code d\'authentification est invalide. Assurez-vous d\'avoir utilisé le lien de confirmation.';
 $lang['resendpwdconfirm']      = 'Un lien de confirmation vous a été envoyé par courriel.';
 $lang['resendpwdsuccess']      = 'Votre nouveau mot de passe vous a été expédié par courriel.';
+
 $lang['license']               = 'Sauf mention contraire, le contenu de ce wiki est placé sous la licence suivante :';
 $lang['licenseok']             = 'Note : En modifiant cette page, vous acceptez que le contenu soit placé sous les termes de la licence suivante :';
+
 $lang['searchmedia']           = 'Chercher le nom de fichier :';
 $lang['searchmedia_in']        = 'Chercher dans %s';
 $lang['txt_upload']            = 'Sélectionnez un fichier à envoyer ';
@@ -107,9 +116,10 @@ $lang['txt_filename']          = 'Donnez un « wikiname » (optionnel) ';
 $lang['txt_overwrt']           = 'Écraser le fichier cible';
 $lang['lockedby']              = 'Actuellement bloqué par';
 $lang['lockexpire']            = 'Le blocage expire à';
-$lang['js']['willexpire']            = 'Votre blocage pour modifier cette page expire dans une minute.\nPour éviter les conflits, utiliser le bouton « Aperçu » pour réinitialiser le minuteur.';
-$lang['js']['notsavedyet']     = 'Les modifications non enregistrées seront perdues.
-Voulez-vous vraiment continuer ?';
+
+$lang['js']['willexpire']      = 'Votre blocage pour modifier cette page expire dans une minute.
+                                  Pour éviter les conflits, utiliser le bouton « Aperçu » pour réinitialiser le minuteur.';
+$lang['js']['notsavedyet']     = 'Les modifications non enregistrées seront perdues. Voulez-vous vraiment continuer ?';
 $lang['js']['searchmedia']     = 'Chercher des fichiers';
 $lang['js']['keepopen']        = 'Gardez la fenêtre ouverte pendant la sélection';
 $lang['js']['hidedetails']     = 'Masquer détails';
@@ -135,13 +145,27 @@ $lang['js']['mediaright']      = 'Aligner l\'image sur la droite.';
 $lang['js']['mediacenter']     = 'Centrer l\'image';
 $lang['js']['medianoalign']    = 'Ne pas aligner.';
 $lang['js']['nosmblinks']      = 'Les liens vers les partages Windows ne fonctionnent qu\'avec Microsoft Internet Explorer.
-Vous pouvez toujours copier puis coller le lien.';
+                                  Vous pouvez toujours copier puis coller le lien.';
 $lang['js']['linkwiz']         = 'Assistant Lien';
 $lang['js']['linkto']          = 'Lien vers :';
 $lang['js']['del_confirm']     = 'Effacer cette entrée ?';
 $lang['js']['mu_btn']          = 'Envoyer plusieurs fichiers en même temps';
+$lang['js']['willexpire']      = 'Votre verrouillage pour la modification de cette page expire dans une minute.\nPour éviter les conflits, utilisez le bouton « Aperçu » pour réinitialiser le minuteur.';
+$lang['js']['restore_confirm']     = 'Voulez vous vraiment restaurer cette version?';
+$lang['js']['media_diff']          = 'Voir les différences:';
+$lang['js']['media_diff_both']     = 'Côte à côte';
+$lang['js']['media_diff_opacity']  = 'Calque';
+$lang['js']['media_diff_portions'] = 'Curseur';
+$lang['js']['media_select']        = 'Sélection de fichiers…';
+$lang['js']['media_upload_btn']    = 'Télécharger';
+$lang['js']['media_done_btn']      = 'Terminé';
+$lang['js']['media_drop']          = 'Déposez des fichiers ici pour les télécharger';
+$lang['js']['media_cancel']        = 'supprimer';
+$lang['js']['media_overwrt']       = 'Écraser les fichiers existants';
+
 $lang['rssfailed']             = 'Une erreur s\'est produite en récupérant ce flux : ';
 $lang['nothingfound']          = 'Pas de réponse.';
+
 $lang['mediaselect']           = 'Sélection de fichier';
 $lang['fileupload']            = 'Envoi de fichier';
 $lang['uploadsucc']            = 'Téléversement réussi';
@@ -166,6 +190,7 @@ $lang['mediaextchange']        = 'Extension du fichier changée de .%s en .%s !'
 $lang['reference']             = 'Références pour';
 $lang['ref_inuse']             = 'Le fichier ne peut être effacé car il est utilisé par les pages suivantes :';
 $lang['ref_hidden']            = 'Des références existent dans des pages que vous n\'avez pas la permission de lire';
+
 $lang['hits']                  = 'Occurrences trouvées';
 $lang['quickhits']             = 'Pages trouvées ';
 $lang['toc']                   = 'Table des matières';
@@ -189,11 +214,18 @@ $lang['external_edit']         = 'modification externe';
 $lang['summary']               = 'Résumé';
 $lang['noflash']               = 'Le greffon <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash</a> est nécessaire pour afficher ce contenu.';
 $lang['download']              = 'Télécharger un extrait';
+
 $lang['mail_newpage']          = 'page ajoutée :';
 $lang['mail_changed']          = 'page modifiée :';
 $lang['mail_subscribe_list']   = 'pages modifiées dans la catégorie :';
 $lang['mail_new_user']         = 'nouvel utilisateur :';
 $lang['mail_upload']           = 'fichier envoyé :';
+
+$lang['changes_type']          = 'Voir les changements';
+$lang['pages_changes']         = 'Pages';
+$lang['media_changes']         = 'Fichier multimédias';
+$lang['both_changes']          = 'Pages et fichiers multimédias';
+
 $lang['qb_bold']               = 'Emphase forte (gras)';
 $lang['qb_italic']             = 'Emphase (italique)';
 $lang['qb_underl']             = 'Souligné';
@@ -218,8 +250,11 @@ $lang['qb_media']              = 'Ajouter des images ou d\'autres fichiers';
 $lang['qb_sig']                = 'Insérer une signature';
 $lang['qb_smileys']            = 'Émoticones';
 $lang['qb_chars']              = 'Caractères spéciaux';
+
 $lang['upperns']               = 'Aller à la catégorie parente';
+
 $lang['admin_register']        = 'Ajouter un nouvel utilisateur';
+
 $lang['metaedit']              = 'Modifier les métadonnées';
 $lang['metasaveerr']           = 'Erreur lors de l\'écriture des métadonnées';
 $lang['metasaveok']            = 'Métadonnées enregistrées';
@@ -234,24 +269,33 @@ $lang['img_copyr']             = 'Copyright';
 $lang['img_format']            = 'Format';
 $lang['img_camera']            = 'Appareil photo';
 $lang['img_keywords']          = 'Mots-clés';
-$lang['subscr_subscribe_success'] = '%s a été ajouté à la liste de souscription de %s';
-$lang['subscr_subscribe_error'] = 'Erreur en ajoutant %s à la liste de souscription de %s';
+$lang['img_width']             = 'Largeur';
+$lang['img_height']            = 'Hauteur';
+$lang['img_manager']           = 'Voir dans le gestionnaire de médias';
+
+$lang['subscr_subscribe_success']   = '%s a été ajouté à la liste de souscription de %s';
+$lang['subscr_subscribe_error']     = 'Erreur en ajoutant %s à la liste de souscription de %s';
 $lang['subscr_subscribe_noaddress'] = 'Il n\'y a pas d\'adresse associée à votre identifiant, vous ne pouvez pas être ajouté à la liste de souscription';
 $lang['subscr_unsubscribe_success'] = '%s a été retiré de la liste de souscription de %s';
-$lang['subscr_unsubscribe_error'] = 'Erreur en retirant %s de la liste de souscription de %s';
-$lang['subscr_already_subscribed'] = '%s est déjà souscrit à %s';
-$lang['subscr_not_subscribed'] = '%s n\'est pas souscrit à %s';
-$lang['subscr_m_not_subscribed'] = 'Vous n\'avez pas souscrit pour l\'instant à la page actuelle ou la catégorie';
-$lang['subscr_m_new_header']   = 'Ajouter une souscription';
-$lang['subscr_m_current_header'] = 'Souscriptions actives';
-$lang['subscr_m_unsubscribe']  = 'Annuler la souscription';
-$lang['subscr_m_subscribe']    = 'Souscrire';
-$lang['subscr_m_receive']      = 'Recevoir';
-$lang['subscr_style_every']    = 'Envoyer un courriel à chaque modification';
-$lang['subscr_style_digest']   = 'Courriel résumant les modifications de chaque page';
-$lang['subscr_style_list']     = 'Liste des pages modifiées depuis le dernier courriel';
+$lang['subscr_unsubscribe_error']   = 'Erreur en retirant %s de la liste de souscription de %s';
+$lang['subscr_already_subscribed']  = '%s est déjà souscrit à %s';
+// Manage page for subscriptions
+$lang['subscr_not_subscribed']      = '%s n\'est pas souscrit à %s';
+$lang['subscr_m_not_subscribed']    = 'Vous n\'avez pas souscrit pour l\'instant à la page actuelle ou la catégorie';
+$lang['subscr_m_new_header']        = 'Ajouter une souscription';
+$lang['subscr_m_current_header']    = 'Souscriptions actives';
+$lang['subscr_m_unsubscribe']       = 'Annuler la souscription';
+$lang['subscr_m_subscribe']         = 'Souscrire';
+$lang['subscr_m_receive']           = 'Recevoir';
+$lang['subscr_style_every']         = 'Envoyer un courriel à chaque modification';
+$lang['subscr_style_digest']        = 'Courriel résumant les modifications de chaque page';
+$lang['subscr_style_list']          = 'Liste des pages modifiées depuis le dernier courriel';
+
+/* auth.class language support */
 $lang['authmodfailed']         = 'Mauvais paramétrage de l\'authentification. Merci d\'informer l\'administrateur du Wiki.';
 $lang['authtempfail']          = 'L\'authentification est temporairement indisponible. Si cela perdure, merci d\'informer l\'administrateur du Wiki.';
+
+/* installer strings */
 $lang['i_chooselang']          = 'Choisissez votre langue';
 $lang['i_installer']           = 'Installeur DokuWiki';
 $lang['i_wikiname']            = 'Nom du wiki';
@@ -274,6 +318,7 @@ $lang['i_pol1']                = 'Wiki public (lecture pour tout le monde, écri
 $lang['i_pol2']                = 'Wiki fermé (lecture, écriture, envoi de fichiers pour les utilisateurs enregistrés uniquement)';
 $lang['i_retry']               = 'Réessayer';
 $lang['i_license']             = 'Veuillez choisir la licence sous laquelle placer votre contenu :';
+
 $lang['mu_intro']              = 'Ici vous pouvez envoyer plusieurs fichiers en même temps. Cliquez sur le bouton parcourir pour les ajouter. Cliquez sur envoyer lorsque c\'est prêt. ';
 $lang['mu_gridname']           = 'Nom du fichier';
 $lang['mu_gridsize']           = 'Taille';
@@ -289,6 +334,7 @@ $lang['mu_progress']           = '@PCT@% envoyé';
 $lang['mu_filetypes']          = 'Types de fichiers acceptés';
 $lang['mu_info']               = 'fichiers envoyés.';
 $lang['mu_lasterr']            = 'Dernière erreur : ';
+
 $lang['recent_global']         = 'Vous êtes actuellement en train de regarder les modifications au sein de la catégorie <strong>%s</strong>. Vous pouvez aussi <a href="%s">voir les récentes modifications sur tout le wiki</a>.';
 $lang['years']                 = 'il y a %d ans';
 $lang['months']                = 'il y a %d mois';
@@ -297,4 +343,27 @@ $lang['days']                  = 'il y a %d jours';
 $lang['hours']                 = 'il y a %d heures';
 $lang['minutes']               = 'il y a %d minutes';
 $lang['seconds']               = 'il y a %d secondes';
+
 $lang['wordblock']             = 'Vos modifications n\'ont pas été sauvegardées parce qu\'elles contiennent des textes non autorisé (spam).';
+
+$lang['media_uploadtab']       = 'Télécharger';
+$lang['media_searchtab']       = 'Rechercher';
+$lang['media_viewtab']         = 'Voir';
+$lang['media_edittab']         = 'Éditer';
+$lang['media_historytab']      = 'Historique';
+$lang['media_thumbsview']      = 'Miniatures';
+$lang['media_listview']        = 'Liste';
+$lang['media_sort']            = 'Tri';
+$lang['media_sort_name']       = 'par nom';
+$lang['media_sort_date']       = 'par date';
+$lang['media_upload']          = 'Télécharger dans la catégorie <strong>%s</strong>.';
+$lang['media_search']          = 'Chercher dans la catégorie <strong>%s</strong>.';
+$lang['media_edit']            = 'Éditer';
+$lang['media_history']         = 'Anciennes révision du fichier.';
+$lang['media_meta_edited']     = 'métadonnées éditées';
+$lang['media_perm_read']       = 'Désolé, vous n\'avez pas les droits pour lire les fichiers.';
+$lang['media_perm_upload']     = 'Désolé, vous n\'avez pas les droits pour télécharger des fichiers.';
+$lang['media_update']          = 'Télécharger une nouvelle version';
+$lang['media_restore']         = 'Restaurer cette version';
+
+$lang['plugin_install_err']    = "Extension mal installée. Renommez le dossier de l'extension '%s' en '%s'.";
-- 
cgit v1.2.3


From 0fbb95872b10d1318aa1ac7be20470a2d07dd7a1 Mon Sep 17 00:00:00 2001
From: Random <rfc@nm.ru>
Date: Mon, 12 Sep 2011 18:54:34 +0200
Subject: ru: language updates (new strings of the Media Manager)

---
 inc/lang/ru/lang.php | 114 ++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 91 insertions(+), 23 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index ce9e54819..3a00a40af 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -22,11 +22,12 @@
  */
 $lang['encoding']              = ' utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '«';
-$lang['doublequoteclosing']    = '»';
-$lang['singlequoteopening']    = '„';
-$lang['singlequoteclosing']    = '“';
-$lang['apostrophe']            = '’';
+$lang['doublequoteopening']    = '«'; //&ldquo;
+$lang['doublequoteclosing']    = '»'; //&rdquo;
+$lang['singlequoteopening']    = '„'; //&lsquo;
+$lang['singlequoteclosing']    = '“'; //&rsquo;
+$lang['apostrophe']            = '’'; //&rsquo;
+
 $lang['btn_edit']              = 'Править страницу';
 $lang['btn_source']            = 'Показать исходный текст';
 $lang['btn_show']              = 'Показать страницу';
@@ -60,6 +61,9 @@ $lang['btn_recover']           = 'Восстановить черновик';
 $lang['btn_draftdel']          = 'Удалить черновик';
 $lang['btn_revert']            = 'Восстановить';
 $lang['btn_register']          = 'Зарегистрироваться';
+$lang['btn_apply']             = 'Применить';
+$lang['btn_media']             = 'Media Manager';
+
 $lang['loggedinas']            = 'Зашли как';
 $lang['user']                  = 'Логин';
 $lang['pass']                  = 'Пароль';
@@ -74,6 +78,7 @@ $lang['badlogin']              = 'Извините, неверное имя по
 $lang['minoredit']             = 'Небольшие изменения';
 $lang['draftdate']             = 'Черновик сохранён';
 $lang['nosecedit']             = 'За это время страница была изменена и информация о секции устарела. Загружена полная версия страницы.';
+
 $lang['regmissing']            = 'Извините, вам следует заполнить все поля.';
 $lang['reguexists']            = 'Извините, пользователь с таким логином уже существует.';
 $lang['regsuccess']            = 'Пользователь создан, пароль выслан на адрес электронной почты.';
@@ -83,10 +88,12 @@ $lang['regbadmail']            = 'Данный вами адрес электр
 $lang['regbadpass']            = 'Два введённых пароля не идентичны. Пожалуйста, попробуйте ещё раз.';
 $lang['regpwmail']             = 'Ваш пароль для системы «ДокуВики»';
 $lang['reghere']               = 'У вас ещё нет аккаунта? Зарегистрируйтесь';
+
 $lang['profna']                = 'Данная вики не поддерживает изменение профиля';
 $lang['profnochange']          = 'Изменений не было внесено, профиль не обновлён.';
 $lang['profnoempty']           = 'Логин и адрес электронной почты не могут быть пустыми.';
 $lang['profchanged']           = 'Профиль пользователя успешно обновлён.';
+
 $lang['pwdforget']             = 'Забыли пароль? Получите новый';
 $lang['resendna']              = 'Данная вики не поддерживает повторную отправку пароля.';
 $lang['resendpwd']             = 'Выслать пароль для';
@@ -95,8 +102,10 @@ $lang['resendpwdnouser']       = 'Пользователь с таким лог
 $lang['resendpwdbadauth']      = 'Извините, неверный код авторизации. Убедитесь, что вы полностью скопировали ссылку. ';
 $lang['resendpwdconfirm']      = 'Ссылка для подтверждения пароля была выслана по электронной почте. ';
 $lang['resendpwdsuccess']      = 'Ваш новый пароль был выслан по электронной почте.';
+
 $lang['license']               = 'За исключением случаев, когда указано иное, содержимое этой вики предоставляется на условиях следующей лицензии:';
 $lang['licenseok']             = 'Примечание: редактируя эту страницу, вы соглашаетесь на использование своего вклада на условиях следующей лицензии:';
+
 $lang['searchmedia']           = 'Поиск по имени файла:';
 $lang['searchmedia_in']        = 'Поиск в %s';
 $lang['txt_upload']            = 'Выберите файл для загрузки';
@@ -104,7 +113,7 @@ $lang['txt_filename']          = 'Введите имя файла в вики (
 $lang['txt_overwrt']           = 'Перезаписать существующий файл';
 $lang['lockedby']              = 'В данный момент заблокирован';
 $lang['lockexpire']            = 'Блокировка истекает в';
-$lang['js']['willexpire']            = 'Ваша блокировка редактирования этой страницы истекает в течение минуты.\nЧтобы избежать конфликтов и сбросить таймер блокировки, нажмите кнопку просмотра.';
+$lang['js']['willexpire']      = 'Ваша блокировка редактирования этой страницы истекает в течение минуты.\nЧтобы избежать конфликтов и сбросить таймер блокировки, нажмите кнопку просмотра.';
 $lang['js']['notsavedyet']     = 'Несохранённые изменения будут потеряны. Вы действительно хотите продолжить?';
 $lang['js']['searchmedia']     = 'Поиск файлов';
 $lang['js']['keepopen']        = 'Не закрывать окно после выбора';
@@ -135,8 +144,22 @@ $lang['js']['linkwiz']         = 'Мастер ссылок';
 $lang['js']['linkto']          = 'Ссылка на:';
 $lang['js']['del_confirm']     = 'Вы на самом деле желаете удалить выбранное?';
 $lang['js']['mu_btn']          = 'Загрузить несколько файлов одновременно';
+$lang['js']['willexpire']      = 'Ваша блокировка этой страницы на редактирование истекает в течении минуты.\nЧтобы предотвратить конфликты используйте кнопку "Просмотр" для сброса таймера блокировки.';
+$lang['js']['restore_confirm']     = 'Действительно восстановить эту версию?';
+$lang['js']['media_diff']          = 'Просмотр отличий:';
+$lang['js']['media_diff_both']     = 'Рядом';
+$lang['js']['media_diff_opacity']  = 'Наложением';
+$lang['js']['media_diff_portions'] = 'Частями';
+$lang['js']['media_select']        = 'Выбрать файлы…';
+$lang['js']['media_upload_btn']    = 'Загрузить';
+$lang['js']['media_done_btn']      = 'Готово';
+$lang['js']['media_drop']          = 'Переместите файлы сюда для загрузки';
+$lang['js']['media_cancel']        = 'отменить';
+$lang['js']['media_overwrt']       = 'Перезаписать существующие файлы';
+
 $lang['rssfailed']             = 'Произошла ошибка при получении следующей новостной ленты: ';
 $lang['nothingfound']          = 'Ничего не найдено.';
+
 $lang['mediaselect']           = 'Выбор медиафайла';
 $lang['fileupload']            = 'Загрузка медиафайла';
 $lang['uploadsucc']            = 'Загрузка произведена успешно';
@@ -161,6 +184,7 @@ $lang['mediaextchange']        = 'Расширение изменилось: с
 $lang['reference']             = 'Ссылки для';
 $lang['ref_inuse']             = 'Этот файл не может быть удалён, так как он используется на следующих страницах:';
 $lang['ref_hidden']            = 'Некоторые ссылки находятся на страницах, на чтение которых у вас нет прав доступа';
+
 $lang['hits']                  = 'соответствий';
 $lang['quickhits']             = 'Соответствия в названиях страниц';
 $lang['toc']                   = 'Содержание';
@@ -184,11 +208,18 @@ $lang['external_edit']         = 'внешнее изменение';
 $lang['summary']               = 'Сводка изменений';
 $lang['noflash']               = 'Для просмотра этого содержимого требуется <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>.';
 $lang['download']              = 'Скачать код';
+
 $lang['mail_newpage']          = 'страница добавлена:';
 $lang['mail_changed']          = 'страница изменена:';
 $lang['mail_subscribe_list']   = 'изменились страницы в пространстве имён:';
 $lang['mail_new_user']         = 'новый пользователь:';
 $lang['mail_upload']           = 'файл закачан:';
+
+$lang['changes_type']          = 'Посмотреть изменения';
+$lang['pages_changes']         = 'Страниц';
+$lang['media_changes']         = 'Медиа файлов';
+$lang['both_changes']          = 'И страниц и медиа файлов';
+
 $lang['qb_bold']               = 'Полужирный';
 $lang['qb_italic']             = 'Курсив';
 $lang['qb_underl']             = 'Подчёркнутый';
@@ -213,8 +244,11 @@ $lang['qb_media']              = 'Добавить изображения или
 $lang['qb_sig']                = 'Вставить подпись';
 $lang['qb_smileys']            = 'Смайлики';
 $lang['qb_chars']              = 'Специальные символы';
+
 $lang['upperns']               = 'Перейти в родительское пространство имён';
+
 $lang['admin_register']        = 'Добавить пользователя';
+
 $lang['metaedit']              = 'Править метаданные';
 $lang['metasaveerr']           = 'Ошибка записи метаданных';
 $lang['metasaveok']            = 'Метаданные сохранены';
@@ -229,24 +263,33 @@ $lang['img_copyr']             = 'Авторские права';
 $lang['img_format']            = 'Формат';
 $lang['img_camera']            = 'Модель';
 $lang['img_keywords']          = 'Ключевые слова';
-$lang['subscr_subscribe_success'] = 'Добавлен %s в подписку на %s';
-$lang['subscr_subscribe_error'] = 'Невозможно добавить %s в подписку на %s';
+$lang['img_width']             = 'Ширина';
+$lang['img_height']            = 'Высота';
+$lang['img_manager']           = 'Просмотр в media manager';
+
+$lang['subscr_subscribe_success']   = 'Добавлен %s в подписку на %s';
+$lang['subscr_subscribe_error']     = 'Невозможно добавить %s в подписку на %s';
 $lang['subscr_subscribe_noaddress'] = 'Нет адреса электронной почты, сопоставленного с вашей учётной записью. Вы не можете подписаться на рассылку';
 $lang['subscr_unsubscribe_success'] = 'Удалён %s из подписки на %s';
-$lang['subscr_unsubscribe_error'] = 'Ошибка удаления %s из подписки на %s';
-$lang['subscr_already_subscribed'] = '%s уже подписан на %s';
-$lang['subscr_not_subscribed'] = '%s не подписан на %s';
-$lang['subscr_m_not_subscribed'] = 'Вы не подписаны на текущую страницу или пространство имён.';
-$lang['subscr_m_new_header']   = 'Добавить подписку';
-$lang['subscr_m_current_header'] = 'Текущие подписки';
-$lang['subscr_m_unsubscribe']  = 'Отменить подписку';
-$lang['subscr_m_subscribe']    = 'Подписаться';
-$lang['subscr_m_receive']      = 'Получить';
-$lang['subscr_style_every']    = 'уведомлять о каждом изменении';
-$lang['subscr_style_digest']   = 'сводка изменений по каждой странице';
-$lang['subscr_style_list']     = 'перечислять изменившиеся страницы с прошлого уведомления';
+$lang['subscr_unsubscribe_error']   = 'Ошибка удаления %s из подписки на %s';
+$lang['subscr_already_subscribed']  = '%s уже подписан на %s';
+$lang['subscr_not_subscribed']      = '%s не подписан на %s';
+// Manage page for subscriptions
+$lang['subscr_m_not_subscribed']    = 'Вы не подписаны на текущую страницу или пространство имён.';
+$lang['subscr_m_new_header']        = 'Добавить подписку';
+$lang['subscr_m_current_header']    = 'Текущие подписки';
+$lang['subscr_m_unsubscribe']       = 'Отменить подписку';
+$lang['subscr_m_subscribe']         = 'Подписаться';
+$lang['subscr_m_receive']           = 'Получить';
+$lang['subscr_style_every']         = 'уведомлять о каждом изменении';
+$lang['subscr_style_digest']        = 'сводка изменений по каждой странице';
+$lang['subscr_style_list']          = 'перечислять изменившиеся страницы с прошлого уведомления';
+
+/* auth.class language support */
 $lang['authmodfailed']         = 'Неправильная конфигурация аутентификации пользователя. Пожалуйста, сообщите об этом своему администратору вики.';
 $lang['authtempfail']          = 'Аутентификация пользователей временно недоступна. Если проблема продолжается какое-то время, пожалуйста, сообщите об этом своему администратору вики.';
+
+/* installer strings */
 $lang['i_chooselang']          = 'Выберите свой язык/Choose your language';
 $lang['i_installer']           = 'Установка «ДокуВики»';
 $lang['i_wikiname']            = 'Название вики';
@@ -254,8 +297,8 @@ $lang['i_enableacl']           = 'Разрешить ограничение пр
 $lang['i_superuser']           = 'Суперпользователь';
 $lang['i_problems']            = 'Программа установки столкнулась с проблемами, перечисленными ниже. Чтобы продолжить, вам необходимо их устранить. ';
 $lang['i_modified']            = 'Из соображений безопасности эта программа запускается только на новой, неизменённой установке «ДокуВики».
-Вам нужно либо заново распаковать скачанный пакет установки, либо обратиться к полной
-<a href="http://www.dokuwiki.org/install">инструкции по установке «ДокуВики»</a>';
+                                  Вам нужно либо заново распаковать скачанный пакет установки, либо обратиться к полной
+                                  <a href="http://www.dokuwiki.org/install">инструкции по установке «ДокуВики»</a>';
 $lang['i_funcna']              = 'Функция PHP <code>%s</code> недоступна. Может быть, она по какой-то причине заблокирована вашим хостером?';
 $lang['i_phpver']              = 'Ваша версия PHP (<code>%s</code>) ниже требуемой (<code>%s</code>). Вам необходимо обновить установленную версию PHP.';
 $lang['i_permfail']            = '<code>%s</code> недоступна для записи «ДокуВики». Вам необходимо исправить системные права доступа для этой директории!';
@@ -264,7 +307,7 @@ $lang['i_writeerr']            = 'Не удалось создать <code>%s</c
 $lang['i_badhash']             = 'dokuwiki.php не распознан или изменён (хэш=<code>%s</code>)';
 $lang['i_badval']              = '<code>%s</code> — недопустимое или пустое значение';
 $lang['i_success']             = 'Конфигурация прошла успешно. Теперь вы можете удалить файл install.php. Переходите к
-                        <a href="doku.php">своей новой «ДокуВики»</a>.';
+                                 <a href="doku.php">своей новой «ДокуВики»</a>.';
 $lang['i_failure']             = 'При записи в файлы конфигурации были обнаружены ошибки. Возможно, вам придётся исправить их вручную, прежде чем вы сможете использовать <a href="doku.php">свою новую «ДокуВики»</a>.';
 $lang['i_policy']              = 'Исходная политика прав доступа';
 $lang['i_pol0']                = 'Открытая вики (чтение, запись, закачка файлов для всех)';
@@ -272,6 +315,7 @@ $lang['i_pol1']                = 'Общедоступная вики (чтен
 $lang['i_pol2']                = 'Закрытая вики (чтение, запись и загрузка файлов только для зарегистрированных пользователей)';
 $lang['i_retry']               = 'Повторить попытку';
 $lang['i_license']             = 'Пожалуйста, выберите тип лицензии для своей вики:';
+
 $lang['mu_intro']              = 'Здесь вы можете загрузить несколько файлов сразу. Кликните на «обзор», чтобы добавить их в список. Нажмите «загрузить», когда будете готовы.';
 $lang['mu_gridname']           = 'Имя файла';
 $lang['mu_gridsize']           = 'Размер';
@@ -287,6 +331,7 @@ $lang['mu_progress']           = '@PCT@% загружено';
 $lang['mu_filetypes']          = 'Допустимые типы файлов';
 $lang['mu_info']               = 'файлов загружено.';
 $lang['mu_lasterr']            = 'Последняя ошибка:';
+
 $lang['recent_global']         = 'Вы просматриваете изменения в пространстве имён <b>%s</b>. Вы можете также <a href="%s">просмотреть недавние изменения во всей вики</a>.';
 $lang['years']                 = '%d лет назад';
 $lang['months']                = '%d месяц(ев) назад';
@@ -295,4 +340,27 @@ $lang['days']                  = '%d дней назад';
 $lang['hours']                 = '%d час(ов) назад';
 $lang['minutes']               = '%d минут назад';
 $lang['seconds']               = '%d секунд назад';
+
 $lang['wordblock']             = 'Ваши изменения не сохранены, поскольку они содержат блокируемые слова (спам).';
+
+$lang['media_uploadtab']       = 'Загрузка';
+$lang['media_searchtab']       = 'Поиск';
+$lang['media_viewtab']         = 'Просмотр';
+$lang['media_edittab']         = 'Правка';
+$lang['media_historytab']      = 'История';
+$lang['media_thumbsview']      = 'Иконками';
+$lang['media_listview']        = 'Списком';
+$lang['media_sort']            = 'Сортировка';
+$lang['media_sort_name']       = 'по имени';
+$lang['media_sort_date']       = 'по дате';
+$lang['media_upload']          = 'Загрузка в пространство имён <strong>%s</strong>.';
+$lang['media_search']          = 'Поиск в пространстве имён <strong>%s</strong>.';
+$lang['media_edit']            = 'Правка';
+$lang['media_history']         = 'Это предыдущие версии файлов.';
+$lang['media_meta_edited']     = 'метаданные изменены';
+$lang['media_perm_read']       = 'Извините, у Вас недостаточно прав для чтения файлов.';
+$lang['media_perm_upload']     = 'Извините, у Вас недостаточно прав для загрузки файлов.';
+$lang['media_update']          = 'Загрузить новую версию';
+$lang['media_restore']         = 'Восстановить эту версию';
+
+$lang['plugin_install_err']    = "Плагин установлен некорректро. Переименуйте папку плагина из '%s' в '%s'.";
\ No newline at end of file
-- 
cgit v1.2.3


From c62a5f5846e3477044ebc93e96f98b878d3e7a59 Mon Sep 17 00:00:00 2001
From: Dedeco <balacobaco@imap.cc>
Date: Mon, 12 Sep 2011 21:53:15 +0200
Subject: pt-BR language update

---
 inc/lang/pt-br/lang.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index 0abe8a6b6..d1b46c294 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -18,6 +18,7 @@
  * @author Sergio Motta <sergio@cisne.com.br>
  * @author Isaias Masiero Filho <masiero@masiero.org>
  * @author Frederico Guimarães <frederico@teia.bio.br>
+ * @author Balaco Baco <balacobaco@imap.cc>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -103,7 +104,7 @@ $lang['txt_filename']          = 'Enviar como (opcional)';
 $lang['txt_overwrt']           = 'Substituir o arquivo existente';
 $lang['lockedby']              = 'Atualmente bloqueada por';
 $lang['lockexpire']            = 'O bloqueio expira em';
-$lang['js']['willexpire']            = 'O seu bloqueio de edição deste página irá expirar em um minuto.\nPara evitar conflitos de edição, clique no botão de visualização para reiniciar o temporizador de bloqueio.';
+$lang['js']['willexpire']      = 'O seu bloqueio de edição deste página irá expirar em um minuto.\nPara evitar conflitos de edição, clique no botão de visualização para reiniciar o temporizador de bloqueio.';
 $lang['js']['notsavedyet']     = 'As alterações não salvas serão perdidas.
 Deseja realmente continuar?';
 $lang['js']['searchmedia']     = 'Buscar por arquivos';
-- 
cgit v1.2.3


From 22129acd14ddbf9f714169ba94269787d675ff7b Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 16 Sep 2011 14:09:25 +0100
Subject: improved words for different diff views of images

---
 inc/lang/en/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 360af235b..f082c1655 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -136,8 +136,8 @@ $lang['js']['mu_btn']          = 'Upload multiple files at once';
 $lang['js']['restore_confirm'] = 'Really restore this version?';
 $lang['js']['media_diff']          = 'View differences:';
 $lang['js']['media_diff_both']     = 'Side by Side';
-$lang['js']['media_diff_opacity']  = 'Overlay';
-$lang['js']['media_diff_portions'] = 'Slider';
+$lang['js']['media_diff_opacity']  = 'Shine-through';
+$lang['js']['media_diff_portions'] = 'Swipe';
 $lang['js']['media_select']        = 'Select files…';
 $lang['js']['media_upload_btn']    = 'Upload';
 $lang['js']['media_done_btn']      = 'Done';
-- 
cgit v1.2.3


From 5247e262aea9e2e03a3a60673b826546215f6976 Mon Sep 17 00:00:00 2001
From: Random <rfc@nm.ru>
Date: Sat, 17 Sep 2011 11:07:48 +0200
Subject: ru: fixes in lang.php and uploadmail.txt

---
 inc/lang/ru/lang.php       |  2 +-
 inc/lang/ru/uploadmail.txt | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 3a00a40af..ef560e3a2 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -363,4 +363,4 @@ $lang['media_perm_upload']     = 'Извините, у Вас недостато
 $lang['media_update']          = 'Загрузить новую версию';
 $lang['media_restore']         = 'Восстановить эту версию';
 
-$lang['plugin_install_err']    = "Плагин установлен некорректро. Переименуйте папку плагина из '%s' в '%s'.";
\ No newline at end of file
+$lang['plugin_install_err']    = "Плагин установлен некорректно. Переименуйте папку плагина из '%s' в '%s'.";
\ No newline at end of file
diff --git a/inc/lang/ru/uploadmail.txt b/inc/lang/ru/uploadmail.txt
index fd7c4a7f8..77f79231e 100644
--- a/inc/lang/ru/uploadmail.txt
+++ b/inc/lang/ru/uploadmail.txt
@@ -1,13 +1,14 @@
 В вашу вики был закачан файл. Подробная информация:
 
-Файл        : @MEDIA@
-Дата        : @DATE@
-Браузер     : @BROWSER@
-Адрес IP    : @IPADDRESS@
-Хост        : @HOSTNAME@
-Размер      : @SIZE@
-Тип MIME    : @MIME@
-Пользователь: @USER@
+Файл         : @MEDIA@
+Старая версия: @OLD@
+Дата         : @DATE@
+Браузер      : @BROWSER@
+Адрес IP     : @IPADDRESS@
+Хост         : @HOSTNAME@
+Размер       : @SIZE@
+Тип MIME     : @MIME@
+Пользователь : @USER@
 
 -- 
 Это письмо было сгенерировано «ДокуВики» по адресу
-- 
cgit v1.2.3


From 95b451bc621ae202d0229176ad0712b22d14c953 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sat, 17 Sep 2011 19:36:34 +0200
Subject: Rework media manager HTML (JS and CSS will come)

---
 inc/html.php                  | 155 ++++++++++++-------
 inc/lang/de-informal/lang.php |  17 ++-
 inc/lang/de/lang.php          |  17 ++-
 inc/lang/en/lang.php          |  17 ++-
 inc/lang/fr/lang.php          |  12 +-
 inc/lang/pt/lang.php          |  11 +-
 inc/lang/ru/lang.php          |  13 +-
 inc/media.php                 | 339 +++++++++++++++++++-----------------------
 inc/template.php              |  71 +++++----
 9 files changed, 336 insertions(+), 316 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 1c48d6059..66bc83127 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -982,6 +982,73 @@ function html_backlinks(){
     }
 }
 
+function html_diff_head($l_rev, $r_rev, $id = null, $media = false) {
+    global $lang;
+    if ($id === null) {
+        global $ID;
+        $id = $ID;
+    }
+    $media_or_wikiFN = $media ? 'mediaFN' : 'wikiFN';
+    $ml_or_wl = $media ? 'ml' : 'wl';
+    $l_minor = $r_minor = '';
+
+    if(!$l_rev){
+        $l_head = '&mdash;';
+    }else{
+        $l_info   = getRevisionInfo($id,$l_rev,true, $media);
+        if($l_info['user']){
+            $l_user = editorinfo($l_info['user']);
+            if(auth_ismanager()) $l_user .= ' ('.$l_info['ip'].')';
+        } else {
+            $l_user = $l_info['ip'];
+        }
+        $l_user  = '<span class="user">'.$l_user.'</span>';
+        $l_sum   = ($l_info['sum']) ? '<span class="sum">'.hsc($l_info['sum']).'</span>' : '';
+        if ($l_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $l_minor = 'class="minor"';
+
+        $l_head = '<a class="wikilink1" href="'.$ml_or_wl($id,"rev=$l_rev").'">'.
+        $id.' ['.dformat($l_rev).']</a>'.
+        '<br />'.$l_user.' '.$l_sum;
+    }
+
+    if($r_rev){
+        $r_info   = getRevisionInfo($id,$r_rev,true, $media);
+        if($r_info['user']){
+            $r_user = editorinfo($r_info['user']);
+            if(auth_ismanager()) $r_user .= ' ('.$r_info['ip'].')';
+        } else {
+            $r_user = $r_info['ip'];
+        }
+        $r_user = '<span class="user">'.$r_user.'</span>';
+        $r_sum  = ($r_info['sum']) ? '<span class="sum">'.hsc($r_info['sum']).'</span>' : '';
+        if ($r_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
+
+        $r_head = '<a class="wikilink1" href="'.$ml_or_wl($id,"rev=$r_rev").'">'.
+        $id.' ['.dformat($r_rev).']</a>'.
+        '<br />'.$r_user.' '.$r_sum;
+    }elseif($_rev = @filemtime($media_or_wikiFN($id))){
+        $_info   = getRevisionInfo($id,$_rev,true, $media);
+        if($_info['user']){
+            $_user = editorinfo($_info['user']);
+            if(auth_ismanager()) $_user .= ' ('.$_info['ip'].')';
+        } else {
+            $_user = $_info['ip'];
+        }
+        $_user = '<span class="user">'.$_user.'</span>';
+        $_sum  = ($_info['sum']) ? '<span class="sum">'.hsc($_info['sum']).'</span>' : '';
+        if ($_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
+
+        $r_head  = '<a class="wikilink1" href="'.$ml_or_wl($id).'">'.
+        $id.' ['.dformat($_rev).']</a> '.
+        '('.$lang['current'].')'.
+        '<br />'.$_user.' '.$_sum;
+    }else{
+        $r_head = '&mdash; ('.$lang['current'].')';
+    }
+
+    return array($l_head, $r_head, $l_minor, $r_minor);
+}
+
 /**
  * show diff
  *
@@ -1056,59 +1123,7 @@ function html_diff($text='',$intro=true,$type=null){
         }
         $r_text = rawWiki($ID,$r_rev);
 
-        if(!$l_rev){
-            $l_head = '&mdash;';
-        }else{
-            $l_info   = getRevisionInfo($ID,$l_rev,true);
-            if($l_info['user']){
-                $l_user = editorinfo($l_info['user']);
-                if(auth_ismanager()) $l_user .= ' ('.$l_info['ip'].')';
-            } else {
-                $l_user = $l_info['ip'];
-            }
-            $l_user  = '<span class="user">'.$l_user.'</span>';
-            $l_sum   = ($l_info['sum']) ? '<span class="sum">'.hsc($l_info['sum']).'</span>' : '';
-            if ($l_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $l_minor = 'class="minor"';
-
-            $l_head = '<a class="wikilink1" href="'.wl($ID,"rev=$l_rev").'">'.
-            $ID.' ['.dformat($l_rev).']</a>'.
-            '<br />'.$l_user.' '.$l_sum;
-        }
-
-        if($r_rev){
-            $r_info   = getRevisionInfo($ID,$r_rev,true);
-            if($r_info['user']){
-                $r_user = editorinfo($r_info['user']);
-                if(auth_ismanager()) $r_user .= ' ('.$r_info['ip'].')';
-            } else {
-                $r_user = $r_info['ip'];
-            }
-            $r_user = '<span class="user">'.$r_user.'</span>';
-            $r_sum  = ($r_info['sum']) ? '<span class="sum">'.hsc($r_info['sum']).'</span>' : '';
-            if ($r_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
-
-            $r_head = '<a class="wikilink1" href="'.wl($ID,"rev=$r_rev").'">'.
-            $ID.' ['.dformat($r_rev).']</a>'.
-            '<br />'.$r_user.' '.$r_sum;
-        }elseif($_rev = @filemtime(wikiFN($ID))){
-            $_info   = getRevisionInfo($ID,$_rev,true);
-            if($_info['user']){
-                $_user = editorinfo($_info['user']);
-                if(auth_ismanager()) $_user .= ' ('.$_info['ip'].')';
-            } else {
-                $_user = $_info['ip'];
-            }
-            $_user = '<span class="user">'.$_user.'</span>';
-            $_sum  = ($_info['sum']) ? '<span class="sum">'.hsc($_info['sum']).'</span>' : '';
-            if ($_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
-
-            $r_head  = '<a class="wikilink1" href="'.wl($ID).'">'.
-            $ID.' ['.dformat($_rev).']</a> '.
-            '('.$lang['current'].')'.
-            '<br />'.$_user.' '.$_sum;
-        }else{
-            $r_head = '&mdash; ('.$lang['current'].')';
-        }
+        list($l_head, $r_head, $l_minor, $r_minor) = html_diff_head($l_rev, $r_rev);
     }
 
     $df = new Diff(explode("\n",htmlspecialchars($l_text)),
@@ -1811,3 +1826,37 @@ function html_flashobject($swf,$width,$height,$params=null,$flashvars=null,$atts
     return $out;
 }
 
+function html_tabs($tabs, $current_tab = null) {
+    echo '<ul class="tabs">';
+
+    foreach($tabs as $id => $tab) {
+        html_tab($tab['href'], $tab['caption'], $id === $current_tab);
+    }
+
+    echo '</ul>';
+    echo '<div class="clearer"></div>';
+}
+/**
+ * Prints a single tab
+ *
+ * @author Kate Arzamastseva <pshns@ukr.net>
+ * @author Adrian Lang <mail@adrianlang.de>
+ *
+ * @param string $href - tab href
+ * @param string $caption - tab caption
+ * @param boolean $selected - is tab selected
+ */
+
+function html_tab($href, $caption, $selected=false) {
+    $tab = '<li>';
+    if ($selected) {
+        $tab .= '<strong>';
+    } else {
+        $tab .= '<a href="' . hsc($href) . '">';
+    }
+    $tab .= hsc($caption)
+         .  '</' . ($selected ? 'strong' : 'a') . '>'
+         .  '</li>';
+    echo $tab;
+}
+
diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index 4f762b55d..4d7c26621 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -345,15 +345,16 @@ $lang['media_searchtab']       = 'Suchen';
 $lang['media_viewtab']         = 'Anzeigen';
 $lang['media_edittab']         = 'Bearbeiten';
 $lang['media_historytab']      = 'Verlauf';
-$lang['media_thumbsview']      = 'Miniaturansicht';
-$lang['media_listview']        = 'Detailansicht';
-$lang['media_sort']            = 'Sortieren';
-$lang['media_sort_name']       = 'nach Name';
-$lang['media_sort_date']       = 'nach Datum';
+$lang['media_list_thumbs']     = '<span>Medien anzeigen als</span> Miniaturansicht';
+$lang['media_list_rows']       = '<span>Medien anzeigen als</span> Listenansicht';
+$lang['media_sort_name']       = '<span>Sortieren nach</span> Name';
+$lang['media_sort_date']       = '<span>Sortieren nach</span> Datum';
+$lang['media_files']           = 'Medien im Namespace <strong>%s</strong>.';
 $lang['media_upload']          = 'In den <strong>%s</strong> Namespace hochladen.';
 $lang['media_search']          = 'Im Namespace <strong>%s</strong> suchen.';
-$lang['media_edit']            = 'Bearbeiten';
-$lang['media_history']         = 'Versionsverlauf der Datei.';
+$lang['media_view']            = '<span class="%s">%s</span>';
+$lang['media_edit']            = '<span class="%s">%s</span> bearbeiten';
+$lang['media_history']         = 'Versionen von <span class="%s">%s</span>';
 $lang['media_meta_edited']     = 'Meta-Informationen bearbeitet';
 $lang['media_perm_read']       = 'Du besitzt nicht die notwendigen Berechtigungen um die Datei anzuzeigen.';
 $lang['media_perm_upload']     = 'Du besitzt nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
@@ -362,4 +363,4 @@ $lang['media_restore']         = 'Diese Version wiederherstellen';
 
 $lang['plugin_install_err']    = "Plugin nicht korrekt installiert. Plugin-Verzeichnis von '%s' nach '%s' umbenennen.";
 
-//Setup VIM: ex: et ts=2 :
\ No newline at end of file
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index a289f9987..360e6b428 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -345,15 +345,16 @@ $lang['media_searchtab']       = 'Suchen';
 $lang['media_viewtab']         = 'Anzeigen';
 $lang['media_edittab']         = 'Bearbeiten';
 $lang['media_historytab']      = 'Verlauf';
-$lang['media_thumbsview']      = 'Miniaturansicht';
-$lang['media_listview']        = 'Detailansicht';
-$lang['media_sort']            = 'Sortieren';
-$lang['media_sort_name']       = 'nach Name';
-$lang['media_sort_date']       = 'nach Datum';
+$lang['media_list_thumbs']     = '<span>Medien anzeigen als</span> Miniaturansicht';
+$lang['media_list_rows']       = '<span>Medien anzeigen als</span> Listenansicht';
+$lang['media_sort_name']       = '<span>Sortieren nach</span> Name';
+$lang['media_sort_date']       = '<span>Sortieren nach</span> Datum';
+$lang['media_files']           = 'Medien im Namespace <strong>%s</strong>.';
 $lang['media_upload']          = 'In den <strong>%s</strong> Namespace hochladen.';
 $lang['media_search']          = 'Im Namespace <strong>%s</strong> suchen.';
-$lang['media_edit']            = 'Bearbeiten';
-$lang['media_history']         = 'Versionsverlauf der Datei.';
+$lang['media_view']            = '<span class="%s">%s</span>';
+$lang['media_edit']            = '<span class="%s">%s</span> bearbeiten';
+$lang['media_history']         = 'Versionen von <span class="%s">%s</span>';
 $lang['media_meta_edited']     = 'Meta-Informationen bearbeitet';
 $lang['media_perm_read']       = 'Sie besitzen nicht die notwendigen Berechtigungen um die Datei anzuzeigen.';
 $lang['media_perm_upload']     = 'Sie besitzen nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
@@ -362,4 +363,4 @@ $lang['media_restore']         = 'Diese Version wiederherstellen';
 
 $lang['plugin_install_err']    = "Plugin nicht korrekt installiert. Plugin-Verzeichnis von '%s' nach '%s' umbenennen.";
 
-//Setup VIM: ex: et ts=2 :
\ No newline at end of file
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index f082c1655..fbfd0e34f 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -337,15 +337,16 @@ $lang['media_searchtab']       = 'Search';
 $lang['media_viewtab']         = 'View';
 $lang['media_edittab']         = 'Edit';
 $lang['media_historytab']      = 'History';
-$lang['media_thumbsview']      = 'Thumbnails';
-$lang['media_listview']        = 'List';
-$lang['media_sort']            = 'Sort';
-$lang['media_sort_name']       = 'by name';
-$lang['media_sort_date']       = 'by date';
+$lang['media_list_thumbs']     = '<span>Show list as</span> thumbnails';
+$lang['media_list_rows']       = '<span>Show list as</span> list';
+$lang['media_sort_name']       = '<span>Sort by</span> name';
+$lang['media_sort_date']       = '<span>Sort by</span> date';
+$lang['media_files']           = 'Media files in the <strong>%s</strong> namespace.';
 $lang['media_upload']          = 'Upload to the <strong>%s</strong> namespace.';
 $lang['media_search']          = 'Search in the <strong>%s</strong> namespace.';
-$lang['media_edit']            = 'Edit';
-$lang['media_history']         = 'These are the older revisions of the file.';
+$lang['media_view']            = '<span class="%s">%s</span>';
+$lang['media_edit']            = 'Edit <span class="%s">%s</span>';
+$lang['media_history']         = 'History of <span class="%s">%s</span>';
 $lang['media_meta_edited']     = 'metadata edited';
 $lang['media_perm_read']       = 'Sorry, you don\'t have enough rights to read files.';
 $lang['media_perm_upload']     = 'Sorry, you don\'t have enough rights to upload files.';
@@ -354,4 +355,4 @@ $lang['media_restore']         = 'Restore this version';
 
 $lang['plugin_install_err']    = "Plugin installed incorrectly. Rename plugin directory '%s' to '%s'.";
 
-//Setup VIM: ex: et ts=2 :
\ No newline at end of file
+//Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 53d3b7665..c73febc00 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -351,15 +351,13 @@ $lang['media_searchtab']       = 'Rechercher';
 $lang['media_viewtab']         = 'Voir';
 $lang['media_edittab']         = 'Éditer';
 $lang['media_historytab']      = 'Historique';
-$lang['media_thumbsview']      = 'Miniatures';
-$lang['media_listview']        = 'Liste';
-$lang['media_sort']            = 'Tri';
-$lang['media_sort_name']       = 'par nom';
-$lang['media_sort_date']       = 'par date';
+$lang['media_sort_name']       = '<span>Tri par</span> nom';
+$lang['media_sort_date']       = '<span>Tri par</span> date';
 $lang['media_upload']          = 'Télécharger dans la catégorie <strong>%s</strong>.';
 $lang['media_search']          = 'Chercher dans la catégorie <strong>%s</strong>.';
-$lang['media_edit']            = 'Éditer';
-$lang['media_history']         = 'Anciennes révision du fichier.';
+$lang['media_view']            = '<span class="%s">%s</span>';
+$lang['media_edit']            = 'Éditer <span class="%s">%s</span>';
+$lang['media_history']         = 'Historique du <span class="%s">%s</span>';
 $lang['media_meta_edited']     = 'métadonnées éditées';
 $lang['media_perm_read']       = 'Désolé, vous n\'avez pas les droits pour lire les fichiers.';
 $lang['media_perm_upload']     = 'Désolé, vous n\'avez pas les droits pour télécharger des fichiers.';
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index ef67a284c..6a2034a95 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -309,15 +309,14 @@ $lang['media_searchtab']  = 'Procurar';
 $lang['media_viewtab']    = 'Ver';
 $lang['media_edittab']    = 'Editar';
 $lang['media_historytab'] = 'Histórico';
-$lang['media_thumbsview'] = 'Miniaturas';
-$lang['media_listview']   = 'Lista';
 $lang['media_sort']       = 'Ordenar';
-$lang['media_sort_name']  = 'por nome';
-$lang['media_sort_date']  = 'por data';
+$lang['media_sort_name']  = '<span>Ordenar por</span> nome';
+$lang['media_sort_date']  = '<span>Ordenar por</span> data';
 $lang['media_upload']     = 'Enviar para o grupo <strong>%s</strong>.';
 $lang['media_search']     = 'Procurar no grupo <strong>%s</strong>.';
-$lang['media_edit']       = 'Editar';
-$lang['media_history']    = 'Estas são as revisões anteriores do ficheiro.';
+$lang['media_view']       = '<span class="%s">%s</span>';
+$lang['media_edit']       = 'Editar <span class="%s">%s</span>';
+$lang['media_history']    = 'Histórico do <span class="%s">%s</span>';
 $lang['media_meta_edited']= 'metadata editada';
 $lang['media_perm_read']  = 'Perdão, não tem permissão para ler ficheiros.';
 $lang['media_perm_upload']= 'Perdão, não tem permissão para enviar ficheiros.';
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index ef560e3a2..52c1dc20b 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -348,19 +348,16 @@ $lang['media_searchtab']       = 'Поиск';
 $lang['media_viewtab']         = 'Просмотр';
 $lang['media_edittab']         = 'Правка';
 $lang['media_historytab']      = 'История';
-$lang['media_thumbsview']      = 'Иконками';
-$lang['media_listview']        = 'Списком';
-$lang['media_sort']            = 'Сортировка';
-$lang['media_sort_name']       = 'по имени';
-$lang['media_sort_date']       = 'по дате';
+$lang['media_sort_name']       = '<span>Сортировка по</span> имени';
+$lang['media_sort_date']       = '<span>Сортировка по</span> дате';
 $lang['media_upload']          = 'Загрузка в пространство имён <strong>%s</strong>.';
 $lang['media_search']          = 'Поиск в пространстве имён <strong>%s</strong>.';
-$lang['media_edit']            = 'Правка';
-$lang['media_history']         = 'Это предыдущие версии файлов.';
+$lang['media_view']            = '<span class="%s">%s</span>';
+$lang['media_edit']            = 'Правка <span class="%s">%s</span>';
 $lang['media_meta_edited']     = 'метаданные изменены';
 $lang['media_perm_read']       = 'Извините, у Вас недостаточно прав для чтения файлов.';
 $lang['media_perm_upload']     = 'Извините, у Вас недостаточно прав для загрузки файлов.';
 $lang['media_update']          = 'Загрузить новую версию';
 $lang['media_restore']         = 'Восстановить эту версию';
 
-$lang['plugin_install_err']    = "Плагин установлен некорректно. Переименуйте папку плагина из '%s' в '%s'.";
\ No newline at end of file
+$lang['plugin_install_err']    = "Плагин установлен некорректно. Переименуйте папку плагина из '%s' в '%s'.";
diff --git a/inc/media.php b/inc/media.php
index 451a205db..ea612ea3f 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -108,10 +108,10 @@ function media_metaform($id,$auth){
     $src = mediaFN($id);
 
     // output
-    $action = media_managerURL(array('tab_details' => 'view'));
-    echo '<form action="'.$action.'" id="mediamanager__save_meta" accept-charset="utf-8" method="post" class="meta">'.NL;
-
-    formSecurityToken();
+    $form = new Doku_Form(array('action' => media_managerURL(array('tab_details' => 'view')),
+                                'class' => 'meta'));
+    $form->addHidden('img', $id);
+    $form->addHidden('mediado', 'save');
     foreach($fields as $key => $field){
         // get current value
         if (empty($field[0])) continue;
@@ -126,33 +126,19 @@ function media_metaform($id,$auth){
         $p['id']    = 'meta__'.$key;
         $p['name']  = 'meta['.$field[0].']';
 
-        // put label
-        echo '<div class="metafield">';
-        echo '<label for="meta__'.$key.'">';
-        echo ($lang[$field[1]]) ? $lang[$field[1]] : $field[1];
-        echo ':</label>';
-
-        // put input field
+        $form->addElement('<div class="row">');
         if($field[2] == 'text'){
-            $p['value'] = $value;
-            $p['type']  = 'text';
-            $att = buildAttributes($p);
-            echo "<input $att/>".NL;
+            $form->addElement(form_makeField('text', $p['name'], $value, ($lang[$field[1]]) ? $lang[$field[1]] : $field[1] . ':', $p['id'], $p['class']));
         }else{
             $att = buildAttributes($p);
-            echo "<textarea $att rows=\"6\" cols=\"50\">".formText($value).'</textarea>'.NL;
+            $form->addElement("<textarea $att rows=\"6\" cols=\"50\">".formText($value).'</textarea>');
         }
-        echo '</div>'.NL;
+        $form->addElement('</div>');
     }
-    echo '<div class="buttons">'.NL;
-    echo '<input type="hidden" name="img" value="'.hsc($id).'" />'.NL;
-    echo '<input type="hidden" name="mediado" value="save" />';
-
-    $do = 'mediado';
-    echo '<input name="'.$do.'[save]" type="submit" value="'.$lang['btn_save'].
-        '" title="'.$lang['btn_save'].' [S]" accesskey="s" class="button" />'.NL;
-    echo '</div>'.NL;
-    echo '</form>'.NL;
+    $form->addElement('<div class="buttons">');
+    $form->addElement(form_makeButton('submit', '', $lang['btn_save'], array('accesskey' => 's', 'name' => 'mediado[save]')));
+    $form->addElement('</div>');
+    $form->printForm();
 }
 
 /**
@@ -588,11 +574,11 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=fals
             echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
         }else {
             if ($fullscreenview) {
-                $view = $_REQUEST['view'];
-                if ($view == 'list') {
-                    echo '<ul class="mediamanager-list" id="mediamanager__file_list">';
+                $view = $_REQUEST['list'];
+                if ($view == 'rows') {
+                    echo '<ul class="rows">';
                 } else {
-                    echo '<ul class="mediamanager-thumbs" id="mediamanager__file_list">';
+                    echo '<ul class="thumbs">';
                 }
             }
             foreach($data as $item){
@@ -608,41 +594,26 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=fals
     if (!$fullscreenview) media_searchform($ns);
 }
 
-/**
- * Prints mediamanager tab
- *
- * @author Kate Arzamastseva <pshns@ukr.net>
- * @param string $link - tab href
- * @param string $class - tab css class
- * @param string $name - tab caption
- * @param boolean $selected - is tab selected
- */
-function media_tab($link, $class, $name, $selected=false) {
-    if ($selected) $class .= ' selected';
-    $tab = '<a href="'.$link.'" class="'.$class.'" >'.$name.'</a>';
-    echo $tab;
-}
-
 /**
  * Prints tabs for files list actions
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
+ * @author Adrian Lang <mail@adrianlang.de>
+ *
  * @param string $selected_tab - opened tab
  */
+
 function media_tabs_files($selected_tab = ''){
     global $lang;
+    $tabs = array();
+    foreach(array('files'  => 'mediaselect',
+                  'upload' => 'media_uploadtab',
+                  'search' => 'media_searchtab') as $tab => $caption) {
+        $tabs[$tab] = array('href'    => media_managerURL(array('tab_files' => $tab), '&'),
+                            'caption' => $lang[$caption]);
+    }
 
-    echo '<div class="mediamanager-tabs" id="mediamanager__tabs_files">';
-
-    media_tab(media_managerURL(array('tab_files' => 'files')),
-        'files', $lang['mediaselect'], ($selected_tab == 'files'));
-    media_tab(media_managerURL(array('tab_files' => 'upload')),
-        'upload', $lang['media_uploadtab'], ($selected_tab == 'upload'));
-    media_tab(media_managerURL(array('tab_files' => 'search')),
-        'search', $lang['media_searchtab'], ($selected_tab == 'search'));
-
-    echo '<div class="clearer"></div>';
-    echo '</div>';
+    html_tabs($tabs, $selected_tab);
 }
 
 /**
@@ -654,23 +625,21 @@ function media_tabs_files($selected_tab = ''){
 function media_tabs_details($image, $selected_tab = ''){
     global $lang, $conf;
 
-    echo '<div class="mediamanager-tabs" id="mediamanager__tabs_details">';
-
-    media_tab(media_managerURL(array('tab_details' => 'view')),
-        'view', $lang['media_viewtab'], ($selected_tab == 'view'));
+    $tabs = array();
+    $tabs['view'] = array('href'    => media_managerURL(array('tab_details' => 'view'), '&'),
+                          'caption' => $lang['media_viewtab']);
 
     list($ext, $mime) = mimetype($image);
     if ($mime == 'image/jpeg' && @file_exists(mediaFN($image))) {
-        media_tab(media_managerURL(array('tab_details' => 'edit')),
-            'edit', $lang['media_edittab'], ($selected_tab == 'edit'));
+        $tabs['edit'] = array('href'    => media_managerURL(array('tab_details' => 'edit'), '&'),
+                              'caption' => $lang['media_edittab']);
     }
     if ($conf['mediarevisions']) {
-        media_tab(media_managerURL(array('tab_details' => 'history')),
-            'history', $lang['media_historytab'], ($selected_tab == 'history'));
+        $tabs['history'] = array('href'    => media_managerURL(array('tab_details' => 'history'), '&'),
+                                 'caption' => $lang['media_historytab']);
     }
 
-    echo '<div class="clearer"></div>';
-    echo '</div>';
+    html_tabs($tabs, $selected_tab);
 }
 
 /**
@@ -678,42 +647,41 @@ function media_tabs_details($image, $selected_tab = ''){
  *
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
-function media_tab_files_options($ns, $sort){
-    global $lang;
-
-    echo '<div class="background-container">';
-
-    echo '<strong class="namespace">';
-    echo $ns ? $ns : '['.$lang['mediaroot'].']';
-    echo '</strong>';
-
-    echo '<div id="mediamanager__tabs_list">';
-
-    echo '<a href="'.media_managerURL(array('view' => 'thumbs')).'" id="mediamanager__link_thumbs" >';
-    echo $lang['media_thumbsview'];
-    echo '</a>';
-
-    echo '<a href="'.media_managerURL(array('view' => 'list')).'" id="mediamanager__link_list" >';
-    echo $lang['media_listview'];
-    echo '</a>';
-
-    echo '</div>';
+function media_tab_files_options(){
+    global $lang, $NS;
+    $sort = _media_get_sort_type();
+    $form = new Doku_Form(array('class' => 'actions', 'method' => 'get'));
+    $form->addHidden('sectok', null);
+    $form->addHidden('ns', $NS);
+    $form->addHidden('do', 'media');
+    $form->addElement('<ul>');
+    foreach(array('list' => array('listType', array('thumbs', 'rows')),
+                  'sort' => array('sortBy', array('name', 'date'), $sort))
+            as $group => $content) {
+        if (count($content) < 3) {
+            $content[2] = isset($_REQUEST[$group])
+                            ? $_REQUEST[$group]
+                            : $content[1][0];
+        }
 
-    echo '<div id="mediamanager__sort">';
-    $form = new Doku_Form(array('action'=>media_managerURL(array(), '&'), 'id' => 'mediamanager__form_sort'));
-    $form->addElement(form_makeListboxField(
-                        'sort',
-                        array(
-                            'name' => $lang['media_sort_name'],
-                            'date' => $lang['media_sort_date']),
-                        $sort,
-                        $lang['media_sort']));
+        $form->addElement('<li class="' . $content[0] . '">');
+        foreach($content[1] as $option) {
+            $attrs = array();
+            if ($content[2] == $option) {
+                $attrs['checked'] = 'checked';
+            }
+            $form->addElement(form_makeRadioField($group, $option,
+                                       $lang['media_' . $group . '_' . $option],
+                                                  $content[0] . '__' . $option,
+                                                  $option, $attrs));
+        }
+        $form->addElement('</li>');
+    }
+    $form->addElement('<li>');
     $form->addElement(form_makeButton('submit', '', $lang['btn_apply']));
+    $form->addElement('</li>');
+    $form->addElement('</ul>');
     $form->printForm();
-    echo '</div>';
-
-    echo '<div class="clearer"></div>';
-    echo '</div>';
 }
 
 /**
@@ -723,12 +691,14 @@ function media_tab_files_options($ns, $sort){
  * @return string - sort type
  */
 function _media_get_sort_type() {
-    $sort = $_REQUEST['sort'];
-    if (!$sort && (strpos($_COOKIE['DOKU_PREFS'], 'sort') >= 0)) {
+    $sort = 'name';
+    if (isset($_REQUEST['sort'])) {
+        $sort = $_REQUEST['sort'];
+    } elseif (strpos($_COOKIE['DOKU_PREFS'], 'sort') >= 0) {
         $parts = explode('#', $_COOKIE['DOKU_PREFS']);
-            for ($i = 0; $i < count($parts); $i+=2){
-                if ($parts[$i] == 'sort') $sort = $parts[$i+1];
-            }
+        for ($i = 0; $i < count($parts); $i+=2){
+            if ($parts[$i] == 'sort') $sort = $parts[$i+1];
+        }
     }
     return $sort;
 }
@@ -742,16 +712,11 @@ function media_tab_files($ns,$auth=null,$jump='') {
     global $lang;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    $sort = _media_get_sort_type();
-    media_tab_files_options($ns, $sort);
-
-    echo '<div class="scroll-container" >';
     if($auth < AUTH_READ){
         echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
     }else{
-        media_filelist($ns,$auth,$jump,true,$sort);
+        media_filelist($ns,$auth,$jump,true,_media_get_sort_type());
     }
-    echo '</div>';
 }
 
 /**
@@ -763,12 +728,10 @@ function media_tab_upload($ns,$auth=null,$jump='') {
     global $lang;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    echo '<div class="background-container">';
-    echo sprintf($lang['media_upload'], $ns ? $ns : '['.$lang['mediaroot'].']');
-    echo '</div>';
-
-    echo '<div class="scroll-container">';
-    if ($auth >= AUTH_UPLOAD) echo '<div class="upload">' . $lang['mediaupload'] . '</div>';
+    echo '<div class="upload">';
+    if ($auth >= AUTH_UPLOAD) {
+        echo '<p>' . $lang['mediaupload'] . '</p>';
+    }
     media_uploadform($ns, $auth, true);
     echo '</div>';
 }
@@ -784,13 +747,12 @@ function media_tab_search($ns,$auth=null) {
     $do = $_REQUEST['mediado'];
     $query = $_REQUEST['q'];
     if (!$query) $query = '';
+    echo '<div class="search">';
 
-    $sort = _media_get_sort_type();
-    media_tab_files_options($ns, $sort);
-
-    echo '<div class="scroll-container">';
     media_searchform($ns, $query, true);
-    if ($do == 'searchlist') media_searchlist($query,$ns,$auth,true,$sort);
+    if ($do == 'searchlist') {
+        media_searchlist($query,$ns,$auth,true,_media_get_sort_type());
+    }
     echo '</div>';
 }
 
@@ -803,14 +765,6 @@ function media_tab_view($image, $ns, $auth=null, $rev=false) {
     global $lang, $conf;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    echo '<div class="background-container">';
-    list($ext,$mime,$dl) = mimetype($image,false);
-    $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
-    $class = 'select mediafile mf_'.$class;
-    echo '<span class="'.$class.'" >'.$image.'</span>';
-    echo '</div>';
-
-    echo '<div class="scroll-container">';
     if ($image && $auth >= AUTH_READ) {
         $meta = new JpegMeta(mediaFN($image, $rev));
         media_preview($image, $auth, $rev, $meta);
@@ -820,7 +774,6 @@ function media_tab_view($image, $ns, $auth=null, $rev=false) {
     } else {
         echo '<div class="nothing">'.$lang['media_perm_read'].'</div>';
     }
-    echo '</div>';
 }
 
 /**
@@ -832,16 +785,10 @@ function media_tab_edit($image, $ns, $auth=null) {
     global $lang;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    echo '<div class="background-container">';
-    echo $lang['media_edit'];
-    echo '</div>';
-
-    echo '<div class="scroll-container">';
     if ($image) {
         list($ext, $mime) = mimetype($image);
         if ($mime == 'image/jpeg') media_metaform($image,$auth);
     }
-    echo '</div>';
 }
 
 /**
@@ -854,11 +801,6 @@ function media_tab_history($image, $ns, $auth=null) {
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
     $do = $_REQUEST['mediado'];
 
-    echo '<div class="background-container">';
-    echo $lang['media_history'];
-    echo '</div>';
-
-    echo '<div class="scroll-container">';
     if ($auth >= AUTH_READ && $image) {
         if ($do == 'diff'){
             media_diff($image, $ns, $auth);
@@ -869,7 +811,6 @@ function media_tab_history($image, $ns, $auth=null) {
     } else {
         echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
     }
-    echo '</div>';
 }
 
 /**
@@ -880,7 +821,7 @@ function media_tab_history($image, $ns, $auth=null) {
 function media_preview($image, $auth, $rev=false, $meta=false) {
     global $lang;
 
-    echo '<div class="mediamanager__preview">';
+    echo '<div class="image">';
 
     $size = media_image_preview_size($image, $rev, $meta);
 
@@ -896,7 +837,7 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
         $more['w'] = $size[0];
         $more['h'] = $size[1];
         $src = ml($image, $more);
-        echo '<img src="'.$src.'" alt="'.$image.'" style="max-width: '.$size[0].'px;" />';
+        echo '<img src="'.$src.'" alt="" style="max-width: '.$size[0].'px;" />';
     }
 
     echo '</div>';
@@ -910,7 +851,7 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
 function media_preview_buttons($image, $auth, $rev=false) {
     global $lang, $conf;
 
-    echo '<div class="mediamanager__preview_buttons">';
+    echo '<ul class="actions">';
 
     $more = '';
     if ($rev) {
@@ -924,9 +865,12 @@ function media_preview_buttons($image, $auth, $rev=false) {
     if (@file_exists(mediaFN($image, $rev))) {
 
         // view original file button
-        $form = new Doku_Form(array('action'=>$link, 'target'=>'_blank'));
+        $form = new Doku_Form(array('action'=>$link, 'method'=>'get', 'target' => '_blank'));
+        $form->addHidden('sectok', null);
         $form->addElement(form_makeButton('submit','',$lang['mediaview']));
+        echo '<li>';
         $form->printForm();
+        echo '</li>';
     }
 
     if($auth >= AUTH_DELETE && !$rev && @file_exists(mediaFN($image))){
@@ -935,8 +879,9 @@ function media_preview_buttons($image, $auth, $rev=false) {
         $form = new Doku_Form(array('id' => 'mediamanager__btn_delete',
             'action'=>media_managerURL(array('delete' => $image), '&')));
         $form->addElement(form_makeButton('submit','',$lang['btn_delete']));
+        echo '<li>';
         $form->printForm();
-
+        echo '</li>';
     }
 
     $auth_ow = (($conf['mediarevisions']) ? AUTH_UPLOAD : AUTH_DELETE);
@@ -946,7 +891,9 @@ function media_preview_buttons($image, $auth, $rev=false) {
         $form = new Doku_Form(array('id' => 'mediamanager__btn_update',
             'action'=>media_managerURL(array('image' => $image, 'mediado' => 'update'), '&')));
         $form->addElement(form_makeButton('submit','',$lang['media_update']));
+        echo '<li>';
         $form->printForm();
+        echo '</li>';
     }
 
     if($auth >= AUTH_UPLOAD && $rev && $conf['mediarevisions'] && @file_exists(mediaFN($image, $rev))){
@@ -957,10 +904,12 @@ function media_preview_buttons($image, $auth, $rev=false) {
         $form->addHidden('mediado','restore');
         $form->addHidden('rev',$rev);
         $form->addElement(form_makeButton('submit','',$lang['media_restore']));
+        echo '<li>';
         $form->printForm();
+        echo '</li>';
     }
 
-    echo '</div>';
+    echo '</ul>';
 }
 
 /**
@@ -1046,7 +995,7 @@ function media_details($image, $auth, $rev=false, $meta=false) {
     if (!$meta) $meta = new JpegMeta(mediaFN($image, $rev));
     $tags = media_file_tags($meta);
 
-    echo '<dl class="img_tags">';
+    echo '<dl>';
     foreach($tags as $tag){
         if ($tag['value']) {
             $value = cleanText($tag['value']);
@@ -1150,8 +1099,9 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
         $difftype = $_REQUEST['difftype'];
 
         if (!$fromajax) {
-            $form = new Doku_Form(array('action'=>media_managerURL(array(), '&'),
-                'id' => 'mediamanager__form_diffview'));
+            $form = new Doku_Form(array('action'=>media_managerURL(array(), '&'), 'method' => 'get'
+            ));
+            $form->addHidden('sectok', null);
             $form->addElement('<input type="hidden" name="rev2[]" value="'.$l_rev.'" ></input>');
             $form->addElement('<input type="hidden" name="rev2[]" value="'.$r_rev.'" ></input>');
             $form->addHidden('mediado', 'diff');
@@ -1167,57 +1117,76 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
         }
     }
 
-    echo '<div class="mediamanager-preview">';
-    echo '<ul id="mediamanager__diff_table">';
+    list($l_head, $r_head) = html_diff_head($l_rev, $r_rev, $image, true);
 
-    echo '<li>';
+    ?>
+    <table>
+      <tr>
+        <th><?php echo $l_head; ?></th>
+        <th><?php echo $r_head; ?></th>
+      </tr>
+    <?php
+
+    echo '<tr class="image">';
+    echo '<td>';
     media_preview($image, $auth, $l_rev, $l_meta);
-    echo '</li>';
+    echo '</td>';
 
-    echo '<li>';
+    echo '<td>';
     media_preview($image, $auth, $r_rev, $r_meta);
-    echo '</li>';
+    echo '</td>';
+    echo '</tr>';
 
-    echo '<li>';
+    echo '<tr class="actions">';
+    echo '<td>';
     media_preview_buttons($image, $auth, $l_rev);
-    echo '</li>';
+    echo '</td>';
 
-    echo '<li>';
+    echo '<td>';
     media_preview_buttons($image, $auth, $r_rev);
-    echo '</li>';
+    echo '</td>';
+    echo '</tr>';
 
     $l_tags = media_file_tags($l_meta);
     $r_tags = media_file_tags($r_meta);
+    // FIXME r_tags-only stuff
     foreach ($l_tags as $key => $l_tag) {
         if ($l_tag['value'] != $r_tags[$key]['value']) {
-            $r_tags[$key]['class'] = 'highlighted';
-            $l_tags[$key]['class'] = 'highlighted';
+            $r_tags[$key]['highlighted'] = true;
+            $l_tags[$key]['highlighted'] = true;
         } else if (!$l_tag['value'] || !$r_tags[$key]['value']) {
             unset($r_tags[$key]);
             unset($l_tags[$key]);
         }
     }
 
+    echo '<tr>';
     foreach(array($l_tags,$r_tags) as $tags){
-        echo '<li><div>';
+        echo '<td>';
 
         echo '<dl class="img_tags">';
         foreach($tags as $tag){
             $value = cleanText($tag['value']);
             if (!$value) $value = '-';
             echo '<dt>'.$lang[$tag['tag'][1]].':</dt>';
-            echo '<dd class="'.$tag['class'].'" >';
+            echo '<dd>';
+            if ($tag['highlighted']) {
+                echo '<strong>';
+            }
             if ($tag['tag'][2] == 'date') echo dformat($value);
             else echo hsc($value);
+            if ($tag['highlighted']) {
+                echo '</strong>';
+            }
             echo '</dd>';
         }
         echo '</dl>';
 
-        echo '</div></li>';
+        echo '</td>';
     }
+    echo '</tr>';
 
-    echo '</ul>';
-    echo '</div>';
+    echo '</table>';
 
     if ($is_img && !$fromajax) echo '</div>';
 }
@@ -1250,14 +1219,14 @@ function media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $type) {
     $r_src = ml($image, $r_more);
 
     // slider
-    echo '<div id="mediamanager__'.$type.'_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>';
+    echo '<div id="diff_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>';
 
-    // two image's in div's
-    echo '<div id="mediamanager__diff_layout">';
-    echo '<div id="mediamanager__diff_'.$type.'_image1" style="max-width: '.$l_size[0].'px;">';
+    // two images in divs
+    echo '<div id="diff_' . $type . '">';
+    echo '<div class="image1" style="max-width: '.$l_size[0].'px;">';
     echo '<img src="'.$l_src.'" alt="" />';
     echo '</div>';
-    echo '<div id="mediamanager__diff_'.$type.'_image2" style="max-width: '.$l_size[0].'px;">';
+    echo '<div class="image2" style="max-width: '.$l_size[0].'px;">';
     echo '<img src="'.$r_src.'" alt="" />';
     echo '</div>';
     echo '</div>';
@@ -1447,42 +1416,43 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
     $file = utf8_decodeFN($item['file']);
 
     // output
-    echo '<li><div>';
+    echo '<li><dl>';
 
+        echo '<dt>';
     if($item['isimg']) {
         media_printimgdetail($item, true);
 
     } else {
         echo '<a name="d_:'.$item['id'].'" class="image" title="'.$item['id'].'" href="'.
             media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']),
-            'tab_details' => 'view')).'"><span>';
+            'tab_details' => 'view')).'">';
         echo media_printicon($item['id']);
-        echo '</span></a>';
+        echo '</a>';
     }
+    echo '</dt>';
     //echo '<input type=checkbox />';
     if (!$display_namespace) {
         $name = hsc($file);
     } else {
         $name = hsc($item['id']);
     }
-    echo '<a href="'.media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']),
-        'tab_details' => 'view')).'" name="h_:'.$item['id'].'" class="name">'.$name.'</a>';
+    echo '<dd class="name"><a href="'.media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']),
+        'tab_details' => 'view')).'" name="h_:'.$item['id'].'">'.$name.'</a></dd>';
 
     if($item['isimg']){
         $size = '';
         $size .= (int) $item['meta']->getField('File.Width');
         $size .= '&#215;';
         $size .= (int) $item['meta']->getField('File.Height');
-        echo '<span class="size">'.$size.'</span>';
+        echo '<dd class="size">'.$size.'</dd>';
     } else {
-        echo '<span class="size">&nbsp;</span>';
+        echo '<dd class="size">&nbsp;</dd>';
     }
     $date = dformat($item['mtime']);
-    echo '<span class="date">'.$date.'</span>';
+    echo '<dd class="date">'.$date.'</dd>';
     $filesize = filesize_h($item['size']);
-    echo '<span class="filesize">'.$filesize.'</span>';
-    echo '<div class="clearer"></div>';
-    echo '</div></li>'.NL;
+    echo '<dd class="filesize">'.$filesize.'</dd>';
+    echo '</dl></li>'.NL;
 }
 
 /**
@@ -1661,7 +1631,6 @@ function media_searchform($ns,$query='',$fullscreen=false){
     else $params['action'] = media_managerURL(array(), '&');
     $form = new Doku_Form($params);
     if (!$fullscreen) $form->addElement('<div class="upload">' . $lang['mediasearch'] . '</div>');
-    $form->addElement(formSecurityToken());
     $form->addHidden('ns', $ns);
     if (!$fullscreen) $form->addHidden('do', 'searchlist');
     else $form->addHidden('mediado', 'searchlist');
diff --git a/inc/template.php b/inc/template.php
index 96e0668c2..58baca111 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1136,29 +1136,36 @@ function tpl_mediaFileList(){
     global $AUTH;
     global $NS;
     global $JUMPTO;
+    global $lang;
 
     $opened_tab = $_REQUEST['tab_files'];
     if (!$opened_tab || !in_array($opened_tab, array('files', 'upload', 'search'))) $opened_tab = 'files';
     if ($_REQUEST['mediado'] == 'update') $opened_tab = 'upload';
 
+    // FIXME: define lang
+    echo '<h2 class="a11y">' . sprintf($lang['filelist_desc'], $NS) .  '</h2>';
+
     media_tabs_files($opened_tab);
 
+    echo '<div class="panelHeader">';
+    echo '<h3>';
+    printf($lang['media_' . $opened_tab],
+           hsc($ns ? $ns : '['.$lang['mediaroot'].']'));
+    echo '</h3>';
+    if ($opened_tab === 'search' || $opened_tab === 'files') {
+        media_tab_files_options();
+    }
+    echo '</div>';
+
+    echo '<div class="panelContent">';
     if ($opened_tab == 'files') {
-        echo '<div id="mediamanager__files">';
         media_tab_files($NS,$AUTH,$JUMPTO);
-        echo '</div>';
-
     } elseif ($opened_tab == 'upload') {
-        echo '<div id="mediamanager__files">';
         media_tab_upload($NS,$AUTH,$JUMPTO);
-        echo '</div>';
-
     } elseif ($opened_tab == 'search') {
-        echo '<div id="mediamanager__files">';
         media_tab_search($NS,$AUTH);
-        echo '</div>';
     }
-
+    echo '</div>';
 }
 
 /**
@@ -1170,7 +1177,7 @@ function tpl_mediaFileList(){
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function tpl_mediaFileDetails($image, $rev){
-    global $AUTH, $NS, $conf, $DEL;
+    global $AUTH, $NS, $conf, $DEL, $lang;
 
     $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')) && $conf['mediarevisions']);
     if (!$image || (!file_exists(mediaFN($image)) && !$removed) || $DEL) return '';
@@ -1195,21 +1202,26 @@ function tpl_mediaFileDetails($image, $rev){
 
     media_tabs_details($image, $opened_tab);
 
+    echo '<div class="panelHeader"><h3>';
+    list($ext,$mime,$dl) = mimetype($image,false);
+    $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
+    $class = 'select mediafile mf_'.$class;
+    printf($lang['media_' . $opened_tab], $class, $image);
+    echo '</h3></div>';
+
+    echo '<div class="panelContent">';
+
     if ($opened_tab == 'view') {
-        echo '<div id="mediamanager__details">';
         media_tab_view($image, $NS, $AUTH, $rev);
-        echo '</div>';
 
     } elseif ($opened_tab == 'edit' && !$removed) {
-        echo '<div id="mediamanager__details">';
         media_tab_edit($image, $NS, $AUTH);
-        echo '</div>';
 
     } elseif ($opened_tab == 'history' && $conf['mediarevisions']) {
-        echo '<div id="mediamanager__details">';
         media_tab_history($image,$NS,$AUTH);
-        echo '</div>';
     }
+
+    echo '</div>';
 }
 
 /**
@@ -1482,44 +1494,37 @@ function tpl_favicon($types=array('favicon')) {
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function tpl_media() {
-    //
     global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $REV, $lang, $fullscreen, $conf;
     $fullscreen = true;
-    require_once(DOKU_INC.'lib/exe/mediamanager.php');
+    require_once DOKU_INC.'lib/exe/mediamanager.php';
 
     if ($_REQUEST['image']) $image = cleanID($_REQUEST['image']);
     if (isset($IMG)) $image = $IMG;
     if (isset($JUMPTO)) $image = $JUMPTO;
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
-    echo '<div id="mediamanager__page">';
     echo '<h1>'.$lang['btn_media'].'</h1>';
-    echo '<div id="mediamanager__layout">';
+    echo '<div id="mediamanager__page">';
 
-    echo '<div id="mediamanager__layout_namespaces" class="layout-resizable" >';
+    echo '<div class="panel namespaces">';
     html_msgarea();
-    echo '<div class="mediamanager-tabs">';
-    echo '<a href="#" class="selected">'.hsc($lang['namespaces']).'</a>';
-    echo '<div class="clearer"></div>';
-    echo '</div>';
-    echo '<div class="background-container">';
+    echo '<h2>'.hsc($lang['namespaces']).'</h2>';
+    echo '<div class="panelHeader">';
     echo hsc($lang['namespaces']);
     echo '</div>';
-    echo '<div class="scroll-container">';
-    tpl_mediaTree();
+
+    echo '<div class="panelContent">';
+    media_nstree($NS);
     echo '</div>';
     echo '</div>';
 
-    echo '<div id="mediamanager__layout_list" class="layout-resizable" >';
+    echo '<div class="panel filelist">';
     tpl_mediaFileList();
     echo '</div>';
 
-    echo '<div id="mediamanager__layout_detail" class="layout" >';
+    echo '<div class="panel file">';
     tpl_mediaFileDetails($image, $rev);
     echo '</div>';
-
-    echo '<div class="clearer"></div>';
-    echo '</div>';
     echo '</div>';
 }
 
-- 
cgit v1.2.3


From e546f04b31e036426fa2202297436fc4208475f3 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sun, 18 Sep 2011 09:55:45 +0200
Subject: Change className from form.actions to form.options

---
 inc/media.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index ea612ea3f..7999fd255 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -650,7 +650,7 @@ function media_tabs_details($image, $selected_tab = ''){
 function media_tab_files_options(){
     global $lang, $NS;
     $sort = _media_get_sort_type();
-    $form = new Doku_Form(array('class' => 'actions', 'method' => 'get'));
+    $form = new Doku_Form(array('class' => 'options', 'method' => 'get'));
     $form->addHidden('sectok', null);
     $form->addHidden('ns', $NS);
     $form->addHidden('do', 'media');
-- 
cgit v1.2.3


From 90f69556e88c39509172f5926ca29c1ae63e2103 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 18 Sep 2011 10:28:31 +0100
Subject: media manager: re-newed CSS roughly (more to come)

---
 inc/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/template.php b/inc/template.php
index 58baca111..e2549095c 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1513,7 +1513,7 @@ function tpl_media() {
     echo hsc($lang['namespaces']);
     echo '</div>';
 
-    echo '<div class="panelContent">';
+    echo '<div class="panelContent" id="media__tree">';
     media_nstree($NS);
     echo '</div>';
     echo '</div>';
-- 
cgit v1.2.3


From eaac63bb6c71253d7c2d4817c7ffc40cf4f13aeb Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sun, 18 Sep 2011 20:31:08 +0200
Subject: Fix mediamanager JS (diffs not yet working)

---
 inc/media.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 7999fd255..2900f3e4d 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1099,8 +1099,9 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
         $difftype = $_REQUEST['difftype'];
 
         if (!$fromajax) {
-            $form = new Doku_Form(array('action'=>media_managerURL(array(), '&'), 'method' => 'get'
-            ));
+            $form = new Doku_Form(array('action' => media_managerURL(array(), '&'),
+                                        'method' => 'get',
+                                        'id' => 'mediamanager__form_diffview'));
             $form->addHidden('sectok', null);
             $form->addElement('<input type="hidden" name="rev2[]" value="'.$l_rev.'" ></input>');
             $form->addElement('<input type="hidden" name="rev2[]" value="'.$r_rev.'" ></input>');
@@ -1219,10 +1220,10 @@ function media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $type) {
     $r_src = ml($image, $r_more);
 
     // slider
-    echo '<div id="diff_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>';
+    echo '<div class="diff_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>';
 
     // two images in divs
-    echo '<div id="diff_' . $type . '">';
+    echo '<div class="diff_' . $type . '">';
     echo '<div class="image1" style="max-width: '.$l_size[0].'px;">';
     echo '<img src="'.$l_src.'" alt="" />';
     echo '</div>';
-- 
cgit v1.2.3


From c57314fe779ba40a0d3d15fb315b7d6d9acfe730 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 18 Sep 2011 19:47:19 +0100
Subject: media manager: more CSS changes

---
 inc/media.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 7999fd255..bcc5e4400 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1430,7 +1430,6 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
         echo '</a>';
     }
     echo '</dt>';
-    //echo '<input type=checkbox />';
     if (!$display_namespace) {
         $name = hsc($file);
     } else {
-- 
cgit v1.2.3


From ba340a70c09e74be51cb8f41531ade7049b6a4fa Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 18 Sep 2011 20:43:58 +0100
Subject: media manager: word changes

---
 inc/lang/en/lang.php | 14 ++++++++------
 inc/template.php     |  7 +++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index fbfd0e34f..b68ca4730 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -334,6 +334,7 @@ $lang['wordblock']             = 'Your change was not saved because it contains
 
 $lang['media_uploadtab']       = 'Upload';
 $lang['media_searchtab']       = 'Search';
+$lang['media_file']            = 'File';
 $lang['media_viewtab']         = 'View';
 $lang['media_edittab']         = 'Edit';
 $lang['media_historytab']      = 'History';
@@ -341,12 +342,13 @@ $lang['media_list_thumbs']     = '<span>Show list as</span> thumbnails';
 $lang['media_list_rows']       = '<span>Show list as</span> list';
 $lang['media_sort_name']       = '<span>Sort by</span> name';
 $lang['media_sort_date']       = '<span>Sort by</span> date';
-$lang['media_files']           = 'Media files in the <strong>%s</strong> namespace.';
-$lang['media_upload']          = 'Upload to the <strong>%s</strong> namespace.';
-$lang['media_search']          = 'Search in the <strong>%s</strong> namespace.';
-$lang['media_view']            = '<span class="%s">%s</span>';
-$lang['media_edit']            = 'Edit <span class="%s">%s</span>';
-$lang['media_history']         = 'History of <span class="%s">%s</span>';
+$lang['media_namespaces']      = 'Choose namespace';
+$lang['media_files']           = 'Media files in <strong>%s</strong>';
+$lang['media_upload']          = 'Upload to <strong>%s</strong>';
+$lang['media_search']          = 'Search in <strong>%s</strong>';
+$lang['media_view']            = '<strong class="%s">%s</strong>';
+$lang['media_edit']            = 'Edit <strong class="%s">%s</strong>';
+$lang['media_history']         = 'History of <strong class="%s">%s</strong>';
 $lang['media_meta_edited']     = 'metadata edited';
 $lang['media_perm_read']       = 'Sorry, you don\'t have enough rights to read files.';
 $lang['media_perm_upload']     = 'Sorry, you don\'t have enough rights to upload files.';
diff --git a/inc/template.php b/inc/template.php
index e2549095c..aeb446b5b 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1508,9 +1508,9 @@ function tpl_media() {
 
     echo '<div class="panel namespaces">';
     html_msgarea();
-    echo '<h2>'.hsc($lang['namespaces']).'</h2>';
+    echo '<h2>'.$lang['namespaces'].'</h2>';
     echo '<div class="panelHeader">';
-    echo hsc($lang['namespaces']);
+    echo $lang['media_namespaces'];
     echo '</div>';
 
     echo '<div class="panelContent" id="media__tree">';
@@ -1519,12 +1519,15 @@ function tpl_media() {
     echo '</div>';
 
     echo '<div class="panel filelist">';
+    echo '<h2 class="a11y">'.$lang['mediaselect'].'</h2>';
     tpl_mediaFileList();
     echo '</div>';
 
     echo '<div class="panel file">';
+    echo '<h2 class="a11y">'.$lang['media_file'].'</h2>';
     tpl_mediaFileDetails($image, $rev);
     echo '</div>';
+
     echo '</div>';
 }
 
-- 
cgit v1.2.3


From 699c5072ff1d0470c53299ab9a4dfbb4457e7843 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 00:28:25 +0100
Subject: media manager: small functionality and css changes

---
 inc/html.php     |  9 ++++++---
 inc/media.php    | 27 ++++-----------------------
 inc/template.php |  4 +---
 3 files changed, 11 insertions(+), 29 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 66bc83127..8cf22de82 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1006,8 +1006,9 @@ function html_diff_head($l_rev, $r_rev, $id = null, $media = false) {
         $l_sum   = ($l_info['sum']) ? '<span class="sum">'.hsc($l_info['sum']).'</span>' : '';
         if ($l_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $l_minor = 'class="minor"';
 
+        $l_head_title = ($media) ? dformat($l_rev) : $id.' ['.dformat($l_rev).']';
         $l_head = '<a class="wikilink1" href="'.$ml_or_wl($id,"rev=$l_rev").'">'.
-        $id.' ['.dformat($l_rev).']</a>'.
+        $l_head_title.'</a>'.
         '<br />'.$l_user.' '.$l_sum;
     }
 
@@ -1023,8 +1024,9 @@ function html_diff_head($l_rev, $r_rev, $id = null, $media = false) {
         $r_sum  = ($r_info['sum']) ? '<span class="sum">'.hsc($r_info['sum']).'</span>' : '';
         if ($r_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
 
+        $r_head_title = ($media) ? dformat($r_rev) : $id.' ['.dformat($r_rev).']';
         $r_head = '<a class="wikilink1" href="'.$ml_or_wl($id,"rev=$r_rev").'">'.
-        $id.' ['.dformat($r_rev).']</a>'.
+        $r_head_title.'</a>'.
         '<br />'.$r_user.' '.$r_sum;
     }elseif($_rev = @filemtime($media_or_wikiFN($id))){
         $_info   = getRevisionInfo($id,$_rev,true, $media);
@@ -1038,8 +1040,9 @@ function html_diff_head($l_rev, $r_rev, $id = null, $media = false) {
         $_sum  = ($_info['sum']) ? '<span class="sum">'.hsc($_info['sum']).'</span>' : '';
         if ($_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
 
+        $r_head_title = ($media) ? dformat($_rev) : $id.' ['.dformat($_rev).']';
         $r_head  = '<a class="wikilink1" href="'.$ml_or_wl($id).'">'.
-        $id.' ['.dformat($_rev).']</a> '.
+        $r_head_title.'</a> '.
         '('.$lang['current'].')'.
         '<br />'.$_user.' '.$_sum;
     }else{
diff --git a/inc/media.php b/inc/media.php
index b6ee3cb03..e4beb3115 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -125,12 +125,14 @@ function media_metaform($id,$auth){
         $p['class'] = 'edit';
         $p['id']    = 'meta__'.$key;
         $p['name']  = 'meta['.$field[0].']';
+        $p_attrs    = array('class' => 'edit');
 
         $form->addElement('<div class="row">');
         if($field[2] == 'text'){
-            $form->addElement(form_makeField('text', $p['name'], $value, ($lang[$field[1]]) ? $lang[$field[1]] : $field[1] . ':', $p['id'], $p['class']));
+            $form->addElement(form_makeField('text', $p['name'], $value, ($lang[$field[1]]) ? $lang[$field[1]] : $field[1] . ':', $p['id'], $p['class'], $p_attrs));
         }else{
             $att = buildAttributes($p);
+            $form->addElement('<label for="meta__'.$key.'">'.$lang[$field[1]].'</label>');
             $form->addElement("<textarea $att rows=\"6\" cols=\"50\">".formText($value).'</textarea>');
         }
         $form->addElement('</div>');
@@ -853,26 +855,6 @@ function media_preview_buttons($image, $auth, $rev=false) {
 
     echo '<ul class="actions">';
 
-    $more = '';
-    if ($rev) {
-        $more = "rev=$rev";
-    } else {
-        $t = @filemtime(mediaFN($image));
-        $more = "t=$t";
-    }
-    $link = ml($image,$more,true,'&');
-
-    if (@file_exists(mediaFN($image, $rev))) {
-
-        // view original file button
-        $form = new Doku_Form(array('action'=>$link, 'method'=>'get', 'target' => '_blank'));
-        $form->addHidden('sectok', null);
-        $form->addElement(form_makeButton('submit','',$lang['mediaview']));
-        echo '<li>';
-        $form->printForm();
-        echo '</li>';
-    }
-
     if($auth >= AUTH_DELETE && !$rev && @file_exists(mediaFN($image))){
 
         // delete button
@@ -1484,12 +1466,11 @@ function media_printimgdetail($item, $fullscreen=false){
             $p['height'] = $h;
         }
         $p['alt']    = $item['id'];
-        $p['class']  = 'thumb';
         $att = buildAttributes($p);
 
         // output
         if ($fullscreen) {
-            echo '<a name="'.($index ? 'd' : 'l').'_:'.$item['id'].'" class="image'.$index.'" title="'.$item['id'].'" href="'.
+            echo '<a name="'.($index ? 'd' : 'l').'_:'.$item['id'].'" class="image '.($index ? 'tiny' : 'thumb').'" href="'.
                 media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']), 'tab_details' => 'view')).'">';
             echo '<span><img src="'.$src.'" '.$att.' /></span>';
             echo '</a>';
diff --git a/inc/template.php b/inc/template.php
index aeb446b5b..ffe5b84b4 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1142,8 +1142,7 @@ function tpl_mediaFileList(){
     if (!$opened_tab || !in_array($opened_tab, array('files', 'upload', 'search'))) $opened_tab = 'files';
     if ($_REQUEST['mediado'] == 'update') $opened_tab = 'upload';
 
-    // FIXME: define lang
-    echo '<h2 class="a11y">' . sprintf($lang['filelist_desc'], $NS) .  '</h2>';
+    echo '<h2 class="a11y">' . $lang['mediaselect'] . '</h2>';
 
     media_tabs_files($opened_tab);
 
@@ -1519,7 +1518,6 @@ function tpl_media() {
     echo '</div>';
 
     echo '<div class="panel filelist">';
-    echo '<h2 class="a11y">'.$lang['mediaselect'].'</h2>';
     tpl_mediaFileList();
     echo '</div>';
 
-- 
cgit v1.2.3


From 94add30314d7c0ed51fa78304ca342d0273b366c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 01:22:32 +0100
Subject: media manager: added a few newlines to the output

---
 inc/html.php     |  7 ++---
 inc/media.php    | 93 ++++++++++++++++++++++++++++----------------------------
 inc/template.php | 48 ++++++++++++++---------------
 3 files changed, 73 insertions(+), 75 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 8cf22de82..7f5a46b93 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1830,14 +1830,13 @@ function html_flashobject($swf,$width,$height,$params=null,$flashvars=null,$atts
 }
 
 function html_tabs($tabs, $current_tab = null) {
-    echo '<ul class="tabs">';
+    echo '<ul class="tabs">'.NL;
 
     foreach($tabs as $id => $tab) {
         html_tab($tab['href'], $tab['caption'], $id === $current_tab);
     }
 
-    echo '</ul>';
-    echo '<div class="clearer"></div>';
+    echo '</ul>'.NL;
 }
 /**
  * Prints a single tab
@@ -1859,7 +1858,7 @@ function html_tab($href, $caption, $selected=false) {
     }
     $tab .= hsc($caption)
          .  '</' . ($selected ? 'strong' : 'a') . '>'
-         .  '</li>';
+         .  '</li>'.NL;
     echo $tab;
 }
 
diff --git a/inc/media.php b/inc/media.php
index e4beb3115..560abc3bc 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -135,11 +135,11 @@ function media_metaform($id,$auth){
             $form->addElement('<label for="meta__'.$key.'">'.$lang[$field[1]].'</label>');
             $form->addElement("<textarea $att rows=\"6\" cols=\"50\">".formText($value).'</textarea>');
         }
-        $form->addElement('</div>');
+        $form->addElement('</div>'.NL);
     }
     $form->addElement('<div class="buttons">');
     $form->addElement(form_makeButton('submit', '', $lang['btn_save'], array('accesskey' => 's', 'name' => 'mediado[save]')));
-    $form->addElement('</div>');
+    $form->addElement('</div>'.NL);
     $form->printForm();
 }
 
@@ -578,9 +578,9 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=fals
             if ($fullscreenview) {
                 $view = $_REQUEST['list'];
                 if ($view == 'rows') {
-                    echo '<ul class="rows">';
+                    echo '<ul class="rows">'.NL;
                 } else {
-                    echo '<ul class="thumbs">';
+                    echo '<ul class="thumbs">'.NL;
                 }
             }
             foreach($data as $item){
@@ -590,7 +590,7 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=fals
                     media_printfile_thumbs($item,$auth,$jump);
                 }
             }
-            if ($fullscreenview) echo '</ul>';
+            if ($fullscreenview) echo '</ul>'.NL;
         }
     }
     if (!$fullscreenview) media_searchform($ns);
@@ -656,7 +656,7 @@ function media_tab_files_options(){
     $form->addHidden('sectok', null);
     $form->addHidden('ns', $NS);
     $form->addHidden('do', 'media');
-    $form->addElement('<ul>');
+    $form->addElement('<ul>'.NL);
     foreach(array('list' => array('listType', array('thumbs', 'rows')),
                   'sort' => array('sortBy', array('name', 'date'), $sort))
             as $group => $content) {
@@ -677,12 +677,12 @@ function media_tab_files_options(){
                                                   $content[0] . '__' . $option,
                                                   $option, $attrs));
         }
-        $form->addElement('</li>');
+        $form->addElement('</li>'.NL);
     }
     $form->addElement('<li>');
     $form->addElement(form_makeButton('submit', '', $lang['btn_apply']));
-    $form->addElement('</li>');
-    $form->addElement('</ul>');
+    $form->addElement('</li>'.NL);
+    $form->addElement('</ul>'.NL);
     $form->printForm();
 }
 
@@ -730,12 +730,12 @@ function media_tab_upload($ns,$auth=null,$jump='') {
     global $lang;
     if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
 
-    echo '<div class="upload">';
+    echo '<div class="upload">'.NL;
     if ($auth >= AUTH_UPLOAD) {
         echo '<p>' . $lang['mediaupload'] . '</p>';
     }
     media_uploadform($ns, $auth, true);
-    echo '</div>';
+    echo '</div>'.NL;
 }
 
 /**
@@ -749,13 +749,13 @@ function media_tab_search($ns,$auth=null) {
     $do = $_REQUEST['mediado'];
     $query = $_REQUEST['q'];
     if (!$query) $query = '';
-    echo '<div class="search">';
+    echo '<div class="search">'.NL;
 
     media_searchform($ns, $query, true);
     if ($do == 'searchlist') {
         media_searchlist($query,$ns,$auth,true,_media_get_sort_type());
     }
-    echo '</div>';
+    echo '</div>'.NL;
 }
 
 /**
@@ -774,7 +774,7 @@ function media_tab_view($image, $ns, $auth=null, $rev=false) {
         media_details($image, $auth, $rev, $meta);
 
     } else {
-        echo '<div class="nothing">'.$lang['media_perm_read'].'</div>';
+        echo '<div class="nothing">'.$lang['media_perm_read'].'</div>'.NL;
     }
 }
 
@@ -821,13 +821,12 @@ function media_tab_history($image, $ns, $auth=null) {
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function media_preview($image, $auth, $rev=false, $meta=false) {
-    global $lang;
-
-    echo '<div class="image">';
 
     $size = media_image_preview_size($image, $rev, $meta);
 
     if ($size) {
+        echo '<div class="image">';
+
         $more = array();
         if ($rev) {
             $more['rev'] = $rev;
@@ -840,9 +839,9 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
         $more['h'] = $size[1];
         $src = ml($image, $more);
         echo '<img src="'.$src.'" alt="" style="max-width: '.$size[0].'px;" />';
-    }
 
-    echo '</div>';
+        echo '</div>'.NL;
+    }
 }
 
 /**
@@ -853,7 +852,7 @@ function media_preview($image, $auth, $rev=false, $meta=false) {
 function media_preview_buttons($image, $auth, $rev=false) {
     global $lang, $conf;
 
-    echo '<ul class="actions">';
+    echo '<ul class="actions">'.NL;
 
     if($auth >= AUTH_DELETE && !$rev && @file_exists(mediaFN($image))){
 
@@ -863,7 +862,7 @@ function media_preview_buttons($image, $auth, $rev=false) {
         $form->addElement(form_makeButton('submit','',$lang['btn_delete']));
         echo '<li>';
         $form->printForm();
-        echo '</li>';
+        echo '</li>'.NL;
     }
 
     $auth_ow = (($conf['mediarevisions']) ? AUTH_UPLOAD : AUTH_DELETE);
@@ -875,7 +874,7 @@ function media_preview_buttons($image, $auth, $rev=false) {
         $form->addElement(form_makeButton('submit','',$lang['media_update']));
         echo '<li>';
         $form->printForm();
-        echo '</li>';
+        echo '</li>'.NL;
     }
 
     if($auth >= AUTH_UPLOAD && $rev && $conf['mediarevisions'] && @file_exists(mediaFN($image, $rev))){
@@ -888,10 +887,10 @@ function media_preview_buttons($image, $auth, $rev=false) {
         $form->addElement(form_makeButton('submit','',$lang['media_restore']));
         echo '<li>';
         $form->printForm();
-        echo '</li>';
+        echo '</li>'.NL;
     }
 
-    echo '</ul>';
+    echo '</ul>'.NL;
 }
 
 /**
@@ -977,17 +976,17 @@ function media_details($image, $auth, $rev=false, $meta=false) {
     if (!$meta) $meta = new JpegMeta(mediaFN($image, $rev));
     $tags = media_file_tags($meta);
 
-    echo '<dl>';
+    echo '<dl>'.NL;
     foreach($tags as $tag){
         if ($tag['value']) {
             $value = cleanText($tag['value']);
             echo '<dt>'.$lang[$tag['tag'][1]].':</dt><dd>';
             if ($tag['tag'][2] == 'date') echo dformat($value);
             else echo hsc($value);
-            echo '</dd>';
+            echo '</dd>'.NL;
         }
     }
-    echo '</dl>';
+    echo '</dl>'.NL;
 }
 
 /**
@@ -1090,7 +1089,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
             $form->addHidden('mediado', 'diff');
             $form->printForm();
 
-            echo '<div id="mediamanager__diff" >';
+            echo NL.'<div id="mediamanager__diff" >'.NL;
         }
 
         if ($difftype == 'opacity' || $difftype == 'portions') {
@@ -1118,7 +1117,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
     echo '<td>';
     media_preview($image, $auth, $r_rev, $r_meta);
     echo '</td>';
-    echo '</tr>';
+    echo '</tr>'.NL;
 
     echo '<tr class="actions">';
     echo '<td>';
@@ -1128,7 +1127,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
     echo '<td>';
     media_preview_buttons($image, $auth, $r_rev);
     echo '</td>';
-    echo '</tr>';
+    echo '</tr>'.NL;
 
     $l_tags = media_file_tags($l_meta);
     $r_tags = media_file_tags($r_meta);
@@ -1145,7 +1144,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
 
     echo '<tr>';
     foreach(array($l_tags,$r_tags) as $tags){
-        echo '<td>';
+        echo '<td>'.NL;
 
         echo '<dl class="img_tags">';
         foreach($tags as $tag){
@@ -1163,13 +1162,13 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
             }
             echo '</dd>';
         }
-        echo '</dl>';
+        echo '</dl>'.NL;
 
         echo '</td>';
     }
-    echo '</tr>';
+    echo '</tr>'.NL;
 
-    echo '</table>';
+    echo '</table>'.NL;
 
     if ($is_img && !$fromajax) echo '</div>';
 }
@@ -1298,16 +1297,16 @@ function media_searchlist($query,$ns,$auth=null,$fullscreen=false,$sort=''){
         if ($fullscreen) {
             $view = $_REQUEST['view'];
             if ($view == 'list') {
-                echo '<ul class="mediamanager-list" id="mediamanager__file_list">';
+                echo '<ul class="mediamanager-list" id="mediamanager__file_list">'.NL;
             } else {
-                echo '<ul class="mediamanager-thumbs" id="mediamanager__file_list">';
+                echo '<ul class="mediamanager-thumbs" id="mediamanager__file_list">'.NL;
             }
         }
         foreach($evdata['data'] as $item){
             if (!$fullscreen) media_printfile($item,$item['perm'],'',true);
             else media_printfile_thumbs($item,$item['perm'],false,true);
         }
-        if ($fullscreen) echo '</ul>';
+        if ($fullscreen) echo '</ul>'.NL;
     }
 }
 
@@ -1399,7 +1398,7 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
     $file = utf8_decodeFN($item['file']);
 
     // output
-    echo '<li><dl>';
+    echo '<li><dl>'.NL;
 
         echo '<dt>';
     if($item['isimg']) {
@@ -1412,28 +1411,28 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
         echo media_printicon($item['id']);
         echo '</a>';
     }
-    echo '</dt>';
+    echo '</dt>'.NL;
     if (!$display_namespace) {
         $name = hsc($file);
     } else {
         $name = hsc($item['id']);
     }
     echo '<dd class="name"><a href="'.media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']),
-        'tab_details' => 'view')).'" name="h_:'.$item['id'].'">'.$name.'</a></dd>';
+        'tab_details' => 'view')).'" name="h_:'.$item['id'].'">'.$name.'</a></dd>'.NL;
 
     if($item['isimg']){
         $size = '';
         $size .= (int) $item['meta']->getField('File.Width');
         $size .= '&#215;';
         $size .= (int) $item['meta']->getField('File.Height');
-        echo '<dd class="size">'.$size.'</dd>';
+        echo '<dd class="size">'.$size.'</dd>'.NL;
     } else {
-        echo '<dd class="size">&nbsp;</dd>';
+        echo '<dd class="size">&nbsp;</dd>'.NL;
     }
     $date = dformat($item['mtime']);
-    echo '<dd class="date">'.$date.'</dd>';
+    echo '<dd class="date">'.$date.'</dd>'.NL;
     $filesize = filesize_h($item['size']);
-    echo '<dd class="filesize">'.$filesize.'</dd>';
+    echo '<dd class="filesize">'.$filesize.'</dd>'.NL;
     echo '</dl></li>'.NL;
 }
 
@@ -1592,9 +1591,9 @@ function media_uploadform($ns, $auth, $fullscreen = false){
         $form->addElement(form_makeCloseTag('p'));
     }
 
-    echo '<div id="mediamanager__uploader">';
+    echo NL.'<div id="mediamanager__uploader">'.NL;
     html_form('upload', $form);
-    echo '</div>';
+    echo '</div>'.NL;
 }
 
 /**
@@ -1611,7 +1610,7 @@ function media_searchform($ns,$query='',$fullscreen=false){
     if (!$fullscreen) $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php';
     else $params['action'] = media_managerURL(array(), '&');
     $form = new Doku_Form($params);
-    if (!$fullscreen) $form->addElement('<div class="upload">' . $lang['mediasearch'] . '</div>');
+    if (!$fullscreen) $form->addElement('<div class="upload">' . $lang['mediasearch'] . '</div>'.NL);
     $form->addHidden('ns', $ns);
     if (!$fullscreen) $form->addHidden('do', 'searchlist');
     else $form->addHidden('mediado', 'searchlist');
diff --git a/inc/template.php b/inc/template.php
index ffe5b84b4..77d52fece 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1142,21 +1142,21 @@ function tpl_mediaFileList(){
     if (!$opened_tab || !in_array($opened_tab, array('files', 'upload', 'search'))) $opened_tab = 'files';
     if ($_REQUEST['mediado'] == 'update') $opened_tab = 'upload';
 
-    echo '<h2 class="a11y">' . $lang['mediaselect'] . '</h2>';
+    echo '<h2 class="a11y">' . $lang['mediaselect'] . '</h2>'.NL;
 
     media_tabs_files($opened_tab);
 
-    echo '<div class="panelHeader">';
+    echo '<div class="panelHeader">'.NL;
     echo '<h3>';
     printf($lang['media_' . $opened_tab],
            hsc($ns ? $ns : '['.$lang['mediaroot'].']'));
-    echo '</h3>';
+    echo '</h3>'.NL;
     if ($opened_tab === 'search' || $opened_tab === 'files') {
         media_tab_files_options();
     }
-    echo '</div>';
+    echo '</div>'.NL;
 
-    echo '<div class="panelContent">';
+    echo '<div class="panelContent">'.NL;
     if ($opened_tab == 'files') {
         media_tab_files($NS,$AUTH,$JUMPTO);
     } elseif ($opened_tab == 'upload') {
@@ -1164,7 +1164,7 @@ function tpl_mediaFileList(){
     } elseif ($opened_tab == 'search') {
         media_tab_search($NS,$AUTH);
     }
-    echo '</div>';
+    echo '</div>'.NL;
 }
 
 /**
@@ -1206,9 +1206,9 @@ function tpl_mediaFileDetails($image, $rev){
     $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
     $class = 'select mediafile mf_'.$class;
     printf($lang['media_' . $opened_tab], $class, $image);
-    echo '</h3></div>';
+    echo '</h3></div>'.NL;
 
-    echo '<div class="panelContent">';
+    echo '<div class="panelContent">'.NL;
 
     if ($opened_tab == 'view') {
         media_tab_view($image, $NS, $AUTH, $rev);
@@ -1220,7 +1220,7 @@ function tpl_mediaFileDetails($image, $rev){
         media_tab_history($image,$NS,$AUTH);
     }
 
-    echo '</div>';
+    echo '</div>'.NL;
 }
 
 /**
@@ -1502,31 +1502,31 @@ function tpl_media() {
     if (isset($JUMPTO)) $image = $JUMPTO;
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
-    echo '<h1>'.$lang['btn_media'].'</h1>';
-    echo '<div id="mediamanager__page">';
-
-    echo '<div class="panel namespaces">';
+    echo '<h1>'.$lang['btn_media'].'</h1>'.NL;
+    echo '<div id="mediamanager__page">'.NL;
     html_msgarea();
-    echo '<h2>'.$lang['namespaces'].'</h2>';
+
+    echo '<div class="panel namespaces">'.NL;
+    echo '<h2>'.$lang['namespaces'].'</h2>'.NL;
     echo '<div class="panelHeader">';
     echo $lang['media_namespaces'];
-    echo '</div>';
+    echo '</div>'.NL;
 
-    echo '<div class="panelContent" id="media__tree">';
+    echo '<div class="panelContent" id="media__tree">'.NL;
     media_nstree($NS);
-    echo '</div>';
-    echo '</div>';
+    echo '</div>'.NL;
+    echo '</div>'.NL;
 
-    echo '<div class="panel filelist">';
+    echo '<div class="panel filelist">'.NL;
     tpl_mediaFileList();
-    echo '</div>';
+    echo '</div>'.NL;
 
-    echo '<div class="panel file">';
-    echo '<h2 class="a11y">'.$lang['media_file'].'</h2>';
+    echo '<div class="panel file">'.NL;
+    echo '<h2 class="a11y">'.$lang['media_file'].'</h2>'.NL;
     tpl_mediaFileDetails($image, $rev);
-    echo '</div>';
+    echo '</div>'.NL;
 
-    echo '</div>';
+    echo '</div>'.NL;
 }
 
 //Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From 026d14a9c6bccdf50efdbf2e662c2ab1b72af2c3 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 10:22:06 +0100
Subject: media manager: moved some html out of lang.php and fixed namespace in
 middle panel

---
 inc/lang/en/lang.php | 12 ++++++------
 inc/template.php     |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index b68ca4730..2ee6240b9 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -343,12 +343,12 @@ $lang['media_list_rows']       = '<span>Show list as</span> list';
 $lang['media_sort_name']       = '<span>Sort by</span> name';
 $lang['media_sort_date']       = '<span>Sort by</span> date';
 $lang['media_namespaces']      = 'Choose namespace';
-$lang['media_files']           = 'Media files in <strong>%s</strong>';
-$lang['media_upload']          = 'Upload to <strong>%s</strong>';
-$lang['media_search']          = 'Search in <strong>%s</strong>';
-$lang['media_view']            = '<strong class="%s">%s</strong>';
-$lang['media_edit']            = 'Edit <strong class="%s">%s</strong>';
-$lang['media_history']         = 'History of <strong class="%s">%s</strong>';
+$lang['media_files']           = 'Media files in %s';
+$lang['media_upload']          = 'Upload to %s';
+$lang['media_search']          = 'Search in %s';
+$lang['media_view']            = '%s';
+$lang['media_edit']            = 'Edit %s';
+$lang['media_history']         = 'History of %s';
 $lang['media_meta_edited']     = 'metadata edited';
 $lang['media_perm_read']       = 'Sorry, you don\'t have enough rights to read files.';
 $lang['media_perm_upload']     = 'Sorry, you don\'t have enough rights to upload files.';
diff --git a/inc/template.php b/inc/template.php
index 77d52fece..718fbd125 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1148,8 +1148,8 @@ function tpl_mediaFileList(){
 
     echo '<div class="panelHeader">'.NL;
     echo '<h3>';
-    printf($lang['media_' . $opened_tab],
-           hsc($ns ? $ns : '['.$lang['mediaroot'].']'));
+    $tabTitle = ($NS) ? $NS : '['.$lang['mediaroot'].']';
+    printf($lang['media_' . $opened_tab], '<strong>'.$tabTitle.'</strong>');
     echo '</h3>'.NL;
     if ($opened_tab === 'search' || $opened_tab === 'files') {
         media_tab_files_options();
@@ -1205,7 +1205,8 @@ function tpl_mediaFileDetails($image, $rev){
     list($ext,$mime,$dl) = mimetype($image,false);
     $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
     $class = 'select mediafile mf_'.$class;
-    printf($lang['media_' . $opened_tab], $class, $image);
+    $tabTitle = '<strong class="'.$class.'">'.$image.'</strong>';
+    printf($lang['media_' . $opened_tab], $tabTitle);
     echo '</h3></div>'.NL;
 
     echo '<div class="panelContent">'.NL;
-- 
cgit v1.2.3


From fba0b25db639efd576e78d9a4258de5c8ef916b6 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 11:00:23 +0100
Subject: media manager: improved spacing around option buttons and changed
 lang strings for them

---
 inc/lang/en/lang.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 2ee6240b9..3a5eb0e9b 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -338,10 +338,10 @@ $lang['media_file']            = 'File';
 $lang['media_viewtab']         = 'View';
 $lang['media_edittab']         = 'Edit';
 $lang['media_historytab']      = 'History';
-$lang['media_list_thumbs']     = '<span>Show list as</span> thumbnails';
-$lang['media_list_rows']       = '<span>Show list as</span> list';
-$lang['media_sort_name']       = '<span>Sort by</span> name';
-$lang['media_sort_date']       = '<span>Sort by</span> date';
+$lang['media_list_thumbs']     = 'Thumbnails';
+$lang['media_list_rows']       = 'List';
+$lang['media_sort_name']       = 'Name';
+$lang['media_sort_date']       = 'Date';
 $lang['media_namespaces']      = 'Choose namespace';
 $lang['media_files']           = 'Media files in %s';
 $lang['media_upload']          = 'Upload to %s';
-- 
cgit v1.2.3


From add1dac08a50d721dedeb498c12beba09575420f Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 11:02:00 +0100
Subject: media manager: shortened text for media list headline

---
 inc/lang/en/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 3a5eb0e9b..bfa8920a5 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -343,7 +343,7 @@ $lang['media_list_rows']       = 'List';
 $lang['media_sort_name']       = 'Name';
 $lang['media_sort_date']       = 'Date';
 $lang['media_namespaces']      = 'Choose namespace';
-$lang['media_files']           = 'Media files in %s';
+$lang['media_files']           = 'Files in %s';
 $lang['media_upload']          = 'Upload to %s';
 $lang['media_search']          = 'Search in %s';
 $lang['media_view']            = '%s';
-- 
cgit v1.2.3


From 8db1e1e98b267e53ad82b4ff4bcb4caef24a70c9 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 11:21:11 +0100
Subject: media manager: renamed List display option to 'Rows'

---
 inc/lang/en/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index bfa8920a5..25088a40c 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -339,7 +339,7 @@ $lang['media_viewtab']         = 'View';
 $lang['media_edittab']         = 'Edit';
 $lang['media_historytab']      = 'History';
 $lang['media_list_thumbs']     = 'Thumbnails';
-$lang['media_list_rows']       = 'List';
+$lang['media_list_rows']       = 'Rows';
 $lang['media_sort_name']       = 'Name';
 $lang['media_sort_date']       = 'Date';
 $lang['media_namespaces']      = 'Choose namespace';
-- 
cgit v1.2.3


From 8b8998596af1a9dd2d4fcfac9f6b4393fcf69d57 Mon Sep 17 00:00:00 2001
From: Petros Vidalis <pvidalis@gmail.com>
Date: Mon, 19 Sep 2011 13:16:25 +0200
Subject: Greek language update

---
 inc/lang/el/lang.php | 45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php
index 373dc5463..de8705db9 100644
--- a/inc/lang/el/lang.php
+++ b/inc/lang/el/lang.php
@@ -7,6 +7,7 @@
  * @author Αθανάσιος Νταής <homunculus@wana.gr>
  * @author Konstantinos Koryllos <koryllos@gmail.com>
  * @author George Petsagourakis <petsagouris@gmail.com>
+ * @author Petros Vidalis <pvidalis@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -48,6 +49,8 @@ $lang['btn_recover']           = 'Επαναφορά αυτόματα αποθη
 $lang['btn_draftdel']          = 'Διαγραφή αυτόματα αποθηκευμένης σελίδας';
 $lang['btn_revert']            = 'Αποκατάσταση';
 $lang['btn_register']          = 'Εγγραφή';
+$lang['btn_apply']             = 'Εφαρμογή';
+$lang['btn_media']             = 'Διαχειριστής πολυμέσων';
 $lang['loggedinas']            = 'Συνδεδεμένος ως';
 $lang['user']                  = 'Όνομα χρήστη';
 $lang['pass']                  = 'Κωδικός';
@@ -92,7 +95,7 @@ $lang['txt_filename']          = 'Επιλέξτε νέο όνομα αρχεί
 $lang['txt_overwrt']           = 'Αντικατάσταση υπάρχοντος αρχείου';
 $lang['lockedby']              = 'Προσωρινά κλειδωμένο από';
 $lang['lockexpire']            = 'Το κλείδωμα λήγει στις';
-$lang['js']['willexpire']            = 'Το κλείδωμά σας για την επεξεργασία αυτής της σελίδας θα λήξει σε ένα λεπτό.\n Για να το ανανεώσετε χρησιμοποιήστε την Προεπισκόπηση.';
+$lang['js']['willexpire']      = 'Το κλείδωμά σας για την επεξεργασία αυτής της σελίδας θα λήξει σε ένα λεπτό.\n Για να το ανανεώσετε χρησιμοποιήστε την Προεπισκόπηση.';
 $lang['js']['notsavedyet']     = 'Οι μη αποθηκευμένες αλλαγές θα χαθούν.
 Θέλετε να συνεχίσετε;';
 $lang['js']['searchmedia']     = 'Αναζήτηση για αρχεία';
@@ -125,6 +128,17 @@ $lang['js']['linkwiz']         = 'Αυτόματος Οδηγός Συνδέσμ
 $lang['js']['linkto']          = 'Σύνδεση σε:';
 $lang['js']['del_confirm']     = 'Να διαγραφεί;';
 $lang['js']['mu_btn']          = 'Ταυτόχρονη φόρτωση πολλαπλών φακέλων';
+$lang['js']['restore_confirm'] = 'Θέλετε την επαναφορά σε αυτή την έκδοση;';
+$lang['js']['media_diff']      = 'Εμφάνιση διαφορών:';
+$lang['js']['media_diff_both'] = 'Δίπλα δίπλα';
+$lang['js']['media_diff_opacity'] = 'Επικάλυψη';
+$lang['js']['media_diff_portions'] = 'Κύλιση';
+$lang['js']['media_select']    = 'Επιλογή αρχείων...';
+$lang['js']['media_upload_btn'] = 'Φόρτωση';
+$lang['js']['media_done_btn']  = 'Ολοκλήρωση';
+$lang['js']['media_drop']      = 'Ρίξτε αρχεία εδώ για να τα φορτώσετε';
+$lang['js']['media_cancel']    = 'αφαίρεση';
+$lang['js']['media_overwrt']   = 'Αντικατάσταση υπάρχοντων αρχείων';
 $lang['rssfailed']             = 'Παρουσιάστηκε κάποιο σφάλμα κατά την ανάγνωση αυτού του feed: ';
 $lang['nothingfound']          = 'Δεν βρέθηκαν σχετικά αποτελέσματα.';
 $lang['mediaselect']           = 'Επιλογή Αρχείων';
@@ -179,6 +193,10 @@ $lang['mail_changed']          = 'σελίδα τροποποιήθηκε:';
 $lang['mail_subscribe_list']   = 'σελίδες που άλλαξαν στον φάκελο:';
 $lang['mail_new_user']         = 'νέος χρήστης:';
 $lang['mail_upload']           = 'αρχείο φορτώθηκε:';
+$lang['changes_type']          = 'Εμφάνιση αλλαγών του';
+$lang['pages_changes']         = 'Σελίδες';
+$lang['media_changes']         = 'Αρχεία πολυμέσων';
+$lang['both_changes']          = 'Σελίδες και αρχεία πολυμέσων';
 $lang['qb_bold']               = 'Έντονο Κείμενο';
 $lang['qb_italic']             = 'Πλάγιο Κείμενο';
 $lang['qb_underl']             = 'Υπογραμμισμένο Κείμενο';
@@ -219,6 +237,9 @@ $lang['img_copyr']             = 'Copyright';
 $lang['img_format']            = 'Format';
 $lang['img_camera']            = 'Camera';
 $lang['img_keywords']          = 'Λέξεις-κλειδιά';
+$lang['img_width']             = 'Πλάτος';
+$lang['img_height']            = 'Ύψος';
+$lang['img_manager']           = 'Εμφάνιση στον διαχειριστή πολυμέσων';
 $lang['subscr_subscribe_success'] = 'Ο/η %s προστέθηκε στην λίστα ειδοποιήσεων για το %s';
 $lang['subscr_subscribe_error'] = 'Σφάλμα κατά την προσθήκη του/της %s στην λίστα ειδοποιήσεων για το %s';
 $lang['subscr_subscribe_noaddress'] = 'Δεν υπάρχει διεύθυνση ταχυδρομείου συσχετισμένη με το όνομα χρήστη σας. Κατά συνέπεια δεν μπορείτε να προστεθείτε στην λίστα ειδοποιήσεων';
@@ -283,4 +304,24 @@ $lang['days']                  = 'πριν %d ημέρες';
 $lang['hours']                 = 'πριν %d ώρες';
 $lang['minutes']               = 'πριν %d λεπτά';
 $lang['seconds']               = 'πριν %d δευτερόλεπτα';
-$lang['wordblock']             = 'Η αλλαγή σας δεν αποθηκεύτηκε γιατί περιείχε spam.';
\ No newline at end of file
+$lang['wordblock']             = 'Η αλλαγή σας δεν αποθηκεύτηκε γιατί περιείχε spam.';
+$lang['media_uploadtab']       = 'Φόρτωση';
+$lang['media_searchtab']       = 'Αναζήτηση';
+$lang['media_viewtab']         = 'Εμφάνιση';
+$lang['media_edittab']         = 'Επεξεργασία';
+$lang['media_historytab']      = 'Ιστορικό';
+$lang['media_thumbsview']      = 'Προεπισκόπιση';
+$lang['media_listview']        = 'Λίστα';
+$lang['media_sort']            = 'Ταξινόμιση';
+$lang['media_sort_name']       = 'ανά όνομα';
+$lang['media_sort_date']       = 'ανά ημερομηνία';
+$lang['media_upload']          = 'Φόρτωση στο <strong>%s</strong> φάκελο.';
+$lang['media_search']          = 'Αναζήτηση στο <strong>%s</strong> φάκελο.';
+$lang['media_edit']            = 'Επεξεργασία';
+$lang['media_history']         = 'Αυτές είναι οι παλαιότερες αναθεωρήσεις του αρχείου.';
+$lang['media_meta_edited']     = 'τα μεταδεδομένα επεξεργάστηκαν';
+$lang['media_perm_read']       = 'Συγνώμη, δεν έχετε επαρκή διακαιώματα για να διαβάσετε αυτά τα αρχεία.';
+$lang['media_perm_upload']     = 'Συγνώμη, δεν έχετε επαρκή διακαιώματα για να φορτώσετε αυτά τα αρχεία.';
+$lang['media_update']          = 'Φόρτωση νέας έκδοσης';
+$lang['media_restore']         = 'Επαναφορά αυτή της έκδοσης';
+$lang['plugin_install_err']    = 'Η επέκταση δεν εγκαταστήθηκε σωστά. Μετονομασία φακέλου επεκτάσεων από \'%s\' σε \'%s\'.';
-- 
cgit v1.2.3


From b1ba68599b1aaf3242332cfd97b167f999fd788c Mon Sep 17 00:00:00 2001
From: Robert Bogenschneider <robog@gmx.de>
Date: Mon, 19 Sep 2011 13:17:43 +0200
Subject: Esperanto language update

---
 inc/lang/eo/lang.php | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index 14bc56405..94bd244ac 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -9,6 +9,7 @@
  * @author Felipe Castro <fefcas@gmail.com>
  * @author Robert Bogenschneider <robog@gmx.de>
  * @author Erik Pedersen <erik.pedersen@shaw.ca>
+ * @author Robert BOGENSCHNEIDER <bogi@UEA.org>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -50,6 +51,8 @@ $lang['btn_recover']           = 'Restarigi skizon';
 $lang['btn_draftdel']          = 'Forigi skizon';
 $lang['btn_revert']            = 'Restarigi';
 $lang['btn_register']          = 'Registriĝi';
+$lang['btn_apply']             = 'Apliki';
+$lang['btn_media']             = 'Media-administrilo';
 $lang['loggedinas']            = 'Ensalutita kiel';
 $lang['user']                  = 'Uzant-nomo';
 $lang['pass']                  = 'Pasvorto';
@@ -94,7 +97,7 @@ $lang['txt_filename']          = 'Alŝuti kiel (laŭvole)';
 $lang['txt_overwrt']           = 'Anstataŭigi ekzistantan dosieron';
 $lang['lockedby']              = 'Nune ŝlosita de';
 $lang['lockexpire']            = 'Ŝlosado ĉesos en';
-$lang['js']['willexpire']            = 'Vi povos redakti ĉi tiun paĝon post unu minuto.\nSe vi volas nuligi tempkontrolon de la ŝlosado, do premu butonon "Antaŭrigardi".';
+$lang['js']['willexpire']      = 'Vi povos redakti ĉi tiun paĝon post unu minuto.\nSe vi volas nuligi tempkontrolon de la ŝlosado, do premu butonon "Antaŭrigardi".';
 $lang['js']['notsavedyet']     = 'Ne konservitaj modifoj perdiĝos.
 Ĉu vi certe volas daŭrigi la procezon?';
 $lang['js']['searchmedia']     = 'Serĉi dosierojn';
@@ -127,6 +130,17 @@ $lang['js']['linkwiz']         = 'Ligil-Asistanto';
 $lang['js']['linkto']          = 'Ligilo al:';
 $lang['js']['del_confirm']     = 'Ĉu vere forigi elektitajn ero(j)n?';
 $lang['js']['mu_btn']          = 'Alŝuti plurajn dosierojn multope.';
+$lang['js']['restore_confirm'] = 'Ĉu vere restarigi ĉi tiun version?';
+$lang['js']['media_diff']      = 'Rigardu la diferencojn:';
+$lang['js']['media_diff_both'] = 'Flankon apud flanko';
+$lang['js']['media_diff_opacity'] = 'Unu super la alia';
+$lang['js']['media_diff_portions'] = 'Ŝovilo';
+$lang['js']['media_select']    = 'Elektu dosierojn...';
+$lang['js']['media_upload_btn'] = 'Alŝuto';
+$lang['js']['media_done_btn']  = 'Finita';
+$lang['js']['media_drop']      = 'Demetu ĉi-tien por alŝuti';
+$lang['js']['media_cancel']    = 'forigi';
+$lang['js']['media_overwrt']   = 'Anstataûi ekzistantajn dosierojn';
 $lang['rssfailed']             = 'Okazis eraro dum ricevado de la novaĵ-fluo: ';
 $lang['nothingfound']          = 'Ankoraŭ nenio troviĝas tie ĉi.';
 $lang['mediaselect']           = 'Elekto de aŭdvidaĵa dosiero';
@@ -181,6 +195,10 @@ $lang['mail_changed']          = 'paĝo modifita:';
 $lang['mail_subscribe_list']   = 'ŝanĝitaj paĝoj en nomspaco:';
 $lang['mail_new_user']         = 'Nova uzanto:';
 $lang['mail_upload']           = 'dosiero alŝutita:';
+$lang['changes_type']          = 'Rigardi ŝanĝojn de';
+$lang['pages_changes']         = 'Paĝoj';
+$lang['media_changes']         = 'Mediaj dosieroj';
+$lang['both_changes']          = 'Ambaû - paĝojn kaj mediajn dosierojn';
 $lang['qb_bold']               = 'Dika teksto';
 $lang['qb_italic']             = 'Dekliva teksto';
 $lang['qb_underl']             = 'Substrekita teksto';
@@ -221,6 +239,9 @@ $lang['img_copyr']             = 'Kopirajtoj';
 $lang['img_format']            = 'Formato';
 $lang['img_camera']            = 'Kamerao';
 $lang['img_keywords']          = 'Ŝlosilvortoj';
+$lang['img_width']             = 'Larĝeco';
+$lang['img_height']            = 'Alteco';
+$lang['img_manager']           = 'Rigardi en media-administrilo';
 $lang['subscr_subscribe_success'] = 'Aldonis %s al la abonlisto por %s';
 $lang['subscr_subscribe_error'] = 'Eraro dum aldono de %s al la abonlisto por %s';
 $lang['subscr_subscribe_noaddress'] = 'Ne estas adreso ligita al via ensaluto, ne eblas aldoni vin al la abonlisto';
@@ -286,3 +307,23 @@ $lang['hours']                 = 'antaŭ %d horoj';
 $lang['minutes']               = 'antaŭ %d minutoj';
 $lang['seconds']               = 'antaŭ %d sekundoj';
 $lang['wordblock']             = 'Via ŝanĝo ne estis savita, ĉar ĝi enhavas blokitan tekston (spamon).';
+$lang['media_uploadtab']       = 'Alŝuto';
+$lang['media_searchtab']       = 'Serĉo';
+$lang['media_viewtab']         = 'Rigardi';
+$lang['media_edittab']         = 'Modifi';
+$lang['media_historytab']      = 'Historio';
+$lang['media_thumbsview']      = 'Bildetoj';
+$lang['media_listview']        = 'Listigi';
+$lang['media_sort']            = 'Sorti';
+$lang['media_sort_name']       = 'per nomo';
+$lang['media_sort_date']       = 'per dato';
+$lang['media_upload']          = 'Alŝuti al la nomspaco <strong>%s</strong>.';
+$lang['media_search']          = 'Serĉi en la nomspaco <strong>%s</strong>.';
+$lang['media_edit']            = 'Modifi';
+$lang['media_history']         = 'Tiuj estas la pli malnovaj revizioj de la dosiero.';
+$lang['media_meta_edited']     = 'metadatumoj ŝanĝitaj';
+$lang['media_perm_read']       = 'Bedaûrinde viaj rajtoj ne sufiĉas por legi dosierojn.';
+$lang['media_perm_upload']     = 'Bedaûrinde viaj rajtoj ne sufiĉas por alŝuti dosierojn.';
+$lang['media_update']          = 'Alŝuti novan version';
+$lang['media_restore']         = 'Restarigi ĉi tiun version';
+$lang['plugin_install_err']    = 'Kromaĵo instalita malĝuste. Renomu la kromaĵan dosierujon \'%s\' al \'%s\'.';
-- 
cgit v1.2.3


From 54a5505521ae2d30ec6348c5350c0adc7466379a Mon Sep 17 00:00:00 2001
From: Otto Vainio <otto@valjakko.net>
Date: Mon, 19 Sep 2011 13:19:11 +0200
Subject: Finnish language update

---
 inc/lang/fi/lang.php | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index a2f2e2027..83d487302 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -49,6 +49,8 @@ $lang['btn_recover']           = 'Palauta luonnos';
 $lang['btn_draftdel']          = 'Poista luonnos';
 $lang['btn_revert']            = 'palauta';
 $lang['btn_register']          = 'Rekisteröidy';
+$lang['btn_apply']             = 'Toteuta';
+$lang['btn_media']             = 'Media manager';
 $lang['loggedinas']            = 'Kirjautunut nimellä';
 $lang['user']                  = 'Käyttäjänimi';
 $lang['pass']                  = 'Salasana';
@@ -93,7 +95,7 @@ $lang['txt_filename']          = 'Lähetä nimellä (valinnainen)';
 $lang['txt_overwrt']           = 'Ylikirjoita olemassa oleva';
 $lang['lockedby']              = 'Tällä hetkellä tiedoston on lukinnut';
 $lang['lockexpire']            = 'Lukitus päättyy';
-$lang['js']['willexpire']            = 'Lukituksesi tämän sivun muokkaukseen päättyy minuutin kuluttua.\nRistiriitojen välttämiseksi paina esikatselu-nappia nollataksesi lukitusajan.';
+$lang['js']['willexpire']      = 'Lukituksesi tämän sivun muokkaukseen päättyy minuutin kuluttua.\nRistiriitojen välttämiseksi paina esikatselu-nappia nollataksesi lukitusajan.';
 $lang['js']['notsavedyet']     = 'Dokumentissa on tallentamattomia muutoksia, jotka häviävät.
  Haluatko varmasti jatkaa?';
 $lang['js']['searchmedia']     = 'Etsi tiedostoja';
@@ -126,6 +128,17 @@ $lang['js']['linkwiz']         = 'Linkkivelho';
 $lang['js']['linkto']          = 'Linkki kohteeseen:';
 $lang['js']['del_confirm']     = 'Haluatko todella poistaa valitut kohteet?';
 $lang['js']['mu_btn']          = 'Lähetä useampia tiedostoja kerralla';
+$lang['js']['restore_confirm'] = 'Haluatko varmasti palauttaa tämän version?';
+$lang['js']['media_diff']      = 'Näytä erot:';
+$lang['js']['media_diff_both'] = 'Vierekkäin';
+$lang['js']['media_diff_opacity'] = 'Päällä';
+$lang['js']['media_diff_portions'] = 'Liukusäädin';
+$lang['js']['media_select']    = 'Valitse tiedostot...';
+$lang['js']['media_upload_btn'] = 'Lähetä';
+$lang['js']['media_done_btn']  = 'Valmis';
+$lang['js']['media_drop']      = 'Pudota lähetettävät tiedostot tähän';
+$lang['js']['media_cancel']    = 'Poista';
+$lang['js']['media_overwrt']   = 'Ylikirjoita olemassa olevat tiedostot';
 $lang['rssfailed']             = 'Virhe tapahtui noudettaessa tätä syötettä: ';
 $lang['nothingfound']          = 'Mitään ei löytynyt.';
 $lang['mediaselect']           = 'Mediatiedoston valinta';
@@ -180,6 +193,10 @@ $lang['mail_changed']          = 'sivu muutettu:';
 $lang['mail_subscribe_list']   = 'muuttuneet sivut nimiavaruudessa:';
 $lang['mail_new_user']         = 'uusi käyttäjä:';
 $lang['mail_upload']           = 'tiedosto lähetetty:';
+$lang['changes_type']          = 'Näytä muutokset:';
+$lang['pages_changes']         = 'Sivut';
+$lang['media_changes']         = 'Mediatiedostot';
+$lang['both_changes']          = 'Sivut ja mediatiedostot';
 $lang['qb_bold']               = 'Lihavoitu teksti';
 $lang['qb_italic']             = 'Kursivoitu teksti';
 $lang['qb_underl']             = 'Alleviivattu teksti';
@@ -220,6 +237,9 @@ $lang['img_copyr']             = 'Tekijänoikeus';
 $lang['img_format']            = 'Formaatti';
 $lang['img_camera']            = 'Kamera';
 $lang['img_keywords']          = 'Avainsanat';
+$lang['img_width']             = 'Leveys';
+$lang['img_height']            = 'Korkeus';
+$lang['img_manager']           = 'Näytä mediamanagerissa';
 $lang['subscr_subscribe_success'] = '%s lisätty %s tilauslistalle';
 $lang['subscr_subscribe_error'] = 'Virhe lisättäessä %s tilauslistalle %s';
 $lang['subscr_subscribe_noaddress'] = 'Login tiedoissasi ei ole sähköpostiosoitetta. Sinua ei voi lisätä tilaukseen';
@@ -284,3 +304,23 @@ $lang['hours']                 = '%d tuntia sitten';
 $lang['minutes']               = '%d minuuttia sitten';
 $lang['seconds']               = '% sekuntia sitten';
 $lang['wordblock']             = 'Muutostasi ei talletettu, koska se sisältää estettyä tekstiä (spam).';
+$lang['media_uploadtab']       = 'Lähetä';
+$lang['media_searchtab']       = 'Etsi';
+$lang['media_viewtab']         = 'Näytä';
+$lang['media_edittab']         = 'Muokkaa';
+$lang['media_historytab']      = 'Historia';
+$lang['media_thumbsview']      = 'Pikkukuvat';
+$lang['media_listview']        = 'Lista';
+$lang['media_sort']            = 'Järjestä';
+$lang['media_sort_name']       = 'nimen mukaan';
+$lang['media_sort_date']       = 'päivämäärän mukaan';
+$lang['media_upload']          = 'Lähetä <strong>%s</strong> nimiavaruuteen';
+$lang['media_search']          = 'Etsi <strong>%s</strong> nimiavaruudesta';
+$lang['media_edit']            = 'Muokkaa';
+$lang['media_history']         = 'Nämä ovat vanhat versiot tiedostosta.';
+$lang['media_meta_edited']     = 'Metadataa muokattu';
+$lang['media_perm_read']       = 'Anteeksi. Sinulla ei ole riittävästi oikeuksia lukeaksesi tiedostoja.';
+$lang['media_perm_upload']     = 'Anteeksi. Sinulla ei ole riittävästi oikeuksia lähettääksesi tiedostoja.';
+$lang['media_update']          = 'Lähetä uusi versio';
+$lang['media_restore']         = 'Palauta tämä versio';
+$lang['plugin_install_err']    = 'Liitännäinen asentui virheellisesti. Nimeä liitännäisen hakemisto \'%s\' -> \'%s\'';
-- 
cgit v1.2.3


From f84d2dfd6f3df6ad2403af497075b0bb35393ffc Mon Sep 17 00:00:00 2001
From: Thomas Nygreen <nygreen@gmail.com>
Date: Mon, 19 Sep 2011 13:20:27 +0200
Subject: Norwegian language update

---
 inc/lang/no/adminplugins.txt  |  2 +-
 inc/lang/no/lang.php          | 56 ++++++++++++++++++++++++++++++++++++++++---
 inc/lang/no/newpage.txt       |  2 +-
 inc/lang/no/norev.txt         |  4 ++--
 inc/lang/no/subscr_digest.txt | 20 ++++++++++++++++
 inc/lang/no/subscr_form.txt   |  3 +++
 inc/lang/no/subscr_list.txt   | 17 +++++++++++++
 inc/lang/no/subscr_single.txt | 23 ++++++++++++++++++
 inc/lang/no/updateprofile.txt |  2 +-
 inc/lang/no/uploadmail.txt    |  1 +
 10 files changed, 122 insertions(+), 8 deletions(-)
 create mode 100644 inc/lang/no/subscr_digest.txt
 create mode 100644 inc/lang/no/subscr_form.txt
 create mode 100644 inc/lang/no/subscr_list.txt
 create mode 100644 inc/lang/no/subscr_single.txt

(limited to 'inc')

diff --git a/inc/lang/no/adminplugins.txt b/inc/lang/no/adminplugins.txt
index 32499a2e4..091ae4d7e 100644
--- a/inc/lang/no/adminplugins.txt
+++ b/inc/lang/no/adminplugins.txt
@@ -1 +1 @@
-====== Ekstra tilleggene ======
\ No newline at end of file
+====== Ekstra tillegg ======
\ No newline at end of file
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index fa946ca02..7ed5902ca 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -19,8 +19,8 @@
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '“';
-$lang['doublequoteclosing']    = '”';
+$lang['doublequoteopening']    = '«';
+$lang['doublequoteclosing']    = '»';
 $lang['singlequoteopening']    = '‘';
 $lang['singlequoteclosing']    = '’';
 $lang['apostrophe']            = '\'';
@@ -57,6 +57,8 @@ $lang['btn_recover']           = 'Gjennvinn kladd';
 $lang['btn_draftdel']          = 'Slett kladd';
 $lang['btn_revert']            = 'Gjenopprette';
 $lang['btn_register']          = 'Registrer deg';
+$lang['btn_apply']             = 'Bruk';
+$lang['btn_media']             = 'Mediefiler';
 $lang['loggedinas']            = 'Innlogget som';
 $lang['user']                  = 'Brukernavn';
 $lang['pass']                  = 'Passord';
@@ -101,7 +103,7 @@ $lang['txt_filename']          = 'Skriv inn wikinavn (alternativt)';
 $lang['txt_overwrt']           = 'Overskriv eksisterende fil';
 $lang['lockedby']              = 'Stengt av';
 $lang['lockexpire']            = 'Avstengningen opphører';
-$lang['js']['willexpire']            = 'Din redigeringslås for dette dokumentet kommer snart til å opphøre.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.';
+$lang['js']['willexpire']      = 'Din redigeringslås for dette dokumentet kommer snart til å opphøre.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.';
 $lang['js']['notsavedyet']     = 'Ulagrede endringer vil gå tapt.
 Vil du fortsette?';
 $lang['js']['searchmedia']     = 'Søk for filer';
@@ -134,6 +136,16 @@ $lang['js']['linkwiz']         = 'guide til lenker';
 $lang['js']['linkto']          = 'Lenke til:';
 $lang['js']['del_confirm']     = 'Slett denne oppføringen?';
 $lang['js']['mu_btn']          = 'Last opp flere filer samtidig';
+$lang['js']['restore_confirm'] = 'Er du sikker på at du vil gjenopprette denne versjonen?';
+$lang['js']['media_diff']      = 'Vis forskjeller:';
+$lang['js']['media_diff_both'] = 'Side ved side:';
+$lang['js']['media_diff_portions'] = 'Glidebryter';
+$lang['js']['media_select']    = 'Velg filer…';
+$lang['js']['media_upload_btn'] = 'Last opp';
+$lang['js']['media_done_btn']  = 'Ferdig';
+$lang['js']['media_drop']      = 'Dra filer hit for å laste dem opp';
+$lang['js']['media_cancel']    = 'fjern';
+$lang['js']['media_overwrt']   = 'Erstatt eksisterende filer';
 $lang['rssfailed']             = 'En feil oppstod da denne kilden skulle hentes:';
 $lang['nothingfound']          = 'Ingen data funnet.';
 $lang['mediaselect']           = 'Valg av mediafil';
@@ -169,6 +181,7 @@ $lang['diff']                  = 'Vis forskjeller mot nåværende versjon';
 $lang['diff2']                 = 'Vis forskjeller mellom valgte versjoner';
 $lang['difflink']              = 'Lenk til denne sammenligningen';
 $lang['diff_type']             = 'Vis forskjeller:';
+$lang['diff_inline']           = 'I teksten';
 $lang['diff_side']             = 'Side ved side';
 $lang['line']                  = 'Linje';
 $lang['breadcrumb']            = 'Spor';
@@ -187,6 +200,10 @@ $lang['mail_changed']          = 'side endret:';
 $lang['mail_subscribe_list']   = 'side endret i \'namespace\':';
 $lang['mail_new_user']         = 'ny bruker:';
 $lang['mail_upload']           = 'fil opplastet:';
+$lang['changes_type']          = 'Vis endringer av';
+$lang['pages_changes']         = 'Sider';
+$lang['media_changes']         = 'Mediefiler';
+$lang['both_changes']          = 'Både sider og mediefiler';
 $lang['qb_bold']               = 'Fet tekst';
 $lang['qb_italic']             = 'Kursiv tekst';
 $lang['qb_underl']             = 'Understreket tekst';
@@ -227,12 +244,25 @@ $lang['img_copyr']             = 'Opphavsrett';
 $lang['img_format']            = 'Format';
 $lang['img_camera']            = 'Kamera';
 $lang['img_keywords']          = 'Nøkkelord';
+$lang['img_width']             = 'Bredde';
+$lang['img_height']            = 'Høyde';
+$lang['img_manager']           = 'Vis i mediefilbehandler';
+$lang['subscr_subscribe_success'] = 'La til %s som abonnent på %s';
+$lang['subscr_subscribe_error'] = 'Klarte ikke å legge til %s som abonnent på %s';
+$lang['subscr_subscribe_noaddress'] = 'Brukeren din er ikke registrert med noen adresse. Du kan derfor ikke legges til som abonnent.';
+$lang['subscr_unsubscribe_success'] = 'Avsluttet %s sitt abonnement på %s';
+$lang['subscr_unsubscribe_error'] = 'Klarte ikke å avslutte %s sitt abonnement på %s';
+$lang['subscr_already_subscribed'] = '%s abonnerer allerede på %s';
+$lang['subscr_not_subscribed'] = '%s abonnerer ikke på %s';
+$lang['subscr_m_not_subscribed'] = 'Du abonnerer ikke på denne sida eller dette navnerommet';
 $lang['subscr_m_new_header']   = 'Legg til abonnement';
 $lang['subscr_m_current_header'] = 'Gjeldende abonnementer';
 $lang['subscr_m_unsubscribe']  = 'Avmeld';
 $lang['subscr_m_subscribe']    = 'Påmeld';
 $lang['subscr_m_receive']      = 'Motta';
 $lang['subscr_style_every']    = 'e-post for alle endringer';
+$lang['subscr_style_digest']   = 'e-post med sammendrag av endringer for hver side (%.2f dager mellom hver)';
+$lang['subscr_style_list']     = 'liste med sider som er endra siden forrige e-post (%.2f dager mellom hver)';
 $lang['authmodfailed']         = 'Feilkonfigurert brukerautorisasjon. Vennligst innformer Wiki-admin.';
 $lang['authtempfail']          = 'Brukerautorisasjon er midlertidig utilgjengelig. Om dette vedvarer, vennligst informer Wiki-admin.';
 $lang['i_chooselang']          = 'Velg ditt språk';
@@ -285,3 +315,23 @@ $lang['hours']                 = '%d timer siden';
 $lang['minutes']               = '%d minutter siden';
 $lang['seconds']               = '%d sekunder siden';
 $lang['wordblock']             = 'Din endring ble ikke lagret ettersom den inneholder blokkert tekst (søppel).';
+$lang['media_uploadtab']       = 'Last opp';
+$lang['media_searchtab']       = 'Søk';
+$lang['media_viewtab']         = 'Vis';
+$lang['media_edittab']         = 'Rediger';
+$lang['media_historytab']      = 'Historikk';
+$lang['media_thumbsview']      = 'Miniatyrbilder';
+$lang['media_listview']        = 'Liste';
+$lang['media_sort']            = 'Sorter';
+$lang['media_sort_name']       = 'etter navn';
+$lang['media_sort_date']       = 'etter dato';
+$lang['media_upload']          = 'Last opp til navnerommet <strong>%s</strong>.';
+$lang['media_search']          = 'Søk i navnerommet <strong>%s</strong>.';
+$lang['media_edit']            = 'Rediger';
+$lang['media_history']         = 'Dette er de tidligere versjonene av fila.';
+$lang['media_meta_edited']     = 'metadata er endra';
+$lang['media_perm_read']       = 'Beklager, du har ikke tilgang til å lese filer.';
+$lang['media_perm_upload']     = 'Beklager, du har ikke tilgang til å laste opp filer.';
+$lang['media_update']          = 'Last opp ny versjon';
+$lang['media_restore']         = 'Gjenopprett denne versjonen';
+$lang['plugin_install_err']    = 'Tillegget ble feil installert. Skift navn på mappa \'%s\' til \'%s\'.';
diff --git a/inc/lang/no/newpage.txt b/inc/lang/no/newpage.txt
index 8f4b8da79..f712998d2 100644
--- a/inc/lang/no/newpage.txt
+++ b/inc/lang/no/newpage.txt
@@ -1,3 +1,3 @@
-====== Det fins ikke noe innhold ======
+====== Dette emnet har ikke noe innhold ======
 
 Du har klikket på en lenke til et emne som ikke finnes ennå. Du kan skape det gjennom å klikke på ''**Lag denne siden**''.
diff --git a/inc/lang/no/norev.txt b/inc/lang/no/norev.txt
index dfd71db0f..cc58c99e3 100644
--- a/inc/lang/no/norev.txt
+++ b/inc/lang/no/norev.txt
@@ -1,4 +1,4 @@
-====== Det fins ingen slik versjon ======
+====== Versjonen finnes ikke ======
 
-Den angitte versjonen fins ikke. Bruk ''**Historikk**'' for en oversikt over de versjoner som fins av dette dokumentet.
+Den angitte versjonen finnes ikke. Bruk ''**Historikk**'' for en oversikt over de versjoner som finnes av dette dokumentet.
 
diff --git a/inc/lang/no/subscr_digest.txt b/inc/lang/no/subscr_digest.txt
new file mode 100644
index 000000000..3192e43b7
--- /dev/null
+++ b/inc/lang/no/subscr_digest.txt
@@ -0,0 +1,20 @@
+Hei!
+
+Sida @PAGE@ på wikien @TITLE@ har blitt endra.
+Her er endringene:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Gammel versjon : @OLDPAGE@
+Ny versjon: @NEWPAGE@
+
+For å avslutte varslinga, logg inn på
+@DOKUWIKIURL@ og gå til 
+@NEWPAGE@
+og avslutt abonnementet på endringer av sida eller i navnerommet.
+
+--
+Denne e-posten ble generert av DokuWiki på
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/no/subscr_form.txt b/inc/lang/no/subscr_form.txt
new file mode 100644
index 000000000..c3df69e02
--- /dev/null
+++ b/inc/lang/no/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Administrere abonnement ======
+
+Denne sida lar deg administrere abonnementene dine for denne sida og dette navnerommet.
\ No newline at end of file
diff --git a/inc/lang/no/subscr_list.txt b/inc/lang/no/subscr_list.txt
new file mode 100644
index 000000000..72cd307cb
--- /dev/null
+++ b/inc/lang/no/subscr_list.txt
@@ -0,0 +1,17 @@
+Hei!
+
+Sider i navnerommet @PAGE@ på wikien @TITLE@ har blitt endra.
+Her er endringene:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+For å avslutte varslinga, logg inn på
+@DOKUWIKIURL@ og gå til 
+@NEWPAGE@
+og avslutt abonnementet på endringer av sida eller i navnerommet.
+
+--
+Denne e-posten ble generert av DokuWiki på
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/no/subscr_single.txt b/inc/lang/no/subscr_single.txt
new file mode 100644
index 000000000..ce117b952
--- /dev/null
+++ b/inc/lang/no/subscr_single.txt
@@ -0,0 +1,23 @@
+Hei!
+
+Sida @PAGE@ på wikien @TITLE@ har blitt endra.
+Her er endringene:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Dato : @DATE@
+Bruker : @USER@
+Sammendrag: @SUMMARY@
+Gammel versjon : @OLDPAGE@
+Ny versjon: @NEWPAGE@
+
+For å avslutte varslinga, logg inn på
+@DOKUWIKIURL@, gå til 
+@NEWPAGE@
+og avslutt abonnementet på endringer av sida eller i navnerommet.
+
+--
+Denne e-posten ble generert av DokuWiki på
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/inc/lang/no/updateprofile.txt b/inc/lang/no/updateprofile.txt
index 5565e528f..b2e37e76d 100644
--- a/inc/lang/no/updateprofile.txt
+++ b/inc/lang/no/updateprofile.txt
@@ -1,5 +1,5 @@
 ====== Oppdater din brukerprofil ======
 
-Du behøver bare fylle ut de felter du ønsker å endre. Du kan ikke endre ditt brukernavn.
+Du behøver bare fylle ut de felter du ønsker å endre. Du kan ikke endre brukernavnet ditt.
 
 
diff --git a/inc/lang/no/uploadmail.txt b/inc/lang/no/uploadmail.txt
index b01905009..2890d962d 100644
--- a/inc/lang/no/uploadmail.txt
+++ b/inc/lang/no/uploadmail.txt
@@ -1,6 +1,7 @@
 En fil ble lastet opp på din DokuWiki. Her er detaljene:
 
 Fil : @MEDIA@
+Gammel versjon: @OLD@
 Dato : @DATE@
 Nettleser : @BROWSER@
 IP-adresse : @IPADDRESS@
-- 
cgit v1.2.3


From 86e64c1709dfad1edceb5b0b2acdaade3b248d96 Mon Sep 17 00:00:00 2001
From: lainme <lainme993@gmail.com>
Date: Mon, 19 Sep 2011 13:41:40 +0200
Subject: Simplified Chinese language update

---
 inc/lang/zh/lang.php | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 31e6dc238..4328d10ce 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -13,6 +13,7 @@
  * @author caii <zhoucaiqi@gmail.com>
  * @author Hiphen Lee <jacob.b.leung@gmail.com>
  * @author caii, patent agent in China <zhoucaiqi@gmail.com>
+ * @author lainme993@gmail.com
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -54,6 +55,8 @@ $lang['btn_recover']           = '恢复草稿';
 $lang['btn_draftdel']          = '删除草稿';
 $lang['btn_revert']            = '恢复';
 $lang['btn_register']          = '注册';
+$lang['btn_apply']             = '应用';
+$lang['btn_media']             = '媒体管理器';
 $lang['loggedinas']            = '登录为';
 $lang['user']                  = '用户名';
 $lang['pass']                  = '密码';
@@ -98,7 +101,7 @@ $lang['txt_filename']          = '上传并重命名为（可选）';
 $lang['txt_overwrt']           = '覆盖已存在的同名文件';
 $lang['lockedby']              = '目前已被下列人员锁定';
 $lang['lockexpire']            = '预计锁定解除于';
-$lang['js']['willexpire']            = '您对本页的独有编辑权将于一分钟之后解除。\n为了防止与其他人的编辑冲突，请使用预览按钮重设计时器。';
+$lang['js']['willexpire']      = '您对本页的独有编辑权将于一分钟之后解除。\n为了防止与其他人的编辑冲突，请使用预览按钮重设计时器。';
 $lang['js']['notsavedyet']     = '未保存的更改将丢失。
 真的要继续？';
 $lang['js']['searchmedia']     = '查找文件';
@@ -131,6 +134,17 @@ $lang['js']['linkwiz']         = '链接向导';
 $lang['js']['linkto']          = '链接到：';
 $lang['js']['del_confirm']     = '真的要删除选中的项目吗？';
 $lang['js']['mu_btn']          = '一次上传了多个文件';
+$lang['js']['restore_confirm'] = '确实要恢复这个版本么？';
+$lang['js']['media_diff']      = '查看差异：';
+$lang['js']['media_diff_both'] = '肩并肩';
+$lang['js']['media_diff_opacity'] = '叠加';
+$lang['js']['media_diff_portions'] = '滑块';
+$lang['js']['media_select']    = '选择文件……';
+$lang['js']['media_upload_btn'] = '上传';
+$lang['js']['media_done_btn']  = '完成';
+$lang['js']['media_drop']      = '拖拽文件到此处来上传';
+$lang['js']['media_cancel']    = '删除';
+$lang['js']['media_overwrt']   = '覆盖已存在的文件';
 $lang['rssfailed']             = '获取该 RSS 信息时产生错误：';
 $lang['nothingfound']          = '什么都没有找到。';
 $lang['mediaselect']           = '媒体文件';
@@ -185,6 +199,10 @@ $lang['mail_changed']          = '更改页面：';
 $lang['mail_subscribe_list']   = '命名空间中改变的页面：';
 $lang['mail_new_user']         = '新用户：';
 $lang['mail_upload']           = '已上传的文件：';
+$lang['changes_type']          = '查看何种更改';
+$lang['pages_changes']         = '页面';
+$lang['media_changes']         = '媒体文件';
+$lang['both_changes']          = '页面和媒体文件';
 $lang['qb_bold']               = '粗体';
 $lang['qb_italic']             = '斜体';
 $lang['qb_underl']             = '下划线';
@@ -225,6 +243,9 @@ $lang['img_copyr']             = '版权';
 $lang['img_format']            = '格式';
 $lang['img_camera']            = '相机';
 $lang['img_keywords']          = '关键字';
+$lang['img_width']             = '宽度';
+$lang['img_height']            = '高度';
+$lang['img_manager']           = '在媒体管理器中查看';
 $lang['subscr_subscribe_success'] = '添加 %s 到 %s 的订阅列表';
 $lang['subscr_subscribe_error'] = '添加 %s 到 %s 的订阅列表中出现错误';
 $lang['subscr_subscribe_noaddress'] = '没有与您登录信息相关联的地址，您无法被添加到订阅列表';
@@ -293,3 +314,23 @@ $lang['hours']                 = '%d小时前';
 $lang['minutes']               = '%d分钟前';
 $lang['seconds']               = '%d秒前';
 $lang['wordblock']             = '您的更改没有被保存，因为它包含被屏蔽的文字（垃圾信息）。';
+$lang['media_uploadtab']       = '上传';
+$lang['media_searchtab']       = '搜索';
+$lang['media_viewtab']         = '查看';
+$lang['media_edittab']         = '编辑';
+$lang['media_historytab']      = '历史';
+$lang['media_thumbsview']      = '缩略图';
+$lang['media_listview']        = '列表';
+$lang['media_sort']            = '排序';
+$lang['media_sort_name']       = '按名称';
+$lang['media_sort_date']       = '按日期';
+$lang['media_upload']          = '上传到 <strong>%s</strong> 命名空间。';
+$lang['media_search']          = '在 <strong>%s</strong> 命名空间中搜索。';
+$lang['media_edit']            = '编辑';
+$lang['media_history']         = '这些是文件的旧版本。';
+$lang['media_meta_edited']     = '元数据已编辑';
+$lang['media_perm_read']       = '抱歉，您没有足够权限读取这些文件。';
+$lang['media_perm_upload']     = '抱歉，您没有足够权限来上传文件。';
+$lang['media_update']          = '上传新版本';
+$lang['media_restore']         = '恢复这个版本';
+$lang['plugin_install_err']    = '插件安装不正确。重命名插件目录“%s”为“%s”。';
-- 
cgit v1.2.3


From 0831741370e6589c76c19869e8f11c114a944f0c Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Mon, 19 Sep 2011 16:07:09 +0200
Subject: Add file revision above file detail page

---
 inc/lang/en/lang.php | 1 +
 inc/template.php     | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 25088a40c..92c7185b2 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -347,6 +347,7 @@ $lang['media_files']           = 'Files in %s';
 $lang['media_upload']          = 'Upload to %s';
 $lang['media_search']          = 'Search in %s';
 $lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s at %s';
 $lang['media_edit']            = 'Edit %s';
 $lang['media_history']         = 'History of %s';
 $lang['media_meta_edited']     = 'metadata edited';
diff --git a/inc/template.php b/inc/template.php
index 718fbd125..891c2e143 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1206,7 +1206,11 @@ function tpl_mediaFileDetails($image, $rev){
     $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
     $class = 'select mediafile mf_'.$class;
     $tabTitle = '<strong class="'.$class.'">'.$image.'</strong>';
-    printf($lang['media_' . $opened_tab], $tabTitle);
+    if ($opened_tab === 'view' && $rev) {
+        printf($lang['media_viewold'], $tabTitle, dformat($rev));
+    } else {
+        printf($lang['media_' . $opened_tab], $tabTitle);
+    }
     echo '</h3></div>'.NL;
 
     echo '<div class="panelContent">'.NL;
-- 
cgit v1.2.3


From bc314c5832351325feac48564dae39a93321d99a Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 20 Sep 2011 10:47:46 +0100
Subject: media manager: improved the panel widths

---
 inc/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/template.php b/inc/template.php
index 891c2e143..b56d6c718 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1507,8 +1507,8 @@ function tpl_media() {
     if (isset($JUMPTO)) $image = $JUMPTO;
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
-    echo '<h1>'.$lang['btn_media'].'</h1>'.NL;
     echo '<div id="mediamanager__page">'.NL;
+    echo '<h1>'.$lang['btn_media'].'</h1>'.NL;
     html_msgarea();
 
     echo '<div class="panel namespaces">'.NL;
-- 
cgit v1.2.3


From 33e91473c28e8f1c8542459bb4d755beb620305e Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Thu, 22 Sep 2011 21:37:33 +0200
Subject: Resize images in fullscreen mediamanager using CSS

---
 inc/media.php | 58 +++++++++++++++++++++++++++-------------------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 560abc3bc..d26d18626 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1441,42 +1441,38 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
  */
 function media_printimgdetail($item, $fullscreen=false){
     // prepare thumbnail
-    if (!$fullscreen) {
-        $size_array[] = 120;
-    } else {
-        $size_array = array(90, 40);
-    }
-    foreach ($size_array as $index => $size) {
-        $w = (int) $item['meta']->getField('File.Width');
-        $h = (int) $item['meta']->getField('File.Height');
-        if($w>$size || $h>$size){
-            if (!$fullscreen) {
-                $ratio = $item['meta']->getResizeRatio($size);
-            } else {
-                $ratio = $item['meta']->getResizeRatio($size,$size);
-            }
-            $w = floor($w * $ratio);
-            $h = floor($h * $ratio);
-        }
-        $src = ml($item['id'],array('w'=>$w,'h'=>$h,'t'=>$item['mtime']));
-        $p = array();
+    $size = $fullscreen ? 90 : 120;
+
+    $w = (int) $item['meta']->getField('File.Width');
+    $h = (int) $item['meta']->getField('File.Height');
+    if($w>$size || $h>$size){
         if (!$fullscreen) {
-            $p['width']  = $w;
-            $p['height'] = $h;
+            $ratio = $item['meta']->getResizeRatio($size);
+        } else {
+            $ratio = $item['meta']->getResizeRatio($size,$size);
         }
-        $p['alt']    = $item['id'];
-        $att = buildAttributes($p);
+        $w = floor($w * $ratio);
+        $h = floor($h * $ratio);
+    }
+    $src = ml($item['id'],array('w'=>$w,'h'=>$h,'t'=>$item['mtime']));
+    $p = array();
+    if (!$fullscreen) {
+        // In fullscreen mediamanager view, image resizing is done via CSS.
+        $p['width']  = $w;
+        $p['height'] = $h;
+    }
+    $p['alt']    = $item['id'];
+    $att = buildAttributes($p);
 
-        // output
-        if ($fullscreen) {
-            echo '<a name="'.($index ? 'd' : 'l').'_:'.$item['id'].'" class="image '.($index ? 'tiny' : 'thumb').'" href="'.
-                media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']), 'tab_details' => 'view')).'">';
-            echo '<span><img src="'.$src.'" '.$att.' /></span>';
-            echo '</a>';
-        }
+    // output
+    if ($fullscreen) {
+        echo '<a name="l_:'.$item['id'].'" class="image thumb" href="'.
+            media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']), 'tab_details' => 'view')).'">';
+        echo '<span><img src="'.$src.'" '.$att.' /></span>';
+        echo '</a>';
     }
 
-    if ($fullscreen) return '';
+    if ($fullscreen) return;
 
     echo '<div class="detail">';
     echo '<div class="thumb">';
-- 
cgit v1.2.3


From 554a8c9ffe7dc256ff10fdb49a144ca7dc510989 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sat, 24 Sep 2011 16:34:32 +0200
Subject: More mediamanager reworking

---
 inc/common.php | 12 +++++++++
 inc/media.php  | 79 ++++++++++++++++++++++++++--------------------------------
 2 files changed, 48 insertions(+), 43 deletions(-)

(limited to 'inc')

diff --git a/inc/common.php b/inc/common.php
index 56a7fb060..ec7f9bece 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -1558,4 +1558,16 @@ function valid_input_set($param, $valid_values, $array, $exc = '') {
     }
 }
 
+function get_doku_pref($pref, $default) {
+    if (strpos($_COOKIE['DOKU_PREFS'], $pref) !== false) {
+        $parts = explode('#', $_COOKIE['DOKU_PREFS']);
+        for ($i = 0; $i < count($parts); $i+=2){
+            if ($parts[$i] == $pref) {
+                return $parts[$i+1];
+            }
+        }
+    }
+    return $default;
+}
+
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/media.php b/inc/media.php
index d26d18626..4ca4c509c 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -576,12 +576,7 @@ function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=fals
             echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
         }else {
             if ($fullscreenview) {
-                $view = $_REQUEST['list'];
-                if ($view == 'rows') {
-                    echo '<ul class="rows">'.NL;
-                } else {
-                    echo '<ul class="thumbs">'.NL;
-                }
+                echo '<ul class="' . _media_get_list_type() . '">';
             }
             foreach($data as $item){
                 if (!$fullscreenview) {
@@ -651,25 +646,23 @@ function media_tabs_details($image, $selected_tab = ''){
  */
 function media_tab_files_options(){
     global $lang, $NS;
-    $sort = _media_get_sort_type();
-    $form = new Doku_Form(array('class' => 'options', 'method' => 'get'));
+    $form = new Doku_Form(array('class' => 'options', 'method' => 'get',
+                                'action' => media_managerURL(array(), '&')));
     $form->addHidden('sectok', null);
-    $form->addHidden('ns', $NS);
-    $form->addHidden('do', 'media');
+    if (isset($_REQUEST['q'])) {
+        $form->addHidden('q', $_REQUEST['q']);
+    }
     $form->addElement('<ul>'.NL);
     foreach(array('list' => array('listType', array('thumbs', 'rows')),
-                  'sort' => array('sortBy', array('name', 'date'), $sort))
+                  'sort' => array('sortBy', array('name', 'date')))
             as $group => $content) {
-        if (count($content) < 3) {
-            $content[2] = isset($_REQUEST[$group])
-                            ? $_REQUEST[$group]
-                            : $content[1][0];
-        }
+        $checked = "_media_get_${group}_type";
+        $checked = $checked();
 
         $form->addElement('<li class="' . $content[0] . '">');
         foreach($content[1] as $option) {
             $attrs = array();
-            if ($content[2] == $option) {
+            if ($checked == $option) {
                 $attrs['checked'] = 'checked';
             }
             $form->addElement(form_makeRadioField($group, $option,
@@ -693,16 +686,20 @@ function media_tab_files_options(){
  * @return string - sort type
  */
 function _media_get_sort_type() {
-    $sort = 'name';
-    if (isset($_REQUEST['sort'])) {
-        $sort = $_REQUEST['sort'];
-    } elseif (strpos($_COOKIE['DOKU_PREFS'], 'sort') >= 0) {
-        $parts = explode('#', $_COOKIE['DOKU_PREFS']);
-        for ($i = 0; $i < count($parts); $i+=2){
-            if ($parts[$i] == 'sort') $sort = $parts[$i+1];
-        }
+    return _media_get_display_param('sort', array('default' => 'name', 'date'));
+}
+
+function _media_get_list_type() {
+    return _media_get_display_param('list', array('default' => 'thumbs', 'rows'));
+}
+
+function _media_get_display_param($param, $values) {
+    if (isset($_REQUEST[$param]) && in_array($_REQUEST[$param], $values)) {
+        // FIXME: Set cookie
+        return $_REQUEST[$param];
+    } else {
+        return get_doku_pref($param, $values['default']);
     }
-    return $sort;
 }
 
 /**
@@ -1295,12 +1292,7 @@ function media_searchlist($query,$ns,$auth=null,$fullscreen=false,$sort=''){
         echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
     }else {
         if ($fullscreen) {
-            $view = $_REQUEST['view'];
-            if ($view == 'list') {
-                echo '<ul class="mediamanager-list" id="mediamanager__file_list">'.NL;
-            } else {
-                echo '<ul class="mediamanager-thumbs" id="mediamanager__file_list">'.NL;
-            }
+            echo '<ul class="' . _media_get_list_type() . '">';
         }
         foreach($evdata['data'] as $item){
             if (!$fullscreen) media_printfile($item,$item['perm'],'',true);
@@ -1514,18 +1506,16 @@ function media_managerURL($params=false, $amp='&amp;', $abs=false, $params_array
     global $ID;
 
     $gets = array('do' => 'media');
-    $media_manager_params = array('tab_files', 'tab_details', 'image', 'ns', 'view');
+    $media_manager_params = array('tab_files', 'tab_details', 'image', 'ns', 'list', 'sort');
     foreach ($media_manager_params as $x) {
         if (isset($_REQUEST[$x])) $gets[$x] = $_REQUEST[$x];
     }
 
     if ($params) {
-        foreach ($params as $k => $v) {
-            $gets[$k] = $v;
-        }
+        $gets = $params + $gets;
     }
     unset($gets['id']);
-    if ($gets['delete']) {
+    if (isset($gets['delete'])) {
         unset($gets['image']);
         unset($gets['tab_details']);
     }
@@ -1603,15 +1593,18 @@ function media_searchform($ns,$query='',$fullscreen=false){
 
     // The default HTML search form
     $params = array('id' => 'dw__mediasearch');
-    if (!$fullscreen) $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php';
-    else $params['action'] = media_managerURL(array(), '&');
+    if (!$fullscreen) {
+        $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php';
+    } else {
+        $params['action'] = media_managerURL(array(), '&');
+    }
     $form = new Doku_Form($params);
-    if (!$fullscreen) $form->addElement('<div class="upload">' . $lang['mediasearch'] . '</div>'.NL);
     $form->addHidden('ns', $ns);
-    if (!$fullscreen) $form->addHidden('do', 'searchlist');
-    else $form->addHidden('mediado', 'searchlist');
+    $form->addHidden($fullscreen ? 'mediado' : 'do', 'searchlist');
+
+    if (!$fullscreen) $form->addElement('<div class="upload">' . $lang['mediasearch'] . '</div>'.NL);
     $form->addElement(form_makeOpenTag('p'));
-    $form->addElement(form_makeTextField('q', $query,$lang['searchmedia'],'mediamanager__sort_textfield','',array('title'=>sprintf($lang['searchmedia_in'],hsc($ns).':*'))));
+    $form->addElement(form_makeTextField('q', $query,$lang['searchmedia'],'','',array('title'=>sprintf($lang['searchmedia_in'],hsc($ns).':*'))));
     $form->addElement(form_makeButton('submit', '', $lang['btn_search']));
     $form->addElement(form_makeCloseTag('p'));
     html_form('searchmedia', $form);
-- 
cgit v1.2.3


From b680ea06a64290b3e28a7b7d2d8d33373a3e6709 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 25 Sep 2011 09:54:17 +0200
Subject: fix namespace cleaning FS#2295

This patch applies the correct pagename cleaning to namespaces as well.
Namespaces should follow the same rules as pagenames but due to a bug it
was possible to have namespaces ending in a underscore.

If you used such a namespace it will be inaccessible after applying this
patch. You should rename the namespace directory on the filesystem
(removing the trailing underscore). You old links will then work
automatically again. Rebuilding the search index is recommended.
---
 inc/pageutils.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc')

diff --git a/inc/pageutils.php b/inc/pageutils.php
index 81dcb66e7..31b5f9ff9 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -134,6 +134,7 @@ function cleanID($raw_id,$ascii=false,$media=false){
     $id = preg_replace('#:+#',':',$id);
     $id = ($media ? trim($id,':.-') : trim($id,':._-'));
     $id = preg_replace('#:[:\._\-]+#',':',$id);
+    $id = preg_replace('#[:\._\-]+:#',':',$id);
 
     $cache[(string)$raw_id] = $id;
     return($id);
-- 
cgit v1.2.3


From 9a71fb5c963f2943a45bc4d0c77a84dd788e17b3 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 25 Sep 2011 11:47:53 +0100
Subject: media manager: fixed and improved diff views

---
 inc/media.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 4ca4c509c..f5099c1d5 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1077,9 +1077,12 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
         $difftype = $_REQUEST['difftype'];
 
         if (!$fromajax) {
-            $form = new Doku_Form(array('action' => media_managerURL(array(), '&'),
-                                        'method' => 'get',
-                                        'id' => 'mediamanager__form_diffview'));
+            $form = new Doku_Form(array(
+            	'action' => media_managerURL(array(), '&'),
+                'method' => 'get',
+                'id' => 'mediamanager__form_diffview',
+                'class' => 'diffView'
+            ));
             $form->addHidden('sectok', null);
             $form->addElement('<input type="hidden" name="rev2[]" value="'.$l_rev.'" ></input>');
             $form->addElement('<input type="hidden" name="rev2[]" value="'.$r_rev.'" ></input>');
@@ -1189,8 +1192,6 @@ function media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $type) {
         }
     }
 
-    echo '<div class="mediamanager-preview">';
-
     $l_more = array('rev' => $l_rev, 'h' => $l_size[1], 'w' => $l_size[0]);
     $r_more = array('rev' => $r_rev, 'h' => $l_size[1], 'w' => $l_size[0]);
 
@@ -1198,19 +1199,17 @@ function media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $type) {
     $r_src = ml($image, $r_more);
 
     // slider
-    echo '<div class="diff_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>';
+    echo '<div class="slider" style="max-width: '.($l_size[0]-20).'px;" ></div>'.NL;
 
     // two images in divs
-    echo '<div class="diff_' . $type . '">';
+    echo '<div class="imageDiff ' . $type . '">'.NL;
     echo '<div class="image1" style="max-width: '.$l_size[0].'px;">';
     echo '<img src="'.$l_src.'" alt="" />';
-    echo '</div>';
+    echo '</div>'.NL;
     echo '<div class="image2" style="max-width: '.$l_size[0].'px;">';
     echo '<img src="'.$r_src.'" alt="" />';
-    echo '</div>';
-    echo '</div>';
-
-    echo '</div>';
+    echo '</div>'.NL;
+    echo '</div>'.NL;
 }
 
 /**
-- 
cgit v1.2.3


From edf35c4242c97d4f25032f5c295f5a8e60e83c15 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 25 Sep 2011 21:22:15 +0100
Subject: whitespace fixes: tabs to spaces

---
 inc/media.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index f5099c1d5..16e3c0074 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1078,7 +1078,7 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
 
         if (!$fromajax) {
             $form = new Doku_Form(array(
-            	'action' => media_managerURL(array(), '&'),
+                'action' => media_managerURL(array(), '&'),
                 'method' => 'get',
                 'id' => 'mediamanager__form_diffview',
                 'class' => 'diffView'
-- 
cgit v1.2.3


From 8032624921fc54dae6c6f44f55b8209738876113 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 27 Sep 2011 14:59:16 +0100
Subject: media manager: IE7 fixes (and other small improvements)

---
 inc/media.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 16e3c0074..3e640237a 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1459,7 +1459,7 @@ function media_printimgdetail($item, $fullscreen=false){
     if ($fullscreen) {
         echo '<a name="l_:'.$item['id'].'" class="image thumb" href="'.
             media_managerURL(array('image' => hsc($item['id']), 'ns' => getNS($item['id']), 'tab_details' => 'view')).'">';
-        echo '<span><img src="'.$src.'" '.$att.' /></span>';
+        echo '<img src="'.$src.'" '.$att.' />';
         echo '</a>';
     }
 
-- 
cgit v1.2.3


From b824abd4a1f0a1458e89c5f023902687ee1730e9 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 10 Oct 2011 20:25:47 +0200
Subject: Fixes a problem with parsing overlong changelog lines

When an overlong edit summary was given for an edit, the resulting
changelog line could be longer than the chunk that is handled in the
changelog reader (8192 bytes) causing the reader to abort the operation.

This meant that old revisions where no longer accessible. This patch
fixes the reader (it continues reading chunks until a full line is
found).

However, limiting the summary makes sense and will be added in another
patch.
---
 inc/changelog.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'inc')

diff --git a/inc/changelog.php b/inc/changelog.php
index fea39f9f7..3162df01a 100644
--- a/inc/changelog.php
+++ b/inc/changelog.php
@@ -454,8 +454,9 @@ function getRevisions($id, $first, $num, $chunk_size=8192, $media=false) {
     }
     $num = max($num, 0);
     $chunk_size = max($chunk_size, 0);
-    if ($first<0) { $first = 0; }
-    else if (!$media && @file_exists(wikiFN($id)) || $media && @file_exists(mediaFN($id))) {
+    if ($first<0) {
+        $first = 0;
+    } else if (!$media && @file_exists(wikiFN($id)) || $media && @file_exists(mediaFN($id))) {
         // skip current revision if the page exists
         $first = max($first+1, 0);
     }
@@ -476,13 +477,21 @@ function getRevisions($id, $first, $num, $chunk_size=8192, $media=false) {
         $finger = max($tail-$chunk_size, 0);
         while ($count<$num+$first) {
             fseek($fp, $finger);
+            $nl = $finger;
             if ($finger>0) {
                 fgets($fp); // slip the finger forward to a new line
-                $finger = ftell($fp);
+                $nl = ftell($fp);
+            }
+
+            // was the chunk big enough? if not, take another bite
+            if($nl > 0 && $tail <= $nl){
+                $finger = max($finger-$chunk_size, 0);
+                continue;
+            }else{
+                $finger = $nl;
             }
 
             // read chunk
-            if ($tail<=$finger) { break; }
             $chunk = '';
             $read_size = max($tail-$finger, 0); // found chunk size
             $got = 0;
-- 
cgit v1.2.3


From 7fa35bb18633117eb89c1960346a572eb7cd0369 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 10 Oct 2011 20:33:47 +0200
Subject: limit edit summaries to 255 characters

---
 inc/changelog.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/changelog.php b/inc/changelog.php
index 3162df01a..60f9b8657 100644
--- a/inc/changelog.php
+++ b/inc/changelog.php
@@ -74,7 +74,7 @@ function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extr
             'type'  => str_replace($strip, '', $type),
             'id'    => $id,
             'user'  => $user,
-            'sum'   => str_replace($strip, '', $summary),
+            'sum'   => utf8_substr(str_replace($strip, '', $summary),0,255),
             'extra' => str_replace($strip, '', $extra)
             );
 
@@ -131,7 +131,7 @@ function addMediaLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='',
             'type'  => str_replace($strip, '', $type),
             'id'    => $id,
             'user'  => $user,
-            'sum'   => str_replace($strip, '', $summary),
+            'sum'   => utf8_substr(str_replace($strip, '', $summary),0,255),
             'extra' => str_replace($strip, '', $extra)
             );
 
-- 
cgit v1.2.3


From bc64186ea372e1a6fde4a99f6a914e80357b95c4 Mon Sep 17 00:00:00 2001
From: Marius-Alex Olar <olarmariusalex@gmail.com>
Date: Mon, 10 Oct 2011 20:40:41 +0200
Subject: Romanian language update

---
 inc/lang/ro/lang.php | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index b8d7520e6..2a61ef204 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -7,6 +7,7 @@
  * @author Sergiu Baltariu <s_baltariu@yahoo.com>
  * @author Emanuel-Emeric Andrași <n30@mandrivausers.ro>
  * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro>
+ * @author Marius OLAR <olarmariusalex@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -48,6 +49,8 @@ $lang['btn_recover']           = 'Recuperează schiţă';
 $lang['btn_draftdel']          = 'Şterge schiţă';
 $lang['btn_revert']            = 'Revenire';
 $lang['btn_register']          = 'Înregistrează';
+$lang['btn_apply']             = 'Aplică';
+$lang['btn_media']             = 'Administrare media';
 $lang['loggedinas']            = 'Logat ca şi';
 $lang['user']                  = 'Utilizator';
 $lang['pass']                  = 'Parola';
@@ -92,7 +95,7 @@ $lang['txt_filename']          = 'Încarcă fişierul ca (opţional)';
 $lang['txt_overwrt']           = 'Suprascrie fişierul existent';
 $lang['lockedby']              = 'Momentan blocat de';
 $lang['lockexpire']            = 'Blocarea expiră la';
-$lang['js']['willexpire']            = 'Blocarea pentru editarea paginii expiră intr-un minut.\nPentru a preveni conflictele foloseşte butonul de previzualizare pentru resetarea blocării.';
+$lang['js']['willexpire']      = 'Blocarea pentru editarea paginii expiră intr-un minut.\nPentru a preveni conflictele foloseşte butonul de previzualizare pentru resetarea blocării.';
 $lang['js']['notsavedyet']     = 'Există modificări nesalvate, care se vor pierde.
 Doreşti să continui?';
 $lang['js']['searchmedia']     = 'Caută fişiere';
@@ -125,6 +128,17 @@ $lang['js']['linkwiz']         = 'Asistent legătură';
 $lang['js']['linkto']          = 'Legătură la:';
 $lang['js']['del_confirm']     = 'Doriţi într-adevăr ştergerea elementelor selectate?';
 $lang['js']['mu_btn']          = 'Încarcă mai multe fişiere simultan';
+$lang['js']['restore_confirm'] = 'Sunteți sigur că doriți restaurarea acestei versiuni?';
+$lang['js']['media_diff']      = 'Arată diferențele:';
+$lang['js']['media_diff_both'] = 'Unul lângă altul';
+$lang['js']['media_diff_opacity'] = 'Străveziu';
+$lang['js']['media_diff_portions'] = 'Lovește cu putere';
+$lang['js']['media_select']    = 'Selectează fișierele...';
+$lang['js']['media_upload_btn'] = 'Încarcă';
+$lang['js']['media_done_btn']  = 'Gata';
+$lang['js']['media_drop']      = 'Lasă fișierele aici pentru încărcarea lor';
+$lang['js']['media_cancel']    = 'înlătură';
+$lang['js']['media_overwrt']   = 'Suprascrie fișierele deja existente';
 $lang['rssfailed']             = 'A apărut o eroare in timpul descărcării acestui cîmp: ';
 $lang['nothingfound']          = 'Nu am găsit nimic.';
 $lang['mediaselect']           = 'Selectare fişiere media';
@@ -179,6 +193,10 @@ $lang['mail_changed']          = 'page schimbată:';
 $lang['mail_subscribe_list']   = 'pagini modificate în spaţiul de nume:';
 $lang['mail_new_user']         = 'utilizator nou';
 $lang['mail_upload']           = 'fişier încărcat:';
+$lang['changes_type']          = 'Vizualizare modificări';
+$lang['pages_changes']         = 'Pagini';
+$lang['media_changes']         = 'Fișiere media';
+$lang['both_changes']          = 'Ambele pagini şi fişiere media';
 $lang['qb_bold']               = 'Text Îngroşat';
 $lang['qb_italic']             = 'Text Italic';
 $lang['qb_underl']             = 'Text Subliniat';
@@ -219,6 +237,9 @@ $lang['img_copyr']             = 'Copyright';
 $lang['img_format']            = 'Format';
 $lang['img_camera']            = 'Camera';
 $lang['img_keywords']          = 'Cuvinte cheie';
+$lang['img_width']             = 'Lățime';
+$lang['img_height']            = 'Înălțime';
+$lang['img_manager']           = 'Vizualizează în administratorul media';
 $lang['subscr_subscribe_success'] = 'Adăugat %s la lista de abonare pentru %s';
 $lang['subscr_subscribe_error'] = 'Eroare la adăugarea %s la lista de abonare pentru %s';
 $lang['subscr_subscribe_noaddress'] = 'Nu există adresa asociată cu logarea dvs., nu puteţi fi adăugat la lista de abonare';
@@ -271,7 +292,7 @@ $lang['mu_ready']              = 'pregătit pentru încărcare';
 $lang['mu_done']               = 'complet';
 $lang['mu_fail']               = 'eşuat';
 $lang['mu_authfail']           = 'sesiunea a expirat';
-$lang['mu_progress']           = '@PCT@% incărcat';
+$lang['mu_progress']           = '@PCT@% încărcat';
 $lang['mu_filetypes']          = 'Tipuri de fişiere permise';
 $lang['mu_info']               = 'fişiere încărcate';
 $lang['mu_lasterr']            = 'Ultima eroare:';
@@ -284,3 +305,27 @@ $lang['hours']                 = 'acum %d ore';
 $lang['minutes']               = 'acum %d minute';
 $lang['seconds']               = 'acum %d secunde';
 $lang['wordblock']             = 'Modificarea dvs. nu au fost salvate deoarece conţine text blocat (spam).';
+$lang['media_uploadtab']       = 'Încarcă';
+$lang['media_searchtab']       = 'Căutare';
+$lang['media_file']            = 'Fișier';
+$lang['media_viewtab']         = 'Vizualizare';
+$lang['media_edittab']         = 'Editare';
+$lang['media_historytab']      = 'Istoric';
+$lang['media_list_thumbs']     = 'Miniaturi';
+$lang['media_list_rows']       = 'Linii';
+$lang['media_sort_name']       = 'Nume';
+$lang['media_sort_date']       = 'Data';
+$lang['media_namespaces']      = 'Alegeți numele se spațiu';
+$lang['media_files']           = 'Fișiere în %s';
+$lang['media_upload']          = 'Încarcă în %s';
+$lang['media_search']          = 'Caută în %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s în %s';
+$lang['media_edit']            = 'Editare %s';
+$lang['media_history']         = 'Istoricul pentru %s';
+$lang['media_meta_edited']     = 'metadate editate';
+$lang['media_perm_read']       = 'Ne pare rău, dar nu aveți suficiente drepturi pentru a putea citi fișiere.';
+$lang['media_perm_upload']     = 'Ne pare rău, dar nu aveți suficiente drepturi pentru a putea încărca fișiere.';
+$lang['media_update']          = 'Încarcă noua versiune';
+$lang['media_restore']         = 'Restaurează această versiune';
+$lang['plugin_install_err']    = 'Modul instalat greșit. Redenumește directorul modulului \'%s\' în \'%s\'.';
-- 
cgit v1.2.3


From f4aabe763b3ae83161819c991d4c7820523c3524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Figols?= <ruben.figols@gmail.com>
Date: Mon, 10 Oct 2011 20:42:02 +0200
Subject: Spanish language update

---
 inc/lang/es/lang.php | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 4c83f5d96..8e912e9a8 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -25,6 +25,7 @@
  * @author Mauro Javier Giamberardino <mgiamberardino@gmail.com>
  * @author emezeta <emezeta@infoprimo.com>
  * @author Oscar Ciudad <oscar@jacho.net>
+ * @author Ruben Figols <ruben.figols@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -66,6 +67,8 @@ $lang['btn_recover']           = 'Recuperar borrador';
 $lang['btn_draftdel']          = 'Eliminar borrador';
 $lang['btn_revert']            = 'Restaurar';
 $lang['btn_register']          = 'Registrarse';
+$lang['btn_apply']             = 'Aplicar';
+$lang['btn_media']             = 'Gestor de ficheros';
 $lang['loggedinas']            = 'Conectado como ';
 $lang['user']                  = 'Usuario';
 $lang['pass']                  = 'Contraseña';
@@ -110,7 +113,7 @@ $lang['txt_filename']          = 'Subir como (opcional)';
 $lang['txt_overwrt']           = 'Sobreescribir archivo existente';
 $lang['lockedby']              = 'Actualmente bloqueado por';
 $lang['lockexpire']            = 'El bloqueo expira en';
-$lang['willexpire']            = 'Tu bloqueo para editar esta página expira en un minuto.\nPara evitar conflictos usa el botón previsualizar para reiniciar el contador de tiempo.';
+$lang['js']['willexpire']      = 'El bloqueo para la edición de esta página expira en un minuto.\nPAra prevenir conflictos uso el botón Previsualizar para restaurar el contador de bloqueo.';
 $lang['js']['notsavedyet']     = 'Los cambios que no se han guardado se perderán.
 ¿Realmente quieres continuar?';
 $lang['js']['searchmedia']     = 'Buscar archivos';
@@ -143,6 +146,17 @@ $lang['js']['linkwiz']         = 'Asistente de enlaces';
 $lang['js']['linkto']          = 'Enlazar a:';
 $lang['js']['del_confirm']     = '¿Quieres realmente borrar lo seleccionado?';
 $lang['js']['mu_btn']          = 'Subir varios archivos a la vez';
+$lang['js']['restore_confirm'] = '¿Estás seguro de querer restaurar esta versión?';
+$lang['js']['media_diff']      = 'Ver diferencias:';
+$lang['js']['media_diff_both'] = 'Lado por lado';
+$lang['js']['media_diff_opacity'] = 'A través de Shine';
+$lang['js']['media_diff_portions'] = 'Pasar';
+$lang['js']['media_select']    = 'Seleccionar ficheros';
+$lang['js']['media_upload_btn'] = 'Cargar';
+$lang['js']['media_done_btn']  = 'Hecho';
+$lang['js']['media_drop']      = 'Arrastra los ficheros aquí para cargar';
+$lang['js']['media_cancel']    = 'Eliminar';
+$lang['js']['media_overwrt']   = 'Sobreescribir ficheros exitentes';
 $lang['rssfailed']             = 'Se ha producido un error mientras se leían los datos de este feed: ';
 $lang['nothingfound']          = 'No se ha encontrado nada.';
 $lang['mediaselect']           = 'Archivos Multimedia';
@@ -197,6 +211,10 @@ $lang['mail_changed']          = 'página cambiada:';
 $lang['mail_subscribe_list']   = 'páginas cambiadas en el espacio de nombre:';
 $lang['mail_new_user']         = 'nuevo usuario:';
 $lang['mail_upload']           = 'archivo subido:';
+$lang['changes_type']          = 'Ver cambios de';
+$lang['pages_changes']         = 'Páginas';
+$lang['media_changes']         = 'Archivos multimedia';
+$lang['both_changes']          = 'Ambas páginas y archivos multimedia';
 $lang['qb_bold']               = 'Negrita';
 $lang['qb_italic']             = 'Itálica';
 $lang['qb_underl']             = 'Subrayado';
@@ -237,6 +255,9 @@ $lang['img_copyr']             = 'Copyright';
 $lang['img_format']            = 'Formato';
 $lang['img_camera']            = 'Cámara';
 $lang['img_keywords']          = 'Palabras claves';
+$lang['img_width']             = 'Ancho';
+$lang['img_height']            = 'Alto';
+$lang['img_manager']           = 'Ver en el Administrador de medios';
 $lang['subscr_subscribe_success'] = 'Se agregó %s a las listas de suscripción para %s';
 $lang['subscr_subscribe_error'] = 'Error al agregar %s a las listas de suscripción para %s';
 $lang['subscr_subscribe_noaddress'] = 'No hay dirección asociada con tu registro, no se puede agregarte a la lista de suscripción';
@@ -301,3 +322,27 @@ $lang['hours']                 = '%d horas atrás';
 $lang['minutes']               = '%d minutos atrás';
 $lang['seconds']               = '%d segundos atrás';
 $lang['wordblock']             = 'Sus cambios no se han guardado porque contienen textos bloqueados (spam).';
+$lang['media_uploadtab']       = 'Cargar';
+$lang['media_searchtab']       = 'Buscar';
+$lang['media_file']            = 'Fichero';
+$lang['media_viewtab']         = 'Ver';
+$lang['media_edittab']         = 'Editar';
+$lang['media_historytab']      = 'Historial';
+$lang['media_list_thumbs']     = 'Miniaturas';
+$lang['media_list_rows']       = 'Celdas';
+$lang['media_sort_name']       = 'Nombre';
+$lang['media_sort_date']       = 'Fecha';
+$lang['media_namespaces']      = 'Escoge "espacio de nombre"';
+$lang['media_files']           = 'Ficheros en %s';
+$lang['media_upload']          = 'Cargar a %s';
+$lang['media_search']          = 'Buscar en %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s en %s';
+$lang['media_edit']            = 'Editar %s';
+$lang['media_history']         = 'Historial de %s';
+$lang['media_meta_edited']     = 'Metadatos editados';
+$lang['media_perm_read']       = 'Disculpa, no tienes los permisos necesarios para leer ficheros.';
+$lang['media_perm_upload']     = 'Disculpa, no tienes los permisos necesarios para cargar ficheros.';
+$lang['media_update']          = 'Actualizar nueva versión';
+$lang['media_restore']         = 'Restaurar esta versión';
+$lang['plugin_install_err']    = 'Plugin instalado incorrectamente. Renombra el directorio de plugins \'%s\' to \'%s\'.';
-- 
cgit v1.2.3


From a17cd808475d1303cecfd340b2effc84541bc5d4 Mon Sep 17 00:00:00 2001
From: Kaeptn Haddock <kaeptn.haddock@gmail.com>
Date: Mon, 10 Oct 2011 20:43:38 +0200
Subject: German language update

---
 inc/lang/de/lang.php | 106 ++++++++++++++++++---------------------------------
 1 file changed, 38 insertions(+), 68 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 360e6b428..f647e6d64 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -19,15 +19,15 @@
  * @author Niels Lange <niels@boldencursief.nl>
  * @author Christian Wichmann <nospam@zone0.de>
  * @author Matthias Schulte <mailinglist@lupo49.de>
+ * @author Paul Lachewsky <kaeptn.haddock@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '„'; //&ldquo;
-$lang['doublequoteclosing']    = '“'; //&rdquo;
-$lang['singlequoteopening']    = '‚'; //&lsquo;
-$lang['singlequoteclosing']    = '‘'; //&rsquo;
-$lang['apostrophe']            = '’'; //&rsquo;
-
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '’';
 $lang['btn_edit']              = 'Diese Seite bearbeiten';
 $lang['btn_source']            = 'Zeige Quelltext';
 $lang['btn_show']              = 'Seite anzeigen';
@@ -63,7 +63,6 @@ $lang['btn_revert']            = 'Wiederherstellen';
 $lang['btn_register']          = 'Registrieren';
 $lang['btn_apply']             = 'Übernehmen';
 $lang['btn_media']             = 'Medien-Manager';
-
 $lang['loggedinas']            = 'Angemeldet als';
 $lang['user']                  = 'Benutzername';
 $lang['pass']                  = 'Passwort';
@@ -76,9 +75,8 @@ $lang['email']                 = 'E-Mail';
 $lang['profile']               = 'Benutzerprofil';
 $lang['badlogin']              = 'Nutzername oder Passwort sind falsch.';
 $lang['minoredit']             = 'kleine Änderung';
-$lang['draftdate']             = 'Entwurf gespeichert am'; // full dformat date will be added
+$lang['draftdate']             = 'Entwurf gespeichert am';
 $lang['nosecedit']             = 'Diese Seite wurde in der Zwischenzeit geändert, Sektionsinfo ist veraltet, lade stattdessen volle Seite.';
-
 $lang['regmissing']            = 'Alle Felder müssen ausgefüllt werden.';
 $lang['reguexists']            = 'Der Nutzername existiert leider schon.';
 $lang['regsuccess']            = 'Der neue Nutzer wurde angelegt und das Passwort per E-Mail versandt.';
@@ -88,12 +86,10 @@ $lang['regbadmail']            = 'Die angegebene E-Mail-Adresse scheint ungülti
 $lang['regbadpass']            = 'Die beiden eingegeben Passwörter stimmen nicht überein. Bitte versuchen Sie es noch einmal.';
 $lang['regpwmail']             = 'Ihr DokuWiki Passwort';
 $lang['reghere']               = 'Sie haben noch keinen Zugang? Hier registrieren';
-
 $lang['profna']                = 'Änderung des Benutzerprofils in diesem Wiki nicht möglich.';
 $lang['profnochange']          = 'Keine Änderungen, nichts zu tun.';
 $lang['profnoempty']           = 'Es muss ein Name und eine E-Mail-Adresse angegeben werden.';
 $lang['profchanged']           = 'Benutzerprofil erfolgreich geändert.';
-
 $lang['pwdforget']             = 'Passwort vergessen? Fordere ein neues an';
 $lang['resendna']              = 'Passwörter versenden ist in diesem Wiki nicht möglich.';
 $lang['resendpwd']             = 'Neues Passwort senden für';
@@ -102,10 +98,8 @@ $lang['resendpwdnouser']       = 'Es tut mir Leid, aber der Benutzer existiert n
 $lang['resendpwdbadauth']      = 'Es tut mir Leid, aber dieser Authentifizierungscode ist ungültig. Stellen Sie sicher, dass Sie den kompletten Bestätigungslink verwendet haben.';
 $lang['resendpwdconfirm']      = 'Ein Bestätigungslink wurde per E-Mail versandt.';
 $lang['resendpwdsuccess']      = 'Ihr neues Passwort wurde per E-Mail versandt.';
-
 $lang['license']               = 'Falls nicht anders bezeichnet, ist der Inhalt dieses Wikis unter der folgenden Lizenz veröffentlicht:';
 $lang['licenseok']             = 'Hinweis: Durch das Bearbeiten dieser Seite geben Sie Ihr Einverständnis, dass Ihr Inhalt unter der folgenden Lizenz veröffentlicht wird:';
-
 $lang['searchmedia']           = 'Suche Dateinamen:';
 $lang['searchmedia_in']        = 'Suche in %s';
 $lang['txt_upload']            = 'Datei zum Hochladen auswählen';
@@ -113,7 +107,6 @@ $lang['txt_filename']          = 'Hochladen als (optional)';
 $lang['txt_overwrt']           = 'Bestehende Datei überschreiben';
 $lang['lockedby']              = 'Momentan gesperrt von';
 $lang['lockexpire']            = 'Sperre läuft ab am';
-
 $lang['js']['willexpire']      = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, sollten Sie sie durch einen Klick auf den Vorschau-Knopf verlängern.';
 $lang['js']['notsavedyet']     = 'Nicht gespeicherte Änderungen gehen verloren!';
 $lang['js']['searchmedia']     = 'Suche Dateien';
@@ -146,20 +139,18 @@ $lang['js']['linkto']          = 'Link nach:';
 $lang['js']['del_confirm']     = 'Eintrag wirklich löschen?';
 $lang['js']['mu_btn']          = 'Mehrere Dateien gleichzeitig hochladen';
 $lang['js']['restore_confirm'] = 'Really restore this version?';
-$lang['js']['media_diff']          = 'Unterschiede anzeigen:';
-$lang['js']['media_diff_both']     = 'Side by Side';
-$lang['js']['media_diff_opacity']  = 'Überblenden';
+$lang['js']['media_diff']      = 'Unterschiede anzeigen:';
+$lang['js']['media_diff_both'] = 'Side by Side';
+$lang['js']['media_diff_opacity'] = 'Überblenden';
 $lang['js']['media_diff_portions'] = 'Übergang';
-$lang['js']['media_select']        = 'Dateien auswählen…';
-$lang['js']['media_upload_btn']    = 'Hochladen';
-$lang['js']['media_done_btn']      = 'Fertig';
-$lang['js']['media_drop']          = 'Dateien hier draufziehen um sie hochzuladen';
-$lang['js']['media_cancel']        = 'Entfernen';
-$lang['js']['media_overwrt']       = 'Existierende Dateien überschreiben';
-
+$lang['js']['media_select']    = 'Dateien auswählen…';
+$lang['js']['media_upload_btn'] = 'Hochladen';
+$lang['js']['media_done_btn']  = 'Fertig';
+$lang['js']['media_drop']      = 'Dateien hier draufziehen um sie hochzuladen';
+$lang['js']['media_cancel']    = 'Entfernen';
+$lang['js']['media_overwrt']   = 'Existierende Dateien überschreiben';
 $lang['rssfailed']             = 'Es ist ein Fehler beim Laden des Feeds aufgetreten: ';
 $lang['nothingfound']          = 'Nichts gefunden.';
-
 $lang['mediaselect']           = 'Dateiauswahl';
 $lang['fileupload']            = 'Datei hochladen';
 $lang['uploadsucc']            = 'Datei wurde erfolgreich hochgeladen';
@@ -184,7 +175,6 @@ $lang['mediaextchange']        = 'Dateiendung vom .%s nach .%s geändert!';
 $lang['reference']             = 'Verwendung von';
 $lang['ref_inuse']             = 'Diese Datei kann nicht gelöscht werden, da sie noch von folgenden Seiten benutzt wird:';
 $lang['ref_hidden']            = 'Einige Verweise sind auf Seiten, für die Sie keine Leseberechtigung haben.';
-
 $lang['hits']                  = 'Treffer';
 $lang['quickhits']             = 'Passende Seitennamen';
 $lang['toc']                   = 'Inhaltsverzeichnis';
@@ -208,18 +198,15 @@ $lang['external_edit']         = 'Externe Bearbeitung';
 $lang['summary']               = 'Zusammenfassung';
 $lang['noflash']               = 'Das <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> wird benötigt, um diesen Inhalt anzuzeigen.';
 $lang['download']              = 'Schnipsel herunterladen';
-
 $lang['mail_newpage']          = 'Neue Seite:';
 $lang['mail_changed']          = 'Seite geändert:';
 $lang['mail_subscribe_list']   = 'Geänderte Seiten im Namensraum:';
 $lang['mail_new_user']         = 'Neuer Benutzer:';
 $lang['mail_upload']           = 'Datei hochgeladen:';
-
 $lang['changes_type']          = 'Änderungen anzeigen von';
 $lang['pages_changes']         = 'Seiten';
 $lang['media_changes']         = 'Mediendateien';
 $lang['both_changes']          = 'Beides, Seiten- und Mediendateien';
-
 $lang['qb_bold']               = 'Fetter Text';
 $lang['qb_italic']             = 'Kursiver Text';
 $lang['qb_underl']             = 'Unterstrichener Text';
@@ -244,11 +231,8 @@ $lang['qb_media']              = 'Bilder und andere Dateien hinzufügen';
 $lang['qb_sig']                = 'Unterschrift einfügen';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Sonderzeichen';
-
 $lang['upperns']               = 'zum übergeordneten Namensraum springen';
-
 $lang['admin_register']        = 'Neuen Benutzer anmelden';
-
 $lang['metaedit']              = 'Metadaten bearbeiten';
 $lang['metasaveerr']           = 'Die Metadaten konnten nicht gesichert werden';
 $lang['metasaveok']            = 'Metadaten gesichert';
@@ -266,30 +250,24 @@ $lang['img_keywords']          = 'Schlagwörter';
 $lang['img_width']             = 'Breite';
 $lang['img_height']            = 'Höhe';
 $lang['img_manager']           = 'Im Medien-Manager anzeigen';
-
-$lang['subscr_subscribe_success']   = '%s hat nun Änderungen der Seite %s abonniert';
-$lang['subscr_subscribe_error']     = '%s kann die Änderungen der Seite %s nicht abonnieren';
+$lang['subscr_subscribe_success'] = '%s hat nun Änderungen der Seite %s abonniert';
+$lang['subscr_subscribe_error'] = '%s kann die Änderungen der Seite %s nicht abonnieren';
 $lang['subscr_subscribe_noaddress'] = 'Weil Ihre E-Mail-Adresse fehlt, können Sie das Thema nicht abonnieren';
 $lang['subscr_unsubscribe_success'] = 'Das Abonnement von %s für die Seite %s wurde aufgelöst';
-$lang['subscr_unsubscribe_error']   = 'Das Abonnement von %s für die Seite %s konnte nicht aufgelöst werden';
-$lang['subscr_already_subscribed']  = '%s hat %s bereits abonniert';
-$lang['subscr_not_subscribed']      = '%s hat %s nicht abonniert';
-// Manage page for subscriptions
-$lang['subscr_m_not_subscribed']    = 'Sie haben die aktuelle Seite und ihre Namensräume nicht abonniert.';
-$lang['subscr_m_new_header']        = 'Abonnement hinzufügen';
-$lang['subscr_m_current_header']    = 'Aktuelle Abonnements';
-$lang['subscr_m_unsubscribe']       = 'Löschen';
-$lang['subscr_m_subscribe']         = 'Abonnieren';
-$lang['subscr_m_receive']           = 'Benachrichtigung';
-$lang['subscr_style_every']         = 'E-Mail bei jeder Bearbeitung';
-$lang['subscr_style_digest']        = 'Zusammenfassung der Änderungen für jede veränderte Seite (Alle %.2f Tage)';
-$lang['subscr_style_list']          = 'Liste der geänderten Seiten (Alle %.2f Tage)';
-
-/* auth.class language support */
+$lang['subscr_unsubscribe_error'] = 'Das Abonnement von %s für die Seite %s konnte nicht aufgelöst werden';
+$lang['subscr_already_subscribed'] = '%s hat %s bereits abonniert';
+$lang['subscr_not_subscribed'] = '%s hat %s nicht abonniert';
+$lang['subscr_m_not_subscribed'] = 'Sie haben die aktuelle Seite und ihre Namensräume nicht abonniert.';
+$lang['subscr_m_new_header']   = 'Abonnement hinzufügen';
+$lang['subscr_m_current_header'] = 'Aktuelle Abonnements';
+$lang['subscr_m_unsubscribe']  = 'Löschen';
+$lang['subscr_m_subscribe']    = 'Abonnieren';
+$lang['subscr_m_receive']      = 'Benachrichtigung';
+$lang['subscr_style_every']    = 'E-Mail bei jeder Bearbeitung';
+$lang['subscr_style_digest']   = 'Zusammenfassung der Änderungen für jede veränderte Seite (Alle %.2f Tage)';
+$lang['subscr_style_list']     = 'Liste der geänderten Seiten (Alle %.2f Tage)';
 $lang['authmodfailed']         = 'Benutzerüberprüfung nicht möglich. Bitte wenden Sie sich an den Systembetreuer.';
 $lang['authtempfail']          = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wenden Sie sich an den Systembetreuer.';
-
-/* installer strings */
 $lang['i_chooselang']          = 'Wählen Sie Ihre Sprache';
 $lang['i_installer']           = 'DokuWiki Installation';
 $lang['i_wikiname']            = 'Wiki-Name';
@@ -312,7 +290,6 @@ $lang['i_pol1']                = 'Öffentliches Wiki (lesen für alle, schreiben
 $lang['i_pol2']                = 'Geschlossenes Wiki (lesen, schreiben, hochladen nur für registrierte Nutzer)';
 $lang['i_retry']               = 'Wiederholen';
 $lang['i_license']             = 'Bitte wählen Sie die Lizenz, unter die Sie Ihre Inhalte stellen möchten:';
-
 $lang['mu_intro']              = 'In diesem Bereich können Sie mehrere Dateien gleichzeitig hochladen. Benutzen Sie die Schaltfläche "Durchsuchen" um sie der Warteschlange zuzufügen. Betätigen Sie die Schaltfläche "Hochladen" um die Übertragung zu starten.';
 $lang['mu_gridname']           = 'Dateiname';
 $lang['mu_gridsize']           = 'Größe';
@@ -328,7 +305,6 @@ $lang['mu_progress']           = '@PCT@% hochgeladen';
 $lang['mu_filetypes']          = 'Erlaubte Dateitypen';
 $lang['mu_info']               = 'Dateien hochgeladen!';
 $lang['mu_lasterr']            = 'Letzter Fehler:';
-
 $lang['recent_global']         = 'Im Moment sehen Sie die Änderungen im Namensraum <b>%s</b>. Sie können auch <a href="%s">die Änderungen im gesamten Wiki sehen</a>.';
 $lang['years']                 = 'vor %d Jahren';
 $lang['months']                = 'vor %d Monaten';
@@ -337,30 +313,24 @@ $lang['days']                  = 'vor %d Tagen';
 $lang['hours']                 = 'vor %d Stunden';
 $lang['minutes']               = 'vor %d Minuten';
 $lang['seconds']               = 'vor %d Sekunden';
-
 $lang['wordblock']             = 'Ihre Bearbeitung wurde nicht gespeichert, da sie gesperrten Text enthielt (Spam).';
-
 $lang['media_uploadtab']       = 'Hochladen';
 $lang['media_searchtab']       = 'Suchen';
 $lang['media_viewtab']         = 'Anzeigen';
 $lang['media_edittab']         = 'Bearbeiten';
 $lang['media_historytab']      = 'Verlauf';
-$lang['media_list_thumbs']     = '<span>Medien anzeigen als</span> Miniaturansicht';
-$lang['media_list_rows']       = '<span>Medien anzeigen als</span> Listenansicht';
-$lang['media_sort_name']       = '<span>Sortieren nach</span> Name';
-$lang['media_sort_date']       = '<span>Sortieren nach</span> Datum';
-$lang['media_files']           = 'Medien im Namespace <strong>%s</strong>.';
+$lang['media_thumbsview']      = 'Miniaturansicht';
+$lang['media_listview']        = 'Detailansicht';
+$lang['media_sort']            = 'Sortieren';
+$lang['media_sort_name']       = 'nach Name';
+$lang['media_sort_date']       = 'nach Datum';
 $lang['media_upload']          = 'In den <strong>%s</strong> Namespace hochladen.';
 $lang['media_search']          = 'Im Namespace <strong>%s</strong> suchen.';
-$lang['media_view']            = '<span class="%s">%s</span>';
-$lang['media_edit']            = '<span class="%s">%s</span> bearbeiten';
-$lang['media_history']         = 'Versionen von <span class="%s">%s</span>';
+$lang['media_edit']            = 'Bearbeiten';
+$lang['media_history']         = 'Versionsverlauf der Datei.';
 $lang['media_meta_edited']     = 'Meta-Informationen bearbeitet';
 $lang['media_perm_read']       = 'Sie besitzen nicht die notwendigen Berechtigungen um die Datei anzuzeigen.';
 $lang['media_perm_upload']     = 'Sie besitzen nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
 $lang['media_update']          = 'Neue Version hochladen';
 $lang['media_restore']         = 'Diese Version wiederherstellen';
-
-$lang['plugin_install_err']    = "Plugin nicht korrekt installiert. Plugin-Verzeichnis von '%s' nach '%s' umbenennen.";
-
-//Setup VIM: ex: et ts=2 :
+$lang['plugin_install_err']    = 'Plugin nicht korrekt installiert. Plugin-Verzeichnis von \'%s\' nach \'%s\' umbenennen.';
-- 
cgit v1.2.3


From a76231726379ab65af1ce994b8d74e2ac814f8db Mon Sep 17 00:00:00 2001
From: Jeroen Roeterd <jroeterd@gmail.com>
Date: Mon, 10 Oct 2011 20:55:34 +0200
Subject: Dutch language update

---
 inc/lang/nl/lang.php | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index 6090babd9..1f548508e 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -14,6 +14,7 @@
  * @author Matthias Carchon <webmaster@c-mattic.be>
  * @author Marijn Hofstra <hofstra.m@gmail.com>
  * @author Timon Van Overveldt <timonvo@gmail.com>
+ * @author Jeroen
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -55,6 +56,8 @@ $lang['btn_recover']           = 'Herstel concept';
 $lang['btn_draftdel']          = 'Verwijder concept';
 $lang['btn_revert']            = 'Herstellen';
 $lang['btn_register']          = 'Registreren';
+$lang['btn_apply']             = 'Toepassen';
+$lang['btn_media']             = 'Media beheerder';
 $lang['loggedinas']            = 'Ingelogd als';
 $lang['user']                  = 'Gebruikersnaam';
 $lang['pass']                  = 'Wachtwoord';
@@ -99,7 +102,7 @@ $lang['txt_filename']          = 'Vul nieuwe naam in (optioneel)';
 $lang['txt_overwrt']           = 'Overschrijf bestaand bestand';
 $lang['lockedby']              = 'Momenteel in gebruik door';
 $lang['lockexpire']            = 'Exclusief gebruiksrecht vervalt op';
-$lang['js']['willexpire']            = 'Je exclusieve gebruiksrecht voor het aanpassen van deze pagina verloopt over een minuut.\nKlik op de Voorbeeld-knop om het exclusieve gebruiksrecht te verlengen.';
+$lang['js']['willexpire']      = 'Je exclusieve gebruiksrecht voor het aanpassen van deze pagina verloopt over een minuut.\nKlik op de Voorbeeld-knop om het exclusieve gebruiksrecht te verlengen.';
 $lang['js']['notsavedyet']     = 'Nog niet bewaarde wijzigingen zullen verloren gaan.
 Weet je zeker dat je wilt doorgaan?';
 $lang['js']['searchmedia']     = 'Zoek naar bestanden';
@@ -132,6 +135,14 @@ $lang['js']['linkwiz']         = 'Linkwizard';
 $lang['js']['linkto']          = 'Link naar:';
 $lang['js']['del_confirm']     = 'Item(s) verwijderen?';
 $lang['js']['mu_btn']          = 'Meerdere files tegelijk uploaden';
+$lang['js']['restore_confirm'] = 'Werkelijk deze versie terugzetten?';
+$lang['js']['media_diff']      = 'Verschillen bekijken:';
+$lang['js']['media_diff_both'] = 'Naast elkaar';
+$lang['js']['media_diff_opacity'] = 'Doorschijnend';
+$lang['js']['media_select']    = 'Selecteer bestanden';
+$lang['js']['media_done_btn']  = 'Klaar';
+$lang['js']['media_cancel']    = 'Verwijderen';
+$lang['js']['media_overwrt']   = 'Bestaande bestanden overschrijven';
 $lang['rssfailed']             = 'Er is een fout opgetreden bij het ophalen van de feed: ';
 $lang['nothingfound']          = 'Er werd niets gevonden.';
 $lang['mediaselect']           = 'Bestandsselectie';
@@ -186,6 +197,9 @@ $lang['mail_changed']          = 'pagina aangepast:';
 $lang['mail_subscribe_list']   = 'Pagina\'s veranderd in namespace:';
 $lang['mail_new_user']         = 'nieuwe gebruiker:';
 $lang['mail_upload']           = 'bestand geüpload:';
+$lang['pages_changes']         = 'Pagina\'s';
+$lang['media_changes']         = 'Media bestanden';
+$lang['both_changes']          = 'Zowel pagina\'s als media bestanden';
 $lang['qb_bold']               = 'Vette tekst';
 $lang['qb_italic']             = 'Cursieve tekst';
 $lang['qb_underl']             = 'Onderstreepte tekst';
@@ -226,6 +240,9 @@ $lang['img_copyr']             = 'Copyright';
 $lang['img_format']            = 'Formaat';
 $lang['img_camera']            = 'Camera';
 $lang['img_keywords']          = 'Trefwoorden';
+$lang['img_width']             = 'Breedte';
+$lang['img_height']            = 'Hoogte';
+$lang['img_manager']           = 'In media beheerder bekijken';
 $lang['subscr_subscribe_success'] = '%s is ingeschreven voor %s';
 $lang['subscr_subscribe_error'] = 'Fout bij inschrijven van %s voor %s';
 $lang['subscr_subscribe_noaddress'] = 'Er is geen emailadres geassocieerd met uw account, u kunt daardoor niet worden ingeschreven.';
@@ -290,3 +307,22 @@ $lang['hours']                 = '%d uren geleden';
 $lang['minutes']               = '%d minuten geleden';
 $lang['seconds']               = '%d seconden geleden';
 $lang['wordblock']             = 'Uw wijziging is niet opgeslagen omdat deze niet-toegestane tekst bevat (spam).';
+$lang['media_searchtab']       = 'Zoeken';
+$lang['media_file']            = 'Bestand';
+$lang['media_viewtab']         = 'Beeld';
+$lang['media_edittab']         = 'Bewerken';
+$lang['media_historytab']      = 'Geschiedenis';
+$lang['media_list_rows']       = 'Regels';
+$lang['media_sort_name']       = 'Naam';
+$lang['media_sort_date']       = 'Datum';
+$lang['media_namespaces']      = 'Kies naamruimte';
+$lang['media_files']           = 'Bestanden in %s';
+$lang['media_search']          = 'Zoeken in %s';
+$lang['media_view']            = '%s';
+$lang['media_edit']            = '%s bewerken';
+$lang['media_history']         = 'Geschiedenis van %s';
+$lang['media_meta_edited']     = 'Metagegevens bewerkt';
+$lang['media_perm_read']       = 'Sorry, u heeft niet voldoende rechten om bestanden te lezen.';
+$lang['media_perm_upload']     = 'Sorry, u heeft niet voldoende rechten om bestanden te uploaden.';
+$lang['media_restore']         = 'Deze versie terugzetten';
+$lang['plugin_install_err']    = 'Plugin is juist geinstalleerd. Hernoem plugin map \'%s\' naar \'%s\'.';
-- 
cgit v1.2.3


From 931a41b3c0876dd969a780d5c17c2c435f8749ce Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 14 Oct 2011 14:04:36 +0200
Subject: don't run SimplePie_File constructor FS#2348

---
 inc/FeedParser.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/FeedParser.php b/inc/FeedParser.php
index 235bed46e..e5f1fb636 100644
--- a/inc/FeedParser.php
+++ b/inc/FeedParser.php
@@ -49,13 +49,15 @@ class FeedParser_File extends SimplePie_File {
      */
     function FeedParser_File($url, $timeout=10, $redirects=5,
                              $headers=null, $useragent=null, $force_fsockopen=false) {
-        @parent::__construct();
         $this->http    = new DokuHTTPClient();
         $this->success = $this->http->sendRequest($url);
 
         $this->headers = $this->http->resp_headers;
         $this->body    = $this->http->resp_body;
         $this->error   = $this->http->error;
+
+        $this->method  = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
+
         return $this->success;
     }
 
-- 
cgit v1.2.3


From 7ae6f87a6c547c0bed9f52e628c050551529259a Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 14 Oct 2011 16:05:57 +0200
Subject: Fixed test and broken salt generation in PassHash class

Turned out a test wasn't really testing what it should have been testing
and thus did hide a bug. Still puzzles me why it still worked some
times.
This patch also sets the default iteration count for bmd5 and pmd5 to 8.
---
 inc/PassHash.class.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'inc')

diff --git a/inc/PassHash.class.php b/inc/PassHash.class.php
index 541de6752..31493c022 100644
--- a/inc/PassHash.class.php
+++ b/inc/PassHash.class.php
@@ -82,7 +82,7 @@ class PassHash {
     public function gen_salt($len=32){
         $salt  = '';
         $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-        for($i=0;$i<$len,$i++;) $salt .= $chars[mt_rand(0,61)];
+        for($i=0;$i<$len;$i++) $salt .= $chars[mt_rand(0,61)];
         return $salt;
     }
 
@@ -292,17 +292,20 @@ class PassHash {
      * Password hashing method 'pmd5'
      *
      * Uses salted MD5 hashs. Salt is 1+8 bytes long, 1st byte is the
-     * iteration count.
+     * iteration count when given, for null salts $compute is used.
      *
      * @param string $clear - the clear text to hash
      * @param string $salt  - the salt to use, null for random
      * @param string $magic - the hash identifier (P or H)
+     * @param int  $compute - the iteration count for new passwords
      * @returns string - hashed password
      */
-    public function hash_pmd5($clear, $salt=null, $magic='P'){
-        $this->init_salt($salt);
-
+    public function hash_pmd5($clear, $salt=null, $magic='P',$compute=8){
         $itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+        if(is_null($salt)){
+            $this->init_salt($salt);
+            $salt = $itoa64[$compute].$salt; // prefix iteration count
+        }
         $iterc = $salt[0]; // pos 0 of salt is iteration count
         $iter = strpos($itoa64,$iterc);
         $iter = 1 << $iter;
@@ -340,8 +343,8 @@ class PassHash {
     /**
      * Alias for hash_pmd5
      */
-    public function hash_hmd5($clear, $salt=null, $magic='H'){
-        return $this->hash_pmd5($clear, $salt, $magic);
+    public function hash_hmd5($clear, $salt=null, $magic='H', $compute=8){
+        return $this->hash_pmd5($clear, $salt, $magic, $compute);
     }
 
     /**
-- 
cgit v1.2.3


From 639f8f436d585d7697a7cbf4d7ad87854798c504 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 14 Oct 2011 18:26:37 +0200
Subject: Check if given file is really a file in JpegMeta FS#2322

---
 inc/JpegMeta.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index afa70168c..5c043fb6b 100644
--- a/inc/JpegMeta.php
+++ b/inc/JpegMeta.php
@@ -1207,7 +1207,7 @@ class JpegMeta {
      * @author  Andreas Gohr <andi@splitbrain.org>
      */
     function _parseFileInfo() {
-        if (file_exists($this->_fileName)) {
+        if (file_exists($this->_fileName) && is_file($this->_fileName)) {
             $this->_info['file'] = array();
             $this->_info['file']['Name'] = basename($this->_fileName);
             $this->_info['file']['Path'] = fullpath($this->_fileName);
-- 
cgit v1.2.3


From 407e65b998d62ef65046facba0d66a5dbbcb2509 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 15 Oct 2011 10:40:31 +0200
Subject: Treat a whitespace-only page as empty and delete it FS#2283

---
 inc/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/common.php b/inc/common.php
index ec7f9bece..8b92ebcbc 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -980,7 +980,7 @@ function saveWikiText($id,$text,$summary,$minor=false){
 
     $file = wikiFN($id);
     $old = @filemtime($file); // from page
-    $wasRemoved = empty($text);
+    $wasRemoved = (trim($text) == ''); // check for empty or whitespace only
     $wasCreated = !@file_exists($file);
     $wasReverted = ($REV==true);
     $newRev = false;
-- 
cgit v1.2.3


From 46213daa86e91437d10a0bc603399f4d999b04ca Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 15 Oct 2011 11:23:20 +0200
Subject: cleanup of handler.php

The file contained a few DOS lineendings and trailing spaces
---
 inc/parser/handler.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'inc')

diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 22a50d1b7..0e54425f7 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -1489,10 +1489,10 @@ class Doku_Handler_Block {
         }
     }
 
-    function openParagraph($pos){
+    function openParagraph($pos){
         if ($this->inParagraph) return;
         $this->calls[] = array('p_open',array(), $pos);
-        $this->inParagraph = true;
+        $this->inParagraph = true;
         $this->skipEol = true;
     }
 
@@ -1503,7 +1503,7 @@ class Doku_Handler_Block {
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      */
-    function closeParagraph($pos){
+    function closeParagraph($pos){
         if (!$this->inParagraph) return;
         // look back if there was any content - we don't want empty paragraphs
         $content = '';
@@ -1521,17 +1521,17 @@ class Doku_Handler_Block {
         if(trim($content)==''){
             //remove the whole paragraph
             array_splice($this->calls,$i);
-        }else{
-            // remove ending linebreaks in the paragraph
-            $i=count($this->calls)-1;
+        }else{
+            // remove ending linebreaks in the paragraph
+            $i=count($this->calls)-1;
             if ($this->calls[$i][0] == 'cdata') $this->calls[$i][1][0] = rtrim($this->calls[$i][1][0],DOKU_PARSER_EOL);
             $this->calls[] = array('p_close',array(), $pos);
         }
 
-        $this->inParagraph = false;
+        $this->inParagraph = false;
         $this->skipEol = true;
     }
-    
+
     function addCall($call) {
         $key = count($this->calls);
         if ($key and ($call[0] == 'cdata') and ($this->calls[$key-1][0] == 'cdata')) {
@@ -1553,7 +1553,7 @@ class Doku_Handler_Block {
      * @author Andreas Gohr <andi@splitbrain.org>
      */
     function process($calls) {
-        // open first paragraph
+        // open first paragraph
         $this->openParagraph(0);
         foreach ( $calls as $key => $call ) {
             $cname = $call[0];
-- 
cgit v1.2.3


From a86cc527f2653a972a7416116630b5be5c3e380c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 15 Oct 2011 11:24:19 +0200
Subject: Fix performance issue in close_paragraph

Looks like a for loop is faster than array_splice
---
 inc/parser/handler.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 0e54425f7..24d880e2d 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -1520,7 +1520,8 @@ class Doku_Handler_Block {
 
         if(trim($content)==''){
             //remove the whole paragraph
-            array_splice($this->calls,$i);
+            //array_splice($this->calls,$i); // <- this is much slower than the loop below
+            for($x=$ccount-1; $x>=$i; $x--) unset($this->calls[$x]);
         }else{
             // remove ending linebreaks in the paragraph
             $i=count($this->calls)-1;
-- 
cgit v1.2.3


From faba9a3522d0d79f3d6172e15804bc23c1215ddf Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 15 Oct 2011 11:32:17 +0200
Subject: added the missing bit to my last commit

---
 inc/parser/handler.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 24d880e2d..6754d2560 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -1507,7 +1507,8 @@ class Doku_Handler_Block {
         if (!$this->inParagraph) return;
         // look back if there was any content - we don't want empty paragraphs
         $content = '';
-        for($i=count($this->calls)-1; $i>=0; $i--){
+        $ccount = count($this->calls);
+        for($i=$ccount-1; $i>=0; $i--){
             if($this->calls[$i][0] == 'p_open'){
                 break;
             }elseif($this->calls[$i][0] == 'cdata'){
-- 
cgit v1.2.3


From 6f0b0dd1609f2a253b48f1b9347168dd2d5a61d7 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 15 Oct 2011 10:35:25 +0100
Subject: removed remnants of old flash uploader (FS#2335)

---
 inc/lang/ar/lang.php          | 1 -
 inc/lang/az/lang.php          | 1 -
 inc/lang/bg/lang.php          | 1 -
 inc/lang/ca-valencia/lang.php | 1 -
 inc/lang/ca/lang.php          | 1 -
 inc/lang/cs/lang.php          | 1 -
 inc/lang/da/lang.php          | 1 -
 inc/lang/de-informal/lang.php | 3 +--
 inc/lang/de/lang.php          | 1 -
 inc/lang/el/lang.php          | 1 -
 inc/lang/en/lang.php          | 1 -
 inc/lang/eo/lang.php          | 1 -
 inc/lang/es/lang.php          | 1 -
 inc/lang/et/lang.php          | 1 -
 inc/lang/eu/lang.php          | 1 -
 inc/lang/fa/lang.php          | 3 +--
 inc/lang/fi/lang.php          | 1 -
 inc/lang/fr/lang.php          | 1 -
 inc/lang/gl/lang.php          | 1 -
 inc/lang/he/lang.php          | 1 -
 inc/lang/hr/lang.php          | 1 -
 inc/lang/hu/lang.php          | 1 -
 inc/lang/ia/lang.php          | 1 -
 inc/lang/it/lang.php          | 1 -
 inc/lang/ja/lang.php          | 1 -
 inc/lang/ko/lang.php          | 1 -
 inc/lang/la/lang.php          | 1 -
 inc/lang/lt/lang.php          | 1 -
 inc/lang/lv/lang.php          | 1 -
 inc/lang/mk/lang.php          | 1 -
 inc/lang/mr/lang.php          | 1 -
 inc/lang/ne/lang.php          | 1 -
 inc/lang/nl/lang.php          | 1 -
 inc/lang/no/lang.php          | 1 -
 inc/lang/pl/lang.php          | 1 -
 inc/lang/pt-br/lang.php       | 1 -
 inc/lang/pt/lang.php          | 1 -
 inc/lang/ro/lang.php          | 1 -
 inc/lang/ru/lang.php          | 1 -
 inc/lang/sk/lang.php          | 1 -
 inc/lang/sl/lang.php          | 1 -
 inc/lang/sq/lang.php          | 1 -
 inc/lang/sr/lang.php          | 1 -
 inc/lang/sv/lang.php          | 1 -
 inc/lang/th/lang.php          | 1 -
 inc/lang/tr/lang.php          | 1 -
 inc/lang/uk/lang.php          | 1 -
 inc/lang/zh-tw/lang.php       | 1 -
 inc/lang/zh/lang.php          | 1 -
 49 files changed, 2 insertions(+), 51 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index ee330099b..02a62fe94 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -123,7 +123,6 @@ $lang['js']['nosmblinks']      = 'الروابط لمجلدات مشاركة و
 $lang['js']['linkwiz']         = 'مرشد الروابط';
 $lang['js']['linkto']          = 'الرابط إلى :';
 $lang['js']['del_confirm']     = 'هل حقاً تريد حذف البنود المختارة؟';
-$lang['js']['mu_btn']          = 'رفع عدة ملفات في وقت واحد';
 $lang['rssfailed']             = 'خطأ ما حدث أثناء جلب ملف التغذية:';
 $lang['nothingfound']          = 'لا يوجد شيء';
 $lang['mediaselect']           = 'ملفات الوسائط';
diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php
index 302f24c16..14ce18c2a 100644
--- a/inc/lang/az/lang.php
+++ b/inc/lang/az/lang.php
@@ -118,7 +118,6 @@ $lang['js']['nosmblinks']      = 'Windows-un şəbəkə qovluqlarına link ancaq
 $lang['js']['linkwiz']         = 'Linklər köməkçisi';
 $lang['js']['linkto']          = 'Link göstərir:';
 $lang['js']['del_confirm']     = 'Siz əminsiz ki, seçilmişləri silmək istəyirsiniz?';
-$lang['js']['mu_btn']          = 'Bir neçə faylı birdən yükləmək';
 $lang['mediausage']            = 'Bu fayla link yaratmaq üçün aşağıdakı sintaksisdən istifadə edin:';
 $lang['mediaview']             = 'Bu faylın ilkinə bax';
 $lang['mediaroot']             = 'kök';
diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php
index 580f6d963..ca6aaeadc 100644
--- a/inc/lang/bg/lang.php
+++ b/inc/lang/bg/lang.php
@@ -122,7 +122,6 @@ $lang['js']['nosmblinks']      = 'Връзките към Windows shares раб
 $lang['js']['linkwiz']         = 'Помощник за препратки';
 $lang['js']['linkto']          = 'Препратка към: ';
 $lang['js']['del_confirm']     = 'Да бъдат ли изтрити избраните елементи?';
-$lang['js']['mu_btn']          = 'Качване на няколко файла наведнъж';
 $lang['rssfailed']             = 'Възникна грешка при получаването на емисията: ';
 $lang['nothingfound']          = 'Нищо не е открито.';
 $lang['mediaselect']           = 'Медийни файлове';
diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php
index c9c15b12d..4fc4dfa50 100644
--- a/inc/lang/ca-valencia/lang.php
+++ b/inc/lang/ca-valencia/lang.php
@@ -119,7 +119,6 @@ $lang['js']['nosmblinks']      = 'Els vínculs a recursos compartits de Windows
 $lang['js']['linkwiz']         = 'Assistent de vínculs';
 $lang['js']['linkto']          = 'Vincular a:';
 $lang['js']['del_confirm']     = '¿Realment vol borrar el(s) ítem(s) seleccionat(s)?';
-$lang['js']['mu_btn']          = 'Enviar diversos archius d\'una';
 $lang['mediausage']            = 'Utilise la següent sintaxis per a referenciar est archiu:';
 $lang['mediaview']             = 'Vore l\'archiu original';
 $lang['mediaroot']             = 'base';
diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php
index fbd1cb18a..41ee389d8 100644
--- a/inc/lang/ca/lang.php
+++ b/inc/lang/ca/lang.php
@@ -120,7 +120,6 @@ Si voleu podeu copiar i enganxar l\'enllaç.';
 $lang['js']['linkwiz']         = 'Auxiliar d\'enllaços';
 $lang['js']['linkto']          = 'Enllaça a:';
 $lang['js']['del_confirm']     = 'Suprimiu aquesta entrada?';
-$lang['js']['mu_btn']          = 'Penja múltiples fitxers';
 $lang['mediausage']            = 'Utilitzeu la sintaxi següent per referir-vos a aquest enllaç:';
 $lang['mediaview']             = 'Mostra el fitxer original';
 $lang['mediaroot']             = 'arrel';
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index eaefaadb5..292c2c42e 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -127,7 +127,6 @@ Přesto tento odkaz můžete zkopírovat a vložit jinde.';
 $lang['js']['linkwiz']         = 'Průvodce odkazy';
 $lang['js']['linkto']          = 'Odkaz na:';
 $lang['js']['del_confirm']     = 'Vymazat tuto položku?';
-$lang['js']['mu_btn']          = 'Načíst více souborů najednou';
 $lang['rssfailed']             = 'Nastala chyba při vytváření tohoto RSS: ';
 $lang['nothingfound']          = 'Nic nenalezeno.';
 $lang['mediaselect']           = 'Výběr dokumentu';
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index 614f2bdf2..0b6961921 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -130,7 +130,6 @@ Du kan stadig kopiere og indsætte linket.';
 $lang['js']['linkwiz']         = 'guiden til henvisninger';
 $lang['js']['linkto']          = 'Henvise til:';
 $lang['js']['del_confirm']     = 'Slet valgte post(er)?';
-$lang['js']['mu_btn']          = 'Overføre flere filer på en gang';
 $lang['rssfailed']             = 'Der opstod en fejl ved indhentning af: ';
 $lang['nothingfound']          = 'Søgningen gav intet resultat.';
 $lang['mediaselect']           = 'Vælg mediefil';
diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index 4d7c26621..62b633fd5 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -19,7 +19,7 @@
  * @author Matthias Schulte <mailinglist@lupo49.de>
  * @author Christian Wichmann <nospam@zone0.de>
  */
- 
+
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
 $lang['doublequoteopening']    = '„';
@@ -144,7 +144,6 @@ $lang['js']['nosmblinks']      = 'Das Verlinken von Windows-Freigaben funktionie
 $lang['js']['linkwiz']         = 'Link-Assistent';
 $lang['js']['linkto']          = 'Link zu:';
 $lang['js']['del_confirm']     = 'Die ausgewählten Dateien wirklich löschen?';
-$lang['js']['mu_btn']          = 'Mehrere Dateien gleichzeitig hochladen';
 $lang['js']['restore_confirm'] = 'Really restore this version?';
 $lang['js']['media_diff']          = 'Unterschiede anzeigen:';
 $lang['js']['media_diff_both']     = 'Side by Side';
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index f647e6d64..34434cafa 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -137,7 +137,6 @@ $lang['js']['nosmblinks']      = 'Das Verlinken von Windows-Freigaben funktionie
 $lang['js']['linkwiz']         = 'Link-Assistent';
 $lang['js']['linkto']          = 'Link nach:';
 $lang['js']['del_confirm']     = 'Eintrag wirklich löschen?';
-$lang['js']['mu_btn']          = 'Mehrere Dateien gleichzeitig hochladen';
 $lang['js']['restore_confirm'] = 'Really restore this version?';
 $lang['js']['media_diff']      = 'Unterschiede anzeigen:';
 $lang['js']['media_diff_both'] = 'Side by Side';
diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php
index de8705db9..4c334c1de 100644
--- a/inc/lang/el/lang.php
+++ b/inc/lang/el/lang.php
@@ -127,7 +127,6 @@ $lang['js']['nosmblinks']      = 'Οι σύνδεσμοι προς Windows share
 $lang['js']['linkwiz']         = 'Αυτόματος Οδηγός Συνδέσμων';
 $lang['js']['linkto']          = 'Σύνδεση σε:';
 $lang['js']['del_confirm']     = 'Να διαγραφεί;';
-$lang['js']['mu_btn']          = 'Ταυτόχρονη φόρτωση πολλαπλών φακέλων';
 $lang['js']['restore_confirm'] = 'Θέλετε την επαναφορά σε αυτή την έκδοση;';
 $lang['js']['media_diff']      = 'Εμφάνιση διαφορών:';
 $lang['js']['media_diff_both'] = 'Δίπλα δίπλα';
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 92c7185b2..89a7c4d40 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -132,7 +132,6 @@ $lang['js']['nosmblinks']      = 'Linking to Windows shares only works in Micros
 $lang['js']['linkwiz']         = 'Link Wizard';
 $lang['js']['linkto']          = 'Link to:';
 $lang['js']['del_confirm']     = 'Really delete selected item(s)?';
-$lang['js']['mu_btn']          = 'Upload multiple files at once';
 $lang['js']['restore_confirm'] = 'Really restore this version?';
 $lang['js']['media_diff']          = 'View differences:';
 $lang['js']['media_diff_both']     = 'Side by Side';
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index 94bd244ac..8a15981ee 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -129,7 +129,6 @@ Vi ankoraŭ povas kopii kaj almeti la ligilon.';
 $lang['js']['linkwiz']         = 'Ligil-Asistanto';
 $lang['js']['linkto']          = 'Ligilo al:';
 $lang['js']['del_confirm']     = 'Ĉu vere forigi elektitajn ero(j)n?';
-$lang['js']['mu_btn']          = 'Alŝuti plurajn dosierojn multope.';
 $lang['js']['restore_confirm'] = 'Ĉu vere restarigi ĉi tiun version?';
 $lang['js']['media_diff']      = 'Rigardu la diferencojn:';
 $lang['js']['media_diff_both'] = 'Flankon apud flanko';
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 8e912e9a8..5164c3243 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -145,7 +145,6 @@ Lo que sí puedes hacer es copiar y pegar el enlace.';
 $lang['js']['linkwiz']         = 'Asistente de enlaces';
 $lang['js']['linkto']          = 'Enlazar a:';
 $lang['js']['del_confirm']     = '¿Quieres realmente borrar lo seleccionado?';
-$lang['js']['mu_btn']          = 'Subir varios archivos a la vez';
 $lang['js']['restore_confirm'] = '¿Estás seguro de querer restaurar esta versión?';
 $lang['js']['media_diff']      = 'Ver diferencias:';
 $lang['js']['media_diff_both'] = 'Lado por lado';
diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index 66fab3f9a..6cd2f437d 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -124,7 +124,6 @@ Siiski võid kopeerida ja asetada lingi.';
 $lang['js']['linkwiz']         = 'Lingi nõustaja';
 $lang['js']['linkto']          = 'Lingi:';
 $lang['js']['del_confirm']     = 'Kas kustutame selle kirje?';
-$lang['js']['mu_btn']          = 'Laadi üles mittu faili';
 $lang['rssfailed']             = 'Sinu soovitud info ammutamisel tekkis viga: ';
 $lang['nothingfound']          = 'Oops, aga mitte muhvigi ei leitud.';
 $lang['mediaselect']           = 'Hunnik faile';
diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php
index 30dfe9e5b..d02f281c3 100644
--- a/inc/lang/eu/lang.php
+++ b/inc/lang/eu/lang.php
@@ -122,7 +122,6 @@ Esteka kopiatu eta itsatsi dezakezu dena den.';
 $lang['js']['linkwiz']         = 'Estekatze Laguntzailea';
 $lang['js']['linkto']          = 'Estekatu hona:';
 $lang['js']['del_confirm']     = 'Benetan ezabatu aukeratutako fitxategia(k)?';
-$lang['js']['mu_btn']          = 'Igo hainbat fitxategi aldi berean';
 $lang['rssfailed']             = 'Errorea gertatu da feed hau irakurtzean:';
 $lang['nothingfound']          = 'Ez da ezer aurkitu.';
 $lang['mediaselect']           = 'Aukeratu Multimedia fitxategia';
diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php
index 1a7467431..ac14ce07a 100644
--- a/inc/lang/fa/lang.php
+++ b/inc/lang/fa/lang.php
@@ -98,7 +98,7 @@ $lang['txt_overwrt']           = 'بر روی فایل موجود بنویس';
 $lang['lockedby']              = 'در حال حاضر قفل شده است';
 $lang['lockexpire']            = 'قفل منقضی شده است';
 $lang['js']['willexpire']            = 'حالت قفل شما مدتی است منقضی شده است \n برای جلوگیری از تداخل دکمه‌ی پیش‌نمایش را برای صفر شدن ساعت قفل بزنید.';
-$lang['js']['notsavedyet']     = 'تغییرات ذخیره شده از بین خواهد رفت. 
+$lang['js']['notsavedyet']     = 'تغییرات ذخیره شده از بین خواهد رفت.
  می‌خواهید ادامه دهید؟';
 $lang['js']['searchmedia']     = 'جستجو برای فایل';
 $lang['js']['keepopen']        = 'پنجره را ر زمان انتخاب باز نگه‌دار';
@@ -129,7 +129,6 @@ $lang['js']['nosmblinks']      = 'پیوند به Windows share فقط در ای
 $lang['js']['linkwiz']         = 'ویزارد پیوند';
 $lang['js']['linkto']          = 'پیوند به:';
 $lang['js']['del_confirm']     = 'واقعن تصمیم به حذف این موارد دارید؟';
-$lang['js']['mu_btn']          = 'ارسال هم‌زمان چندین فایل ';
 $lang['rssfailed']             = 'بروز خطا در هنگام واکشی';
 $lang['nothingfound']          = 'چیزی پیدا نشد';
 $lang['mediaselect']           = 'فایل‌ها';
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index 83d487302..8d671a4cb 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -127,7 +127,6 @@ Voit silti kopioida ja liittää linkin.';
 $lang['js']['linkwiz']         = 'Linkkivelho';
 $lang['js']['linkto']          = 'Linkki kohteeseen:';
 $lang['js']['del_confirm']     = 'Haluatko todella poistaa valitut kohteet?';
-$lang['js']['mu_btn']          = 'Lähetä useampia tiedostoja kerralla';
 $lang['js']['restore_confirm'] = 'Haluatko varmasti palauttaa tämän version?';
 $lang['js']['media_diff']      = 'Näytä erot:';
 $lang['js']['media_diff_both'] = 'Vierekkäin';
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index c73febc00..c02ad657d 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -149,7 +149,6 @@ $lang['js']['nosmblinks']      = 'Les liens vers les partages Windows ne fonctio
 $lang['js']['linkwiz']         = 'Assistant Lien';
 $lang['js']['linkto']          = 'Lien vers :';
 $lang['js']['del_confirm']     = 'Effacer cette entrée ?';
-$lang['js']['mu_btn']          = 'Envoyer plusieurs fichiers en même temps';
 $lang['js']['willexpire']      = 'Votre verrouillage pour la modification de cette page expire dans une minute.\nPour éviter les conflits, utilisez le bouton « Aperçu » pour réinitialiser le minuteur.';
 $lang['js']['restore_confirm']     = 'Voulez vous vraiment restaurer cette version?';
 $lang['js']['media_diff']          = 'Voir les différences:';
diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php
index a3caeff6d..01938b3a0 100644
--- a/inc/lang/gl/lang.php
+++ b/inc/lang/gl/lang.php
@@ -137,7 +137,6 @@ Sempre podes copiar e colar a ligazón.';
 $lang['js']['linkwiz']         = 'Asistente de ligazóns';
 $lang['js']['linkto']          = 'Ligazón para:';
 $lang['js']['del_confirm']     = 'Estás certo de quereres eliminar os elementos seleccionados?';
-$lang['js']['mu_btn']          = 'Subir varios arquivos de vez';
 $lang['mediausage']            = 'Emprega a seguinte sintaxe para inserires unha referencia a este arquivo:';
 $lang['mediaview']             = 'Ver arquivo orixinal';
 $lang['mediaroot']             = 'raigaña';
diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 589088320..f295e44a9 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -126,7 +126,6 @@ $lang['js']['nosmblinks']      = 'קישור לכונני שיתוף של Window
 $lang['js']['linkwiz']         = 'אשף הקישורים';
 $lang['js']['linkto']          = 'קישור אל:';
 $lang['js']['del_confirm']     = 'באמת למחוק?';
-$lang['js']['mu_btn']          = 'העלאת מספר קבצים יחד';
 $lang['rssfailed']             = 'אירע כשל בעת קבלת הזנה זו:';
 $lang['nothingfound']          = 'לא נמצאו תוצאות.';
 $lang['mediaselect']           = 'קובצי מדיה';
diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php
index a85214cf7..ef10d7720 100644
--- a/inc/lang/hr/lang.php
+++ b/inc/lang/hr/lang.php
@@ -123,7 +123,6 @@ $lang['js']['nosmblinks']      = 'Linkovi na dijeljene Windows mape rade samo s
 $lang['js']['linkwiz']         = 'Čarobnjak za poveznice';
 $lang['js']['linkto']          = 'Poveznica na:';
 $lang['js']['del_confirm']     = 'Zbilja želite obrisati odabrane stavke?';
-$lang['js']['mu_btn']          = 'Postavi više datoteka odjednom';
 $lang['rssfailed']             = 'Došlo je do greške prilikom preuzimanja feed-a: ';
 $lang['nothingfound']          = 'Traženi dokumetni nisu pronađeni.';
 $lang['mediaselect']           = 'Mediafile datoteke';
diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php
index 89ad77948..23419a2bd 100644
--- a/inc/lang/hu/lang.php
+++ b/inc/lang/hu/lang.php
@@ -127,7 +127,6 @@ A hivatkozást másolni és beszúrni ettől fügetlenül mndig tudod.';
 $lang['js']['linkwiz']         = 'Hivatkozás varázsló';
 $lang['js']['linkto']          = 'Hivatkozás erre:';
 $lang['js']['del_confirm']     = 'Valóban törölni akarod a kiválasztott elem(ek)et?';
-$lang['js']['mu_btn']          = 'Több fájl feltöltése egyszerre';
 $lang['rssfailed']             = 'Hiba történt ennek a betöltésekor: ';
 $lang['nothingfound']          = 'Semmit sem találtam.';
 $lang['mediaselect']           = 'Médiafájl kiválasztása';
diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php
index abf1e6786..8398f29f0 100644
--- a/inc/lang/ia/lang.php
+++ b/inc/lang/ia/lang.php
@@ -143,7 +143,6 @@ Tu pote nonobstante copiar e collar le ligamine.';
 $lang['js']['linkwiz']         = 'Assistente pro ligamines';
 $lang['js']['linkto']          = 'Ligar verso:';
 $lang['js']['del_confirm']     = 'Realmente deler le entrata(s) seligite?';
-$lang['js']['mu_btn']          = 'Incargar plure files simultaneemente';
 $lang['mediausage']            = 'Usa le syntaxe sequente pro referer a iste file:';
 $lang['mediaview']             = 'Vider file original';
 $lang['mediaroot']             = 'radice';
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index 8812b148d..9f4d42004 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -129,7 +129,6 @@ $lang['js']['nosmblinks']      = 'I collegamenti con le risorse condivise di Win
 $lang['js']['linkwiz']         = 'Collegamento guidato';
 $lang['js']['linkto']          = 'Collega a:';
 $lang['js']['del_confirm']     = 'Eliminare veramente questa voce?';
-$lang['js']['mu_btn']          = 'Carica più di un file alla volta';
 $lang['rssfailed']             = 'Si è verificato un errore cercando questo feed: ';
 $lang['nothingfound']          = 'Nessun risultato trovato.';
 $lang['mediaselect']           = 'Selezione dei file';
diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index b0b93450e..1eeb6bb73 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -123,7 +123,6 @@ $lang['js']['nosmblinks']      = 'ウィンドウズの共有フォルダへリ
 $lang['js']['linkwiz']         = 'リンクウィザード';
 $lang['js']['linkto']          = 'リンク先：';
 $lang['js']['del_confirm']     = '選択した項目を本当に削除しますか？';
-$lang['js']['mu_btn']          = '複数のファイルを一度にアップロード';
 $lang['rssfailed']             = 'RSSの取得に失敗しました：';
 $lang['nothingfound']          = '該当文書はありませんでした。';
 $lang['mediaselect']           = 'メディアファイルを選択';
diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index 7b55ebe71..91825c797 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -125,7 +125,6 @@ $lang['js']['nosmblinks']      = '윈도우 공유 파일과의 연결은 MS 인
 $lang['js']['linkwiz']         = '링크 마법사';
 $lang['js']['linkto']          = '다음으로 연결:';
 $lang['js']['del_confirm']     = '정말로 선택된 항목(들)을 삭제하시겠습니까?';
-$lang['js']['mu_btn']          = '여러 파일들을 한번에 업로드합니다.';
 $lang['rssfailed']             = 'feed 가져오기 실패: ';
 $lang['nothingfound']          = '아무 것도 없습니다.';
 $lang['mediaselect']           = '미디어 파일 선택';
diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php
index 00312f7a1..fd34a4ef8 100644
--- a/inc/lang/la/lang.php
+++ b/inc/lang/la/lang.php
@@ -125,7 +125,6 @@ Adhuc transcribere nexum potes.';
 $lang['js']['linkwiz']         = 'Connectendi ductor';
 $lang['js']['linkto']          = 'Nexum ad:';
 $lang['js']['del_confirm']     = 'Delere electas res uin?';
-$lang['js']['mu_btn']          = 'Plura documenta uno tempore onerare';
 $lang['rssfailed']             = 'Error in restituendo ';
 $lang['nothingfound']          = 'Nihil inuentum est.';
 $lang['mediaselect']           = 'Documenta uisiua:';
diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php
index 121e25308..b42035026 100644
--- a/inc/lang/lt/lang.php
+++ b/inc/lang/lt/lang.php
@@ -115,7 +115,6 @@ $lang['js']['keepopen']        = 'Pažymėjus palikti langą atvertą';
 $lang['js']['hidedetails']     = 'Paslėpti Detales';
 $lang['js']['nosmblinks']      = 'Nurodos į "Windows shares" veikia tik su Microsoft Internet Explorer naršykle.
 Vis dėlto, jūs galite nukopijuoti šią nuorodą.';
-$lang['js']['mu_btn']          = 'Pateikite kelis failus vienu ypu';
 $lang['mediausage']            = 'Failo nuorodai užrašyti naudokite tokią sintaksę:';
 $lang['mediaview']             = 'Žiūrėti pirminį failą';
 $lang['mediaroot']             = 'pradžia (root)';
diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php
index 64e22c56a..30679c824 100644
--- a/inc/lang/lv/lang.php
+++ b/inc/lang/lv/lang.php
@@ -121,7 +121,6 @@ Protams, ka vari saiti kopēt un iespraust citā programmā.';
 $lang['js']['linkwiz']         = 'Saišu vednis';
 $lang['js']['linkto']          = 'Saite uz: ';
 $lang['js']['del_confirm']     = 'Dzēst šo šķirkli?';
-$lang['js']['mu_btn']          = 'Augšuplādēt uzreiz vairākus failus.';
 $lang['rssfailed']             = 'Kļūda saņemot saturu no ';
 $lang['nothingfound']          = 'Nekas nav atrasts.';
 $lang['mediaselect']           = 'Mēdiju faila izvēle';
diff --git a/inc/lang/mk/lang.php b/inc/lang/mk/lang.php
index b7d433092..ca4a746cd 100644
--- a/inc/lang/mk/lang.php
+++ b/inc/lang/mk/lang.php
@@ -117,7 +117,6 @@ $lang['js']['nosmblinks']      = 'Поврзувањето со Windows Shares 
 $lang['js']['linkwiz']         = 'Волшебник за врски';
 $lang['js']['linkto']          = 'Врска до:';
 $lang['js']['del_confirm']     = 'Дали навистина да ги избришам избраните датотеки?';
-$lang['js']['mu_btn']          = 'Качете повеќе датотеки наеднаш';
 $lang['mediausage']            = 'Користете ја следнава синтакса за референцирање кон оваа датотека:';
 $lang['mediaview']             = 'Види ја оригиналната датотека';
 $lang['mediaroot']             = 'root';
diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php
index ae9d05bfd..02bda19d6 100644
--- a/inc/lang/mr/lang.php
+++ b/inc/lang/mr/lang.php
@@ -118,7 +118,6 @@ $lang['mediafiles']            = 'मध्ये उपलब्ध असल
 $lang['js']['keepopen']        = 'निवड केल्यावर विण्डो उघडी ठेवा';
 $lang['js']['hidedetails']     = 'सविस्तर मजकूर लपवा';
 $lang['js']['nosmblinks']      = 'विन्डोज़ शेअर ला लिंक केल्यास ते फक्त मायक्रोसॉफ़्ट इन्टरनेट एक्स्प्लोरर वरच चालते. तरी तुम्ही लिंक कॉपी करू शकता.';
-$lang['js']['mu_btn']          = 'एक वेळेस अनेक फाइल वापरा';
 $lang['mediausage']            = 'ह्या फाइलचा संदर्भ देण्यासाठी खालील सिन्टॅक्स वापरा :';
 $lang['mediaview']             = 'मूळ फाइल बघू ';
 $lang['mediaroot']             = 'रूट';
diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php
index 53c701b23..5d572ccd9 100644
--- a/inc/lang/ne/lang.php
+++ b/inc/lang/ne/lang.php
@@ -110,7 +110,6 @@ $lang['mediafiles']            = ' उपलब्ध फाइलहरु ';
 $lang['js']['keepopen']        = 'छनौटमा विन्डो खुला राख्नुहोस् ';
 $lang['js']['hidedetails']     = 'जानकारी लुकाउनु होस् ';
 $lang['js']['nosmblinks']      = 'विन्डोहरु लिङ्क गर्दा माइक्रो सफ्ट एक्सप्लोररमामात्र  काम साझा हुन्छ । तर कपि गर्न र टास्न मिल्छ।   ';
-$lang['js']['mu_btn']          = 'धेरै वटा फाइलहरु एकैपटक अपलोड गर्नुहोस् ।';
 $lang['mediausage']            = 'फाइललाई रेफरेन्स गर्न निम्न सुत्र प्रयोग गर्नुहोस् :';
 $lang['mediaview']             = 'सक्कली फाइल हेर्नुहोस् ';
 $lang['mediaroot']             = 'रुट(मूख्य प्रयोगकर्ता)';
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index 1f548508e..62d23b0d2 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -134,7 +134,6 @@ Je kan de link wel kopiëren en plakken.';
 $lang['js']['linkwiz']         = 'Linkwizard';
 $lang['js']['linkto']          = 'Link naar:';
 $lang['js']['del_confirm']     = 'Item(s) verwijderen?';
-$lang['js']['mu_btn']          = 'Meerdere files tegelijk uploaden';
 $lang['js']['restore_confirm'] = 'Werkelijk deze versie terugzetten?';
 $lang['js']['media_diff']      = 'Verschillen bekijken:';
 $lang['js']['media_diff_both'] = 'Naast elkaar';
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index 7ed5902ca..8f9562408 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -135,7 +135,6 @@ Du kan fortsatt kopiere og lime inn lenken.';
 $lang['js']['linkwiz']         = 'guide til lenker';
 $lang['js']['linkto']          = 'Lenke til:';
 $lang['js']['del_confirm']     = 'Slett denne oppføringen?';
-$lang['js']['mu_btn']          = 'Last opp flere filer samtidig';
 $lang['js']['restore_confirm'] = 'Er du sikker på at du vil gjenopprette denne versjonen?';
 $lang['js']['media_diff']      = 'Vis forskjeller:';
 $lang['js']['media_diff_both'] = 'Side ved side:';
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index f9bf57852..a6fc3d52e 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -129,7 +129,6 @@ Możesz skopiować odnośnik.';
 $lang['js']['linkwiz']         = 'Tworzenie odnośników';
 $lang['js']['linkto']          = 'Link do';
 $lang['js']['del_confirm']     = 'Czy na pewno usunąć?';
-$lang['js']['mu_btn']          = 'Wyślij wiele plików na raz';
 $lang['rssfailed']             = 'Wystąpił błąd przy pobieraniu tych danych: ';
 $lang['nothingfound']          = 'Nic nie znaleziono.';
 $lang['mediaselect']           = 'Wysyłanie pliku';
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index d1b46c294..066b3acaa 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -136,7 +136,6 @@ Entretanto, você ainda pode copiar e colar o atalho.';
 $lang['js']['linkwiz']         = 'Link Wizard';
 $lang['js']['linkto']          = 'Link para:';
 $lang['js']['del_confirm']     = 'Deseja realmente excluir o(s) item(ns) selecionado(s)?';
-$lang['js']['mu_btn']          = 'Enviar vários arquivos de uma vez';
 $lang['rssfailed']             = 'Ocorreu um erro durante a atualização dessa fonte: ';
 $lang['nothingfound']          = 'Não foi encontrado nada.';
 $lang['mediaselect']           = 'Arquivos de mídia';
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 6a2034a95..78688ce5f 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -137,7 +137,6 @@ $lang['js']['linkwiz']         = 'Assistente de Criação de Ligação';
 $lang['js']['linkto']          = 'Ligação para:';
 $lang['js']['del_confirm']     = 'Remover o(s) item(s) selecionados?';
 $lang['js']['restore_confirm'] = 'Restaurar esta versão?';
-$lang['js']['mu_btn']          = 'Enviar múltiplos ficheiros de uma vez';
 $lang['rssfailed']             = 'Ocorreu um erro neste canal RSS: ';
 $lang['nothingfound']          = 'Nada foi encontrado.';
 $lang['mediaselect']           = 'Selecção de ficheiros';
diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index 2a61ef204..91f8ebb97 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -127,7 +127,6 @@ Puteţi însă copia şi insera legătura.';
 $lang['js']['linkwiz']         = 'Asistent legătură';
 $lang['js']['linkto']          = 'Legătură la:';
 $lang['js']['del_confirm']     = 'Doriţi într-adevăr ştergerea elementelor selectate?';
-$lang['js']['mu_btn']          = 'Încarcă mai multe fişiere simultan';
 $lang['js']['restore_confirm'] = 'Sunteți sigur că doriți restaurarea acestei versiuni?';
 $lang['js']['media_diff']      = 'Arată diferențele:';
 $lang['js']['media_diff_both'] = 'Unul lângă altul';
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 52c1dc20b..44d1027c0 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -143,7 +143,6 @@ $lang['js']['nosmblinks']      = 'Ссылка на сетевые катало
 $lang['js']['linkwiz']         = 'Мастер ссылок';
 $lang['js']['linkto']          = 'Ссылка на:';
 $lang['js']['del_confirm']     = 'Вы на самом деле желаете удалить выбранное?';
-$lang['js']['mu_btn']          = 'Загрузить несколько файлов одновременно';
 $lang['js']['willexpire']      = 'Ваша блокировка этой страницы на редактирование истекает в течении минуты.\nЧтобы предотвратить конфликты используйте кнопку "Просмотр" для сброса таймера блокировки.';
 $lang['js']['restore_confirm']     = 'Действительно восстановить эту версию?';
 $lang['js']['media_diff']          = 'Просмотр отличий:';
diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index 4dab977b9..aee1ca367 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -124,7 +124,6 @@ Aj napriek tomu tento odkaz môžete skopírovať a vložiť inde.';
 $lang['js']['linkwiz']         = 'Sprievodca odkazmi';
 $lang['js']['linkto']          = 'Odkaz na:';
 $lang['js']['del_confirm']     = 'Zmazať túto položku?';
-$lang['js']['mu_btn']          = 'Nahrať viac súborov súčasne';
 $lang['rssfailed']             = 'Nastala chyba pri vytváraní tohto RSS: ';
 $lang['nothingfound']          = 'Nič nenájdené.';
 $lang['mediaselect']           = 'Výber dokumentu';
diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php
index 55c895b2d..9acf13504 100644
--- a/inc/lang/sl/lang.php
+++ b/inc/lang/sl/lang.php
@@ -123,7 +123,6 @@ $lang['js']['nosmblinks']      = 'Povezovanje do souporabnih datotek sistema Win
 $lang['js']['linkwiz']         = 'Čarovnik za povezave';
 $lang['js']['linkto']          = 'Poveži na:';
 $lang['js']['del_confirm']     = 'Ali naj se res izbrišejo izbrani predmeti?';
-$lang['js']['mu_btn']          = 'Pošiljanje več dokumentov hkrati.';
 $lang['rssfailed']             = 'Prišlo je do napake med pridobivanjem vira: ';
 $lang['nothingfound']          = 'Ni najdenih predmetov.';
 $lang['mediaselect']           = 'Predstavne datoteke';
diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php
index ea2f018b3..87d0f30b5 100644
--- a/inc/lang/sq/lang.php
+++ b/inc/lang/sq/lang.php
@@ -120,7 +120,6 @@ $lang['js']['nosmblinks']      = 'Lidhja te Windows shares funksionon vetëm në
 $lang['js']['linkwiz']         = 'Magjistari i Link';
 $lang['js']['linkto']          = 'Lidh tek:';
 $lang['js']['del_confirm']     = 'Fshiji vërtetë objektet e përzgjedhura?';
-$lang['js']['mu_btn']          = 'Ngarko shumë skedarë njëkohësisht';
 $lang['mediausage']            = 'Përdor sintaksën e mëposhtme për të referuar këtë skedar:';
 $lang['mediaview']             = 'Shiko skedarin origjinal';
 $lang['mediaroot']             = 'rrënja';
diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php
index a868f1d81..22bcf4e33 100644
--- a/inc/lang/sr/lang.php
+++ b/inc/lang/sr/lang.php
@@ -123,7 +123,6 @@ $lang['js']['nosmblinks']      = 'Повезивање са Windows дељени
 $lang['js']['linkwiz']         = 'Чаробњак за стварање везе';
 $lang['js']['linkto']          = 'Повежи ка:';
 $lang['js']['del_confirm']     = 'Обриши овај унос?';
-$lang['js']['mu_btn']          = 'Слање више датотека одједном';
 $lang['rssfailed']             = 'Дошло је до грешке приликом преузимања овог довода: ';
 $lang['nothingfound']          = 'Ништа није нађено.';
 $lang['mediaselect']           = 'Избор медијске датотеке';
diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php
index d6f90a5f4..943509fed 100644
--- a/inc/lang/sv/lang.php
+++ b/inc/lang/sv/lang.php
@@ -131,7 +131,6 @@ Du kan fortfarande klippa och klistra in länken om du använder en annan webbl
 $lang['js']['linkwiz']         = 'Snabbguide Länkar';
 $lang['js']['linkto']          = 'Länk till:';
 $lang['js']['del_confirm']     = 'Vill du verkligen radera?';
-$lang['js']['mu_btn']          = 'Ladda upp flera filer samtidigt';
 $lang['rssfailed']             = 'Ett fel uppstod när detta RSS-flöde skulle hämtas: ';
 $lang['nothingfound']          = 'Inga filer hittades.';
 $lang['mediaselect']           = 'Mediafiler';
diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php
index e9dffa2c1..c447bf61c 100644
--- a/inc/lang/th/lang.php
+++ b/inc/lang/th/lang.php
@@ -126,7 +126,6 @@ $lang['js']['nosmblinks']      = 'เชื่อมไปยังหน้า
 $lang['js']['linkwiz']         = 'ลิงค์วิเศษ';
 $lang['js']['linkto']          = 'ลิงค์ไป:';
 $lang['js']['del_confirm']     = 'ต้องการลบรายการที่เลือกจริงๆหรือ?';
-$lang['js']['mu_btn']          = 'อัพโหลดหลายๆไฟล์ในครั้งเดียว';
 $lang['mediausage']            = 'ให้ใช้ไวยกรณ์ต่อไปนี้เพื่ออ้างอิงไฟล์นี้';
 $lang['mediaview']             = 'ดูไฟล์ต้นฉบับ';
 $lang['mediaroot']             = 'ราก(รูท)';
diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php
index 0b76a6e81..94b1c951a 100644
--- a/inc/lang/tr/lang.php
+++ b/inc/lang/tr/lang.php
@@ -124,7 +124,6 @@ $lang['js']['nosmblinks']      = 'Windows paylaşımı sadece Microsoft Internet
 $lang['js']['linkwiz']         = 'Bağlantı sihirbazı';
 $lang['js']['linkto']          = 'Bağlantı:';
 $lang['js']['del_confirm']     = 'Bu girişi sil?';
-$lang['js']['mu_btn']          = 'Birden fazla dosyayı bir seferde gönder';
 $lang['rssfailed']             = 'Bu beslemeyi çekerken hata oluştu: ';
 $lang['nothingfound']          = 'Hiçbir şey yok.';
 $lang['mediaselect']           = 'Çokluortam dosyası seçimi';
diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php
index 6b80bc75c..22d61c9bf 100644
--- a/inc/lang/uk/lang.php
+++ b/inc/lang/uk/lang.php
@@ -126,7 +126,6 @@ $lang['js']['nosmblinks']      = 'Посилання на мережеві па
 $lang['js']['linkwiz']         = 'Чарівник посилань';
 $lang['js']['linkto']          = 'Посилання на:';
 $lang['js']['del_confirm']     = 'Дійсно знищити обрані елементи?';
-$lang['js']['mu_btn']          = 'Завантажити одночасно кілька файлів';
 $lang['rssfailed']             = 'Виникла помилка під час отримання RSS-стрічки: ';
 $lang['nothingfound']          = 'Нічого не знайдено.';
 $lang['mediaselect']           = 'Вибір медіа-файлу';
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index 2222125f5..a46869d6c 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -126,7 +126,6 @@ $lang['js']['nosmblinks']      = '只有在 Microsoft IE 下才能執行「連
 $lang['js']['linkwiz']         = '建立連結精靈';
 $lang['js']['linkto']          = '連結至：';
 $lang['js']['del_confirm']     = '確定刪除選取的項目？';
-$lang['js']['mu_btn']          = '上傳多個檔案';
 $lang['rssfailed']             = '擷取 RSS 饋送檔時發生錯誤：';
 $lang['nothingfound']          = '沒找到任何結果。';
 $lang['mediaselect']           = '媒體檔案';
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 4328d10ce..6e6dff6f4 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -133,7 +133,6 @@ $lang['js']['nosmblinks']      = '连接到 Windows 共享功能只有在 IE 浏
 $lang['js']['linkwiz']         = '链接向导';
 $lang['js']['linkto']          = '链接到：';
 $lang['js']['del_confirm']     = '真的要删除选中的项目吗？';
-$lang['js']['mu_btn']          = '一次上传了多个文件';
 $lang['js']['restore_confirm'] = '确实要恢复这个版本么？';
 $lang['js']['media_diff']      = '查看差异：';
 $lang['js']['media_diff_both'] = '肩并肩';
-- 
cgit v1.2.3


From a284275484f42c92beaac76c05a80e66d3ab3026 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 15 Oct 2011 13:16:37 +0200
Subject: fix off-by-one error

---
 inc/parser/handler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 6754d2560..fd4304ba5 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -1522,7 +1522,7 @@ class Doku_Handler_Block {
         if(trim($content)==''){
             //remove the whole paragraph
             //array_splice($this->calls,$i); // <- this is much slower than the loop below
-            for($x=$ccount-1; $x>=$i; $x--) unset($this->calls[$x]);
+            for($x=$ccount-1; $x>$i; $x--) unset($this->calls[$x]);
         }else{
             // remove ending linebreaks in the paragraph
             $i=count($this->calls)-1;
-- 
cgit v1.2.3


From d8f7a7f328a68b48d9ef5c0987b6a4915d43735e Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 15 Oct 2011 14:24:20 +0200
Subject: replace unset with array_pop

unset does not reset the Array's internal pointer which messes up later
calls. array_pop is still much faster than array_splice
---
 inc/parser/handler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index fd4304ba5..55b715ad9 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -1522,7 +1522,7 @@ class Doku_Handler_Block {
         if(trim($content)==''){
             //remove the whole paragraph
             //array_splice($this->calls,$i); // <- this is much slower than the loop below
-            for($x=$ccount-1; $x>$i; $x--) unset($this->calls[$x]);
+            for($x=$ccount; $x>$i; $x--) array_pop($this->calls);
         }else{
             // remove ending linebreaks in the paragraph
             $i=count($this->calls)-1;
-- 
cgit v1.2.3


From 8767131332327095c90b4a0a59f8605842095883 Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sat, 15 Oct 2011 15:21:52 +0200
Subject: Fixed missing ul wrapper in TOC (FS#2328)

---
 inc/html.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 7f5a46b93..1658e9b4c 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -899,7 +899,7 @@ function html_li_default($item){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function html_buildlist($data,$class,$func,$lifunc='html_li_default'){
+function html_buildlist($data,$class,$func,$lifunc='html_li_default',$forcewrapper=false){
     if (count($data) === 0) {
         return '';
     }
@@ -907,7 +907,7 @@ function html_buildlist($data,$class,$func,$lifunc='html_li_default'){
     $start_level = $data[0]['level'];
     $ret   = '';
 
-    if ($start_level < 2) {
+    if ($forcewrapper || $start_level < 2) {
         // Trigger building a wrapper ul if the first level is
         // 0 (we have a root object) or 1 (just the root content)
         --$start_level;
@@ -930,8 +930,9 @@ function html_buildlist($data,$class,$func,$lifunc='html_li_default'){
                 //close higher lists
                 $ret .= "</ul>\n</li>\n";
             }
+            $ret .= "<ul class=\"$class\">\n";
         } elseif ($ret !== '') {
-            //close last item
+            //close previous item
             $ret .= "</li>\n";
         }
 
@@ -1694,7 +1695,7 @@ function html_TOC($toc){
     $out .= $lang['toc'];
     $out .= '</div>'.DOKU_LF;
     $out .= '<div id="toc__inside">'.DOKU_LF;
-    $out .= html_buildlist($toc,'toc','html_list_toc');
+    $out .= html_buildlist($toc,'toc','html_list_toc','html_li_default',true);
     $out .= '</div>'.DOKU_LF.'</div>'.DOKU_LF;
     $out .= '<!-- TOC END -->'.DOKU_LF;
     return $out;
-- 
cgit v1.2.3


From 32261ab5b431dd614d0153b55a1dd353714f51f1 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 15 Oct 2011 15:06:42 +0100
Subject: FS#2291 replace space with non-breaking space in utf8 special chars

---
 inc/utf8.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/utf8.php b/inc/utf8.php
index 303987e4f..9d0d17f78 100644
--- a/inc/utf8.php
+++ b/inc/utf8.php
@@ -1219,7 +1219,7 @@ if(empty($UTF8_SPECIAL_CHARS)) $UTF8_SPECIAL_CHARS = array(
 global $UTF8_SPECIAL_CHARS2;
 if(empty($UTF8_SPECIAL_CHARS2)) $UTF8_SPECIAL_CHARS2 =
     "\x1A".' !"#$%&\'()+,/;<=>?@[\]^`{|}~€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•�'.
-    '�—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½�'.
+    '�—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½�'.
     '�¿×÷ˇ˘˙˚˛˜˝̣̀́̃̉΄΅·ϖְֱֲֳִֵֶַָֹֻּֽ־ֿ�'.
     '�ׁׂ׃׳״،؛؟ـًٌٍَُِّْ٪฿‌‍‎‏–—―‗‘’‚“”�'.
     '��†‡•…‰′″‹›⁄₧₪₫€№℘™Ωℵ←↑→↓↔↕↵'.
-- 
cgit v1.2.3


From c7e90e3f2f3b7cddce01cc73132e2a168b3b696a Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 15 Oct 2011 17:30:51 +0100
Subject: show accesskey also on actionlink title and add accesskey parameter
 only if a key is defined (FS#2226)

---
 inc/template.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/template.php b/inc/template.php
index b56d6c718..f98385adb 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -480,10 +480,15 @@ function tpl_actionlink($type,$pre='',$suf='',$inner='',$return=false){
             $linktarget = wl($id, $params);
         }
         $caption = $lang['btn_' . $type];
+        $akey = $addTitle = '';
+        if($accesskey){
+            $akey = 'accesskey="'.$accesskey.'" ';
+            $addTitle = ' ['.strtoupper($accesskey).']';
+        }
         $out = tpl_link($linktarget, $pre.(($inner)?$inner:$caption).$suf,
                         'class="action ' . $type . '" ' .
-                        'accesskey="' . $accesskey . '" rel="nofollow" ' .
-                        'title="' . hsc($caption) . '"', 1);
+                        $akey . 'rel="nofollow" ' .
+                        'title="' . hsc($caption).$addTitle . '"', 1);
     }
     if ($return) return $out;
     echo $out;
-- 
cgit v1.2.3


From 85fef7e2945dc208c20d655d280aac102658747a Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 15 Oct 2011 18:41:09 +0200
Subject: allow page unlocking based on session IDs FS#2262

---
 inc/common.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'inc')

diff --git a/inc/common.php b/inc/common.php
index 8b92ebcbc..39af439f8 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -714,8 +714,8 @@ function checklock($id){
     }
 
     //my own lock
-    $ip = io_readFile($lock);
-    if( ($ip == clientIP()) || ($ip == $_SERVER['REMOTE_USER']) ){
+    list($ip,$session) = explode("\n",io_readFile($lock));
+    if($ip == $_SERVER['REMOTE_USER'] || $ip == clientIP() || $session == session_id()){
         return false;
     }
 
@@ -738,7 +738,7 @@ function lock($id){
     if($_SERVER['REMOTE_USER']){
         io_saveFile($lock,$_SERVER['REMOTE_USER']);
     }else{
-        io_saveFile($lock,clientIP());
+        io_saveFile($lock,clientIP()."\n".session_id());
     }
 }
 
@@ -751,8 +751,8 @@ function lock($id){
 function unlock($id){
     $lock = wikiLockFN($id);
     if(@file_exists($lock)){
-        $ip = io_readFile($lock);
-        if( ($ip == clientIP()) || ($ip == $_SERVER['REMOTE_USER']) ){
+        list($ip,$session) = explode("\n",io_readFile($lock));
+        if($ip == $_SERVER['REMOTE_USER'] || $ip == clientIP() || $session == session_id()){
             @unlink($lock);
             return true;
         }
-- 
cgit v1.2.3


From cb5d414667f275f3cf88f62f30eb7de9d943835a Mon Sep 17 00:00:00 2001
From: Aivars Miska <allefm@gmail.com>
Date: Sat, 15 Oct 2011 18:51:12 +0200
Subject: Latvian language update

---
 inc/lang/lv/lang.php | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php
index 30679c824..205d2e56d 100644
--- a/inc/lang/lv/lang.php
+++ b/inc/lang/lv/lang.php
@@ -45,6 +45,8 @@ $lang['btn_recover']           = 'Atjaunot melnrakstu';
 $lang['btn_draftdel']          = 'Dzēst melnrakstu';
 $lang['btn_revert']            = 'Atjaunot';
 $lang['btn_register']          = 'Reģistrēties';
+$lang['btn_apply']             = 'Labi';
+$lang['btn_media']             = 'Mēdiju pārvaldnieks';
 $lang['loggedinas']            = 'Pieteicies kā';
 $lang['user']                  = 'Lietotājvārds';
 $lang['pass']                  = 'Parole';
@@ -89,7 +91,7 @@ $lang['txt_filename']          = 'Ievadi vikivārdu (nav obligāts)';
 $lang['txt_overwrt']           = 'Aizstāt esošo failu';
 $lang['lockedby']              = 'Patlaban bloķējis ';
 $lang['lockexpire']            = 'Bloķējums beigsies ';
-$lang['js']['willexpire']            = 'Tavs bloķējums uz šo lapu pēc minūtes beigsies.\nLai izvairītos no konflikta, nospied Iepriekšapskata pogu\n un bloķējuma laiku sāks skaitīt no jauna.';
+$lang['js']['willexpire']      = 'Tavs bloķējums uz šo lapu pēc minūtes beigsies.\nLai izvairītos no konflikta, nospied Iepriekšapskata pogu\n un bloķējuma laiku sāks skaitīt no jauna.';
 $lang['js']['notsavedyet']     = 'Veiktas bet nav saglabātas izmaiņas.
 Vai tiešām tās nevajag?';
 $lang['js']['searchmedia']     = 'Meklēt failus';
@@ -121,6 +123,16 @@ Protams, ka vari saiti kopēt un iespraust citā programmā.';
 $lang['js']['linkwiz']         = 'Saišu vednis';
 $lang['js']['linkto']          = 'Saite uz: ';
 $lang['js']['del_confirm']     = 'Dzēst šo šķirkli?';
+$lang['js']['mu_btn']          = 'Augšuplādēt uzreiz vairākus failus.';
+$lang['js']['restore_confirm'] = 'Tiešām atjaunot šo versiju';
+$lang['js']['media_diff']      = 'Skatīt atšķirību';
+$lang['js']['media_diff_both'] = 'Blakus';
+$lang['js']['media_diff_opacity'] = 'Pārklāti';
+$lang['js']['media_select']    = 'Norādīt failus...';
+$lang['js']['media_upload_btn'] = 'Augšuplādēt';
+$lang['js']['media_done_btn']  = 'Gatavs';
+$lang['js']['media_drop']      = 'Nomet te augšuplādējamos failus';
+$lang['js']['media_overwrt']   = 'Rakstīt pāri esošajiem failiem';
 $lang['rssfailed']             = 'Kļūda saņemot saturu no ';
 $lang['nothingfound']          = 'Nekas nav atrasts.';
 $lang['mediaselect']           = 'Mēdiju faila izvēle';
@@ -159,7 +171,7 @@ $lang['diff_type']             = 'Skatīt atšķirības:';
 $lang['diff_inline']           = 'Iekļauti';
 $lang['diff_side']             = 'Blakus';
 $lang['line']                  = 'Rinda';
-$lang['breadcrumb']            = 'Ceļš';
+$lang['breadcrumb']            = 'Apmeklēts';
 $lang['youarehere']            = 'Tu atrodies šeit';
 $lang['lastmod']               = 'Labota';
 $lang['by']                    = ', labojis';
@@ -175,6 +187,10 @@ $lang['mail_changed']          = 'lapa mainīta:';
 $lang['mail_subscribe_list']   = 'Nodaļā mainītās lapas:';
 $lang['mail_new_user']         = 'Jauns lietotājs:';
 $lang['mail_upload']           = 'augšupielādētais fails:';
+$lang['changes_type']          = 'Skatīt izmaiņas';
+$lang['pages_changes']         = 'Lapās';
+$lang['media_changes']         = 'Mēdiju failos';
+$lang['both_changes']          = 'Gan lapās, gan mēdiju failos';
 $lang['qb_bold']               = 'Trekninājums';
 $lang['qb_italic']             = 'Kursīvs';
 $lang['qb_underl']             = 'Pasvītrojums';
@@ -215,6 +231,9 @@ $lang['img_copyr']             = 'Autortiesības';
 $lang['img_format']            = 'Formāts';
 $lang['img_camera']            = 'Fotoaparāts';
 $lang['img_keywords']          = 'Atslēgvārdi';
+$lang['img_width']             = 'Platums';
+$lang['img_height']            = 'Augstums';
+$lang['img_manager']           = 'Skatīt mēdiju pārvaldniekā';
 $lang['subscr_subscribe_success'] = '%s pievienots %s abonēšanas sarakstam';
 $lang['subscr_subscribe_error'] = 'Kļūme pievienojot %s %s abonēšanas sarakstam.';
 $lang['subscr_subscribe_noaddress'] = 'Nav zināma jūsu e-pasta adrese, tāpēc nevarat abonēt.';
@@ -280,3 +299,27 @@ $lang['hours']                 = 'pirms %d stundām';
 $lang['minutes']               = 'pirms %d minūtēm';
 $lang['seconds']               = 'pirms %d sekundēm';
 $lang['wordblock']             = 'Grozījumus nevarēju saglabāt, jo tie satur aizliegto vārdu (spamu).';
+$lang['media_uploadtab']       = 'Augšuplādēt';
+$lang['media_searchtab']       = 'Meklēt';
+$lang['media_file']            = 'Fails';
+$lang['media_viewtab']         = 'Skatīt';
+$lang['media_edittab']         = 'Labot';
+$lang['media_historytab']      = 'Vēsture';
+$lang['media_list_thumbs']     = 'Sīktēli';
+$lang['media_list_rows']       = 'Rindas';
+$lang['media_sort_name']       = 'Nosaukums';
+$lang['media_sort_date']       = 'Datums';
+$lang['media_namespaces']      = 'Norādīt nodaļu';
+$lang['media_files']           = 'Faili nodaļā s%';
+$lang['media_upload']          = 'Augšuplādēt nodaļā s%';
+$lang['media_search']          = 'Meklēt nodaļā s%';
+$lang['media_view']            = 's%';
+$lang['media_viewold']         = 's% nodaļā s%';
+$lang['media_edit']            = 'Labot %s';
+$lang['media_history']         = 's% vēsture';
+$lang['media_meta_edited']     = 'metadati laboti';
+$lang['media_perm_read']       = 'Atvainojiet, jums nav tiesību skatīt failus. ';
+$lang['media_perm_upload']     = 'Atvainojiet, jums nav tiesību augšupielādēt. ';
+$lang['media_update']          = 'Augšupielādēt jaunu versiju';
+$lang['media_restore']         = 'Atjaunot šo versiju';
+$lang['plugin_install_err']    = 'Modulis aplami instalēts.  Pārdēvē moduļa direktoriju s% par s%.';
-- 
cgit v1.2.3


From 335d098af63b77a0c6e9147978a631965d07f3bd Mon Sep 17 00:00:00 2001
From: Johan Guilbaud <guilbaud.johan@gmail.com>
Date: Sat, 15 Oct 2011 18:52:46 +0200
Subject: French language update

---
 inc/lang/fr/lang.php | 101 ++++++++++++++++++++-------------------------------
 1 file changed, 39 insertions(+), 62 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index c02ad657d..a78d3ac90 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -25,12 +25,11 @@
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
-$lang['doublequoteopening']    = '“'; //&ldquo;
-$lang['doublequoteclosing']    = '”'; //&rdquo;
-$lang['singlequoteopening']    = '‘'; //&lsquo;
-$lang['singlequoteclosing']    = '’'; //&rsquo;
-$lang['apostrophe']            = '’'; //&rsquo;
-
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
 $lang['btn_edit']              = 'Modifier cette page';
 $lang['btn_source']            = 'Afficher le texte source';
 $lang['btn_show']              = 'Afficher la page';
@@ -66,7 +65,6 @@ $lang['btn_revert']            = 'Restaurer';
 $lang['btn_register']          = 'S\'enregistrer';
 $lang['btn_apply']             = 'Appliquer';
 $lang['btn_media']             = 'Gestionnaire de médias';
-
 $lang['loggedinas']            = 'Connecté en tant que ';
 $lang['user']                  = 'Utilisateur';
 $lang['pass']                  = 'Mot de passe';
@@ -79,9 +77,8 @@ $lang['email']                 = 'Adresse de courriel';
 $lang['profile']               = 'Profil utilisateur';
 $lang['badlogin']              = 'L\'utilisateur ou le mot de passe est incorrect.';
 $lang['minoredit']             = 'Modification mineure';
-$lang['draftdate']             = 'Brouillon auto-enregistré le'; // full dformat date will be added
+$lang['draftdate']             = 'Brouillon auto-enregistré le';
 $lang['nosecedit']             = 'La page a changé entre temps, les informations de la section sont obsolètes ; la page complète a été chargée à la place.';
-
 $lang['regmissing']            = 'Désolé, vous devez remplir tous les champs.';
 $lang['reguexists']            = 'Désolé, ce nom d\'utilisateur est déjà pris.';
 $lang['regsuccess']            = 'L\'utilisateur a été créé. Le mot de passe a été expédié par courriel.';
@@ -91,12 +88,10 @@ $lang['regbadmail']            = 'L\'adresse de courriel semble incorrecte. Si v
 $lang['regbadpass']            = 'Les deux mots de passe fournis sont différents, veuillez recommencez.';
 $lang['regpwmail']             = 'Votre mot de passe DokuWiki';
 $lang['reghere']               = 'Vous n\'avez pas encore de compte ? Enregistrez-vous ici ';
-
 $lang['profna']                = 'Ce wiki ne permet pas de modifier les profils';
 $lang['profnochange']          = 'Pas de changement, rien à faire.';
 $lang['profnoempty']           = 'Un nom ou une adresse de courriel vide n\'est pas permis.';
 $lang['profchanged']           = 'Mise à jour du profil réussie.';
-
 $lang['pwdforget']             = 'Mot de passe oublié ? Faites-vous envoyer votre mot de passe ';
 $lang['resendna']              = 'Ce wiki ne permet pas le renvoi de mot de passe.';
 $lang['resendpwd']             = 'Renvoyer le mot de passe de';
@@ -105,10 +100,8 @@ $lang['resendpwdnouser']       = 'Désolé, cet utilisateur est introuvable dans
 $lang['resendpwdbadauth']      = 'Désolé, ce code d\'authentification est invalide. Assurez-vous d\'avoir utilisé le lien de confirmation.';
 $lang['resendpwdconfirm']      = 'Un lien de confirmation vous a été envoyé par courriel.';
 $lang['resendpwdsuccess']      = 'Votre nouveau mot de passe vous a été expédié par courriel.';
-
 $lang['license']               = 'Sauf mention contraire, le contenu de ce wiki est placé sous la licence suivante :';
 $lang['licenseok']             = 'Note : En modifiant cette page, vous acceptez que le contenu soit placé sous les termes de la licence suivante :';
-
 $lang['searchmedia']           = 'Chercher le nom de fichier :';
 $lang['searchmedia_in']        = 'Chercher dans %s';
 $lang['txt_upload']            = 'Sélectionnez un fichier à envoyer ';
@@ -116,9 +109,7 @@ $lang['txt_filename']          = 'Donnez un « wikiname » (optionnel) ';
 $lang['txt_overwrt']           = 'Écraser le fichier cible';
 $lang['lockedby']              = 'Actuellement bloqué par';
 $lang['lockexpire']            = 'Le blocage expire à';
-
-$lang['js']['willexpire']      = 'Votre blocage pour modifier cette page expire dans une minute.
-                                  Pour éviter les conflits, utiliser le bouton « Aperçu » pour réinitialiser le minuteur.';
+$lang['js']['willexpire']      = 'Votre verrouillage pour la modification de cette page expire dans une minute.\nPour éviter les conflits, utilisez le bouton « Aperçu » pour réinitialiser le minuteur.';
 $lang['js']['notsavedyet']     = 'Les modifications non enregistrées seront perdues. Voulez-vous vraiment continuer ?';
 $lang['js']['searchmedia']     = 'Chercher des fichiers';
 $lang['js']['keepopen']        = 'Gardez la fenêtre ouverte pendant la sélection';
@@ -149,22 +140,20 @@ $lang['js']['nosmblinks']      = 'Les liens vers les partages Windows ne fonctio
 $lang['js']['linkwiz']         = 'Assistant Lien';
 $lang['js']['linkto']          = 'Lien vers :';
 $lang['js']['del_confirm']     = 'Effacer cette entrée ?';
-$lang['js']['willexpire']      = 'Votre verrouillage pour la modification de cette page expire dans une minute.\nPour éviter les conflits, utilisez le bouton « Aperçu » pour réinitialiser le minuteur.';
-$lang['js']['restore_confirm']     = 'Voulez vous vraiment restaurer cette version?';
-$lang['js']['media_diff']          = 'Voir les différences:';
-$lang['js']['media_diff_both']     = 'Côte à côte';
-$lang['js']['media_diff_opacity']  = 'Calque';
+$lang['js']['mu_btn']          = 'Envoyer plusieurs fichiers en même temps';
+$lang['js']['restore_confirm'] = 'Voulez vous vraiment restaurer cette version?';
+$lang['js']['media_diff']      = 'Voir les différences:';
+$lang['js']['media_diff_both'] = 'Côte à côte';
+$lang['js']['media_diff_opacity'] = 'Calque';
 $lang['js']['media_diff_portions'] = 'Curseur';
-$lang['js']['media_select']        = 'Sélection de fichiers…';
-$lang['js']['media_upload_btn']    = 'Télécharger';
-$lang['js']['media_done_btn']      = 'Terminé';
-$lang['js']['media_drop']          = 'Déposez des fichiers ici pour les télécharger';
-$lang['js']['media_cancel']        = 'supprimer';
-$lang['js']['media_overwrt']       = 'Écraser les fichiers existants';
-
+$lang['js']['media_select']    = 'Sélection de fichiers…';
+$lang['js']['media_upload_btn'] = 'Télécharger';
+$lang['js']['media_done_btn']  = 'Terminé';
+$lang['js']['media_drop']      = 'Déposez des fichiers ici pour les télécharger';
+$lang['js']['media_cancel']    = 'supprimer';
+$lang['js']['media_overwrt']   = 'Écraser les fichiers existants';
 $lang['rssfailed']             = 'Une erreur s\'est produite en récupérant ce flux : ';
 $lang['nothingfound']          = 'Pas de réponse.';
-
 $lang['mediaselect']           = 'Sélection de fichier';
 $lang['fileupload']            = 'Envoi de fichier';
 $lang['uploadsucc']            = 'Téléversement réussi';
@@ -189,7 +178,6 @@ $lang['mediaextchange']        = 'Extension du fichier changée de .%s en .%s !'
 $lang['reference']             = 'Références pour';
 $lang['ref_inuse']             = 'Le fichier ne peut être effacé car il est utilisé par les pages suivantes :';
 $lang['ref_hidden']            = 'Des références existent dans des pages que vous n\'avez pas la permission de lire';
-
 $lang['hits']                  = 'Occurrences trouvées';
 $lang['quickhits']             = 'Pages trouvées ';
 $lang['toc']                   = 'Table des matières';
@@ -213,18 +201,15 @@ $lang['external_edit']         = 'modification externe';
 $lang['summary']               = 'Résumé';
 $lang['noflash']               = 'Le greffon <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash</a> est nécessaire pour afficher ce contenu.';
 $lang['download']              = 'Télécharger un extrait';
-
 $lang['mail_newpage']          = 'page ajoutée :';
 $lang['mail_changed']          = 'page modifiée :';
 $lang['mail_subscribe_list']   = 'pages modifiées dans la catégorie :';
 $lang['mail_new_user']         = 'nouvel utilisateur :';
 $lang['mail_upload']           = 'fichier envoyé :';
-
 $lang['changes_type']          = 'Voir les changements';
 $lang['pages_changes']         = 'Pages';
 $lang['media_changes']         = 'Fichier multimédias';
 $lang['both_changes']          = 'Pages et fichiers multimédias';
-
 $lang['qb_bold']               = 'Emphase forte (gras)';
 $lang['qb_italic']             = 'Emphase (italique)';
 $lang['qb_underl']             = 'Souligné';
@@ -249,11 +234,8 @@ $lang['qb_media']              = 'Ajouter des images ou d\'autres fichiers';
 $lang['qb_sig']                = 'Insérer une signature';
 $lang['qb_smileys']            = 'Émoticones';
 $lang['qb_chars']              = 'Caractères spéciaux';
-
 $lang['upperns']               = 'Aller à la catégorie parente';
-
 $lang['admin_register']        = 'Ajouter un nouvel utilisateur';
-
 $lang['metaedit']              = 'Modifier les métadonnées';
 $lang['metasaveerr']           = 'Erreur lors de l\'écriture des métadonnées';
 $lang['metasaveok']            = 'Métadonnées enregistrées';
@@ -271,30 +253,24 @@ $lang['img_keywords']          = 'Mots-clés';
 $lang['img_width']             = 'Largeur';
 $lang['img_height']            = 'Hauteur';
 $lang['img_manager']           = 'Voir dans le gestionnaire de médias';
-
-$lang['subscr_subscribe_success']   = '%s a été ajouté à la liste de souscription de %s';
-$lang['subscr_subscribe_error']     = 'Erreur en ajoutant %s à la liste de souscription de %s';
+$lang['subscr_subscribe_success'] = '%s a été ajouté à la liste de souscription de %s';
+$lang['subscr_subscribe_error'] = 'Erreur en ajoutant %s à la liste de souscription de %s';
 $lang['subscr_subscribe_noaddress'] = 'Il n\'y a pas d\'adresse associée à votre identifiant, vous ne pouvez pas être ajouté à la liste de souscription';
 $lang['subscr_unsubscribe_success'] = '%s a été retiré de la liste de souscription de %s';
-$lang['subscr_unsubscribe_error']   = 'Erreur en retirant %s de la liste de souscription de %s';
-$lang['subscr_already_subscribed']  = '%s est déjà souscrit à %s';
-// Manage page for subscriptions
-$lang['subscr_not_subscribed']      = '%s n\'est pas souscrit à %s';
-$lang['subscr_m_not_subscribed']    = 'Vous n\'avez pas souscrit pour l\'instant à la page actuelle ou la catégorie';
-$lang['subscr_m_new_header']        = 'Ajouter une souscription';
-$lang['subscr_m_current_header']    = 'Souscriptions actives';
-$lang['subscr_m_unsubscribe']       = 'Annuler la souscription';
-$lang['subscr_m_subscribe']         = 'Souscrire';
-$lang['subscr_m_receive']           = 'Recevoir';
-$lang['subscr_style_every']         = 'Envoyer un courriel à chaque modification';
-$lang['subscr_style_digest']        = 'Courriel résumant les modifications de chaque page';
-$lang['subscr_style_list']          = 'Liste des pages modifiées depuis le dernier courriel';
-
-/* auth.class language support */
+$lang['subscr_unsubscribe_error'] = 'Erreur en retirant %s de la liste de souscription de %s';
+$lang['subscr_already_subscribed'] = '%s est déjà souscrit à %s';
+$lang['subscr_not_subscribed'] = '%s n\'est pas souscrit à %s';
+$lang['subscr_m_not_subscribed'] = 'Vous n\'avez pas souscrit pour l\'instant à la page actuelle ou la catégorie';
+$lang['subscr_m_new_header']   = 'Ajouter une souscription';
+$lang['subscr_m_current_header'] = 'Souscriptions actives';
+$lang['subscr_m_unsubscribe']  = 'Annuler la souscription';
+$lang['subscr_m_subscribe']    = 'Souscrire';
+$lang['subscr_m_receive']      = 'Recevoir';
+$lang['subscr_style_every']    = 'Envoyer un courriel à chaque modification';
+$lang['subscr_style_digest']   = 'Courriel résumant les modifications de chaque page';
+$lang['subscr_style_list']     = 'Liste des pages modifiées depuis le dernier courriel';
 $lang['authmodfailed']         = 'Mauvais paramétrage de l\'authentification. Merci d\'informer l\'administrateur du Wiki.';
 $lang['authtempfail']          = 'L\'authentification est temporairement indisponible. Si cela perdure, merci d\'informer l\'administrateur du Wiki.';
-
-/* installer strings */
 $lang['i_chooselang']          = 'Choisissez votre langue';
 $lang['i_installer']           = 'Installeur DokuWiki';
 $lang['i_wikiname']            = 'Nom du wiki';
@@ -317,7 +293,6 @@ $lang['i_pol1']                = 'Wiki public (lecture pour tout le monde, écri
 $lang['i_pol2']                = 'Wiki fermé (lecture, écriture, envoi de fichiers pour les utilisateurs enregistrés uniquement)';
 $lang['i_retry']               = 'Réessayer';
 $lang['i_license']             = 'Veuillez choisir la licence sous laquelle placer votre contenu :';
-
 $lang['mu_intro']              = 'Ici vous pouvez envoyer plusieurs fichiers en même temps. Cliquez sur le bouton parcourir pour les ajouter. Cliquez sur envoyer lorsque c\'est prêt. ';
 $lang['mu_gridname']           = 'Nom du fichier';
 $lang['mu_gridsize']           = 'Taille';
@@ -333,7 +308,6 @@ $lang['mu_progress']           = '@PCT@% envoyé';
 $lang['mu_filetypes']          = 'Types de fichiers acceptés';
 $lang['mu_info']               = 'fichiers envoyés.';
 $lang['mu_lasterr']            = 'Dernière erreur : ';
-
 $lang['recent_global']         = 'Vous êtes actuellement en train de regarder les modifications au sein de la catégorie <strong>%s</strong>. Vous pouvez aussi <a href="%s">voir les récentes modifications sur tout le wiki</a>.';
 $lang['years']                 = 'il y a %d ans';
 $lang['months']                = 'il y a %d mois';
@@ -342,19 +316,23 @@ $lang['days']                  = 'il y a %d jours';
 $lang['hours']                 = 'il y a %d heures';
 $lang['minutes']               = 'il y a %d minutes';
 $lang['seconds']               = 'il y a %d secondes';
-
 $lang['wordblock']             = 'Vos modifications n\'ont pas été sauvegardées parce qu\'elles contiennent des textes non autorisé (spam).';
-
 $lang['media_uploadtab']       = 'Télécharger';
 $lang['media_searchtab']       = 'Rechercher';
+$lang['media_file']            = 'Fichier';
 $lang['media_viewtab']         = 'Voir';
 $lang['media_edittab']         = 'Éditer';
 $lang['media_historytab']      = 'Historique';
+$lang['media_list_thumbs']     = 'Aperçus';
+$lang['media_list_rows']       = 'Lignes';
 $lang['media_sort_name']       = '<span>Tri par</span> nom';
 $lang['media_sort_date']       = '<span>Tri par</span> date';
+$lang['media_namespaces']      = 'Choisissez un espace de nom';
+$lang['media_files']           = 'Fichiers présents dans';
 $lang['media_upload']          = 'Télécharger dans la catégorie <strong>%s</strong>.';
 $lang['media_search']          = 'Chercher dans la catégorie <strong>%s</strong>.';
 $lang['media_view']            = '<span class="%s">%s</span>';
+$lang['media_viewold']         = '%s dans %s';
 $lang['media_edit']            = 'Éditer <span class="%s">%s</span>';
 $lang['media_history']         = 'Historique du <span class="%s">%s</span>';
 $lang['media_meta_edited']     = 'métadonnées éditées';
@@ -362,5 +340,4 @@ $lang['media_perm_read']       = 'Désolé, vous n\'avez pas les droits pour lir
 $lang['media_perm_upload']     = 'Désolé, vous n\'avez pas les droits pour télécharger des fichiers.';
 $lang['media_update']          = 'Télécharger une nouvelle version';
 $lang['media_restore']         = 'Restaurer cette version';
-
-$lang['plugin_install_err']    = "Extension mal installée. Renommez le dossier de l'extension '%s' en '%s'.";
+$lang['plugin_install_err']    = 'Extension mal installée. Renommez le dossier de l\'extension \'%s\' en \'%s\'.';
-- 
cgit v1.2.3


From f20ead66bf5f9c5e4f7deef3cc2af9954973cc16 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 15 Oct 2011 19:20:43 +0200
Subject: readded delete in popup and link to full mediamanager FS#2347

---
 inc/media.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 3e640237a..7da1f0899 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1355,6 +1355,20 @@ function media_printfile($item,$auth,$jump,$display_namespace=false){
     echo ' <a href="'.$link.'" target="_blank"><img src="'.DOKU_BASE.'lib/images/magnifier.png" '.
         'alt="'.$lang['mediaview'].'" title="'.$lang['mediaview'].'" class="btn" /></a>';
 
+    // mediamanager button
+    $link = wl('',array('do'=>'media','image'=>$item['id']));
+    echo ' <a href="'.$link.'" target="_blank"><img src="'.DOKU_BASE.'lib/images/mediamanager.png" '.
+        'alt="'.$lang['btn_media'].'" title="'.$lang['btn_media'].'" class="btn" /></a>';
+
+    // delete button
+    if($item['writable'] && $auth >= AUTH_DELETE){
+        $link = DOKU_BASE.'lib/exe/mediamanager.php?delete='.rawurlencode($item['id']).
+            '&amp;sectok='.getSecurityToken();
+        echo ' <a href="'.$link.'" class="btn_media_delete" title="'.$item['id'].'">'.
+            '<img src="'.DOKU_BASE.'lib/images/trash.png" alt="'.$lang['btn_delete'].'" '.
+            'title="'.$lang['btn_delete'].'" class="btn" /></a>';
+    }
+
     echo '<div class="example" id="ex_'.str_replace(':','_',$item['id']).'">';
     echo $lang['mediausage'].' <code>{{:'.$item['id'].'}}</code>';
     echo '</div>';
-- 
cgit v1.2.3


From 8071beaa75257a6e763bf8b2d6dd586fe0935d6b Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 15 Oct 2011 20:53:56 +0200
Subject: bind security token to username

This makes the security token more robust agains session fixation
attacks. A CSRF warning will no longer abort a page save but lead to the
preview mode to avoid information loss when a user logs in during
editing (eg in another tab).
---
 inc/actions.php | 2 +-
 inc/common.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/actions.php b/inc/actions.php
index 1a0ae4028..ddfafc554 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -101,7 +101,7 @@ function act_dispatch(){
             if(checkSecurityToken()){
                 $ACT = act_save($ACT);
             }else{
-                $ACT = 'show';
+                $ACT = 'preview';
             }
         }
 
diff --git a/inc/common.php b/inc/common.php
index 39af439f8..0c769c50d 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -56,7 +56,7 @@ function stripctl($string){
  * @return  string
  */
 function getSecurityToken(){
-    return md5(auth_cookiesalt().session_id());
+    return md5(auth_cookiesalt().session_id().$_SERVER['REMOTE_USER']);
 }
 
 /**
-- 
cgit v1.2.3


From e10e770cbef96be859b572c97ac1b9f0bc1e95bd Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 16 Oct 2011 14:23:18 +0200
Subject: Upgraded SimplePie library to 1.2.1

From the release notes: This release fixes a few bugs, including a major URL
parsing bug, where URLs with query strings were parsed incorrectly.
---
 inc/SimplePie.php | 570 ++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 423 insertions(+), 147 deletions(-)

(limited to 'inc')

diff --git a/inc/SimplePie.php b/inc/SimplePie.php
index d35443165..10d8141bd 100644
--- a/inc/SimplePie.php
+++ b/inc/SimplePie.php
@@ -5,7 +5,7 @@
  * A PHP-Based RSS and Atom Feed Framework.
  * Takes the hard work out of managing a complete RSS/Atom solution.
  *
- * Copyright (c) 2004-2009, Ryan Parman and Geoffrey Sneddon
+ * Copyright (c) 2004-2011, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
@@ -33,10 +33,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.2.1-dev
- * @copyright 2004-2009 Ryan Parman, Geoffrey Sneddon
+ * @version 1.2.1
+ * @copyright 2004-2011 Ryan Parman, Geoffrey Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Geoffrey Sneddon
+ * @author Ryan McCue
  * @link http://simplepie.org/ SimplePie
  * @link http://simplepie.org/support/ Please submit all bug reports and feature requests to the SimplePie forums
  * @license http://www.opensource.org/licenses/bsd-license.php BSD License
@@ -55,9 +56,8 @@ define('SIMPLEPIE_VERSION', '1.2.1-dev');
 
 /**
  * SimplePie Build
- * @todo Hardcode for release (there's no need to have to call SimplePie_Misc::parse_date() only every load of simplepie.inc)
  */
-define('SIMPLEPIE_BUILD', gmdate('YmdHis', SimplePie_Misc::parse_date(substr('$Date$', 7, 25)) ? SimplePie_Misc::parse_date(substr('$Date$', 7, 25)) : filemtime(__FILE__)));
+define('SIMPLEPIE_BUILD', '20111015034325');
 
 /**
  * SimplePie Website URL
@@ -3279,6 +3279,11 @@ class SimplePie_Item
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML);
+		}
+
 		elseif (!$description_only)
 		{
 			return $this->get_content(true);
@@ -3643,7 +3648,7 @@ class SimplePie_Item
 		{
 			return $this->sanitize($this->get_date(''), SIMPLEPIE_CONSTRUCT_TEXT);
 		}
-		elseif (($date = $this->get_date('U')) !== null)
+		elseif (($date = $this->get_date('U')) !== null && $date !== false)
 		{
 			return strftime($date_format, $date);
 		}
@@ -4068,16 +4073,16 @@ class SimplePie_Item
 					$temp = explode(':', $this->sanitize($duration_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
 					if (sizeof($temp) > 0)
 					{
-						(int) $seconds = array_pop($temp);
+						$seconds = (int) array_pop($temp);
 					}
 					if (sizeof($temp) > 0)
 					{
-						(int) $minutes = array_pop($temp);
+						$minutes = (int) array_pop($temp);
 						$seconds += $minutes * 60;
 					}
 					if (sizeof($temp) > 0)
 					{
-						(int) $hours = array_pop($temp);
+						$hours = (int) array_pop($temp);
 						$seconds += $hours * 3600;
 					}
 					unset($temp);
@@ -5056,7 +5061,7 @@ class SimplePie_Item
 			{
 				foreach ((array) $this->data['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
 				{
-					if (isset($content['attribs']['']['url']))
+					if (isset($content['attribs']['']['url']) || isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
 					{
 						// Attributes
 						$bitrate = null;
@@ -5141,8 +5146,10 @@ class SimplePie_Item
 						{
 							$width = $this->sanitize($content['attribs']['']['width'], SIMPLEPIE_CONSTRUCT_TEXT);
 						}
-						$url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-
+						if (isset($content['attribs']['']['url']))
+						{
+							$url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+						}
 						// Checking the other optional media: elements. Priority: media:content, media:group, item, channel
 
 						// CAPTIONS
@@ -7731,16 +7738,17 @@ class SimplePie_File
 			{
 				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
 				$url_parts = parse_url($url);
+				$socket_host = $url_parts['host'];
 				if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https')
 				{
-					$url_parts['host'] = "ssl://$url_parts[host]";
+					$socket_host = "ssl://$url_parts[host]";
 					$url_parts['port'] = 443;
 				}
 				if (!isset($url_parts['port']))
 				{
 					$url_parts['port'] = 80;
 				}
-				$fp = @fsockopen($url_parts['host'], $url_parts['port'], $errno, $errstr, $timeout);
+				$fp = @fsockopen($socket_host, $url_parts['port'], $errno, $errstr, $timeout);
 				if (!$fp)
 				{
 					$this->error = 'fsockopen error: ' . $errstr;
@@ -8486,7 +8494,7 @@ class SimplePie_gzdecode
 
 				// Get the length of the extra field
 				$len = current(unpack('v', substr($this->compressed_data, $this->position, 2)));
-				$position += 2;
+				$this->position += 2;
 
 				// Check the length of the string is still valid
 				$this->min_compressed_size += $len + 4;
@@ -9448,12 +9456,12 @@ class SimplePie_Misc
 		}
 
 		// This is first, as behaviour of this is completely predictable
-		if ($input === 'Windows-1252' && $output === 'UTF-8')
+		if ($input === 'windows-1252' && $output === 'UTF-8')
 		{
 			return SimplePie_Misc::windows_1252_to_utf8($data);
 		}
 		// This is second, as behaviour of this varies only with PHP version (the middle part of this expression checks the encoding is supported).
-		elseif (function_exists('mb_convert_encoding') && @mb_convert_encoding("\x80", 'UTF-16BE', $input) !== "\x00\x80" && ($return = @mb_convert_encoding($data, $output, $input)))
+		elseif (function_exists('mb_convert_encoding') && @mb_convert_encoding("\x80", 'UTF-16BE', $input) !== "\x00\x80" && in_array($input, mb_list_encodings()) && ($return = @mb_convert_encoding($data, $output, $input)))
 		{
 			return $return;
 		}
@@ -9469,6 +9477,17 @@ class SimplePie_Misc
 		}
 	}
 
+	/**
+	 * Normalize an encoding name
+	 *
+	 * This is automatically generated by create.php
+	 *
+	 * To generate it, run `php create.php` on the command line, and copy the
+	 * output to replace this function.
+	 *
+	 * @param string $charset Character set to standardise
+	 * @return string Standardised name
+	 */
 	function encoding($charset)
 	{
 		// Normalization from UTS #22
@@ -9502,7 +9521,6 @@ class SimplePie_Misc
 
 			case 'big5':
 			case 'csbig5':
-			case 'xxbig5':
 				return 'Big5';
 
 			case 'big5hkscs':
@@ -9658,14 +9676,14 @@ class SimplePie_Misc
 			case 'isoir85':
 				return 'ES2';
 
-			case 'cseucfixwidjapanese':
-			case 'extendedunixcodefixedwidthforjapanese':
-				return 'Extended_UNIX_Code_Fixed_Width_for_Japanese';
-
 			case 'cseucpkdfmtjapanese':
 			case 'eucjp':
 			case 'extendedunixcodepackedformatforjapanese':
-				return 'Extended_UNIX_Code_Packed_Format_for_Japanese';
+				return 'EUC-JP';
+
+			case 'cseucfixwidjapanese':
+			case 'extendedunixcodefixedwidthforjapanese':
+				return 'Extended_UNIX_Code_Fixed_Width_for_Japanese';
 
 			case 'gb18030':
 				return 'GB18030';
@@ -9744,80 +9762,6 @@ class SimplePie_Misc
 			case 'ibmthai':
 				return 'IBM-Thai';
 
-			case 'ccsid858':
-			case 'cp858':
-			case 'ibm858':
-			case 'pcmultilingual850euro':
-				return 'IBM00858';
-
-			case 'ccsid924':
-			case 'cp924':
-			case 'ebcdiclatin9euro':
-			case 'ibm924':
-				return 'IBM00924';
-
-			case 'ccsid1140':
-			case 'cp1140':
-			case 'ebcdicus37euro':
-			case 'ibm1140':
-				return 'IBM01140';
-
-			case 'ccsid1141':
-			case 'cp1141':
-			case 'ebcdicde273euro':
-			case 'ibm1141':
-				return 'IBM01141';
-
-			case 'ccsid1142':
-			case 'cp1142':
-			case 'ebcdicdk277euro':
-			case 'ebcdicno277euro':
-			case 'ibm1142':
-				return 'IBM01142';
-
-			case 'ccsid1143':
-			case 'cp1143':
-			case 'ebcdicfi278euro':
-			case 'ebcdicse278euro':
-			case 'ibm1143':
-				return 'IBM01143';
-
-			case 'ccsid1144':
-			case 'cp1144':
-			case 'ebcdicit280euro':
-			case 'ibm1144':
-				return 'IBM01144';
-
-			case 'ccsid1145':
-			case 'cp1145':
-			case 'ebcdices284euro':
-			case 'ibm1145':
-				return 'IBM01145';
-
-			case 'ccsid1146':
-			case 'cp1146':
-			case 'ebcdicgb285euro':
-			case 'ibm1146':
-				return 'IBM01146';
-
-			case 'ccsid1147':
-			case 'cp1147':
-			case 'ebcdicfr297euro':
-			case 'ibm1147':
-				return 'IBM01147';
-
-			case 'ccsid1148':
-			case 'cp1148':
-			case 'ebcdicinternational500euro':
-			case 'ibm1148':
-				return 'IBM01148';
-
-			case 'ccsid1149':
-			case 'cp1149':
-			case 'ebcdicis871euro':
-			case 'ibm1149':
-				return 'IBM01149';
-
 			case 'cp37':
 			case 'csibm37':
 			case 'ebcdiccpca':
@@ -9965,6 +9909,12 @@ class SimplePie_Misc
 			case 'ibm857':
 				return 'IBM857';
 
+			case 'ccsid858':
+			case 'cp858':
+			case 'ibm858':
+			case 'pcmultilingual850euro':
+				return 'IBM00858';
+
 			case '860':
 			case 'cp860':
 			case 'csibm860':
@@ -10067,6 +10017,12 @@ class SimplePie_Misc
 			case 'ibm918':
 				return 'IBM918';
 
+			case 'ccsid924':
+			case 'cp924':
+			case 'ebcdiclatin9euro':
+			case 'ibm924':
+				return 'IBM00924';
+
 			case 'cp1026':
 			case 'csibm1026':
 			case 'ibm1026':
@@ -10075,6 +10031,68 @@ class SimplePie_Misc
 			case 'ibm1047':
 				return 'IBM1047';
 
+			case 'ccsid1140':
+			case 'cp1140':
+			case 'ebcdicus37euro':
+			case 'ibm1140':
+				return 'IBM01140';
+
+			case 'ccsid1141':
+			case 'cp1141':
+			case 'ebcdicde273euro':
+			case 'ibm1141':
+				return 'IBM01141';
+
+			case 'ccsid1142':
+			case 'cp1142':
+			case 'ebcdicdk277euro':
+			case 'ebcdicno277euro':
+			case 'ibm1142':
+				return 'IBM01142';
+
+			case 'ccsid1143':
+			case 'cp1143':
+			case 'ebcdicfi278euro':
+			case 'ebcdicse278euro':
+			case 'ibm1143':
+				return 'IBM01143';
+
+			case 'ccsid1144':
+			case 'cp1144':
+			case 'ebcdicit280euro':
+			case 'ibm1144':
+				return 'IBM01144';
+
+			case 'ccsid1145':
+			case 'cp1145':
+			case 'ebcdices284euro':
+			case 'ibm1145':
+				return 'IBM01145';
+
+			case 'ccsid1146':
+			case 'cp1146':
+			case 'ebcdicgb285euro':
+			case 'ibm1146':
+				return 'IBM01146';
+
+			case 'ccsid1147':
+			case 'cp1147':
+			case 'ebcdicfr297euro':
+			case 'ibm1147':
+				return 'IBM01147';
+
+			case 'ccsid1148':
+			case 'cp1148':
+			case 'ebcdicinternational500euro':
+			case 'ibm1148':
+				return 'IBM01148';
+
+			case 'ccsid1149':
+			case 'cp1149':
+			case 'ebcdicis871euro':
+			case 'ibm1149':
+				return 'IBM01149';
+
 			case 'csiso143iecp271':
 			case 'iecp271':
 			case 'isoir143':
@@ -10617,11 +10635,6 @@ class SimplePie_Misc
 			case 'sen850200c':
 				return 'SEN_850200_C';
 
-			case 'csshiftjis':
-			case 'mskanji':
-			case 'shiftjis':
-				return 'Shift_JIS';
-
 			case 'csiso102t617bit':
 			case 'isoir102':
 			case 't617bit':
@@ -10720,7 +10733,10 @@ class SimplePie_Misc
 			case 'viscii':
 				return 'VISCII';
 
+			case 'csshiftjis':
 			case 'cswindows31j':
+			case 'mskanji':
+			case 'shiftjis':
 			case 'windows31j':
 				return 'Windows-31J';
 
@@ -11381,6 +11397,58 @@ function embed_wmedia(width, height, link) {
 }
 		<?php
 	}
+
+
+
+	/**
+	 * Format debugging information
+	 */
+	function debug($sp)
+	{
+		$info = 'SimplePie ' . SIMPLEPIE_VERSION . ' Build ' . SIMPLEPIE_BUILD . "\n";
+		$info .= 'PHP ' . PHP_VERSION . "\n";
+		if ($sp->error() !== null)
+		{
+			$info .= 'Error occurred: ' . $sp->error() . "\n";
+		}
+		else
+		{
+			$info .= "No error found.\n";
+		}
+		$info .= "Extensions:\n";
+		$extensions = array('pcre', 'curl', 'zlib', 'mbstring', 'iconv', 'xmlreader', 'xml');
+		foreach ($extensions as $ext)
+		{
+			if (extension_loaded($ext))
+			{
+				$info .= "    $ext loaded\n";
+				switch ($ext)
+				{
+					case 'pcre':
+						$info .= '      Version ' . PCRE_VERSION . "\n";
+						break;
+					case 'curl':
+						$version = curl_version();
+						$info .= '      Version ' . $version['version'] . "\n";
+						break;
+					case 'mbstring':
+						$info .= '      Overloading: ' . mb_get_info('func_overload') . "\n";
+						break;
+					case 'iconv':
+						$info .= '      Version ' . ICONV_VERSION . "\n";
+						break;
+					case 'xml':
+						$info .= '      Version ' . LIBXML_DOTTED_VERSION . "\n";
+						break;
+				}
+			}
+			else
+			{
+				$info .= "    $ext not loaded\n";
+			}
+		}
+		return $info;
+	}
 }
 
 /**
@@ -11852,14 +11920,135 @@ class SimplePie_IRI
 	/**
 	 * Replace invalid character with percent encoding
 	 *
-	 * @access private
 	 * @param string $string Input string
 	 * @param string $valid_chars Valid characters
 	 * @param int $case Normalise case
 	 * @return string
 	 */
-	function replace_invalid_with_pct_encoding($string, $valid_chars, $case = SIMPLEPIE_SAME_CASE)
+	function replace_invalid_with_pct_encoding($string, $valid_chars, $case = SIMPLEPIE_SAME_CASE, $iprivate = false)
 	{
+		// Normalize as many pct-encoded sections as possible
+		$string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array(&$this, 'remove_iunreserved_percent_encoded'), $string);
+
+		// Replace invalid percent characters
+		$string = preg_replace('/%(?![A-Fa-f0-9]{2})/', '%25', $string);
+
+		// Add unreserved and % to $valid_chars (the latter is safe because all
+		// pct-encoded sections are now valid).
+		$valid_chars .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~%';
+
+		// Now replace any bytes that aren't allowed with their pct-encoded versions
+		$position = 0;
+		$strlen = strlen($string);
+		while (($position += strspn($string, $valid_chars, $position)) < $strlen)
+		{
+			$value = ord($string[$position]);
+
+			// Start position
+			$start = $position;
+
+			// By default we are valid
+			$valid = true;
+
+			// No one byte sequences are valid due to the while.
+			// Two byte sequence:
+			if (($value & 0xE0) === 0xC0)
+			{
+				$character = ($value & 0x1F) << 6;
+				$length = 2;
+				$remaining = 1;
+			}
+			// Three byte sequence:
+			elseif (($value & 0xF0) === 0xE0)
+			{
+				$character = ($value & 0x0F) << 12;
+				$length = 3;
+				$remaining = 2;
+			}
+			// Four byte sequence:
+			elseif (($value & 0xF8) === 0xF0)
+			{
+				$character = ($value & 0x07) << 18;
+				$length = 4;
+				$remaining = 3;
+			}
+			// Invalid byte:
+			else
+			{
+				$valid = false;
+				$length = 1;
+				$remaining = 0;
+			}
+
+			if ($remaining)
+			{
+				if ($position + $length <= $strlen)
+				{
+					for ($position++; $remaining; $position++)
+					{
+						$value = ord($string[$position]);
+
+						// Check that the byte is valid, then add it to the character:
+						if (($value & 0xC0) === 0x80)
+						{
+							$character |= ($value & 0x3F) << (--$remaining * 6);
+						}
+						// If it is invalid, count the sequence as invalid and reprocess the current byte:
+						else
+						{
+							$valid = false;
+							$position--;
+							break;
+						}
+					}
+				}
+				else
+				{
+					$position = $strlen - 1;
+					$valid = false;
+				}
+			}
+
+			// Percent encode anything invalid or not in ucschar
+			if (
+				// Invalid sequences
+				!$valid
+				// Non-shortest form sequences are invalid
+				|| $length > 1 && $character <= 0x7F
+				|| $length > 2 && $character <= 0x7FF
+				|| $length > 3 && $character <= 0xFFFF
+				// Outside of range of ucschar codepoints
+				// Noncharacters
+				|| ($character & 0xFFFE) === 0xFFFE
+				|| $character >= 0xFDD0 && $character <= 0xFDEF
+				|| (
+					// Everything else not in ucschar
+					   $character > 0xD7FF && $character < 0xF900
+					|| $character < 0xA0
+					|| $character > 0xEFFFD
+				)
+				&& (
+					// Everything not in iprivate, if it applies
+					   !$iprivate
+					|| $character < 0xE000
+					|| $character > 0x10FFFD
+				)
+			)
+			{
+				// If we were a character, pretend we weren't, but rather an error.
+				if ($valid)
+					$position--;
+
+				for ($j = $start; $j <= $position; $j++)
+				{
+					$string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1);
+					$j += 2;
+					$position += 2;
+					$strlen += 2;
+				}
+			}
+		}
+
 		// Normalise case
 		if ($case & SIMPLEPIE_LOWERCASE)
 		{
@@ -11870,61 +12059,148 @@ class SimplePie_IRI
 			$string = strtoupper($string);
 		}
 
-		// Store position and string length (to avoid constantly recalculating this)
-		$position = 0;
-		$strlen = strlen($string);
+		return $string;
+	}
 
-		// Loop as long as we have invalid characters, advancing the position to the next invalid character
-		while (($position += strspn($string, $valid_chars, $position)) < $strlen)
+	/**
+	 * Callback function for preg_replace_callback.
+	 *
+	 * Removes sequences of percent encoded bytes that represent UTF-8
+	 * encoded characters in iunreserved
+	 *
+	 * @access private
+	 * @param array $match PCRE match
+	 * @return string Replacement
+	 */
+	function remove_iunreserved_percent_encoded($match)
+	{
+		// As we just have valid percent encoded sequences we can just explode
+		// and ignore the first member of the returned array (an empty string).
+		$bytes = explode('%', $match[0]);
+
+		// Initialize the new string (this is what will be returned) and that
+		// there are no bytes remaining in the current sequence (unsurprising
+		// at the first byte!).
+		$string = '';
+		$remaining = 0;
+
+		// Loop over each and every byte, and set $value to its value
+		for ($i = 1, $len = count($bytes); $i < $len; $i++)
 		{
-			// If we have a % character
-			if ($string[$position] === '%')
+			$value = hexdec($bytes[$i]);
+
+			// If we're the first byte of sequence:
+			if (!$remaining)
 			{
-				// If we have a pct-encoded section
-				if ($position + 2 < $strlen && strspn($string, '0123456789ABCDEFabcdef', $position + 1, 2) === 2)
-				{
-					// Get the the represented character
-					$chr = chr(hexdec(substr($string, $position + 1, 2)));
+				// Start position
+				$start = $i;
 
-					// If the character is valid, replace the pct-encoded with the actual character while normalising case
-					if (strpos($valid_chars, $chr) !== false)
-					{
-						if ($case & SIMPLEPIE_LOWERCASE)
-						{
-							$chr = strtolower($chr);
-						}
-						elseif ($case & SIMPLEPIE_UPPERCASE)
-						{
-							$chr = strtoupper($chr);
-						}
-						$string = substr_replace($string, $chr, $position, 3);
-						$strlen -= 2;
-						$position++;
-					}
+				// By default we are valid
+				$valid = true;
 
-					// Otherwise just normalise the pct-encoded to uppercase
-					else
+				// One byte sequence:
+				if ($value <= 0x7F)
+				{
+					$character = $value;
+					$length = 1;
+				}
+				// Two byte sequence:
+				elseif (($value & 0xE0) === 0xC0)
+				{
+					$character = ($value & 0x1F) << 6;
+					$length = 2;
+					$remaining = 1;
+				}
+				// Three byte sequence:
+				elseif (($value & 0xF0) === 0xE0)
+				{
+					$character = ($value & 0x0F) << 12;
+					$length = 3;
+					$remaining = 2;
+				}
+				// Four byte sequence:
+				elseif (($value & 0xF8) === 0xF0)
+				{
+					$character = ($value & 0x07) << 18;
+					$length = 4;
+					$remaining = 3;
+				}
+				// Invalid byte:
+				else
+				{
+					$valid = false;
+					$remaining = 0;
+				}
+			}
+			// Continuation byte:
+			else
+			{
+				// Check that the byte is valid, then add it to the character:
+				if (($value & 0xC0) === 0x80)
+				{
+					$remaining--;
+					$character |= ($value & 0x3F) << ($remaining * 6);
+				}
+				// If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence:
+				else
+				{
+					$valid = false;
+					$remaining = 0;
+					$i--;
+				}
+			}
+
+			// If we've reached the end of the current byte sequence, append it to Unicode::$data
+			if (!$remaining)
+			{
+				// Percent encode anything invalid or not in iunreserved
+				if (
+					// Invalid sequences
+					!$valid
+					// Non-shortest form sequences are invalid
+					|| $length > 1 && $character <= 0x7F
+					|| $length > 2 && $character <= 0x7FF
+					|| $length > 3 && $character <= 0xFFFF
+					// Outside of range of iunreserved codepoints
+					|| $character < 0x2D
+					|| $character > 0xEFFFD
+					// Noncharacters
+					|| ($character & 0xFFFE) === 0xFFFE
+					|| $character >= 0xFDD0 && $character <= 0xFDEF
+					// Everything else not in iunreserved (this is all BMP)
+					|| $character === 0x2F
+					|| $character > 0x39 && $character < 0x41
+					|| $character > 0x5A && $character < 0x61
+					|| $character > 0x7A && $character < 0x7E
+					|| $character > 0x7E && $character < 0xA0
+					|| $character > 0xD7FF && $character < 0xF900
+				)
+				{
+					for ($j = $start; $j <= $i; $j++)
 					{
-						$string = substr_replace($string, strtoupper(substr($string, $position + 1, 2)), $position + 1, 2);
-						$position += 3;
+						$string .= '%' . strtoupper($bytes[$j]);
 					}
 				}
-				// If we don't have a pct-encoded section, just replace the % with its own esccaped form
 				else
 				{
-					$string = substr_replace($string, '%25', $position, 1);
-					$strlen += 2;
-					$position += 3;
+					for ($j = $start; $j <= $i; $j++)
+					{
+						$string .= chr(hexdec($bytes[$j]));
+					}
 				}
 			}
-			// If we have an invalid character, change into its pct-encoded form
-			else
+		}
+
+		// If we have any bytes left over they are invalid (i.e., we are
+		// mid-way through a multi-byte sequence)
+		if ($remaining)
+		{
+			for ($j = $start; $j < $len; $j++)
 			{
-				$replacement = sprintf("%%%02X", ord($string[$position]));
-				$string = str_replace($string[$position], $replacement, $string);
-				$strlen = strlen($string);
+				$string .= '%' . strtoupper($bytes[$j]);
 			}
 		}
+
 		return $string;
 	}
 
@@ -14446,7 +14722,7 @@ class SimplePie_Parser
 					case constant('XMLReader::END_ELEMENT'):
 						if ($xml->namespaceURI !== '')
 						{
-							$tagName = "{$xml->namespaceURI}{$this->separator}{$xml->localName}";
+							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
 						}
 						else
 						{
@@ -14458,7 +14734,7 @@ class SimplePie_Parser
 						$empty = $xml->isEmptyElement;
 						if ($xml->namespaceURI !== '')
 						{
-							$tagName = "{$xml->namespaceURI}{$this->separator}{$xml->localName}";
+							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
 						}
 						else
 						{
@@ -14469,7 +14745,7 @@ class SimplePie_Parser
 						{
 							if ($xml->namespaceURI !== '')
 							{
-								$attrName = "{$xml->namespaceURI}{$this->separator}{$xml->localName}";
+								$attrName = $xml->namespaceURI . $this->separator . $xml->localName;
 							}
 							else
 							{
-- 
cgit v1.2.3


From 434f59213c7786053b453612347ff83abfeb8b7b Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Mon, 17 Oct 2011 20:17:05 +0200
Subject: HTML compliant fix for missing ul wrapper in TOC (FS#2328)

---
 inc/html.php | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index 1658e9b4c..1a2d7daef 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -905,40 +905,35 @@ function html_buildlist($data,$class,$func,$lifunc='html_li_default',$forcewrapp
     }
 
     $start_level = $data[0]['level'];
-    $ret   = '';
-
-    if ($forcewrapper || $start_level < 2) {
-        // Trigger building a wrapper ul if the first level is
-        // 0 (we have a root object) or 1 (just the root content)
-        --$start_level;
-    }
-
     $level = $start_level;
+    $ret   = '';
+    $open  = 0;
 
     foreach ($data as $item){
 
         if( $item['level'] > $level ){
             //open new list
             for($i=0; $i<($item['level'] - $level); $i++){
-                if ($i) $ret .= "<li class=\"clear\">\n";
+                if ($i) $ret .= "<li class=\"clear\">";
                 $ret .= "\n<ul class=\"$class\">\n";
+                $open++;
             }
+            $level = $item['level'];
+
         }elseif( $item['level'] < $level ){
             //close last item
             $ret .= "</li>\n";
-            for ($i=0; $i<($level - $item['level']); $i++){
+            while( $level > $item['level'] && $open > 0 ){
                 //close higher lists
                 $ret .= "</ul>\n</li>\n";
+                $level--;
+                $open--;
             }
-            $ret .= "<ul class=\"$class\">\n";
         } elseif ($ret !== '') {
             //close previous item
             $ret .= "</li>\n";
         }
 
-        //remember current level
-        $level = $item['level'];
-
         //print item
         $ret .= call_user_func($lifunc,$item);
         $ret .= '<div class="li">';
@@ -948,8 +943,15 @@ function html_buildlist($data,$class,$func,$lifunc='html_li_default',$forcewrapp
     }
 
     //close remaining items and lists
-    while(--$level >= $start_level) {
-        $ret .= "</li></ul>\n";
+    $ret .= "</li>\n";
+    while($open-- > 0) {
+        $ret .= "</ul></li>\n";
+    }
+
+    if ($forcewrapper || $start_level < 2) {
+        // Trigger building a wrapper ul if the first level is
+        // 0 (we have a root object) or 1 (just the root content)
+        $ret = "\n<ul class=\"$class\">\n".$ret."</ul>\n";
     }
 
     return $ret;
-- 
cgit v1.2.3


From 71861ac4c5e2038488f9b59a3767a8877dec4a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20Magne=20B=C3=B8e?= <jonmagne@gmail.com>
Date: Sun, 23 Oct 2011 06:53:57 +0200
Subject: Norwegian language update

---
 inc/lang/no/conflict.txt      |   2 +-
 inc/lang/no/lang.php          |  14 +++-
 inc/lang/no/registermail.txt  |   2 +-
 inc/lang/no/stopwords.txt     | 182 ++++++++++++++----------------------------
 inc/lang/no/subscr_digest.txt |   6 +-
 inc/lang/no/subscr_single.txt |   6 +-
 6 files changed, 78 insertions(+), 134 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/no/conflict.txt b/inc/lang/no/conflict.txt
index 89479af4f..855034685 100644
--- a/inc/lang/no/conflict.txt
+++ b/inc/lang/no/conflict.txt
@@ -1,4 +1,4 @@
-====== Det fins en nyere versjon ======
+====== Det finnes en nyere versjon ======
 
 Det fins en nyere versjon av dokumentet du har redigert. Dette kan skje når en annen bruker redigerer dokumentet samtidig med deg.
 
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index 8f9562408..88d21b536 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -16,6 +16,7 @@
  * @author Lisa Ditlefsen <lisa@vervesearch.com>
  * @author Erik Pedersen <erik.pedersen@shaw.ca>
  * @author Rune Rasmussen syntaxerror.no@gmail.com
+ * @author Jon Bøe <jonmagneboe@hotmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -137,7 +138,8 @@ $lang['js']['linkto']          = 'Lenke til:';
 $lang['js']['del_confirm']     = 'Slett denne oppføringen?';
 $lang['js']['restore_confirm'] = 'Er du sikker på at du vil gjenopprette denne versjonen?';
 $lang['js']['media_diff']      = 'Vis forskjeller:';
-$lang['js']['media_diff_both'] = 'Side ved side:';
+$lang['js']['media_diff_both'] = 'Side ved side';
+$lang['js']['media_diff_opacity'] = 'Gjennomskinnelighet';
 $lang['js']['media_diff_portions'] = 'Glidebryter';
 $lang['js']['media_select']    = 'Velg filer…';
 $lang['js']['media_upload_btn'] = 'Last opp';
@@ -316,16 +318,20 @@ $lang['seconds']               = '%d sekunder siden';
 $lang['wordblock']             = 'Din endring ble ikke lagret ettersom den inneholder blokkert tekst (søppel).';
 $lang['media_uploadtab']       = 'Last opp';
 $lang['media_searchtab']       = 'Søk';
+$lang['media_file']            = 'Fil';
 $lang['media_viewtab']         = 'Vis';
 $lang['media_edittab']         = 'Rediger';
 $lang['media_historytab']      = 'Historikk';
-$lang['media_thumbsview']      = 'Miniatyrbilder';
-$lang['media_listview']        = 'Liste';
-$lang['media_sort']            = 'Sorter';
+$lang['media_list_thumbs']     = 'Miniatyrbilder';
+$lang['media_list_rows']       = 'Rader';
 $lang['media_sort_name']       = 'etter navn';
 $lang['media_sort_date']       = 'etter dato';
+$lang['media_namespaces']      = 'Velg navnerom';
+$lang['media_files']           = 'Filer i %s';
 $lang['media_upload']          = 'Last opp til navnerommet <strong>%s</strong>.';
 $lang['media_search']          = 'Søk i navnerommet <strong>%s</strong>.';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s på %s';
 $lang['media_edit']            = 'Rediger';
 $lang['media_history']         = 'Dette er de tidligere versjonene av fila.';
 $lang['media_meta_edited']     = 'metadata er endra';
diff --git a/inc/lang/no/registermail.txt b/inc/lang/no/registermail.txt
index e1fae2b90..35ed253ab 100644
--- a/inc/lang/no/registermail.txt
+++ b/inc/lang/no/registermail.txt
@@ -1,4 +1,4 @@
-En ny bruker har registret seg, her er detaljene:
+En ny bruker har registrert seg, her er detaljene:
 
 Brukernavn  : @NEWUSER@
 Fult navn   : @NEWNAME@
diff --git a/inc/lang/no/stopwords.txt b/inc/lang/no/stopwords.txt
index 2b2ab11e2..9a4c302d9 100644
--- a/inc/lang/no/stopwords.txt
+++ b/inc/lang/no/stopwords.txt
@@ -1,130 +1,68 @@
-# This is a list of words the indexer ignores, one word per line
-# When you edit this file be sure to use UNIX line endings (single newline)
-# No need to include words shorter than 3 chars - these are ignored anyway
-# This list is based upon the ones found at http://www.ranks.nl/stopwords/
-alle
-andre
-arbeid
-begge
-bort
-bra
-bruke
-denne
-der
-deres
+# Dette er en liste med ord som indeksereren ignorerer, ett ord per linje.
+# Når du redigerer siden, pass på å bruke UNIX linjeslutt (enkel ny linje).
+# Ord kortere enn 3 bokstaver er automatisk ignorert.
+# Listen er basert på http://helmer.aksis.uib.no/nta/ord10000.txt
+i
+og
 det
-din
-disse
-eller
-ene
-eneste
-enhver
-enn
-folk
+er
+på
+til
+som
+en
+å
 for
-fordi
-forsÛke
-fra
-fÅ
-fÛr
-fÛrst
-gjorde
-gjÛre
-god
-gÅ
-hadde
-han
-hans
-hennes
-her
-hva
-hvem
-hver
-hvilken
-hvis
-hvor
-hvordan
-hvorfor
-ikke
-inn
-innen
-kan
-kunne
-lage
-lang
-lik
-like
-makt
-mange
+av
+at
+har
 med
-meg
-meget
-men
-mens
-mer
-mest
-min
-mye
-mÅ
-mÅte
-navn
-nei
-nÅ
-nÅr
-ogsÅ
-opp
-oss
-over
-part
-punkt
-pÅ
-rett
-riktig
-samme
-sant
-siden
-sist
-skulle
-slik
-slutt
-som
-start
-stille
-sÅ
-tid
-til
-tilbake
-tilstand
-under
-uten
-var
-ved
-verdi
-vil
-ville
-vite
-vÅr
-vÖre
-vÖrt
-om
-er
-og
-du
-dine
 de
-deres
-com
-for
+ikke
+den
+han
+om
+et
 fra
-inni
-hvordan
-det
-dette
+men
+vi
 var
-hva
-når
-hvor
-hvem
+jeg
+seg
+sier
 vil
-med
+kan
+ble
+skal
+etter
+også
+så
+ut
+år
+nå
+da
+dette
+blir
+ved
+mot
+hadde
+to
+hun
+over
+være
+ha
+må
+går
+opp
+få
+andre
+eller
+bare
+sin
+mer
+inn
+før
+bli
+vært
+enn
+alle
 www
\ No newline at end of file
diff --git a/inc/lang/no/subscr_digest.txt b/inc/lang/no/subscr_digest.txt
index 3192e43b7..6afd0cc5c 100644
--- a/inc/lang/no/subscr_digest.txt
+++ b/inc/lang/no/subscr_digest.txt
@@ -1,6 +1,6 @@
 Hei!
 
-Sida @PAGE@ på wikien @TITLE@ har blitt endra.
+Siden @PAGE@ på wikien @TITLE@ har blitt endret.
 Her er endringene:
 
 --------------------------------------------------------
@@ -10,10 +10,10 @@ Her er endringene:
 Gammel versjon : @OLDPAGE@
 Ny versjon: @NEWPAGE@
 
-For å avslutte varslinga, logg inn på
+For å avslutte varslingen, logg inn på
 @DOKUWIKIURL@ og gå til 
 @NEWPAGE@
-og avslutt abonnementet på endringer av sida eller i navnerommet.
+og avslutt abonnementet på endringer av siden eller i navnerommet.
 
 --
 Denne e-posten ble generert av DokuWiki på
diff --git a/inc/lang/no/subscr_single.txt b/inc/lang/no/subscr_single.txt
index ce117b952..25296da58 100644
--- a/inc/lang/no/subscr_single.txt
+++ b/inc/lang/no/subscr_single.txt
@@ -1,6 +1,6 @@
 Hei!
 
-Sida @PAGE@ på wikien @TITLE@ har blitt endra.
+Siden @PAGE@ på wikien @TITLE@ har blitt endret.
 Her er endringene:
 
 --------------------------------------------------------
@@ -13,10 +13,10 @@ Sammendrag: @SUMMARY@
 Gammel versjon : @OLDPAGE@
 Ny versjon: @NEWPAGE@
 
-For å avslutte varslinga, logg inn på
+For å avslutte varslingen, logg inn på
 @DOKUWIKIURL@, gå til 
 @NEWPAGE@
-og avslutt abonnementet på endringer av sida eller i navnerommet.
+og avslutt abonnementet på endringer av siden eller i navnerommet.
 
 --
 Denne e-posten ble generert av DokuWiki på
-- 
cgit v1.2.3


From 3bc1b86f57f47cd1dc0d9443137e12fc325e304b Mon Sep 17 00:00:00 2001
From: Martin Michalek <michalek.dev@gmail.com>
Date: Sun, 23 Oct 2011 06:56:18 +0200
Subject: Slovak language update

---
 inc/lang/sk/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index aee1ca367..3abe4aed1 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Uložiť ako (voliteľné)';
 $lang['txt_overwrt']           = 'Prepísať existujúci súbor';
 $lang['lockedby']              = 'Práve zamknuté:';
 $lang['lockexpire']            = 'Zámok stratí platnosť:';
-$lang['js']['willexpire']            = 'Váš zámok pre editáciu za chvíľu stratí platnosť.\nAby ste predišli konfliktom, stlačte tlačítko Náhľad a zámok sa predĺži.';
+$lang['js']['willexpire']      = 'Váš zámok pre editáciu za chvíľu stratí platnosť.\nAby ste predišli konfliktom, stlačte tlačítko Náhľad a zámok sa predĺži.';
 $lang['js']['notsavedyet']     = 'Neuložené zmeny budú stratené.
 Chcete naozaj pokračovať?';
 $lang['js']['searchmedia']     = 'Hľadať súbory';
@@ -101,7 +101,7 @@ $lang['js']['hidedetails']     = 'Skryť detaily';
 $lang['js']['mediatitle']      = 'Nastavenia odkazu';
 $lang['js']['mediadisplay']    = 'Typ odkazu';
 $lang['js']['mediaalign']      = 'Zarovnanie';
-$lang['js']['mediasize']       = 'Veľkosť obrázku';
+$lang['js']['mediasize']       = 'Veľkosť obrázka';
 $lang['js']['mediatarget']     = 'Cieľ odkazu';
 $lang['js']['mediaclose']      = 'Zatvoriť';
 $lang['js']['mediainsert']     = 'Vložiť';
-- 
cgit v1.2.3


From 12e233d35a8c74cd22af40fedac47511c00d3d97 Mon Sep 17 00:00:00 2001
From: Pierre Corell <info@joomla-praxis.de>
Date: Thu, 27 Oct 2011 23:44:00 +0200
Subject: German language updates

---
 inc/lang/de-informal/lang.php | 67 +++++++++++++------------------------------
 inc/lang/de/lang.php          | 11 +++++--
 2 files changed, 28 insertions(+), 50 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index 62b633fd5..1ecad6af0 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -18,8 +18,8 @@
  * @author Marcel Metz <marcel_metz@gmx.de>
  * @author Matthias Schulte <mailinglist@lupo49.de>
  * @author Christian Wichmann <nospam@zone0.de>
+ * @author Pierre Corell <info@joomla-praxis.de>
  */
-
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
 $lang['doublequoteopening']    = '„';
@@ -27,7 +27,6 @@ $lang['doublequoteclosing']    = '“';
 $lang['singlequoteopening']    = '‚';
 $lang['singlequoteclosing']    = '‘';
 $lang['apostrophe']            = '’';
-
 $lang['btn_edit']              = 'Diese Seite bearbeiten';
 $lang['btn_source']            = 'Zeige Quelltext';
 $lang['btn_show']              = 'Seite anzeigen';
@@ -63,7 +62,6 @@ $lang['btn_revert']            = 'Wiederherstellen';
 $lang['btn_register']          = 'Registrieren';
 $lang['btn_apply']             = 'Übernehmen';
 $lang['btn_media']             = 'Medien-Manager';
-
 $lang['loggedinas']            = 'Angemeldet als';
 $lang['user']                  = 'Benutzername';
 $lang['pass']                  = 'Passwort';
@@ -75,10 +73,9 @@ $lang['fullname']              = 'Voller Name';
 $lang['email']                 = 'E-Mail';
 $lang['profile']               = 'Benutzerprofil';
 $lang['badlogin']              = 'Nutzername oder Passwort sind falsch.';
-$lang['minoredit']             = 'kleine Änderung';
+$lang['minoredit']             = 'Kleine Änderung';
 $lang['draftdate']             = 'Entwurf gespeichert am';
 $lang['nosecedit']             = 'Diese Seite wurde in der Zwischenzeit geändert, da das Sektionsinfo veraltet ist. Die ganze Seite wird stattdessen geladen.';
-
 $lang['regmissing']            = 'Alle Felder müssen ausgefüllt werden';
 $lang['reguexists']            = 'Der Nutzername existiert leider schon.';
 $lang['regsuccess']            = 'Der neue Nutzer wurde angelegt und das Passwort per E-Mail versandt.';
@@ -88,12 +85,10 @@ $lang['regbadmail']            = 'Die angegebene Mail-Adresse scheint ungültig
 $lang['regbadpass']            = 'Die beiden eingegeben Passwörter stimmen nicht überein. Bitte versuche es noch einmal.';
 $lang['regpwmail']             = 'Ihr DokuWiki Passwort';
 $lang['reghere']               = 'Du hast noch keinen Zugang? Hier registrieren';
-
 $lang['profna']                = 'Änderung des Benutzerprofils in diesem Wiki nicht möglich.';
 $lang['profnochange']          = 'Keine Änderungen, nichts zu tun.';
 $lang['profnoempty']           = 'Es muss ein Name oder eine E-Mail Adresse angegeben werden.';
 $lang['profchanged']           = 'Benutzerprofil erfolgreich geändert.';
-
 $lang['pwdforget']             = 'Passwort vergessen? Fordere ein neues an';
 $lang['resendna']              = 'Passwörter versenden ist in diesem Wiki nicht möglich.';
 $lang['resendpwd']             = 'Neues Passwort senden für';
@@ -102,10 +97,8 @@ $lang['resendpwdnouser']       = 'Es tut mir Leid, aber der Benutzer existiert n
 $lang['resendpwdbadauth']      = 'Es tut mir Leid, aber dieser Authentifizierungscode ist ungültig. Stelle sicher, dass du den kompletten Bestätigungslink verwendet haben.';
 $lang['resendpwdconfirm']      = 'Ein Bestätigungslink wurde per E-Mail versandt.';
 $lang['resendpwdsuccess']      = 'Dein neues Passwort wurde per E-Mail versandt.';
-
 $lang['license']               = 'Falls nicht anders bezeichnet, ist der Inhalt dieses Wikis unter der folgenden Lizenz veröffentlicht:';
 $lang['licenseok']             = 'Hinweis: Durch das Bearbeiten dieser Seite gibst du dein Einverständnis, dass dein Inhalt unter der folgenden Lizenz veröffentlicht wird:';
-
 $lang['searchmedia']           = 'Suche nach Datei:';
 $lang['searchmedia_in']        = 'Suche in %s';
 $lang['txt_upload']            = 'Datei zum Hochladen auswählen';
@@ -113,8 +106,7 @@ $lang['txt_filename']          = 'Hochladen als (optional)';
 $lang['txt_overwrt']           = 'Bestehende Datei überschreiben';
 $lang['lockedby']              = 'Momentan gesperrt von';
 $lang['lockexpire']            = 'Sperre läuft ab am';
-
-$lang['js']['willexpire']            = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, solltest du sie durch einen Klick auf den Vorschau-Knopf verlängern.';
+$lang['js']['willexpire']      = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, solltest du sie durch einen Klick auf den Vorschau-Knopf verlängern.';
 $lang['js']['notsavedyet']     = 'Nicht gespeicherte Änderungen gehen verloren!';
 $lang['js']['searchmedia']     = 'Suche nach Dateien';
 $lang['js']['keepopen']        = 'Fenster nach Auswahl nicht schließen';
@@ -144,21 +136,19 @@ $lang['js']['nosmblinks']      = 'Das Verlinken von Windows-Freigaben funktionie
 $lang['js']['linkwiz']         = 'Link-Assistent';
 $lang['js']['linkto']          = 'Link zu:';
 $lang['js']['del_confirm']     = 'Die ausgewählten Dateien wirklich löschen?';
-$lang['js']['restore_confirm'] = 'Really restore this version?';
-$lang['js']['media_diff']          = 'Unterschiede anzeigen:';
-$lang['js']['media_diff_both']     = 'Side by Side';
-$lang['js']['media_diff_opacity']  = 'Überblenden';
+$lang['js']['restore_confirm'] = 'Wirkliich diese Version wieder herstellen?';
+$lang['js']['media_diff']      = 'Unterschiede anzeigen:';
+$lang['js']['media_diff_both'] = 'Seite für Seite';
+$lang['js']['media_diff_opacity'] = 'Überblenden';
 $lang['js']['media_diff_portions'] = 'Übergang';
-$lang['js']['media_select']        = 'Dateien auswählen…';
-$lang['js']['media_upload_btn']    = 'Hochladen';
-$lang['js']['media_done_btn']      = 'Fertig';
-$lang['js']['media_drop']          = 'Dateien hier draufziehen um sie hochzuladen';
-$lang['js']['media_cancel']        = 'Entfernen';
-$lang['js']['media_overwrt']       = 'Existierende Dateien überschreiben';
-
+$lang['js']['media_select']    = 'Dateien auswählen…';
+$lang['js']['media_upload_btn'] = 'Hochladen';
+$lang['js']['media_done_btn']  = 'Fertig';
+$lang['js']['media_drop']      = 'Dateien hier draufziehen um sie hochzuladen';
+$lang['js']['media_cancel']    = 'Entfernen';
+$lang['js']['media_overwrt']   = 'Existierende Dateien überschreiben';
 $lang['rssfailed']             = 'Es ist ein Fehler beim Laden des Feeds aufgetreten: ';
 $lang['nothingfound']          = 'Nichts gefunden.';
-
 $lang['mediaselect']           = 'Dateiauswahl';
 $lang['fileupload']            = 'Datei hochladen';
 $lang['uploadsucc']            = 'Datei wurde erfolgreich hochgeladen';
@@ -183,7 +173,6 @@ $lang['mediaextchange']        = 'Dateiendung vom .%s nach .%s geändert!';
 $lang['reference']             = 'Verwendung von';
 $lang['ref_inuse']             = 'Diese Datei kann nicht gelöscht werden, da sie noch von folgenden Seiten benutzt wird:';
 $lang['ref_hidden']            = 'Einige Verweise sind auf Seiten, für die du keine Leseberechtigung hast.';
-
 $lang['hits']                  = 'Treffer';
 $lang['quickhits']             = 'Passende Seitennamen';
 $lang['toc']                   = 'Inhaltsverzeichnis';
@@ -207,18 +196,15 @@ $lang['external_edit']         = 'Externe Bearbeitung';
 $lang['summary']               = 'Zusammenfassung';
 $lang['noflash']               = 'Das <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> wird benötigt, um diesen Inhalt anzuzeigen.';
 $lang['download']              = 'Download-Teil';
-
 $lang['mail_newpage']          = 'Neue Seite:';
 $lang['mail_changed']          = 'Seite geändert:';
 $lang['mail_subscribe_list']   = 'Seite hat sich im Namespace geändert:';
 $lang['mail_new_user']         = 'Neuer Benutzer:';
 $lang['mail_upload']           = 'Datei hochgeladen:';
-
 $lang['changes_type']          = 'Änderungen anzeigen von';
 $lang['pages_changes']         = 'Seiten';
 $lang['media_changes']         = 'Mediendateien';
 $lang['both_changes']          = 'Beides, Seiten- und Mediendateien';
-
 $lang['qb_bold']               = 'Fetter Text';
 $lang['qb_italic']             = 'Kursiver Text';
 $lang['qb_underl']             = 'Unterstrichener Text';
@@ -243,11 +229,8 @@ $lang['qb_media']              = 'Bilder und andere Dateien hinzufügen';
 $lang['qb_sig']                = 'Unterschrift einfügen';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Sonderzeichen';
-
 $lang['upperns']               = 'Gehe zum übergeordneten Namensraum';
-
 $lang['admin_register']        = 'Neuen Benutzer anmelden';
-
 $lang['metaedit']              = 'Metadaten bearbeiten';
 $lang['metasaveerr']           = 'Die Metadaten konnten nicht gesichert werden';
 $lang['metasaveok']            = 'Metadaten gesichert';
@@ -265,7 +248,6 @@ $lang['img_keywords']          = 'Schlagwörter';
 $lang['img_width']             = 'Breite';
 $lang['img_height']            = 'Höhe';
 $lang['img_manager']           = 'Im Medien-Manager anzeigen';
-
 $lang['subscr_subscribe_success'] = 'Die Seite %s wurde zur Abonnementenliste von %s hinzugefügt';
 $lang['subscr_subscribe_error'] = 'Fehler beim Hinzufügen von %s zur Abonnementenliste von %s';
 $lang['subscr_subscribe_noaddress'] = 'In deinem Account ist keine E-Mail-Adresse hinterlegt. Dadurch kann die Seite nicht abonniert werden';
@@ -273,7 +255,6 @@ $lang['subscr_unsubscribe_success'] = 'Die Seite %s wurde von der Abonnementenli
 $lang['subscr_unsubscribe_error'] = 'Fehler beim Entfernen von %s von der Abonnementenliste von %s';
 $lang['subscr_already_subscribed'] = '%s ist bereits auf der Abonnementenliste von %s';
 $lang['subscr_not_subscribed'] = '%s ist nicht auf der Abonnementenliste von %s';
-// Manage page for subscriptions
 $lang['subscr_m_not_subscribed'] = 'Du hast kein Abonnement von dieser Seite oder dem Namensraum.';
 $lang['subscr_m_new_header']   = 'Abonnementen hinzufügen';
 $lang['subscr_m_current_header'] = 'Aktive Abonnements';
@@ -283,12 +264,8 @@ $lang['subscr_m_receive']      = 'Erhalten';
 $lang['subscr_style_every']    = 'E-Mail bei jeder Änderung';
 $lang['subscr_style_digest']   = 'E-Mail mit zusammengefasster Übersicht der Seitenänderungen (alle %.2f Tage)';
 $lang['subscr_style_list']     = 'Auflistung aller geänderten Seiten seit der letzten E-Mail (alle %.2f Tage)';
-
-/* auth.class language support */
 $lang['authmodfailed']         = 'Benutzerüberprüfung nicht möglich. Bitte wende dich an den Admin.';
 $lang['authtempfail']          = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wende dich an den Admin.';
-
-/* installer strings */
 $lang['i_chooselang']          = 'Wähle deine Sprache';
 $lang['i_installer']           = 'DokuWiki-Installation';
 $lang['i_wikiname']            = 'Wiki-Name';
@@ -311,7 +288,6 @@ $lang['i_pol1']                = 'Öffentliches Wiki (lesen für alle, schreiben
 $lang['i_pol2']                = 'Geschlossenes Wiki (lesen, schreiben, hochladen nur für registrierte Nutzer)';
 $lang['i_retry']               = 'Wiederholen';
 $lang['i_license']             = 'Bitte wähle die Lizenz aus unter der die Wiki-Inhalte veröffentlicht werden sollen:';
-
 $lang['mu_intro']              = 'In diesem Bereich kannst du mehrere Dateien gleichzeitig hochladen. Benutze die Schaltfläche "Durchsuchen", um sie der Warteschlange zuzufügen. Betätige die Schaltfläche "Hochladen", um die Übertragung zu starten.';
 $lang['mu_gridname']           = 'Dateiname';
 $lang['mu_gridsize']           = 'Größe';
@@ -327,7 +303,6 @@ $lang['mu_progress']           = '@PCT@% hochgeladen';
 $lang['mu_filetypes']          = 'Erlaubte Dateitypen';
 $lang['mu_info']               = 'Dateien hochgeladen.';
 $lang['mu_lasterr']            = 'Letzter Fehler:';
-
 $lang['recent_global']         = 'Im Moment siehst du die Änderungen im Namensraum <b>%s</b>. Du kannst auch <a href="%s">die Änderungen im gesamten Wiki sehen</a>.';
 $lang['years']                 = 'vor %d Jahren';
 $lang['months']                = 'vor %d Monaten';
@@ -336,11 +311,10 @@ $lang['days']                  = 'vor %d Tagen';
 $lang['hours']                 = 'vor %d Stunden';
 $lang['minutes']               = 'vor %d Minuten';
 $lang['seconds']               = 'vor %d Sekunden';
-
 $lang['wordblock']             = 'Deine Bearbeitung wurde nicht gespeichert, da sie gesperrten Text enthielt (Spam).';
-
 $lang['media_uploadtab']       = 'Hochladen';
 $lang['media_searchtab']       = 'Suchen';
+$lang['media_file']            = 'Datei';
 $lang['media_viewtab']         = 'Anzeigen';
 $lang['media_edittab']         = 'Bearbeiten';
 $lang['media_historytab']      = 'Verlauf';
@@ -348,10 +322,12 @@ $lang['media_list_thumbs']     = '<span>Medien anzeigen als</span> Miniaturansic
 $lang['media_list_rows']       = '<span>Medien anzeigen als</span> Listenansicht';
 $lang['media_sort_name']       = '<span>Sortieren nach</span> Name';
 $lang['media_sort_date']       = '<span>Sortieren nach</span> Datum';
-$lang['media_files']           = 'Medien im Namespace <strong>%s</strong>.';
-$lang['media_upload']          = 'In den <strong>%s</strong> Namespace hochladen.';
-$lang['media_search']          = 'Im Namespace <strong>%s</strong> suchen.';
+$lang['media_namespaces']      = 'Namensraum wählen';
+$lang['media_files']           = 'Medien im Namensraum <strong>%s</strong>.';
+$lang['media_upload']          = 'In den <strong>%s</strong> Namensraum hochladen.';
+$lang['media_search']          = 'Im Namensraum <strong>%s</strong> suchen.';
 $lang['media_view']            = '<span class="%s">%s</span>';
+$lang['media_viewold']         = '%s in %s';
 $lang['media_edit']            = '<span class="%s">%s</span> bearbeiten';
 $lang['media_history']         = 'Versionen von <span class="%s">%s</span>';
 $lang['media_meta_edited']     = 'Meta-Informationen bearbeitet';
@@ -359,7 +335,4 @@ $lang['media_perm_read']       = 'Du besitzt nicht die notwendigen Berechtigunge
 $lang['media_perm_upload']     = 'Du besitzt nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
 $lang['media_update']          = 'Neue Version hochladen';
 $lang['media_restore']         = 'Diese Version wiederherstellen';
-
-$lang['plugin_install_err']    = "Plugin nicht korrekt installiert. Plugin-Verzeichnis von '%s' nach '%s' umbenennen.";
-
-//Setup VIM: ex: et ts=2 :
+$lang['plugin_install_err']    = 'Plugin nicht korrekt installiert. Plugin-Verzeichnis von \'%s\' nach \'%s\' umbenennen.';
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 34434cafa..eef2f6632 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -20,6 +20,7 @@
  * @author Christian Wichmann <nospam@zone0.de>
  * @author Matthias Schulte <mailinglist@lupo49.de>
  * @author Paul Lachewsky <kaeptn.haddock@gmail.com>
+ * @author Pierre Corell <info@joomla-praxis.de>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -315,16 +316,20 @@ $lang['seconds']               = 'vor %d Sekunden';
 $lang['wordblock']             = 'Ihre Bearbeitung wurde nicht gespeichert, da sie gesperrten Text enthielt (Spam).';
 $lang['media_uploadtab']       = 'Hochladen';
 $lang['media_searchtab']       = 'Suchen';
+$lang['media_file']            = 'Datei';
 $lang['media_viewtab']         = 'Anzeigen';
 $lang['media_edittab']         = 'Bearbeiten';
 $lang['media_historytab']      = 'Verlauf';
-$lang['media_thumbsview']      = 'Miniaturansicht';
-$lang['media_listview']        = 'Detailansicht';
-$lang['media_sort']            = 'Sortieren';
+$lang['media_list_thumbs']     = 'Vorschaubilder';
+$lang['media_list_rows']       = 'Reihen';
 $lang['media_sort_name']       = 'nach Name';
 $lang['media_sort_date']       = 'nach Datum';
+$lang['media_namespaces']      = 'Namensraum wählen';
+$lang['media_files']           = 'Dateien in %s';
 $lang['media_upload']          = 'In den <strong>%s</strong> Namespace hochladen.';
 $lang['media_search']          = 'Im Namespace <strong>%s</strong> suchen.';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s in %s';
 $lang['media_edit']            = 'Bearbeiten';
 $lang['media_history']         = 'Versionsverlauf der Datei.';
 $lang['media_meta_edited']     = 'Meta-Informationen bearbeitet';
-- 
cgit v1.2.3


From d9edf3516f5fb365c74220223e36698a092f63b1 Mon Sep 17 00:00:00 2001
From: Kiril Velikov <neohidra@gmail.com>
Date: Thu, 27 Oct 2011 23:45:17 +0200
Subject: Bulgarian language update

---
 inc/lang/bg/lang.php | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 4 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php
index ca6aaeadc..8985e20e5 100644
--- a/inc/lang/bg/lang.php
+++ b/inc/lang/bg/lang.php
@@ -37,7 +37,7 @@ $lang['btn_update']            = 'Актуализиране';
 $lang['btn_delete']            = 'Изтриване';
 $lang['btn_back']              = 'Назад';
 $lang['btn_backlink']          = 'Обратни препратки';
-$lang['btn_backtomedia']       = 'Назад към избора на медиен файл';
+$lang['btn_backtomedia']       = 'Назад към избора на файл';
 $lang['btn_subscribe']         = 'Абонаменти';
 $lang['btn_profile']           = 'Профил';
 $lang['btn_reset']             = 'Изчистване';
@@ -47,6 +47,8 @@ $lang['btn_recover']           = 'Възстановяване на чернов
 $lang['btn_draftdel']          = 'Изтриване на чернова';
 $lang['btn_revert']            = 'Възстановяване';
 $lang['btn_register']          = 'Регистриране';
+$lang['btn_apply']             = 'Прилагане';
+$lang['btn_media']             = 'Диспечер на файлове';
 $lang['loggedinas']            = 'Вписани сте като';
 $lang['user']                  = 'Потребител';
 $lang['pass']                  = 'Парола';
@@ -91,7 +93,7 @@ $lang['txt_filename']          = 'Качи като (незадължителн
 $lang['txt_overwrt']           = 'Презапиши съществуващите файлове';
 $lang['lockedby']              = 'В момента е заключена от';
 $lang['lockexpire']            = 'Ще бъде отключена на';
-$lang['js']['willexpire']            = 'Страницата ще бъде отключена за редактиране след минута.\nЗа предотвратяване на конфликти, ползвайте бутона "Преглед", за рестартиране на брояча за заключване.';
+$lang['js']['willexpire']      = 'Страницата ще бъде отключена за редактиране след минута.\nЗа предотвратяване на конфликти, ползвайте бутона "Преглед", за рестартиране на брояча за заключване.';
 $lang['js']['notsavedyet']     = 'Незаписаните промени ще бъдат загубени. Желаете ли да продължите?';
 $lang['js']['searchmedia']     = 'Търсене на файлове';
 $lang['js']['keepopen']        = 'Без затваряне на прозореца след избор';
@@ -122,10 +124,21 @@ $lang['js']['nosmblinks']      = 'Връзките към Windows shares раб
 $lang['js']['linkwiz']         = 'Помощник за препратки';
 $lang['js']['linkto']          = 'Препратка към: ';
 $lang['js']['del_confirm']     = 'Да бъдат ли изтрити избраните елементи?';
+$lang['js']['restore_confirm'] = 'Наистина ли желаете да бъде възстановена тази версия?';
+$lang['js']['media_diff']      = 'Преглед на разликите:';
+$lang['js']['media_diff_both'] = 'Един до друг';
+$lang['js']['media_diff_opacity'] = 'Наслагване (и прозиране)';
+$lang['js']['media_diff_portions'] = 'По половинка';
+$lang['js']['media_select']    = 'Изберете файлове...';
+$lang['js']['media_upload_btn'] = 'Качване';
+$lang['js']['media_done_btn']  = 'Готово';
+$lang['js']['media_drop']      = 'Влачете и пуснете файливе тук, за да бъдат качени';
+$lang['js']['media_cancel']    = 'премахване';
+$lang['js']['media_overwrt']   = 'Презапиши съществуващите файлове';
 $lang['rssfailed']             = 'Възникна грешка при получаването на емисията: ';
 $lang['nothingfound']          = 'Нищо не е открито.';
-$lang['mediaselect']           = 'Медийни файлове';
-$lang['fileupload']            = 'Качване на медийни файлове';
+$lang['mediaselect']           = 'Файлове';
+$lang['fileupload']            = 'Качване на файлове';
 $lang['uploadsucc']            = 'Качването е успешно';
 $lang['uploadfail']            = 'Качването се провали. Може би поради грешни права?';
 $lang['uploadwrong']           = 'Качването е отказано. Файлово разширение е забранено!';
@@ -176,6 +189,10 @@ $lang['mail_changed']          = 'променена страница: ';
 $lang['mail_subscribe_list']   = 'променени страници в именно пространство: ';
 $lang['mail_new_user']         = 'нов потребител: ';
 $lang['mail_upload']           = 'качен файл: ';
+$lang['changes_type']          = 'Преглед на променените';
+$lang['pages_changes']         = 'Страници';
+$lang['media_changes']         = 'Файлове';
+$lang['both_changes']          = 'Страници и файлове';
 $lang['qb_bold']               = 'Удебелен текст';
 $lang['qb_italic']             = 'Курсив текст';
 $lang['qb_underl']             = 'Подчертан текст';
@@ -216,6 +233,9 @@ $lang['img_copyr']             = 'Авторско право';
 $lang['img_format']            = 'Формат';
 $lang['img_camera']            = 'Фотоапарат';
 $lang['img_keywords']          = 'Ключови думи';
+$lang['img_width']             = 'Ширина';
+$lang['img_height']            = 'Височина';
+$lang['img_manager']           = 'Преглед в диспечера на файлове';
 $lang['subscr_subscribe_success'] = '%s е добавен към списъка с абониралите се за %s';
 $lang['subscr_subscribe_error'] = 'Грешка при добавянето на %s към списъка с абониралите се за %s';
 $lang['subscr_subscribe_noaddress'] = 'Добавянето ви към списъка с абонати не е възможно поради липсата на свързан адрес (на ел. поща) с профила ви.';
@@ -281,3 +301,27 @@ $lang['hours']                 = 'преди %d часа';
 $lang['minutes']               = 'преди %d минути';
 $lang['seconds']               = 'преди %d секунди';
 $lang['wordblock']             = 'Направените от вас промени не са съхранени, защото съдържат забранен текст (SPAM).';
+$lang['media_uploadtab']       = 'Качване';
+$lang['media_searchtab']       = 'Търсене';
+$lang['media_file']            = 'Файл';
+$lang['media_viewtab']         = 'Преглед';
+$lang['media_edittab']         = 'Редактиране';
+$lang['media_historytab']      = 'История';
+$lang['media_list_thumbs']     = 'Миниатюри';
+$lang['media_list_rows']       = 'Редове';
+$lang['media_sort_name']       = 'Име';
+$lang['media_sort_date']       = 'Дата';
+$lang['media_namespaces']      = 'Изберете именно пространство';
+$lang['media_files']           = 'Файлове в %s';
+$lang['media_upload']          = 'Качване в %s';
+$lang['media_search']          = 'Търсене в %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s в %s';
+$lang['media_edit']            = 'Редактиране на %s';
+$lang['media_history']         = 'История на %s';
+$lang['media_meta_edited']     = 'редактиране на метаданните';
+$lang['media_perm_read']       = 'За съжаление нямате достатъчно права, за да можете да прочетете файла.';
+$lang['media_perm_upload']     = 'За съжаление нямате достатъчно права, за да можете да качите файла.';
+$lang['media_update']          = 'Качване на нова версия';
+$lang['media_restore']         = 'Възстановяване на тази версия';
+$lang['plugin_install_err']    = 'Неправилно инсталирана приставка. Моля, преименувайте директорията \'%s\' на \'%s\'.';
-- 
cgit v1.2.3


From ad7ad47edd6772cee4fc7955869d9a1dee98a73e Mon Sep 17 00:00:00 2001
From: Martin Michalek <michalek.dev@gmail.com>
Date: Thu, 27 Oct 2011 23:47:09 +0200
Subject: Slovak language update

---
 inc/lang/sk/lang.php | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'inc')

diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index 3abe4aed1..c0d45da58 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -48,6 +48,8 @@ $lang['btn_recover']           = 'Obnoviť koncept';
 $lang['btn_draftdel']          = 'Zmazať koncept';
 $lang['btn_revert']            = 'Obnoviť';
 $lang['btn_register']          = 'Registrovať';
+$lang['btn_apply']             = 'Použiť';
+$lang['btn_media']             = 'Správa médií';
 $lang['loggedinas']            = 'Prihlásený(á) ako';
 $lang['user']                  = 'Užívateľské meno';
 $lang['pass']                  = 'Heslo';
@@ -124,6 +126,17 @@ Aj napriek tomu tento odkaz môžete skopírovať a vložiť inde.';
 $lang['js']['linkwiz']         = 'Sprievodca odkazmi';
 $lang['js']['linkto']          = 'Odkaz na:';
 $lang['js']['del_confirm']     = 'Zmazať túto položku?';
+$lang['js']['restore_confirm'] = 'Skutočne obnoviť túto verziu?';
+$lang['js']['media_diff']      = 'Zobraziť rozdiely:';
+$lang['js']['media_diff_both'] = 'Vedľa seba';
+$lang['js']['media_diff_opacity'] = 'Presvitaním';
+$lang['js']['media_diff_portions'] = 'Potiahnutím';
+$lang['js']['media_select']    = 'Vybrať súbory...';
+$lang['js']['media_upload_btn'] = 'Nahrať';
+$lang['js']['media_done_btn']  = 'Hotovo';
+$lang['js']['media_drop']      = 'Pridajte súbory potiahnutím myšou';
+$lang['js']['media_cancel']    = 'odstrániť';
+$lang['js']['media_overwrt']   = 'Prepísať existujúce súbory';
 $lang['rssfailed']             = 'Nastala chyba pri vytváraní tohto RSS: ';
 $lang['nothingfound']          = 'Nič nenájdené.';
 $lang['mediaselect']           = 'Výber dokumentu';
@@ -178,6 +191,10 @@ $lang['mail_changed']          = 'stránka zmenená:';
 $lang['mail_subscribe_list']   = 'stránky zmenené v mennom priestore:';
 $lang['mail_new_user']         = 'nový užívateľ:';
 $lang['mail_upload']           = 'nahraný súbor:';
+$lang['changes_type']          = 'Prehľad zmien';
+$lang['pages_changes']         = 'Stránok';
+$lang['media_changes']         = 'Média súborov';
+$lang['both_changes']          = 'Stránok spolu s média súbormi';
 $lang['qb_bold']               = 'Tučné';
 $lang['qb_italic']             = 'Kurzíva';
 $lang['qb_underl']             = 'Podčiarknutie';
@@ -218,6 +235,9 @@ $lang['img_copyr']             = 'Kopírovacie práva';
 $lang['img_format']            = 'Formát';
 $lang['img_camera']            = 'Fotoaparát';
 $lang['img_keywords']          = 'Kľúčové slová';
+$lang['img_width']             = 'Šírka';
+$lang['img_height']            = 'Výška';
+$lang['img_manager']           = 'Prezrieť v správcovi médií';
 $lang['subscr_subscribe_success'] = 'Používateľ %s bol pridaný do zoznamu hlásení o zmenách %s';
 $lang['subscr_subscribe_error'] = 'Chyba pri pridaní používateľa %s do zoznamu hlásení o zmenách %s';
 $lang['subscr_subscribe_noaddress'] = 'Vaše prihlasovacie meno nemá priradenú žiadnu email adresu, nemôžete byť pridaný do zoznamu hlásení o zmenách';
@@ -282,3 +302,27 @@ $lang['hours']                 = 'pred %d hodinami';
 $lang['minutes']               = 'pred %d minútami';
 $lang['seconds']               = 'pred %d sekundami';
 $lang['wordblock']             = 'Vaše zmeny neboli uložené, pretože obsahovali nepovolený text (spam).';
+$lang['media_uploadtab']       = 'Nahrať';
+$lang['media_searchtab']       = 'Hľadať';
+$lang['media_file']            = 'Súbor';
+$lang['media_viewtab']         = 'Náhľad';
+$lang['media_edittab']         = 'Upraviť';
+$lang['media_historytab']      = 'História';
+$lang['media_list_thumbs']     = 'Miniatúry';
+$lang['media_list_rows']       = 'Zoznam';
+$lang['media_sort_name']       = 'Meno';
+$lang['media_sort_date']       = 'Dátum';
+$lang['media_namespaces']      = 'Vybrať priestor';
+$lang['media_files']           = 'Súbory v %s';
+$lang['media_upload']          = 'Nahrať do %s';
+$lang['media_search']          = 'Hľadať v %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s v %s';
+$lang['media_edit']            = 'Upraviť %s';
+$lang['media_history']         = 'História %s';
+$lang['media_meta_edited']     = 'metadáta upravené';
+$lang['media_perm_read']       = 'Prepáčte, ale nemáte dostatočné oprávnenie na čítanie súborov.';
+$lang['media_perm_upload']     = 'Prepáčte, ale nemáte dostatočné oprávnenie na nahrávanie súborov.';
+$lang['media_update']          = 'Nahrať novú verziu';
+$lang['media_restore']         = 'Obnoviť túto verziu';
+$lang['plugin_install_err']    = 'Plugin nebol nainštalovaný úspešne. Premenujte adresár s pluginom \'%s\' na \'%s\'.';
-- 
cgit v1.2.3


From 1888d1bb1d60876eb3334724dce2e41eadb83efa Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sat, 29 Oct 2011 22:37:13 +0200
Subject: Removed faulty <span> tags from translations (FS#2360)

---
 inc/lang/de-informal/lang.php | 14 +++++++-------
 inc/lang/fr/lang.php          | 10 +++++-----
 inc/lang/pt/lang.php          | 10 +++++-----
 inc/lang/ru/lang.php          |  8 ++++----
 4 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index 1ecad6af0..ec5e308ce 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -318,18 +318,18 @@ $lang['media_file']            = 'Datei';
 $lang['media_viewtab']         = 'Anzeigen';
 $lang['media_edittab']         = 'Bearbeiten';
 $lang['media_historytab']      = 'Verlauf';
-$lang['media_list_thumbs']     = '<span>Medien anzeigen als</span> Miniaturansicht';
-$lang['media_list_rows']       = '<span>Medien anzeigen als</span> Listenansicht';
-$lang['media_sort_name']       = '<span>Sortieren nach</span> Name';
-$lang['media_sort_date']       = '<span>Sortieren nach</span> Datum';
+$lang['media_list_thumbs']     = 'Medien anzeigen als Miniaturansicht';
+$lang['media_list_rows']       = 'Medien anzeigen als Listenansicht';
+$lang['media_sort_name']       = 'Sortieren nach Name';
+$lang['media_sort_date']       = 'Sortieren nach Datum';
 $lang['media_namespaces']      = 'Namensraum wählen';
 $lang['media_files']           = 'Medien im Namensraum <strong>%s</strong>.';
 $lang['media_upload']          = 'In den <strong>%s</strong> Namensraum hochladen.';
 $lang['media_search']          = 'Im Namensraum <strong>%s</strong> suchen.';
-$lang['media_view']            = '<span class="%s">%s</span>';
+$lang['media_view']            = '%s';
 $lang['media_viewold']         = '%s in %s';
-$lang['media_edit']            = '<span class="%s">%s</span> bearbeiten';
-$lang['media_history']         = 'Versionen von <span class="%s">%s</span>';
+$lang['media_edit']            = '%s bearbeiten';
+$lang['media_history']         = 'Versionen von %s';
 $lang['media_meta_edited']     = 'Meta-Informationen bearbeitet';
 $lang['media_perm_read']       = 'Du besitzt nicht die notwendigen Berechtigungen um die Datei anzuzeigen.';
 $lang['media_perm_upload']     = 'Du besitzt nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index a78d3ac90..a0bc6aff7 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -325,16 +325,16 @@ $lang['media_edittab']         = 'Éditer';
 $lang['media_historytab']      = 'Historique';
 $lang['media_list_thumbs']     = 'Aperçus';
 $lang['media_list_rows']       = 'Lignes';
-$lang['media_sort_name']       = '<span>Tri par</span> nom';
-$lang['media_sort_date']       = '<span>Tri par</span> date';
+$lang['media_sort_name']       = 'Tri par nom';
+$lang['media_sort_date']       = 'Tri par date';
 $lang['media_namespaces']      = 'Choisissez un espace de nom';
 $lang['media_files']           = 'Fichiers présents dans';
 $lang['media_upload']          = 'Télécharger dans la catégorie <strong>%s</strong>.';
 $lang['media_search']          = 'Chercher dans la catégorie <strong>%s</strong>.';
-$lang['media_view']            = '<span class="%s">%s</span>';
+$lang['media_view']            = '%s';
 $lang['media_viewold']         = '%s dans %s';
-$lang['media_edit']            = 'Éditer <span class="%s">%s</span>';
-$lang['media_history']         = 'Historique du <span class="%s">%s</span>';
+$lang['media_edit']            = 'Éditer %s';
+$lang['media_history']         = 'Historique du %s';
 $lang['media_meta_edited']     = 'métadonnées éditées';
 $lang['media_perm_read']       = 'Désolé, vous n\'avez pas les droits pour lire les fichiers.';
 $lang['media_perm_upload']     = 'Désolé, vous n\'avez pas les droits pour télécharger des fichiers.';
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 78688ce5f..3c3a8d9da 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -309,13 +309,13 @@ $lang['media_viewtab']    = 'Ver';
 $lang['media_edittab']    = 'Editar';
 $lang['media_historytab'] = 'Histórico';
 $lang['media_sort']       = 'Ordenar';
-$lang['media_sort_name']  = '<span>Ordenar por</span> nome';
-$lang['media_sort_date']  = '<span>Ordenar por</span> data';
+$lang['media_sort_name']  = 'Ordenar por nome';
+$lang['media_sort_date']  = 'Ordenar por data';
 $lang['media_upload']     = 'Enviar para o grupo <strong>%s</strong>.';
 $lang['media_search']     = 'Procurar no grupo <strong>%s</strong>.';
-$lang['media_view']       = '<span class="%s">%s</span>';
-$lang['media_edit']       = 'Editar <span class="%s">%s</span>';
-$lang['media_history']    = 'Histórico do <span class="%s">%s</span>';
+$lang['media_view']       = '%s';
+$lang['media_edit']       = 'Editar %s';
+$lang['media_history']    = 'Histórico do %s';
 $lang['media_meta_edited']= 'metadata editada';
 $lang['media_perm_read']  = 'Perdão, não tem permissão para ler ficheiros.';
 $lang['media_perm_upload']= 'Perdão, não tem permissão para enviar ficheiros.';
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 44d1027c0..eda838451 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -347,12 +347,12 @@ $lang['media_searchtab']       = 'Поиск';
 $lang['media_viewtab']         = 'Просмотр';
 $lang['media_edittab']         = 'Правка';
 $lang['media_historytab']      = 'История';
-$lang['media_sort_name']       = '<span>Сортировка по</span> имени';
-$lang['media_sort_date']       = '<span>Сортировка по</span> дате';
+$lang['media_sort_name']       = 'Сортировка по имени';
+$lang['media_sort_date']       = 'Сортировка по дате';
 $lang['media_upload']          = 'Загрузка в пространство имён <strong>%s</strong>.';
 $lang['media_search']          = 'Поиск в пространстве имён <strong>%s</strong>.';
-$lang['media_view']            = '<span class="%s">%s</span>';
-$lang['media_edit']            = 'Правка <span class="%s">%s</span>';
+$lang['media_view']            = '%s';
+$lang['media_edit']            = 'Правка %s';
 $lang['media_meta_edited']     = 'метаданные изменены';
 $lang['media_perm_read']       = 'Извините, у Вас недостаточно прав для чтения файлов.';
 $lang['media_perm_upload']     = 'Извините, у Вас недостаточно прав для загрузки файлов.';
-- 
cgit v1.2.3


From 3629bc8cec45352566fcad4764203908c2b22528 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sun, 30 Oct 2011 10:50:40 +0100
Subject: MediaManager: Check DOKU_PREF cookie value for validness

---
 inc/media.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index 7da1f0899..dab0bcef2 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -698,7 +698,11 @@ function _media_get_display_param($param, $values) {
         // FIXME: Set cookie
         return $_REQUEST[$param];
     } else {
-        return get_doku_pref($param, $values['default']);
+        $val = get_doku_pref($param, $values['default']);
+        if (!in_array($val, $values)) {
+            $val = $values['default'];
+        }
+        return $val;
     }
 }
 
-- 
cgit v1.2.3


From d5a9514cb7286254b1dcf65ba764234e199b8b7f Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sun, 30 Oct 2011 11:15:13 +0100
Subject: Remove references to (un)?subscribens.

---
 inc/actions.php               | 4 ++--
 inc/lang/az/lang.php          | 2 --
 inc/lang/ca-valencia/lang.php | 2 --
 inc/lang/ca/lang.php          | 2 --
 inc/lang/is/lang.php          | 2 --
 inc/lang/lt/lang.php          | 2 --
 inc/lang/mr/lang.php          | 2 --
 inc/lang/ne/lang.php          | 2 --
 inc/lang/th/lang.php          | 2 --
 inc/template.php              | 4 ----
 10 files changed, 2 insertions(+), 22 deletions(-)

(limited to 'inc')

diff --git a/inc/actions.php b/inc/actions.php
index ddfafc554..4a2e200ae 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -215,7 +215,7 @@ function act_clean($act){
     //disable all acl related commands if ACL is disabled
     if(!$conf['useacl'] && in_array($act,array('login','logout','register','admin',
                     'subscribe','unsubscribe','profile','revert',
-                    'resendpwd','subscribens','unsubscribens',))){
+                    'resendpwd'))){
         msg('Command unavailable: '.htmlspecialchars($act),-1);
         return 'show';
     }
@@ -227,7 +227,7 @@ function act_clean($act){
                     'preview','search','show','check','index','revisions',
                     'diff','recent','backlink','admin','subscribe','revert',
                     'unsubscribe','profile','resendpwd','recover',
-                    'draftdel','subscribens','unsubscribens','sitemap','media')) && substr($act,0,7) != 'export_' ) {
+                    'draftdel','sitemap','media')) && substr($act,0,7) != 'export_' ) {
         msg('Command unknown: '.htmlspecialchars($act),-1);
         return 'show';
     }
diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php
index 14ce18c2a..13ba7b3c3 100644
--- a/inc/lang/az/lang.php
+++ b/inc/lang/az/lang.php
@@ -38,8 +38,6 @@ $lang['btn_backlink']          = 'Bura olan link-lər';
 $lang['btn_backtomedia']       = 'media-fayl seçiminə qayıt';
 $lang['btn_subscribe']         = 'Abunə ol (bütün dəyişiklər)';
 $lang['btn_unsubscribe']       = 'Abunəlikdən çıx (bütün dəyişiklər)';
-$lang['btn_subscribens']       = 'Abunə ol (bu bölümün dəyişikləri)';
-$lang['btn_unsubscribens']     = 'Abunəlikdən çıx (bu bölümün dəyişikləri)';
 $lang['btn_profile']           = 'Profil';
 $lang['btn_reset']             = 'Boşalt';
 $lang['btn_resendpwd']         = 'Yeni şifrəni göndər';
diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php
index 4fc4dfa50..eac9fc8d1 100644
--- a/inc/lang/ca-valencia/lang.php
+++ b/inc/lang/ca-valencia/lang.php
@@ -39,8 +39,6 @@ $lang['btn_backlink']          = 'Vínculs remitents';
 $lang['btn_backtomedia']       = 'Tornar a la selecció d\'archius de mijos';
 $lang['btn_subscribe']         = 'Subscriure\'s a la pàgina';
 $lang['btn_unsubscribe']       = 'Desubscriure\'s de la pàgina';
-$lang['btn_subscribens']       = 'Subscriure\'s a l\'espai de noms';
-$lang['btn_unsubscribens']     = 'Desubscriure\'s de l\'espai de noms';
 $lang['btn_profile']           = 'Actualisar perfil';
 $lang['btn_reset']             = 'Reiniciar';
 $lang['btn_resendpwd']         = 'Enviar contrasenya nova';
diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php
index 41ee389d8..7094df5b4 100644
--- a/inc/lang/ca/lang.php
+++ b/inc/lang/ca/lang.php
@@ -39,8 +39,6 @@ $lang['btn_backlink']          = 'Què hi enllaça';
 $lang['btn_backtomedia']       = 'Torna a la selecció de fitxers';
 $lang['btn_subscribe']         = 'Subscripció a canvis d\'aquesta pàgina';
 $lang['btn_unsubscribe']       = 'Cancel·la subscripció a pàgina';
-$lang['btn_subscribens']       = 'Subscripció a canvis d\'aquest espai';
-$lang['btn_unsubscribens']     = 'Cancel·la subscripció a espai';
 $lang['btn_profile']           = 'Actualització del perfil';
 $lang['btn_reset']             = 'Reinicia';
 $lang['btn_resendpwd']         = 'Envia nova contrasenya';
diff --git a/inc/lang/is/lang.php b/inc/lang/is/lang.php
index 7388e6908..0e281e58d 100644
--- a/inc/lang/is/lang.php
+++ b/inc/lang/is/lang.php
@@ -45,8 +45,6 @@ $lang['btn_backlink']          = 'Hvað tengist hingað';
 $lang['btn_backtomedia']       = 'Aftur til miðlaskrá';
 $lang['btn_subscribe']         = 'Vakta';
 $lang['btn_unsubscribe']       = 'Afvakta';
-$lang['btn_subscribens']       = 'Vakta breytingar á nafnrými';
-$lang['btn_unsubscribens']     = 'Afvakta breytingar á nafnrými';
 $lang['btn_profile']           = 'Uppfæra notanda';
 $lang['btn_reset']             = 'Endurstilla';
 $lang['btn_resendpwd']         = 'Senda nýtt aðgangsorð með tölvupósti';
diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php
index b42035026..d14a0695a 100644
--- a/inc/lang/lt/lang.php
+++ b/inc/lang/lt/lang.php
@@ -41,8 +41,6 @@ $lang['btn_backlink']          = 'Atgalinės nuorodos';
 $lang['btn_backtomedia']       = 'Atgal į Mediabylos išsirinkimą';
 $lang['btn_subscribe']         = 'Užsisakyti keitimų prenumeratą';
 $lang['btn_unsubscribe']       = 'Atsisakyti keitimų prenumeratos';
-$lang['btn_subscribens']       = 'Užsakyti vardų srities prenumeratą';
-$lang['btn_unsubscribens']     = 'Atsisakyti vardų srities prenumeratos';
 $lang['btn_profile']           = 'Atnaujinti profilį';
 $lang['btn_reset']             = 'Atstata';
 $lang['btn_resendpwd']         = 'Išsiųsti naują slaptažodį';
diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php
index 02bda19d6..63fda3e5a 100644
--- a/inc/lang/mr/lang.php
+++ b/inc/lang/mr/lang.php
@@ -45,8 +45,6 @@ $lang['btn_backlink']          = 'येथे काय जोडले आह
 $lang['btn_backtomedia']       = 'परत माध्यम फाइल निवडीकड़े';
 $lang['btn_subscribe']         = 'पृष्ठाच्या बदलांची पुरवणी (फीड) लावा ';
 $lang['btn_unsubscribe']       = 'पृष्ठाच्या बदलांची पुरवणी (फीड) बंद करा';
-$lang['btn_subscribens']       = 'नामसमुहाच्या (नेमस्पेस) बदलांची पुरवणी (फीड) लावा';
-$lang['btn_unsubscribens']     = 'नामसमुहाच्या (नेमस्पेस) बदलांची पुरवणी (फीड) बंद करा';
 $lang['btn_profile']           = 'प्रोफाइल अद्ययावत करा';
 $lang['btn_reset']             = 'रिसेट';
 $lang['btn_resendpwd']         = 'कृपया परवलीचा नवीन शब्द माझ्या इमेल पत्त्यावर पाठविणे.';
diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php
index 5d572ccd9..97e2dde5c 100644
--- a/inc/lang/ne/lang.php
+++ b/inc/lang/ne/lang.php
@@ -38,8 +38,6 @@ $lang['btn_backlink']          = 'पछाडिका लिङ्कहरु
 $lang['btn_backtomedia']       = 'मिडिया छनौटमा फर्कनुहोस्';
 $lang['btn_subscribe']         = 'पृष्ठ परिवर्तन ग्राह्य गर्नुहोस्';
 $lang['btn_unsubscribe']       = 'पृष्ठ परिवर्तन अग्राह्य गर्नुहोस्';
-$lang['btn_subscribens']       = 'नेमस्पेस परिवर्तन ग्राह्य गर्नुहोस् ';
-$lang['btn_unsubscribens']     = 'नेमस्पेस परिवर्तन अग्राह्य गर्नुहोस् ';
 $lang['btn_profile']           = 'प्रोफाइल अध्यावधिक गर्नुहोस् ';
 $lang['btn_reset']             = 'पूर्वरुपमा फर्काउनुहोस';
 $lang['btn_resendpwd']         = 'नयाँ प्रवेश शव्द(पासवर्ड) पठाउनुहोस् ';
diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php
index c447bf61c..0d0613961 100644
--- a/inc/lang/th/lang.php
+++ b/inc/lang/th/lang.php
@@ -46,8 +46,6 @@ $lang['btn_backlink']          = 'หน้าที่ลิงก์มา';
 $lang['btn_backtomedia']       = 'กลับไปยังหน้าเลือกไฟล์สื่อ';
 $lang['btn_subscribe']         = 'เฝ้าดู';
 $lang['btn_unsubscribe']       = 'เลิกเฝ้าดู';
-$lang['btn_subscribens']       = 'สมัครเพื่อตามการเปลี่ยนแปลงเนมสเปซ';
-$lang['btn_unsubscribens']     = 'ยกเลิกสมัครเพื่อตามการเปลี่ยนแปลงเนมสเปซ';
 $lang['btn_profile']           = 'แก้ข้อมูลผู้ใช้';
 $lang['btn_reset']             = 'เริ่มใหม่';
 $lang['btn_resendpwd']         = 'ลืมรหัส ส่งให้ใหม่ทางอีเมล';
diff --git a/inc/template.php b/inc/template.php
index f98385adb..c70e407d6 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -631,10 +631,6 @@ function tpl_get_action($type) {
                 return false;
             }
             break;
-        case 'subscribens':
-            // Superseded by subscribe/subscription
-            return '';
-            break;
         case 'media':
             break;
         default:
-- 
cgit v1.2.3


From 222298bcee7f8e8fd98bb6fc1bcfb821ac1e55cd Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Mon, 31 Oct 2011 15:27:45 +0100
Subject: Do not send empty changes to the AD backend

This fixes password changing operations: password change and user
modification are two different operations on the AD backend - the user
modification should not be done on password only changes.
---
 inc/auth/ad.class.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'inc')

diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php
index 9ffd3e18b..1fddad243 100644
--- a/inc/auth/ad.class.php
+++ b/inc/auth/ad.class.php
@@ -286,11 +286,13 @@ class auth_ad extends auth_basic {
         if(isset($changes['mail'])){
             $adchanges['email'] = $changes['mail'];
         }
-        try {
-            $return = $return & $this->adldap->user_modify($user,$adchanges);
-        } catch (adLDAPException $e) {
-            if ($this->cnf['debug']) msg('AD Auth: '.$e->getMessage(), -1);
-            $return = false;
+        if(count($adchanges)){
+            try {
+                $return = $return & $this->adldap->user_modify($user,$adchanges);
+            } catch (adLDAPException $e) {
+                if ($this->cnf['debug']) msg('AD Auth: '.$e->getMessage(), -1);
+                $return = false;
+            }
         }
 
         return $return;
-- 
cgit v1.2.3


From 38b2bf3580c3c65ad5574bf64567622955f13c13 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 4 Nov 2011 19:37:32 +0000
Subject: fixed media list options in new mediamanager to work without
 JavaScript again (FS#2363)

---
 inc/media.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index dab0bcef2..9d3e90a54 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -647,7 +647,11 @@ function media_tabs_details($image, $selected_tab = ''){
 function media_tab_files_options(){
     global $lang, $NS;
     $form = new Doku_Form(array('class' => 'options', 'method' => 'get',
-                                'action' => media_managerURL(array(), '&')));
+                                'action' => wl($ID)));
+    $media_manager_params = media_managerURL(array(), '', false, true);
+    foreach($media_manager_params as $pKey => $pVal){
+        $form->addHidden($pKey, $pVal);
+    }
     $form->addHidden('sectok', null);
     if (isset($_REQUEST['q'])) {
         $form->addHidden('q', $_REQUEST['q']);
-- 
cgit v1.2.3


From 4c7ecf15c97359074e7c343564ce4ba00c50cc80 Mon Sep 17 00:00:00 2001
From: Guy Brand <gb@unistra.fr>
Date: Sat, 5 Nov 2011 21:53:56 +0100
Subject: Verify conf/ directory is writable in the do=check action

---
 inc/infoutils.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'inc')

diff --git a/inc/infoutils.php b/inc/infoutils.php
index f1deec66b..2506275ae 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -175,6 +175,12 @@ function check(){
         msg('Lockdir is not writable',-1);
     }
 
+    if(is_writable(DOKU_CONF)){
+        msg('conf directory is writable',1);
+    }else{
+        msg('conf directory is not writable',-1);
+    }
+
     if($conf['authtype'] == 'plain'){
         global $config_cascade;
         if(is_writable($config_cascade['plainauth.users']['default'])){
-- 
cgit v1.2.3


From 8707b67124d73a0df1b88c2f0da037aa0fa5ba16 Mon Sep 17 00:00:00 2001
From: Guy Brand <gb@unistra.fr>
Date: Sat, 5 Nov 2011 22:07:39 +0100
Subject: French strings minor fix and obsolete email address update

---
 inc/lang/fr/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index a0bc6aff7..60b86b346 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -7,7 +7,7 @@
  * @author Antoine Fixary <antoine.fixary@freesbee.fr>
  * @author cumulus <pta-n56@myamail.com>
  * @author Gwenn Gueguen <contact@demisel.net>
- * @author Guy Brand <gb@isis.u-strasbg.fr>
+ * @author Guy Brand <gb@unistra.fr>
  * @author Fabien Chabreuil <fabien@integralpersonality.com>
  * @author Stéphane Chamberland <stephane.chamberland@ec.gc.ca>
  * @author Delassaux Julien <julien@delassaux.fr>
@@ -141,7 +141,7 @@ $lang['js']['linkwiz']         = 'Assistant Lien';
 $lang['js']['linkto']          = 'Lien vers :';
 $lang['js']['del_confirm']     = 'Effacer cette entrée ?';
 $lang['js']['mu_btn']          = 'Envoyer plusieurs fichiers en même temps';
-$lang['js']['restore_confirm'] = 'Voulez vous vraiment restaurer cette version?';
+$lang['js']['restore_confirm'] = 'Voulez vous vraiment restaurer cette version ?';
 $lang['js']['media_diff']      = 'Voir les différences:';
 $lang['js']['media_diff_both'] = 'Côte à côte';
 $lang['js']['media_diff_opacity'] = 'Calque';
-- 
cgit v1.2.3


From 2fb7abe3dee7d302d006ae5c112c98123914279d Mon Sep 17 00:00:00 2001
From: Piyush Mishra <me@piyushmishra.com>
Date: Sun, 6 Nov 2011 19:32:01 +0530
Subject: renamed plugins.protected.php to plugins.required.php and added it
 cascade to allow overwriting as a local protected file

---
 inc/config_cascade.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/config_cascade.php b/inc/config_cascade.php
index c01778e99..443114f52 100644
--- a/inc/config_cascade.php
+++ b/inc/config_cascade.php
@@ -67,7 +67,10 @@ $config_cascade = array_merge(
         
         'plugins' => array(
             'local'     => array(DOKU_CONF.'plugins.local.php'),
-            'protected' => array(DOKU_CONF.'plugins.protected.php'),
+            'protected' => array(
+                DOKU_CONF.'plugins.required.php',
+                DOKU_CONF.'plugins.protected.php',
+                ),
             ),
         ),
         $config_cascade
-- 
cgit v1.2.3


From 8d3d75690639f442359661cdbbd91ebcd9e0371a Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 8 Nov 2011 23:06:59 +0000
Subject: use DOKU_SCRIPT instead of stray doku.php in checkUpdateMessages()
 (FS#2364)

---
 inc/infoutils.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/infoutils.php b/inc/infoutils.php
index 2506275ae..2b8486906 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -24,7 +24,7 @@ function checkUpdateMessages(){
     $lm = @filemtime($cf);
 
     // check if new messages needs to be fetched
-    if($lm < time()-(60*60*24) || $lm < @filemtime(DOKU_INC.'doku.php')){
+    if($lm < time()-(60*60*24) || $lm < @filemtime(DOKU_INC.DOKU_SCRIPT)){
         $http = new DokuHTTPClient();
         $http->timeout = 8;
         $data = $http->get(DOKU_MESSAGEURL.$updateVersion);
-- 
cgit v1.2.3