Changeset 7228 for branches/2.4/prototype/rest/catalog/UserContactsResource.php

Timestamp:

09/17/12 14:30:47 (12 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.2.

Location:

branches/2.4

Files:

• . (modified) (1 prop)
• prototype/rest/catalog/UserContactsResource.php (modified) (2 diffs)

branches/2.4/prototype/rest/catalog/UserContactsResource.php

@@ -282 +282 @@
 
                         $d = new Data();
-                        $i = new Item($request->resources, (($value['user'] == Config::me("uidNumber")) ? 'ContactsResource' : 'SharedContactResource'), $value['id']);
+                        $i = new Item($request->resources, (($value['user'] == Config::me("uidNumber")) ? 'PersonalContactResource' : 'SharedContactResource'), $value['id']);
                         $d->setName('id');
                         $d->setValue($value['id']);
@@ -487 +487 @@
     private function isEnabledDynamicContacts($user){
 
-                        //recuperando as preferencias (suas preferencias, preferencia padrão, preferencia obrigatoria) 
-                        //dos contatos dinamicos 
-                $sql = 'SELECT preference_owner, preference_value '.
+                //recuperando as preferencias (suas preferencias, preferencia padrão, preferencia obrigatoria)
+                //dos contatos dinamicos
+        $sql = 'SELECT preference_owner, preference_value '.
                 'FROM phpgw_preferences '.
                 'WHERE preference_app = \'expressoMail\' AND '.
-                        'preference_owner in (-1,-2, ' . $user . ')'; 
-                 
-        $preferences = Controller::service('PostgreSQL')->execResultSql($sql); 
- 
-                $array = array(); 
-        if(count($preferences) > 0){ 
-                        foreach($preferences as $preference){ 
-                                //recupera a preferencia 
-                $preference_value = unserialize( $preference['preference_value'] ); 
-                 
-                                //gera um array com o owner e o valor da preferencia: 
-                                //true: SIM  (1) 
-                                //false: NAO (0) 
-                                //null: escolha pelo usuario/ usar padrao / sem padrao 
-                                $value = null; 
-                                if(isset($preference_value['use_dynamic_contacts'])){ 
-                                        $value = (isset($preference_value['use_dynamic_contacts'])) ? $preference_value['use_dynamic_contacts'] == '1' : false; 
-                                } 
-                                $array[ $preference['preference_owner'] ] = $value; 
-                        } 
+                        'preference_owner in (-1,-2, ' . $user . ')';
+
+        $preferences = Controller::service('PostgreSQL')->execResultSql($sql);
+
+                $array = array();
+        if(count($preferences) > 0){
+                        foreach($preferences as $preference){
+                                //recupera a preferencia
+                $preference_value = unserialize( $preference['preference_value'] );
+                
+                                //gera um array com o owner e o valor da preferencia:
+                                //true: SIM  (1)
+                                //false: NAO (0)
+                                //null: escolha pelo usuario/ usar padrao / sem padrao
+                                $value = null;
+                                if(isset($preference_value['use_dynamic_contacts'])){
+                                        $value = (isset($preference_value['use_dynamic_contacts'])) ? $preference_value['use_dynamic_contacts'] == '1' : false;
+                                }
+                                $array[ $preference['preference_owner'] ] = $value;
+                        }
         }
-        //preferencia obrigatoria (SIM) 
-        if(array_key_exists(-1,$array) && $array[-1]){ 
-                return true; 
-        } 
-        //preferencia do user (SIM) 
-        else if(array_key_exists($user,$array) && $array[$user] ){ 
-                return true; 
-        } 
-        //preferencia padrao (SIM) escolhida pelo user 
-        else if(array_key_exists($user, $array) && $array[$user] === null && 
-                array_key_exists(-2, $array) && $array[-2]){ 
-                return true; 
-        } 
-        return false;
+
+                //preferencia obrigatoria (SIM)
+                if(array_key_exists(-1,$array) && $array[-1]){
+                        return true;
+                }
+                //preferencia do user (SIM)
+                else if(array_key_exists($user,$array) && $array[$user] ){
+                        return true;
+                }
+                //preferencia padrao (SIM) escolhida pelo user
+                else if(array_key_exists($user, $array) && $array[$user] === null &&
+                        array_key_exists(-2, $array) && $array[-2]){
+                        return true;
+                }
+                return false;
     }
 }