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 --- lib/plugins/acl/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index 6c7c28ff6..00bf9969f 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -488,7 +488,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { function _html_list_acl($item){ $ret = ''; // what to display - if($item['label']){ + if(!empty($item['label'])){ $base = $item['label']; }else{ $base = ':'.$item['id']; -- cgit v1.2.3 From d072820d2d17a702aaa47a0dccb89cd50f982b98 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 5 Mar 2014 22:11:19 +0000 Subject: improvements in acl plugin to avoid missing var errors --- lib/plugins/acl/admin.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index 00bf9969f..de38aedd5 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -268,7 +268,10 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { usort($data,array($this,'_tree_sort')); $count = count($data); if($count>0) for($i=1; $i<$count; $i++){ - if($data[$i-1]['id'] == $data[$i]['id'] && $data[$i-1]['type'] == $data[$i]['type']) unset($data[$i]); + if($data[$i-1]['id'] == $data[$i]['id'] && $data[$i-1]['type'] == $data[$i]['type']) { + unset($data[$i]); + $i++; // duplicate found, next $i can't be a duplicate, so skip forward one + } } return $data; } @@ -496,8 +499,11 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { } // highlight? - if( ($item['type']== $this->current_item['type'] && $item['id'] == $this->current_item['id'])) + if( ($item['type']== $this->current_item['type'] && $item['id'] == $this->current_item['id'])) { $cl = ' cur'; + } else { + $cl = ''; + } // namespace or page? if($item['type']=='d'){ -- 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 --- lib/plugins/acl/lang/et/lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/et/lang.php b/lib/plugins/acl/lang/et/lang.php index bc4c73a16..ad2e9ffc9 100644 --- a/lib/plugins/acl/lang/et/lang.php +++ b/lib/plugins/acl/lang/et/lang.php @@ -1,8 +1,8 @@ * @author Aari Juhanson * @author Kaiko Kaur -- 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 --- lib/plugins/acl/lang/et/lang.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/et/lang.php b/lib/plugins/acl/lang/et/lang.php index ad2e9ffc9..84e21d1f8 100644 --- a/lib/plugins/acl/lang/et/lang.php +++ b/lib/plugins/acl/lang/et/lang.php @@ -8,6 +8,7 @@ * @author Kaiko Kaur * @author kristian.kankainen@kuu.la * @author Rivo Zängov + * @author Janar Leas */ $lang['admin_acl'] = 'Ligipääsukontrolli nimekirja haldamine'; $lang['acl_group'] = 'Grupp'; @@ -16,6 +17,8 @@ $lang['acl_perms'] = 'Lubatud'; $lang['page'] = 'leht'; $lang['namespace'] = 'alajaotus'; $lang['btn_select'] = 'Vali'; +$lang['p_choose_id'] = 'Sisesta ülal-olevasse vormi kasutaja või rühm nägemaks leheküljele %s sätestatud volitusi.'; +$lang['p_choose_ns'] = 'Sisesta ülal-olevasse vormi kasutaja või rühm nägemaks nimeruumile %s sätestatud volitusi.'; $lang['who'] = 'Kasutaja/Grupp'; $lang['perm'] = 'Õigused'; $lang['acl_perm0'] = 'Pole'; -- 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 --- lib/plugins/acl/lang/ru/help.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/ru/help.txt b/lib/plugins/acl/lang/ru/help.txt index ecb2fe3d0..e1b76c2c7 100644 --- a/lib/plugins/acl/lang/ru/help.txt +++ b/lib/plugins/acl/lang/ru/help.txt @@ -5,4 +5,4 @@ * Форма выше позволяет вам просмотреть и изменить права доступа для выбранного пользователя или группы. * Текущие права доступа отображены в таблице ниже. Вы можете использовать её для быстрого удаления или изменения правил. -Прочтение [[doku>acl|официальной документации по ACL]] может помочь вам в полном понимании работы управления правами доступа в «ДокуВики». +Прочтение [[doku>acl|официальной документации по правам доступа]] может помочь вам в полном понимании работы управления правами доступа в «Докувики». -- 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 --- lib/plugins/acl/lang/et/help.txt | 9 +++++++++ lib/plugins/acl/lang/et/lang.php | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 lib/plugins/acl/lang/et/help.txt (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/et/help.txt b/lib/plugins/acl/lang/et/help.txt new file mode 100644 index 000000000..a2c8e9e95 --- /dev/null +++ b/lib/plugins/acl/lang/et/help.txt @@ -0,0 +1,9 @@ +=== Kiir-spikker: === + +Käesoleval leheküljel saad oma wiki nimeruumidele ja lehekülgedele lisada ning eemaldada õigusi. + * Vasemas paanis on näidatud kõik saada olevad nimeruumid ja leheküljed. + * Ülal olev vorm laseb sul vaadelda ja muuta valitud rühma või kasutaja õigusi. + * Allolevas tabelis näidatakse kõiki hetkel sättestatud reegleid ligipääsudele. +Saad seda kasutada reeglite hulgi muutmiseks või kustutamiseks + +Mõistmaks paremini DokuWiki ligipääsu halduse toimimist, võiks abiks olla [[doku>acl|ACL-i ametliku dokumentatsiooniga]] tutvumine. \ No newline at end of file diff --git a/lib/plugins/acl/lang/et/lang.php b/lib/plugins/acl/lang/et/lang.php index 84e21d1f8..199500103 100644 --- a/lib/plugins/acl/lang/et/lang.php +++ b/lib/plugins/acl/lang/et/lang.php @@ -15,10 +15,15 @@ $lang['acl_group'] = 'Grupp'; $lang['acl_user'] = 'Kasutaja'; $lang['acl_perms'] = 'Lubatud'; $lang['page'] = 'leht'; -$lang['namespace'] = 'alajaotus'; +$lang['namespace'] = 'Nimeruum'; $lang['btn_select'] = 'Vali'; +$lang['p_user_ns'] = 'Kasutaja %s omab nimeruumis %s: %s järgmisi õigusi.'; +$lang['p_group_ns'] = 'Rühma %s liikmed omavad nimeruumis %s: %s järgmisi õigusi.'; $lang['p_choose_id'] = 'Sisesta ülal-olevasse vormi kasutaja või rühm nägemaks leheküljele %s sätestatud volitusi.'; $lang['p_choose_ns'] = 'Sisesta ülal-olevasse vormi kasutaja või rühm nägemaks nimeruumile %s sätestatud volitusi.'; +$lang['p_inherited'] = 'Märkus: neid õigusi pole eraldi määratletud, vaid on päritud teistest rühmadest või kõrgematest nimeruumidest.'; +$lang['p_include'] = 'Kõrgemad õigused hõlmavad alamaid. Õigus loomine, üleslaadida ja kustutada rakenduvad nimeruumidele, mitte lehekülgedele.'; +$lang['where'] = 'Lehekülg/nimeruum'; $lang['who'] = 'Kasutaja/Grupp'; $lang['perm'] = 'Õigused'; $lang['acl_perm0'] = 'Pole'; -- 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 --- lib/plugins/acl/lang/et/lang.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/et/lang.php b/lib/plugins/acl/lang/et/lang.php index 84e21d1f8..4dad6b969 100644 --- a/lib/plugins/acl/lang/et/lang.php +++ b/lib/plugins/acl/lang/et/lang.php @@ -11,7 +11,7 @@ * @author Janar Leas */ $lang['admin_acl'] = 'Ligipääsukontrolli nimekirja haldamine'; -$lang['acl_group'] = 'Grupp'; +$lang['acl_group'] = 'Rühm'; $lang['acl_user'] = 'Kasutaja'; $lang['acl_perms'] = 'Lubatud'; $lang['page'] = 'leht'; @@ -19,7 +19,8 @@ $lang['namespace'] = 'alajaotus'; $lang['btn_select'] = 'Vali'; $lang['p_choose_id'] = 'Sisesta ülal-olevasse vormi kasutaja või rühm nägemaks leheküljele %s sätestatud volitusi.'; $lang['p_choose_ns'] = 'Sisesta ülal-olevasse vormi kasutaja või rühm nägemaks nimeruumile %s sätestatud volitusi.'; -$lang['who'] = 'Kasutaja/Grupp'; +$lang['p_isadmin'] = 'Märkus: Valitud kasutajal või rühmal on alati kõik õigused, kuna nii on sätestanud ülemkasutaja.'; +$lang['who'] = 'Kasutaja/Rühm'; $lang['perm'] = 'Õigused'; $lang['acl_perm0'] = 'Pole'; $lang['acl_perm1'] = 'Lugemine'; -- cgit v1.2.3 From b0fedeccedf889d4d6ddaa76ec2a9b4da3e84347 Mon Sep 17 00:00:00 2001 From: Janar Leas Date: Thu, 13 Mar 2014 17:40:44 +0100 Subject: translation update --- lib/plugins/acl/lang/et/lang.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/et/lang.php b/lib/plugins/acl/lang/et/lang.php index 84e21d1f8..bdf3dd6b5 100644 --- a/lib/plugins/acl/lang/et/lang.php +++ b/lib/plugins/acl/lang/et/lang.php @@ -19,6 +19,8 @@ $lang['namespace'] = 'alajaotus'; $lang['btn_select'] = 'Vali'; $lang['p_choose_id'] = 'Sisesta ülal-olevasse vormi kasutaja või rühm nägemaks leheküljele %s sätestatud volitusi.'; $lang['p_choose_ns'] = 'Sisesta ülal-olevasse vormi kasutaja või rühm nägemaks nimeruumile %s sätestatud volitusi.'; +$lang['p_inherited'] = 'Teadmiseks: Neid õigusi pole eralti määratletud, vaid on päritud teistest rühmadest või ülemast nimeruumist.'; +$lang['p_isadmin'] = 'Teadmiseks: Valitud rühm või kasutaja omab alati kõiki õigusi, kuna nii on sätestanud ülemkasutaja.'; $lang['who'] = 'Kasutaja/Grupp'; $lang['perm'] = 'Õigused'; $lang['acl_perm0'] = 'Pole'; -- cgit v1.2.3 From da2c1fba42556340dac10a521b9a9e153ded4669 Mon Sep 17 00:00:00 2001 From: Myeongjin Date: Tue, 22 Apr 2014 10:51:03 +0200 Subject: translation update --- lib/plugins/acl/lang/ko/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php index 34b93a9f4..e06eb662c 100644 --- a/lib/plugins/acl/lang/ko/lang.php +++ b/lib/plugins/acl/lang/ko/lang.php @@ -33,7 +33,7 @@ $lang['p_include'] = '더 높은 접근 권한은 하위를 포함 $lang['current'] = '현재 ACL 규칙'; $lang['where'] = '문서/이름공간'; $lang['who'] = '사용자/그룹'; -$lang['perm'] = '접근 권한'; +$lang['perm'] = '권한'; $lang['acl_perm0'] = '없음'; $lang['acl_perm1'] = '읽기'; $lang['acl_perm2'] = '편집'; -- cgit v1.2.3 From 6dda14c94f6b8447a2c7f8e57cae0d1c536a9f35 Mon Sep 17 00:00:00 2001 From: Myeongjin Date: Sun, 27 Apr 2014 02:21:03 +0200 Subject: translation update --- lib/plugins/acl/lang/ko/help.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/lang/ko/help.txt b/lib/plugins/acl/lang/ko/help.txt index 9baeedbb9..80069b322 100644 --- a/lib/plugins/acl/lang/ko/help.txt +++ b/lib/plugins/acl/lang/ko/help.txt @@ -1,8 +1,8 @@ === 빠른 도움말: === 현재 문서에서 위키 이름공간과 문서에 대한 접근 권한을 추가하거나 삭제할 수 있습니다. -* 왼쪽 영역에는 선택 가능한 이름공간과 문서 목록을 보여줍니다. -* 위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 바꿀 수 있습니다. -* 아래 테이블에서 현재 설정된 모든 접근 제어 규칙을 볼 수 있으며, 즉시 여러 규칙을 삭제하거나 바꿀 수 있습니다. + * 왼쪽 영역에는 선택 가능한 이름공간과 문서 목록을 보여줍니다. + * 위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 바꿀 수 있습니다. + * 아래 테이블에서 현재 설정된 모든 접근 제어 규칙을 볼 수 있으며, 즉시 여러 규칙을 삭제하거나 바꿀 수 있습니다. 도쿠위키에서 접근 제어가 어떻게 동작되는지 알아보려면 [[doku>ko:acl|ACL 공식 문서]]를 읽어보시기 바랍니다. \ No newline at end of file -- cgit v1.2.3 From fde860be8cb3ed16b2b0843b77b093a60397083e Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Fri, 16 May 2014 00:09:32 +0200 Subject: Move colon from code to language strings --- lib/plugins/acl/admin.php | 4 ++-- lib/plugins/acl/lang/ar/lang.php | 4 ++-- lib/plugins/acl/lang/bg/lang.php | 4 ++-- lib/plugins/acl/lang/ca-valencia/lang.php | 4 ++-- lib/plugins/acl/lang/ca/lang.php | 4 ++-- lib/plugins/acl/lang/cs/lang.php | 4 ++-- lib/plugins/acl/lang/da/lang.php | 4 ++-- lib/plugins/acl/lang/de-informal/lang.php | 4 ++-- lib/plugins/acl/lang/de/lang.php | 4 ++-- lib/plugins/acl/lang/el/lang.php | 4 ++-- lib/plugins/acl/lang/en/lang.php | 4 ++-- lib/plugins/acl/lang/eo/lang.php | 4 ++-- lib/plugins/acl/lang/es/lang.php | 4 ++-- lib/plugins/acl/lang/et/lang.php | 4 ++-- lib/plugins/acl/lang/eu/lang.php | 4 ++-- lib/plugins/acl/lang/fa/lang.php | 4 ++-- lib/plugins/acl/lang/fi/lang.php | 4 ++-- lib/plugins/acl/lang/fr/lang.php | 4 ++-- lib/plugins/acl/lang/gl/lang.php | 4 ++-- lib/plugins/acl/lang/he/lang.php | 4 ++-- lib/plugins/acl/lang/hr/lang.php | 4 ++-- lib/plugins/acl/lang/ia/lang.php | 4 ++-- lib/plugins/acl/lang/id/lang.php | 4 ++-- lib/plugins/acl/lang/is/lang.php | 4 ++-- lib/plugins/acl/lang/it/lang.php | 4 ++-- lib/plugins/acl/lang/ja/lang.php | 4 ++-- lib/plugins/acl/lang/kk/lang.php | 4 ++-- lib/plugins/acl/lang/ko/lang.php | 4 ++-- lib/plugins/acl/lang/la/lang.php | 4 ++-- lib/plugins/acl/lang/lt/lang.php | 4 ++-- lib/plugins/acl/lang/lv/lang.php | 4 ++-- lib/plugins/acl/lang/mk/lang.php | 4 ++-- lib/plugins/acl/lang/mr/lang.php | 4 ++-- lib/plugins/acl/lang/ne/lang.php | 4 ++-- lib/plugins/acl/lang/nl/lang.php | 4 ++-- lib/plugins/acl/lang/no/lang.php | 4 ++-- lib/plugins/acl/lang/pl/lang.php | 4 ++-- lib/plugins/acl/lang/pt-br/lang.php | 4 ++-- lib/plugins/acl/lang/pt/lang.php | 4 ++-- lib/plugins/acl/lang/ro/lang.php | 4 ++-- lib/plugins/acl/lang/ru/lang.php | 4 ++-- lib/plugins/acl/lang/sk/lang.php | 4 ++-- lib/plugins/acl/lang/sl/lang.php | 4 ++-- lib/plugins/acl/lang/sq/lang.php | 4 ++-- lib/plugins/acl/lang/sr/lang.php | 4 ++-- lib/plugins/acl/lang/sv/lang.php | 4 ++-- lib/plugins/acl/lang/th/lang.php | 4 ++-- lib/plugins/acl/lang/tr/lang.php | 4 ++-- lib/plugins/acl/lang/uk/lang.php | 4 ++-- lib/plugins/acl/lang/vi/lang.php | 4 ++-- lib/plugins/acl/lang/zh-tw/lang.php | 4 ++-- lib/plugins/acl/lang/zh/lang.php | 4 ++-- 52 files changed, 104 insertions(+), 104 deletions(-) (limited to 'lib/plugins/acl') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index de38aedd5..ebb097a04 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -779,8 +779,8 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { } echo '