fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [16988] add database port to config


From: sigurdne
Subject: [Fmsystem-commits] [16988] add database port to config
Date: Sat, 19 Aug 2017 11:32:15 -0400 (EDT)

Revision: 16988
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16988
Author:   sigurdne
Date:     2017-08-19 11:32:15 -0400 (Sat, 19 Aug 2017)
Log Message:
-----------
add database port to config

Modified Paths:
--------------
    trunk/bookingfrontend/inc/custom/default/MinId.php
    trunk/felamimail/inc/class.egw_db.inc.php
    trunk/header.inc.php.template
    trunk/hrm/inc/class.socommon.inc.php
    trunk/phpgwapi/doc/index.html
    trunk/phpgwapi/doc/index.txt
    trunk/phpgwapi/inc/class.db.inc.php
    trunk/phpgwapi/inc/class.jasper_wrapper.inc.php
    trunk/phpgwapi/inc/class.schema_proc_mysql.inc.php
    trunk/phpgwapi/inc/class.setup.inc.php
    trunk/phpgwapi/inc/class.setup_html.inc.php
    trunk/phpgwapi/inc/class.setup_process.inc.php
    trunk/phpgwapi/inc/functions.inc.php
    trunk/property/inc/class.bomigrate.inc.php
    trunk/property/inc/class.socommon.inc.php
    trunk/property/inc/class.uimigrate.inc.php
    trunk/setup/manageheader.php
    trunk/setup/templates/base/manageheader.tpl

Modified: trunk/bookingfrontend/inc/custom/default/MinId.php
===================================================================
--- trunk/bookingfrontend/inc/custom/default/MinId.php  2017-08-17 12:34:54 UTC 
(rev 16987)
+++ trunk/bookingfrontend/inc/custom/default/MinId.php  2017-08-19 15:32:15 UTC 
(rev 16988)
@@ -105,7 +105,7 @@
                        $db = createObject('phpgwapi.db', null, null, true);
 
                        $db->Host = 
$GLOBALS['phpgw_domain']['default']['db_host'];
-                       $db->Port = '5432';
+                       $db->Port = 
$GLOBALS['phpgw_domain']['default']['db_port'];//'5432';
                        $db->Type = 'postgres';
                        $db->Database = 'breg';
                        $db->User = 
$GLOBALS['phpgw_domain']['default']['db_user'];

Modified: trunk/felamimail/inc/class.egw_db.inc.php
===================================================================
--- trunk/felamimail/inc/class.egw_db.inc.php   2017-08-17 12:34:54 UTC (rev 
16987)
+++ trunk/felamimail/inc/class.egw_db.inc.php   2017-08-19 15:32:15 UTC (rev 
16988)
@@ -209,6 +209,7 @@
                $phpgw_db           = & $GLOBALS['phpgw']->db;
                $this->Database         = & $phpgw_db->Database;
                $this->Host                     = & $phpgw_db->Host;
+               $this->Port                     = & $phpgw_db->Port;
                $this->User                     = & $phpgw_db->User;
                $this->Password         = & $phpgw_db->Password;
 

