add config variable to show or hide comments. bumped config version number

diff --git a/HISTORY b/HISTORY
index 0770b99dfed1d5d3ea3d9135115e2a2b06de7a88..5a42c1f37eaaa29d7562e72a295a17d3dde3384b 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -9,6 +9,7 @@ Features
 * View, add, edit and delete comments on tables, views, schemas, 
   aggregates, conversions, operators, functions and 
   columns (Dan Boren & ChrisKL)
+* Add config file option for turning off the display of comments
 * Allow creating array columns in tables
 * Allow adding array columns to tables
 * Allow creating domains with type length and arrays

diff --git a/aggregates.php b/aggregates.php
index 1d6194afeac8a71c322a6858d6fe0323f21f0fd8..7cc246bcc4b5e1cdd3058b890b2c5d3916a72fb0 100644 (file)
--- a/aggregates.php
+++ b/aggregates.php
@@ -3,7 +3,7 @@
        /**
         * Manage aggregates in a database
         *
-        * $Id: aggregates.php,v 1.2 2004/04/17 12:59:03 chriskl Exp $
+        * $Id: aggregates.php,v 1.3 2004/05/08 14:44:56 chriskl Exp $
         */
 
        // Include application functions
@@ -16,7 +16,7 @@
         * Show default list of aggregates in the database
         */
        function doDefault($msg = '') {
-               global $data, $misc;
+               global $data, $conf, $misc;
                global $lang;
 
                echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['straggregates']}</h2>\n";
