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