From 8265594d98708c1c993489099402d9ee27d2a289 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 14 Oct 2013 15:55:16 +0200 Subject: move ajax.php to action.php. Fixes FS#2233 --- lib/plugins/acl/action.php | 92 ++++++++++++++++++++++++++++++++++++++++++++++ lib/plugins/acl/script.js | 9 +++-- 2 files changed, 97 insertions(+), 4 deletions(-) create mode 100644 lib/plugins/acl/action.php (limited to 'lib/plugins') diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php new file mode 100644 index 000000000..92a93865c --- /dev/null +++ b/lib/plugins/acl/action.php @@ -0,0 +1,92 @@ + + */ + +// must be run within Dokuwiki +if(!defined('DOKU_INC')) die(); + +/** + * Register handler + */ +class action_plugin_acl extends DokuWiki_Action_Plugin { + + /** + * Registers a callback function for a given event + * + * @param Doku_Event_Handler $controller DokuWiki's event controller object + * @return void + */ + public function register(Doku_Event_Handler &$controller) { + + $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handle_ajax_call_acl'); + + } + + /** + * AJAX call handler for ACL plugin + * + * @param Doku_Event $event event object by reference + * @param mixed $param empty + * @return void + */ + + public function handle_ajax_call_acl(Doku_Event &$event, $param) { + if ($event->data !== 'plugin_acl') { + return; + } + $event->stopPropagation(); + $event->preventDefault(); + + + //close session + session_write_close(); + + global $conf; + global $ID; + global $INPUT; + + //fix for Opera XMLHttpRequests + $postData = http_get_raw_post_data(); + if(!count($_POST) && !empty($postData)){ + parse_str($postData, $_POST); + } + + if(!auth_isadmin()) die('for admins only'); + if(!checkSecurityToken()) die('CRSF Attack'); + + $ID = getID(); + + /** @var $acl admin_plugin_acl */ + $acl = plugin_load('admin','acl'); + $acl->handle(); + + $ajax = $INPUT->str('ajax'); + header('Content-Type: text/html; charset=utf-8'); + + if($ajax == 'info'){ + $acl->_html_info(); + }elseif($ajax == 'tree'){ + + $dir = $conf['datadir']; + $ns = $INPUT->str('ns'); + if($ns == '*'){ + $ns =''; + } + $ns = cleanID($ns); + $lvl = count(explode(':',$ns)); + $ns = utf8_encodeFN(str_replace(':','/',$ns)); + + $data = $acl->_get_tree($ns,$ns); + + foreach(array_keys($data) as $item){ + $data[$item]['level'] = $lvl+1; + } + echo html_buildlist($data, 'acl', array($acl, '_html_list_acl'), + array($acl, '_html_li_acl')); + } + } +} \ No newline at end of file diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js index 0abb80d67..58598b1e0 100644 --- a/lib/plugins/acl/script.js +++ b/lib/plugins/acl/script.js @@ -25,9 +25,10 @@ var dw_acl = { var $frm = jQuery('#acl__detail form'); jQuery.post( - DOKU_BASE + 'lib/plugins/acl/ajax.php', + DOKU_BASE + 'lib/exe/ajax.php', jQuery.extend(dw_acl.parseatt($clicky.parent().find('a')[0].search), - {ajax: 'tree', + {call: 'plugin_acl', + ajax: 'tree', current_ns: $frm.find('input[name=ns]').val(), current_id: $frm.find('input[name=id]').val()}), show_sublist, @@ -64,8 +65,8 @@ var dw_acl = { .attr('role', 'alert') .html('...') .load( - DOKU_BASE + 'lib/plugins/acl/ajax.php', - jQuery('#acl__detail form').serialize() + '&ajax=info' + DOKU_BASE + 'lib/exe/ajax.php', + jQuery('#acl__detail form').serialize() + '&call=plugin_acl&ajax=info' ); return false; }, -- cgit v1.2.3 From d4e2226677c742531e589ebd2b45fdd4553322ad Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 14 Oct 2013 15:56:52 +0200 Subject: remove unused variable --- lib/plugins/acl/action.php | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php index 92a93865c..373d6cbb0 100644 --- a/lib/plugins/acl/action.php +++ b/lib/plugins/acl/action.php @@ -71,7 +71,6 @@ class action_plugin_acl extends DokuWiki_Action_Plugin { $acl->_html_info(); }elseif($ajax == 'tree'){ - $dir = $conf['datadir']; $ns = $INPUT->str('ns'); if($ns == '*'){ $ns =''; -- cgit v1.2.3 From 219fe1dcb7250b332a77278fd31f20e5da10846c Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 14 Oct 2013 16:00:45 +0200 Subject: Code reformatting and remove unused global conf --- lib/plugins/acl/action.php | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php index 373d6cbb0..01842250e 100644 --- a/lib/plugins/acl/action.php +++ b/lib/plugins/acl/action.php @@ -30,62 +30,62 @@ class action_plugin_acl extends DokuWiki_Action_Plugin { * AJAX call handler for ACL plugin * * @param Doku_Event $event event object by reference - * @param mixed $param empty + * @param mixed $param empty * @return void */ public function handle_ajax_call_acl(Doku_Event &$event, $param) { - if ($event->data !== 'plugin_acl') { + if($event->data !== 'plugin_acl') { return; } $event->stopPropagation(); $event->preventDefault(); - //close session session_write_close(); - global $conf; global $ID; global $INPUT; //fix for Opera XMLHttpRequests $postData = http_get_raw_post_data(); - if(!count($_POST) && !empty($postData)){ + if(!count($_POST) && !empty($postData)) { parse_str($postData, $_POST); } if(!auth_isadmin()) die('for admins only'); if(!checkSecurityToken()) die('CRSF Attack'); - $ID = getID(); + $ID = getID(); /** @var $acl admin_plugin_acl */ - $acl = plugin_load('admin','acl'); + $acl = plugin_load('admin', 'acl'); $acl->handle(); $ajax = $INPUT->str('ajax'); header('Content-Type: text/html; charset=utf-8'); - if($ajax == 'info'){ + if($ajax == 'info') { $acl->_html_info(); - }elseif($ajax == 'tree'){ + } elseif($ajax == 'tree') { - $ns = $INPUT->str('ns'); - if($ns == '*'){ - $ns =''; + $ns = $INPUT->str('ns'); + if($ns == '*') { + $ns = ''; } - $ns = cleanID($ns); - $lvl = count(explode(':',$ns)); - $ns = utf8_encodeFN(str_replace(':','/',$ns)); + $ns = cleanID($ns); + $lvl = count(explode(':', $ns)); + $ns = utf8_encodeFN(str_replace(':', '/', $ns)); - $data = $acl->_get_tree($ns,$ns); + $data = $acl->_get_tree($ns, $ns); - foreach(array_keys($data) as $item){ - $data[$item]['level'] = $lvl+1; + foreach(array_keys($data) as $item) { + $data[$item]['level'] = $lvl + 1; } - echo html_buildlist($data, 'acl', array($acl, '_html_list_acl'), - array($acl, '_html_li_acl')); + echo html_buildlist( + $data, 'acl', array($acl, '_html_list_acl'), + array($acl, '_html_li_acl') + ); } } } \ No newline at end of file -- cgit v1.2.3 From 07be12a51cc4c7850e57b25c6c1bd86ca0004a00 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 14 Oct 2013 16:04:31 +0200 Subject: acl ajax: replace die() by return --- lib/plugins/acl/action.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php index 01842250e..bac518fcd 100644 --- a/lib/plugins/acl/action.php +++ b/lib/plugins/acl/action.php @@ -53,8 +53,8 @@ class action_plugin_acl extends DokuWiki_Action_Plugin { parse_str($postData, $_POST); } - if(!auth_isadmin()) die('for admins only'); - if(!checkSecurityToken()) die('CRSF Attack'); + if(!auth_isadmin()) return; + if(!checkSecurityToken()) return; $ID = getID(); -- cgit v1.2.3 From 00dd0e7e7ab5bc29658e4be85336841af70b6b97 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 14 Oct 2013 16:12:01 +0200 Subject: acl ajax: add messages to returns --- lib/plugins/acl/action.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php index bac518fcd..6111aca42 100644 --- a/lib/plugins/acl/action.php +++ b/lib/plugins/acl/action.php @@ -53,8 +53,14 @@ class action_plugin_acl extends DokuWiki_Action_Plugin { parse_str($postData, $_POST); } - if(!auth_isadmin()) return; - if(!checkSecurityToken()) return; + if(!auth_isadmin()) { + echo 'for admins only'; + return; + } + if(!checkSecurityToken()) { + echo 'CRSF Attack'; + return; + } $ID = getID(); -- cgit v1.2.3 From 45d5ad751f327b10e7256d448d5595daa82c98c4 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 15 Oct 2013 13:03:30 +0200 Subject: fix php strict notices --- lib/plugins/action.php | 2 +- lib/plugins/config/settings/extra.class.php | 2 +- lib/plugins/plugin/classes/ap_info.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/action.php b/lib/plugins/action.php index 04b4f07a6..4b5eef60a 100644 --- a/lib/plugins/action.php +++ b/lib/plugins/action.php @@ -17,7 +17,7 @@ class DokuWiki_Action_Plugin extends DokuWiki_Plugin { /** * Registers a callback function for a given event */ - function register(Doku_Event_Handler $controller) { + public function register(Doku_Event_Handler $controller) { trigger_error('register() not implemented in '.get_class($this), E_USER_WARNING); } } diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php index d0f99fa8f..83de802a3 100644 --- a/lib/plugins/config/settings/extra.class.php +++ b/lib/plugins/config/settings/extra.class.php @@ -176,7 +176,7 @@ if (!class_exists('setting_renderer')) { $format = $this->_format; foreach (plugin_list('renderer') as $plugin) { - $renderer =& plugin_load('renderer',$plugin); + $renderer = plugin_load('renderer',$plugin); if (method_exists($renderer,'canRender') && $renderer->canRender($format)) { $this->_choices[] = $plugin; diff --git a/lib/plugins/plugin/classes/ap_info.class.php b/lib/plugins/plugin/classes/ap_info.class.php index b3826b944..89b78fa2d 100644 --- a/lib/plugins/plugin/classes/ap_info.class.php +++ b/lib/plugins/plugin/classes/ap_info.class.php @@ -14,7 +14,7 @@ class ap_info extends ap_manage { usort($component_list, array($this,'component_sort')); foreach ($component_list as $component) { - if (($obj = &plugin_load($component['type'],$component['name'],false,true)) === null) continue; + if (($obj = plugin_load($component['type'],$component['name'],false,true)) === null) continue; $compname = explode('_',$component['name']); if($compname[1]){ -- cgit v1.2.3 From 5da403f17a007f1b202f1c5ea2dbc80ab19d26e8 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 15 Oct 2013 16:26:25 +0200 Subject: fix signatures and old by references --- lib/plugins/config/settings/config.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index 1d2173706..a5a11cda1 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -794,7 +794,7 @@ if (!class_exists('setting_numericopt')) { if (!class_exists('setting_onoff')) { class setting_onoff extends setting_numeric { - function html(&$plugin) { + function html(&$plugin, $echo = false) { $value = ''; $disable = ''; @@ -830,7 +830,7 @@ if (!class_exists('setting_multichoice')) { class setting_multichoice extends setting_string { var $_choices = array(); - function html(&$plugin) { + function html(&$plugin, $echo = false) { $value = ''; $disable = ''; $nochoice = ''; -- cgit v1.2.3 From 74ed54d4f9a7c9796916f33f649ef94619a31704 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Wed, 16 Oct 2013 11:29:27 +0200 Subject: fix signature mail unittest, and improve some signatures info plugin --- lib/plugins/info/syntax.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php index 5d969d7a2..e68061e5d 100644 --- a/lib/plugins/info/syntax.php +++ b/lib/plugins/info/syntax.php @@ -58,6 +58,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { */ function render($format, Doku_Renderer &$renderer, $data) { if($format == 'xhtml'){ + /** @var Doku_Renderer_xhtml $renderer */ //handle various info stuff switch ($data[0]){ case 'syntaxmodes': @@ -103,7 +104,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { * * uses some of the original renderer methods */ - function _plugins_xhtml($type, Doku_Renderer &$renderer){ + function _plugins_xhtml($type, Doku_Renderer_xhtml &$renderer){ global $lang; $renderer->doc .= '
    '; @@ -141,9 +142,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { * * uses some of the original renderer methods */ - function _helpermethods_xhtml(Doku_Renderer &$renderer){ - global $lang; - + function _helpermethods_xhtml(Doku_Renderer_xhtml &$renderer){ $plugins = plugin_list('helper'); foreach($plugins as $p){ if (!$po = plugin_load('helper',$p)) continue; -- cgit v1.2.3 From e07886c01389351f28a254ef6f7c9611453508fb Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sun, 20 Oct 2013 20:21:42 +0200 Subject: Info plugin: allow xhtml renders to not to be an xhtml renderer Renderers that set the format to xhtml don't necessarily inherit from Doku_Renderer_xhtml, this reverts a prior change that introduced the stricter parameter type. --- lib/plugins/info/syntax.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php index e68061e5d..f8c6eb484 100644 --- a/lib/plugins/info/syntax.php +++ b/lib/plugins/info/syntax.php @@ -104,7 +104,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { * * uses some of the original renderer methods */ - function _plugins_xhtml($type, Doku_Renderer_xhtml &$renderer){ + function _plugins_xhtml($type, Doku_Renderer &$renderer){ global $lang; $renderer->doc .= '
      '; @@ -142,7 +142,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { * * uses some of the original renderer methods */ - function _helpermethods_xhtml(Doku_Renderer_xhtml &$renderer){ + function _helpermethods_xhtml(Doku_Renderer &$renderer){ $plugins = plugin_list('helper'); foreach($plugins as $p){ if (!$po = plugin_load('helper',$p)) continue; @@ -250,10 +250,11 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { /** * Adds a TOC item */ - function _addToTOC($text, $level, Doku_Renderer_xhtml &$renderer){ + function _addToTOC($text, $level, Doku_Renderer &$renderer){ global $conf; if (($level >= $conf['toptoclevel']) && ($level <= $conf['maxtoclevel'])){ + /** @var $renderer Doku_Renderer_xhtml */ $hid = $renderer->_headerToLink($text, 'true'); $renderer->toc[] = array( 'hid' => $hid, -- cgit v1.2.3 From e979d184ca6fbad44ae1f33610c80b80d106e067 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 20 Oct 2013 21:51:13 +0200 Subject: remove no longer used ajax.php --- lib/plugins/acl/ajax.php | 57 ------------------------------------------------ 1 file changed, 57 deletions(-) delete mode 100644 lib/plugins/acl/ajax.php (limited to 'lib/plugins') diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php deleted file mode 100644 index 10e18af97..000000000 --- a/lib/plugins/acl/ajax.php +++ /dev/null @@ -1,57 +0,0 @@ - - */ - -if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../'); -require_once(DOKU_INC.'inc/init.php'); -//close session -session_write_close(); - -global $conf; -global $ID; -global $INPUT; - -//fix for Opera XMLHttpRequests -$postData = http_get_raw_post_data(); -if(!count($_POST) && !empty($postData)){ - parse_str($postData, $_POST); -} - -if(!auth_isadmin()) die('for admins only'); -if(!checkSecurityToken()) die('CRSF Attack'); - -$ID = getID(); - -/** @var $acl admin_plugin_acl */ -$acl = plugin_load('admin','acl'); -$acl->handle(); - -$ajax = $INPUT->str('ajax'); -header('Content-Type: text/html; charset=utf-8'); - -if($ajax == 'info'){ - $acl->_html_info(); -}elseif($ajax == 'tree'){ - - $dir = $conf['datadir']; - $ns = $INPUT->str('ns'); - if($ns == '*'){ - $ns =''; - } - $ns = cleanID($ns); - $lvl = count(explode(':',$ns)); - $ns = utf8_encodeFN(str_replace(':','/',$ns)); - - $data = $acl->_get_tree($ns,$ns); - - foreach(array_keys($data) as $item){ - $data[$item]['level'] = $lvl+1; - } - echo html_buildlist($data, 'acl', array($acl, '_html_list_acl'), - array($acl, '_html_li_acl')); -} - -- cgit v1.2.3 From 4d13d89c45c088d6070c4e2da6d5b702f13c77ab Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 20 Oct 2013 21:52:19 +0200 Subject: remove obsolete opera handling and session closing --- lib/plugins/acl/action.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/action.php b/lib/plugins/acl/action.php index 6111aca42..5e186fb61 100644 --- a/lib/plugins/acl/action.php +++ b/lib/plugins/acl/action.php @@ -41,18 +41,9 @@ class action_plugin_acl extends DokuWiki_Action_Plugin { $event->stopPropagation(); $event->preventDefault(); - //close session - session_write_close(); - global $ID; global $INPUT; - //fix for Opera XMLHttpRequests - $postData = http_get_raw_post_data(); - if(!count($_POST) && !empty($postData)) { - parse_str($postData, $_POST); - } - if(!auth_isadmin()) { echo 'for admins only'; return; @@ -94,4 +85,4 @@ class action_plugin_acl extends DokuWiki_Action_Plugin { ); } } -} \ No newline at end of file +} -- cgit v1.2.3 From 214eb73e2e4c60dc992d61d8736dd9391178d170 Mon Sep 17 00:00:00 2001 From: Jens Hyllegaard Date: Mon, 21 Oct 2013 14:20:59 +0200 Subject: translation update --- lib/plugins/plugin/lang/da/lang.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/plugins') diff --git a/lib/plugins/plugin/lang/da/lang.php b/lib/plugins/plugin/lang/da/lang.php index d2751fa1b..07077eaa1 100644 --- a/lib/plugins/plugin/lang/da/lang.php +++ b/lib/plugins/plugin/lang/da/lang.php @@ -12,6 +12,7 @@ * @author rasmus@kinnerup.com * @author Michael Pedersen subben@gmail.com * @author Mikael Lyngvig + * @author Jens Hyllegaard */ $lang['menu'] = 'Håndter udvidelser'; $lang['download'] = 'Hent og tilføj ny udvidelse'; @@ -23,7 +24,7 @@ $lang['btn_settings'] = 'indstillinger'; $lang['btn_download'] = 'Hent'; $lang['btn_enable'] = 'Gem'; $lang['url'] = 'URL-adresse'; -$lang['installed'] = 'Tliføjet:'; +$lang['installed'] = 'Tilføjet:'; $lang['lastupdate'] = 'Sidst opdateret:'; $lang['source'] = 'Kilde:'; $lang['unknown'] = 'ukendt'; -- cgit v1.2.3 From e4e504c4188ebbe344ed3b6b316137e99f98f642 Mon Sep 17 00:00:00 2001 From: Roy Zahor Date: Mon, 21 Oct 2013 14:30:49 +0200 Subject: translation update --- lib/plugins/acl/lang/he/lang.php | 4 ++-- lib/plugins/plugin/lang/he/lang.php | 4 ++-- lib/plugins/popularity/lang/he/lang.php | 5 +++-- lib/plugins/revert/lang/he/lang.php | 5 +++-- lib/plugins/usermanager/lang/he/lang.php | 5 +++-- 5 files changed, 13 insertions(+), 10 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/lang/he/lang.php b/lib/plugins/acl/lang/he/lang.php index 91025f4b8..6716081eb 100644 --- a/lib/plugins/acl/lang/he/lang.php +++ b/lib/plugins/acl/lang/he/lang.php @@ -1,8 +1,8 @@ * @author Dotan Kamber * @author Moshe Kaplan diff --git a/lib/plugins/plugin/lang/he/lang.php b/lib/plugins/plugin/lang/he/lang.php index 47253e335..7753c23cf 100644 --- a/lib/plugins/plugin/lang/he/lang.php +++ b/lib/plugins/plugin/lang/he/lang.php @@ -1,8 +1,8 @@ * @author Dotan Kamber * @author Moshe Kaplan diff --git a/lib/plugins/popularity/lang/he/lang.php b/lib/plugins/popularity/lang/he/lang.php index f619127cd..54341636b 100644 --- a/lib/plugins/popularity/lang/he/lang.php +++ b/lib/plugins/popularity/lang/he/lang.php @@ -1,7 +1,8 @@ * @author Moshe Kaplan * @author Yaron Yogev diff --git a/lib/plugins/revert/lang/he/lang.php b/lib/plugins/revert/lang/he/lang.php index ac3c3412e..2f49856f5 100644 --- a/lib/plugins/revert/lang/he/lang.php +++ b/lib/plugins/revert/lang/he/lang.php @@ -1,7 +1,8 @@ * @author Moshe Kaplan * @author Yaron Yogev diff --git a/lib/plugins/usermanager/lang/he/lang.php b/lib/plugins/usermanager/lang/he/lang.php index 601163013..18202584e 100644 --- a/lib/plugins/usermanager/lang/he/lang.php +++ b/lib/plugins/usermanager/lang/he/lang.php @@ -1,7 +1,8 @@ * @author Dotan Kamber * @author Moshe Kaplan -- cgit v1.2.3 From 48e49553b3ae1dc9624cdd96b34ffe0175ba8ae3 Mon Sep 17 00:00:00 2001 From: Jens Hyllegaard Date: Mon, 21 Oct 2013 14:36:35 +0200 Subject: translation update --- lib/plugins/authad/lang/da/settings.php | 10 ++++++++++ lib/plugins/authldap/lang/da/settings.php | 9 +++++++++ lib/plugins/authmysql/lang/da/settings.php | 12 ++++++++++++ lib/plugins/authpgsql/lang/da/settings.php | 10 ++++++++++ 4 files changed, 41 insertions(+) create mode 100644 lib/plugins/authldap/lang/da/settings.php create mode 100644 lib/plugins/authmysql/lang/da/settings.php create mode 100644 lib/plugins/authpgsql/lang/da/settings.php (limited to 'lib/plugins') diff --git a/lib/plugins/authad/lang/da/settings.php b/lib/plugins/authad/lang/da/settings.php index 958c41cf5..f50abf1ce 100644 --- a/lib/plugins/authad/lang/da/settings.php +++ b/lib/plugins/authad/lang/da/settings.php @@ -4,7 +4,17 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Soren Birk + * @author Jens Hyllegaard */ +$lang['account_suffix'] = 'Dit konto suffiks. F.eks. @mit.domæne.dk'; +$lang['base_dn'] = 'Dit grund DN. F.eks. DC=mit,DC=domæne,DC=dk'; +$lang['domain_controllers'] = 'En kommasepareret liste over domænecontrollere. F.eks. srv1.domain.org,srv2.domain.org'; +$lang['admin_username'] = 'En privilegeret Active Directory bruger med adgang til alle andre brugeres data. Valgfri, men skal bruges til forskellige handlinger såsom at sende abonnement e-mails.'; $lang['admin_password'] = 'Kodeordet til den ovenstående bruger.'; +$lang['sso'] = 'Bør Single-Sign-On via Kerberos eller NTLM bruges?'; +$lang['real_primarygroup'] = 'Bør den korrekte primære gruppe findes i stedet for at antage "Domain Users" (langsommere)'; $lang['use_ssl'] = 'Benyt SSL forbindelse? hvis ja, vælg ikke TLS herunder.'; $lang['use_tls'] = 'Benyt TLS forbindelse? hvis ja, vælg ikke SSL herover.'; +$lang['debug'] = 'Vis yderligere debug output ved fejl?'; +$lang['expirywarn'] = 'Dage før brugere skal advares om udløben adgangskode. 0 for at deaktivere.'; +$lang['additional'] = 'En kommasepareret liste over yderligere AD attributter der skal hentes fra brugerdata. Brug af nogen udvidelser.'; diff --git a/lib/plugins/authldap/lang/da/settings.php b/lib/plugins/authldap/lang/da/settings.php new file mode 100644 index 000000000..a3558aa5c --- /dev/null +++ b/lib/plugins/authldap/lang/da/settings.php @@ -0,0 +1,9 @@ + + */ +$lang['server'] = 'Din LDAP server. Enten værtsnavn (localhost) eller fuld kvalificeret URL (ldap://server.tld:389)'; +$lang['debug'] = 'Vis yderligere debug output ved fejl'; diff --git a/lib/plugins/authmysql/lang/da/settings.php b/lib/plugins/authmysql/lang/da/settings.php new file mode 100644 index 000000000..207d0ff60 --- /dev/null +++ b/lib/plugins/authmysql/lang/da/settings.php @@ -0,0 +1,12 @@ + + */ +$lang['server'] = 'Din MySQL server'; +$lang['debug'] = 'Vis yderligere debug output'; +$lang['debug_o_0'] = 'ingen'; +$lang['debug_o_1'] = 'kun ved fejl'; +$lang['debug_o_2'] = 'alle SQL forespørgsler'; diff --git a/lib/plugins/authpgsql/lang/da/settings.php b/lib/plugins/authpgsql/lang/da/settings.php new file mode 100644 index 000000000..76c08a734 --- /dev/null +++ b/lib/plugins/authpgsql/lang/da/settings.php @@ -0,0 +1,10 @@ + + */ +$lang['server'] = 'Din PostgresSQL server'; +$lang['port'] = 'Din PostgresSQL servers port'; +$lang['debug'] = 'Vis yderligere debug output'; -- cgit v1.2.3 From bbae9436b433e627e9b4f68fdc946357d214b40f Mon Sep 17 00:00:00 2001 From: Jens Hyllegaard Date: Mon, 21 Oct 2013 15:00:55 +0200 Subject: translation update --- lib/plugins/popularity/lang/da/submitted.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins') diff --git a/lib/plugins/popularity/lang/da/submitted.txt b/lib/plugins/popularity/lang/da/submitted.txt index 7d7d5429c..88e9ba060 100644 --- a/lib/plugins/popularity/lang/da/submitted.txt +++ b/lib/plugins/popularity/lang/da/submitted.txt @@ -1,3 +1,3 @@ -====== Popularitetsfeeback ====== +====== Popularitetsfeedback ====== Dataene er blevet sendt. \ No newline at end of file -- cgit v1.2.3