[Phpgroupware-cvs] [21021] Improvement: fetchmode assoc 4686:4746

[Sigurd Nes]

Revision: 21021
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=21021
Author:   sigurdne
Date:     2010-02-07 10:43:41 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
Improvement: fetchmode assoc 4686:4746

Modified Paths:
--------------
    people/sigurdne/modules/calendar/trunk/inc/class.calendar_holiday.inc.php
    people/sigurdne/modules/calendar/trunk/inc/class.socalendar.inc.php
    people/sigurdne/modules/calendar/trunk/inc/class.socalendar_sql.inc.php
    people/sigurdne/modules/calendar/trunk/inc/class.soholiday.inc.php
    people/sigurdne/modules/calendar/trunk/setup/tables_update.inc.php

Modified: 
people/sigurdne/modules/calendar/trunk/inc/class.calendar_holiday.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.calendar_holiday.inc.php   
2010-02-07 10:42:49 UTC (rev 21020)
+++ people/sigurdne/modules/calendar/trunk/inc/class.calendar_holiday.inc.php   
2010-02-07 10:43:41 UTC (rev 21021)
@@ -61,10 +61,10 @@
 
        function is_network_load_needed($locale)
        {
-               $sql = "SELECT count(*) FROM phpgw_cal_holidays WHERE 
locale='".$locale."'";
+               $sql = "SELECT count(*) as cnt FROM phpgw_cal_holidays WHERE 
locale='".$locale."'";
                $this->db->query($sql,__LINE__,__FILE__);
                $this->db->next_record();
-               $rows = $this->db->f(0);
+               $rows = $this->db->f('cnt');
                if($rows==0)
                {
                        $this->load_from_network($locale);

Modified: people/sigurdne/modules/calendar/trunk/inc/class.socalendar.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.socalendar.inc.php 
2010-02-07 10:42:49 UTC (rev 21020)
+++ people/sigurdne/modules/calendar/trunk/inc/class.socalendar.inc.php 
2010-02-07 10:43:41 UTC (rev 21021)
@@ -276,9 +276,9 @@
                                while($this->cal->stream->next_record())
                                {
                                        $id = $this->cal->stream->f('cal_id');
-                                       $db2->query('SELECT count(*) FROM 
phpgw_cal_user WHERE cal_id='.$id.' AND 
cal_login='.$new_owner,__LINE__,__FILE__);
+                                       $db2->query('SELECT count(*) as cnt 
FROM phpgw_cal_user WHERE cal_id='.$id.' AND 
cal_login='.$new_owner,__LINE__,__FILE__);
                                        $db2->next_record();
-                                       if($db2->f(0) == 0)
+                                       if($db2->f('cnt') == 0)
                                        {
                                                $db2->query('UPDATE 
phpgw_cal_user SET cal_login='.$new_owner.' WHERE cal_id='.$id.' AND 
cal_login='.$account_id,__LINE__,__FILE__);
                                        }

Modified: 
people/sigurdne/modules/calendar/trunk/inc/class.socalendar_sql.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.socalendar_sql.inc.php     
2010-02-07 10:42:49 UTC (rev 21020)
+++ people/sigurdne/modules/calendar/trunk/inc/class.socalendar_sql.inc.php     
2010-02-07 10:43:41 UTC (rev 21021)
@@ -726,9 +726,9 @@
                                $end = 0;
                        }
 
-                       $this->stream->query('SELECT count(cal_id) FROM 
phpgw_cal_repeats WHERE cal_id='.$event['id'],__LINE__,__FILE__);
+                       $this->stream->query('SELECT count(cal_id) as cnt FROM 
phpgw_cal_repeats WHERE cal_id='.$event['id'],__LINE__,__FILE__);
                        $this->stream->next_record();
-                       $num_rows = $this->stream->f(0);
+                       $num_rows = $this->stream->f('cnt');
                        if($num_rows == 0)
                        {
                                $this->stream->query('INSERT INTO 
phpgw_cal_repeats(cal_id,recur_type,recur_enddate,recur_data,recur_interval) '

Modified: people/sigurdne/modules/calendar/trunk/inc/class.soholiday.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/inc/class.soholiday.inc.php  
2010-02-07 10:42:49 UTC (rev 21020)
+++ people/sigurdne/modules/calendar/trunk/inc/class.soholiday.inc.php  
2010-02-07 10:43:41 UTC (rev 21021)
@@ -177,7 +177,7 @@
                        {
                                $querymethod .= " AND (occurence < 1900 OR 
occurence = $year)";
                        }
-                       $sql = "SELECT count(*) FROM phpgw_cal_holidays WHERE 
locale='".$locale."'".$querymethod;
+                       $sql = "SELECT count(*) as cnt FROM phpgw_cal_holidays 
WHERE locale='".$locale."'".$querymethod;
 
                        if($this->debug)
                        {
@@ -186,7 +186,7 @@
                        
                        $this->db->query($sql,__LINE__,__FILE__);
                        $this->db->next_record();
-                       $retval = intval($this->db->f(0));
+                       $retval = intval($this->db->f('cnt'));
                        if($this->debug)
                        {
                                echo 'Total Holidays for : '.$locale.' : 
'.$retval."<br />\n";

Modified: people/sigurdne/modules/calendar/trunk/setup/tables_update.inc.php
===================================================================
--- people/sigurdne/modules/calendar/trunk/setup/tables_update.inc.php  
2010-02-07 10:42:49 UTC (rev 21020)
+++ people/sigurdne/modules/calendar/trunk/setup/tables_update.inc.php  
2010-02-07 10:43:41 UTC (rev 21021)
@@ -208,9 +208,9 @@
                        )
                );
        
-               $GLOBALS['phpgw_setup']->oProc->query('SELECT count(*) FROM 
webcal_entry',__LINE__,__FILE__);
+               $GLOBALS['phpgw_setup']->oProc->query('SELECT count(*) as cnt 
FROM webcal_entry',__LINE__,__FILE__);
                $GLOBALS['phpgw_setup']->oProc->next_record();
-               if($GLOBALS['phpgw_setup']->oProc->f(0))
+               if($GLOBALS['phpgw_setup']->oProc->f('cnt'))
                {
                        $GLOBALS['phpgw_setup']->oProc->query('SELECT 
cal_id,cal_owner,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description,cal_id,cal_date,cal_time,cal_mod_date,cal_mod_time
 FROM webcal_entry ORDER BY cal_id',__LINE__,__FILE__);
                        while($GLOBALS['phpgw_setup']->oProc->next_record())
@@ -250,9 +250,9 @@
                        )
                );
        
-               $GLOBALS['phpgw_setup']->oProc->query('SELECT count(*) FROM 
webcal_entry_user',__LINE__,__FILE__);
+               $GLOBALS['phpgw_setup']->oProc->query('SELECT count(*) as cnt 
FROM webcal_entry_user',__LINE__,__FILE__);
                $GLOBALS['phpgw_setup']->oProc->next_record();
-               if($GLOBALS['phpgw_setup']->oProc->f(0))
+               if($GLOBALS['phpgw_setup']->oProc->f('cnt'))
                {
                        $GLOBALS['phpgw_setup']->oProc->query('SELECT 
cal_id,cal_login,cal_status FROM webcal_entry_user ORDER BY 
cal_id',__LINE__,__FILE__);
                        while($GLOBALS['phpgw_setup']->oProc->next_record())
@@ -283,9 +283,9 @@
                        )
                );
        
-               $GLOBALS['phpgw_setup']->oProc->query('SELECT count(*) FROM 
webcal_entry_repeats',__LINE__,__FILE__);
+               $GLOBALS['phpgw_setup']->oProc->query('SELECT count(*) as cnt 
FROM webcal_entry_repeats',__LINE__,__FILE__);
                $GLOBALS['phpgw_setup']->oProc->next_record();
-               if($GLOBALS['phpgw_setup']->oProc->f(0))
+               if($GLOBALS['phpgw_setup']->oProc->f('cnt'))
                {
                        $GLOBALS['phpgw_setup']->oProc->query('SELECT 
cal_id,cal_type,cal_end,cal_frequency,cal_days FROM webcal_entry_repeats ORDER 
BY cal_id',__LINE__,__FILE__);
                        while($GLOBALS['phpgw_setup']->oProc->next_record())