Tag v 6.0.0-beta4 Fixes links to PG help pagesv6.0.0-beta4

36 files changed, 116 insertions, 159 deletions

diff --git a/composer.json b/composer.json
index f44858dc..02a9a736 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "huasofoundries/phppgadmin",
-    "version": "6.0.0-beta3",
+    "version": "6.0.0-beta4",
     "description": "Like phpmyadmin but for postgres",
     "type": "project",
     "license": "MIT",
diff --git a/composer.lock b/composer.lock
index d46f8dc7..76747eee 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "5683177cba3d18f3aeb0dcc859d375c5",
-    "content-hash": "fe30cca84cd3ff7b984241fec0102d3d",
+    "hash": "77f266451ace5a87cd6d46f1052ce0f2",
+    "content-hash": "bd823aa572a32436443ede488327dc7d",
     "packages": [
         {
             "name": "adodb/adodb-php",
diff --git a/help/PostgresDoc81.php b/help/PostgresDoc81.php
deleted file mode 100644
index d91aac41..00000000
--- a/help/PostgresDoc81.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Help links for PostgreSQL 8.1 documentation
- *
- * $Id: PostgresDoc81.php,v 1.3 2006/12/28 04:26:55 xzilla Exp $
- */
-
-include BASE_PATH . '/help/PostgresDoc80.php';
-
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '8.1');
-
-$this->help_page['pg.role'] = 'user-manag.html';
-$this->help_page['pg.role.create'] = array('sql-createrole.html', 'user-manag.html#DATABASE-ROLES');
-$this->help_page['pg.role.alter'] = array('sql-alterrole.html', 'role-attributes.html');
-$this->help_page['pg.role.drop'] = array('sql-droprole.html', 'user-manag.html#DATABASE-ROLES');
diff --git a/help/PostgresDoc83.php b/help/PostgresDoc83.php
deleted file mode 100644
index 679069b0..00000000
--- a/help/PostgresDoc83.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Help links for PostgreSQL 8.3 documentation
- *
- * $Id: PostgresDoc83.php,v 1.3 2008/03/17 21:35:48 ioguix Exp $
- */
-
-include BASE_PATH . '/help/PostgresDoc82.php';
-
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '8.3');
-
-$this->help_page['pg.fts'] = 'textsearch.html';
-
-$this->help_page['pg.ftscfg'] = 'textsearch-intro.html#TEXTSEARCH-INTRO-CONFIGURATIONS';
-$this->help_page['pg.ftscfg.example'] = 'textsearch-configuration.html';
-$this->help_page['pg.ftscfg.drop'] = 'sql-droptsconfig.html';
-$this->help_page['pg.ftscfg.create'] = 'sql-createtsconfig.html';
-$this->help_page['pg.ftscfg.alter'] = 'sql-altertsconfig.html';
-
-$this->help_page['pg.ftsdict'] = 'textsearch-dictionaries.html';
-$this->help_page['pg.ftsdict.drop'] = 'sql-droptsdictionary.html';
-$this->help_page['pg.ftsdict.create'] = array('sql-createtsdictionary.html', 'sql-createtstemplate.html');
-$this->help_page['pg.ftsdict.alter'] = 'sql-altertsdictionary.html';
-
-$this->help_page['pg.ftsparser'] = 'textsearch-parsers.html';
diff --git a/help/PostgresDoc96.php b/help/PostgresDoc96.php
deleted file mode 100644
index 833ad105..00000000
--- a/help/PostgresDoc96.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Help links for PostgreSQL 9.5 documentation
- *
- */
-
-include BASE_PATH . '/help/PostgresDoc95.php';
-
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '9.5');
-
-$this->help_page['pg.matview'] = 'sql-creatematerializedview.html';
diff --git a/index.php b/index.php
index 711e2488..6a491f75 100644
--- a/index.php
+++ b/index.php
@@ -85,7 +85,7 @@ $app->get('/redirect[/{subject}]', function ($request, $response, $args) use ($m
 
 		$include_file = $url['url'];
 
-		\PC::debug($url, 'url');
+		\PC::debug($url, 'url', 'subject', $subject);
 
 		// Load query vars into superglobal arrays
 		if (isset($url['urlvars'])) {
diff --git a/src/classes/Misc.php b/src/classes/Misc.php
index 06bfb00a..2f4d63ab 100644
--- a/src/classes/Misc.php
+++ b/src/classes/Misc.php
@@ -146,7 +146,7 @@ class Misc {
 			// Create a database wrapper class for easy manipulation of the
 			// connection.
 
-			$this->data              = new $_type($_connection->conn);
+			$this->data              = new $_type($_connection->conn, $this->conf);
 			$this->data->platform    = $_connection->platform;
 			$this->data->server_info = $server_info;
 			$this->data->conf        = $this->conf;
@@ -1667,7 +1667,7 @@ class Misc {
 	}
 
 	function getHelpLink($help) {
-		return htmlspecialchars("help.php?help=" . urlencode($help) . "&server=" . urlencode($this->server_id));
+		return htmlspecialchars("/src/views/help.php?help=" . urlencode($help) . "&server=" . urlencode($this->server_id));
 
 	}
 
diff --git a/src/controllers/HelpController.php b/src/controllers/HelpController.php
index 20e77795..e5839d0b 100644
--- a/src/controllers/HelpController.php
+++ b/src/controllers/HelpController.php
@@ -8,6 +8,20 @@ namespace PHPPgAdmin\Controller;
 class HelpController extends BaseController {
 	public $_name = 'HelpController';
 
+	public function render() {
+		$action = $this->action;
+
+		switch ($action) {
+			case 'browse':
+				$this->doBrowse();
+				break;
+			default:
+				$this->doDefault();
+				break;
+		}
+
+	}
+
 	public function doDefault() {
 		$conf = $this->conf;
 		$misc = $this->misc;
@@ -17,6 +31,7 @@ class HelpController extends BaseController {
 		if (isset($_REQUEST['help'])) {
 			$url = $data->getHelp($_REQUEST['help']);
 
+			\PC::debug(['url' => $url], 'HelpController::doDefault');
 			if (is_array($url)) {
 				$this->doChoosePage($url);
 				return;
diff --git a/src/database/Postgres.php b/src/database/Postgres.php
index 68bc6136..39a152ad 100644
--- a/src/database/Postgres.php
+++ b/src/database/Postgres.php
@@ -163,9 +163,10 @@ class Postgres extends ADODB_base {
 	// The default type storage
 	var $typStorageDef = 'plain';
 
-	function __construct(&$conn) {
+	function __construct(&$conn, $conf) {
 		\PC::debug(['class' => __CLASS__, 'major_version' => $this->major_version], 'instanced connection class');
 		$this->conn = $conn;
+		$this->conf = $conf;
 	}
 	// Formatting functions
 
@@ -438,7 +439,7 @@ class Postgres extends ADODB_base {
 	}
 
 	function getHelpPages() {
-		include_once BASE_PATH . '/help/PostgresDoc95.php';
+		include_once BASE_PATH . '/src/help/PostgresDoc95.php';
 		return $this->help_page;
 	}
 
diff --git a/src/database/Postgres74.php b/src/database/Postgres74.php
index f5e09e91..9effcb75 100644
--- a/src/database/Postgres74.php
+++ b/src/database/Postgres74.php
@@ -25,7 +25,7 @@ class Postgres74 extends Postgres80 {
 	// Help functions
 
 	function getHelpPages() {
-		include_once BASE_PATH . '/help/PostgresDoc74.php';
+		include_once BASE_PATH . '/src/help/PostgresDoc74.php';
 		return $this->help_page;
 	}
 
diff --git a/src/database/Postgres80.php b/src/database/Postgres80.php
index 81137c7f..4bf4df20 100644
--- a/src/database/Postgres80.php
+++ b/src/database/Postgres80.php
@@ -47,7 +47,7 @@ class Postgres80 extends Postgres81 {
 	// Help functions
 
 	function getHelpPages() {
-		include_once BASE_PATH . '/help/PostgresDoc80.php';
+		include_once BASE_PATH . '/src/help/PostgresDoc80.php';
 		return $this->help_page;
 	}
 
diff --git a/src/database/Postgres81.php b/src/database/Postgres81.php
index 1e41596a..f16a26f6 100644
--- a/src/database/Postgres81.php
+++ b/src/database/Postgres81.php
@@ -42,7 +42,7 @@ class Postgres81 extends Postgres82 {
 	// Help functions
 
 	function getHelpPages() {
-		include_once BASE_PATH . '/help/PostgresDoc81.php';
+		include_once BASE_PATH . '/src/help/PostgresDoc81.php';
 		return $this->help_page;
 	}
 
diff --git a/src/database/Postgres82.php b/src/database/Postgres82.php
index e0ea5ee7..2a69e69b 100644
--- a/src/database/Postgres82.php
+++ b/src/database/Postgres82.php
@@ -19,7 +19,7 @@ class Postgres82 extends Postgres83 {
 	// Help functions
 
 	function getHelpPages() {
-		include_once BASE_PATH . '/help/PostgresDoc82.php';
+		include_once BASE_PATH . '/src/help/PostgresDoc82.php';
 		return $this->help_page;
 	}
 
diff --git a/src/database/Postgres83.php b/src/database/Postgres83.php
index d57aea7e..199dccc4 100644
--- a/src/database/Postgres83.php
+++ b/src/database/Postgres83.php
@@ -42,7 +42,7 @@ class Postgres83 extends Postgres84 {
 	// Help functions
 
 	function getHelpPages() {
-		include_once BASE_PATH . '/help/PostgresDoc83.php';
+		include_once BASE_PATH . '/src/help/PostgresDoc83.php';
 		return $this->help_page;
 	}
 
diff --git a/src/database/Postgres84.php b/src/database/Postgres84.php
index 6005ef8a..82c80513 100644
--- a/src/database/Postgres84.php
+++ b/src/database/Postgres84.php
@@ -27,7 +27,7 @@ class Postgres84 extends Postgres90 {
 	// Help functions
 
 	function getHelpPages() {
-		include_once BASE_PATH . '/help/PostgresDoc84.php';
+		include_once BASE_PATH . '/src/help/PostgresDoc84.php';
 		return $this->help_page;
 	}
 
diff --git a/src/database/Postgres90.php b/src/database/Postgres90.php
index 9f1b9b9f..ee6b6586 100644
--- a/src/database/Postgres90.php
+++ b/src/database/Postgres90.php
@@ -10,14 +10,10 @@ class Postgres90 extends Postgres91 {
 
 	var $major_version = 9.0;
 
-	function __construct(&$conn) {
-		\PC::debug(['class' => __CLASS__, 'major_version' => $this->major_version], 'instanced connection class');
-		$this->conn = $conn;
-	}
 	// Help functions
 
 	function getHelpPages() {
-		include_once BASE_PATH . '/help/PostgresDoc90.php';
+		include_once BASE_PATH . '/src/help/PostgresDoc90.php';
 		return $this->help_page;
 	}
 
diff --git a/src/database/Postgres91.php b/src/database/Postgres91.php
index 1df0249a..3e44a28f 100644
--- a/src/database/Postgres91.php
+++ b/src/database/Postgres91.php
@@ -10,14 +10,10 @@ class Postgres91 extends Postgres92 {
 
 	var $major_version = 9.1;
 
-	function __construct(&$conn) {
-		\PC::debug(['class' => __CLASS__, 'major_version' => $this->major_version], 'instanced connection class');
-		$this->conn = $conn;
-	}
 	// Help functions
 
 	function getHelpPages() {
-		include_once BASE_PATH . '/help/PostgresDoc91.php';
+		include_once BASE_PATH . '/src/help/PostgresDoc91.php';
 		return $this->help_page;
 	}
 
diff --git a/src/database/Postgres92.php b/src/database/Postgres92.php
index 11ee1a5e..c1122cf5 100644
--- a/src/database/Postgres92.php
+++ b/src/database/Postgres92.php
@@ -9,14 +9,10 @@ class Postgres92 extends Postgres93 {
 
 	var $major_version = 9.2;
 
-	function __construct(&$conn) {
-		\PC::debug(['class' => __CLASS__, 'major_version' => $this->major_version], 'instanced connection class');
-		$this->conn = $conn;
-	}
 	// Help functions
 
 	function getHelpPages() {
-		include_once BASE_PATH . '/help/PostgresDoc92.php';
+		include_once BASE_PATH . '/src/help/PostgresDoc92.php';
 		return $this->help_page;
 	}
 
diff --git a/src/database/Postgres93.php b/src/database/Postgres93.php
index c3be16f7..7ec326f8 100644
--- a/src/database/Postgres93.php
+++ b/src/database/Postgres93.php
@@ -8,14 +8,11 @@ namespace PHPPgAdmin\Database;
 class Postgres93 extends Postgres {
 
 	var $major_version = 9.3;
-	function __construct(&$conn) {
-		\PC::debug(['class' => __CLASS__, 'major_version' => $this->major_version], 'instanced connection class');
-		$this->conn = $conn;
-	}
+
 	// Help functions
 
 	function getHelpPages() {
-		include_once BASE_PATH . '/help/PostgresDoc93.php';
+		include_once BASE_PATH . '/src/help/PostgresDoc93.php';
 		return $this->help_page;
 	}
 
diff --git a/src/database/Postgres94.php b/src/database/Postgres94.php
index c35ec68a..f1632507 100644
--- a/src/database/Postgres94.php
+++ b/src/database/Postgres94.php
@@ -8,14 +8,11 @@ namespace PHPPgAdmin\Database;
 class Postgres94 extends Postgres {
 
 	var $major_version = 9.4;
-	function __construct(&$conn) {
-		\PC::debug(['class' => __CLASS__, 'major_version' => $this->major_version], 'instanced connection class');
-		$this->conn = $conn;
-	}
+
 	// Help functions
 
 	function getHelpPages() {
-		include_once BASE_PATH . '/help/PostgresDoc94.php';
+		include_once BASE_PATH . '/src/help/PostgresDoc94.php';
 		return $this->help_page;
 	}
 
diff --git a/src/database/Postgres95.php b/src/database/Postgres95.php
index 098fd920..7b6d242b 100644
--- a/src/database/Postgres95.php
+++ b/src/database/Postgres95.php
@@ -9,14 +9,10 @@ class Postgres95 extends Postgres {
 
 	var $major_version = 9.5;
 
-	function __construct(&$conn) {
-		\PC::debug(['class' => __CLASS__, 'major_version' => $this->major_version], 'instanced connection class');
-		$this->conn = $conn;
-	}
 	// Help functions
 
 	function getHelpPages() {
-		include_once BASE_PATH . '/help/PostgresDoc95.php';
+		include_once BASE_PATH . '/src/help/PostgresDoc95.php';
 		return $this->help_page;
 	}
 
diff --git a/src/database/Postgres96.php b/src/database/Postgres96.php
index a1cb3844..d2c3468a 100644
--- a/src/database/Postgres96.php
+++ b/src/database/Postgres96.php
@@ -9,14 +9,11 @@ class Postgres96 extends Postgres {
 
 	var $major_version = 9.6;
 
-	function __construct(&$conn) {
-		\PC::debug(['class' => __CLASS__, 'major_version' => $this->major_version], 'instanced connection class');
-		$this->conn = $conn;
-	}
 	// Help functions
 
 	function getHelpPages() {
-		include_once BASE_PATH . '/help/PostgresDoc96.php';
+		include_once BASE_PATH . '/src/help/PostgresDoc96.php';
+
 		return $this->help_page;
 	}
 
diff --git a/help/PostgresDoc74.php b/src/help/PostgresDoc74.php
index 2261f17b..bfc05f53 100644
--- a/help/PostgresDoc74.php
+++ b/src/help/PostgresDoc74.php
@@ -4,27 +4,27 @@
  * Help links for PostgreSQL 7.4 documentation
  */
 
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '7.4');
+$this->help_base = sprintf($this->conf['help_base'], strval($this->major_version));
 
 # TODO: Check and fix links
 
-$this->help_page = array(
+$this->help_page = [
 
 	'pg.database' => 'managing-databases.html',
-	'pg.database.create' => array('sql-createdatabase.html', 'manage-ag-createdb.html'),
+	'pg.database.create' => ['sql-createdatabase.html', 'manage-ag-createdb.html'],
 	'pg.database.alter' => 'sql-alterdatabase.html',
-	'pg.database.drop' => array('sql-dropdatabase.html', 'manage-ag-dropdb.html'),
+	'pg.database.drop' => ['sql-dropdatabase.html', 'manage-ag-dropdb.html'],
 
 	'pg.admin.analyze' => 'sql-analyze.html',
 	'pg.admin.vacuum' => 'sql-vacuum.html',
 
-	'pg.cast' => array('sql-expressions.html#SQL-SYNTAX-TYPE-CASTS', 'sql-createcast.html'),
+	'pg.cast' => ['sql-expressions.html#SQL-SYNTAX-TYPE-CASTS', 'sql-createcast.html'],
 	'pg.cast.create' => 'sql-createcast.html',
 	'pg.cast.drop' => 'sql-dropcast.html',
 
-	'pg.column.add' => array('ddl-alter.html#AEN2115', 'sql-altertable.html'),
-	'pg.column.alter' => array('ddl-alter.html', 'sql-altertable.html'),
-	'pg.column.drop' => array('ddl-alter.html#AEN2124', 'sql-altertable.html'),
+	'pg.column.add' => ['ddl-alter.html#AEN2115', 'sql-altertable.html'],
+	'pg.column.alter' => ['ddl-alter.html', 'sql-altertable.html'],
+	'pg.column.drop' => ['ddl-alter.html#AEN2124', 'sql-altertable.html'],
 
 	'pg.constraint' => 'ddl-constraints.html',
 	'pg.constraint.add' => 'ddl-alter.html#AEN2131',
@@ -44,16 +44,16 @@ $this->help_page = array(
 	'pg.domain.create' => 'sql-createdomain.html',
 	'pg.domain.drop' => 'sql-dropdomain.html',
 
-	'pg.function' => array('xfunc.html', 'functions.html', 'sql-expressions.html#AEN1599'),
+	'pg.function' => ['xfunc.html', 'functions.html', 'sql-expressions.html#AEN1599'],
 	'pg.function.alter' => 'sql-alterfunction.html',
 	'pg.function.create' => 'sql-createfunction.html',
-	'pg.function.create.c' => array('xfunc-c.html', 'sql-createfunction.html'),
-	'pg.function.create.internal' => array('xfunc-internal.html', 'sql-createfunction.html'),
-	'pg.function.create.pl' => array('xfunc-sql.html', 'xfunc-pl.html', 'sql-createfunction.html'),
+	'pg.function.create.c' => ['xfunc-c.html', 'sql-createfunction.html'],
+	'pg.function.create.internal' => ['xfunc-internal.html', 'sql-createfunction.html'],
+	'pg.function.create.pl' => ['xfunc-sql.html', 'xfunc-pl.html', 'sql-createfunction.html'],
 	'pg.function.drop' => 'sql-dropfunction.html',
 
 	'pg.group' => 'groups.html',
-	'pg.group.alter' => array('sql-altergroup.html', 'groups.html'),
+	'pg.group.alter' => ['sql-altergroup.html', 'groups.html'],
 	'pg.group.create' => 'sql-creategroup.html',
 	'pg.group.drop' => 'sql-dropgroup.html',
 
@@ -73,7 +73,7 @@ $this->help_page = array(
 	'pg.opclass.create' => 'sql-createopclass.html',
 	'pg.opclass.drop' => 'sql-dropopclass.html',
 
-	'pg.operator' => array('xoper.html', 'functions.html', 'sql-expressions.html#AEN1570'),
+	'pg.operator' => ['xoper.html', 'functions.html', 'sql-expressions.html#AEN1570'],
 	'pg.operator.alter' => 'sql-alteroperator.html',
 	'pg.operator.create' => 'sql-createoperator.html',
 	'pg.operator.drop' => 'sql-dropoperator.html',
@@ -84,7 +84,7 @@ $this->help_page = array(
 	'pg.pl.plpython' => 'plpython.html',
 	'pg.pl.pltcl' => 'pltcl.html',
 
-	'pg.privilege' => array('privileges.html', 'ddl-priv.html'),
+	'pg.privilege' => ['privileges.html', 'ddl-priv.html'],
 	'pg.privilege.grant' => 'sql-grant.html',
 	'pg.privilege.revoke' => 'sql-revoke.html',
 
@@ -96,7 +96,7 @@ $this->help_page = array(
 
 	'pg.schema' => 'ddl-schemas.html',
 	'pg.schema.alter' => 'sql-alterschema.html',
-	'pg.schema.create' => array('sql-createschema.html', 'ddl-schemas.html#DDL-SCHEMAS-CREATE'),
+	'pg.schema.create' => ['sql-createschema.html', 'ddl-schemas.html#DDL-SCHEMAS-CREATE'],
 	'pg.schema.drop' => 'sql-dropschema.html',
 	'pg.schema.search_path' => 'ddl-schemas.html#DDL-SCHEMAS-PATH',
 
@@ -105,7 +105,7 @@ $this->help_page = array(
 	'pg.sequence.create' => 'sql-createsequence.html',
 	'pg.sequence.drop' => 'sql-dropsequence.html',
 
-	'pg.sql' => array('sql.html', 'sql-commands.html'),
+	'pg.sql' => ['sql.html', 'sql-commands.html'],
 	'pg.sql.insert' => 'sql-insert.html',
 	'pg.sql.select' => 'sql-select.html',
 	'pg.sql.update' => 'sql-update.html',
@@ -126,23 +126,23 @@ $this->help_page = array(
 	'pg.trigger.create' => 'sql-createtrigger.html',
 	'pg.trigger.drop' => 'sql-droptrigger.html',
 
-	'pg.type' => array('xtypes.html', 'datatype.html', 'extend-type-system.html'),
+	'pg.type' => ['xtypes.html', 'datatype.html', 'extend-type-system.html'],
 	'pg.type.alter' => 'sql-altertype.html',
 	'pg.type.create' => 'sql-createtype.html',
 	'pg.type.drop' => 'sql-droptype.html',
 
-	'pg.user.alter' => array('sql-alteruser.html', 'user-attributes.html'),
-	'pg.user.create' => array('sql-createuser.html', 'user-manag.html#DATABASE-USERS'),
-	'pg.user.drop' => array('sql-dropuser.html', 'user-manag.html#DATABASE-USERS'),
+	'pg.user.alter' => ['sql-alteruser.html', 'user-attributes.html'],
+	'pg.user.create' => ['sql-createuser.html', 'user-manag.html#DATABASE-USERS'],
+	'pg.user.drop' => ['sql-dropuser.html', 'user-manag.html#DATABASE-USERS'],
 
 	'pg.variable' => 'runtime-config.html',
 
 	'pg.view' => 'tutorial-views.html',
-	'pg.view.alter' => array('sql-createview.html', 'sql-altertable.html'),
+	'pg.view.alter' => ['sql-createview.html', 'sql-altertable.html'],
 	'pg.view.create' => 'sql-createview.html',
 	'pg.view.drop' => 'sql-dropview.html',
 
-	'pg.aggregate' => array('xaggr.html', 'tutorial-agg.html', 'functions-aggregate.html', 'sql-expressions.html#SYNTAX-AGGREGATES'),
+	'pg.aggregate' => ['xaggr.html', 'tutorial-agg.html', 'functions-aggregate.html', 'sql-expressions.html#SYNTAX-AGGREGATES'],
 	'pg.aggregate.create' => 'sql-createaggregate.html',
 	'pg.aggregate.drop' => 'sql-dropaggregate.html',
 	'pg.aggregate.alter' => 'sql-alteraggregate.html',
@@ -152,4 +152,4 @@ $this->help_page = array(
 	'pg.user' => 'user-manag.html',
 
 	'pg.locks' => 'view-pg-locks.html',
-);
+];
diff --git a/help/PostgresDoc80.php b/src/help/PostgresDoc80.php
index d1c03f30..fc8562b5 100644
--- a/help/PostgresDoc80.php
+++ b/src/help/PostgresDoc80.php
@@ -8,16 +8,14 @@
 
 include BASE_PATH . '/help/PostgresDoc74.php';
 
-$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.add'][0]  = 'ddl-alter.html#AEN2217';
 $this->help_page['pg.column.drop'][0] = 'ddl-alter.html#AEN2226';
 
-$this->help_page['pg.constraint.add'] = 'ddl-alter.html#AEN2217';
-$this->help_page['pg.constraint.check'] = 'ddl-constraints.html#AEN1978';
-$this->help_page['pg.constraint.drop'] = 'ddl-alter.html#AEN2226';
+$this->help_page['pg.constraint.add']         = 'ddl-alter.html#AEN2217';
+$this->help_page['pg.constraint.check']       = 'ddl-constraints.html#AEN1978';
+$this->help_page['pg.constraint.drop']        = 'ddl-alter.html#AEN2226';
 $this->help_page['pg.constraint.primary_key'] = 'ddl-constraints.html#AEN2055';
-$this->help_page['pg.constraint.unique_key'] = 'ddl-constraints.html#AEN2033';
+$this->help_page['pg.constraint.unique_key']  = 'ddl-constraints.html#AEN2033';
 
 $this->help_page['pg.domain'] = 'extend-type-system.html#AEN27940';
 
diff --git a/src/help/PostgresDoc81.php b/src/help/PostgresDoc81.php
new file mode 100644
index 00000000..30991eb7
--- /dev/null
+++ b/src/help/PostgresDoc81.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * Help links for PostgreSQL 8.1 documentation
+ *
+ * $Id: PostgresDoc81.php,v 1.3 2006/12/28 04:26:55 xzilla Exp $
+ */
+
+include BASE_PATH . '/help/PostgresDoc80.php';
+
+$this->help_page['pg.role']        = 'user-manag.html';
+$this->help_page['pg.role.create'] = ['sql-createrole.html', 'user-manag.html#DATABASE-ROLES'];
+$this->help_page['pg.role.alter']  = ['sql-alterrole.html', 'role-attributes.html'];
+$this->help_page['pg.role.drop']   = ['sql-droprole.html', 'user-manag.html#DATABASE-ROLES'];
diff --git a/help/PostgresDoc82.php b/src/help/PostgresDoc82.php
index d7b5c8f5..56d5ab5f 100644
--- a/help/PostgresDoc82.php
+++ b/src/help/PostgresDoc82.php
@@ -7,5 +7,3 @@
  */
 
 include BASE_PATH . '/help/PostgresDoc81.php';
-
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '8.2');
diff --git a/src/help/PostgresDoc83.php b/src/help/PostgresDoc83.php
new file mode 100644
index 00000000..067fb154
--- /dev/null
+++ b/src/help/PostgresDoc83.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Help links for PostgreSQL 8.3 documentation
+ *
+ * $Id: PostgresDoc83.php,v 1.3 2008/03/17 21:35:48 ioguix Exp $
+ */
+
+include BASE_PATH . '/help/PostgresDoc82.php';
+
+$this->help_page['pg.fts'] = 'textsearch.html';
+
+$this->help_page['pg.ftscfg']         = 'textsearch-intro.html#TEXTSEARCH-INTRO-CONFIGURATIONS';
+$this->help_page['pg.ftscfg.example'] = 'textsearch-configuration.html';
+$this->help_page['pg.ftscfg.drop']    = 'sql-droptsconfig.html';
+$this->help_page['pg.ftscfg.create']  = 'sql-createtsconfig.html';
+$this->help_page['pg.ftscfg.alter']   = 'sql-altertsconfig.html';
+
+$this->help_page['pg.ftsdict']        = 'textsearch-dictionaries.html';
+$this->help_page['pg.ftsdict.drop']   = 'sql-droptsdictionary.html';
+$this->help_page['pg.ftsdict.create'] = ['sql-createtsdictionary.html', 'sql-createtstemplate.html'];
+$this->help_page['pg.ftsdict.alter']  = 'sql-altertsdictionary.html';
+
+$this->help_page['pg.ftsparser'] = 'textsearch-parsers.html';
diff --git a/help/PostgresDoc84.php b/src/help/PostgresDoc84.php
index dde0144e..3ea6d5b3 100644
--- a/help/PostgresDoc84.php
+++ b/src/help/PostgresDoc84.php
@@ -7,5 +7,3 @@
  */
 
 include BASE_PATH . '/help/PostgresDoc83.php';
-
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '8.4');
diff --git a/help/PostgresDoc90.php b/src/help/PostgresDoc90.php
index 5d72989d..1a44ee0e 100644
--- a/help/PostgresDoc90.php
+++ b/src/help/PostgresDoc90.php
@@ -7,5 +7,3 @@
  */
 
 include BASE_PATH . '/help/PostgresDoc84.php';
-
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '9.0');
diff --git a/help/PostgresDoc91.php b/src/help/PostgresDoc91.php
index f86535f8..2871b968 100644
--- a/help/PostgresDoc91.php
+++ b/src/help/PostgresDoc91.php
@@ -7,5 +7,3 @@
  */
 
 include BASE_PATH . '/help/PostgresDoc90.php';
-
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '9.1');
diff --git a/help/PostgresDoc92.php b/src/help/PostgresDoc92.php
index a15cd71d..a11bfa5f 100644
--- a/help/PostgresDoc92.php
+++ b/src/help/PostgresDoc92.php
@@ -7,5 +7,3 @@
  */
 
 include BASE_PATH . '/help/PostgresDoc91.php';
-
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '9.2');
diff --git a/help/PostgresDoc93.php b/src/help/PostgresDoc93.php
index 91c329c5..e13f95b8 100644
--- a/help/PostgresDoc93.php
+++ b/src/help/PostgresDoc93.php
@@ -7,5 +7,3 @@
  */
 
 include BASE_PATH . '/help/PostgresDoc92.php';
-
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '9.3');
diff --git a/help/PostgresDoc94.php b/src/help/PostgresDoc94.php
index 5e02dde5..e5b42845 100644
--- a/help/PostgresDoc94.php
+++ b/src/help/PostgresDoc94.php
@@ -7,5 +7,3 @@
  */
 
 include BASE_PATH . '/help/PostgresDoc93.php';
-
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '9.4');
diff --git a/help/PostgresDoc95.php b/src/help/PostgresDoc95.php
index acf2745f..b8d8c0e0 100644
--- a/help/PostgresDoc95.php
+++ b/src/help/PostgresDoc95.php
@@ -7,6 +7,4 @@
 
 include BASE_PATH . '/help/PostgresDoc94.php';
 
-$this->help_base = sprintf($GLOBALS['conf']['help_base'], '9.5');
-
 $this->help_page['pg.matview'] = 'sql-creatematerializedview.html';
diff --git a/src/help/PostgresDoc96.php b/src/help/PostgresDoc96.php
new file mode 100644
index 00000000..94e89d93
--- /dev/null
+++ b/src/help/PostgresDoc96.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * Help links for PostgreSQL 9.5 documentation
+ *
+ */
+
+include BASE_PATH . '/help/PostgresDoc95.php';
diff --git a/src/views/help.php b/src/views/help.php
index bd02d615..ac85a87f 100644
--- a/src/views/help.php
+++ b/src/views/help.php
@@ -10,12 +10,4 @@
 require_once '../lib.inc.php';
 
 $help_controller = new \PHPPgAdmin\Controller\HelpController($container);
-
-switch ($action) {
-	case 'browse':
-		$help_controller->doBrowse();
-		break;
-	default:
-		$help_controller->doDefault();
-		break;
-}
+$help_controller->render();