[Fmsystem-commits] [6466] Setup: set Portico Estate as default system name - and postres as default db

[Sigurd Nes]

Revision: 6466
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6466
Author:   sigurdne
Date:     2010-10-10 21:40:37 +0000 (Sun, 10 Oct 2010)
Log Message:
-----------
Setup: set Portico Estate as default system name - and postres as default db

Modified Paths:
--------------
    trunk/setup/manageheader.php

Modified: trunk/setup/manageheader.php
===================================================================
--- trunk/setup/manageheader.php        2010-10-10 17:22:31 UTC (rev 6465)
+++ trunk/setup/manageheader.php        2010-10-10 21:40:37 UTC (rev 6466)
@@ -291,23 +291,23 @@
                        $detected .= $request_order;
 
                        $supported_db = array();
-                       if (extension_loaded('mysql') || 
function_exists('mysql_connect'))
+                       if (extension_loaded('pgsql') || 
function_exists('pg_connect'))
                        {
-                               $detected .= '<li>' . lang('You appear to have 
MySQL support enabled') . "</li>\n";
-                               $supported_db[] = 'mysql';
+                               $detected .= '<li>' . lang('You appear to have 
Postgres-DB support enabled') . "</li>\n";
+                               $supported_db[]  = 'postgres';
                        }
                        else
                        {
-                               $detected .= '<li class="warn">' . lang('No 
MySQL support found. Disabling') . "</li>\n";
+                               $detected .= '<li class="warn">' . lang('No 
Postgres-DB support found. Disabling') . "</li>\n";
                        }
-                       if (extension_loaded('pgsql') || 
function_exists('pg_connect'))
+                       if (extension_loaded('mysql') || 
function_exists('mysql_connect'))
                        {
-                               $detected .= '<li>' . lang('You appear to have 
Postgres-DB support enabled') . "</li>\n";
-                               $supported_db[]  = 'postgres';
+                               $detected .= '<li>' . lang('You appear to have 
MySQL support enabled') . "</li>\n";
+                               $supported_db[] = 'mysql';
                        }
                        else
                        {
-                               $detected .= '<li class="warn">' . lang('No 
Postgres-DB support found. Disabling') . "</li>\n";
+                               $detected .= '<li class="warn">' . lang('No 
MySQL support found. Disabling') . "</li>\n";
                        }
                        if (extension_loaded('mssql') || 
function_exists('mssql_connect'))
                        {
@@ -623,7 +623,7 @@
                        $setup_tpl->set_var('include_root', 
$GLOBALS['phpgw_info']['server']['include_root']);
                        $setup_tpl->set_var('header_admin_password', 
isset($GLOBALS['phpgw_info']['server']['header_admin_password']) ? 
$GLOBALS['phpgw']->crypto->decrypt($GLOBALS['phpgw_info']['server']['header_admin_password'])
 : '');
 //                     $setup_tpl->set_var('header_admin_password', 
isset($GLOBALS['phpgw_info']['server']['header_admin_password']) ? 
$GLOBALS['phpgw_info']['server']['header_admin_password'] : '');
-                       $setup_tpl->set_var('system_name', 
isset($GLOBALS['phpgw_info']['server']['system_name']) ? 
$GLOBALS['phpgw_info']['server']['system_name'] : 'phpGroupWare');
+                       $setup_tpl->set_var('system_name', 
isset($GLOBALS['phpgw_info']['server']['system_name']) ? 
$GLOBALS['phpgw_info']['server']['system_name'] : 'Portico Estate');
                        $setup_tpl->set_var('default_lang', 
isset($GLOBALS['phpgw_info']['server']['default_lang']) ? 
$GLOBALS['phpgw_info']['server']['default_lang'] : phpgw::get_var('ConfigLang', 
'string', 'POST'));
 
                        if ( 
isset($GLOBALS['phpgw_info']['server']['db_persistent']) && 
$GLOBALS['phpgw_info']['server']['db_persistent'] )