From 3412e50b54e3daac8745234e21ab6e72be0ed165 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 04 Jun 2014 11:20:33 -0400
Subject: [PATCH] Fix attachment menu structure and aria-attributes

---
 plugins/password/drivers/hmail.php |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/plugins/password/drivers/hmail.php b/plugins/password/drivers/hmail.php
index 104c851..6504346 100644
--- a/plugins/password/drivers/hmail.php
+++ b/plugins/password/drivers/hmail.php
@@ -5,7 +5,6 @@
  *
  * @version 2.0
  * @author Roland 'rosali' Liebl <myroundcube@mail4us.net>
- *
  */
 
 class rcube_hmail_password
@@ -26,8 +25,8 @@
                 $obApp = new COM("hMailServer.Application");
         }
         catch (Exception $e) {
-            write_log('errors', "Plugin password (hmail driver): " . trim(strip_tags($e->getMessage())));
-            write_log('errors', "Plugin password (hmail driver): This problem is often caused by DCOM permissions not being set.");
+            rcube::write_log('errors', "Plugin password (hmail driver): " . trim(strip_tags($e->getMessage())));
+            rcube::write_log('errors', "Plugin password (hmail driver): This problem is often caused by DCOM permissions not being set.");
             return PASSWORD_ERROR;
         }
 
@@ -39,8 +38,7 @@
         else {
             $domain = $rcmail->config->get('username_domain',false);
             if (!$domain) {
-                write_log('errors','Plugin password (hmail driver): $rcmail_config[\'username_domain\'] is not defined.');
-                write_log('errors','Plugin password (hmail driver): Hint: Use hmail_login plugin (http://myroundcube.googlecode.com');
+                rcube::write_log('errors','Plugin password (hmail driver): $config[\'username_domain\'] is not defined.');
                 return PASSWORD_ERROR;
             }
             $username = $username . "@" . $domain;
@@ -55,8 +53,8 @@
             return PASSWORD_SUCCESS;
         }
         catch (Exception $e) {
-            write_log('errors', "Plugin password (hmail driver): " . trim(strip_tags($e->getMessage())));
-            write_log('errors', "Plugin password (hmail driver): This problem is often caused by DCOM permissions not being set.");
+            rcube::write_log('errors', "Plugin password (hmail driver): " . trim(strip_tags($e->getMessage())));
+            rcube::write_log('errors', "Plugin password (hmail driver): This problem is often caused by DCOM permissions not being set.");
             return PASSWORD_ERROR;
         }
     }

--
Gitblit v1.9.1