SF.net SVN: phpwiki:[10732] trunk

Revision: 10732
          http://sourceforge.net/p/phpwiki/code/10732
Author:   vargenau
Date:     2021-12-06 13:00:41 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
Remove old WikiUser options

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/lib/IniConfig.php
    trunk/lib/plugin/DebugAuthInfo.php

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2021-12-06 12:49:15 UTC (rev 10731)
+++ trunk/config/config-default.ini	2021-12-06 13:00:41 UTC (rev 10732)
@@ -101,10 +101,6 @@
 DBAUTH_IS_MEMBER   = "SELECT userid FROM pref WHERE userid='$userid' AND groupname='$groupname'"
 DBAUTH_GROUP_MEMBERS = "SELECT userid FROM pref WHERE groupname='$groupname'"
 DBAUTH_USER_GROUPS = "SELECT groupname FROM pref WHERE userid='$userid'"
-; old WikiUser options:
-ALLOW_HTTP_AUTH_LOGIN = false
-ALLOW_LDAP_LOGIN = false
-ALLOW_IMAP_LOGIN = false
 
 THEME = Sidebar
 ; DEFAULT_LANGUAGE =

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2021-12-06 12:49:15 UTC (rev 10731)
+++ trunk/lib/IniConfig.php	2021-12-06 13:00:41 UTC (rev 10732)
@@ -135,8 +135,8 @@
         'STRICT_MAILABLE_PAGEDUMPS', 'COMPRESS_OUTPUT',
         'ALLOW_ANON_USER', 'ALLOW_ANON_EDIT',
         'ALLOW_BOGO_LOGIN', 'ALLOW_USER_PASSWORDS',
-        'AUTH_USER_FILE_STORABLE', 'ALLOW_HTTP_AUTH_LOGIN',
-        'ALLOW_USER_LOGIN', 'ALLOW_LDAP_LOGIN', 'ALLOW_IMAP_LOGIN',
+        'AUTH_USER_FILE_STORABLE',
+        'ALLOW_USER_LOGIN',
         'WARN_NONPUBLIC_INTERWIKIMAP', 'USE_PATH_INFO',
         'PLUGIN_CACHED_USECACHE', 'PLUGIN_CACHED_FORCE_SYNCMAP',
         'BLOG_DEFAULT_EMPTY_PREFIX', 'DATABASE_PERSISTENT',
@@ -211,8 +211,7 @@
         // calculate them later: old or dynamic constants
         if (!array_key_exists($item, $rs) and
             in_array($item, array('USE_PATH_INFO', 'USE_DB_SESSION',
-                'ALLOW_HTTP_AUTH_LOGIN', 'ALLOW_LDAP_LOGIN',
-                'ALLOW_IMAP_LOGIN', 'ALLOW_USER_LOGIN',
+                'ALLOW_USER_LOGIN',
                 'REQUIRE_SIGNIN_BEFORE_EDIT',
                 'WIKIDB_NOCACHE_MARKUP',
                 'COMPRESS_OUTPUT', 'USE_BYTEA', 'ISREADONLY',

Modified: trunk/lib/plugin/DebugAuthInfo.php
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php	2021-12-06 12:49:15 UTC (rev 10731)
+++ trunk/lib/plugin/DebugAuthInfo.php	2021-12-06 13:00:41 UTC (rev 10732)
@@ -75,10 +75,10 @@
                     "ALLOW_ANON_EDIT", "ALLOW_BOGO_LOGIN",
                     "REQUIRE_SIGNIN_BEFORE_EDIT", "ALLOW_USER_PASSWORDS",
                     "PASSWORD_LENGTH_MINIMUM", "USE_DB_SESSION"))));
-        if ((defined('ALLOW_LDAP_LOGIN') && ALLOW_LDAP_LOGIN) or in_array("LDAP", $GLOBALS['USER_AUTH_ORDER']))
+        if (in_array("LDAP", $GLOBALS['USER_AUTH_ORDER']))
             $table->pushContent($this->show_hash("LDAP DEFINES",
                 $this->buildConstHash(array("LDAP_AUTH_HOST", "LDAP_BASE_DN"))));
-        if ((defined('ALLOW_IMAP_LOGIN') && ALLOW_IMAP_LOGIN) or in_array("IMAP", $GLOBALS['USER_AUTH_ORDER']))
+        if (in_array("IMAP", $GLOBALS['USER_AUTH_ORDER']))
             $table->pushContent($this->show_hash("IMAP DEFINES", array("IMAP_AUTH_HOST" => IMAP_AUTH_HOST)));
         if (defined('AUTH_USER_FILE') or in_array("File", $GLOBALS['USER_AUTH_ORDER']))
             $table->pushContent($this->show_hash("AUTH_USER_FILE",

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.