diff options
| -rwxr-xr-x | mod/setup.php | 11 | ||||
| -rw-r--r-- | view/en/htconfig.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/install_db.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/install_settings.tpl | 1 |
4 files changed, 12 insertions, 2 deletions
diff --git a/mod/setup.php b/mod/setup.php index 7831ce0b6..c6c5db96b 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -27,6 +27,7 @@ function setup_post(&$a) { case 3: $urlpath = $a->get_path(); $dbhost = notags(trim($_POST['dbhost'])); + $dbport = intval(notags(trim($_POST['dbport']))); $dbuser = notags(trim($_POST['dbuser'])); $dbpass = notags(trim($_POST['dbpass'])); $dbdata = notags(trim($_POST['dbdata'])); @@ -47,7 +48,7 @@ function setup_post(&$a) { ); if($r) { unset($db); - $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true); + $db = new dba($dbhost, $dbport, $dbuser, $dbpass, $dbdata, true); } else { $a->data['db_create_failed']=true; } @@ -65,6 +66,7 @@ function setup_post(&$a) { case 4: $urlpath = $a->get_path(); $dbhost = notags(trim($_POST['dbhost'])); + $dbport = intval(notags(trim($_POST['dbport']))); $dbuser = notags(trim($_POST['dbuser'])); $dbpass = notags(trim($_POST['dbpass'])); $dbdata = notags(trim($_POST['dbdata'])); @@ -81,6 +83,7 @@ function setup_post(&$a) { $tpl = get_intltext_template('htconfig.tpl'); $txt = replace_macros($tpl,array( '$dbhost' => $dbhost, + '$dbport' => $dbport, '$dbuser' => $dbuser, '$dbpass' => $dbpass, '$dbdata' => $dbdata, @@ -120,7 +123,7 @@ function setup_content(&$a) { global $install_wizard_pass, $db; $o = ''; $wizard_status = ""; - $install_title = t('Red Identity/Communications Server - Setup'); + $install_title = t('Red Matrix Server - Setup'); @@ -222,6 +225,7 @@ function setup_content(&$a) { $dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost'); $dbuser = notags(trim($_POST['dbuser'])); + $dbport = intval(notags(trim($_POST['dbport']))); $dbpass = notags(trim($_POST['dbpass'])); $dbdata = notags(trim($_POST['dbdata'])); $phpath = notags(trim($_POST['phpath'])); @@ -240,6 +244,7 @@ function setup_content(&$a) { '$status' => $wizard_status, '$dbhost' => array('dbhost', t('Database Server Name'), $dbhost, ''), + '$dbport' => array('dbport', t('Database Port'), $dbport, t('Communication port number or leave blank to use default'), '$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, ''), '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, ''), '$dbdata' => array('dbdata', t('Database Name'), $dbdata, ''), @@ -262,6 +267,7 @@ function setup_content(&$a) { case 3: { // Site settings require_once('datetime.php'); $dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost'); + $dbport = intval(notags(trim($_POST['dbuser']))); $dbuser = notags(trim($_POST['dbuser'])); $dbpass = notags(trim($_POST['dbpass'])); $dbdata = notags(trim($_POST['dbdata'])); @@ -279,6 +285,7 @@ function setup_content(&$a) { '$status' => $wizard_status, '$dbhost' => $dbhost, + '$dbport' => $dbport, '$dbuser' => $dbuser, '$dbpass' => $dbpass, '$dbdata' => $dbdata, diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 6f22f8476..e6c268070 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -4,6 +4,7 @@ // Copy or rename this file to .htconfig.php $db_host = '$dbhost'; +$db_port = '$dbport'; $db_user = '$dbuser'; $db_pass = '$dbpass'; $db_data = '$dbdata'; diff --git a/view/tpl/install_db.tpl b/view/tpl/install_db.tpl index fe8aee85b..344003b02 100755 --- a/view/tpl/install_db.tpl +++ b/view/tpl/install_db.tpl @@ -24,6 +24,7 @@ <input type="hidden" name="pass" value="3" /> {{include file="field_input.tpl" field=$dbhost}} +{{include file="field_input.tpl" field=$dbport}} {{include file="field_input.tpl" field=$dbuser}} {{include file="field_password.tpl" field=$dbpass}} {{include file="field_input.tpl" field=$dbdata}} diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl index f91122737..45be2faf0 100755 --- a/view/tpl/install_settings.tpl +++ b/view/tpl/install_settings.tpl @@ -16,6 +16,7 @@ <input type="hidden" name="phpath" value="{{$phpath}}" /> <input type="hidden" name="dbhost" value="{{$dbhost}}" /> +<input type="hidden" name="dbport" value="{{$dbport}}" /> <input type="hidden" name="dbuser" value="{{$dbuser}}" /> <input type="hidden" name="dbpass" value="{{$dbpass}}" /> <input type="hidden" name="dbdata" value="{{$dbdata}}" /> |