From 5b64744053cfbc06efdfe980066a9600ec9e33db Mon Sep 17 00:00:00 2001
From: jerome <jerome>
Date: Mon, 10 Nov 2008 04:57:20 +0000
Subject: [PATCH] Installation: MDL-17122 add comment and link to the Moodle
 Docs in the postgresql installation database page

---
 install.php                        | 4 +++-
 install/lang/en_utf8/installer.php | 3 +++
 install/stringnames.txt            | 1 +
 lang/en_utf8/install.php           | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/install.php b/install.php
index 29680989bcb..01ca75272e3 100644
--- a/install.php
+++ b/install.php
@@ -621,7 +621,9 @@ if (isset($_GET['help'])) {
                     echo '<p style="text-align: center">' . get_string('databasesettingswillbecreated', 'install') . '</p>';
                     echo '</div>';
 
-                    echo '<div id="postgres7">' . get_string('databasesettingssub_postgres7', 'install') . '</div>';
+                    echo '<div id="postgres7">' . get_string('databasesettingssub_postgres7', 'install');
+                    echo '<p style="text-align: left">' . get_string('postgresqlwarning', 'install') . '</p>';
+                    echo '</div>';
 
                     echo '<div id="mssql">' . get_string('databasesettingssub_mssql', 'install');
                 /// Link to mssql installation page
diff --git a/install/lang/en_utf8/installer.php b/install/lang/en_utf8/installer.php
index 51a776bb694..bce272535e9 100644
--- a/install/lang/en_utf8/installer.php
+++ b/install/lang/en_utf8/installer.php
@@ -260,6 +260,9 @@ $string['phpversionhelp'] = '<p>Moodle requires a PHP version of at least 4.3.0
 <p>You must upgrade PHP or move to a host with a newer version of PHP!<br/>
 (In case of 5.0.x you could also downgrade to 4.4.x version)</p>';
 $string['postgres7'] = 'PostgreSQL (postgres7)';
+$string['postgresqlwarning'] = '<strong>Note:</strong> If you experience some connection problems, you can try to set Host Server field as
+ host=\'postgresql_host\' port=\'5432\' dbname=\'postgresql_database_name\' user=\'postgresql_user\' password=\'postgresql_user_password\'
+and to leave empty the Database, User and Password fields. More information on <a href=\"http://docs.moodle.org/en/Installing_Postgres_for_PHP\">Moodle Docs</a>';
 $string['previous'] = 'Previous';
 $string['qtyperqpwillberemoved'] = 'During the upgrade, the RQP question type will be removed. You were not using this question type, so you should not experience any problems.';
 $string['qtyperqpwillberemovedanyway'] = 'During the upgrade, the RQP question type will be removed. You have some RQP questions in your database, and these will stop working unless you reinstall the code from http://moodle.org/mod/data/view.php?d=13&amp;rid=797 before continuing with the upgrade.';
diff --git a/install/stringnames.txt b/install/stringnames.txt
index 41377e84b61..a6153e7a85e 100644
--- a/install/stringnames.txt
+++ b/install/stringnames.txt
@@ -129,6 +129,7 @@ phpversion
 phpversionerror
 phpversionhelp
 postgres7
+postgresqlwarning
 previous
 qtyperqpwillberemoved
 qtyperqpwillberemovedanyway
diff --git a/lang/en_utf8/install.php b/lang/en_utf8/install.php
index 2ed2b5a4f5b..336a0140a1b 100644
--- a/lang/en_utf8/install.php
+++ b/lang/en_utf8/install.php
@@ -256,6 +256,9 @@ $string['phpversionhelp'] = '<p>Moodle requires a PHP version of at least 4.3.0
 <p>You must upgrade PHP or move to a host with a newer version of PHP!<br/>
 (In case of 5.0.x you could also downgrade to 4.4.x version)</p>';
 $string['postgres7'] = 'PostgreSQL (postgres7)';
+$string['postgresqlwarning'] = '<strong>Note:</strong> If you experience some connection problems, you can try to set Host Server field as
+ host=\'postgresql_host\' port=\'5432\' dbname=\'postgresql_database_name\' user=\'postgresql_user\' password=\'postgresql_user_password\'
+and to leave empty the Database, User and Password fields. More information on <a href=\"http://docs.moodle.org/en/Installing_Postgres_for_PHP\">Moodle Docs</a>';
 $string['safemode'] = 'Safe Mode';
 $string['safemodeerror'] = 'Moodle may have trouble with safe mode on';
 $string['safemodehelp'] = '<p>Moodle may have a variety of problems with safe mode on, not least is that