Creating Tag v6.0.0-RC5 at 2020-02-05 -v6.0.0-RC5

45 files changed, 60 insertions, 57 deletions

diff --git a/src/controllers/AcinsertController.php b/src/controllers/AcinsertController.php
index 25bd9555..7107dc8e 100644
--- a/src/controllers/AcinsertController.php
+++ b/src/controllers/AcinsertController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/AggregatesController.php b/src/controllers/AggregatesController.php
index e33522f9..f813f661 100644
--- a/src/controllers/AggregatesController.php
+++ b/src/controllers/AggregatesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/AlldbController.php b/src/controllers/AlldbController.php
index 20e97fe9..81105099 100644
--- a/src/controllers/AlldbController.php
+++ b/src/controllers/AlldbController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php
index e6296111..701def4f 100644
--- a/src/controllers/BaseController.php
+++ b/src/controllers/BaseController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/BrowserController.php b/src/controllers/BrowserController.php
index 4074a733..8cd801ff 100644
--- a/src/controllers/BrowserController.php
+++ b/src/controllers/BrowserController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/CastsController.php b/src/controllers/CastsController.php
index de0b9285..8e559f92 100644
--- a/src/controllers/CastsController.php
+++ b/src/controllers/CastsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/ColpropertiesController.php b/src/controllers/ColpropertiesController.php
index b54a14d5..5b759eb2 100644
--- a/src/controllers/ColpropertiesController.php
+++ b/src/controllers/ColpropertiesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
@@ -96,7 +96,7 @@ class ColpropertiesController extends BaseController
             if (null !== $attrs->fields['comment']) {
                 echo '<p class="comment">', $this->misc->printVal($attrs->fields['comment']), '</p>'.PHP_EOL;
             }
