finish off Save as Report feature - sweeeeet

diff --git a/classes/database/BaseDB.php b/classes/database/BaseDB.php
index c86e6f8fca02803f16b07a0ae2de9817fc345a03..b304a7448a24c527b781b4e079fe59142bcd3126 100644 (file)
--- a/classes/database/BaseDB.php
+++ b/classes/database/BaseDB.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: BaseDB.php,v 1.25 2003/08/18 08:10:16 chriskl Exp $
+ * $Id: BaseDB.php,v 1.26 2003/08/18 08:20:43 chriskl Exp $
  */
 
 include_once('classes/database/ADODB_base.php');
@@ -124,7 +124,7 @@ class BaseDB extends ADODB_base {
                $this->fieldClean($table);
 
                $sql = "SELECT \"" . join('","', $show) . "\" FROM ";
-               if ($this->hasSchemas()) {
+               if ($this->hasSchemas() && isset($_REQUEST['schema'])) {
                        $this->fieldClean($_REQUEST['schema']);
                        $sql .= "\"{$_REQUEST['schema']}\".";
                }

diff --git a/display.php b/display.php
index c3c9f9f2f38927fbd549112512da425f2124bbdd..3a85fb8a86ed8d093cdbc9f66b030ba270f4ee8d 100644 (file)
--- a/display.php
+++ b/display.php
@@ -9,7 +9,7 @@
         * @param $return_desc The return link name
         * @param $page The current page
         *
-        * $Id: display.php,v 1.22 2003/08/18 08:10:16 chriskl Exp $
+        * $Id: display.php,v 1.23 2003/08/18 08:20:43 chriskl Exp $
         */
 
        // Include application functions
@@ -72,9 +72,12 @@
        }
        else echo "<p>{$lang['strnodata']}</p>\n";
        
-       echo "<p><a class=\"navlink\" href=\"{$_REQUEST['return_url']}\">{$_REQUEST['return_desc']}</a> |\n";
-       echo "<a class=\"navlink\" href=\"reports.php?action=create&db_name=", urlencode($_REQUEST['database']), "&report_sql=",
-               urlencode($_REQUEST['query']), "\">Save As Report</a></p>\n";
+       echo "<p><a class=\"navlink\" href=\"{$_REQUEST['return_url']}\">{$_REQUEST['return_desc']}</a>";
+       if ($conf['show_reports'] && is_object($rs) && $rs->recordCount() > 0) {
+               echo " | <a class=\"navlink\" href=\"reports.php?action=create&db_name=", urlencode($_REQUEST['database']), "&report_sql=",
+                       urlencode($_REQUEST['query']), "\">Save As Report</a></p>\n";
+       }
+       echo "</p>\n";
 
        $misc->printFooter();
 ?>

diff --git a/reports.php b/reports.php
index 802b5a0a5ef2403c59b39077920e7c706c8a60f6..5f4cbac507873fcbca1be53d252b93680869344e 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -3,7 +3,7 @@
        /**
         * List reports in a database
         *
-        * $Id: reports.php,v 1.12 2003/08/13 09:17:26 chriskl Exp $
+        * $Id: reports.php,v 1.13 2003/08/18 08:20:43 chriskl Exp $
         */
 
        // Include application functions
@@ -128,10 +128,10 @@
                global $data, $reportsdb, $misc;
                global $PHP_SELF, $lang;
 
-               if (!isset($_POST['report_name'])) $_POST['report_name'] = '';
-               if (!isset($_POST['db_name'])) $_POST['db_name'] = '';
-               if (!isset($_POST['descr'])) $_POST['descr'] = '';
-               if (!isset($_POST['report_sql'])) $_POST['report_sql'] = '';
+               if (!isset($_REQUEST['report_name'])) $_REQUEST['report_name'] = '';
+               if (!isset($_REQUEST['db_name'])) $_REQUEST['db_name'] = '';
+               if (!isset($_REQUEST['descr'])) $_REQUEST['descr'] = '';
+               if (!isset($_REQUEST['report_sql'])) $_REQUEST['report_sql'] = '';
 
                $databases = &$data->getDatabases();
 
@@ -142,23 +142,23 @@
                echo "<table width=\"100%\">\n";
                echo "<tr><th class=\"data\">{$lang['strname']}</th>\n";
                echo "<td class=\"data1\"><input name=\"report_name\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
-                       htmlspecialchars($_POST['report_name']), "\" /></td></tr>\n";
+                       htmlspecialchars($_REQUEST['report_name']), "\" /></td></tr>\n";
                echo "<tr><th class=\"data\">{$lang['strdatabase']}</th>\n";
                echo "<td class=\"data1\"><select name=\"db_name\">\n";
                while (!$databases->EOF) {
                        $dbname = $databases->f[$data->dbFields['dbname']];
                        echo "<option value=\"", htmlspecialchars($dbname), "\"",
-                       ($dbname == $_POST['db_name']) ? ' selected' : '', ">",
+                       ($dbname == $_REQUEST['db_name']) ? ' selected' : '', ">",
                                htmlspecialchars($dbname), "</option>\n";
                        $databases->moveNext();
                }
                echo "</select></td></tr>\n";
                echo "<tr><th class=\"data\">{$lang['strcomment']}</th>\n";
                echo "<td class=\"data1\"><textarea style=\"width:100%;\" rows=\"5\" cols=\"50\" name=\"descr\" wrap=\"virtual\">",
-                       htmlspecialchars($_POST['descr']), "</textarea></td></tr>\n";
+                       htmlspecialchars($_REQUEST['descr']), "</textarea></td></tr>\n";
                echo "<tr><th class=\"data\">{$lang['strsql']}</th>\n";
                echo "<td class=\"data1\"><textarea style=\"width:100%;\" rows=\"15\" cols=\"50\" name=\"report_sql\" wrap=\"virtual\">",
-                       htmlspecialchars($_POST['report_sql']), "</textarea></td></tr>\n";
+                       htmlspecialchars($_REQUEST['report_sql']), "</textarea></td></tr>\n";
                echo "</table>\n";
                echo "<p><input type=\"hidden\" name=\"action\" value=\"save_create\" />\n";
                echo "<input type=\"submit\" value=\"{$lang['strsave']}\" />\n";

diff --git a/sql.php b/sql.php
index f2285e49ce817b4affd7054dce748b7357e12d32..2f69cc1e79477bb7644c70b9d2e7d106d4d59e07 100644 (file)
--- a/sql.php
+++ b/sql.php
@@ -8,7 +8,7 @@
         * @param $return_url The return URL
         * @param $return_desc The return link name
         *
-        * $Id: sql.php,v 1.8 2003/08/05 06:04:36 chriskl Exp $
+        * $Id: sql.php,v 1.9 2003/08/18 08:20:43 chriskl Exp $
         */
 
        // Include application functions
@@ -73,7 +73,12 @@
        else echo "<p>{$lang['strinvalidparam']}</p>\n";
 
        echo "<p><a class=\"navlink\" href=\"database.php?database=", urlencode($_REQUEST['database']),
-               "&action=sql\">{$lang['strback']}</a></p>\n";
+               "&action=sql\">{$lang['strback']}</a>";
+       if ($conf['show_reports'] && is_object($rs) && $rs->recordCount() > 0) {
+               echo " | <a class=\"navlink\" href=\"reports.php?action=create&db_name=", urlencode($_REQUEST['database']), "&report_sql=",
+                       urlencode($_POST['query']), "\">Save As Report</a>";
+       }
+       echo "</p>\n";
        
        $misc->printFooter();
 ?>