From 9f5d0a880a0991170e77351c9a7b92bbb9831697 Mon Sep 17 00:00:00 2001 From: chriskl Date: Wed, 17 Dec 2003 09:11:32 +0000 Subject: [PATCH] phpPgAdmin now works without '.' in the include_path --- HISTORY | 2 ++ all_db.php | 4 ++-- bottombar.php | 4 ++-- browser.php | 6 +++--- casts.php | 4 ++-- classes/Misc.php | 4 ++-- classes/database/ADODB_base.php | 6 +++--- classes/database/Connection.php | 4 ++-- classes/database/Postgres.php | 4 ++-- classes/database/Postgres71.php | 4 ++-- classes/database/Postgres72.php | 4 ++-- classes/database/Postgres73.php | 4 ++-- classes/database/Postgres74.php | 4 ++-- classes/database/Postgres75.php | 4 ++-- constraints.php | 6 +++--- conversions.php | 4 ++-- database.php | 4 ++-- databases.php | 4 ++-- dataexport.php | 6 +++--- dbexport.php | 4 ++-- display.php | 4 ++-- domains.php | 4 ++-- functions.php | 4 ++-- groups.php | 4 ++-- index.php | 4 ++-- indexes.php | 6 +++--- info.php | 4 ++-- intro.php | 4 ++-- lang/langcheck | 6 +++--- languages.php | 4 ++-- libraries/errorhandler.inc.php | 4 ++-- libraries/lib.inc.php | 18 +++++++++--------- login.php | 4 ++-- operators.php | 4 ++-- privileges.php | 4 ++-- reports.php | 6 +++--- rules.php | 4 ++-- schema.php | 4 ++-- sequences.php | 4 ++-- sql.php | 4 ++-- sqledit.php | 4 ++-- tables.php | 6 +++--- tblproperties.php | 4 ++-- topbar.php | 4 ++-- triggers.php | 6 +++--- types.php | 4 ++-- users.php | 4 ++-- views.php | 6 +++--- 48 files changed, 113 insertions(+), 111 deletions(-) diff --git a/HISTORY b/HISTORY index 4e99d52fc..cf65e870d 100644 --- a/HISTORY +++ b/HISTORY @@ -13,6 +13,8 @@ Features Bugs * Object browser fixed for databases with no schemas * Properly detect that reports database is missing +* Fix for alter column on PostgreSQL 7.1 +* phpPgAdmin now works without '.' in the include_path Translations * Spanish from Martin Marques diff --git a/all_db.php b/all_db.php index 19b63cdef..52497e57b 100644 --- a/all_db.php +++ b/all_db.php @@ -3,11 +3,11 @@ /** * Manage databases within a server * - * $Id: all_db.php,v 1.20 2003/12/13 08:04:12 chriskl Exp $ + * $Id: all_db.php,v 1.21 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; if (!isset($msg)) $msg = ''; diff --git a/bottombar.php b/bottombar.php index cbb1258ef..10191c7fd 100644 --- a/bottombar.php +++ b/bottombar.php @@ -3,12 +3,12 @@ /** * Bottom bar * - * $Id: bottombar.php,v 1.2 2003/12/10 16:03:29 chriskl Exp $ + * $Id: bottombar.php,v 1.3 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions (no db conn) $_no_db_connection = true; - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $misc->printHeader(); $misc->printBody('bottombar'); diff --git a/browser.php b/browser.php index ddb6a1161..e62a49eef 100644 --- a/browser.php +++ b/browser.php @@ -5,14 +5,14 @@ * if you click on a database it shows a list of database objects in that * database. * - * $Id: browser.php,v 1.32 2003/12/16 17:17:43 soranzo Exp $ + * $Id: browser.php,v 1.33 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); // Include tree classe - include_once('classes/HTML_TreeMenu/TreeMenu.php'); + include_once('./classes/HTML_TreeMenu/TreeMenu.php'); // Output header $misc->printHeader('', "\n"); diff --git a/casts.php b/casts.php index 407a4c86d..c6bcc02cb 100644 --- a/casts.php +++ b/casts.php @@ -3,11 +3,11 @@ /** * Manage casts in a database * - * $Id: casts.php,v 1.4 2003/12/10 16:03:29 chriskl Exp $ + * $Id: casts.php,v 1.5 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; if (!isset($msg)) $msg = ''; diff --git a/classes/Misc.php b/classes/Misc.php index b03b6a57b..8f8219788 100644 --- a/classes/Misc.php +++ b/classes/Misc.php @@ -2,7 +2,7 @@ /** * Class to hold various commonly used functions * - * $Id: Misc.php,v 1.54 2003/12/15 08:10:50 chriskl Exp $ + * $Id: Misc.php,v 1.55 2003/12/17 09:11:32 chriskl Exp $ */ class Misc { @@ -156,7 +156,7 @@ function &getDatabaseAccessor($database) { // Create a database wrapper class for easy manipulation of the // connection. - include_once('classes/database/' . $_type . '.php'); + include_once('./classes/database/' . $_type . '.php'); $data = &new $_type($_connection->conn); return $data; diff --git a/classes/database/ADODB_base.php b/classes/database/ADODB_base.php index 165f721af..1eea55618 100644 --- a/classes/database/ADODB_base.php +++ b/classes/database/ADODB_base.php @@ -3,11 +3,11 @@ /* * Parent class of all ADODB objects. * - * $Id: ADODB_base.php,v 1.15 2003/12/10 16:03:30 chriskl Exp $ + * $Id: ADODB_base.php,v 1.16 2003/12/17 09:11:32 chriskl Exp $ */ -include_once('libraries/errorhandler.inc.php'); -include_once('libraries/adodb/adodb.inc.php'); +include_once('./libraries/errorhandler.inc.php'); +include_once('./libraries/adodb/adodb.inc.php'); class ADODB_base { diff --git a/classes/database/Connection.php b/classes/database/Connection.php index 7662c4311..7b9fcb36a 100755 --- a/classes/database/Connection.php +++ b/classes/database/Connection.php @@ -3,10 +3,10 @@ /** * Class to represent a database connection * - * $Id: Connection.php,v 1.1 2003/12/10 16:03:30 chriskl Exp $ + * $Id: Connection.php,v 1.2 2003/12/17 09:11:32 chriskl Exp $ */ -include_once('classes/database/ADODB_base.php'); +include_once('./classes/database/ADODB_base.php'); class Connection { diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php index b10069250..0b01e3d08 100755 --- a/classes/database/Postgres.php +++ b/classes/database/Postgres.php @@ -4,12 +4,12 @@ * A class that implements the DB interface for Postgres * Note: This class uses ADODB and returns RecordSets. * - * $Id: Postgres.php,v 1.167 2003/12/15 08:30:54 chriskl Exp $ + * $Id: Postgres.php,v 1.168 2003/12/17 09:11:32 chriskl Exp $ */ // @@@ THOUGHT: What about inherits? ie. use of ONLY??? -include_once('classes/database/BaseDB.php'); +include_once('./classes/database/BaseDB.php'); class Postgres extends BaseDB { diff --git a/classes/database/Postgres71.php b/classes/database/Postgres71.php index 16dd9d88e..b72ba39c9 100644 --- a/classes/database/Postgres71.php +++ b/classes/database/Postgres71.php @@ -4,12 +4,12 @@ * A class that implements the DB interface for Postgres * Note: This class uses ADODB and returns RecordSets. * - * $Id: Postgres71.php,v 1.48 2003/12/16 01:27:23 chriskl Exp $ + * $Id: Postgres71.php,v 1.49 2003/12/17 09:11:32 chriskl Exp $ */ // @@@ THOUGHT: What about inherits? ie. use of ONLY??? -include_once('classes/database/Postgres.php'); +include_once('./classes/database/Postgres.php'); class Postgres71 extends Postgres { diff --git a/classes/database/Postgres72.php b/classes/database/Postgres72.php index 51c73b96b..1ee2cd71d 100644 --- a/classes/database/Postgres72.php +++ b/classes/database/Postgres72.php @@ -4,11 +4,11 @@ * A class that implements the DB interface for Postgres * Note: This class uses ADODB and returns RecordSets. * - * $Id: Postgres72.php,v 1.53 2003/12/10 16:03:30 chriskl Exp $ + * $Id: Postgres72.php,v 1.54 2003/12/17 09:11:32 chriskl Exp $ */ -include_once('classes/database/Postgres71.php'); +include_once('./classes/database/Postgres71.php'); class Postgres72 extends Postgres71 { diff --git a/classes/database/Postgres73.php b/classes/database/Postgres73.php index 27a851485..c4a645dd3 100644 --- a/classes/database/Postgres73.php +++ b/classes/database/Postgres73.php @@ -4,12 +4,12 @@ * A class that implements the DB interface for Postgres * Note: This class uses ADODB and returns RecordSets. * - * $Id: Postgres73.php,v 1.82 2003/12/10 16:03:30 chriskl Exp $ + * $Id: Postgres73.php,v 1.83 2003/12/17 09:11:32 chriskl Exp $ */ // @@@ THOUGHT: What about inherits? ie. use of ONLY??? -include_once('classes/database/Postgres72.php'); +include_once('./classes/database/Postgres72.php'); class Postgres73 extends Postgres72 { diff --git a/classes/database/Postgres74.php b/classes/database/Postgres74.php index 81f1263c0..b34376cb9 100644 --- a/classes/database/Postgres74.php +++ b/classes/database/Postgres74.php @@ -4,10 +4,10 @@ * A class that implements the DB interface for Postgres * Note: This class uses ADODB and returns RecordSets. * - * $Id: Postgres74.php,v 1.20 2003/12/10 16:03:30 chriskl Exp $ + * $Id: Postgres74.php,v 1.21 2003/12/17 09:11:32 chriskl Exp $ */ -include_once('classes/database/Postgres73.php'); +include_once('./classes/database/Postgres73.php'); class Postgres74 extends Postgres73 { diff --git a/classes/database/Postgres75.php b/classes/database/Postgres75.php index 00e22ae7b..d68f598a8 100755 --- a/classes/database/Postgres75.php +++ b/classes/database/Postgres75.php @@ -3,10 +3,10 @@ /** * PostgreSQL 7.5 support * - * $Id: Postgres75.php,v 1.2 2003/12/10 16:03:30 chriskl Exp $ + * $Id: Postgres75.php,v 1.3 2003/12/17 09:11:32 chriskl Exp $ */ -include_once('classes/database/Postgres74.php'); +include_once('./classes/database/Postgres74.php'); class Postgres75 extends Postgres74 { diff --git a/constraints.php b/constraints.php index 76c14b27a..6f27e993d 100644 --- a/constraints.php +++ b/constraints.php @@ -3,12 +3,12 @@ /** * List constraints on a table * - * $Id: constraints.php,v 1.24 2003/12/15 15:42:45 chriskl Exp $ + * $Id: constraints.php,v 1.25 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); - include_once('classes/class.select.php'); + include_once('./libraries/lib.inc.php'); + include_once('./classes/class.select.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; $PHP_SELF = $_SERVER['PHP_SELF']; diff --git a/conversions.php b/conversions.php index a2b8b86a1..03980ff56 100644 --- a/conversions.php +++ b/conversions.php @@ -3,11 +3,11 @@ /** * Manage conversions in a database * - * $Id: conversions.php,v 1.2 2003/12/10 16:03:29 chriskl Exp $ + * $Id: conversions.php,v 1.3 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; if (!isset($msg)) $msg = ''; diff --git a/database.php b/database.php index ae734d098..da725a0ca 100755 --- a/database.php +++ b/database.php @@ -3,11 +3,11 @@ /** * Manage schemas within a database * - * $Id: database.php,v 1.28 2003/12/13 11:04:04 chriskl Exp $ + * $Id: database.php,v 1.29 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; if (!isset($msg)) $msg = ''; diff --git a/databases.php b/databases.php index 5cfcc6570..571e49e41 100755 --- a/databases.php +++ b/databases.php @@ -4,11 +4,11 @@ * List databases in a server * @param $webdbServerID The ID of the current server * - * $Id: databases.php,v 1.4 2003/03/17 05:20:29 chriskl Exp $ + * $Id: databases.php,v 1.5 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $misc->printHeader($lang['strdatabases']); $misc->printBody(); diff --git a/dataexport.php b/dataexport.php index 86cf7b239..4c107956f 100644 --- a/dataexport.php +++ b/dataexport.php @@ -3,7 +3,7 @@ /** * Does an export to the screen or as a download * - * $Id: dataexport.php,v 1.6 2003/12/10 16:03:29 chriskl Exp $ + * $Id: dataexport.php,v 1.7 2003/12/17 09:11:32 chriskl Exp $ */ $extensions = array( @@ -53,7 +53,7 @@ // Include application functions $_no_output = true; - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); if (isset($_REQUEST['query'])) $_REQUEST['query'] = trim(unserialize($_REQUEST['query'])); @@ -263,7 +263,7 @@ if (!isset($msg)) $msg = null; // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $misc->printHeader($lang['strexport']); echo "

", $misc->printVal($_REQUEST['database']), ": {$lang['strexport']}

\n"; diff --git a/dbexport.php b/dbexport.php index ded5649ea..420c953ac 100644 --- a/dbexport.php +++ b/dbexport.php @@ -2,12 +2,12 @@ /** * Does an export of a database to the screen or as a download * - * $Id: dbexport.php,v 1.2 2003/12/13 16:15:43 chriskl Exp $ + * $Id: dbexport.php,v 1.3 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions $_no_output = true; - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); // Check that database dumps are enabled. if ($conf['pg_dump_path'] !== null && $conf['pg_dump_path'] != '') { diff --git a/display.php b/display.php index 6c08a920e..8da263f8f 100644 --- a/display.php +++ b/display.php @@ -9,11 +9,11 @@ * @param $return_desc The return link name * @param $page The current page * - * $Id: display.php,v 1.33 2003/12/10 16:03:29 chriskl Exp $ + * $Id: display.php,v 1.34 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); global $conf, $lang; diff --git a/domains.php b/domains.php index a6197f7bf..245a2fa5e 100644 --- a/domains.php +++ b/domains.php @@ -3,11 +3,11 @@ /** * Manage domains in a database * - * $Id: domains.php,v 1.6 2003/12/10 16:03:29 chriskl Exp $ + * $Id: domains.php,v 1.7 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; if (!isset($msg)) $msg = ''; diff --git a/functions.php b/functions.php index 36f2aed47..fd8db6543 100644 --- a/functions.php +++ b/functions.php @@ -3,11 +3,11 @@ /** * Manage functions in a database * - * $Id: functions.php,v 1.23 2003/12/10 16:03:29 chriskl Exp $ + * $Id: functions.php,v 1.24 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; if (!isset($msg)) $msg = ''; diff --git a/groups.php b/groups.php index b845d3140..1886b0022 100644 --- a/groups.php +++ b/groups.php @@ -3,11 +3,11 @@ /** * Manage groups in a database cluster * - * $Id: groups.php,v 1.14 2003/11/03 19:53:45 soranzo Exp $ + * $Id: groups.php,v 1.15 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; if (!isset($msg)) $msg = ''; diff --git a/index.php b/index.php index 73a91548a..9b6b559d9 100755 --- a/index.php +++ b/index.php @@ -3,11 +3,11 @@ /** * Main access point to the app. * - * $Id: index.php,v 1.7 2003/05/26 11:33:22 chriskl Exp $ + * $Id: index.php,v 1.8 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $misc->printHeader(); ?> diff --git a/indexes.php b/indexes.php index b45db1657..a08096e06 100644 --- a/indexes.php +++ b/indexes.php @@ -3,12 +3,12 @@ /** * List indexes on a table * - * $Id: indexes.php,v 1.20 2003/12/10 16:03:29 chriskl Exp $ + * $Id: indexes.php,v 1.21 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); - include_once('classes/class.select.php'); + include_once('./libraries/lib.inc.php'); + include_once('./classes/class.select.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; $PHP_SELF = $_SERVER['PHP_SELF']; diff --git a/info.php b/info.php index 7b8512a9b..727758ab3 100644 --- a/info.php +++ b/info.php @@ -3,11 +3,11 @@ /** * List extra information on a table * - * $Id: info.php,v 1.3 2003/12/10 16:03:29 chriskl Exp $ + * $Id: info.php,v 1.4 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; $PHP_SELF = $_SERVER['PHP_SELF']; diff --git a/intro.php b/intro.php index 370532156..9128230d3 100755 --- a/intro.php +++ b/intro.php @@ -3,12 +3,12 @@ /** * Intro screen * - * $Id: intro.php,v 1.9 2003/09/10 07:13:18 chriskl Exp $ + * $Id: intro.php,v 1.10 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions (no db conn) $_no_db_connection = true; - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $misc->printHeader(); $misc->printBody(); diff --git a/lang/langcheck b/lang/langcheck index 1338f0590..b77976e99 100644 --- a/lang/langcheck +++ b/lang/langcheck @@ -5,7 +5,7 @@ * This script will generate a report on the status of a language * as compared to the master english translation. * - * $Id: langcheck,v 1.2 2003/09/01 03:08:12 chriskl Exp $ + * $Id: langcheck,v 1.3 2003/12/17 09:11:32 chriskl Exp $ */ error_reporting(E_ALL); set_time_limit(0); @@ -22,14 +22,14 @@ } // Include english source file - include('english.php'); + include('./english.php'); $master = $lang; $master_keys = array_keys($lang); unset($lang); // Include target language file - include("{$_SERVER['argv'][1]}.php"); + include("./{$_SERVER['argv'][1]}.php"); $slave = $lang; $slave_keys = array_keys($lang); diff --git a/languages.php b/languages.php index 8aca7404f..05de6e187 100644 --- a/languages.php +++ b/languages.php @@ -3,11 +3,11 @@ /** * Manage languages in a database * - * $Id: languages.php,v 1.2 2003/12/10 16:03:29 chriskl Exp $ + * $Id: languages.php,v 1.3 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; if (!isset($msg)) $msg = ''; diff --git a/libraries/errorhandler.inc.php b/libraries/errorhandler.inc.php index 11600fc23..f8a93feb2 100644 --- a/libraries/errorhandler.inc.php +++ b/libraries/errorhandler.inc.php @@ -3,7 +3,7 @@ /** * Overrides default ADODB error handler to provide nicer error handling. * - * $Id: errorhandler.inc.php,v 1.13 2003/10/03 07:38:55 chriskl Exp $ + * $Id: errorhandler.inc.php,v 1.14 2003/12/17 09:11:32 chriskl Exp $ */ define('ADODB_ERROR_HANDLER','Error_Handler'); @@ -38,7 +38,7 @@ function Error_Handler($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false) case 'PCONNECT': case 'CONNECT': $_failed = true; - include('login.php'); + include('./login.php'); exit; break; default: diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php index e95cf3efb..353f9b6c5 100644 --- 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.70 2003/12/13 11:04:04 chriskl Exp $ + * $Id: lib.inc.php,v 1.71 2003/12/17 09:11:32 chriskl Exp $ */ // Set error reporting level to max @@ -19,7 +19,7 @@ // Check to see if the configuration file exists, if not, explain if (file_exists('conf/config.inc.php')) { $conf = array(); - include('conf/config.inc.php'); + include('./conf/config.inc.php'); } else { echo "Configuration error: Copy conf/config.inc.php-dist to conf/config.inc.php and edit appropriately."; @@ -58,10 +58,10 @@ // one has not been selected yet. if (!isset($conf['default_lang'])) $conf['default_lang'] = 'english'; $lang = array(); - include_once('lang/recoded/english.php'); + include_once('./lang/recoded/english.php'); // Include default language over the top - we really should try to avoid this // in the case when the user has chosen a language. - include_once("lang/recoded/" . strtolower($conf['default_lang']) . ".php"); + include_once("./lang/recoded/" . strtolower($conf['default_lang']) . ".php"); // Check for config file version mismatch if (!isset($conf['version']) || $conf['base_version'] > $conf['version']) { @@ -70,7 +70,7 @@ } // Create Misc class references - include_once('classes/Misc.php'); + include_once('./classes/Misc.php'); $misc = new Misc(); // Start session (if not auto-started) @@ -118,19 +118,19 @@ || !isset($_SESSION['webdbServerID']) || !isset($_SESSION['webdbLanguage']) || !isset($conf['servers'][$_SESSION['webdbServerID']])) { - include('login.php'); + include('./login.php'); exit; } // If extra login check fails, back to the login screen $_allowed = $misc->checkExtraSecurity(); if (!$_allowed) { - include('login.php'); + include('./login.php'); exit; } // Import language file - include("lang/recoded/" . strtolower($_SESSION['webdbLanguage']) . ".php"); + include("./lang/recoded/" . strtolower($_SESSION['webdbLanguage']) . ".php"); // Check database support is properly compiled in if (!function_exists('pg_connect')) { @@ -148,7 +148,7 @@ $_curr_db = $conf['servers'][$_SESSION['webdbServerID']]['defaultdb']; // Create the connection object and make the connection - include_once('classes/database/Connection.php'); + include_once('./classes/database/Connection.php'); $_connection = new Connection( $conf['servers'][$_SESSION['webdbServerID']]['host'], $conf['servers'][$_SESSION['webdbServerID']]['port'], diff --git a/login.php b/login.php index f9708c87b..c4215be18 100755 --- a/login.php +++ b/login.php @@ -3,12 +3,12 @@ /** * Login screen * - * $Id: login.php,v 1.14 2003/09/30 09:33:43 soranzo Exp $ + * $Id: login.php,v 1.15 2003/12/17 09:11:32 chriskl Exp $ */ // This needs to be an include once to prevent lib.inc.php infinite recursive includes. // Check to see if the configuration file exists, if not, explain - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); // Unfortunately, since sometimes lib.inc.php has been included, but we still // need the config variables diff --git a/operators.php b/operators.php index 50c7b4341..a51f047eb 100644 --- a/operators.php +++ b/operators.php @@ -3,11 +3,11 @@ /** * Manage operators in a database * - * $Id: operators.php,v 1.8 2003/12/10 16:03:29 chriskl Exp $ + * $Id: operators.php,v 1.9 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; if (!isset($msg)) $msg = ''; diff --git a/privileges.php b/privileges.php index fae8342db..881906508 100644 --- a/privileges.php +++ b/privileges.php @@ -3,11 +3,11 @@ /** * Manage privileges in a database * - * $Id: privileges.php,v 1.20 2003/12/10 16:03:29 chriskl Exp $ + * $Id: privileges.php,v 1.21 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; if (!isset($msg)) $msg = ''; diff --git a/reports.php b/reports.php index f559ee04c..a9709bf6f 100644 --- a/reports.php +++ b/reports.php @@ -3,11 +3,11 @@ /** * List reports in a database * - * $Id: reports.php,v 1.15 2003/12/15 08:30:54 chriskl Exp $ + * $Id: reports.php,v 1.16 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; $PHP_SELF = $_SERVER['PHP_SELF']; @@ -269,7 +269,7 @@ function doDefault($msg = '') { $misc->printBody(); // Create a database accessor for the reports database - include_once('classes/Reports.php'); + include_once('./classes/Reports.php'); $reportsdb = new Reports($status); if ($status != 0) { echo "

{$lang['strnoreportsdb']}

\n"; diff --git a/rules.php b/rules.php index 7f0e8bca1..ce5b90e99 100644 --- a/rules.php +++ b/rules.php @@ -3,11 +3,11 @@ /** * List rules on a table * - * $Id: rules.php,v 1.16 2003/12/10 16:03:29 chriskl Exp $ + * $Id: rules.php,v 1.17 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; $PHP_SELF = $_SERVER['PHP_SELF']; diff --git a/schema.php b/schema.php index 6623da4ac..658ea7cdb 100755 --- a/schema.php +++ b/schema.php @@ -3,12 +3,12 @@ /** * Display properties of a schema * - * $Id: schema.php,v 1.11 2003/12/10 16:07:04 chriskl Exp $ + * $Id: schema.php,v 1.12 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions (no db conn) $_no_db_connection = true; - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; if (!isset($msg)) $msg = ''; diff --git a/sequences.php b/sequences.php index c2297991d..6f2103157 100644 --- a/sequences.php +++ b/sequences.php @@ -3,11 +3,11 @@ /** * Manage sequences in a database * - * $Id: sequences.php,v 1.15 2003/12/10 16:03:29 chriskl Exp $ + * $Id: sequences.php,v 1.16 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; if (!isset($msg)) $msg = ''; diff --git a/sql.php b/sql.php index 7f8c0f55f..4b50e3fe3 100644 --- a/sql.php +++ b/sql.php @@ -6,11 +6,11 @@ * how many SQL statements have been strung together with semi-colons * @param $query The SQL query string to execute * - * $Id: sql.php,v 1.13 2003/12/10 16:03:29 chriskl Exp $ + * $Id: sql.php,v 1.14 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $PHP_SELF = $_SERVER['PHP_SELF']; diff --git a/sqledit.php b/sqledit.php index f87b9cede..df55b3ce6 100644 --- a/sqledit.php +++ b/sqledit.php @@ -3,11 +3,11 @@ /** * Alternative SQL editing window * - * $Id: sqledit.php,v 1.9 2003/12/15 07:59:22 chriskl Exp $ + * $Id: sqledit.php,v 1.10 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; if (!isset($msg)) $msg = ''; diff --git a/tables.php b/tables.php index f53d1bc8e..1265f15fe 100644 --- a/tables.php +++ b/tables.php @@ -3,11 +3,11 @@ /** * List tables in a database * - * $Id: tables.php,v 1.42 2003/12/15 15:42:45 chriskl Exp $ + * $Id: tables.php,v 1.43 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; $PHP_SELF = $_SERVER['PHP_SELF']; @@ -262,7 +262,7 @@ function doSelectRows($confirm, $msg = '') { $_REQUEST['return_url'] = "tables.php?action=confselectrows&{$misc->href}&table={$_REQUEST['table']}"; $_REQUEST['return_desc'] = $lang['strback']; - include('display.php'); + include('./display.php'); exit; } } diff --git a/tblproperties.php b/tblproperties.php index 7a858b359..7df2ecef0 100644 --- a/tblproperties.php +++ b/tblproperties.php @@ -3,11 +3,11 @@ /** * List tables in a database * - * $Id: tblproperties.php,v 1.32 2003/12/15 15:42:45 chriskl Exp $ + * $Id: tblproperties.php,v 1.33 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; $PHP_SELF = $_SERVER['PHP_SELF']; diff --git a/topbar.php b/topbar.php index eb91844ed..3eae5b378 100755 --- a/topbar.php +++ b/topbar.php @@ -3,11 +3,11 @@ /** * Top menu for phpPgAdmin * - * $Id: topbar.php,v 1.19 2003/12/15 07:59:22 chriskl Exp $ + * $Id: topbar.php,v 1.20 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $misc->printHeader(); $misc->printBody('topbar'); diff --git a/triggers.php b/triggers.php index c435ee198..00937862f 100644 --- a/triggers.php +++ b/triggers.php @@ -3,12 +3,12 @@ /** * List triggers on a table * - * $Id: triggers.php,v 1.18 2003/12/15 15:42:45 chriskl Exp $ + * $Id: triggers.php,v 1.19 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); - include_once('classes/class.select.php'); + include_once('./libraries/lib.inc.php'); + include_once('./classes/class.select.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; $PHP_SELF = $_SERVER['PHP_SELF']; diff --git a/types.php b/types.php index 3715dd9e9..4fd9dcaba 100644 --- a/types.php +++ b/types.php @@ -3,11 +3,11 @@ /** * Manage types in a database * - * $Id: types.php,v 1.12 2003/12/10 16:03:29 chriskl Exp $ + * $Id: types.php,v 1.13 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; if (!isset($msg)) $msg = ''; diff --git a/users.php b/users.php index 65883abe2..5cf2ffbbf 100644 --- a/users.php +++ b/users.php @@ -3,11 +3,11 @@ /** * Manage users in a database cluster * - * $Id: users.php,v 1.18 2003/10/06 18:10:14 soranzo Exp $ + * $Id: users.php,v 1.19 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; if (!isset($msg)) $msg = ''; diff --git a/views.php b/views.php index e4cd592de..873ba1210 100644 --- a/views.php +++ b/views.php @@ -3,11 +3,11 @@ /** * Manage views in a database * - * $Id: views.php,v 1.25 2003/12/10 16:03:29 chriskl Exp $ + * $Id: views.php,v 1.26 2003/12/17 09:11:32 chriskl Exp $ */ // Include application functions - include_once('libraries/lib.inc.php'); + include_once('./libraries/lib.inc.php'); $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : ''; if (!isset($msg)) $msg = ''; @@ -113,7 +113,7 @@ function doSelectRows($confirm, $msg = '') { $_REQUEST['return_url'] = "views.php?action=confselectrows&{$misc->href}&view={$_REQUEST['view']}"; $_REQUEST['return_desc'] = $lang['strback']; - include('display.php'); + include('./display.php'); exit; } }