Changeset 5971

Timestamp:

04/18/12 18:19:41 (12 years ago)

Author:

natan

Message:

Ticket #2633 - Implementação da limitação de numero de marcadores por usuario

Location:

trunk/prototype

Files:

• api/controller.php (modified) (1 diff)
• config/label.ini (modified) (1 diff)
• modules/mail/interceptors/Helpers.php (modified) (2 diffs)
• services/PostgreSQL.php (modified) (6 diffs)

trunk/prototype/api/controller.php

@@ -532 +532 @@
                         case 'create': $return = $params['service']->create( $params['URI'], $params['properties']/*, $criteria*/ ); break;
 
-                        case 'delete': $return = $params['service']->delete( $params['URI'], $params['properties']/*, $criteria*/ ); break;
+                        case 'delete': $return = $params['service']->delete( $params['URI'], $params['properties'], $params['criteria'] ); break;
 
                         case 'deleteAll': $return = $params['service']->deleteAll( $params['URI'], $params['properties'], $params['criteria'] ); break;

trunk/prototype/config/label.ini

@@ -5 +5 @@
 addVerifyOwnerFilter = modules/mail/interceptors/LabelSecure.php
 
+[before.read]
+addVerifyOwnerFilter = modules/mail/interceptors/LabelSecure.php
+
 [before.delete]
+addVerifyOwnerFilter = modules/mail/interceptors/LabelSecure.php
 clearAllLabeledsOfLabel = modules/mail/interceptors/Helpers.php
 
 [before.update]
-verifyNameLabel = modules/mail/interceptors/Helpers.php
+validateLabel = modules/mail/interceptors/Helpers.php
 
 [before.create]
-verifyNameLabel = modules/mail/interceptors/Helpers.php
+validateLabel = modules/mail/interceptors/Helpers.php
 
 [PostgreSQL.mapping]
-id = id
+id = slot
 uid = user_id
 name = name

trunk/prototype/modules/mail/interceptors/Helpers.php

@@ -68 +68 @@
                 }
         }
-        
-        //label:before.create
-        public function verifyNameLabel(&$uri , &$params , &$criteria , $original){
-                $nameLabel = $params['name'];
-                $Labels = Controller::find(array('concept' => 'label'), false, array('filter' => array('i=', 'name', $nameLabel) ));
-                if($Labels){
-                        Throw new Exception('Já existe um marcador com esse nome.');
-                }
-        }
                 
         public static function in_arrayr($needle, $haystack) {
@@ -249 +240 @@
         }       
 
+        //label:before.create
+        public function validateLabel(&$uri , &$params , &$criteria , $original){
+
+                if( !!Controller::find( array('concept' => 'label'), false, array('filter' => array('i=', 'name', $params['name'])) ) )
+                {
+                    throw new Exception('Já existe um marcador com esse nome.');
+                }
+
+                $used = Controller::service('PostgreSQL')->execSql( 'SELECT count(slot) as used from expressomail_label where user_id = '.Config::me('uidNumber'), true );
+
+                if( $used['used'] === '0' )
+                {
+                    $params['id'] = '1';
+                    return;
+                }
+
+                $slot = Controller::service('PostgreSQL')->execSql( 'SELECT label.slot + 1 as id FROM expressomail_label as label, phpgw_config as config WHERE label.user_id = '.Config::me('uidNumber').' AND config.config_name = \'expressoMail_limit_labels\' AND label.slot <= config.config_value::integer AND ( SELECT count(slot) FROM expressomail_label WHERE slot = label.slot + 1 AND user_id = '.Config::me('uidNumber').' ) = 0 limit 1', true );
+
+                if( empty( $slot ) )
+                {
+                    throw new Exception('Nenhum slot disponivel.');
+                }
+
+                $params['id'] = $slot['id'];
+        }
 }
 

trunk/prototype/services/PostgreSQL.php

@@ -15 +15 @@
         $justthese = self::parseJustthese($justthese, $map);
 
-        return $this->execResultSql( 'SELECT '.$justthese['select'].' FROM '. (Config::get($uri['concept'],'PostgreSQL.concept')) .' '.$criteria );
+        return $this->execSql( 'SELECT '.$justthese['select'].' FROM '. (Config::get($uri['concept'],'PostgreSQL.concept')) .' '.$criteria );
     }
 
@@ -22 +22 @@
       $map =  Config::get($uri['concept'], 'PostgreSQL.mapping');   
       $justthese = self::parseJustthese($justthese, $map);
