From fcbae4b4f8b875a8f364fcad8dd87f0713021b7e Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Mon, 11 Jun 2001 01:49:16 +0000
Subject: [PATCH] Now using only db wrappers in schema_proc

---
 phpgwapi/setup/tables_update.inc.php | 664 ++++++++++++++-------------
 1 file changed, 334 insertions(+), 330 deletions(-)

diff --git a/phpgwapi/setup/tables_update.inc.php b/phpgwapi/setup/tables_update.inc.php
index 085e9f4dfb..9af2951c96 100644
--- a/phpgwapi/setup/tables_update.inc.php
+++ b/phpgwapi/setup/tables_update.inc.php
@@ -19,15 +19,15 @@
 		$oProc = $phpgw_setup->oProc;
 		$oProc->AlterColumn("access_log", "lo", array("type" => "varchar", "precision" => 255));
 
-		$oProc->m_odb->query("update lang set lang='da' where lang='dk'");
-		$oProc->m_odb->query("update lang set lang='ko' where lang='kr'");
+		$oProc->query("update lang set lang='da' where lang='dk'");
+		$oProc->query("update lang set lang='ko' where lang='kr'");
 
-		$oProc->m_odb->query("update preferences set preference_name='da' where preference_name='dk'");
-		$oProc->m_odb->query("update preferences set preference_name='ko' where preference_name='kr'");
+		$oProc->query("update preferences set preference_name='da' where preference_name='dk'");
+		$oProc->query("update preferences set preference_name='ko' where preference_name='kr'");
 
 	  	//install weather support
-		$oProc->m_odb->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('weather', 'Weather', 1, 12, NULL, '".$phpgw_info["server"]["version"]."')");
-		$oProc->m_odb->query("INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'weather','Weather','en','weather')");
+		$oProc->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('weather', 'Weather', 1, 12, NULL, '".$phpgw_info["server"]["version"]."')");
+		$oProc->query("INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'weather','Weather','en','weather')");
 
 		$setup_info['phpgwapi']['currentver'] = '0.9.2';
 		return $setup_info['phpgwapi']['currentver'];
@@ -39,15 +39,17 @@
 		global $phpgw_setup;
 
 		$oProc = $phpgw_setup->oProc;
