YunoHost-Apps/baikal_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/baikal_ynh.git synced 2024-09-03 18:16:11 +02:00
Code Issues Activity Actions

update patch

Browse source
This commit is contained in:
optikfluffel 2019-05-16 15:18:08 +02:00
parent 7960d34742
commit c4b5736a78
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sources/patches/app-add-ldap-auth.patch
View file

@ -1,18 +1,18 @@
diff --git a/Core/Frameworks/Baikal/Core/Server.php b/Core/Frameworks/Baikal/Core/Server.php diff --git a/Core/Frameworks/Baikal/Core/Server.php b/Core/Frameworks/Baikal/Core/Server.php
index 8026854..8d306fe 100644 index 957cac3..fcc2e3c 100644
--- a/Core/Frameworks/Baikal/Core/Server.php --- a/Core/Frameworks/Baikal/Core/Server.php
+++ b/Core/Frameworks/Baikal/Core/Server.php +++ b/Core/Frameworks/Baikal/Core/Server.php
@@ -133,6 +133,8 @@ class Server { @@ -133,6 +133,8 @@ class Server {
if ($this->authType === 'Basic') { if ($this->authType === 'Basic') {
$authBackend = new \Baikal\Core\PDOBasicAuth($this->pdo, $this->authRealm); $authBackend = new \Baikal\Core\PDOBasicAuth($this->pdo, $this->authRealm);
+ } elseif ($this->authType === 'LDAP-UserBind') { + } elseif ($this->authType === 'LDAP-UserBind') {
+ $authBackend = new \Baikal\Core\LDAPUserBindAuth($this->pdo, $this->authRealm); + $authBackend = new \Baikal\Core\LDAPUserBindAuth($this->pdo, $this->authRealm);
} else { } else {
$authBackend = new \Sabre\DAV\Auth\Backend\PDO($this->pdo); $authBackend = new \Sabre\DAV\Auth\Backend\PDO($this->pdo);
$authBackend->setRealm($this->authRealm); $authBackend->setRealm($this->authRealm);
diff --git a/Core/Frameworks/Baikal/Model/Config/Standard.php b/Core/Frameworks/Baikal/Model/Config/Standard.php diff --git a/Core/Frameworks/Baikal/Model/Config/Standard.php b/Core/Frameworks/Baikal/Model/Config/Standard.php
index 6107377..39f90bd 100644 index 2e07f44..948b5be 100644
--- a/Core/Frameworks/Baikal/Model/Config/Standard.php --- a/Core/Frameworks/Baikal/Model/Config/Standard.php
+++ b/Core/Frameworks/Baikal/Model/Config/Standard.php +++ b/Core/Frameworks/Baikal/Model/Config/Standard.php
@@ -46,6 +46,22 @@ class Standard extends \Baikal\Model\Config { @@ -46,6 +46,22 @@ class Standard extends \Baikal\Model\Config {
@ -53,8 +53,8 @@ index 6107377..39f90bd 100644
$oMorpho->add(new \Formal\Element\Listbox([ $oMorpho->add(new \Formal\Element\Listbox([
"prop" => "BAIKAL_DAV_AUTH_TYPE", "prop" => "BAIKAL_DAV_AUTH_TYPE",
"label" => "WebDAV authentication type", "label" => "WebDAV authentication type",
- "options" => [ "Digest", "Basic" ] - "options" => ["Digest", "Basic"]
+ "options" => [ "Digest", "Basic", "LDAP-UserBind" ] + "options" => ["Digest", "Basic", "LDAP-UserBind"]
+ ])); + ]));
+ +
+ $oMorpho->add(new \Formal\Element\Text([ + $oMorpho->add(new \Formal\Element\Text([