From 60a396c8ac50f17c2e3f43a9533af86cf6976976 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 4 Feb 2014 00:34:12 +0100 Subject: wrap userlink building with event. Implements an event which can modify the link below usernames, and the displayed user name. When no name supplied, the name of currently logged-in user is used. --- inc/common.php | 109 +++++++++++++++++++++++++++++++++++++++++++------------ inc/template.php | 3 +- 2 files changed, 86 insertions(+), 26 deletions(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index 32771285b..053776a41 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1418,34 +1418,95 @@ function shorten($keep, $short, $max, $min = 9, $char = '…') { * @author Andy Webber */ function editorinfo($username) { - global $conf; + return userinfo($username); +} + +/** + * Returns users realname w/o link + * + * @param string|bool $username or false when currently logged-in user should be used + * @return string html of formatted user name + * + * @triggers COMMON_USER_LINK + */ +function userinfo($username = false) { + global $conf, $INFO; + /** @var DokuWiki_Auth_Plugin $auth */ global $auth; - switch($conf['showuseras']) { - case 'username': - case 'email': - case 'email_link': - if($auth) $info = $auth->getUserData($username); - break; - default: - return hsc($username); - } - - if(isset($info) && $info) { - switch($conf['showuseras']) { - case 'username': - return hsc($info['name']); - case 'email': - return obfuscate($info['mail']); - case 'email_link': - $mail = obfuscate($info['mail']); - return ''.$mail.''; - default: - return hsc($username); + // prepare initial event data + $data = array( + 'username' => $username, // the unique user name + 'name' => '', + 'link' => array( //setting 'link' to false disables linking + 'target' => '', + 'pre' => '', + 'suf' => '', + 'style' => '', + 'more' => '', + 'url' => '', + 'title' => '', + 'class' => '' + ), + 'userinfo' => '' + ); + if($username === false) { + $data['username'] = $_SERVER['REMOTE_USER']; + $data['name'] = ''.hsc($INFO['userinfo']['name']).' ('.hsc($_SERVER['REMOTE_USER']).')'; + } + + $evt = new Doku_Event('COMMON_USER_LINK', $data); + if($evt->advise_before(true)) { + if(empty($data['name'])) { + if($conf['showuseras'] == 'loginname') { + $data['name'] = hsc($data['username']); + } else { + if($auth) $info = $auth->getUserData($username); + if(isset($info) && $info) { + switch($conf['showuseras']) { + case 'username': + $data['name'] = hsc($info['name']); + break; + case 'email': + case 'email_link': + $data['name'] = obfuscate($info['mail']); + break; + } + } + } + } + if($data['link'] !== false && empty($data['link']['url'])){ + if($conf['showuseras'] == 'email_link') { + if(!isset($info)) { + if($auth) $info = $auth->getUserData($username); + } + if(isset($info) && $info) { + $data['link']['url'] = 'mailto:'.obfuscate($info['mail']); + } else { + $data['link'] = false; + } + + } else { + $data['link'] = false; + } + } + + if($data['link'] === false) { + $data['userinfo'] = $data['name']; + } else{ + $data['link']['name'] = $data['name']; + /** @var Doku_Renderer_xhtml $xhtml_renderer */ + static $xhtml_renderer = null; + if(is_null($xhtml_renderer)){ + $xhtml_renderer = p_get_renderer('xhtml'); + } + $data['userinfo'] = $xhtml_renderer->_formatLink($data['link']); } - } else { - return hsc($username); } + $evt->advise_after(); + unset($evt); + + return $data['userinfo']; } /** diff --git a/inc/template.php b/inc/template.php index 0a6a9e4aa..ba7279636 100644 --- a/inc/template.php +++ b/inc/template.php @@ -885,9 +885,8 @@ function tpl_youarehere($sep = ' » ') { */ function tpl_userinfo() { global $lang; - global $INFO; if(isset($_SERVER['REMOTE_USER'])) { - print $lang['loggedinas'].': '.hsc($INFO['userinfo']['name']).' ('.hsc($_SERVER['REMOTE_USER']).')'; + print $lang['loggedinas'].': '.userinfo(); return true; } return false; -- cgit v1.2.3 From 8a7e0ee6403bb358edf90c2419af066dd79cb2ce Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 4 Feb 2014 00:59:45 +0100 Subject: update $username as well, when read from _SERVER --- inc/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index 053776a41..297c36355 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1451,7 +1451,7 @@ function userinfo($username = false) { 'userinfo' => '' ); if($username === false) { - $data['username'] = $_SERVER['REMOTE_USER']; + $data['username'] = $username = $_SERVER['REMOTE_USER']; $data['name'] = ''.hsc($INFO['userinfo']['name']).' ('.hsc($_SERVER['REMOTE_USER']).')'; } -- cgit v1.2.3 From 62c8004ec7c360471b96b4faa6128cd207f89bf2 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Fri, 14 Feb 2014 14:36:54 +0100 Subject: change default arg value of userinfo in null instead false --- inc/common.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index 297c36355..c18f43668 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1429,7 +1429,7 @@ function editorinfo($username) { * * @triggers COMMON_USER_LINK */ -function userinfo($username = false) { +function userinfo($username = null) { global $conf, $INFO; /** @var DokuWiki_Auth_Plugin $auth */ global $auth; @@ -1450,7 +1450,7 @@ function userinfo($username = false) { ), 'userinfo' => '' ); - if($username === false) { + if($username === null) { $data['username'] = $username = $_SERVER['REMOTE_USER']; $data['name'] = ''.hsc($INFO['userinfo']['name']).' ('.hsc($_SERVER['REMOTE_USER']).')'; } -- cgit v1.2.3 From 7c2f8eec8f8dbd26e20f8afc516e38d5c6f1cc02 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Fri, 14 Feb 2014 23:54:54 +0100 Subject: handle interwiki without slashes as pageids. Added user interwiki * allowed urlparams * added `wiki:users:` as default user profile link --- inc/parser/xhtml.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'inc') diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 80701cd2e..fbdd8ada6 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -699,6 +699,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer { //get interwiki URL $url = $this->_resolveInterWiki($wikiName,$wikiUri); + if(strpos($url,'/') === false) { + list($url, $urlparam) = explode('?', $url, 2); + $url = wl($url, $urlparam); + } + if ( !$isImage ) { $class = preg_replace('/[^_\-a-z0-9]+/i','_',$wikiName); $link['class'] = "interwiki iw_$class"; -- cgit v1.2.3 From b3d353e634614780173506006921f7545ca81305 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sat, 15 Feb 2014 00:00:24 +0100 Subject: wikilink needs wiki target as well --- inc/parser/xhtml.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc') diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index fbdd8ada6..957dd992b 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -702,6 +702,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { if(strpos($url,'/') === false) { list($url, $urlparam) = explode('?', $url, 2); $url = wl($url, $urlparam); + $link['target'] = $conf['target']['wiki']; } if ( !$isImage ) { -- cgit v1.2.3 From 7f081821c51e704c2720b993ca5364fa5e7e3663 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sat, 15 Feb 2014 00:42:05 +0100 Subject: Extend showuseras config with username_link uses the user interwiki link as profile link --- inc/common.php | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index c18f43668..22e57b2c5 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1465,6 +1465,7 @@ function userinfo($username = null) { if(isset($info) && $info) { switch($conf['showuseras']) { case 'username': + case 'username_link': $data['name'] = hsc($info['name']); break; case 'email': @@ -1475,13 +1476,31 @@ function userinfo($username = null) { } } } + + /** @var Doku_Renderer_xhtml $xhtml_renderer */ + static $xhtml_renderer = null; + if($data['link'] !== false && empty($data['link']['url'])){ - if($conf['showuseras'] == 'email_link') { + + if(in_array($conf['showuseras'], array('email_link', 'username_link'))) { if(!isset($info)) { if($auth) $info = $auth->getUserData($username); } if(isset($info) && $info) { - $data['link']['url'] = 'mailto:'.obfuscate($info['mail']); + if($conf['showuseras'] == 'email_link') { + $data['link']['url'] = 'mailto:'.obfuscate($info['mail']); + } else { + if(is_null($xhtml_renderer)){ + $xhtml_renderer = p_get_renderer('xhtml'); + } + if(empty($xhtml_renderer->interwiki)) { + $xhtml_renderer->interwiki = getInterwiki(); + } + $shortcut = 'user'; + $url = $xhtml_renderer->_resolveInterWiki($shortcut, $username); + list($url, $urlparam) = explode('?', $url, 2); + $data['link']['url'] = wl($url, $urlparam); + } } else { $data['link'] = false; } @@ -1495,8 +1514,6 @@ function userinfo($username = null) { $data['userinfo'] = $data['name']; } else{ $data['link']['name'] = $data['name']; - /** @var Doku_Renderer_xhtml $xhtml_renderer */ - static $xhtml_renderer = null; if(is_null($xhtml_renderer)){ $xhtml_renderer = p_get_renderer('xhtml'); } -- cgit v1.2.3 From 40e0b44409037978b0bce4b451b1569c3bc3ee19 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sat, 15 Feb 2014 10:58:33 +0100 Subject: use http_sendfile correct --- inc/actions.php | 2 +- inc/fetch.functions.php | 2 +- inc/httputils.php | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'inc') diff --git a/inc/actions.php b/inc/actions.php index 50cbe369f..4dbad1a32 100644 --- a/inc/actions.php +++ b/inc/actions.php @@ -697,7 +697,7 @@ function act_sitemap($act) { // Send file //use x-sendfile header to pass the delivery to compatible webservers - if (http_sendfile($sitemap)) exit; + http_sendfile($sitemap); readfile($sitemap); exit; diff --git a/inc/fetch.functions.php b/inc/fetch.functions.php index 3eacaa2fe..c61c54503 100644 --- a/inc/fetch.functions.php +++ b/inc/fetch.functions.php @@ -77,7 +77,7 @@ function sendFile($file, $mime, $dl, $cache, $public = false, $orig = null) { } //use x-sendfile header to pass the delivery to compatible webservers - if(http_sendfile($file)) exit; + http_sendfile($file); // send file contents $fp = @fopen($file, "rb"); diff --git a/inc/httputils.php b/inc/httputils.php index ca60ed509..fdf453a8c 100644 --- a/inc/httputils.php +++ b/inc/httputils.php @@ -64,12 +64,13 @@ function http_conditionalRequest($timestamp){ * Let the webserver send the given file via x-sendfile method * * @author Chris Smith + * @param string $file absolute path of file to send * @returns void or exits with previously header() commands executed */ function http_sendfile($file) { global $conf; - //use x-sendfile header to pass the delivery to compatible webservers + //use x-sendfile header to pass the delivery to compatible web servers if($conf['xsendfile'] == 1){ header("X-LIGHTTPD-send-file: $file"); ob_end_clean(); @@ -83,8 +84,6 @@ function http_sendfile($file) { ob_end_clean(); exit; } - - return false; } /** @@ -223,7 +222,8 @@ function http_cached($cache, $cache_ok) { header('Content-Encoding: gzip'); readfile($cache.".gz"); } else { - if (!http_sendfile($cache)) readfile($cache); + http_sendfile($cache); + readfile($cache); } exit; } -- cgit v1.2.3 From 446b5b5934799f1f906ea8903b1e96c981f1c1b2 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sat, 15 Feb 2014 10:59:18 +0100 Subject: FS#2388 give relative path to sendfile on nginx --- inc/httputils.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'inc') diff --git a/inc/httputils.php b/inc/httputils.php index fdf453a8c..d6532720f 100644 --- a/inc/httputils.php +++ b/inc/httputils.php @@ -80,6 +80,8 @@ function http_sendfile($file) { ob_end_clean(); exit; }elseif($conf['xsendfile'] == 3){ + // FS#2388 nginx just needs the relative path. + $file = DOKU_REL.substr($file, strlen(fullpath(DOKU_INC)) + 1); header("X-Accel-Redirect: $file"); ob_end_clean(); exit; -- cgit v1.2.3 From 2345e871e407dbece52f3181cd8b077f07cbb0c1 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sat, 15 Feb 2014 11:11:15 +0100 Subject: wikilink creating refactored to _resolveinterwiki(). Added DOKU_BASE for local target --- inc/common.php | 4 +--- inc/parser/renderer.php | 5 +++++ inc/parser/xhtml.php | 8 +------- 3 files changed, 7 insertions(+), 10 deletions(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index 22e57b2c5..e991375f5 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1497,9 +1497,7 @@ function userinfo($username = null) { $xhtml_renderer->interwiki = getInterwiki(); } $shortcut = 'user'; - $url = $xhtml_renderer->_resolveInterWiki($shortcut, $username); - list($url, $urlparam) = explode('?', $url, 2); - $data['link']['url'] = wl($url, $urlparam); + $data['link']['url'] = $xhtml_renderer->_resolveInterWiki($shortcut, $username); } } else { $data['link'] = false; diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php index e3401fd48..66a106b11 100644 --- a/inc/parser/renderer.php +++ b/inc/parser/renderer.php @@ -321,6 +321,11 @@ class Doku_Renderer extends DokuWiki_Plugin { //default $url = $url.rawurlencode($reference); } + //url without slashes is handled as a pageid + if(strpos($url,'/') === false) { + list($url, $urlparam) = explode('?', $url, 2); + $url = wl($url, $urlparam); + } if($hash) $url .= '#'.rawurlencode($hash); return $url; diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 957dd992b..f0a507721 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -699,12 +699,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer { //get interwiki URL $url = $this->_resolveInterWiki($wikiName,$wikiUri); - if(strpos($url,'/') === false) { - list($url, $urlparam) = explode('?', $url, 2); - $url = wl($url, $urlparam); - $link['target'] = $conf['target']['wiki']; - } - if ( !$isImage ) { $class = preg_replace('/[^_\-a-z0-9]+/i','_',$wikiName); $link['class'] = "interwiki iw_$class"; @@ -713,7 +707,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { } //do we stay at the same server? Use local target - if( strpos($url,DOKU_URL) === 0 ){ + if( strpos($url,DOKU_URL) === 0 OR strpos($url,DOKU_BASE) === 0){ $link['target'] = $conf['target']['wiki']; } -- cgit v1.2.3 From 5a9ce44695f44ecc76f356c1fc26f0a1846231b7 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sat, 15 Feb 2014 11:17:09 +0100 Subject: code reformatting --- inc/common.php | 30 +++++++++++++++--------------- inc/parser/renderer.php | 42 +++++++++++++++++++++--------------------- inc/parser/xhtml.php | 10 +++++----- 3 files changed, 41 insertions(+), 41 deletions(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index e991375f5..cd3c053a3 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1438,21 +1438,21 @@ function userinfo($username = null) { $data = array( 'username' => $username, // the unique user name 'name' => '', - 'link' => array( //setting 'link' to false disables linking - 'target' => '', - 'pre' => '', - 'suf' => '', - 'style' => '', - 'more' => '', - 'url' => '', - 'title' => '', - 'class' => '' + 'link' => array( //setting 'link' to false disables linking + 'target' => '', + 'pre' => '', + 'suf' => '', + 'style' => '', + 'more' => '', + 'url' => '', + 'title' => '', + 'class' => '' ), 'userinfo' => '' ); if($username === null) { $data['username'] = $username = $_SERVER['REMOTE_USER']; - $data['name'] = ''.hsc($INFO['userinfo']['name']).' ('.hsc($_SERVER['REMOTE_USER']).')'; + $data['name'] = '' . hsc($INFO['userinfo']['name']) . ' (' . hsc($_SERVER['REMOTE_USER']) . ')'; } $evt = new Doku_Event('COMMON_USER_LINK', $data); @@ -1480,7 +1480,7 @@ function userinfo($username = null) { /** @var Doku_Renderer_xhtml $xhtml_renderer */ static $xhtml_renderer = null; - if($data['link'] !== false && empty($data['link']['url'])){ + if($data['link'] !== false && empty($data['link']['url'])) { if(in_array($conf['showuseras'], array('email_link', 'username_link'))) { if(!isset($info)) { @@ -1488,9 +1488,9 @@ function userinfo($username = null) { } if(isset($info) && $info) { if($conf['showuseras'] == 'email_link') { - $data['link']['url'] = 'mailto:'.obfuscate($info['mail']); + $data['link']['url'] = 'mailto:' . obfuscate($info['mail']); } else { - if(is_null($xhtml_renderer)){ + if(is_null($xhtml_renderer)) { $xhtml_renderer = p_get_renderer('xhtml'); } if(empty($xhtml_renderer->interwiki)) { @@ -1510,9 +1510,9 @@ function userinfo($username = null) { if($data['link'] === false) { $data['userinfo'] = $data['name']; - } else{ + } else { $data['link']['name'] = $data['name']; - if(is_null($xhtml_renderer)){ + if(is_null($xhtml_renderer)) { $xhtml_renderer = p_get_renderer('xhtml'); } $data['userinfo'] = $xhtml_renderer->_formatLink($data['link']); diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php index 66a106b11..d01fc3899 100644 --- a/inc/parser/renderer.php +++ b/inc/parser/renderer.php @@ -273,17 +273,17 @@ class Doku_Renderer extends DokuWiki_Plugin { * * @author Andreas Gohr */ - function _simpleTitle($name){ + function _simpleTitle($name) { global $conf; //if there is a hash we use the ancor name only - list($name,$hash) = explode('#',$name,2); + list($name, $hash) = explode('#', $name, 2); if($hash) return $hash; - if($conf['useslash']){ - $name = strtr($name,';/',';:'); - }else{ - $name = strtr($name,';',':'); + if($conf['useslash']) { + $name = strtr($name, ';/', ';:'); + } else { + $name = strtr($name, ';', ':'); } return noNSorNS($name); @@ -292,9 +292,9 @@ class Doku_Renderer extends DokuWiki_Plugin { /** * Resolve an interwikilink */ - function _resolveInterWiki(&$shortcut,$reference){ + function _resolveInterWiki(&$shortcut, $reference) { //get interwiki URL - if ( isset($this->interwiki[$shortcut]) ) { + if(isset($this->interwiki[$shortcut])) { $url = $this->interwiki[$shortcut]; } else { // Default to Google I'm feeling lucky @@ -303,30 +303,30 @@ class Doku_Renderer extends DokuWiki_Plugin { } //split into hash and url part - list($reference,$hash) = explode('#',$reference,2); + list($reference, $hash) = explode('#', $reference, 2); //replace placeholder - if(preg_match('#\{(URL|NAME|SCHEME|HOST|PORT|PATH|QUERY)\}#',$url)){ + if(preg_match('#\{(URL|NAME|SCHEME|HOST|PORT|PATH|QUERY)\}#', $url)) { //use placeholders - $url = str_replace('{URL}',rawurlencode($reference),$url); - $url = str_replace('{NAME}',$reference,$url); + $url = str_replace('{URL}', rawurlencode($reference), $url); + $url = str_replace('{NAME}', $reference, $url); $parsed = parse_url($reference); if(!$parsed['port']) $parsed['port'] = 80; - $url = str_replace('{SCHEME}',$parsed['scheme'],$url); - $url = str_replace('{HOST}',$parsed['host'],$url); - $url = str_replace('{PORT}',$parsed['port'],$url); - $url = str_replace('{PATH}',$parsed['path'],$url); - $url = str_replace('{QUERY}',$parsed['query'],$url); - }else{ + $url = str_replace('{SCHEME}', $parsed['scheme'], $url); + $url = str_replace('{HOST}', $parsed['host'], $url); + $url = str_replace('{PORT}', $parsed['port'], $url); + $url = str_replace('{PATH}', $parsed['path'], $url); + $url = str_replace('{QUERY}', $parsed['query'], $url); + } else { //default - $url = $url.rawurlencode($reference); + $url = $url . rawurlencode($reference); } //url without slashes is handled as a pageid - if(strpos($url,'/') === false) { + if(strpos($url, '/') === false) { list($url, $urlparam) = explode('?', $url, 2); $url = wl($url, $urlparam); } - if($hash) $url .= '#'.rawurlencode($hash); + if($hash) $url .= '#' . rawurlencode($hash); return $url; } diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index f0a507721..20cd8e9d6 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -685,7 +685,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { } /** - */ + */ function interwikilink($match, $name = null, $wikiName, $wikiUri) { global $conf; @@ -697,17 +697,17 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $link['name'] = $this->_getLinkTitle($name, $wikiUri, $isImage); //get interwiki URL - $url = $this->_resolveInterWiki($wikiName,$wikiUri); + $url = $this->_resolveInterWiki($wikiName, $wikiUri); - if ( !$isImage ) { - $class = preg_replace('/[^_\-a-z0-9]+/i','_',$wikiName); + if(!$isImage) { + $class = preg_replace('/[^_\-a-z0-9]+/i', '_', $wikiName); $link['class'] = "interwiki iw_$class"; } else { $link['class'] = 'media'; } //do we stay at the same server? Use local target - if( strpos($url,DOKU_URL) === 0 OR strpos($url,DOKU_BASE) === 0){ + if(strpos($url, DOKU_URL) === 0 OR strpos($url, DOKU_BASE) === 0) { $link['target'] = $conf['target']['wiki']; } -- cgit v1.2.3 From 6496c33fc8e98f6e3acaaa5db0234d9c07bec4fe Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sat, 15 Feb 2014 14:34:26 +0100 Subject: interwiki : prefixed configurls handled as wikilinks --- inc/common.php | 10 +++++++++- inc/parser/renderer.php | 9 +++++---- inc/parser/xhtml.php | 11 ++++++++++- 3 files changed, 24 insertions(+), 6 deletions(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index cd3c053a3..aa59a8c11 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1497,7 +1497,15 @@ function userinfo($username = null) { $xhtml_renderer->interwiki = getInterwiki(); } $shortcut = 'user'; - $data['link']['url'] = $xhtml_renderer->_resolveInterWiki($shortcut, $username); + $data['link']['url'] = $xhtml_renderer->_resolveInterWiki($shortcut, $username, $exists); + if($exists !== null) { + if($exists) { + $data['link']['class'] .= ' wikilink1'; + } else { + $data['link']['class'] .= ' wikilink2'; + $data['link']['rel'] = 'nofollow'; + } + } } } else { $data['link'] = false; diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php index d01fc3899..fa70c299e 100644 --- a/inc/parser/renderer.php +++ b/inc/parser/renderer.php @@ -292,7 +292,7 @@ class Doku_Renderer extends DokuWiki_Plugin { /** * Resolve an interwikilink */ - function _resolveInterWiki(&$shortcut, $reference) { + function _resolveInterWiki(&$shortcut, $reference, &$exists=null) { //get interwiki URL if(isset($this->interwiki[$shortcut])) { $url = $this->interwiki[$shortcut]; @@ -322,9 +322,10 @@ class Doku_Renderer extends DokuWiki_Plugin { $url = $url . rawurlencode($reference); } //url without slashes is handled as a pageid - if(strpos($url, '/') === false) { - list($url, $urlparam) = explode('?', $url, 2); - $url = wl($url, $urlparam); + if($url{0} === ':') { + list($id, $urlparam) = explode('?', $url, 2); + $url = wl(cleanID($id), $urlparam); + $exists = page_exists($id); } if($hash) $url .= '#' . rawurlencode($hash); diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 20cd8e9d6..53a4dbcad 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -697,7 +697,8 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $link['name'] = $this->_getLinkTitle($name, $wikiUri, $isImage); //get interwiki URL - $url = $this->_resolveInterWiki($wikiName, $wikiUri); + $exists = null; + $url = $this->_resolveInterWiki($wikiName, $wikiUri, $exists); if(!$isImage) { $class = preg_replace('/[^_\-a-z0-9]+/i', '_', $wikiName); @@ -710,6 +711,14 @@ class Doku_Renderer_xhtml extends Doku_Renderer { if(strpos($url, DOKU_URL) === 0 OR strpos($url, DOKU_BASE) === 0) { $link['target'] = $conf['target']['wiki']; } + if($exists !== null && !$isImage) { + if($exists) { + $link['class'] .= ' wikilink1'; + } else { + $link['class'] .= ' wikilink2'; + $link['rel'] = 'nofollow'; + } + } $link['url'] = $url; $link['title'] = htmlspecialchars($link['url']); -- cgit v1.2.3 From ef3e3cddddc43156f53958411f3396c9ef5dec60 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sat, 15 Feb 2014 14:55:51 +0100 Subject: Only use the whole text as search snippet when it's the first match --- inc/fulltext.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/fulltext.php b/inc/fulltext.php index bd8e6b866..fdaa1a19b 100644 --- a/inc/fulltext.php +++ b/inc/fulltext.php @@ -333,7 +333,7 @@ function ft_snippet($id,$highlight){ $pre = min($pre,100-$post); } else if ($post>50) { $post = min($post, 100-$pre); - } else { + } else if ($offset == 0) { // both are less than 50, means the context is the whole string // make it so and break out of this loop - there is no need for the // complex snippet calculations -- cgit v1.2.3 From 43d58b76484489688582f407d73054a3d4ddcba1 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sat, 15 Feb 2014 15:34:03 +0100 Subject: Fix the snippet search to continue after the previous match --- inc/fulltext.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'inc') diff --git a/inc/fulltext.php b/inc/fulltext.php index fdaa1a19b..87b5a7370 100644 --- a/inc/fulltext.php +++ b/inc/fulltext.php @@ -354,12 +354,12 @@ function ft_snippet($id,$highlight){ } // set $offset for next match attempt - // substract strlen to avoid splitting a potential search success, - // this is an approximation as the search pattern may match strings - // of varying length and it will fail if the context snippet - // boundary breaks a matching string longer than the current match - $utf8_offset = $utf8_idx + $post; - $offset = $idx + strlen(utf8_substr($text,$utf8_idx,$post)); + // continue matching after the current match + // if the current match is not the longest possible match starting at the current offset + // this prevents further matching of this snippet but for possible matches of length + // smaller than match length + context (at least 50 characters) this match is part of the context + $utf8_offset = $utf8_idx + $utf8_len; + $offset = $idx + strlen(utf8_substr($text,$utf8_idx,$utf8_len)); $offset = utf8_correctIdx($text,$offset); } -- cgit v1.2.3 From a7e8b43e07d1665d3fdff8bde3a9850c0228efaf Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sat, 15 Feb 2014 15:47:24 +0100 Subject: Add FULLTEXT_PHRASE_MATCH event for allowing plugins to match phrases Our index doesn't support phrase searches so we are searching for the pages that contain all words of the phrase and then search again in the content of the pages. As plugins can also add additional text to the index this event allows plugins to do phrase matching in their content. --- inc/fulltext.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/fulltext.php b/inc/fulltext.php index bd8e6b866..cc6742e5d 100644 --- a/inc/fulltext.php +++ b/inc/fulltext.php @@ -72,8 +72,20 @@ function _ft_pageSearch(&$data) { $pages = end($stack); $pages_matched = array(); foreach(array_keys($pages) as $id){ - $text = utf8_strtolower(rawWiki($id)); - if (strpos($text, $phrase) !== false) { + $evdata = array( + 'id' => $id, + 'phrase' => $phrase, + 'text' => rawWiki($id) + ); + $evt = new Doku_Event('FULLTEXT_PHRASE_MATCH',$evdata); + if ($evt->advise_before() && $evt->result !== true) { + $text = utf8_strtolower($evdata['text']); + if (strpos($text, $phrase) !== false) { + $evt->result = true; + } + } + $evt->advise_after(); + if ($evt->result === true) { $pages_matched[$id] = 0; // phrase: always 0 hit } } -- cgit v1.2.3 From f379edc2c80eee8cab2b94a4374113a0100f3929 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sat, 15 Feb 2014 16:51:48 +0100 Subject: fix comment in _resolveInterWiki --- inc/parser/renderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php index fa70c299e..01a1fbfec 100644 --- a/inc/parser/renderer.php +++ b/inc/parser/renderer.php @@ -321,7 +321,7 @@ class Doku_Renderer extends DokuWiki_Plugin { //default $url = $url . rawurlencode($reference); } - //url without slashes is handled as a pageid + //handle as wiki links if($url{0} === ':') { list($id, $urlparam) = explode('?', $url, 2); $url = wl(cleanID($id), $urlparam); -- cgit v1.2.3 From acbf061c66059df3daf7cdbe7e8ec4182418dd20 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sat, 15 Feb 2014 22:09:04 +0100 Subject: add Reply-To and Sender to whitelist for cleanAddress FS#2916 --- inc/Mailer.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/Mailer.class.php b/inc/Mailer.class.php index 2ac2c1d60..480dc0e01 100644 --- a/inc/Mailer.class.php +++ b/inc/Mailer.class.php @@ -522,7 +522,7 @@ class Mailer { // clean up addresses if(empty($this->headers['From'])) $this->from($conf['mailfrom']); - $addrs = array('To', 'From', 'Cc', 'Bcc'); + $addrs = array('To', 'From', 'Cc', 'Bcc', 'Reply-To', 'Sender'); foreach($addrs as $addr) { if(isset($this->headers[$addr])) { $this->headers[$addr] = $this->cleanAddress($this->headers[$addr]); -- cgit v1.2.3 From 8c253612ce858dfc41922e084c065888b592e8bd Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sat, 15 Feb 2014 22:09:24 +0100 Subject: improve PHPDocs of Mailer --- inc/Mailer.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'inc') diff --git a/inc/Mailer.class.php b/inc/Mailer.class.php index 480dc0e01..e32178bba 100644 --- a/inc/Mailer.class.php +++ b/inc/Mailer.class.php @@ -277,7 +277,7 @@ class Mailer { /** * Add the To: recipients * - * @see setAddress + * @see cleanAddress * @param string|array $address Multiple adresses separated by commas or as array */ public function to($address) { @@ -287,7 +287,7 @@ class Mailer { /** * Add the Cc: recipients * - * @see setAddress + * @see cleanAddress * @param string|array $address Multiple adresses separated by commas or as array */ public function cc($address) { @@ -297,7 +297,7 @@ class Mailer { /** * Add the Bcc: recipients * - * @see setAddress + * @see cleanAddress * @param string|array $address Multiple adresses separated by commas or as array */ public function bcc($address) { @@ -310,7 +310,7 @@ class Mailer { * This is set to $conf['mailfrom'] when not specified so you shouldn't need * to call this function * - * @see setAddress + * @see cleanAddress * @param string $address from address */ public function from($address) { @@ -333,9 +333,9 @@ class Mailer { * for headers. Addresses may not contain Non-ASCII data! * * Example: - * setAddress("föö , me@somewhere.com","TBcc"); + * cc("föö , me@somewhere.com","TBcc"); * - * @param string|array $address Multiple adresses separated by commas or as array + * @param string|array $addresses Multiple adresses separated by commas or as array * @return bool|string the prepared header (can contain multiple lines) */ public function cleanAddress($addresses) { -- cgit v1.2.3 From 17954bb5e3033069554ebb963fb9040c52b4760b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 15 Feb 2014 22:46:32 +0000 Subject: added title to video/audio tags, use title for fallback links, refactored duplicate code --- inc/parser/xhtml.php | 51 ++++++++++++++++----------------------------------- 1 file changed, 16 insertions(+), 35 deletions(-) (limited to 'inc') diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 80701cd2e..9d75c271d 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -1096,48 +1096,30 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $ret .= ' />'; - }elseif(media_supportedav($mime, 'video')){ + }elseif(media_supportedav($mime, 'video') || media_supportedav($mime, 'audio')){ // first get the $title - if (!is_null($title)) { - $title = $this->_xmlEntities($title); - } - if (!$title) { - // just show the sourcename - $title = $this->_xmlEntities(utf8_basename(noNS($src))); - } + $title = !is_null($title) ? $this->_xmlEntities($title) : false; if (!$render) { - // if the video is not supposed to be rendered - // return the title of the video - return $title; + // if the file is not supposed to be rendered + // return the title of the file (just the sourcename if there is no title) + return $title ? $title : $this->_xmlEntities(utf8_basename(noNS($src))); } $att = array(); $att['class'] = "media$align"; - - //add video(s) - $ret .= $this->_video($src, $width, $height, $att); - - }elseif(media_supportedav($mime, 'audio')){ - // first get the $title - if (!is_null($title)) { - $title = $this->_xmlEntities($title); + if ($title) { + $att['title'] = $title; } - if (!$title) { - // just show the sourcename - $title = $this->_xmlEntities(utf8_basename(noNS($src))); + + if (media_supportedav($mime, 'video')) { + //add video + $ret .= $this->_video($src, $width, $height, $att); } - if (!$render) { - // if the video is not supposed to be rendered - // return the title of the video - return $title; + if (media_supportedav($mime, 'audio')) { + //add audio + $ret .= $this->_audio($src, $att); } - $att = array(); - $att['class'] = "media$align"; - - //add audio - $ret .= $this->_audio($src, $att); - }elseif($mime == 'application/x-shockwave-flash'){ if (!$render) { // if the flash is not supposed to be rendered @@ -1282,7 +1264,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer { * @return string */ function _video($src,$width,$height,$atts=null){ - // prepare width and height if(is_null($atts)) $atts = array(); $atts['width'] = (int) $width; @@ -1309,7 +1290,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { // output source for each alternative video format foreach($alternatives as $mime => $file) { $url = ml($file,array('cache'=>$cache),true,'&'); - $title = $this->_xmlEntities(utf8_basename(noNS($file))); + $title = $atts['title'] ? $atts['title'] : $this->_xmlEntities(utf8_basename(noNS($file))); $out .= ''.NL; // alternative content (just a link to the file) @@ -1345,7 +1326,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { // output source for each alternative audio format foreach($alternatives as $mime => $file) { $url = ml($file,array('cache'=>$cache),true,'&'); - $title = $this->_xmlEntities(utf8_basename(noNS($file))); + $title = $atts['title'] ? $atts['title'] : $this->_xmlEntities(utf8_basename(noNS($file))); $out .= ''.NL; // alternative content (just a link to the file) -- cgit v1.2.3 From b83a74f191b6ee9120c0c376509164285480ebac Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 15 Feb 2014 23:44:00 +0000 Subject: fixed typo in phpdoc --- inc/media.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/media.php b/inc/media.php index 56fa5d54b..fe155f0f3 100644 --- a/inc/media.php +++ b/inc/media.php @@ -2164,7 +2164,7 @@ function media_alternativefiles($src, $exts){ /** * Check if video/audio is supported to be embedded. * - * @param string $src - mimetype of media file + * @param string $mime - mimetype of media file * @param string $type - type of media files to check ('video', 'audio', or none) * @return boolean * -- cgit v1.2.3 From b95f73d374c43006a82eddd35b630bd10a9fbb5f Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 16 Feb 2014 16:20:54 +0000 Subject: Add ordering to event handlers Allows a sequence integer to be supplied when registering to handle an event. When processing an event, handlers (hooks) will be executed in ascending order of their sequence number. If two or more handlers have the same sequence number their order of execution is undefined. A handler wanting to be first, should use -PHP_MAX_INT. A handler wanting to be last can use PHP_MAX_INT. There may be conflicts if two or more plugins use these values in the expectation that they will guarantee being first or last. --- inc/events.php | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'inc') diff --git a/inc/events.php b/inc/events.php index f7b1a7a16..9c3169b34 100644 --- a/inc/events.php +++ b/inc/events.php @@ -148,9 +148,10 @@ class Doku_Event_Handler { * if NULL, method is assumed to be a globally available function * @param $method (function) event handler function * @param $param (mixed) data passed to the event handler + * @param $seq (int) sequence number for ordering hook execution (ascending) */ - function register_hook($event, $advise, $obj, $method, $param=null) { - $this->_hooks[$event.'_'.$advise][] = array($obj, $method, $param); + function register_hook($event, $advise, $obj, $method, $param=null, $seq=0) { + $this->_hooks[$event.'_'.$advise][] = array($obj, $method, $param, (int)$seq); } function process_event(&$event,$advise='') { @@ -158,8 +159,8 @@ class Doku_Event_Handler { $evt_name = $event->name . ($advise ? '_'.$advise : '_BEFORE'); if (!empty($this->_hooks[$evt_name])) { - foreach ($this->_hooks[$evt_name] as $hook) { - // list($obj, $method, $param) = $hook; + foreach ($this->sort_hooks($this->_hooks[$evt_name]) as $hook) { + // list($obj, $method, $param, $seq) = $hook; $obj =& $hook[0]; $method = $hook[1]; $param = $hook[2]; @@ -174,6 +175,20 @@ class Doku_Event_Handler { } } } + + protected function sort_hooks($hooks) { + usort($hooks, array('Doku_Event_Handler','cmp_hooks')); + return $hooks; + } + + public static function cmp_hooks($a, $b) { + if ($a[3] == $b[3]) { + return 0; + } + + return ($a[3] < $b[3]) ? -1 : 1; + } + } /** -- cgit v1.2.3 From adb80b0288b9e3c7c4576056d5e1d0dc77bcb842 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 16 Feb 2014 16:35:34 +0000 Subject: An event object used as a string will return its name - the event name --- inc/events.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'inc') diff --git a/inc/events.php b/inc/events.php index 9c3169b34..44ccdb8a6 100644 --- a/inc/events.php +++ b/inc/events.php @@ -32,6 +32,10 @@ class Doku_Event { } + function __toString() { + return $this->name; + } + /** * advise functions * -- cgit v1.2.3 From d668eb9fab52028922a60c337d370b956602a533 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 16 Feb 2014 16:36:33 +0000 Subject: since php 5, no need to access objects by reference --- inc/events.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'inc') diff --git a/inc/events.php b/inc/events.php index 44ccdb8a6..ed60c95fe 100644 --- a/inc/events.php +++ b/inc/events.php @@ -164,10 +164,7 @@ class Doku_Event_Handler { if (!empty($this->_hooks[$evt_name])) { foreach ($this->sort_hooks($this->_hooks[$evt_name]) as $hook) { - // list($obj, $method, $param, $seq) = $hook; - $obj =& $hook[0]; - $method = $hook[1]; - $param = $hook[2]; + list($obj, $method, $param, $seq) = $hook; if (is_null($obj)) { $method($event, $param); -- cgit v1.2.3 From dfe934f96f476bdcf60d82feceb4d2a78df28ca0 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 16 Feb 2014 20:52:10 +0100 Subject: Switched file icons against generated ones, added 32x32 versions --- inc/media.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'inc') diff --git a/inc/media.php b/inc/media.php index 56fa5d54b..803587c64 100644 --- a/inc/media.php +++ b/inc/media.php @@ -1427,10 +1427,10 @@ function media_printfile($item,$auth,$jump,$display_namespace=false){ function media_printicon($filename){ list($ext) = mimetype(mediaFN($filename),false); - if (@file_exists(DOKU_INC.'lib/images/fileicons/'.$ext.'.png')) { - $icon = DOKU_BASE.'lib/images/fileicons/'.$ext.'.png'; + if (@file_exists(DOKU_INC.'lib/images/fileicons/32x32/'.$ext.'.png')) { + $icon = DOKU_BASE.'lib/images/fileicons/32x32/'.$ext.'.png'; } else { - $icon = DOKU_BASE.'lib/images/fileicons/file.png'; + $icon = DOKU_BASE.'lib/images/fileicons/32x32/file.png'; } return ''.$filename.''; -- cgit v1.2.3 From b9bd3ecff7347bc96d59368f3f4ba4a271ecf0bd Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 16 Feb 2014 20:15:07 +0000 Subject: add appropriate visibility keywords to event properties --- inc/events.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'inc') diff --git a/inc/events.php b/inc/events.php index ed60c95fe..e9ffa5a92 100644 --- a/inc/events.php +++ b/inc/events.php @@ -11,12 +11,12 @@ if(!defined('DOKU_INC')) die('meh.'); class Doku_Event { // public properties - var $name = ''; // READONLY event name, objects must register against this name to see the event - var $data = null; // READWRITE data relevant to the event, no standardised format (YET!) - var $result = null; // READWRITE the results of the event action, only relevant in "_AFTER" advise + public $name = ''; // READONLY event name, objects must register against this name to see the event + public $data = null; // READWRITE data relevant to the event, no standardised format (YET!) + public $result = null; // READWRITE the results of the event action, only relevant in "_AFTER" advise // event handlers may modify this if they are preventing the default action // to provide the after event handlers with event results - var $canPreventDefault = true; // READONLY if true, event handlers can prevent the events default action + public $canPreventDefault = true; // READONLY if true, event handlers can prevent the events default action // private properties, event handlers can effect these through the provided methods var $_default = true; // whether or not to carry out the default action associated with the event @@ -121,7 +121,7 @@ class Doku_Event_Handler { // public properties: none // private properties - var $_hooks = array(); // array of events and their registered handlers + protected $_hooks = array(); // array of events and their registered handlers /** * event_handler -- cgit v1.2.3 From 33416b823f72c23623d441e6341f564c41cd8f8f Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 16 Feb 2014 20:18:30 +0000 Subject: remove reference operator from object, no longer required --- inc/events.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/events.php b/inc/events.php index e9ffa5a92..91b0d181a 100644 --- a/inc/events.php +++ b/inc/events.php @@ -158,7 +158,7 @@ class Doku_Event_Handler { $this->_hooks[$event.'_'.$advise][] = array($obj, $method, $param, (int)$seq); } - function process_event(&$event,$advise='') { + function process_event($event,$advise='') { $evt_name = $event->name . ($advise ? '_'.$advise : '_BEFORE'); -- cgit v1.2.3 From cf0a922758503003100c988bf25eeaaa8e5b287c Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 16 Feb 2014 20:19:09 +0000 Subject: Ensure hook array is always in the correct sequence Changed to sort on add from sort on process for efficiency. Some events (e.g. AUTH_ACL_CHECK) could be trigged many times in a single page request. --- inc/events.php | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) (limited to 'inc') diff --git a/inc/events.php b/inc/events.php index 91b0d181a..888b968b5 100644 --- a/inc/events.php +++ b/inc/events.php @@ -155,7 +155,13 @@ class Doku_Event_Handler { * @param $seq (int) sequence number for ordering hook execution (ascending) */ function register_hook($event, $advise, $obj, $method, $param=null, $seq=0) { - $this->_hooks[$event.'_'.$advise][] = array($obj, $method, $param, (int)$seq); + $seq = (int)$seq; + $doSort = !isset($this->_hooks[$event.'_'.$advise][$seq]); + $this->_hooks[$event.'_'.$advise][$seq][] = array($obj, $method, $param); + + if ($doSort) { + ksort($this->_hooks[$event.'_'.$advise]); + } } function process_event($event,$advise='') { @@ -163,33 +169,21 @@ class Doku_Event_Handler { $evt_name = $event->name . ($advise ? '_'.$advise : '_BEFORE'); if (!empty($this->_hooks[$evt_name])) { - foreach ($this->sort_hooks($this->_hooks[$evt_name]) as $hook) { - list($obj, $method, $param, $seq) = $hook; + foreach ($this->_hooks[$evt_name] as $sequenced_hooks) { + foreach ($sequenced_hooks as $hook) { + list($obj, $method, $param, $seq) = $hook; - if (is_null($obj)) { - $method($event, $param); - } else { - $obj->$method($event, $param); - } + if (is_null($obj)) { + $method($event, $param); + } else { + $obj->$method($event, $param); + } - if (!$event->_continue) break; + if (!$event->_continue) return; + } } } } - - protected function sort_hooks($hooks) { - usort($hooks, array('Doku_Event_Handler','cmp_hooks')); - return $hooks; - } - - public static function cmp_hooks($a, $b) { - if ($a[3] == $b[3]) { - return 0; - } - - return ($a[3] < $b[3]) ? -1 : 1; - } - } /** -- cgit v1.2.3 From 2a2a43c4fa64079215d205d1faf50ab8a59caaab Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 17 Feb 2014 00:37:28 +0100 Subject: change default userspace to :user: and add interwiki class --- inc/common.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index aa59a8c11..4a5ead6b8 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1498,6 +1498,7 @@ function userinfo($username = null) { } $shortcut = 'user'; $data['link']['url'] = $xhtml_renderer->_resolveInterWiki($shortcut, $username, $exists); + $data['link']['class'] .= ' interwiki iw_user'; if($exists !== null) { if($exists) { $data['link']['class'] .= ' wikilink1'; -- cgit v1.2.3 From f23eef27e07dfe76ab76fda68242d44de10e4022 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 17 Feb 2014 17:56:58 +0100 Subject: PHPDocs internallink --- inc/parser/xhtml.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'inc') diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 9d75c271d..315b4d640 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -562,6 +562,12 @@ class Doku_Renderer_xhtml extends Doku_Renderer { * $search,$returnonly & $linktype are not for the renderer but are used * elsewhere - no need to implement them in other renderers * + * @param string $id pageid + * @param string|null $name link name + * @param string|null $search adds search url param + * @param bool $returnonly whether to return html or write to doc attribute + * @param string $linktype type to set use of headings + * @return void|string writes to doc attribute or returns html depends on $returnonly * @author Andreas Gohr */ function internallink($id, $name = null, $search=null,$returnonly=false,$linktype='content') { -- cgit v1.2.3 From 0e2431b761b5c24b59109867ec74d7647d16131f Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 17 Feb 2014 19:01:57 +0100 Subject: Improve PHPDocs, rename auth_basic to DokuWiki_Auth_Plugin --- inc/confutils.php | 3 ++- inc/subscription.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'inc') diff --git a/inc/confutils.php b/inc/confutils.php index 0ac003b72..31371d41f 100644 --- a/inc/confutils.php +++ b/inc/confutils.php @@ -237,13 +237,14 @@ function getConfigFiles($type) { * check if the given action was disabled in config * * @author Andreas Gohr + * @param string $action * @returns boolean true if enabled, false if disabled */ function actionOK($action){ static $disabled = null; if(is_null($disabled) || defined('SIMPLE_TEST')){ global $conf; - /** @var auth_basic $auth */ + /** @var DokuWiki_Auth_Plugin $auth */ global $auth; // prepare disabled actions array and handle legacy options diff --git a/inc/subscription.php b/inc/subscription.php index ddf2f39e6..ddf30706b 100644 --- a/inc/subscription.php +++ b/inc/subscription.php @@ -288,7 +288,7 @@ class Subscription { public function send_bulk($page) { if(!$this->isenabled()) return 0; - /** @var auth_basic $auth */ + /** @var DokuWiki_Auth_Plugin $auth */ global $auth; global $conf; global $USERINFO; @@ -651,7 +651,7 @@ class Subscription { public function notifyaddresses(&$data) { if(!$this->isenabled()) return; - /** @var auth_basic $auth */ + /** @var DokuWiki_Auth_Plugin $auth */ global $auth; global $conf; -- cgit v1.2.3 From d0f7cf78a9332d409d163cb5ec617059c72296ad Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 17 Feb 2014 19:06:34 +0100 Subject: PHPDocs improvements and minor fixes feedcreator --- inc/feedcreator.class.php | 99 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 74 insertions(+), 25 deletions(-) (limited to 'inc') diff --git a/inc/feedcreator.class.php b/inc/feedcreator.class.php index 670a1bc29..b90da5724 100644 --- a/inc/feedcreator.class.php +++ b/inc/feedcreator.class.php @@ -185,6 +185,8 @@ class HtmlDescribable { */ var $descriptionTruncSize; + var $description; + /** * Returns a formatted description field, depending on descriptionHtmlSyndicated and * $descriptionTruncSize properties @@ -222,7 +224,7 @@ class FeedHtmlField { /** * Creates a new instance of FeedHtmlField. - * @param $string: if given, sets the rawFieldContent property + * @param string $parFieldContent: if given, sets the rawFieldContent property */ function FeedHtmlField($parFieldContent) { if ($parFieldContent) { @@ -267,8 +269,14 @@ class FeedHtmlField { * @author Kai Blankenhorn */ class UniversalFeedCreator extends FeedCreator { + /** @var FeedCreator */ var $_feed; + /** + * Sets format + * + * @param string $format + */ function _setFormat($format) { switch (strtoupper($format)) { @@ -344,7 +352,7 @@ class UniversalFeedCreator extends FeedCreator { * Creates a syndication feed based on the items previously added. * * @see FeedCreator::addItem() - * @param string format format the feed should comply to. Valid values are: + * @param string $format format the feed should comply to. Valid values are: * "PIE0.1", "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3", "HTML", "JS" * @return string the contents of the feed. */ @@ -358,10 +366,10 @@ class UniversalFeedCreator extends FeedCreator { * header may be sent to redirect the use to the newly created file. * @since 1.4 * - * @param string format format the feed should comply to. Valid values are: + * @param string $format format the feed should comply to. Valid values are: * "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM", "ATOM0.3", "HTML", "JS" - * @param string filename optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()). - * @param boolean displayContents optional send the content of the file or not. If true, the file will be sent in the body of the response. + * @param string $filename optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()). + * @param boolean $displayContents optional send the content of the file or not. If true, the file will be sent in the body of the response. */ function saveFeed($format="RSS0.91", $filename="", $displayContents=true) { $this->_setFormat($format); @@ -376,10 +384,10 @@ class UniversalFeedCreator extends FeedCreator { * before anything else, especially before you do the time consuming task to build the feed * (web fetching, for example). * - * @param string format format the feed should comply to. Valid values are: + * @param string $format format the feed should comply to. Valid values are: * "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3". - * @param filename string optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()). - * @param timeout int optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour) + * @param string $filename optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()). + * @param int $timeout optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour) */ function useCached($format="RSS0.91", $filename="", $timeout=3600) { $this->_setFormat($format); @@ -390,7 +398,7 @@ class UniversalFeedCreator extends FeedCreator { /** * Outputs feed to the browser - needed for on-the-fly feed generation (like it is done in WordPress, etc.) * - * @param format string format the feed should comply to. Valid values are: + * @param $format string format the feed should comply to. Valid values are: * "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3". */ function outputFeed($format='RSS0.91') { @@ -422,7 +430,13 @@ class FeedCreator extends HtmlDescribable { /** * Optional attributes of a feed. */ - var $syndicationURL, $image, $language, $copyright, $pubDate, $lastBuildDate, $editor, $editorEmail, $webmaster, $category, $docs, $ttl, $rating, $skipHours, $skipDays; + var $syndicationURL, $language, $copyright, $pubDate, $lastBuildDate, $editor, $editorEmail, $webmaster, $category, $docs, $ttl, $rating, $skipHours, $skipDays; + /** + * Optional attribute of a feed + * + * @var FeedImage + */ + var $image = null; /** * The url of the external xsl stylesheet used to format the naked rss feed. @@ -430,13 +444,18 @@ class FeedCreator extends HtmlDescribable { */ var $xslStyleSheet = ""; + /** + * Style sheet for rss feed + */ + var $cssStyleSheet = ""; + /** * @access private + * @var FeedItem[] */ var $items = Array(); - /** * This feed's MIME content type. * @since 1.4 @@ -466,7 +485,7 @@ class FeedCreator extends HtmlDescribable { /** * Adds an FeedItem to the feed. * - * @param object FeedItem $item The FeedItem to add to the feed. + * @param FeedItem $item The FeedItem to add to the feed. * @access public */ function addItem($item) { @@ -482,8 +501,8 @@ class FeedCreator extends HtmlDescribable { * If the string is already shorter than $length, it is returned unchanged. * * @static - * @param string string A string to be truncated. - * @param int length the maximum length the string should be truncated to + * @param string $string A string to be truncated. + * @param int $length the maximum length the string should be truncated to * @return string the truncated string */ function iTrunc($string, $length) { @@ -527,8 +546,8 @@ class FeedCreator extends HtmlDescribable { /** * Creates a string containing all additional elements specified in * $additionalElements. - * @param elements array an associative array containing key => value pairs - * @param indentString string a string that will be inserted before every generated line + * @param $elements array an associative array containing key => value pairs + * @param $indentString string a string that will be inserted before every generated line * @return string the XML tags corresponding to $additionalElements */ function _createAdditionalElements($elements, $indentString="") { @@ -541,6 +560,9 @@ class FeedCreator extends HtmlDescribable { return $ae; } + /** + * Create elements for stylesheets + */ function _createStylesheetReferences() { $xml = ""; if ($this->cssStyleSheet) $xml .= "cssStyleSheet."\" type=\"text/css\"?>\n"; @@ -610,8 +632,8 @@ class FeedCreator extends HtmlDescribable { * before anything else, especially before you do the time consuming task to build the feed * (web fetching, for example). * @since 1.4 - * @param filename string optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()). - * @param timeout int optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour) + * @param $filename string optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()). + * @param $timeout int optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour) */ function useCached($filename="", $timeout=3600) { $this->_timeout = $timeout; @@ -629,8 +651,8 @@ class FeedCreator extends HtmlDescribable { * header may be sent to redirect the user to the newly created file. * @since 1.4 * - * @param filename string optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()). - * @param redirect boolean optional send an HTTP redirect header or not. If true, the user will be automatically redirected to the created file. + * @param $filename string optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()). + * @param $displayContents boolean optional send an HTTP redirect header or not. If true, the user will be automatically redirected to the created file. */ function saveFeed($filename="", $displayContents=true) { if ($filename=="") { @@ -667,6 +689,7 @@ class FeedCreator extends HtmlDescribable { * Usually, you won't need to use this. */ class FeedDate { + /** @var int */ var $unix; /** @@ -726,7 +749,7 @@ class FeedDate { /** * Gets the date stored in this FeedDate as an RFC 822 date. * - * @return a date in RFC 822 format + * @return string a date in RFC 822 format */ function rfc822() { //return gmdate("r",$this->unix); @@ -738,7 +761,7 @@ class FeedDate { /** * Gets the date stored in this FeedDate as an ISO 8601 date. * - * @return a date in ISO 8601 (RFC 3339) format + * @return string a date in ISO 8601 (RFC 3339) format */ function iso8601() { $date = gmdate("Y-m-d\TH:i:sO",$this->unix); @@ -751,7 +774,7 @@ class FeedDate { /** * Gets the date stored in this FeedDate as unix time stamp. * - * @return a date as a unix time stamp + * @return int a date as a unix time stamp */ function unix() { return $this->unix; @@ -777,7 +800,7 @@ class RSSCreator10 extends FeedCreator { $feed = "encoding."\"?>\n"; $feed.= $this->_createGeneratorComment(); if ($this->cssStyleSheet=="") { - $cssStyleSheet = "http://www.w3.org/2000/08/w3c-synd/style.css"; + $this->cssStyleSheet = "http://www.w3.org/2000/08/w3c-synd/style.css"; } $feed.= $this->_createStylesheetReferences(); $feed.= "encoding = "utf-8"; } + /** + * Build content + * @return string + */ function createFeed() { $feed = "encoding."\"?>\n"; $feed.= $this->_createStylesheetReferences(); $feed.= "\n"; $feed.= " ".FeedCreator::iTrunc(htmlspecialchars($this->title),100)."\n"; - $this->truncSize = 500; + $this->descriptionTruncSize = 500; $feed.= " ".$this->getDescription()."\n"; $feed.= " ".$this->link."\n"; $icnt = count($this->items); @@ -1091,6 +1118,10 @@ class AtomCreator10 extends FeedCreator { $this->encoding = "utf-8"; } + /** + * Build content + * @return string + */ function createFeed() { $feed = "encoding."\"?>\n"; $feed.= $this->_createGeneratorComment(); @@ -1174,6 +1205,10 @@ class AtomCreator03 extends FeedCreator { $this->encoding = "utf-8"; } + /** + * Build content + * @return string + */ function createFeed() { $feed = "encoding."\"?>\n"; $feed.= $this->_createGeneratorComment(); @@ -1281,6 +1316,7 @@ class MBOXCreator extends FeedCreator { */ function createFeed() { $icnt = count($this->items); + $feed = ""; for ($i=0; $i<$icnt; $i++) { if ($this->items[$i]->author!="") { $from = $this->items[$i]->author; @@ -1331,6 +1367,10 @@ class OPMLCreator extends FeedCreator { $this->encoding = "utf-8"; } + /** + * Build content + * @return string + */ function createFeed() { $feed = "encoding."\"?>\n"; $feed.= $this->_createGeneratorComment(); @@ -1441,6 +1481,7 @@ class HTMLCreator extends FeedCreator { } //set an openInNewWindow_token_to be inserted or not + $targetInsert = ""; if ($this->openInNewWindow) { $targetInsert = " target='_blank'"; } @@ -1568,6 +1609,14 @@ class JSCreator extends HTMLCreator { * @author Andreas Gohr */ class DokuWikiFeedCreator extends UniversalFeedCreator{ + + /** + * Build content + * + * @param string $format + * @param string $encoding + * @return string + */ function createFeed($format = "RSS0.91",$encoding='iso-8859-15') { $this->_setFormat($format); $this->_feed->encoding = $encoding; -- cgit v1.2.3 From d7fd4c3e04fcbbf463c35763e008527d3c9ad59f Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 17 Feb 2014 19:12:41 +0100 Subject: Add dynamic declared _time attribute to cache object --- inc/cache.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc') diff --git a/inc/cache.php b/inc/cache.php index 5eac94934..8453fe3e9 100644 --- a/inc/cache.php +++ b/inc/cache.php @@ -16,6 +16,7 @@ class cache { // used by _useCache to determine cache validity var $_event = ''; // event to be triggered during useCache + var $_time; function cache($key,$ext) { $this->key = $key; -- cgit v1.2.3 From 901248028bc3b7497093ab3853f2f6e347fbc397 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 17 Feb 2014 19:22:57 +0100 Subject: fix httputils PHPDocs --- inc/httputils.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'inc') diff --git a/inc/httputils.php b/inc/httputils.php index ca60ed509..003733ede 100644 --- a/inc/httputils.php +++ b/inc/httputils.php @@ -64,7 +64,8 @@ function http_conditionalRequest($timestamp){ * Let the webserver send the given file via x-sendfile method * * @author Chris Smith - * @returns void or exits with previously header() commands executed + * @param $file + * @returns bool or exits with previously header() commands executed */ function http_sendfile($file) { global $conf; @@ -92,7 +93,7 @@ function http_sendfile($file) { * * This function exits the running script * - * @param ressource $fh - file handle for an already open file + * @param resource $fh - file handle for an already open file * @param int $size - size of the whole file * @param int $mime - MIME type of the file * @@ -204,7 +205,7 @@ function http_gzip_valid($uncompressed_file) { * * This function handles output of cacheable resource files. It ses the needed * HTTP headers. If a useable cache is present, it is passed to the web server - * and the scrpt is terminated. + * and the script is terminated. */ function http_cached($cache, $cache_ok) { global $conf; -- cgit v1.2.3 From b63529ad89f66ca4de0b4b6003892ac7fd71653c Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Mon, 17 Feb 2014 20:02:35 +0000 Subject: remove '' from list, its not part of the hook array --- inc/events.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/events.php b/inc/events.php index 888b968b5..58ba4d5e4 100644 --- a/inc/events.php +++ b/inc/events.php @@ -171,7 +171,7 @@ class Doku_Event_Handler { if (!empty($this->_hooks[$evt_name])) { foreach ($this->_hooks[$evt_name] as $sequenced_hooks) { foreach ($sequenced_hooks as $hook) { - list($obj, $method, $param, $seq) = $hook; + list($obj, $method, $param) = $hook; if (is_null($obj)) { $method($event, $param); -- cgit v1.2.3 From c59b3e001d1e8258b1d118909257b70516c8a6b1 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 17 Feb 2014 23:16:59 +0100 Subject: add visibility keywords and PHPDocs for cache --- inc/cache.php | 87 ++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 25 deletions(-) (limited to 'inc') diff --git a/inc/cache.php b/inc/cache.php index 8453fe3e9..8c23bd09b 100644 --- a/inc/cache.php +++ b/inc/cache.php @@ -9,16 +9,20 @@ if(!defined('DOKU_INC')) die('meh.'); class cache { - var $key = ''; // primary identifier for this item - var $ext = ''; // file ext for cache data, secondary identifier for this item - var $cache = ''; // cache file name - var $depends = array(); // array containing cache dependency information, + public $key = ''; // primary identifier for this item + public $ext = ''; // file ext for cache data, secondary identifier for this item + public $cache = ''; // cache file name + public $depends = array(); // array containing cache dependency information, // used by _useCache to determine cache validity var $_event = ''; // event to be triggered during useCache var $_time; - function cache($key,$ext) { + /** + * @param string $key primary identifier + * @param string $ext file extension + */ + public function cache($key,$ext) { $this->key = $key; $this->ext = $ext; $this->cache = getCacheName($key,$ext); @@ -37,7 +41,7 @@ class cache { * * @return bool true if cache can be used, false otherwise */ - function useCache($depends=array()) { + public function useCache($depends=array()) { $this->depends = $depends; $this->_addDependencies(); @@ -60,7 +64,7 @@ class cache { * * @return bool see useCache() */ - function _useCache() { + protected function _useCache() { if (!empty($this->depends['purge'])) return false; // purge requested? if (!($this->_time = @filemtime($this->cache))) return false; // cache exists? @@ -84,7 +88,7 @@ class cache { * it should not remove any existing dependencies and * it should only overwrite a dependency when the new value is more stringent than the old */ - function _addDependencies() { + protected function _addDependencies() { global $INPUT; if ($INPUT->has('purge')) $this->depends['purge'] = true; // purge requested } @@ -95,7 +99,7 @@ class cache { * @param bool $clean true to clean line endings, false to leave line endings alone * @return string cache contents */ - function retrieveCache($clean=true) { + public function retrieveCache($clean=true) { return io_readFile($this->cache, $clean); } @@ -105,14 +109,14 @@ class cache { * @param string $data the data to be cached * @return bool true on success, false otherwise */ - function storeCache($data) { + public function storeCache($data) { return io_savefile($this->cache, $data); } /** * remove any cached data associated with this cache instance */ - function removeCache() { + public function removeCache() { @unlink($this->cache); } @@ -123,7 +127,7 @@ class cache { * @param bool $success result of this cache use attempt * @return bool pass-thru $success value */ - function _stats($success) { + protected function _stats($success) { global $conf; static $stats = null; static $file; @@ -160,12 +164,18 @@ class cache { class cache_parser extends cache { - var $file = ''; // source file for cache - var $mode = ''; // input mode (represents the processing the input file will undergo) + public $file = ''; // source file for cache + public $mode = ''; // input mode (represents the processing the input file will undergo) var $_event = 'PARSER_CACHE_USE'; - function cache_parser($id, $file, $mode) { + /** + * + * @param string $id page id + * @param string $file source file for cache + * @param string $mode input mode + */ + public function cache_parser($id, $file, $mode) { if ($id) $this->page = $id; $this->file = $file; $this->mode = $mode; @@ -173,24 +183,29 @@ class cache_parser extends cache { parent::cache($file.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.'.$mode); } - function _useCache() { + /** + * method contains cache use decision logic + * + * @return bool see useCache() + */ + protected function _useCache() { if (!@file_exists($this->file)) return false; // source exists? return parent::_useCache(); } - function _addDependencies() { - global $conf, $config_cascade; + protected function _addDependencies() { + global $conf; $this->depends['age'] = isset($this->depends['age']) ? min($this->depends['age'],$conf['cachetime']) : $conf['cachetime']; // parser cache file dependencies ... - $files = array($this->file, // ... source + $files = array($this->file, // ... source DOKU_INC.'inc/parser/parser.php', // ... parser DOKU_INC.'inc/parser/handler.php', // ... handler ); - $files = array_merge($files, getConfigFiles('main')); // ... wiki settings + $files = array_merge($files, getConfigFiles('main')); // ... wiki settings $this->depends['files'] = !empty($this->depends['files']) ? array_merge($files, $this->depends['files']) : $files; parent::_addDependencies(); @@ -199,7 +214,13 @@ class cache_parser extends cache { } class cache_renderer extends cache_parser { - function _useCache() { + + /** + * method contains cache use decision logic + * + * @return bool see useCache() + */ + protected function _useCache() { global $conf; if (!parent::_useCache()) return false; @@ -232,7 +253,7 @@ class cache_renderer extends cache_parser { return true; } - function _addDependencies() { + protected function _addDependencies() { // renderer cache file dependencies ... $files = array( @@ -256,16 +277,32 @@ class cache_renderer extends cache_parser { class cache_instructions extends cache_parser { - function cache_instructions($id, $file) { + /** + * @param string $id page id + * @param string $file source file for cache + */ + public function cache_instructions($id, $file) { parent::cache_parser($id, $file, 'i'); } - function retrieveCache($clean=true) { + /** + * retrieve the cached data + * + * @param bool $clean true to clean line endings, false to leave line endings alone + * @return string cache contents + */ + public function retrieveCache($clean=true) { $contents = io_readFile($this->cache, false); return !empty($contents) ? unserialize($contents) : array(); } - function storeCache($instructions) { + /** + * cache $instructions + * + * @param string $instructions the instruction to be cached + * @return bool true on success, false otherwise + */ + public function storeCache($instructions) { return io_savefile($this->cache,serialize($instructions)); } } -- cgit v1.2.3 From 53204f807bcd990bb9a2463237076054da0fec49 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 17 Feb 2014 23:42:58 +0100 Subject: cleanup PHPDocs: DokuWiki_Syntax_Plugin is a DokuWiki_Plugin as well --- inc/pluginutils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/pluginutils.php b/inc/pluginutils.php index 894bbefb6..911c4e5c0 100644 --- a/inc/pluginutils.php +++ b/inc/pluginutils.php @@ -37,7 +37,7 @@ function plugin_list($type='',$all=false) { * @param $name string name of the plugin to load * @param $new bool true to return a new instance of the plugin, false to use an already loaded instance * @param $disabled bool true to load even disabled plugins - * @return DokuWiki_Plugin|DokuWiki_Syntax_Plugin|null the plugin object or null on failure + * @return DokuWiki_Plugin|null the plugin object or null on failure */ function plugin_load($type,$name,$new=false,$disabled=false) { /** @var $plugin_controller Doku_Plugin_Controller */ -- cgit v1.2.3 From 5965f64b985361323931454deffb806ec6c8695b Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 17 Feb 2014 23:43:34 +0100 Subject: PHPDocs for Doku_Event and handler --- inc/events.php | 44 ++++++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 12 deletions(-) (limited to 'inc') diff --git a/inc/events.php b/inc/events.php index 58ba4d5e4..7f9824f60 100644 --- a/inc/events.php +++ b/inc/events.php @@ -8,6 +8,9 @@ if(!defined('DOKU_INC')) die('meh.'); +/** + * The event + */ class Doku_Event { // public properties @@ -32,6 +35,9 @@ class Doku_Event { } + /** + * @return string + */ function __toString() { return $this->name; } @@ -51,7 +57,8 @@ class Doku_Event { * $evt->advise_after(); * unset($evt); * - * @return results of processing the event, usually $this->_default + * @param bool $enablePreventDefault + * @return bool results of processing the event, usually $this->_default */ function advise_before($enablePreventDefault=true) { global $EVENT_HANDLER; @@ -77,7 +84,9 @@ class Doku_Event { * $this->_default, all of which may have been modified by the event handlers. * - advise all registered (_AFTER) handlers that the event has taken place * - * @return $event->results + * @param null|callable $action + * @param bool $enablePrevent + * @return mixed $event->results * the value set by any _before or handlers if the default action is prevented * or the results of the default action (as modified by _after handlers) * or NULL no action took place and no handler modified the value @@ -116,6 +125,9 @@ class Doku_Event { function preventDefault() { $this->_default = false; } } +/** + * Controls the registration and execution of all events, + */ class Doku_Event_Handler { // public properties: none @@ -132,6 +144,7 @@ class Doku_Event_Handler { function Doku_Event_Handler() { // load action plugins + /** @var DokuWiki_Action_Plugin $plugin */ $plugin = null; $pluginlist = plugin_list('action'); @@ -147,12 +160,13 @@ class Doku_Event_Handler { * * register a hook for an event * - * @param $event (string) name used by the event, (incl '_before' or '_after' for triggers) - * @param $obj (obj) object in whose scope method is to be executed, + * @param $event string name used by the event, (incl '_before' or '_after' for triggers) + * @param $advise string + * @param $obj object object in whose scope method is to be executed, * if NULL, method is assumed to be a globally available function - * @param $method (function) event handler function - * @param $param (mixed) data passed to the event handler - * @param $seq (int) sequence number for ordering hook execution (ascending) + * @param $method string event handler function + * @param $param mixed data passed to the event handler + * @param $seq int sequence number for ordering hook execution (ascending) */ function register_hook($event, $advise, $obj, $method, $param=null, $seq=0) { $seq = (int)$seq; @@ -164,6 +178,12 @@ class Doku_Event_Handler { } } + /** + * process the before/after event + * + * @param Doku_Event $event + * @param string $advise BEFORE or AFTER + */ function process_event($event,$advise='') { $evt_name = $event->name . ($advise ? '_'.$advise : '_BEFORE'); @@ -191,12 +211,12 @@ class Doku_Event_Handler { * * function wrapper to process (create, trigger and destroy) an event * - * @param $name (string) name for the event - * @param $data (mixed) event data - * @param $action (callback) (optional, default=NULL) default action, a php callback function - * @param $canPreventDefault (bool) (optional, default=true) can hooks prevent the default action + * @param $name string name for the event + * @param $data mixed event data + * @param $action callback (optional, default=NULL) default action, a php callback function + * @param $canPreventDefault bool (optional, default=true) can hooks prevent the default action * - * @return (mixed) the event results value after all event processing is complete + * @return mixed the event results value after all event processing is complete * by default this is the return value of the default action however * it can be set or modified by event handler hooks */ -- cgit v1.2.3 From cefd14cbc4f6dabfb2fb7b7ffb6b68d4501afd4f Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 18 Feb 2014 00:54:21 +0100 Subject: PHPDocs of cache classes --- inc/cache.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'inc') diff --git a/inc/cache.php b/inc/cache.php index 8c23bd09b..5f54a34a9 100644 --- a/inc/cache.php +++ b/inc/cache.php @@ -8,6 +8,9 @@ if(!defined('DOKU_INC')) die('meh.'); +/** + * Generic handling of caching + */ class cache { public $key = ''; // primary identifier for this item public $ext = ''; // file ext for cache data, secondary identifier for this item @@ -162,6 +165,9 @@ class cache { } } +/** + * Parser caching + */ class cache_parser extends cache { public $file = ''; // source file for cache @@ -213,6 +219,9 @@ class cache_parser extends cache { } +/** + * Caching of data of renderer + */ class cache_renderer extends cache_parser { /** @@ -275,6 +284,9 @@ class cache_renderer extends cache_parser { } } +/** + * Caching of parser instructions + */ class cache_instructions extends cache_parser { /** -- cgit v1.2.3 From dbf714f723aaf3a4e63a0ac2f07746c41fa3e98d Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 18 Feb 2014 13:34:22 +0100 Subject: Improve PHPDocs pageutils --- inc/pageutils.php | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'inc') diff --git a/inc/pageutils.php b/inc/pageutils.php index c8d3cf4bb..9c2794387 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -94,6 +94,7 @@ function getID($param='id',$clean=true){ * @author Andreas Gohr * @param string $raw_id The pageid to clean * @param boolean $ascii Force ASCII + * @return string cleaned id */ function cleanID($raw_id,$ascii=false){ global $conf; @@ -244,6 +245,7 @@ function page_exists($id,$rev='',$clean=true) { * @param $rev string page revision, empty string for current * @param $clean bool flag indicating that $raw_id should be cleaned. Only set to false * when $id is guaranteed to have been cleaned already. + * @return string full path * * @author Andreas Gohr */ @@ -361,6 +363,7 @@ function mediaFN($id, $rev=''){ * * @param string $id The id of the local file * @param string $ext The file extension (usually txt) + * @return string full filepath to localized file * @author Andreas Gohr */ function localeFN($id,$ext='txt'){ @@ -543,6 +546,11 @@ function isHiddenPage($id){ return $data['hidden']; } +/** + * callback checks if page is hidden + * + * @param array $data event data see isHiddenPage() + */ function _isHiddenPage(&$data) { global $conf; global $ACT; -- cgit v1.2.3 From 5f0071ebcd0bb2a2cb0f64834014be73f6690806 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 18 Feb 2014 13:41:13 +0100 Subject: PHPDocs form --- inc/form.php | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'inc') diff --git a/inc/form.php b/inc/form.php index 312c42b60..610f50200 100644 --- a/inc/form.php +++ b/inc/form.php @@ -47,15 +47,11 @@ class Doku_Form { * with up to four parameters is deprecated, instead the first parameter * should be an array with parameters. * - * @param mixed $params Parameters for the HTML form element; Using the - * deprecated calling convention this is the ID - * attribute of the form - * @param string $action (optional, deprecated) submit URL, defaults to - * current page - * @param string $method (optional, deprecated) 'POST' or 'GET', default - * is POST - * @param string $enctype (optional, deprecated) Encoding type of the - * data + * @param mixed $params Parameters for the HTML form element; Using the deprecated + * calling convention this is the ID attribute of the form + * @param bool|string $action (optional, deprecated) submit URL, defaults to current page + * @param bool|string $method (optional, deprecated) 'POST' or 'GET', default is POST + * @param bool|string $enctype (optional, deprecated) Encoding type of the data * @author Tom N Harris */ function Doku_Form($params, $action=false, $method=false, $enctype=false) { @@ -230,7 +226,7 @@ class Doku_Form { * first (underflow) or last (overflow) element. * * @param int $pos 0-based index - * @return arrayreference pseudo-element + * @return array reference pseudo-element * @author Tom N Harris */ function &getElementAt($pos) { -- cgit v1.2.3 From c9ec6231967652cf58f7840063ed94a26e6d8b37 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 18 Feb 2014 20:05:33 +0100 Subject: Fix PHPDocs emailadressvalidator --- inc/EmailAddressValidator.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'inc') diff --git a/inc/EmailAddressValidator.php b/inc/EmailAddressValidator.php index bb4ef0ca9..fd6f3275b 100644 --- a/inc/EmailAddressValidator.php +++ b/inc/EmailAddressValidator.php @@ -15,8 +15,8 @@ class EmailAddressValidator { /** * Check email address validity - * @param strEmailAddress Email address to be checked - * @return True if email is valid, false if not + * @param string $strEmailAddress Email address to be checked + * @return bool True if email is valid, false if not */ public function check_email_address($strEmailAddress) { @@ -82,8 +82,8 @@ class EmailAddressValidator { /** * Checks email section before "@" symbol for validity - * @param strLocalPortion Text to be checked - * @return True if local portion is valid, false if not + * @param string $strLocalPortion Text to be checked + * @return bool True if local portion is valid, false if not */ protected function check_local_portion($strLocalPortion) { // Local portion can only be from 1 to 64 characters, inclusive. @@ -113,8 +113,8 @@ class EmailAddressValidator { /** * Checks email section after "@" symbol for validity - * @param strDomainPortion Text to be checked - * @return True if domain portion is valid, false if not + * @param string $strDomainPortion Text to be checked + * @return bool True if domain portion is valid, false if not */ protected function check_domain_portion($strDomainPortion) { // Total domain can only be from 1 to 255 characters, inclusive @@ -172,10 +172,10 @@ class EmailAddressValidator { /** * Check given text length is between defined bounds - * @param strText Text to be checked - * @param intMinimum Minimum acceptable length - * @param intMaximum Maximum acceptable length - * @return True if string is within bounds (inclusive), false if not + * @param string $strText Text to be checked + * @param int $intMinimum Minimum acceptable length + * @param int $intMaximum Maximum acceptable length + * @return bool True if string is within bounds (inclusive), false if not */ protected function check_text_length($strText, $intMinimum, $intMaximum) { // Minimum and maximum are both inclusive -- cgit v1.2.3 From baf0c3e506eee97c63d130af88fe3547c31579cc Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 18 Feb 2014 21:59:16 +0100 Subject: extract navigation html to separated method --- inc/html.php | 208 +++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 118 insertions(+), 90 deletions(-) (limited to 'inc') diff --git a/inc/html.php b/inc/html.php index 05688e0aa..7d533282e 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1082,9 +1082,11 @@ function html_diff_head($l_rev, $r_rev, $id = null, $media = false, $inline = fa /** * Show diff + * between current page version and provided $text + * or between the revisions provided via GET or POST * * @author Andreas Gohr - * @param string $text compare with this text with most current version + * @param string $text when non-empty: compare with this text with most current version * @param bool $intro display the intro text * @param string $type type of the diff (inline or sidebyside) */ @@ -1184,94 +1186,7 @@ function html_diff($text = '', $intro = true, $type = null) { $l_nav = ''; $r_nav = ''; if(!$text) { - $r_rev = $r_rev ? $r_rev : $INFO['meta']['last_change']['date']; //last timestamp is not in changelog - //retrieve revisions with additional info - list($l_revs, $r_revs) = $pagelog->getRevisionsAround($l_rev, $r_rev); - $l_revisions = array(); - foreach($l_revs as $rev) { - $info = $pagelog->getRevisionInfo($rev); - $l_revisions[$rev] = array( - $rev, - dformat($info['date']) . ' ' . editorinfo($info['user']) . ' ' . $info['sum'], - $rev >= $r_rev //disable? - ); - } - $r_revisions = array(); - foreach($r_revs as $rev) { - $info = $pagelog->getRevisionInfo($rev); - $r_revisions[$rev] = array( - $rev, - dformat($info['date']) . ' ' . editorinfo($info['user']) . ' ' . $info['sum'], - $rev <= $l_rev //disable? - ); - } - //determine previous/next revisions - $l_index = array_search($l_rev, $l_revs); - $l_prev = $l_revs[$l_index + 1]; - $l_next = $l_revs[$l_index - 1]; - $r_index = array_search($r_rev, $r_revs); - $r_prev = $r_revs[$r_index + 1]; - $r_next = $r_revs[$r_index - 1]; - - //Left side: - //move back - if($l_prev) { - $l_nav .= html_diff_navigationlink($type, 'diffbothprevrev', $l_prev, $r_prev); - $l_nav .= html_diff_navigationlink($type, 'diffprevrev', $l_prev, $r_rev); - } - //dropdown - $form = new Doku_Form(array('action' => wl())); - $form->addHidden('id', $ID); - $form->addHidden('difftype', $type); - $form->addHidden('rev2[1]', $r_rev); - $form->addHidden('do', 'diff'); - $form->addElement( - form_makeListboxField( - 'rev2[0]', - $l_revisions, - $l_rev, - '', '', '', - array('class' => 'quickselect') - ) - ); - $form->addElement(form_makeButton('submit', 'diff', 'Go')); - $l_nav .= $form->getForm(); - //move forward - if($l_next < $r_rev) { - $l_nav .= html_diff_navigationlink($type, 'diffnextrev', $l_next, $r_rev); - } - - //Right side: - //move back - if($l_rev < $r_prev) { - $r_nav .= html_diff_navigationlink($type, 'diffprevrev', $l_rev, $r_prev); - } - //dropdown - $form = new Doku_Form(array('action' => wl())); - $form->addHidden('id', $ID); - $form->addHidden('rev2[0]', $l_rev); - $form->addHidden('difftype', $type); - $form->addHidden('do', 'diff'); - $form->addElement( - form_makeListboxField( - 'rev2[1]', - $r_revisions, - $r_rev, - '', '', '', - array('class' => 'quickselect') - ) - ); - $form->addElement(form_makeButton('submit', 'diff', 'Go')); - $r_nav .= $form->getForm(); - //move forward - if($r_next) { - if($pagelog->isCurrentRevision($r_next)) { - $r_nav .= html_diff_navigationlink($type, 'difflastrev', $l_rev); //last revision is diff with current page - } else { - $r_nav .= html_diff_navigationlink($type, 'diffnextrev', $l_rev, $r_next); - } - $r_nav .= html_diff_navigationlink($type, 'diffbothnextrev', $l_next, $r_next); - } + list($l_nav, $r_nav) = html_diff_navigation($pagelog, $type, $l_rev, $r_rev); } /* * Create diff object and the formatter @@ -1318,7 +1233,7 @@ function html_diff($text = '', $intro = true, $type = null) { ptln('

'); // link to exactly this view FS#2835 - html_diff_navigationlink($type, 'difflink', $l_rev, $r_rev ? $r_rev : $INFO['lastmod']); + echo html_diff_navigationlink($type, 'difflink', $l_rev, $r_rev ? $r_rev : $INFO['lastmod']); ptln('

'); ptln(''); // .diffoptions @@ -1381,6 +1296,118 @@ function html_diff($text = '', $intro = true, $type = null) { getRevisionsAround($l_rev, $r_rev); + $l_revisions = array(); + foreach($l_revs as $rev) { + $info = $pagelog->getRevisionInfo($rev); + $l_revisions[$rev] = array( + $rev, + dformat($info['date']) . ' ' . editorinfo($info['user']) . ' ' . $info['sum'], + $rev >= $r_rev //disable? + ); + } + $r_revisions = array(); + foreach($r_revs as $rev) { + $info = $pagelog->getRevisionInfo($rev); + $r_revisions[$rev] = array( + $rev, + dformat($info['date']) . ' ' . editorinfo($info['user']) . ' ' . $info['sum'], + $rev <= $l_rev //disable? + ); + } + //determine previous/next revisions + $l_index = array_search($l_rev, $l_revs); + $l_prev = $l_revs[$l_index + 1]; + $l_next = $l_revs[$l_index - 1]; + $r_index = array_search($r_rev, $r_revs); + $r_prev = $r_revs[$r_index + 1]; + $r_next = $r_revs[$r_index - 1]; + + + /* + * Left side: + */ + $l_nav = ''; + //move back + if($l_prev) { + $l_nav .= html_diff_navigationlink($type, 'diffbothprevrev', $l_prev, $r_prev); + $l_nav .= html_diff_navigationlink($type, 'diffprevrev', $l_prev, $r_rev); + } + //dropdown + $form = new Doku_Form(array('action' => wl())); + $form->addHidden('id', $ID); + $form->addHidden('difftype', $type); + $form->addHidden('rev2[1]', $r_rev); + $form->addHidden('do', 'diff'); + $form->addElement( + form_makeListboxField( + 'rev2[0]', + $l_revisions, + $l_rev, + '', '', '', + array('class' => 'quickselect') + ) + ); + $form->addElement(form_makeButton('submit', 'diff', 'Go')); + $l_nav .= $form->getForm(); + //move forward + if($l_next < $r_rev) { + $l_nav .= html_diff_navigationlink($type, 'diffnextrev', $l_next, $r_rev); + } + + /* + * Right side: + */ + $r_nav = ''; + //move back + if($l_rev < $r_prev) { + $r_nav .= html_diff_navigationlink($type, 'diffprevrev', $l_rev, $r_prev); + } + //dropdown + $form = new Doku_Form(array('action' => wl())); + $form->addHidden('id', $ID); + $form->addHidden('rev2[0]', $l_rev); + $form->addHidden('difftype', $type); + $form->addHidden('do', 'diff'); + $form->addElement( + form_makeListboxField( + 'rev2[1]', + $r_revisions, + $r_rev, + '', '', '', + array('class' => 'quickselect') + ) + ); + $form->addElement(form_makeButton('submit', 'diff', 'Go')); + $r_nav .= $form->getForm(); + //move forward + if($r_next) { + if($pagelog->isCurrentRevision($r_next)) { + $r_nav .= html_diff_navigationlink($type, 'difflastrev', $l_rev); //last revision is diff with current page + } else { + $r_nav .= html_diff_navigationlink($type, 'diffnextrev', $l_rev, $r_next); + } + $r_nav .= html_diff_navigationlink($type, 'diffbothnextrev', $l_next, $r_next); + } + return array($l_nav, $r_nav); +} + /** * Create html link to a diff defined by two revisions * @@ -1715,6 +1742,7 @@ function html_edit(){ * Display the default edit form * * Is the default action for HTML_EDIT_FORMSELECTION. + * @param mixed[] $param */ function html_edit_form($param) { global $TEXT; -- cgit v1.2.3 From af59854ba94dae9584db04d5688dddb581503d33 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 18 Feb 2014 22:25:53 +0100 Subject: Check if revision is defined at all before comparing --- inc/html.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/html.php b/inc/html.php index 7d533282e..e7d401594 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1339,7 +1339,6 @@ function html_diff_navigation($pagelog, $type, $l_rev, $r_rev) { $r_prev = $r_revs[$r_index + 1]; $r_next = $r_revs[$r_index - 1]; - /* * Left side: */ @@ -1367,7 +1366,7 @@ function html_diff_navigation($pagelog, $type, $l_rev, $r_rev) { $form->addElement(form_makeButton('submit', 'diff', 'Go')); $l_nav .= $form->getForm(); //move forward - if($l_next < $r_rev) { + if($l_next && $l_next < $r_rev) { $l_nav .= html_diff_navigationlink($type, 'diffnextrev', $l_next, $r_rev); } -- cgit v1.2.3 From c130b0f8ec18ec66ac40422cf354a23268108866 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 19 Feb 2014 01:34:14 +0000 Subject: improved positioning of diff options --- 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 e7d401594..1a549824e 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1207,7 +1207,7 @@ function html_diff($text = '', $intro = true, $type = null) { * Display type and exact reference */ if(!$text) { - ptln('
'); + ptln('
'); $form = new Doku_Form(array('action' => wl())); -- cgit v1.2.3 From 621bbd2a24f6ceac0310c04b27e11a2c7c325294 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Wed, 19 Feb 2014 17:58:36 +0100 Subject: diff of removed page, require handling right rev=0 When page is removed, and diff can be requested between a revision and current situation. This results in right revision is 0. Similar case just after creating a page. A diff between the first version and nothing before, result in left revision is 0. In these cases a empty dummy revision is placed as selected value in dropdown. Otherwise user got distracted by the revisions details shown in select field, which are not related to the diff below. --- inc/changelog.php | 16 +++++++++++----- inc/html.php | 31 ++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 12 deletions(-) (limited to 'inc') diff --git a/inc/changelog.php b/inc/changelog.php index d2ad23c08..28e53e77a 100644 --- a/inc/changelog.php +++ b/inc/changelog.php @@ -642,7 +642,7 @@ abstract class ChangeLog { * When available it returns $max entries for each revision * * @param int $rev1 oldest revision timestamp - * @param int $rev2 newest revision timestamp + * @param int $rev2 newest revision timestamp (0 looks up last revision) * @param int $max maximum number of revisions returned * @return array with two arrays with revisions surrounding rev1 respectively rev2 */ @@ -651,10 +651,16 @@ abstract class ChangeLog { $rev1 = max($rev1, 0); $rev2 = max($rev2, 0); - if($rev2 < $rev1) { - $rev = $rev2; - $rev2 = $rev1; - $rev1 = $rev; + if($rev2) { + if($rev2 < $rev1) { + $rev = $rev2; + $rev2 = $rev1; + $rev1 = $rev; + } + } else { + //empty right side means a removed page. Look up last revision. + $revs = $this->getRevisions(-1, 1); + $rev2 = $revs[0]; } //collect revisions around rev2 list($revs2, $allrevs, $fp, $lines, $head, $tail) = $this->retrieveRevisionsAround($rev2, $max); diff --git a/inc/html.php b/inc/html.php index 1a549824e..39d0eeada 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1308,21 +1308,27 @@ function html_diff($text = '', $intro = true, $type = null) { function html_diff_navigation($pagelog, $type, $l_rev, $r_rev) { global $INFO, $ID; - //last timestamp is not in changelog + //last timestamp is not in changelog (note: when page is removed, the metadata timestamp is zero as well) $r_rev = $r_rev ? $r_rev : $INFO['meta']['last_change']['date']; //retrieve revisions with additional info list($l_revs, $r_revs) = $pagelog->getRevisionsAround($l_rev, $r_rev); $l_revisions = array(); + if(!$l_rev) { + $l_revisions[0] = array(0, "", false); //no left revision given, add dummy + } foreach($l_revs as $rev) { $info = $pagelog->getRevisionInfo($rev); $l_revisions[$rev] = array( $rev, dformat($info['date']) . ' ' . editorinfo($info['user']) . ' ' . $info['sum'], - $rev >= $r_rev //disable? + $r_rev ? $rev >= $r_rev : false //disable? ); } $r_revisions = array(); + if(!$r_rev) { + $r_revisions[0] = array(0, "", false); //no right revision given, add dummy + } foreach($r_revs as $rev) { $info = $pagelog->getRevisionInfo($rev); $r_revisions[$rev] = array( @@ -1331,13 +1337,24 @@ function html_diff_navigation($pagelog, $type, $l_rev, $r_rev) { $rev <= $l_rev //disable? ); } + //determine previous/next revisions $l_index = array_search($l_rev, $l_revs); $l_prev = $l_revs[$l_index + 1]; $l_next = $l_revs[$l_index - 1]; - $r_index = array_search($r_rev, $r_revs); - $r_prev = $r_revs[$r_index + 1]; - $r_next = $r_revs[$r_index - 1]; + if($r_rev) { + $r_index = array_search($r_rev, $r_revs); + $r_prev = $r_revs[$r_index + 1]; + $r_next = $r_revs[$r_index - 1]; + } else { + //removed page + if($l_next) { + $r_prev = $r_revs[0]; + } else { + $r_prev = null; + } + $r_next = null; + } /* * Left side: @@ -1366,7 +1383,7 @@ function html_diff_navigation($pagelog, $type, $l_rev, $r_rev) { $form->addElement(form_makeButton('submit', 'diff', 'Go')); $l_nav .= $form->getForm(); //move forward - if($l_next && $l_next < $r_rev) { + if($l_next && ($l_next < $r_rev || !$r_rev)) { $l_nav .= html_diff_navigationlink($type, 'diffnextrev', $l_next, $r_rev); } @@ -1418,7 +1435,7 @@ function html_diff_navigation($pagelog, $type, $l_rev, $r_rev) { */ function html_diff_navigationlink($difftype, $linktype, $lrev, $rrev = null) { global $ID, $lang; - if($rrev === null) { + if(!$rrev) { $urlparam = array( 'do' => 'diff', 'rev' => $lrev, -- cgit v1.2.3 From 4d5954c8d1f8bcc5450f8cf70d8139cf5a1e697d Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 20 Feb 2014 14:03:29 +0100 Subject: improve comment in html_diff_navigation --- inc/html.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/html.php b/inc/html.php index 39d0eeada..2c7e8b1a6 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1308,7 +1308,8 @@ function html_diff($text = '', $intro = true, $type = null) { function html_diff_navigation($pagelog, $type, $l_rev, $r_rev) { global $INFO, $ID; - //last timestamp is not in changelog (note: when page is removed, the metadata timestamp is zero as well) + // last timestamp is not in changelog, retrieve timestamp from metadata + // note: when page is removed, the metadata timestamp is zero $r_rev = $r_rev ? $r_rev : $INFO['meta']['last_change']['date']; //retrieve revisions with additional info -- cgit v1.2.3 From 04d68ae4edcddca8a3c30ed4ce6c72d28440a084 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 20 Feb 2014 14:08:02 +0100 Subject: PHPDocs auth.php --- inc/auth.php | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'inc') diff --git a/inc/auth.php b/inc/auth.php index 6000ea6d7..8fde129aa 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -845,6 +845,12 @@ function auth_nameencode($name, $skip_group = false) { return $cache[$name][$skip_group]; } +/** + * callback encodes the matches + * + * @param array $matches first complete match, next matching subpatterms + * @return string + */ function auth_nameencode_callback($matches) { return '%'.dechex(ord(substr($matches[1],-1))); } @@ -1075,6 +1081,11 @@ function updateprofile() { return false; } +/** + * Delete the current logged-in user + * + * @return bool true on success, false on any error + */ function auth_deleteprofile(){ global $conf; global $lang; -- cgit v1.2.3 From 6d606653fa148cf19dc5e996822212a144b51ada Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 20 Feb 2014 14:09:09 +0100 Subject: Improve PHPDocs Doku_Cli_Opts (cliopts.php) --- inc/cliopts.php | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'inc') diff --git a/inc/cliopts.php b/inc/cliopts.php index 9cea686a2..3eac72e5b 100644 --- a/inc/cliopts.php +++ b/inc/cliopts.php @@ -74,9 +74,9 @@ class Doku_Cli_Opts { /** * * @see http://www.sitepoint.com/article/php-command-line-1/3 - * @param string executing file name - this MUST be passed the __FILE__ constant - * @param string short options - * @param array (optional) long options + * @param string $bin_file executing file name - this MUST be passed the __FILE__ constant + * @param string $short_options short options + * @param array $long_options (optional) long options * @return Doku_Cli_Opts_Container or Doku_Cli_Opts_Error */ function & getOptions($bin_file, $short_options, $long_options = null) { @@ -233,12 +233,12 @@ class Doku_Cli_Opts { * Parse short option * * @param string $arg Argument - * @param string[] $short_options Available short options + * @param string $short_options Available short options * @param string[][] &$opts * @param string[] &$args * * @access private - * @return void + * @return void|Doku_Cli_Opts_Error */ function _parseShortOption($arg, $short_options, &$opts, &$args) { $len = strlen($arg); @@ -324,7 +324,7 @@ class Doku_Cli_Opts { * @param string[] &$args * * @access private - * @return void|PEAR_Error + * @return void|Doku_Cli_Opts_Error */ function _parseLongOption($arg, $long_options, &$opts, &$args) { @list($opt, $opt_arg) = explode('=', $arg, 2); @@ -402,7 +402,7 @@ class Doku_Cli_Opts { * Will take care on register_globals and register_argc_argv ini directives * * @access public - * @return mixed the $argv PHP array or PEAR error if not registered + * @return array|Doku_Cli_Opts_Error the $argv PHP array or PEAR error if not registered */ function readPHPArgv() { global $argv; @@ -421,10 +421,19 @@ class Doku_Cli_Opts { return $argv; } + /** + * @param $code + * @param $msg + * @return Doku_Cli_Opts_Error + */ function raiseError($code, $msg) { return new Doku_Cli_Opts_Error($code, $msg); } + /** + * @param $obj + * @return bool + */ function isError($obj) { return is_a($obj, 'Doku_Cli_Opts_Error'); } -- cgit v1.2.3 From 74160ca1dea24b237ff3e956d19a420a1593b957 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 20 Feb 2014 14:10:24 +0100 Subject: PHPDocs missing breaks, removed unused var in common.php --- inc/common.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index 32771285b..4682bedf9 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1140,7 +1140,6 @@ function saveWikiText($id, $text, $summary, $minor = false) { * @author Andreas Gohr */ function saveOldRevision($id) { - global $conf; $oldf = wikiFN($id); if(!@file_exists($oldf)) return ''; $date = filemtime($oldf); @@ -1230,8 +1229,9 @@ function getGoogleQuery() { /** * Return the human readable size of a file * - * @param int $size A file size - * @param int $dec A number of decimal places + * @param int $size A file size + * @param int $dec A number of decimal places + * @return string human readable size * @author Martin Benjamin * @author Aidan Lister * @version 1.0.0 @@ -1362,12 +1362,16 @@ function php_to_byte($v) { $l = substr($v, -1); $ret = substr($v, 0, -1); switch(strtoupper($l)) { + /** @noinspection PhpMissingBreakStatementInspection */ case 'P': $ret *= 1024; + /** @noinspection PhpMissingBreakStatementInspection */ case 'T': $ret *= 1024; + /** @noinspection PhpMissingBreakStatementInspection */ case 'G': $ret *= 1024; + /** @noinspection PhpMissingBreakStatementInspection */ case 'M': $ret *= 1024; case 'K': -- cgit v1.2.3 From 8d443db51f9acca81484bec96d8bcd49c00e6414 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 20 Feb 2014 17:19:45 +0100 Subject: remove 'fix dateformat config for upgraders' FS#2073 --- inc/init.php | 5 ----- 1 file changed, 5 deletions(-) (limited to 'inc') diff --git a/inc/init.php b/inc/init.php index a937b934d..3e422453d 100644 --- a/inc/init.php +++ b/inc/init.php @@ -183,11 +183,6 @@ if($conf['compression'] == 'gz' && !function_exists('gzopen')){ $conf['compression'] = 0; } -// fix dateformat for upgraders -if(strpos($conf['dformat'],'%') === false){ - $conf['dformat'] = '%Y/%m/%d %H:%M'; -} - // precalculate file creation modes init_creationmodes(); -- cgit v1.2.3 From 900a9e9e56d360fa7d347304e9b0d4b691d4becc Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 20 Feb 2014 19:25:13 +0100 Subject: replace dir_delete by io_rmdir --- inc/media.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/media.php b/inc/media.php index fe155f0f3..a6109f785 100644 --- a/inc/media.php +++ b/inc/media.php @@ -284,7 +284,7 @@ function media_upload_xhr($ns,$auth){ 'copy' ); unlink($path); - if ($tmp) dir_delete($tmp); + if ($tmp) io_rmdir($tmp, true); if (is_array($res)) { msg($res[0], $res[1]); return false; -- cgit v1.2.3 From 2472a8f6cbd2abffe712ddd42fe2ad296d03d8f2 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 20 Feb 2014 21:42:31 +0100 Subject: Removed unused vars, define undefined ones --- inc/io.php | 2 -- inc/media.php | 1 - 2 files changed, 3 deletions(-) (limited to 'inc') diff --git a/inc/io.php b/inc/io.php index c5225a2e0..27a34b045 100644 --- a/inc/io.php +++ b/inc/io.php @@ -367,8 +367,6 @@ function io_createNamespace($id, $ns_type='pages') { * @author Andreas Gohr */ function io_makeFileDir($file){ - global $conf; - $dir = dirname($file); if(!@is_dir($dir)){ io_mkdir_p($dir) || msg("Creating directory $dir failed",-1); diff --git a/inc/media.php b/inc/media.php index fe155f0f3..132738942 100644 --- a/inc/media.php +++ b/inc/media.php @@ -1039,7 +1039,6 @@ function media_details($image, $auth, $rev=false, $meta=false) { * @author Kate Arzamastseva */ function media_diff($image, $ns, $auth, $fromajax = false) { - global $lang; global $conf; global $INPUT; -- cgit v1.2.3 From 6ffaeda954351208754898acc6e2ff228f3ae472 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 20 Feb 2014 21:43:25 +0100 Subject: added some PHPDocs media.php --- inc/media.php | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/media.php b/inc/media.php index 132738942..6d5bf461b 100644 --- a/inc/media.php +++ b/inc/media.php @@ -728,10 +728,23 @@ function _media_get_sort_type() { return _media_get_display_param('sort', array('default' => 'name', 'date')); } +/** + * Returns type of listing for the list of files in media manager + * + * @author Kate Arzamastseva + * @return string - list type + */ function _media_get_list_type() { return _media_get_display_param('list', array('default' => 'thumbs', 'rows')); } +/** + * Get display parameters + * + * @param string $param name of parameter + * @param array $values allowed values, where default value has index key 'default' + * @return string the parameter value + */ function _media_get_display_param($param, $values) { global $INPUT; if (in_array($INPUT->str($param), $values)) { @@ -859,6 +872,10 @@ function media_tab_history($image, $ns, $auth=null) { /** * Prints mediafile details * + * @param string $image media id + * @param $auth + * @param int|bool $rev + * @param JpegMeta|bool $meta * @author Kate Arzamastseva */ function media_preview($image, $auth, $rev=false, $meta=false) { @@ -1097,9 +1114,15 @@ function media_diff($image, $ns, $auth, $fromajax = false) { } +/** + * Callback for media file diff + * + * @param $data + * @return bool|void + */ function _media_file_diff($data) { if(is_array($data) && count($data)===6) { - return media_file_diff($data[0], $data[1], $data[2], $data[3], $data[4], $data[5]); + media_file_diff($data[0], $data[1], $data[2], $data[3], $data[4], $data[5]); } else { return false; } @@ -1558,7 +1581,7 @@ function media_printimgdetail($item, $fullscreen=false){ * @param string $amp - separator * @param bool $abs * @param bool $params_array - * @return string - link + * @return string|array - link */ function media_managerURL($params=false, $amp='&', $abs=false, $params_array=false) { global $ID; -- cgit v1.2.3 From 948d482d02c7bfd8a6b00e1339e7e2300acde137 Mon Sep 17 00:00:00 2001 From: Marina Vladi Date: Sat, 22 Feb 2014 12:51:41 +0100 Subject: translation update --- inc/lang/hu/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php index 5113e1cc8..a0aef9447 100644 --- a/inc/lang/hu/lang.php +++ b/inc/lang/hu/lang.php @@ -337,4 +337,4 @@ $lang['media_restore'] = 'Ezen verzió visszaállítása'; $lang['currentns'] = 'Aktuális névtér'; $lang['searchresult'] = 'Keresés eredménye'; $lang['plainhtml'] = 'Sima HTML'; -$lang['wikimarkup'] = 'Wiki-jelölő nyelv'; +$lang['wikimarkup'] = 'Wiki-jelölőnyelv'; -- cgit v1.2.3 From 46b189b552d813ab47a67d597ee4ef621f34b8a5 Mon Sep 17 00:00:00 2001 From: Robert Bogenschneider Date: Sun, 23 Feb 2014 08:21:01 +0100 Subject: translation update --- inc/lang/eo/admin.txt | 2 +- inc/lang/eo/adminplugins.txt | 2 +- inc/lang/eo/diff.txt | 2 +- inc/lang/eo/draft.txt | 2 +- inc/lang/eo/edit.txt | 2 +- inc/lang/eo/editrev.txt | 2 +- inc/lang/eo/lang.php | 11 ++++++----- 7 files changed, 12 insertions(+), 11 deletions(-) (limited to 'inc') diff --git a/inc/lang/eo/admin.txt b/inc/lang/eo/admin.txt index 4b0cf7909..4b3cf0c2a 100644 --- a/inc/lang/eo/admin.txt +++ b/inc/lang/eo/admin.txt @@ -1,3 +1,3 @@ ====== Administrado ====== -Sube vi povas trovi liston de administraj taskoj disponeblaj en DokuWiki. +Sube vi trovas liston de administraj taskoj haveblaj en DokuWiki. diff --git a/inc/lang/eo/adminplugins.txt b/inc/lang/eo/adminplugins.txt index 769a8c538..bb7e7829b 100644 --- a/inc/lang/eo/adminplugins.txt +++ b/inc/lang/eo/adminplugins.txt @@ -1 +1 @@ -===== Eksteraj kromaĵoj ===== \ No newline at end of file +===== Aldonaj kromaĵoj ===== \ No newline at end of file diff --git a/inc/lang/eo/diff.txt b/inc/lang/eo/diff.txt index 5829a7db1..3c9db61c8 100644 --- a/inc/lang/eo/diff.txt +++ b/inc/lang/eo/diff.txt @@ -1,4 +1,4 @@ ====== Diferencoj ====== -Ĉi tie vi povas vidi diferencojn inter la aktuala versio kaj la elektita revizio de la paĝo. +Tio montras diferencojn inter du versioj de la paĝo. diff --git a/inc/lang/eo/draft.txt b/inc/lang/eo/draft.txt index 32ddc83f6..57526f3b5 100644 --- a/inc/lang/eo/draft.txt +++ b/inc/lang/eo/draft.txt @@ -1,5 +1,5 @@ ====== Skiza dosiero troviĝis ====== -Via lasta sekcio de redakto en tiu ĉi paĝo ne korekte kompletiĝis. DokuWiki aŭtomate konservis skizon dum vi laboris, kiun vi nun povas uzi por daŭrigi vian redaktadon. Sube vi povas vidi la datumaron, kiu konserviĝis el via lasta sekcio. +Via lasta redaktosesio en tiu ĉi paĝo ne ĝuste kompletiĝis. DokuWiki aŭtomate konservis skizon dum vi laboris, kiun vi nun povas uzi por daŭrigi vian redaktadon. Sube vi povas vidi la datumaron, kiu konserviĝis el via lasta sesio. Bonvolu decidi ĉu vi volas //restarigi// vian perditan redakton, //forigi// la aŭtomate konservitan skizon aŭ //rezigni// pri la redakta procezo. diff --git a/inc/lang/eo/edit.txt b/inc/lang/eo/edit.txt index 29b3382c5..ccc8a613d 100644 --- a/inc/lang/eo/edit.txt +++ b/inc/lang/eo/edit.txt @@ -1 +1 @@ -Redaktu paĝon kaj poste premu butonon titolitan '"Konservi'". Bonvolu tralegi la [[wiki:syntax|vikian sintakson]] por kompreni kiel vi povas krei paĝojn. Bonvolu redakti nur se vi planas **plibonigi** la enhavon de la paĝo. Se vi volas nur testi ion, bonvolu uzi specialan paĝon: [[wiki:playground|ludejo]]. +Redaktu paĝon kaj poste premu butonon titolitan '"Konservi'". Bonvolu tralegi la [[wiki:syntax|vikian sintakson]] pri la formatigo. Bonvolu redakti **nur**, se vi povas **plibonigi** la enhavon de la paĝo. Se vi volas nur testi ion, bonvolu uzi specialan paĝon: [[playground:playground|sablokesto]]. diff --git a/inc/lang/eo/editrev.txt b/inc/lang/eo/editrev.txt index 1640baa91..2e1406b0f 100644 --- a/inc/lang/eo/editrev.txt +++ b/inc/lang/eo/editrev.txt @@ -1,2 +1,2 @@ -**Vi laboras kun malnova revizio de la dokumento!** Se vi konservos ĝin, kreiĝos nova kuranta versio kun la sama enhavo. +**Vi laboras kun malnova revizio de la dokumento!** Se vi konservos ĝin, kreiĝos nova kuranta versio kun tiu enhavo. ---- diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php index a543b2571..97231bdce 100644 --- a/inc/lang/eo/lang.php +++ b/inc/lang/eo/lang.php @@ -37,13 +37,13 @@ $lang['btn_secedit'] = 'Redakti'; $lang['btn_login'] = 'Ensaluti'; $lang['btn_logout'] = 'Elsaluti'; $lang['btn_admin'] = 'Administri'; -$lang['btn_update'] = 'Ĝisdatigi'; +$lang['btn_update'] = 'Aktualigi'; $lang['btn_delete'] = 'Forigi'; $lang['btn_back'] = 'Retroiri'; $lang['btn_backlink'] = 'Retroligoj'; $lang['btn_backtomedia'] = 'Retroiri al elekto de dosiero'; $lang['btn_subscribe'] = 'Aliĝi al paĝaj modifoj'; -$lang['btn_profile'] = 'Ĝisdatigi profilon'; +$lang['btn_profile'] = 'Aktualigi profilon'; $lang['btn_reset'] = 'Rekomenci'; $lang['btn_resendpwd'] = 'Sendi novan pasvorton'; $lang['btn_draft'] = 'Redakti skizon'; @@ -53,7 +53,7 @@ $lang['btn_revert'] = 'Restarigi'; $lang['btn_register'] = 'Registriĝi'; $lang['btn_apply'] = 'Apliki'; $lang['btn_media'] = 'Medio-administrilo'; -$lang['btn_deleteuser'] = 'Forigi mian aliĝon'; +$lang['btn_deleteuser'] = 'Forigi mian konton'; $lang['loggedinas'] = 'Ensalutinta kiel'; $lang['user'] = 'Uzant-nomo'; $lang['pass'] = 'Pasvorto'; @@ -81,7 +81,7 @@ $lang['reghere'] = 'Se vi ne havas konton, vi povas akiri ĝin'; $lang['profna'] = 'Tiu ĉi vikio ne ebligas modifon en la profiloj.'; $lang['profnochange'] = 'Neniu ŝanĝo, nenio farinda.'; $lang['profnoempty'] = 'Malplena nomo aŭ retadreso ne estas permesata.'; -$lang['profchanged'] = 'La profilo de la uzanto sukcese ĝisdatiĝis.'; +$lang['profchanged'] = 'La profilo de la uzanto sukcese aktualiĝis.'; $lang['profnodelete'] = 'Tiu ĉi vikio ne subtenas forigo de uzantoj'; $lang['profdeleteuser'] = 'Forigi aliĝon'; $lang['profdeleted'] = 'Via uzant-aliĝo estis forigata de tiu ĉi vikio'; @@ -104,7 +104,7 @@ $lang['txt_filename'] = 'Alŝuti kiel (laŭvole)'; $lang['txt_overwrt'] = 'Anstataŭigi ekzistantan dosieron'; $lang['maxuploadsize'] = 'Alŝuto maks. %s po dosiero.'; $lang['lockedby'] = 'Nune ŝlosita de'; -$lang['lockexpire'] = 'Ŝlosado ĉesos en'; +$lang['lockexpire'] = 'Ŝlosado ĉesos je'; $lang['js']['willexpire'] = 'Vi povos redakti ĉi tiun paĝon post unu minuto.\nSe vi volas nuligi tempokontrolon de la ŝlosado, premu la butonon "Antaŭrigardi".'; $lang['js']['notsavedyet'] = 'Ne konservitaj modifoj perdiĝos. Ĉu vi certe volas daŭrigi la procezon?'; @@ -293,6 +293,7 @@ $lang['i_policy'] = 'Komenca ACL-a agordo'; $lang['i_pol0'] = 'Malferma Vikio (legi, skribi, alŝuti povas ĉiuj)'; $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_allowreg'] = 'Permesi al uzantoj registri sin mem'; $lang['i_retry'] = 'Reprovi'; $lang['i_license'] = 'Bonvolu elekti la permesilon, sub kiun vi volas meti vian enhavon:'; $lang['i_license_none'] = 'Ne montri licencinformojn'; -- cgit v1.2.3 From adfe6dafd15d9bf52ed6212b44b02a6a32c8bf49 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 23 Feb 2014 09:38:03 +0100 Subject: fixed proxy authentication in SSL tunneling --- inc/HTTPClient.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php index de3a16830..53f3c9a78 100644 --- a/inc/HTTPClient.php +++ b/inc/HTTPClient.php @@ -552,7 +552,7 @@ class HTTPClient { $request = "CONNECT {$requestinfo['host']}:{$requestinfo['port']} HTTP/1.0".HTTP_NL; $request .= "Host: {$requestinfo['host']}".HTTP_NL; if($this->proxy_user) { - 'Proxy-Authorization Basic '.base64_encode($this->proxy_user.':'.$this->proxy_pass).HTTP_NL; + $request .= 'Proxy-Authorization Basic '.base64_encode($this->proxy_user.':'.$this->proxy_pass).HTTP_NL; } $request .= HTTP_NL; -- cgit v1.2.3 From 01c9a118dacc1e2c07f2b0ddee84c514022e5927 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 23 Feb 2014 09:54:47 +0100 Subject: have most current revision always available in $INFO fixes fix for FS#2853 --- inc/common.php | 9 +++++---- inc/html.php | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index 32771285b..bbc0a6e68 100644 --- a/inc/common.php +++ b/inc/common.php @@ -155,12 +155,13 @@ function pageinfo() { $info['subscribed'] = false; } - $info['locked'] = checklock($ID); - $info['filepath'] = fullpath(wikiFN($ID)); - $info['exists'] = @file_exists($info['filepath']); + $info['locked'] = checklock($ID); + $info['filepath'] = fullpath(wikiFN($ID)); + $info['exists'] = @file_exists($info['filepath']); + $info['currentrev'] = @filemtime($info['filepath']); if($REV) { //check if current revision was meant - if($info['exists'] && (@filemtime($info['filepath']) == $REV)) { + if($info['exists'] && ($info['currentrev'] == $REV)) { $REV = ''; } elseif($RANGE) { //section editing does not work with old revisions! diff --git a/inc/html.php b/inc/html.php index 0434f3b45..fcec29670 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1189,7 +1189,7 @@ function html_diff($text='',$intro=true,$type=null){ $diffurl = wl($ID, array( 'do' => 'diff', 'rev2[0]' => $l_rev, - 'rev2[1]' => $r_rev ? $r_rev : $INFO['lastmod'], // link to exactly this view FS#2835 + 'rev2[1]' => $r_rev ? $r_rev : $INFO['currentrev'], // link to exactly this view FS#2835 'difftype' => $type, )); ptln('

'.$lang['difflink'].'

'); -- cgit v1.2.3 From 4d51938bb0516f7cc033d8c93131f56af7525da0 Mon Sep 17 00:00:00 2001 From: Rene Date: Sun, 23 Feb 2014 22:56:02 +0100 Subject: translation update --- inc/lang/nl/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc') diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php index e5e3e3c76..e22aa9fff 100644 --- a/inc/lang/nl/lang.php +++ b/inc/lang/nl/lang.php @@ -22,6 +22,7 @@ * @author Klap-in * @author Remon * @author gicalle + * @author Rene */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; -- cgit v1.2.3 From 11ac6abdb90a812687d7db7df99aa02f843dd12a Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Tue, 25 Feb 2014 02:58:58 +0000 Subject: if configured renderer is not found, try to fallback to a bundled renderer --- inc/parserutils.php | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) (limited to 'inc') diff --git a/inc/parserutils.php b/inc/parserutils.php index 4df273f11..2fb523d0c 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -631,27 +631,43 @@ function & p_get_renderer($mode) { return $Renderer; } - // try default renderer first: - $file = DOKU_INC."inc/parser/$rname.php"; - if(@file_exists($file)){ - require_once $file; - - if ( !class_exists($rclass) ) { - trigger_error("Unable to resolve render class $rclass",E_USER_WARNING); - msg("Renderer '$rname' for $mode not valid",-1); - return null; - } - $Renderer = new $rclass(); - }else{ - // Maybe a plugin/component is available? + // assuming the configured renderer is bundled, construct its file name + $default = DOKU_INC."inc/parser/$rname.php"; + if (!file_exists($default)) { + // not bundled, see if its an enabled plugin for rendering $mode $Renderer = $plugin_controller->load('renderer',$rname); + if (is_a($Renderer, 'Doku_Renderer') && ($mode == $Renderer->getFormat())) { + return $Renderer; + } - if(!isset($Renderer) || is_null($Renderer)){ + // there is a configuration error! + // not bundled, not an enabled plugin, try to fallback to a bundled renderer + $fallback = DOKU_INC."inc/parser/$mode.php"; + if (!file_exists($fallback)) { msg("No renderer '$rname' found for mode '$mode'",-1); return null; + } else { + $default = $fallback; + $rclass = "Doku_Renderer_$mode"; + + // viewers should see renderered output, so restrict the warning to admins only + $msg = "No renderer '$rname' found for mode '$mode', check your plugins"; + if ($mode == 'xhtml') { + $msg .= " and the 'renderer_xhtml' config setting"; + } + $msg .= ".
Attempting to fallback to the bundled renderer."; + msg($msg,-1,'','',MSG_ADMIN_ONLY); } } + require_once $default; + if ( !class_exists($rclass) ) { + trigger_error("Unable to resolve render class $rclass",E_USER_WARNING); + msg("Renderer '$rname' for $mode not valid",-1); + return null; + } + $Renderer = new $rclass(); + return $Renderer; } -- cgit v1.2.3 From 252398f08d0752fd17b25e4afab70a6d0b6455a7 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Tue, 25 Feb 2014 03:00:46 +0000 Subject: remove reference operator from p_get_renderer() declaration, not required for php5 --- inc/parserutils.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/parserutils.php b/inc/parserutils.php index 2fb523d0c..9420931eb 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -588,7 +588,7 @@ function p_sort_modes($a, $b){ function p_render($mode,$instructions,&$info){ if(is_null($instructions)) return ''; - $Renderer =& p_get_renderer($mode); + $Renderer = p_get_renderer($mode); if (is_null($Renderer)) return null; $Renderer->reset(); @@ -619,7 +619,7 @@ function p_render($mode,$instructions,&$info){ * @param $mode string Mode of the renderer to get * @return null|Doku_Renderer The renderer */ -function & p_get_renderer($mode) { +function p_get_renderer($mode) { /** @var Doku_Plugin_Controller $plugin_controller */ global $conf, $plugin_controller; -- cgit v1.2.3 From becfa414b5b024ded4e094b1c113a72f39d8b763 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 25 Feb 2014 15:45:00 +0100 Subject: refactor detail.php to template.php - refactor detail en mediamanager link creation - refactor metadata listing --- inc/lang/en/lang.php | 4 +-- inc/template.php | 98 ++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 94 insertions(+), 8 deletions(-) (limited to 'inc') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index cbdef8661..e945341d7 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -52,6 +52,8 @@ $lang['btn_register'] = 'Register'; $lang['btn_apply'] = 'Apply'; $lang['btn_media'] = 'Media Manager'; $lang['btn_deleteuser'] = 'Remove My Account'; +$lang['btn_img_backto'] = 'Back to %s'; +$lang['btn_mediaManager'] = 'View in media manager'; $lang['loggedinas'] = 'Logged in as'; $lang['user'] = 'Username'; @@ -253,7 +255,6 @@ $lang['admin_register'] = 'Add new user'; $lang['metaedit'] = 'Edit Metadata'; $lang['metasaveerr'] = 'Writing metadata failed'; $lang['metasaveok'] = 'Metadata saved'; -$lang['img_backto'] = 'Back to'; $lang['img_title'] = 'Title'; $lang['img_caption'] = 'Caption'; $lang['img_date'] = 'Date'; @@ -266,7 +267,6 @@ $lang['img_camera'] = 'Camera'; $lang['img_keywords'] = 'Keywords'; $lang['img_width'] = 'Width'; $lang['img_height'] = 'Height'; -$lang['img_manager'] = 'View in media manager'; $lang['subscr_subscribe_success'] = 'Added %s to subscription list for %s'; $lang['subscr_subscribe_error'] = 'Error adding %s to subscription list for %s'; diff --git a/inc/template.php b/inc/template.php index 0a6a9e4aa..aa3c658a8 100644 --- a/inc/template.php +++ b/inc/template.php @@ -548,6 +548,7 @@ function tpl_actionlink($type, $pre = '', $suf = '', $inner = '', $return = fals * @var string $method * @var bool $nofollow * @var array $params + * @var string $replacement */ extract($data); if(strpos($id, '#') === 0) { @@ -556,6 +557,9 @@ function tpl_actionlink($type, $pre = '', $suf = '', $inner = '', $return = fals $linktarget = wl($id, $params); } $caption = $lang['btn_'.$type]; + if(strpos($caption, '%s')){ + $caption = sprintf($caption, $replacement); + } $akey = $addTitle = ''; if($accesskey) { $akey = 'accesskey="'.$accesskey.'" '; @@ -609,11 +613,12 @@ function tpl_get_action($type) { if ($type == 'subscription') $type = 'subscribe'; if(!actionOK($type)) return false; - $accesskey = null; - $id = $ID; - $method = 'get'; - $params = array('do' => $type); - $nofollow = true; + $accesskey = null; + $id = $ID; + $method = 'get'; + $params = array('do' => $type); + $nofollow = true; + $replacement = ''; switch($type) { case 'edit': // most complicated type - we need to decide on current action @@ -670,6 +675,11 @@ function tpl_get_action($type) { $params = array(); $accesskey = 'b'; break; + case 'img_backto': + $params = array(); + $accesskey = 'b'; + $replacement = $ID; + break; case 'login': $params['sectok'] = getSecurityToken(); if(isset($_SERVER['REMOTE_USER'])) { @@ -717,11 +727,26 @@ function tpl_get_action($type) { case 'media': $params['ns'] = getNS($ID); break; + case 'mediaManager': + // View image in media manager + global $IMG; + $imgNS = getNS($IMG); + $authNS = auth_quickaclcheck("$imgNS:*"); + if ($authNS < AUTH_UPLOAD) { + return false; + } + $params = array( + 'ns' => $imgNS, + 'image' => $IMG, + 'do' => 'media' + ); + //$type = 'media'; + break; default: return '[unknown %s type]'; break; } - return compact('accesskey', 'type', 'id', 'method', 'params', 'nofollow'); + return compact('accesskey', 'type', 'id', 'method', 'params', 'nofollow', 'replacement'); } /** @@ -1016,6 +1041,67 @@ function tpl_img_getTag($tags, $alt = '', $src = null) { return $info; } +/** + * Returns a description list of the metatags of the current image + * + * @return string html of description list + */ +function tpl_img_meta() { + global $lang; + + $tags = tpl_get_img_meta(); + + echo '
'; + foreach($tags as $tag) { + $label = $lang[$tag['langkey']]; + if(!$label) $label = $tag['langkey']; + + echo '
'.$label.':
'; + if ($tag['type'] == 'date') { + echo dformat($tag['value']); + } else { + echo hsc($tag['value']); + } + echo '
'; + } + echo '
'; +} + +/** + * Returns metadata as configured in mediameta config file, ready for creating html + * + * @return array with arrays containing the entries: + * - string langkey key to lookup in the $lang var, if not found printed as is + * - string type type of value + * - string value tag value (unescaped) + */ +function tpl_get_img_meta() { + + $config_files = getConfigFiles('mediameta'); + foreach ($config_files as $config_file) { + if(@file_exists($config_file)) { + include($config_file); + } + } + /** @var array $fields the included array with metadata */ + + $tags = array(); + foreach($fields as $tag){ + $t = array(); + if (!empty($tag[0])) { + $t = array($tag[0]); + } + if(is_array($tag[3])) { + $t = array_merge($t,$tag[3]); + } + $value = tpl_img_getTag($t); + if ($value) { + $tags[] = array('langkey' => $tag[1], 'type' => $tag[2], 'value' => $value); + } + } + return $tags; +} + /** * Prints the image with a link to the full sized version * -- cgit v1.2.3 From 2f2c518c20d6e55e20e9fc2fb0ec2053854b0d1b Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 25 Feb 2014 19:59:29 +0100 Subject: Show 'not logged in' only when logged out FS#2124 --- inc/lang/en/denied.txt | 2 +- inc/lang/en/lang.php | 1 + inc/template.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/lang/en/denied.txt b/inc/lang/en/denied.txt index 3ac72820c..6f7fe055e 100644 --- a/inc/lang/en/denied.txt +++ b/inc/lang/en/denied.txt @@ -1,4 +1,4 @@ ====== Permission Denied ====== -Sorry, you don't have enough rights to continue. Perhaps you forgot to login? +Sorry, you don't have enough rights to continue. @NOTLOGGEDIN@ diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index cbdef8661..b95a8a58a 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -78,6 +78,7 @@ $lang['regbadmail'] = 'The given email address looks invalid - if you $lang['regbadpass'] = 'The two given passwords are not identical, please try again.'; $lang['regpwmail'] = 'Your DokuWiki password'; $lang['reghere'] = 'You don\'t have an account yet? Just get one'; +$lang['notloggedin'] = 'Please be aware you are not logged in.'; $lang['profna'] = 'This wiki does not support profile modification'; $lang['profnochange'] = 'No changes, nothing to do.'; diff --git a/inc/template.php b/inc/template.php index 0a6a9e4aa..c9d583d98 100644 --- a/inc/template.php +++ b/inc/template.php @@ -154,7 +154,7 @@ function tpl_content_core() { html_resendpwd(); break; case 'denied': - print p_locale_xhtml('denied'); + html_denied(); break; case 'profile' : html_updateprofile(); -- cgit v1.2.3 From d59dea9fddf885a836f7dc2d8be1f93afb7e9542 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 25 Feb 2014 20:00:56 +0100 Subject: added new html_denied() method as well --- inc/html.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'inc') diff --git a/inc/html.php b/inc/html.php index fcec29670..507ba511e 100644 --- a/inc/html.php +++ b/inc/html.php @@ -64,6 +64,25 @@ function html_login(){ print '
'.NL; } + +/** + * Denied page content + * + * @return string html + */ +function html_denied() { + global $lang; + $denied = p_locale_xhtml('denied'); + $notloggedin = isset($_SERVER['REMOTE_USER']) ? '' : $lang['notloggedin']; + + $denied = str_replace( + array('@NOTLOGGEDIN@'), + array($notloggedin), + $denied + ); + print $denied; +} + /** * inserts section edit buttons if wanted or removes the markers * -- cgit v1.2.3 From 8daa2c9f98ef02857c1d92f2f226288c313146a7 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 25 Feb 2014 20:13:27 +0100 Subject: Update localizations --- inc/lang/ar/denied.txt | 2 +- inc/lang/az/denied.txt | 2 +- inc/lang/bg/denied.txt | 2 +- inc/lang/bn/denied.txt | 2 +- inc/lang/ca-valencia/denied.txt | 2 +- inc/lang/ca/denied.txt | 2 +- inc/lang/cs/denied.txt | 2 +- inc/lang/da/denied.txt | 2 +- inc/lang/de-informal/denied.txt | 2 +- inc/lang/de/denied.txt | 2 +- inc/lang/el/denied.txt | 2 +- inc/lang/eo/denied.txt | 2 +- inc/lang/es/denied.txt | 2 +- inc/lang/et/denied.txt | 2 +- inc/lang/eu/denied.txt | 2 +- inc/lang/fa/denied.txt | 2 +- inc/lang/fi/denied.txt | 2 +- inc/lang/fo/denied.txt | 2 +- inc/lang/fr/denied.txt | 2 +- inc/lang/gl/denied.txt | 2 +- inc/lang/he/denied.txt | 2 +- inc/lang/hr/denied.txt | 2 +- inc/lang/hu-formal/denied.txt | 2 +- inc/lang/hu/denied.txt | 2 +- inc/lang/ia/denied.txt | 2 +- inc/lang/id/denied.txt | 2 +- inc/lang/it/denied.txt | 3 +-- inc/lang/ja/denied.txt | 2 +- inc/lang/km/denied.txt | 2 +- inc/lang/ko/denied.txt | 2 +- inc/lang/ku/denied.txt | 2 +- inc/lang/la/denied.txt | 2 +- inc/lang/lb/denied.txt | 2 +- inc/lang/lt/denied.txt | 2 +- inc/lang/lv/denied.txt | 2 +- inc/lang/mg/denied.txt | 2 +- inc/lang/mr/denied.txt | 2 +- inc/lang/ne/denied.txt | 2 +- inc/lang/nl/denied.txt | 2 +- inc/lang/no/denied.txt | 2 +- inc/lang/pl/denied.txt | 2 +- inc/lang/pt-br/denied.txt | 2 +- inc/lang/pt/denied.txt | 2 +- inc/lang/ro/denied.txt | 3 +-- inc/lang/ru/denied.txt | 2 +- inc/lang/sk/denied.txt | 2 +- inc/lang/sl/denied.txt | 2 +- inc/lang/sq/denied.txt | 2 +- inc/lang/sr/denied.txt | 2 +- inc/lang/sv/denied.txt | 2 +- inc/lang/th/denied.txt | 2 +- inc/lang/tr/denied.txt | 2 +- inc/lang/uk/denied.txt | 2 +- inc/lang/vi/denied.txt | 2 +- inc/lang/zh-tw/denied.txt | 2 +- inc/lang/zh/denied.txt | 2 +- 56 files changed, 56 insertions(+), 58 deletions(-) (limited to 'inc') diff --git a/inc/lang/ar/denied.txt b/inc/lang/ar/denied.txt index 11405233c..1d83efdff 100644 --- a/inc/lang/ar/denied.txt +++ b/inc/lang/ar/denied.txt @@ -1,3 +1,3 @@ ====== لا صلاحيات ====== -عذرا، ليس مصرح لك الاستمرار، لعلك نسيت تسجيل الدخول؟ \ No newline at end of file +عذرا، ليس مصرح لك الاستمرار @NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/az/denied.txt b/inc/lang/az/denied.txt index a68b08c8c..2b5258274 100644 --- a/inc/lang/az/denied.txt +++ b/inc/lang/az/denied.txt @@ -1,3 +1,3 @@ ====== Müraciət qadağan edilmişdir ====== -Sizin bu əməliyyat üçün kifayət qədər haqqınız yoxdur. Bəlkə, Siz sistemə oz istifadəçi adınız ilə girməyi unutmusunuz? +Sizin bu əməliyyat üçün kifayət qədər haqqınız yoxdur. @NOTLOGGEDIN@ diff --git a/inc/lang/bg/denied.txt b/inc/lang/bg/denied.txt index 45ce63769..2443c3130 100644 --- a/inc/lang/bg/denied.txt +++ b/inc/lang/bg/denied.txt @@ -1,4 +1,4 @@ ====== Отказан достъп ====== -Нямате достатъчно права, за да продължите. Може би сте забравили да се впишете? +Нямате достатъчно права, за да продължите. @NOTLOGGEDIN@ diff --git a/inc/lang/bn/denied.txt b/inc/lang/bn/denied.txt index 711275bad..dbc00e26a 100644 --- a/inc/lang/bn/denied.txt +++ b/inc/lang/bn/denied.txt @@ -1,3 +1,3 @@ ====== অনুমতি অস্বীকার ===== -দুঃখিত, আপনি কি এগিয়ে যেতে যথেষ্ট অধিকার নেই. সম্ভবত আপনি লগইন ভুলে গেছেন? \ No newline at end of file +দুঃখিত, আপনি কি এগিয়ে যেতে যথেষ্ট অধিকার নেই. @NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/ca-valencia/denied.txt b/inc/lang/ca-valencia/denied.txt index 39c45d946..ff42fd37a 100644 --- a/inc/lang/ca-valencia/denied.txt +++ b/inc/lang/ca-valencia/denied.txt @@ -1,4 +1,4 @@ ====== Permís denegat ====== -Disculpe, pero no té permís per a continuar. ¿Haurà oblidat iniciar sessió? +Disculpe, pero no té permís per a continuar. @NOTLOGGEDIN@ diff --git a/inc/lang/ca/denied.txt b/inc/lang/ca/denied.txt index e6125e83b..481375d2b 100644 --- a/inc/lang/ca/denied.txt +++ b/inc/lang/ca/denied.txt @@ -1,4 +1,4 @@ ====== Permís denegat ====== -No teniu prou drets per continuar. Potser us heu descuidat d'entrar? +No teniu prou drets per continuar. @NOTLOGGEDIN@ diff --git a/inc/lang/cs/denied.txt b/inc/lang/cs/denied.txt index 00a8811de..c0f82f492 100644 --- a/inc/lang/cs/denied.txt +++ b/inc/lang/cs/denied.txt @@ -1,3 +1,3 @@ ====== Nepovolená akce ====== -Promiňte, ale nemáte dostatečná oprávnění k této činnosti. Možná jste se zapomněli přihlásit? +Promiňte, ale nemáte dostatečná oprávnění k této činnosti. @NOTLOGGEDIN@ diff --git a/inc/lang/da/denied.txt b/inc/lang/da/denied.txt index a4fa8b88f..2be828c51 100644 --- a/inc/lang/da/denied.txt +++ b/inc/lang/da/denied.txt @@ -1,3 +1,3 @@ ====== Adgang nægtet! ====== -Du har ikke rettigheder til at fortsætte. Måske er du ikke logget ind. +Du har ikke rettigheder til at fortsætte. @NOTLOGGEDIN@ diff --git a/inc/lang/de-informal/denied.txt b/inc/lang/de-informal/denied.txt index 0bc0e59a8..a2713d2e9 100644 --- a/inc/lang/de-informal/denied.txt +++ b/inc/lang/de-informal/denied.txt @@ -1,4 +1,4 @@ ====== Zugang verweigert ====== -Du hast nicht die erforderliche Berechtigung, um diese Aktion durchzuführen. Eventuell bist du nicht am Wiki angemeldet? +Du hast nicht die erforderliche Berechtigung, um diese Aktion durchzuführen. @NOTLOGGEDIN@ diff --git a/inc/lang/de/denied.txt b/inc/lang/de/denied.txt index 8efa81f1b..1538c694d 100644 --- a/inc/lang/de/denied.txt +++ b/inc/lang/de/denied.txt @@ -1,4 +1,4 @@ ====== Zugang verweigert ====== -Sie haben nicht die erforderliche Berechtigung, um diese Aktion durchzuführen. Eventuell sind Sie nicht am Wiki angemeldet? +Sie haben nicht die erforderliche Berechtigung, um diese Aktion durchzuführen. @NOTLOGGEDIN@ diff --git a/inc/lang/el/denied.txt b/inc/lang/el/denied.txt index 36d7ae103..1c2717613 100644 --- a/inc/lang/el/denied.txt +++ b/inc/lang/el/denied.txt @@ -2,4 +2,4 @@ Συγγνώμη, αλλά δεν έχετε επαρκή δικαιώματα για την συγκεκριμένη ενέργεια. -Μήπως παραλείψατε να συνδεθείτε; +@NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/eo/denied.txt b/inc/lang/eo/denied.txt index 3cd6c76bf..942cbbe86 100644 --- a/inc/lang/eo/denied.txt +++ b/inc/lang/eo/denied.txt @@ -1,4 +1,4 @@ ====== Aliro malpermesita ====== -Vi ne havas sufiĉajn rajtojn rigardi ĉi tiujn paĝojn. Eble vi forgesis identiĝi. +Vi ne havas sufiĉajn rajtojn rigardi ĉi tiujn paĝojn. @NOTLOGGEDIN@ diff --git a/inc/lang/es/denied.txt b/inc/lang/es/denied.txt index d7b37404b..0887e7ce6 100644 --- a/inc/lang/es/denied.txt +++ b/inc/lang/es/denied.txt @@ -1,3 +1,3 @@ ====== Permiso Denegado ====== -Lo siento, no tienes suficientes permisos para continuar. ¿Quizás has olvidado identificarte? \ No newline at end of file +Lo siento, no tienes suficientes permisos para continuar. @NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/et/denied.txt b/inc/lang/et/denied.txt index bb564ac57..f2d81c007 100644 --- a/inc/lang/et/denied.txt +++ b/inc/lang/et/denied.txt @@ -1,3 +1,3 @@ ====== Sul pole ligipääsuluba ====== -Kahju küll, aga sinu tublidusest ei piisa, et edasi liikuda, selleks on vastavaid õigusi vaja. +Kahju küll, aga sinu tublidusest ei piisa, et edasi liikuda. @NOTLOGGEDIN@ diff --git a/inc/lang/eu/denied.txt b/inc/lang/eu/denied.txt index 257076a3d..d454ffdfb 100644 --- a/inc/lang/eu/denied.txt +++ b/inc/lang/eu/denied.txt @@ -1,3 +1,3 @@ ====== Ez duzu baimenik ====== -Barkatu, ez duzu baimenik orri hau ikusteko. Agian sesioa hastea ahaztu zaizu? \ No newline at end of file +Barkatu, ez duzu baimenik orri hau ikusteko. @NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/fa/denied.txt b/inc/lang/fa/denied.txt index 827f73e2b..cb9258c03 100644 --- a/inc/lang/fa/denied.txt +++ b/inc/lang/fa/denied.txt @@ -1,3 +1,3 @@ ====== دسترسی ممکن نیست ====== -شرمنده، شما اجازه‌ی دسترسی ب این صفحه را ندارید. ممکن است فراموش کرده باشید که وارد سایت شوید! \ No newline at end of file +شرمنده، شما اجازه‌ی دسترسی ب این صفحه را ندارید. @NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/fi/denied.txt b/inc/lang/fi/denied.txt index cd31da06b..89ae3b8e1 100644 --- a/inc/lang/fi/denied.txt +++ b/inc/lang/fi/denied.txt @@ -1,3 +1,3 @@ ====== Lupa evätty ====== -Sinulla ei ole tarpeeksi valtuuksia jatkaa. Ehkä unohdit kirjautua sisään? +Sinulla ei ole tarpeeksi valtuuksia jatkaa. @NOTLOGGEDIN@ diff --git a/inc/lang/fo/denied.txt b/inc/lang/fo/denied.txt index 505b249b4..25d98f634 100644 --- a/inc/lang/fo/denied.txt +++ b/inc/lang/fo/denied.txt @@ -1,3 +1,3 @@ ====== Atgongd nokta! ====== -Tú hevur ikki rættindi til at halda áfram. Møguliga hevur tú ikki rita inn. +Tú hevur ikki rættindi til at halda áfram. @NOTLOGGEDIN@ diff --git a/inc/lang/fr/denied.txt b/inc/lang/fr/denied.txt index 20d4d6755..640829482 100644 --- a/inc/lang/fr/denied.txt +++ b/inc/lang/fr/denied.txt @@ -1,3 +1,3 @@ ====== Autorisation refusée ====== -Désolé, vous n'avez pas les droits pour continuer. Peut-être avez-vous oublié de vous identifier ? +Désolé, vous n'avez pas les droits pour continuer. @NOTLOGGEDIN@ diff --git a/inc/lang/gl/denied.txt b/inc/lang/gl/denied.txt index 69408a4f3..a0847ecb2 100644 --- a/inc/lang/gl/denied.txt +++ b/inc/lang/gl/denied.txt @@ -1,4 +1,4 @@ ====== Permiso Denegado ====== -Sentímolo, mais non tes permisos de abondo para continuares. Pode que esqueceses iniciar a sesión? +Sentímolo, mais non tes permisos de abondo para continuares. @NOTLOGGEDIN@ diff --git a/inc/lang/he/denied.txt b/inc/lang/he/denied.txt index a366fc198..1c605f7b8 100644 --- a/inc/lang/he/denied.txt +++ b/inc/lang/he/denied.txt @@ -1,3 +1,3 @@ ====== הרשאה נדחתה ====== -אנו מצטערים אך אין לך הרשאות מתאימות כדי להמשיך. אולי שכחת להיכנס למערכת? \ No newline at end of file +אנו מצטערים אך אין לך הרשאות מתאימות כדי להמשיך. @NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/hr/denied.txt b/inc/lang/hr/denied.txt index 216eea582..c9b0ca3eb 100644 --- a/inc/lang/hr/denied.txt +++ b/inc/lang/hr/denied.txt @@ -2,4 +2,4 @@ Nemate autorizaciju. -Niste li se možda zaboravili prijaviti u aplikaciju? +@NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/hu-formal/denied.txt b/inc/lang/hu-formal/denied.txt index 97abd632a..f25e4f086 100644 --- a/inc/lang/hu-formal/denied.txt +++ b/inc/lang/hu-formal/denied.txt @@ -1,3 +1,3 @@ ====== Hozzáférés megtadadva ====== -Sajnáljuk, de nincs joga a folytatáshoz. Talán elfelejtett bejelentkezni? \ No newline at end of file +Sajnáljuk, de nincs joga a folytatáshoz. @NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/hu/denied.txt b/inc/lang/hu/denied.txt index 0b06724df..85bb6d352 100644 --- a/inc/lang/hu/denied.txt +++ b/inc/lang/hu/denied.txt @@ -1,4 +1,4 @@ ====== Hozzáférés megtagadva ====== -Sajnáljuk, nincs jogod a folytatáshoz. Esetleg elfelejtettél bejelentkezni? +Sajnáljuk, nincs jogod a folytatáshoz. @NOTLOGGEDIN@ diff --git a/inc/lang/ia/denied.txt b/inc/lang/ia/denied.txt index 044e1532d..29d35bbde 100644 --- a/inc/lang/ia/denied.txt +++ b/inc/lang/ia/denied.txt @@ -1,3 +1,3 @@ ====== Permission refusate ====== -Pardono, tu non ha le derectos requisite pro continuar. Pote esser que tu ha oblidate de aperir un session. \ No newline at end of file +Pardono, tu non ha le derectos requisite pro continuar. @NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/id/denied.txt b/inc/lang/id/denied.txt index bad8f24a6..e40be0550 100644 --- a/inc/lang/id/denied.txt +++ b/inc/lang/id/denied.txt @@ -1,4 +1,4 @@ ====== Akses Ditolak ====== -Maaf, Anda tidak mempunyai hak akses untuk melanjutkan. Apakah Anda belum login? +Maaf, Anda tidak mempunyai hak akses untuk melanjutkan. @NOTLOGGEDIN@ diff --git a/inc/lang/it/denied.txt b/inc/lang/it/denied.txt index d21956a5b..6bba10cf0 100644 --- a/inc/lang/it/denied.txt +++ b/inc/lang/it/denied.txt @@ -1,5 +1,4 @@ ====== Accesso negato ====== -Non hai i diritti per continuare. Forse hai dimenticato di effettuare l'accesso? - +Non hai i diritti per continuare. @NOTLOGGEDIN@ diff --git a/inc/lang/ja/denied.txt b/inc/lang/ja/denied.txt index d170aebe4..452d62217 100644 --- a/inc/lang/ja/denied.txt +++ b/inc/lang/ja/denied.txt @@ -1,4 +1,4 @@ ====== アクセスが拒否されました ====== -実行する権限がありません。ログインされているか確認してください。 +実行する権限がありません。@NOTLOGGEDIN@ diff --git a/inc/lang/km/denied.txt b/inc/lang/km/denied.txt index 58b10ee86..7fa1868b4 100644 --- a/inc/lang/km/denied.txt +++ b/inc/lang/km/denied.txt @@ -1,3 +1,3 @@ ====== បដិសេធអនុញ្ញាត ====== -សូមទុស អ្នកគ្មានអនុញ្ញាតទៅបណ្តទេ។ +សូមទុស អ្នកគ្មានអនុញ្ញាតទៅបណ្តទេ។ @NOTLOGGEDIN@ diff --git a/inc/lang/ko/denied.txt b/inc/lang/ko/denied.txt index cf0b294a4..50556a72e 100644 --- a/inc/lang/ko/denied.txt +++ b/inc/lang/ko/denied.txt @@ -1,3 +1,3 @@ ====== 권한 거절 ====== -죄송하지만 계속할 수 있는 권한이 없습니다. 로그인을 잊으셨나요? \ No newline at end of file +죄송하지만 계속할 수 있는 권한이 없습니다. @NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/ku/denied.txt b/inc/lang/ku/denied.txt index 3ac72820c..6f7fe055e 100644 --- a/inc/lang/ku/denied.txt +++ b/inc/lang/ku/denied.txt @@ -1,4 +1,4 @@ ====== Permission Denied ====== -Sorry, you don't have enough rights to continue. Perhaps you forgot to login? +Sorry, you don't have enough rights to continue. @NOTLOGGEDIN@ diff --git a/inc/lang/la/denied.txt b/inc/lang/la/denied.txt index fdb62f53e..e703c7716 100644 --- a/inc/lang/la/denied.txt +++ b/inc/lang/la/denied.txt @@ -1,3 +1,3 @@ ====== Ad hanc paginam accedere non potes ====== -Ad hanc paginam accedere non potes: antea in conuentum ineas, deinde rursum temptas \ No newline at end of file +Ad hanc paginam accedere non potes: antea in conuentum ineas, deinde rursum temptas @NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/lb/denied.txt b/inc/lang/lb/denied.txt index 487bf2198..a7b52d024 100644 --- a/inc/lang/lb/denied.txt +++ b/inc/lang/lb/denied.txt @@ -1,3 +1,3 @@ ======Erlaabnis verweigert====== -Et deet mer leed, du hues net genuch Rechter fir weiderzefueren. Hues de vläicht vergiess dech anzeloggen? +Et deet mer leed, du hues net genuch Rechter fir weiderzefueren. @NOTLOGGEDIN@ diff --git a/inc/lang/lt/denied.txt b/inc/lang/lt/denied.txt index c25fb5f0c..de651bb1a 100644 --- a/inc/lang/lt/denied.txt +++ b/inc/lang/lt/denied.txt @@ -1,4 +1,4 @@ ====== Priėjimas uždraustas ====== -Jūs neturite reikiamų teisių, kad galėtumėte tęsti. Turbūt pamiršote prisijungti :-). +Jūs neturite reikiamų teisių, kad galėtumėte tęsti. @NOTLOGGEDIN@ diff --git a/inc/lang/lv/denied.txt b/inc/lang/lv/denied.txt index c7df462c8..e8287242e 100644 --- a/inc/lang/lv/denied.txt +++ b/inc/lang/lv/denied.txt @@ -1,6 +1,6 @@ ====== Piekļuve aizliegta ====== -Atvaino, tev nav tiesību turpināt. Varbūt aizmirsi ielogoties? +Atvaino, tev nav tiesību turpināt. @NOTLOGGEDIN@ diff --git a/inc/lang/mg/denied.txt b/inc/lang/mg/denied.txt index edf20f1a1..a769bcd40 100644 --- a/inc/lang/mg/denied.txt +++ b/inc/lang/mg/denied.txt @@ -1,4 +1,4 @@ ====== Tsy tafiditra ====== -Miala tsiny fa tsy manana alalana hanohizana mankany ianao. Angamba hadinonao ny niditra. +Miala tsiny fa tsy manana alalana hanohizana mankany ianao. @NOTLOGGEDIN@ diff --git a/inc/lang/mr/denied.txt b/inc/lang/mr/denied.txt index 1b499f51d..2a7827e3e 100644 --- a/inc/lang/mr/denied.txt +++ b/inc/lang/mr/denied.txt @@ -1,3 +1,3 @@ ====== परवानगी नाकारली ====== -क्षमा करा, पण तुम्हाला यापुढे जाण्याचे हक्क नाहीत. कदाचित तुम्ही लॉगिन करायला विसरला आहात ? \ No newline at end of file +क्षमा करा, पण तुम्हाला यापुढे जाण्याचे हक्क नाहीत. @NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/ne/denied.txt b/inc/lang/ne/denied.txt index ab4bcf290..69e1840e7 100644 --- a/inc/lang/ne/denied.txt +++ b/inc/lang/ne/denied.txt @@ -1,3 +1,3 @@ ====== अनुमति अमान्य ====== -माफ गर्नुहोला तपाईलाई अगाडि बढ्न अनुमति छैन। सम्भवत: तपाईले प्रवेश गर्न भुल्नु भयो। \ No newline at end of file +माफ गर्नुहोला तपाईलाई अगाडि बढ्न अनुमति छैन। @NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/nl/denied.txt b/inc/lang/nl/denied.txt index 6a8bf773f..8c2cf3f42 100644 --- a/inc/lang/nl/denied.txt +++ b/inc/lang/nl/denied.txt @@ -1,3 +1,3 @@ ====== Toegang geweigerd ====== -Sorry: je hebt niet voldoende rechten om verder te gaan. Misschien ben je vergeten in te loggen? +Sorry: je hebt niet voldoende rechten om verder te gaan. @NOTLOGGEDIN@ diff --git a/inc/lang/no/denied.txt b/inc/lang/no/denied.txt index 6e7f1f28b..f34b73cbb 100644 --- a/inc/lang/no/denied.txt +++ b/inc/lang/no/denied.txt @@ -1,3 +1,3 @@ ====== Adgang forbudt ====== -Beklager, men du har ikke rettigheter til dette. Kanskje du har glemt å logge inn? +Beklager, men du har ikke rettigheter til dette. @NOTLOGGEDIN@ diff --git a/inc/lang/pl/denied.txt b/inc/lang/pl/denied.txt index d402463ef..c9352536a 100644 --- a/inc/lang/pl/denied.txt +++ b/inc/lang/pl/denied.txt @@ -1,4 +1,4 @@ ====== Brak dostępu ====== -Nie masz wystarczających uprawnień. Zaloguj się! +Nie masz wystarczających uprawnień. @NOTLOGGEDIN@ diff --git a/inc/lang/pt-br/denied.txt b/inc/lang/pt-br/denied.txt index d7e423f42..5f6cc318d 100644 --- a/inc/lang/pt-br/denied.txt +++ b/inc/lang/pt-br/denied.txt @@ -1,3 +1,3 @@ ====== Permissão Negada ====== -Desculpe, você não tem permissões suficientes para continuar. Por acaso esqueceu de autenticar-se? +Desculpe, você não tem permissões suficientes para continuar. @NOTLOGGEDIN@ diff --git a/inc/lang/pt/denied.txt b/inc/lang/pt/denied.txt index eb2614387..e3e0c6e4b 100644 --- a/inc/lang/pt/denied.txt +++ b/inc/lang/pt/denied.txt @@ -1,3 +1,3 @@ ====== Permissão Negada ====== -Não possui direitos e permissões suficientes para continuar. Talvez se tenha esquecido de iniciar sessão? \ No newline at end of file +Não possui direitos e permissões suficientes para continuar. @NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/ro/denied.txt b/inc/lang/ro/denied.txt index 8e8126a17..966b259b9 100644 --- a/inc/lang/ro/denied.txt +++ b/inc/lang/ro/denied.txt @@ -1,4 +1,3 @@ ====== Acces nepermis ====== -Din păcate nu ai destule drepturi pentru a continua. Poate ai uitat să te -autentifici? +Din păcate nu ai destule drepturi pentru a continua. @NOTLOGGEDIN@ diff --git a/inc/lang/ru/denied.txt b/inc/lang/ru/denied.txt index f7f53ce88..e8143810e 100644 --- a/inc/lang/ru/denied.txt +++ b/inc/lang/ru/denied.txt @@ -1,3 +1,3 @@ ====== Доступ запрещён ====== -Извините, у вас не хватает прав для этого действия. Может быть вы забыли войти в вики под своим логином? +Извините, у вас не хватает прав для этого действия. @NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/sk/denied.txt b/inc/lang/sk/denied.txt index 6e9c98496..191c9b42a 100644 --- a/inc/lang/sk/denied.txt +++ b/inc/lang/sk/denied.txt @@ -1,3 +1,3 @@ ====== Nepovolená akcia ====== -Prepáčte, ale nemáte dostatočné oprávnenie k tejto činnosti. Možno ste sa zabudli prihlásiť? +Prepáčte, ale nemáte dostatočné oprávnenie k tejto činnosti. @NOTLOGGEDIN@ diff --git a/inc/lang/sl/denied.txt b/inc/lang/sl/denied.txt index 5b5fd4d3a..ca73c53a2 100644 --- a/inc/lang/sl/denied.txt +++ b/inc/lang/sl/denied.txt @@ -1,3 +1,3 @@ ====== Ni ustreznih dovoljenj ====== -Za nadaljevanje opravila je treba imeti ustrezna dovoljenja. Ali ste se morda pozabili prijaviti? +Za nadaljevanje opravila je treba imeti ustrezna dovoljenja. @NOTLOGGEDIN@ diff --git a/inc/lang/sq/denied.txt b/inc/lang/sq/denied.txt index 03e10527f..19b04f1f9 100644 --- a/inc/lang/sq/denied.txt +++ b/inc/lang/sq/denied.txt @@ -1,3 +1,3 @@ ====== Leja Refuzohet ====== -Na vjen keq, ju nuk keni të drejta të mjaftueshme për të vazhduar. Mbase harruat të hyni? \ No newline at end of file +Na vjen keq, ju nuk keni të drejta të mjaftueshme për të vazhduar. @NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/sr/denied.txt b/inc/lang/sr/denied.txt index b74f2b1f8..42d0bdf57 100644 --- a/inc/lang/sr/denied.txt +++ b/inc/lang/sr/denied.txt @@ -1,4 +1,4 @@ ====== Забрањен приступ ====== -Извините, али немате довољно права да наставите. Можда сте заборавили да се пријавите? +Извините, али немате довољно права да наставите. @NOTLOGGEDIN@ diff --git a/inc/lang/sv/denied.txt b/inc/lang/sv/denied.txt index 64d129227..a60632c6a 100644 --- a/inc/lang/sv/denied.txt +++ b/inc/lang/sv/denied.txt @@ -1,4 +1,4 @@ ====== Åtkomst nekad ====== -Tyvärr, du har inte behörighet att fortsätta. Kanske har du glömt att logga in? +Tyvärr, du har inte behörighet att fortsätta. @NOTLOGGEDIN@ diff --git a/inc/lang/th/denied.txt b/inc/lang/th/denied.txt index 88b012a67..6375697e2 100644 --- a/inc/lang/th/denied.txt +++ b/inc/lang/th/denied.txt @@ -1,3 +1,3 @@ ====== ปฏิเสธสิทธิ์ ====== -ขออภัย คุณไม่มีสิทธิ์เพียงพอที่จะดำเนินการต่อ บางทีคุณอาจจะลืมล็อกอิน? \ No newline at end of file +ขออภัย คุณไม่มีสิทธิ์เพียงพอที่จะดำเนินการต่อ @NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/tr/denied.txt b/inc/lang/tr/denied.txt index 04e9b8bfb..ecc277c1f 100644 --- a/inc/lang/tr/denied.txt +++ b/inc/lang/tr/denied.txt @@ -1,4 +1,4 @@ ====== Yetki Reddedildi ====== -Üzgünüz, devam etmek için yetkiniz yok. Giriş yapmayı unutmuş olabilir misiniz? +Üzgünüz, devam etmek için yetkiniz yok. @NOTLOGGEDIN@ diff --git a/inc/lang/uk/denied.txt b/inc/lang/uk/denied.txt index 5db12e1bc..8e0a4fe7f 100644 --- a/inc/lang/uk/denied.txt +++ b/inc/lang/uk/denied.txt @@ -1,4 +1,4 @@ ====== Доступ заборонено ====== -Вибачте, але у вас не вистачає прав для продовження. Можливо ви забули увійти в систему? +Вибачте, але у вас не вистачає прав для продовження. @NOTLOGGEDIN@ diff --git a/inc/lang/vi/denied.txt b/inc/lang/vi/denied.txt index 35acaeb62..58739e63e 100644 --- a/inc/lang/vi/denied.txt +++ b/inc/lang/vi/denied.txt @@ -1,3 +1,3 @@ ====== Không được phép vào ====== -Rất tiếc là bạn không được phép để tiếp tục. Bạn quên đăng nhập hay sao? +Rất tiếc là bạn không được phép để tiếp tục. @NOTLOGGEDIN@ diff --git a/inc/lang/zh-tw/denied.txt b/inc/lang/zh-tw/denied.txt index 5a4d483a5..4297c1a20 100644 --- a/inc/lang/zh-tw/denied.txt +++ b/inc/lang/zh-tw/denied.txt @@ -1,4 +1,4 @@ ====== 權限拒絕 ====== -抱歉，您沒有足夠權限繼續執行。或許您忘了登入？ +抱歉，您沒有足夠權限繼續執行。@NOTLOGGEDIN@ diff --git a/inc/lang/zh/denied.txt b/inc/lang/zh/denied.txt index 276741c40..bf3a85478 100644 --- a/inc/lang/zh/denied.txt +++ b/inc/lang/zh/denied.txt @@ -1,3 +1,3 @@ ====== 拒绝授权 ====== -对不起，您没有足够权限，无法继续。也许您忘了登录？ \ No newline at end of file +对不起，您没有足够权限，无法继续。@NOTLOGGEDIN@ \ No newline at end of file -- cgit v1.2.3 From 2ada8709d3a0cea872f117823b244b400fac5f87 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Tue, 25 Feb 2014 20:32:56 +0000 Subject: add renderers to autolader --- inc/load.php | 6 ++++++ inc/parser/code.php | 1 - inc/parser/metadata.php | 2 -- inc/parser/renderer.php | 1 - inc/parser/xhtml.php | 3 --- inc/parser/xhtmlsummary.php | 1 - inc/parserutils.php | 2 -- 7 files changed, 6 insertions(+), 10 deletions(-) (limited to 'inc') diff --git a/inc/load.php b/inc/load.php index 497dd6921..f1deffe19 100644 --- a/inc/load.php +++ b/inc/load.php @@ -96,6 +96,12 @@ function load_autoload($name){ 'DokuWiki_Remote_Plugin' => DOKU_PLUGIN.'remote.php', 'DokuWiki_Auth_Plugin' => DOKU_PLUGIN.'auth.php', + 'Doku_Renderer' => DOKU_INC.'inc/parser/renderer.php', + 'Doku_Renderer_xhtml' => DOKU_INC.'inc/parser/xhtml.php', + 'Doku_Renderer_code' => DOKU_INC.'inc/parser/code.php', + 'Doku_Renderer_xhtmlsummary' => DOKU_INC.'inc/parser/xhtmlsummary.php', + 'Doku_Renderer_metadata' => DOKU_INC.'inc/parser/metadata.php', + ); if(isset($classes[$name])){ diff --git a/inc/parser/code.php b/inc/parser/code.php index 0b8e3ee02..d77ffd1aa 100644 --- a/inc/parser/code.php +++ b/inc/parser/code.php @@ -5,7 +5,6 @@ * @author Andreas Gohr */ if(!defined('DOKU_INC')) die('meh.'); -require_once DOKU_INC . 'inc/parser/renderer.php'; class Doku_Renderer_code extends Doku_Renderer { var $_codeblock=0; diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php index 8ba159d62..73bae190f 100644 --- a/inc/parser/metadata.php +++ b/inc/parser/metadata.php @@ -16,8 +16,6 @@ if ( !defined('DOKU_TAB') ) { define ('DOKU_TAB',"\t"); } -require_once DOKU_INC . 'inc/parser/renderer.php'; - /** * The Renderer */ diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php index e3401fd48..6b6a1770b 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/plugin.php'; require_once DOKU_INC . 'inc/pluginutils.php'; /** diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 315b4d640..184e62fe3 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -17,9 +17,6 @@ if ( !defined('DOKU_TAB') ) { define ('DOKU_TAB',"\t"); } -require_once DOKU_INC . 'inc/parser/renderer.php'; -require_once DOKU_INC . 'inc/html.php'; - /** * The Renderer */ diff --git a/inc/parser/xhtmlsummary.php b/inc/parser/xhtmlsummary.php index 95f86cbef..867b71f6a 100644 --- a/inc/parser/xhtmlsummary.php +++ b/inc/parser/xhtmlsummary.php @@ -1,6 +1,5 @@ advise_before()) { - require_once DOKU_INC."inc/parser/metadata.php"; - // get instructions $instructions = p_cached_instructions(wikiFN($id),false,$id); if(is_null($instructions)){ -- cgit v1.2.3 From 548d801fe28808c85529c4e396ccc563550d4634 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Tue, 25 Feb 2014 20:33:37 +0000 Subject: rework p_get_renderer() for use with autoloading bundled renderers --- inc/parserutils.php | 60 ++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'inc') diff --git a/inc/parserutils.php b/inc/parserutils.php index 11f044146..7a85b64e3 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -614,8 +614,13 @@ function p_render($mode,$instructions,&$info){ } /** + * Figure out the correct renderer class to use for $mode, + * instantiate and return it + * * @param $mode string Mode of the renderer to get * @return null|Doku_Renderer The renderer + * + * @author Christopher Smith */ function p_get_renderer($mode) { /** @var Doku_Plugin_Controller $plugin_controller */ @@ -624,49 +629,44 @@ function p_get_renderer($mode) { $rname = !empty($conf['renderer_'.$mode]) ? $conf['renderer_'.$mode] : $mode; $rclass = "Doku_Renderer_$rname"; + // if requested earlier or a bundled renderer if( class_exists($rclass) ) { $Renderer = new $rclass(); return $Renderer; } - // assuming the configured renderer is bundled, construct its file name - $default = DOKU_INC."inc/parser/$rname.php"; - if (!file_exists($default)) { - // not bundled, see if its an enabled plugin for rendering $mode - $Renderer = $plugin_controller->load('renderer',$rname); + // not bundled, see if its an enabled plugin for rendering $mode + $Renderer = $plugin_controller->load('renderer',$rname); + if ($Renderer) { if (is_a($Renderer, 'Doku_Renderer') && ($mode == $Renderer->getFormat())) { return $Renderer; - } - - // there is a configuration error! - // not bundled, not an enabled plugin, try to fallback to a bundled renderer - $fallback = DOKU_INC."inc/parser/$mode.php"; - if (!file_exists($fallback)) { - msg("No renderer '$rname' found for mode '$mode'",-1); - return null; } else { - $default = $fallback; - $rclass = "Doku_Renderer_$mode"; - - // viewers should see renderered output, so restrict the warning to admins only - $msg = "No renderer '$rname' found for mode '$mode', check your plugins"; - if ($mode == 'xhtml') { - $msg .= " and the 'renderer_xhtml' config setting"; - } - $msg .= ".
Attempting to fallback to the bundled renderer."; - msg($msg,-1,'','',MSG_ADMIN_ONLY); + // plugin found, but not a renderer or not the right renderer for this $mode + msg("Renderer plugin '$rname' not valid for $mode",-1,'','',MSG_ADMINS_ONLY); } } - require_once $default; - if ( !class_exists($rclass) ) { - trigger_error("Unable to resolve render class $rclass",E_USER_WARNING); - msg("Renderer '$rname' for $mode not valid",-1); - return null; + // there is a configuration error! + // not bundled, not a valid enabled plugin, use $mode to try to fallback to a bundled renderer + $rclass = "Doku_Renderer_$mode"; + if ( class_exists($rclass) ) { + // viewers should see renderered output, so restrict the warning to admins only + $msg = "No renderer '$rname' found for mode '$mode', check your plugins"; + if ($mode == 'xhtml') { + $msg .= " and the 'renderer_xhtml' config setting"; + } + $msg .= ".
Attempting to fallback to the bundled renderer."; + msg($msg,-1,'','',MSG_ADMINS_ONLY); + + $Renderer = new $rclass; + $Renderer->nocache(); // fallback only (and may include admin alerts), don't cache + return $Renderer; } - $Renderer = new $rclass(); - return $Renderer; + // fallback failed, alert the world + trigger_error("Unable to resolve render class $rclass",E_USER_WARNING); + msg("No renderer '$rname' found for mode '$mode'",-1); + return null; } /** -- cgit v1.2.3 From 5b76ad9103ca8e25d29c5ce018859be6679b7b1c Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Tue, 25 Feb 2014 20:34:20 +0000 Subject: code cleaning - add some braces --- inc/parserutils.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/parserutils.php b/inc/parserutils.php index 7a85b64e3..c12732e88 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -430,8 +430,9 @@ function p_render_metadata($id, $orig){ global $ID, $METADATA_RENDERERS; // avoid recursive rendering processes for the same id - if (isset($METADATA_RENDERERS[$id])) + if (isset($METADATA_RENDERERS[$id])) { return $orig; + } // store the original metadata in the global $METADATA_RENDERERS so p_set_metadata can use it $METADATA_RENDERERS[$id] =& $orig; -- cgit v1.2.3 From f3283f02766b2a2730b81c5a5a0b0a6240af054c Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Tue, 25 Feb 2014 21:15:43 +0000 Subject: change to an Exception and expect it --- inc/parserutils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/parserutils.php b/inc/parserutils.php index c12732e88..1c628a766 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -665,7 +665,7 @@ function p_get_renderer($mode) { } // fallback failed, alert the world - trigger_error("Unable to resolve render class $rclass",E_USER_WARNING); + throw new Exception("Unable to resolve render class $rclass",E_USER_WARNING); msg("No renderer '$rname' found for mode '$mode'",-1); return null; } -- cgit v1.2.3 From a049856df3f316114a9d936d830d5b6d419b11e6 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 26 Feb 2014 01:12:33 +0000 Subject: revert back to trigger error --- inc/parserutils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/parserutils.php b/inc/parserutils.php index 1c628a766..c12732e88 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -665,7 +665,7 @@ function p_get_renderer($mode) { } // fallback failed, alert the world - throw new Exception("Unable to resolve render class $rclass",E_USER_WARNING); + trigger_error("Unable to resolve render class $rclass",E_USER_WARNING); msg("No renderer '$rname' found for mode '$mode'",-1); return null; } -- cgit v1.2.3 From e30b0f289638b91494ea96d307fd82e1458d6dcf Mon Sep 17 00:00:00 2001 From: Wild Date: Sat, 22 Feb 2014 12:47:47 +0100 Subject: translation update --- inc/lang/fr/denied.txt | 2 +- inc/lang/fr/lang.php | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'inc') diff --git a/inc/lang/fr/denied.txt b/inc/lang/fr/denied.txt index 20d4d6755..56c59a7c2 100644 --- a/inc/lang/fr/denied.txt +++ b/inc/lang/fr/denied.txt @@ -1,3 +1,3 @@ ====== Autorisation refusée ====== -Désolé, vous n'avez pas les droits pour continuer. Peut-être avez-vous oublié de vous identifier ? +Désolé, vous n'avez pas suffisement d'autorisations pour poursuivre votre demande. Peut-être avez-vous oublié de vous identifier ? diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php index 49f617323..32e3055f7 100644 --- a/inc/lang/fr/lang.php +++ b/inc/lang/fr/lang.php @@ -29,6 +29,7 @@ * @author Bruno Veilleux * @author Emmanuel * @author Jérôme Brandt + * @author Wild */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -51,10 +52,10 @@ $lang['btn_revs'] = 'Anciennes révisions'; $lang['btn_recent'] = 'Derniers changements'; $lang['btn_upload'] = 'Envoyer'; $lang['btn_cancel'] = 'Annuler'; -$lang['btn_index'] = 'Index'; +$lang['btn_index'] = 'Plan du site'; $lang['btn_secedit'] = 'Modifier'; -$lang['btn_login'] = 'Connexion'; -$lang['btn_logout'] = 'Déconnexion'; +$lang['btn_login'] = 'S\'identifier'; +$lang['btn_logout'] = 'Se déconnecter'; $lang['btn_admin'] = 'Administrer'; $lang['btn_update'] = 'Mettre à jour'; $lang['btn_delete'] = 'Effacer'; @@ -69,7 +70,7 @@ $lang['btn_draft'] = 'Modifier le brouillon'; $lang['btn_recover'] = 'Récupérer le brouillon'; $lang['btn_draftdel'] = 'Effacer le brouillon'; $lang['btn_revert'] = 'Restaurer'; -$lang['btn_register'] = 'S\'enregistrer'; +$lang['btn_register'] = 'Créer un compte'; $lang['btn_apply'] = 'Appliquer'; $lang['btn_media'] = 'Gestionnaire de médias'; $lang['btn_deleteuser'] = 'Supprimer mon compte'; -- cgit v1.2.3 From 524df5769a0b9b7aa35af6500c85528c2b0515fe Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 28 Feb 2014 12:43:19 +0100 Subject: added stripped bit to language file this has been done by a script and might not be 100% accurate --- inc/lang/ar/lang.php | 1 + inc/lang/az/lang.php | 1 + inc/lang/bg/lang.php | 1 + inc/lang/bn/lang.php | 1 + inc/lang/ca-valencia/lang.php | 1 + inc/lang/ca/lang.php | 1 + inc/lang/cs/lang.php | 1 + inc/lang/da/lang.php | 1 + inc/lang/de-informal/lang.php | 1 + inc/lang/de/lang.php | 1 + inc/lang/el/lang.php | 1 + inc/lang/eo/lang.php | 1 + inc/lang/es/lang.php | 1 + inc/lang/et/lang.php | 1 + inc/lang/eu/lang.php | 1 + inc/lang/fa/lang.php | 1 + inc/lang/fi/lang.php | 1 + inc/lang/fo/lang.php | 1 + inc/lang/fr/lang.php | 1 + inc/lang/gl/lang.php | 1 + inc/lang/he/lang.php | 1 + inc/lang/hr/lang.php | 1 + inc/lang/hu-formal/lang.php | 1 + inc/lang/hu/lang.php | 1 + inc/lang/ia/lang.php | 1 + inc/lang/id/lang.php | 1 + inc/lang/it/lang.php | 1 + inc/lang/ja/lang.php | 1 + inc/lang/km/lang.php | 1 + inc/lang/ko/lang.php | 1 + inc/lang/ku/lang.php | 1 + inc/lang/la/lang.php | 1 + inc/lang/lb/lang.php | 1 + inc/lang/lt/lang.php | 1 + inc/lang/lv/lang.php | 1 + inc/lang/mg/lang.php | 1 + inc/lang/mr/lang.php | 1 + inc/lang/ne/lang.php | 1 + inc/lang/nl/lang.php | 1 + inc/lang/no/lang.php | 1 + inc/lang/pl/lang.php | 1 + inc/lang/pt-br/lang.php | 1 + inc/lang/pt/lang.php | 1 + inc/lang/ro/lang.php | 1 + inc/lang/ru/lang.php | 1 + inc/lang/sk/lang.php | 1 + inc/lang/sl/lang.php | 1 + inc/lang/sq/lang.php | 1 + inc/lang/sr/lang.php | 1 + inc/lang/sv/lang.php | 1 + inc/lang/th/lang.php | 1 + inc/lang/tr/lang.php | 1 + inc/lang/uk/lang.php | 1 + inc/lang/vi/lang.php | 1 + inc/lang/zh-tw/lang.php | 1 + inc/lang/zh/lang.php | 1 + 56 files changed, 56 insertions(+) (limited to 'inc') diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php index 157513429..f5e56de90 100644 --- a/inc/lang/ar/lang.php +++ b/inc/lang/ar/lang.php @@ -341,3 +341,4 @@ $lang['media_restore'] = 'استرجع هذه النسخة'; $lang['currentns'] = 'مساحة الاسم الحالية'; $lang['searchresult'] = 'نتيجة البحث'; $lang['wikimarkup'] = 'علامات الوكي'; +$lang['notloggedin'] = 'الاستمرار، لعلك نسيت تسجيل الدخول؟'; diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php index df54b4f10..5ea965626 100644 --- a/inc/lang/az/lang.php +++ b/inc/lang/az/lang.php @@ -215,3 +215,4 @@ $lang['days'] = '%d gün əvvəl'; $lang['hours'] = '%d saat əvvəl'; $lang['minutes'] = '%d dəqiqə əvvəl'; $lang['seconds'] = '%d saniyə əvvəl'; +$lang['notloggedin'] = 'Bəlkə, Siz sistemə oz istifadəçi adınız ilə girməyi unutmusunuz?'; diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php index bb74ff1ca..79bab5865 100644 --- a/inc/lang/bg/lang.php +++ b/inc/lang/bg/lang.php @@ -330,3 +330,4 @@ $lang['media_update'] = 'Качване на нова версия'; $lang['media_restore'] = 'Възстановяване на тази версия'; $lang['searchresult'] = 'Резултати от търсенето'; $lang['plainhtml'] = 'Обикновен HTML'; +$lang['notloggedin'] = 'Може би сте забравили да се впишете?'; diff --git a/inc/lang/bn/lang.php b/inc/lang/bn/lang.php index 94a3fbb12..f538e47ec 100644 --- a/inc/lang/bn/lang.php +++ b/inc/lang/bn/lang.php @@ -127,3 +127,4 @@ $lang['js']['medialeft'] = 'বাম দিকে ইমেজ সার $lang['js']['mediaright'] = 'ডান দিকে ইমেজ সারিবদ্ধ কর'; $lang['js']['mediacenter'] = 'মাঝখানে ইমেজ সারিবদ্ধ কর'; $lang['js']['medianoalign'] = 'কোনো সারিবদ্ধ করা প্রয়োজন নেই'; +$lang['notloggedin'] = 'সম্ভবত আপনি লগইন ভুলে গেছেন?'; diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php index 9ab423783..e5bd58417 100644 --- a/inc/lang/ca-valencia/lang.php +++ b/inc/lang/ca-valencia/lang.php @@ -220,3 +220,4 @@ $lang['days'] = 'fa %d dies'; $lang['hours'] = 'fa %d hores'; $lang['minutes'] = 'fa %d minuts'; $lang['seconds'] = 'fa %d segons'; +$lang['notloggedin'] = '¿Haurà oblidat iniciar sessió?'; diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php index fd19c6834..810a613c2 100644 --- a/inc/lang/ca/lang.php +++ b/inc/lang/ca/lang.php @@ -313,3 +313,4 @@ $lang['media_perm_read'] = 'No teniu permisos suficients per a llegir arxi $lang['media_perm_upload'] = 'No teniu permisos suficients per a pujar arxius'; $lang['media_update'] = 'Puja la nova versió'; $lang['media_restore'] = 'Restaura aquesta versió'; +$lang['notloggedin'] = 'Potser us heu descuidat d\'entrar?'; diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php index a0f69b3dc..8461277ca 100644 --- a/inc/lang/cs/lang.php +++ b/inc/lang/cs/lang.php @@ -342,3 +342,4 @@ $lang['currentns'] = 'Aktuální jmenný prostor'; $lang['searchresult'] = 'Výsledek hledání'; $lang['plainhtml'] = 'Čisté HTML'; $lang['wikimarkup'] = 'Wiki jazyk'; +$lang['notloggedin'] = 'Možná jste se zapomněli přihlásit?'; diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php index eb50bb240..c2d892d2a 100644 --- a/inc/lang/da/lang.php +++ b/inc/lang/da/lang.php @@ -336,3 +336,4 @@ $lang['media_perm_read'] = 'Du har ikke nok rettigheder til at læse filer $lang['media_perm_upload'] = 'Du har ikke nok rettigheder til at uploade filer.'; $lang['media_update'] = 'Upload ny version'; $lang['media_restore'] = 'Genskab denne version'; +$lang['notloggedin'] = 'Måske er du ikke logget ind.'; diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php index be3f14a18..c9e478649 100644 --- a/inc/lang/de-informal/lang.php +++ b/inc/lang/de-informal/lang.php @@ -343,3 +343,4 @@ $lang['media_update'] = 'Neue Version hochladen'; $lang['media_restore'] = 'Diese Version wiederherstellen'; $lang['currentns'] = 'Aktueller Namensraum'; $lang['searchresult'] = 'Suchergebnis'; +$lang['notloggedin'] = 'Eventuell bist du nicht am Wiki angemeldet?'; diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index 9df1035f7..01f2e81c5 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -345,3 +345,4 @@ $lang['media_restore'] = 'Diese Version wiederherstellen'; $lang['currentns'] = 'Aktueller Namensraum'; $lang['searchresult'] = 'Suchergebnisse'; $lang['plainhtml'] = 'HTML Klartext'; +$lang['notloggedin'] = 'Eventuell sind Sie nicht am Wiki angemeldet?'; diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php index 170e101a5..89bcc08b3 100644 --- a/inc/lang/el/lang.php +++ b/inc/lang/el/lang.php @@ -330,3 +330,4 @@ $lang['media_perm_upload'] = 'Συγνώμη, δεν έχετε επαρκή $lang['media_update'] = 'Φόρτωση νέας έκδοσης'; $lang['media_restore'] = 'Επαναφορά αυτή της έκδοσης'; $lang['searchresult'] = 'Αποτέλεσμα έρευνας'; +$lang['notloggedin'] = 'Μήπως παραλείψατε να συνδεθείτε;'; diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php index 97231bdce..3252a6c2b 100644 --- a/inc/lang/eo/lang.php +++ b/inc/lang/eo/lang.php @@ -335,3 +335,4 @@ $lang['currentns'] = 'Aktuala nomspaco'; $lang['searchresult'] = 'Serĉrezulto'; $lang['plainhtml'] = 'Plena HTML'; $lang['wikimarkup'] = 'Vikiteksto'; +$lang['notloggedin'] = 'Eble vi forgesis identiĝi.'; diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php index 216093f6c..9dc406aef 100644 --- a/inc/lang/es/lang.php +++ b/inc/lang/es/lang.php @@ -356,3 +356,4 @@ $lang['currentns'] = 'Espacio de nombres actual'; $lang['searchresult'] = 'Resultado de la búsqueda'; $lang['plainhtml'] = 'HTML sencillo'; $lang['wikimarkup'] = 'Etiquetado Wiki'; +$lang['notloggedin'] = '¿Quizás has olvidado identificarte?'; diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php index cc736db4d..58877f3bc 100644 --- a/inc/lang/et/lang.php +++ b/inc/lang/et/lang.php @@ -229,3 +229,4 @@ $lang['i_pol0'] = 'Avatud (lugemine, kirjutamine ja üleslaadimin $lang['i_pol1'] = 'Avalikuks lugemiseks (lugeda saavad kõik, kirjutada ja üles laadida vaid registreeritud kasutajad)'; $lang['i_pol2'] = 'Suletud (kõik õigused, kaasaarvatud lugemine on lubatud vaid registreeritud kasutajatele)'; $lang['i_retry'] = 'Proovi uuesti'; +$lang['notloggedin'] = 'liikuda, selleks on vastavaid õigusi vaja.'; diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php index c7e7ead9a..fb42dfb27 100644 --- a/inc/lang/eu/lang.php +++ b/inc/lang/eu/lang.php @@ -306,3 +306,4 @@ $lang['media_viewold'] = '%s -n %s'; $lang['media_edit'] = '%s editatu'; $lang['media_update'] = 'Bertsio berria igo'; $lang['media_restore'] = 'Bertsio hau berrezarri'; +$lang['notloggedin'] = 'Agian sesioa hastea ahaztu zaizu?'; diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php index dbad62890..2b4c35b27 100644 --- a/inc/lang/fa/lang.php +++ b/inc/lang/fa/lang.php @@ -324,3 +324,4 @@ $lang['media_perm_read'] = 'متاسفانه ، شما حق خواندن $lang['media_perm_upload'] = 'متاسفانه ، شما حق آپلود این فایل ها را ندارید.'; $lang['media_update'] = 'آپلود نسخه جدید'; $lang['media_restore'] = 'بازیابی این نسخه'; +$lang['notloggedin'] = 'ممکن است فراموش کرده باشید که وارد سایت شوید!'; diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php index feefc3da8..10a730f3f 100644 --- a/inc/lang/fi/lang.php +++ b/inc/lang/fi/lang.php @@ -334,3 +334,4 @@ $lang['currentns'] = 'Nykyinen nimiavaruus'; $lang['searchresult'] = 'Haun tulokset'; $lang['plainhtml'] = 'pelkkä HTML'; $lang['wikimarkup'] = 'Wiki markup'; +$lang['notloggedin'] = 'Ehkä unohdit kirjautua sisään?'; diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php index 161e7321a..e4814869f 100644 --- a/inc/lang/fo/lang.php +++ b/inc/lang/fo/lang.php @@ -169,3 +169,4 @@ $lang['img_format'] = 'Snið'; $lang['img_camera'] = 'Fototól'; $lang['img_keywords'] = 'Evnisorð'; $lang['authtempfail'] = 'Validering av brúkara virkar fyribils ikki. Um hetta er varandi, fá so samband við umboðsstjóran á hesi wiki.'; +$lang['notloggedin'] = 'Møguliga hevur tú ikki rita inn.'; diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php index 49f617323..b50e4eed0 100644 --- a/inc/lang/fr/lang.php +++ b/inc/lang/fr/lang.php @@ -352,3 +352,4 @@ $lang['currentns'] = 'Namespace actuel'; $lang['searchresult'] = 'Résultat de la recherche'; $lang['plainhtml'] = 'HTML brut'; $lang['wikimarkup'] = 'Wiki balise'; +$lang['notloggedin'] = 'poursuivre votre demande. Peut-être avez-vous oublié de vous identifier ?'; diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php index 65967a3b5..3e5229a17 100644 --- a/inc/lang/gl/lang.php +++ b/inc/lang/gl/lang.php @@ -318,3 +318,4 @@ $lang['media_perm_read'] = 'Sentímolo, non tes permisos suficientes para $lang['media_perm_upload'] = 'Sentímolo, non tes permisos suficientes para subir arquivos.'; $lang['media_update'] = 'Subir nova versión'; $lang['media_restore'] = 'Restaurar esta versión'; +$lang['notloggedin'] = 'Pode que esqueceses iniciar a sesión?'; diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php index 8efe0da17..7012c0e17 100644 --- a/inc/lang/he/lang.php +++ b/inc/lang/he/lang.php @@ -325,3 +325,4 @@ $lang['media_sort_date'] = 'תאריך'; $lang['media_namespaces'] = 'בחר מרחב שמות'; $lang['media_files'] = 'קבצים ב s%'; $lang['media_upload'] = 'להעלות s%'; +$lang['notloggedin'] = 'אולי שכחת להיכנס למערכת?'; diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php index f19610827..fe3a64d4d 100644 --- a/inc/lang/hr/lang.php +++ b/inc/lang/hr/lang.php @@ -263,3 +263,4 @@ $lang['hours'] = '%d sati prije'; $lang['minutes'] = '%d minuta prije'; $lang['seconds'] = '%d sekundi prije'; $lang['wordblock'] = 'Vaša promjena nije spremljena jer sadrži blokirani tekst (spam).'; +$lang['notloggedin'] = 'Niste li se možda zaboravili prijaviti u aplikaciju?'; diff --git a/inc/lang/hu-formal/lang.php b/inc/lang/hu-formal/lang.php index a98bdc0d3..09bbdc58f 100644 --- a/inc/lang/hu-formal/lang.php +++ b/inc/lang/hu-formal/lang.php @@ -25,3 +25,4 @@ $lang['btn_older'] = 'régebbi >>'; $lang['btn_revs'] = 'Korábbi változatok'; $lang['btn_recent'] = 'Legújabb változások'; $lang['btn_upload'] = 'Feltöltés'; +$lang['notloggedin'] = 'Talán elfelejtett bejelentkezni?'; diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php index a0aef9447..6fb20cc3f 100644 --- a/inc/lang/hu/lang.php +++ b/inc/lang/hu/lang.php @@ -338,3 +338,4 @@ $lang['currentns'] = 'Aktuális névtér'; $lang['searchresult'] = 'Keresés eredménye'; $lang['plainhtml'] = 'Sima HTML'; $lang['wikimarkup'] = 'Wiki-jelölőnyelv'; +$lang['notloggedin'] = 'Esetleg elfelejtettél bejelentkezni?'; diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php index 144dfe33b..7fc4dbb68 100644 --- a/inc/lang/ia/lang.php +++ b/inc/lang/ia/lang.php @@ -260,3 +260,4 @@ $lang['days'] = '%d dies retro'; $lang['hours'] = '%d horas retro'; $lang['minutes'] = '%d minutas retro'; $lang['seconds'] = '%d secundas retro'; +$lang['notloggedin'] = 'Pote esser que tu ha oblidate de aperir un session.'; diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php index 5cb5cb6ea..34c687f1d 100644 --- a/inc/lang/id/lang.php +++ b/inc/lang/id/lang.php @@ -218,3 +218,4 @@ $lang['i_pol0'] = 'Wiki Terbuka (baca, tulis, upload untuk semua $lang['i_pol1'] = 'Wiki Publik (baca untuk semua orang, tulis dan upload untuk pengguna terdaftar)'; $lang['i_pol2'] = 'Wiki Privat (baca, tulis dan upload hanya untuk pengguna terdaftar)'; $lang['i_retry'] = 'Coba Lagi'; +$lang['notloggedin'] = 'Apakah Anda belum login?'; diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php index a2bde3b60..95d64e00f 100644 --- a/inc/lang/it/lang.php +++ b/inc/lang/it/lang.php @@ -338,3 +338,4 @@ $lang['media_perm_upload'] = 'Spiacente, non hai abbastanza privilegi per ca $lang['media_update'] = 'Carica nuova versione'; $lang['media_restore'] = 'Ripristina questa versione'; $lang['searchresult'] = 'Risultati della ricerca'; +$lang['notloggedin'] = 'Forse hai dimenticato di effettuare l\'accesso?'; diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php index 1f53b0a90..367c56a9b 100644 --- a/inc/lang/ja/lang.php +++ b/inc/lang/ja/lang.php @@ -336,3 +336,4 @@ $lang['currentns'] = '現在の名前空間'; $lang['searchresult'] = '検索結果'; $lang['plainhtml'] = 'プレーンHTML'; $lang['wikimarkup'] = 'Wikiマークアップ'; +$lang['notloggedin'] = '実行する権限がありません。ログインされているか確認してください。'; diff --git a/inc/lang/km/lang.php b/inc/lang/km/lang.php index 4800b6c23..5712956b0 100644 --- a/inc/lang/km/lang.php +++ b/inc/lang/km/lang.php @@ -204,3 +204,4 @@ $lang['i_pol2'] = 'វីគីបិទជិត'; $lang['i_retry'] = 'ម្តងទៀត'; //Setup VIM: ex: et ts=2 : +$lang['notloggedin'] = 'សូមទុស អ្នកគ្មានអនុញ្ញាតទៅបណ្តទេ។ '; diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php index 266ff01e5..120caba78 100644 --- a/inc/lang/ko/lang.php +++ b/inc/lang/ko/lang.php @@ -336,3 +336,4 @@ $lang['currentns'] = '현재 이름공간'; $lang['searchresult'] = '검색 결과'; $lang['plainhtml'] = '일반 HTML'; $lang['wikimarkup'] = '위키 문법'; +$lang['notloggedin'] = '로그인을 잊으셨나요?'; diff --git a/inc/lang/ku/lang.php b/inc/lang/ku/lang.php index b6287806d..a8a1b8cbf 100644 --- a/inc/lang/ku/lang.php +++ b/inc/lang/ku/lang.php @@ -140,3 +140,4 @@ $lang['img_camera'] = 'Camera'; $lang['img_keywords']= 'Keywords'; //Setup VIM: ex: et ts=2 : +$lang['notloggedin'] = 'Perhaps you forgot to login?'; diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php index c71a71bdd..885c4f4b8 100644 --- a/inc/lang/la/lang.php +++ b/inc/lang/la/lang.php @@ -260,3 +260,4 @@ $lang['hours'] = 'a horis %d'; $lang['minutes'] = 'a minutis %d'; $lang['seconds'] = 'a secundis %d'; $lang['wordblock'] = 'Mutationes non seruantur, eo quod mala uerba contenit'; +$lang['notloggedin'] = 'Ad hanc paginam accedere non potes: antea in conuentum ineas, deinde rursum temptas '; diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php index 55113745a..7778478a4 100644 --- a/inc/lang/lb/lang.php +++ b/inc/lang/lb/lang.php @@ -194,3 +194,4 @@ $lang['days'] = 'virun %d Deeg'; $lang['hours'] = 'virun %d Stonnen'; $lang['minutes'] = 'virun %d Minutten'; $lang['seconds'] = 'virun %d Sekonnen'; +$lang['notloggedin'] = 'Hues de vläicht vergiess dech anzeloggen?'; diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php index c38ea8838..f03d6d5cd 100644 --- a/inc/lang/lt/lang.php +++ b/inc/lang/lt/lang.php @@ -181,3 +181,4 @@ $lang['i_wikiname'] = 'Wiki vardas'; $lang['i_enableacl'] = 'Įjungti ACL (rekomenduojama)'; $lang['i_superuser'] = 'Supervartotojas'; $lang['i_problems'] = 'Instaliavimo metu buvo klaidų, kurios pateiktos žemiau. Tęsti negalima, kol nebus pašalintos priežastys.'; +$lang['notloggedin'] = 'Turbūt pamiršote prisijungti :-).'; diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php index 898125d60..df16a385d 100644 --- a/inc/lang/lv/lang.php +++ b/inc/lang/lv/lang.php @@ -318,3 +318,4 @@ $lang['media_perm_read'] = 'Atvainojiet, jums nav tiesību skatīt failus. $lang['media_perm_upload'] = 'Atvainojiet, jums nav tiesību augšupielādēt. '; $lang['media_update'] = 'Augšupielādēt jaunu versiju'; $lang['media_restore'] = 'Atjaunot šo versiju'; +$lang['notloggedin'] = 'Varbūt aizmirsi ielogoties?'; diff --git a/inc/lang/mg/lang.php b/inc/lang/mg/lang.php index c5ed669a9..f179f2c28 100644 --- a/inc/lang/mg/lang.php +++ b/inc/lang/mg/lang.php @@ -119,3 +119,4 @@ $lang['js']['del_confirm']= 'Hofafana ilay andalana?'; $lang['admin_register']= 'Ampio mpampiasa vaovao...'; //Setup VIM: ex: et ts=2 : +$lang['notloggedin'] = 'Angamba hadinonao ny niditra.'; diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php index 54b69974d..15976d4a1 100644 --- a/inc/lang/mr/lang.php +++ b/inc/lang/mr/lang.php @@ -264,3 +264,4 @@ $lang['i_pol1'] = 'सार्वजनिक विकी ( स $lang['i_pol2'] = 'बंदिस्त विकी ( वाचन , लेखन व अपलोडची परवानगी फक्त नोंदणीकृत सदस्यांना ) '; $lang['i_retry'] = 'पुन्हा प्रयत्न'; $lang['recent_global'] = 'तुम्ही सध्या %s या नेमस्पेस मधील बदल पाहात आहात.तुम्ही पूर्ण विकी मधले बदल सुद्धा पाहू शकता.'; +$lang['notloggedin'] = 'कदाचित तुम्ही लॉगिन करायला विसरला आहात ?'; diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php index 7fd14d2c5..5b24d4c49 100644 --- a/inc/lang/ne/lang.php +++ b/inc/lang/ne/lang.php @@ -192,3 +192,4 @@ $lang['i_pol1'] = 'Public विकि (पठन सवैका $lang['i_pol2'] = 'बन्द विकि (पठन , लेखन, अपलोड ) दर्ता भएका प्रयोगकर्ताका लागि मात्र ।'; $lang['i_retry'] = 'पुन: प्रयास गर्नुहोस् '; $lang['recent_global'] = 'तपाई अहिले %s नेमस्पेस भित्र भएका परिवर्तन हेर्दैहुनुहुन्छ। तपाई पुरै विकिमा भएको परिवर्तन हेर्न सक्नुहुन्छ.'; +$lang['notloggedin'] = 'सम्भवत: तपाईले प्रवेश गर्न भुल्नु भयो।'; diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php index e5e3e3c76..03574b24f 100644 --- a/inc/lang/nl/lang.php +++ b/inc/lang/nl/lang.php @@ -347,3 +347,4 @@ $lang['currentns'] = 'Huidige namespace'; $lang['searchresult'] = 'Zoekresultaat'; $lang['plainhtml'] = 'Alleen HTML'; $lang['wikimarkup'] = 'Wiki Opmaak'; +$lang['notloggedin'] = 'Misschien ben je vergeten in te loggen?'; diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php index 3f31f6c73..278254f3f 100644 --- a/inc/lang/no/lang.php +++ b/inc/lang/no/lang.php @@ -348,3 +348,4 @@ $lang['media_restore'] = 'Gjenopprett denne versjonen'; $lang['currentns'] = 'gjeldende navnemellomrom'; $lang['searchresult'] = 'Søk i resultat'; $lang['plainhtml'] = 'Enkel HTML'; +$lang['notloggedin'] = 'Kanskje du har glemt å logge inn?'; diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php index e5f2d8d40..6af045226 100644 --- a/inc/lang/pl/lang.php +++ b/inc/lang/pl/lang.php @@ -342,3 +342,4 @@ $lang['currentns'] = 'Obecny katalog'; $lang['searchresult'] = 'Wyniki wyszukiwania'; $lang['plainhtml'] = 'Czysty HTML'; $lang['wikimarkup'] = 'Znaczniki'; +$lang['notloggedin'] = 'Zaloguj się!'; diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php index 6845e792d..bf92e06ed 100644 --- a/inc/lang/pt-br/lang.php +++ b/inc/lang/pt-br/lang.php @@ -349,3 +349,4 @@ $lang['currentns'] = 'Domínio atual'; $lang['searchresult'] = 'Resultado da Busca'; $lang['plainhtml'] = 'HTML simples'; $lang['wikimarkup'] = 'Marcação wiki'; +$lang['notloggedin'] = 'Por acaso esqueceu de autenticar-se?'; diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php index 46405c444..230db88da 100644 --- a/inc/lang/pt/lang.php +++ b/inc/lang/pt/lang.php @@ -319,3 +319,4 @@ $lang['media_perm_read'] = 'Perdão, não tem permissão para ler ficheiro $lang['media_perm_upload'] = 'Perdão, não tem permissão para enviar ficheiros.'; $lang['media_update'] = 'enviar nova versão'; $lang['media_restore'] = 'Restaurar esta versão'; +$lang['notloggedin'] = 'Talvez se tenha esquecido de iniciar sessão?'; diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php index 491ab58e7..fe0842e1e 100644 --- a/inc/lang/ro/lang.php +++ b/inc/lang/ro/lang.php @@ -319,3 +319,4 @@ $lang['media_perm_read'] = 'Ne pare rău, dar nu ai suficiente permisiuni $lang['media_perm_upload'] = 'Ne pare rău, dar nu ai suficiente permisiuni pentru a putea încărca fișiere.'; $lang['media_update'] = 'Încarcă noua versiune'; $lang['media_restore'] = 'Restaurează această versiune'; +$lang['notloggedin'] = 'autentifici?'; diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php index 208d647a8..9a393193a 100644 --- a/inc/lang/ru/lang.php +++ b/inc/lang/ru/lang.php @@ -350,3 +350,4 @@ $lang['media_restore'] = 'Восстановить эту версию'; $lang['currentns'] = 'Текущее пространство имен'; $lang['searchresult'] = 'Результаты поиска'; $lang['plainhtml'] = 'Чистый HTML'; +$lang['notloggedin'] = 'Может быть вы забыли войти в вики под своим логином?'; diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php index aa823b074..47cdc1fe4 100644 --- a/inc/lang/sk/lang.php +++ b/inc/lang/sk/lang.php @@ -332,3 +332,4 @@ $lang['currentns'] = 'Aktuálny menný priestor'; $lang['searchresult'] = 'Výsledky hľadania'; $lang['plainhtml'] = 'Jednoduché HTML'; $lang['wikimarkup'] = 'Wiki formát'; +$lang['notloggedin'] = 'Možno ste sa zabudli prihlásiť?'; diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php index c9a47927d..41e2b3b12 100644 --- a/inc/lang/sl/lang.php +++ b/inc/lang/sl/lang.php @@ -327,3 +327,4 @@ $lang['currentns'] = 'Trenutni imenski prostor'; $lang['searchresult'] = 'Rezultati iskanja'; $lang['plainhtml'] = 'Zapis HTML'; $lang['wikimarkup'] = 'Oblikovni jezik Wiki'; +$lang['notloggedin'] = 'Ali ste se morda pozabili prijaviti?'; diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php index 2ed62ed4e..ab9208e55 100644 --- a/inc/lang/sq/lang.php +++ b/inc/lang/sq/lang.php @@ -235,3 +235,4 @@ $lang['days'] = '%d ditë më parë'; $lang['hours'] = '%d orë më parë'; $lang['minutes'] = '%d minuta më parë'; $lang['seconds'] = '%d sekonda më parë'; +$lang['notloggedin'] = 'Mbase harruat të hyni?'; diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php index 7c434cbc9..53faa69ec 100644 --- a/inc/lang/sr/lang.php +++ b/inc/lang/sr/lang.php @@ -260,3 +260,4 @@ $lang['hours'] = 'Пре %d сати'; $lang['minutes'] = 'Пре %d минута'; $lang['seconds'] = 'Пре %d секунди'; $lang['wordblock'] = 'Ваше измене нису сачуване јер садрже забрањен текст (спам)'; +$lang['notloggedin'] = 'Можда сте заборавили да се пријавите?'; diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php index 8c8858f61..867d038c4 100644 --- a/inc/lang/sv/lang.php +++ b/inc/lang/sv/lang.php @@ -343,3 +343,4 @@ $lang['media_update'] = 'Ladda upp ny version'; $lang['media_restore'] = 'Återställ denna version'; $lang['searchresult'] = 'Sökresultat'; $lang['plainhtml'] = 'Ren HTML'; +$lang['notloggedin'] = 'Kanske har du glömt att logga in?'; diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php index 5d364166b..2e6abe6b6 100644 --- a/inc/lang/th/lang.php +++ b/inc/lang/th/lang.php @@ -219,3 +219,4 @@ $lang['days'] = '%d วันก่อน'; $lang['hours'] = '%d ชั่วโมงก่อน'; $lang['minutes'] = '%d นาทีก่อน'; $lang['seconds'] = '%d วินาทีก่อน'; +$lang['notloggedin'] = 'บางทีคุณอาจจะลืมล็อกอิน?'; diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php index 210a82530..a9c90054c 100644 --- a/inc/lang/tr/lang.php +++ b/inc/lang/tr/lang.php @@ -304,3 +304,4 @@ $lang['media_history'] = 'Geçmiş %s'; $lang['media_perm_upload'] = 'Üzgünüm, karşıya dosya yükleme yetkiniz yok.'; $lang['media_update'] = 'Yeni versiyonu yükleyin'; $lang['media_restore'] = 'Bu sürümü eski haline getir'; +$lang['notloggedin'] = 'Giriş yapmayı unutmuş olabilir misiniz?'; diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php index 4e91e82a2..d09360479 100644 --- a/inc/lang/uk/lang.php +++ b/inc/lang/uk/lang.php @@ -285,3 +285,4 @@ $lang['hours'] = '%d годин тому'; $lang['minutes'] = '%d хвилин тому'; $lang['seconds'] = '%d секунд тому'; $lang['wordblock'] = 'Ваші зміни не збережено, тому що вони розпізнані як такі, що містять заблокований текст(спам).'; +$lang['notloggedin'] = 'Можливо ви забули увійти в систему?'; diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php index d8e40f875..b99311f1a 100644 --- a/inc/lang/vi/lang.php +++ b/inc/lang/vi/lang.php @@ -239,3 +239,4 @@ $lang['media_perm_read'] = 'Sorry, bạn không đủ quyền truy cập.' $lang['media_perm_upload'] = 'Xin lỗi, bạn không đủ quyền để upload file lên.'; $lang['media_update'] = 'Tải lên phiên bản mới'; $lang['media_restore'] = 'Phục hồi phiên bản này'; +$lang['notloggedin'] = 'Bạn quên đăng nhập hay sao?'; diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php index 456377810..b230cd70d 100644 --- a/inc/lang/zh-tw/lang.php +++ b/inc/lang/zh-tw/lang.php @@ -341,3 +341,4 @@ $lang['currentns'] = '目前的命名空間'; $lang['searchresult'] = '搜尋結果'; $lang['plainhtml'] = '純 HTML'; $lang['wikimarkup'] = 'Wiki 語法標記'; +$lang['notloggedin'] = '抱歉，您沒有足夠權限繼續執行。或許您忘了登入？'; diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php index 004997d6e..c3fdae46b 100644 --- a/inc/lang/zh/lang.php +++ b/inc/lang/zh/lang.php @@ -349,3 +349,4 @@ $lang['currentns'] = '当前命名空间'; $lang['searchresult'] = '搜索结果'; $lang['plainhtml'] = '纯HTML'; $lang['wikimarkup'] = 'Wiki Markup 语言'; +$lang['notloggedin'] = '对不起，您没有足够权限，无法继续。也许您忘了登录？'; -- cgit v1.2.3 From c09f0eb1d9009ce0a7d2a12c41b125957604eff5 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Fri, 28 Feb 2014 17:13:42 +0100 Subject: define overridable constants for session properties FS#1913 --- inc/init.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'inc') diff --git a/inc/init.php b/inc/init.php index 3e422453d..08f4b45b9 100644 --- a/inc/init.php +++ b/inc/init.php @@ -140,18 +140,23 @@ if ($conf['gzip_output'] && } // init session -if (!headers_sent() && !defined('NOSESSION')){ - session_name("DokuWiki"); +if(!headers_sent() && !defined('NOSESSION')) { + if(!defined('DOKU_SESSION_NAME')) define ('DOKU_SESSION_NAME', "DokuWiki"); + if(!defined('DOKU_SESSION_LIFETIME')) define ('DOKU_SESSION_LIFETIME', 0); $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']; - if (version_compare(PHP_VERSION, '5.2.0', '>')) { - session_set_cookie_params(0,$cookieDir,'',($conf['securecookie'] && is_ssl()),true); - }else{ - session_set_cookie_params(0,$cookieDir,'',($conf['securecookie'] && is_ssl())); + if(!defined('DOKU_SESSION_PATH')) define ('DOKU_SESSION_PATH', $cookieDir); + if(!defined('DOKU_SESSION_DOMAIN')) define ('DOKU_SESSION_DOMAIN', ''); + + session_name(DOKU_SESSION_NAME); + if(version_compare(PHP_VERSION, '5.2.0', '>')) { + session_set_cookie_params(DOKU_SESSION_LIFETIME, DOKU_SESSION_PATH, DOKU_SESSION_DOMAIN, ($conf['securecookie'] && is_ssl()), true); + } else { + session_set_cookie_params(DOKU_SESSION_LIFETIME, DOKU_SESSION_PATH, DOKU_SESSION_DOMAIN, ($conf['securecookie'] && is_ssl())); } session_start(); // load left over messages - if(isset($_SESSION[DOKU_COOKIE]['msg'])){ + if(isset($_SESSION[DOKU_COOKIE]['msg'])) { $MSG = $_SESSION[DOKU_COOKIE]['msg']; unset($_SESSION[DOKU_COOKIE]['msg']); } -- cgit v1.2.3 From 5ee37844b9e6f852bf16da41e5c07f056ec376d1 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 28 Feb 2014 16:55:57 +0000 Subject: remove rendundant msg --- inc/parserutils.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'inc') diff --git a/inc/parserutils.php b/inc/parserutils.php index c12732e88..b41e2d473 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -638,13 +638,8 @@ function p_get_renderer($mode) { // not bundled, see if its an enabled plugin for rendering $mode $Renderer = $plugin_controller->load('renderer',$rname); - if ($Renderer) { - if (is_a($Renderer, 'Doku_Renderer') && ($mode == $Renderer->getFormat())) { - return $Renderer; - } else { - // plugin found, but not a renderer or not the right renderer for this $mode - msg("Renderer plugin '$rname' not valid for $mode",-1,'','',MSG_ADMINS_ONLY); - } + if (is_a($Renderer, 'Doku_Renderer') && ($mode == $Renderer->getFormat())) { + return $Renderer; } // there is a configuration error! -- cgit v1.2.3 From 489dcad6f038c54dda1f29c0887fa43f5b3f7fcb Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 28 Feb 2014 16:56:29 +0000 Subject: remove require handled by autoloader --- 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 6b6a1770b..1f9ad00a2 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/pluginutils.php'; /** * An empty renderer, produces no output -- cgit v1.2.3 From 0e6682672bb6ed779e4d8585c07cdc0ed57d81e5 Mon Sep 17 00:00:00 2001 From: "Khan M. B. Asad" Date: Sun, 2 Mar 2014 01:25:21 +0100 Subject: translation update --- inc/lang/bn/lang.php | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'inc') diff --git a/inc/lang/bn/lang.php b/inc/lang/bn/lang.php index 94a3fbb12..230f3ef80 100644 --- a/inc/lang/bn/lang.php +++ b/inc/lang/bn/lang.php @@ -5,6 +5,7 @@ * * @author Foysol * @author ninetailz + * @author Khan M. B. Asad */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'itr'; @@ -127,3 +128,33 @@ $lang['js']['medialeft'] = 'বাম দিকে ইমেজ সার $lang['js']['mediaright'] = 'ডান দিকে ইমেজ সারিবদ্ধ কর'; $lang['js']['mediacenter'] = 'মাঝখানে ইমেজ সারিবদ্ধ কর'; $lang['js']['medianoalign'] = 'কোনো সারিবদ্ধ করা প্রয়োজন নেই'; +$lang['js']['nosmblinks'] = 'উইন্ডোস শেয়ার এর সাথে সংযোগ সাধন কেবল মাইক্রোসফ্ট ইন্টারনেট এক্সপ্লোরারেই সম্ভব।\nতবে আপনি লিংকটি কপি পেস্ট করতেই পারেন।'; +$lang['js']['linkwiz'] = 'লিংক উইজার্ড'; +$lang['js']['linkto'] = 'সংযোগের লক্ষ্য:'; +$lang['js']['del_confirm'] = 'নির্বাচিত আইটেম(গুলো) আসলেই মুছে ফেলতে চান?'; +$lang['js']['restore_confirm'] = 'এই সংস্করণ সত্যিই পূর্বাবস্থায় ফিরিয়ে আনতে চান?'; +$lang['js']['media_diff'] = 'পার্থক্যগুলো দেখুন:'; +$lang['js']['media_diff_both'] = 'পাশাপাশি'; +$lang['js']['media_diff_opacity'] = 'শাইন-থ্রু'; +$lang['js']['media_diff_portions'] = 'ঝেঁটিয়ে বিদায়'; +$lang['js']['media_select'] = 'ফাইল নির্বাচন...'; +$lang['js']['media_upload_btn'] = 'আপলোড'; +$lang['js']['media_done_btn'] = 'সাধিত'; +$lang['js']['media_drop'] = 'আপলোডের জন্য এখানে ফাইল ফেলুন'; +$lang['js']['media_cancel'] = 'অপসারণ'; +$lang['js']['media_overwrt'] = 'বর্তমান ফাইল ওভাররাইট করুন'; +$lang['rssfailed'] = 'ফিডটি জোগাড় করতে গিয়ে একটি ত্রুটি ঘটেছে:'; +$lang['nothingfound'] = 'কিছু পাওয়া যায়নি।'; +$lang['mediaselect'] = 'মিডিয়া ফাইল'; +$lang['fileupload'] = 'মিডিয়া ফাইল আপলোড'; +$lang['uploadsucc'] = 'আপলোড সফল'; +$lang['uploadfail'] = 'আপলোড ব্যর্থ। অনুমতি জনিত ত্রুটি কী?'; +$lang['uploadwrong'] = 'আপলোড প্রত্যাখ্যাত। এই ফাইল এক্সটেনশন অননুমোদিত।'; +$lang['uploadexist'] = 'ফাইল ইতিমধ্যেই বিরাজমান। কিছু করা হয়নি।'; +$lang['uploadbadcontent'] = 'আপলোডকৃত সামগ্রী %s ফাইল এক্সটেনশন এর সাথে মিলেনি।'; +$lang['uploadspam'] = 'স্প্যাম ব্ল্যাকলিস্ট আপলোড আটকে দিয়েছে।'; +$lang['uploadxss'] = 'সামগ্রীটি ক্ষতিকর ভেবে আপলোড আটকে দেয়া হয়েছে।'; +$lang['uploadsize'] = 'আপলোডকৃত ফাইলটি বেশি বড়ো। (সর্বোচ্চ %s)'; +$lang['deletesucc'] = '"%s" ফাইলটি মুছে ফেলা হয়েছে।'; +$lang['deletefail'] = '"%s" ডিলিট করা যায়নি - অনুমতি আছে কি না দেখুন।'; +$lang['mediainuse'] = '"%s" ফাইলটি মোছা হয়নি - এটি এখনো ব্যবহৃত হচ্ছে।'; -- cgit v1.2.3 From 709fd92548efedbd4b4e5693097165d1dff072e4 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 2 Mar 2014 20:46:26 +0000 Subject: resolve scrutinizer issue, is_a type hint doesn't allow null --- inc/parserutils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/parserutils.php b/inc/parserutils.php index b41e2d473..06bd6dbb8 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -638,7 +638,7 @@ function p_get_renderer($mode) { // not bundled, see if its an enabled plugin for rendering $mode $Renderer = $plugin_controller->load('renderer',$rname); - if (is_a($Renderer, 'Doku_Renderer') && ($mode == $Renderer->getFormat())) { + if ($Renderer && is_a($Renderer, 'Doku_Renderer') && ($mode == $Renderer->getFormat())) { return $Renderer; } -- cgit v1.2.3 From 55a71a16cbfacd3836ca70e37e45f85bd44ceab1 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 4 Mar 2014 21:14:24 +0100 Subject: removed pre PHP 5.2 code wrt setcookie and session setting - moved cookiedir determination in the if-statement --- inc/auth.php | 13 +++---------- inc/init.php | 12 +++++------- 2 files changed, 8 insertions(+), 17 deletions(-) (limited to 'inc') diff --git a/inc/auth.php b/inc/auth.php index 8fde129aa..6c4636b2f 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -528,11 +528,7 @@ function auth_logoff($keepbc = false) { $USERINFO = null; //FIXME $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']; - if(version_compare(PHP_VERSION, '5.2.0', '>')) { - setcookie(DOKU_COOKIE, '', time() - 600000, $cookieDir, '', ($conf['securecookie'] && is_ssl()), true); - } else { - setcookie(DOKU_COOKIE, '', time() - 600000, $cookieDir, '', ($conf['securecookie'] && is_ssl())); - } + setcookie(DOKU_COOKIE, '', time() - 600000, $cookieDir, '', ($conf['securecookie'] && is_ssl()), true); if($auth) $auth->logOff(); } @@ -1319,11 +1315,8 @@ function auth_setCookie($user, $pass, $sticky) { $cookie = base64_encode($user).'|'.((int) $sticky).'|'.base64_encode($pass); $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']; $time = $sticky ? (time() + 60 * 60 * 24 * 365) : 0; //one year - if(version_compare(PHP_VERSION, '5.2.0', '>')) { - setcookie(DOKU_COOKIE, $cookie, $time, $cookieDir, '', ($conf['securecookie'] && is_ssl()), true); - } else { - setcookie(DOKU_COOKIE, $cookie, $time, $cookieDir, '', ($conf['securecookie'] && is_ssl())); - } + setcookie(DOKU_COOKIE, $cookie, $time, $cookieDir, '', ($conf['securecookie'] && is_ssl()), true); + // set session $_SESSION[DOKU_COOKIE]['auth']['user'] = $user; $_SESSION[DOKU_COOKIE]['auth']['pass'] = sha1($pass); diff --git a/inc/init.php b/inc/init.php index 08f4b45b9..9b8465911 100644 --- a/inc/init.php +++ b/inc/init.php @@ -143,16 +143,14 @@ if ($conf['gzip_output'] && if(!headers_sent() && !defined('NOSESSION')) { if(!defined('DOKU_SESSION_NAME')) define ('DOKU_SESSION_NAME', "DokuWiki"); if(!defined('DOKU_SESSION_LIFETIME')) define ('DOKU_SESSION_LIFETIME', 0); - $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']; - if(!defined('DOKU_SESSION_PATH')) define ('DOKU_SESSION_PATH', $cookieDir); + if(!defined('DOKU_SESSION_PATH')) { + $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']; + define ('DOKU_SESSION_PATH', $cookieDir); + } if(!defined('DOKU_SESSION_DOMAIN')) define ('DOKU_SESSION_DOMAIN', ''); session_name(DOKU_SESSION_NAME); - if(version_compare(PHP_VERSION, '5.2.0', '>')) { - session_set_cookie_params(DOKU_SESSION_LIFETIME, DOKU_SESSION_PATH, DOKU_SESSION_DOMAIN, ($conf['securecookie'] && is_ssl()), true); - } else { - session_set_cookie_params(DOKU_SESSION_LIFETIME, DOKU_SESSION_PATH, DOKU_SESSION_DOMAIN, ($conf['securecookie'] && is_ssl())); - } + session_set_cookie_params(DOKU_SESSION_LIFETIME, DOKU_SESSION_PATH, DOKU_SESSION_DOMAIN, ($conf['securecookie'] && is_ssl()), true); session_start(); // load left over messages -- cgit v1.2.3 From f019ab46c33b430831053cd41b5b04a163fd529f Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 4 Mar 2014 21:27:10 +0100 Subject: added login form at denied access page - restore lang string as well --- inc/html.php | 4 ++++ inc/lang/en/lang.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/html.php b/inc/html.php index 507ba511e..514f961e7 100644 --- a/inc/html.php +++ b/inc/html.php @@ -81,6 +81,10 @@ function html_denied() { $denied ); print $denied; + + if(!$_SERVER['REMOTE_USER']){ + html_login(); + } } /** diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index b95a8a58a..fccb470e3 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -78,7 +78,7 @@ $lang['regbadmail'] = 'The given email address looks invalid - if you $lang['regbadpass'] = 'The two given passwords are not identical, please try again.'; $lang['regpwmail'] = 'Your DokuWiki password'; $lang['reghere'] = 'You don\'t have an account yet? Just get one'; -$lang['notloggedin'] = 'Please be aware you are not logged in.'; +$lang['notloggedin'] = 'Perhaps you forgot to login?'; $lang['profna'] = 'This wiki does not support profile modification'; $lang['profnochange'] = 'No changes, nothing to do.'; -- cgit v1.2.3 From ddf7ce094f821dc45273f75203e5da7838d96e96 Mon Sep 17 00:00:00 2001 From: Cupen Date: Wed, 5 Mar 2014 09:26:40 +0100 Subject: translation update --- inc/lang/zh/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc') diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php index 004997d6e..57110bae3 100644 --- a/inc/lang/zh/lang.php +++ b/inc/lang/zh/lang.php @@ -20,6 +20,7 @@ * @author Yangyu Huang * @author anjianshi * @author oott123 + * @author Cupen */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; -- cgit v1.2.3 From 9a9ddee0317986914ffa1990917c4267b04b5370 Mon Sep 17 00:00:00 2001 From: xiqingongzi Date: Wed, 5 Mar 2014 14:36:01 +0100 Subject: translation update --- inc/lang/zh/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc') diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php index 57110bae3..8777c65a5 100644 --- a/inc/lang/zh/lang.php +++ b/inc/lang/zh/lang.php @@ -21,6 +21,7 @@ * @author anjianshi * @author oott123 * @author Cupen + * @author xiqingongzi */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; -- cgit v1.2.3 From fc8dbb92180ea98835a9e9cc701afe512b8fd47b Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 5 Mar 2014 16:43:08 +0100 Subject: updates jquery and jquery ui we now pull jQuery directly from jquery's CDN instead of google because google serves slightly outdated versions under the /1/ branch The updated smoothness theme currently breaks compression. Haven't figured out why, yet. --- inc/lang/es/jquery.ui.datepicker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/lang/es/jquery.ui.datepicker.js b/inc/lang/es/jquery.ui.datepicker.js index ae32124e7..763d4cedd 100644 --- a/inc/lang/es/jquery.ui.datepicker.js +++ b/inc/lang/es/jquery.ui.datepicker.js @@ -9,9 +9,9 @@ jQuery(function($){ monthNames: ['enero','febrero','marzo','abril','mayo','junio', 'julio','agosto','septiembre','octubre','noviembre','diciembre'], monthNamesShort: ['ene','feb','mar','abr','may','jun', - 'jul','ago','sep','oct','nov','dic'], + 'jul','ogo','sep','oct','nov','dic'], dayNames: ['domingo','lunes','martes','miércoles','jueves','viernes','sábado'], - dayNamesShort: ['dom','lun','mar','mié','jue','vie','sáb'], + dayNamesShort: ['dom','lun','mar','mié','juv','vie','sáb'], dayNamesMin: ['D','L','M','X','J','V','S'], weekHeader: 'Sm', dateFormat: 'dd/mm/yy', -- cgit v1.2.3 From 5c19269483d61ba921eaf572252d976c15152924 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Wed, 5 Mar 2014 20:10:01 +0100 Subject: Update lang of img pagetools --- inc/lang/af/lang.php | 2 +- inc/lang/ar/lang.php | 4 ++-- inc/lang/az/lang.php | 2 +- inc/lang/bg/lang.php | 4 ++-- inc/lang/ca-valencia/lang.php | 2 +- inc/lang/ca/lang.php | 2 +- inc/lang/cs/lang.php | 4 ++-- inc/lang/da/lang.php | 4 ++-- inc/lang/de-informal/lang.php | 4 ++-- inc/lang/de/lang.php | 4 ++-- inc/lang/el/lang.php | 4 ++-- inc/lang/eo/lang.php | 4 ++-- inc/lang/es/lang.php | 4 ++-- inc/lang/et/lang.php | 2 +- inc/lang/eu/lang.php | 4 ++-- inc/lang/fa/lang.php | 4 ++-- inc/lang/fi/lang.php | 4 ++-- inc/lang/fo/lang.php | 2 +- inc/lang/fr/lang.php | 4 ++-- inc/lang/gl/lang.php | 4 ++-- inc/lang/he/lang.php | 4 ++-- inc/lang/hi/lang.php | 2 +- inc/lang/hr/lang.php | 2 +- inc/lang/hu/lang.php | 4 ++-- inc/lang/ia/lang.php | 2 +- inc/lang/id/lang.php | 2 +- inc/lang/is/lang.php | 2 +- inc/lang/it/lang.php | 4 ++-- inc/lang/ja/lang.php | 4 ++-- inc/lang/kk/lang.php | 2 +- inc/lang/km/lang.php | 2 +- inc/lang/ko/lang.php | 4 ++-- inc/lang/ku/lang.php | 2 +- inc/lang/la/lang.php | 2 +- inc/lang/lb/lang.php | 2 +- inc/lang/lt/lang.php | 2 +- inc/lang/lv/lang.php | 4 ++-- inc/lang/mk/lang.php | 2 +- inc/lang/mr/lang.php | 4 ++-- inc/lang/ne/lang.php | 2 +- inc/lang/nl/lang.php | 4 ++-- inc/lang/no/lang.php | 4 ++-- inc/lang/pl/lang.php | 4 ++-- inc/lang/pt-br/lang.php | 4 ++-- inc/lang/pt/lang.php | 4 ++-- inc/lang/ro/lang.php | 4 ++-- inc/lang/ru/lang.php | 4 ++-- inc/lang/sk/lang.php | 4 ++-- inc/lang/sl/lang.php | 4 ++-- inc/lang/sq/lang.php | 2 +- inc/lang/sr/lang.php | 2 +- inc/lang/sv/lang.php | 4 ++-- inc/lang/th/lang.php | 2 +- inc/lang/tr/lang.php | 4 ++-- inc/lang/uk/lang.php | 2 +- inc/lang/vi/lang.php | 4 ++-- inc/lang/zh-tw/lang.php | 4 ++-- inc/lang/zh/lang.php | 4 ++-- 58 files changed, 93 insertions(+), 93 deletions(-) (limited to 'inc') diff --git a/inc/lang/af/lang.php b/inc/lang/af/lang.php index 826fda6e8..008110450 100644 --- a/inc/lang/af/lang.php +++ b/inc/lang/af/lang.php @@ -63,7 +63,7 @@ $lang['qb_extlink'] = 'Eksterne skakel'; $lang['qb_hr'] = 'Horisontale streep'; $lang['qb_sig'] = 'Handtekening met datum'; $lang['admin_register'] = 'Skep gerus \'n rekening'; -$lang['img_backto'] = 'Terug na'; +$lang['btn_img_backto'] = 'Terug na %s'; $lang['img_date'] = 'Datem'; $lang['img_camera'] = 'Camera'; $lang['i_wikiname'] = 'Wiki Naam'; diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php index 157513429..b0a2edc88 100644 --- a/inc/lang/ar/lang.php +++ b/inc/lang/ar/lang.php @@ -239,7 +239,7 @@ $lang['admin_register'] = 'أضف مستخدما جديدا'; $lang['metaedit'] = 'تحرير البيانات الشمولية '; $lang['metasaveerr'] = 'فشلت كتابة البيانات الشمولية'; $lang['metasaveok'] = 'حُفظت البيانات الشمولية'; -$lang['img_backto'] = 'عودة إلى'; +$lang['btn_img_backto'] = 'عودة إلى %s'; $lang['img_title'] = 'العنوان'; $lang['img_caption'] = 'وصف'; $lang['img_date'] = 'التاريخ'; @@ -252,7 +252,7 @@ $lang['img_camera'] = 'الكمرا'; $lang['img_keywords'] = 'كلمات مفتاحية'; $lang['img_width'] = 'العرض'; $lang['img_height'] = 'الإرتفاع'; -$lang['img_manager'] = 'اعرض في مدير الوسائط'; +$lang['btn_mediaManager'] = 'اعرض في مدير الوسائط'; $lang['subscr_subscribe_success'] = 'اضيف %s لقائمة اشتراك %s'; $lang['subscr_subscribe_error'] = 'خطأ في إضافة %s لقائمة اشتراك %s'; $lang['subscr_subscribe_noaddress'] = 'ليس هناك عنوان مرتبط بولوجك، لا يمكن اضافتك لقائمة الاشتراك'; diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php index df54b4f10..8d51d2372 100644 --- a/inc/lang/az/lang.php +++ b/inc/lang/az/lang.php @@ -172,7 +172,7 @@ $lang['admin_register'] = 'İstifadəçi əlavə et'; $lang['metaedit'] = 'Meta-məlumatlarda düzəliş et'; $lang['metasaveerr'] = 'Meta-məlumatları yazan zamanı xəta'; $lang['metasaveok'] = 'Meta-məlumatlar yadda saxlandı'; -$lang['img_backto'] = 'Qayıd'; +$lang['btn_img_backto'] = 'Qayıd %s'; $lang['img_title'] = 'Başlıq'; $lang['img_caption'] = 'İmza'; $lang['img_date'] = 'Tarix'; diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php index bb74ff1ca..dcf66955f 100644 --- a/inc/lang/bg/lang.php +++ b/inc/lang/bg/lang.php @@ -236,7 +236,7 @@ $lang['admin_register'] = 'Добавяне на нов потребит $lang['metaedit'] = 'Редактиране на метаданни'; $lang['metasaveerr'] = 'Записването на метаданните се провали'; $lang['metasaveok'] = 'Метаданните са запазени успешно'; -$lang['img_backto'] = 'Назад към'; +$lang['btn_img_backto'] = 'Назад към %s'; $lang['img_title'] = 'Заглавие'; $lang['img_caption'] = 'Надпис'; $lang['img_date'] = 'Дата'; @@ -249,7 +249,7 @@ $lang['img_camera'] = 'Фотоапарат'; $lang['img_keywords'] = 'Ключови думи'; $lang['img_width'] = 'Ширина'; $lang['img_height'] = 'Височина'; -$lang['img_manager'] = 'Преглед в диспечера на файлове'; +$lang['btn_mediaManager'] = 'Преглед в диспечера на файлове'; $lang['subscr_subscribe_success'] = '%s е добавен към списъка с абониралите се за %s'; $lang['subscr_subscribe_error'] = 'Грешка при добавянето на %s към списъка с абониралите се за %s'; $lang['subscr_subscribe_noaddress'] = 'Добавянето ви към списъка с абонати не е възможно поради липсата на свързан адрес (на ел. поща) с профила ви.'; diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php index 9ab423783..6e6f2a662 100644 --- a/inc/lang/ca-valencia/lang.php +++ b/inc/lang/ca-valencia/lang.php @@ -174,7 +174,7 @@ $lang['admin_register'] = 'Afegir nou usuari'; $lang['metaedit'] = 'Editar meta-senyes'; $lang['metasaveerr'] = 'Erro escrivint meta-senyes'; $lang['metasaveok'] = 'Meta-senyes guardades'; -$lang['img_backto'] = 'Tornar a'; +$lang['btn_img_backto'] = 'Tornar a %s'; $lang['img_title'] = 'Títul'; $lang['img_caption'] = 'Subtítul'; $lang['img_date'] = 'Data'; diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php index fd19c6834..1d297a1b1 100644 --- a/inc/lang/ca/lang.php +++ b/inc/lang/ca/lang.php @@ -228,7 +228,7 @@ $lang['admin_register'] = 'Afegeix nou usuari'; $lang['metaedit'] = 'Edita metadades'; $lang['metasaveerr'] = 'No s\'han pogut escriure les metadades'; $lang['metasaveok'] = 'S\'han desat les metadades'; -$lang['img_backto'] = 'Torna a'; +$lang['btn_img_backto'] = 'Torna a %s'; $lang['img_title'] = 'Títol'; $lang['img_caption'] = 'Peu d\'imatge'; $lang['img_date'] = 'Data'; diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php index a0f69b3dc..a491c1533 100644 --- a/inc/lang/cs/lang.php +++ b/inc/lang/cs/lang.php @@ -248,7 +248,7 @@ $lang['admin_register'] = 'Přidat nového uživatele'; $lang['metaedit'] = 'Upravit Metadata'; $lang['metasaveerr'] = 'Chyba při zápisu metadat'; $lang['metasaveok'] = 'Metadata uložena'; -$lang['img_backto'] = 'Zpět na'; +$lang['btn_img_backto'] = 'Zpět na %s'; $lang['img_title'] = 'Titulek'; $lang['img_caption'] = 'Popis'; $lang['img_date'] = 'Datum'; @@ -261,7 +261,7 @@ $lang['img_camera'] = 'Typ fotoaparátu'; $lang['img_keywords'] = 'Klíčová slova'; $lang['img_width'] = 'Šířka'; $lang['img_height'] = 'Výška'; -$lang['img_manager'] = 'Zobrazit ve správě médií'; +$lang['btn_mediaManager'] = 'Zobrazit ve správě médií'; $lang['subscr_subscribe_success'] = '%s byl přihlášen do seznamu odběratelů %s'; $lang['subscr_subscribe_error'] = 'Došlo k chybě při přihlašování %s do seznamu odběratelů %s'; $lang['subscr_subscribe_noaddress'] = 'K Vašemu loginu neexistuje žádná adresa, nemohl jste být přihlášen do seznamu odběratelů.'; diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php index eb50bb240..bdf882ba7 100644 --- a/inc/lang/da/lang.php +++ b/inc/lang/da/lang.php @@ -246,7 +246,7 @@ $lang['admin_register'] = 'Tilføj ny bruger'; $lang['metaedit'] = 'Rediger metadata'; $lang['metasaveerr'] = 'Skrivning af metadata fejlede'; $lang['metasaveok'] = 'Metadata gemt'; -$lang['img_backto'] = 'Tilbage til'; +$lang['btn_img_backto'] = 'Tilbage til %s'; $lang['img_title'] = 'Titel'; $lang['img_caption'] = 'Billedtekst'; $lang['img_date'] = 'Dato'; @@ -259,7 +259,7 @@ $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Emneord'; $lang['img_width'] = 'Bredde'; $lang['img_height'] = 'Højde'; -$lang['img_manager'] = 'Vis i Media Manager'; +$lang['btn_mediaManager'] = 'Vis i Media Manager'; $lang['subscr_subscribe_success'] = 'Tilføjede %s til abonnement listen for %s'; $lang['subscr_subscribe_error'] = 'Fejl ved tilføjelse af %s til abonnement listen for %s'; $lang['subscr_subscribe_noaddress'] = 'Der er ikke nogen addresse forbundet til din bruger, så du kan ikke blive tilføjet til abonnement listen'; diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php index be3f14a18..2e2e04149 100644 --- a/inc/lang/de-informal/lang.php +++ b/inc/lang/de-informal/lang.php @@ -251,7 +251,7 @@ $lang['admin_register'] = 'Neuen Benutzer anmelden'; $lang['metaedit'] = 'Metadaten bearbeiten'; $lang['metasaveerr'] = 'Die Metadaten konnten nicht gesichert werden'; $lang['metasaveok'] = 'Metadaten gesichert'; -$lang['img_backto'] = 'Zurück zu'; +$lang['btn_img_backto'] = 'Zurück zu %s'; $lang['img_title'] = 'Titel'; $lang['img_caption'] = 'Bildunterschrift'; $lang['img_date'] = 'Datum'; @@ -264,7 +264,7 @@ $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Schlagwörter'; $lang['img_width'] = 'Breite'; $lang['img_height'] = 'Höhe'; -$lang['img_manager'] = 'Im Medien-Manager anzeigen'; +$lang['btn_mediaManager'] = 'Im Medien-Manager anzeigen'; $lang['subscr_subscribe_success'] = 'Die Seite %s wurde zur Abonnementliste von %s hinzugefügt'; $lang['subscr_subscribe_error'] = 'Fehler beim Hinzufügen von %s zur Abonnementliste von %s'; $lang['subscr_subscribe_noaddress'] = 'In deinem Account ist keine E-Mail-Adresse hinterlegt. Dadurch kann die Seite nicht abonniert werden'; diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index 9df1035f7..8eb0055e9 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -252,7 +252,7 @@ $lang['admin_register'] = 'Neuen Benutzer anmelden'; $lang['metaedit'] = 'Metadaten bearbeiten'; $lang['metasaveerr'] = 'Die Metadaten konnten nicht gesichert werden'; $lang['metasaveok'] = 'Metadaten gesichert'; -$lang['img_backto'] = 'Zurück zu'; +$lang['btn_img_backto'] = 'Zurück zu %s'; $lang['img_title'] = 'Titel'; $lang['img_caption'] = 'Bildunterschrift'; $lang['img_date'] = 'Datum'; @@ -265,7 +265,7 @@ $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Schlagwörter'; $lang['img_width'] = 'Breite'; $lang['img_height'] = 'Höhe'; -$lang['img_manager'] = 'Im Medien-Manager anzeigen'; +$lang['btn_mediaManager'] = 'Im Medien-Manager anzeigen'; $lang['subscr_subscribe_success'] = '%s hat nun Änderungen der Seite %s abonniert'; $lang['subscr_subscribe_error'] = '%s kann die Änderungen der Seite %s nicht abonnieren'; $lang['subscr_subscribe_noaddress'] = 'Weil Ihre E-Mail-Adresse fehlt, können Sie das Thema nicht abonnieren'; diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php index 170e101a5..d97721cdb 100644 --- a/inc/lang/el/lang.php +++ b/inc/lang/el/lang.php @@ -241,7 +241,7 @@ $lang['admin_register'] = 'Προσθήκη νέου χρήστη'; $lang['metaedit'] = 'Τροποποίηση metadata'; $lang['metasaveerr'] = 'Η αποθήκευση των metadata απέτυχε'; $lang['metasaveok'] = 'Επιτυχής αποθήκευση metadata'; -$lang['img_backto'] = 'Επιστροφή σε'; +$lang['btn_img_backto'] = 'Επιστροφή σε %s'; $lang['img_title'] = 'Τίτλος'; $lang['img_caption'] = 'Λεζάντα'; $lang['img_date'] = 'Ημερομηνία'; @@ -254,7 +254,7 @@ $lang['img_camera'] = 'Camera'; $lang['img_keywords'] = 'Λέξεις-κλειδιά'; $lang['img_width'] = 'Πλάτος'; $lang['img_height'] = 'Ύψος'; -$lang['img_manager'] = 'Εμφάνιση στον διαχειριστή πολυμέσων'; +$lang['btn_mediaManager'] = 'Εμφάνιση στον διαχειριστή πολυμέσων'; $lang['subscr_subscribe_success'] = 'Ο/η %s προστέθηκε στην λίστα ειδοποιήσεων για το %s'; $lang['subscr_subscribe_error'] = 'Σφάλμα κατά την προσθήκη του/της %s στην λίστα ειδοποιήσεων για το %s'; $lang['subscr_subscribe_noaddress'] = 'Δεν υπάρχει διεύθυνση ταχυδρομείου συσχετισμένη με το όνομα χρήστη σας. Κατά συνέπεια δεν μπορείτε να προστεθείτε στην λίστα ειδοποιήσεων'; diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php index 97231bdce..b3c19b601 100644 --- a/inc/lang/eo/lang.php +++ b/inc/lang/eo/lang.php @@ -240,7 +240,7 @@ $lang['admin_register'] = 'Aldoni novan uzanton'; $lang['metaedit'] = 'Redakti metadatumaron'; $lang['metasaveerr'] = 'La konservo de metadatumaro malsukcesis'; $lang['metasaveok'] = 'La metadatumaro konserviĝis'; -$lang['img_backto'] = 'Iri reen al'; +$lang['btn_img_backto'] = 'Iri reen al %s'; $lang['img_title'] = 'Titolo'; $lang['img_caption'] = 'Priskribo'; $lang['img_date'] = 'Dato'; @@ -253,7 +253,7 @@ $lang['img_camera'] = 'Kamerao'; $lang['img_keywords'] = 'Ŝlosilvortoj'; $lang['img_width'] = 'Larĝeco'; $lang['img_height'] = 'Alteco'; -$lang['img_manager'] = 'Rigardi en aŭdvidaĵ-administrilo'; +$lang['btn_mediaManager'] = 'Rigardi en aŭdvidaĵ-administrilo'; $lang['subscr_subscribe_success'] = 'Aldonis %s al la abonlisto por %s'; $lang['subscr_subscribe_error'] = 'Eraro dum aldono de %s al la abonlisto por %s'; $lang['subscr_subscribe_noaddress'] = 'Ne estas adreso ligita al via ensaluto, ne eblas aldoni vin al la abonlisto'; diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php index 216093f6c..9d7e6f954 100644 --- a/inc/lang/es/lang.php +++ b/inc/lang/es/lang.php @@ -262,7 +262,7 @@ $lang['admin_register'] = 'Añadir nuevo usuario'; $lang['metaedit'] = 'Editar metadatos'; $lang['metasaveerr'] = 'La escritura de los metadatos ha fallado'; $lang['metasaveok'] = 'Los metadatos han sido guardados'; -$lang['img_backto'] = 'Volver a'; +$lang['btn_img_backto'] = 'Volver a %s'; $lang['img_title'] = 'Título'; $lang['img_caption'] = 'Epígrafe'; $lang['img_date'] = 'Fecha'; @@ -275,7 +275,7 @@ $lang['img_camera'] = 'Cámara'; $lang['img_keywords'] = 'Palabras claves'; $lang['img_width'] = 'Ancho'; $lang['img_height'] = 'Alto'; -$lang['img_manager'] = 'Ver en el Administrador de medios'; +$lang['btn_mediaManager'] = 'Ver en el Administrador de medios'; $lang['subscr_subscribe_success'] = 'Se agregó %s a las listas de suscripción para %s'; $lang['subscr_subscribe_error'] = 'Error al agregar %s a las listas de suscripción para %s'; $lang['subscr_subscribe_noaddress'] = 'No hay dirección asociada con tu registro, no se puede agregarte a la lista de suscripción'; diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php index cc736db4d..9d1d67e27 100644 --- a/inc/lang/et/lang.php +++ b/inc/lang/et/lang.php @@ -197,7 +197,7 @@ $lang['admin_register'] = 'Lisa kasutaja'; $lang['metaedit'] = 'Muuda lisainfot'; $lang['metasaveerr'] = 'Lisainfo salvestamine läks untsu.'; $lang['metasaveok'] = 'Lisainfo salvestatud'; -$lang['img_backto'] = 'Tagasi'; +$lang['btn_img_backto'] = 'Tagasi %s'; $lang['img_title'] = 'Tiitel'; $lang['img_caption'] = 'Kirjeldus'; $lang['img_date'] = 'Kuupäev'; diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php index c7e7ead9a..9a38099b3 100644 --- a/inc/lang/eu/lang.php +++ b/inc/lang/eu/lang.php @@ -227,7 +227,7 @@ $lang['admin_register'] = 'Erabiltzaile berria gehitu'; $lang['metaedit'] = 'Metadatua Aldatu'; $lang['metasaveerr'] = 'Metadatuaren idazketak huts egin du'; $lang['metasaveok'] = 'Metadatua gordea'; -$lang['img_backto'] = 'Atzera hona'; +$lang['btn_img_backto'] = 'Atzera hona %s'; $lang['img_title'] = 'Izenburua'; $lang['img_caption'] = 'Epigrafea'; $lang['img_date'] = 'Data'; @@ -240,7 +240,7 @@ $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Hitz-gakoak'; $lang['img_width'] = 'Zabalera'; $lang['img_height'] = 'Altuera'; -$lang['img_manager'] = 'Media kudeatzailean ikusi'; +$lang['btn_mediaManager'] = 'Media kudeatzailean ikusi'; $lang['subscr_subscribe_success'] = '%s gehitua %s-ren harpidetza zerrendara'; $lang['subscr_subscribe_error'] = 'Errorea %s gehitzen %s-ren harpidetza zerrendara'; $lang['subscr_subscribe_noaddress'] = 'Ez dago helbiderik zure login-arekin lotuta, ezin zara harpidetza zerrendara gehitua izan.'; diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php index dbad62890..1e819419f 100644 --- a/inc/lang/fa/lang.php +++ b/inc/lang/fa/lang.php @@ -240,7 +240,7 @@ $lang['admin_register'] = 'یک حساب جدید بسازید'; $lang['metaedit'] = 'ویرایش داده‌های متا'; $lang['metasaveerr'] = 'نوشتن داده‌نما با مشکل مواجه شد'; $lang['metasaveok'] = 'داده‌نما ذخیره شد'; -$lang['img_backto'] = 'بازگشت به '; +$lang['btn_img_backto'] = 'بازگشت به %s'; $lang['img_title'] = 'عنوان تصویر'; $lang['img_caption'] = 'عنوان'; $lang['img_date'] = 'تاریخ'; @@ -253,7 +253,7 @@ $lang['img_camera'] = 'دوربین'; $lang['img_keywords'] = 'واژه‌های کلیدی'; $lang['img_width'] = 'عرض'; $lang['img_height'] = 'ارتفاع'; -$lang['img_manager'] = 'دیدن در مدیریت محتوای چند رسانه ای'; +$lang['btn_mediaManager'] = 'دیدن در مدیریت محتوای چند رسانه ای'; $lang['subscr_subscribe_success'] = '%s به لیست آبونه %s افزوده شد'; $lang['subscr_subscribe_error'] = 'اشکال در افزودن %s به لیست آبونه %s'; $lang['subscr_subscribe_noaddress'] = 'هیچ آدرسی برای این عضویت اضافه نشده است، شما نمی‌توانید به لیست آبونه اضافه شوید'; diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php index feefc3da8..9b877013e 100644 --- a/inc/lang/fi/lang.php +++ b/inc/lang/fi/lang.php @@ -240,7 +240,7 @@ $lang['admin_register'] = 'Lisää uusi käyttäjä'; $lang['metaedit'] = 'Muokkaa metadataa'; $lang['metasaveerr'] = 'Metadatan kirjoittaminen epäonnistui'; $lang['metasaveok'] = 'Metadata tallennettu'; -$lang['img_backto'] = 'Takaisin'; +$lang['btn_img_backto'] = 'Takaisin %s'; $lang['img_title'] = 'Otsikko'; $lang['img_caption'] = 'Kuvateksti'; $lang['img_date'] = 'Päivämäärä'; @@ -253,7 +253,7 @@ $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Avainsanat'; $lang['img_width'] = 'Leveys'; $lang['img_height'] = 'Korkeus'; -$lang['img_manager'] = 'Näytä mediamanagerissa'; +$lang['btn_mediaManager'] = 'Näytä mediamanagerissa'; $lang['subscr_subscribe_success'] = '%s lisätty %s tilauslistalle'; $lang['subscr_subscribe_error'] = 'Virhe lisättäessä %s tilauslistalle %s'; $lang['subscr_subscribe_noaddress'] = 'Login tiedoissasi ei ole sähköpostiosoitetta. Sinua ei voi lisätä tilaukseen'; diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php index 161e7321a..2613186eb 100644 --- a/inc/lang/fo/lang.php +++ b/inc/lang/fo/lang.php @@ -157,7 +157,7 @@ $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['btn_img_backto'] = 'Aftur til %s'; $lang['img_title'] = 'Heitið'; $lang['img_caption'] = 'Myndatekstur'; $lang['img_date'] = 'Dato'; diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php index 49f617323..b05019355 100644 --- a/inc/lang/fr/lang.php +++ b/inc/lang/fr/lang.php @@ -258,7 +258,7 @@ $lang['admin_register'] = 'Ajouter un nouvel utilisateur'; $lang['metaedit'] = 'Modifier les métadonnées'; $lang['metasaveerr'] = 'Erreur lors de l\'enregistrement des métadonnées'; $lang['metasaveok'] = 'Métadonnées enregistrées'; -$lang['img_backto'] = 'Retour à'; +$lang['btn_img_backto'] = 'Retour à %s'; $lang['img_title'] = 'Titre'; $lang['img_caption'] = 'Légende'; $lang['img_date'] = 'Date'; @@ -271,7 +271,7 @@ $lang['img_camera'] = 'Appareil photo'; $lang['img_keywords'] = 'Mots-clés'; $lang['img_width'] = 'Largeur'; $lang['img_height'] = 'Hauteur'; -$lang['img_manager'] = 'Voir dans le gestionnaire de médias'; +$lang['btn_mediaManager'] = 'Voir dans le gestionnaire de médias'; $lang['subscr_subscribe_success'] = '%s a été ajouté à la liste de souscription de %s'; $lang['subscr_subscribe_error'] = 'Erreur à l\'ajout de %s à la liste de souscription de %s'; $lang['subscr_subscribe_noaddress'] = 'Il n\'y a pas d\'adresse associée à votre identifiant, vous ne pouvez pas être ajouté à la liste de souscription'; diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php index 65967a3b5..0c81f1fb2 100644 --- a/inc/lang/gl/lang.php +++ b/inc/lang/gl/lang.php @@ -230,7 +230,7 @@ $lang['admin_register'] = 'Engadir novo usuario'; $lang['metaedit'] = 'Editar Metadatos'; $lang['metasaveerr'] = 'Non se puideron escribir os metadatos'; $lang['metasaveok'] = 'Metadatos gardados'; -$lang['img_backto'] = 'Volver a'; +$lang['btn_img_backto'] = 'Volver a %s'; $lang['img_title'] = 'Título'; $lang['img_caption'] = 'Lenda'; $lang['img_date'] = 'Data'; @@ -243,7 +243,7 @@ $lang['img_camera'] = 'Cámara'; $lang['img_keywords'] = 'Verbas chave'; $lang['img_width'] = 'Ancho'; $lang['img_height'] = 'Alto'; -$lang['img_manager'] = 'Ver no xestor de arquivos-media'; +$lang['btn_mediaManager'] = 'Ver no xestor de arquivos-media'; $lang['subscr_subscribe_success'] = 'Engadido %s á lista de subscrición para %s'; $lang['subscr_subscribe_error'] = 'Erro ao tentar engadir %s á lista de subscrición para %s'; $lang['subscr_subscribe_noaddress'] = 'Non hai enderezos asociados co teu inicio de sesión, non é posíbel engadirte á lista de subscrición'; diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php index 8efe0da17..5339d1802 100644 --- a/inc/lang/he/lang.php +++ b/inc/lang/he/lang.php @@ -243,7 +243,7 @@ $lang['admin_register'] = 'הוספת משתמש חדש'; $lang['metaedit'] = 'עריכת נתוני העל'; $lang['metasaveerr'] = 'אירע כשל בשמירת נתוני העל'; $lang['metasaveok'] = 'נתוני העל נשמרו'; -$lang['img_backto'] = 'חזרה אל'; +$lang['btn_img_backto'] = 'חזרה אל %s'; $lang['img_title'] = 'שם'; $lang['img_caption'] = 'כותרת'; $lang['img_date'] = 'תאריך'; @@ -256,7 +256,7 @@ $lang['img_camera'] = 'מצלמה'; $lang['img_keywords'] = 'מילות מפתח'; $lang['img_width'] = 'רוחב'; $lang['img_height'] = 'גובה'; -$lang['img_manager'] = 'צפה במנהל מדיה'; +$lang['btn_mediaManager'] = 'צפה במנהל מדיה'; $lang['subscr_subscribe_success'] = '%s נוסף לרשימת המינויים לדף %s'; $lang['subscr_subscribe_error'] = 'אירעה שגיאה בהוספת %s לרשימת המינויים לדף %s'; $lang['subscr_subscribe_noaddress'] = 'אין כתובת המשויכת עם הכניסה שלך, נא ניתן להוסיף אותך לרשימת המינויים'; diff --git a/inc/lang/hi/lang.php b/inc/lang/hi/lang.php index 184eeedbc..95c443ae9 100644 --- a/inc/lang/hi/lang.php +++ b/inc/lang/hi/lang.php @@ -103,7 +103,7 @@ $lang['qb_extlink'] = 'बाह्य कड़ी'; $lang['qb_hr'] = 'खड़ी रेखा'; $lang['qb_sig'] = 'हस्ताक्षर डालें'; $lang['admin_register'] = 'नया उपयोगकर्ता जोड़ें'; -$lang['img_backto'] = 'वापस जाना'; +$lang['btn_img_backto'] = 'वापस जाना %s'; $lang['img_title'] = 'शीर्षक'; $lang['img_caption'] = 'सहशीर्षक'; $lang['img_date'] = 'तिथि'; diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php index f19610827..544541ab2 100644 --- a/inc/lang/hr/lang.php +++ b/inc/lang/hr/lang.php @@ -204,7 +204,7 @@ $lang['admin_register'] = 'Dodaj novog korisnika'; $lang['metaedit'] = 'Uredi metapodatake'; $lang['metasaveerr'] = 'Neuspješno zapisivanje metapodataka'; $lang['metasaveok'] = 'Spremljeni metapdaci'; -$lang['img_backto'] = 'Povratak na'; +$lang['btn_img_backto'] = 'Povratak na %s'; $lang['img_title'] = 'Naziv'; $lang['img_caption'] = 'Naslov'; $lang['img_date'] = 'Datum'; diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php index a0aef9447..ad70438d9 100644 --- a/inc/lang/hu/lang.php +++ b/inc/lang/hu/lang.php @@ -243,7 +243,7 @@ $lang['admin_register'] = 'Új felhasználó'; $lang['metaedit'] = 'Metaadatok szerkesztése'; $lang['metasaveerr'] = 'A metaadatok írása nem sikerült'; $lang['metasaveok'] = 'Metaadatok elmentve'; -$lang['img_backto'] = 'Vissza'; +$lang['btn_img_backto'] = 'Vissza %s'; $lang['img_title'] = 'Cím'; $lang['img_caption'] = 'Képaláírás'; $lang['img_date'] = 'Dátum'; @@ -256,7 +256,7 @@ $lang['img_camera'] = 'Fényképezőgép típusa'; $lang['img_keywords'] = 'Kulcsszavak'; $lang['img_width'] = 'Szélesség'; $lang['img_height'] = 'Magasság'; -$lang['img_manager'] = 'Megtekintés a médiakezelőben'; +$lang['btn_mediaManager'] = 'Megtekintés a médiakezelőben'; $lang['subscr_subscribe_success'] = '%s hozzáadva az értesítési listához: %s'; $lang['subscr_subscribe_error'] = 'Hiba történt %s hozzáadásakor az értesítési listához: %s'; $lang['subscr_subscribe_noaddress'] = 'Nincs e-mail cím megadva az adataidnál, így a rendszer nem tudott hozzáadni az értesítési listához'; diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php index 144dfe33b..1cc9bd8b5 100644 --- a/inc/lang/ia/lang.php +++ b/inc/lang/ia/lang.php @@ -202,7 +202,7 @@ $lang['admin_register'] = 'Adder nove usator'; $lang['metaedit'] = 'Modificar metadatos'; $lang['metasaveerr'] = 'Scriptura de metadatos fallite'; $lang['metasaveok'] = 'Metadatos salveguardate'; -$lang['img_backto'] = 'Retornar a'; +$lang['btn_img_backto'] = 'Retornar a %s'; $lang['img_title'] = 'Titulo'; $lang['img_caption'] = 'Legenda'; $lang['img_date'] = 'Data'; diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php index 5cb5cb6ea..648aad865 100644 --- a/inc/lang/id/lang.php +++ b/inc/lang/id/lang.php @@ -186,7 +186,7 @@ $lang['admin_register'] = 'Tambah user baru'; $lang['metaedit'] = 'Edit Metadata'; $lang['metasaveerr'] = 'Gagal menulis metadata'; $lang['metasaveok'] = 'Metadata tersimpan'; -$lang['img_backto'] = 'Kembali ke'; +$lang['btn_img_backto'] = 'Kembali ke %s'; $lang['img_title'] = 'Judul'; $lang['img_caption'] = 'Label'; $lang['img_date'] = 'Tanggal'; diff --git a/inc/lang/is/lang.php b/inc/lang/is/lang.php index fbc7e9049..219431a42 100644 --- a/inc/lang/is/lang.php +++ b/inc/lang/is/lang.php @@ -170,7 +170,7 @@ $lang['admin_register'] = 'Setja nýjan notenda inn'; $lang['metaedit'] = 'Breyta lýsigögnum'; $lang['metasaveerr'] = 'Vistun lýsigagna mistókst'; $lang['metasaveok'] = 'Lýsigögn vistuð'; -$lang['img_backto'] = 'Aftur til'; +$lang['btn_img_backto'] = 'Aftur til %s'; $lang['img_title'] = 'Heiti'; $lang['img_caption'] = 'Skýringartexti'; $lang['img_date'] = 'Dagsetning'; diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php index a2bde3b60..eefcec9db 100644 --- a/inc/lang/it/lang.php +++ b/inc/lang/it/lang.php @@ -245,7 +245,7 @@ $lang['admin_register'] = 'Aggiungi un nuovo utente'; $lang['metaedit'] = 'Modifica metadati'; $lang['metasaveerr'] = 'Scrittura metadati fallita'; $lang['metasaveok'] = 'Metadati salvati'; -$lang['img_backto'] = 'Torna a'; +$lang['btn_img_backto'] = 'Torna a %s'; $lang['img_title'] = 'Titolo'; $lang['img_caption'] = 'Descrizione'; $lang['img_date'] = 'Data'; @@ -258,7 +258,7 @@ $lang['img_camera'] = 'Camera'; $lang['img_keywords'] = 'Parole chiave'; $lang['img_width'] = 'Larghezza'; $lang['img_height'] = 'Altezza'; -$lang['img_manager'] = 'Guarda nel gestore media'; +$lang['btn_mediaManager'] = 'Guarda nel gestore media'; $lang['subscr_subscribe_success'] = 'Aggiunto %s alla lista di sottoscrizioni %s'; $lang['subscr_subscribe_error'] = 'Impossibile aggiungere %s alla lista di sottoscrizioni %s'; $lang['subscr_subscribe_noaddress'] = 'Non esiste alcun indirizzo associato al tuo account, non puoi essere aggiunto alla lista di sottoscrizioni'; diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php index 1f53b0a90..782689fa3 100644 --- a/inc/lang/ja/lang.php +++ b/inc/lang/ja/lang.php @@ -240,7 +240,7 @@ $lang['admin_register'] = '新規ユーザー作成'; $lang['metaedit'] = 'メタデータ編集'; $lang['metasaveerr'] = 'メタデータの書き込みに失敗しました'; $lang['metasaveok'] = 'メタデータは保存されました'; -$lang['img_backto'] = '戻る'; +$lang['btn_img_backto'] = '戻る %s'; $lang['img_title'] = 'タイトル'; $lang['img_caption'] = '見出し'; $lang['img_date'] = '日付'; @@ -253,7 +253,7 @@ $lang['img_camera'] = '使用カメラ'; $lang['img_keywords'] = 'キーワード'; $lang['img_width'] = '幅'; $lang['img_height'] = '高さ'; -$lang['img_manager'] = 'メディアマネージャーで閲覧'; +$lang['btn_mediaManager'] = 'メディアマネージャーで閲覧'; $lang['subscr_subscribe_success'] = '%sが%sの購読リストに登録されました。'; $lang['subscr_subscribe_error'] = '%sを%sの購読リストへの追加に失敗しました。'; $lang['subscr_subscribe_noaddress'] = 'あなたのログインに対応するアドレスがないため、購読リストへ追加することができません。'; diff --git a/inc/lang/kk/lang.php b/inc/lang/kk/lang.php index 37b0f462b..4b111b118 100644 --- a/inc/lang/kk/lang.php +++ b/inc/lang/kk/lang.php @@ -123,7 +123,7 @@ $lang['yours'] = 'Сендердің болжамыңыз'; $lang['created'] = 'ЖасалFан'; $lang['mail_new_user'] = 'Жаңа пайдаланушы'; $lang['qb_chars'] = 'Арнайы белгiлер'; -$lang['img_backto'] = 'Қайта оралу'; +$lang['btn_img_backto'] = 'Қайта оралу %s'; $lang['img_format'] = 'Формат'; $lang['img_camera'] = 'Камера'; $lang['i_chooselang'] = 'Тіл таңдау'; diff --git a/inc/lang/km/lang.php b/inc/lang/km/lang.php index 4800b6c23..9f65ccd16 100644 --- a/inc/lang/km/lang.php +++ b/inc/lang/km/lang.php @@ -165,7 +165,7 @@ $lang['admin_register']= 'តែមអ្នកប្រើ';//'Add new user'; $lang['metaedit'] = 'កែទិន្នន័យអរូប';//'Edit Metadata'; $lang['metasaveerr'] = 'ពំអាចកត់រទិន្នន័យអរូប';//'Writing metadata failed'; $lang['metasaveok'] = 'ទិន្នន័យអរូប'; -$lang['img_backto'] = 'ថយក្រោយ'; +$lang['btn_img_backto'] = 'ថយក្រោយ%s'; $lang['img_title'] = 'អភិធេយ្យ'; $lang['img_caption'] = 'ចំណងជើង'; $lang['img_date'] = 'ថ្ងៃខែ';//'Date'; diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php index 266ff01e5..3a49dda7a 100644 --- a/inc/lang/ko/lang.php +++ b/inc/lang/ko/lang.php @@ -241,7 +241,7 @@ $lang['admin_register'] = '새 사용자 추가'; $lang['metaedit'] = '메타데이터 편집'; $lang['metasaveerr'] = '메타데이터 쓰기 실패'; $lang['metasaveok'] = '메타데이터 저장됨'; -$lang['img_backto'] = '뒤로'; +$lang['btn_img_backto'] = '뒤로 %s'; $lang['img_title'] = '제목'; $lang['img_caption'] = '설명'; $lang['img_date'] = '날짜'; @@ -254,7 +254,7 @@ $lang['img_camera'] = '카메라'; $lang['img_keywords'] = '키워드'; $lang['img_width'] = '너비'; $lang['img_height'] = '높이'; -$lang['img_manager'] = '미디어 관리자에서 보기'; +$lang['btn_mediaManager'] = '미디어 관리자에서 보기'; $lang['subscr_subscribe_success'] = '%s 사용자가 %s 구독 목록에 추가했습니다'; $lang['subscr_subscribe_error'] = '%s 사용자가 %s 구독 목록에 추가하는데 실패했습니다'; $lang['subscr_subscribe_noaddress'] = '로그인으로 연결된 주소가 없기 때문에 구독 목록에 추가할 수 없습니다'; diff --git a/inc/lang/ku/lang.php b/inc/lang/ku/lang.php index b6287806d..14f568b8e 100644 --- a/inc/lang/ku/lang.php +++ b/inc/lang/ku/lang.php @@ -127,7 +127,7 @@ $lang['admin_register']= 'Add new user...'; $lang['metaedit'] = 'Edit Metadata'; $lang['metasaveerr'] = 'Writing metadata failed'; $lang['metasaveok'] = 'Metadata saved'; -$lang['img_backto'] = 'Back to'; +$lang['btn_img_backto'] = 'Back to %s'; $lang['img_title'] = 'Title'; $lang['img_caption'] = 'Caption'; $lang['img_date'] = 'Date'; diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php index c71a71bdd..691b303ed 100644 --- a/inc/lang/la/lang.php +++ b/inc/lang/la/lang.php @@ -202,7 +202,7 @@ $lang['admin_register'] = 'Nouom Sodalem creare'; $lang['metaedit'] = 'Res codicis mutare'; $lang['metasaveerr'] = 'Res codicis non scribitur.'; $lang['metasaveok'] = 'Res codicis seruatae.'; -$lang['img_backto'] = 'Redere ad'; +$lang['btn_img_backto'] = 'Redere ad %s'; $lang['img_title'] = 'Titulus'; $lang['img_caption'] = 'Descriptio'; $lang['img_date'] = 'Dies'; diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php index 55113745a..efb98f679 100644 --- a/inc/lang/lb/lang.php +++ b/inc/lang/lb/lang.php @@ -162,7 +162,7 @@ $lang['admin_register'] = 'Neie Benotzer bäisetzen'; $lang['metaedit'] = 'Metadaten änneren'; $lang['metasaveerr'] = 'Feeler beim Schreiwe vun de Metadaten'; $lang['metasaveok'] = 'Metadate gespäichert'; -$lang['img_backto'] = 'Zeréck op'; +$lang['btn_img_backto'] = 'Zeréck op %s'; $lang['img_title'] = 'Titel'; $lang['img_caption'] = 'Beschreiwung'; $lang['img_date'] = 'Datum'; diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php index c38ea8838..74c8c88e9 100644 --- a/inc/lang/lt/lang.php +++ b/inc/lang/lt/lang.php @@ -163,7 +163,7 @@ $lang['admin_register'] = 'Sukurti naują vartotoją'; $lang['metaedit'] = 'Redaguoti metaduomenis'; $lang['metasaveerr'] = 'Nepavyko išsaugoti metaduomenų'; $lang['metasaveok'] = 'Metaduomenys išsaugoti'; -$lang['img_backto'] = 'Atgal į'; +$lang['btn_img_backto'] = 'Atgal į %s'; $lang['img_title'] = 'Pavadinimas'; $lang['img_caption'] = 'Antraštė'; $lang['img_date'] = 'Data'; diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php index 898125d60..91fed262e 100644 --- a/inc/lang/lv/lang.php +++ b/inc/lang/lv/lang.php @@ -228,7 +228,7 @@ $lang['admin_register'] = 'Pievienot jaunu lietotāju'; $lang['metaedit'] = 'Labot metadatus'; $lang['metasaveerr'] = 'Metadati nav saglabāti'; $lang['metasaveok'] = 'Metadati saglabāti'; -$lang['img_backto'] = 'Atpakaļ uz'; +$lang['btn_img_backto'] = 'Atpakaļ uz %s'; $lang['img_title'] = 'Virsraksts'; $lang['img_caption'] = 'Apraksts'; $lang['img_date'] = 'Datums'; @@ -241,7 +241,7 @@ $lang['img_camera'] = 'Fotoaparāts'; $lang['img_keywords'] = 'Atslēgvārdi'; $lang['img_width'] = 'Platums'; $lang['img_height'] = 'Augstums'; -$lang['img_manager'] = 'Skatīt mēdiju pārvaldniekā'; +$lang['btn_mediaManager'] = 'Skatīt mēdiju pārvaldniekā'; $lang['subscr_subscribe_success'] = '%s pievienots %s abonēšanas sarakstam'; $lang['subscr_subscribe_error'] = 'Kļūme pievienojot %s %s abonēšanas sarakstam.'; $lang['subscr_subscribe_noaddress'] = 'Nav zināma jūsu e-pasta adrese, tāpēc nevarat abonēt.'; diff --git a/inc/lang/mk/lang.php b/inc/lang/mk/lang.php index 2b2c9fb7f..6bf5fafc9 100644 --- a/inc/lang/mk/lang.php +++ b/inc/lang/mk/lang.php @@ -171,7 +171,7 @@ $lang['admin_register'] = 'Додај нов корисник'; $lang['metaedit'] = 'Уреди мета-податоци'; $lang['metasaveerr'] = 'Запишување на мета-податоците не успеа'; $lang['metasaveok'] = 'Мета-податоците се зачувани'; -$lang['img_backto'] = 'Назад до'; +$lang['btn_img_backto'] = 'Назад до %s'; $lang['img_title'] = 'Насловна линија'; $lang['img_caption'] = 'Наслов'; $lang['img_date'] = 'Датум'; diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php index 54b69974d..ab84e7353 100644 --- a/inc/lang/mr/lang.php +++ b/inc/lang/mr/lang.php @@ -227,7 +227,7 @@ $lang['admin_register'] = 'नवीन सदस्य'; $lang['metaedit'] = 'मेटाडेटा बदला'; $lang['metasaveerr'] = 'मेटाडेटा सुरक्षित झाला नाही'; $lang['metasaveok'] = 'मेटाडेटा सुरक्षित झाला'; -$lang['img_backto'] = 'परत जा'; +$lang['btn_img_backto'] = 'परत जा %s'; $lang['img_title'] = 'नाव'; $lang['img_caption'] = 'टीप'; $lang['img_date'] = 'तारीख'; @@ -240,7 +240,7 @@ $lang['img_camera'] = 'कॅमेरा'; $lang['img_keywords'] = 'मुख्य शब्द'; $lang['img_width'] = 'रुंदी'; $lang['img_height'] = 'उंची'; -$lang['img_manager'] = 'मिडिया व्यवस्थापकात बघू'; +$lang['btn_mediaManager'] = 'मिडिया व्यवस्थापकात बघू'; $lang['authtempfail'] = 'सदस्य अधिकृत करण्याची सुविधा सध्या चालू नाही. सतत हा मजकूर दिसल्यास कृपया तुमच्या विकीच्या व्यवस्थापकाशी सम्पर्क साधा.'; $lang['i_chooselang'] = 'तुमची भाषा निवडा'; $lang['i_installer'] = 'डॉक्युविकि इनस्टॉलर'; diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php index 7fd14d2c5..a7d694d5b 100644 --- a/inc/lang/ne/lang.php +++ b/inc/lang/ne/lang.php @@ -158,7 +158,7 @@ $lang['admin_register'] = 'नयाँ प्रयोगकर्ता $lang['metaedit'] = 'मेटाडेटा सम्पादन गर्नुहोस्'; $lang['metasaveerr'] = 'मेटाडाटा लेखन असफल'; $lang['metasaveok'] = 'मेटाडाटा वचत भयो '; -$lang['img_backto'] = 'फिर्ता'; +$lang['btn_img_backto'] = 'फिर्ता%s'; $lang['img_title'] = 'शिर्षक'; $lang['img_caption'] = 'निम्न लेख'; $lang['img_date'] = 'मिति'; diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php index e5e3e3c76..2df23004f 100644 --- a/inc/lang/nl/lang.php +++ b/inc/lang/nl/lang.php @@ -253,7 +253,7 @@ $lang['admin_register'] = 'Nieuwe gebruiker toevoegen'; $lang['metaedit'] = 'Metadata wijzigen'; $lang['metasaveerr'] = 'Schrijven van metadata mislukt'; $lang['metasaveok'] = 'Metadata bewaard'; -$lang['img_backto'] = 'Terug naar'; +$lang['btn_img_backto'] = 'Terug naar %s'; $lang['img_title'] = 'Titel'; $lang['img_caption'] = 'Bijschrift'; $lang['img_date'] = 'Datum'; @@ -266,7 +266,7 @@ $lang['img_camera'] = 'Camera'; $lang['img_keywords'] = 'Trefwoorden'; $lang['img_width'] = 'Breedte'; $lang['img_height'] = 'Hoogte'; -$lang['img_manager'] = 'In mediabeheerder bekijken'; +$lang['btn_mediaManager'] = 'In mediabeheerder bekijken'; $lang['subscr_subscribe_success'] = '%s is ingeschreven voor %s'; $lang['subscr_subscribe_error'] = 'Fout bij inschrijven van %s voor %s'; $lang['subscr_subscribe_noaddress'] = 'Er is geen e-mailadres gekoppeld aan uw account, u kunt daardoor niet worden ingeschreven.'; diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php index 3f31f6c73..cdf0effcc 100644 --- a/inc/lang/no/lang.php +++ b/inc/lang/no/lang.php @@ -251,7 +251,7 @@ $lang['admin_register'] = 'Legg til ny bruker'; $lang['metaedit'] = 'Rediger metadata'; $lang['metasaveerr'] = 'Skriving av metadata feilet'; $lang['metasaveok'] = 'Metadata lagret'; -$lang['img_backto'] = 'Tilbake til'; +$lang['btn_img_backto'] = 'Tilbake til %s'; $lang['img_title'] = 'Tittel'; $lang['img_caption'] = 'Bildetekst'; $lang['img_date'] = 'Dato'; @@ -264,7 +264,7 @@ $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Nøkkelord'; $lang['img_width'] = 'Bredde'; $lang['img_height'] = 'Høyde'; -$lang['img_manager'] = 'Vis i mediefilbehandler'; +$lang['btn_mediaManager'] = 'Vis i mediefilbehandler'; $lang['subscr_subscribe_success'] = 'La til %s som abonnent på %s'; $lang['subscr_subscribe_error'] = 'Klarte ikke å legge til %s som abonnent på %s'; $lang['subscr_subscribe_noaddress'] = 'Brukeren din er ikke registrert med noen adresse. Du kan derfor ikke legges til som abonnent.'; diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php index e5f2d8d40..e65866761 100644 --- a/inc/lang/pl/lang.php +++ b/inc/lang/pl/lang.php @@ -247,7 +247,7 @@ $lang['admin_register'] = 'Dodawanie użytkownika'; $lang['metaedit'] = 'Edytuj metadane'; $lang['metasaveerr'] = 'Zapis metadanych nie powiódł się'; $lang['metasaveok'] = 'Metadane zapisano'; -$lang['img_backto'] = 'Wróć do'; +$lang['btn_img_backto'] = 'Wróć do %s'; $lang['img_title'] = 'Tytuł'; $lang['img_caption'] = 'Nagłówek'; $lang['img_date'] = 'Data'; @@ -260,7 +260,7 @@ $lang['img_camera'] = 'Aparat'; $lang['img_keywords'] = 'Słowa kluczowe'; $lang['img_width'] = 'Szerokość'; $lang['img_height'] = 'Wysokość'; -$lang['img_manager'] = 'Zobacz w menadżerze multimediów'; +$lang['btn_mediaManager'] = 'Zobacz w menadżerze multimediów'; $lang['subscr_subscribe_success'] = 'Dodano %s do listy subskrypcji %s'; $lang['subscr_subscribe_error'] = 'Błąd podczas dodawania %s do listy subskrypcji %s'; $lang['subscr_subscribe_noaddress'] = 'Brak adresu skojarzonego z twoim loginem, nie możesz zostać dodany(a) do listy subskrypcji'; diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php index 6845e792d..d5539f921 100644 --- a/inc/lang/pt-br/lang.php +++ b/inc/lang/pt-br/lang.php @@ -254,7 +254,7 @@ $lang['admin_register'] = 'Adicionar novo usuário'; $lang['metaedit'] = 'Editar metadados'; $lang['metasaveerr'] = 'Não foi possível escrever os metadados'; $lang['metasaveok'] = 'Os metadados foram salvos'; -$lang['img_backto'] = 'Voltar para'; +$lang['btn_img_backto'] = 'Voltar para %s'; $lang['img_title'] = 'Título'; $lang['img_caption'] = 'Descrição'; $lang['img_date'] = 'Data'; @@ -267,7 +267,7 @@ $lang['img_camera'] = 'Câmera'; $lang['img_keywords'] = 'Palavras-chave'; $lang['img_width'] = 'Largura'; $lang['img_height'] = 'Altura'; -$lang['img_manager'] = 'Ver no gerenciador de mídias'; +$lang['btn_mediaManager'] = 'Ver no gerenciador de mídias'; $lang['subscr_subscribe_success'] = 'Adicionado %s à lista de monitoramentos de %s'; $lang['subscr_subscribe_error'] = 'Ocorreu um erro na adição de %s à lista de monitoramentos de %s'; $lang['subscr_subscribe_noaddress'] = 'Como não há nenhum endereço associado ao seu usuário, você não pode ser adicionado à lista de monitoramento'; diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php index 46405c444..b2bb2dc34 100644 --- a/inc/lang/pt/lang.php +++ b/inc/lang/pt/lang.php @@ -233,7 +233,7 @@ $lang['admin_register'] = 'Registar Novo Utilizador'; $lang['metaedit'] = 'Editar Metadata'; $lang['metasaveerr'] = 'Falhou a escrita de Metadata'; $lang['metasaveok'] = 'Metadata gravada'; -$lang['img_backto'] = 'De volta a'; +$lang['btn_img_backto'] = 'De volta a %s'; $lang['img_title'] = 'Título'; $lang['img_caption'] = 'Legenda'; $lang['img_date'] = 'Data'; @@ -246,7 +246,7 @@ $lang['img_camera'] = 'Câmara'; $lang['img_keywords'] = 'Palavras-Chave'; $lang['img_width'] = 'Largura'; $lang['img_height'] = 'Altura'; -$lang['img_manager'] = 'Ver em gestor de media'; +$lang['btn_mediaManager'] = 'Ver em gestor de media'; $lang['subscr_subscribe_success'] = 'Adicionado %s à lista de subscrição para %s'; $lang['subscr_subscribe_error'] = 'Erro ao adicionar %s à lista de subscrição para %s'; $lang['subscr_subscribe_noaddress'] = 'Não existe endereço algum associado com o seu nome de utilizador, não pode ser adicionado à lista de subscrição'; diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php index 491ab58e7..31b2d7eba 100644 --- a/inc/lang/ro/lang.php +++ b/inc/lang/ro/lang.php @@ -232,7 +232,7 @@ $lang['admin_register'] = 'Adaugă utilizator nou'; $lang['metaedit'] = 'Editează metadata'; $lang['metasaveerr'] = 'Scrierea metadatelor a eșuat'; $lang['metasaveok'] = 'Metadatele au fost salvate'; -$lang['img_backto'] = 'Înapoi la'; +$lang['btn_img_backto'] = 'Înapoi la %s'; $lang['img_title'] = 'Titlu'; $lang['img_caption'] = 'Legendă'; $lang['img_date'] = 'Dată'; @@ -245,7 +245,7 @@ $lang['img_camera'] = 'Camera'; $lang['img_keywords'] = 'Cuvinte cheie'; $lang['img_width'] = 'Lățime'; $lang['img_height'] = 'Înălțime'; -$lang['img_manager'] = 'Vizualizează în administratorul media'; +$lang['btn_mediaManager'] = 'Vizualizează în administratorul media'; $lang['subscr_subscribe_success'] = 'Adăugat %s la lista de abonare pentru %s'; $lang['subscr_subscribe_error'] = 'Eroare la adăugarea %s la lista de abonare pentru %s'; $lang['subscr_subscribe_noaddress'] = 'Nu există adresă de e-mail asociată autentificării curente, nu poți fi adăugat la lista de abonare'; diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php index 208d647a8..d69191521 100644 --- a/inc/lang/ru/lang.php +++ b/inc/lang/ru/lang.php @@ -253,7 +253,7 @@ $lang['admin_register'] = 'Добавить пользователя'; $lang['metaedit'] = 'Править метаданные'; $lang['metasaveerr'] = 'Ошибка записи метаданных'; $lang['metasaveok'] = 'Метаданные сохранены'; -$lang['img_backto'] = 'Вернуться к'; +$lang['btn_img_backto'] = 'Вернуться к %s'; $lang['img_title'] = 'Название'; $lang['img_caption'] = 'Подпись'; $lang['img_date'] = 'Дата'; @@ -266,7 +266,7 @@ $lang['img_camera'] = 'Модель'; $lang['img_keywords'] = 'Ключевые слова'; $lang['img_width'] = 'Ширина'; $lang['img_height'] = 'Высота'; -$lang['img_manager'] = 'Просмотр в «управлении медиафайлами»'; +$lang['btn_mediaManager'] = 'Просмотр в «управлении медиафайлами»'; $lang['subscr_subscribe_success'] = 'Добавлен %s в подписку на %s'; $lang['subscr_subscribe_error'] = 'Невозможно добавить %s в подписку на %s'; $lang['subscr_subscribe_noaddress'] = 'Нет адреса электронной почты, сопоставленного с вашей учётной записью. Вы не можете подписаться на рассылку'; diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php index aa823b074..3ba220a2d 100644 --- a/inc/lang/sk/lang.php +++ b/inc/lang/sk/lang.php @@ -238,7 +238,7 @@ $lang['admin_register'] = 'Pridaj nového užívateľa'; $lang['metaedit'] = 'Upraviť metainformácie'; $lang['metasaveerr'] = 'Zápis metainformácií zlyhal'; $lang['metasaveok'] = 'Metainformácie uložené'; -$lang['img_backto'] = 'Späť na'; +$lang['btn_img_backto'] = 'Späť na %s'; $lang['img_title'] = 'Titul'; $lang['img_caption'] = 'Popis'; $lang['img_date'] = 'Dátum'; @@ -251,7 +251,7 @@ $lang['img_camera'] = 'Fotoaparát'; $lang['img_keywords'] = 'Kľúčové slová'; $lang['img_width'] = 'Šírka'; $lang['img_height'] = 'Výška'; -$lang['img_manager'] = 'Prezrieť v správcovi médií'; +$lang['btn_mediaManager'] = 'Prezrieť v správcovi médií'; $lang['subscr_subscribe_success'] = 'Používateľ %s bol pridaný do zoznamu hlásení o zmenách %s'; $lang['subscr_subscribe_error'] = 'Chyba pri pridaní používateľa %s do zoznamu hlásení o zmenách %s'; $lang['subscr_subscribe_noaddress'] = 'Vaše prihlasovacie meno nemá priradenú žiadnu email adresu, nemôžete byť pridaný do zoznamu hlásení o zmenách'; diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php index c9a47927d..6de260092 100644 --- a/inc/lang/sl/lang.php +++ b/inc/lang/sl/lang.php @@ -235,7 +235,7 @@ $lang['admin_register'] = 'Dodaj novega uporabnika'; $lang['metaedit'] = 'Uredi metapodatke'; $lang['metasaveerr'] = 'Zapisovanje metapodatkov je spodletelo'; $lang['metasaveok'] = 'Metapodatki so shranjeni'; -$lang['img_backto'] = 'Nazaj na'; +$lang['btn_img_backto'] = 'Nazaj na %s'; $lang['img_title'] = 'Naslov'; $lang['img_caption'] = 'Opis'; $lang['img_date'] = 'Datum'; @@ -248,7 +248,7 @@ $lang['img_camera'] = 'Fotoaparat'; $lang['img_keywords'] = 'Ključne besede'; $lang['img_width'] = 'Širina'; $lang['img_height'] = 'Višina'; -$lang['img_manager'] = 'Poglej v urejevalniku predstavnih vsebin'; +$lang['btn_mediaManager'] = 'Poglej v urejevalniku predstavnih vsebin'; $lang['subscr_subscribe_success'] = 'Uporabniški račun %s je dodan na seznam naročnin na %s'; $lang['subscr_subscribe_error'] = 'Napaka med dodajanjem %s na seznam naročnin na %s'; $lang['subscr_subscribe_noaddress'] = 'S trenutnimi prijavnimi podatki ni povezanega elektronskega naslova, zato uporabniškega računa ni mogoče dodati na seznam naročnikov.'; diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php index 2ed62ed4e..c31cdd360 100644 --- a/inc/lang/sq/lang.php +++ b/inc/lang/sq/lang.php @@ -179,7 +179,7 @@ $lang['admin_register'] = 'Shto Përdorues të Ri'; $lang['metaedit'] = 'Redakto Metadata'; $lang['metasaveerr'] = 'Shkrimi i metadata-ve dështoi'; $lang['metasaveok'] = 'Metadata u ruajt'; -$lang['img_backto'] = 'Mbrapa te'; +$lang['btn_img_backto'] = 'Mbrapa te %s'; $lang['img_title'] = 'Titulli '; $lang['img_caption'] = 'Titra'; $lang['img_date'] = 'Data'; diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php index 7c434cbc9..4b44704ad 100644 --- a/inc/lang/sr/lang.php +++ b/inc/lang/sr/lang.php @@ -201,7 +201,7 @@ $lang['admin_register'] = 'Додај новог корисника'; $lang['metaedit'] = 'Измени мета-податке'; $lang['metasaveerr'] = 'Записивање мета-података није било успешно'; $lang['metasaveok'] = 'Мета-подаци су сачувани'; -$lang['img_backto'] = 'Натраг на'; +$lang['btn_img_backto'] = 'Натраг на %s'; $lang['img_title'] = 'Наслов'; $lang['img_caption'] = 'Назив'; $lang['img_date'] = 'Датум'; diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php index 8c8858f61..c057d8705 100644 --- a/inc/lang/sv/lang.php +++ b/inc/lang/sv/lang.php @@ -249,7 +249,7 @@ $lang['admin_register'] = 'Lägg till ny användare'; $lang['metaedit'] = 'Redigera metadata'; $lang['metasaveerr'] = 'Skrivning av metadata misslyckades'; $lang['metasaveok'] = 'Metadata sparad'; -$lang['img_backto'] = 'Tillbaka till'; +$lang['btn_img_backto'] = 'Tillbaka till %s'; $lang['img_title'] = 'Rubrik'; $lang['img_caption'] = 'Bildtext'; $lang['img_date'] = 'Datum'; @@ -262,7 +262,7 @@ $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Nyckelord'; $lang['img_width'] = 'Bredd'; $lang['img_height'] = 'Höjd'; -$lang['img_manager'] = 'Se mediahanteraren'; +$lang['btn_mediaManager'] = 'Se mediahanteraren'; $lang['subscr_subscribe_success'] = 'La till %s till prenumerationslista %s'; $lang['subscr_subscribe_noaddress'] = 'Det finns ingen adress associerad med din inloggning, du kan inte bli tillagd i prenumerationslistan'; $lang['subscr_unsubscribe_success'] = '%s borttagen från prenumerationslistan för %s'; diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php index 5d364166b..8aebfe1a5 100644 --- a/inc/lang/th/lang.php +++ b/inc/lang/th/lang.php @@ -181,7 +181,7 @@ $lang['admin_register'] = 'สร้างบัญชีผู้ใช $lang['metaedit'] = 'แก้ไขข้อมูลเมต้า'; $lang['metasaveerr'] = 'มีข้อผิดพลาดในการเขียนข้อมูลเมต้า'; $lang['metasaveok'] = 'บันทึกเมต้าดาต้าแล้ว'; -$lang['img_backto'] = 'กลับไปยัง'; +$lang['btn_img_backto'] = 'กลับไปยัง %s'; $lang['img_title'] = 'ชื่อภาพ'; $lang['img_caption'] = 'คำบรรยายภาพ'; $lang['img_date'] = 'วันที่'; diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php index 210a82530..2af17fe27 100644 --- a/inc/lang/tr/lang.php +++ b/inc/lang/tr/lang.php @@ -233,7 +233,7 @@ $lang['admin_register'] = 'Yeni kullanıcı ekle...'; $lang['metaedit'] = 'Metaverileri Değiştir'; $lang['metasaveerr'] = 'Metaveri yazma başarısız '; $lang['metasaveok'] = 'Metaveri kaydedildi'; -$lang['img_backto'] = 'Şuna dön:'; +$lang['btn_img_backto'] = 'Şuna dön: %s'; $lang['img_title'] = 'Başlık'; $lang['img_caption'] = 'Serlevha'; $lang['img_date'] = 'Tarih'; @@ -246,7 +246,7 @@ $lang['img_camera'] = 'Fotoğraf Makinası'; $lang['img_keywords'] = 'Anahtar Sözcükler'; $lang['img_width'] = 'Genişlik'; $lang['img_height'] = 'Yükseklik'; -$lang['img_manager'] = 'Ortam oynatıcısında göster'; +$lang['btn_mediaManager'] = 'Ortam oynatıcısında göster'; $lang['subscr_m_new_header'] = 'Üyelik ekle'; $lang['subscr_m_current_header'] = 'Üyeliğini onayla'; $lang['subscr_m_unsubscribe'] = 'Üyelik iptali'; diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php index 4e91e82a2..09b2b6d1d 100644 --- a/inc/lang/uk/lang.php +++ b/inc/lang/uk/lang.php @@ -223,7 +223,7 @@ $lang['admin_register'] = 'Додати нового користувач $lang['metaedit'] = 'Редагувати метадані'; $lang['metasaveerr'] = 'Помилка запису метаданих'; $lang['metasaveok'] = 'Метадані збережено'; -$lang['img_backto'] = 'Повернутися до'; +$lang['btn_img_backto'] = 'Повернутися до %s'; $lang['img_title'] = 'Назва'; $lang['img_caption'] = 'Підпис'; $lang['img_date'] = 'Дата'; diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php index d8e40f875..ccc179eec 100644 --- a/inc/lang/vi/lang.php +++ b/inc/lang/vi/lang.php @@ -192,7 +192,7 @@ $lang['qb_sig'] = 'Đặt chữ ký'; $lang['metaedit'] = 'Sửa Metadata'; $lang['metasaveerr'] = 'Thất bại khi viết metadata'; $lang['metasaveok'] = 'Metadata đã được lưu'; -$lang['img_backto'] = 'Quay lại'; +$lang['btn_img_backto'] = 'Quay lại %s'; $lang['img_title'] = 'Tiêu đề'; $lang['img_caption'] = 'Ghi chú'; $lang['img_date'] = 'Ngày'; @@ -205,7 +205,7 @@ $lang['img_camera'] = 'Camera'; $lang['img_keywords'] = 'Từ khóa'; $lang['img_width'] = 'Rộng'; $lang['img_height'] = 'Cao'; -$lang['img_manager'] = 'Xem trong trình quản lý tệp media'; +$lang['btn_mediaManager'] = 'Xem trong trình quản lý tệp media'; $lang['i_chooselang'] = 'Chọn ngôn ngữ'; $lang['i_retry'] = 'Thử lại'; $lang['years'] = 'cách đây %d năm'; diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php index 456377810..84afec97a 100644 --- a/inc/lang/zh-tw/lang.php +++ b/inc/lang/zh-tw/lang.php @@ -243,7 +243,7 @@ $lang['admin_register'] = '新增使用者'; $lang['metaedit'] = '編輯後設資料'; $lang['metasaveerr'] = '後設資料無法寫入'; $lang['metasaveok'] = '後設資料已儲存'; -$lang['img_backto'] = '回上一頁'; +$lang['btn_img_backto'] = '回上一頁 %s'; $lang['img_title'] = '標題'; $lang['img_caption'] = '照片說明'; $lang['img_date'] = '日期'; @@ -256,7 +256,7 @@ $lang['img_camera'] = '相機'; $lang['img_keywords'] = '關鍵字'; $lang['img_width'] = '寬度'; $lang['img_height'] = '高度'; -$lang['img_manager'] = '在多媒體管理器中檢視'; +$lang['btn_mediaManager'] = '在多媒體管理器中檢視'; $lang['subscr_subscribe_success'] = '已將 %s 加入至 %s 的訂閱列表'; $lang['subscr_subscribe_error'] = '將 %s 加入至 %s 的訂閱列表時發生錯誤'; $lang['subscr_subscribe_noaddress'] = '沒有與您登入相關的地址，無法將您加入訂閱列表'; diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php index 004997d6e..672ff0c0b 100644 --- a/inc/lang/zh/lang.php +++ b/inc/lang/zh/lang.php @@ -251,7 +251,7 @@ $lang['admin_register'] = '添加新用户'; $lang['metaedit'] = '编辑元数据'; $lang['metasaveerr'] = '写入元数据失败'; $lang['metasaveok'] = '元数据已保存'; -$lang['img_backto'] = '返回到'; +$lang['btn_img_backto'] = '返回到 %s'; $lang['img_title'] = '标题'; $lang['img_caption'] = '说明'; $lang['img_date'] = '日期'; @@ -264,7 +264,7 @@ $lang['img_camera'] = '相机'; $lang['img_keywords'] = '关键字'; $lang['img_width'] = '宽度'; $lang['img_height'] = '高度'; -$lang['img_manager'] = '在媒体管理器中查看'; +$lang['btn_mediaManager'] = '在媒体管理器中查看'; $lang['subscr_subscribe_success'] = '添加 %s 到 %s 的订阅列表'; $lang['subscr_subscribe_error'] = '添加 %s 到 %s 的订阅列表中出现错误'; $lang['subscr_subscribe_noaddress'] = '没有与您登录信息相关联的地址，您无法被添加到订阅列表'; -- cgit v1.2.3 From 17dd401e94c682034b7f3d9164ac3523ab01d825 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 5 Mar 2014 21:48:59 +0000 Subject: fix return by reference not a var --- inc/JpegMeta.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index cb1772736..a35ec3ed0 100644 --- a/inc/JpegMeta.php +++ b/inc/JpegMeta.php @@ -2929,7 +2929,8 @@ class JpegMeta { $length = strlen($data) - $pos; } - return substr($data, $pos, $length); + $rv = substr($data, $pos, $length); + return $rv; } /*************************************************************/ -- cgit v1.2.3 From 0e80bb5e347ff00c6f81627d8e39dafaaa923bc5 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 5 Mar 2014 21:58:46 +0000 Subject: use empty() where array values might not be set --- inc/actions.php | 2 +- inc/common.php | 2 +- inc/html.php | 10 +++++----- inc/init.php | 2 +- inc/media.php | 8 ++++---- inc/search.php | 16 ++++++++-------- 6 files changed, 20 insertions(+), 20 deletions(-) (limited to 'inc') diff --git a/inc/actions.php b/inc/actions.php index 4dbad1a32..240dce59a 100644 --- a/inc/actions.php +++ b/inc/actions.php @@ -733,7 +733,7 @@ function act_subscription($act){ } // any action given? if not just return and show the subscription page - if(!$params['action'] || !checkSecurityToken()) return $act; + if(empty($params['action']) || !checkSecurityToken()) return $act; // Handle POST data, may throw exception. trigger_event('ACTION_HANDLE_SUBSCRIBE', $params, 'subscription_handle_post'); diff --git a/inc/common.php b/inc/common.php index 9a53ee526..36bd32c4f 100644 --- a/inc/common.php +++ b/inc/common.php @@ -191,7 +191,7 @@ function pageinfo() { if($REV) { $revinfo = getRevisionInfo($ID, $REV, 1024); } else { - if(is_array($info['meta']['last_change'])) { + if(!empty($info['meta']['last_change']) && is_array($info['meta']['last_change'])) { $revinfo = $info['meta']['last_change']; } else { $revinfo = getRevisionInfo($ID, $info['lastmod'], 1024); diff --git a/inc/html.php b/inc/html.php index fcec29670..41f26e5cd 100644 --- a/inc/html.php +++ b/inc/html.php @@ -691,7 +691,7 @@ function html_recent($first=0, $show_changes='both'){ $form->addElement(form_makeOpenTag('div', array('class' => 'li'))); - if ($recent['media']) { + if (!empty($recent['media'])) { $form->addElement(media_printicon($recent['id'])); } else { $icon = DOKU_BASE.'lib/images/fileicons/file.png'; @@ -705,7 +705,7 @@ function html_recent($first=0, $show_changes='both'){ $diff = false; $href = ''; - if ($recent['media']) { + if (!empty($recent['media'])) { $diff = (count(getRevisions($recent['id'], 0, 1, 8192, true)) && @file_exists(mediaFN($recent['id']))); if ($diff) { $href = media_managerURL(array('tab_details' => 'history', @@ -715,7 +715,7 @@ function html_recent($first=0, $show_changes='both'){ $href = wl($recent['id'],"do=diff", false, '&'); } - if ($recent['media'] && !$diff) { + if (!empty($recent['media']) && !$diff) { $form->addElement(''); } else { $form->addElement(form_makeOpenTag('a', array('class' => 'diff_link', 'href' => $href))); @@ -729,7 +729,7 @@ function html_recent($first=0, $show_changes='both'){ $form->addElement(form_makeCloseTag('a')); } - if ($recent['media']) { + if (!empty($recent['media'])) { $href = media_managerURL(array('tab_details' => 'history', 'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&'); } else { @@ -745,7 +745,7 @@ function html_recent($first=0, $show_changes='both'){ ))); $form->addElement(form_makeCloseTag('a')); - if ($recent['media']) { + if (!empty($recent['media'])) { $href = media_managerURL(array('tab_details' => 'view', 'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&'); $class = (file_exists(mediaFN($recent['id']))) ? 'wikilink1' : $class = 'wikilink2'; $form->addElement(form_makeOpenTag('a', array('class' => $class, 'href' => $href))); diff --git a/inc/init.php b/inc/init.php index 9b8465911..6fb27bd2a 100644 --- a/inc/init.php +++ b/inc/init.php @@ -176,7 +176,7 @@ if(function_exists('set_magic_quotes_runtime')) @set_magic_quotes_runtime(0); $_REQUEST = array_merge($_GET,$_POST); // we don't want a purge URL to be digged -if(isset($_REQUEST['purge']) && $_SERVER['HTTP_REFERER']) unset($_REQUEST['purge']); +if(isset($_REQUEST['purge']) && !empty($_SERVER['HTTP_REFERER'])) unset($_REQUEST['purge']); // disable gzip if not available if($conf['compression'] == 'bz2' && !function_exists('bzopen')){ diff --git a/inc/media.php b/inc/media.php index 4fff95d94..dc76521c6 100644 --- a/inc/media.php +++ b/inc/media.php @@ -1018,7 +1018,7 @@ function media_file_tags($meta) { foreach($fields as $key => $tag){ $t = array(); if (!empty($tag[0])) $t = array($tag[0]); - if(is_array($tag[3])) $t = array_merge($t,$tag[3]); + if(isset($tag[3]) && is_array($tag[3])) $t = array_merge($t,$tag[3]); $value = media_getTag($t, $meta); $tags[] = array('tag' => $tag, 'value' => $value); } @@ -1779,7 +1779,7 @@ function media_nstree_item($item){ global $INPUT; $pos = strrpos($item['id'], ':'); $label = substr($item['id'], $pos > 0 ? $pos + 1 : 0); - if(!$item['label']) $item['label'] = $label; + if(empty($item['label'])) $item['label'] = $label; $ret = ''; if (!($INPUT->str('do') == 'media')) @@ -1841,7 +1841,7 @@ function media_resize_image($file, $ext, $w, $h=0){ if( $mtime > filemtime($file) || media_resize_imageIM($ext,$file,$info[0],$info[1],$local,$w,$h) || media_resize_imageGD($ext,$file,$info[0],$info[1],$local,$w,$h) ){ - if($conf['fperm']) @chmod($local, $conf['fperm']); + if(!empty($conf['fperm'])) @chmod($local, $conf['fperm']); return $local; } //still here? resizing failed @@ -1902,7 +1902,7 @@ function media_crop_image($file, $ext, $w, $h=0){ if( $mtime > @filemtime($file) || media_crop_imageIM($ext,$file,$info[0],$info[1],$local,$cw,$ch,$cx,$cy) || media_resize_imageGD($ext,$file,$cw,$ch,$local,$cw,$ch,$cx,$cy) ){ - if($conf['fperm']) @chmod($local, $conf['fperm']); + if(!empty($conf['fperm'])) @chmod($local, $conf['fperm']); return media_resize_image($local,$ext, $w, $h); } diff --git a/inc/search.php b/inc/search.php index c2d31b959..840f70375 100644 --- a/inc/search.php +++ b/inc/search.php @@ -141,7 +141,7 @@ function search_media(&$data,$base,$file,$type,$lvl,$opts){ //we do nothing with directories if($type == 'd') { - if(!$opts['depth']) return true; // recurse forever + if(empty($opts['depth'])) return true; // recurse forever $depth = substr_count($file,'/'); if($depth >= $opts['depth']) return false; // depth reached return true; @@ -157,12 +157,12 @@ function search_media(&$data,$base,$file,$type,$lvl,$opts){ //check ACL for namespace (we have no ACL for mediafiles) $info['perm'] = auth_quickaclcheck(getNS($info['id']).':*'); - if(!$opts['skipacl'] && $info['perm'] < AUTH_READ){ + if(empty($opts['skipacl']) && $info['perm'] < AUTH_READ){ return false; } //check pattern filter - if($opts['pattern'] && !@preg_match($opts['pattern'], $info['id'])){ + if(!empty($opts['pattern']) && !@preg_match($opts['pattern'], $info['id'])){ return false; } @@ -176,7 +176,7 @@ function search_media(&$data,$base,$file,$type,$lvl,$opts){ }else{ $info['isimg'] = false; } - if($opts['hash']){ + if(!empty($opts['hash'])){ $info['hash'] = md5(io_readFile(mediaFN($info['id']),false)); } @@ -361,7 +361,7 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){ if($type == 'd') { // decide if to recursion into this directory is wanted - if(!$opts['depth']){ + if(empty($opts['depth'])){ $return = true; // recurse forever }else{ $depth = substr_count($file,'/'); @@ -407,7 +407,7 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){ $item['level'] = $lvl; $item['open'] = $return; - if($opts['meta']){ + if(!empty($opts['meta'])){ $item['file'] = utf8_basename($file); $item['size'] = filesize($base.'/'.$file); $item['mtime'] = filemtime($base.'/'.$file); @@ -417,8 +417,8 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){ } if($type == 'f'){ - if($opts['hash']) $item['hash'] = md5(io_readFile($base.'/'.$file,false)); - if($opts['firsthead']) $item['title'] = p_get_first_heading($item['id'],METADATA_DONT_RENDER); + if(!empty($opts['hash'])) $item['hash'] = md5(io_readFile($base.'/'.$file,false)); + if(!empty($opts['firsthead'])) $item['title'] = p_get_first_heading($item['id'],METADATA_DONT_RENDER); } // finally add the item -- cgit v1.2.3 From 6d2af55dde922ac10a288b4195b1bf338e7bc5a9 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 5 Mar 2014 22:01:20 +0000 Subject: suppress errors where list() may not fill all vars --- inc/common.php | 6 +++--- inc/parser/metadata.php | 2 +- inc/parser/renderer.php | 6 +++--- inc/parser/xhtml.php | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index 36bd32c4f..6aad42bd1 100644 --- a/inc/common.php +++ b/inc/common.php @@ -773,7 +773,7 @@ function checklock($id) { } //my own lock - list($ip, $session) = explode("\n", io_readFile($lock)); + @list($ip, $session) = explode("\n", io_readFile($lock)); if($ip == $_SERVER['REMOTE_USER'] || $ip == clientIP() || $session == session_id()) { return false; } @@ -811,7 +811,7 @@ function lock($id) { function unlock($id) { $lock = wikiLockFN($id); if(@file_exists($lock)) { - list($ip, $session) = explode("\n", io_readFile($lock)); + @list($ip, $session) = explode("\n", io_readFile($lock)); if($ip == $_SERVER['REMOTE_USER'] || $ip == clientIP() || $session == session_id()) { @unlink($lock); return true; @@ -1536,7 +1536,7 @@ function send_redirect($url) { // work around IE bug // http://www.ianhoar.com/2008/11/16/internet-explorer-6-and-redirected-anchor-links/ - list($url, $hash) = explode('#', $url); + @list($url, $hash) = explode('#', $url); if($hash) { if(strpos($url, '?')) { $url = $url.'&#'.$hash; diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php index 73bae190f..82a268fd6 100644 --- a/inc/parser/metadata.php +++ b/inc/parser/metadata.php @@ -299,7 +299,7 @@ class Doku_Renderer_metadata extends Doku_Renderer { // first resolve and clean up the $id resolve_pageid(getNS($ID), $id, $exists); - list($page, $hash) = explode('#', $id, 2); + @list($page, $hash) = explode('#', $id, 2); // set metadata $this->meta['relation']['references'][$page] = $exists; diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php index 1f9ad00a2..e748c36d8 100644 --- a/inc/parser/renderer.php +++ b/inc/parser/renderer.php @@ -274,8 +274,8 @@ class Doku_Renderer extends DokuWiki_Plugin { function _simpleTitle($name){ global $conf; - //if there is a hash we use the ancor name only - list($name,$hash) = explode('#',$name,2); + //if there is a hash we use the anchor name only + @list($name,$hash) = explode('#',$name,2); if($hash) return $hash; if($conf['useslash']){ @@ -301,7 +301,7 @@ class Doku_Renderer extends DokuWiki_Plugin { } //split into hash and url part - list($reference,$hash) = explode('#',$reference,2); + @list($reference,$hash) = explode('#',$reference,2); //replace placeholder if(preg_match('#\{(URL|NAME|SCHEME|HOST|PORT|PATH|QUERY)\}#',$url)){ diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 184e62fe3..4966f103a 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -606,7 +606,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { } //keep hash anchor - list($id,$hash) = explode('#',$id,2); + @list($id,$hash) = explode('#',$id,2); if(!empty($hash)) $hash = $this->_headerToLink($hash); //prepare for formating -- cgit v1.2.3 From f87b5dbbbad408da775ac4c60ceb9f9666280527 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 5 Mar 2014 22:04:14 +0000 Subject: use isset() + ?: or error suppression where value may not be set --- inc/auth.php | 2 +- inc/init.php | 8 ++++---- inc/search.php | 2 +- inc/template.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'inc') diff --git a/inc/auth.php b/inc/auth.php index 6c4636b2f..e44e837a7 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -325,7 +325,7 @@ function auth_browseruid() { $uid = ''; $uid .= $_SERVER['HTTP_USER_AGENT']; $uid .= $_SERVER['HTTP_ACCEPT_ENCODING']; - $uid .= $_SERVER['HTTP_ACCEPT_CHARSET']; + $uid .= @$_SERVER['HTTP_ACCEPT_CHARSET']; $uid .= substr($ip, 0, strpos($ip, '.')); $uid = strtolower($uid); return md5($uid); diff --git a/inc/init.php b/inc/init.php index 6fb27bd2a..bcd96e5e4 100644 --- a/inc/init.php +++ b/inc/init.php @@ -441,12 +441,12 @@ function getBaseURL($abs=null){ //split hostheader into host and port if(isset($_SERVER['HTTP_HOST'])){ $parsed_host = parse_url('http://'.$_SERVER['HTTP_HOST']); - $host = $parsed_host['host']; - $port = $parsed_host['port']; + $host = isset($parsed_host['host']) ? $parsed_host['host'] : null; + $port = isset($parsed_host['port']) ? $parsed_host['port'] : null; }elseif(isset($_SERVER['SERVER_NAME'])){ $parsed_host = parse_url('http://'.$_SERVER['SERVER_NAME']); - $host = $parsed_host['host']; - $port = $parsed_host['port']; + $host = isset($parsed_host['host']) ? $parsed_host['host'] : null; + $port = isset($parsed_host['port']) ? $parsed_host['port'] : null; }else{ $host = php_uname('n'); $port = ''; diff --git a/inc/search.php b/inc/search.php index 840f70375..ee4eef534 100644 --- a/inc/search.php +++ b/inc/search.php @@ -351,7 +351,7 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){ $return = true; // get ID and check if it is a valid one - $item['id'] = pathID($file,($type == 'd' || $opts['keeptxt'])); + $item['id'] = pathID($file,($type == 'd' || @$opts['keeptxt'])); if($item['id'] != cleanID($item['id'])){ if($opts['showmsg']) msg(hsc($item['id']).' is not a valid file name for DokuWiki - skipped',-1); diff --git a/inc/template.php b/inc/template.php index 0a6a9e4aa..d9aa8863f 100644 --- a/inc/template.php +++ b/inc/template.php @@ -210,7 +210,7 @@ function tpl_toc($return = false) { } else { $tocok = true; } - $toc = $meta['description']['tableofcontents']; + $toc = isset($meta['description']['tableofcontents']) ? $meta['description']['tableofcontents'] : null; if(!$tocok || !is_array($toc) || !$conf['tocminheads'] || count($toc) < $conf['tocminheads']) { $toc = array(); } -- cgit v1.2.3 From 9b4337c6e7bb0fdfa0bffa4294b56b0624b93d79 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 5 Mar 2014 22:05:14 +0000 Subject: refactor to take into account missing value --- inc/search.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/search.php b/inc/search.php index ee4eef534..89f3e253d 100644 --- a/inc/search.php +++ b/inc/search.php @@ -371,8 +371,12 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){ $return = true; } } - if($return && !preg_match('/'.$opts['recmatch'].'/',$file)){ - $return = false; // doesn't match + + if ($return) { + $match = empty($opts['recmatch']) || preg_match('/'.$opts['recmatch'].'/',$file); + if (!$match) { + return false; // doesn't match + } } } -- cgit v1.2.3 From d30d491370b894b5c76e28362a0a3313f74a439e Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 5 Mar 2014 22:06:18 +0000 Subject: set empty 'do' key to avoid errors in other tpl functions --- inc/template.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'inc') diff --git a/inc/template.php b/inc/template.php index d9aa8863f..c0dfbb845 100644 --- a/inc/template.php +++ b/inc/template.php @@ -637,7 +637,7 @@ function tpl_get_action($type) { $accesskey = 'v'; } } else { - $params = array(); + $params = array('do' => ''); $type = 'show'; $accesskey = 'v'; } @@ -658,7 +658,7 @@ function tpl_get_action($type) { break; case 'top': $accesskey = 't'; - $params = array(); + $params = array('do' => ''); $id = '#dokuwiki__top'; break; case 'back': @@ -667,7 +667,7 @@ function tpl_get_action($type) { return false; } $id = $parent; - $params = array(); + $params = array('do' => ''); $accesskey = 'b'; break; case 'login': -- cgit v1.2.3 From 39134585c3f7a3c02113fb844ffabe0c1398c937 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 5 Mar 2014 22:15:25 +0000 Subject: add some braces (just style, not E_ALL) --- inc/indexer.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'inc') diff --git a/inc/indexer.php b/inc/indexer.php index 07f29b542..7c0b8bc18 100644 --- a/inc/indexer.php +++ b/inc/indexer.php @@ -304,15 +304,17 @@ class Doku_Indexer { $addwords = true; } // test if value is already in the index - if (isset($val_idx[$id]) && $val_idx[$id] <= 0) + if (isset($val_idx[$id]) && $val_idx[$id] <= 0){ $val_idx[$id] = 0; - else // else add it + } else { // else add it $val_idx[$id] = 1; + } } } - if ($addwords) + if ($addwords) { $this->saveIndex($metaname.'_w', '', $metawords); + } $vals_changed = false; foreach ($val_idx as $id => $action) { if ($action == -1) { @@ -1214,14 +1216,16 @@ class Doku_Indexer { */ protected function updateTuple($line, $id, $count) { $newLine = $line; - if ($newLine !== '') + if ($newLine !== ''){ $newLine = preg_replace('/(^|:)'.preg_quote($id,'/').'\*\d*/', '', $newLine); + } $newLine = trim($newLine, ':'); if ($count) { - if (strlen($newLine) > 0) + if (strlen($newLine) > 0) { return "$id*$count:".$newLine; - else + } else { return "$id*$count".$newLine; + } } return $newLine; } -- cgit v1.2.3 From a854a9a897ade35800abd440c29787ec8429c678 Mon Sep 17 00:00:00 2001 From: Joerg Date: Thu, 6 Mar 2014 10:46:06 +0100 Subject: translation update --- inc/lang/de/lang.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'inc') diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index 9df1035f7..1840f2a6c 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -23,6 +23,7 @@ * @author Pierre Corell * @author Mateng Schimmerlos * @author Benedikt Fey + * @author Joerg */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -345,3 +346,4 @@ $lang['media_restore'] = 'Diese Version wiederherstellen'; $lang['currentns'] = 'Aktueller Namensraum'; $lang['searchresult'] = 'Suchergebnisse'; $lang['plainhtml'] = 'HTML Klartext'; +$lang['wikimarkup'] = 'Wiki Markup'; -- cgit v1.2.3 From 99327e8e4c6bc07af2ebfc62bffee62f35c34025 Mon Sep 17 00:00:00 2001 From: Juan De La Cruz Date: Thu, 6 Mar 2014 15:10:56 +0100 Subject: translation update --- inc/lang/es/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc') diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php index 216093f6c..b9f81dd82 100644 --- a/inc/lang/es/lang.php +++ b/inc/lang/es/lang.php @@ -31,6 +31,7 @@ * @author r0sk * @author monica * @author Antonio Bueno + * @author Juan De La Cruz */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; -- cgit v1.2.3 From 1418498c406caca058076e3d148e31daee800551 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Thu, 6 Mar 2014 14:54:19 +0000 Subject: extend to cover (PR#589) --- inc/Input.class.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'inc') diff --git a/inc/Input.class.php b/inc/Input.class.php index 7434d2b2c..de8bf5b97 100644 --- a/inc/Input.class.php +++ b/inc/Input.class.php @@ -15,6 +15,8 @@ class Input { public $post; /** @var GetInput Access $_GET parameters */ public $get; + /** @var ServerInput Access $_SERVER parameters */ + public $server; protected $access; @@ -25,6 +27,7 @@ class Input { $this->access = &$_REQUEST; $this->post = new PostInput(); $this->get = new GetInput(); + $this->server = new ServerInput(); } /** @@ -260,3 +263,18 @@ class GetInput extends Input { $_REQUEST[$name] = $value; } } + +/** + * Internal class used for $_SERVER access in Input class + */ +class ServerInput extends Input { + protected $access; + + /** + * Initialize the $access array, remove subclass members + */ + function __construct() { + $this->access = &$_SERVER; + } + +} -- cgit v1.2.3 From e26a58378c0c7f5d468dde469a7f782b45354426 Mon Sep 17 00:00:00 2001 From: Janar Leas Date: Thu, 6 Mar 2014 17:55:34 +0100 Subject: translation update --- inc/lang/et/adminplugins.txt | 1 + inc/lang/et/lang.php | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 inc/lang/et/adminplugins.txt (limited to 'inc') diff --git a/inc/lang/et/adminplugins.txt b/inc/lang/et/adminplugins.txt new file mode 100644 index 000000000..ee3ffb0a7 --- /dev/null +++ b/inc/lang/et/adminplugins.txt @@ -0,0 +1 @@ +===== Täiendavad laiendused ===== \ No newline at end of file diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php index cc736db4d..3dbf9f53d 100644 --- a/inc/lang/et/lang.php +++ b/inc/lang/et/lang.php @@ -1,13 +1,14 @@ * @author Aari Juhanson * @author Kaiko Kaur * @author kristian.kankainen@kuu.la * @author Rivo Zängov + * @author Janar Leas */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -43,11 +44,15 @@ $lang['btn_backtomedia'] = 'Tagasi faili valikusse'; $lang['btn_subscribe'] = 'Jälgi seda lehte (teated meilile)'; $lang['btn_profile'] = 'Minu info'; $lang['btn_reset'] = 'Taasta'; +$lang['btn_resendpwd'] = 'Sea uus salasõna'; $lang['btn_draft'] = 'Toimeta mustandit'; $lang['btn_recover'] = 'Taata mustand'; $lang['btn_draftdel'] = 'Kustuta mustand'; $lang['btn_revert'] = 'Taasta'; $lang['btn_register'] = 'Registreeri uus kasutaja'; +$lang['btn_apply'] = 'Kinnita'; +$lang['btn_media'] = 'Meedia haldur'; +$lang['btn_deleteuser'] = 'Eemalda minu konto'; $lang['loggedinas'] = 'Logis sisse kui'; $lang['user'] = 'Kasutaja'; $lang['pass'] = 'Parool'; @@ -59,8 +64,10 @@ $lang['fullname'] = 'Täielik nimi'; $lang['email'] = 'E-post'; $lang['profile'] = 'Kasutaja info'; $lang['badlogin'] = 'Oops, Sinu kasutajanimi või parool oli vale.'; +$lang['badpassconfirm'] = 'Väär salasõna'; $lang['minoredit'] = 'Ebaolulised muudatused'; $lang['draftdate'] = 'Mustand automaatselt salvestatud'; +$lang['nosecedit'] = 'Leht on vahepeal muutunud, jaotiste teave osutus aegunuks sestap laeti tervelehekülg.'; $lang['regmissing'] = 'Kõik väljad tuleb ära täita.'; $lang['reguexists'] = 'Tegelikult on sellise nimega kasutaja juba olemas.'; $lang['regsuccess'] = 'Kasutaja sai tehtud. Parool saadeti Sulle e-posti aadressil.'; @@ -76,21 +83,30 @@ $lang['profna'] = 'Viki ei toeta profiili muudatusi'; $lang['profnochange'] = 'Muutused puuduvad.'; $lang['profnoempty'] = 'Tühi nimi ega meiliaadress pole lubatud.'; $lang['profchanged'] = 'Kasutaja info edukalt muudetud'; +$lang['profnodelete'] = 'See wiki ei toeta kasutajate kustutamist'; +$lang['profdeleteuser'] = 'Kustuta konto'; +$lang['profdeleted'] = 'Sinu kasutajakonto on sellest wikist kustutatud'; +$lang['profconfdelete'] = 'Soovin sellest wikist oma konnto eemaldada.
See tegevus on taastamatu.'; +$lang['profconfdeletemissing'] = 'Kinnituse valikkast märkimata.'; $lang['pwdforget'] = 'Unustasid parooli? Tee uus'; $lang['resendna'] = 'See wiki ei toeta parooli taassaatmist.'; +$lang['resendpwd'] = 'Sea uus salasõna'; $lang['resendpwdmissing'] = 'Khmm... Sa pead täitma kõik väljad.'; $lang['resendpwdnouser'] = 'Aga sellist kasutajat ei ole.'; $lang['resendpwdbadauth'] = 'See autentimiskood ei ole õige. Kontrolli, et kopeerisid terve lingi.'; $lang['resendpwdconfirm'] = 'Kinnituslink saadeti meilile.'; $lang['resendpwdsuccess'] = 'Uus parool saadeti Sinu meilile.'; +$lang['license'] = 'Kus pole öeldud teisiti, kehtib selle wiki sisule järgmine leping:'; +$lang['licenseok'] = 'Teadmiseks: Toimetades seda lehte, nõustud avaldama oma sisu järgmise lepingu alusel:'; $lang['searchmedia'] = 'Otsi failinime:'; $lang['searchmedia_in'] = 'Otsi %s'; $lang['txt_upload'] = 'Vali fail, mida üles laadida'; $lang['txt_filename'] = 'Siseta oma Wikinimi (soovituslik)'; $lang['txt_overwrt'] = 'Kirjutan olemasoleva faili üle'; +$lang['maxuploadsize'] = 'Üleslaadimiseks lubatu enim %s faili kohta.'; $lang['lockedby'] = 'Praegu on selle lukustanud'; $lang['lockexpire'] = 'Lukustus aegub'; -$lang['js']['willexpire'] = 'Teie lukustus selle lehe toimetamisele aegub umbes minuti pärast.\nIgasugu probleemide vältimiseks kasuta eelvaate nuppu, et lukustusarvesti taas tööle panna.'; +$lang['js']['willexpire'] = 'Teie lukustus selle lehe toimetamisele aegub umbes minuti pärast.\nIgasugu probleemide vältimiseks kasuta eelvaate nuppu, et lukustusarvesti taas tööle panna.'; $lang['js']['notsavedyet'] = 'Sul on seal salvestamata muudatusi, mis kohe kõige kaduva teed lähevad. Kas Sa ikka tahad edasi liikuda?'; $lang['js']['searchmedia'] = 'Otsi faile'; @@ -122,6 +138,17 @@ Siiski võid kopeerida ja asetada lingi.'; $lang['js']['linkwiz'] = 'Lingi nõustaja'; $lang['js']['linkto'] = 'Lingi:'; $lang['js']['del_confirm'] = 'Kas kustutame selle kirje?'; +$lang['js']['restore_confirm'] = 'Tõesti taastad selle järgu?'; +$lang['js']['media_diff'] = 'Vaatle erisusi:'; +$lang['js']['media_diff_both'] = 'Kõrvuti'; +$lang['js']['media_diff_opacity'] = 'Kuma läbi'; +$lang['js']['media_diff_portions'] = 'Puhasta'; +$lang['js']['media_select'] = 'Vali failid…'; +$lang['js']['media_upload_btn'] = 'Lae üles'; +$lang['js']['media_done_btn'] = 'Valmis'; +$lang['js']['media_drop'] = 'Üleslaadimiseks viska failid siia'; +$lang['js']['media_cancel'] = 'eemalda'; +$lang['js']['media_overwrt'] = 'Asenda olemasolevad failid'; $lang['rssfailed'] = 'Sinu soovitud info ammutamisel tekkis viga: '; $lang['nothingfound'] = 'Oops, aga mitte muhvigi ei leitud.'; $lang['mediaselect'] = 'Hunnik faile'; @@ -131,6 +158,8 @@ $lang['uploadfail'] = 'Üleslaadimine läks nässu. Äkki pole Sa sel $lang['uploadwrong'] = 'Ei saa Sa midagi üles laadida. Oops, aga seda tüüpi faili sul lihtsalt ei lubata üles laadida'; $lang['uploadexist'] = 'Fail on juba olemas. Midagi ei muudetud.'; $lang['uploadbadcontent'] = 'Üles laaditu ei sobinud %s faililaiendiga.'; +$lang['uploadspam'] = 'Üleslaadimine tõrjuti rämpssisu vältija poolt.'; +$lang['uploadxss'] = 'Üleslaadimine tõrjuti kahtlase sisu võimaluse tõttu'; $lang['uploadsize'] = 'Üles laaditud fail on liiga suur (maksimaalne suurus on %s).'; $lang['deletesucc'] = 'Fail nimega "%s" sai kustutatud.'; $lang['deletefail'] = 'Faili nimega "%s" ei kustutatud (kontrolli õigusi).'; @@ -155,6 +184,7 @@ $lang['diff'] = 'Näita erinevusi hetkel kehtiva versiooniga'; $lang['diff2'] = 'Näita valitud versioonide erinevusi'; $lang['difflink'] = 'Lõlita võrdlemise vaatele'; $lang['diff_type'] = 'Vaata erinevusi:'; +$lang['diff_inline'] = 'Jooksvalt'; $lang['diff_side'] = 'Kõrvuti'; $lang['line'] = 'Rida'; $lang['breadcrumb'] = 'Käidud rada'; -- cgit v1.2.3 From 585bf44e2b756eac2e1cfce7035ef237bc02a788 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Thu, 6 Mar 2014 19:55:56 +0000 Subject: amend $_SERVER to $INPUT->server --- inc/Mailer.class.php | 15 +++++--- inc/actions.php | 27 +++++++++----- inc/auth.php | 54 +++++++++++++++++---------- inc/changelog.php | 8 +++- inc/common.php | 102 +++++++++++++++++++++++++++++++++++---------------- inc/infoutils.php | 9 ++++- inc/init.php | 4 ++ inc/mail.php | 9 ++--- inc/pageutils.php | 21 ++++++----- inc/remote.php | 5 ++- inc/subscription.php | 18 ++++++--- inc/template.php | 39 ++++++++++++++------ inc/toolbar.php | 4 +- 13 files changed, 213 insertions(+), 102 deletions(-) (limited to 'inc') diff --git a/inc/Mailer.class.php b/inc/Mailer.class.php index e32178bba..e90b45f99 100644 --- a/inc/Mailer.class.php +++ b/inc/Mailer.class.php @@ -39,6 +39,8 @@ class Mailer { */ public function __construct() { global $conf; + /* @var Input $INPUT */ + global $INPUT; $server = parse_url(DOKU_URL, PHP_URL_HOST); if(strpos($server,'.') === false) $server = $server.'.localhost'; @@ -53,7 +55,7 @@ class Mailer { // add some default headers for mailfiltering FS#2247 $this->setHeader('X-Mailer', 'DokuWiki'); - $this->setHeader('X-DokuWiki-User', $_SERVER['REMOTE_USER']); + $this->setHeader('X-DokuWiki-User', $INPUT->server->str('REMOTE_USER')); $this->setHeader('X-DokuWiki-Title', $conf['title']); $this->setHeader('X-DokuWiki-Server', $server); $this->setHeader('X-Auto-Response-Suppress', 'OOF'); @@ -181,6 +183,9 @@ class Mailer { public function setBody($text, $textrep = null, $htmlrep = null, $html = null, $wrap = true) { global $INFO; global $conf; + /* @var Input $INPUT */ + global $INPUT; + $htmlrep = (array)$htmlrep; $textrep = (array)$textrep; @@ -218,24 +223,24 @@ class Mailer { $cip = gethostsbyaddrs($ip); $trep = array( 'DATE' => dformat(), - 'BROWSER' => $_SERVER['HTTP_USER_AGENT'], + 'BROWSER' => $INPUT->server->str('HTTP_USER_AGENT'), 'IPADDRESS' => $ip, 'HOSTNAME' => $cip, 'TITLE' => $conf['title'], 'DOKUWIKIURL' => DOKU_URL, - 'USER' => $_SERVER['REMOTE_USER'], + 'USER' => $INPUT->server->str('REMOTE_USER'), 'NAME' => $INFO['userinfo']['name'], 'MAIL' => $INFO['userinfo']['mail'], ); $trep = array_merge($trep, (array)$textrep); $hrep = array( 'DATE' => ''.hsc(dformat()).'', - 'BROWSER' => hsc($_SERVER['HTTP_USER_AGENT']), + 'BROWSER' => hsc($INPUT->server->str('HTTP_USER_AGENT')), 'IPADDRESS' => ''.hsc($ip).'', 'HOSTNAME' => ''.hsc($cip).'', 'TITLE' => hsc($conf['title']), 'DOKUWIKIURL' => ''.DOKU_URL.'', - 'USER' => hsc($_SERVER['REMOTE_USER']), + 'USER' => hsc($INPUT->server->str('REMOTE_USER')), 'NAME' => hsc($INFO['userinfo']['name']), 'MAIL' => ''. hsc($INFO['userinfo']['mail']).'', diff --git a/inc/actions.php b/inc/actions.php index 240dce59a..ef09a0dc7 100644 --- a/inc/actions.php +++ b/inc/actions.php @@ -20,6 +20,7 @@ function act_dispatch(){ global $ID; global $INFO; global $QUERY; + /* @var Input $INPUT */ global $INPUT; global $lang; global $conf; @@ -94,7 +95,7 @@ function act_dispatch(){ // user profile changes if (in_array($ACT, array('profile','profile_delete'))) { - if(!$_SERVER['REMOTE_USER']) { + if(!$INPUT->server->str('REMOTE_USER')) { $ACT = 'login'; } else { switch ($ACT) { @@ -190,7 +191,7 @@ function act_dispatch(){ unset($evt); // when action 'show', the intial not 'show' and POST, do a redirect - if($ACT == 'show' && $preact != 'show' && strtolower($_SERVER['REQUEST_METHOD']) == 'post'){ + if($ACT == 'show' && $preact != 'show' && strtolower($INPUT->server->str('REQUEST_METHOD')) == 'post'){ act_redirect($ID,$preact); } @@ -414,6 +415,8 @@ function act_revert($act){ global $ID; global $REV; global $lang; + /* @var Input $INPUT */ + global $INPUT; // FIXME $INFO['writable'] currently refers to the attic version // global $INFO; // if (!$INFO['writable']) { @@ -445,7 +448,7 @@ function act_revert($act){ session_write_close(); // when done, show current page - $_SERVER['REQUEST_METHOD'] = 'post'; //should force a redirect + $INPUT->server->set('REQUEST_METHOD','post'); //should force a redirect $REV = ''; return 'show'; } @@ -493,17 +496,20 @@ function act_redirect_execute($opts){ function act_auth($act){ global $ID; global $INFO; + /* @var Input $INPUT */ + global $INPUT; //already logged in? - if(isset($_SERVER['REMOTE_USER']) && $act=='login'){ + if($INPUT->server->has('REMOTE_USER') && $act=='login'){ return 'show'; } //handle logout if($act=='logout'){ $lockedby = checklock($ID); //page still locked? - if($lockedby == $_SERVER['REMOTE_USER']) + if($lockedby == $INPUT->server->str('REMOTE_USER')){ unlock($ID); //try to unlock + } // do the logout stuff auth_logoff(); @@ -719,10 +725,11 @@ function act_subscription($act){ global $lang; global $INFO; global $ID; + /* @var Input $INPUT */ global $INPUT; // subcriptions work for logged in users only - if(!$_SERVER['REMOTE_USER']) return 'show'; + if(!$INPUT->server->str('REMOTE_USER')) return 'show'; // get and preprocess data. $params = array(); @@ -745,9 +752,9 @@ function act_subscription($act){ // Perform action. $sub = new Subscription(); if($action == 'unsubscribe'){ - $ok = $sub->remove($target, $_SERVER['REMOTE_USER'], $style); + $ok = $sub->remove($target, $INPUT->server->str('REMOTE_USER'), $style); }else{ - $ok = $sub->add($target, $_SERVER['REMOTE_USER'], $style); + $ok = $sub->add($target, $INPUT->server->str('REMOTE_USER'), $style); } if($ok) { @@ -776,6 +783,8 @@ function act_subscription($act){ function subscription_handle_post(&$params) { global $INFO; global $lang; + /* @var Input $INPUT */ + global $INPUT; // Get and validate parameters. if (!isset($params['target'])) { @@ -806,7 +815,7 @@ function subscription_handle_post(&$params) { } if ($is === false) { throw new Exception(sprintf($lang['subscr_not_subscribed'], - $_SERVER['REMOTE_USER'], + $INPUT->server->str('REMOTE_USER'), prettyprint_id($target))); } // subscription_set deletes a subscription if style = null. diff --git a/inc/auth.php b/inc/auth.php index e44e837a7..2bdc3eb00 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -131,6 +131,8 @@ function auth_setup() { function auth_loadACL() { global $config_cascade; global $USERINFO; + /* @var Input $INPUT */ + global $INPUT; if(!is_readable($config_cascade['acl']['default'])) return array(); @@ -145,10 +147,10 @@ function auth_loadACL() { // substitute user wildcard first (its 1:1) if(strstr($line, '%USER%')){ // if user is not logged in, this ACL line is meaningless - skip it - if (!isset($_SERVER['REMOTE_USER'])) continue; + if (!$INPUT->server->has('REMOTE_USER')) continue; - $id = str_replace('%USER%',cleanID($_SERVER['REMOTE_USER']),$id); - $rest = str_replace('%USER%',auth_nameencode($_SERVER['REMOTE_USER']),$rest); + $id = str_replace('%USER%',cleanID($INPUT->server->str('REMOTE_USER')),$id); + $rest = str_replace('%USER%',auth_nameencode($INPUT->server->str('REMOTE_USER')),$rest); } // substitute group wildcard (its 1:m) @@ -217,6 +219,8 @@ function auth_login($user, $pass, $sticky = false, $silent = false) { global $lang; /* @var DokuWiki_Auth_Plugin $auth */ global $auth; + /* @var Input $INPUT */ + global $INPUT; $sticky ? $sticky = true : $sticky = false; //sanity check @@ -226,7 +230,7 @@ function auth_login($user, $pass, $sticky = false, $silent = false) { //usual login if($auth->checkPass($user, $pass)) { // make logininfo globally available - $_SERVER['REMOTE_USER'] = $user; + $INPUT->server->set('REMOTE_USER', $user); $secret = auth_cookiesalt(!$sticky, true); //bind non-sticky to session auth_setCookie($user, auth_encrypt($pass, $secret), $sticky); return true; @@ -253,7 +257,7 @@ function auth_login($user, $pass, $sticky = false, $silent = false) { ) { // he has session, cookie and browser right - let him in - $_SERVER['REMOTE_USER'] = $user; + $INPUT->server->set('REMOTE_USER', $user); $USERINFO = $session['info']; //FIXME move all references to session return true; } @@ -288,7 +292,10 @@ function auth_validateToken($token) { } // still here? trust the session data global $USERINFO; - $_SERVER['REMOTE_USER'] = $_SESSION[DOKU_COOKIE]['auth']['user']; + /* @var Input $INPUT */ + global $INPUT; + + $INPUT->server->set('REMOTE_USER',$_SESSION[DOKU_COOKIE]['auth']['user']); $USERINFO = $_SESSION[DOKU_COOKIE]['auth']['info']; return true; } @@ -321,11 +328,14 @@ function auth_createToken() { * @return string a MD5 sum of various browser headers */ function auth_browseruid() { + /* @var Input $INPUT */ + global $INPUT; + $ip = clientIP(true); $uid = ''; - $uid .= $_SERVER['HTTP_USER_AGENT']; - $uid .= $_SERVER['HTTP_ACCEPT_ENCODING']; - $uid .= @$_SERVER['HTTP_ACCEPT_CHARSET']; + $uid .= $INPUT->server->str('HTTP_USER_AGENT'); + $uid .= $INPUT->server->str('HTTP_ACCEPT_ENCODING'); + $uid .= $INPUT->server->str('HTTP_ACCEPT_CHARSET'); $uid .= substr($ip, 0, strpos($ip, '.')); $uid = strtolower($uid); return md5($uid); @@ -511,6 +521,8 @@ function auth_logoff($keepbc = false) { global $USERINFO; /* @var DokuWiki_Auth_Plugin $auth */ global $auth; + /* @var Input $INPUT */ + global $INPUT; // make sure the session is writable (it usually is) @session_start(); @@ -523,8 +535,7 @@ function auth_logoff($keepbc = false) { unset($_SESSION[DOKU_COOKIE]['auth']['info']); if(!$keepbc && isset($_SESSION[DOKU_COOKIE]['bc'])) unset($_SESSION[DOKU_COOKIE]['bc']); - if(isset($_SERVER['REMOTE_USER'])) - unset($_SERVER['REMOTE_USER']); + $INPUT->server->remove('REMOTE_USER'); $USERINFO = null; //FIXME $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']; @@ -553,13 +564,16 @@ function auth_ismanager($user = null, $groups = null, $adminonly = false) { global $USERINFO; /* @var DokuWiki_Auth_Plugin $auth */ global $auth; + /* @var Input $INPUT */ + global $INPUT; + if(!$auth) return false; if(is_null($user)) { - if(!isset($_SERVER['REMOTE_USER'])) { + if(!$INPUT->server->has('REMOTE_USER')) { return false; } else { - $user = $_SERVER['REMOTE_USER']; + $user = $INPUT->server->str('REMOTE_USER'); } } if(is_null($groups)) { @@ -651,9 +665,11 @@ function auth_isMember($memberlist, $user, array $groups) { function auth_quickaclcheck($id) { global $conf; global $USERINFO; + /* @var Input $INPUT */ + global $INPUT; # if no ACL is used always return upload rights if(!$conf['useacl']) return AUTH_UPLOAD; - return auth_aclcheck($id, $_SERVER['REMOTE_USER'], $USERINFO['grps']); + return auth_aclcheck($id, $INPUT->server->str('REMOTE_USER'), $USERINFO['grps']); } /** @@ -1058,18 +1074,18 @@ function updateprofile() { } if($conf['profileconfirm']) { - if(!$auth->checkPass($_SERVER['REMOTE_USER'], $INPUT->post->str('oldpass'))) { + if(!$auth->checkPass($INPUT->server->str('REMOTE_USER'), $INPUT->post->str('oldpass'))) { msg($lang['badpassconfirm'], -1); return false; } } - if($result = $auth->triggerUserMod('modify', array($_SERVER['REMOTE_USER'], $changes))) { + if($result = $auth->triggerUserMod('modify', array($INPUT->server->str('REMOTE_USER'), $changes))) { // update cookie and session with the changed data if($changes['pass']) { list( /*user*/, $sticky, /*pass*/) = auth_getCookie(); $pass = auth_encrypt($changes['pass'], auth_cookiesalt(!$sticky, true)); - auth_setCookie($_SERVER['REMOTE_USER'], $pass, (bool) $sticky); + auth_setCookie($INPUT->server->str('REMOTE_USER'), $pass, (bool) $sticky); } return true; } @@ -1105,13 +1121,13 @@ function auth_deleteprofile(){ } if($conf['profileconfirm']) { - if(!$auth->checkPass($_SERVER['REMOTE_USER'], $INPUT->post->str('oldpass'))) { + if(!$auth->checkPass($INPUT->server->str('REMOTE_USER'), $INPUT->post->str('oldpass'))) { msg($lang['badpassconfirm'], -1); return false; } } - $deleted[] = $_SERVER['REMOTE_USER']; + $deleted[] = $INPUT->server->str('REMOTE_USER'); if($auth->triggerUserMod('delete', array($deleted))) { // force and immediate logout including removing the sticky cookie auth_logoff(); diff --git a/inc/changelog.php b/inc/changelog.php index 6ff1e0eca..cd46b1ec0 100644 --- a/inc/changelog.php +++ b/inc/changelog.php @@ -52,6 +52,8 @@ function parseChangelogLine($line) { */ function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extra='', $flags=null){ global $conf, $INFO; + /** @var Input $INPUT */ + global $INPUT; // check for special flags as keys if (!is_array($flags)) { $flags = array(); } @@ -65,7 +67,7 @@ function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extr if(!$date) $date = time(); //use current time if none supplied $remote = (!$flagExternalEdit)?clientIP(true):'127.0.0.1'; - $user = (!$flagExternalEdit)?$_SERVER['REMOTE_USER']:''; + $user = (!$flagExternalEdit)?$INPUT->server->str('REMOTE_USER'):''; $strip = array("\t", "\n"); $logline = array( @@ -117,12 +119,14 @@ function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extr */ function addMediaLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extra='', $flags=null){ global $conf; + /** @var Input $INPUT */ + global $INPUT; $id = cleanid($id); if(!$date) $date = time(); //use current time if none supplied $remote = clientIP(true); - $user = $_SERVER['REMOTE_USER']; + $user = $INPUT->server->str('REMOTE_USER'); $strip = array("\t", "\n"); $logline = array( diff --git a/inc/common.php b/inc/common.php index 6aad42bd1..9fbebde94 100644 --- a/inc/common.php +++ b/inc/common.php @@ -56,15 +56,18 @@ function stripctl($string) { * @return string */ function getSecurityToken() { - return PassHash::hmac('md5', session_id().$_SERVER['REMOTE_USER'], auth_cookiesalt()); + /** @var Input $INPUT */ + global $INPUT; + return PassHash::hmac('md5', session_id().$INPUT->server->str('REMOTE_USER'), auth_cookiesalt()); } /** * Check the secret CSRF token */ function checkSecurityToken($token = null) { + /** @var Input $INPUT */ global $INPUT; - if(empty($_SERVER['REMOTE_USER'])) return true; // no logged in user, no need for a check + if(!$INPUT->server->str('REMOTE_USER')) return true; // no logged in user, no need for a check if(is_null($token)) $token = $INPUT->str('sectok'); if(getSecurityToken() != $token) { @@ -93,14 +96,16 @@ function formSecurityToken($print = true) { */ function basicinfo($id, $htmlClient=true){ global $USERINFO; + /* @var Input $INPUT */ + global $INPUT; // set info about manager/admin status. $info['isadmin'] = false; $info['ismanager'] = false; - if(isset($_SERVER['REMOTE_USER'])) { + if($INPUT->server->has('REMOTE_USER')) { $info['userinfo'] = $USERINFO; $info['perm'] = auth_quickaclcheck($id); - $info['client'] = $_SERVER['REMOTE_USER']; + $info['client'] = $INPUT->server->str('REMOTE_USER'); if($info['perm'] == AUTH_ADMIN) { $info['isadmin'] = true; @@ -111,7 +116,7 @@ function basicinfo($id, $htmlClient=true){ // if some outside auth were used only REMOTE_USER is set if(!$info['userinfo']['name']) { - $info['userinfo']['name'] = $_SERVER['REMOTE_USER']; + $info['userinfo']['name'] = $INPUT->server->str('REMOTE_USER'); } } else { @@ -140,6 +145,8 @@ function pageinfo() { global $REV; global $RANGE; global $lang; + /* @var Input $INPUT */ + global $INPUT; $info = basicinfo($ID); @@ -148,7 +155,7 @@ function pageinfo() { $info['id'] = $ID; $info['rev'] = $REV; - if(isset($_SERVER['REMOTE_USER'])) { + if($INPUT->server->has('REMOTE_USER')) { $sub = new Subscription(); $info['subscribed'] = $sub->user_subscription(); } else { @@ -356,11 +363,14 @@ function breadcrumbs() { */ function idfilter($id, $ue = true) { global $conf; + /* @var Input $INPUT */ + global $INPUT; + if($conf['useslash'] && $conf['userewrite']) { $id = strtr($id, ':', '/'); } elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' && $conf['userewrite'] && - strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') === false + strpos($INPUT->server->str('SERVER_SOFTWARE'), 'Microsoft-IIS') === false ) { $id = strtr($id, ':', ';'); } @@ -588,6 +598,8 @@ function checkwordblock($text = '') { global $SUM; global $conf; global $INFO; + /* @var Input $INPUT */ + global $INPUT; if(!$conf['usewordblock']) return false; @@ -620,9 +632,9 @@ function checkwordblock($text = '') { if(count($re) && preg_match('#('.join('|', $re).')#si', $text, $matches)) { // prepare event data $data['matches'] = $matches; - $data['userinfo']['ip'] = $_SERVER['REMOTE_ADDR']; - if($_SERVER['REMOTE_USER']) { - $data['userinfo']['user'] = $_SERVER['REMOTE_USER']; + $data['userinfo']['ip'] = $INPUT->server->str('REMOTE_ADDR'); + if($INPUT->server->str('REMOTE_USER')) { + $data['userinfo']['user'] = $INPUT->server->str('REMOTE_USER'); $data['userinfo']['name'] = $INFO['userinfo']['name']; $data['userinfo']['mail'] = $INFO['userinfo']['mail']; } @@ -648,12 +660,17 @@ function checkwordblock($text = '') { * @return string */ function clientIP($single = false) { + /* @var Input $INPUT */ + global $INPUT; + $ip = array(); - $ip[] = $_SERVER['REMOTE_ADDR']; - if(!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) - $ip = array_merge($ip, explode(',', str_replace(' ', '', $_SERVER['HTTP_X_FORWARDED_FOR']))); - if(!empty($_SERVER['HTTP_X_REAL_IP'])) - $ip = array_merge($ip, explode(',', str_replace(' ', '', $_SERVER['HTTP_X_REAL_IP']))); + $ip[] = $INPUT->server->str('REMOTE_ADDR'); + if($INPUT->server->str('HTTP_X_FORWARDED_FOR')) { + $ip = array_merge($ip, explode(',', str_replace(' ', '', $INPUT->server->str('HTTP_X_FORWARDED_FOR')))); + } + if($INPUT->server->str('HTTP_X_REAL_IP')) { + $ip = array_merge($ip, explode(',', str_replace(' ', '', $INPUT->server->str('HTTP_X_REAL_IP')))); + } // some IPv4/v6 regexps borrowed from Feyd // see: http://forums.devnetwork.net/viewtopic.php?f=38&t=53479 @@ -712,16 +729,18 @@ function clientIP($single = false) { * @link http://www.brainhandles.com/2007/10/15/detecting-mobile-browsers/#code */ function clientismobile() { + /* @var Input $INPUT */ + global $INPUT; - if(isset($_SERVER['HTTP_X_WAP_PROFILE'])) return true; + if($INPUT->server->has('HTTP_X_WAP_PROFILE')) return true; - if(preg_match('/wap\.|\.wap/i', $_SERVER['HTTP_ACCEPT'])) return true; + if(preg_match('/wap\.|\.wap/i', $INPUT->server->str('HTTP_ACCEPT'))) return true; - if(!isset($_SERVER['HTTP_USER_AGENT'])) return false; + if(!$INPUT->server->has('HTTP_USER_AGENT')) return false; $uamatches = 'midp|j2me|avantg|docomo|novarra|palmos|palmsource|240x320|opwv|chtml|pda|windows ce|mmp\/|blackberry|mib\/|symbian|wireless|nokia|hand|mobi|phone|cdm|up\.b|audio|SIE\-|SEC\-|samsung|HTC|mot\-|mitsu|sagem|sony|alcatel|lg|erics|vx|NEC|philips|mmm|xx|panasonic|sharp|wap|sch|rover|pocket|benq|java|pt|pg|vox|amoi|bird|compal|kg|voda|sany|kdd|dbt|sendo|sgh|gradi|jb|\d\d\di|moto'; - if(preg_match("/$uamatches/i", $_SERVER['HTTP_USER_AGENT'])) return true; + if(preg_match("/$uamatches/i", $INPUT->server->str('HTTP_USER_AGENT'))) return true; return false; } @@ -761,6 +780,9 @@ function gethostsbyaddrs($ips) { */ function checklock($id) { global $conf; + /* @var Input $INPUT */ + global $INPUT; + $lock = wikiLockFN($id); //no lockfile @@ -774,7 +796,7 @@ function checklock($id) { //my own lock @list($ip, $session) = explode("\n", io_readFile($lock)); - if($ip == $_SERVER['REMOTE_USER'] || $ip == clientIP() || $session == session_id()) { + if($ip == $INPUT->server->str('REMOTE_USER') || $ip == clientIP() || $session == session_id()) { return false; } @@ -788,14 +810,16 @@ function checklock($id) { */ function lock($id) { global $conf; + /* @var Input $INPUT */ + global $INPUT; if($conf['locktime'] == 0) { return; } $lock = wikiLockFN($id); - if($_SERVER['REMOTE_USER']) { - io_saveFile($lock, $_SERVER['REMOTE_USER']); + if($INPUT->server->str('REMOTE_USER')) { + io_saveFile($lock, $INPUT->server->str('REMOTE_USER')); } else { io_saveFile($lock, clientIP()."\n".session_id()); } @@ -809,10 +833,13 @@ function lock($id) { * @return bool true if a lock was removed */ function unlock($id) { + /* @var Input $INPUT */ + global $INPUT; + $lock = wikiLockFN($id); if(@file_exists($lock)) { @list($ip, $session) = explode("\n", io_readFile($lock)); - if($ip == $_SERVER['REMOTE_USER'] || $ip == clientIP() || $session == session_id()) { + if($ip == $INPUT->server->str('REMOTE_USER') || $ip == clientIP() || $session == session_id()) { @unlink($lock); return true; } @@ -938,6 +965,8 @@ function parsePageTemplate(&$data) { global $USERINFO; global $conf; + /* @var Input $INPUT */ + global $INPUT; // replace placeholders $file = noNS($id); @@ -969,7 +998,7 @@ function parsePageTemplate(&$data) { utf8_ucfirst($page), utf8_ucwords($page), utf8_strtoupper($page), - $_SERVER['REMOTE_USER'], + $INPUT->server->str('REMOTE_USER'), $USERINFO['name'], $USERINFO['mail'], $conf['dformat'], @@ -1050,6 +1079,9 @@ function saveWikiText($id, $text, $summary, $minor = false) { global $conf; global $lang; global $REV; + /* @var Input $INPUT */ + global $INPUT; + // ignore if no changes were made if($text == rawWiki($id, '')) { return; @@ -1112,7 +1144,7 @@ function saveWikiText($id, $text, $summary, $minor = false) { $type = DOKU_CHANGE_TYPE_CREATE; } else if($wasRemoved) { $type = DOKU_CHANGE_TYPE_DELETE; - } else if($minor && $conf['useacl'] && $_SERVER['REMOTE_USER']) { + } else if($minor && $conf['useacl'] && $INPUT->server->str('REMOTE_USER')) { $type = DOKU_CHANGE_TYPE_MINOR_EDIT; } //minor edits only for logged in users @@ -1164,6 +1196,8 @@ function saveOldRevision($id) { */ function notify($id, $who, $rev = '', $summary = '', $minor = false, $replace = array()) { global $conf; + /* @var Input $INPUT */ + global $INPUT; // decide if there is something to do, eg. whom to mail if($who == 'admin') { @@ -1172,7 +1206,7 @@ function notify($id, $who, $rev = '', $summary = '', $minor = false, $replace = $to = $conf['notify']; } elseif($who == 'subscribers') { if(!actionOK('subscribe')) return false; //subscribers enabled? - if($conf['useacl'] && $_SERVER['REMOTE_USER'] && $minor) return false; //skip minors + if($conf['useacl'] && $INPUT->server->str('REMOTE_USER') && $minor) return false; //skip minors $data = array('id' => $id, 'addresslist' => '', 'self' => false); trigger_event( 'COMMON_NOTIFY_ADDRESSLIST', $data, @@ -1197,10 +1231,13 @@ function notify($id, $who, $rev = '', $summary = '', $minor = false, $replace = * @author Todd Augsburger */ function getGoogleQuery() { - if(!isset($_SERVER['HTTP_REFERER'])) { + /* @var Input $INPUT */ + global $INPUT; + + if(!$INPUT->server->has('HTTP_REFERER')) { return ''; } - $url = parse_url($_SERVER['HTTP_REFERER']); + $url = parse_url($INPUT->server->str('HTTP_REFERER')); // only handle common SEs if(!preg_match('/(google|bing|yahoo|ask|duckduckgo|babylon|aol|yandex)/',$url['host'])) return ''; @@ -1523,6 +1560,9 @@ function is_mem_available($mem, $bytes = 1048576) { * @author Andreas Gohr */ function send_redirect($url) { + /* @var Input $INPUT */ + global $INPUT; + //are there any undisplayed messages? keep them in session for display global $MSG; if(isset($MSG) && count($MSG) && !defined('NOSESSION')) { @@ -1546,9 +1586,9 @@ function send_redirect($url) { } // check if running on IIS < 6 with CGI-PHP - if(isset($_SERVER['SERVER_SOFTWARE']) && isset($_SERVER['GATEWAY_INTERFACE']) && - (strpos($_SERVER['GATEWAY_INTERFACE'], 'CGI') !== false) && - (preg_match('|^Microsoft-IIS/(\d)\.\d$|', trim($_SERVER['SERVER_SOFTWARE']), $matches)) && + if($INPUT->server->has('SERVER_SOFTWARE') && $INPUT->server->has('GATEWAY_INTERFACE') && + (strpos($INPUT->server->str('GATEWAY_INTERFACE'), 'CGI') !== false) && + (preg_match('|^Microsoft-IIS/(\d)\.\d$|', trim($INPUT->server->str('SERVER_SOFTWARE')), $matches)) && $matches[1] < 6 ) { header('Refresh: 0;url='.$url); diff --git a/inc/infoutils.php b/inc/infoutils.php index 3636d86a1..0992040d9 100644 --- a/inc/infoutils.php +++ b/inc/infoutils.php @@ -102,6 +102,8 @@ function getVersion(){ function check(){ global $conf; global $INFO; + /* @var Input $INPUT */ + global $INPUT; if ($INFO['isadmin'] || $INFO['ismanager']){ msg('DokuWiki version: '.getVersion(),1); @@ -204,7 +206,7 @@ function check(){ } if($INFO['userinfo']['name']){ - msg('You are currently logged in as '.$_SERVER['REMOTE_USER'].' ('.$INFO['userinfo']['name'].')',0); + msg('You are currently logged in as '.$INPUT->server->str('REMOTE_USER').' ('.$INFO['userinfo']['name'].')',0); msg('You are part of the groups '.join($INFO['userinfo']['grps'],', '),0); }else{ msg('You are currently not logged in',0); @@ -361,6 +363,9 @@ function dbg($msg,$hidden=false){ */ function dbglog($msg,$header=''){ global $conf; + /* @var Input $INPUT */ + global $INPUT; + // The debug log isn't automatically cleaned thus only write it when // debugging has been enabled by the user. if($conf['allowdebug'] !== 1) return; @@ -373,7 +378,7 @@ function dbglog($msg,$header=''){ $file = $conf['cachedir'].'/debug.log'; $fh = fopen($file,'a'); if($fh){ - fwrite($fh,date('H:i:s ').$_SERVER['REMOTE_ADDR'].': '.$msg."\n"); + fwrite($fh,date('H:i:s ').$INPUT->server->str('REMOTE_ADDR').': '.$msg."\n"); fclose($fh); } } diff --git a/inc/init.php b/inc/init.php index bcd96e5e4..4ff239787 100644 --- a/inc/init.php +++ b/inc/init.php @@ -402,6 +402,10 @@ function remove_magic_quotes(&$array) { * Returns the full absolute URL to the directory where * DokuWiki is installed in (includes a trailing slash) * + * !! Can not access $_SERVER values through $INPUT + * !! here as this function is called before $INPUT is + * !! initialized. + * * @author Andreas Gohr */ function getBaseURL($abs=null){ diff --git a/inc/mail.php b/inc/mail.php index 0b60c0a5b..9994ac63e 100644 --- a/inc/mail.php +++ b/inc/mail.php @@ -40,6 +40,8 @@ if (!defined('PREG_PATTERN_VALID_EMAIL')) define('PREG_PATTERN_VALID_EMAIL', '[' function mail_setup(){ global $conf; global $USERINFO; + /** @var Input $INPUT */ + global $INPUT; // auto constructed address $host = @parse_url(DOKU_URL,PHP_URL_HOST); @@ -53,11 +55,8 @@ function mail_setup(){ $replace['@MAIL@'] = $noreply; } - if(!empty($_SERVER['REMOTE_USER'])){ - $replace['@USER@'] = $_SERVER['REMOTE_USER']; - }else{ - $replace['@USER@'] = 'noreply'; - } + // use 'noreply' if no user + $replace['@USER@'] = $INPUT->server->str('REMOTE_USER', 'noreply', true); if(!empty($USERINFO['name'])){ $replace['@NAME@'] = $USERINFO['name']; diff --git a/inc/pageutils.php b/inc/pageutils.php index 9c2794387..8474c5697 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -19,6 +19,7 @@ * @author Andreas Gohr */ function getID($param='id',$clean=true){ + /** @var Input $INPUT */ global $INPUT; global $conf; global $ACT; @@ -27,7 +28,7 @@ function getID($param='id',$clean=true){ //construct page id from request URI if(empty($id) && $conf['userewrite'] == 2){ - $request = $_SERVER['REQUEST_URI']; + $request = $INPUT->server->str('REQUEST_URI'); $script = ''; //get the script URL @@ -36,15 +37,15 @@ function getID($param='id',$clean=true){ if($param != 'id') { $relpath = 'lib/exe/'; } - $script = $conf['basedir'].$relpath.utf8_basename($_SERVER['SCRIPT_FILENAME']); - - }elseif($_SERVER['PATH_INFO']){ - $request = $_SERVER['PATH_INFO']; - }elseif($_SERVER['SCRIPT_NAME']){ - $script = $_SERVER['SCRIPT_NAME']; - }elseif($_SERVER['DOCUMENT_ROOT'] && $_SERVER['SCRIPT_FILENAME']){ - $script = preg_replace ('/^'.preg_quote($_SERVER['DOCUMENT_ROOT'],'/').'/','', - $_SERVER['SCRIPT_FILENAME']); + $script = $conf['basedir'].$relpath.utf8_basename($INPUT->server->str('SCRIPT_FILENAME')); + + }elseif($INPUT->server->str('PATH_INFO')){ + $request = $INPUT->server->str('PATH_INFO'); + }elseif($INPUT->server->str('SCRIPT_NAME')){ + $script = $INPUT->server->str('SCRIPT_NAME'); + }elseif($INPUT->server->str('DOCUMENT_ROOT') && $INPUT->server->str('SCRIPT_FILENAME')){ + $script = preg_replace ('/^'.preg_quote($INPUT->server->str('DOCUMENT_ROOT'),'/').'/','', + $INPUT->server->str('SCRIPT_FILENAME')); $script = '/'.$script; } diff --git a/inc/remote.php b/inc/remote.php index 2ef28afd2..e27aa74f8 100644 --- a/inc/remote.php +++ b/inc/remote.php @@ -169,6 +169,9 @@ class RemoteAPI { public function hasAccess() { global $conf; global $USERINFO; + /** @var Input $INPUT */ + global $INPUT; + if (!$conf['remote']) { return false; } @@ -179,7 +182,7 @@ class RemoteAPI { return true; } - return auth_isMember($conf['remoteuser'], $_SERVER['REMOTE_USER'], (array) $USERINFO['grps']); + return auth_isMember($conf['remoteuser'], $INPUT->server->str('REMOTE_USER'), (array) $USERINFO['grps']); } /** diff --git a/inc/subscription.php b/inc/subscription.php index ddf30706b..adf1b821c 100644 --- a/inc/subscription.php +++ b/inc/subscription.php @@ -256,8 +256,10 @@ class Subscription { if(!$this->isenabled()) return false; global $ID; + /** @var Input $INPUT */ + global $INPUT; if(!$id) $id = $ID; - if(!$user) $user = $_SERVER['REMOTE_USER']; + if(!$user) $user = $INPUT->server->str('REMOTE_USER'); $subs = $this->subscribers($id, $user); if(!count($subs)) return false; @@ -292,13 +294,15 @@ class Subscription { global $auth; global $conf; global $USERINFO; + /** @var Input $INPUT */ + global $INPUT; $count = 0; $subscriptions = $this->subscribers($page, null, array('digest', 'list')); // remember current user info $olduinfo = $USERINFO; - $olduser = $_SERVER['REMOTE_USER']; + $olduser = $INPUT->server->str('REMOTE_USER'); foreach($subscriptions as $target => $users) { if(!$this->lock($target)) continue; @@ -315,7 +319,7 @@ class Subscription { // Work as the user to make sure ACLs apply correctly $USERINFO = $auth->getUserData($user); - $_SERVER['REMOTE_USER'] = $user; + $INPUT->server->set('REMOTE_USER',$user); if($USERINFO === false) continue; if(!$USERINFO['mail']) continue; @@ -334,7 +338,7 @@ class Subscription { foreach($changes as $rev) { $n = 0; while(!is_null($rev) && $rev['date'] >= $lastupdate && - ($_SERVER['REMOTE_USER'] === $rev['user'] || + ($INPUT->server->str('REMOTE_USER') === $rev['user'] || $rev['type'] === DOKU_CHANGE_TYPE_MINOR_EDIT)) { $rev = getRevisions($rev['id'], $n++, 1); $rev = (count($rev) > 0) ? $rev[0] : null; @@ -369,7 +373,7 @@ class Subscription { // restore current user info $USERINFO = $olduinfo; - $_SERVER['REMOTE_USER'] = $olduser; + $INPUT->server->set('REMOTE_USER',$olduser); return $count; } @@ -654,6 +658,8 @@ class Subscription { /** @var DokuWiki_Auth_Plugin $auth */ global $auth; global $conf; + /** @var Input $INPUT */ + global $INPUT; $id = $data['id']; $self = $data['self']; @@ -667,7 +673,7 @@ class Subscription { $userinfo = $auth->getUserData($user); if($userinfo === false) continue; if(!$userinfo['mail']) continue; - if(!$self && $user == $_SERVER['REMOTE_USER']) continue; //skip our own changes + if(!$self && $user == $INPUT->server->str('REMOTE_USER')) continue; //skip our own changes $level = auth_aclcheck($id, $user, $userinfo['grps']); if($level >= AUTH_READ) { diff --git a/inc/template.php b/inc/template.php index c0dfbb845..88964fada 100644 --- a/inc/template.php +++ b/inc/template.php @@ -291,6 +291,8 @@ function tpl_metaheaders($alt = true) { global $lang; global $conf; global $updateVersion; + /** @var Input $INPUT */ + global $INPUT; // prepare the head array $head = array(); @@ -401,7 +403,7 @@ function tpl_metaheaders($alt = true) { // make $INFO and other vars available to JavaScripts $json = new JSON(); $script = "var NS='".$INFO['namespace']."';"; - if($conf['useacl'] && !empty($_SERVER['REMOTE_USER'])) { + if($conf['useacl'] && $INPUT->server->str('REMOTE_USER')) { $script .= "var SIG='".toolbar_signature()."';"; } $script .= 'var JSINFO = '.$json->encode($JSINFO).';'; @@ -603,6 +605,8 @@ function tpl_get_action($type) { global $REV; global $ACT; global $conf; + /** @var Input $INPUT */ + global $INPUT; // check disabled actions and fix the badly named ones if($type == 'history') $type = 'revisions'; @@ -672,7 +676,7 @@ function tpl_get_action($type) { break; case 'login': $params['sectok'] = getSecurityToken(); - if(isset($_SERVER['REMOTE_USER'])) { + if($INPUT->server->has('REMOTE_USER')) { if(!actionOK('logout')) { return false; } @@ -681,12 +685,12 @@ function tpl_get_action($type) { } break; case 'register': - if(!empty($_SERVER['REMOTE_USER'])) { + if($INPUT->server->str('REMOTE_USER')) { return false; } break; case 'resendpwd': - if(!empty($_SERVER['REMOTE_USER'])) { + if($INPUT->server->str('REMOTE_USER')) { return false; } break; @@ -703,14 +707,14 @@ function tpl_get_action($type) { $params['sectok'] = getSecurityToken(); break; case 'subscribe': - if(!$_SERVER['REMOTE_USER']) { + if(!$INPUT->server->str('REMOTE_USER')) { return false; } break; case 'backlink': break; case 'profile': - if(!isset($_SERVER['REMOTE_USER'])) { + if(!$INPUT->server->has('REMOTE_USER')) { return false; } break; @@ -886,8 +890,11 @@ function tpl_youarehere($sep = ' » ') { function tpl_userinfo() { global $lang; global $INFO; - if(isset($_SERVER['REMOTE_USER'])) { - print $lang['loggedinas'].': '.hsc($INFO['userinfo']['name']).' ('.hsc($_SERVER['REMOTE_USER']).')'; + /** @var Input $INPUT */ + global $INPUT; + + if($INPUT->server->str('REMOTE_USER')) { + print $lang['loggedinas'].': '.hsc($INFO['userinfo']['name']).' ('.hsc($INPUT->server->str('REMOTE_USER')).')'; return true; } return false; @@ -1030,6 +1037,7 @@ function tpl_img_getTag($tags, $alt = '', $src = null) { */ function tpl_img($maxwidth = 0, $maxheight = 0, $link = true, $params = null) { global $IMG; + /** @var Input $INPUT */ global $INPUT; $w = tpl_img_getTag('File.Width'); $h = tpl_img_getTag('File.Height'); @@ -1242,6 +1250,7 @@ function tpl_mediaContent($fromajax = false, $sort='natural') { global $INUSE; global $NS; global $JUMPTO; + /** @var Input $INPUT */ global $INPUT; $do = $INPUT->extract('do')->str('do'); @@ -1291,6 +1300,7 @@ function tpl_mediaFileList() { global $NS; global $JUMPTO; global $lang; + /** @var Input $INPUT */ global $INPUT; $opened_tab = $INPUT->str('tab_files'); @@ -1331,7 +1341,9 @@ function tpl_mediaFileList() { * @author Kate Arzamastseva */ function tpl_mediaFileDetails($image, $rev) { - global $AUTH, $NS, $conf, $DEL, $lang, $INPUT; + global $AUTH, $NS, $conf, $DEL, $lang; + /** @var Input $INPUT */ + global $INPUT; $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')) && $conf['mediarevisions']); if(!$image || (!file_exists(mediaFN($image)) && !$removed) || $DEL) return; @@ -1409,12 +1421,14 @@ function tpl_actiondropdown($empty = '', $button = '>') { global $ID; global $REV; global $lang; + /** @var Input $INPUT */ + global $INPUT; echo '
'; echo '
'; echo ''; if($REV) echo ''; - if (!empty($_SERVER['REMOTE_USER'])) { + if ($INPUT->server->str('REMOTE_USER')) { echo ''; } @@ -1780,11 +1794,14 @@ function tpl_media() { */ function tpl_classes() { global $ACT, $conf, $ID, $INFO; + /** @var Input $INPUT */ + global $INPUT; + $classes = array( 'dokuwiki', 'mode_'.$ACT, 'tpl_'.$conf['template'], - !empty($_SERVER['REMOTE_USER']) ? 'loggedIn' : '', + $INPUT->server->bool('REMOTE_USER') ? 'loggedIn' : '', $INFO['exists'] ? '' : 'notFound', ($ID == $conf['start']) ? 'home' : '', ); diff --git a/inc/toolbar.php b/inc/toolbar.php index d8d2f209b..7cc29e866 100644 --- a/inc/toolbar.php +++ b/inc/toolbar.php @@ -241,10 +241,12 @@ function toolbar_JSdefines($varname){ function toolbar_signature(){ global $conf; global $INFO; + /** @var Input $INPUT */ + global $INPUT; $sig = $conf['signature']; $sig = dformat(null,$sig); - $sig = str_replace('@USER@',$_SERVER['REMOTE_USER'],$sig); + $sig = str_replace('@USER@',$INPUT->server->str('REMOTE_USER'),$sig); $sig = str_replace('@NAME@',$INFO['userinfo']['name'],$sig); $sig = str_replace('@MAIL@',$INFO['userinfo']['mail'],$sig); $sig = str_replace('@DATE@',dformat(),$sig); -- cgit v1.2.3 From e1ecd6fde3f52e917907ec1dffc774829934d0dd Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Thu, 6 Mar 2014 20:05:31 +0000 Subject: resolve notices generated in calls to updateTuple() when $metaidx[$id] doesn't exist --- inc/indexer.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/indexer.php b/inc/indexer.php index 7c0b8bc18..a167db47f 100644 --- a/inc/indexer.php +++ b/inc/indexer.php @@ -270,8 +270,9 @@ class Doku_Indexer { // Special handling for titles so the index file is simpler if (array_key_exists('title', $key)) { $value = $key['title']; - if (is_array($value)) + if (is_array($value)) { $value = $value[0]; + } $this->saveIndexKey('title', '', $pid, $value); unset($key['title']); } @@ -299,8 +300,10 @@ class Doku_Indexer { if ($val !== "") { $id = array_search($val, $metawords, true); if ($id === false) { + // didn't find $val, so we'll add it to the end of metawords and create a placeholder in metaidx $id = count($metawords); $metawords[$id] = $val; + $metaidx[$id] = ''; $addwords = true; } // test if value is already in the index -- cgit v1.2.3 From b7a3421a21dcfafa93505b980de9f1cf8fd3532e Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Thu, 6 Mar 2014 20:11:42 +0000 Subject: use \!empty() rather than error suppression --- inc/search.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/search.php b/inc/search.php index 89f3e253d..21666b3fd 100644 --- a/inc/search.php +++ b/inc/search.php @@ -351,10 +351,11 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){ $return = true; // get ID and check if it is a valid one - $item['id'] = pathID($file,($type == 'd' || @$opts['keeptxt'])); + $item['id'] = pathID($file,($type == 'd' || !empty($opts['keeptxt']))); if($item['id'] != cleanID($item['id'])){ - if($opts['showmsg']) + if($opts['showmsg']){ msg(hsc($item['id']).' is not a valid file name for DokuWiki - skipped',-1); + } return false; // skip non-valid files } $item['ns'] = getNS($item['id']); -- cgit v1.2.3 From 1a043a5b56efd30f7580a1801080f80037dd4789 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 6 Mar 2014 23:47:23 +0100 Subject: Revert "added stripped bit to language file" This reverts commit 524df5769a0b9b7aa35af6500c85528c2b0515fe. Conflicts: inc/lang/bn/lang.php inc/lang/fr/lang.php --- inc/lang/ar/lang.php | 1 - inc/lang/az/lang.php | 1 - inc/lang/bg/lang.php | 1 - inc/lang/ca-valencia/lang.php | 1 - inc/lang/ca/lang.php | 1 - inc/lang/cs/lang.php | 1 - inc/lang/da/lang.php | 1 - inc/lang/de-informal/lang.php | 1 - inc/lang/de/lang.php | 1 - inc/lang/el/lang.php | 1 - inc/lang/eo/lang.php | 1 - inc/lang/es/lang.php | 1 - inc/lang/et/lang.php | 1 - inc/lang/eu/lang.php | 1 - inc/lang/fa/lang.php | 1 - inc/lang/fi/lang.php | 1 - inc/lang/fo/lang.php | 1 - inc/lang/fr/lang.php | 2 -- inc/lang/gl/lang.php | 1 - inc/lang/he/lang.php | 1 - inc/lang/hr/lang.php | 1 - inc/lang/hu-formal/lang.php | 1 - inc/lang/hu/lang.php | 1 - inc/lang/ia/lang.php | 1 - inc/lang/id/lang.php | 1 - inc/lang/it/lang.php | 1 - inc/lang/ja/lang.php | 1 - inc/lang/km/lang.php | 1 - inc/lang/ko/lang.php | 1 - inc/lang/ku/lang.php | 1 - inc/lang/la/lang.php | 1 - inc/lang/lb/lang.php | 1 - inc/lang/lt/lang.php | 1 - inc/lang/lv/lang.php | 1 - inc/lang/mg/lang.php | 1 - inc/lang/mr/lang.php | 1 - inc/lang/ne/lang.php | 1 - inc/lang/nl/lang.php | 1 - inc/lang/no/lang.php | 1 - inc/lang/pl/lang.php | 1 - inc/lang/pt-br/lang.php | 1 - inc/lang/pt/lang.php | 1 - inc/lang/ro/lang.php | 1 - inc/lang/ru/lang.php | 1 - inc/lang/sk/lang.php | 1 - inc/lang/sl/lang.php | 1 - inc/lang/sq/lang.php | 1 - inc/lang/sr/lang.php | 1 - inc/lang/sv/lang.php | 1 - inc/lang/th/lang.php | 1 - inc/lang/tr/lang.php | 1 - inc/lang/uk/lang.php | 1 - inc/lang/vi/lang.php | 1 - inc/lang/zh-tw/lang.php | 1 - inc/lang/zh/lang.php | 1 - 55 files changed, 56 deletions(-) (limited to 'inc') diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php index f5e56de90..157513429 100644 --- a/inc/lang/ar/lang.php +++ b/inc/lang/ar/lang.php @@ -341,4 +341,3 @@ $lang['media_restore'] = 'استرجع هذه النسخة'; $lang['currentns'] = 'مساحة الاسم الحالية'; $lang['searchresult'] = 'نتيجة البحث'; $lang['wikimarkup'] = 'علامات الوكي'; -$lang['notloggedin'] = 'الاستمرار، لعلك نسيت تسجيل الدخول؟'; diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php index 5ea965626..df54b4f10 100644 --- a/inc/lang/az/lang.php +++ b/inc/lang/az/lang.php @@ -215,4 +215,3 @@ $lang['days'] = '%d gün əvvəl'; $lang['hours'] = '%d saat əvvəl'; $lang['minutes'] = '%d dəqiqə əvvəl'; $lang['seconds'] = '%d saniyə əvvəl'; -$lang['notloggedin'] = 'Bəlkə, Siz sistemə oz istifadəçi adınız ilə girməyi unutmusunuz?'; diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php index 79bab5865..bb74ff1ca 100644 --- a/inc/lang/bg/lang.php +++ b/inc/lang/bg/lang.php @@ -330,4 +330,3 @@ $lang['media_update'] = 'Качване на нова версия'; $lang['media_restore'] = 'Възстановяване на тази версия'; $lang['searchresult'] = 'Резултати от търсенето'; $lang['plainhtml'] = 'Обикновен HTML'; -$lang['notloggedin'] = 'Може би сте забравили да се впишете?'; diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php index e5bd58417..9ab423783 100644 --- a/inc/lang/ca-valencia/lang.php +++ b/inc/lang/ca-valencia/lang.php @@ -220,4 +220,3 @@ $lang['days'] = 'fa %d dies'; $lang['hours'] = 'fa %d hores'; $lang['minutes'] = 'fa %d minuts'; $lang['seconds'] = 'fa %d segons'; -$lang['notloggedin'] = '¿Haurà oblidat iniciar sessió?'; diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php index 810a613c2..fd19c6834 100644 --- a/inc/lang/ca/lang.php +++ b/inc/lang/ca/lang.php @@ -313,4 +313,3 @@ $lang['media_perm_read'] = 'No teniu permisos suficients per a llegir arxi $lang['media_perm_upload'] = 'No teniu permisos suficients per a pujar arxius'; $lang['media_update'] = 'Puja la nova versió'; $lang['media_restore'] = 'Restaura aquesta versió'; -$lang['notloggedin'] = 'Potser us heu descuidat d\'entrar?'; diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php index 8461277ca..a0f69b3dc 100644 --- a/inc/lang/cs/lang.php +++ b/inc/lang/cs/lang.php @@ -342,4 +342,3 @@ $lang['currentns'] = 'Aktuální jmenný prostor'; $lang['searchresult'] = 'Výsledek hledání'; $lang['plainhtml'] = 'Čisté HTML'; $lang['wikimarkup'] = 'Wiki jazyk'; -$lang['notloggedin'] = 'Možná jste se zapomněli přihlásit?'; diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php index c2d892d2a..eb50bb240 100644 --- a/inc/lang/da/lang.php +++ b/inc/lang/da/lang.php @@ -336,4 +336,3 @@ $lang['media_perm_read'] = 'Du har ikke nok rettigheder til at læse filer $lang['media_perm_upload'] = 'Du har ikke nok rettigheder til at uploade filer.'; $lang['media_update'] = 'Upload ny version'; $lang['media_restore'] = 'Genskab denne version'; -$lang['notloggedin'] = 'Måske er du ikke logget ind.'; diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php index c9e478649..be3f14a18 100644 --- a/inc/lang/de-informal/lang.php +++ b/inc/lang/de-informal/lang.php @@ -343,4 +343,3 @@ $lang['media_update'] = 'Neue Version hochladen'; $lang['media_restore'] = 'Diese Version wiederherstellen'; $lang['currentns'] = 'Aktueller Namensraum'; $lang['searchresult'] = 'Suchergebnis'; -$lang['notloggedin'] = 'Eventuell bist du nicht am Wiki angemeldet?'; diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index 01f2e81c5..9df1035f7 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -345,4 +345,3 @@ $lang['media_restore'] = 'Diese Version wiederherstellen'; $lang['currentns'] = 'Aktueller Namensraum'; $lang['searchresult'] = 'Suchergebnisse'; $lang['plainhtml'] = 'HTML Klartext'; -$lang['notloggedin'] = 'Eventuell sind Sie nicht am Wiki angemeldet?'; diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php index 89bcc08b3..170e101a5 100644 --- a/inc/lang/el/lang.php +++ b/inc/lang/el/lang.php @@ -330,4 +330,3 @@ $lang['media_perm_upload'] = 'Συγνώμη, δεν έχετε επαρκή $lang['media_update'] = 'Φόρτωση νέας έκδοσης'; $lang['media_restore'] = 'Επαναφορά αυτή της έκδοσης'; $lang['searchresult'] = 'Αποτέλεσμα έρευνας'; -$lang['notloggedin'] = 'Μήπως παραλείψατε να συνδεθείτε;'; diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php index 3252a6c2b..97231bdce 100644 --- a/inc/lang/eo/lang.php +++ b/inc/lang/eo/lang.php @@ -335,4 +335,3 @@ $lang['currentns'] = 'Aktuala nomspaco'; $lang['searchresult'] = 'Serĉrezulto'; $lang['plainhtml'] = 'Plena HTML'; $lang['wikimarkup'] = 'Vikiteksto'; -$lang['notloggedin'] = 'Eble vi forgesis identiĝi.'; diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php index 9dc406aef..216093f6c 100644 --- a/inc/lang/es/lang.php +++ b/inc/lang/es/lang.php @@ -356,4 +356,3 @@ $lang['currentns'] = 'Espacio de nombres actual'; $lang['searchresult'] = 'Resultado de la búsqueda'; $lang['plainhtml'] = 'HTML sencillo'; $lang['wikimarkup'] = 'Etiquetado Wiki'; -$lang['notloggedin'] = '¿Quizás has olvidado identificarte?'; diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php index 58877f3bc..cc736db4d 100644 --- a/inc/lang/et/lang.php +++ b/inc/lang/et/lang.php @@ -229,4 +229,3 @@ $lang['i_pol0'] = 'Avatud (lugemine, kirjutamine ja üleslaadimin $lang['i_pol1'] = 'Avalikuks lugemiseks (lugeda saavad kõik, kirjutada ja üles laadida vaid registreeritud kasutajad)'; $lang['i_pol2'] = 'Suletud (kõik õigused, kaasaarvatud lugemine on lubatud vaid registreeritud kasutajatele)'; $lang['i_retry'] = 'Proovi uuesti'; -$lang['notloggedin'] = 'liikuda, selleks on vastavaid õigusi vaja.'; diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php index fb42dfb27..c7e7ead9a 100644 --- a/inc/lang/eu/lang.php +++ b/inc/lang/eu/lang.php @@ -306,4 +306,3 @@ $lang['media_viewold'] = '%s -n %s'; $lang['media_edit'] = '%s editatu'; $lang['media_update'] = 'Bertsio berria igo'; $lang['media_restore'] = 'Bertsio hau berrezarri'; -$lang['notloggedin'] = 'Agian sesioa hastea ahaztu zaizu?'; diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php index 2b4c35b27..dbad62890 100644 --- a/inc/lang/fa/lang.php +++ b/inc/lang/fa/lang.php @@ -324,4 +324,3 @@ $lang['media_perm_read'] = 'متاسفانه ، شما حق خواندن $lang['media_perm_upload'] = 'متاسفانه ، شما حق آپلود این فایل ها را ندارید.'; $lang['media_update'] = 'آپلود نسخه جدید'; $lang['media_restore'] = 'بازیابی این نسخه'; -$lang['notloggedin'] = 'ممکن است فراموش کرده باشید که وارد سایت شوید!'; diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php index 10a730f3f..feefc3da8 100644 --- a/inc/lang/fi/lang.php +++ b/inc/lang/fi/lang.php @@ -334,4 +334,3 @@ $lang['currentns'] = 'Nykyinen nimiavaruus'; $lang['searchresult'] = 'Haun tulokset'; $lang['plainhtml'] = 'pelkkä HTML'; $lang['wikimarkup'] = 'Wiki markup'; -$lang['notloggedin'] = 'Ehkä unohdit kirjautua sisään?'; diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php index e4814869f..161e7321a 100644 --- a/inc/lang/fo/lang.php +++ b/inc/lang/fo/lang.php @@ -169,4 +169,3 @@ $lang['img_format'] = 'Snið'; $lang['img_camera'] = 'Fototól'; $lang['img_keywords'] = 'Evnisorð'; $lang['authtempfail'] = 'Validering av brúkara virkar fyribils ikki. Um hetta er varandi, fá so samband við umboðsstjóran á hesi wiki.'; -$lang['notloggedin'] = 'Møguliga hevur tú ikki rita inn.'; diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php index 64405ce6b..32e3055f7 100644 --- a/inc/lang/fr/lang.php +++ b/inc/lang/fr/lang.php @@ -353,5 +353,3 @@ $lang['currentns'] = 'Namespace actuel'; $lang['searchresult'] = 'Résultat de la recherche'; $lang['plainhtml'] = 'HTML brut'; $lang['wikimarkup'] = 'Wiki balise'; -$lang['notloggedin'] = 'Peut-être avez-vous oublié de vous identifier ?'; - diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php index 3e5229a17..65967a3b5 100644 --- a/inc/lang/gl/lang.php +++ b/inc/lang/gl/lang.php @@ -318,4 +318,3 @@ $lang['media_perm_read'] = 'Sentímolo, non tes permisos suficientes para $lang['media_perm_upload'] = 'Sentímolo, non tes permisos suficientes para subir arquivos.'; $lang['media_update'] = 'Subir nova versión'; $lang['media_restore'] = 'Restaurar esta versión'; -$lang['notloggedin'] = 'Pode que esqueceses iniciar a sesión?'; diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php index 7012c0e17..8efe0da17 100644 --- a/inc/lang/he/lang.php +++ b/inc/lang/he/lang.php @@ -325,4 +325,3 @@ $lang['media_sort_date'] = 'תאריך'; $lang['media_namespaces'] = 'בחר מרחב שמות'; $lang['media_files'] = 'קבצים ב s%'; $lang['media_upload'] = 'להעלות s%'; -$lang['notloggedin'] = 'אולי שכחת להיכנס למערכת?'; diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php index fe3a64d4d..f19610827 100644 --- a/inc/lang/hr/lang.php +++ b/inc/lang/hr/lang.php @@ -263,4 +263,3 @@ $lang['hours'] = '%d sati prije'; $lang['minutes'] = '%d minuta prije'; $lang['seconds'] = '%d sekundi prije'; $lang['wordblock'] = 'Vaša promjena nije spremljena jer sadrži blokirani tekst (spam).'; -$lang['notloggedin'] = 'Niste li se možda zaboravili prijaviti u aplikaciju?'; diff --git a/inc/lang/hu-formal/lang.php b/inc/lang/hu-formal/lang.php index 09bbdc58f..a98bdc0d3 100644 --- a/inc/lang/hu-formal/lang.php +++ b/inc/lang/hu-formal/lang.php @@ -25,4 +25,3 @@ $lang['btn_older'] = 'régebbi >>'; $lang['btn_revs'] = 'Korábbi változatok'; $lang['btn_recent'] = 'Legújabb változások'; $lang['btn_upload'] = 'Feltöltés'; -$lang['notloggedin'] = 'Talán elfelejtett bejelentkezni?'; diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php index 6fb20cc3f..a0aef9447 100644 --- a/inc/lang/hu/lang.php +++ b/inc/lang/hu/lang.php @@ -338,4 +338,3 @@ $lang['currentns'] = 'Aktuális névtér'; $lang['searchresult'] = 'Keresés eredménye'; $lang['plainhtml'] = 'Sima HTML'; $lang['wikimarkup'] = 'Wiki-jelölőnyelv'; -$lang['notloggedin'] = 'Esetleg elfelejtettél bejelentkezni?'; diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php index 7fc4dbb68..144dfe33b 100644 --- a/inc/lang/ia/lang.php +++ b/inc/lang/ia/lang.php @@ -260,4 +260,3 @@ $lang['days'] = '%d dies retro'; $lang['hours'] = '%d horas retro'; $lang['minutes'] = '%d minutas retro'; $lang['seconds'] = '%d secundas retro'; -$lang['notloggedin'] = 'Pote esser que tu ha oblidate de aperir un session.'; diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php index 34c687f1d..5cb5cb6ea 100644 --- a/inc/lang/id/lang.php +++ b/inc/lang/id/lang.php @@ -218,4 +218,3 @@ $lang['i_pol0'] = 'Wiki Terbuka (baca, tulis, upload untuk semua $lang['i_pol1'] = 'Wiki Publik (baca untuk semua orang, tulis dan upload untuk pengguna terdaftar)'; $lang['i_pol2'] = 'Wiki Privat (baca, tulis dan upload hanya untuk pengguna terdaftar)'; $lang['i_retry'] = 'Coba Lagi'; -$lang['notloggedin'] = 'Apakah Anda belum login?'; diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php index 95d64e00f..a2bde3b60 100644 --- a/inc/lang/it/lang.php +++ b/inc/lang/it/lang.php @@ -338,4 +338,3 @@ $lang['media_perm_upload'] = 'Spiacente, non hai abbastanza privilegi per ca $lang['media_update'] = 'Carica nuova versione'; $lang['media_restore'] = 'Ripristina questa versione'; $lang['searchresult'] = 'Risultati della ricerca'; -$lang['notloggedin'] = 'Forse hai dimenticato di effettuare l\'accesso?'; diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php index 367c56a9b..1f53b0a90 100644 --- a/inc/lang/ja/lang.php +++ b/inc/lang/ja/lang.php @@ -336,4 +336,3 @@ $lang['currentns'] = '現在の名前空間'; $lang['searchresult'] = '検索結果'; $lang['plainhtml'] = 'プレーンHTML'; $lang['wikimarkup'] = 'Wikiマークアップ'; -$lang['notloggedin'] = '実行する権限がありません。ログインされているか確認してください。'; diff --git a/inc/lang/km/lang.php b/inc/lang/km/lang.php index 5712956b0..4800b6c23 100644 --- a/inc/lang/km/lang.php +++ b/inc/lang/km/lang.php @@ -204,4 +204,3 @@ $lang['i_pol2'] = 'វីគីបិទជិត'; $lang['i_retry'] = 'ម្តងទៀត'; //Setup VIM: ex: et ts=2 : -$lang['notloggedin'] = 'សូមទុស អ្នកគ្មានអនុញ្ញាតទៅបណ្តទេ។ '; diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php index 120caba78..266ff01e5 100644 --- a/inc/lang/ko/lang.php +++ b/inc/lang/ko/lang.php @@ -336,4 +336,3 @@ $lang['currentns'] = '현재 이름공간'; $lang['searchresult'] = '검색 결과'; $lang['plainhtml'] = '일반 HTML'; $lang['wikimarkup'] = '위키 문법'; -$lang['notloggedin'] = '로그인을 잊으셨나요?'; diff --git a/inc/lang/ku/lang.php b/inc/lang/ku/lang.php index a8a1b8cbf..b6287806d 100644 --- a/inc/lang/ku/lang.php +++ b/inc/lang/ku/lang.php @@ -140,4 +140,3 @@ $lang['img_camera'] = 'Camera'; $lang['img_keywords']= 'Keywords'; //Setup VIM: ex: et ts=2 : -$lang['notloggedin'] = 'Perhaps you forgot to login?'; diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php index 885c4f4b8..c71a71bdd 100644 --- a/inc/lang/la/lang.php +++ b/inc/lang/la/lang.php @@ -260,4 +260,3 @@ $lang['hours'] = 'a horis %d'; $lang['minutes'] = 'a minutis %d'; $lang['seconds'] = 'a secundis %d'; $lang['wordblock'] = 'Mutationes non seruantur, eo quod mala uerba contenit'; -$lang['notloggedin'] = 'Ad hanc paginam accedere non potes: antea in conuentum ineas, deinde rursum temptas '; diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php index 7778478a4..55113745a 100644 --- a/inc/lang/lb/lang.php +++ b/inc/lang/lb/lang.php @@ -194,4 +194,3 @@ $lang['days'] = 'virun %d Deeg'; $lang['hours'] = 'virun %d Stonnen'; $lang['minutes'] = 'virun %d Minutten'; $lang['seconds'] = 'virun %d Sekonnen'; -$lang['notloggedin'] = 'Hues de vläicht vergiess dech anzeloggen?'; diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php index f03d6d5cd..c38ea8838 100644 --- a/inc/lang/lt/lang.php +++ b/inc/lang/lt/lang.php @@ -181,4 +181,3 @@ $lang['i_wikiname'] = 'Wiki vardas'; $lang['i_enableacl'] = 'Įjungti ACL (rekomenduojama)'; $lang['i_superuser'] = 'Supervartotojas'; $lang['i_problems'] = 'Instaliavimo metu buvo klaidų, kurios pateiktos žemiau. Tęsti negalima, kol nebus pašalintos priežastys.'; -$lang['notloggedin'] = 'Turbūt pamiršote prisijungti :-).'; diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php index df16a385d..898125d60 100644 --- a/inc/lang/lv/lang.php +++ b/inc/lang/lv/lang.php @@ -318,4 +318,3 @@ $lang['media_perm_read'] = 'Atvainojiet, jums nav tiesību skatīt failus. $lang['media_perm_upload'] = 'Atvainojiet, jums nav tiesību augšupielādēt. '; $lang['media_update'] = 'Augšupielādēt jaunu versiju'; $lang['media_restore'] = 'Atjaunot šo versiju'; -$lang['notloggedin'] = 'Varbūt aizmirsi ielogoties?'; diff --git a/inc/lang/mg/lang.php b/inc/lang/mg/lang.php index f179f2c28..c5ed669a9 100644 --- a/inc/lang/mg/lang.php +++ b/inc/lang/mg/lang.php @@ -119,4 +119,3 @@ $lang['js']['del_confirm']= 'Hofafana ilay andalana?'; $lang['admin_register']= 'Ampio mpampiasa vaovao...'; //Setup VIM: ex: et ts=2 : -$lang['notloggedin'] = 'Angamba hadinonao ny niditra.'; diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php index 15976d4a1..54b69974d 100644 --- a/inc/lang/mr/lang.php +++ b/inc/lang/mr/lang.php @@ -264,4 +264,3 @@ $lang['i_pol1'] = 'सार्वजनिक विकी ( स $lang['i_pol2'] = 'बंदिस्त विकी ( वाचन , लेखन व अपलोडची परवानगी फक्त नोंदणीकृत सदस्यांना ) '; $lang['i_retry'] = 'पुन्हा प्रयत्न'; $lang['recent_global'] = 'तुम्ही सध्या %s या नेमस्पेस मधील बदल पाहात आहात.तुम्ही पूर्ण विकी मधले बदल सुद्धा पाहू शकता.'; -$lang['notloggedin'] = 'कदाचित तुम्ही लॉगिन करायला विसरला आहात ?'; diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php index 5b24d4c49..7fd14d2c5 100644 --- a/inc/lang/ne/lang.php +++ b/inc/lang/ne/lang.php @@ -192,4 +192,3 @@ $lang['i_pol1'] = 'Public विकि (पठन सवैका $lang['i_pol2'] = 'बन्द विकि (पठन , लेखन, अपलोड ) दर्ता भएका प्रयोगकर्ताका लागि मात्र ।'; $lang['i_retry'] = 'पुन: प्रयास गर्नुहोस् '; $lang['recent_global'] = 'तपाई अहिले %s नेमस्पेस भित्र भएका परिवर्तन हेर्दैहुनुहुन्छ। तपाई पुरै विकिमा भएको परिवर्तन हेर्न सक्नुहुन्छ.'; -$lang['notloggedin'] = 'सम्भवत: तपाईले प्रवेश गर्न भुल्नु भयो।'; diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php index 88a88802b..e22aa9fff 100644 --- a/inc/lang/nl/lang.php +++ b/inc/lang/nl/lang.php @@ -348,4 +348,3 @@ $lang['currentns'] = 'Huidige namespace'; $lang['searchresult'] = 'Zoekresultaat'; $lang['plainhtml'] = 'Alleen HTML'; $lang['wikimarkup'] = 'Wiki Opmaak'; -$lang['notloggedin'] = 'Misschien ben je vergeten in te loggen?'; diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php index 278254f3f..3f31f6c73 100644 --- a/inc/lang/no/lang.php +++ b/inc/lang/no/lang.php @@ -348,4 +348,3 @@ $lang['media_restore'] = 'Gjenopprett denne versjonen'; $lang['currentns'] = 'gjeldende navnemellomrom'; $lang['searchresult'] = 'Søk i resultat'; $lang['plainhtml'] = 'Enkel HTML'; -$lang['notloggedin'] = 'Kanskje du har glemt å logge inn?'; diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php index 6af045226..e5f2d8d40 100644 --- a/inc/lang/pl/lang.php +++ b/inc/lang/pl/lang.php @@ -342,4 +342,3 @@ $lang['currentns'] = 'Obecny katalog'; $lang['searchresult'] = 'Wyniki wyszukiwania'; $lang['plainhtml'] = 'Czysty HTML'; $lang['wikimarkup'] = 'Znaczniki'; -$lang['notloggedin'] = 'Zaloguj się!'; diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php index bf92e06ed..6845e792d 100644 --- a/inc/lang/pt-br/lang.php +++ b/inc/lang/pt-br/lang.php @@ -349,4 +349,3 @@ $lang['currentns'] = 'Domínio atual'; $lang['searchresult'] = 'Resultado da Busca'; $lang['plainhtml'] = 'HTML simples'; $lang['wikimarkup'] = 'Marcação wiki'; -$lang['notloggedin'] = 'Por acaso esqueceu de autenticar-se?'; diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php index 230db88da..46405c444 100644 --- a/inc/lang/pt/lang.php +++ b/inc/lang/pt/lang.php @@ -319,4 +319,3 @@ $lang['media_perm_read'] = 'Perdão, não tem permissão para ler ficheiro $lang['media_perm_upload'] = 'Perdão, não tem permissão para enviar ficheiros.'; $lang['media_update'] = 'enviar nova versão'; $lang['media_restore'] = 'Restaurar esta versão'; -$lang['notloggedin'] = 'Talvez se tenha esquecido de iniciar sessão?'; diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php index fe0842e1e..491ab58e7 100644 --- a/inc/lang/ro/lang.php +++ b/inc/lang/ro/lang.php @@ -319,4 +319,3 @@ $lang['media_perm_read'] = 'Ne pare rău, dar nu ai suficiente permisiuni $lang['media_perm_upload'] = 'Ne pare rău, dar nu ai suficiente permisiuni pentru a putea încărca fișiere.'; $lang['media_update'] = 'Încarcă noua versiune'; $lang['media_restore'] = 'Restaurează această versiune'; -$lang['notloggedin'] = 'autentifici?'; diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php index 9a393193a..208d647a8 100644 --- a/inc/lang/ru/lang.php +++ b/inc/lang/ru/lang.php @@ -350,4 +350,3 @@ $lang['media_restore'] = 'Восстановить эту версию'; $lang['currentns'] = 'Текущее пространство имен'; $lang['searchresult'] = 'Результаты поиска'; $lang['plainhtml'] = 'Чистый HTML'; -$lang['notloggedin'] = 'Может быть вы забыли войти в вики под своим логином?'; diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php index 47cdc1fe4..aa823b074 100644 --- a/inc/lang/sk/lang.php +++ b/inc/lang/sk/lang.php @@ -332,4 +332,3 @@ $lang['currentns'] = 'Aktuálny menný priestor'; $lang['searchresult'] = 'Výsledky hľadania'; $lang['plainhtml'] = 'Jednoduché HTML'; $lang['wikimarkup'] = 'Wiki formát'; -$lang['notloggedin'] = 'Možno ste sa zabudli prihlásiť?'; diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php index 41e2b3b12..c9a47927d 100644 --- a/inc/lang/sl/lang.php +++ b/inc/lang/sl/lang.php @@ -327,4 +327,3 @@ $lang['currentns'] = 'Trenutni imenski prostor'; $lang['searchresult'] = 'Rezultati iskanja'; $lang['plainhtml'] = 'Zapis HTML'; $lang['wikimarkup'] = 'Oblikovni jezik Wiki'; -$lang['notloggedin'] = 'Ali ste se morda pozabili prijaviti?'; diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php index ab9208e55..2ed62ed4e 100644 --- a/inc/lang/sq/lang.php +++ b/inc/lang/sq/lang.php @@ -235,4 +235,3 @@ $lang['days'] = '%d ditë më parë'; $lang['hours'] = '%d orë më parë'; $lang['minutes'] = '%d minuta më parë'; $lang['seconds'] = '%d sekonda më parë'; -$lang['notloggedin'] = 'Mbase harruat të hyni?'; diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php index 53faa69ec..7c434cbc9 100644 --- a/inc/lang/sr/lang.php +++ b/inc/lang/sr/lang.php @@ -260,4 +260,3 @@ $lang['hours'] = 'Пре %d сати'; $lang['minutes'] = 'Пре %d минута'; $lang['seconds'] = 'Пре %d секунди'; $lang['wordblock'] = 'Ваше измене нису сачуване јер садрже забрањен текст (спам)'; -$lang['notloggedin'] = 'Можда сте заборавили да се пријавите?'; diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php index 867d038c4..8c8858f61 100644 --- a/inc/lang/sv/lang.php +++ b/inc/lang/sv/lang.php @@ -343,4 +343,3 @@ $lang['media_update'] = 'Ladda upp ny version'; $lang['media_restore'] = 'Återställ denna version'; $lang['searchresult'] = 'Sökresultat'; $lang['plainhtml'] = 'Ren HTML'; -$lang['notloggedin'] = 'Kanske har du glömt att logga in?'; diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php index 2e6abe6b6..5d364166b 100644 --- a/inc/lang/th/lang.php +++ b/inc/lang/th/lang.php @@ -219,4 +219,3 @@ $lang['days'] = '%d วันก่อน'; $lang['hours'] = '%d ชั่วโมงก่อน'; $lang['minutes'] = '%d นาทีก่อน'; $lang['seconds'] = '%d วินาทีก่อน'; -$lang['notloggedin'] = 'บางทีคุณอาจจะลืมล็อกอิน?'; diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php index a9c90054c..210a82530 100644 --- a/inc/lang/tr/lang.php +++ b/inc/lang/tr/lang.php @@ -304,4 +304,3 @@ $lang['media_history'] = 'Geçmiş %s'; $lang['media_perm_upload'] = 'Üzgünüm, karşıya dosya yükleme yetkiniz yok.'; $lang['media_update'] = 'Yeni versiyonu yükleyin'; $lang['media_restore'] = 'Bu sürümü eski haline getir'; -$lang['notloggedin'] = 'Giriş yapmayı unutmuş olabilir misiniz?'; diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php index d09360479..4e91e82a2 100644 --- a/inc/lang/uk/lang.php +++ b/inc/lang/uk/lang.php @@ -285,4 +285,3 @@ $lang['hours'] = '%d годин тому'; $lang['minutes'] = '%d хвилин тому'; $lang['seconds'] = '%d секунд тому'; $lang['wordblock'] = 'Ваші зміни не збережено, тому що вони розпізнані як такі, що містять заблокований текст(спам).'; -$lang['notloggedin'] = 'Можливо ви забули увійти в систему?'; diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php index b99311f1a..d8e40f875 100644 --- a/inc/lang/vi/lang.php +++ b/inc/lang/vi/lang.php @@ -239,4 +239,3 @@ $lang['media_perm_read'] = 'Sorry, bạn không đủ quyền truy cập.' $lang['media_perm_upload'] = 'Xin lỗi, bạn không đủ quyền để upload file lên.'; $lang['media_update'] = 'Tải lên phiên bản mới'; $lang['media_restore'] = 'Phục hồi phiên bản này'; -$lang['notloggedin'] = 'Bạn quên đăng nhập hay sao?'; diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php index b230cd70d..456377810 100644 --- a/inc/lang/zh-tw/lang.php +++ b/inc/lang/zh-tw/lang.php @@ -341,4 +341,3 @@ $lang['currentns'] = '目前的命名空間'; $lang['searchresult'] = '搜尋結果'; $lang['plainhtml'] = '純 HTML'; $lang['wikimarkup'] = 'Wiki 語法標記'; -$lang['notloggedin'] = '抱歉，您沒有足夠權限繼續執行。或許您忘了登入？'; diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php index c3fdae46b..004997d6e 100644 --- a/inc/lang/zh/lang.php +++ b/inc/lang/zh/lang.php @@ -349,4 +349,3 @@ $lang['currentns'] = '当前命名空间'; $lang['searchresult'] = '搜索结果'; $lang['plainhtml'] = '纯HTML'; $lang['wikimarkup'] = 'Wiki Markup 语言'; -$lang['notloggedin'] = '对不起，您没有足够权限，无法继续。也许您忘了登录？'; -- cgit v1.2.3 From d1e9181ef12479db0c36d6d93f0ecff84523bf73 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 6 Mar 2014 23:50:05 +0100 Subject: removed 'not logged in' text, loginform is shown already --- inc/html.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'inc') diff --git a/inc/html.php b/inc/html.php index 514f961e7..4a355bdaf 100644 --- a/inc/html.php +++ b/inc/html.php @@ -71,16 +71,7 @@ function html_login(){ * @return string html */ function html_denied() { - global $lang; - $denied = p_locale_xhtml('denied'); - $notloggedin = isset($_SERVER['REMOTE_USER']) ? '' : $lang['notloggedin']; - - $denied = str_replace( - array('@NOTLOGGEDIN@'), - array($notloggedin), - $denied - ); - print $denied; + print p_locale_xhtml('denied'); if(!$_SERVER['REMOTE_USER']){ html_login(); -- cgit v1.2.3 From b981d5915250e5efe218466b608607174eb26608 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Fri, 7 Mar 2014 00:06:17 +0100 Subject: remove placeholder van denied.txt --- inc/lang/ar/denied.txt | 2 +- inc/lang/az/denied.txt | 2 +- inc/lang/bg/denied.txt | 2 +- inc/lang/bn/denied.txt | 2 +- inc/lang/ca-valencia/denied.txt | 2 +- inc/lang/ca/denied.txt | 2 +- inc/lang/cs/denied.txt | 2 +- inc/lang/da/denied.txt | 2 +- inc/lang/de-informal/denied.txt | 2 +- inc/lang/de/denied.txt | 2 +- inc/lang/el/denied.txt | 1 - inc/lang/en/denied.txt | 2 +- inc/lang/eo/denied.txt | 2 +- inc/lang/es/denied.txt | 3 ++- inc/lang/et/denied.txt | 3 ++- inc/lang/eu/denied.txt | 3 ++- inc/lang/fa/denied.txt | 3 ++- inc/lang/fi/denied.txt | 3 ++- inc/lang/fo/denied.txt | 3 ++- inc/lang/fr/denied.txt | 3 ++- inc/lang/gl/denied.txt | 2 +- inc/lang/he/denied.txt | 3 ++- inc/lang/hr/denied.txt | 1 - inc/lang/hu-formal/denied.txt | 3 ++- inc/lang/hu/denied.txt | 2 +- inc/lang/ia/denied.txt | 3 ++- inc/lang/id/denied.txt | 2 +- inc/lang/it/denied.txt | 2 +- inc/lang/ja/denied.txt | 2 +- inc/lang/km/denied.txt | 3 ++- inc/lang/ko/denied.txt | 3 ++- inc/lang/ku/denied.txt | 2 +- inc/lang/la/denied.txt | 3 ++- inc/lang/lb/denied.txt | 3 ++- inc/lang/lt/denied.txt | 2 +- inc/lang/lv/denied.txt | 4 +--- inc/lang/mg/denied.txt | 2 +- inc/lang/mr/denied.txt | 3 ++- inc/lang/ne/denied.txt | 3 ++- inc/lang/nl/denied.txt | 3 ++- inc/lang/no/denied.txt | 3 ++- inc/lang/pl/denied.txt | 2 +- inc/lang/pt-br/denied.txt | 3 ++- inc/lang/pt/denied.txt | 3 ++- inc/lang/ro/denied.txt | 3 ++- inc/lang/ru/denied.txt | 3 ++- inc/lang/sk/denied.txt | 3 ++- inc/lang/sl/denied.txt | 3 ++- inc/lang/sq/denied.txt | 3 ++- inc/lang/sr/denied.txt | 2 +- inc/lang/sv/denied.txt | 2 +- inc/lang/th/denied.txt | 3 ++- inc/lang/tr/denied.txt | 2 +- inc/lang/uk/denied.txt | 2 +- inc/lang/vi/denied.txt | 3 ++- inc/lang/zh-tw/denied.txt | 2 +- inc/lang/zh/denied.txt | 3 ++- 57 files changed, 83 insertions(+), 59 deletions(-) (limited to 'inc') diff --git a/inc/lang/ar/denied.txt b/inc/lang/ar/denied.txt index 1d83efdff..b369f7f23 100644 --- a/inc/lang/ar/denied.txt +++ b/inc/lang/ar/denied.txt @@ -1,3 +1,3 @@ ====== لا صلاحيات ====== -عذرا، ليس مصرح لك الاستمرار @NOTLOGGEDIN@ \ No newline at end of file +عذرا، ليس مصرح لك الاستمرار \ No newline at end of file diff --git a/inc/lang/az/denied.txt b/inc/lang/az/denied.txt index 2b5258274..c6fddb63a 100644 --- a/inc/lang/az/denied.txt +++ b/inc/lang/az/denied.txt @@ -1,3 +1,3 @@ ====== Müraciət qadağan edilmişdir ====== -Sizin bu əməliyyat üçün kifayət qədər haqqınız yoxdur. @NOTLOGGEDIN@ +Sizin bu əməliyyat üçün kifayət qədər haqqınız yoxdur. diff --git a/inc/lang/bg/denied.txt b/inc/lang/bg/denied.txt index 2443c3130..bd695d46d 100644 --- a/inc/lang/bg/denied.txt +++ b/inc/lang/bg/denied.txt @@ -1,4 +1,4 @@ ====== Отказан достъп ====== -Нямате достатъчно права, за да продължите. @NOTLOGGEDIN@ +Нямате достатъчно права, за да продължите. diff --git a/inc/lang/bn/denied.txt b/inc/lang/bn/denied.txt index dbc00e26a..5ba0fcf4f 100644 --- a/inc/lang/bn/denied.txt +++ b/inc/lang/bn/denied.txt @@ -1,3 +1,3 @@ ====== অনুমতি অস্বীকার ===== -দুঃখিত, আপনি কি এগিয়ে যেতে যথেষ্ট অধিকার নেই. @NOTLOGGEDIN@ \ No newline at end of file +দুঃখিত, আপনি কি এগিয়ে যেতে যথেষ্ট অধিকার নেই. \ No newline at end of file diff --git a/inc/lang/ca-valencia/denied.txt b/inc/lang/ca-valencia/denied.txt index ff42fd37a..6640e07f5 100644 --- a/inc/lang/ca-valencia/denied.txt +++ b/inc/lang/ca-valencia/denied.txt @@ -1,4 +1,4 @@ ====== Permís denegat ====== -Disculpe, pero no té permís per a continuar. @NOTLOGGEDIN@ +Disculpe, pero no té permís per a continuar. diff --git a/inc/lang/ca/denied.txt b/inc/lang/ca/denied.txt index 481375d2b..3f66d6bb6 100644 --- a/inc/lang/ca/denied.txt +++ b/inc/lang/ca/denied.txt @@ -1,4 +1,4 @@ ====== Permís denegat ====== -No teniu prou drets per continuar. @NOTLOGGEDIN@ +No teniu prou drets per continuar. diff --git a/inc/lang/cs/denied.txt b/inc/lang/cs/denied.txt index c0f82f492..29524e5db 100644 --- a/inc/lang/cs/denied.txt +++ b/inc/lang/cs/denied.txt @@ -1,3 +1,3 @@ ====== Nepovolená akce ====== -Promiňte, ale nemáte dostatečná oprávnění k této činnosti. @NOTLOGGEDIN@ +Promiňte, ale nemáte dostatečná oprávnění k této činnosti. diff --git a/inc/lang/da/denied.txt b/inc/lang/da/denied.txt index 2be828c51..7bf3b8b9b 100644 --- a/inc/lang/da/denied.txt +++ b/inc/lang/da/denied.txt @@ -1,3 +1,3 @@ ====== Adgang nægtet! ====== -Du har ikke rettigheder til at fortsætte. @NOTLOGGEDIN@ +Du har ikke rettigheder til at fortsætte. diff --git a/inc/lang/de-informal/denied.txt b/inc/lang/de-informal/denied.txt index a2713d2e9..99004f6e1 100644 --- a/inc/lang/de-informal/denied.txt +++ b/inc/lang/de-informal/denied.txt @@ -1,4 +1,4 @@ ====== Zugang verweigert ====== -Du hast nicht die erforderliche Berechtigung, um diese Aktion durchzuführen. @NOTLOGGEDIN@ +Du hast nicht die erforderliche Berechtigung, um diese Aktion durchzuführen. diff --git a/inc/lang/de/denied.txt b/inc/lang/de/denied.txt index 1538c694d..db3343876 100644 --- a/inc/lang/de/denied.txt +++ b/inc/lang/de/denied.txt @@ -1,4 +1,4 @@ ====== Zugang verweigert ====== -Sie haben nicht die erforderliche Berechtigung, um diese Aktion durchzuführen. @NOTLOGGEDIN@ +Sie haben nicht die erforderliche Berechtigung, um diese Aktion durchzuführen. diff --git a/inc/lang/el/denied.txt b/inc/lang/el/denied.txt index 1c2717613..25fcbe8ca 100644 --- a/inc/lang/el/denied.txt +++ b/inc/lang/el/denied.txt @@ -2,4 +2,3 @@ Συγγνώμη, αλλά δεν έχετε επαρκή δικαιώματα για την συγκεκριμένη ενέργεια. -@NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/en/denied.txt b/inc/lang/en/denied.txt index 6f7fe055e..34cb8456a 100644 --- a/inc/lang/en/denied.txt +++ b/inc/lang/en/denied.txt @@ -1,4 +1,4 @@ ====== Permission Denied ====== -Sorry, you don't have enough rights to continue. @NOTLOGGEDIN@ +Sorry, you don't have enough rights to continue. diff --git a/inc/lang/eo/denied.txt b/inc/lang/eo/denied.txt index 942cbbe86..0be6a2e84 100644 --- a/inc/lang/eo/denied.txt +++ b/inc/lang/eo/denied.txt @@ -1,4 +1,4 @@ ====== Aliro malpermesita ====== -Vi ne havas sufiĉajn rajtojn rigardi ĉi tiujn paĝojn. @NOTLOGGEDIN@ +Vi ne havas sufiĉajn rajtojn rigardi ĉi tiujn paĝojn. diff --git a/inc/lang/es/denied.txt b/inc/lang/es/denied.txt index 0887e7ce6..02a76a8cf 100644 --- a/inc/lang/es/denied.txt +++ b/inc/lang/es/denied.txt @@ -1,3 +1,4 @@ ====== Permiso Denegado ====== -Lo siento, no tienes suficientes permisos para continuar. @NOTLOGGEDIN@ \ No newline at end of file +Lo siento, no tienes suficientes permisos para continuar. + diff --git a/inc/lang/et/denied.txt b/inc/lang/et/denied.txt index f2d81c007..093ccf4a8 100644 --- a/inc/lang/et/denied.txt +++ b/inc/lang/et/denied.txt @@ -1,3 +1,4 @@ ====== Sul pole ligipääsuluba ====== -Kahju küll, aga sinu tublidusest ei piisa, et edasi liikuda. @NOTLOGGEDIN@ +Kahju küll, aga sinu tublidusest ei piisa, et edasi liikuda. + diff --git a/inc/lang/eu/denied.txt b/inc/lang/eu/denied.txt index d454ffdfb..869c4c7d8 100644 --- a/inc/lang/eu/denied.txt +++ b/inc/lang/eu/denied.txt @@ -1,3 +1,4 @@ ====== Ez duzu baimenik ====== -Barkatu, ez duzu baimenik orri hau ikusteko. @NOTLOGGEDIN@ \ No newline at end of file +Barkatu, ez duzu baimenik orri hau ikusteko. + diff --git a/inc/lang/fa/denied.txt b/inc/lang/fa/denied.txt index cb9258c03..4bffa0f3c 100644 --- a/inc/lang/fa/denied.txt +++ b/inc/lang/fa/denied.txt @@ -1,3 +1,4 @@ ====== دسترسی ممکن نیست ====== -شرمنده، شما اجازه‌ی دسترسی ب این صفحه را ندارید. @NOTLOGGEDIN@ \ No newline at end of file +شرمنده، شما اجازه‌ی دسترسی ب این صفحه را ندارید. + diff --git a/inc/lang/fi/denied.txt b/inc/lang/fi/denied.txt index 89ae3b8e1..89ebd4830 100644 --- a/inc/lang/fi/denied.txt +++ b/inc/lang/fi/denied.txt @@ -1,3 +1,4 @@ ====== Lupa evätty ====== -Sinulla ei ole tarpeeksi valtuuksia jatkaa. @NOTLOGGEDIN@ +Sinulla ei ole tarpeeksi valtuuksia jatkaa. + diff --git a/inc/lang/fo/denied.txt b/inc/lang/fo/denied.txt index 25d98f634..ecebba88c 100644 --- a/inc/lang/fo/denied.txt +++ b/inc/lang/fo/denied.txt @@ -1,3 +1,4 @@ ====== Atgongd nokta! ====== -Tú hevur ikki rættindi til at halda áfram. @NOTLOGGEDIN@ +Tú hevur ikki rættindi til at halda áfram. + diff --git a/inc/lang/fr/denied.txt b/inc/lang/fr/denied.txt index 8bba75153..da01a4086 100644 --- a/inc/lang/fr/denied.txt +++ b/inc/lang/fr/denied.txt @@ -1,3 +1,4 @@ ====== Autorisation refusée ====== -Désolé, vous n'avez pas suffisement d'autorisations pour poursuivre votre demande. @NOTLOGGEDIN@ +Désolé, vous n'avez pas suffisement d'autorisations pour poursuivre votre demande. + diff --git a/inc/lang/gl/denied.txt b/inc/lang/gl/denied.txt index a0847ecb2..ef37a06f0 100644 --- a/inc/lang/gl/denied.txt +++ b/inc/lang/gl/denied.txt @@ -1,4 +1,4 @@ ====== Permiso Denegado ====== -Sentímolo, mais non tes permisos de abondo para continuares. @NOTLOGGEDIN@ +Sentímolo, mais non tes permisos de abondo para continuares. diff --git a/inc/lang/he/denied.txt b/inc/lang/he/denied.txt index 1c605f7b8..a2e19f3c5 100644 --- a/inc/lang/he/denied.txt +++ b/inc/lang/he/denied.txt @@ -1,3 +1,4 @@ ====== הרשאה נדחתה ====== -אנו מצטערים אך אין לך הרשאות מתאימות כדי להמשיך. @NOTLOGGEDIN@ \ No newline at end of file +אנו מצטערים אך אין לך הרשאות מתאימות כדי להמשיך. + diff --git a/inc/lang/hr/denied.txt b/inc/lang/hr/denied.txt index c9b0ca3eb..172b0fc92 100644 --- a/inc/lang/hr/denied.txt +++ b/inc/lang/hr/denied.txt @@ -2,4 +2,3 @@ Nemate autorizaciju. -@NOTLOGGEDIN@ \ No newline at end of file diff --git a/inc/lang/hu-formal/denied.txt b/inc/lang/hu-formal/denied.txt index f25e4f086..d56a18117 100644 --- a/inc/lang/hu-formal/denied.txt +++ b/inc/lang/hu-formal/denied.txt @@ -1,3 +1,4 @@ ====== Hozzáférés megtadadva ====== -Sajnáljuk, de nincs joga a folytatáshoz. @NOTLOGGEDIN@ \ No newline at end of file +Sajnáljuk, de nincs joga a folytatáshoz. + diff --git a/inc/lang/hu/denied.txt b/inc/lang/hu/denied.txt index 85bb6d352..922cbb895 100644 --- a/inc/lang/hu/denied.txt +++ b/inc/lang/hu/denied.txt @@ -1,4 +1,4 @@ ====== Hozzáférés megtagadva ====== -Sajnáljuk, nincs jogod a folytatáshoz. @NOTLOGGEDIN@ +Sajnáljuk, nincs jogod a folytatáshoz. diff --git a/inc/lang/ia/denied.txt b/inc/lang/ia/denied.txt index 29d35bbde..82f2fc668 100644 --- a/inc/lang/ia/denied.txt +++ b/inc/lang/ia/denied.txt @@ -1,3 +1,4 @@ ====== Permission refusate ====== -Pardono, tu non ha le derectos requisite pro continuar. @NOTLOGGEDIN@ \ No newline at end of file +Pardono, tu non ha le derectos requisite pro continuar. + diff --git a/inc/lang/id/denied.txt b/inc/lang/id/denied.txt index e40be0550..ff09c13c4 100644 --- a/inc/lang/id/denied.txt +++ b/inc/lang/id/denied.txt @@ -1,4 +1,4 @@ ====== Akses Ditolak ====== -Maaf, Anda tidak mempunyai hak akses untuk melanjutkan. @NOTLOGGEDIN@ +Maaf, Anda tidak mempunyai hak akses untuk melanjutkan. diff --git a/inc/lang/it/denied.txt b/inc/lang/it/denied.txt index 6bba10cf0..577d081ce 100644 --- a/inc/lang/it/denied.txt +++ b/inc/lang/it/denied.txt @@ -1,4 +1,4 @@ ====== Accesso negato ====== -Non hai i diritti per continuare. @NOTLOGGEDIN@ +Non hai i diritti per continuare. diff --git a/inc/lang/ja/denied.txt b/inc/lang/ja/denied.txt index 452d62217..98ccb2f5a 100644 --- a/inc/lang/ja/denied.txt +++ b/inc/lang/ja/denied.txt @@ -1,4 +1,4 @@ ====== アクセスが拒否されました ====== -実行する権限がありません。@NOTLOGGEDIN@ +実行する権限がありません。 diff --git a/inc/lang/km/denied.txt b/inc/lang/km/denied.txt index 7fa1868b4..be0371498 100644 --- a/inc/lang/km/denied.txt +++ b/inc/lang/km/denied.txt @@ -1,3 +1,4 @@ ====== បដិសេធអនុញ្ញាត ====== -សូមទុស អ្នកគ្មានអនុញ្ញាតទៅបណ្តទេ។ @NOTLOGGEDIN@ + +សូមទុស អ្នកគ្មានអនុញ្ញាតទៅបណ្តទេ។ diff --git a/inc/lang/ko/denied.txt b/inc/lang/ko/denied.txt index 50556a72e..a4b94be65 100644 --- a/inc/lang/ko/denied.txt +++ b/inc/lang/ko/denied.txt @@ -1,3 +1,4 @@ ====== 권한 거절 ====== -죄송하지만 계속할 수 있는 권한이 없습니다. @NOTLOGGEDIN@ \ No newline at end of file +죄송하지만 계속할 수 있는 권한이 없습니다. + diff --git a/inc/lang/ku/denied.txt b/inc/lang/ku/denied.txt index 6f7fe055e..34cb8456a 100644 --- a/inc/lang/ku/denied.txt +++ b/inc/lang/ku/denied.txt @@ -1,4 +1,4 @@ ====== Permission Denied ====== -Sorry, you don't have enough rights to continue. @NOTLOGGEDIN@ +Sorry, you don't have enough rights to continue. diff --git a/inc/lang/la/denied.txt b/inc/lang/la/denied.txt index e703c7716..1cdaf05c9 100644 --- a/inc/lang/la/denied.txt +++ b/inc/lang/la/denied.txt @@ -1,3 +1,4 @@ ====== Ad hanc paginam accedere non potes ====== -Ad hanc paginam accedere non potes: antea in conuentum ineas, deinde rursum temptas @NOTLOGGEDIN@ \ No newline at end of file +Ad hanc paginam accedere non potes: antea in conuentum ineas. + diff --git a/inc/lang/lb/denied.txt b/inc/lang/lb/denied.txt index a7b52d024..1a7fd8f52 100644 --- a/inc/lang/lb/denied.txt +++ b/inc/lang/lb/denied.txt @@ -1,3 +1,4 @@ ======Erlaabnis verweigert====== -Et deet mer leed, du hues net genuch Rechter fir weiderzefueren. @NOTLOGGEDIN@ +Et deet mer leed, du hues net genuch Rechter fir weiderzefueren. + diff --git a/inc/lang/lt/denied.txt b/inc/lang/lt/denied.txt index de651bb1a..9a8544694 100644 --- a/inc/lang/lt/denied.txt +++ b/inc/lang/lt/denied.txt @@ -1,4 +1,4 @@ ====== Priėjimas uždraustas ====== -Jūs neturite reikiamų teisių, kad galėtumėte tęsti. @NOTLOGGEDIN@ +Jūs neturite reikiamų teisių, kad galėtumėte tęsti. diff --git a/inc/lang/lv/denied.txt b/inc/lang/lv/denied.txt index e8287242e..6733fb2e9 100644 --- a/inc/lang/lv/denied.txt +++ b/inc/lang/lv/denied.txt @@ -1,6 +1,4 @@ ====== Piekļuve aizliegta ====== -Atvaino, tev nav tiesību turpināt. @NOTLOGGEDIN@ - - +Atvaino, tev nav tiesību turpināt. diff --git a/inc/lang/mg/denied.txt b/inc/lang/mg/denied.txt index a769bcd40..d6d2b814e 100644 --- a/inc/lang/mg/denied.txt +++ b/inc/lang/mg/denied.txt @@ -1,4 +1,4 @@ ====== Tsy tafiditra ====== -Miala tsiny fa tsy manana alalana hanohizana mankany ianao. @NOTLOGGEDIN@ +Miala tsiny fa tsy manana alalana hanohizana mankany ianao. diff --git a/inc/lang/mr/denied.txt b/inc/lang/mr/denied.txt index 2a7827e3e..5415fde04 100644 --- a/inc/lang/mr/denied.txt +++ b/inc/lang/mr/denied.txt @@ -1,3 +1,4 @@ ====== परवानगी नाकारली ====== -क्षमा करा, पण तुम्हाला यापुढे जाण्याचे हक्क नाहीत. @NOTLOGGEDIN@ \ No newline at end of file +क्षमा करा, पण तुम्हाला यापुढे जाण्याचे हक्क नाहीत. + diff --git a/inc/lang/ne/denied.txt b/inc/lang/ne/denied.txt index 69e1840e7..5c58cde28 100644 --- a/inc/lang/ne/denied.txt +++ b/inc/lang/ne/denied.txt @@ -1,3 +1,4 @@ ====== अनुमति अमान्य ====== -माफ गर्नुहोला तपाईलाई अगाडि बढ्न अनुमति छैन। @NOTLOGGEDIN@ \ No newline at end of file +माफ गर्नुहोला तपाईलाई अगाडि बढ्न अनुमति छैन। + diff --git a/inc/lang/nl/denied.txt b/inc/lang/nl/denied.txt index 8c2cf3f42..a172ddab6 100644 --- a/inc/lang/nl/denied.txt +++ b/inc/lang/nl/denied.txt @@ -1,3 +1,4 @@ ====== Toegang geweigerd ====== -Sorry: je hebt niet voldoende rechten om verder te gaan. @NOTLOGGEDIN@ +Sorry: je hebt niet voldoende rechten om verder te gaan. + diff --git a/inc/lang/no/denied.txt b/inc/lang/no/denied.txt index f34b73cbb..f60f48f6b 100644 --- a/inc/lang/no/denied.txt +++ b/inc/lang/no/denied.txt @@ -1,3 +1,4 @@ ====== Adgang forbudt ====== -Beklager, men du har ikke rettigheter til dette. @NOTLOGGEDIN@ +Beklager, men du har ikke rettigheter til dette. + diff --git a/inc/lang/pl/denied.txt b/inc/lang/pl/denied.txt index c9352536a..2b268b921 100644 --- a/inc/lang/pl/denied.txt +++ b/inc/lang/pl/denied.txt @@ -1,4 +1,4 @@ ====== Brak dostępu ====== -Nie masz wystarczających uprawnień. @NOTLOGGEDIN@ +Nie masz wystarczających uprawnień. diff --git a/inc/lang/pt-br/denied.txt b/inc/lang/pt-br/denied.txt index 5f6cc318d..9a71df619 100644 --- a/inc/lang/pt-br/denied.txt +++ b/inc/lang/pt-br/denied.txt @@ -1,3 +1,4 @@ ====== Permissão Negada ====== -Desculpe, você não tem permissões suficientes para continuar. @NOTLOGGEDIN@ +Desculpe, você não tem permissões suficientes para continuar. + diff --git a/inc/lang/pt/denied.txt b/inc/lang/pt/denied.txt index e3e0c6e4b..3af816666 100644 --- a/inc/lang/pt/denied.txt +++ b/inc/lang/pt/denied.txt @@ -1,3 +1,4 @@ ====== Permissão Negada ====== -Não possui direitos e permissões suficientes para continuar. @NOTLOGGEDIN@ \ No newline at end of file +Não possui direitos e permissões suficientes para continuar. + diff --git a/inc/lang/ro/denied.txt b/inc/lang/ro/denied.txt index 966b259b9..490233acf 100644 --- a/inc/lang/ro/denied.txt +++ b/inc/lang/ro/denied.txt @@ -1,3 +1,4 @@ ====== Acces nepermis ====== -Din păcate nu ai destule drepturi pentru a continua. @NOTLOGGEDIN@ +Din păcate nu ai destule drepturi pentru a continua. + diff --git a/inc/lang/ru/denied.txt b/inc/lang/ru/denied.txt index e8143810e..6b7c82511 100644 --- a/inc/lang/ru/denied.txt +++ b/inc/lang/ru/denied.txt @@ -1,3 +1,4 @@ ====== Доступ запрещён ====== -Извините, у вас не хватает прав для этого действия. @NOTLOGGEDIN@ \ No newline at end of file +Извините, у вас не хватает прав для этого действия. + diff --git a/inc/lang/sk/denied.txt b/inc/lang/sk/denied.txt index 191c9b42a..aa6f7b8fb 100644 --- a/inc/lang/sk/denied.txt +++ b/inc/lang/sk/denied.txt @@ -1,3 +1,4 @@ ====== Nepovolená akcia ====== -Prepáčte, ale nemáte dostatočné oprávnenie k tejto činnosti. @NOTLOGGEDIN@ +Prepáčte, ale nemáte dostatočné oprávnenie k tejto činnosti. + diff --git a/inc/lang/sl/denied.txt b/inc/lang/sl/denied.txt index ca73c53a2..206e167bb 100644 --- a/inc/lang/sl/denied.txt +++ b/inc/lang/sl/denied.txt @@ -1,3 +1,4 @@ ====== Ni ustreznih dovoljenj ====== -Za nadaljevanje opravila je treba imeti ustrezna dovoljenja. @NOTLOGGEDIN@ +Za nadaljevanje opravila je treba imeti ustrezna dovoljenja. + diff --git a/inc/lang/sq/denied.txt b/inc/lang/sq/denied.txt index 19b04f1f9..60aa05e55 100644 --- a/inc/lang/sq/denied.txt +++ b/inc/lang/sq/denied.txt @@ -1,3 +1,4 @@ ====== Leja Refuzohet ====== -Na vjen keq, ju nuk keni të drejta të mjaftueshme për të vazhduar. @NOTLOGGEDIN@ \ No newline at end of file +Na vjen keq, ju nuk keni të drejta të mjaftueshme për të vazhduar. + diff --git a/inc/lang/sr/denied.txt b/inc/lang/sr/denied.txt index 42d0bdf57..521c28453 100644 --- a/inc/lang/sr/denied.txt +++ b/inc/lang/sr/denied.txt @@ -1,4 +1,4 @@ ====== Забрањен приступ ====== -Извините, али немате довољно права да наставите. @NOTLOGGEDIN@ +Извините, али немате довољно права да наставите. diff --git a/inc/lang/sv/denied.txt b/inc/lang/sv/denied.txt index a60632c6a..7ae09b85b 100644 --- a/inc/lang/sv/denied.txt +++ b/inc/lang/sv/denied.txt @@ -1,4 +1,4 @@ ====== Åtkomst nekad ====== -Tyvärr, du har inte behörighet att fortsätta. @NOTLOGGEDIN@ +Tyvärr, du har inte behörighet att fortsätta. diff --git a/inc/lang/th/denied.txt b/inc/lang/th/denied.txt index 6375697e2..4cc29d626 100644 --- a/inc/lang/th/denied.txt +++ b/inc/lang/th/denied.txt @@ -1,3 +1,4 @@ ====== ปฏิเสธสิทธิ์ ====== -ขออภัย คุณไม่มีสิทธิ์เพียงพอที่จะดำเนินการต่อ @NOTLOGGEDIN@ \ No newline at end of file +ขออภัย คุณไม่มีสิทธิ์เพียงพอที่จะดำเนินการต่อ + diff --git a/inc/lang/tr/denied.txt b/inc/lang/tr/denied.txt index ecc277c1f..2acfd7a8f 100644 --- a/inc/lang/tr/denied.txt +++ b/inc/lang/tr/denied.txt @@ -1,4 +1,4 @@ ====== Yetki Reddedildi ====== -Üzgünüz, devam etmek için yetkiniz yok. @NOTLOGGEDIN@ +Üzgünüz, devam etmek için yetkiniz yok. diff --git a/inc/lang/uk/denied.txt b/inc/lang/uk/denied.txt index 8e0a4fe7f..635d31c38 100644 --- a/inc/lang/uk/denied.txt +++ b/inc/lang/uk/denied.txt @@ -1,4 +1,4 @@ ====== Доступ заборонено ====== -Вибачте, але у вас не вистачає прав для продовження. @NOTLOGGEDIN@ +Вибачте, але у вас не вистачає прав для продовження. diff --git a/inc/lang/vi/denied.txt b/inc/lang/vi/denied.txt index 58739e63e..fe6e759fc 100644 --- a/inc/lang/vi/denied.txt +++ b/inc/lang/vi/denied.txt @@ -1,3 +1,4 @@ ====== Không được phép vào ====== -Rất tiếc là bạn không được phép để tiếp tục. @NOTLOGGEDIN@ +Rất tiếc là bạn không được phép để tiếp tục. + diff --git a/inc/lang/zh-tw/denied.txt b/inc/lang/zh-tw/denied.txt index 4297c1a20..23f306d07 100644 --- a/inc/lang/zh-tw/denied.txt +++ b/inc/lang/zh-tw/denied.txt @@ -1,4 +1,4 @@ ====== 權限拒絕 ====== -抱歉，您沒有足夠權限繼續執行。@NOTLOGGEDIN@ +抱歉，您沒有足夠權限繼續執行。 diff --git a/inc/lang/zh/denied.txt b/inc/lang/zh/denied.txt index bf3a85478..94721e48a 100644 --- a/inc/lang/zh/denied.txt +++ b/inc/lang/zh/denied.txt @@ -1,3 +1,4 @@ ====== 拒绝授权 ====== -对不起，您没有足够权限，无法继续。@NOTLOGGEDIN@ \ No newline at end of file +对不起，您没有足够权限，无法继续。 + -- cgit v1.2.3 From 49f299d6a332f8755f3b7a20c414702cca9c5ab8 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Thu, 6 Mar 2014 23:19:19 +0000 Subject: another instance of empty() where an array key might not exist --- inc/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/search.php b/inc/search.php index 21666b3fd..be4710237 100644 --- a/inc/search.php +++ b/inc/search.php @@ -353,7 +353,7 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){ // get ID and check if it is a valid one $item['id'] = pathID($file,($type == 'd' || !empty($opts['keeptxt']))); if($item['id'] != cleanID($item['id'])){ - if($opts['showmsg']){ + if(!empty($opts['showmsg'])){ msg(hsc($item['id']).' is not a valid file name for DokuWiki - skipped',-1); } return false; // skip non-valid files -- cgit v1.2.3 From 6bc2d8e51371c2ee17233d4c76112e3fefca437f Mon Sep 17 00:00:00 2001 From: Aleksandr Selivanov Date: Sat, 8 Mar 2014 13:05:57 +0100 Subject: translation update --- inc/lang/ru/lang.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'inc') diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php index 208d647a8..3515d02ce 100644 --- a/inc/lang/ru/lang.php +++ b/inc/lang/ru/lang.php @@ -24,6 +24,7 @@ * @author Pavel * @author Artur * @author Erli Moen + * @author Aleksandr Selivanov */ $lang['encoding'] = ' utf-8'; $lang['direction'] = 'ltr'; @@ -350,3 +351,4 @@ $lang['media_restore'] = 'Восстановить эту версию'; $lang['currentns'] = 'Текущее пространство имен'; $lang['searchresult'] = 'Результаты поиска'; $lang['plainhtml'] = 'Чистый HTML'; +$lang['wikimarkup'] = 'вики-разметка'; -- cgit v1.2.3 From 71324fa7507690cb9078385f401e3ce772221fb8 Mon Sep 17 00:00:00 2001 From: Janar Leas Date: Sat, 8 Mar 2014 23:30:35 +0100 Subject: translation update --- inc/lang/et/lang.php | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'inc') diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php index 3dbf9f53d..1be57c05d 100644 --- a/inc/lang/et/lang.php +++ b/inc/lang/et/lang.php @@ -9,6 +9,7 @@ * @author kristian.kankainen@kuu.la * @author Rivo Zängov * @author Janar Leas + * @author Janar Leas */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -196,9 +197,22 @@ $lang['created'] = 'tekitatud'; $lang['restored'] = 'vana versioon taastatud (%s)'; $lang['external_edit'] = 'väline muutmine'; $lang['summary'] = 'kokkuvõte muudatustest'; +$lang['noflash'] = 'Sele sisu vaatamisesks on vajalik Adobe Flash Laiendus.'; +$lang['tools'] = 'Tööriistad'; +$lang['user_tools'] = 'Kasutaja tarvikud'; +$lang['site_tools'] = 'Lehe tööriistad'; +$lang['page_tools'] = 'Lehekülje tarvikud'; +$lang['skip_to_content'] = 'mine sisule'; +$lang['sidebar'] = 'Külgriba'; $lang['mail_newpage'] = 'leht lisatud:'; $lang['mail_changed'] = 'leht muudetud'; +$lang['mail_subscribe_list'] = 'muutunud lehed nimeruumis:'; $lang['mail_new_user'] = 'Uus kasutaja:'; +$lang['mail_upload'] = 'üles laetud fail:'; +$lang['changes_type'] = 'Näita mmutuseid'; +$lang['pages_changes'] = 'Leheküljed'; +$lang['media_changes'] = 'Meedia failid'; +$lang['both_changes'] = 'Mõlemid, leheküljed ja meedia failid'; $lang['qb_bold'] = 'Rasvane kiri'; $lang['qb_italic'] = 'Kaldkiri'; $lang['qb_underl'] = 'Alajoonega kiri'; @@ -223,6 +237,7 @@ $lang['qb_media'] = 'Lisa pilte ja muid faile'; $lang['qb_sig'] = 'Lisa allkiri!'; $lang['qb_smileys'] = 'Emotikonid'; $lang['qb_chars'] = 'Erisümbolid'; +$lang['upperns'] = 'mine ülemisse nimeruumi'; $lang['admin_register'] = 'Lisa kasutaja'; $lang['metaedit'] = 'Muuda lisainfot'; $lang['metasaveerr'] = 'Lisainfo salvestamine läks untsu.'; @@ -238,6 +253,21 @@ $lang['img_copyr'] = 'Autoriõigused'; $lang['img_format'] = 'Formaat'; $lang['img_camera'] = 'Kaamera'; $lang['img_keywords'] = 'Võtmesõnad'; +$lang['img_width'] = 'Laius'; +$lang['img_height'] = 'Kõrgus'; +$lang['img_manager'] = 'Näita meediahalduris'; +$lang['subscr_subscribe_success'] = '%s lisati %s tellijaks'; +$lang['subscr_subscribe_error'] = 'Viga %s lisamisel %s tellijaks'; +$lang['subscr_subscribe_noaddress'] = 'Sinu kasutajaga pole seotud ühtegi aadressi, seega ei saa sind tellijaks lisada'; +$lang['subscr_unsubscribe_success'] = '%s eemaldati %s tellijatest'; +$lang['subscr_unsubscribe_error'] = 'Viga %s eemaldamisel %s tellijatest'; +$lang['subscr_already_subscribed'] = '%s on juba %s tellija'; +$lang['subscr_not_subscribed'] = '%s pole %s tellija'; +$lang['subscr_m_not_subscribed'] = 'Sina pole hetkel selle lehekülje ega nimeruumi tellija.'; +$lang['subscr_m_new_header'] = 'Lisa tellimus'; +$lang['subscr_m_current_header'] = 'Hetkel tellitud'; +$lang['subscr_m_unsubscribe'] = 'Eemalda tellimus'; +$lang['subscr_m_subscribe'] = 'Telli'; $lang['authtempfail'] = 'Kasutajate autentimine on ajutiselt rivist väljas. Kui see olukord mõne aja jooksul ei parane, siis teavita sellest serveri haldajat.'; $lang['i_chooselang'] = 'Vali keel'; $lang['i_installer'] = 'DokuWiki paigaldaja'; -- cgit v1.2.3 From 8a94404455e7db660088b91f82bf92137bad4195 Mon Sep 17 00:00:00 2001 From: Janar Leas Date: Sun, 9 Mar 2014 00:21:04 +0100 Subject: translation update --- inc/lang/et/lang.php | 48 +++++++++++++++++++++++++++++++++++++++++++ inc/lang/et/resetpwd.txt | 3 +++ inc/lang/et/subscr_digest.txt | 21 +++++++++++++++++++ inc/lang/et/subscr_form.txt | 3 +++ inc/lang/et/subscr_list.txt | 19 +++++++++++++++++ inc/lang/et/subscr_single.txt | 23 +++++++++++++++++++++ inc/lang/et/uploadmail.txt | 16 +++++++++++++++ 7 files changed, 133 insertions(+) create mode 100644 inc/lang/et/resetpwd.txt create mode 100644 inc/lang/et/subscr_digest.txt create mode 100644 inc/lang/et/subscr_form.txt create mode 100644 inc/lang/et/subscr_list.txt create mode 100644 inc/lang/et/subscr_single.txt create mode 100644 inc/lang/et/uploadmail.txt (limited to 'inc') diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php index 3dbf9f53d..2247ba289 100644 --- a/inc/lang/et/lang.php +++ b/inc/lang/et/lang.php @@ -9,6 +9,7 @@ * @author kristian.kankainen@kuu.la * @author Rivo Zängov * @author Janar Leas + * @author Janar Leas */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -238,7 +239,11 @@ $lang['img_copyr'] = 'Autoriõigused'; $lang['img_format'] = 'Formaat'; $lang['img_camera'] = 'Kaamera'; $lang['img_keywords'] = 'Võtmesõnad'; +$lang['subscr_style_every'] = 'igast toimetamisest teavitab ekiri'; +$lang['subscr_style_digest'] = 'kokkuvõte ekirjaga toimetamistest igal leheküljel (iga %.2f päeva järel)'; +$lang['subscr_style_list'] = 'Peale viimast ekirja (iga %.2f päeva järel) toimetaud lehekülgede loend.'; $lang['authtempfail'] = 'Kasutajate autentimine on ajutiselt rivist väljas. Kui see olukord mõne aja jooksul ei parane, siis teavita sellest serveri haldajat.'; +$lang['authpwdexpire'] = 'Sinu salasõna aegub %päeva pärast, võiksid seda peatselt muuta.'; $lang['i_chooselang'] = 'Vali keel'; $lang['i_installer'] = 'DokuWiki paigaldaja'; $lang['i_wikiname'] = 'Wiki nimi'; @@ -248,9 +253,11 @@ $lang['i_problems'] = 'Paigaldaja leidis mõned vead, mis on allpool $lang['i_modified'] = 'Õnnetuste vältimiseks läheb see skript käima ainult värskelt paigaldatud ja muutmata Dokuwiki peal. Sa peaksid ilmselt kogu koodi uuesti lahti pakkima. Vaata ka Dokuwiki installeerimis juhendit'; $lang['i_funcna'] = 'PHP funktsiooni %s ei ole olemas.võibolla sinu serveri hooldaja on selle mingil põhjusel keelanud?'; +$lang['i_phpver'] = 'Sinu PHP versioon %s on vanem nõutavast %s. Pead oma paigaldatud PHP-d uuendama.'; $lang['i_permfail'] = 'Dokuwiki ei saa kirjutada faili %s. Kontrolli serveris failide õigused üle.'; $lang['i_confexists'] = '%s on juba olemas'; $lang['i_writeerr'] = 'Faili %s ei lubata tekitada. Kontrolli kataloogi ja faili õigusi.'; +$lang['i_badhash'] = 'Tundmatu või muutunud dokuwiki.php (hash=%s)'; $lang['i_badval'] = '%s - lubamatu või tühi väärtus'; $lang['i_success'] = 'Seadistamine on õnnelikult lõpule viidud. Sa võid nüüd kustutada faili install.php. Alusta oma uue DokuWiki täitmist.'; $lang['i_failure'] = 'Konfiguratsiooni faili kirjutamisel esines vigu. Võimalik, et pead need käsitsi parandama enne uue DokuWiki täitma asumist.'; @@ -258,4 +265,45 @@ $lang['i_policy'] = 'Wiki õiguste algne poliitika'; $lang['i_pol0'] = 'Avatud (lugemine, kirjutamine ja üleslaadimine kõigile lubatud)'; $lang['i_pol1'] = 'Avalikuks lugemiseks (lugeda saavad kõik, kirjutada ja üles laadida vaid registreeritud kasutajad)'; $lang['i_pol2'] = 'Suletud (kõik õigused, kaasaarvatud lugemine on lubatud vaid registreeritud kasutajatele)'; +$lang['i_allowreg'] = 'Luba kasutajail endid ise arvele võtta'; $lang['i_retry'] = 'Proovi uuesti'; +$lang['i_license'] = 'Vali leping, mille alusel wiki sisu avaldatakse:'; +$lang['i_license_none'] = 'Ära näita mingit lepingu teavet'; +$lang['i_pop_field'] = 'Aitake meil täiendada DokuWiki kasutuskogemsut:'; +$lang['i_pop_label'] = 'Kord kuus, saada DokuWiki arendajatele anonüümseid kasutus andmeid.'; +$lang['recent_global'] = 'Uurid hetkel nimeruumi %s muudatusi. Võid uurida ka kogu selle wiki muudatusi.'; +$lang['years'] = '%d aasta eest'; +$lang['months'] = '%d kuu eest'; +$lang['weeks'] = '%d nädala eest'; +$lang['days'] = '%d päeva eest'; +$lang['hours'] = '%d tunni eest'; +$lang['minutes'] = '%d minuti eest'; +$lang['seconds'] = '%d sekundi eest'; +$lang['wordblock'] = 'Sinu toimetus jäeti muutmata tõrjutud teksti tõttu (rämpspost?).'; +$lang['media_uploadtab'] = 'Lae-↑ '; +$lang['media_searchtab'] = 'Otsi'; +$lang['media_file'] = 'Fail'; +$lang['media_viewtab'] = 'Vaata'; +$lang['media_edittab'] = 'Toimeta'; +$lang['media_historytab'] = 'Ajalugu'; +$lang['media_list_thumbs'] = 'Pisipildid'; +$lang['media_list_rows'] = 'Ridu'; +$lang['media_sort_name'] = 'Nimi'; +$lang['media_sort_date'] = 'Kuupäev'; +$lang['media_namespaces'] = 'Vali nimeruum'; +$lang['media_files'] = 'Failid %s-is'; +$lang['media_upload'] = 'Lae %s-ssi'; +$lang['media_search'] = 'Leia %s-st'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s asub %s-s'; +$lang['media_edit'] = 'Muuda %s-i'; +$lang['media_history'] = '%s ajalugu'; +$lang['media_meta_edited'] = 'toimetati päiseteavet'; +$lang['media_perm_read'] = 'Sul pole piisavaid õigusi failide vaatamiseks'; +$lang['media_perm_upload'] = 'Sul pole piisavaid õigusi failide üleslaadimiseks'; +$lang['media_update'] = 'Lea üles uus järk'; +$lang['media_restore'] = 'Ennista sellele järgule'; +$lang['currentns'] = 'Hetkel nimeruumis'; +$lang['searchresult'] = 'Otsingu tulemus'; +$lang['plainhtml'] = 'Liht-HTML'; +$lang['wikimarkup'] = 'Wiki märgistus'; diff --git a/inc/lang/et/resetpwd.txt b/inc/lang/et/resetpwd.txt new file mode 100644 index 000000000..3a802986f --- /dev/null +++ b/inc/lang/et/resetpwd.txt @@ -0,0 +1,3 @@ +====== Sea uus salasõna ====== + +Sisesta oma selle wiki kasutajale uus salasõna \ No newline at end of file diff --git a/inc/lang/et/subscr_digest.txt b/inc/lang/et/subscr_digest.txt new file mode 100644 index 000000000..7446fd9f4 --- /dev/null +++ b/inc/lang/et/subscr_digest.txt @@ -0,0 +1,21 @@ +Tere! + +Wiki-s @TITLE@ toimetati lehekülge @PAGE@. + +Muudatustest lähemalt: + +-------------------------------------------------------- +@DIFF@ +-------------------------------------------------------- + +Endine: @OLDPAGE@ +Uus: @NEWPAGE@ + +Lehekülje teavituste katkestamiseks, sisene wiki-sse aadressil @DOKUWIKIURL@ +ja mine: +@SUBSCRIBE@ +ning loobu lehekülje ja/või nimeruumi muudatuste teavitustest. + +-- +Selle e-kirja lõi DokuWiki aadressilt +@DOKUWIKIURL@ \ No newline at end of file diff --git a/inc/lang/et/subscr_form.txt b/inc/lang/et/subscr_form.txt new file mode 100644 index 000000000..45d911f72 --- /dev/null +++ b/inc/lang/et/subscr_form.txt @@ -0,0 +1,3 @@ +====== Tellimuste haldus ====== + +See lehekülg lubab sul hallata oma tellimusi antud leheküljele ja nimeruumi. \ No newline at end of file diff --git a/inc/lang/et/subscr_list.txt b/inc/lang/et/subscr_list.txt new file mode 100644 index 000000000..0629651b7 --- /dev/null +++ b/inc/lang/et/subscr_list.txt @@ -0,0 +1,19 @@ +Tere! + +Wiki-s @TITLE@ toimetati nimeruumi @PAGE@. +Muudatustest lähemalt: + +-------------------------------------------------------- +@DIFF@ +-------------------------------------------------------- +Endine: @OLDPAGE@ +Uus: @NEWPAGE@ + +Lehekülje teavituste katkestamiseks, sisene wiki-sse aadressil @DOKUWIKIURL@ +ja mine: +@SUBSCRIBE@ +ning loobu lehekülje ja/või nimeruumi muudatuste teavitustest. + +-- +Selle e-kirja lõi DokuWiki aadressilt +@DOKUWIKIURL@ \ No newline at end of file diff --git a/inc/lang/et/subscr_single.txt b/inc/lang/et/subscr_single.txt new file mode 100644 index 000000000..149c95ad1 --- /dev/null +++ b/inc/lang/et/subscr_single.txt @@ -0,0 +1,23 @@ +Tere! + +Wikis @TITLE@ toimetati lehekülge @PAGE@. +Muudatustest lähemalt: + +-------------------------------------------------------- +@DIFF@ +-------------------------------------------------------- + +Kuupäev : @DATE@ +Kasutaja : @USER@ +Kokkuvõte: @SUMMARY@ +Endine: @OLDPAGE@ +Uus: @NEWPAGE@ + +Lehekülje teavituste katkestamiseks, sisene wiki-sse aadressil @DOKUWIKIURL@ +ja mine: +@SUBSCRIBE@ +ning loobu lehekülje ja/või nimeruumi muudatuste teavitustest. + +-- +Selle e-kirja lõi DokuWiki aadressilt +@DOKUWIKIURL@ \ No newline at end of file diff --git a/inc/lang/et/uploadmail.txt b/inc/lang/et/uploadmail.txt new file mode 100644 index 000000000..2d3a6aa7e --- /dev/null +++ b/inc/lang/et/uploadmail.txt @@ -0,0 +1,16 @@ +Sinu DokuWiki-sse lisati fail. +Lähemalt: + + Fail : @MEDIA@ + Endine : @OLD@ + Kuupäev : @DATE@ + Veebilehitseja : @BROWSER@ + IP-aadress : @IPADDRESS@ + Hostinimi : @HOSTNAME@ + Suurus : @SIZE@ + MIME liik : @MIME@ + Kasutaja : @ USER@ + +-- +Selle e-kirja lõi DokuWiki aadressilt +@DOKUWIKIURL@ \ No newline at end of file -- cgit v1.2.3 From 30f6ec4bf42de282d69f87494819f0599a1fae82 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 10 Mar 2014 23:58:18 +0100 Subject: update usage in userlink --- inc/common.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index 143ad8923..d971986df 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1475,6 +1475,8 @@ function userinfo($username = null) { global $conf, $INFO; /** @var DokuWiki_Auth_Plugin $auth */ global $auth; + /** @var Input $INPUT */ + global $INPUT; // prepare initial event data $data = array( @@ -1493,8 +1495,8 @@ function userinfo($username = null) { 'userinfo' => '' ); if($username === null) { - $data['username'] = $username = $_SERVER['REMOTE_USER']; - $data['name'] = '' . hsc($INFO['userinfo']['name']) . ' (' . hsc($_SERVER['REMOTE_USER']) . ')'; + $data['username'] = $username = $INPUT->server->str('REMOTE_USER'); + $data['name'] = '' . hsc($INFO['userinfo']['name']) . ' (' . hsc($INPUT->server->str('REMOTE_USER')) . ')'; } $evt = new Doku_Event('COMMON_USER_LINK', $data); -- cgit v1.2.3 From 533772e1d092bc1b1326f7fe5a31091b58bf9030 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 11 Mar 2014 00:00:50 +0100 Subject: declare more clear, before used as ref --- inc/common.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index d971986df..6e7142f0e 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1541,6 +1541,7 @@ function userinfo($username = null) { $xhtml_renderer->interwiki = getInterwiki(); } $shortcut = 'user'; + $exists = null; $data['link']['url'] = $xhtml_renderer->_resolveInterWiki($shortcut, $username, $exists); $data['link']['class'] .= ' interwiki iw_user'; if($exists !== null) { -- cgit v1.2.3 From 68321121b4d24c7489400c950afdbe6eba0f417d Mon Sep 17 00:00:00 2001 From: Aleksandr Selivanov Date: Tue, 11 Mar 2014 18:06:07 +0100 Subject: translation update --- inc/lang/ru/admin.txt | 2 +- inc/lang/ru/lang.php | 32 ++++++++++++++++---------------- inc/lang/ru/mailtext.txt | 2 +- inc/lang/ru/norev.txt | 1 - inc/lang/ru/password.txt | 2 +- inc/lang/ru/pwconfirm.txt | 2 +- inc/lang/ru/registermail.txt | 2 +- inc/lang/ru/subscr_digest.txt | 4 ++-- inc/lang/ru/subscr_list.txt | 4 ++-- inc/lang/ru/subscr_single.txt | 4 ++-- inc/lang/ru/uploadmail.txt | 2 +- 11 files changed, 28 insertions(+), 29 deletions(-) (limited to 'inc') diff --git a/inc/lang/ru/admin.txt b/inc/lang/ru/admin.txt index e00daa447..cd609a347 100644 --- a/inc/lang/ru/admin.txt +++ b/inc/lang/ru/admin.txt @@ -1,4 +1,4 @@ ====== Управление ====== -Ниже вы сможете найти список административных операций, доступных в «ДокуВики». +Ниже вы сможете найти список административных операций, доступных в «Докувики». diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php index 3515d02ce..bf8fa34c8 100644 --- a/inc/lang/ru/lang.php +++ b/inc/lang/ru/lang.php @@ -91,7 +91,7 @@ $lang['regsuccess2'] = 'Пользователь создан.'; $lang['regmailfail'] = 'Похоже есть проблема с отправкой пароля по почте. Пожалуйста, сообщите об этом администратору.'; $lang['regbadmail'] = 'Данный вами адрес электронной почты выглядит неправильным. Если вы считаете это ошибкой, сообщите администратору.'; $lang['regbadpass'] = 'Два введённых пароля не идентичны. Пожалуйста, попробуйте ещё раз.'; -$lang['regpwmail'] = 'Ваш пароль для системы «ДокуВики»'; +$lang['regpwmail'] = 'Ваш пароль для системы «Докувики»'; $lang['reghere'] = 'У вас ещё нет аккаунта? Зарегистрируйтесь'; $lang['profna'] = 'Данная вики не поддерживает изменение профиля'; $lang['profnochange'] = 'Изменений не было внесено, профиль не обновлён.'; @@ -146,7 +146,7 @@ $lang['js']['medialeft'] = 'Выровнять изображение по $lang['js']['mediaright'] = 'Выровнять изображение по правому краю.'; $lang['js']['mediacenter'] = 'Выровнять изображение по центру.'; $lang['js']['medianoalign'] = 'Не выравнивать.'; -$lang['js']['nosmblinks'] = 'Ссылка на сетевые каталоги Windows работает только из Интернет Эксплорера. Но вы можете скопировать ссылку.'; +$lang['js']['nosmblinks'] = 'Ссылка на сетевые каталоги Windows работает только из MS Internet Explorer, но вы можете скопировать ссылку.'; $lang['js']['linkwiz'] = 'Мастер ссылок'; $lang['js']['linkto'] = 'Ссылка на:'; $lang['js']['del_confirm'] = 'Вы на самом деле желаете удалить выбранное?'; @@ -287,34 +287,34 @@ $lang['subscr_style_list'] = 'список изменённых страни $lang['authtempfail'] = 'Аутентификация пользователей временно недоступна. Если проблема продолжается какое-то время, пожалуйста, сообщите об этом своему администратору вики.'; $lang['authpwdexpire'] = 'Действие вашего пароля истекает через %d дней. Вы должны изменить его как можно скорее'; $lang['i_chooselang'] = 'Выберите свой язык/Choose your language'; -$lang['i_installer'] = 'Установка «ДокуВики»'; +$lang['i_installer'] = 'Установка «Докувики»'; $lang['i_wikiname'] = 'Название вики'; $lang['i_enableacl'] = 'Разрешить ограничение прав доступа (рекомендуется)'; $lang['i_superuser'] = 'Суперпользователь'; $lang['i_problems'] = 'Программа установки столкнулась с проблемами, перечисленными ниже. Чтобы продолжить, вам необходимо их устранить. '; -$lang['i_modified'] = 'Из соображений безопасности эта программа запускается только на новой, неизменённой установке «ДокуВики». +$lang['i_modified'] = 'Из соображений безопасности эта программа запускается только на новой, неизменённой установке «Докувики». Вам нужно либо заново распаковать скачанный пакет установки, либо обратиться к полной - инструкции по установке «ДокуВики»'; + инструкции по установке «Докувики»'; $lang['i_funcna'] = 'Функция PHP %s недоступна. Может быть, она по какой-то причине заблокирована вашим хостером?'; $lang['i_phpver'] = 'Ваша версия PHP (%s) ниже требуемой (%s). Вам необходимо обновить установленную версию PHP.'; -$lang['i_permfail'] = '%s недоступна для записи «ДокуВики». Вам необходимо исправить системные права доступа для этой директории!'; +$lang['i_permfail'] = '%s недоступна для записи «Докувики». Вам необходимо исправить системные права доступа для этой директории!'; $lang['i_confexists'] = '%s уже существует'; -$lang['i_writeerr'] = 'Не удалось создать %s. Вам необходимо проверить системные права доступа к файлу/директориям и создать файл вручную. '; +$lang['i_writeerr'] = 'Не удалось создать %s. Вам необходимо проверить системные права доступа к файлу и директориям, и создать файл вручную. '; $lang['i_badhash'] = 'dokuwiki.php не распознан или изменён (хэш=%s)'; $lang['i_badval'] = '%s — недопустимое или пустое значение'; $lang['i_success'] = 'Конфигурация прошла успешно. Теперь вы можете удалить файл install.php. Переходите к - своей новой «ДокуВики».'; -$lang['i_failure'] = 'При записи в файлы конфигурации были обнаружены ошибки. Возможно, вам придётся исправить их вручную, прежде чем вы сможете использовать свою новую «ДокуВики».'; + своей новой «Докувики».'; +$lang['i_failure'] = 'При записи в файлы конфигурации были обнаружены ошибки. Возможно, вам придётся исправить их вручную, прежде чем вы сможете использовать свою новую «Докувики».'; $lang['i_policy'] = 'Исходная политика прав доступа'; $lang['i_pol0'] = 'Открытая вики (чтение, запись, закачка файлов для всех)'; $lang['i_pol1'] = 'Общедоступная вики (чтение для всех, запись и загрузка файлов для зарегистрированных пользователей)'; $lang['i_pol2'] = 'Закрытая вики (чтение, запись и загрузка файлов только для зарегистрированных пользователей)'; -$lang['i_allowreg'] = 'Позволить пользователям самостоятельно регестрироваться'; +$lang['i_allowreg'] = 'Разрешить пользователям самостоятельно регистрироваться'; $lang['i_retry'] = 'Повторить попытку'; -$lang['i_license'] = 'Пожалуйста, выберите тип лицензии для своей вики:'; -$lang['i_license_none'] = 'Не отображать информацию о лицензионных операциях'; -$lang['i_pop_field'] = 'Пожалуйста, помогите нам улучшить «ДокуВики»:'; -$lang['i_pop_label'] = 'Отправлять раз в месяц анонимную пользовательскую информацию разработчикам «ДокуВики»'; +$lang['i_license'] = 'Пожалуйста, выберите тип лицензии для своей вики'; +$lang['i_license_none'] = 'Не отображать информацию о лицензии'; +$lang['i_pop_field'] = 'Пожалуйста, помогите нам улучшить «Докувики»:'; +$lang['i_pop_label'] = 'Отправлять раз в месяц анонимную пользовательскую информацию разработчикам «Докувики»'; $lang['recent_global'] = 'Вы просматриваете изменения в пространстве имён %s. Вы можете также просмотреть недавние изменения во всей вики.'; $lang['years'] = '%d лет назад'; $lang['months'] = '%d месяц(ев) назад'; @@ -348,7 +348,7 @@ $lang['media_perm_read'] = 'Извините, у вас недостато $lang['media_perm_upload'] = 'Извините, у вас недостаточно прав для загрузки файлов.'; $lang['media_update'] = 'Загрузить новую версию'; $lang['media_restore'] = 'Восстановить эту версию'; -$lang['currentns'] = 'Текущее пространство имен'; +$lang['currentns'] = 'Текущее пространство имён'; $lang['searchresult'] = 'Результаты поиска'; -$lang['plainhtml'] = 'Чистый HTML'; +$lang['plainhtml'] = 'Простой HTML'; $lang['wikimarkup'] = 'вики-разметка'; diff --git a/inc/lang/ru/mailtext.txt b/inc/lang/ru/mailtext.txt index 2b3f76bbd..953daddf2 100644 --- a/inc/lang/ru/mailtext.txt +++ b/inc/lang/ru/mailtext.txt @@ -13,5 +13,5 @@ IP-адрес: @IPADDRESS@ -- -Это письмо было сгенерировано «ДокуВики» по адресу +Это письмо было сгенерировано «Докувики» по адресу @DOKUWIKIURL@ diff --git a/inc/lang/ru/norev.txt b/inc/lang/ru/norev.txt index 388d6149d..c088d0d5a 100644 --- a/inc/lang/ru/norev.txt +++ b/inc/lang/ru/norev.txt @@ -1,4 +1,3 @@ ====== Такой версии не существует ====== Указанная версия страницы не существует. Нажмите на кнопку «История страницы», чтобы получить список доступных предыдущих версий этого документа. - diff --git a/inc/lang/ru/password.txt b/inc/lang/ru/password.txt index eb100f334..fabdf2b68 100644 --- a/inc/lang/ru/password.txt +++ b/inc/lang/ru/password.txt @@ -6,5 +6,5 @@ Пароль: @PASSWORD@ -- -Это письмо было сгенерировано «ДокуВики» по адресу +Это письмо было сгенерировано «Докувики» по адресу @DOKUWIKIURL@ diff --git a/inc/lang/ru/pwconfirm.txt b/inc/lang/ru/pwconfirm.txt index 9c27af752..954c75dfe 100644 --- a/inc/lang/ru/pwconfirm.txt +++ b/inc/lang/ru/pwconfirm.txt @@ -9,5 +9,5 @@ @CONFIRM@ -- -Это сообщение было сгенерировано «ДокуВики» по адресу +Это сообщение было сгенерировано «Докувики» по адресу @DOKUWIKIURL@ diff --git a/inc/lang/ru/registermail.txt b/inc/lang/ru/registermail.txt index fc862b034..86ef11e8c 100644 --- a/inc/lang/ru/registermail.txt +++ b/inc/lang/ru/registermail.txt @@ -10,5 +10,5 @@ Хост: @HOSTNAME@ -- -Это сообщение было сгенерировано «ДокуВики» по адресу +Это сообщение было сгенерировано «Докувики» по адресу @DOKUWIKIURL@ diff --git a/inc/lang/ru/subscr_digest.txt b/inc/lang/ru/subscr_digest.txt index 41774a4e9..ac0fc0528 100644 --- a/inc/lang/ru/subscr_digest.txt +++ b/inc/lang/ru/subscr_digest.txt @@ -15,6 +15,6 @@ @SUBSCRIBE@ и отмените подписку на страницу и/или пространство имен. --- -Это письмо создано «ДокуВики» с сайта +-- +Это письмо создано «Докувики» с сайта @DOKUWIKIURL@ \ No newline at end of file diff --git a/inc/lang/ru/subscr_list.txt b/inc/lang/ru/subscr_list.txt index 41e1323bc..984a25eb0 100644 --- a/inc/lang/ru/subscr_list.txt +++ b/inc/lang/ru/subscr_list.txt @@ -12,6 +12,6 @@ @SUBSCRIBE@ и отмените подписку на страницу и/или пространство имён. --- -Это письмо создано «ДокуВики» с сайта +-- +Это письмо создано «Докувики» с сайта @DOKUWIKIURL@ \ No newline at end of file diff --git a/inc/lang/ru/subscr_single.txt b/inc/lang/ru/subscr_single.txt index 911a48e96..679ca6fff 100644 --- a/inc/lang/ru/subscr_single.txt +++ b/inc/lang/ru/subscr_single.txt @@ -19,6 +19,6 @@ @SUBSCRIBE@ и отмените подписку на страницу и/или пространство имён. --- -Это письмо создано «ДокуВики» с сайта +-- +Это письмо создано «Докувики» с сайта @DOKUWIKIURL@ \ No newline at end of file diff --git a/inc/lang/ru/uploadmail.txt b/inc/lang/ru/uploadmail.txt index f696f2c44..84103b45a 100644 --- a/inc/lang/ru/uploadmail.txt +++ b/inc/lang/ru/uploadmail.txt @@ -11,5 +11,5 @@ Пользователь: @USER@ -- -Это письмо было сгенерировано «ДокуВики» по адресу +Это письмо было сгенерировано «Докувики» по адресу @DOKUWIKIURL@ -- cgit v1.2.3 From abaffa745a174b306d15c70aa8610f7ef5bd3a80 Mon Sep 17 00:00:00 2001 From: Janar Leas Date: Wed, 12 Mar 2014 16:26:12 +0100 Subject: translation update --- inc/lang/et/index.txt | 2 +- inc/lang/et/lang.php | 12 ++++++------ inc/lang/et/subscr_form.txt | 2 +- inc/lang/et/subscr_single.txt | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'inc') diff --git a/inc/lang/et/index.txt b/inc/lang/et/index.txt index 8d2e25a68..fec211d9b 100644 --- a/inc/lang/et/index.txt +++ b/inc/lang/et/index.txt @@ -1,3 +1,3 @@ ====== Sisukord ====== -See siin on nimekiri kõigist saadaval olevatest lehtedest järjestatud [[doku>namespaces|alajaotuste]] järgi. +Alloleavs on loetletud kõik saada olevaist leheküljed, mis on järjestatud [[doku>namespaces|nimeruumi]]de alusel. diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php index fdfae2d9d..ee9b1d969 100644 --- a/inc/lang/et/lang.php +++ b/inc/lang/et/lang.php @@ -171,7 +171,7 @@ $lang['accessdenied'] = 'Ligipääs keelatud.'; $lang['mediausage'] = 'Kasuta järgmist kirjapilti sellele failile viitamaks:'; $lang['mediaview'] = 'Vaata faili algsel kujul.'; $lang['mediaroot'] = 'juur'; -$lang['mediaupload'] = 'Lae fail sellesse nimeruumi (kataloogi). Et tekitada veel alam nimeruum kasuta koolonit Wiki nimes.'; +$lang['mediaupload'] = 'Lae fail sellesse nimeruumi (kataloogi). Loomaks täiendavaid alam-nimeruume, kasuta wiki-nime ja nimeruumide eraldamiseks koolonit.'; $lang['mediaextchange'] = 'Faili laiend .%s-st %s-ks!'; $lang['reference'] = 'Viited'; $lang['ref_inuse'] = 'Seda faili ei saa kustutada, sest teda kasutavad järgmised lehed:'; @@ -206,7 +206,7 @@ $lang['skip_to_content'] = 'mine sisule'; $lang['sidebar'] = 'Külgriba'; $lang['mail_newpage'] = 'leht lisatud:'; $lang['mail_changed'] = 'leht muudetud'; -$lang['mail_subscribe_list'] = 'muutunud lehed nimeruumis:'; +$lang['mail_subscribe_list'] = 'muutunud leheküljed nimeruumis:'; $lang['mail_new_user'] = 'Uus kasutaja:'; $lang['mail_upload'] = 'üles laetud fail:'; $lang['changes_type'] = 'Näita mmutuseid'; @@ -256,9 +256,6 @@ $lang['img_keywords'] = 'Võtmesõnad'; $lang['img_width'] = 'Laius'; $lang['img_height'] = 'Kõrgus'; $lang['img_manager'] = 'Näita meediahalduris'; -$lang['subscr_style_every'] = 'igast toimetamisest teavitab ekiri'; -$lang['subscr_style_digest'] = 'kokkuvõte ekirjaga toimetamistest igal leheküljel (iga %.2f päeva järel)'; -$lang['subscr_style_list'] = 'Peale viimast ekirja (iga %.2f päeva järel) toimetaud lehekülgede loend.'; $lang['subscr_subscribe_success'] = '%s lisati %s tellijaks'; $lang['subscr_subscribe_error'] = 'Viga %s lisamisel %s tellijaks'; $lang['subscr_subscribe_noaddress'] = 'Sinu kasutajaga pole seotud ühtegi aadressi, seega ei saa sind tellijaks lisada'; @@ -271,6 +268,9 @@ $lang['subscr_m_new_header'] = 'Lisa tellimus'; $lang['subscr_m_current_header'] = 'Hetkel tellitud'; $lang['subscr_m_unsubscribe'] = 'Eemalda tellimus'; $lang['subscr_m_subscribe'] = 'Telli'; +$lang['subscr_style_every'] = 'igast toimetamisest teavitab ekiri'; +$lang['subscr_style_digest'] = 'kokkuvõte ekirjaga toimetamistest igal leheküljel (iga %.2f päeva järel)'; +$lang['subscr_style_list'] = 'Peale viimast ekirja (iga %.2f päeva järel) toimetaud lehekülgede loend.'; $lang['authtempfail'] = 'Kasutajate autentimine on ajutiselt rivist väljas. Kui see olukord mõne aja jooksul ei parane, siis teavita sellest serveri haldajat.'; $lang['authpwdexpire'] = 'Sinu salasõna aegub %päeva pärast, võiksid seda peatselt muuta.'; $lang['i_chooselang'] = 'Vali keel'; @@ -332,7 +332,7 @@ $lang['media_perm_read'] = 'Sul pole piisavaid õigusi failide vaatamiseks $lang['media_perm_upload'] = 'Sul pole piisavaid õigusi failide üleslaadimiseks'; $lang['media_update'] = 'Lea üles uus järk'; $lang['media_restore'] = 'Ennista sellele järgule'; -$lang['currentns'] = 'Hetkel nimeruumis'; +$lang['currentns'] = 'Hetke nimeruum'; $lang['searchresult'] = 'Otsingu tulemus'; $lang['plainhtml'] = 'Liht-HTML'; $lang['wikimarkup'] = 'Wiki märgistus'; diff --git a/inc/lang/et/subscr_form.txt b/inc/lang/et/subscr_form.txt index 45d911f72..61a005b47 100644 --- a/inc/lang/et/subscr_form.txt +++ b/inc/lang/et/subscr_form.txt @@ -1,3 +1,3 @@ ====== Tellimuste haldus ====== -See lehekülg lubab sul hallata oma tellimusi antud leheküljele ja nimeruumi. \ No newline at end of file +See lehekülg lubab sul hallata oma tellimusi antud leheküljele ja nimeruumile. \ No newline at end of file diff --git a/inc/lang/et/subscr_single.txt b/inc/lang/et/subscr_single.txt index 149c95ad1..fff069f65 100644 --- a/inc/lang/et/subscr_single.txt +++ b/inc/lang/et/subscr_single.txt @@ -1,6 +1,6 @@ Tere! -Wikis @TITLE@ toimetati lehekülge @PAGE@. +Wiki-s @TITLE@ toimetati lehekülge @PAGE@. Muudatustest lähemalt: -------------------------------------------------------- -- cgit v1.2.3 From 3e8d68b4a59e93099da9af13f0825ea2d05d7bd2 Mon Sep 17 00:00:00 2001 From: Janar Leas Date: Thu, 13 Mar 2014 17:36:15 +0100 Subject: translation update --- inc/lang/et/lang.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'inc') diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php index fdfae2d9d..6018a7608 100644 --- a/inc/lang/et/lang.php +++ b/inc/lang/et/lang.php @@ -256,9 +256,6 @@ $lang['img_keywords'] = 'Võtmesõnad'; $lang['img_width'] = 'Laius'; $lang['img_height'] = 'Kõrgus'; $lang['img_manager'] = 'Näita meediahalduris'; -$lang['subscr_style_every'] = 'igast toimetamisest teavitab ekiri'; -$lang['subscr_style_digest'] = 'kokkuvõte ekirjaga toimetamistest igal leheküljel (iga %.2f päeva järel)'; -$lang['subscr_style_list'] = 'Peale viimast ekirja (iga %.2f päeva järel) toimetaud lehekülgede loend.'; $lang['subscr_subscribe_success'] = '%s lisati %s tellijaks'; $lang['subscr_subscribe_error'] = 'Viga %s lisamisel %s tellijaks'; $lang['subscr_subscribe_noaddress'] = 'Sinu kasutajaga pole seotud ühtegi aadressi, seega ei saa sind tellijaks lisada'; @@ -271,6 +268,9 @@ $lang['subscr_m_new_header'] = 'Lisa tellimus'; $lang['subscr_m_current_header'] = 'Hetkel tellitud'; $lang['subscr_m_unsubscribe'] = 'Eemalda tellimus'; $lang['subscr_m_subscribe'] = 'Telli'; +$lang['subscr_style_every'] = 'igast toimetamisest teavitab ekiri'; +$lang['subscr_style_digest'] = 'kokkuvõte ekirjaga toimetamistest igal leheküljel (iga %.2f päeva järel)'; +$lang['subscr_style_list'] = 'Peale viimast ekirja (iga %.2f päeva järel) toimetaud lehekülgede loend.'; $lang['authtempfail'] = 'Kasutajate autentimine on ajutiselt rivist väljas. Kui see olukord mõne aja jooksul ei parane, siis teavita sellest serveri haldajat.'; $lang['authpwdexpire'] = 'Sinu salasõna aegub %päeva pärast, võiksid seda peatselt muuta.'; $lang['i_chooselang'] = 'Vali keel'; -- cgit v1.2.3 From a8795974051a91137b01ff88dbf5586a647b24ce Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Fri, 14 Mar 2014 00:24:21 +0100 Subject: Fix caching (make the event callback public again) Caching had been completely broken (disabled) for caches with events because the default event handler (cache::_useCache()) was protected and thus couldn't be executed by the event handler. This was broken in c59b3e001d1e8258b1d118909257b70516c8a6b1 --- inc/cache.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'inc') diff --git a/inc/cache.php b/inc/cache.php index 5f54a34a9..56c5b65f2 100644 --- a/inc/cache.php +++ b/inc/cache.php @@ -63,11 +63,13 @@ class cache { * age - expire cache if older than age (seconds) * files - expire cache if any file in this array was updated more recently than the cache * + * Note that this function needs to be public as it is used as callback for the event handler + * * can be overridden * * @return bool see useCache() */ - protected function _useCache() { + public function _useCache() { if (!empty($this->depends['purge'])) return false; // purge requested? if (!($this->_time = @filemtime($this->cache))) return false; // cache exists? @@ -194,7 +196,7 @@ class cache_parser extends cache { * * @return bool see useCache() */ - protected function _useCache() { + public function _useCache() { if (!@file_exists($this->file)) return false; // source exists? return parent::_useCache(); @@ -229,7 +231,7 @@ class cache_renderer extends cache_parser { * * @return bool see useCache() */ - protected function _useCache() { + public function _useCache() { global $conf; if (!parent::_useCache()) return false; -- cgit v1.2.3 From bc2ddb548f71b1a822dd03c3bc7c3c0e7cd9b152 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Fri, 14 Mar 2014 13:05:03 +0100 Subject: Events: Trigger a warning if the default action is not callable This adds a warning in the case that the default action is not null but also not callable which can happen when the supplied method is not public. --- inc/events.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/events.php b/inc/events.php index 7f9824f60..318a7617e 100644 --- a/inc/events.php +++ b/inc/events.php @@ -93,7 +93,12 @@ class Doku_Event { */ function trigger($action=null, $enablePrevent=true) { - if (!is_callable($action)) $enablePrevent = false; + if (!is_callable($action)) { + $enablePrevent = false; + if (!is_null($action)) { + trigger_error('The default action of '.$this.' is not null but also not callable. Maybe the method is not public?', E_USER_WARNING); + } + } if ($this->advise_before($enablePrevent) && is_callable($action)) { if (is_array($action)) { -- cgit v1.2.3 From 15f3bc49ed925ccb7c04299e9f614b0a1b739b13 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Fri, 14 Mar 2014 18:42:25 +0100 Subject: enable editorinfo and userinfo to return plain text names --- inc/common.php | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index 6e7142f0e..f0c935c0c 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1457,21 +1457,26 @@ function shorten($keep, $short, $max, $min = 9, $char = '…') { * Return the users realname or e-mail address for use * in page footer and recent changes pages * + * @param string|bool $username or false when currently logged-in user should be used + * @param bool $textonly true returns only plain text, true allows returning html + * @return string html or text of formatted user name + * * @author Andy Webber */ -function editorinfo($username) { - return userinfo($username); +function editorinfo($username, $textonly = false) { + return userinfo($username, $textonly); } /** * Returns users realname w/o link * * @param string|bool $username or false when currently logged-in user should be used - * @return string html of formatted user name + * @param bool $textonly true returns only plain text, true allows returning html + * @return string html or text of formatted user name * * @triggers COMMON_USER_LINK */ -function userinfo($username = null) { +function userinfo($username = null, $textonly = false) { global $conf, $INFO; /** @var DokuWiki_Auth_Plugin $auth */ global $auth; @@ -1492,25 +1497,30 @@ function userinfo($username = null) { 'title' => '', 'class' => '' ), - 'userinfo' => '' + 'userinfo' => '', // formatted user name as will be returned + 'textonly' => $textonly ); if($username === null) { $data['username'] = $username = $INPUT->server->str('REMOTE_USER'); - $data['name'] = '' . hsc($INFO['userinfo']['name']) . ' (' . hsc($INPUT->server->str('REMOTE_USER')) . ')'; + if($textonly){ + $data['name'] = $INFO['userinfo']['name']. ' (' . $INPUT->server->str('REMOTE_USER') . ')'; + }else { + $data['name'] = '' . hsc($INFO['userinfo']['name']) . ' (' . hsc($INPUT->server->str('REMOTE_USER')) . ')'; + } } $evt = new Doku_Event('COMMON_USER_LINK', $data); if($evt->advise_before(true)) { if(empty($data['name'])) { if($conf['showuseras'] == 'loginname') { - $data['name'] = hsc($data['username']); + $data['name'] = $textonly ? $data['username'] : hsc($data['username']); } else { if($auth) $info = $auth->getUserData($username); if(isset($info) && $info) { switch($conf['showuseras']) { case 'username': case 'username_link': - $data['name'] = hsc($info['name']); + $data['name'] = $textonly ? $info['name'] : hsc($info['name']); break; case 'email': case 'email_link': @@ -1524,7 +1534,7 @@ function userinfo($username = null) { /** @var Doku_Renderer_xhtml $xhtml_renderer */ static $xhtml_renderer = null; - if($data['link'] !== false && empty($data['link']['url'])) { + if(!$data['textonly'] && empty($data['link']['url'])) { if(in_array($conf['showuseras'], array('email_link', 'username_link'))) { if(!isset($info)) { @@ -1554,15 +1564,15 @@ function userinfo($username = null) { } } } else { - $data['link'] = false; + $data['textonly'] = true; } } else { - $data['link'] = false; + $data['textonly'] = true; } } - if($data['link'] === false) { + if($data['textonly']) { $data['userinfo'] = $data['name']; } else { $data['link']['name'] = $data['name']; -- cgit v1.2.3 From f8fb2d1811251304687b805a60b489f63cb5c4fb Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 15 Mar 2014 21:29:33 +0100 Subject: strip sourcemaps in CSS and JS #601 source maps are invalid for our dispatched sources and may even cause problems. this makes sure any sourcemap declarations are stripped from the output --- inc/common.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index 9fbebde94..5aacf6355 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1675,4 +1675,13 @@ function set_doku_pref($pref, $val) { } } +/** + * Strips source mapping declarations from given text #601 + * + * @param &string $text reference to the CSS or JavaScript code to clean + */ +function stripsourcemaps(&$text){ + $text = preg_replace('/^(\/\/|\/\*)[@#]\s+sourceMappingURL=.*?(\*\/)?$/im', '\\1\\2', $text); +} + //Setup VIM: ex: et ts=2 : -- cgit v1.2.3 From c0953023fdf442f13e6c27b7bd70dcde61243e88 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sun, 16 Mar 2014 21:00:06 +0100 Subject: improve phpdocs editorinfo() --- inc/common.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index f0c935c0c..14d4a9d79 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1459,7 +1459,7 @@ function shorten($keep, $short, $max, $min = 9, $char = '…') { * * @param string|bool $username or false when currently logged-in user should be used * @param bool $textonly true returns only plain text, true allows returning html - * @return string html or text of formatted user name + * @return string html or plain text(not escaped) of formatted user name * * @author Andy Webber */ @@ -1472,7 +1472,7 @@ function editorinfo($username, $textonly = false) { * * @param string|bool $username or false when currently logged-in user should be used * @param bool $textonly true returns only plain text, true allows returning html - * @return string html or text of formatted user name + * @return string html or plain text(not escaped) of formatted user name * * @triggers COMMON_USER_LINK */ -- cgit v1.2.3 From cd4635ee7f07ae17e1b2a58d8d9e6620ddb077ef Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sun, 16 Mar 2014 21:10:43 +0100 Subject: Rename userinfo() to userlink() --- inc/common.php | 4 ++-- inc/template.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index 14d4a9d79..eef160122 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1464,7 +1464,7 @@ function shorten($keep, $short, $max, $min = 9, $char = '…') { * @author Andy Webber */ function editorinfo($username, $textonly = false) { - return userinfo($username, $textonly); + return userlink($username, $textonly); } /** @@ -1476,7 +1476,7 @@ function editorinfo($username, $textonly = false) { * * @triggers COMMON_USER_LINK */ -function userinfo($username = null, $textonly = false) { +function userlink($username = null, $textonly = false) { global $conf, $INFO; /** @var DokuWiki_Auth_Plugin $auth */ global $auth; diff --git a/inc/template.php b/inc/template.php index 5a3bdea6a..ea65b9d43 100644 --- a/inc/template.php +++ b/inc/template.php @@ -893,7 +893,7 @@ function tpl_userinfo() { global $INPUT; if($INPUT->server->str('REMOTE_USER')) { - print $lang['loggedinas'].': '.userinfo(); + print $lang['loggedinas'].': '.userlink(); return true; } return false; -- cgit v1.2.3 From 4d5fc927eace8f4208895cd309d23fc9025dbb6b Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sun, 16 Mar 2014 21:13:27 +0100 Subject: use more consistent names --- inc/common.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'inc') diff --git a/inc/common.php b/inc/common.php index eef160122..5164d4ac0 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1497,7 +1497,7 @@ function userlink($username = null, $textonly = false) { 'title' => '', 'class' => '' ), - 'userinfo' => '', // formatted user name as will be returned + 'userlink' => '', // formatted user name as will be returned 'textonly' => $textonly ); if($username === null) { @@ -1573,19 +1573,19 @@ function userlink($username = null, $textonly = false) { } if($data['textonly']) { - $data['userinfo'] = $data['name']; + $data['userlink'] = $data['name']; } else { $data['link']['name'] = $data['name']; if(is_null($xhtml_renderer)) { $xhtml_renderer = p_get_renderer('xhtml'); } - $data['userinfo'] = $xhtml_renderer->_formatLink($data['link']); + $data['userlink'] = $xhtml_renderer->_formatLink($data['link']); } } $evt->advise_after(); unset($evt); - return $data['userinfo']; + return $data['userlink']; } /** -- cgit v1.2.3 From 5057e70035247a6d3a296a8e4e39c55244fa8b90 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 17 Mar 2014 11:16:12 +0100 Subject: translation update --- inc/lang/de/lang.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php index 6d9be75da..c6f11abc9 100644 --- a/inc/lang/de/lang.php +++ b/inc/lang/de/lang.php @@ -24,6 +24,7 @@ * @author Mateng Schimmerlos * @author Benedikt Fey * @author Joerg + * @author Simon */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -68,6 +69,8 @@ $lang['btn_register'] = 'Registrieren'; $lang['btn_apply'] = 'Übernehmen'; $lang['btn_media'] = 'Medien-Manager'; $lang['btn_deleteuser'] = 'Benutzerprofil löschen'; +$lang['btn_img_backto'] = 'Zurück zu %s'; +$lang['btn_mediaManager'] = 'Im Medien-Manager anzeigen'; $lang['loggedinas'] = 'Angemeldet als'; $lang['user'] = 'Benutzername'; $lang['pass'] = 'Passwort'; @@ -92,6 +95,7 @@ $lang['regbadmail'] = 'Die angegebene E-Mail-Adresse scheint ungülti $lang['regbadpass'] = 'Die beiden eingegeben Passwörter stimmen nicht überein. Bitte versuchen Sie es noch einmal.'; $lang['regpwmail'] = 'Ihr DokuWiki-Passwort'; $lang['reghere'] = 'Sie haben noch keinen Zugang? Hier registrieren'; +$lang['notloggedin'] = 'Haben Sie vergessen sich einzuloggen?'; $lang['profna'] = 'Änderung des Benutzerprofils in diesem Wiki nicht möglich.'; $lang['profnochange'] = 'Keine Änderungen, nichts zu tun.'; $lang['profnoempty'] = 'Es muss ein Name und eine E-Mail-Adresse angegeben werden.'; @@ -253,7 +257,6 @@ $lang['admin_register'] = 'Neuen Benutzer anmelden'; $lang['metaedit'] = 'Metadaten bearbeiten'; $lang['metasaveerr'] = 'Die Metadaten konnten nicht gesichert werden'; $lang['metasaveok'] = 'Metadaten gesichert'; -$lang['btn_img_backto'] = 'Zurück zu %s'; $lang['img_title'] = 'Titel'; $lang['img_caption'] = 'Bildunterschrift'; $lang['img_date'] = 'Datum'; @@ -266,7 +269,6 @@ $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Schlagwörter'; $lang['img_width'] = 'Breite'; $lang['img_height'] = 'Höhe'; -$lang['btn_mediaManager'] = 'Im Medien-Manager anzeigen'; $lang['subscr_subscribe_success'] = '%s hat nun Änderungen der Seite %s abonniert'; $lang['subscr_subscribe_error'] = '%s kann die Änderungen der Seite %s nicht abonnieren'; $lang['subscr_subscribe_noaddress'] = 'Weil Ihre E-Mail-Adresse fehlt, können Sie das Thema nicht abonnieren'; -- cgit v1.2.3 From f934b764a4e9940f8fe921905ab24abff136f1c5 Mon Sep 17 00:00:00 2001 From: Aleksandr Selivanov Date: Mon, 17 Mar 2014 16:41:22 +0100 Subject: translation update --- inc/lang/ru/lang.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php index 9d35005bc..df44432c6 100644 --- a/inc/lang/ru/lang.php +++ b/inc/lang/ru/lang.php @@ -69,6 +69,8 @@ $lang['btn_register'] = 'Зарегистрироваться'; $lang['btn_apply'] = 'Применить'; $lang['btn_media'] = 'Управление медиафайлами'; $lang['btn_deleteuser'] = 'Удалить мой аккаунт'; +$lang['btn_img_backto'] = 'Вернуться к %s'; +$lang['btn_mediaManager'] = 'Просмотр в «управлении медиафайлами»'; $lang['loggedinas'] = 'Зашли как'; $lang['user'] = 'Логин'; $lang['pass'] = 'Пароль'; @@ -93,6 +95,7 @@ $lang['regbadmail'] = 'Данный вами адрес электр $lang['regbadpass'] = 'Два введённых пароля не идентичны. Пожалуйста, попробуйте ещё раз.'; $lang['regpwmail'] = 'Ваш пароль для системы «Докувики»'; $lang['reghere'] = 'У вас ещё нет аккаунта? Зарегистрируйтесь'; +$lang['notloggedin'] = 'Может быть, вы забыли пароль?'; $lang['profna'] = 'Данная вики не поддерживает изменение профиля'; $lang['profnochange'] = 'Изменений не было внесено, профиль не обновлён.'; $lang['profnoempty'] = 'Логин и адрес электронной почты не могут быть пустыми.'; @@ -198,6 +201,9 @@ $lang['difflink'] = 'Ссылка на это сравнение'; $lang['diff_type'] = 'Посмотреть отличия'; $lang['diff_inline'] = 'встроенный'; $lang['diff_side'] = 'бок о бок'; +$lang['diffprevrev'] = 'Предыдущая версия'; +$lang['diffnextrev'] = 'Следущая версия'; +$lang['difflastrev'] = 'Последняя версия'; $lang['line'] = 'Строка'; $lang['breadcrumb'] = 'Вы посетили'; $lang['youarehere'] = 'Вы находитесь здесь'; @@ -254,7 +260,6 @@ $lang['admin_register'] = 'Добавить пользователя'; $lang['metaedit'] = 'Править метаданные'; $lang['metasaveerr'] = 'Ошибка записи метаданных'; $lang['metasaveok'] = 'Метаданные сохранены'; -$lang['btn_img_backto'] = 'Вернуться к %s'; $lang['img_title'] = 'Название'; $lang['img_caption'] = 'Подпись'; $lang['img_date'] = 'Дата'; @@ -267,7 +272,6 @@ $lang['img_camera'] = 'Модель'; $lang['img_keywords'] = 'Ключевые слова'; $lang['img_width'] = 'Ширина'; $lang['img_height'] = 'Высота'; -$lang['btn_mediaManager'] = 'Просмотр в «управлении медиафайлами»'; $lang['subscr_subscribe_success'] = 'Добавлен %s в подписку на %s'; $lang['subscr_subscribe_error'] = 'Невозможно добавить %s в подписку на %s'; $lang['subscr_subscribe_noaddress'] = 'Нет адреса электронной почты, сопоставленного с вашей учётной записью. Вы не можете подписаться на рассылку'; -- cgit v1.2.3 From bc2be47d5025f6340908f521679a214a49066bab Mon Sep 17 00:00:00 2001 From: Rene Date: Mon, 17 Mar 2014 18:51:15 +0100 Subject: translation update --- inc/lang/nl/lang.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php index 42362661d..8d66a1392 100644 --- a/inc/lang/nl/lang.php +++ b/inc/lang/nl/lang.php @@ -67,6 +67,8 @@ $lang['btn_register'] = 'Registreren'; $lang['btn_apply'] = 'Toepassen'; $lang['btn_media'] = 'Mediabeheerder'; $lang['btn_deleteuser'] = 'Verwijder mijn account'; +$lang['btn_img_backto'] = 'Terug naar %s'; +$lang['btn_mediaManager'] = 'In mediabeheerder bekijken'; $lang['loggedinas'] = 'Ingelogd als'; $lang['user'] = 'Gebruikersnaam'; $lang['pass'] = 'Wachtwoord'; @@ -91,6 +93,7 @@ $lang['regbadmail'] = 'Het opgegeven e-mailadres lijkt ongeldig - als $lang['regbadpass'] = 'De twee ingevoerde wachtwoorden zijn niet identiek. Probeer het nog eens.'; $lang['regpwmail'] = 'Je DokuWiki wachtwoord'; $lang['reghere'] = 'Je hebt nog geen account? Vraag er eentje aan'; +$lang['notloggedin'] = 'Misschien vergat je in te loggen?'; $lang['profna'] = 'Deze wiki ondersteunt geen profielwijzigingen'; $lang['profnochange'] = 'Geen wijzigingen, niets gedaan'; $lang['profnoempty'] = 'Een lege gebruikersnaam of e-mailadres is niet toegestaan'; @@ -198,6 +201,11 @@ $lang['difflink'] = 'Link naar deze vergelijking'; $lang['diff_type'] = 'Bekijk verschillen:'; $lang['diff_inline'] = 'Inline'; $lang['diff_side'] = 'Zij aan zij'; +$lang['diffprevrev'] = 'Vorige revisie'; +$lang['diffnextrev'] = 'Volgende revisie'; +$lang['difflastrev'] = 'Laatste revisie'; +$lang['diffbothprevrev'] = 'Beide kanten vorige revisie'; +$lang['diffbothnextrev'] = 'Beide kanten volgende revisie'; $lang['line'] = 'Regel'; $lang['breadcrumb'] = 'Spoor'; $lang['youarehere'] = 'Je bent hier'; @@ -254,7 +262,6 @@ $lang['admin_register'] = 'Nieuwe gebruiker toevoegen'; $lang['metaedit'] = 'Metadata wijzigen'; $lang['metasaveerr'] = 'Schrijven van metadata mislukt'; $lang['metasaveok'] = 'Metadata bewaard'; -$lang['btn_img_backto'] = 'Terug naar %s'; $lang['img_title'] = 'Titel'; $lang['img_caption'] = 'Bijschrift'; $lang['img_date'] = 'Datum'; @@ -267,7 +274,6 @@ $lang['img_camera'] = 'Camera'; $lang['img_keywords'] = 'Trefwoorden'; $lang['img_width'] = 'Breedte'; $lang['img_height'] = 'Hoogte'; -$lang['btn_mediaManager'] = 'In mediabeheerder bekijken'; $lang['subscr_subscribe_success'] = '%s is ingeschreven voor %s'; $lang['subscr_subscribe_error'] = 'Fout bij inschrijven van %s voor %s'; $lang['subscr_subscribe_noaddress'] = 'Er is geen e-mailadres gekoppeld aan uw account, u kunt daardoor niet worden ingeschreven.'; -- cgit v1.2.3 From 5267006fc0516e8787cbc6a79e55cd4efd3e52c9 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 17 Mar 2014 19:15:41 +0100 Subject: notloggedin lang string left --- inc/lang/bn/lang.php | 1 - inc/lang/en/lang.php | 1 - inc/lang/ru/lang.php | 1 - 3 files changed, 3 deletions(-) (limited to 'inc') diff --git a/inc/lang/bn/lang.php b/inc/lang/bn/lang.php index 8dece4ea0..230f3ef80 100644 --- a/inc/lang/bn/lang.php +++ b/inc/lang/bn/lang.php @@ -66,7 +66,6 @@ $lang['minoredit'] = 'ক্ষুদ্র পরিবর্তন $lang['draftdate'] = 'খসড়া উপর স্বতঃসংরক্ষণ'; $lang['nosecedit'] = 'পাতা ইতিমধ্যে পরিবর্তিত হয়েছিল, অধ্যায় তথ্যের পরিবর্তে পুরো পাতা লোড তারিখ সীমার বাইরে ছিল. '; -$lang['notloggedin'] = 'সম্ভবত আপনি লগইন ভুলে গেছেন?'; $lang['regmissing'] = 'দুঃখিত, আপনি সমস্ত ক্ষেত্রগুলি পূরণ করা আবশ্যক.'; $lang['reguexists'] = 'দুঃখিত, এই লগইন সঙ্গে একটি ব্যবহারকারী ইতিমধ্যেই বিদ্যমান.'; $lang['regsuccess'] = 'ব্যবহারকারী তৈরি করা হয়েছে এবং পাসওয়ার্ড ইমেইল করে পাঠানো হয়েছিল.'; diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index e53a25815..592289185 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -80,7 +80,6 @@ $lang['regbadmail'] = 'The given email address looks invalid - if you $lang['regbadpass'] = 'The two given passwords are not identical, please try again.'; $lang['regpwmail'] = 'Your DokuWiki password'; $lang['reghere'] = 'You don\'t have an account yet? Just get one'; -$lang['notloggedin'] = 'Perhaps you forgot to login?'; $lang['profna'] = 'This wiki does not support profile modification'; $lang['profnochange'] = 'No changes, nothing to do.'; diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php index df44432c6..deeb01616 100644 --- a/inc/lang/ru/lang.php +++ b/inc/lang/ru/lang.php @@ -95,7 +95,6 @@ $lang['regbadmail'] = 'Данный вами адрес электр $lang['regbadpass'] = 'Два введённых пароля не идентичны. Пожалуйста, попробуйте ещё раз.'; $lang['regpwmail'] = 'Ваш пароль для системы «Докувики»'; $lang['reghere'] = 'У вас ещё нет аккаунта? Зарегистрируйтесь'; -$lang['notloggedin'] = 'Может быть, вы забыли пароль?'; $lang['profna'] = 'Данная вики не поддерживает изменение профиля'; $lang['profnochange'] = 'Изменений не было внесено, профиль не обновлён.'; $lang['profnoempty'] = 'Логин и адрес электронной почты не могут быть пустыми.'; -- cgit v1.2.3 From 494cd513a6a384395f63bcdae7343254acc36e16 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 17 Mar 2014 19:21:31 +0100 Subject: notloggedin removed from nl as well + fix of AD domain string. --- inc/lang/nl/lang.php | 1 - 1 file changed, 1 deletion(-) (limited to 'inc') diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php index 8d66a1392..b6cf11968 100644 --- a/inc/lang/nl/lang.php +++ b/inc/lang/nl/lang.php @@ -93,7 +93,6 @@ $lang['regbadmail'] = 'Het opgegeven e-mailadres lijkt ongeldig - als $lang['regbadpass'] = 'De twee ingevoerde wachtwoorden zijn niet identiek. Probeer het nog eens.'; $lang['regpwmail'] = 'Je DokuWiki wachtwoord'; $lang['reghere'] = 'Je hebt nog geen account? Vraag er eentje aan'; -$lang['notloggedin'] = 'Misschien vergat je in te loggen?'; $lang['profna'] = 'Deze wiki ondersteunt geen profielwijzigingen'; $lang['profnochange'] = 'Geen wijzigingen, niets gedaan'; $lang['profnoempty'] = 'Een lege gebruikersnaam of e-mailadres is niet toegestaan'; -- cgit v1.2.3 From 2549a25a3e31bbf5b00c04831062e05640d7b8c0 Mon Sep 17 00:00:00 2001 From: Christopher Schive Date: Tue, 18 Mar 2014 13:56:35 +0100 Subject: translation update --- inc/lang/no/lang.php | 11 +++++++++-- inc/lang/no/resetpwd.txt | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 inc/lang/no/resetpwd.txt (limited to 'inc') diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php index cdf0effcc..8b3c4937f 100644 --- a/inc/lang/no/lang.php +++ b/inc/lang/no/lang.php @@ -20,6 +20,7 @@ * @author Egil Hansen * @author Thomas Juberg * @author Boris + * @author Christopher Schive */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -64,6 +65,8 @@ $lang['btn_register'] = 'Registrer deg'; $lang['btn_apply'] = 'Bruk'; $lang['btn_media'] = 'Mediefiler'; $lang['btn_deleteuser'] = 'Fjern min konto'; +$lang['btn_img_backto'] = 'Tilbake til %s'; +$lang['btn_mediaManager'] = 'Vis i mediefilbehandler'; $lang['loggedinas'] = 'Innlogget som'; $lang['user'] = 'Brukernavn'; $lang['pass'] = 'Passord'; @@ -195,6 +198,11 @@ $lang['difflink'] = 'Lenk til denne sammenligningen'; $lang['diff_type'] = 'Vis forskjeller:'; $lang['diff_inline'] = 'I teksten'; $lang['diff_side'] = 'Side ved side'; +$lang['diffprevrev'] = 'Forrige revisjon'; +$lang['diffnextrev'] = 'Neste revisjon'; +$lang['difflastrev'] = 'Siste revisjon'; +$lang['diffbothprevrev'] = 'Begge sider forrige revisjon'; +$lang['diffbothnextrev'] = 'Begge sider neste revisjon'; $lang['line'] = 'Linje'; $lang['breadcrumb'] = 'Spor'; $lang['youarehere'] = 'Du er her'; @@ -251,7 +259,6 @@ $lang['admin_register'] = 'Legg til ny bruker'; $lang['metaedit'] = 'Rediger metadata'; $lang['metasaveerr'] = 'Skriving av metadata feilet'; $lang['metasaveok'] = 'Metadata lagret'; -$lang['btn_img_backto'] = 'Tilbake til %s'; $lang['img_title'] = 'Tittel'; $lang['img_caption'] = 'Bildetekst'; $lang['img_date'] = 'Dato'; @@ -264,7 +271,6 @@ $lang['img_camera'] = 'Kamera'; $lang['img_keywords'] = 'Nøkkelord'; $lang['img_width'] = 'Bredde'; $lang['img_height'] = 'Høyde'; -$lang['btn_mediaManager'] = 'Vis i mediefilbehandler'; $lang['subscr_subscribe_success'] = 'La til %s som abonnent på %s'; $lang['subscr_subscribe_error'] = 'Klarte ikke å legge til %s som abonnent på %s'; $lang['subscr_subscribe_noaddress'] = 'Brukeren din er ikke registrert med noen adresse. Du kan derfor ikke legges til som abonnent.'; @@ -348,3 +354,4 @@ $lang['media_restore'] = 'Gjenopprett denne versjonen'; $lang['currentns'] = 'gjeldende navnemellomrom'; $lang['searchresult'] = 'Søk i resultat'; $lang['plainhtml'] = 'Enkel HTML'; +$lang['wikimarkup'] = 'wiki-format'; diff --git a/inc/lang/no/resetpwd.txt b/inc/lang/no/resetpwd.txt new file mode 100644 index 000000000..2da717021 --- /dev/null +++ b/inc/lang/no/resetpwd.txt @@ -0,0 +1,3 @@ +====== Sett nytt passord ====== + +Vennligst skriv inn et nytt passord for din konto i denne wikien. \ No newline at end of file -- cgit v1.2.3