remove backend kill command since it's just been removed from cvs

diff --git a/HISTORY b/HISTORY
index 67c7078833f3bdca474bbf2785bdc030d9388d07..83d4803067ef53ec8d437c5b2810ba6215104548 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -8,7 +8,7 @@ Features
 * Context-sensitive online help system
 * Use language preferencies from browser (Markus Bertheau, Nicola Soranzo)
 * Tablespace support for 7.5
-* Support cancelling and killing backend processes in 7.5
+* Support cancelling backend processes in 7.5
 * Allow setting privileges on databases
 * Allow setting schema search path in SQL window
 * Allow filtering find results by object type

diff --git a/classes/database/Postgres75.php b/classes/database/Postgres75.php
index d7328fce085e444d00e660718d961f983bedbe51..fc40a98c8c6ce75f6796a33b311c29ae6c762bf8 100755 (executable)
--- a/classes/database/Postgres75.php
+++ b/classes/database/Postgres75.php
@@ -3,7 +3,7 @@
 /**
  * PostgreSQL 7.5 support
  *
- * $Id: Postgres75.php,v 1.15 2004/07/19 03:01:54 chriskl Exp $
+ * $Id: Postgres75.php,v 1.16 2004/08/04 02:07:03 chriskl Exp $
  */
 
 include_once('./classes/database/Postgres74.php');
@@ -387,7 +387,7 @@ class Postgres75 extends Postgres74 {
        /**
         * Sends a cancel or kill command to a process
         * @param $pid The ID of the backend process
-        * @param $signal 'CANCEL' or 'KILL'
+        * @param $signal 'CANCEL'
         * @return 0 success
         * @return -1 invalid signal type
         */
@@ -397,8 +397,6 @@ class Postgres75 extends Postgres74 {
                
                if ($signal == 'CANCEL')
                        $sql = "SELECT pg_catalog.pg_cancel_backend({$pid}) AS val";
-               elseif ($signal == 'KILL')
-                       $sql = "SELECT pg_catalog.pg_terminate_backend({$pid}) AS val";
                else
                        return -1;
                        

diff --git a/database.php b/database.php
index f40ba35a4faa4a66f352ec78a6c70c1bd45f893b..23f29ee93b48d9ce8e8b1b382d1f395a1b51e542 100755 (executable)
--- a/database.php
+++ b/database.php
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.56 2004/07/22 08:47:34 jollytoad Exp $
+        * $Id: database.php,v 1.57 2004/08/04 02:07:02 chriskl Exp $
         */
 
        // Include application functions
@@ -391,11 +391,6 @@
                                        'title' => $lang['strcancel'],
                                        'url'   => "{$PHP_SELF}?action=signal&signal=CANCEL&database=" . urlencode($_REQUEST['database']) . "&",
                                        'vars'  => array('procpid' => 'procpid')
-                               ),
-                               'kill' => array(
-                                       'title' => $lang['strkill'],
-                                       'url'   => "{$PHP_SELF}?action=signal&signal=KILL&database=" . urlencode($_REQUEST['database']) . "&",
-                                       'vars'  => array('procpid' => 'procpid')
                                )
                        );
                }

diff --git a/lang/english.php b/lang/english.php
index 9ac09d952465b3115eb8d15dac20d85c8fb6efc6..a4aef72addeb73f5783ff53bab12c925ce866a0a 100755 (executable)
--- a/lang/english.php
+++ b/lang/english.php
@@ -4,7 +4,7 @@
         * English language file for phpPgAdmin.  Use this as a basis
         * for new translations.
         *
-        * $Id: english.php,v 1.159 2004/08/03 09:20:16 chriskl Exp $
+        * $Id: english.php,v 1.160 2004/08/04 02:07:03 chriskl Exp $
         */
 
        // Language and character set
@@ -125,7 +125,6 @@
        $lang['strstarttime'] = 'Start Time';
        $lang['strfile'] = 'File';
        $lang['strfileimported'] = 'File imported.';
-       $lang['strkill'] = 'Kill';
 
        // Error handling
        $lang['strnoframes'] = 'You need a frames-enabled browser to use this application.';

diff --git a/lang/recoded/english.php b/lang/recoded/english.php
index 0fed1bff8f586e19474692b349b135743f315c7c..703c0d8e3459951920bc794bdc1742d19da57e74 100644 (file)
--- a/lang/recoded/english.php
+++ b/lang/recoded/english.php
@@ -4,7 +4,7 @@
         * English language file for phpPgAdmin.  Use this as a basis
         * for new translations.
         *
-        * $Id: english.php,v 1.111 2004/08/03 09:20:16 chriskl Exp $
+        * $Id: english.php,v 1.112 2004/08/04 02:07:03 chriskl Exp $
         */
 
        // Language and character set
@@ -125,7 +125,6 @@
        $lang['strstarttime'] = 'Start Time';
        $lang['strfile'] = 'File';
        $lang['strfileimported'] = 'File imported.';
-       $lang['strkill'] = 'Kill';
 
        // Error handling
        $lang['strnoframes'] = 'You need a frames-enabled browser to use this application.';