-      $criteria = ($criteria !== false) ? $this->parseCriteria ( $criteria , $map , ' WHERE id = \''.addslashes( $uri['id'] ).'\'') : ' WHERE id = \''.addslashes( $uri['id'] ).'\'';
+      $criteria = ($criteria !== false) ? $this->parseCriteria ( $criteria , $map , ' WHERE '.$map['id'].' = \''.addslashes( $uri['id'] ).'\'') : ' WHERE '.$map['id'].' = \''.addslashes( $uri['id'] ).'\'';
    
-      return $this->execResultSql( 'SELECT '.$justthese['select'].' FROM '. (Config::get($uri['concept'],'PostgreSQL.concept')) .$criteria , true );
+      return $this->execSql( 'SELECT '.$justthese['select'].' FROM '. (Config::get($uri['concept'],'PostgreSQL.concept')) .$criteria , true );
     }
         
@@ -33 +33 @@
     }
 
-    public function delete ( $uri, $justthese = false ){
-            return $this->execSql('DELETE FROM '.(Config::get($uri['concept'],'PostgreSQL.concept')).' WHERE id = '.addslashes($uri['id']));
+    public function delete ( $uri, $justthese = false, $criteria = false ){
+            $map = Config::get($uri['concept'], 'PostgreSQL.mapping');
+            if(!self::parseCriteria ( $criteria , $map)) return false; //Validador para não apagar tabela inteira
+            $criteria = ($criteria !== false) ? $this->parseCriteria ( $criteria , $map , ' WHERE '.$map['id'].' = \''.addslashes( $uri['id'] ).'\'') : ' WHERE '.$map['id'].' = \''.addslashes( $uri['id'] ).'\'';
+            return $this->execSql('DELETE FROM '.(Config::get($uri['concept'],'PostgreSQL.concept')).$criteria);
     }
 
@@ -48 +51 @@
 
     public function create ( $uri,  $data ){    
-            return $this->execResultSql( 'INSERT INTO '.(Config::get($uri['concept'],'PostgreSQL.concept')).' '.self::parseInsertData( $data , $uri['concept'] ), true );
-    }
-
-    private function execSql( $sql ){
-            if(!$this->con)     $this->open( $this->config );
+            return $this->execSql( 'INSERT INTO '.(Config::get($uri['concept'],'PostgreSQL.concept')).' '.self::parseInsertData( $data , $uri['concept'] ), true );
+    }
+
+    public function execSql( $sql, $unique = false )
+    {
+            if(!$this->con) $this->open( $this->config );
 
             $rs = pg_query( $this->con, $sql );
 
-            if ( !$rs ){
-                    $this->error = pg_last_error ( $this->con );
-                    return false;
-            }
-
-            return $rs;
-    }
-        
+            if( is_bool( $rs ) )
+            {
+                if ( !$rs )
+                  $this->error = pg_last_error ( $this->con );
+
+                return( $rs );
+            }
+
+            if( pg_num_rows( $rs ) <= 0 )
+                return array();
+
+            $return = array();
+
+            while( $row = pg_fetch_assoc( $rs ) )
+                $return[] = $row;
+
+            return( $unique ? $return[0] : $return );
+    }
+
+    //@DEPRECATED
     public function execResultSql( $sql, $unique = false ){
-            $rs = $this->execSql( $sql );
-
-            if( $rs && $rs > 0 )
-                return self::parseSelectResult( $rs , $unique );
-
-            return $rs;
+            return $this->execSql( $sql, $unique );
     }
 
@@ -146 +157 @@
             }
             
-            return '('.implode(',', $ind).') VALUES ('.implode(',', $val).') RETURNING id';
+            return '('.implode(',', $ind).') VALUES ('.implode(',', $val).') RETURNING '.$map['id'].' as id';
     }
         
@@ -161 +172 @@
             return 'SET '.implode(',', $d);
     }
-        
-    private static function parseSelectResult( $result , $unique = false){
-            
-            $return = array();
-            
-            if  (!$result) return false;
-            if (pg_num_rows($result) === 0) return $return;
-            else
-              while( $row = pg_fetch_assoc( $result ))
-                      $return[] = $row; 
-            
-            if($unique === true) return $return[0];
-            
-            return $return;
-    }
-        
+
     private static function parseCriteria( $criteria  , &$map , $query = '' ){