before tag v6 RC4

45 files changed, 55 insertions, 46 deletions

diff --git a/src/controllers/AcinsertController.php b/src/controllers/AcinsertController.php
index b25fa7b5..25bd9555 100644
--- a/src/controllers/AcinsertController.php
+++ b/src/controllers/AcinsertController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/AggregatesController.php b/src/controllers/AggregatesController.php
index e004a9c2..e33522f9 100644
--- a/src/controllers/AggregatesController.php
+++ b/src/controllers/AggregatesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/AlldbController.php b/src/controllers/AlldbController.php
index 77c3c7cc..20e97fe9 100644
--- a/src/controllers/AlldbController.php
+++ b/src/controllers/AlldbController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php
index 0befd7f8..e6296111 100644
--- a/src/controllers/BaseController.php
+++ b/src/controllers/BaseController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/BrowserController.php b/src/controllers/BrowserController.php
index e5b821ea..4074a733 100644
--- a/src/controllers/BrowserController.php
+++ b/src/controllers/BrowserController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/CastsController.php b/src/controllers/CastsController.php
index bf6b9f97..de0b9285 100644
--- a/src/controllers/CastsController.php
+++ b/src/controllers/CastsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/ColpropertiesController.php b/src/controllers/ColpropertiesController.php
index c3576019..b54a14d5 100644
--- a/src/controllers/ColpropertiesController.php
+++ b/src/controllers/ColpropertiesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/ConstraintsController.php b/src/controllers/ConstraintsController.php
index d487f8de..fada970b 100644
--- a/src/controllers/ConstraintsController.php
+++ b/src/controllers/ConstraintsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/ConversionsController.php b/src/controllers/ConversionsController.php
index a9301a65..884ec060 100644
--- a/src/controllers/ConversionsController.php
+++ b/src/controllers/ConversionsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/DatabaseController.php b/src/controllers/DatabaseController.php
index 40ef4b7e..e60648ac 100644
--- a/src/controllers/DatabaseController.php
+++ b/src/controllers/DatabaseController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/DataexportController.php b/src/controllers/DataexportController.php
index 6cf47462..defdacb7 100644
--- a/src/controllers/DataexportController.php
+++ b/src/controllers/DataexportController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/DataimportController.php b/src/controllers/DataimportController.php
index 768e6577..3cea8d43 100644
--- a/src/controllers/DataimportController.php
+++ b/src/controllers/DataimportController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/DbexportController.php b/src/controllers/DbexportController.php
index 2e663498..70bb80c0 100644
--- a/src/controllers/DbexportController.php
+++ b/src/controllers/DbexportController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/DisplayController.php b/src/controllers/DisplayController.php
index 6765e747..a6e960d0 100644
--- a/src/controllers/DisplayController.php
+++ b/src/controllers/DisplayController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
@@ -133,6 +133,15 @@ class DisplayController extends BaseController
             count(*) AS \"count\"
             FROM \"{$f_schema}\".\"{$f_table}\"
             GROUP BY \"{$object}\" ORDER BY \"{$object}\"";
+        } elseif ($subject === 'table' && !isset($_REQUEST['query'])) {
+            $query = $data->getSelectSQL(
+                $_REQUEST['table'],
+                array_keys($_POST['show']),
+                $_POST['values'],
+                $_POST['ops']
+            );
+            $_REQUEST['query']  = $query;
+            $_REQUEST['return'] = 'selectrows';
         }
 
         //$object = $this->setIfIsset($object, $_REQUEST[$subject]);
