diff --git a/scripts/_common.sh b/scripts/_common.sh index c2d0c5c..8b8c9e3 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="7.4" pkg_dependencies="php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-apcu-bc php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-ldap" diff --git a/sources/patches/app-00-no-password-ldap.patch b/sources/patches/app-00-no-password-ldap.patch index 645e65f..8b6b56c 100644 --- a/sources/patches/app-00-no-password-ldap.patch +++ b/sources/patches/app-00-no-password-ldap.patch @@ -2,10 +2,10 @@ diff --git a/protected/humhub/modules/ldap/models/LdapSettings.php b/protected/h index e6402e8b3..3b653d590 100644 --- a/protected/humhub/modules/ldap/models/LdapSettings.php +++ b/protected/humhub/modules/ldap/models/LdapSettings.php -@@ -120,7 +120,7 @@ class LdapSettings extends Model +@@ -125,7 +125,7 @@ class LdapSettings extends Model return [ [['enabled', 'refreshUsers', 'usernameAttribute', 'emailAttribute', 'username', 'passwordField', 'hostname', 'port', 'idAttribute'], 'string', 'max' => 255], - [['baseDn', 'loginFilter', 'userFilter'], 'string'], + [['baseDn', 'loginFilter', 'userFilter', 'ignoredDNs'], 'string'], - [['usernameAttribute', 'username', 'passwordField', 'hostname', 'port', 'baseDn', 'loginFilter', 'userFilter', 'idAttribute'], 'required'], + [['usernameAttribute', 'hostname', 'port', 'baseDn', 'loginFilter', 'userFilter', 'idAttribute'], 'required'], ['encryption', 'in', 'range' => ['', 'ssl', 'tls']],