[21024] Improvement: fetchmode assoc 4686:4746

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

Modified Paths:
--------------
    people/sigurdne/modules/setup/trunk/index.php

Modified: people/sigurdne/modules/setup/trunk/index.php
===================================================================
--- people/sigurdne/modules/setup/trunk/index.php	2010-02-07 10:44:40 UTC (rev 21023)
+++ people/sigurdne/modules/setup/trunk/index.php	2010-02-07 10:44:53 UTC (rev 21024)
@@ -336,11 +336,11 @@
 			);
 			$GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='auth_type'");
 			$GLOBALS['phpgw_setup']->db->next_record();
-			if ($GLOBALS['phpgw_setup']->db->f(0) == 'ldap')
+			if ($GLOBALS['phpgw_setup']->db->f('config_value') == 'ldap')
 			{
 				$GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='ldap_host'");
 				$GLOBALS['phpgw_setup']->db->next_record();
-				if ($GLOBALS['phpgw_setup']->db->f(0) != '')
+				if ($GLOBALS['phpgw_setup']->db->f('config_value') != '')
 				{
 					$btn_config_ldap = $GLOBALS['phpgw_setup']->html->make_frm_btn_simple(
 						lang('LDAP account import/export'),
@@ -355,7 +355,7 @@
 				}
 				$GLOBALS['phpgw_setup']->db->query("select config_value FROM phpgw_config WHERE config_name='webserver_url'");
 				$GLOBALS['phpgw_setup']->db->next_record();
-				if ($GLOBALS['phpgw_setup']->db->f(0))
+				if ($GLOBALS['phpgw_setup']->db->f('config_value'))
 				{
 					/* NOTE: we assume here ldap doesn't delete accounts */
 					$link_make_accts = $GLOBALS['phpgw_setup']->html->make_href_link_simple(
@@ -376,13 +376,13 @@
 				/* detect whether anything will be deleted before alerting */
 				$phpgw_setup->db->query("SELECT config_value FROM phpgw_config WHERE config_name = 'account_repository'");
 				$phpgw_setup->db->next_record();
-				$account_repository = $phpgw_setup->db->f(0);
+				$account_repository = $phpgw_setup->db->f('config_value');
 				$account_creation_notice = lang('and optional demo accounts.');
 				if ($account_repository == 'sql')
 				{
-					$phpgw_setup->db->query("select count(*) from phpgw_accounts");
+					$phpgw_setup->db->query("select count(*) as cnt from phpgw_accounts");
 					$phpgw_setup->db->next_record();
-					$number_of_accounts = (int) $phpgw_setup->db->f(0);
+					$number_of_accounts = (int) $phpgw_setup->db->f('cnt');
 					if ($number_of_accounts>0)
 					{
 						$account_creation_notice .= lang('<br /><b>This will delete all existing accounts.</b>');