@@ -27,7 +27,7 @@
                if ($aggregates->recordCount() > 0) {
                        echo "<table>\n";
                        echo "<tr><th class=\"data\">{$lang['strname']}</th><th class=\"data\">{$lang['strtype']}</th>";
-                       echo "<th class=\"data\">{$lang['strcomment']}</th>";
+                       if ($conf['show_comments']) echo "<th class=\"data\">{$lang['strcomment']}</th>";
                        echo "</tr>\n";
                        $i = 0;
                        while (!$aggregates->EOF) {
@@ -40,7 +40,7 @@
                                else
                                        echo $misc->printVal($aggregates->f['proargtypes']);
                                echo "</td>\n";
-                               echo "<td class=\"data{$id}\">", $misc->printVal($aggregates->f['aggcomment']), "</td>\n";
+                               if ($conf['show_comments']) echo "<td class=\"data{$id}\">", $misc->printVal($aggregates->f['aggcomment']), "</td>\n";
                                echo "</tr>\n";
                                $aggregates->moveNext();
                                $i++;

diff --git a/all_db.php b/all_db.php
index d248ef8f9f8bd2a3b928546a0c73b7c16d41ad4f..a0e493609e5bfed838936b81319206c6e21d68a1 100644 (file)
--- a/all_db.php
+++ b/all_db.php
@@ -3,7 +3,7 @@
        /**
         * Manage databases within a server
         *
-        * $Id: all_db.php,v 1.22 2004/01/04 07:30:12 chriskl Exp $
+        * $Id: all_db.php,v 1.23 2004/05/08 14:44:56 chriskl Exp $
         */
 
        // Include application functions
@@ -108,7 +108,7 @@
         * Show default list of databases in the server
         */
        function doDefault($msg = '') {
-               global $data, $misc;
+               global $data, $conf, $misc;
                global $PHP_SELF, $lang;
                
                echo "<h2>{$lang['strdatabases']}</h2>\n";
@@ -118,17 +118,19 @@
                if ($databases->recordCount() > 0) {
                        echo "<table>\n";
                        echo "<tr><th class=\"data\">{$lang['strdatabase']}</th><th class=\"data\">{$lang['strowner']}</th>";
-                       echo "<th class=\"data\">{$lang['strencoding']}</th><th class=\"data\">{$lang['strcomment']}</th>";
-                       echo "<th class=\"data\">{$lang['stractions']}</th></tr>\n";
+                       echo "<th class=\"data\">{$lang['strencoding']}</th>";
+                       echo "<th class=\"data\">{$lang['stractions']}</th>\n";
+                       if ($conf['show_comments']) echo "<th class=\"data\">{$lang['strcomment']}</th>";
+                       echo "</tr>\n";
                        $i = 0;
                        while (!$databases->EOF) {
                                $id = (($i % 2) == 0 ? '1' : '2');
                                echo "<tr><td class=\"data{$id}\">", $misc->printVal($databases->f[$data->dbFields['dbname']]), "</td>\n";
                                echo "<td class=\"data{$id}\">", $misc->printVal($databases->f[$data->dbFields['owner']]), "</td>\n";
                                echo "<td class=\"data{$id}\">", $misc->printVal($databases->f[$data->dbFields['encoding']]), "</td>\n";
-                               echo "<td class=\"data{$id}\">", htmlspecialchars($databases->f[$data->dbFields['dbcomment']]), "</td>\n";
                                echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confirm_drop&amp;db=",
                                        urlencode($databases->f[$data->dbFields['dbname']]), "\">{$lang['strdrop']}</a></td>\n";
+                               if ($conf['show_comments']) echo "<td class=\"data{$id}\">", htmlspecialchars($databases->f[$data->dbFields['dbcomment']]), "</td>\n";
                                echo "</tr>\n";
                                $databases->moveNext();
                                $i++;

diff --git a/conf/config.inc.php-dist b/conf/config.inc.php-dist
index ef6f38db018c6d7d55b03821c3e702c282e72d24..f63031afeb07cdd675fbcc5ad4ff45511b0680d2 100644 (file)
--- a/conf/config.inc.php-dist
+++ b/conf/config.inc.php-dist
@@ -4,7 +4,7 @@
         * Central phpPgAdmin configuration.  As a user you may modify the
         * settings here for your particular configuration.
         *
-        * $Id: config.inc.php-dist,v 1.33 2004/03/04 20:12:24 xzilla Exp $
+        * $Id: config.inc.php-dist,v 1.34 2004/05/08 14:45:10 chriskl Exp $
         */
 
        // An example server.  Create as many of these as you wish,
@@ -51,6 +51,10 @@
        // other means. (eg. Run 'SELECT * FROM pg_database' in the SQL area.)
        $conf['owned_only'] = false;
 
+       // Display comments on objects?  Comments are a good way of documenting
+       // a database, but they do take up space in the interface.
+       $conf['show_comments'] = true;
+
        // Display "advanced" objects?  Setting this to true will show types,
        // operators conversions, languages and casts in phpPgAdmin.  These
        // objects are rarely administered and can clutter the interface.
@@ -93,6 +97,6 @@
         * Don't modify anything below this line *
         *****************************************/
 
-       $conf['version'] = 12;
+       $conf['version'] = 13;
 
 ?>

diff --git a/conversions.php b/conversions.php
index 4317b5e12b5e3639b203cc9202a1c2295cb09ff9..0f5952c42a01556698692b7db2b65d563f307a4c 100644 (file)
--- a/conversions.php
+++ b/conversions.php
@@ -3,7 +3,7 @@
        /**
         * Manage conversions in a database
         *
-        * $Id: conversions.php,v 1.4 2004/04/17 12:59:03 chriskl Exp $
+        * $Id: conversions.php,v 1.5 2004/05/08 14:44:56 chriskl Exp $
         */
 
        // Include application functions
@@ -17,7 +17,7 @@
         * Show default list of conversions in the database
         */
        function doDefault($msg = '') {
-               global $data, $misc, $database;
+               global $data, $conf, $misc, $database;
                global $PHP_SELF, $lang;
 
                echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strconversions']}</h2>\n";
@@ -29,7 +29,7 @@
                        echo "<table>\n";
                        echo "<tr><th class=\"data\">{$lang['strname']}</th><th class=\"data\">{$lang['strsourceencoding']}</th>";
                        echo "<th class=\"data\">{$lang['strtargetencoding']}</th><th class=\"data\">{$lang['strdefault']}</th>";
-                       echo "<th class=\"data\">{$lang['strcomment']}</th>\n";
+                       if ($conf['show_comments']) echo "<th class=\"data\">{$lang['strcomment']}</th>\n";
                        echo "</tr>\n";
                        $i = 0;
                        while (!$conversions->EOF) {
@@ -39,7 +39,7 @@
                                echo "<td class=\"data{$id}\">", $misc->printVal($conversions->f['conforencoding']), "</td>\n";
                                echo "<td class=\"data{$id}\">", $misc->printVal($conversions->f['contoencoding']), "</td>\n";
                                echo "<td class=\"data{$id}\">", ($conversions->f['condefault']) ? $lang['stryes'] : $lang['strno'], "</td>\n";
-                               echo "<td class=\"data{$id}\">", $misc->printVal($conversions->f['concomment']), "</td>\n";
+                               if ($conf['show_comments']) echo "<td class=\"data{$id}\">", $misc->printVal($conversions->f['concomment']), "</td>\n";
                                echo "</tr>\n";
                                $conversions->moveNext();
                                $i++;

diff --git a/database.php b/database.php
index 368b690ff6847fe7deef44390deb8485c65d4605..1a3a13dafab92a0328aa787d6a5a4f3418e2a9f9 100755 (executable)
--- a/database.php
+++ b/database.php
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.39 2004/04/20 01:34:43 chriskl Exp $
+        * $Id: database.php,v 1.40 2004/05/08 14:44:56 chriskl Exp $
         */
 
        // Include application functions
@@ -547,7 +547,7 @@
         * Show default list of schemas in the server
         */
        function doDefault($msg = '') {
-               global $data, $misc;
+               global $data, $misc, $conf;
                global $PHP_SELF, $lang;
                
                $misc->printDatabaseNav();
@@ -561,7 +561,9 @@
                        if ($schemas->recordCount() > 0) {
                                echo "<table>\n";
                                echo "<tr><th class=\"data\">{$lang['strname']}</th><th class=\"data\">{$lang['strowner']}</th>";
-                               echo "<th colspan=\"3\" class=\"data\">{$lang['stractions']}</th><th class=\"data\">{$lang['strcomment']}</th>\n";
+                               echo "<th colspan=\"3\" class=\"data\">{$lang['stractions']}</th>";
+                               if ($conf['show_comments']) echo "<th class=\"data\">{$lang['strcomment']}</th>\n";
+                               echo "</tr>\n";
                                $i = 0;
                                while (!$schemas->EOF) {
                                        $id = (($i % 2) == 0 ? '1' : '2');
@@ -576,7 +578,7 @@
                                        echo "<td class=\"opbutton{$id}\"><a href=\"schema.php?database=",
                                                urlencode($_REQUEST['database']), "&amp;schema=",
                                                urlencode($schemas->f[$data->nspFields['nspname']]), "&amp;action=alter\">{$lang['stralter']}</a></td>\n";
-                                       echo "<td class=\"data{$id}\">", $misc->printVal($schemas->f[$data->nspFields['nspcomment']]), "</td>\n";
+                                       if ($conf['show_comments']) echo "<td class=\"data{$id}\">", $misc->printVal($schemas->f[$data->nspFields['nspcomment']]), "</td>\n";
                                        echo "</tr>\n";
                                        $schemas->moveNext();
                                        $i++;

diff --git a/domains.php b/domains.php
index 4cd1c64a80df20a2c556d7f27360c851b3905154..70f73e46ecc5f8ce7428d6b418e40a21dae54c54 100644 (file)
--- a/domains.php
+++ b/domains.php
@@ -3,7 +3,7 @@
        /**
         * Manage domains in a database
         *
-        * $Id: domains.php,v 1.10 2004/03/31 08:09:55 chriskl Exp $
+        * $Id: domains.php,v 1.11 2004/05/08 14:44:56 chriskl Exp $
         */
 
        // Include application functions
@@ -357,7 +357,7 @@
         * Show default list of domains in the database
         */
        function doDefault($msg = '') {
-               global $data, $misc;
+               global $data, $conf, $misc;
                global $PHP_SELF, $lang;
                
                echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strdomains']}</h2>\n";
@@ -369,7 +369,9 @@
                        echo "<table>\n";
                        echo "<tr><th class=\"data\">{$lang['strdomain']}</th><th class=\"data\">{$lang['strtype']}</th><th class=\"data\">{$lang['strnotnull']}</th>";
                        echo "<th class=\"data\">{$lang['strdefault']}</th><th class=\"data\">{$lang['strowner']}</th>";
-                       echo "<th colspan=\"2\" class=\"data\">{$lang['stractions']}</th><th class=\"data\">{$lang['strcomment']}</th></tr>\n";
+                       echo "<th colspan=\"2\" class=\"data\">{$lang['stractions']}</th>";
+                       if ($conf['show_comments']) echo "<th class=\"data\">{$lang['strcomment']}</th>";
+                       echo "</tr>\n";
                        $i = 0;
                        while (!$domains->EOF) {
                                $domains->f['domnotnull'] = $data->phpBool($domains->f['domnotnull']);
@@ -381,7 +383,7 @@
                                echo "<td class=\"data{$id}\">", $misc->printVal($domains->f['domowner']), "</td>\n";
                                echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=properties&amp;{$misc->href}&amp;domain=", urlencode($domains->f['domname']), "\">{$lang['strproperties']}</a></td>\n"; 
                                echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confirm_drop&amp;{$misc->href}&amp;domain=", urlencode($domains->f['domname']), "\">{$lang['strdrop']}</a></td>\n";
-                               echo "<td class=\"data{$id}\">", $misc->printVal($domains->f['domcomment']), "</td>\n";
+                               if ($conf['show_comments']) echo "<td class=\"data{$id}\">", $misc->printVal($domains->f['domcomment']), "</td>\n";
                                echo "</tr>\n";
                                $domains->moveNext();
                                $i++;

diff --git a/functions.php b/functions.php
index 2ad434a3a479bf5fd08779fe74fb8d25a5fff6c0..28883c5b17fc375c559041f8d353fa4ede3529d8 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -3,7 +3,7 @@
        /**
         * Manage functions in a database
         *
-        * $Id: functions.php,v 1.28 2004/05/08 14:08:00 chriskl Exp $
+        * $Id: functions.php,v 1.29 2004/05/08 14:45:09 chriskl Exp $
         */
 
        // Include application functions
@@ -323,7 +323,7 @@
         * Show default list of functions in the database
         */
        function doDefault($msg = '') {
-               global $data, $misc, $func;
+               global $data, $conf, $misc, $func;
                global $PHP_SELF, $lang;
                
                echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strfunctions']}</h2>\n";
@@ -335,7 +335,7 @@
                        echo "<table>\n";
                        echo "<tr><th class=\"data\">{$lang['strfunctions']}</th><th class=\"data\">{$lang['strreturns']}</th>\n";
                        echo "<th class=\"data\">{$lang['strarguments']}</th><th colspan=\"4\" class=\"data\">{$lang['stractions']}</th>\n";
-                       echo "<th class=\"data\">{$lang['strcomment']}</th>\n";
+                       if ($conf['show_comments']) echo "<th class=\"data\">{$lang['strcomment']}</th>\n";
                        echo "</tr>\n";
                        $i = 0;
                        while (!$funcs->EOF) {
@@ -359,7 +359,7 @@
                                                $funcs->f[$data->fnFields['fnoid']], "&amp;type=function\">{$lang['strprivileges']}</a></td>\n";
                                }
                                else echo "<td></td>";
-                               echo "<td class=\"data{$id}\">", $misc->printVal($funcs->f['funccomment']), "</td>\n";                          
+                               if ($conf['show_comments']) echo "<td class=\"data{$id}\">", $misc->printVal($funcs->f['funccomment']), "</td>\n";                              
                                echo "</tr>\n";
                                $funcs->moveNext();
                                $i++;

diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php
index fbb4ead64f14c02b5496f76eedb4c9c860dddb2b..c2bc419cccd38aa8cf8984a166fc937e077228cb 100644 (file)
--- a/libraries/lib.inc.php
+++ b/libraries/lib.inc.php
@@ -3,7 +3,7 @@
        /**
         * Function library read in upon startup
         *
-        * $Id: lib.inc.php,v 1.74 2004/03/04 01:27:29 chriskl Exp $
+        * $Id: lib.inc.php,v 1.75 2004/05/08 14:45:10 chriskl Exp $
         */
        
        // Set error reporting level to max
@@ -29,7 +29,7 @@
        // Configuration file version.  If this is greater than that in config.inc.php, then
        // the app will refuse to run.  This and $conf['version'] should be incremented whenever
        // backwards incompatible changes are made to config.inc.php-dist.
-       $conf['base_version'] = 12;
+       $conf['base_version'] = 13;
 
        // List of available language files
        $appLangFiles = array(

diff --git a/operators.php b/operators.php
index be350243de301cf0ac111a57c0521d4db19521fb..e2b68cc6104cadd43cf059783f16e2db695a5739 100644 (file)
--- a/operators.php
+++ b/operators.php
@@ -3,7 +3,7 @@
        /**
         * Manage operators in a database
         *
-        * $Id: operators.php,v 1.11 2004/04/17 12:59:03 chriskl Exp $
+        * $Id: operators.php,v 1.12 2004/05/08 14:45:10 chriskl Exp $
         */
 
        // Include application functions
@@ -101,7 +101,7 @@
         * Show default list of operators in the database
         */
        function doDefault($msg = '') {
-               global $data, $misc, $database;
+               global $data, $conf, $misc;
                global $PHP_SELF, $lang;
 
                echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['stroperators']}</h2>\n";
@@ -113,7 +113,8 @@
                        echo "<table>\n";
                        echo "<tr><th class=\"data\">{$lang['stroperator']}</th><th class=\"data\">{$lang['strleftarg']}</th>";
                        echo "<th class=\"data\">{$lang['strrightarg']}</th><th class=\"data\">{$lang['strreturns']}</th>";
-                       echo "<th colspan=\"2\" class=\"data\">{$lang['stractions']}</th><th class=\"data\">{$lang['strcomment']}</th\n";
+                       echo "<th colspan=\"2\" class=\"data\">{$lang['stractions']}</th>";
+                       if ($conf['show_comments']) echo "<th class=\"data\">{$lang['strcomment']}</th\n";
                        echo "</tr>\n";
                        $i = 0;
                        while (!$operators->EOF) {
@@ -126,7 +127,7 @@
                                        urlencode($operators->f['oprname']), "&operator_oid=", urlencode($operators->f['oid']), "\">{$lang['strproperties']}</a></td>\n";
                                echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confirm_drop&amp;{$misc->href}&amp;operator=",
                                        urlencode($operators->f['oprname']), "&operator_oid=", urlencode($operators->f['oid']), "\">{$lang['strdrop']}</a></td>\n";
-                               echo "<td class=\"data{$id}\">", $misc->printVal($operators->f['oprcomment']), "</td>\n";
+                               if ($conf['show_comments']) echo "<td class=\"data{$id}\">", $misc->printVal($operators->f['oprcomment']), "</td>\n";
                                echo "</tr>\n";
                                $operators->moveNext();
                                $i++;

diff --git a/tables.php b/tables.php
index f6e3e1e437fecc9013378815adcfdd4185e02d00..25e15194e97151067a013997d2ff331fae231d2c 100644 (file)
--- a/tables.php
+++ b/tables.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tables.php,v 1.49 2004/04/17 12:59:04 chriskl Exp $
+        * $Id: tables.php,v 1.50 2004/05/08 14:45:10 chriskl Exp $
         */
 
        // Include application functions
@@ -449,7 +449,7 @@
         * Show default list of tables in the database
         */
        function doDefault($msg = '') {
-               global $data, $misc, $data;
+               global $data, $conf, $misc, $data;
                global $PHP_SELF, $lang;
                
                echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strtables']}</h2>\n";
@@ -459,7 +459,9 @@
                if ($tables->recordCount() > 0) {
                        echo "<table>\n";
                        echo "<tr>\n\t<th class=\"data\">{$lang['strtable']}</th>\n\t<th class=\"data\">{$lang['strowner']}</th>\n";
-                       echo "\t<th colspan=\"6\" class=\"data\">{$lang['stractions']}</th>\n\t<th class=\"data\">{$lang['strcomment']}</th>\n</tr>\n";
+                       echo "\t<th colspan=\"6\" class=\"data\">{$lang['stractions']}</th>\n";
+                       if ($conf['show_comments']) echo "\t<th class=\"data\">{$lang['strcomment']}</th>\n";
+                       echo "</tr>\n";
                        $i = 0;
                        while (!$tables->EOF) {
                                $return_url = urlencode("tables.php?{$misc->href}");
@@ -479,7 +481,7 @@
                                        urlencode($tables->f[$data->tbFields['tbname']]), "\">{$lang['strempty']}</a></td>\n";
                                echo "\t<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confirm_drop&amp;{$misc->href}&amp;table=",
                                        urlencode($tables->f[$data->tbFields['tbname']]), "\">{$lang['strdrop']}</a></td>\n";
-                               echo "\t<td class=\"data{$id}\">", $misc->printVal($tables->f['tablecomment']), "</td>\n";
+                               if ($conf['show_comments']) echo "\t<td class=\"data{$id}\">", $misc->printVal($tables->f['tablecomment']), "</td>\n";
                                echo "</tr>\n";
                                $tables->moveNext();
                                $i++;

diff --git a/tblproperties.php b/tblproperties.php
index dc7c7be9c5f22bc213e2c6412e4632cc85f9699a..2cd16429b14cda91f83dbed5e6837b220c83608a 100644 (file)
--- a/tblproperties.php
+++ b/tblproperties.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tblproperties.php,v 1.42 2004/04/12 07:50:33 chriskl Exp $
+        * $Id: tblproperties.php,v 1.43 2004/05/08 14:45:10 chriskl Exp $
         */
 
        // Include application functions
@@ -395,7 +395,7 @@
         * Show default list of columns in the table
         */
        function doDefault($msg = '') {
-               global $data, $misc;
+               global $data, $conf, $misc;
                global $PHP_SELF, $lang;
 
                $misc->printTableNav();
@@ -418,8 +418,8 @@
                        echo "\t<th colspan=\"2\" class=\"data\">{$lang['stractions']}</th>\n";
                else
                        echo "\t<th class=\"data\">{$lang['stractions']}</th>\n";
-               echo "\t<th class=\"data\">{$lang['strcomment']}</th>\n"; 
-               echo "</tr>\n";
+               if ($conf['show_comments']) echo "\t<th class=\"data\">{$lang['strcomment']}</th>\n"; 
+               echo "</tr>\n";
 
                $i = 0;
                while (!$attrs->EOF) {
@@ -435,7 +435,7 @@
                                echo "\t<td class=\"opbutton{$id}\"><a href=\"{$PHP_SELF}?{$misc->href}&table=", urlencode($_REQUEST['table']),
                                        "&column=", urlencode($attrs->f['attname']), "&action=confirm_drop\">{$lang['strdrop']}</a></td>\n";
                        }
-                       echo "\t<td class=\"data{$id}\">", $misc->printVal($attrs->f['comment']), "</td>\n"; 
+                       if ($conf['show_comments']) echo "\t<td class=\"data{$id}\">", $misc->printVal($attrs->f['comment']), "</td>\n"; 
                        echo "</tr>\n";
                        $attrs->moveNext();
                        $i++;

diff --git a/views.php b/views.php
index 66fff5bdec111f967faba59c90a8452b36334495..36a5c644e27de2945285dd70cb4aec1412e0d5e5 100644 (file)
--- a/views.php
+++ b/views.php
@@ -3,7 +3,7 @@
        /**
         * Manage views in a database
         *
-        * $Id: views.php,v 1.28 2004/03/12 08:56:52 chriskl Exp $
+        * $Id: views.php,v 1.29 2004/05/08 14:45:10 chriskl Exp $
         */
 
        // Include application functions
@@ -294,7 +294,6 @@
                global $PHP_SELF, $lang;
                
                echo "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strviews']}</h2>\n";
-               //$misc->printHelp("/tutorial-views.html");
                $misc->printMsg($msg);
                
                $views = &$data->getViews();
@@ -303,7 +302,8 @@
                        echo "<table>\n";
                        echo "<tr><th class=\"data\">{$lang['strview']}</th><th class=\"data\">{$lang['strowner']}</th>";
                        echo "<th colspan=\"5\" class=\"data\">{$lang['stractions']}</th>\n";
-                       echo "<th class=\"data\">{$lang['strcomment']}</th></tr>\n";
+                       if ($conf['show_comments']) echo "<th class=\"data\">{$lang['strcomment']}</th>";
+                       echo "</tr>\n";
                        $i = 0;
                        while (!$views->EOF) {
                                // @@@@@@@@@ FIX THIS!!!!!
@@ -325,7 +325,7 @@
                                echo "<td class=\"opbutton{$id}\"><a href=\"$PHP_SELF?action=confirm_drop&{$misc->href}&view=", urlencode($views->f[$data->vwFields['vwname']]), "\">{$lang['strdrop']}</a></td>\n";
                                echo "<td class=\"opbutton{$id}\"><a href=\"privileges.php?{$misc->href}&object=", urlencode($views->f[$data->vwFields['vwname']]),
                                        "&type=view\">{$lang['strprivileges']}</a></td>\n";
-                               echo "<td class=\"data{$id}\">", $misc->printVal($views->f[$data->vwFields['vwcomment']]), "</td>\n";
+                               if ($conf['show_comments']) echo "<td class=\"data{$id}\">", $misc->printVal($views->f[$data->vwFields['vwcomment']]), "</td>\n";
                                echo "</tr>\n";
                                $views->moveNext();
                                $i++;