From f08de69924600edfc8e5390a04e8406318b146ff Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 6 Apr 2010 15:12:34 +0000 Subject: [PATCH] Allow to use phoneAccount attributes as replacements in macros git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@17489 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../gofon/gofon/phoneaccount/class_phoneAccount.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc index a21752907..16b93b674 100644 --- a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc +++ b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc @@ -32,9 +32,9 @@ class phoneAccount extends plugin var $goFonHomeServers = array(); // Contains all available server configurations var $context = "default"; - var $sip_contexts = "default"; + var $sip_contexts = array(); var $voice_context = "default"; - var $voicemail_contexts = "default"; + var $voicemail_contexts = array(); /* attribute list for save action */ var $CopyPasteVars = array("phoneNumbers","macroarray","macrostillavailable"/*"phoneNumbers" -Reset- */, @@ -1144,6 +1144,9 @@ class phoneAccount extends plugin $string = $paras['default']; $string=preg_replace("/%uid/i",$this->uid,$string); + $string=preg_replace("/%pager/i",$this->pager,$string); + $string=preg_replace("/%context/i",$this->context,$string); + $string=preg_replace("/%voicemailcontext/i",$this->voice_context,$string); if(isset($this->cn)){ $string=preg_replace("/%cn/i",$this->cn,$string); -- 2.30.2