-		$oProc->m_odb->query("select distinct($field) from $table");
-		if ($oProc->m_odb->num_rows()) {
-			while ($oProc->m_odb->next_record()) {
-				$owner[count($owner)] = $phpgw_setup->db->f($field);
+		$oProc->query("select distinct($field) from $table");
+		if ($oProc->num_rows()) {
+			while ($oProc->next_record())
+			{
+				$owner[count($owner)] = $oProc->f($field);
 			}
-			for($i=0;$i<count($owner);$i++) {
-				$oProc->m_odb->query("select account_id from accounts where account_lid='".$owner[$i]."'");
-				$oProc->m_odb->next_record();
-				$oProc->m_odb->query("update $table set $field=".$oProc->m_odb->f("account_id")." where $field='".$owner[$i]."'");
+			for($i=0;$i<count($owner);$i++)
+			{
+				$oProc->query("select account_id from accounts where account_lid='".$owner[$i]."'");
+				$oProc->next_record();
+				$oProc->query("update $table set $field=".$oProc->f("account_id")." where $field='".$owner[$i]."'");
 			}
 		}
 
@@ -110,7 +112,7 @@
 		global $setup_info, $phpgw_setup;
 
 		$oProc = $phpgw_setup->oProc;
-		$oProc->m_odb->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('transy', 'Translation Management', 0, 13, NULL, '".$setup_info['phpgwapi']['version']."')");
+		$oProc->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('transy', 'Translation Management', 0, 13, NULL, '".$setup_info['phpgwapi']['version']."')");
 
 		$setup_info['phpgwapi']['currentver'] = '0.9.3pre7';
 		return $setup_info['phpgwapi']['currentver'];
@@ -136,142 +138,142 @@
 			)
 		);
 
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('AA','Afar','No')");        
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('AB','Abkhazian','No')");   
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('AF','Afrikaans','No')");   
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('AM','Amharic','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('AR','Arabic','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('AS','Assamese','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('AY','Aymara','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('AZ','Azerbaijani','No')"); 
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('BA','Bashkir','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('BE','Byelorussian','No')");        
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('BG','Bulgarian','No')");   
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('BH','Bihari','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('BI','Bislama','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('BN','Bengali / Bangla','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('BO','Tibetan','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('BR','Breton','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('CA','Catalan','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('CO','Corsican','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('CS','Czech','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('CY','Welsh','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('DA','Danish','Yes')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('DE','German','Yes')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('DZ','Bhutani','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('EL','Greek','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('EN','English / American','Yes')"); 
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('EO','Esperanto','No')");   
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ES','Spanish','Yes')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ET','Estonian','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('EU','Basque','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('FA','Persian','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('FI','Finnish','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('FJ','Fiji','No')");        
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('FO','Faeroese','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('FR','French','Yes')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('FY','Frisian','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('GA','Irish','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('GD','Gaelic / Scots Gaelic','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('GL','Galician','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('GN','Guarani','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('GU','Gujarati','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('HA','Hausa','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('HI','Hindi','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('HR','Croatian','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('HU','Hungarian','No')");   
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('HY','Armenian','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('IA','Interlingua','No')"); 
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('IE','Interlingue','No')"); 
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('IK','Inupiak','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('IN','Indonesian','No')");  
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('IS','Icelandic','No')");   
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('IT','Italian','Yes')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('IW','Hebrew','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('JA','Japanese','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('JI','Yiddish','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('JW','Javanese','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('KA','Georgian','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('KK','Kazakh','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('KL','Greenlandic','No')"); 
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('KM','Cambodian','No')");   
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('KN','Kannada','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('KO','Korean','Yes')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('KS','Kashmiri','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('KU','Kurdish','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('KY','Kirghiz','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('LA','Latin','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('LN','Lingala','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('LO','Laothian','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('LT','Lithuanian','No')");  
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('LV','Latvian / Lettish','No')");   
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('MG','Malagasy','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('MI','Maori','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('MK','Macedonian','No')");  
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ML','Malayalam','No')");   
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('MN','Mongolian','No')");   
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('MO','Moldavian','No')");   
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('MR','Marathi','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('MS','Malay','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('MT','Maltese','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('MY','Burmese','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('NA','Nauru','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('NE','Nepali','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('NL','Dutch','Yes')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('NO','Norwegian','Yes')");  
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('OC','Occitan','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('OM','Oromo / Afan','No')");        
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('OR','Oriya','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('PA','Punjabi','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('PL','Polish','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('PS','Pashto / Pushto','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('PT','Portuguese','Yes')"); 
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('QU','Quechua','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('RM','Rhaeto-Romance','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('RN','Kirundi','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('RO','Romanian','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('RU','Russian','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('RW','Kinyarwanda','No')"); 
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('SA','Sanskrit','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('SD','Sindhi','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('SG','Sangro','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('SH','Serbo-Croatian','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('SI','Singhalese','No')");  
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('SK','Slovak','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('SL','Slovenian','No')");   
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('SM','Samoan','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('SN','Shona','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('SO','Somali','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('SQ','Albanian','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('SR','Serbian','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('SS','Siswati','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ST','Sesotho','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('SU','Sudanese','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('SV','Swedish','Yes')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('SW','Swahili','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('TA','Tamil','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('TE','Tegulu','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('TG','Tajik','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('TH','Thai','No')");        
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('TI','Tigrinya','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('TK','Turkmen','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('TL','Tagalog','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('TN','Setswana','No')");    
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('TO','Tonga','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('TR','Turkish','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('TS','Tsonga','No')");      
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('TT','Tatar','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('TW','Twi','No')"); 
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('UK','Ukrainian','No')");   
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('UR','Urdu','No')");        
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('UZ','Uzbek','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('VI','Vietnamese','No')");  
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('VO','Volapuk','No')");     
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('WO','Wolof','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('XH','Xhosa','No')");       
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('YO','Yoruba','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ZH','Chinese','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ZU','Zulu','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('AA','Afar','No')");        
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('AB','Abkhazian','No')");   
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('AF','Afrikaans','No')");   
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('AM','Amharic','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('AR','Arabic','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('AS','Assamese','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('AY','Aymara','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('AZ','Azerbaijani','No')"); 
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('BA','Bashkir','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('BE','Byelorussian','No')");        
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('BG','Bulgarian','No')");   
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('BH','Bihari','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('BI','Bislama','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('BN','Bengali / Bangla','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('BO','Tibetan','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('BR','Breton','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('CA','Catalan','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('CO','Corsican','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('CS','Czech','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('CY','Welsh','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('DA','Danish','Yes')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('DE','German','Yes')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('DZ','Bhutani','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('EL','Greek','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('EN','English / American','Yes')"); 
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('EO','Esperanto','No')");   
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ES','Spanish','Yes')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ET','Estonian','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('EU','Basque','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('FA','Persian','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('FI','Finnish','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('FJ','Fiji','No')");        
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('FO','Faeroese','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('FR','French','Yes')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('FY','Frisian','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('GA','Irish','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('GD','Gaelic / Scots Gaelic','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('GL','Galician','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('GN','Guarani','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('GU','Gujarati','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('HA','Hausa','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('HI','Hindi','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('HR','Croatian','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('HU','Hungarian','No')");   
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('HY','Armenian','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('IA','Interlingua','No')"); 
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('IE','Interlingue','No')"); 
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('IK','Inupiak','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('IN','Indonesian','No')");  
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('IS','Icelandic','No')");   
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('IT','Italian','Yes')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('IW','Hebrew','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('JA','Japanese','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('JI','Yiddish','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('JW','Javanese','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('KA','Georgian','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('KK','Kazakh','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('KL','Greenlandic','No')"); 
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('KM','Cambodian','No')");   
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('KN','Kannada','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('KO','Korean','Yes')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('KS','Kashmiri','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('KU','Kurdish','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('KY','Kirghiz','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('LA','Latin','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('LN','Lingala','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('LO','Laothian','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('LT','Lithuanian','No')");  
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('LV','Latvian / Lettish','No')");   
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('MG','Malagasy','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('MI','Maori','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('MK','Macedonian','No')");  
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ML','Malayalam','No')");   
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('MN','Mongolian','No')");   
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('MO','Moldavian','No')");   
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('MR','Marathi','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('MS','Malay','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('MT','Maltese','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('MY','Burmese','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('NA','Nauru','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('NE','Nepali','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('NL','Dutch','Yes')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('NO','Norwegian','Yes')");  
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('OC','Occitan','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('OM','Oromo / Afan','No')");        
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('OR','Oriya','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('PA','Punjabi','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('PL','Polish','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('PS','Pashto / Pushto','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('PT','Portuguese','Yes')"); 
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('QU','Quechua','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('RM','Rhaeto-Romance','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('RN','Kirundi','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('RO','Romanian','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('RU','Russian','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('RW','Kinyarwanda','No')"); 
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('SA','Sanskrit','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('SD','Sindhi','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('SG','Sangro','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('SH','Serbo-Croatian','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('SI','Singhalese','No')");  
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('SK','Slovak','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('SL','Slovenian','No')");   
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('SM','Samoan','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('SN','Shona','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('SO','Somali','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('SQ','Albanian','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('SR','Serbian','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('SS','Siswati','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ST','Sesotho','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('SU','Sudanese','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('SV','Swedish','Yes')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('SW','Swahili','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('TA','Tamil','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('TE','Tegulu','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('TG','Tajik','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('TH','Thai','No')");        
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('TI','Tigrinya','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('TK','Turkmen','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('TL','Tagalog','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('TN','Setswana','No')");    
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('TO','Tonga','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('TR','Turkish','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('TS','Tsonga','No')");      
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('TT','Tatar','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('TW','Twi','No')"); 
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('UK','Ukrainian','No')");   
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('UR','Urdu','No')");        
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('UZ','Uzbek','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('VI','Vietnamese','No')");  
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('VO','Volapuk','No')");     
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('WO','Wolof','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('XH','Xhosa','No')");       
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('YO','Yoruba','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ZH','Chinese','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ZU','Zulu','No')");
 
 		$setup_info['phpgwapi']['currentver'] = '0.9.3pre8';
 		return $setup_info['phpgwapi']['currentver'];
@@ -315,143 +317,143 @@
 		global $setup_info, $phpgw_setup;
 
 		$oProc = $phpgw_setup->oProc;
-		$oProc->m_odb->query("delete from languages");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('aa','Afar','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ab','Abkhazian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('af','Afrikaans','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('am','Amharic','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ar','Arabic','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('as','Assamese','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ay','Aymara','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('az','Azerbaijani','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ba','Bashkir','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('be','Byelorussian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('bg','Bulgarian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('bh','Bihari','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('bi','Bislama','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('bn','Bengali / Bangla','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('bo','Tibetan','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('br','Breton','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ca','Catalan','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('co','Corsican','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('cs','Czech','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('cy','Welsh','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('da','Danish','Yes')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('de','German','Yes')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('dz','Bhutani','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('el','Greek','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('en','English / American','Yes')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('eo','Esperanto','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('es','Spanish','Yes')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('et','Estonian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('eu','Basque','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('fa','Persian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('fi','Finnish','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('fj','Fiji','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('fo','Faeroese','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('fr','French','Yes')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('fy','Frisian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ga','Irish','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('gd','Gaelic / Scots Gaelic','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('gl','Galician','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('gn','Guarani','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('gu','Gujarati','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ha','Hausa','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('hi','Hindi','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('hr','Croatian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('hu','Hungarian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('hy','Armenian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ia','Interlingua','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ie','Interlingue','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ik','Inupiak','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('in','Indonesian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('is','Icelandic','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('it','Italian','Yes')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('iw','Hebrew','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ja','Japanese','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ji','Yiddish','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('jw','Javanese','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ka','Georgian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('kk','Kazakh','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('kl','Greenlandic','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('km','Cambodian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('kn','Kannada','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ko','Korean','Yes')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ks','Kashmiri','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ku','Kurdish','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ky','Kirghiz','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('la','Latin','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ln','Lingala','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('lo','Laothian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('lt','Lithuanian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('lv','Latvian / Lettish','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('mg','Malagasy','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('mi','Maori','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('mk','Macedonian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ml','Malayalam','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('mn','Mongolian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('mo','Moldavian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('mr','Marathi','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ms','Malay','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('mt','Maltese','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('my','Burmese','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('na','Nauru','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ne','Nepali','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('nl','Dutch','Yes')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('no','Norwegian','Yes')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('oc','Occitan','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('om','Oromo / Afan','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('or','Oriya','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('pa','Punjabi','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('pl','Polish','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ps','Pashto / Pushto','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('pt','Portuguese','Yes')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('qu','Quechua','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('rm','Rhaeto-Romance','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('rn','Kirundi','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ro','Romanian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ru','Russian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('rw','Kinyarwanda','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('sa','Sanskrit','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('sd','Sindhi','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('sg','Sangro','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('sh','Serbo-Croatian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('si','Singhalese','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('sk','Slovak','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('sl','Slovenian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('sm','Samoan','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('sn','Shona','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('so','Somali','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('sq','Albanian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('sr','Serbian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ss','Siswati','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('st','Sesotho','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('su','Sudanese','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('sv','Swedish','Yes')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('sw','Swahili','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ta','Tamil','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('te','Tegulu','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('tg','Tajik','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('th','Thai','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ti','Tigrinya','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('tk','Turkmen','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('tl','Tagalog','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('tn','Setswana','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('to','Tonga','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('tr','Turkish','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ts','Tsonga','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('tt','Tatar','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('tw','Twi','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('uk','Ukrainian','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('ur','Urdu','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('uz','Uzbek','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('vi','Vietnamese','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('vo','Volapuk','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('wo','Wolof','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('xh','Xhosa','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('yo','Yoruba','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('zh','Chinese','No')");
-		@$oProc->m_odb->query("INSERT INTO languages (lang_id, lang_name, available) values ('zu','Zulu','No')");
+		$oProc->query("delete from languages");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('aa','Afar','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ab','Abkhazian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('af','Afrikaans','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('am','Amharic','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ar','Arabic','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('as','Assamese','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ay','Aymara','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('az','Azerbaijani','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ba','Bashkir','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('be','Byelorussian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('bg','Bulgarian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('bh','Bihari','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('bi','Bislama','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('bn','Bengali / Bangla','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('bo','Tibetan','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('br','Breton','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ca','Catalan','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('co','Corsican','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('cs','Czech','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('cy','Welsh','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('da','Danish','Yes')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('de','German','Yes')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('dz','Bhutani','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('el','Greek','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('en','English / American','Yes')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('eo','Esperanto','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('es','Spanish','Yes')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('et','Estonian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('eu','Basque','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('fa','Persian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('fi','Finnish','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('fj','Fiji','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('fo','Faeroese','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('fr','French','Yes')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('fy','Frisian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ga','Irish','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('gd','Gaelic / Scots Gaelic','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('gl','Galician','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('gn','Guarani','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('gu','Gujarati','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ha','Hausa','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('hi','Hindi','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('hr','Croatian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('hu','Hungarian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('hy','Armenian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ia','Interlingua','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ie','Interlingue','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ik','Inupiak','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('in','Indonesian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('is','Icelandic','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('it','Italian','Yes')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('iw','Hebrew','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ja','Japanese','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ji','Yiddish','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('jw','Javanese','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ka','Georgian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('kk','Kazakh','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('kl','Greenlandic','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('km','Cambodian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('kn','Kannada','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ko','Korean','Yes')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ks','Kashmiri','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ku','Kurdish','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ky','Kirghiz','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('la','Latin','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ln','Lingala','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('lo','Laothian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('lt','Lithuanian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('lv','Latvian / Lettish','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('mg','Malagasy','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('mi','Maori','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('mk','Macedonian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ml','Malayalam','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('mn','Mongolian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('mo','Moldavian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('mr','Marathi','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ms','Malay','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('mt','Maltese','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('my','Burmese','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('na','Nauru','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ne','Nepali','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('nl','Dutch','Yes')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('no','Norwegian','Yes')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('oc','Occitan','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('om','Oromo / Afan','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('or','Oriya','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('pa','Punjabi','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('pl','Polish','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ps','Pashto / Pushto','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('pt','Portuguese','Yes')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('qu','Quechua','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('rm','Rhaeto-Romance','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('rn','Kirundi','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ro','Romanian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ru','Russian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('rw','Kinyarwanda','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('sa','Sanskrit','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('sd','Sindhi','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('sg','Sangro','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('sh','Serbo-Croatian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('si','Singhalese','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('sk','Slovak','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('sl','Slovenian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('sm','Samoan','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('sn','Shona','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('so','Somali','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('sq','Albanian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('sr','Serbian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ss','Siswati','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('st','Sesotho','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('su','Sudanese','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('sv','Swedish','Yes')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('sw','Swahili','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ta','Tamil','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('te','Tegulu','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('tg','Tajik','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('th','Thai','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ti','Tigrinya','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('tk','Turkmen','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('tl','Tagalog','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('tn','Setswana','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('to','Tonga','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('tr','Turkish','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ts','Tsonga','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('tt','Tatar','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('tw','Twi','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('uk','Ukrainian','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('ur','Urdu','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('uz','Uzbek','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('vi','Vietnamese','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('vo','Volapuk','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('wo','Wolof','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('xh','Xhosa','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('yo','Yoruba','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('zh','Chinese','No')");
+		@$oProc->query("INSERT INTO languages (lang_id, lang_name, available) values ('zu','Zulu','No')");
 
 		$setup_info['phpgwapi']['currentver'] = '0.9.5pre1';
 		return $setup_info['phpgwapi']['currentver'];
@@ -588,11 +590,11 @@
 		global $setup_info, $phpgw_setup;
 
 		$oProc = $phpgw_setup->oProc;
-		$oProc->m_odb->query("select * from preferences order by preference_owner");
+		$oProc->query("select * from preferences order by preference_owner");
 		$t = array();
-		while ($oProc->m_odb->next_record())
+		while ($oProc->next_record())
 		{
-			$t[$oProc->m_odb->f("preference_owner")][$phpgw_setup->db->f("preference_appname")][$phpgw_setup->db->f("preference_var")] = $phpgw_setup->db->f("preference_value");
+			$t[$oProc->f("preference_owner")][$oProc->f("preference_appname")][$oProc->f("preference_var")] = $oProc->f("preference_value");
 		}
 
 		$oProc->DropTable("preferences");
@@ -609,7 +611,7 @@
 
 		while ($tt = each($t))
 		{
-			$oProc->m_odb->query("insert into preferences values ('$tt[0]','" . serialize($tt[1]) . "')");
+			$oProc->query("insert into preferences values ('$tt[0]','" . serialize($tt[1]) . "')");
 		}
 
 		$setup_info['phpgwapi']['currentver'] = '0.9.8pre2';
@@ -727,45 +729,47 @@
 	function phpgwapi_upgrade0_9_9()
 	{
 		global $setup_info, $phpgw_setup;
-		$db2 = $phpgw_setup->db;
+
+		$oProc = $phpgw_setup->oProc;
+		$db2 = $oProc;
 		//convert user settings
-		$phpgw_setup->db->query("select account_id, account_permissions from accounts",__LINE__,__FILE__);
-		if($phpgw_setup->db->num_rows())
+		$oProc->query("select account_id, account_permissions from accounts",__LINE__,__FILE__);
+		if($oProc->num_rows())
 		{
-			while($phpgw_setup->db->next_record())
+			while($oProc->next_record())
 			{
-				$apps_perms = explode(":",$phpgw_setup->db->f("account_permissions"));
+				$apps_perms = explode(":",$oProc->f("account_permissions"));
 				for($i=1;$i<count($apps_perms)-1;$i++)
 				{
 					if ($apps_perms[$i] != "")
 					{
 						$sql = "insert into phpgw_acl (acl_appname, acl_location, acl_account, acl_account_type, acl_rights)";
-						$sql .= " values('".$apps_perms[$i]."', 'run', ".$phpgw_setup->db->f("account_id").", 'u', 1)";
+						$sql .= " values('".$apps_perms[$i]."', 'run', ".$oProc->f("account_id").", 'u', 1)";
 						$db2->query($sql ,__LINE__,__FILE__);
 					}
 				}
 			}
 		}
-		$phpgw_setup->db->query("update accounts set account_permissions = ''",__LINE__,__FILE__);
+		$oProc->query("update accounts set account_permissions = ''",__LINE__,__FILE__);
 		//convert group settings
-		$phpgw_setup->db->query("select group_id, group_apps from groups",__LINE__,__FILE__);
-		if($phpgw_setup->db->num_rows())
+		$oProc->query("select group_id, group_apps from groups",__LINE__,__FILE__);
+		if($oProc->num_rows())
 		{
-			while($phpgw_setup->db->next_record())
+			while($oProc->next_record())
 			{
-				$apps_perms = explode(":",$phpgw_setup->db->f("group_apps"));
+				$apps_perms = explode(":",$oProc->f("group_apps"));
 				for($i=1;$i<count($apps_perms)-1;$i++)
 				{
 					if ($apps_perms[$i] != "")
 					{
 						$sql = "insert into phpgw_acl (acl_appname, acl_location, acl_account, acl_account_type, acl_rights)";
-						$sql .= " values('".$apps_perms[$i]."', 'run', ".$phpgw_setup->db->f("group_id").", 'g', 1)";
+						$sql .= " values('".$apps_perms[$i]."', 'run', ".$oProc->f("group_id").", 'g', 1)";
 						$db2->query($sql ,__LINE__,__FILE__);
 					}
 				}
 			}
 		}
-		$phpgw_setup->db->query("update groups set group_apps = ''",__LINE__,__FILE__);
+		$oProc->query("update groups set group_apps = ''",__LINE__,__FILE__);
 
 		$setup_info['phpgwapi']['currentver'] = '0.9.10pre1';
 		return $setup_info['phpgwapi']['currentver'];
@@ -778,7 +782,7 @@
 		global $setup_info, $phpgw_setup;
 
 		$oProc = $phpgw_setup->oProc;
-		$oProc->m_odb->query("alter table phpgw_categories add column cat_access varchar(25) after cat_owner");
+		$oProc->query("alter table phpgw_categories add column cat_access varchar(25) after cat_owner");
 
 		$setup_info['phpgwapi']['currentver'] = '0.9.10pre2';
 		return $setup_info['phpgwapi']['currentver'];
@@ -791,24 +795,24 @@
 		global $setup_info, $phpgw_setup;
 
 		$oProc = $phpgw_setup->oProc;
-		$db2 = $oProc->m_odb;
+		$db2 = $oProc;
 
-		$oProc->m_odb->query("SELECT account_groups,account_id FROM accounts",__LINE__,__FILE__);
-		if($oProc->m_odb->num_rows())
+		$oProc->query("SELECT account_groups,account_id FROM accounts",__LINE__,__FILE__);
+		if($oProc->num_rows())
 		{
-			while($oProc->m_odb->next_record())
+			while($oProc->next_record())
 			{
-				$gl = explode(",",$phpgw_setup->db->f("account_groups"));
+				$gl = explode(",",$oProc->f("account_groups"));
 				for ($i=1; $i<(count($gl)-1); $i++)
 				{
 					$ga = explode(":",$gl[$i]);
 					$sql = "INSERT INTO phpgw_acl (acl_appname, acl_location, acl_account, acl_account_type, acl_rights)";
-					$sql .= " VALUES('phpgw_group', '".$ga[0]."', ".$phpgw_setup->db->f("account_id").", 'u', 1)";
+					$sql .= " VALUES('phpgw_group', '".$ga[0]."', ".$oProc->f("account_id").", 'u', 1)";
 					$db2->query($sql ,__LINE__,__FILE__);
 				}
 			}
 		}
-		$oProc->m_odb->query("UPDATE accounts SET account_groups= ''",__LINE__,__FILE__);
+		$oProc->query("UPDATE accounts SET account_groups= ''",__LINE__,__FILE__);
 
 		$setup_info['phpgwapi']['currentver'] = '0.9.10pre3';
 		return $setup_info['phpgwapi']['currentver'];
@@ -821,11 +825,11 @@
 		global $setup_info, $phpgw_setup;
 
 		$oProc = $phpgw_setup->oProc;
-		$oProc->m_odb->query("alter table accounts rename phpgw_accounts",__LINE__,__FILE__);
-		$oProc->m_odb->query("alter table phpgw_accounts drop column account_permissions",__LINE__,__FILE__);
-		$oProc->m_odb->query("alter table phpgw_accounts drop column account_groups",__LINE__,__FILE__);
-		$oProc->m_odb->query("alter table phpgw_accounts add column account_type char(1)",__LINE__,__FILE__);
-		$oProc->m_odb->query("update phpgw_accounts set account_type='u'",__LINE__,__FILE__);
+		$oProc->query("alter table accounts rename phpgw_accounts",__LINE__,__FILE__);
+		$oProc->query("alter table phpgw_accounts drop column account_permissions",__LINE__,__FILE__);
+		$oProc->query("alter table phpgw_accounts drop column account_groups",__LINE__,__FILE__);
+		$oProc->query("alter table phpgw_accounts add column account_type char(1)",__LINE__,__FILE__);
+		$oProc->query("update phpgw_accounts set account_type='u'",__LINE__,__FILE__);
 
 		$setup_info['phpgwapi']['currentver'] = '0.9.10pre4';
 		return $setup_info['phpgwapi']['currentver'];
@@ -867,12 +871,12 @@
 		global $setup_info, $phpgw_setup;
 
 		$oProc = $phpgw_setup->oProc;
-		$db2 = $oProc->m_odb;
-		$db3 = $oProc->m_odb;
+		$db2 = $oProc;
+		$db3 = $oProc;
 
-		$oProc->m_odb->query("SELECT MAX(group_id) FROM groups",__LINE__,__FILE__);
-		$oProc->m_odb->next_record();
-		$max_group_id = $oProc->m_odb->f(0);
+		$oProc->query("SELECT MAX(group_id) FROM groups",__LINE__,__FILE__);
+		$oProc->next_record();
+		$max_group_id = $oProc->f(0);
 
 		// This is for use by former CORE apps to use in this version number's upgrade locally
 		$oProc->CreateTable(
@@ -890,12 +894,12 @@
 			)
 		);
 
-		$oProc->m_odb->query("SELECT group_id, group_name FROM groups",__LINE__,__FILE__);
-		while($oProc->m_odb->next_record())
+		$oProc->query("SELECT group_id, group_name FROM groups",__LINE__,__FILE__);
+		while($oProc->next_record())
 		{
-			$old_group_id = $oProc->m_odb->f("group_id");
-			$old_group_name = $oProc->m_odb->f("group_name");
-			$group_name = $oProc->m_odb->f("group_name");
+			$old_group_id = $oProc->f("group_id");
+			$old_group_name = $oProc->f("group_name");
+			$group_name = $oProc->f("group_name");
 			while(1)
 			{
 				$new_group_id = mt_rand ($max_group_id, 60000);
@@ -1316,7 +1320,7 @@
 
 		$oProc = $phpgw_setup->oProc;
 		$oProc->AddColumn('phpgw_config','config_app', array('type' => 'varchar', 'precision' => 50));
-		$oProc->m_odb->query("UPDATE phpgw_config SET config_app='phpgwapi'",__LINE__,__FILE__);
+		$oProc->query("UPDATE phpgw_config SET config_app='phpgwapi'",__LINE__,__FILE__);
 
 		$setup_info['phpgwapi']['currentver'] = '0.9.11.005';
 		return $setup_info['phpgwapi']['currentver'];
@@ -1330,7 +1334,7 @@
 
 		$oProc = $phpgw_setup->oProc;
 		$oProc->AddColumn('phpgw_accounts','account_expires', array('type' => 'int', 'precision' => 4));
-		$oProc->m_odb->query("UPDATE phpgw_accounts SET account_expires='-1'",__LINE__,__FILE__);
+		$oProc->query("UPDATE phpgw_accounts SET account_expires='-1'",__LINE__,__FILE__);
 
 		$setup_info['phpgwapi']['currentver'] = '0.9.11.006';
 		return $setup_info['phpgwapi']['currentver'];