added mysqli support

setup/lang/phpgw_de.lang

@@ -288,12 +288,8 @@ next run	setup	de	n
 no	setup	de	Nein
 no accounts existing	setup	de	Keine Benutzerkonten gefunden
 no algorithms available	setup	de	Kein Algorithmus verfügbar
-no microsoft sql server support found. disabling	setup	de	Keine Unterstützung für Microsoft SQL Server gefunden. Abgeschaltet
+no %1 support found. disabling	setup	de	Keine Unterstützung für %1 gefunden. Abgeschaltet
 no modes available	setup	de	kein Modus verfügbar
-no mysql support found. disabling	setup	de	Keine Unterstützung für MySQL gefunden. Abgeschaltet
-no odbc support found. disabling	setup	de	Keine ODBC Unterstützung gefunden. Abgeschaltet
-no oracle-db support found. disabling	setup	de	Keine Unterstützung für Oracle gefunden. Abgeschaltet
-no postgresql support found. disabling	setup	de	Keine Unterstützung für PostgreSQL gefunden. Abgeschaltet
 no xml support found. disabling	setup	de	Keine Unterstützung für XML gefunden. Abgeschaltet
 not	setup	de	nicht
 not all mcrypt algorithms and modes work with egroupware. if you experience problems try switching it off.	setup	de	Nicht alle MCrypt-Algorithmen und -Modi funktionieren mit eGroupWare. Wenn Sie Probleme feststellen, versuchen Sie es abzuschalten.
@@ -490,14 +486,8 @@ you appear to be running a pre-beta version of egroupware.<br />these versions a
 you appear to be running an old version of php <br />it its recommend that you upgrade to a new version. <br />older version of php might not run egroupware correctly, if at all. <br /><br />please upgrade to at least version %1	setup	de	Es sieht so aus als ob Sie eine alte PHP-Version benutzen<br />Es ist notwendig auf eine neue Version zu aktualisieren.<br />Ältere PHP-Versionen könnten eGroupWare (wenn überhaupt) nicht korrekt ausführen. <br /><br />Biite aktualisieren Sie mindestens auf Version %1
 you appear to be running version %1 of egroupware	setup	de	Es sieht so aus als benutzen Sie Version %1 von eGroupWare
 you appear to be using php earlier than 4.1.0. egroupware now requires 4.1.0 or later	setup	de	Sie scheinen php in einer Version vor 4.1.0 zu verwenden. eGroupWare benötigt nun Version 4.1.0 oder höher.
-you appear to be using php3. disabling php4 sessions support	setup	de	Sie scheinen PHP3 zu verwenden. Schalte PHP4 Session Unterstützung ab.
+you appear to have php session support. enabling php sessions.	setup	de	Sie scheinen PHP Session Unterstützung zu haben. PHP Sessions eingeschaltet.
-you appear to be using php4. enabling php4 sessions support	setup	de	Sie scheinen PHP4 zu verwenden. Schalte PHP4 Session Unterstützung ein.
+you appear to have %1 support.	setup	de	Sie scheinen %1 Unterstützung zu haben.
-you appear to have microsoft sql server support enabled	setup	de	Sie scheinen Microsoft SQL Server Unterstützung zu haben.
-you appear to have mysql support enabled	setup	de	Sie scheinen MySQL Unterstützung zu haben.
-you appear to have odbc support enabled	setup	de	Sie scheinen ODBC Unterstützung zu haben.
-you appear to have oracle support enabled	setup	de	Sie scheinen Oracle Unterstützung zu haben.
-you appear to have oracle v8 (oci) support enabled	setup	de	Sie scheinen Oracle V8 (OCI) Unterstützung zu haben.
-you appear to have postgresql support enabled	setup	de	Sie scheinen PostgreSQL Unterstützung zu haben.
 you appear to have xml support enabled	setup	de	Sie scheinen XML Unterstützung zu haben.
 you are ready for this stage, but this stage is not yet written.<br />	setup	de	Sie sind bereit für diesen Schritt, aber dieser Abschnitt wurde noch nicht geschrieben.<br />
 you didn't enter a config password for domain %1	setup	de	Sie haben kein Passwort für die Domain %1 angegeben
@@ -511,7 +501,7 @@ you must enter a username for the admin	setup	de	Sie m
 you need to add some domains to your header.inc.php.	setup	de	Sie müssen mindestens eine Domain zu Ihrer header.inc.php hinzufügen.
 you need to select your current charset!	setup	de	Sie müssen Ihren aktuellen Zeichensatz auswählen!
 you should either uninstall and then reinstall it, or attempt manual repairs	setup	de	Sie sollten entweder de- und neuinstallieren, oder manuelle Reparaturen versuchen
