Merge branch '3.2'

thorsten · Oct 2, 2023 · ba711fc · ba711fc
2 parents cfe7269 + 4dc881a
commit ba711fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/phpmyfaq/setup/update.php b/phpmyfaq/setup/update.php
@@ -360,13 +360,13 @@
                 ADD jwt TEXT NULL DEFAULT NULL;';
 
             $query[] = 'ALTER TABLE ' . $prefix . 'faquserdata
-                ADD twofactor_enabled INT(1) NULL DEFAULT 0,
+                ADD twofactor_enabled INT NULL DEFAULT 0,
                 ADD secret VARCHAR(128) NULL DEFAULT NULL';
         }
 
         // New backup
         $query[] = 'CREATE TABLE ' . $prefix . 'faqbackup (
-            id INT(11) NOT NULL,
+            id INT NOT NULL,
             filename VARCHAR(255) NOT NULL,
             authkey VARCHAR(255) NOT NULL,
             authcode VARCHAR(255) NOT NULL,

diff --git a/phpmyfaq/src/phpMyFAQ/Setup/Installer.php b/phpmyfaq/src/phpMyFAQ/Setup/Installer.php
@@ -439,21 +439,6 @@ class Installer extends Setup
         'ldap.ldap_use_dynamic_login' => 'false',
         'ldap.ldap_dynamic_login_attribute' => 'uid',
 
-        'ad.adSupport' => 'false',
-        'ad.ad_mapping.name' => 'cn',
-        'ad.ad_mapping.username' => 'samAccountName',
-        'ad.ad_mapping.mail' => 'mail',
-        'ad.ad_mapping.memberOf' => '',
-        'ad.ad_use_domain_prefix' => 'true',
-        'ad.ad_options.LDAP_OPT_PROTOCOL_VERSION' => '3',
-        'ad.ad_options.LDAP_OPT_REFERRALS' => '0',
-        'ad.ad_use_memberOf' => 'false',
-        'ad.ad_use_sasl' => 'false',
-        'ad.ad_use_multiple_servers' => 'false',
-        'ad.ad_use_anonymous_login' => 'false',
-        'ad.ad_use_dynamic_login' => 'false',
-        'ad.ad_dynamic_login_attribute' => 'uid',
-
         'api.enableAccess' => 'true',
         'api.apiClientToken' => '',