Remove long config for long deprecated MCAL extension

diff --git a/framework/Auth/lib/Horde/Auth/Passwd.php b/framework/Auth/lib/Horde/Auth/Passwd.php
index a40c5ec..d227154 100644 (file)
--- a/framework/Auth/lib/Horde/Auth/Passwd.php
+++ b/framework/Auth/lib/Horde/Auth/Passwd.php
@@ -240,8 +240,7 @@ class Horde_Auth_Passwd extends Horde_Auth_Base
      * Find out if a set of login credentials are valid.
      *
      * @param string $userId      The userId to check.
-     * @param array $credentials  An array of login credentials. For MCAL,
-     *                            this must contain a password entry.
+     * @param array $credentials  An array of login credentials.
      *
      * @throws Horde_Auth_Exception
      */

diff --git a/horde/config/conf.xml b/horde/config/conf.xml
index 2ee4e60..05747ea 100644 (file)
--- a/horde/config/conf.xml
+++ b/horde/config/conf.xml
@@ -378,12 +378,6 @@
      </configsection>
     </case>
 
-    <case name="mcal" desc="MCAL authentication">
-     <configsection name="params">
-      <configstring name="calendar" desc="The MCAL calendar name"/>
-     </configsection>
-    </case>
-
     <case name="pam" desc="PAM (Pluggable Authentication Modules, DEPRECATED)
     authentication">
      <configsection name="params">
@@ -821,14 +815,6 @@
        </configsection>
       </case>
 
-      <case name="mcal" desc="Mcal">
-       <configsection name="params">
-        <configstring name="calendar" desc="The MCAL calendar name"/>
-        <configstring name="username" desc="Connect to MCAL as"/>
-        <configstring name="password" desc="Password to connect with"/>
-       </configsection>
-      </case>
-
       <case name="null" desc="Null"/>
 
       <case name="sql" desc="SQL">