-you will need to load the proper schema into your ldap server - see phpgwapi/doc/ldap/readme	setup	de	Sie müssen das entsprechende Schema in Ihren LDAP-Server laden - siehe <a href="../phpgwapi/doc/ldap/README?sessionid=f69c6befb6636a1a9501e45ff0176385" target="_blank">phpgwapi/doc/ldap/README</a>
+you will need to load the proper schema into your ldap server - see phpgwapi/doc/ldap/readme	setup	de	Sie müssen das entsprechende Schema in Ihren LDAP-Server laden - siehe <a href="../phpgwapi/doc/ldap/README" target="_blank">phpgwapi/doc/ldap/README</a>
 you're using an old configuration file format...	setup	de	Sie verwenden ein altes Format der Konfigurationsdatei ...
 you're using an old header.inc.php version...	setup	de	Sie verwenden eine alte header.inc.php Version ...
 your applications are current	setup	de	Ihre Anwendungen sind aktuell

setup/lang/phpgw_en.lang

@@ -284,12 +284,8 @@ next run	setup	en	next run
 no	setup	en	No
 no accounts existing	setup	en	No accounts existing
 no algorithms available	setup	en	no algorithms available
-no microsoft sql server support found. disabling	setup	en	No Microsoft SQL Server support found. Disabling
+no %1 support found. disabling	setup	en	No %1 support found. Disabling
 no modes available	setup	en	no modes available
-no mysql support found. disabling	setup	en	No MySQL support found. Disabling
-no odbc support found. disabling	setup	en	No ODBC support found. Disabling
-no oracle-db support found. disabling	setup	en	No Oracle-DB support found. Disabling
-no postgresql support found. disabling	setup	en	No PostgreSQL support found. Disabling
 no xml support found. disabling	setup	en	No XML support found. Disabling
 not	setup	en	not
 not all mcrypt algorithms and modes work with egroupware. if you experience problems try switching it off.	setup	en	Not all mcrypt algorithms and modes work with eGroupWare. If you experience problems try switching it off.
@@ -485,14 +481,8 @@ you appear to be running a pre-beta version of egroupware.<br />these versions a
 you appear to be running an old version of php <br />it its recommend that you upgrade to a new version. <br />older version of php might not run egroupware correctly, if at all. <br /><br />please upgrade to at least version %1	setup	en	You appear to be running an old version of PHP <br />It its recommend that you upgrade to a new version. <br />Older version of PHP might not run eGroupWare correctly, if at all. <br /><br />Please upgrade to at least version %1
 you appear to be running version %1 of egroupware	setup	en	You appear to be running version %1 of eGroupWare
 you appear to be using php earlier than 4.1.0. egroupware now requires 4.1.0 or later	setup	en	You appear to be using PHP earlier than 4.1.0. eGroupWare now requires 4.1.0 or later
-you appear to be using php3. disabling php4 sessions support	setup	en	You appear to be using PHP3. Disabling PHP4 sessions support
+you appear to have %1 support.	setup	en	You appear to have %1 support.
-you appear to be using php4. enabling php4 sessions support	setup	en	You appear to be using PHP4. Enabling PHP4 sessions support
+you appear to have php session support. enabling php sessions.	setup	en	You appear to have PHP session support. Enabling PHP sessions.
-you appear to have microsoft sql server support enabled	setup	en	You appear to have Microsoft SQL Server support enabled
-you appear to have mysql support enabled	setup	en	You appear to have MySQL support enabled
-you appear to have odbc support enabled	setup	en	You appear to have ODBC support enabled
-you appear to have oracle support enabled	setup	en	You appear to have Oracle support enabled
-you appear to have oracle v8 (oci) support enabled	setup	en	You appear to have Oracle V8 (OCI) support enabled
-you appear to have postgresql support enabled	setup	en	You appear to have PostgreSQL support enabled
 you appear to have xml support enabled	setup	en	You appear to have XML support enabled
 you are ready for this stage, but this stage is not yet written.<br />	setup	en	You are ready for this stage, but this stage is not yet written.<br />
 you didn't enter a config password for domain %1	setup	en	You didn't enter a config password for domain %1

setup/manageheader.php

