Changeset 395 for trunk/expressoMail1_2/index.php

Timestamp:

08/14/08 11:44:42 (16 years ago)

Author:

niltonneto

Message:

Alterações necessárias devido à mudança de implementação do método
memberships() da API, que traz somente o ID dos grupos agora.

File:

• trunk/expressoMail1_2/index.php (modified) (2 diffs)

trunk/expressoMail1_2/index.php

@@ -40 +40 @@
         
         //Enable/Disable VoIP Service -> Voip Server Config
-        $voip_enabled = false;  
+        $voip_enabled = false;
+        $voip_groups = array();
         if($GLOBALS['phpgw_info']['server']['voip_groups']) {
-                $voip_groups = explode(",",$GLOBALS['phpgw_info']['server']['voip_groups']);                    
-                foreach($GLOBALS['phpgw']->accounts->membership() as $idx => $group){                                           
-                        if(array_search($group['account_name'],$voip_groups) !== FALSE){                
+                foreach(explode(",",$GLOBALS['phpgw_info']['server']['voip_groups']) as $i => $voip_group){
+                        $a_voip = explode(";",$voip_group);                     
+                        $voip_groups[] = $a_voip[1];
+                }
+                foreach($GLOBALS['phpgw']->accounts->membership() as $idx => $group){                   
+                        if(array_search($group['account_name'],$voip_groups) !== FALSE){                 
                                 $voip_enabled = true;
                                 break;
@@ -71 +75 @@
                 'mainscreen_showmail'                           => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['mainscreen_showmail'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['mainscreen_showmail'] : "0",
                 'signature'                                             => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['signature'],
+                'type_signature'                                        => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['type_signature'],
                 'use_signature'                                         => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature'] : "0",
                         'hide_folders'                                          => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'] : "0",