From f4fd23ed3c435257aee2202c8ea5a2cbf6b8f44e Mon Sep 17 00:00:00 2001
From: Florian Schlichting <fsfs@debian.org>
Date: Thu, 29 Dec 2016 17:43:46 +0100
Subject: [PATCH] drivers_rimap: update similar to drivers_imap_pam

---
 inc/drivers_rimap.php | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/inc/drivers_rimap.php b/inc/drivers_rimap.php
index 1c7e7ef0..83616c61 100644
--- a/inc/drivers_rimap.php
+++ b/inc/drivers_rimap.php
@@ -11,9 +11,14 @@
 * @license   http://gnu.org/copyleft/gpl.html GNU GPL v2 or later
 */
 
+// The PHP interpreter will die quietly unless satisfied. This provides user feedback instead.
+if (!function_exists('imap_open')) {
+  die("drivers_rimap: php-imap required.");
+}
+
 require_once("auth-functions.php");
 
-class imapPamDrivers
+class rimapPamDrivers
 {
   /**#@+
   * @access private
@@ -22,15 +27,6 @@ class imapPamDrivers
   /**#@-*/
 
 
-  /**
-  * Constructor.
-  * @param string $imap_url formated for imap_open()
-  */
-  function imapPamDrivers($imap_url){
-      $this->__construct($imap_url);
-  }
-
-
   /**
   * The constructor
   *
@@ -40,7 +36,7 @@ class imapPamDrivers
   {
       global $c;
       if (empty($imap_url)){
-          $c->messages[] = sprintf(i18n('drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php'));
+          $c->messages[] = sprintf(i18n('drivers_rimap : imap_url parameter not configured in /etc/davical/*-conf.php'));
           $this->valid=false;
           return ;
       }