Changeset 4688

Timestamp:

07/08/11 18:21:21 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #2083 - Melhorias no leitor de RSS do expressoMail

Location:

branches/2.2/expressoMail1_2

Files:

• inc/class.rss.inc.php (modified) (2 diffs)
• js/draw_api.js (modified) (1 diff)
• setup/setup.inc.php (modified) (1 diff)
• setup/tables_current.inc.php (modified) (1 diff)

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

@@ -33 +33 @@
                 exit;
         }
-        function getChannels(){
+
+        private function createTableRSS()
+        {
+                $query = 'CREATE TABLE phpgw_userrss( uid INT NOT NULL,rss_url VARCHAR(1000),name varchar(50), PRIMARY KEY (uid,rss_url) );';
+                
+                $GLOBALS['phpgw']->db->query($query);
+                
+                if ( $GLOBALS['phpgw']->db->Error )
+                        return false;
+                else
+                        return true;
+        }
+        
+        function getChannels()
+        {
                 include('../header.inc.php');
-                $GLOBALS['phpgw']->db->query('SELECT rss_url,name FROM phpgw_userrss WHERE uid = '.$_SESSION['phpgw_session']['account_id']);
-                while($GLOBALS['phpgw']->db->next_record())
-                        $return[]=$GLOBALS['phpgw']->db->row();
-                return $return;
+                
+                $flag           = false;
+                $tableQuery = "select relname from pg_stat_user_tables order by relname;";
+                
+                if( $GLOBALS['phpgw']->db->query( $tableQuery ) )
+                {
+                        while( $GLOBALS['phpgw']->db->next_record() )
+                        {
+                                $tables[] = $GLOBALS['phpgw']->db->row();
+                        }
+                        
+                        foreach( $tables as $tableName )
+                        {
+                                if( strtolower( $tableName['relname'] ) === 'phpgw_userrss' )
+                                {
+                                        $flag = true;
+                                }
+                        }
+                }
+                
+                if( !$flag )
+                {
+                        $flag = $this->createTableRSS();
+                }
+                
+                $query = 'SELECT rss_url,name FROM phpgw_userrss WHERE uid = '.$_SESSION['phpgw_session']['account_id'];                
+                
+                if( $GLOBALS['phpgw']->db->query($query) ) 
+                {
+                        while( $GLOBALS['phpgw']->db->next_record() )
+                        {
+                                $return[] = $GLOBALS['phpgw']->db->row();
+                        }
+                }
+
+                if( count($return) > 0 )
+                        return $return;
+                else
+                        return "";
         }
-        function addChannel($param){
+        
+        function addChannel($param)
+        {
                 include('../header.inc.php');
                 $name = $GLOBALS['phpgw']->db->db_addslashes(htmlentities($param['name']));
@@ -52 +103 @@
         }
 
-        function removeChannel($param){
+        function removeChannel($param)
+        {
                 include('../header.inc.php');
                 $url = $GLOBALS['phpgw']->db->db_addslashes($param['url']);

branches/2.2/expressoMail1_2/js/draw_api.js

@@ -162 +162 @@
                 {
 
-                    if (data == null || typeof(data) == 'string')
+                        if ( data == null || typeof(data) == 'string')
                     {    
-                            return;
+                                return false;
                     }
 

branches/2.2/expressoMail1_2/setup/setup.inc.php

@@ -16 +16 @@
         $setup_info['expressoMail1_2']['tables'][]              = 'phpgw_expressomail_contacts';
     $setup_info['expressoMail1_2']['tables'][]          = 'phpgw_certificados';
+    $setup_info['expressoMail1_2']['tables'][]          = 'phpgw_userrss';
         $setup_info['expressoMail1_2']['enable']        = 1;
 

branches/2.2/expressoMail1_2/setup/tables_current.inc.php

@@ -33 +33 @@
             'ix' => array(),
             'uc' => array()
+                ),
+                'phpgw_userrss' => array(
+                        'fd' => array(
+                                'uid'           => array('type' => 'int', 'nullable' => false  ),
+                                'rss_url'       => array('type' => 'varchar', 'precision' => 1000 ),
+                                'name'          => array('type' => 'varchar', 'precision' => 50)
+                        ),
+                        'pk' => array('uid','rss_url'),
+                        'fk' => array(),
+            'ix' => array(),
+            'uc' => array()
                 )
         );