Changeset 3018 for branches/2.2/expressoMail1_2/inc/class.db_functions.inc.php

Timestamp:

07/08/10 17:52:20 (14 years ago)

Author:

amuller

Message:

Ticket #1135 - Aplicando alterações do branches 2.0 no branches 2.2

File:

• branches/2.2/expressoMail1_2/inc/class.db_functions.inc.php (modified) (3 diffs)

branches/2.2/expressoMail1_2/inc/class.db_functions.inc.php

@@ -1 +1 @@
 <?php
-define('PHPGW_INCLUDE_ROOT','../');     
-define('PHPGW_API_INC','../phpgwapi/inc');      
-include_once(PHPGW_API_INC.'/class.db.inc.php');
+if(!isset($_SESSION['phpgw_info']['expressomail']['server']['db_name'])) { 
+        include_once('../header.inc.php'); 
+        $_SESSION['phpgw_info']['expressomail']['server']['db_name'] = $GLOBALS['phpgw_info']['server']['db_name'];  
+        $_SESSION['phpgw_info']['expressomail']['server']['db_host'] = $GLOBALS['phpgw_info']['server']['db_host']; 
+        $_SESSION['phpgw_info']['expressomail']['server']['db_port'] = $GLOBALS['phpgw_info']['server']['db_port']; 
+        $_SESSION['phpgw_info']['expressomail']['server']['db_user'] = $GLOBALS['phpgw_info']['server']['db_user']; 
+        $_SESSION['phpgw_info']['expressomail']['server']['db_pass'] = $GLOBALS['phpgw_info']['server']['db_pass']; 
+        $_SESSION['phpgw_info']['expressomail']['server']['db_type'] = $GLOBALS['phpgw_info']['server']['db_type']; 
+} 
+else{ 
+        define('PHPGW_INCLUDE_ROOT','../');      
+        define('PHPGW_API_INC','../phpgwapi/inc');       
+        include_once(PHPGW_API_INC.'/class.db.inc.php'); 
+} 
 include_once('class.dynamic_contacts.inc.php');
         
@@ -214 +225 @@
                 if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['number_of_contacts'] &&
                         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts']) {
+                        // Free others requests 
+                        session_write_close(); 
                         $dynamic_contact = new dynamic_contacts();
                         $dynamic = $dynamic_contact->dynamic_contact_toString();
@@ -353 +366 @@
                                 $calendar = $fileContent;
                 }
+                // It's necessary to access calendar method. 
+                include_once(PHPGW_INCLUDE_ROOT.'/header.inc.php'); 
                         
                 $uiicalendar = CreateObject("calendar.uiicalendar");