Modified: trunk/header.inc.php.template
===================================================================
--- trunk/header.inc.php.template       2017-08-17 12:34:54 UTC (rev 16987)
+++ trunk/header.inc.php.template       2017-08-19 15:32:15 UTC (rev 16988)
@@ -276,6 +276,7 @@
        $GLOBALS['phpgw_domain']['{DB_DOMAIN}'] = array
        (
                'db_host' => '{DB_HOST}',
+               'db_port' => '{DB_PORT}',
                'db_name' => '{DB_NAME}',
                'db_user' => '{DB_USER}',
                'db_pass' => '{DB_PASS}',

Modified: trunk/hrm/inc/class.socommon.inc.php
===================================================================
--- trunk/hrm/inc/class.socommon.inc.php        2017-08-17 12:34:54 UTC (rev 
16987)
+++ trunk/hrm/inc/class.socommon.inc.php        2017-08-19 15:32:15 UTC (rev 
16988)
@@ -25,6 +25,7 @@
                //      $this->db               = $GLOBALS['phpgw']->db;
                        $this->db = CreateObject('phpgwapi.db');
                        $this->db->Host = 
$GLOBALS['phpgw_info']['server']['db_host'];
+                       $this->db->Port = 
$GLOBALS['phpgw_info']['server']['db_port'];
                        $this->db->Type = 
$GLOBALS['phpgw_info']['server']['db_type'];
                        $this->db->Database = 
$GLOBALS['phpgw_info']['server']['db_name'];
                        $this->db->User = 
$GLOBALS['phpgw_info']['server']['db_user'];

Modified: trunk/phpgwapi/doc/index.html
===================================================================
--- trunk/phpgwapi/doc/index.html       2017-08-17 12:34:54 UTC (rev 16987)
+++ trunk/phpgwapi/doc/index.html       2017-08-19 15:32:15 UTC (rev 16988)
@@ -681,6 +681,8 @@
 $GLOBALS['phpgw_info']['server']['db_host'] = Address of the database server. 
        Usually this is set to localhost - but don't assume.
 
+$GLOBALS['phpgw_info']['server']['db_port'] = Database port.
+
 $GLOBALS['phpgw_info']['server']['db_name'] = Database name.
 
 $GLOBALS['phpgw_info']['server']['db_user'] = User name.

Modified: trunk/phpgwapi/doc/index.txt
===================================================================
--- trunk/phpgwapi/doc/index.txt        2017-08-17 12:34:54 UTC (rev 16987)
+++ trunk/phpgwapi/doc/index.txt        2017-08-19 15:32:15 UTC (rev 16988)
@@ -572,8 +572,10 @@
 
        Usually this is set to localhost - but don't assume.
 
-  $GLOBALS['phpgw_info']['server']['db_name'] = Database name.
+$GLOBALS['phpgw_info']['server']['db_port'] = Database port.
 
+$GLOBALS['phpgw_info']['server']['db_name'] = Database name.
+
   $GLOBALS['phpgw_info']['server']['db_user'] = User name.
 
   $GLOBALS['phpgw_info']['server']['db_pass'] = Password
@@ -690,7 +692,7 @@
 
 If the current user speaks Italian, the string returned will be:
 
-  il contatore \xE8 42<br />
+  il contatore è 42<br />
 
 
 The lang function
@@ -834,7 +836,7 @@
 
 9.4 Copyrights and Trademarks
 
-Copyright \xA9 Free Software Foundarion. Permission is granted to copy, 
distribute
+Copyright © Free Software Foundarion. Permission is granted to copy, distribute
 and/or modify this document under the terms of the GNU Free Documentation
 License, Version 1.1 or any later version published by the Free Software
 Foundation.
@@ -846,7 +848,7 @@
 Thanks to all the developers and users who contribute to making phpGroupWare
 such a success.
 The most recent version of this document can be found at docs.phpgroupware.org
-Copyright \xA9 2000-2004 Free_Software_Foundation_Inc, distributed under the 
terms
+Copyright © 2000-2004 Free_Software_Foundation_Inc, distributed under the terms
 of the GNU_Free_Documentation_License
 Source: $Source$
 Version: $Revision: 15562 $

Modified: trunk/phpgwapi/inc/class.db.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.db.inc.php 2017-08-17 12:34:54 UTC (rev 16987)
+++ trunk/phpgwapi/inc/class.db.inc.php 2017-08-19 15:32:15 UTC (rev 16988)
@@ -122,6 +122,7 @@
 
                        $this->Database         = 
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_name']);
                        $this->Host                     = 
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_host']);
+                       $this->Port                     = 
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_port']);
                        $this->User                     = 
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_user']);
                        $this->Password         = 
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_pass']);
 

Modified: trunk/phpgwapi/inc/class.jasper_wrapper.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.jasper_wrapper.inc.php     2017-08-17 12:34:54 UTC 
(rev 16987)
+++ trunk/phpgwapi/inc/class.jasper_wrapper.inc.php     2017-08-19 15:32:15 UTC 
(rev 16988)
@@ -35,18 +35,21 @@
                        $crypto = createObject('phpgwapi.crypto',array($_key, 
$_iv));
 
                        $db_host = 
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_host']);
+                       $db_port=  
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_port']);
                        $db_name = 
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_name']);
                        $this->db_user = 
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_user']);
                        $this->db_pass = 
$crypto->decrypt($GLOBALS['phpgw_info']['server']['db_pass']);
                        $this->connection_string = "";
 
-                       if ($GLOBALS['phpgw_info']['server']['db_type'] == 
"postgres") 
+                       if ($GLOBALS['phpgw_info']['server']['db_type'] == 
"postgres")
                        {
-                               $this->connection_string = 
"jdbc:postgresql://".$db_host.":5432/".$db_name;
+                               $db_port = $db_port ? $db_port : '5432';
+                               $this->connection_string = 
"jdbc:postgresql://{$db_host}:{$db_port}/{$db_name}";
                        } 
                        elseif ($GLOBALS['phpgw_info']['server']['db_type'] == 
"mysql") 
                        {
-                               $this->connection_string = 
"jdbc:mysql://".$db_host.":3306/".$db_name;
+                               $db_port = $db_port ? $db_port : '3306';
+                               $this->connection_string = 
"jdbc:mysql://{$db_host}:{$db_port}/{$db_name}";
                        }
                }
 

