Add ability to show login error from the IMAP server instead of traditional "Unknown...

[squirrelmail.git] / plugins / mail_fetch / setup.php

diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php
index 616ba1d04a6cedf2218721b2e57bfee4eb612766..b77547d7a48ed8038cf241333294bf2a334341fe 100644 (file)
--- a/plugins/mail_fetch/setup.php
+++ b/plugins/mail_fetch/setup.php
@@ -5,7 +5,7 @@
  *
  * Setup of the mailfetch plugin.
  *
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2014 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
@@ -18,8 +18,7 @@
 function squirrelmail_plugin_init_mail_fetch() {
     global $squirrelmail_plugin_hooks;
 
-    $squirrelmail_plugin_hooks['menuline']['mail_fetch'] = 'mail_fetch_link';
-    $squirrelmail_plugin_hooks['loading_prefs']['mail_fetch'] = 'mail_fetch_load_pref';
+    $squirrelmail_plugin_hooks['template_construct_page_header.tpl']['mail_fetch'] = 'mail_fetch_link';
     $squirrelmail_plugin_hooks['login_verified']['mail_fetch'] = 'mail_fetch_setnew';
     $squirrelmail_plugin_hooks['left_main_before']['mail_fetch'] = 'mail_fetch_login';
     $squirrelmail_plugin_hooks['optpage_register_block']['mail_fetch'] = 'mailfetch_optpage_register_block';
@@ -31,17 +30,8 @@ function squirrelmail_plugin_init_mail_fetch() {
  * @private
  */
 function mail_fetch_link() {
-    displayInternalLink('plugins/mail_fetch/fetch.php', _("Fetch"), '');
-    echo '  ';
-}
-
-/**
- * load preferences
- * @private
- */
-function mail_fetch_load_pref() {
-    include_once(SM_PATH . 'plugins/mail_fetch/functions.php');
-    mail_fetch_load_pref_function();
+    include_once (SM_PATH . 'plugins/mail_fetch/functions.php');
+    return mail_fetch_link_do();
 }
 
 /**
@@ -80,4 +70,3 @@ function mail_fetch_folderact($args) {
     include_once (SM_PATH . 'plugins/mail_fetch/functions.php');
     mail_fetch_folderact_function($args);
 }
-?>
\ No newline at end of file