Changeset 5850 for trunk/expressoAdmin1_2/inc

Timestamp:

03/29/12 16:32:30 (12 years ago)

Author:

acoutinho

Message:

Ticket #2577 - Problemas com a criacaoo/Edicao de contas compartilhadas

Location:

trunk/expressoAdmin1_2/inc

Files:

• class.imap_functions.inc.php (modified) (1 diff)
• class.uishared_accounts.inc.php (modified) (1 diff)

trunk/expressoAdmin1_2/inc/class.imap_functions.inc.php

@@ -457 +457 @@
         function getTemplate( $tpls, $macros, $target = false )
         {
-            require_once( ROOT.'header.inc.php' );
+            require_once( ROOT.'/header.inc.php' );
 
             $template = CreateObject( 'phpgwapi.Template', PHPGW_APP_TPL );

trunk/expressoAdmin1_2/inc/class.uishared_accounts.inc.php

@@ -107 +107 @@
                             'display_quota_used' => 'none',
                             'aclExpressoCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'expressoCalendar')) ? '' : 'none',
-                            'aclCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? '' : 'none'
+                            'aclCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? '' : 'none',
+                            'calendarName' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? 'Calendar' : 'ExpressoCalendar'
                         );
                         $p->set_var($var);