diff --git a/src/controllers/DomainsController.php b/src/controllers/DomainsController.php
index 5138b75a..6692a1b3 100644
--- a/src/controllers/DomainsController.php
+++ b/src/controllers/DomainsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/FulltextController.php b/src/controllers/FulltextController.php
index 3ef499d7..d123f40c 100644
--- a/src/controllers/FulltextController.php
+++ b/src/controllers/FulltextController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/FunctionsController.php b/src/controllers/FunctionsController.php
index 67a615cb..fc04cd4e 100644
--- a/src/controllers/FunctionsController.php
+++ b/src/controllers/FunctionsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/GroupsController.php b/src/controllers/GroupsController.php
index 113c87e5..72e196b8 100644
--- a/src/controllers/GroupsController.php
+++ b/src/controllers/GroupsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/HelpController.php b/src/controllers/HelpController.php
index 97b35d13..882b4cc0 100644
--- a/src/controllers/HelpController.php
+++ b/src/controllers/HelpController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/HistoryController.php b/src/controllers/HistoryController.php
index 27432eec..d0ae15b2 100644
--- a/src/controllers/HistoryController.php
+++ b/src/controllers/HistoryController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/IndexesController.php b/src/controllers/IndexesController.php
index efabf200..c37b5172 100644
--- a/src/controllers/IndexesController.php
+++ b/src/controllers/IndexesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/InfoController.php b/src/controllers/InfoController.php
index 966451f0..cff86d4c 100644
--- a/src/controllers/InfoController.php
+++ b/src/controllers/InfoController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/IntroController.php b/src/controllers/IntroController.php
index 9b0d9578..17f0fa3c 100644
--- a/src/controllers/IntroController.php
+++ b/src/controllers/IntroController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/LanguagesController.php b/src/controllers/LanguagesController.php
index c98b9525..71d16b0f 100644
--- a/src/controllers/LanguagesController.php
+++ b/src/controllers/LanguagesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/LoginController.php b/src/controllers/LoginController.php
index f141ad33..0518aa70 100644
--- a/src/controllers/LoginController.php
+++ b/src/controllers/LoginController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/MaterializedviewpropertiesController.php b/src/controllers/MaterializedviewpropertiesController.php
index bf2bff53..869125d8 100644
--- a/src/controllers/MaterializedviewpropertiesController.php
+++ b/src/controllers/MaterializedviewpropertiesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/MaterializedviewsController.php b/src/controllers/MaterializedviewsController.php
index cf6494c4..c0eba6d8 100644
--- a/src/controllers/MaterializedviewsController.php
+++ b/src/controllers/MaterializedviewsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/OpclassesController.php b/src/controllers/OpclassesController.php
index ce6babcf..6095dd35 100644
--- a/src/controllers/OpclassesController.php
+++ b/src/controllers/OpclassesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/OperatorsController.php b/src/controllers/OperatorsController.php
index 94338bb7..5c8d30ae 100644
--- a/src/controllers/OperatorsController.php
+++ b/src/controllers/OperatorsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/PrivilegesController.php b/src/controllers/PrivilegesController.php
index 4a11f641..908a0bf4 100644
--- a/src/controllers/PrivilegesController.php
+++ b/src/controllers/PrivilegesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/RolesController.php b/src/controllers/RolesController.php
index 4f9d95cb..368d579d 100644
--- a/src/controllers/RolesController.php
+++ b/src/controllers/RolesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/RulesController.php b/src/controllers/RulesController.php
index 1b84710e..18571df1 100644
--- a/src/controllers/RulesController.php
+++ b/src/controllers/RulesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/SchemasController.php b/src/controllers/SchemasController.php
index 6b7002f4..c718c894 100644
--- a/src/controllers/SchemasController.php
+++ b/src/controllers/SchemasController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/SequencesController.php b/src/controllers/SequencesController.php
index f6fdbafc..849c9118 100644
--- a/src/controllers/SequencesController.php
+++ b/src/controllers/SequencesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/ServersController.php b/src/controllers/ServersController.php
index d5b50bf3..e4f78c6f 100644
--- a/src/controllers/ServersController.php
+++ b/src/controllers/ServersController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/SqlController.php b/src/controllers/SqlController.php
index 55c6ca61..e6ba9633 100644
--- a/src/controllers/SqlController.php
+++ b/src/controllers/SqlController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/SqleditController.php b/src/controllers/SqleditController.php
index 70fffb36..5d234ab5 100644
--- a/src/controllers/SqleditController.php
+++ b/src/controllers/SqleditController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/TablesController.php b/src/controllers/TablesController.php
index 55c32b24..56fc2801 100644
--- a/src/controllers/TablesController.php
+++ b/src/controllers/TablesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
@@ -831,7 +831,7 @@ class TablesController extends BaseController
 
             $attrs = $data->getTableAttributes($_REQUEST['table']);
 
-            echo '<form action="'.\SUBFOLDER.'/src/views/tables" method="post" id="selectform">'.PHP_EOL;
+            echo '<form action="'.\SUBFOLDER.'/src/views/display" method="post" id="selectform">'.PHP_EOL;
             if ($attrs->recordCount() > 0) {
                 // JavaScript for select all feature
                 echo '<script type="text/javascript">'.PHP_EOL;
diff --git a/src/controllers/TablespacesController.php b/src/controllers/TablespacesController.php
index fc831c23..436c68cc 100644
--- a/src/controllers/TablespacesController.php
+++ b/src/controllers/TablespacesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/TblpropertiesController.php b/src/controllers/TblpropertiesController.php
index ea74768a..715306e9 100644
--- a/src/controllers/TblpropertiesController.php
+++ b/src/controllers/TblpropertiesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/TriggersController.php b/src/controllers/TriggersController.php
index 7b2e8651..dc725d53 100644
--- a/src/controllers/TriggersController.php
+++ b/src/controllers/TriggersController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/TypesController.php b/src/controllers/TypesController.php
index 6a1e8f49..766487fb 100644
--- a/src/controllers/TypesController.php
+++ b/src/controllers/TypesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/UsersController.php b/src/controllers/UsersController.php
index 7fc7ea9a..62fef479 100644
--- a/src/controllers/UsersController.php
+++ b/src/controllers/UsersController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/ViewpropertiesController.php b/src/controllers/ViewpropertiesController.php
index 91f8eb32..afaf9bbe 100644
--- a/src/controllers/ViewpropertiesController.php
+++ b/src/controllers/ViewpropertiesController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;
diff --git a/src/controllers/ViewsController.php b/src/controllers/ViewsController.php
index 1cd2a454..cf33f4f7 100644
--- a/src/controllers/ViewsController.php
+++ b/src/controllers/ViewsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC3
+ * PHPPgAdmin v6.0.0-RC4
  */
 
 namespace PHPPgAdmin\Controller;