[phpwiki-checkins] SF.net SVN: phpwiki:[9168] trunk

[<var...@us...>]

Revision: 9168
          http://sourceforge.net/p/phpwiki/code/9168
Author:   vargenau
Date:     2014-10-03 13:51:44 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
function imap_open exists

Modified Paths:
--------------
    trunk/configurator.php
    trunk/lib/WikiUser.php

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2014-10-03 13:48:15 UTC (rev 9167)
+++ trunk/configurator.php	2014-10-03 13:51:44 UTC (rev 9168)
@@ -1179,10 +1179,8 @@
 The entries in this ou must have a gidNumber and cn attribute.
 Default: ou=Groups");
 
-if (function_exists('imap_open')) {
-
-    $properties["IMAP Auth Host"] =
-        new _define_optional('IMAP_AUTH_HOST', 'localhost:143/imap/notls', "
+$properties["IMAP Auth Host"] =
+    new _define_optional('IMAP_AUTH_HOST', 'localhost:143/imap/notls', "
 If USER_AUTH_ORDER contains IMAP:
 
 The IMAP server to check usernames from. Defaults to localhost.
@@ -1191,21 +1189,6 @@
   localhost, localhost:143/imap/notls,
   localhost:993/imap/ssl/novalidate-cert (SuSE refuses non-SSL conections)");
 
-} else { // function_exists('imap_open')
-
-    $properties["IMAP Authentication"] =
-        new unchangeable_variable('IMAP_AUTH_HOST', "
-; If USER_AUTH_ORDER contains IMAP:
-; The IMAP server to check usernames from. Defaults to localhost.
-;
-; Some IMAP_AUTH_HOST samples:
-;   localhost, localhost:143/imap/notls,
-;   localhost:993/imap/ssl/novalidate-cert (SuSE refuses non-SSL conections)
-;IMAP_AUTH_HOST = localhost:143/imap/notls", "
-Ignored. No IMAP support in this php. configure --with-imap");
-
-}
-
 $properties["POP3 Authentication"] =
     new _define_optional('POP3_AUTH_HOST', 'localhost:110', "
 If USER_AUTH_ORDER contains POP3:

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2014-10-03 13:48:15 UTC (rev 9167)
+++ trunk/lib/WikiUser.php	2014-10-03 13:51:44 UTC (rev 9168)
@@ -1013,7 +1013,7 @@
                         include_once 'lib/WikiUser/LDAP.php';
                         return new _LDAPPassUser($UserName, $this->_prefs);
                     } elseif (in_array('IMAP', $dbh->getAuthParam('USER_AUTH_ORDER')) and
-                        defined('IMAP_AUTH_HOST') and function_exists('imap_open')
+                        defined('IMAP_AUTH_HOST')
                     ) {
                         include_once 'lib/WikiUser/IMAP.php';
                             return new _IMAPPassUser($UserName, $this->_prefs);

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