Changeset 6578 for trunk

Timestamp:

06/22/12 14:47:14 (12 years ago)

Author:

tezza

Message:

Ticket #2766 - Acrescentado/corrigindo recursos de contatos/grupos compartilhados.

Location:

trunk/prototype

Files:

• config/Tonic.srv (modified) (2 diffs)
• config/contact.ini (modified) (1 diff)
• config/contactGroup.ini (modified) (1 diff)
• rest/catalog/DynamicContactsResource.php (modified) (3 diffs)
• rest/catalog/SharedContactResource.php (added)
• rest/catalog/SharedGroupResource.php (added)
• rest/user/UserResource.php (modified) (1 diff)
• rest/user/UsersResource.php (modified) (3 diffs)

trunk/prototype/config/Tonic.srv

@@ -15 +15 @@
 
 [/sharedcontact/:id]
-SharedContactsResource = /catalog/SharedContactResource.php
+SharedContactResource = /catalog/SharedContactResource.php
 
 [/groups]
@@ -24 +24 @@
 
 [/sharedgroup/:id]
-SharedGroupsResource = /catalog/SharedGroupResource.php
+SharedGroupResource = /catalog/SharedGroupResource.php
 
 [/dynamiccontacts]

trunk/prototype/config/contact.ini

@@ -3 +3 @@
 
 [after.find]
-findConnections = modules/catalog/interceptors/DBMapping.php
+findConnections = modules/catalog/interceptors/CatalogDBMapping.php
 
 [PostgreSQL.mapping]

trunk/prototype/config/contactGroup.ini

@@ -3 +3 @@
 
 [after.find]
-findGroupConnections = modules/catalog/interceptors/DBMapping.php
+findGroupConnections = modules/catalog/interceptors/CatalogDBMapping.php
 
 [PostgreSQL.mapping]

trunk/prototype/rest/catalog/DynamicContactsResource.php

@@ -189 +189 @@
         }
 
-        //recupera os atributos definidos no conceito 'user'
+        //recuperar os atributos definidos no conceito 'user'
         $map = Config::get('dynamicContact', 'PostgreSQL.mapping');
 
@@ -207 +207 @@
         }
 
-
         $response = new Response($request);
         $response->addHeader('Content-type', 'aplication/json');
@@ -220 +219 @@
 
         try {
-            $idDynamicContact = Controller::create(
-                            array('concept' => 'dynamicContact'), $params
-            );
-
-            if (!$idDynamicContact) {
-                throw new Exception(Controller::service('PostgreSQL')->error);
-            }
+
+                //verificar o limite maximo de contatos dinamicos nas preferencias do administrador
+                $sql =  "SELECT config_value ".
+                        "FROM phpgw_config ".
+                        "WHERE config_app = 'expressoMail1_2' ".
+                                "AND config_name = 'expressoMail_Number_of_dynamic_contacts'";
+
+                $numberOfMessages = Controller::service('PostgreSQL')->execResultSql($sql, true);
+                $numberOfMessages = (count($numberOfMessages) > 0) ? (int)$numberOfMessages['config_value'] : 0;
+
+                //realizar busca de contatos dinamicos ordenados pela data de utilizacao
+                $dynamicContacts = Controller::find(array('concept' => 'dynamicContact'), false, array('filter' => array('=', 'owner', Config::me("uidNumber")), 'order' => array('timestamp') ) );
+                $numberOfDynamicContacts = ($dynamicContacts !== false) ? count($dynamicContacts) : 0;
+
+
+                //se a quantidade de contatos dinamicos de usuario exceder o limite maximo definido nas preferencias do administrador,
+                //remover o contato dinamico mais antigo
+                if($numberOfDynamicContacts >= $numberOfMessages){
+                        $id = $dynamicContacts[0]['id'];
+                        $delete = Controller::delete(array('concept' => 'dynamicContact', 'id' => $id));
+
+                        if (!$delete) {
+                                $this->createException($request, $response, Response::INTERNALSERVERERROR, 'Internal Server Error', Controller::service('PostgreSQL')->error);
+                                return $response;
+                        }
+                }       
+
+                //inserir o novo contato dinamico
+                $create = Controller::create( array('concept' => 'dynamicContact'), $params );
+
+                if (!$create) {
+                        throw new Exception(Controller::service('PostgreSQL')->error);
+                }
+
         } catch (Exception $ex) {
+
             $response->code = Response::INTERNALSERVERERROR;
             return $response;
         }
-
         $response->body = json_encode(null);
 

trunk/prototype/rest/user/UserResource.php

@@ -31 +31 @@
             $this->secured();
 
-            $user = Controller::find(array('concept' => 'user','service'=>'OpenLDAP'), false, array('filter' => array('=', 'uid', $id )));
+            $user = Controller::find(
+                                        array('concept' => 'user','service'=>'OpenLDAP'), 
+                                        false, 
+                                        array('filter' => array('=', 'uid', $id ),
+                                              'notExternal' => true)
+            );
 
             //Se nao foi encontrado usuario na consulta

trunk/prototype/rest/user/UsersResource.php

@@ -30 +30 @@
 
         $this->secured();
-        
+
+
         try {       
             //Executa uma consulta de usuários do LDAP a partir de um determinado atributo e valor
@@ -40 +41 @@
                     //verifica se o campo(atributo) passado pelo usuário está definido no conceito 'user'
                     if(isset($map[ $_GET['field'] ])){
-                            $users = Controller::find(array('concept' => 'user','service'=>'OpenLDAP'), false, array('filter' => array('=', $_GET['field'],$_GET['value'] )));
+                            $users = Controller::find(
+                                                        array('concept' => 'user','service'=>'OpenLDAP'), 
+                                                        false, 
+                                                        array('filter' => array('=', $_GET['field'],$_GET['value'] ), 'notExternal' => true)
+                            );
                     }
                     else{
@@ -66 +71 @@
             else{
                     //Executa a consulta dos primeiros 20 usuarios do LDAP
-                    $users = Controller::find(array('concept' => 'user','service'=>'OpenLDAP'), false, array('filter' => array('=', 'phpgwAccountType', 'u'),'limit'=>20));
+                    $users = Controller::find(
+                                                array('concept' => 'user','service'=>'OpenLDAP'), 
+                                                false, 
+                                                array('filter' => array('=', 'phpgwAccountType', 'u'),
+                                                      'limit' => 20,
+                                                      'notExternal' => true)
+                    );
             }