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 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(-) 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(-) 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(-) 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(-) 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 --- inc/parser/handler.php | 2 +- lib/plugins/action.php | 2 +- lib/plugins/config/settings/extra.class.php | 2 +- lib/plugins/plugin/classes/ap_info.class.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/parser/handler.php b/inc/parser/handler.php index 1de981b48..63a4104e2 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -70,7 +70,7 @@ class Doku_Handler { */ function plugin($match, $state, $pos, $pluginname){ $data = array($match); - $plugin =& plugin_load('syntax',$pluginname); + $plugin = plugin_load('syntax',$pluginname); if($plugin != null){ $data = $plugin->handle($match, $state, $pos, $this); } 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 f19d1038b198647f2be868029e6692e6e55f8850 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 15 Oct 2013 13:12:57 +0200 Subject: fix php strict and remove double duplicated code of renderer plugin loader --- inc/parserutils.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/inc/parserutils.php b/inc/parserutils.php index 56161af44..21ae756c4 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -641,10 +641,7 @@ function & p_get_renderer($mode) { $Renderer = new $rclass(); }else{ // Maybe a plugin/component is available? - list($plugin, $component) = $plugin_controller->_splitName($rname); - if (!$plugin_controller->isdisabled($plugin)){ - $Renderer =& $plugin_controller->load('renderer',$rname); - } + $Renderer = $plugin_controller->load('renderer',$rname); if(!isset($Renderer) || is_null($Renderer)){ msg("No renderer '$rname' found for mode '$mode'",-1); -- cgit v1.2.3 From a04f2bd5a2eae55dbbdbbcffbe7b500b689138e7 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 15 Oct 2013 16:08:45 +0200 Subject: not assign object from plugin_load by reference --- inc/actions.php | 2 +- inc/html.php | 2 +- inc/template.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/actions.php b/inc/actions.php index bf124c887..06499df9c 100644 --- a/inc/actions.php +++ b/inc/actions.php @@ -164,7 +164,7 @@ function act_dispatch(){ $pluginlist = plugin_list('admin'); if (in_array($page, $pluginlist)) { // attempt to load the plugin - if ($plugin =& plugin_load('admin',$page) !== null){ + if ($plugin = plugin_load('admin',$page) !== null){ /** @var DokuWiki_Admin_Plugin $plugin */ if($plugin->forAdminOnly() && !$INFO['isadmin']){ // a manager tried to load a plugin that's for admins only diff --git a/inc/html.php b/inc/html.php index 03e9dc751..68ca364f1 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1669,7 +1669,7 @@ function html_admin(){ $menu = array(); foreach ($pluginlist as $p) { /** @var DokuWiki_Admin_Plugin $obj */ - if($obj =& plugin_load('admin',$p) === null) continue; + if($obj = plugin_load('admin',$p) === null) continue; // check permissions if($obj->forAdminOnly() && !$INFO['isadmin']) continue; diff --git a/inc/template.php b/inc/template.php index c08767e52..868ef300c 100644 --- a/inc/template.php +++ b/inc/template.php @@ -223,7 +223,7 @@ function tpl_toc($return = false) { if(in_array($class, $pluginlist)) { // attempt to load the plugin /** @var $plugin DokuWiki_Admin_Plugin */ - $plugin =& plugin_load('admin', $class); + $plugin = plugin_load('admin', $class); } } if( ($plugin !== null) && (!$plugin->forAdminOnly() || $INFO['isadmin']) ) { @@ -257,7 +257,7 @@ function tpl_admin() { if(in_array($class, $pluginlist)) { // attempt to load the plugin /** @var $plugin DokuWiki_Admin_Plugin */ - $plugin =& plugin_load('admin', $class); + $plugin = plugin_load('admin', $class); } } -- 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 --- inc/actions.php | 3 ++- inc/html.php | 4 ++-- lib/plugins/config/settings/config.class.php | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/inc/actions.php b/inc/actions.php index 06499df9c..5a59d852d 100644 --- a/inc/actions.php +++ b/inc/actions.php @@ -164,7 +164,8 @@ function act_dispatch(){ $pluginlist = plugin_list('admin'); if (in_array($page, $pluginlist)) { // attempt to load the plugin - if ($plugin = plugin_load('admin',$page) !== null){ + + if (($plugin = plugin_load('admin',$page)) !== null){ /** @var DokuWiki_Admin_Plugin $plugin */ if($plugin->forAdminOnly() && !$INFO['isadmin']){ // a manager tried to load a plugin that's for admins only diff --git a/inc/html.php b/inc/html.php index 68ca364f1..2d7216a45 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1661,7 +1661,7 @@ function html_admin(){ global $ID; global $INFO; global $conf; - /** @var auth_basic $auth */ + /** @var DokuWiki_Auth_Plugin $auth */ global $auth; // build menu of admin functions from the plugins that handle them @@ -1669,7 +1669,7 @@ function html_admin(){ $menu = array(); foreach ($pluginlist as $p) { /** @var DokuWiki_Admin_Plugin $obj */ - if($obj = plugin_load('admin',$p) === null) continue; + if(($obj = plugin_load('admin',$p)) === null) continue; // check permissions if($obj->forAdminOnly() && !$INFO['isadmin']) continue; 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 ab4d3f3b70150d4b7c2622bd5fa6079c49b8d32f Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 15 Oct 2013 16:36:56 +0200 Subject: fix expression passed by reference --- lib/exe/detail.php | 4 +++- lib/exe/mediamanager.php | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/exe/detail.php b/lib/exe/detail.php index 7aae08f76..e3c81d877 100644 --- a/lib/exe/detail.php +++ b/lib/exe/detail.php @@ -9,7 +9,9 @@ $ID = cleanID($INPUT->str('id')); // this makes some general infos available as well as the info about the // "parent" page $INFO = array_merge(pageinfo(),mediainfo()); -trigger_event('DETAIL_STARTED', $tmp=array()); + +$tmp = array(); +trigger_event('DETAIL_STARTED', $tmp); //close session session_write_close(); diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php index d9e4a6b04..d94a24c74 100644 --- a/lib/exe/mediamanager.php +++ b/lib/exe/mediamanager.php @@ -34,7 +34,8 @@ $JSINFO = array('id' => '', 'namespace' => ''); $AUTH = $INFO['perm']; // shortcut for historical reasons - trigger_event('MEDIAMANAGER_STARTED',$tmp=array()); + $tmp = array(); + trigger_event('MEDIAMANAGER_STARTED', $tmp); session_write_close(); //close session // do not display the manager if user does not have read access -- cgit v1.2.3 From 0ea5ced2b723ed55c3b9ef7e1071fe6d75c77f75 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 15 Oct 2013 16:45:19 +0200 Subject: output of fread is string, but recognized as object. Fixed assign by ref --- inc/JpegMeta.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index ba6a2b5bb..947407a48 100644 --- a/inc/JpegMeta.php +++ b/inc/JpegMeta.php @@ -975,7 +975,7 @@ class JpegMeta { if ($capture) { if ($length) - $this->_markers[$count]['data'] =& fread($this->_fp, $length); + $this->_markers[$count]['data'] = fread($this->_fp, $length); else $this->_markers[$count]['data'] = ""; } -- 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 --- _test/tests/inc/subscription.test.php | 2 +- lib/plugins/info/syntax.php | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/_test/tests/inc/subscription.test.php b/_test/tests/inc/subscription.test.php index 333400576..34a7b9e4b 100644 --- a/_test/tests/inc/subscription.test.php +++ b/_test/tests/inc/subscription.test.php @@ -237,7 +237,7 @@ class MockupSubscription extends Subscription { return parent::buildregex($user, $style, $data); } - protected function send($subscriber_mail, $subject, $id, $template, $trep, $hrep = null) { + protected function send($subscriber_mail, $subject, $id, $template, $trep, $hrep = null, $headers = array()) { $this->mails[] = $subscriber_mail; return true; } 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 5aaca723334349b7efc215172c472976e99c130d Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Wed, 16 Oct 2013 11:50:33 +0200 Subject: fixed some errors indicated by IDEA --- inc/JpegMeta.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index ba6a2b5bb..87c95103a 100644 --- a/inc/JpegMeta.php +++ b/inc/JpegMeta.php @@ -161,7 +161,7 @@ class JpegMeta { if($info != false) break; } - if($info === false) $info = $alt; + if($info === false) $info = ''; if(is_array($info)){ if(isset($info['val'])){ $info = $info['val']; @@ -874,7 +874,7 @@ class JpegMeta { /*************************************************************/ /*************************************************************/ - function _dispose() { + function _dispose($fileName = "") { $this->_fileName = $fileName; $this->_fp = null; @@ -2183,7 +2183,8 @@ class JpegMeta { } while ($j < $count) { - $this->_putString($value, $j * 4, "\0\0\0\0"); + $v = "\0\0\0\0"; + $this->_putString($value, $j * 4, $v); $j++; } break; @@ -2206,7 +2207,8 @@ class JpegMeta { } while ($j < $count) { - $this->_putString($value, $j * 8, "\0\0\0\0\0\0\0\0"); + $v = "\0\0\0\0\0\0\0\0"; + $this->_putString($value, $j * 8, $v); $j++; } break; -- cgit v1.2.3 From f5891fa46a904172ba403360a977c215c81cd255 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Wed, 16 Oct 2013 12:06:29 +0200 Subject: fix some Only vars assigned by reference --- inc/JpegMeta.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index 87c95103a..231fda083 100644 --- a/inc/JpegMeta.php +++ b/inc/JpegMeta.php @@ -1452,7 +1452,7 @@ class JpegMeta { if ($this->_markers[$i]['marker'] == 0xE1) { $signature = $this->_getFixedString($this->_markers[$i]['data'], 0, 29); if ($signature == "http://ns.adobe.com/xap/1.0/\0") { - $data =& substr($this->_markers[$i]['data'], 29); + $data = substr($this->_markers[$i]['data'], 29); break; } } @@ -2337,7 +2337,7 @@ class JpegMeta { function _readIPTC(&$data, $pos = 0) { $totalLength = strlen($data); - $IPTCTags =& $this->_iptcTagNames(); + $IPTCTags = $this->_iptcTagNames(); while ($pos < ($totalLength - 5)) { $signature = $this->_getShort($data, $pos); -- cgit v1.2.3 From 30f6faf00624251f7ac69fc86e9f3c5a01ad5d90 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 16 Oct 2013 15:22:58 +0100 Subject: update for deprecated '/e' flag in preg_replace (php 5.5) --- inc/auth.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/inc/auth.php b/inc/auth.php index 36fc7d086..ac079c574 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -808,14 +808,14 @@ function auth_nameencode($name, $skip_group = false) { if(!isset($cache[$name][$skip_group])) { if($skip_group && $name{0} == '@') { - $cache[$name][$skip_group] = '@'.preg_replace( - '/([\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f])/e', - "'%'.dechex(ord(substr('\\1',-1)))", substr($name, 1) + $cache[$name][$skip_group] = '@'.preg_replace_callback( + '/([\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f])/', + 'auth_nameencode_callback', substr($name, 1) ); } else { - $cache[$name][$skip_group] = preg_replace( - '/([\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f])/e', - "'%'.dechex(ord(substr('\\1',-1)))", $name + $cache[$name][$skip_group] = preg_replace_callback( + '/([\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f])/', + 'auth_nameencode_callback', $name ); } } @@ -823,6 +823,10 @@ function auth_nameencode($name, $skip_group = false) { return $cache[$name][$skip_group]; } +function auth_nameencode_callback($matches) { + return '%'.dechex(ord(substr($matches[1],-1))); +} + /** * Create a pronouncable password * -- cgit v1.2.3 From c8d2e830e238503225cac35736b815864d334b1d Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 16 Oct 2013 21:50:25 +0100 Subject: escape '$' in mailer test strings --- _test/tests/inc/mailer.test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_test/tests/inc/mailer.test.php b/_test/tests/inc/mailer.test.php index 3a89413b4..dc234232f 100644 --- a/_test/tests/inc/mailer.test.php +++ b/_test/tests/inc/mailer.test.php @@ -50,8 +50,8 @@ class mailer_test extends DokuWikiTest { // set a bunch of test headers $mail->setHeader('test-header','bla'); $mail->setHeader('to','A valid ASCII name '); - $mail->setHeader('from',"Thös ne\needs\x00serious cleaning$§%."); - $mail->setHeader('bad',"Thös ne\needs\x00serious cleaning$§%.",false); + $mail->setHeader('from',"Thös ne\needs\x00serious cleaning\$§%."); + $mail->setHeader('bad',"Thös ne\needs\x00serious cleaning\$§%.",false); $mail->setHeader("weird\n*+\x00foo.-_@bar?",'now clean'); // are they set? -- cgit v1.2.3 From 4d8acaacee33f49d51c06f6dae1dbe245018a020 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 16 Oct 2013 21:52:02 +0100 Subject: remove '&' reference operator from metadata test, not required in php5 --- _test/tests/inc/parserutils_set_metadata_during_rendering.test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_test/tests/inc/parserutils_set_metadata_during_rendering.test.php b/_test/tests/inc/parserutils_set_metadata_during_rendering.test.php index f08785ca2..18660553d 100644 --- a/_test/tests/inc/parserutils_set_metadata_during_rendering.test.php +++ b/_test/tests/inc/parserutils_set_metadata_during_rendering.test.php @@ -80,7 +80,7 @@ class parserutils_set_metadata_during_rendering_test extends DokuWikiTest { } // wrapper function for the fake plugin controller, return $this for the fake syntax of this test - function &load($type,$name,$new=false,$disabled=false){ + function load($type,$name,$new=false,$disabled=false){ if ($name == 'parserutils_test') { return $this; } else { -- cgit v1.2.3 From 443e135d59e9d227eec818dabf9ee64d7a73d474 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 16 Oct 2013 22:04:01 +0100 Subject: replace boolean conditional checks on possibly uninitialized vars with \!empty/empty/isset as appropriate --- inc/auth.php | 4 ++-- inc/common.php | 8 ++++---- inc/indexer.php | 3 ++- inc/init.php | 2 +- inc/io.php | 2 +- inc/pageutils.php | 2 +- inc/parser/handler.php | 4 ++-- inc/plugincontroller.class.php | 2 +- inc/search.php | 24 ++++++++++++------------ inc/subscription.php | 2 +- inc/template.php | 10 +++++----- lib/tpl/dokuwiki/tpl_header.php | 2 +- 12 files changed, 33 insertions(+), 32 deletions(-) diff --git a/inc/auth.php b/inc/auth.php index ac079c574..0d42c8673 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -139,10 +139,10 @@ function auth_loadACL() { $out = array(); foreach($acl as $line) { $line = trim($line); - if($line{0} == '#') continue; + if(empty($line) || ($line{0} == '#')) continue; // skip blank lines & comments list($id,$rest) = preg_split('/\s+/',$line,2); - // substitue user wildcard first (its 1:1) + // 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; diff --git a/inc/common.php b/inc/common.php index 866e0aadd..32771285b 100644 --- a/inc/common.php +++ b/inc/common.php @@ -64,7 +64,7 @@ function getSecurityToken() { */ function checkSecurityToken($token = null) { global $INPUT; - if(!$_SERVER['REMOTE_USER']) return true; // no logged in user, no need for a check + if(empty($_SERVER['REMOTE_USER'])) return true; // no logged in user, no need for a check if(is_null($token)) $token = $INPUT->str('sectok'); if(getSecurityToken() != $token) { @@ -474,13 +474,13 @@ function ml($id = '', $more = '', $direct = true, $sep = '&', $abs = false) if(is_array($more)) { // add token for resized images - if($more['w'] || $more['h'] || $isexternalimage){ + if(!empty($more['w']) || !empty($more['h']) || $isexternalimage){ $more['tok'] = media_get_token($id,$more['w'],$more['h']); } // strip defaults for shorter URLs if(isset($more['cache']) && $more['cache'] == 'cache') unset($more['cache']); - if(!$more['w']) unset($more['w']); - if(!$more['h']) unset($more['h']); + if(empty($more['w'])) unset($more['w']); + if(empty($more['h'])) unset($more['h']); if(isset($more['id']) && $direct) unset($more['id']); $more = buildURLparams($more, $sep); } else { diff --git a/inc/indexer.php b/inc/indexer.php index 8f0ba7ec6..00b66239d 100644 --- a/inc/indexer.php +++ b/inc/indexer.php @@ -1017,8 +1017,9 @@ class Doku_Indexer { return false; } } - if ($conf['dperm']) + if (!empty($conf['dperm'])) { chmod($lock, $conf['dperm']); + } return $status; } diff --git a/inc/init.php b/inc/init.php index 30eb1b251..d96860e10 100644 --- a/inc/init.php +++ b/inc/init.php @@ -288,7 +288,7 @@ function init_files(){ $fh = @fopen($file,'a'); if($fh){ fclose($fh); - if($conf['fperm']) chmod($file, $conf['fperm']); + if(!empty($conf['fperm'])) chmod($file, $conf['fperm']); }else{ nice_die("$file is not writable. Check your permissions settings!"); } diff --git a/inc/io.php b/inc/io.php index 4bd7c3364..eff0279ac 100644 --- a/inc/io.php +++ b/inc/io.php @@ -393,7 +393,7 @@ function io_mkdir_p($target){ return io_mkdir_ftp($dir); }else{ $ret = @mkdir($target,$conf['dmode']); // crawl back up & create dir tree - if($ret && $conf['dperm']) chmod($target, $conf['dperm']); + if($ret && !empty($conf['dperm'])) chmod($target, $conf['dperm']); return $ret; } } diff --git a/inc/pageutils.php b/inc/pageutils.php index bf79daa7d..60f326e04 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -396,7 +396,7 @@ function resolve_id($ns,$id,$clean=true){ // if the id starts with a dot we need to handle the // relative stuff - if($id{0} == '.'){ + if($id && $id{0} == '.'){ // normalize initial dots without a colon $id = preg_replace('/^(\.+)(?=[^:\.])/','\1:',$id); // prepend the current namespace diff --git a/inc/parser/handler.php b/inc/parser/handler.php index 63a4104e2..bb284136f 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -653,8 +653,8 @@ function Doku_Handler_Parse_Media($match) { //parse width and height if(preg_match('#(\d+)(x(\d+))?#i',$param,$size)){ - ($size[1]) ? $w = $size[1] : $w = null; - ($size[3]) ? $h = $size[3] : $h = null; + !empty($size[1]) ? $w = $size[1] : $w = null; + !empty($size[3]) ? $h = $size[3] : $h = null; } else { $w = null; $h = null; diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php index c825870cd..b8b678b4f 100644 --- a/inc/plugincontroller.class.php +++ b/inc/plugincontroller.class.php @@ -206,7 +206,7 @@ class Doku_Plugin_Controller { $backup = $file.'.bak'; if (@file_exists($backup)) @unlink($backup); if (!@copy($file,$backup)) return false; - if ($conf['fperm']) chmod($backup, $conf['fperm']); + if (!empty($conf['fperm'])) chmod($backup, $conf['fperm']); } //check if can open for writing, else restore return io_saveFile($file,$out); diff --git a/inc/search.php b/inc/search.php index 884aa7b23..1853e72c0 100644 --- a/inc/search.php +++ b/inc/search.php @@ -110,7 +110,7 @@ function search_index(&$data,$base,$file,$type,$lvl,$opts){ $opts = array( 'pagesonly' => true, 'listdirs' => true, - 'listfiles' => !$opts['nofiles'], + 'listfiles' => empty($opts['nofiles']), 'sneakyacl' => $conf['sneaky_index'], // Hacky, should rather use recmatch 'depth' => preg_match('#^'.preg_quote($file, '#').'(/|$)#','/'.$opts['ns']) ? 0 : -1 @@ -367,7 +367,7 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){ } // check ACL - if(!$opts['skipacl']){ + if(empty($opts['skipacl'])){ if($type == 'd'){ $item['perm'] = auth_quickaclcheck($item['id'].':*'); }else{ @@ -379,17 +379,17 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){ // are we done here maybe? if($type == 'd'){ - if(!$opts['listdirs']) return $return; - if(!$opts['skipacl'] && $opts['sneakyacl'] && $item['perm'] < AUTH_READ) return false; //neither list nor recurse - if($opts['dirmatch'] && !preg_match('/'.$opts['dirmatch'].'/',$file)) return $return; - if($opts['nsmatch'] && !preg_match('/'.$opts['nsmatch'].'/',$item['ns'])) return $return; + if(empty($opts['listdirs'])) return $return; + if(empty($opts['skipacl']) && !empty($opts['sneakyacl']) && $item['perm'] < AUTH_READ) return false; //neither list nor recurse + if(!empty($opts['dirmatch']) && !preg_match('/'.$opts['dirmatch'].'/',$file)) return $return; + if(!empty($opts['nsmatch']) && !preg_match('/'.$opts['nsmatch'].'/',$item['ns'])) return $return; }else{ - if(!$opts['listfiles']) return $return; - if(!$opts['skipacl'] && $item['perm'] < AUTH_READ) return $return; - if($opts['pagesonly'] && (substr($file,-4) != '.txt')) return $return; - if(!$opts['showhidden'] && isHiddenPage($item['id'])) return $return; - if($opts['filematch'] && !preg_match('/'.$opts['filematch'].'/',$file)) return $return; - if($opts['idmatch'] && !preg_match('/'.$opts['idmatch'].'/',$item['id'])) return $return; + if(empty($opts['listfiles'])) return $return; + if(empty($opts['skipacl']) && $item['perm'] < AUTH_READ) return $return; + if(!empty($opts['pagesonly']) && (substr($file,-4) != '.txt')) return $return; + if(empty($opts['showhidden']) && isHiddenPage($item['id'])) return $return; + if(!empty($opts['filematch']) && !preg_match('/'.$opts['filematch'].'/',$file)) return $return; + if(!empty($opts['idmatch']) && !preg_match('/'.$opts['idmatch'].'/',$item['id'])) return $return; } // still here? prepare the item diff --git a/inc/subscription.php b/inc/subscription.php index ecbc9ef19..ddf2f39e6 100644 --- a/inc/subscription.php +++ b/inc/subscription.php @@ -62,7 +62,7 @@ class Subscription { return false; } - if($conf['dperm']) chmod($lock, $conf['dperm']); + if(!empty($conf['dperm'])) chmod($lock, $conf['dperm']); return true; } diff --git a/inc/template.php b/inc/template.php index 868ef300c..b42c9d934 100644 --- a/inc/template.php +++ b/inc/template.php @@ -401,7 +401,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'] && $_SERVER['REMOTE_USER']) { + if($conf['useacl'] && !empty($_SERVER['REMOTE_USER'])) { $script .= "var SIG='".toolbar_signature()."';"; } $script .= 'var JSINFO = '.$json->encode($JSINFO).';'; @@ -680,12 +680,12 @@ function tpl_get_action($type) { } break; case 'register': - if($_SERVER['REMOTE_USER']) { + if(!empty($_SERVER['REMOTE_USER'])) { return false; } break; case 'resendpwd': - if($_SERVER['REMOTE_USER']) { + if(!empty($_SERVER['REMOTE_USER'])) { return false; } break; @@ -1412,7 +1412,7 @@ function tpl_actiondropdown($empty = '', $button = '>') { echo '
    '; echo ''; if($REV) echo ''; - if ($_SERVER['REMOTE_USER']) { + if (!empty($_SERVER['REMOTE_USER'])) { echo ''; } @@ -1794,7 +1794,7 @@ function tpl_classes() { 'dokuwiki', 'mode_'.$ACT, 'tpl_'.$conf['template'], - $_SERVER['REMOTE_USER'] ? 'loggedIn' : '', + !empty($_SERVER['REMOTE_USER']) ? 'loggedIn' : '', $INFO['exists'] ? '' : 'notFound', ($ID == $conf['start']) ? 'home' : '', ); diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index 19d165059..a2bfd4346 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -41,7 +41,7 @@ if (!defined('DOKU_INC')) die();

      '; tpl_userinfo(); /* 'Logged in as ...' */ echo ''; -- cgit v1.2.3 From 53bfcb5964deda22607f47981b51d17e0f48d7ca Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 16 Oct 2013 22:06:51 +0100 Subject: initialize $inParagraph before use --- inc/parser/handler.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/parser/handler.php b/inc/parser/handler.php index bb284136f..8ae991209 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -1432,6 +1432,7 @@ class Doku_Handler_Table { class Doku_Handler_Block { var $calls = array(); var $skipEol = false; + var $inParagraph = false; // Blocks these should not be inside paragraphs var $blockOpen = array( -- cgit v1.2.3 From 5e40b274af54284ae63341c87534fbbc1e1cea44 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 16 Oct 2013 22:09:09 +0100 Subject: refactor to avoid php notice and match structure of rest of p_get_renderer() --- inc/parserutils.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inc/parserutils.php b/inc/parserutils.php index 21ae756c4..b67daaabb 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -625,7 +625,8 @@ function & p_get_renderer($mode) { $rclass = "Doku_Renderer_$rname"; if( class_exists($rclass) ) { - return new $rclass(); + $Renderer = new $rclass(); + return $Renderer; } // try default renderer first: -- cgit v1.2.3 From eb9dc16998a7eb887015ef72e4100eb20617e7b8 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 18 Oct 2013 12:27:17 +0100 Subject: set error level so it is propagated correctly to dokuwiki --- _test/bootstrap.php | 1 + 1 file changed, 1 insertion(+) diff --git a/_test/bootstrap.php b/_test/bootstrap.php index 732fef9ed..4cb6420bd 100644 --- a/_test/bootstrap.php +++ b/_test/bootstrap.php @@ -15,6 +15,7 @@ require_once DOKU_UNITTEST.'core/TestUtils.php'; define('SIMPLE_TEST', true); // basic behaviours +define('DOKU_E_LEVEL',E_ALL); error_reporting(E_ALL); set_time_limit(0); ini_set('memory_limit','2048M'); -- cgit v1.2.3 From 9aac3abfe47b9ff6977643d06caf0f9520cd55f1 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 18 Oct 2013 12:33:07 +0100 Subject: also use DOKU_E_LEVEL in bootstrap's call to error_reporting() --- _test/bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_test/bootstrap.php b/_test/bootstrap.php index 4cb6420bd..c3eba048a 100644 --- a/_test/bootstrap.php +++ b/_test/bootstrap.php @@ -16,7 +16,7 @@ define('SIMPLE_TEST', true); // basic behaviours define('DOKU_E_LEVEL',E_ALL); -error_reporting(E_ALL); +error_reporting(DOKU_E_LEVEL); set_time_limit(0); ini_set('memory_limit','2048M'); -- cgit v1.2.3 From d301130ed39d5dad319c60cdb3879c6751611831 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 19 Oct 2013 14:35:22 +0100 Subject: additional auth_nameencode tests (apostrophe & backslash) --- _test/tests/inc/auth_nameencode.test.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/_test/tests/inc/auth_nameencode.test.php b/_test/tests/inc/auth_nameencode.test.php index da9f31f90..074155486 100644 --- a/_test/tests/inc/auth_nameencode.test.php +++ b/_test/tests/inc/auth_nameencode.test.php @@ -19,6 +19,18 @@ class auth_nameencode_test extends DokuWikiTest { $this->assertEquals(auth_nameencode($in),$out); } + function test_apostrophe(){ + $in = 'hey\'you'; + $out = 'hey%27you'; + $this->assertEquals(auth_nameencode($in),$out); + } + + function test_backslash(){ + $in = 'hey\\you'; + $out = 'hey%5cyou'; + $this->assertEquals(auth_nameencode($in),$out); + } + function test_complex(){ $in = 'hey $ you !$%! foo '; $out = 'hey%20%24%20you%20%21%24%25%21%20foo%20'; -- cgit v1.2.3 From 9c107bd1fc32c2afe05d514e9d8332223ff6507a Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 19 Oct 2013 14:40:23 +0100 Subject: use preg_replace_callback instead of '/e' flag when encoding quoated printable ('/e' regex flag deprecated in PHP5.5) --- inc/mail.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/inc/mail.php b/inc/mail.php index d0ea651bf..0b60c0a5b 100644 --- a/inc/mail.php +++ b/inc/mail.php @@ -284,10 +284,9 @@ function mail_quotedprintable_encode($sText,$maxlen=74,$bEmulate_imap_8bit=true) // for EBCDIC safeness encode !"#$@[\]^`{|}~, // for complete safeness encode every character :) if ($bEmulate_imap_8bit) - $sRegExp = '/[^\x20\x21-\x3C\x3E-\x7E]/e'; + $sRegExp = '/[^\x20\x21-\x3C\x3E-\x7E]/'; - $sReplmt = 'sprintf( "=%02X", ord ( "$0" ) ) ;'; - $sLine = preg_replace( $sRegExp, $sReplmt, $sLine ); + $sLine = preg_replace_callback( $sRegExp, 'mail_quotedprintable_encode_callback', $sLine ); // encode x09,x20 at lineends { @@ -330,3 +329,6 @@ function mail_quotedprintable_encode($sText,$maxlen=74,$bEmulate_imap_8bit=true) return implode(MAILHEADER_EOL,$aLines); } +function mail_quotedprintable_encode_callback($matches){ + return sprintf( "=%02X", ord ( $matches[0] ) ) ; +} -- cgit v1.2.3 From d1612d99b95fed9b053ebdb5e4c12f30aeb69203 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 20 Oct 2013 21:05:09 +0200 Subject: escaped another $ in mailer test --- _test/tests/inc/mailer.test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_test/tests/inc/mailer.test.php b/_test/tests/inc/mailer.test.php index dc234232f..bac0c39ba 100644 --- a/_test/tests/inc/mailer.test.php +++ b/_test/tests/inc/mailer.test.php @@ -63,7 +63,7 @@ class mailer_test extends DokuWikiTest { $this->assertArrayHasKey('From',$headers); $this->assertEquals('Ths neeedsserious cleaning.',$headers['From']); $this->assertArrayHasKey('Bad',$headers); - $this->assertEquals("Thös ne\needs\x00serious cleaning$§%.",$headers['Bad']); + $this->assertEquals("Thös ne\needs\x00serious cleaning\$§%.",$headers['Bad']); $this->assertArrayHasKey('Weird+foo.-_@bar',$headers); // unset a header again -- 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(-) 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 03a4f627659f89d54c121b485ca89dfaa4a304c0 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 20 Oct 2013 19:36:56 +0100 Subject: change error level to ignore notices --- _test/bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_test/bootstrap.php b/_test/bootstrap.php index c3eba048a..9f4bb5fbd 100644 --- a/_test/bootstrap.php +++ b/_test/bootstrap.php @@ -15,7 +15,7 @@ require_once DOKU_UNITTEST.'core/TestUtils.php'; define('SIMPLE_TEST', true); // basic behaviours -define('DOKU_E_LEVEL',E_ALL); +define('DOKU_E_LEVEL',E_ALL ^ E_NOTICE); error_reporting(DOKU_E_LEVEL); set_time_limit(0); ini_set('memory_limit','2048M'); -- cgit v1.2.3 From 712c66312b26ec08723b47583b7be846451ed712 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 20 Oct 2013 21:28:32 +0200 Subject: more verbosity in test case --- _test/tests/inc/httpclient_http_proxy.test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_test/tests/inc/httpclient_http_proxy.test.php b/_test/tests/inc/httpclient_http_proxy.test.php index faa7a4280..c53e3579c 100644 --- a/_test/tests/inc/httpclient_http_proxy.test.php +++ b/_test/tests/inc/httpclient_http_proxy.test.php @@ -13,7 +13,7 @@ class httpclient_http_proxy_test extends DokuWikiTest { $http->proxy_port = 8080; $data = $http->get($this->url); - $this->assertFalse($data === false, 'HTTP response'); + $this->assertFalse($data === false, 'HTTP response '.$http->error); $this->assertTrue(strpos($data,'DokuWiki') !== false, 'response content'); } -- cgit v1.2.3 From b7cfeab63d3666a24fad96ae42669a2f55e9da03 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 20 Oct 2013 21:37:54 +0200 Subject: make sure HTTP test uses HTTP only and doesn't get redirected --- _test/tests/inc/httpclient_http_proxy.test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_test/tests/inc/httpclient_http_proxy.test.php b/_test/tests/inc/httpclient_http_proxy.test.php index c53e3579c..4aa039fcc 100644 --- a/_test/tests/inc/httpclient_http_proxy.test.php +++ b/_test/tests/inc/httpclient_http_proxy.test.php @@ -1,7 +1,7 @@ Date: Sun, 20 Oct 2013 21:46:02 +0200 Subject: fix proxy CONNECT where HTTP 1.1 answer is given --- inc/HTTPClient.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php index b2621bdbb..96954fb47 100644 --- a/inc/HTTPClient.php +++ b/inc/HTTPClient.php @@ -553,7 +553,7 @@ class HTTPClient { }while($r_line != "\r\n" && $r_line != "\n"); $this->_debug('SSL Tunnel Response',$r_headers); - if(preg_match('/^HTTP\/1\.0 200/i',$r_headers)){ + if(preg_match('/^HTTP\/1\.[01] 200/i',$r_headers)){ if (stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_SSLv3_CLIENT)) { $requesturl = $requestinfo['path']; return true; -- 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 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(-) 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 4c4b65c86f4906b0cdd7b3115636ec829bb7099f Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sun, 20 Oct 2013 22:04:48 +0200 Subject: Fix handling of the legacy subscription action name --- inc/template.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/inc/template.php b/inc/template.php index b42c9d934..e967bf27d 100644 --- a/inc/template.php +++ b/inc/template.php @@ -606,6 +606,7 @@ function tpl_get_action($type) { // check disabled actions and fix the badly named ones if($type == 'history') $type = 'revisions'; + if ($type == 'subscription') $type = 'subscribe'; if(!actionOK($type)) return false; $accesskey = null; @@ -701,10 +702,6 @@ function tpl_get_action($type) { $params['rev'] = $REV; $params['sectok'] = getSecurityToken(); break; - /** @noinspection PhpMissingBreakStatementInspection */ - case 'subscription': - $type = 'subscribe'; - $params['do'] = 'subscribe'; case 'subscribe': if(!$_SERVER['REMOTE_USER']) { return false; -- 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 --- inc/lang/da/lang.php | 1 + lib/plugins/plugin/lang/da/lang.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php index 6fe56929d..0da7e4761 100644 --- a/inc/lang/da/lang.php +++ b/inc/lang/da/lang.php @@ -15,6 +15,7 @@ * @author Michael Pedersen subben@gmail.com * @author Mikael Lyngvig * @author Soren Birk + * @author Jens Hyllegaard */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; 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 --- inc/lang/he/lang.php | 34 ++++++++++++++++++++++++++++---- 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 +++-- 6 files changed, 43 insertions(+), 14 deletions(-) diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php index 5afdbf2fc..4ddc3a019 100644 --- a/inc/lang/he/lang.php +++ b/inc/lang/he/lang.php @@ -1,15 +1,15 @@ * @author Denis Simakov * @author Dotan Kamber * @author Moshe Kaplan * @author Yaron Yogev * @author Yaron Shahrabani + * @author Roy Zahor */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'rtl'; @@ -45,11 +45,13 @@ $lang['btn_backtomedia'] = 'חזרה לבחירת קובץ מדיה'; $lang['btn_subscribe'] = 'מעקב אחרי שינוים'; $lang['btn_profile'] = 'עדכון הפרופיל'; $lang['btn_reset'] = 'איפוס'; +$lang['btn_resendpwd'] = 'הגדר סיסמה חדשה'; $lang['btn_draft'] = 'עריכת טיוטה'; $lang['btn_recover'] = 'שחזור טיוטה'; $lang['btn_draftdel'] = 'מחיקת טיוטה'; $lang['btn_revert'] = 'שחזור'; $lang['btn_register'] = 'הרשמה'; +$lang['btn_media'] = 'מנהל המדיה'; $lang['loggedinas'] = 'נכנסת בשם'; $lang['user'] = 'שם משתמש'; $lang['pass'] = 'ססמה'; @@ -61,6 +63,7 @@ $lang['fullname'] = 'שם מלא'; $lang['email'] = 'דוא״ל'; $lang['profile'] = 'פרופיל המשתמש'; $lang['badlogin'] = 'שם המשתמש או הססמה שגויים, עמך הסליחה'; +$lang['badpassconfirm'] = 'מצטערים, הסיסמה שגויה'; $lang['minoredit'] = 'שינוים מזעריים'; $lang['draftdate'] = 'הטיוטה נשמרה אוטומטית ב־'; $lang['nosecedit'] = 'הדף השתנה בינתיים, הקטע שערכת אינו מעודכן - העמוד כולו נטען במקום זאת.'; @@ -79,6 +82,7 @@ $lang['profnoempty'] = 'השם וכתובת הדוא״ל לא יכול $lang['profchanged'] = 'הפרופיל עודכן בהצלחה'; $lang['pwdforget'] = 'שכחת את הססמה שלך? ניתן לקבל חדשה'; $lang['resendna'] = 'הוויקי הזה אינו תומך בחידוש ססמה'; +$lang['resendpwd'] = 'הגדר סיסמא חדשה בעבור'; $lang['resendpwdmissing'] = 'עליך למלא את כל השדות, עמך הסליחה.'; $lang['resendpwdnouser'] = 'משתמש בשם זה לא נמצא במסד הנתונים, עמך הסליחה.'; $lang['resendpwdbadauth'] = 'קוד אימות זה אינו תקף. יש לוודא כי נעשה שימוש בקישור האימות המלא, עמך הסליחה.'; @@ -93,7 +97,7 @@ $lang['txt_filename'] = 'העלאה בשם (נתון לבחירה)'; $lang['txt_overwrt'] = 'שכתוב על קובץ קיים'; $lang['lockedby'] = 'נעול על ידי'; $lang['lockexpire'] = 'הנעילה פגה'; -$lang['js']['willexpire'] = 'הנעילה תחלוף עוד זמן קצר. \nלמניעת התנגשויות יש להשתמש בכפתור הרענון מטה כדי לאפס את מד משך הנעילה.'; +$lang['js']['willexpire'] = 'הנעילה תחלוף עוד זמן קצר. \nלמניעת התנגשויות יש להשתמש בכפתור הרענון מטה כדי לאפס את מד משך הנעילה.'; $lang['js']['notsavedyet'] = 'שינויים שלא נשמרו ילכו לאיבוד.'; $lang['js']['searchmedia'] = 'חיפוש אחר קבצים'; $lang['js']['keepopen'] = 'השארת חלון פתוח על הבחירה'; @@ -124,6 +128,11 @@ $lang['js']['nosmblinks'] = 'קישור לכונני שיתוף של Window $lang['js']['linkwiz'] = 'אשף הקישורים'; $lang['js']['linkto'] = 'קישור אל:'; $lang['js']['del_confirm'] = 'באמת למחוק?'; +$lang['js']['media_diff'] = 'הצגת הבדלים:'; +$lang['js']['media_diff_both'] = 'זה לצד זה'; +$lang['js']['media_select'] = 'בחר קבצים...'; +$lang['js']['media_upload_btn'] = 'העלאה'; +$lang['js']['media_drop'] = 'גרור לכאן קבצים בכדי להעלותם'; $lang['rssfailed'] = 'אירע כשל בעת קבלת הזנה זו:'; $lang['nothingfound'] = 'לא נמצאו תוצאות.'; $lang['mediaselect'] = 'קובצי מדיה'; @@ -158,6 +167,9 @@ $lang['yours'] = 'הגרסה שלך'; $lang['diff'] = 'הצגת שינוים מגרסה זו ועד הנוכחית'; $lang['diff2'] = 'הצגת הבדלים בין הגרסאות שנבחרו'; $lang['difflink'] = 'קישור לתצוגה השוואה זו'; +$lang['diff_type'] = 'הצגת הבדלים:'; +$lang['diff_inline'] = 'באותה השורה'; +$lang['diff_side'] = 'זה לצד זה'; $lang['line'] = 'שורה'; $lang['breadcrumb'] = 'ביקורים אחרונים'; $lang['youarehere'] = 'זהו מיקומך'; @@ -170,11 +182,14 @@ $lang['external_edit'] = 'עריכה חיצונית'; $lang['summary'] = 'תקציר העריכה'; $lang['noflash'] = 'תוסף פלאש לדפדפן נדרש כדי להציג תוכן זה.'; $lang['download'] = 'הורדת מקטע'; +$lang['tools'] = 'כלים'; $lang['mail_newpage'] = 'דף נוסף:'; $lang['mail_changed'] = 'דף שונה:'; $lang['mail_subscribe_list'] = 'דפים שהשתנו במרחב השם:'; $lang['mail_new_user'] = 'משתמש חדש:'; $lang['mail_upload'] = 'קובץ הועלה:'; +$lang['pages_changes'] = 'דפים'; +$lang['media_changes'] = 'קבצי מדיה'; $lang['qb_bold'] = 'טקסט מודגש'; $lang['qb_italic'] = 'טקסט נטוי'; $lang['qb_underl'] = 'טקסט עם קו תחתון'; @@ -215,6 +230,8 @@ $lang['img_copyr'] = 'זכויות יוצרים'; $lang['img_format'] = 'מבנה'; $lang['img_camera'] = 'מצלמה'; $lang['img_keywords'] = 'מילות מפתח'; +$lang['img_width'] = 'רוחב'; +$lang['img_height'] = 'גובה'; $lang['subscr_subscribe_success'] = '%s נוסף לרשימת המינויים לדף %s'; $lang['subscr_subscribe_error'] = 'אירעה שגיאה בהוספת %s לרשימת המינויים לדף %s'; $lang['subscr_subscribe_noaddress'] = 'אין כתובת המשויכת עם הכניסה שלך, נא ניתן להוסיף אותך לרשימת המינויים'; @@ -264,3 +281,12 @@ $lang['hours'] = 'לפני %d שעות'; $lang['minutes'] = 'לפני %d דקות'; $lang['seconds'] = 'לפני %d שניות'; $lang['wordblock'] = 'השינויים שלך לא נשמרו כיוון שהם מכילים טקסט חסום (ספאם).'; +$lang['media_searchtab'] = 'חיפוש'; +$lang['media_file'] = 'קובץ'; +$lang['media_viewtab'] = 'תצוגה'; +$lang['media_edittab'] = 'עריכה'; +$lang['media_historytab'] = 'היסטוריה'; +$lang['media_list_rows'] = 'שורות'; +$lang['media_sort_name'] = 'שם'; +$lang['media_sort_date'] = 'תאריך'; +$lang['media_namespaces'] = 'בחר מרחב שמות'; 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 --- inc/lang/da/lang.php | 1 + 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 ++++++++++ 5 files changed, 42 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 diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php index 6fe56929d..0da7e4761 100644 --- a/inc/lang/da/lang.php +++ b/inc/lang/da/lang.php @@ -15,6 +15,7 @@ * @author Michael Pedersen subben@gmail.com * @author Mikael Lyngvig * @author Soren Birk + * @author Jens Hyllegaard */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; 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 --- inc/lang/da/lang.php | 1 + lib/plugins/popularity/lang/da/submitted.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php index 6fe56929d..0da7e4761 100644 --- a/inc/lang/da/lang.php +++ b/inc/lang/da/lang.php @@ -15,6 +15,7 @@ * @author Michael Pedersen subben@gmail.com * @author Mikael Lyngvig * @author Soren Birk + * @author Jens Hyllegaard */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; 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