-            $this->prtrace('$isTable', $isTable);
+            //$this->prtrace('$isTable', $isTable);
 
             $column = [
                 'column' => [
@@ -232,7 +232,7 @@ class ColpropertiesController extends BaseController
 
         $this->coalesceArr($_REQUEST, 'stage', 1);
 
-        $this->prtrace('$_REQUEST', $_REQUEST, 'msg', $msg);
+        #$this->prtrace('$_REQUEST', $_REQUEST, 'msg', $msg);
 
         switch ($_REQUEST['stage']) {
             case 1:
@@ -263,7 +263,7 @@ class ColpropertiesController extends BaseController
                     $_REQUEST['field'] = $column->fields['attname'];
                     $_REQUEST['type']  = $column->fields['base_type'];
                     // Check to see if its' an array type...
-                    // XXX: HACKY
+                    // @todo this is pretty hacky!
                     if ('[]' == substr($column->fields['base_type'], strlen($column->fields['base_type']) - 2)) {
                         $_REQUEST['type']  = substr($column->fields['base_type'], 0, strlen($column->fields['base_type']) - 2);
                         $_REQUEST['array'] = '[]';
@@ -272,7 +272,7 @@ class ColpropertiesController extends BaseController
                         $_REQUEST['array'] = '';
                     }
                     // To figure out the length, look in the brackets :(
-                    // XXX: HACKY
+                    //  @todo this is pretty hacky
                     if ($column->fields['type'] != $column->fields['base_type'] && preg_match('/\\(([0-9, ]*)\\)/', $column->fields['type'], $bits)) {
                         $_REQUEST['length'] = $bits[1];
                     } else {
@@ -380,7 +380,7 @@ class ColpropertiesController extends BaseController
                     $_REQUEST['comment']
                 );
 
-                $this->prtrace('status', $status, 'sql', $sql);
+                //$this->prtrace('status', $status, 'sql', $sql);
                 if (0 == $status) {
                     if ($_REQUEST['column'] != $_REQUEST['field']) {
                         $_REQUEST['column'] = $_REQUEST['field'];
diff --git a/src/controllers/ConstraintsController.php b/src/controllers/ConstraintsController.php
index fada970b..d54bc170 100644
--- a/src/controllers/ConstraintsController.php
+++ b/src/controllers/ConstraintsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/ConversionsController.php b/src/controllers/ConversionsController.php
index 884ec060..a68e1e78 100644
--- a/src/controllers/ConversionsController.php
+++ b/src/controllers/ConversionsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/DatabaseController.php b/src/controllers/DatabaseController.php
index e60648ac..f7ad9489 100644
--- a/src/controllers/DatabaseController.php
+++ b/src/controllers/DatabaseController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/DataexportController.php b/src/controllers/DataexportController.php
index defdacb7..466317a4 100644
--- a/src/controllers/DataexportController.php
+++ b/src/controllers/DataexportController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/DataimportController.php b/src/controllers/DataimportController.php
index 3cea8d43..ea33dba6 100644
--- a/src/controllers/DataimportController.php
+++ b/src/controllers/DataimportController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/DbexportController.php b/src/controllers/DbexportController.php
index 70bb80c0..651e267a 100644
--- a/src/controllers/DbexportController.php
+++ b/src/controllers/DbexportController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/DisplayController.php b/src/controllers/DisplayController.php
index a6e960d0..34932046 100644
--- a/src/controllers/DisplayController.php
+++ b/src/controllers/DisplayController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
@@ -134,11 +134,14 @@ class DisplayController extends BaseController
             FROM \"{$f_schema}\".\"{$f_table}\"
             GROUP BY \"{$object}\" ORDER BY \"{$object}\"";
         } elseif ($subject === 'table' && !isset($_REQUEST['query'])) {
-            $query = $data->getSelectSQL(
+            $show   = $this->getPostParam('show', []);
+            $values = $this->getPostParam('values', []);
+            $ops    = $this->getPostParam('ops', []);
+            $query  = $data->getSelectSQL(
                 $_REQUEST['table'],
-                array_keys($_POST['show']),
-                $_POST['values'],
-                $_POST['ops']
+                array_keys($show),
+                $values,
+                $ops
             );
             $_REQUEST['query']  = $query;
             $_REQUEST['return'] = 'selectrows';
diff --git a/src/controllers/DomainsController.php b/src/controllers/DomainsController.php
index 6692a1b3..c25fc999 100644
--- a/src/controllers/DomainsController.php
+++ b/src/controllers/DomainsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/FulltextController.php b/src/controllers/FulltextController.php
index d123f40c..7983e5cb 100644
--- a/src/controllers/FulltextController.php
+++ b/src/controllers/FulltextController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/FunctionsController.php b/src/controllers/FunctionsController.php
index fc04cd4e..b209b800 100644
--- a/src/controllers/FunctionsController.php
+++ b/src/controllers/FunctionsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/GroupsController.php b/src/controllers/GroupsController.php
index 72e196b8..c2cb34b6 100644
--- a/src/controllers/GroupsController.php
+++ b/src/controllers/GroupsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/HelpController.php b/src/controllers/HelpController.php
index 882b4cc0..3b3fc6ce 100644
--- a/src/controllers/HelpController.php
+++ b/src/controllers/HelpController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/HistoryController.php b/src/controllers/HistoryController.php
index d0ae15b2..66cda798 100644
--- a/src/controllers/HistoryController.php
+++ b/src/controllers/HistoryController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/IndexesController.php b/src/controllers/IndexesController.php
index c37b5172..08be4fa6 100644
--- a/src/controllers/IndexesController.php
+++ b/src/controllers/IndexesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
@@ -105,14 +105,14 @@ class IndexesController extends BaseController
         };
         $this->coalesceArr($_REQUEST, 'subject', 'table');
 
-        $subject = urlencode($_REQUEST['subject']);
-        $object  = urlencode($_REQUEST[$_REQUEST['subject']]);
+        $subject = urlencode($this->getRequestParam('subject', 'table'));
+        $object  = urlencode($this->getRequestParam($subject));
 
         $this->printTrail($subject);
         $this->printTabs($subject, 'indexes');
         $this->printMsg($msg);
 
-        $indexes = $data->getIndexes($_REQUEST[$_REQUEST['subject']]);
+        $indexes = $data->getIndexes($object);
 
         $columns = [
             'index'       => [
diff --git a/src/controllers/InfoController.php b/src/controllers/InfoController.php
index cff86d4c..38c90557 100644
--- a/src/controllers/InfoController.php
+++ b/src/controllers/InfoController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/IntroController.php b/src/controllers/IntroController.php
index 17f0fa3c..19f0bd19 100644
--- a/src/controllers/IntroController.php
+++ b/src/controllers/IntroController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/LanguagesController.php b/src/controllers/LanguagesController.php
index 71d16b0f..12d729eb 100644
--- a/src/controllers/LanguagesController.php
+++ b/src/controllers/LanguagesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/LoginController.php b/src/controllers/LoginController.php
index 0518aa70..597a629a 100644
--- a/src/controllers/LoginController.php
+++ b/src/controllers/LoginController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/MaterializedviewpropertiesController.php b/src/controllers/MaterializedviewpropertiesController.php
index 869125d8..25e1867c 100644
--- a/src/controllers/MaterializedviewpropertiesController.php
+++ b/src/controllers/MaterializedviewpropertiesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/MaterializedviewsController.php b/src/controllers/MaterializedviewsController.php
index c0eba6d8..d9388070 100644
--- a/src/controllers/MaterializedviewsController.php
+++ b/src/controllers/MaterializedviewsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/OpclassesController.php b/src/controllers/OpclassesController.php
index 6095dd35..97cb65d0 100644
--- a/src/controllers/OpclassesController.php
+++ b/src/controllers/OpclassesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/OperatorsController.php b/src/controllers/OperatorsController.php
index 5c8d30ae..a1c423bc 100644
--- a/src/controllers/OperatorsController.php
+++ b/src/controllers/OperatorsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/PrivilegesController.php b/src/controllers/PrivilegesController.php
index 908a0bf4..4c47e4e3 100644
--- a/src/controllers/PrivilegesController.php
+++ b/src/controllers/PrivilegesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/RolesController.php b/src/controllers/RolesController.php
index 368d579d..a6f3e7dc 100644
--- a/src/controllers/RolesController.php
+++ b/src/controllers/RolesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/RulesController.php b/src/controllers/RulesController.php
index 18571df1..fac546be 100644
--- a/src/controllers/RulesController.php
+++ b/src/controllers/RulesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/SchemasController.php b/src/controllers/SchemasController.php
index c718c894..698ac1f3 100644
--- a/src/controllers/SchemasController.php
+++ b/src/controllers/SchemasController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/SequencesController.php b/src/controllers/SequencesController.php
index 849c9118..c48a6289 100644
--- a/src/controllers/SequencesController.php
+++ b/src/controllers/SequencesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/ServersController.php b/src/controllers/ServersController.php
index e4f78c6f..c6ced3d9 100644
--- a/src/controllers/ServersController.php
+++ b/src/controllers/ServersController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/SqlController.php b/src/controllers/SqlController.php
index e6ba9633..45ed3c09 100644
--- a/src/controllers/SqlController.php
+++ b/src/controllers/SqlController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/SqleditController.php b/src/controllers/SqleditController.php
index 5d234ab5..47b36960 100644
--- a/src/controllers/SqleditController.php
+++ b/src/controllers/SqleditController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/TablesController.php b/src/controllers/TablesController.php
index 56fc2801..4f518be9 100644
--- a/src/controllers/TablesController.php
+++ b/src/controllers/TablesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/TablespacesController.php b/src/controllers/TablespacesController.php
index 436c68cc..a8b908b0 100644
--- a/src/controllers/TablespacesController.php
+++ b/src/controllers/TablespacesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/TblpropertiesController.php b/src/controllers/TblpropertiesController.php
index 715306e9..8b4018d0 100644
--- a/src/controllers/TblpropertiesController.php
+++ b/src/controllers/TblpropertiesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/TriggersController.php b/src/controllers/TriggersController.php
index dc725d53..921ba75f 100644
--- a/src/controllers/TriggersController.php
+++ b/src/controllers/TriggersController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/TypesController.php b/src/controllers/TypesController.php
index 766487fb..83fd4dcb 100644
--- a/src/controllers/TypesController.php
+++ b/src/controllers/TypesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/UsersController.php b/src/controllers/UsersController.php
index 62fef479..dcac1ff6 100644
--- a/src/controllers/UsersController.php
+++ b/src/controllers/UsersController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/ViewpropertiesController.php b/src/controllers/ViewpropertiesController.php
index afaf9bbe..dd1853b7 100644
--- a/src/controllers/ViewpropertiesController.php
+++ b/src/controllers/ViewpropertiesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/ViewsController.php b/src/controllers/ViewsController.php
index cf33f4f7..f6f4778e 100644
--- a/src/controllers/ViewsController.php
+++ b/src/controllers/ViewsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC4
+ * PHPPgAdmin v6.0.0-RC5
  */
 
 namespace PHPPgAdmin\Controller;