From 45970804e69e3d087fe19ad9cefaff0ef44be795 Mon Sep 17 00:00:00 2001
From: Klap-in <klapinklapin@gmail.com>
Date: Sat, 16 Feb 2013 22:53:38 +0100
Subject: Complete metadata and defaults of auth plugin configs

---
 lib/plugins/authad/conf/default.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 lib/plugins/authad/conf/default.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/conf/default.php b/lib/plugins/authad/conf/default.php
new file mode 100644
index 000000000..05d6c328e
--- /dev/null
+++ b/lib/plugins/authad/conf/default.php
@@ -0,0 +1,14 @@
+<?php
+
+$conf['account_suffix']     = '';
+$conf['base_dn']            = '';
+$conf['domain_controllers'] = '';
+$conf['sso']                = 0;
+$conf['ad_username']        = '';
+$conf['ad_password']        = '';
+$conf['real_primarygroup']  = 0;
+$conf['use_ssl']            = 0;
+$conf['use_tls']            = 0;
+$conf['debug']              = 0;
+$conf['expirywarn']         = 0;
+$conf['additional']         = '';
\ No newline at end of file
-- 
cgit v1.2.3


From 00d58927261c5bed6f093ca4aa2064a18139a228 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Wed, 20 Feb 2013 20:26:05 +0100
Subject: Fix remaining missing $INPUT uses FS#2577

This adds $INPUT in all places where it was still missing and available.
$INPUT is now also used in places where using $_REQUEST/... was okay in
order to make the code consistent.
---
 lib/plugins/authad/auth.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index f651d87a1..6c49eafbb 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -71,6 +71,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
      * Constructor
      */
     public function __construct() {
+        global $INPUT;
         parent::__construct();
 
         // we load the config early to modify it a bit here
@@ -99,8 +100,8 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin {
 
             // we need to simulate a login
             if(empty($_COOKIE[DOKU_COOKIE])) {
-                $_REQUEST['u'] = $_SERVER['REMOTE_USER'];
-                $_REQUEST['p'] = 'sso_only';
+                $INPUT->set('u', $_SERVER['REMOTE_USER']);
+                $INPUT->set('p', 'sso_only');
             }
         }
 
-- 
cgit v1.2.3


From d00152be83dd30024aa5dd89b9ad9a70eb25d80f Mon Sep 17 00:00:00 2001
From: Lorenzo Radaelli <lorenzo@mfr-trade.it>
Date: Sun, 24 Feb 2013 10:36:18 +0100
Subject: Italian language update

---
 lib/plugins/authad/lang/it/settings.php | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 lib/plugins/authad/lang/it/settings.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/it/settings.php b/lib/plugins/authad/lang/it/settings.php
new file mode 100644
index 000000000..10ae72f87
--- /dev/null
+++ b/lib/plugins/authad/lang/it/settings.php
@@ -0,0 +1,5 @@
+<?php
+/**
+ * Italian language file
+ *
+ */
-- 
cgit v1.2.3


From 292f6d8bd60b850ddf729e3b609b601fa6f9fcb3 Mon Sep 17 00:00:00 2001
From: lainme <lainme993@gmail.com>
Date: Sun, 24 Feb 2013 10:37:45 +0100
Subject: Simplified Chinese language update

---
 lib/plugins/authad/lang/zh/settings.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 lib/plugins/authad/lang/zh/settings.php

(limited to 'lib/plugins/authad')

diff --git a/lib/plugins/authad/lang/zh/settings.php b/lib/plugins/authad/lang/zh/settings.php
new file mode 100644
index 000000000..9fd3c4e35
--- /dev/null
+++ b/lib/plugins/authad/lang/zh/settings.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Chinese language file
+ *
+ * @author lainme <lainme993@gmail.com>
+ */
+$lang['account_suffix']        = '您的账户后缀。例如 <code>@my.domain.org</code>';
+$lang['base_dn']               = '您的基本分辨名。例如 <code>DC=my,DC=domain,DC=org</code>';
+$lang['domain_controllers']    = '逗号分隔的域名控制器列表。例如 <code>srv1.domain.org,srv2.domain.org</code>';
+$lang['ad_username']           = '一个活动目录的特权用户，可以查看其他所有用户的数据。可选，但对某些活动例如发送订阅邮件是必须的。';
+$lang['ad_password']           = '上述用户的密码。';
+$lang['sso']                   = '是否使用经由 Kerberos 和 NTLM 的 Single-Sign-On？';
+$lang['real_primarygroup']     = ' 是否解析真实的主要组，而不是假设为“域用户” (较慢)';
+$lang['use_ssl']               = '使用 SSL 连接？如果是，不要激活下面的 TLS。';
+$lang['use_tls']               = '使用 TLS 连接？如果是 ，不要激活上面的 SSL。';
+$lang['debug']                 = '有错误时显示额外的调试信息？';
+$lang['expirywarn']            = '提前多少天警告用户密码即将到期。0 则禁用。';
+$lang['additional']            = '需要从用户数据中获取的额外 AD 属性的列表，以逗号分隔。用于某些插件。';
-- 
cgit v1.2.3