Changeset 7631

Timestamp:

12/10/12 10:17:26 (11 years ago)

Author:

cristiano

Message:

Ticket #3209 - Retirado configurações estaticas, comandos desnecessarios do conctactProvider

Location:

trunk/zpush

Files:

• backend/expresso/providers/contactProvider.php (modified) (4 diffs)
• config.php (modified) (2 diffs)

trunk/zpush/backend/expresso/providers/contactProvider.php

@@ -134 +134 @@
         $ids = array();
         try {
-            $result = pg_query($this->db,"BEGIN;");
             if ($result == FALSE) throw new Exception(pg_last_error($this->db));
             $result = pg_query($this->db, "select given_names, family_names, last_update, id_contact from phpgw_cc_contact where id_owner = " . $this->_uidnumber . ";");
@@ -145 +144 @@
                 $messages[] = $message;
             }
-            $result = pg_query($this->db,"COMMIT;");
             if ($result == FALSE) throw new Exception(pg_last_error($this->db));
         } catch (Exception $e) {
-            pg_query($this->db,"ROLLBACK;");
        //     debugLog("exception -> " . $e->getMessage() . " - ARQUIVO: " . $e->getFile() . " - LINHA: " . $e->getLine());
         }
@@ -176 +173 @@
         $message = new SyncContact();
         try {
-            $result = pg_query($this->db,"BEGIN;");
-            if ($result == FALSE) throw new Exception(pg_last_error($this->db));
             $result_contact = pg_query($this->db, "select id_contact, id_owner, id_status, photo, alias, id_prefix, given_names, family_names, names_ordered, id_suffix, birthdate, sex, pgp_key, notes, is_global, last_status, last_update, category, web_page, corporate_name, job_title, department from phpgw_cc_contact where id_contact = " . $id . ";");
             if ($result_contact == FALSE) throw new Exception(pg_last_error($this->db));
@@ -363 +358 @@
                 }
             }
-            $result = pg_query($this->db,"COMMIT;");
-            if ($result == FALSE) throw new Exception(pg_last_error($this->db));
         } catch (Exception $e) {
-            pg_query($this->db,"ROLLBACK;");
             debugLog("exception -> " . $e->getMessage() . " - ARQUIVO: " . $e->getFile() . " - LINHA: " . $e->getLine());
             return;

trunk/zpush/config.php

@@ -176 +176 @@
 
 
-    // ************************
-    //  BackendIMAP settings
-    // ************************
-    // Defines the server to which we want to connect
-    define('IMAP_SERVER', 'localhost');
-    // connecting to default port (143)
-    define('IMAP_PORT', 143);
-    // best cross-platform compatibility (see http://php.net/imap_open for options)
-    define('IMAP_OPTIONS', '/notls/norsh');
-    // overwrite the "from" header if it isn't set when sending emails
-    // options: 'username'    - the username will be set (usefull if your login is equal to your emailaddress)
-    //        'domain'    - the value of the "domain" field is used
-    //        '@mydomain.com' - the username is used and the given string will be appended
-    define('IMAP_DEFAULTFROM', '');
-    // copy outgoing mail to this folder. If not set z-push will try the default folders
-    define('IMAP_SENTFOLDER', 'INBOX/Sent');
-    // forward messages inline (default false - as attachment)
-    define('IMAP_INLINE_FORWARD', false);
-    // use imap_mail() to send emails (default) - if false mail() is used
-    define('IMAP_USE_IMAPMAIL', true);
-
 
     // ************************
@@ -300 +279 @@
 
     $GLOBALS['connections']['db'] = pg_connect( $rs );
+
+
+    $rs = pg_query( $GLOBALS['connections']['db'], 'SELECT * FROM phpgw_emailadmin' );
+    $row = pg_fetch_assoc( $rs );
+
+    // ************************
+    //  BackendIMAP settings
+    // ************************
+    // Defines the server to which we want to connect
+    define('IMAP_SERVER', $row['imapserver']);
+    // connecting to default port (143)
+    define('IMAP_PORT', $row['imapport']);
+    // best cross-platform compatibility (see http://php.net/imap_open for options)
+    define('IMAP_OPTIONS', $row['imapTLSEncryption'] == 'yes' ? '/tls/norsh' : '/notls/norsh');
+
+    // overwrite the "from" header if it isn't set when sending emails
+    // options: 'username'    - the username will be set (usefull if your login is equal to your emailaddress)
+    //        'domain'    - the value of the "domain" field is used
+    //        '@mydomain.com' - the username is used and the given string will be appended
+
+    define('IMAP_DEFAULTFROM', '');
+    // copy outgoing mail to this folder. If not set z-push will try the default folders
+    define('IMAP_SENTFOLDER', 'INBOX' . $row['imapdelimiter'] . $row['imapdefaultsentfolder']);
+    // forward messages inline (default false - as attachment)
+    define('IMAP_INLINE_FORWARD', false);
+    // use imap_mail() to send emails (default) - if false mail() is used
+    define('IMAP_USE_IMAPMAIL', true);
+
+
     $rs = pg_query( $GLOBALS['connections']['db'], 'SELECT app_id FROM phpgw_applications WHERE app_name = \'zpush\'' );
     $row = pg_fetch_assoc( $rs );