Merge branch 'master' into release-1.0

CHANGELOG

@@ -1,6 +1,10 @@
 Roundcube Webmail GlobalAddressbook
 ===================================
 
+Version 1.10 (2017-05-19, rc-1.0)
+=================================================
+ * Add %i macro to get domain from default identity
+
 Version 1.9 (2014-08-31, rc-1.0)
 =================================================
  * Replace globaladdressbook_readonly option with globaladdressbook_perms

composer.json

@@ -5,7 +5,7 @@
   "homepage": "http://github.com/JohnDoh/Roundcube-Plugin-Global-Address-Book/",
   "license": "GPL-3.0",
   "type": "roundcube-plugin",
-  "version": "1.9",
+  "version": "1.10",
   "authors": [
     {
       "name": "Philip Weir",
@@ -25,7 +25,7 @@
   },
   "extra": {
     "roundcube": {
-      "min-version": "1.0-beta"
+      "min-version": "1.0"
     }
   }
 }

config.inc.php.dist

@@ -7,6 +7,7 @@
 // the name of the dummy user which holds the global address book, if the user does not exist it will be created
 // the name can contain the following macros that will be expanded as follows:
 //      %d is replaced with the domain part of the username (if the username is an email address or default mail domain if not)
+//      %i is replaced with the domain part of the email address from the user's default identity
 //      %h is replaced with the imap host (from the session info)
 // eg. to create one global address book per domain: global_addressbook@%d
 $config['globaladdressbook_user'] = '[global_addressbook_user]';
@@ -34,5 +35,3 @@ $config['globaladdressbook_autocomplete'] = true;
 
 // check globaladdressbook for known senders when displaying remote inline images
 $config['globaladdressbook_check_safe'] = true;
-
-?>

globaladdressbook.php

@@ -5,7 +5,6 @@
  *
  * Plugin to add a global address book
  *
- * @version @package_version@
  * @author Philip Weir
  *
  * Copyright (C) 2009-2014 Philip Weir
@@ -44,9 +43,7 @@ public function init()
 		$this->load_config();
 		$this->add_texts('localization/');
 
-		$this->user_name = $rcmail->config->get('globaladdressbook_user', '[global_addressbook_user]');
-		$this->user_name = str_replace('%d', $rcmail->user->get_username('domain'), $this->user_name);
-		$this->user_name = str_replace('%h', $_SESSION['storage_host'], $this->user_name);
+		$this->user_name = globaladdressbook::parse_user($rcmail->config->get('globaladdressbook_user', '[global_addressbook_user]'));
 		$this->groups = $rcmail->config->get('globaladdressbook_groups', false);
 		$this->name = $this->gettext('globaladdressbook');
 		$this->_set_permissions();
@@ -121,6 +118,24 @@ public function check_known_senders($args)
 		return $args;
 	}
 
+	public static function parse_user($name)
+	{
+		$user = rcube::get_instance()->user;
+
+		// %h - IMAP host
+		$h = $_SESSION['storage_host'];
+		// %d - domain name after the '@' from username
+		$d = $user->get_username('domain');
+		// %i - domain name after the '@' from e-mail address of default identity
+		if (strpos($name, '%i') !== false) {
+			$user_ident = $user->list_emails(true);
+			list($local, $domain) = explode('@', $user_ident['email']);
+			$i = $domain;
+		}
+
+		return str_replace(array('%h', '%d', '%i'), array($h, $d, $i), $name);
+	}
+
 	private function _set_permissions()
 	{
 		$rcmail = rcube::get_instance();

localization/cs_CZ.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Globalní Adresář';
 
 $messages = array();
-
-?>

localization/de_CH.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Allgemeines Adressbuch';
 
 $messages = array();
-
-?>

localization/de_DE.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Allgemeines Adressbuch';
 
 $messages = array();
-
-?>

localization/en_GB.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Global Addresses';
 
 $messages = array();
-
-?>

localization/en_US.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Global Addresses';
 
 $messages = array();
-
-?>

localization/es_AR.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Direcciones globales';
 
 $messages = array();
-
-?>

localization/es_ES.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Direcciones globales';
 
 $messages = array();
-
-?>

localization/fr_FR.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Adresses Globales';
 
 $messages = array();
-
-?>

localization/gl_ES.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Direccións globais';
 
 $messages = array();
-
-?>

localization/hu_HU.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Globális címjegyzék';
 
 $messages = array();
-
-?>

localization/it_IT.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Indirizzi Globali';
 
 $messages = array();
-
-?>

localization/ja_JP.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'グローバル・アドレス';
 
 $messages = array();
-
-?>

localization/nl_NL.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Globale adressen';
 
 $messages = array();
-
-?>

localization/pl_PL.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Globalne adresy';
 
 $messages = array();
-
-?>

localization/pt_BR.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Contatos Globais';
 
 $messages = array();
-
-?>

localization/pt_PT.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Endereços Globais';
 
 $messages = array();
-
-?>

localization/ro_RO.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Agendă globală';
 
 $messages = array();
-
-?>

localization/ru_RU.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'Глобальные адреса';
 
 $messages = array();
-
-?>

localization/tr_TR.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = 'global adresler';
 
 $messages = array();
-
-?>

localization/zh_TW.inc

@@ -5,5 +5,3 @@ $labels = array();
 $labels['globaladdressbook'] = '公用通訊錄';
 
 $messages = array();
-
-?>