Modified: trunk/phpgwapi/inc/class.schema_proc_mysql.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.schema_proc_mysql.inc.php  2017-08-17 12:34:54 UTC 
(rev 16987)
+++ trunk/phpgwapi/inc/class.schema_proc_mysql.inc.php  2017-08-19 15:32:15 UTC 
(rev 16988)
@@ -37,6 +37,7 @@
                        if( isset($GLOBALS['phpgw_info']['server']['db_name']) 
&& strlen($GLOBALS['phpgw_info']['server']['db_name']) )
                        {
                                $temp_db->Host = 
$GLOBALS['phpgw_info']['server']['db_host'];
+                               $temp_db->Port = 
$GLOBALS['phpgw_info']['server']['db_port'];
                                $temp_db->Type = 
$GLOBALS['phpgw_info']['server']['db_type'];
                                $temp_db->Database = 
$GLOBALS['phpgw_info']['server']['db_name'];
                                $temp_db->User = 
$GLOBALS['phpgw_info']['server']['db_user'];
@@ -48,6 +49,7 @@
                                $phpgw_domain = $GLOBALS['phpgw_domain'];       
 
                                $temp_db->Host     = 
$phpgw_domain[$ConfigDomain]['db_host'];
+                               $temp_db->Port     = 
$phpgw_domain[$ConfigDomain]['db_port'];
                                $temp_db->Database = 
$phpgw_domain[$ConfigDomain]['db_name'];
                                $temp_db->User     = 
$phpgw_domain[$ConfigDomain]['db_user'];
                                $temp_db->Password = 
$phpgw_domain[$ConfigDomain]['db_pass'];

Modified: trunk/phpgwapi/inc/class.setup.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.setup.inc.php      2017-08-17 12:34:54 UTC (rev 
16987)
+++ trunk/phpgwapi/inc/class.setup.inc.php      2017-08-19 15:32:15 UTC (rev 
16988)
@@ -62,6 +62,7 @@
 
                        $GLOBALS['phpgw_info']['server']['db_type'] = 
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_type'];
                        $GLOBALS['phpgw_info']['server']['db_host']     = 
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_host'];
+                       $GLOBALS['phpgw_info']['server']['db_port']     = 
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_port'];
                        $GLOBALS['phpgw_info']['server']['db_name'] = 
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_name'];
                        $GLOBALS['phpgw_info']['server']['db_user'] = 
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_user'];
                        $GLOBALS['phpgw_info']['server']['db_pass'] = 
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_pass'];

Modified: trunk/phpgwapi/inc/class.setup_html.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.setup_html.inc.php 2017-08-17 12:34:54 UTC (rev 
16987)
+++ trunk/phpgwapi/inc/class.setup_html.inc.php 2017-08-19 15:32:15 UTC (rev 
16988)
@@ -48,7 +48,7 @@
                                
$GLOBALS['header_template']->set_var('DB_DOMAIN',$v);
                                foreach($dom as $x => $y)
                                {
-                                       if( ($setting['enable_mcrypt'] == 
'True' || !empty($setting['enable_crypto'])) && ($x == 'db_pass' || $x == 
'db_host' || $x == 'db_name' || $x == 'db_user' || $x == 'config_pass'))
+                                       if( ($setting['enable_mcrypt'] == 
'True' || !empty($setting['enable_crypto'])) && ($x == 'db_pass' || $x == 
'db_host' || $x == 'db_port' || $x == 'db_name' || $x == 'db_user' || $x == 
'config_pass'))
                                        {
                                                $y = 
$GLOBALS['phpgw']->crypto->encrypt($y);
                                        }

Modified: trunk/phpgwapi/inc/class.setup_process.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.setup_process.inc.php      2017-08-17 12:34:54 UTC 
(rev 16987)
+++ trunk/phpgwapi/inc/class.setup_process.inc.php      2017-08-19 15:32:15 UTC 
(rev 16988)
@@ -54,6 +54,7 @@
                        $GLOBALS['phpgw_setup']->oProc = 
createObject('phpgwapi.schema_proc',$phpgw_domain[$ConfigDomain]['db_type']);
                        $GLOBALS['phpgw_setup']->oProc->m_odb           = 
$GLOBALS['phpgw_setup']->db;
                        $GLOBALS['phpgw_setup']->oProc->m_odb->Host     = 
$crypto->decrypt($phpgw_domain[$ConfigDomain]['db_host']);
+                       $GLOBALS['phpgw_setup']->oProc->m_odb->Port     = 
$crypto->decrypt($phpgw_domain[$ConfigDomain]['db_port']);
                        $GLOBALS['phpgw_setup']->oProc->m_odb->Database = 
$crypto->decrypt($phpgw_domain[$ConfigDomain]['db_name']);
                        $GLOBALS['phpgw_setup']->oProc->m_odb->User     = 
$crypto->decrypt($phpgw_domain[$ConfigDomain]['db_user']);
                        $GLOBALS['phpgw_setup']->oProc->m_odb->Password = 
$crypto->decrypt($phpgw_domain[$ConfigDomain]['db_pass']);

Modified: trunk/phpgwapi/inc/functions.inc.php
===================================================================
--- trunk/phpgwapi/inc/functions.inc.php        2017-08-17 12:34:54 UTC (rev 
16987)
+++ trunk/phpgwapi/inc/functions.inc.php        2017-08-19 15:32:15 UTC (rev 
16988)
@@ -560,6 +560,7 @@
        if 
(isset($GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['user']['domain']]))
        {
                $GLOBALS['phpgw_info']['server']['db_host']                     
= $GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['user']['domain']]['db_host'];
+               $GLOBALS['phpgw_info']['server']['db_port']                     
= $GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['user']['domain']]['db_port'];
                $GLOBALS['phpgw_info']['server']['db_name']                     
