MaxgComp TAR

' . $lang['subscr_m_current_header'] . '

'.hsc(prettyprint_id($sub['target'])).'

'.prettyprint_id($ID).'

'.prettyprint_id($ns).'

Date: Fri, 17 Sep 2010 08:16:24 +0200 Subject: fixed request server port issue in httpclient --- inc/HTTPClient.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc') diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php index b6feba35a..71b6326ef 100644 --- a/inc/HTTPClient.php +++ b/inc/HTTPClient.php @@ -244,6 +244,7 @@ class HTTPClient { // prepare headers $headers = $this->headers; $headers['Host'] = $uri['host']; + if($uri['port']) $headers['Host'].= ':'.$uri['port']; $headers['User-Agent'] = $this->agent; $headers['Referer'] = $this->referer; $headers['Connection'] = 'Close'; -- cgit v1.2.3 From a8be6a4f518e49271e6b35fe7c58901fba2b8d33 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 17 Sep 2010 22:24:21 +0200 Subject: fixed indention --- inc/template.php | 136 +++++++++++++++++++++++++++---------------------------- 1 file changed, 68 insertions(+), 68 deletions(-) (limited to 'inc') diff --git a/inc/template.php b/inc/template.php index 595c5fc03..3d1135479 100644 --- a/inc/template.php +++ b/inc/template.php @@ -793,75 +793,75 @@ function tpl_userinfo(){ global $INFO; if(isset($_SERVER['REMOTE_USER'])){ print $lang['loggedinas'].': '.$INFO['userinfo']['name'].' ('.$_SERVER['REMOTE_USER'].')'; - return true; - } - return false; - } + return true; + } + return false; +} - /** - * Print some info about the current page - * - * @author Andreas Gohr - */ - function tpl_pageinfo($ret=false){ - global $conf; - global $lang; - global $INFO; - global $ID; - - // return if we are not allowed to view the page - if (!auth_quickaclcheck($ID)) { return false; } - - // prepare date and path - $fn = $INFO['filepath']; - if(!$conf['fullpath']){ - if($INFO['rev']){ - $fn = str_replace(fullpath($conf['olddir']).'/','',$fn); - }else{ - $fn = str_replace(fullpath($conf['datadir']).'/','',$fn); - } - } - $fn = utf8_decodeFN($fn); - $date = dformat($INFO['lastmod']); - - // print it - if($INFO['exists']){ - $out = ''; - $out .= $fn; - $out .= ' · '; - $out .= $lang['lastmod']; - $out .= ': '; - $out .= $date; - if($INFO['editor']){ - $out .= ' '.$lang['by'].' '; - $out .= editorinfo($INFO['editor']); - }else{ - $out .= ' ('.$lang['external_edit'].')'; - } - if($INFO['locked']){ - $out .= ' · '; - $out .= $lang['lockedby']; - $out .= ': '; - $out .= editorinfo($INFO['locked']); - } - if($ret){ - return $out; - }else{ - echo $out; - return true; - } - } - return false; - } - - /** - * Prints or returns the name of the given page (current one if none given). - * - * If useheading is enabled this will use the first headline else - * the given ID is used. - * - * @author Andreas Gohr - */ +/** + * Print some info about the current page + * + * @author Andreas Gohr + */ +function tpl_pageinfo($ret=false){ + global $conf; + global $lang; + global $INFO; + global $ID; + + // return if we are not allowed to view the page + if (!auth_quickaclcheck($ID)) { return false; } + + // prepare date and path + $fn = $INFO['filepath']; + if(!$conf['fullpath']){ + if($INFO['rev']){ + $fn = str_replace(fullpath($conf['olddir']).'/','',$fn); + }else{ + $fn = str_replace(fullpath($conf['datadir']).'/','',$fn); + } + } + $fn = utf8_decodeFN($fn); + $date = dformat($INFO['lastmod']); + + // print it + if($INFO['exists']){ + $out = ''; + $out .= $fn; + $out .= ' · '; + $out .= $lang['lastmod']; + $out .= ': '; + $out .= $date; + if($INFO['editor']){ + $out .= ' '.$lang['by'].' '; + $out .= editorinfo($INFO['editor']); + }else{ + $out .= ' ('.$lang['external_edit'].')'; + } + if($INFO['locked']){ + $out .= ' · '; + $out .= $lang['lockedby']; + $out .= ': '; + $out .= editorinfo($INFO['locked']); + } + if($ret){ + return $out; + }else{ + echo $out; + return true; + } + } + return false; +} + +/** + * Prints or returns the name of the given page (current one if none given). + * + * If useheading is enabled this will use the first headline else + * the given ID is used. + * + * @author Andreas Gohr + */ function tpl_pagetitle($id=null, $ret=false){ global $conf; if(is_null($id)){ -- cgit v1.2.3 From 3cf900244031048d73d8dc9cc4ae32a9362dca59 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sat, 18 Sep 2010 13:00:44 +0200 Subject: Corrected contact email of Andreas Haerter --- 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 47e7ed61f..3d4de2289 100644 --- a/inc/utf8.php +++ b/inc/utf8.php @@ -23,7 +23,7 @@ if(!function_exists('utf8_isASCII')){ /** * Checks if a string contains 7bit ASCII only * - * @author Andreas Haerter + * @author Andreas Haerter */ function utf8_isASCII($str){ return (preg_match('/(?:[^\x00-\x7F])/', $str) !== 1); -- cgit v1.2.3 From 5bd930fff2b3cc98f360d3689dd4e00e0b5f92c4 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sat, 18 Sep 2010 17:31:45 +0200 Subject: Write the debug log only when debugging is enabled The debug log isn't automatically cleaned so don't write to it when debugging is disabled and thus nobody is aware that debug output might be generated. --- inc/infoutils.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'inc') diff --git a/inc/infoutils.php b/inc/infoutils.php index ac6a0a84c..d3c6f2918 100644 --- a/inc/infoutils.php +++ b/inc/infoutils.php @@ -304,6 +304,9 @@ function dbg($msg,$hidden=false){ */ function dbglog($msg,$header=''){ global $conf; + // The debug log isn't automatically cleaned thus only write it when + // debugging has been enabled by the user. + if($conf['allowdebug'] !== 1) return; if(is_object($msg) || is_array($msg)){ $msg = print_r($msg,true); } -- cgit v1.2.3 From f4daa9a18d9c09a1bac0696d92e2bceef8a6800f Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 18 Sep 2010 18:13:59 +0100 Subject: #1797 fix ptype stack to properly close and reopen

