Skip to content

Commit

Permalink
phpPgAdmin now works without '.' in the include_path
Browse files Browse the repository at this point in the history
  • Loading branch information
chriskl committed Dec 17, 2003
1 parent a297ddf commit 9f5d0a8
Show file tree
Hide file tree
Showing 48 changed files with 113 additions and 111 deletions.
2 changes: 2 additions & 0 deletions HISTORY
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions all_db.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';
Expand Down
4 changes: 2 additions & 2 deletions bottombar.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
6 changes: 3 additions & 3 deletions browser.php
Original file line number Diff line number Diff line change
Expand Up @@ -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('', "<script src=\"classes/HTML_TreeMenu/TreeMenu.js\" type=\"text/javascript\"></script>\n<script src=\"links.js\" type=\"text/javascript\"></script>");
Expand Down
4 changes: 2 additions & 2 deletions casts.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';
Expand Down
4 changes: 2 additions & 2 deletions classes/Misc.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions classes/database/ADODB_base.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions classes/database/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions classes/database/Postgres.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions classes/database/Postgres71.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions classes/database/Postgres72.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions classes/database/Postgres73.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions classes/database/Postgres74.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions classes/database/Postgres75.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
6 changes: 3 additions & 3 deletions constraints.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'];
Expand Down
4 changes: 2 additions & 2 deletions conversions.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';
Expand Down
4 changes: 2 additions & 2 deletions database.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';
Expand Down
4 changes: 2 additions & 2 deletions databases.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions dataexport.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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']));

Expand Down Expand Up @@ -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 "<h2>", $misc->printVal($_REQUEST['database']), ": {$lang['strexport']}</h2>\n";
Expand Down
4 changes: 2 additions & 2 deletions dbexport.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'] != '') {
Expand Down
4 changes: 2 additions & 2 deletions display.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions domains.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';
Expand Down
4 changes: 2 additions & 2 deletions functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';
Expand Down
4 changes: 2 additions & 2 deletions groups.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';
Expand Down
4 changes: 2 additions & 2 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
?>
Expand Down
6 changes: 3 additions & 3 deletions indexes.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'];
Expand Down
Loading

0 comments on commit 9f5d0a8

Please sign in to comment.