Allow base URL of PostgreSQL documentation to be configured.

9 files changed, 22 insertions, 16 deletions

diff --git a/HISTORY b/HISTORY
index 6c789e25..98dbbe3f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6,6 +6,7 @@ Version 3.6-dev
 
 Features
 * Allow current database to be at the top
+* Allow base URL of PostgreSQL documentation to be configured
 
 Bugs
 * Tree Icons are displayed middle instead of top
diff --git a/conf/config.inc.php-dist b/conf/config.inc.php-dist
index 4000e5bb..c3d4d565 100644
--- a/conf/config.inc.php-dist
+++ b/conf/config.inc.php-dist
@@ -4,7 +4,7 @@
 	 * Central phpPgAdmin configuration.  As a user you may modify the
 	 * settings here for your particular configuration.
 	 *
-	 * $Id: config.inc.php-dist,v 1.40 2005/02/11 11:22:24 chriskl Exp $
+	 * $Id: config.inc.php-dist,v 1.41 2005/02/16 10:27:44 jollytoad Exp $
 	 */
 
 	// An example server.  Create as many of these as you wish,
@@ -95,10 +95,15 @@
 	// Send XHTML headers?  Unless debugging, it's best to leave this off
 	$conf['use_xhtml'] = false;
 
+	// Base URL for PostgreSQL documentation.
+	// '%s', if present, will be replaced with the PostgreSQL version
+	// (7, 7.1, 7.2, 7.3, 7.4, or 8.0)
+	$conf['help_base'] = 'http://www.postgresql.org/docs/%s/interactive/';
+	
 	/*****************************************
 	 * Don't modify anything below this line *
 	 *****************************************/
 
-	$conf['version'] = 13;
+	$conf['version'] = 14;
 
 ?>
diff --git a/help/PostgresDoc70.php b/help/PostgresDoc70.php
index e0ef2583..46135054 100644
--- a/help/PostgresDoc70.php
+++ b/help/PostgresDoc70.php
@@ -3,10 +3,10 @@
 /**
  * Help links for PostgreSQL 7.0 documentation
  *
- * $Id: PostgresDoc70.php,v 1.3 2004/11/15 17:25:03 soranzo Exp $
+ * $Id: PostgresDoc70.php,v 1.4 2005/02/16 10:27:44 jollytoad Exp $
  */
 
-$this->help_base = 'http://www.postgresql.org/docs/7/interactive/';
+$this->help_base = sprintf($GLOBALS['conf']['help_base'], '7');
 
 # TODO: Check and fix links for >= 7.0 and <= 7.3 (those in the following array)
 
diff --git a/help/PostgresDoc71.php b/help/PostgresDoc71.php
index 5d983db2..f2f272dc 100644
--- a/help/PostgresDoc71.php
+++ b/help/PostgresDoc71.php
@@ -3,14 +3,14 @@
 /**
  * Help links for PostgreSQL 7.1 documentation
  *
- * $Id: PostgresDoc71.php,v 1.3 2004/11/15 17:25:03 soranzo Exp $
+ * $Id: PostgresDoc71.php,v 1.4 2005/02/16 10:27:44 jollytoad Exp $
  */
 
 include('./help/PostgresDoc70.php');
 
 # TODO: Check and fix links for 7.1
 
-$this->help_base = 'http://www.postgresql.org/docs/7.1/interactive/';
+$this->help_base = sprintf($GLOBALS['conf']['help_base'], '7.1');
 
 $this->help_page['pg.admin.analyze'] = 'sql-vacuum.html';
 $this->help_page['pg.admin.vacuum'] = 'sql-vacuum.html';
diff --git a/help/PostgresDoc72.php b/help/PostgresDoc72.php
index de6412ce..cff96db5 100644
--- a/help/PostgresDoc72.php
+++ b/help/PostgresDoc72.php
@@ -3,14 +3,14 @@
 /**
  * Help links for PostgreSQL 7.2 documentation
  *
- * $Id: PostgresDoc72.php,v 1.3 2004/11/15 17:25:03 soranzo Exp $
+ * $Id: PostgresDoc72.php,v 1.4 2005/02/16 10:27:44 jollytoad Exp $
  */
 
 include('./help/PostgresDoc71.php');
 
 # TODO: Check and fix links for 7.2
 
