Changeset 5907 for trunk/expressoAdmin1_2

Timestamp:

04/10/12 17:27:27 (12 years ago)

Author:

cristiano

Message:

Ticket #2606 - Syncronização das acls e compartilhamentos com caldav

Location:

trunk/expressoAdmin1_2

Files:

• inc/class.uishared_accounts.inc.php (modified) (2 diffs)
• js/jscode/shared_accounts.js (modified) (2 diffs)
• templates/default/shared_accounts_modal.tpl (modified) (1 diff)

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

@@ -101 +101 @@
                         $p->set_var('modal_id', $modal_id);
                         
+                        $davicalConf = parse_ini_file( dirname(__FILE__)."/../../prototype/config/CalDAV.srv", true );  
                         $var = Array(
                             'mailquota' =>  $this->current_config['expressoAdmin_defaultSharedAccountQuota'],
@@ -108 +109 @@
                             'aclExpressoCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'expressoCalendar')) ? '' : 'none',
                             'aclCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? '' : 'none',
-                            'calendarName' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? 'Calendar' : 'ExpressoCalendar'
-                        );
+                            'calendarName' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? 'Calendar' : 'ExpressoCalendar',
+                            'sharedAccountsLocation' => isset($davicalConf['sharedAccountsLocation']) ? $davicalConf['sharedAccountsLocation'] : ''
+                          );
                         $p->set_var($var);
                         $shared_accounts_modal_tpl = $p->fp('out','shared_accounts_modal');

trunk/expressoAdmin1_2/js/jscode/shared_accounts.js

@@ -396 +396 @@
 
                 if(!!!sharemailbox.currentPemissions[sharedUser.id])
-                    DataLayer.put('calendarSignature', {
+                     DataLayer.put('calendarSignature', {
                         user: sharedUser.id,
                         calendar:  {
                             timezone: 'America/Sao_Paulo',
                             name: $('#cn').val(),
-                            location : $('#cn').val(),
+                            location : $('#sharedAccountsLocation').val() + '/' + $('#cn').val(),
                             description : $('#cn').val()
                             },
@@ -409 +409 @@
                         borderColor: 'eddb21'
                     });
-
+                  
                 var returns = function(data){
                     

trunk/expressoAdmin1_2/templates/default/shared_accounts_modal.tpl

@@ -47 +47 @@
                                                 
                 <td width="15%" valign="bottom" align="center" bgcolor="#DDDDDD" style="padding-bottom: 5px;">
+                    <input type="hidden" id="sharedAccountsLocation" value="{sharedAccountsLocation}" />
                     <table align="center" style="display: {aclCalendar}">
                         <tbody>