@@ -65,6 +65,7 @@
 	$db_fullnames = array(
 		'pgsql'  => 'PostgreSQL',
 		'mysql'  => 'MySQL',
+		'mysqli' => 'MySQLi (php5)',
 		'mssql'  => 'MS SQL Server',
 		'odbc_mssql'  => 'MS SQL Server via ODBC',
 		'oracle' => 'Oracle',
@@ -75,6 +76,7 @@
 	$default_db_ports = array(
 		'pgsql'  => 5432,
 		'mysql'  => 3306,
+		'mysqli' => 3306,
 		'mssql'  => 1433,
 		'odbc_mssql'  => '',
 		'oracle' => 1521,
@@ -272,56 +274,29 @@
 			$detected .= '<tr class="th"><td colspan="2">' . lang('Analysis') . '</td></tr>'."\n".'<tr><td colspan="2">'. "\n";
 
 			$supported_db = array();
-			if(check_load_extension('mysql') || function_exists('mysql_connect'))
+			foreach(array(
+				// short => array(extension,func_to_check,supported_db(s))
+				'mysql'  => array('mysql','mysql_connect','mysql'),
+				'mysqli' => array('mysql','mysql_iconnect','mysqli'),
+				'pgsql'  => array('pgsql','pg_connect','pgsql'),
+				'mssql'  => array('mssql','mssql_connect','mssql'),
+				'odbc'   => array('odbc',false,'sapdb','odbc_mssql','odbc_oracle'),
+				'oracle' => array('oci8',false,'oracle'),
+			) as $db => $data)
 			{
-				$detected .= lang('You appear to have MySQL support enabled') . '<br />' . "\n";
+				$ext = array_shift($data);
-				$supported_db[] = 'mysql';
+				$func_to_check = array_shift($data);
+				$name = isset($db_fullnames[$db]) ? $db_fullnames[$db] : strtoupper($db);
+				if (check_load_extension($ext) || $func_to_check && function_exists($func_to_check))
+				{
+					$detected .= lang('You appear to have %1 support.',$name) . "<br />\n";
+					$supported_db = array_merge($supported_db,$data);
+				}
+				else
+				{
+					$detected .= lang('No %1 support found. Disabling',$name) . "<br />\n";
+				}
 			}
-			else
-			{
-				$detected .= lang('No MySQL support found. Disabling') . '<br />' . "\n";
-			}
-			if(check_load_extension('pgsql') || function_exists('pg_connect'))
-			{
-				$detected .= lang('You appear to have PostgreSQL support enabled') . '<br />' . "\n";
-				$supported_db[]  = 'pgsql';
-			}
-			else
-			{
-				$detected .= lang('No PostgreSQL support found. Disabling') . '<br />' . "\n";
-			}
-			if(check_load_extension('mssql') || function_exists('mssql_connect'))
-			{
-				$detected .= lang('You appear to have Microsoft SQL Server support enabled') . '<br />' . "\n";
-				$supported_db[] = 'mssql';
-			}
-			else
-			{
-				$detected .= lang('No Microsoft SQL Server support found. Disabling') . '<br />' . "\n";
-			}
-			if(check_load_extension('odbc'))
-			{
-				$detected .= lang('You appear to have ODBC support enabled') . '<br />' . "\n";
-				// databases supported by the ODBC driver
-				$supported_db[] = 'sapdb';
-				$supported_db[] = 'odbc_mssql';
-				$supported_db[] = 'odbc_oracle';
-			}
-			else
-			{
-				$detected .= lang('No ODBC support found. Disabling') . '<br />' . "\n";
-			}
-
-			if(check_load_extension('oci8'))
-			{
-				$detected .= lang('You appear to have Oracle V8 (OCI) support enabled') . '<br />' . "\n";
-				$supported_db[] = 'oracle';
-			}
-			else
-			{
-				$detected .= lang('No Oracle-DB support found. Disabling') . '<br />' . "\n";
-			}
-
 			if(!count($supported_db))
 			{
 				$detected .= '<b><p align="center" class="msg">'
@@ -345,7 +320,7 @@
 			}
 			if (check_load_extension('session'))
 			{
-				$detected .= lang('You appear to have PHP4 session support. Enabling PHP4 sessions.') . '<br />' . "\n";
+				$detected .= lang('You appear to have PHP session support. Enabling PHP sessions.') . '<br />' . "\n";
 				$supported_sessions_type[] = 'php4';	// makeing php4 sessions the default
 			}
 			$supported_sessions_type[] = 'db';