-$this->help_base = 'http://www.postgresql.org/docs/7.2/interactive/';
+$this->help_base = sprintf($GLOBALS['conf']['help_base'], '7.2');
 
 $this->help_page['pg.admin.analyze'] = 'sql-analyze.html';
 
diff --git a/help/PostgresDoc73.php b/help/PostgresDoc73.php
index 1c249cbc..6ae50889 100644
--- a/help/PostgresDoc73.php
+++ b/help/PostgresDoc73.php
@@ -3,14 +3,14 @@
 /**
  * Help links for PostgreSQL 7.3 documentation
  *
- * $Id: PostgresDoc73.php,v 1.2 2004/11/07 12:27:14 soranzo Exp $
+ * $Id: PostgresDoc73.php,v 1.3 2005/02/16 10:27:44 jollytoad Exp $
  */
 
 include('./help/PostgresDoc72.php');
 
 # TODO: Check and fix links for 7.3
 
-$this->help_base = 'http://www.postgresql.org/docs/7.3/interactive/';
+$this->help_base = sprintf($GLOBALS['conf']['help_base'], '7.3');
 
 $this->help_page['pg.database.create'][1] = 'manage-ag-createdb.html';
 
diff --git a/help/PostgresDoc74.php b/help/PostgresDoc74.php
index da640d99..7e07b5e5 100644
--- a/help/PostgresDoc74.php
+++ b/help/PostgresDoc74.php
@@ -3,12 +3,12 @@
 /**
  * Help links for PostgreSQL 7.4 documentation
  *
- * $Id: PostgresDoc74.php,v 1.3 2004/11/15 17:25:03 soranzo Exp $
+ * $Id: PostgresDoc74.php,v 1.4 2005/02/16 10:27:44 jollytoad Exp $
  */
  
 include('./help/PostgresDoc73.php');
 
-$this->help_base = 'http://www.postgresql.org/docs/7.4/interactive/';
+$this->help_base = sprintf($GLOBALS['conf']['help_base'], '7.4');
 
 $this->help_page['pg.aggregate.alter'] = 'sql-alteraggregate.html';
 
diff --git a/help/PostgresDoc80.php b/help/PostgresDoc80.php
index 934a22e0..f0bd19ad 100644
--- a/help/PostgresDoc80.php
+++ b/help/PostgresDoc80.php
@@ -3,12 +3,12 @@
 /**
  * Help links for PostgreSQL 8.0 documentation
  *
- * $Id: PostgresDoc80.php,v 1.4 2005/02/15 12:48:49 jollytoad Exp $
+ * $Id: PostgresDoc80.php,v 1.5 2005/02/16 10:27:44 jollytoad Exp $
  */
 
 include('./help/PostgresDoc74.php');
 
-$this->help_base = 'http://www.postgresql.org/docs/8.0/interactive/';
+$this->help_base = sprintf($GLOBALS['conf']['help_base'], '8.0');
 
 $this->help_page['pg.column.add'][0] = 'ddl-alter.html#AEN2217';
 $this->help_page['pg.column.drop'][0] = 'ddl-alter.html#AEN2226';
diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php
index 22a3d3fe..9dfa857a 100644
--- a/libraries/lib.inc.php
+++ b/libraries/lib.inc.php
@@ -3,7 +3,7 @@
 	/**
 	 * Function library read in upon startup
 	 *
-	 * $Id: lib.inc.php,v 1.90 2005/01/19 10:27:16 chriskl Exp $
+	 * $Id: lib.inc.php,v 1.91 2005/02/16 10:27:44 jollytoad Exp $
 	 */
 	
 	// Set error reporting level to max
@@ -36,7 +36,7 @@
 	// Configuration file version.  If this is greater than that in config.inc.php, then
 	// the app will refuse to run.  This and $conf['version'] should be incremented whenever
 	// backwards incompatible changes are made to config.inc.php-dist.
-	$conf['base_version'] = 13;
+	$conf['base_version'] = 14;
 
 	// List of available language files
 	$appLangFiles = array(