diff -urNpa phpPgAdmin-5.2-dev/all_db.php phpPgAdmin/all_db.php
--- phpPgAdmin-5.2-dev/all_db.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/all_db.php	2018-04-14 21:44:40.193268755 +0000
@@ -193,16 +193,17 @@
 		}
 		echo "\t\t\t</select>\n";
 		echo "\t\t</td>\n\t</tr>\n";
-
+	    
 		// ENCODING
 		echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strencoding']}</th>\n";
 		echo "\t\t<td class=\"data1\">\n";
 		echo "\t\t\t<select name=\"formEncoding\">\n";
 		echo "\t\t\t\t<option value=\"\"></option>\n";
-		while (list ($key) = each ($data->codemap)) {
-		    echo "\t\t\t\t<option value=\"", htmlspecialchars($key), "\"",
-				($key == $_POST['formEncoding']) ? ' selected="selected"' : '', ">",
-				$misc->printVal($key), "</option>\n";
+
+		foreach($data->codemap as $key => $value) {
+			echo "\t\t\t\t<option value=\"", htmlspecialchars($key), "\"",
+			($key == $_POST['formEncoding']) ? ' selected="selected"' : '', ">",
+			$misc->printVal($key), "</option>\n";
 		}
 		echo "\t\t\t</select>\n";
 		echo "\t\t</td>\n\t</tr>\n";
diff -urNpa phpPgAdmin-5.2-dev/classes/ArrayRecordSet.php phpPgAdmin/classes/ArrayRecordSet.php
--- phpPgAdmin-5.2-dev/classes/ArrayRecordSet.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/ArrayRecordSet.php	2018-04-14 21:37:08.506273841 +0000
@@ -12,7 +12,7 @@ class ArrayRecordSet {
 	var $EOF = false;
 	var $fields;
 	
-	function ArrayRecordSet($data) {
+	function __construct($data) {
 		$this->_array = $data;
 		$this->_count = count($this->_array);
 		$this->fields = reset($this->_array);
diff -urNpa phpPgAdmin-5.2-dev/classes/class.select.php phpPgAdmin/classes/class.select.php
--- phpPgAdmin-5.2-dev/classes/class.select.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/class.select.php	2018-04-14 21:46:29.154267529 +0000
@@ -24,7 +24,7 @@ class XHtmlSimpleElement {
 	* derived class
 	* 
 	*/
-	function XHtmlSimpleElement($element = null) {
+	function __construct($element = null) {
 
 		$this->_element = $this->is_element();
 		
@@ -93,8 +93,8 @@ class XHtmlElement extends XHtmlSimpleEl
 	var $_htmlcode = "";
 	var $_siblings = array();
 
-	function XHtmlElement($text = null) {
-		XHtmlSimpleElement::XHtmlSimpleElement();
+	function __construct($text = null) {
+		parent::__construct();
 		
 		if ($text) $this->set_text($text);
 	}
@@ -159,8 +159,8 @@ class XHtmlElement extends XHtmlSimpleEl
 }
 
 class XHTML_Button extends XHtmlElement {
-	function XHTML_Button ($name, $text = null) {
-		parent::XHtmlElement();
+	function __construct($name, $text = null) {
+		parent::__construct();
 		
 		$this->set_attribute("name", $name);
 		
@@ -170,8 +170,8 @@ class XHTML_Button extends XHtmlElement
 
 
 class XHTML_Option extends XHtmlElement {
-	function XHTML_Option($text, $value = null) {
-		XHtmlElement::XHtmlElement(null);			
+	function __construct($text, $value = null) {
+		parent::__construct(null);			
 		$this->set_text($text);
 	}
 }
@@ -180,8 +180,8 @@ class XHTML_Option extends XHtmlElement
 class XHTML_Select extends XHTMLElement {
 	var $_data;
 
-	function XHTML_Select ($name, $multiple = false, $size = null) {
-		XHtmlElement::XHtmlElement();					
+	function __construct($name, $multiple = false, $size = null) {
+		parent::__construct();					
 
 		$this->set_attribute("name", $name);
 		if ($multiple) $this->set_attribute("multiple","multiple");
@@ -206,7 +206,10 @@ class XHTML_Select extends XHTMLElement
 	
 	function fetch() {
 		if (isset($this->_data) && $this->_data) {
-			foreach ($this->_data as $value) { $this->add(new XHTML_Option($value)); }
+			foreach ($this->_data as $value) { 
+				$XHTML_Opt = new XHTML_Option($value);
+				$this->add($XHTML_Opt);
+			}
 		}
 		return parent::fetch();
 	}
diff -urNpa phpPgAdmin-5.2-dev/classes/database/ADODB_base.php phpPgAdmin/classes/database/ADODB_base.php
--- phpPgAdmin-5.2-dev/classes/database/ADODB_base.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/database/ADODB_base.php	2018-04-14 21:44:12.554269067 +0000
@@ -20,7 +20,7 @@ class ADODB_base {
 	 * Base constructor
 	 * @param &$conn The connection object
 	 */
-	function ADODB_base(&$conn) {
+	function __construct(&$conn) {
 		$this->conn = $conn;
 	}
 
@@ -59,7 +59,7 @@ class ADODB_base {
 	 */
 	function arrayClean(&$arr) {
 		reset($arr);
-		while(list($k, $v) = each($arr))
+		foreach ($arr as $k => $v)
 			$arr[$k] = addslashes($v);
 		return $arr;
 	}
@@ -141,7 +141,7 @@ class ADODB_base {
 
 		// Build clause
 		$sql = '';
-		while(list($key, $value) = each($conditions)) {
+		foreach ($conditions as $key => $value) {
 			$this->clean($key);
 			$this->clean($value);
 			if ($sql) $sql .= " AND \"{$key}\"='{$value}'";
@@ -221,7 +221,7 @@ class ADODB_base {
 
 		// Populate the syntax arrays
 		reset($vars);
-		while(list($key, $value) = each($vars)) {
+		foreach ($vars as $key => $value) {
 			$this->fieldClean($key);
 			$this->clean($value);
 			if ($setClause) $setClause .= ", \"{$key}\"='{$value}'";
@@ -229,14 +229,13 @@ class ADODB_base {
 		}
 
 		reset($nulls);
-		while(list(, $value) = each($nulls)) {
+		foreach ($nulls as $value) {
 			$this->fieldClean($value);
 			if ($setClause) $setClause .= ", \"{$value}\"=NULL";
 			else $setClause = "UPDATE \"{$table}\" SET \"{$value}\"=NULL";
 		}
-
 		reset($where);
-		while(list($key, $value) = each($where)) {
+		foreach ($where as $key => $value) {
 			$this->fieldClean($key);
 			$this->clean($value);
 			if ($whereClause) $whereClause .= " AND \"{$key}\"='{$value}'";
diff -urNpa phpPgAdmin-5.2-dev/classes/database/Connection.php phpPgAdmin/classes/database/Connection.php
--- phpPgAdmin-5.2-dev/classes/database/Connection.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/database/Connection.php	2018-04-14 21:49:02.514265802 +0000
@@ -19,8 +19,8 @@ class Connection {
 	 * Creates a new connection.  Will actually make a database connection.
 	 * @param $fetchMode Defaults to associative.  Override for different behaviour
 	 */
-	function Connection($host, $port, $sslmode, $user, $password, $database, $fetchMode = ADODB_FETCH_ASSOC) {
-		$this->conn = ADONewConnection('postgres7');
+	function __construct($host, $port, $sslmode, $user, $password, $database, $fetchMode = ADODB_FETCH_ASSOC) {
+		$this->conn = ADONewConnection('postgres');
 		$this->conn->setFetchMode($fetchMode);
 
 		// Ignore host if null
diff -urNpa phpPgAdmin-5.2-dev/classes/database/Postgres74.php phpPgAdmin/classes/database/Postgres74.php
--- phpPgAdmin-5.2-dev/classes/database/Postgres74.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/database/Postgres74.php	2018-04-14 21:37:08.509273841 +0000
@@ -29,8 +29,8 @@ class Postgres74 extends Postgres80 {
 	 * Constructor
 	 * @param $conn The database connection
 	 */
-	function Postgres74($conn) {
-		$this->Postgres80($conn);
+	function __construct($conn) {
+		parent::__construct($conn);
 	}
 
 	// Help functions
diff -urNpa phpPgAdmin-5.2-dev/classes/database/Postgres80.php phpPgAdmin/classes/database/Postgres80.php
--- phpPgAdmin-5.2-dev/classes/database/Postgres80.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/database/Postgres80.php	2018-04-14 21:37:08.509273841 +0000
@@ -50,8 +50,8 @@ class Postgres80 extends Postgres81 {
 	 * Constructor
 	 * @param $conn The database connection
 	 */
-	function Postgres80($conn) {
-		$this->Postgres81($conn);
+	function __construct($conn) {
+		parent::__construct($conn);
 	}
 
 	// Help functions
diff -urNpa phpPgAdmin-5.2-dev/classes/database/Postgres81.php phpPgAdmin/classes/database/Postgres81.php
--- phpPgAdmin-5.2-dev/classes/database/Postgres81.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/database/Postgres81.php	2018-04-14 21:37:08.509273841 +0000
@@ -45,8 +45,8 @@ class Postgres81 extends Postgres82 {
 	 * Constructor
 	 * @param $conn The database connection
 	 */
-	function Postgres81($conn) {
-		$this->Postgres82($conn);
+	function __construct($conn) {
+		parent::__construct($conn);
 	}
 
 	// Help functions
diff -urNpa phpPgAdmin-5.2-dev/classes/database/Postgres82.php phpPgAdmin/classes/database/Postgres82.php
--- phpPgAdmin-5.2-dev/classes/database/Postgres82.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/database/Postgres82.php	2018-04-14 21:37:08.509273841 +0000
@@ -22,8 +22,8 @@ class Postgres82 extends Postgres83 {
 	 * Constructor
 	 * @param $conn The database connection
 	 */
-	function Postgres82($conn) {
-		$this->Postgres($conn);
+	function __construct($conn) {
+		parent::__construct($conn);
 	}
 
 	// Help functions
diff -urNpa phpPgAdmin-5.2-dev/classes/database/Postgres83.php phpPgAdmin/classes/database/Postgres83.php
--- phpPgAdmin-5.2-dev/classes/database/Postgres83.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/database/Postgres83.php	2018-04-14 21:37:08.509273841 +0000
@@ -45,8 +45,8 @@ class Postgres83 extends Postgres84 {
 	 * Constructor
 	 * @param $conn The database connection
 	 */
-	function Postgres83($conn) {
-		$this->Postgres($conn);
+	function __construct($conn) {
+		parent::__construct($conn);
 	}
 
 	// Help functions
diff -urNpa phpPgAdmin-5.2-dev/classes/database/Postgres84.php phpPgAdmin/classes/database/Postgres84.php
--- phpPgAdmin-5.2-dev/classes/database/Postgres84.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/database/Postgres84.php	2018-04-14 21:37:08.509273841 +0000
@@ -30,8 +30,8 @@ class Postgres84 extends Postgres90 {
 	 * Constructor
 	 * @param $conn The database connection
 	 */
-	function Postgres84($conn) {
-		$this->Postgres($conn);
+	function __construct($conn) {
+		parent::__construct($conn);
 	}
 
 	// Help functions
diff -urNpa phpPgAdmin-5.2-dev/classes/database/Postgres90.php phpPgAdmin/classes/database/Postgres90.php
--- phpPgAdmin-5.2-dev/classes/database/Postgres90.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/database/Postgres90.php	2018-04-14 21:37:08.509273841 +0000
@@ -16,8 +16,8 @@ class Postgres90 extends Postgres91 {
 	 * Constructor
 	 * @param $conn The database connection
 	 */
-	function Postgres90($conn) {
-		$this->Postgres($conn);
+	function __construct($conn) {
+		parent::__construct($conn);
 	}
 
 	// Help functions
diff -urNpa phpPgAdmin-5.2-dev/classes/database/Postgres91.php phpPgAdmin/classes/database/Postgres91.php
--- phpPgAdmin-5.2-dev/classes/database/Postgres91.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/database/Postgres91.php	2018-04-14 21:37:08.509273841 +0000
@@ -16,8 +16,8 @@ class Postgres91 extends Postgres92 {
 	 * Constructor
 	 * @param $conn The database connection
 	 */
-	function Postgres91($conn) {
-		$this->Postgres($conn);
+	function __construct($conn) {
+		parent::__construct($conn);
 	}
 
 	// Help functions
diff -urNpa phpPgAdmin-5.2-dev/classes/database/Postgres92.php phpPgAdmin/classes/database/Postgres92.php
--- phpPgAdmin-5.2-dev/classes/database/Postgres92.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/database/Postgres92.php	2018-04-14 21:37:08.509273841 +0000
@@ -15,8 +15,8 @@ class Postgres92 extends Postgres93 {
 	 * Constructor
 	 * @param $conn The database connection
 	 */
-	function Postgres92($conn) {
-		$this->Postgres($conn);
+	function __construct($conn) {
+		parent::__construct($conn);
 	}
 
 	// Help functions
diff -urNpa phpPgAdmin-5.2-dev/classes/database/Postgres93.php phpPgAdmin/classes/database/Postgres93.php
--- phpPgAdmin-5.2-dev/classes/database/Postgres93.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/database/Postgres93.php	2018-04-14 21:37:08.509273841 +0000
@@ -15,8 +15,8 @@ class Postgres93 extends Postgres94 {
 	 * Constructor
 	 * @param $conn The database connection
 	 */
-	function Postgres93($conn) {
-		$this->Postgres($conn);
+	function __construct($conn) {
+		parent::__construct($conn);
 	}
 
 	// Help functions
diff -urNpa phpPgAdmin-5.2-dev/classes/database/Postgres.php phpPgAdmin/classes/database/Postgres.php
--- phpPgAdmin-5.2-dev/classes/database/Postgres.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/database/Postgres.php	2018-04-14 21:37:08.508273841 +0000
@@ -169,8 +169,8 @@ class Postgres extends ADODB_base {
 	 * Constructor
 	 * @param $conn The database connection
 	 */
-	function Postgres($conn) {
-		$this->ADODB_base($conn);
+	function __construct($conn) {
+		parent::__construct($conn);
 	}
 
 	// Formatting functions
diff -urNpa phpPgAdmin-5.2-dev/classes/Gui.php phpPgAdmin/classes/Gui.php
--- phpPgAdmin-5.2-dev/classes/Gui.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/Gui.php	2018-04-14 21:37:08.506273841 +0000
@@ -9,7 +9,7 @@
 		/**
 		 *Constructor
 		 */
-		function GUI () {}
+		function __construct () {}
 		 
 		/**
 		 * Prints a combox box
@@ -21,7 +21,7 @@
 		 * @param (optional) $iSize int to specify the size IF a multi select combo
 		 * @return string with the generated HTML select box
 		 */
-		function printCombo(&$arrOptions, $szName, $bBlankEntry = true, $szDefault = '', $bMultiple = false, $iSize = 10) {
+		static function printCombo(&$arrOptions, $szName, $bBlankEntry = true, $szDefault = '', $bMultiple = false, $iSize = 10) {
 			$htmlOut = '';
 			if ($bMultiple) // If multiple select combo
 				$htmlOut .= "<select name=\"$szName\" id=\"$szName\" multiple=\"multiple\" size=\"$iSize\">\n";
diff -urNpa phpPgAdmin-5.2-dev/classes/Misc.php phpPgAdmin/classes/Misc.php
--- phpPgAdmin-5.2-dev/classes/Misc.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/classes/Misc.php	2018-04-14 21:52:24.533263527 +0000
@@ -12,7 +12,7 @@
 		var $form;
 
 		/* Constructor */
-		function Misc() {
+		function __construct() {
 		}
 
 		/**
diff -urNpa phpPgAdmin-5.2-dev/constraints.php phpPgAdmin/constraints.php
--- phpPgAdmin-5.2-dev/constraints.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/constraints.php	2018-04-14 21:52:51.395263225 +0000
@@ -158,7 +158,8 @@
 
 				if ($attrs->recordCount() > 0) {
 					while (!$attrs->EOF) {
-						$selColumns->add(new XHTML_Option($attrs->fields['attname']));
+						$XHTML_Opt = new XHTML_Option($attrs->fields['attname']);
+						$selColumns->add($XHTML_Opt);
 						$attrs->moveNext();
 					}
 				}
@@ -251,7 +252,8 @@
 
 			if ($attrs->recordCount() > 0) {
 				while (!$attrs->EOF) {
-					$selColumns->add(new XHTML_Option($attrs->fields['attname']));
+					$XHTML_Opt = new XHTML_Option($attrs->fields['attname']);
+					$selColumns->add($XHTML_Opt);
 					$attrs->moveNext();
 				}
 			}
diff -urNpa phpPgAdmin-5.2-dev/dataexport.php phpPgAdmin/dataexport.php
--- phpPgAdmin-5.2-dev/dataexport.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/dataexport.php	2018-04-14 22:06:39.517253901 +0000
@@ -124,7 +124,7 @@
 				echo " FROM stdin;\n";
 				while (!$rs->EOF) {
 					$first = true;
-					while(list($k, $v) = each($rs->fields)) {
+					foreach ($rs -> fields as $k => $v) {
 						// Escape value
 						$v = $data->escapeBytea($v);
 						
diff -urNpa phpPgAdmin-5.2-dev/indexes.php phpPgAdmin/indexes.php
--- phpPgAdmin-5.2-dev/indexes.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/indexes.php	2018-04-14 22:07:24.916253390 +0000
@@ -91,7 +91,8 @@
 
 		if ($attrs->recordCount() > 0) {
 			while (!$attrs->EOF) {
-				$selColumns->add(new XHTML_Option($attrs->fields['attname']));
+				$XHTML_Opt = new XHTML_Option($attrs->fields['attname']);
+				$selColumns->add($XHTML_Opt);
 				$attrs->moveNext();
 			}
 		}
diff -urNpa phpPgAdmin-5.2-dev/libraries/adodb/adodb-datadict.inc.php phpPgAdmin/libraries/adodb/adodb-datadict.inc.php
--- phpPgAdmin-5.2-dev/libraries/adodb/adodb-datadict.inc.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/libraries/adodb/adodb-datadict.inc.php	2018-04-14 22:08:09.636252886 +0000
@@ -518,7 +518,7 @@ class ADODB_DataDict {
 			list($lines,$pkey,$idxs) = $this->_GenFields($flds);
 			// genfields can return FALSE at times
 			if ($lines == null) $lines = array();
-			list(,$first) = each($lines);
+			list(,$first) = array_values($lines);
 			list(,$column_def) = preg_split("/[\t ]+/",$first,2);
 		}
 		return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
diff -urNpa phpPgAdmin-5.2-dev/libraries/adodb/adodb-error.inc.php phpPgAdmin/libraries/adodb/adodb-error.inc.php
--- phpPgAdmin-5.2-dev/libraries/adodb/adodb-error.inc.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/libraries/adodb/adodb-error.inc.php	2018-04-14 22:13:36.238249209 +0000
@@ -103,7 +103,7 @@ function adodb_error_pg($errormsg)
 			 	 => DB_ERROR_ALREADY_EXISTS
         );
 	reset($error_regexps);
-    while (list($regexp,$code) = each($error_regexps)) {
+    foreach ($error_regexps as $regexp => $code) {
         if (preg_match($regexp, $errormsg)) {
             return $code;
         }
diff -urNpa phpPgAdmin-5.2-dev/libraries/adodb/adodb.inc.php phpPgAdmin/libraries/adodb/adodb.inc.php
--- phpPgAdmin-5.2-dev/libraries/adodb/adodb.inc.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/libraries/adodb/adodb.inc.php	2018-04-14 22:39:01.179232040 +0000
@@ -234,7 +234,7 @@
 	
 		var $createdir = true; // requires creation of temp dirs
 		
-		function ADODB_Cache_File()
+		function __construct()
 		{
 		global $ADODB_INCLUDED_CSV;
 			if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
@@ -427,7 +427,7 @@
 	/**
 	 * Constructor
 	 */
-	function ADOConnection()			
+	function __construct()			
 	{
 		die('Virtual Class -- cannot instantiate');
 	}
@@ -963,8 +963,7 @@
 				if (!$array_2d) $inputarr = array($inputarr);
 				foreach($inputarr as $arr) {
 					$sql = ''; $i = 0;
-					//Use each() instead of foreach to reduce memory usage -mikefedyk
-					while(list(, $v) = each($arr)) {
+					foreach($arr as $v) {
 						$sql .= $sqlarr[$i];
 						// from Ron Baldwin <ron.baldwin#sourceprose.com>
 						// Only quote string types	
@@ -2896,7 +2895,7 @@ http://www.stanford.edu/dept/itss/docs/o
 	 * @param queryID  	this is the queryID returned by ADOConnection->_query()
 	 *
 	 */
-	function ADORecordSet($queryID) 
+	function __construct($queryID) 
 	{
 		$this->_queryID = $queryID;
 	}
@@ -3887,13 +3886,13 @@ http://www.stanford.edu/dept/itss/docs/o
 		 * Constructor
 		 *
 		 */
-		function ADORecordSet_array($fakeid=1)
+		function __construct($fakeid=1)
 		{
 		global $ADODB_FETCH_MODE,$ADODB_COMPAT_FETCH;
 		
 			// fetch() on EOF does not delete $this->fields
 			$this->compat = !empty($ADODB_COMPAT_FETCH);
-			$this->ADORecordSet($fakeid); // fake queryID		
+			parent::__construct($fakeid); // fake queryID		
 			$this->fetchMode = $ADODB_FETCH_MODE;
 		}
 		
diff -urNpa phpPgAdmin-5.2-dev/libraries/adodb/drivers/adodb-postgres64.inc.php phpPgAdmin/libraries/adodb/drivers/adodb-postgres64.inc.php
--- phpPgAdmin-5.2-dev/libraries/adodb/drivers/adodb-postgres64.inc.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/libraries/adodb/drivers/adodb-postgres64.inc.php	2018-04-14 21:37:08.528273841 +0000
@@ -873,7 +873,7 @@ class ADORecordSet_postgres64 extends AD
 	var $_blobArr;
 	var $databaseType = "postgres64";
 	var $canSeek = true;
-	function ADORecordSet_postgres64($queryID,$mode=false) 
+	function __construct($queryID,$mode=false) 
 	{
 		if ($mode === false) { 
 			global $ADODB_FETCH_MODE;
@@ -889,7 +889,7 @@ class ADORecordSet_postgres64 extends AD
 		default: $this->fetchMode = PGSQL_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);
+		parent::__construct($queryID);
 	}
 	
 	function GetRowAssoc($upper=true)
diff -urNpa phpPgAdmin-5.2-dev/libraries/adodb/drivers/adodb-postgres7.inc.php phpPgAdmin/libraries/adodb/drivers/adodb-postgres7.inc.php
--- phpPgAdmin-5.2-dev/libraries/adodb/drivers/adodb-postgres7.inc.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/libraries/adodb/drivers/adodb-postgres7.inc.php	2018-04-14 22:41:49.430230145 +0000
@@ -22,9 +22,9 @@ class ADODB_postgres7 extends ADODB_post
 	var $ansiOuter = true;
 	var $charSet = true; //set to true for Postgres 7 and above - PG client supports encodings
 	
-	function ADODB_postgres7() 
+	function __construct() 
 	{
-		$this->ADODB_postgres64();
+		parent::__construct();
 		if (ADODB_ASSOC_CASE !== 2) {
 			$this->rsPrefix .= 'assoc_';
 		}
@@ -215,9 +215,9 @@ class ADORecordSet_postgres7 extends ADO
 	var $databaseType = "postgres7";
 	
 	
-	function ADORecordSet_postgres7($queryID,$mode=false) 
+	function __construct($queryID,$mode=false) 
 	{
-		$this->ADORecordSet_postgres64($queryID,$mode);
+		parent::__construct($queryID,$mode);
 	}
 	
 	 	// 10% speedup to move MoveNext to child class
diff -urNpa phpPgAdmin-5.2-dev/libraries/adodb/toexport.inc.php phpPgAdmin/libraries/adodb/toexport.inc.php
--- phpPgAdmin-5.2-dev/libraries/adodb/toexport.inc.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/libraries/adodb/toexport.inc.php	2018-04-14 22:41:27.668230390 +0000
@@ -74,7 +74,7 @@ function _adodb_export(&$rs,$sep,$seprep
 		$fieldTypes = $rs->FieldTypesArray();
 		reset($fieldTypes);
 		$i = 0;
-		while(list(,$o) = each($fieldTypes)) {
+		foreach ($fieldTypes as $o) {
 		
 			$v = ($o) ? $o->name : 'Field'.($i++);
 			if ($escquote) $v = str_replace($quote,$escquotequote,$v);
diff -urNpa phpPgAdmin-5.2-dev/libraries/decorator.inc.php phpPgAdmin/libraries/decorator.inc.php
--- phpPgAdmin-5.2-dev/libraries/decorator.inc.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/libraries/decorator.inc.php	2018-04-14 21:37:08.529273841 +0000
@@ -91,7 +91,7 @@ function value_url(&$var, &$fields) {
 
 class Decorator
 {
-	function Decorator($value) {
+	function __construct($value) {
 		$this->v = $value;
 	}
 	
@@ -102,7 +102,7 @@ class Decorator
 
 class FieldDecorator extends Decorator
 {
-	function FieldDecorator($fieldName, $default = null) {
+	function __construct($fieldName, $default = null) {
 		$this->f = $fieldName;
 		if ($default !== null) $this->d = $default;
 	}
@@ -114,7 +114,7 @@ class FieldDecorator extends Decorator
 
 class ArrayMergeDecorator extends Decorator
 {
-	function ArrayMergeDecorator($arrays) {
+	function __construct($arrays) {
 		$this->m = $arrays;
 	}
 	
@@ -129,7 +129,7 @@ class ArrayMergeDecorator extends Decora
 
 class ConcatDecorator extends Decorator
 {
-	function ConcatDecorator($values) {
+	function __construct($values) {
 		$this->c = $values;
 	}
 	
@@ -144,7 +144,7 @@ class ConcatDecorator extends Decorator
 
 class CallbackDecorator extends Decorator
 {
-	function CallbackDecorator($callback, $param = null) {
+	function __construct($callback, $param = null) {
 		$this->fn = $callback;
 		$this->p = $param;
 	}
@@ -156,7 +156,7 @@ class CallbackDecorator extends Decorato
 
 class IfEmptyDecorator extends Decorator
 {
-	function IfEmptyDecorator($value, $empty, $full = null) {
+	function __construct($value, $empty, $full = null) {
 		$this->v = $value;
 		$this->e = $empty;
 		if ($full !== null) $this->f = $full;
@@ -173,7 +173,7 @@ class IfEmptyDecorator extends Decorator
 
 class UrlDecorator extends Decorator
 {
-	function UrlDecorator($base, $queryVars = null) {
+	function __construct($base, $queryVars = null) {
 		$this->b = $base;
 		if ($queryVars !== null)
 			$this->q = $queryVars;
@@ -199,7 +199,7 @@ class UrlDecorator extends Decorator
 
 class replaceDecorator extends Decorator
 {
-	function replaceDecorator($str, $params) {
+	function __construct($str, $params) {
 		$this->s = $str;
 		$this->p = $params;
 	}
diff -urNpa phpPgAdmin-5.2-dev/triggers.php phpPgAdmin/triggers.php
--- phpPgAdmin-5.2-dev/triggers.php	2018-04-14 21:23:50.000000000 +0000
+++ phpPgAdmin/triggers.php	2018-04-14 22:42:37.428229605 +0000
@@ -181,7 +181,8 @@
 		/* Populate functions */
 		$sel0 = new XHTML_Select('formFunction');
 		while (!$funcs->EOF) {
-			$sel0->add(new XHTML_Option($funcs->fields['proname']));
+			$XHTML_Opt = new XHTML_Option($funcs->fields['proname']);
+			$sel0->add($XHTML_Opt);
 			$funcs->moveNext();
 		}