= $GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['user']['domain']]['db_name'];
                $GLOBALS['phpgw_info']['server']['db_user']                     
= $GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['user']['domain']]['db_user'];
                $GLOBALS['phpgw_info']['server']['db_pass']                     
= $GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['user']['domain']]['db_pass'];
@@ -569,6 +570,7 @@
        else
        {
                $GLOBALS['phpgw_info']['server']['db_host']                     
= 
$GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['db_host'];
+               $GLOBALS['phpgw_info']['server']['db_port']                     
= 
$GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['db_port'];
                $GLOBALS['phpgw_info']['server']['db_name']                     
= 
$GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['db_name'];
                $GLOBALS['phpgw_info']['server']['db_user']                     
= 
$GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['db_user'];
                $GLOBALS['phpgw_info']['server']['db_pass']                     
= 
$GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['db_pass'];

Modified: trunk/property/inc/class.bomigrate.inc.php
===================================================================
--- trunk/property/inc/class.bomigrate.inc.php  2017-08-17 12:34:54 UTC (rev 
16987)
+++ trunk/property/inc/class.bomigrate.inc.php  2017-08-19 15:32:15 UTC (rev 
16988)
@@ -129,6 +129,7 @@
                                        $this->oProc->m_odb = 
CreateObject('phpgwapi.db');//$GLOBALS['phpgw']->db;
                                        $this->oProc->m_odb->Type = 
$GLOBALS['phpgw_domain'][$domain]['db_type'];
                                        $this->oProc->m_odb->Host = 
$GLOBALS['phpgw_domain'][$domain]['db_host'];
+                                       $this->oProc->m_odb->Port = 
$GLOBALS['phpgw_domain'][$domain]['db_port'];
                                        $this->oProc->m_odb->Database = 
$GLOBALS['phpgw_domain'][$domain]['db_name'];
                                        $this->oProc->m_odb->User = 
$GLOBALS['phpgw_domain'][$domain]['db_user'];
                                        $this->oProc->m_odb->Password = 
$GLOBALS['phpgw_domain'][$domain]['db_pass'];

Modified: trunk/property/inc/class.socommon.inc.php
===================================================================
--- trunk/property/inc/class.socommon.inc.php   2017-08-17 12:34:54 UTC (rev 
16987)
+++ trunk/property/inc/class.socommon.inc.php   2017-08-19 15:32:15 UTC (rev 
16988)
@@ -59,6 +59,7 @@
                                if 
(isset($GLOBALS['phpgw_info']['server']['db_name']) && 
$GLOBALS['phpgw_info']['server']['db_name'])
                                {
                                        $this->db->Host = 
$GLOBALS['phpgw_info']['server']['db_host'];
+                                       $this->db->Port = 
$GLOBALS['phpgw_info']['server']['db_port'];
                                        $this->db->Type = 
$GLOBALS['phpgw_info']['server']['db_type'];
                                        $this->db->Database = 
$GLOBALS['phpgw_info']['server']['db_name'];
                                        $this->db->User = 
$GLOBALS['phpgw_info']['server']['db_user'];
@@ -74,6 +75,7 @@
                                        
$GLOBALS['phpgw_info']['user']['domain'] = $ConfigDomain;
                                        $phpgw_domain = 
$GLOBALS['phpgw_domain'];
                                        $this->db->Host = 
$phpgw_domain[$ConfigDomain]['db_host'];
+                                       $this->db->Port = 
$phpgw_domain[$ConfigDomain]['db_port'];
                                        $this->db->Database = 
$phpgw_domain[$ConfigDomain]['db_name'];
                                        $this->db->User = 
$phpgw_domain[$ConfigDomain]['db_user'];
                                        $this->db->Password = 
$phpgw_domain[$ConfigDomain]['db_pass'];
@@ -420,6 +422,7 @@
                                if 
(isset($GLOBALS['phpgw_info']['server']['db_name']) && 
$GLOBALS['phpgw_info']['server']['db_name'])
                                {
                                        $db->Host = 
$GLOBALS['phpgw_info']['server']['db_host'];
+                                       $db->Port = 
$GLOBALS['phpgw_info']['server']['db_port'];
                                        $db->Type = 
$GLOBALS['phpgw_info']['server']['db_type'];
                                        $db->Database = 
$GLOBALS['phpgw_info']['server']['db_name'];
                                        $db->User = 
$GLOBALS['phpgw_info']['server']['db_user'];
@@ -435,6 +438,7 @@
                                        $phpgw_domain = 
$GLOBALS['phpgw_domain'];
                                        
$GLOBALS['phpgw_info']['user']['domain'] = $ConfigDomain;
                                        $db->Host = 
$phpgw_domain[$ConfigDomain]['db_host'];
+                                       $db->Port = 
$phpgw_domain[$ConfigDomain]['db_port'];
                                        $db->Database = 
$phpgw_domain[$ConfigDomain]['db_name'];
                                        $db->User = 
$phpgw_domain[$ConfigDomain]['db_user'];
                                        $db->Password = 
$phpgw_domain[$ConfigDomain]['db_pass'];

Modified: trunk/property/inc/class.uimigrate.inc.php
===================================================================
--- trunk/property/inc/class.uimigrate.inc.php  2017-08-17 12:34:54 UTC (rev 
16987)
+++ trunk/property/inc/class.uimigrate.inc.php  2017-08-19 15:32:15 UTC (rev 
16988)
@@ -160,6 +160,7 @@
                                        (
                                        'domain' => $domain,
                                        'db_host' => $entry['db_host'],
+                                       'db_port' => $entry['db_port'],
                                        'db_name' => $entry['db_name'],
                                        'db_type' => $entry['db_type'],
                                        'lang_select_migrate_text' => 
$lang_select_migrate_text,
@@ -181,6 +182,7 @@
                                )),
                                'lang_domain' => lang('domain'),
                                'lang_db_host' => lang('db_host'),
+                               'lang_db_port' => lang('db_port'),
                                'lang_db_name' => lang('db_name'),
                                'lang_db_type' => lang('db_type'),
                                'lang_select' => (isset($this->acl_edit) ? 
lang('select') : ''),

Modified: trunk/setup/manageheader.php
===================================================================
--- trunk/setup/manageheader.php        2017-08-17 12:34:54 UTC (rev 16987)
+++ trunk/setup/manageheader.php        2017-08-19 15:32:15 UTC (rev 16988)
@@ -560,6 +560,7 @@
                                                
$setup_tpl->set_var('lang_delete',lang('Delete'));
                                                
$setup_tpl->set_var('db_domain',$key);
                                                
$setup_tpl->set_var('db_host',$GLOBALS['phpgw']->crypto->decrypt($GLOBALS['phpgw_domain'][$key]['db_host']));
+                                               
$setup_tpl->set_var('db_port',$GLOBALS['phpgw']->crypto->decrypt($GLOBALS['phpgw_domain'][$key]['db_port']));
                                                
$setup_tpl->set_var('db_name',$GLOBALS['phpgw']->crypto->decrypt($GLOBALS['phpgw_domain'][$key]['db_name']));
                                                
$setup_tpl->set_var('db_user',$GLOBALS['phpgw']->crypto->decrypt($GLOBALS['phpgw_domain'][$key]['db_user']));
                                                
$setup_tpl->set_var('db_pass',$GLOBALS['phpgw']->crypto->decrypt($GLOBALS['phpgw_domain'][$key]['db_pass']));
@@ -639,6 +640,7 @@
                                
$setup_tpl->set_var('lang_delete',lang('Delete'));
                                $setup_tpl->set_var('db_domain','default');
                                $setup_tpl->set_var('db_host','localhost');
+                               $setup_tpl->set_var('db_port','');
                                $setup_tpl->set_var('db_name','phpgroupware');
                                $setup_tpl->set_var('db_user','phpgroupware');
                                $setup_tpl->set_var('db_pass','your_password');
@@ -840,6 +842,8 @@
                        $setup_tpl->set_var('lang_forgotten_password',lang('url 
forgotten password'));
                        $setup_tpl->set_var('lang_dbhost',lang('DB Host'));
                        
$setup_tpl->set_var('lang_dbhostdescr',lang('Hostname/IP of database server'));
+                       $setup_tpl->set_var('lang_dbport',lang('DB port'));
+                       $setup_tpl->set_var('lang_dbportdescr',lang('If empty, 
default will be used'));
                        $setup_tpl->set_var('lang_dbname',lang('DB Name'));
                        $setup_tpl->set_var('lang_dbnamedescr',lang('Name of 
database'));
                        $setup_tpl->set_var('lang_dbuser',lang('DB User'));

Modified: trunk/setup/templates/base/manageheader.tpl
===================================================================
--- trunk/setup/templates/base/manageheader.tpl 2017-08-17 12:34:54 UTC (rev 
16987)
+++ trunk/setup/templates/base/manageheader.tpl 2017-08-19 15:32:15 UTC (rev 
16988)
@@ -135,6 +135,9 @@
     <td><b>{lang_dbhost}</b><br><input type="text" 
name="settings[{db_domain}][db_host]" 
value="{db_host}"></td><td>{lang_dbhostdescr}</td>
   </tr>
   <tr>
+    <td><b>{lang_dbport}</b><br><input type="text" 
name="settings[{db_domain}][db_port]" 
value="{db_port}"></td><td>{lang_dbportdescr}</td>
+  </tr>
+  <tr>
     <td><b>{lang_dbname}</b><br><input type="text" 
name="settings[{db_domain}][db_name]" 
value="{db_name}"></td><td>{lang_dbnamedescr}</td>
   </tr>
   <tr>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]