elements --- inc/parser/handler.php | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'inc') diff --git a/inc/parser/handler.php b/inc/parser/handler.php index 0b8b79254..acca3f5a1 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -1543,14 +1543,12 @@ class Doku_Handler_Block { // Process blocks which are stack like... (contain linefeeds) if ( in_array($cname,$this->stackOpen ) && (!$plugin || $plugin_open) ) { - $this->calls[] = $call; - // Hack - footnotes shouldn't immediately contain a p_open - if ( $cname != 'footnote_open' ) { - $this->addToStack(); - } else { - $this->addToStack(false); + if ($this->addToStack($cname != 'footnote_open')) { + $this->closeParagraph($call[2]); } + $this->calls[] = $call; + continue; } @@ -1560,7 +1558,9 @@ class Doku_Handler_Block { $this->closeParagraph($call[2]); } $this->calls[] = $call; - $this->removeFromStack(); + if ($this->removeFromStack()) { + $this->calls[] = array('p_open',array(), $call[2]); + } continue; } @@ -1676,16 +1676,25 @@ class Doku_Handler_Block { return $this->calls; } + /** + * + * @return bool true when a p_close() is required + */ function addToStack($newStart = true) { + $ret = $this->inParagraph; $this->blockStack[] = array($this->atStart, $this->inParagraph); $this->atStart = $newStart; $this->inParagraph = false; + + return $ret; } function removeFromStack() { $state = array_pop($this->blockStack); $this->atStart = $state[0]; $this->inParagraph = $state[1]; + + return $this->inParagraph; } function addCall($call) { -- cgit v1.2.3 From 17566ac6f3581704c5238c433234ecfb7b0d98f2 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Wed, 22 Sep 2010 12:21:55 +0200 Subject: Add tpl_getLang function --- inc/template.php | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/template.php b/inc/template.php index 3d1135479..f7c104cdb 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1017,7 +1017,7 @@ function tpl_indexerWebBug(){ */ function tpl_getConf($id){ global $conf; - global $tpl_configloaded; + static $tpl_configloaded = false; $tpl = $conf['template']; @@ -1053,6 +1053,29 @@ function tpl_loadConfig(){ return $conf; } +// language methods +/** + * tpl_getLang($id) + * + * use this function to access template language variables + */ +function tpl_getLang($id){ + static $lang = array(); + + if (count($lang) === 0){ + $path = DOKU_TPLINC.'lang/'; + + $lang = array(); + + global $conf; // definitely don't invoke "global $lang" + // don't include once + @include($path.'en/lang.php'); + if ($conf['lang'] != 'en') @include($path.$conf['lang'].'/lang.php'); + } + + return $lang[$id]; +} + /** * prints the "main content" in the mediamanger popup * -- cgit v1.2.3 From 42de51b18d302d07e109c24dfb0ae237e6d38643 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Wed, 22 Sep 2010 16:29:25 +0200 Subject: Work around WebKit bug: newlines at the end of input values are removed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In WebKit, newlines at the end of input field’s value parameters are removed. This breaks $PRE, so we protect those new lines with a dot and later remove the dot. --- 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 0bf5842ef..add559971 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1177,7 +1177,7 @@ function html_edit(){ $form->addHidden('id', $ID); $form->addHidden('rev', $REV); $form->addHidden('date', $DATE); - $form->addHidden('prefix', $PRE); + $form->addHidden('prefix', $PRE . '.'); $form->addHidden('suffix', $SUF); $form->addHidden('changecheck', $check); -- cgit v1.2.3 From bcd87c4e637d50230c7c53537dfd6c6b87b2f664 Mon Sep 17 00:00:00 2001 From: Einar Petersen Date: Thu, 23 Sep 2010 08:44:09 +0200 Subject: Faroese language update --- inc/lang/fo/lang.php | 335 +++++++++++++++++++++--------------------- inc/lang/fo/subscr_digest.txt | 20 +++ 2 files changed, 188 insertions(+), 167 deletions(-) create mode 100644 inc/lang/fo/subscr_digest.txt (limited to 'inc') diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php index 74d7fff58..2bc5c3d53 100644 --- a/inc/lang/fo/lang.php +++ b/inc/lang/fo/lang.php @@ -3,171 +3,172 @@ * faroese language file * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * @author Poul J. Clementsen + * @author Poul J. Clementsen + * @author Einar Petersen einar.petersen@gmail.com */ -$lang['encoding'] = 'utf-8'; -$lang['direction'] = 'ltr'; - -$lang['btn_edit'] = 'Rætta hetta skjal'; -$lang['btn_source'] = 'Vís keldu'; -$lang['btn_show'] = 'Vís skjal'; -$lang['btn_create'] = 'Býrja uppá hetta skjal'; -$lang['btn_search'] = 'Leita'; -$lang['btn_save'] = 'Goym'; -$lang['btn_preview']= 'Forskoðan'; -$lang['btn_top'] = 'Aftur til toppin'; -$lang['btn_newer'] = '<< undan síða'; -$lang['btn_older'] = 'næsta síðe >>'; -$lang['btn_revs'] = 'Gamlar útgávur'; -$lang['btn_recent'] = 'Nýggj broyting'; -$lang['btn_upload'] = 'Legg fílu upp'; -$lang['btn_cancel'] = 'Angra'; -$lang['btn_index'] = 'Evnisyvirlit'; -$lang['btn_secedit']= 'Rætta'; -$lang['btn_login'] = 'Rita inn'; -$lang['btn_logout'] = 'Rita út'; -$lang['btn_admin'] = 'Admin'; -$lang['btn_update'] = 'Dagfør'; -$lang['btn_delete'] = 'Strika'; -$lang['btn_back'] = 'Aftur'; -$lang['btn_backlink'] = "Ávísingar afturúr"; -$lang['btn_backtomedia'] = 'Aftur til val av miðlafílu'; -$lang['btn_subscribe'] = 'Tilmelda broytingar'; -$lang['btn_unsubscribe'] = 'Strika tilmelding av broytingum'; -$lang['btn_profile'] = 'Dagføra vangamynd'; -$lang['btn_reset'] = 'Nullstilla'; -$lang['btn_resendpwd'] = 'Send nýtt loyniorð'; - -$lang['loggedinas'] = 'Ritavur inn sum'; -$lang['user'] = 'Brúkaranavn'; -$lang['pass'] = 'Loyniorð'; -$lang['newpass'] = 'Nýtt loyniorð'; -$lang['oldpass'] = 'Vátta gamalt loyniorð'; -$lang['passchk'] = 'Endurtak nýtt loyniorð'; -$lang['remember'] = 'Minst til loyniorðið hjá mær'; -$lang['fullname'] = 'Navn'; -$lang['email'] = 'T-postur'; -$lang['register'] = 'Melda til'; -$lang['profile'] = 'Brúkara vangamynd'; -$lang['badlogin'] = 'Skeivt brúkaranavn ella loyniorð.'; -$lang['minoredit'] = 'Smærri broytingar'; - -$lang['regmissing'] = 'Tú skalt fylla út øll øki.'; -$lang['reguexists'] = 'Hetta brúkaranavn er upptiki.'; -$lang['regsuccess'] = 'Tú ert nú stovnavur sum brúkari. Títt loyniorð verður sent til tín í einum T-posti.'; -$lang['regsuccess2']= 'Tú ert nú stovnavur sum brúkari.'; -$lang['regmailfail']= 'Títt loyniorð bleiv ikki sent. Fá vinarliga samband við administratorin.'; -$lang['regbadmail'] = 'T-post adressan er ógildig. Fá vinarliga samband við administratorin, um tú heldur at hetta er eitt brek.'; -$lang['regbadpass'] = 'Bæði loyniorðini eru ikki eins, royn vinarliga umaftur.'; -$lang['regpwmail'] = 'Títt DokuWiki loyniorð'; -$lang['reghere'] = 'Upprætta eina DokuWiki-konto her'; - -$lang['profna'] = 'Tað er ikki møguligt at broyta tína vangamynd í hesu wiki'; -$lang['profnochange'] = 'Ongar broytingar, onki tillaga.'; -$lang['profnoempty'] = 'Tómt navn ella t-post adressa er ikki loyvt.'; -$lang['profchanged'] = 'Brúkara vangamynd dagført rætt.'; - -$lang['pwdforget'] = 'Gloymt títt loyniorð? Fá eitt nýtt'; -$lang['resendna'] = 'Tað er ikki møguligt at fá sent nýtt loyniorð við hesu wiki.'; -$lang['resendpwd'] = 'Send nýtt loyniorð til'; -$lang['resendpwdmissing'] = 'Tú skal filla út øll økir.'; -$lang['resendpwdnouser'] = 'Vit kunna ikki finna hendan brúkara í okkara dátagrunni.'; -$lang['resendpwdsuccess'] = 'Títt nýggja loyniorð er sent við t-posti.'; - -$lang['txt_upload'] = 'Vel tí fílu sum skal leggjast upp'; -$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 á '.$lang['btn_preview'].'-knappin fyri at sleppa undan trupulleikum.'; - -$lang['js']['notsavedyet'] = "Tað eru gjørdar broytingar í skjalinum, um tú haldur fram vilja broytingar fara fyri skeytið.\nYnskir tú at halda fram?"; -$lang['rssfailed'] = 'Eitt brek koma fyri tá roynt var at fáa: '; -$lang['nothingfound']= 'Leiting gav onki úrslit.'; - -$lang['mediaselect'] = 'Vel miðlafílu'; -$lang['fileupload'] = 'Legg miðla fílu upp'; -$lang['uploadsucc'] = 'Upp legg av fílu var væl eydna'; -$lang['uploadfail'] = 'Brek við upp legg av fílu. Tað er møguliga trupuleikar við rættindunum'; -$lang['uploadwrong'] = 'Upp legg av fílu víst burtur. Fíluslag er ikki loyvt'; -$lang['uploadexist'] = 'Fílan er longu til.'; -$lang['deletesucc'] = 'Fílan "%s" er nú strika.'; -$lang['deletefail'] = '"%s" kundi ikki strikast - kanna rættindini.'; -$lang['mediainuse'] = 'Fíla "%s" er ikki strika - hen verður enn nýtt.'; -$lang['namespaces'] = 'Navnarúm'; -$lang['mediafiles'] = 'Atkomandi fílur í'; - -$lang['reference'] = 'Ávísing til'; -$lang['ref_inuse'] = 'Fílan kan ikki strikast, síðan hon enn verður nýtt á fylgjandi síðum:'; -$lang['ref_hidden'] = 'Nakrar ávísingar eru í skjølum sum tú ikki hevur lesi rættindi til'; - -$lang['hits'] = 'Hits'; -$lang['quickhits'] = 'Samsvarandi skjøl'; -$lang['toc'] = 'Innihaldsyvirlit'; -$lang['current'] = 'núverandi'; -$lang['yours'] = 'Tín útgáva'; -$lang['diff'] = 'vís broytingar í mun til núverandi útgávu'; -$lang['line'] = 'Linja'; -$lang['breadcrumb'] = 'Leið'; -$lang['youarehere'] = 'Tú ert her'; -$lang['lastmod'] = 'Seinast broytt'; -$lang['by'] = 'av'; -$lang['deleted'] = 'strika'; -$lang['created'] = 'stovna'; -$lang['restored'] = 'gomul útgáva endurstovna'; -$lang['summary'] = 'Samandráttur'; - -$lang['mail_newpage'] = 'skjal skoyta uppí:'; -$lang['mail_changed'] = 'skjal broytt:'; - -$lang['js']['nosmblinks'] = "Ávísingar til Windows shares virka bert í Microsoft Internet Explorer.\nTú kanst enn avrita og sata inn slóðina."; - -$lang['qb_bold'] = 'Feit'; -$lang['qb_italic'] = 'Skák'; -$lang['qb_underl'] = 'Undurstrika'; -$lang['qb_code'] = 'Skrivimaskinu tekstur'; -$lang['qb_strike'] = 'Gjøgnumstrika'; -$lang['qb_h1'] = 'Stig 1 yvirskrift'; -$lang['qb_h2'] = 'Stig 2 yvirskrift'; -$lang['qb_h3'] = 'Stig 3 yvirskrift'; -$lang['qb_h4'] = 'Stig 4 yvirskrift'; -$lang['qb_h5'] = 'Stig 5 yvirskrift'; -$lang['qb_link'] = 'Innanhýsis slóð'; -$lang['qb_extlink'] = 'Útvortis slóð'; -$lang['qb_hr'] = 'Vatnrætt linja'; -$lang['qb_ol'] = 'Talmerktur listi'; -$lang['qb_ul'] = 'Ótalmerktur listi'; -$lang['qb_media'] = 'Leggja myndir og aðrar fílur afturat'; -$lang['qb_sig'] = 'Set inn undirskrift'; -$lang['qb_smileys'] = 'Smileys'; -$lang['qb_chars'] = 'Sertekn'; - -$lang['js']['del_confirm']= 'Strika post(ar)?'; -$lang['admin_register']= 'Upprætta nýggjan brúkara'; - -$lang['metaedit'] = 'Rætta metadáta'; -$lang['metasaveerr'] = 'Brek við skriving av metadáta'; -$lang['metasaveok'] = 'Metadáta goymt'; -$lang['img_backto'] = 'Aftur til'; -$lang['img_title'] = 'Heitið'; -$lang['img_caption'] = 'Myndatekstur'; -$lang['img_date'] = 'Dato'; -$lang['img_fname'] = 'Fílunavn'; -$lang['img_fsize'] = 'Stødd'; -$lang['img_artist'] = 'Myndafólk'; -$lang['img_copyr'] = 'Upphavsrættur'; -$lang['img_format'] = 'Snið'; -$lang['img_camera'] = 'Fototól'; -$lang['img_keywords']= 'Evnisorð'; - -$lang['subscribe_success'] = 'Skoyt %s uppí tilmeldulistan fyri %s'; -$lang['subscribe_error'] = 'Brek við uppí skoyting av %s til tilmeldulistan fyri %s'; -$lang['subscribe_noaddress']= 'Ongin adressa er knýtt at tíni inn ritan, tú kanst ikki skoytast uppí tilmeldulistan'; -$lang['unsubscribe_success']= 'Strika %s frá tilmeldulistan fyri %s'; -$lang['unsubscribe_error'] = 'Brek við burturtøku av %s frá tilmeldulista fyri %s'; - -/* auth.class language support */ -$lang['authmodfailed'] = 'Brek við validering av brúkarasamansetingv. Fá samband við umboðsstjóran á hesi wiki.'; -$lang['authtempfail'] = 'Validering av brúkara virkar fyribils ikki. Um hetta er varandi, fá so samband við umboðsstjóran á hesi wiki.'; - -//Setup VIM: ex: et ts=2 enc=utf-8 : +$lang['encoding'] = 'utf-8'; +$lang['direction'] = 'ltr'; +$lang['doublequoteopening'] = 'Vanligt gásareygað byrjan'; +$lang['doublequoteclosing'] = 'Vanligt gásareygað endi'; +$lang['singlequoteopening'] = 'Einstakt gásareygað byrjan'; +$lang['singlequoteclosing'] = 'Einstakt gásareygað endi'; +$lang['apostrophe'] = 'Apostroff'; +$lang['btn_edit'] = 'Rætta hetta skjal'; +$lang['btn_source'] = 'Vís keldu'; +$lang['btn_show'] = 'Vís skjal'; +$lang['btn_create'] = 'Býrja uppá hetta skjal'; +$lang['btn_search'] = 'Leita'; +$lang['btn_save'] = 'Goym'; +$lang['btn_preview'] = 'Forskoðan'; +$lang['btn_top'] = 'Aftur til toppin'; +$lang['btn_newer'] = '<< undan síða'; +$lang['btn_older'] = 'næsta síðe >>'; +$lang['btn_revs'] = 'Gamlar útgávur'; +$lang['btn_recent'] = 'Nýggj broyting'; +$lang['btn_upload'] = 'Legg fílu upp'; +$lang['btn_cancel'] = 'Angra'; +$lang['btn_index'] = 'Evnisyvirlit'; +$lang['btn_secedit'] = 'Rætta'; +$lang['btn_login'] = 'Rita inn'; +$lang['btn_logout'] = 'Rita út'; +$lang['btn_admin'] = 'Admin'; +$lang['btn_update'] = 'Dagfør'; +$lang['btn_delete'] = 'Strika'; +$lang['btn_back'] = 'Aftur'; +$lang['btn_backlink'] = 'Ávísingar afturúr'; +$lang['btn_backtomedia'] = 'Aftur til val av miðlafílu'; +$lang['btn_subscribe'] = 'Tilmelda broytingar'; +$lang['btn_profile'] = 'Dagføra vangamynd'; +$lang['btn_reset'] = 'Nullstilla'; +$lang['btn_resendpwd'] = 'Send nýtt loyniorð'; +$lang['btn_draft'] = 'Broyt kladdu'; +$lang['btn_recover'] = 'Endurbygg kladdu'; +$lang['btn_draftdel'] = 'Sletta'; +$lang['btn_revert'] = 'Endurbygg'; +$lang['loggedinas'] = 'Ritavur inn sum'; +$lang['user'] = 'Brúkaranavn'; +$lang['pass'] = 'Loyniorð'; +$lang['newpass'] = 'Nýtt loyniorð'; +$lang['oldpass'] = 'Vátta núverandi loyniorð'; +$lang['passchk'] = 'Endurtak nýtt loyniorð'; +$lang['remember'] = 'Minst til loyniorðið hjá mær'; +$lang['fullname'] = 'Navn'; +$lang['email'] = 'T-postur'; +$lang['register'] = 'Melda til'; +$lang['profile'] = 'Brúkara vangamynd'; +$lang['badlogin'] = 'Skeivt brúkaranavn ella loyniorð.'; +$lang['minoredit'] = 'Smærri broytingar'; +$lang['draftdate'] = 'Goym kladdu sett frá'; +$lang['nosecedit'] = 'Hendan síðan var broytt undir tilevnan, brotið var ikki rætt dagfest, heintaði fulla síðu í staðin'; +$lang['regmissing'] = 'Tú skalt fylla út øll øki.'; +$lang['reguexists'] = 'Hetta brúkaranavn er upptiki.'; +$lang['regsuccess'] = 'Tú ert nú stovnavur sum brúkari. Títt loyniorð verður sent til tín í einum T-posti.'; +$lang['regsuccess2'] = 'Tú ert nú stovnavur sum brúkari.'; +$lang['regmailfail'] = 'Títt loyniorð bleiv ikki sent. Fá vinarliga samband við administratorin.'; +$lang['regbadmail'] = 'T-post adressan er ógildig. Fá vinarliga samband við administratorin, um tú heldur at hetta er eitt brek.'; +$lang['regbadpass'] = 'Bæði loyniorðini eru ikki eins, royn vinarliga umaftur.'; +$lang['regpwmail'] = 'Títt DokuWiki loyniorð'; +$lang['reghere'] = 'Upprætta eina DokuWiki-konto her'; +$lang['profna'] = 'Tað er ikki møguligt at broyta tína vangamynd í hesu wiki'; +$lang['profnochange'] = 'Ongar broytingar, onki tillaga.'; +$lang['profnoempty'] = 'Tómt navn ella t-post adressa er ikki loyvt.'; +$lang['profchanged'] = 'Brúkara vangamynd dagført rætt.'; +$lang['pwdforget'] = 'Gloymt títt loyniorð? Fá eitt nýtt'; +$lang['resendna'] = 'Tað er ikki møguligt at fá sent nýtt loyniorð við hesu wiki.'; +$lang['resendpwd'] = 'Send nýtt loyniorð til'; +$lang['resendpwdmissing'] = 'Tú skal filla út øll økir.'; +$lang['resendpwdnouser'] = 'Vit kunna ikki finna hendan brúkara í okkara dátagrunni.'; +$lang['resendpwdbadauth'] = 'Hald til góðar, hendan góðkenningar kodan er ikki gildug. Kanna eftir at tú nýtti tað fulfíggjaðu góðkenningarleinkjuna'; +$lang['resendpwdconfirm'] = 'Ein góðkenningarleinkja er send við e-posti'; +$lang['resendpwdsuccess'] = 'Títt nýggja loyniorð er sent við t-posti.'; +$lang['license'] = 'Um ikki annað er tilskilað, so er tilfar á hesari wiki loyvt margfaldað undir fylgjandi treytum:'; +$lang['licenseok'] = 'Legg til merkis: Við at dagføra hesa síðu samtykkir tú at loyva margfalding av tilfarinum undir fylgjandi treytum:'; +$lang['searchmedia'] = 'Leita eftir fíl navn:'; +$lang['searchmedia_in'] = 'Leita í %s'; +$lang['txt_upload'] = 'Vel tí fílu sum skal leggjast upp'; +$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']['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'; +$lang['js']['mediasize'] = 'Mynda stødd'; +$lang['js']['mediatarget'] = 'Leinkja til'; +$lang['js']['mediaclose'] = 'Læt aftur'; +$lang['js']['mediainsert'] = 'Set inn'; +$lang['js']['mediadisplayimg'] = 'Vís myndina'; +$lang['js']['mediadisplaylnk'] = 'Vís bert leinkjuna'; +$lang['js']['nosmblinks'] = 'Ávísingar til Windows shares virka bert í Microsoft Internet Explorer. +Tú kanst enn avrita og sata inn slóðina.'; +$lang['js']['del_confirm'] = 'Strika post(ar)?'; +$lang['rssfailed'] = 'Eitt brek koma fyri tá roynt var at fáa: '; +$lang['nothingfound'] = 'Leiting gav onki úrslit.'; +$lang['mediaselect'] = 'Vel miðlafílu'; +$lang['fileupload'] = 'Legg miðla fílu upp'; +$lang['uploadsucc'] = 'Upp legg av fílu var væl eydna'; +$lang['uploadfail'] = 'Brek við upp legg av fílu. Tað er møguliga trupuleikar við rættindunum'; +$lang['uploadwrong'] = 'Upp legg av fílu víst burtur. Fíluslag er ikki loyvt'; +$lang['uploadexist'] = 'Fílan er longu til.'; +$lang['deletesucc'] = 'Fílan "%s" er nú strika.'; +$lang['deletefail'] = '"%s" kundi ikki strikast - kanna rættindini.'; +$lang['mediainuse'] = 'Fíla "%s" er ikki strika - hen verður enn nýtt.'; +$lang['namespaces'] = 'Navnarúm'; +$lang['mediafiles'] = 'Atkomandi fílur í'; +$lang['reference'] = 'Ávísing til'; +$lang['ref_inuse'] = 'Fílan kan ikki strikast, síðan hon enn verður nýtt á fylgjandi síðum:'; +$lang['ref_hidden'] = 'Nakrar ávísingar eru í skjølum sum tú ikki hevur lesi rættindi til'; +$lang['hits'] = 'Hits'; +$lang['quickhits'] = 'Samsvarandi skjøl'; +$lang['toc'] = 'Innihaldsyvirlit'; +$lang['current'] = 'núverandi'; +$lang['yours'] = 'Tín útgáva'; +$lang['diff'] = 'vís broytingar í mun til núverandi útgávu'; +$lang['line'] = 'Linja'; +$lang['breadcrumb'] = 'Leið'; +$lang['youarehere'] = 'Tú ert her'; +$lang['lastmod'] = 'Seinast broytt'; +$lang['by'] = 'av'; +$lang['deleted'] = 'strika'; +$lang['created'] = 'stovna'; +$lang['restored'] = 'gomul útgáva endurstovna'; +$lang['summary'] = 'Samandráttur'; +$lang['mail_newpage'] = 'skjal skoyta uppí:'; +$lang['mail_changed'] = 'skjal broytt:'; +$lang['qb_bold'] = 'Feit'; +$lang['qb_italic'] = 'Skák'; +$lang['qb_underl'] = 'Undurstrika'; +$lang['qb_code'] = 'Skrivimaskinu tekstur'; +$lang['qb_strike'] = 'Gjøgnumstrika'; +$lang['qb_h1'] = 'Stig 1 yvirskrift'; +$lang['qb_h2'] = 'Stig 2 yvirskrift'; +$lang['qb_h3'] = 'Stig 3 yvirskrift'; +$lang['qb_h4'] = 'Stig 4 yvirskrift'; +$lang['qb_h5'] = 'Stig 5 yvirskrift'; +$lang['qb_link'] = 'Innanhýsis slóð'; +$lang['qb_extlink'] = 'Útvortis slóð'; +$lang['qb_hr'] = 'Vatnrætt linja'; +$lang['qb_ol'] = 'Talmerktur listi'; +$lang['qb_ul'] = 'Ótalmerktur listi'; +$lang['qb_media'] = 'Leggja myndir og aðrar fílur afturat'; +$lang['qb_sig'] = 'Set inn undirskrift'; +$lang['qb_smileys'] = 'Smileys'; +$lang['qb_chars'] = 'Sertekn'; +$lang['admin_register'] = 'Upprætta nýggjan brúkara'; +$lang['metaedit'] = 'Rætta metadáta'; +$lang['metasaveerr'] = 'Brek við skriving av metadáta'; +$lang['metasaveok'] = 'Metadáta goymt'; +$lang['img_backto'] = 'Aftur til'; +$lang['img_title'] = 'Heitið'; +$lang['img_caption'] = 'Myndatekstur'; +$lang['img_date'] = 'Dato'; +$lang['img_fname'] = 'Fílunavn'; +$lang['img_fsize'] = 'Stødd'; +$lang['img_artist'] = 'Myndafólk'; +$lang['img_copyr'] = 'Upphavsrættur'; +$lang['img_format'] = 'Snið'; +$lang['img_camera'] = 'Fototól'; +$lang['img_keywords'] = 'Evnisorð'; +$lang['authmodfailed'] = 'Brek við validering av brúkarasamansetingv. Fá samband við umboðsstjóran á hesi wiki.'; +$lang['authtempfail'] = 'Validering av brúkara virkar fyribils ikki. Um hetta er varandi, fá so samband við umboðsstjóran á hesi wiki.'; diff --git a/inc/lang/fo/subscr_digest.txt b/inc/lang/fo/subscr_digest.txt new file mode 100644 index 000000000..3d9f097ad --- /dev/null +++ b/inc/lang/fo/subscr_digest.txt @@ -0,0 +1,20 @@ +Halló! + +Síðan @PAGE@ í @TITLE@ wiki er broytt. +Her eru broytinganar: + +-------------------------------------------------------- +@DIFF@ +-------------------------------------------------------- + +Gamla skjalið: @OLDPAGE@ +Nýggja skjalið: @NEWPAGE@ + +Fyri at avmelda síðu kunngerðir, logga inn í wikiina á +@DOKUWIKIURL@ vitja so +@SUBSCRIBE@ +og avmelda hald á síðu og/ella navnaøkis broytingar. + +-- +This mail was generated by DokuWiki at +@DOKUWIKIURL@ \ No newline at end of file -- cgit v1.2.3 From d9bdb92cc1c1e77c2b43f1ca0dd4960fa122298e Mon Sep 17 00:00:00 2001 From: Martin Michalek Date: Thu, 23 Sep 2010 08:46:20 +0200 Subject: Slovak language update --- inc/lang/sk/lang.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'inc') diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php index b1783008b..c6d8ca438 100644 --- a/inc/lang/sk/lang.php +++ b/inc/lang/sk/lang.php @@ -142,6 +142,7 @@ $lang['deletefail'] = '"%s" nie je možné zmazať - skontrolujte opr $lang['mediainuse'] = 'Súbor "%s" nebol zmazaný - je stále používaný.'; $lang['namespaces'] = 'Menné priestory'; $lang['mediafiles'] = 'Dostupné súbory'; +$lang['accessdenied'] = 'Nemáte oprávnenie na zobrazenie požadovanej stránky.'; $lang['mediausage'] = 'Pre odkázanie na súbor použite nasledujúcu syntax:'; $lang['mediaview'] = 'Zobraziť pôvodný súbor'; $lang['mediaroot'] = 'root'; @@ -157,6 +158,7 @@ $lang['current'] = 'aktuálne'; $lang['yours'] = 'Vaša verzia'; $lang['diff'] = 'Zobraziť rozdiely voči aktuálnej verzii'; $lang['diff2'] = 'Zobraziť rozdiely medzi vybranými verziami'; +$lang['difflink'] = 'Odkaz na tento prehľad zmien'; $lang['line'] = 'Riadok'; $lang['breadcrumb'] = 'História'; $lang['youarehere'] = 'Nachádzate sa'; @@ -253,6 +255,7 @@ $lang['i_pol0'] = 'Otvorená Wiki (čítanie, zápis a nahrávani $lang['i_pol1'] = 'Verejná Wiki (čítanie pre každého, zápis a nahrávanie pre registrovaných užívateľov)'; $lang['i_pol2'] = 'Uzatvorená Wiki (čítanie, zápis a nahrávanie len pre registrovaných užívateľov)'; $lang['i_retry'] = 'Skúsiť znovu'; +$lang['i_license'] = 'Vyberte licenciu, pod ktorou chcete uložiť váš obsah:'; $lang['mu_intro'] = 'Na tomto mieste môžete nahrávať viac súborov súčasne. Tlačidlom Prehľadávať pridáte súbory do zoznamu. Tlačidlom Nahrať vykonáte prenos súborov.'; $lang['mu_gridname'] = 'Názov súboru'; $lang['mu_gridsize'] = 'Veľkosť'; -- cgit v1.2.3 From 07d7dfcf87238d920900ca468d9399d80d8b7247 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 24 Sep 2010 09:56:40 +0200 Subject: ignore wrong content-encoding header FS#2037 Some servers send a content-encoding for gzip files but do not encode the content themselves. This is IMHO wrong, this patch detects this and ignores the header. The request will return true but set a warning message in $this->error --- inc/HTTPClient.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'inc') diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php index 71b6326ef..eea01f9d5 100644 --- a/inc/HTTPClient.php +++ b/inc/HTTPClient.php @@ -459,6 +459,10 @@ class HTTPClient { $this->resp_headers['content-encoding'] == 'gzip' && strlen($r_body) > 10 && substr($r_body,0,3)=="\x1f\x8b\x08"){ $this->resp_body = @gzinflate(substr($r_body, 10)); + if($this->resp_body === false){ + $this->error = 'Failed to decompress gzip encoded content'; + $this->resp_body = $r_body; + } }else{ $this->resp_body = $r_body; } -- cgit v1.2.3 From de3eb1d7f990c4cc17722ce3bdff7b9568ab8b9c Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Tue, 28 Sep 2010 16:38:14 +0200 Subject: Small fixes / cleanup --- inc/HTTPClient.php | 3 +- inc/SimplePie.php | 2 +- inc/TarLib.class.php | 76 ----------------------------------------------- inc/actions.php | 4 --- inc/changelog.php | 2 +- inc/common.php | 1 - inc/feedcreator.class.php | 6 ++-- inc/lang/tr/install.html | 2 +- inc/media.php | 2 ++ inc/pageutils.php | 1 - inc/search.php | 3 +- inc/template.php | 2 +- inc/toolbar.php | 2 -- 13 files changed, 14 insertions(+), 92 deletions(-) (limited to 'inc') diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php index eea01f9d5..4e64668d5 100644 --- a/inc/HTTPClient.php +++ b/inc/HTTPClient.php @@ -276,7 +276,7 @@ class HTTPClient { // open socket $socket = @fsockopen($server,$port,$errno, $errstr, $this->timeout); if (!$socket){ - $resp->status = '-100'; + $this->status = -100; $this->error = "Could not connect to $server:$port\n$errstr ($errno)"; return false; } @@ -560,6 +560,7 @@ class HTTPClient { * @author Andreas Gohr */ function _postEncode($data){ + $url = ''; foreach($data as $key => $val){ if($url) $url .= '&'; $url .= urlencode($key).'='.urlencode($val); diff --git a/inc/SimplePie.php b/inc/SimplePie.php index 276a654ee..99c9f3226 100644 --- a/inc/SimplePie.php +++ b/inc/SimplePie.php @@ -9120,7 +9120,7 @@ class SimplePie_Misc } else { - trigger_error('Unknown class passed as parameter', E_USER_WARNNG); + trigger_error('Unknown class passed as parameter', E_USER_WARNING); } } return false; diff --git a/inc/TarLib.class.php b/inc/TarLib.class.php index 3e9e81234..3da3c72c2 100644 --- a/inc/TarLib.class.php +++ b/inc/TarLib.class.php @@ -457,82 +457,6 @@ class TarLib { return isset($ecodes[$i]) ? $ecodes[$i] : $ecodes[0]; } - /** - * Display informations about the MaxgTar Class. - * - * This function will display vaious informations about the server - * MaxgTar is running on. - * - * The optional parameter DispHeaders is used to generate a full page with - * HTML headers (TRUE by default) or just the table with the informations - * (FALSE). Note that the HTML page generated is verified compatible XHTML - * 1.0, but not HTML 4.0 compatible. - */ - function TarInfo($headers = true) { - if($headers) { - ?> - - - - - MaxgComp TAR - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
MaxgComp TAR
This software was created by the Maxg Network, http://maxg.info -
It is distributed under the GNU Lesser General Public License -
You can find the documentation of this class here
MaxgComp TAR version
ZLIB extensions Yes' : 'No')?>
BZ2 extensions Yes' : 'No')?>
Allow URL fopen Yes' : 'No')?>
Time limit
PHP Version
- Special thanks to « Vincent Blavet » for his PEAR::Archive_Tar class -
- '; - } - function _seek($p_flen, $tell=0) { if($this->_nomf === TarLib::ARCHIVE_DYNAMIC) $this->_memdat=substr($this->_memdat,0,($tell ? strlen($this->_memdat) : 0) + $p_flen); diff --git a/inc/actions.php b/inc/actions.php index 3e0cb1207..d9f5d017c 100644 --- a/inc/actions.php +++ b/inc/actions.php @@ -16,13 +16,10 @@ if(!defined('DOKU_INC')) die('meh.'); * @triggers ACTION_HEADERS_SEND */ function act_dispatch(){ - global $INFO; global $ACT; global $ID; global $QUERY; global $lang; - global $conf; - global $license; $preact = $ACT; @@ -57,7 +54,6 @@ function act_dispatch(){ $ACT = act_permcheck($ACT); //register - $nil = array(); if($ACT == 'register' && $_POST['save'] && register()){ $ACT = 'login'; } diff --git a/inc/changelog.php b/inc/changelog.php index d5cd8308c..bb00df76c 100644 --- a/inc/changelog.php +++ b/inc/changelog.php @@ -104,7 +104,7 @@ function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extr * @author Ben Coburn */ function addMediaLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extra='', $flags=null){ - global $conf, $INFO; + global $conf; $id = cleanid($id); diff --git a/inc/common.php b/inc/common.php index bf5987c28..003546409 100644 --- a/inc/common.php +++ b/inc/common.php @@ -97,7 +97,6 @@ function pageinfo(){ global $REV; global $RANGE; global $USERINFO; - global $conf; global $lang; // include ID & REV not redundant, as some parts of DokuWiki may temporarily change $ID, e.g. p_wiki_xhtml diff --git a/inc/feedcreator.class.php b/inc/feedcreator.class.php index e7b8d7afc..68b9bdd2b 100644 --- a/inc/feedcreator.class.php +++ b/inc/feedcreator.class.php @@ -685,7 +685,8 @@ class FeedDate { $months = Array("Jan"=>1,"Feb"=>2,"Mar"=>3,"Apr"=>4,"May"=>5,"Jun"=>6,"Jul"=>7,"Aug"=>8,"Sep"=>9,"Oct"=>10,"Nov"=>11,"Dec"=>12); $this->unix = mktime($matches[4],$matches[5],$matches[6],$months[$matches[2]],$matches[1],$matches[3]); if (substr($matches[7],0,1)=='+' OR substr($matches[7],0,1)=='-') { - $tzOffset = (substr($matches[7],0,3) * 60 + substr($matches[7],-2)) * 60; + $tzOffset = (((int) substr($matches[7],0,3) * 60) + + (int) substr($matches[7],-2)) * 60; } else { if (strlen($matches[7])==1) { $oneHour = 3600; @@ -709,7 +710,8 @@ class FeedDate { if (preg_match("~(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(.*)~",$dateString,$matches)) { $this->unix = mktime($matches[4],$matches[5],$matches[6],$matches[2],$matches[3],$matches[1]); if (substr($matches[7],0,1)=='+' OR substr($matches[7],0,1)=='-') { - $tzOffset = (substr($matches[7],0,3) * 60 + substr($matches[7],-2)) * 60; + $tzOffset = (((int) substr($matches[7],0,3) * 60) + + (int) substr($matches[7],-2)) * 60; } else { if ($matches[7]=="Z") { $tzOffset = 0; diff --git a/inc/lang/tr/install.html b/inc/lang/tr/install.html index 59e7f57a7..d479ca4e8 100644 --- a/inc/lang/tr/install.html +++ b/inc/lang/tr/install.html @@ -1,6 +1,6 @@

Bu sayfa Dokuwiki kurmanıza yardımcı olmaktadır. Kurulum hakkında bilgi sahibi olmak için bu sayfayı ziyaret edebilirsiniz.

DokuWiki wiki sayfalarını ve wiki sayfalarına ilişkin verileri (resimler, arama indeksi, geçmiş sürümler) dosyalarda tutar. DokuWikiyi sorunsuz olarak kullanmak için bu dosyaların bulunduğu dizinlere mutlaka yazma izniniz olması gereklidir. Bu kurulum betiği yazma izinlerini ayarlayamamaktadır. İzinleri shell, FTP veya kontrol paneliniz (CPanel, Plesk vs.) aracılığı ile düzenleyebilirsiniz.

Kurulum betiği ACL'yi otomatik olarak ayarlamaktadır. Böylece yönetici izinleri belirlenip, DokuWiki kullanımı kolaylaştırılmaktadır.

diff --git a/inc/media.php b/inc/media.php index 668f42d6a..3dacd12b7 100644 --- a/inc/media.php +++ b/inc/media.php @@ -391,6 +391,7 @@ function media_contentcheck($file,$mime){ function media_notify($id,$file,$mime){ global $lang; global $conf; + global $INFO; if(empty($conf['notify'])) return; //notify enabled? $ip = clientIP(); @@ -729,6 +730,7 @@ function media_nstree($ns){ // currently selected namespace $ns = cleanID($ns); if(empty($ns)){ + global $ID; $ns = dirname(str_replace(':','/',$ID)); if($ns == '.') $ns =''; } diff --git a/inc/pageutils.php b/inc/pageutils.php index 969a6ea0d..42a485bdf 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -96,7 +96,6 @@ function getID($param='id',$clean=true){ */ function cleanID($raw_id,$ascii=false,$media=false){ global $conf; - global $lang; static $sepcharpat = null; global $cache_cleanid; diff --git a/inc/search.php b/inc/search.php index ea8897662..8273eef8c 100644 --- a/inc/search.php +++ b/inc/search.php @@ -322,6 +322,7 @@ function search_backlinks(&$data,$base,$file,$type,$lvl,$opts){ $instructions = p_cached_instructions($base.$file,true); if(is_null($instructions)) return false; + global $conf; //check all links for match foreach($instructions as $ins){ if($ins[0] == 'internallink' || ($conf['camelcase'] && $ins[0] == 'camelcaselink') ){ @@ -595,7 +596,7 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){ if(!$opts['listfiles']) return $return; if(!$opts['skipacl'] && $item['perm'] < AUTH_READ) return $return; if($opts['pagesonly'] && (substr($file,-4) != '.txt')) return $return; - if(!$conf['showhidden'] && isHiddenPage($id)) return $return; + if(!$opts['showhidden'] && isHiddenPage($item['id'])) return $return; if($opts['filematch'] && !preg_match('/'.$opts['filematch'].'/',$file)) return $return; if($opts['idmatch'] && !preg_match('/'.$opts['idmatch'].'/',$item['id'])) return $return; } diff --git a/inc/template.php b/inc/template.php index f7c104cdb..4eed30591 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1169,7 +1169,7 @@ function tpl_actiondropdown($empty='',$button='>'){ global $lang; global $auth; - echo '

'; #FIXME action + echo ''; echo ''; if($REV) echo ''; echo ''; diff --git a/inc/toolbar.php b/inc/toolbar.php index a07bfb93d..8bcf6f030 100644 --- a/inc/toolbar.php +++ b/inc/toolbar.php @@ -16,8 +16,6 @@ if(!defined('DOKU_INC')) die('meh.'); * @author Andreas Gohr */ function toolbar_JSdefines($varname){ - global $ID; - global $conf; global $lang; $menu = array(); -- cgit v1.2.3 From c346111a3d99754f72da068bb2e9518b4676d5a4 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Wed, 29 Sep 2010 10:24:16 +0200 Subject: Add back globals for templates --- inc/actions.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'inc') diff --git a/inc/actions.php b/inc/actions.php index d9f5d017c..0a6e6d8c7 100644 --- a/inc/actions.php +++ b/inc/actions.php @@ -145,6 +145,10 @@ function act_dispatch(){ act_redirect($ID,$preact); } + global $INFO; + global $conf; + global $license; + //call template FIXME: all needed vars available? $headers[] = 'Content-Type: text/html; charset=utf-8'; trigger_event('ACTION_HEADERS_SEND',$headers,'act_sendheaders'); -- cgit v1.2.3 From 93a6d0536e2b8c3e75c53753a54e7613bf4c00fe Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 2 Oct 2010 10:23:47 +0200 Subject: properly encode user wildcard in ACLs FS#2039 --- inc/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/auth.php b/inc/auth.php index e1f689f96..90ce61a37 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -107,7 +107,7 @@ function auth_setup(){ $AUTH_ACL = file($config_cascade['acl']['default']); //support user wildcard if(isset($_SERVER['REMOTE_USER'])){ - $AUTH_ACL = str_replace('%USER%',$_SERVER['REMOTE_USER'],$AUTH_ACL); + $AUTH_ACL = str_replace('%USER%',auth_nameencode($_SERVER['REMOTE_USER']),$AUTH_ACL); } } } -- cgit v1.2.3 From 75c93b7798bed5fafb8b75066adce3af14ebb524 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 2 Oct 2010 11:32:00 +0200 Subject: a more correct fix for FS#2039 --- inc/auth.php | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'inc') diff --git a/inc/auth.php b/inc/auth.php index 90ce61a37..a2844a732 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -103,13 +103,34 @@ function auth_setup(){ } //load ACL into a global array XXX - if(is_readable($config_cascade['acl']['default'])){ - $AUTH_ACL = file($config_cascade['acl']['default']); - //support user wildcard - if(isset($_SERVER['REMOTE_USER'])){ - $AUTH_ACL = str_replace('%USER%',auth_nameencode($_SERVER['REMOTE_USER']),$AUTH_ACL); + $AUTH_ACL = auth_loadACL(); +} + +/** + * Loads the ACL setup and handle user wildcards + * + * @author Andreas Gohr + * @returns array + */ +function auth_loadACL(){ + global $config_cascade; + + if(!is_readable($config_cascade['acl']['default'])) return array(); + + $acl = file($config_cascade['acl']['default']); + + //support user wildcard + if(isset($_SERVER['REMOTE_USER'])){ + $len = count($acl); + for($i=0; $i<$len; $i++){ + if($acl[$i]{0} == '#') continue; + list($id,$rest) = preg_split('/\s+/',$acl[$i],2); + $id = str_replace('%USER%',cleanID($_SERVER['REMOTE_USER']),$id); + $rest = str_replace('%USER%',auth_nameencode($_SERVER['REMOTE_USER']),$rest); + $acl[$i] = "$id\t$rest"; } } + return $acl; } function auth_login_wrapper($evdata) { -- cgit v1.2.3 From aaa724858bc8e1414981b87e35424c44295bc2f7 Mon Sep 17 00:00:00 2001 From: Matthias Schulte Date: Sat, 2 Oct 2010 14:01:48 +0200 Subject: Informal German language update --- inc/lang/de-informal/lang.php | 38 ++++++++++++++++-------------------- inc/lang/de-informal/pwconfirm.txt | 2 +- inc/lang/de-informal/subscr_list.txt | 17 ++++++++++++++++ 3 files changed, 35 insertions(+), 22 deletions(-) create mode 100644 inc/lang/de-informal/subscr_list.txt (limited to 'inc') diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php index a42ecc0ab..5048d08cb 100644 --- a/inc/lang/de-informal/lang.php +++ b/inc/lang/de-informal/lang.php @@ -16,6 +16,7 @@ * @author Alexander Fischer * @author Juergen Schwarzer * @author Marcel Metz + * @author Matthias Schulte */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -49,9 +50,6 @@ $lang['btn_back'] = 'Zurück'; $lang['btn_backlink'] = 'Links hierher'; $lang['btn_backtomedia'] = 'Zurück zur Dateiauswahl'; $lang['btn_subscribe'] = 'Änderungen abonnieren'; -$lang['btn_unsubscribe'] = 'Änderungen abbestellen'; -$lang['btn_subscribens'] = 'Namensraumänderungen abonnieren'; -$lang['btn_unsubscribens'] = 'Namensraumänderungen abbestellen'; $lang['btn_profile'] = 'Benutzerprofil'; $lang['btn_reset'] = 'Zurücksetzen'; $lang['btn_resendpwd'] = 'Sende neues Passwort'; @@ -86,7 +84,7 @@ $lang['reghere'] = 'Du hast noch keinen Zugang? Hier anmelden'; $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'] = 'Benuzerprofil erfolgreich geändert.'; +$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 schicken für'; @@ -105,7 +103,16 @@ $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']['notsavedyet'] = "Nicht gespeicherte Änderungen gehen verloren!"; +$lang['js']['notsavedyet'] = 'Nicht gespeicherte Änderungen gehen verloren!'; +$lang['js']['searchmedia'] = 'Suche nach Dateien'; +$lang['js']['keepopen'] = 'Fenster nach Auswahl nicht schließen'; +$lang['js']['hidedetails'] = 'Details ausblenden'; +$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']['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['rssfailed'] = 'Es ist ein Fehler beim Laden des Feeds aufgetreten: '; $lang['nothingfound'] = 'Nichts gefunden.'; $lang['mediaselect'] = 'Dateiauswahl'; @@ -123,15 +130,7 @@ $lang['deletefail'] = '"%s" konnte nicht gelöscht werden - prüfe di $lang['mediainuse'] = 'Die Datei "%s" wurde nicht gelöscht - sie wird noch verwendet.'; $lang['namespaces'] = 'Namensräume'; $lang['mediafiles'] = 'Vorhandene Dateien in'; -$lang['js']['searchmedia'] = 'Suche nach Dateien'; -$lang['js']['keepopen'] = 'Fenster nach Auswahl nicht schließen'; -$lang['js']['hidedetails'] = 'Details ausblenden'; -$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']['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['accessdenied'] = 'Du hast keinen Zugriff auf diese Seite'; $lang['mediausage'] = 'Syntax zum Verwenden dieser Datei:'; $lang['mediaview'] = 'Originaldatei öffnen'; $lang['mediaroot'] = 'Wurzel'; @@ -147,6 +146,7 @@ $lang['current'] = 'aktuell'; $lang['yours'] = 'Deine Version'; $lang['diff'] = 'Zeige Unterschiede zu aktueller Version'; $lang['diff2'] = 'Zeige Unterschiede der ausgewählten Versionen'; +$lang['difflink'] = 'Link zu der Versionshistorie'; $lang['line'] = 'Zeile'; $lang['breadcrumb'] = 'Zuletzt angesehen'; $lang['youarehere'] = 'Du befindest dich hier'; @@ -160,7 +160,8 @@ $lang['summary'] = 'Zusammenfassung'; $lang['noflash'] = 'Das Adobe Flash Plugin wird benötigt, um diesen Inhalt anzuzeigen.'; $lang['download'] = 'Download-Teil'; $lang['mail_newpage'] = 'Neue Seite:'; -$lang['mail_changed'] = 'Seite geaendert:'; +$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['qb_bold'] = 'Fetter Text'; @@ -197,17 +198,12 @@ $lang['img_title'] = 'Titel'; $lang['img_caption'] = 'Bildunterschrift'; $lang['img_date'] = 'Datum'; $lang['img_fname'] = 'Dateiname'; -$lang['img_fsize'] = 'Grösse'; +$lang['img_fsize'] = 'Größe'; $lang['img_artist'] = 'Fotograf'; $lang['img_copyr'] = 'Copyright'; $lang['img_format'] = 'Format'; $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Schlagwörter'; -$lang['subscribe_success'] = '%s hat nun Änderungen der Seite %s abonniert'; -$lang['subscribe_error'] = '%s kann die Änderungen der Seite %s nicht abonnieren'; -$lang['subscribe_noaddress'] = 'Weil deine E-Mail-Adresse fehlt, kannst du das Thema nicht abonnieren'; -$lang['unsubscribe_success'] = 'Das Abonnement von %s für die Seite %s wurde aufgelöst'; -$lang['unsubscribe_error'] = 'Das Abonnement von %s für die Seite %s konnte nicht aufgelöst werden'; $lang['authmodfailed'] = 'Benutzerüberprüfung nicht möglich. Bitte wende dich an den Systembetreuer.'; $lang['authtempfail'] = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wende dich an den Systembetreuer.'; $lang['i_chooselang'] = 'Wähle deine Sprache'; diff --git a/inc/lang/de-informal/pwconfirm.txt b/inc/lang/de-informal/pwconfirm.txt index 5e5572b28..9029bf195 100644 --- a/inc/lang/de-informal/pwconfirm.txt +++ b/inc/lang/de-informal/pwconfirm.txt @@ -1,7 +1,7 @@ Hallo @FULLNAME@! Jemand hat ein neues Passwort für deinen @TITLE@ -login auf @DOKUWIKIURL@ angefordert. +Login auf @DOKUWIKIURL@ angefordert. Wenn du diese Änderung nicht angefordert hast, ignoriere diese E-Mail einfach. diff --git a/inc/lang/de-informal/subscr_list.txt b/inc/lang/de-informal/subscr_list.txt new file mode 100644 index 000000000..dc6d0f3f5 --- /dev/null +++ b/inc/lang/de-informal/subscr_list.txt @@ -0,0 +1,17 @@ +Hallo! + +Die Seiten im Namespace @PAGE@ im @TITLE@ wurden geändert. +Nachfolgenden findest du die geänderten Seiten: + +-------------------------------------------------------- +@DIFF@ +-------------------------------------------------------- + +Um die Benachrichtigungen zu deaktivieren, melde dich am Wiki unter +@DOKUWIKIURL@ an, gehe zur Seite +@SUBSCRIBE@ +und deaktiviere das Abonnement für die Seite und/oder den Namensraum. + +-- +Diese E-Mail wurde erzeugt vom DokuWiki unter +@DOKUWIKIURL@ \ No newline at end of file -- cgit v1.2.3 From decde61ca89c09e81deb350aac4faa7bb705fa70 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 2 Oct 2010 15:18:54 +0200 Subject: renamed index to sitemap FS#2026 --- inc/lang/en/index.txt | 4 ++-- inc/lang/en/lang.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'inc') diff --git a/inc/lang/en/index.txt b/inc/lang/en/index.txt index 5adbfd898..152911bbb 100644 --- a/inc/lang/en/index.txt +++ b/inc/lang/en/index.txt @@ -1,4 +1,4 @@ -====== Index ====== +====== Sitemap ====== -This is an index over all available pages ordered by [[doku>namespaces|namespaces]]. +This is a sitemap over all available pages ordered by [[doku>namespaces|namespaces]]. diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 5414f7a88..5c890246c 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -29,7 +29,7 @@ $lang['btn_revs'] = 'Old revisions'; $lang['btn_recent'] = 'Recent changes'; $lang['btn_upload'] = 'Upload'; $lang['btn_cancel'] = 'Cancel'; -$lang['btn_index'] = 'Index'; +$lang['btn_index'] = 'Sitemap'; $lang['btn_secedit']= 'Edit'; $lang['btn_login'] = 'Login'; $lang['btn_logout'] = 'Logout'; -- cgit v1.2.3 From 156dbd62fa3d65e4ee1f4a97e77e7705edefb03b Mon Sep 17 00:00:00 2001 From: Gina Haeussge Date: Sat, 2 Oct 2010 15:52:09 +0200 Subject: FS#2038: Use GET for the search form --- 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 4eed30591..2693c485b 100644 --- a/inc/template.php +++ b/inc/template.php @@ -664,7 +664,7 @@ function tpl_searchform($ajax=true,$autocomplete=true){ // don't print the search form if search action has been disabled if (!actionOk('search')) return false; - print '

'; + print '

'; print ''; print ' Date: Sat, 2 Oct 2010 17:06:59 +0200 Subject: Fixed bug FS2030 JpegMeta dies on parsing XMP --- inc/JpegMeta.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'inc') diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index 98453131e..fa05f6859 100644 --- a/inc/JpegMeta.php +++ b/inc/JpegMeta.php @@ -1488,6 +1488,8 @@ class JpegMeta { * @author Hakan Sandell */ function _parseXmpNode($values, &$i, &$meta) { + if ($values[$i]['type'] == 'close') return; + if ($values[$i]['type'] == 'complete') { // Simple Type property $meta = $values[$i]['value']; @@ -1501,14 +1503,16 @@ class JpegMeta { while ($values[++$i]['tag'] == 'rdf:li') { $this->_parseXmpNode($values, $i, $meta[]); } - $i++; // skip closing tag + $i++; // skip closing Bag/Seq tag } elseif ($values[$i]['tag'] == 'rdf:Alt') { // Language Alternative property, only the first (default) value is used - $i++; - $this->_parseXmpNode($values, $i, $meta); - while ($values[++$i]['tag'] != 'rdf:Alt'); - $i++; // skip closing tag + if ($values[$i]['type'] == 'open') { + $i++; + $this->_parseXmpNode($values, $i, $meta); + while ($values[++$i]['tag'] != 'rdf:Alt'); + $i++; // skip closing Alt tag + } } else { // Structure property -- cgit v1.2.3 From 26eb848c36688e459e5dfc46cdc68d87ed2bda0c Mon Sep 17 00:00:00 2001 From: Gina Haeussge Date: Sat, 2 Oct 2010 18:04:09 +0200 Subject: FS#1353: Only highlight isolated occurences of search term, not those where it's part of another term. Word boundaries are now respected. --- inc/fulltext.php | 9 ++++++++- inc/html.php | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/fulltext.php b/inc/fulltext.php index e90205e9c..7dae183c8 100644 --- a/inc/fulltext.php +++ b/inc/fulltext.php @@ -313,7 +313,7 @@ function ft_snippet($id,$highlight){ $len = utf8_strlen($text); // build a regexp from the phrases to highlight - $re1 = '('.join('|',array_map('preg_quote_cb',array_filter((array) $highlight))).')'; + $re1 = '('.join('|',array_map('_ft_snippet_re_preprocess', array_map('preg_quote_cb',array_filter((array) $highlight)))).')'; $re2 = "$re1.{0,75}(?!\\1)$re1"; $re3 = "$re1.{0,45}(?!\\1)$re1.{0,45}(?!\\1)(?!\\2)$re1"; @@ -386,6 +386,13 @@ function ft_snippet($id,$highlight){ return $evdata['snippet']; } +/** + * Wraps a search term in regex boundary checks. + */ +function _ft_snippet_re_preprocess($term) { + return '\b'.$term.'\b'; +} + /** * Combine found documents and sum up their scores * diff --git a/inc/html.php b/inc/html.php index add559971..e1478b0a8 100644 --- a/inc/html.php +++ b/inc/html.php @@ -285,13 +285,20 @@ function html_draft(){ */ function html_hilight($html,$phrases){ $phrases = array_filter((array) $phrases); - $regex = join('|',array_map('preg_quote_cb',$phrases)); + $regex = join('|',array_map('_html_hilight_re_preprocess', array_map('preg_quote_cb',$phrases))); if ($regex === '') return $html; $html = preg_replace_callback("/((<[^>]*)|$regex)/ui",'html_hilight_callback',$html); return $html; } +/** + * Wraps a search term in regex boundary checks. + */ +function _html_hilight_re_preprocess($term) { + return '\b'.$term.'\b'; +} + /** * Callback used by html_hilight() * -- cgit v1.2.3 From f3f7087bd8d0b583a3add1b38877a2b9ef39322e Mon Sep 17 00:00:00 2001 From: Isaias Masiero Filho Date: Sat, 2 Oct 2010 18:37:55 +0200 Subject: Brazilian Portuguese language update --- inc/lang/pt-br/lang.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'inc') diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php index 135d20d97..6bbd4c520 100644 --- a/inc/lang/pt-br/lang.php +++ b/inc/lang/pt-br/lang.php @@ -17,8 +17,9 @@ * @author Jair Henrique * @author Luis Dantas * @author Sergio Motta sergio@cisne.com.br + * @author Isaias Masiero Filho */ -$lang['encoding'] = 'utf-8'; +$lang['encoding'] = 'utf-8<'; $lang['direction'] = 'ltr'; $lang['doublequoteopening'] = '“'; $lang['doublequoteclosing'] = '”'; @@ -121,7 +122,7 @@ $lang['js']['mediasmall'] = 'Versão Pequena'; $lang['js']['mediamedium'] = 'Versão Média'; $lang['js']['medialarge'] = 'Versão Grande'; $lang['js']['mediaoriginal'] = 'Versão Original'; -$lang['js']['medialnk'] = 'Link para pagina de detalhes'; +$lang['js']['medialnk'] = 'Link para página de detalhes'; $lang['js']['mediadirect'] = 'Link direto para original'; $lang['js']['medianolnk'] = 'Sem Link'; $lang['js']['medianolink'] = 'Sem link na imagem'; @@ -152,6 +153,7 @@ $lang['deletefail'] = 'Não foi possível excluir "%s" - verifique as $lang['mediainuse'] = 'O arquivo "%s" não foi excluído - ele ainda está em uso.'; $lang['namespaces'] = 'Espaços de nome'; $lang['mediafiles'] = 'Arquivos disponíveis em'; +$lang['accessdenied'] = 'Você não tem permissão para visualizar esta página.'; $lang['mediausage'] = 'Use a seguinte sintaxe para referenciar esse arquivo:'; $lang['mediaview'] = 'Ver o arquivo original'; $lang['mediaroot'] = 'raiz'; @@ -167,6 +169,7 @@ $lang['current'] = 'atual'; $lang['yours'] = 'Sua versão'; $lang['diff'] = 'Mostrar diferenças com a revisão atual'; $lang['diff2'] = 'Mostrar diferenças entre as revisões selecionadas'; +$lang['difflink'] = 'Link para esta página de comparações'; $lang['line'] = 'Linha'; $lang['breadcrumb'] = 'Visitou'; $lang['youarehere'] = 'Você está aqui'; @@ -188,7 +191,7 @@ $lang['qb_bold'] = 'Texto em negrito'; $lang['qb_italic'] = 'Texto em itálico'; $lang['qb_underl'] = 'Texto sublinhado'; $lang['qb_code'] = 'Texto de código'; -$lang['qb_strike'] = 'Texto riscado'; +$lang['qb_strike'] = 'Texto tachado'; $lang['qb_h1'] = 'Cabeçalho de nível 1'; $lang['qb_h2'] = 'Cabeçalho de nível 2'; $lang['qb_h3'] = 'Cabeçalho de nível 3'; -- cgit v1.2.3 From 341f60512614ff9a4ad206e33369aa199b3f1330 Mon Sep 17 00:00:00 2001 From: Gina Haeussge Date: Sat, 2 Oct 2010 19:33:58 +0200 Subject: FS#1928: Keep mlist file upon page deletion to persist subscribers for later recreation and allow notification of subscribers of page deletion. --- inc/common.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index 003546409..390b038a5 100644 --- a/inc/common.php +++ b/inc/common.php @@ -987,9 +987,10 @@ function saveWikiText($id,$text,$summary,$minor=false){ $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 and keep meta data - if (@file_exists($mfile) && $mfile!==$changelog && $mfile!==$metadata) { @unlink($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 p_purge_metadata($id); -- cgit v1.2.3 From 15f1b77cd64a0f676733cf10227129deffcc922b Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 2 Oct 2010 19:48:26 +0200 Subject: more relaxed recognition of windows share links FS#1991 --- 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 acca3f5a1..a96e6b9db 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -440,7 +440,7 @@ class Doku_Handler { array($link[0],$link[1],strtolower($interwiki[0]),$interwiki[1]), $pos ); - }elseif ( preg_match('/^\\\\\\\\[\w.:?\-;,]+?\\\\/u',$link[0]) ) { + }elseif ( preg_match('/^\\\\\\\\[^\\\\]+?\\\\/u',$link[0]) ) { // Windows Share $this->_addCall( 'windowssharelink', -- cgit v1.2.3 From 2237b4fa4c84beb06a92308a19e45027e2bdc131 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 3 Oct 2010 12:53:41 +0200 Subject: correctly handle highlighting of partial searches FS#1353 --- inc/fulltext.php | 21 ++++++++++++++++----- inc/html.php | 9 +-------- 2 files changed, 17 insertions(+), 13 deletions(-) (limited to 'inc') diff --git a/inc/fulltext.php b/inc/fulltext.php index 7dae183c8..943a5d401 100644 --- a/inc/fulltext.php +++ b/inc/fulltext.php @@ -313,7 +313,7 @@ function ft_snippet($id,$highlight){ $len = utf8_strlen($text); // build a regexp from the phrases to highlight - $re1 = '('.join('|',array_map('_ft_snippet_re_preprocess', array_map('preg_quote_cb',array_filter((array) $highlight)))).')'; + $re1 = '('.join('|',array_map('ft_snippet_re_preprocess', array_map('preg_quote_cb',array_filter((array) $highlight)))).')'; $re2 = "$re1.{0,75}(?!\\1)$re1"; $re3 = "$re1.{0,45}(?!\\1)$re1.{0,45}(?!\\1)(?!\\2)$re1"; @@ -389,8 +389,19 @@ function ft_snippet($id,$highlight){ /** * Wraps a search term in regex boundary checks. */ -function _ft_snippet_re_preprocess($term) { - return '\b'.$term.'\b'; +function ft_snippet_re_preprocess($term) { + if(substr($term,0,2) == '\\*'){ + $term = substr($term,2); + }else{ + $term = '\b'.$term; + } + + if(substr($term,-2,2) == '\\*'){ + $term = substr($term,0,-2); + }else{ + $term = $term.'\b'; + } + return $term; } /** @@ -685,7 +696,7 @@ function ft_queryParser($query){ break; case 'W+:': $q['words'][] = $body; - $q['highlight'][] = str_replace('*', '', $body); + $q['highlight'][] = $body; $q['and'][] = $body; // for backward compatibility break; case 'P-:': @@ -693,7 +704,7 @@ function ft_queryParser($query){ break; case 'P+:': $q['phrases'][] = $body; - $q['highlight'][] = str_replace('*', '', $body); + $q['highlight'][] = $body; break; } } diff --git a/inc/html.php b/inc/html.php index e1478b0a8..968a63e4e 100644 --- a/inc/html.php +++ b/inc/html.php @@ -285,20 +285,13 @@ function html_draft(){ */ function html_hilight($html,$phrases){ $phrases = array_filter((array) $phrases); - $regex = join('|',array_map('_html_hilight_re_preprocess', array_map('preg_quote_cb',$phrases))); + $regex = join('|',array_map('ft_snippet_re_preprocess', array_map('preg_quote_cb',$phrases))); if ($regex === '') return $html; $html = preg_replace_callback("/((<[^>]*)|$regex)/ui",'html_hilight_callback',$html); return $html; } -/** - * Wraps a search term in regex boundary checks. - */ -function _html_hilight_re_preprocess($term) { - return '\b'.$term.'\b'; -} - /** * Callback used by html_hilight() * -- cgit v1.2.3 From 060ab504d26b1044e946e7674201fa54f8ffb184 Mon Sep 17 00:00:00 2001 From: Guy Brand Date: Sun, 3 Oct 2010 15:51:21 +0200 Subject: Truncate wiki name in sent mail (FS#2021) --- inc/common.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index 390b038a5..6af7f49de 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1128,7 +1128,11 @@ function notify($id,$who,$rev='',$summary='',$minor=false,$replace=array()){ $diff = rawWiki($id); } $text = str_replace('@DIFF@',$diff,$text); - $subject = '['.$conf['title'].'] '.$subject; + if(utf8_strlen($conf['title']) < 20) { + $subject = '['.$conf['title'].'] '.$subject; + }else{ + $subject = '['.utf8_substr($conf['title'], 0, 20).'...] '.$subject; + } $from = $conf['mailfrom']; $from = str_replace('@USER@',$_SERVER['REMOTE_USER'],$from); -- cgit v1.2.3 From 6d58f7821f530c90900d3cda301f9e22026c5fcb Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 3 Oct 2010 15:33:32 +0100 Subject: No need for a self include ;) --- inc/parser/renderer.php | 1 - 1 file changed, 1 deletion(-) (limited to 'inc') diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php index 7e52cfce2..81c33fe62 100644 --- a/inc/parser/renderer.php +++ b/inc/parser/renderer.php @@ -6,7 +6,6 @@ * @author Andreas Gohr */ if(!defined('DOKU_INC')) die('meh.'); -require_once DOKU_INC . 'inc/parser/renderer.php'; require_once DOKU_INC . 'inc/plugin.php'; require_once DOKU_INC . 'inc/pluginutils.php'; -- cgit v1.2.3 From c2122b83f7b1516bad0b5be5d9c617cffcec8f9d Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 3 Oct 2010 16:44:58 +0100 Subject: FS#1995, add a little defense to avoid warnings caused by bad wiki syntax --- inc/parser/renderer.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php index 81c33fe62..b54ccf050 100644 --- a/inc/parser/renderer.php +++ b/inc/parser/renderer.php @@ -74,7 +74,9 @@ class Doku_Renderer extends DokuWiki_Plugin { foreach ( $instructions as $instruction ) { // execute the callback against ourself - call_user_func_array(array(&$this, $instruction[0]),$instruction[1]); + if (method_exists($this,$instruction[0])) { + call_user_func_array(array($this, $instruction[0]),$instruction[1]); + } } } -- cgit v1.2.3 From f3a3c514a7e4d1a9d5ee8761b509a55555b71f5f Mon Sep 17 00:00:00 2001 From: "Oscar M. Lage" Date: Sun, 3 Oct 2010 20:31:03 +0200 Subject: Spanish language update --- inc/lang/es/lang.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'inc') diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php index 28da1dfee..04403c821 100644 --- a/inc/lang/es/lang.php +++ b/inc/lang/es/lang.php @@ -135,6 +135,7 @@ $lang['js']['medianolink'] = 'No vincular la imagen'; $lang['js']['medialeft'] = 'Alinear imagen a la izquierda'; $lang['js']['mediaright'] = 'Alinear imagen a la derecha.'; $lang['js']['mediacenter'] = 'Alinear imagen en el centro.'; +$lang['js']['medianoalign'] = 'No use alineación.'; $lang['js']['nosmblinks'] = 'El enlace a recursos compartidos de Windows sólo funciona en Microsoft Internet Explorer. Lo que sí puedes hacer es copiar y pegar el enlace.'; $lang['js']['linkwiz'] = 'Asistente de enlaces'; @@ -158,6 +159,7 @@ $lang['deletefail'] = '"%s" no pudo ser borrado; verifique los permis $lang['mediainuse'] = 'El fichero "%s" no ha sido borrado, aún está en uso.'; $lang['namespaces'] = 'Espacios de nombres'; $lang['mediafiles'] = 'Ficheros disponibles en'; +$lang['accessdenied'] = 'No tiene permisos para ver esta página.'; $lang['mediausage'] = 'Use la siguiente sintaxis para hacer referencia a este fichero:'; $lang['mediaview'] = 'Ver el fichero original'; $lang['mediaroot'] = 'root'; @@ -173,6 +175,7 @@ $lang['current'] = 'actual'; $lang['yours'] = 'Tu versión'; $lang['diff'] = 'Muestra diferencias a la versión actual'; $lang['diff2'] = 'Muestra las diferencias entre las revisiones seleccionadas'; +$lang['difflink'] = 'Enlace a la vista de comparación'; $lang['line'] = 'Línea'; $lang['breadcrumb'] = 'Traza'; $lang['youarehere'] = 'Estás aquí'; @@ -269,6 +272,7 @@ $lang['i_pol0'] = 'Wiki abierto (leer, escribir y subir archivos $lang['i_pol1'] = 'Wiki público (leer para todos, escribir y subir archivos para usuarios registrados únicamente)'; $lang['i_pol2'] = 'Wiki cerrado (leer, escribir y subir archivos para usuarios registrados únicamente)'; $lang['i_retry'] = 'Reintentar'; +$lang['i_license'] = 'Por favor escoja una licencia bajo la que publicar su contenido:'; $lang['mu_intro'] = 'Puedes subir varios archivos a la vez desde aquí. Pulsa el botón del navegador para agregarlos a la cola. Pulsa "subir archivo" para proceder.'; $lang['mu_gridname'] = 'Nombre de archivo'; $lang['mu_gridsize'] = 'Tamaño'; @@ -292,3 +296,4 @@ $lang['days'] = '%d días atrás'; $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).'; -- cgit v1.2.3 From 76583efbd01bf8db1ff4af796cade254495a4c61 Mon Sep 17 00:00:00 2001 From: lupo49 Date: Wed, 6 Oct 2010 18:19:20 +0200 Subject: typo fixed --- inc/lang/de/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index c5c65abca..dfd9a8eab 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -84,7 +84,7 @@ $lang['reghere'] = 'Sie haben noch keinen Zugang? Hier anmelden'; $lang['profna'] = 'Änderung des Benutzerprofils in diesem Wiki nicht möglich.'; $lang['profnochange'] = 'Keine Änderungen, nichts zu tun.'; $lang['profnoempty'] = 'Es muß ein Name und eine E-Mail-Adresse angegeben werden.'; -$lang['profchanged'] = 'Benuzerprofil erfolgreich geändert.'; +$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 schicken für'; -- cgit v1.2.3 From bfe8080d8458bfbe853fb9c94548e384fff07d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20=C5=BBur?= Date: Wed, 6 Oct 2010 18:19:22 +0200 Subject: Polish language update --- inc/lang/pl/lang.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'inc') diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php index 0fac281f8..5a366fbb5 100644 --- a/inc/lang/pl/lang.php +++ b/inc/lang/pl/lang.php @@ -146,6 +146,7 @@ $lang['deletefail'] = 'Plik "%s" nie został usunięty, sprawdź upra $lang['mediainuse'] = 'Plik "%s" nie został usunięty, ponieważ jest używany.'; $lang['namespaces'] = 'Katalogi'; $lang['mediafiles'] = 'Dostępne pliki'; +$lang['accessdenied'] = 'Nie masz uprawnień, żeby wyświetlić tę stronę.'; $lang['mediausage'] = 'Użyj następującej składni w odnośniku do tego pliku:'; $lang['mediaview'] = 'Pokaż oryginalny plik'; $lang['mediaroot'] = 'główny'; @@ -161,6 +162,7 @@ $lang['current'] = 'aktualna'; $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['line'] = 'Linia'; $lang['breadcrumb'] = 'Ślad'; $lang['youarehere'] = 'Jesteś tutaj'; @@ -258,6 +260,7 @@ $lang['i_pol0'] = 'Otwarte Wiki (odczyt, zapis i dodawanie plikó $lang['i_pol1'] = 'Publiczne Wiki (odczyt dla wszystkich, zapis i dodawanie plików tylko dla zarejestrowanych użytkowników)'; $lang['i_pol2'] = 'Zamknięte Wiki (odczyt, zapis i dodawanie plików tylko dla zarejestrowanych użytkowników)'; $lang['i_retry'] = 'Spróbuj ponownie'; +$lang['i_license'] = 'Wybierz licencję, na warunkach której chcesz udostępniać treści:'; $lang['mu_intro'] = 'Możesz tutaj wysłać wiele plików na raz. Kliknij przycisk "Przeglądaj" aby dodać je do kolejki. Kliknij "Wyślij" gdy skończysz.'; $lang['mu_gridname'] = 'Nazwa pliku'; $lang['mu_gridsize'] = 'Rozmiar'; -- cgit v1.2.3 From 92062b79cfc90c269b95398132c98f32ac7027ff Mon Sep 17 00:00:00 2001 From: Robert Bogenschneider Date: Wed, 6 Oct 2010 18:20:15 +0200 Subject: Esperanto language update --- inc/lang/eo/lang.php | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) (limited to 'inc') diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php index 1d60fee62..a2457474b 100644 --- a/inc/lang/eo/lang.php +++ b/inc/lang/eo/lang.php @@ -13,6 +13,7 @@ * @author Erik Pedersen * @author Erik Pedersen * @author Robert Bogenschneider + * @author Robert BOGENSCHNEIDER */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -99,24 +100,8 @@ $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']['notsavedyet'] = "Ne konservitaj modifoj perdiĝos.\nĈu vi certe volas daŭrigi la procezon?"; -$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'; -$lang['fileupload'] = 'Alŝuto de aŭdvidaĵa dosiero'; -$lang['uploadsucc'] = 'Alŝuto estis sukcesa'; -$lang['uploadfail'] = 'Alŝuto estis malsukcesa. Eble ĉu estas problemoj pro permes-atributoj?'; -$lang['uploadwrong'] = 'Rifuzita alŝuto. Tiu ĉi dosiersufikso estas malpermesata!'; -$lang['uploadexist'] = 'La dosiero jam ekzistas. Nenio estas farita.'; -$lang['uploadbadcontent'] = 'La alŝutita enhavo ne kongruas al la sufikso %s.'; -$lang['uploadspam'] = 'La alŝutaĵo estis blokita de kontraŭspama vortlisto.'; -$lang['uploadxss'] = 'La alŝutajo estis blokita pro ebla malica enhavo.'; -$lang['uploadsize'] = 'La alŝutita dosiero estis tro granda. (maks. %s)'; -$lang['deletesucc'] = 'La dosiero "%s" estas forigita.'; -$lang['deletefail'] = '"%s" ne povis esti forigita - kontrolu permes-atributojn.'; -$lang['mediainuse'] = 'La dosiero "%s" ne estis forigita - ĝi ankoraŭ estas uzata.'; -$lang['namespaces'] = 'Nomspacoj'; -$lang['mediafiles'] = 'Disponeblaj dosieroj'; +$lang['js']['notsavedyet'] = 'Ne konservitaj modifoj perdiĝos. +Ĉu vi certe volas daŭrigi la procezon?'; $lang['js']['searchmedia'] = 'Serĉi dosierojn'; $lang['js']['keepopen'] = 'Tenu la fenestron malfermata dum elekto'; $lang['js']['hidedetails'] = 'Kaŝi detalojn'; @@ -147,6 +132,24 @@ $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['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'; +$lang['fileupload'] = 'Alŝuto de aŭdvidaĵa dosiero'; +$lang['uploadsucc'] = 'Alŝuto estis sukcesa'; +$lang['uploadfail'] = 'Alŝuto estis malsukcesa. Eble ĉu estas problemoj pro permes-atributoj?'; +$lang['uploadwrong'] = 'Rifuzita alŝuto. Tiu ĉi dosiersufikso estas malpermesata!'; +$lang['uploadexist'] = 'La dosiero jam ekzistas. Nenio estas farita.'; +$lang['uploadbadcontent'] = 'La alŝutita enhavo ne kongruas al la sufikso %s.'; +$lang['uploadspam'] = 'La alŝutaĵo estis blokita de kontraŭspama vortlisto.'; +$lang['uploadxss'] = 'La alŝutajo estis blokita pro ebla malica enhavo.'; +$lang['uploadsize'] = 'La alŝutita dosiero estis tro granda. (maks. %s)'; +$lang['deletesucc'] = 'La dosiero "%s" estas forigita.'; +$lang['deletefail'] = '"%s" ne povis esti forigita - kontrolu permes-atributojn.'; +$lang['mediainuse'] = 'La dosiero "%s" ne estis forigita - ĝi ankoraŭ estas uzata.'; +$lang['namespaces'] = 'Nomspacoj'; +$lang['mediafiles'] = 'Disponeblaj dosieroj'; +$lang['accessdenied'] = 'Vi ne rajtas vidi tiun paĝon.'; $lang['mediausage'] = 'Uzu la jenan sintakson por referenci tiun ĉi dosieron:'; $lang['mediaview'] = 'Rigardi originalan dosieron'; $lang['mediaroot'] = 'ĉefo (root)'; @@ -162,6 +165,7 @@ $lang['current'] = 'aktuala'; $lang['yours'] = 'Via Versio'; $lang['diff'] = 'Montri diferencojn el la aktuala versio'; $lang['diff2'] = 'Montri diferencojn inter la elektitaj revizioj'; +$lang['difflink'] = 'Ligilo al kompara rigardo'; $lang['line'] = 'Linio'; $lang['breadcrumb'] = 'Paŝoj'; $lang['youarehere'] = 'Vi estas ĉi tie'; @@ -259,6 +263,7 @@ $lang['i_pol0'] = 'Malferma Vikio (legi, skribi, alŝuti povas ĉ $lang['i_pol1'] = 'Publika Vikio (legi povas ĉiuj, skribi kaj alŝuti povas registritaj uzantoj)'; $lang['i_pol2'] = 'Ferma Vikio (legi, skribi, alŝuti nur povas registritaj uzantoj)'; $lang['i_retry'] = 'Reprovi'; +$lang['i_license'] = 'Bonvolu elekti la permesilon, sub kiun vi volas meti vian enhavon:'; $lang['mu_intro'] = 'Ĉi tie vi povas alŝuti plurajn dosierojn multope. Klaku la esplor-butonon por aldoni ilin al la vico. Premu alŝuti kiam prete.'; $lang['mu_gridname'] = 'Dosiernomo'; $lang['mu_gridsize'] = 'Grandeco'; -- cgit v1.2.3 From 57d620b925a8f6a5f4c8b01d5f64d02c16e2e091 Mon Sep 17 00:00:00 2001 From: Aivars Miska Date: Wed, 6 Oct 2010 18:58:52 +0200 Subject: Latvian language update --- inc/lang/lv/lang.php | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) (limited to 'inc') diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php index 1ebd86edf..21c4606b3 100644 --- a/inc/lang/lv/lang.php +++ b/inc/lang/lv/lang.php @@ -90,24 +90,8 @@ $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']['notsavedyet'] = "Veiktas bet nav saglabātas izmaiņas.\nVai tiešām tās nevajag?"; -$lang['rssfailed'] = 'Kļūda saņemot saturu no '; -$lang['nothingfound'] = 'Nekas nav atrasts.'; -$lang['mediaselect'] = 'Mēdiju faila izvēle'; -$lang['fileupload'] = 'Mēdiju faila augšupielāde'; -$lang['uploadsucc'] = 'Veiksmīgi ielādēts'; -$lang['uploadfail'] = 'Ielādes kļūme. Varbūt aplamas tiesības?'; -$lang['uploadwrong'] = 'Ielāde aizliegta. Neatļauts faila paplašinājums'; -$lang['uploadexist'] = 'Neko nedarīju, jo fails jau ir.'; -$lang['uploadbadcontent'] = 'Augšupielādētā saturs neatbilst faila paplašinājumam %s.'; -$lang['uploadspam'] = 'Augšupielāde bloķēta ar melno sarakstu.'; -$lang['uploadxss'] = 'Augšupielāde bloķēta iespējama slikta satura dēļ.'; -$lang['uploadsize'] = 'Augšup lādētais fails pārāk liels. Maksimums ir %s.'; -$lang['deletesucc'] = 'Fails "%s" dzēsts.'; -$lang['deletefail'] = 'Nevar dzēst "%s". Pārbaudi tiesības.'; -$lang['mediainuse'] = 'Fails "%s" nav izdzēsts, to lieto.'; -$lang['namespaces'] = 'Nodaļas'; -$lang['mediafiles'] = 'Pieejamie faili'; +$lang['js']['notsavedyet'] = 'Veiktas bet nav saglabātas izmaiņas. +Vai tiešām tās nevajag?'; $lang['js']['searchmedia'] = 'Meklēt failus'; $lang['js']['keepopen'] = 'Pēc faila izvēles logu paturēt atvērtu'; $lang['js']['hidedetails'] = 'Slēpt detaļas'; @@ -138,6 +122,24 @@ $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'; +$lang['fileupload'] = 'Mēdiju faila augšupielāde'; +$lang['uploadsucc'] = 'Veiksmīgi ielādēts'; +$lang['uploadfail'] = 'Ielādes kļūme. Varbūt aplamas tiesības?'; +$lang['uploadwrong'] = 'Ielāde aizliegta. Neatļauts faila paplašinājums'; +$lang['uploadexist'] = 'Neko nedarīju, jo fails jau ir.'; +$lang['uploadbadcontent'] = 'Augšupielādētā saturs neatbilst faila paplašinājumam %s.'; +$lang['uploadspam'] = 'Augšupielāde bloķēta ar melno sarakstu.'; +$lang['uploadxss'] = 'Augšupielāde bloķēta iespējama slikta satura dēļ.'; +$lang['uploadsize'] = 'Augšup lādētais fails pārāk liels. Maksimums ir %s.'; +$lang['deletesucc'] = 'Fails "%s" dzēsts.'; +$lang['deletefail'] = 'Nevar dzēst "%s". Pārbaudi tiesības.'; +$lang['mediainuse'] = 'Fails "%s" nav izdzēsts, to lieto.'; +$lang['namespaces'] = 'Nodaļas'; +$lang['mediafiles'] = 'Pieejamie faili'; +$lang['accessdenied'] = 'Šo lapu nav atļauts skatīt.'; $lang['mediausage'] = 'Atsaucei uz failu lietot šādu sintaksi:'; $lang['mediaview'] = 'Skatīt oriģinālo failu'; $lang['mediaroot'] = 'sakne'; @@ -153,6 +155,7 @@ $lang['current'] = 'patlaban'; $lang['yours'] = 'Tava versija'; $lang['diff'] = 'atšķirības no patreizējas versijas'; $lang['diff2'] = 'norādīto versiju atšķirības'; +$lang['difflink'] = 'Saite uz salīdzināšanas skatu.'; $lang['line'] = 'Rinda'; $lang['breadcrumb'] = 'Ceļš'; $lang['youarehere'] = 'Tu atrodies šeit'; @@ -164,6 +167,7 @@ $lang['restored'] = 'vecā versija atjaunota'; $lang['external_edit'] = 'ārpussistēmas labojums'; $lang['summary'] = 'Anotācija'; $lang['noflash'] = 'Lai attēlotu lapas saturu, vajag Adobe Flash Plugin.'; +$lang['download'] = 'Lejuplādēt «kodiņu»((snippet))'; $lang['mail_newpage'] = 'lapa pievienota:'; $lang['mail_changed'] = 'lapa mainīta:'; $lang['mail_subscribe_list'] = 'Nodaļā mainītās lapas:'; @@ -249,6 +253,7 @@ $lang['i_pol0'] = 'Atvērts Wiki (raksta, lasa un augšupielādē $lang['i_pol1'] = 'Publisks Wiki (lasa ikviens, raksta un augšupielādē reģistrēti lietotāji)'; $lang['i_pol2'] = 'Slēgts Wiki (raksta, lasa un augšupielādē tikai reģistrēti lietotāji)'; $lang['i_retry'] = 'Atkārtot'; +$lang['i_license'] = 'Ar kādu licenci saturs tiks publicēts:'; $lang['mu_intro'] = 'Šeit var augšupielādēt uzreiz vairāku failus. Uzklikšķini Pārlūkot pogai, lai tos ieliktu rindā. Nospied Augšupielādēt, kad rinda sastādīta.'; $lang['mu_gridname'] = 'Faila vārds'; $lang['mu_gridsize'] = 'Izmērs'; @@ -272,3 +277,4 @@ $lang['days'] = 'pirms %d dienām'; $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).'; -- cgit v1.2.3 From 53ea2c3cb9249f966e6c4a20476ecb693344b52a Mon Sep 17 00:00:00 2001 From: lupo49 Date: Wed, 6 Oct 2010 19:11:54 +0200 Subject: typos fixed / added new strings --- inc/lang/de-informal/lang.php | 58 +++++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 18 deletions(-) (limited to 'inc') diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php index 5048d08cb..103432087 100644 --- a/inc/lang/de-informal/lang.php +++ b/inc/lang/de-informal/lang.php @@ -54,7 +54,7 @@ $lang['btn_profile'] = 'Benutzerprofil'; $lang['btn_reset'] = 'Zurücksetzen'; $lang['btn_resendpwd'] = 'Sende neues Passwort'; $lang['btn_draft'] = 'Entwurf bearbeiten'; -$lang['btn_recover'] = 'Entwurf wieder herstellen'; +$lang['btn_recover'] = 'Entwurf wiederherstellen'; $lang['btn_draftdel'] = 'Entwurf löschen'; $lang['btn_revert'] = 'Wiederherstellen'; $lang['loggedinas'] = 'Angemeldet als'; @@ -71,16 +71,16 @@ $lang['profile'] = 'Benutzerprofil'; $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, Sektionsinfo ist veraltet, lade stattdessen volle Seite.'; +$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 Email versandt.'; +$lang['regsuccess'] = 'Der neue Nutzer wurde angelegt und das Passwort per E-Mail versandt.'; $lang['regsuccess2'] = 'Der neue Nutzer wurde angelegt.'; $lang['regmailfail'] = 'Offenbar ist ein Fehler beim Versenden der Passwortmail aufgetreten. Bitte wende dich an den Wiki-Admin.'; $lang['regbadmail'] = 'Die angegebene Mail-Adresse scheint ungültig zu sein. Falls dies ein Fehler ist, wende dich bitte an den Wiki-Admin.'; $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 anmelden'; +$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.'; @@ -95,7 +95,7 @@ $lang['resendpwdconfirm'] = 'Ein Bestätigungslink wurde per E-Mail versand $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 Dateiname:'; +$lang['searchmedia'] = 'Suche nach Datei:'; $lang['searchmedia_in'] = 'Suche in %s'; $lang['txt_upload'] = 'Datei zum Hochladen auswählen'; $lang['txt_filename'] = 'Hochladen als (optional)'; @@ -107,7 +107,28 @@ $lang['js']['notsavedyet'] = 'Nicht gespeicherte Änderungen gehen verloren! $lang['js']['searchmedia'] = 'Suche nach Dateien'; $lang['js']['keepopen'] = 'Fenster nach Auswahl nicht schließen'; $lang['js']['hidedetails'] = 'Details ausblenden'; -$lang['js']['nosmblinks'] = 'Das Verlinken von Windows Freigaben funktioniert nur im Microsoft Internet Explorer. +$lang['js']['mediatitle'] = 'Link-Eigenschaften'; +$lang['js']['mediadisplay'] = 'Linktyp'; +$lang['js']['mediaalign'] = 'Ausrichtung'; +$lang['js']['mediasize'] = 'Bildgröße'; +$lang['js']['mediatarget'] = 'Linkziel'; +$lang['js']['mediaclose'] = 'Schließen'; +$lang['js']['mediainsert'] = 'Einfügen'; +$lang['js']['mediadisplayimg'] = 'Bild anzeigen.'; +$lang['js']['mediadisplaylnk'] = 'Nur den Link anzeigen.'; +$lang['js']['mediasmall'] = 'Kleine Version'; +$lang['js']['mediamedium'] = 'Mittelgroße Version'; +$lang['js']['medialarge'] = 'Große Version'; +$lang['js']['mediaoriginal'] = 'Original Version'; +$lang['js']['medialnk'] = 'Link zu der Detailseite'; +$lang['js']['mediadirect'] = 'Direkter Link zum Original'; +$lang['js']['medianolnk'] = 'Kein link'; +$lang['js']['medianolink'] = 'Keine Verlinkung des Bildes'; +$lang['js']['medialeft'] = 'Bild nach links ausrichten.'; +$lang['js']['mediaright'] = 'Bild nach rechts ausrichten.'; +$lang['js']['mediacenter'] = 'Bild in der Mitte ausrichten'; +$lang['js']['medianoalign'] = 'Keine Ausrichtung des Bildes.'; +$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']['linkwiz'] = 'Link-Assistent'; $lang['js']['linkto'] = 'Link zu:'; @@ -126,8 +147,9 @@ $lang['uploadspam'] = 'Hochladen verweigert: Treffer auf der Spamlist $lang['uploadxss'] = 'Hochladen verweigert: Daten scheinen Schadcode zu enthalten.'; $lang['uploadsize'] = 'Die hochgeladene Datei war zu groß. (max. %s)'; $lang['deletesucc'] = 'Die Datei "%s" wurde gelöscht.'; -$lang['deletefail'] = '"%s" konnte nicht gelöscht werden - prüfe die Berechtigungen.'; -$lang['mediainuse'] = 'Die Datei "%s" wurde nicht gelöscht - sie wird noch verwendet.'; +$lang['deletefail'] = '"%s" konnte nicht gelöscht werden. Keine Berechtigung?.'; +$lang['mediainuse'] = 'Die Datei "%s" wurde nicht gelöscht. Sie wird noch verwendet.'; +$lang['mediainuse'] = 'Die Datei "%s" wurde nicht gelöscht. Sie wird noch verwendet.'; $lang['namespaces'] = 'Namensräume'; $lang['mediafiles'] = 'Vorhandene Dateien in'; $lang['accessdenied'] = 'Du hast keinen Zugriff auf diese Seite'; @@ -154,7 +176,7 @@ $lang['lastmod'] = 'Zuletzt geändert'; $lang['by'] = 'von'; $lang['deleted'] = 'gelöscht'; $lang['created'] = 'angelegt'; -$lang['restored'] = 'alte Version wieder hergestellt'; +$lang['restored'] = 'alte Version wiederhergestellt'; $lang['external_edit'] = 'Externe Bearbeitung'; $lang['summary'] = 'Zusammenfassung'; $lang['noflash'] = 'Das Adobe Flash Plugin wird benötigt, um diesen Inhalt anzuzeigen.'; @@ -188,7 +210,7 @@ $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 Ausgangsfeld'; +$lang['upperns'] = 'Gehe zum übergeordneten Namensraum'; $lang['admin_register'] = 'Neuen Benutzer anmelden'; $lang['metaedit'] = 'Metadaten bearbeiten'; $lang['metasaveerr'] = 'Die Metadaten konnten nicht gesichert werden'; @@ -204,30 +226,30 @@ $lang['img_copyr'] = 'Copyright'; $lang['img_format'] = 'Format'; $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Schlagwörter'; -$lang['authmodfailed'] = 'Benutzerüberprüfung nicht möglich. Bitte wende dich an den Systembetreuer.'; -$lang['authtempfail'] = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wende dich an den Systembetreuer.'; +$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.'; $lang['i_chooselang'] = 'Wähle deine Sprache'; -$lang['i_installer'] = 'DokuWiki Installation'; +$lang['i_installer'] = 'DokuWiki-Installation'; $lang['i_wikiname'] = 'Wiki-Name'; $lang['i_enableacl'] = 'Zugangskontrolle (ACL) aktivieren (empfohlen)'; -$lang['i_superuser'] = 'Administrator Benutzername'; +$lang['i_superuser'] = 'Benutzername des Administrators'; $lang['i_problems'] = 'Das Installationsprogramm hat unten aufgeführte Probleme festgestellt, die zunächst behoben werden müssen, bevor du mit der Installation fortfahren kannst.'; $lang['i_modified'] = 'Aus Sicherheitsgründen arbeitet dieses Script nur mit einer neuen, unmodifizierten DokuWiki-Installation. Du solltest entweder alle Dateien noch einmal frisch installieren oder die Dokuwiki-Installationsanleitung konsultieren.'; -$lang['i_funcna'] = 'Die PHP Funktion %s ist nicht verfügbar. Unter Umständen wurde sie von deinem Hoster deaktiviert?'; +$lang['i_funcna'] = 'Die PHP-Funktion %s ist nicht verfügbar. Unter Umständen wurde sie von deinem Hoster deaktiviert?'; $lang['i_phpver'] = 'Deine PHP-Version %s ist niedriger als die benötigte Version %s. Bitte aktualisiere deine PHP-Installation.'; $lang['i_permfail'] = '%s ist nicht durch DokuWiki beschreibbar. Du musst die Berechtigungen dieses Ordners ändern!'; $lang['i_confexists'] = '%s existiert bereits'; $lang['i_writeerr'] = '%s konnte nicht erzeugt werden. Du solltest die Verzeichnis-/Datei-Rechte überprüfen und die Datei manuell anlegen.'; $lang['i_badhash'] = 'Unbekannte oder modifizierte dokuwiki.php (Hash=%s)'; $lang['i_badval'] = '%s - unerlaubter oder leerer Wert'; -$lang['i_success'] = 'Die Konfiguration wurde erfolgreich abgeschlossen. Du kannst jetzt die install.php löschen. Dein - neues DokuWiki ist jetzt für dich bereit.'; +$lang['i_success'] = 'Die Konfiguration wurde erfolgreich abgeschlossen. Du kannst jetzt die install.php löschen. Dein neues DokuWiki ist jetzt für dich bereit.'; $lang['i_failure'] = 'Es sind Fehler beim Schreiben der Konfigurationsdateien aufgetreten. Du musst diese vermutlich von Hand beheben, bevor du dein neues DokuWiki nutzen kannst.'; $lang['i_policy'] = 'Anfangseinstellung für Zugangskontrolle (ACL)'; $lang['i_pol0'] = 'Offenes Wiki (lesen, schreiben, hochladen für alle)'; $lang['i_pol1'] = 'Öffentliches Wiki (lesen für alle, schreiben und hochladen für registrierte Nutzer)'; $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'; @@ -235,7 +257,7 @@ $lang['mu_gridstat'] = 'Status'; $lang['mu_namespace'] = 'Namensraum'; $lang['mu_browse'] = 'Durchsuchen'; $lang['mu_toobig'] = 'zu groß'; -$lang['mu_ready'] = 'bereit zum hochladen'; +$lang['mu_ready'] = 'bereit zum Hochladen'; $lang['mu_done'] = 'fertig'; $lang['mu_fail'] = 'gescheitert'; $lang['mu_authfail'] = 'Sitzung abgelaufen'; -- cgit v1.2.3 From 229326d2a3898e97a362bc51bd7432eb6311cf08 Mon Sep 17 00:00:00 2001 From: lupo49 Date: Wed, 6 Oct 2010 19:25:53 +0200 Subject: fixed line termination --- inc/lang/de-informal/lang.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php index 103432087..62fea0587 100644 --- a/inc/lang/de-informal/lang.php +++ b/inc/lang/de-informal/lang.php @@ -128,8 +128,7 @@ $lang['js']['medialeft'] = 'Bild nach links ausrichten.'; $lang['js']['mediaright'] = 'Bild nach rechts ausrichten.'; $lang['js']['mediacenter'] = 'Bild in der Mitte ausrichten'; $lang['js']['medianoalign'] = 'Keine Ausrichtung des Bildes.'; -$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 zu:'; $lang['js']['del_confirm'] = 'Die ausgewählten Dateien wirklich löschen?'; -- cgit v1.2.3 From 85dd53ceb1c2d9a7abe01b5ec50d155dcb142c59 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Thu, 7 Oct 2010 08:59:29 +0200 Subject: Add back subscribens link type as empty string This avoids breaking old templates --- inc/template.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'inc') diff --git a/inc/template.php b/inc/template.php index 2693c485b..c2ce130ff 100644 --- a/inc/template.php +++ b/inc/template.php @@ -621,6 +621,10 @@ function tpl_get_action($type) { return false; } break; + case 'subscribens': + // Superseeded by subscribe/subscription + return ''; + break; default: return '[unknown %s type]'; break; -- cgit v1.2.3

MaxgComp TAR
This software was created by the Maxg Network, http://maxg.info - It is distributed under the GNU Lesser General Public License - You can find the documentation of this class here
MaxgComp TAR version
ZLIB extensions	Yes' : 'No')?>
BZ2 extensions	Yes' : 'No')?>
Allow URL fopen	Yes' : 'No')?>
Time limit
PHP Version
- Special thanks to « Vincent Blavet » for his PEAR::Archive_Tar class -