From: xzilla Date: Mon, 9 Jul 2007 14:55:21 +0000 (+0000) Subject: merge changes from DEV_RMPHPSELF into REL_4_1 stable X-Git-Tag: REL_4-1-3~6 X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=d7da541c95e40d32df29faa9294f189ce4c873be;p=phppgadmin.git merge changes from DEV_RMPHPSELF into REL_4_1 stable --- diff --git a/DEVELOPERS b/DEVELOPERS index c80e2880..3f01acdc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -71,7 +71,10 @@ odd characters in user input. Examine existing functions that do similar things to yours to get yours right. When writing data to the display, you should always urlencode() variables in -HREFs and htmlspecialchars() variables in forms. +HREFs and htmlspecialchars() variables in forms. Rather than use action="" +attributes in HTML form elements use action="thisformname.php". This +ensures that browsers remove query strings when expanding the given +relative URL into a full URL. When working with CVS, always make sure to do a 'cvs update' both before you start; so you have the latest code to work with; and also again before you @@ -98,7 +101,7 @@ This is the general form for looping over a recordset: $rs = $class->getResults(); if (is_object($rs) && $rs->recordCount() > 0) { while (!$rs->EOF) { - echo $rs->fields['field']; + echo $rs->f['field']; $rs->moveNext(); } } diff --git a/HISTORY b/HISTORY index 9eeac787..07f87f2b 100644 --- a/HISTORY +++ b/HISTORY @@ -1,6 +1,14 @@ phpPgAdmin History ------------------ +Version 4.1.3-rc-1 +------------- + +Bugs +* Eliminate use of $_SERVER['PHP_SELF']. This fixes a regression in 4.1.2 for + non-mainstream locales (including SQL_ASCII) +* Validate client supplied server against entries in config.inc.php + Version 4.1.2 ------------- @@ -18,7 +26,8 @@ Version 4.1.1 ------------- Bugs -* Fix problem where failed update would report as duplicate update error and fail to return edit screen +* Fix problem where failed update would report as duplicate update error and + fail to return edit screen * Fix error when using $conf[owned_only] on 8.1 & 8.2 * Fix error displaying schema names for parents of inherited tables * Clean up non-standard escape warnings for PostgreSQL 8.2 diff --git a/aggregates.php b/aggregates.php index 8c266b92..0aa17a3f 100644 --- a/aggregates.php +++ b/aggregates.php @@ -3,7 +3,7 @@ /** * Manage aggregates in a database * - * $Id: aggregates.php,v 1.15.2.1 2007/05/28 17:21:55 ioguix Exp $ + * $Id: aggregates.php,v 1.15.2.2 2007/07/09 14:55:21 xzilla Exp $ */ // Include application functions @@ -53,7 +53,7 @@ */ function doCreate($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if (!isset($_REQUEST['name'])) $_REQUEST['name'] = ''; if (!isset($_REQUEST['basetype'])) $_REQUEST['basetype'] = ''; @@ -68,7 +68,7 @@ $misc->printTitle($lang['strcreateaggregate'], 'pg.aggregate.create'); $misc->printMsg($msg); - echo "
\n"; + echo "\n"; echo "\n"; echo "\t\n\t\t\n"; echo "\t\t
{$lang['strname']}_maxNameLen}\" value=\"", @@ -132,13 +132,13 @@ */ function doAlter($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('aggregate'); $misc->printTitle($lang['stralteraggregate'], 'pg.aggregate.alter'); $misc->printMsg($msg); - echo "\n"; + echo "\n"; $aggrdata = $data->getAggregate($_REQUEST['aggrname'], $_REQUEST['aggrtype']); if($aggrdata->recordCount() > 0 ) { // Output table header @@ -177,7 +177,6 @@ function doDrop($confirm) { global $data, $misc; global $lang, $_reload_browser; - global $PHP_SELF; if ($confirm) { $misc->printTrail('aggregate'); @@ -185,7 +184,7 @@ echo "

", sprintf($lang['strconfdropaggregate'], htmlspecialchars($_REQUEST['aggrname'])), "

\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -214,7 +213,7 @@ */ function doProperties($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('aggregate'); $misc->printTitle($lang['strproperties'],'pg.aggregate'); @@ -248,12 +247,12 @@ } else echo "

{$lang['strnodata']}

\n"; - echo "

href}\">{$lang['straggrshowall']} |\n"; + echo "

href}\">{$lang['straggrshowall']} |\n"; if ($data->hasAlterAggregate()) { - echo "href}&aggrname=", + echo "href}&aggrname=", urlencode($_REQUEST['aggrname']), "&aggrtype=", urlencode($_REQUEST['aggrtype']), "\">{$lang['stralter']} |\n"; } - echo "href}&aggrname=", + echo "href}&aggrname=", urlencode($_REQUEST['aggrname']), "&aggrtype=", urlencode($_REQUEST['aggrtype']), "\">{$lang['strdrop']}\n"; } @@ -263,7 +262,7 @@ */ function doDefault($msg = '') { global $data, $conf, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('schema'); $misc->printTabs('schema', 'aggregates'); @@ -305,12 +304,12 @@ ), 'alter' => array( 'title' => $lang['stralter'], - 'url' => "{$PHP_SELF}?action=alter&{$misc->href}&", + 'url' => "aggregates.php?action=alter&{$misc->href}&", 'vars' => array('aggrname' => 'proname', 'aggrtype' => 'proargtypes'), ), 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&", + 'url' => "aggregates.php?action=confirm_drop&{$misc->href}&", 'vars' => array('aggrname' => 'proname', 'aggrtype' => 'proargtypes'), ) ); @@ -318,7 +317,7 @@ if (!$data->hasAlterAggregate()) unset($actions['alter']); $misc->printTable($aggregates, $columns, $actions, $lang['strnoaggregates']); - echo "

href}\">{$lang['strcreateaggregate']}

\n"; + echo "

href}\">{$lang['strcreateaggregate']}

\n"; } /** diff --git a/all_db.php b/all_db.php index 677726c1..24ca0238 100644 --- a/all_db.php +++ b/all_db.php @@ -3,7 +3,7 @@ /** * Manage databases within a server * - * $Id: all_db.php,v 1.45.2.1 2007/05/28 17:21:55 ioguix Exp $ + * $Id: all_db.php,v 1.45.2.2 2007/07/09 14:55:21 xzilla Exp $ */ // Include application functions @@ -17,13 +17,13 @@ */ function doAlter($confirm) { global $data, $misc, $_reload_browser; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('database'); $misc->printTitle($lang['stralter'], 'pg.database.alter'); - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "
{$lang['strname']}"; @@ -82,14 +82,14 @@ */ function doDrop($confirm) { global $data, $misc; - global $PHP_SELF, $lang, $_reload_drop_database; + global $lang, $_reload_drop_database; if ($confirm) { $misc->printTrail('database'); $misc->printTitle($lang['strdrop'], 'pg.database.drop'); echo "

", sprintf($lang['strconfdropdatabase'], $misc->printVal($_REQUEST['dropdatabase'])), "

\n"; - echo "\n"; + echo "\n"; echo "\n"; echo $misc->form; echo "\n"; @@ -113,7 +113,7 @@ */ function doCreate($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('server'); $misc->printTitle($lang['strcreatedatabase'], 'pg.database.create'); @@ -133,7 +133,7 @@ // Fetch all tablespaces from the database if ($data->hasTablespaces()) $tablespaces = $data->getTablespaces(); - echo "\n"; + echo "\n"; echo "\n"; echo "\t\n\t\t\n"; echo "\t\t"; } } break; default; echo "
{$lang['strname']}_maxNameLen}\" value=\"", @@ -212,7 +212,7 @@ */ function doExport($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('server'); $misc->printTabs('server','export'); @@ -261,7 +261,7 @@ */ function doDefault($msg = '') { global $data, $conf, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('server'); $misc->printTabs('server','databases'); @@ -308,7 +308,7 @@ ), 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=confirm_drop&subject=database&{$misc->href}&", + 'url' => "all_db.php?action=confirm_drop&subject=database&{$misc->href}&", 'vars' => array('dropdatabase' => 'datname'), ), 'privileges' => array( @@ -320,7 +320,7 @@ if ($data->hasAlterDatabase() ) { $actions['alter'] = array( 'title' => $lang['stralter'], - 'url' => "{$PHP_SELF}?action=confirm_alter&subject=database&{$misc->href}&", + 'url' => "all_db.php?action=confirm_alter&subject=database&{$misc->href}&", 'vars' => array('alterdatabase' => 'datname') ); } @@ -331,7 +331,7 @@ $misc->printTable($databases, $columns, $actions, $lang['strnodatabases']); - echo "

href}\">{$lang['strcreatedatabase']}

\n"; + echo "

href}\">{$lang['strcreatedatabase']}

\n"; } diff --git a/casts.php b/casts.php index b4ccce4d..2f9fb5e0 100644 --- a/casts.php +++ b/casts.php @@ -3,7 +3,7 @@ /** * Manage casts in a database * - * $Id: casts.php,v 1.12.2.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: casts.php,v 1.12.2.2 2007/07/09 14:55:21 xzilla Exp $ */ // Include application functions @@ -17,7 +17,7 @@ */ function doDefault($msg = '') { global $data, $misc, $database; - global $PHP_SELF, $lang; + global $lang; function renderCastContext($val) { global $lang; diff --git a/classes/Misc.php b/classes/Misc.php index 4848efb6..fe329c2f 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.138 2007/01/10 01:56:06 soranzo Exp $ + * $Id: Misc.php,v 1.137.2.1 2007/07/09 14:55:23 xzilla Exp $ */ class Misc { @@ -1511,7 +1511,7 @@ * $columns = array( * column_id => array( * 'title' => Column heading, - * 'field' => Field name for $tabledata->fields[...], + * 'field' => Field name for $tabledata->f[...], * 'help' => Help page for this column, * ), ... * ); @@ -1533,7 +1533,6 @@ */ function printTable(&$tabledata, &$columns, &$actions, $nodata = null, $pre_fn = null) { global $data, $conf, $misc; - global $PHP_SELF; if ($tabledata->recordCount() > 0) { @@ -1603,23 +1602,23 @@ } else { echo "		"; echo "printUrlVars($action['vars'], $tabledata->fields); + $misc->printUrlVars($action['vars'], $tabledata->f); echo "\">{$action['title']}"; - if (array_key_exists($column['field'], $tabledata->fields)) { + if (isset($tabledata->f[$column['field']])) { if (isset($column['url'])) { echo "printUrlVars($column['vars'], $tabledata->fields); + $misc->printUrlVars($column['vars'], $tabledata->f); echo "\">"; } $type = isset($column['type']) ? $column['type'] : null; $params = isset($column['params']) ? $column['params'] : array(); - echo $misc->printVal($tabledata->fields[$column['field']], $type, $params); + echo $misc->printVal($tabledata->f[$column['field']], $type, $params); } if (isset($column['url'])) echo ""; @@ -1674,7 +1673,7 @@ if ($treedata->recordCount() > 0) { while (!$treedata->EOF) { - $rec =& $treedata->fields; + $rec =& $treedata->f; echo "printTitle($lang['straltercolumn'], 'pg.column.alter'); $misc->printMsg($msg); - echo "\n"; + echo "\n"; // Output table header echo "\n"; @@ -179,7 +179,7 @@ */ function doDefault($msg = '', $isTable = true) { global $data, $conf, $misc, $tableName; - global $PHP_SELF, $lang; + global $lang; function attPre(&$rowdata) { global $data; @@ -243,7 +243,7 @@ urlencode("SELECT {$_REQUEST['column']}, count(*) AS \"count\" FROM $tableName GROUP BY {$_REQUEST['column']} ORDER BY {$_REQUEST['column']}") , "\">{$lang['strbrowse']}\n"; /* Edit link */ - echo "\t
  • href}&table=", urlencode($_REQUEST['table']), + echo "\t
  • href}&table=", urlencode($_REQUEST['table']), "&column=", urlencode($_REQUEST['column']) . "\">{$lang['stralter']}
    • \n"; /* Delete link */ diff --git a/constraints.php b/constraints.php index 1fd06732..554a5c60 100644 --- a/constraints.php +++ b/constraints.php @@ -3,7 +3,7 @@ /** * List constraints on a table * - * $Id: constraints.php,v 1.43.2.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: constraints.php,v 1.43.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -16,7 +16,7 @@ * Confirm and then actually add a FOREIGN KEY constraint */ function addForeignKey($stage, $msg = '') { - global $PHP_SELF, $data, $data, $misc; + global $data, $data, $misc; global $lang; if (!isset($_POST['name'])) $_POST['name'] = ''; @@ -73,7 +73,7 @@ $buttonRemove->set_attribute('onclick', 'buttonPressed(this);'); $buttonRemove->set_attribute('type', 'button'); - echo "\n"; + echo "\n"; echo "
    \n"; echo ""; @@ -176,7 +176,7 @@ $buttonRemove->set_attribute('onclick', 'buttonPressed(this);'); $buttonRemove->set_attribute('type', 'button'); - echo "\n"; + echo "\n"; echo "
    {$lang['strfktarget']}
    \n"; echo "\n"; @@ -218,7 +218,7 @@ * Confirm and then actually add a PRIMARY KEY or UNIQUE constraint */ function addPrimaryOrUniqueKey($type, $confirm, $msg = '') { - global $PHP_SELF, $data, $data, $misc; + global $data, $data, $misc; global $lang; if (!isset($_POST['name'])) $_POST['name'] = ''; @@ -269,7 +269,7 @@ $buttonRemove->set_attribute('onclick', 'buttonPressed(this);'); $buttonRemove->set_attribute('type', 'button'); - echo "\n"; + echo "\n"; echo "
    {$lang['strname']}
    \n"; echo ""; @@ -344,7 +344,7 @@ * Confirm and then actually add a CHECK constraint */ function addCheck($confirm, $msg = '') { - global $PHP_SELF, $data, $data, $misc; + global $data, $data, $misc; global $lang; if (!isset($_POST['name'])) $_POST['name'] = ''; @@ -355,7 +355,7 @@ $misc->printTitle($lang['straddcheck'],'pg.constraint.check'); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo "
    {$lang['strname']}
    \n"; echo "\n"; echo "\n"; @@ -394,7 +394,7 @@ */ function doDrop($confirm) { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('constraint'); @@ -403,7 +403,7 @@ echo "

    ", sprintf($lang['strconfdropconstraint'], $misc->printVal($_REQUEST['constraint']), $misc->printVal($_REQUEST['table'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -431,7 +431,6 @@ */ function doDefault($msg = '') { global $data, $misc; - global $PHP_SELF; global $lang; function cnPre(&$rowdata) { @@ -468,7 +467,7 @@ $actions = array( 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", + 'url' => "constraints.php?action=confirm_drop&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", 'vars' => array('constraint' => 'conname', 'type' => 'contype'), ), ); @@ -477,13 +476,13 @@ $misc->printTable($constraints, $columns, $actions, $lang['strnoconstraints'], 'cnPre'); - echo "

    href}&table=", urlencode($_REQUEST['table']), + echo "

    href}&table=", urlencode($_REQUEST['table']), "\">{$lang['straddcheck']} |\n"; - echo "href}&table=", urlencode($_REQUEST['table']), + echo "href}&table=", urlencode($_REQUEST['table']), "\">{$lang['stradduniq']} |\n"; - echo "href}&table=", urlencode($_REQUEST['table']), + echo "href}&table=", urlencode($_REQUEST['table']), "\">{$lang['straddpk']} |\n"; - echo "href}&table=", urlencode($_REQUEST['table']), + echo "href}&table=", urlencode($_REQUEST['table']), "\">{$lang['straddfk']}

    \n"; } diff --git a/conversions.php b/conversions.php index 8d996238..af61a473 100644 --- a/conversions.php +++ b/conversions.php @@ -3,7 +3,7 @@ /** * Manage conversions in a database * - * $Id: conversions.php,v 1.12.2.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: conversions.php,v 1.12.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -17,7 +17,7 @@ */ function doDefault($msg = '') { global $data, $conf, $misc, $database; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('schema'); $misc->printTabs('schema', 'conversions'); diff --git a/database.php b/database.php index 746b7f97..5aa9d58d 100755 --- a/database.php +++ b/database.php @@ -3,7 +3,7 @@ /** * Manage schemas within a database * - * $Id: database.php,v 1.88.2.2 2007/05/28 17:21:56 ioguix Exp $ + * $Id: database.php,v 1.88.2.3 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -33,7 +33,7 @@ * Searches for a named database object */ function doFind($confirm = true, $msg = '') { - global $PHP_SELF, $data, $data, $misc; + global $data, $data, $misc; global $lang, $conf; if (!isset($_GET['term'])) $_GET['term'] = ''; @@ -43,7 +43,7 @@ $misc->printTabs('database','find'); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo "

    _maxNameLen}\" />\n"; // Output list of filters. This is complex due to all the 'has' and 'conf' feature possibilities @@ -275,7 +275,7 @@ */ function doExport($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('database'); $misc->printTabs('database','export'); @@ -327,7 +327,7 @@ * Show the current status of all database variables */ function doVariables() { - global $PHP_SELF, $data, $misc; + global $data, $misc; global $lang; // Fetch the variables from the database @@ -356,7 +356,7 @@ * are running. */ function doProcesses($msg = '') { - global $PHP_SELF, $data, $misc; + global $data, $misc; global $lang; $misc->printTrail('database'); @@ -421,7 +421,7 @@ $actions = array( 'cancel' => array( 'title' => $lang['strcancel'], - 'url' => "{$PHP_SELF}?action=signal&signal=CANCEL&{$misc->href}&", + 'url' => "database.php?action=signal&signal=CANCEL&{$misc->href}&", 'vars' => array('procpid' => 'procpid') ) ); @@ -438,7 +438,7 @@ * Show the existing table locks in the current database */ function doLocks() { - global $PHP_SELF, $data, $misc; + global $data, $misc; global $lang; // Get the info from the pg_locks view @@ -484,7 +484,7 @@ * Allow database administration and tuning tasks */ function doAdmin($action = '', $msg = '') { - global $PHP_SELF, $data, $misc; + global $data, $misc; global $lang; switch ($action) { case 'vacuum': @@ -533,7 +533,7 @@ // Vacuum echo "

    \n"; echo "
    {$lang['strname']}{$lang['strdefinition']}
    \n"; - echo "\n"; + echo "\n"; echo "
    \n"; if ($data->hasFullVacuum()) { echo "
    \n"; @@ -547,7 +547,7 @@ // Analyze echo "    		\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo $misc->form; @@ -557,7 +557,7 @@ // Recluster if ($data->hasRecluster()){ echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo $misc->form; @@ -567,7 +567,7 @@ // Reindex echo "\n"; - echo "\n"; + echo "\n"; echo "
    \n"; echo "\n"; echo "\n"; @@ -632,12 +632,12 @@ $actions = array( 'edit' => array( 'title' => $lang['stredit'], - 'url' => "{$PHP_SELF}?action=editautovac&schema=pg_catalog&{$misc->href}&", + 'url' => "database.php?action=editautovac&schema=pg_catalog&{$misc->href}&", 'vars' => array('key[vacrelid]' => 'vacrelid') ), 'delete' => array( 'title' => $lang['strdelete'], - 'url' => "{$PHP_SELF}?action=delautovac&{$misc->href}&", + 'url' => "database.php?action=delautovac&{$misc->href}&", 'vars' => array('key[vacrelid]' => 'vacrelid') ) ); @@ -655,7 +655,6 @@ function doEditAutovacuum($confirm, $msg = '') { global $data, $misc, $conf; global $lang; - global $PHP_SELF; $key = $_REQUEST['key']; @@ -667,7 +666,7 @@ $attrs = $data->getTableAttributes('pg_autovacuum'); $rs = $data->browseRow('pg_autovacuum', $key); - echo "\n"; + echo "\n"; $elements = 0; $error = true; if ($rs->recordCount() == 1 && $attrs->recordCount() > 0) { @@ -755,7 +754,7 @@ * Delete rows from the autovacuum table */ function doDelAutovacuum($confirm) { - global $PHP_SELF, $data, $misc; + global $data, $misc; global $lang; if ($confirm) { @@ -765,7 +764,7 @@ echo "

    {$lang['strconfdeleterow']}

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo $misc->form; echo "\n"; @@ -789,7 +788,7 @@ * Allow execution of arbitrary SQL statements on a database */ function doSQL() { - global $PHP_SELF, $data, $misc; + global $data, $misc; global $lang; if (!isset($_REQUEST['query'])) $_REQUEST['query'] = ''; @@ -832,7 +831,7 @@ } function doTree() { - global $misc, $data, $lang, $PHP_SELF, $slony; + global $misc, $data, $lang, $slony; $reqvars = $misc->getRequestVars('database'); diff --git a/dataexport.php b/dataexport.php index 5fc001e9..431f864d 100644 --- a/dataexport.php +++ b/dataexport.php @@ -4,7 +4,7 @@ * Does an export to the screen or as a download. This checks to * see if they have pg_dump set up, and will use it if possible. * - * $Id: dataexport.php,v 1.23.2.1 2007/05/28 19:30:17 soranzo Exp $ + * $Id: dataexport.php,v 1.23.2.2 2007/07/09 14:55:22 xzilla Exp $ */ $extensions = array( @@ -307,7 +307,7 @@ $misc->printTitle($lang['strexport']); if (isset($msg)) $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo "\n"; echo "
    {$lang['strformat']}:\n"; echo $misc->form; if (isset($_REQUEST['table'])) diff --git a/domains.php b/domains.php index f32d6130..753a8cc0 100644 --- a/domains.php +++ b/domains.php @@ -3,7 +3,7 @@ /** * Manage domains in a database * - * $Id: domains.php,v 1.24.2.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: domains.php,v 1.24.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -31,7 +31,7 @@ */ function doAlter($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('domain'); $misc->printTitle($lang['stralter'],'pg.domain.alter'); @@ -52,7 +52,7 @@ } // Display domain info - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -87,7 +87,7 @@ * Confirm and then actually add a CHECK constraint */ function addCheck($confirm, $msg = '') { - global $PHP_SELF, $data, $data, $misc; + global $data, $data, $misc; global $lang; if (!isset($_POST['name'])) $_POST['name'] = ''; @@ -98,7 +98,7 @@ $misc->printTitle($lang['straddcheck'],'pg.constraint.check'); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo "
    {$lang['strname']}", $misc->printVal($domaindata->f['domname']), "
    \n"; echo "\n"; echo "\n"; @@ -137,7 +137,7 @@ */ function doDropConstraint($confirm, $msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('domain'); @@ -146,7 +146,7 @@ echo "

    ", sprintf($lang['strconfdropconstraint'], $misc->printVal($_REQUEST['constraint']), $misc->printVal($_REQUEST['domain'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -174,7 +174,7 @@ */ function doProperties($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('domain'); $misc->printTitle($lang['strproperties'],'pg.domain'); @@ -218,7 +218,7 @@ echo $misc->printVal($domaincons->f['consrc']); echo ""; echo "\n"; $domaincons->moveNext(); @@ -231,11 +231,11 @@ } else echo "

    {$lang['strnodata']}

    \n"; - echo "

    href}\">{$lang['strshowalldomains']}\n"; + echo "

    href}\">{$lang['strshowalldomains']}\n"; if ($data->hasDomainConstraints()) { - echo "| href}&domain=", urlencode($_REQUEST['domain']), + echo "| href}&domain=", urlencode($_REQUEST['domain']), "\">{$lang['straddcheck']}\n"; - echo "| href}&domain=", + echo "| href}&domain=", urlencode($_REQUEST['domain']), "\">{$lang['stralter']}\n"; } echo "

    \n"; @@ -246,14 +246,14 @@ */ function doDrop($confirm) { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('domain'); $misc->printTitle($lang['strdrop'],'pg.domain.drop'); echo "

    ", sprintf($lang['strconfdropdomain'], $misc->printVal($_REQUEST['domain'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo $misc->form; @@ -280,7 +280,7 @@ */ function doCreate($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if (!isset($_POST['domname'])) $_POST['domname'] = ''; if (!isset($_POST['domtype'])) $_POST['domtype'] = ''; @@ -295,7 +295,7 @@ $misc->printTitle($lang['strcreatedomain'],'pg.domain.create'); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo "
    {$lang['strname']}{$lang['strdefinition']}
    "; - echo "href}&constraint=", urlencode($domaincons->f['conname']), + echo "href}&constraint=", urlencode($domaincons->f['conname']), "&domain=", urlencode($_REQUEST['domain']), "&type=", urlencode($domaincons->f['contype']), "\">{$lang['strdrop']}
    \n"; echo "\n"; echo "
    {$lang['strname']}_maxNameLen}\" value=\"", @@ -365,7 +365,7 @@ */ function doDefault($msg = '') { global $data, $conf, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('schema'); $misc->printTabs('schema','domains'); @@ -408,19 +408,19 @@ $actions = array( 'properties' => array( 'title' => $lang['strproperties'], - 'url' => "{$PHP_SELF}?action=properties&{$misc->href}&", + 'url' => "domains.php?action=properties&{$misc->href}&", 'vars' => array('domain' => 'domname'), ), 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&", + 'url' => "domains.php?action=confirm_drop&{$misc->href}&", 'vars' => array('domain' => 'domname'), ), ); $misc->printTable($domains, $columns, $actions, $lang['strnodomains']); - echo "

    href}\">{$lang['strcreatedomain']}

    \n"; + echo "

    href}\">{$lang['strcreatedomain']}

    \n"; } @@ -428,7 +428,7 @@ * Generate XML for the browser tree. */ function doTree() { - global $misc, $data, $PHP_SELF; + global $misc, $data; $domains = $data->getDomains(); diff --git a/functions.php b/functions.php index d4dee9e7..6347cd72 100644 --- a/functions.php +++ b/functions.php @@ -3,7 +3,7 @@ /** * Manage functions in a database * - * $Id: functions.php,v 1.56.2.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: functions.php,v 1.56.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -44,7 +44,7 @@ */ function doEdit($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('function'); $misc->printTitle($lang['stralter'],'pg.function.alter'); @@ -83,7 +83,7 @@ } $func_full = $fndata->f['proname'] . "(". $fndata->f['proarguments'] .")"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -171,7 +171,7 @@ */ function doProperties($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('function'); $misc->printTitle($lang['strproperties'],'pg.function'); @@ -256,10 +256,10 @@ } else echo "

    {$lang['strnodata']}

    \n"; - echo "

    href}\">{$lang['strshowallfunctions']} |\n"; - echo "href}&function=", + echo "

    href}\">{$lang['strshowallfunctions']} |\n"; + echo "href}&function=", urlencode($_REQUEST['function']), "&function_oid=", urlencode($_REQUEST['function_oid']), "\">{$lang['stralter']} |\n"; - echo "href}&function=", + echo "href}&function=", urlencode($func_full), "&function_oid=", $_REQUEST['function_oid'], "\">{$lang['strdrop']}\n"; } @@ -268,7 +268,7 @@ */ function doDrop($confirm) { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('schema'); @@ -276,7 +276,7 @@ echo "

    ", sprintf($lang['strconfdropfunction'], $misc->printVal($_REQUEST['function'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -304,7 +304,7 @@ */ function doCreate($msg = '',$szJS="") { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('schema'); if (!isset($_POST['formFunction'])) $_POST['formFunction'] = ''; @@ -444,7 +444,7 @@ var g_lang_strarglower = \"". addslashes($lang["strarglower"]) ."\"; "; - echo "\n"; + echo "\n"; echo "
    {$lang['strfunction']}
    \n"; echo "\n"; echo "\n"; @@ -613,7 +613,7 @@ */ function doDefault($msg = '') { global $data, $conf, $misc, $func; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('schema'); $misc->printTabs('schema','functions'); @@ -657,12 +657,12 @@ ), 'alter' => array( 'title' => $lang['stralter'], - 'url' => "{$PHP_SELF}?action=edit&{$misc->href}&", + 'url' => "functions.php?action=edit&{$misc->href}&", 'vars' => array('function' => 'proproto', 'function_oid' => 'prooid'), ), 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&", + 'url' => "functions.php?action=confirm_drop&{$misc->href}&", 'vars' => array('function' => 'proproto', 'function_oid' => 'prooid'), ), 'privileges' => array( @@ -678,9 +678,9 @@ $misc->printTable($funcs, $columns, $actions, $lang['strnofunctions']); - echo "

    href}\">{$lang['strcreateplfunction']} | "; - echo "href}\">{$lang['strcreateinternalfunction']} | "; - echo "href}\">{$lang['strcreatecfunction']}

    \n"; + echo "

    href}\">{$lang['strcreateplfunction']} | "; + echo "href}\">{$lang['strcreateinternalfunction']} | "; + echo "href}\">{$lang['strcreatecfunction']}

    \n"; } /** diff --git a/groups.php b/groups.php index c062f86f..5028233f 100644 --- a/groups.php +++ b/groups.php @@ -3,7 +3,7 @@ /** * Manage groups in a database cluster * - * $Id: groups.php,v 1.21.4.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: groups.php,v 1.21.4.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -17,7 +17,7 @@ */ function doAddMember() { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $status = $data->addGroupMember($_REQUEST['group'], $_REQUEST['user']); if ($status == 0) @@ -31,7 +31,7 @@ */ function doDropMember($confirm) { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('group'); @@ -39,7 +39,7 @@ echo "

    ", sprintf($lang['strconfdropmember'], $misc->printVal($_REQUEST['user']), $misc->printVal($_REQUEST['group'])), "

    \n"; - echo "\n"; + echo "\n"; echo $misc->form; echo "\n"; echo "\n"; @@ -62,7 +62,7 @@ */ function doProperties($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if (!isset($_POST['user'])) $_POST['user'] = ''; @@ -80,7 +80,7 @@ while (!$groupdata->EOF) { $id = (($i % 2) == 0 ? '1' : '2'); echo "\n"; - echo "\n"; echo "\n"; $groupdata->moveNext(); @@ -90,7 +90,7 @@ else echo "

    {$lang['strnousers']}

    \n"; // Display form for adding a user to the group - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; - echo "

    href}\">{$lang['strshowallgroups']}

    \n"; + echo "

    href}\">{$lang['strshowallgroups']}

    \n"; } /** @@ -113,7 +113,7 @@ */ function doDrop($confirm) { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('group'); @@ -121,7 +121,7 @@ echo "

    ", sprintf($lang['strconfdropgroup'], $misc->printVal($_REQUEST['group'])), "

    \n"; - echo "\n"; + echo "\n"; echo $misc->form; echo "\n"; echo "\n"; @@ -143,7 +143,7 @@ */ function doCreate($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if (!isset($_POST['name'])) $_POST['name'] = ''; if (!isset($_POST['members'])) $_POST['members'] = array(); @@ -155,7 +155,7 @@ $misc->printTitle($lang['strcreategroup'],'pg.group.create'); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "
    {$lang['strname']}{$lang['strreturns']}
    ", $misc->printVal($groupdata->f['usename']), "href}&group=", + echo "href}&group=", urlencode($_REQUEST['group']), "&user=", urlencode($groupdata->f['usename']), "\">{$lang['strdrop']}
    \n"; echo "\t\n\t\t\n"; @@ -207,7 +207,7 @@ */ function doDefault($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('server'); $misc->printTabs('server','groups'); @@ -228,19 +228,19 @@ $actions = array( 'properties' => array( 'title' => $lang['strproperties'], - 'url' => "{$PHP_SELF}?action=properties&{$misc->href}&", + 'url' => "groups.php?action=properties&{$misc->href}&", 'vars' => array('group' => 'groname'), ), 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&", + 'url' => "groups.php?action=confirm_drop&{$misc->href}&", 'vars' => array('group' => 'groname'), ), ); $misc->printTable($groups, $columns, $actions, $lang['strnogroups']); - echo "

    href}\">{$lang['strcreategroup']}

    \n"; + echo "

    href}\">{$lang['strcreategroup']}

    \n"; } diff --git a/indexes.php b/indexes.php index 7571b3bf..b3bfec36 100644 --- a/indexes.php +++ b/indexes.php @@ -3,7 +3,7 @@ /** * List indexes on a table * - * $Id: indexes.php,v 1.38.2.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: indexes.php,v 1.38.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -17,7 +17,7 @@ */ function doClusterIndex($confirm) { global $data, $misc, $action; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { // Default analyze to on @@ -28,7 +28,7 @@ echo "

    ", sprintf($lang['strconfcluster'], $misc->printVal($_REQUEST['index'])), "

    \n"; - echo "\n"; + echo "\n"; echo "

    \n"; echo "\n"; echo "\n"; @@ -70,7 +70,7 @@ */ function doCreateIndex($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if (!isset($_POST['formIndexName'])) $_POST['formIndexName'] = ''; if (!isset($_POST['formIndexType'])) $_POST['formIndexType'] = null; @@ -107,7 +107,7 @@ $buttonRemove->set_attribute("onclick", "buttonPressed(this);"); $buttonRemove->set_attribute("type", "button"); - echo "\n"; + echo "\n"; echo "
    {$lang['strname']}
    \n"; @@ -202,7 +202,7 @@ */ function doDropIndex($confirm) { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('index'); @@ -210,7 +210,7 @@ echo "

    ", sprintf($lang['strconfdropindex'], $misc->printVal($_REQUEST['index'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -235,7 +235,7 @@ function doDefault($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; function indPre(&$rowdata, $actions) { global $data, $lang; @@ -288,17 +288,17 @@ $actions = array( 'cluster' => array( 'title' => $lang['strclusterindex'], - 'url' => "{$PHP_SELF}?action=confirm_cluster_index&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", + 'url' => "indexes.php?action=confirm_cluster_index&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", 'vars' => array('index' => 'indname'), ), 'reindex' => array( 'title' => $lang['strreindex'], - 'url' => "{$PHP_SELF}?action=reindex&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", + 'url' => "indexes.php?action=reindex&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", 'vars' => array('index' => 'indname'), ), 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=confirm_drop_index&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", + 'url' => "indexes.php?action=confirm_drop_index&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", 'vars' => array('index' => 'indname'), ), ); @@ -307,7 +307,7 @@ $misc->printTable($indexes, $columns, $actions, $lang['strnoindexes'], 'indPre'); - echo "

    href}&table=", urlencode($_REQUEST['table']), "\">{$lang['strcreateindex']}

    \n"; + echo "

    href}&table=", urlencode($_REQUEST['table']), "\">{$lang['strcreateindex']}

    \n"; } $misc->printHeader($lang['strindexes'], ""); diff --git a/intro.php b/intro.php index b462bb00..74761065 100755 --- a/intro.php +++ b/intro.php @@ -3,7 +3,7 @@ /** * Intro screen * - * $Id: intro.php,v 1.15.6.1 2007/05/28 19:30:17 soranzo Exp $ + * $Id: intro.php,v 1.15.6.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions (no db conn) @@ -19,7 +19,7 @@

    - +\n"; echo "
    ", $misc->printVal($oprdata->f['oprgtcmpop']), "
    \n"; - echo "

    href}\">{$lang['strshowalloperators']}

    \n"; + echo "

    href}\">{$lang['strshowalloperators']}

    \n"; } else doDefault($lang['strinvalidparam']); @@ -67,7 +67,7 @@ */ function doDrop($confirm) { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('operator'); @@ -75,7 +75,7 @@ echo "

    ", sprintf($lang['strconfdropoperator'], $misc->printVal($_REQUEST['operator'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -103,7 +103,7 @@ */ function doDefault($msg = '') { global $data, $conf, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('schema'); $misc->printTabs('schema','operators'); @@ -140,26 +140,26 @@ $actions = array( 'properties' => array( 'title' => $lang['strproperties'], - 'url' => "{$PHP_SELF}?action=properties&{$misc->href}&", + 'url' => "operators.php?action=properties&{$misc->href}&", 'vars' => array('operator' => 'oprname', 'operator_oid' => 'oid'), ), 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&", + 'url' => "operators.php?action=confirm_drop&{$misc->href}&", 'vars' => array('operator' => 'oprname', 'operator_oid' => 'oid'), ), ); $misc->printTable($operators, $columns, $actions, $lang['strnooperators']); -// echo "

    href}\">{$lang['strcreateoperator']}

    \n"; +// echo "

    href}\">{$lang['strcreateoperator']}

    \n"; } /** * Generate XML for the browser tree. */ function doTree() { - global $misc, $data, $PHP_SELF; + global $misc, $data; $operators = $data->getOperators(); diff --git a/plugin_slony.php b/plugin_slony.php index b5dc0b54..b988e007 100755 --- a/plugin_slony.php +++ b/plugin_slony.php @@ -3,7 +3,7 @@ /** * Slony database tab plugin * - * $Id: plugin_slony.php,v 1.12.2.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: plugin_slony.php,v 1.12.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -31,7 +31,7 @@ * @param string $subject The tree node to return */ function doTree($subject) { - global $misc, $data, $lang, $PHP_SELF, $slony; + global $misc, $data, $lang, $slony; $reqvars = $misc->getRequestVars('database'); if (isset($slony)) @@ -421,7 +421,7 @@ * Display the slony clusters (we only support one) */ function doClusters($msg = '') { - global $PHP_SELF, $slony, $misc; + global $slony, $misc; global $lang; $misc->printTrail('database'); @@ -460,7 +460,7 @@ $misc->printTable($clusters, $columns, $actions, $lang['strnoclusters']); if ($clusters->recordCount() == 0) { - echo "

    href}\">{$lang['strinitcluster']}

    \n"; + echo "

    href}\">{$lang['strinitcluster']}

    \n"; } } @@ -470,7 +470,7 @@ * Display the properties of a slony cluster */ function doCluster($msg = '') { - global $data, $slony, $misc, $PHP_SELF; + global $data, $slony, $misc; global $lang; $misc->printTrail('slony_cluster'); @@ -504,7 +504,7 @@ */ function doCreateCluster($confirm, $msg = '') { global $data, $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { if (!isset($_POST['cluster'])) $_POST['cluster'] = ''; @@ -515,7 +515,7 @@ $misc->printTitle($lang['strinitcluster']); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "\n"; echo "\t\n\t\t\n"; @@ -558,7 +558,7 @@ */ function doDropCluster($confirm) { global $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('slony_cluster'); @@ -566,7 +566,7 @@ echo "

    ", sprintf($lang['strconfdropcluster'], $misc->printVal($slony->slony_cluster)), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo $misc->form; echo "\n"; @@ -588,7 +588,7 @@ * List all the nodes */ function doNodes($msg = '') { - global $PHP_SELF, $slony, $misc; + global $slony, $misc; global $lang; $misc->printTrail('slony_cluster'); @@ -631,14 +631,14 @@ $misc->printTable($nodes, $columns, $actions, $lang['strnonodes']); - echo "

    href}\">{$lang['strcreatenode']}

    \n"; + echo "

    href}\">{$lang['strcreatenode']}

    \n"; } /** * Display the properties of a node */ function doNode($msg = '') { - global $data, $slony, $misc, $PHP_SELF; + global $data, $slony, $misc; global $lang; $misc->printTrail('slony_node'); @@ -666,7 +666,7 @@ } else echo "

    {$lang['strnodata']}

    \n"; - echo "

    href}&no_id={$_REQUEST['no_id']}\">{$lang['strdrop']}

    \n"; + echo "

    href}&no_id={$_REQUEST['no_id']}\">{$lang['strdrop']}

    \n"; } /** @@ -674,7 +674,7 @@ */ function doCreateNode($confirm, $msg = '') { global $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { if (!isset($_POST['nodeid'])) $_POST['nodeid'] = ''; @@ -684,7 +684,7 @@ $misc->printTitle($lang['strcreatenode']); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "
    {$lang['strcluster']}
    \n"; echo "\t\n\t\t\n"; @@ -717,7 +717,7 @@ */ function doDropNode($confirm) { global $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('slony_cluster'); @@ -725,7 +725,7 @@ echo "

    ", sprintf($lang['strconfdropnode'], $misc->printVal($_REQUEST['no_id'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo $misc->form; @@ -748,7 +748,7 @@ * List all the paths */ function doPaths($msg = '') { - global $PHP_SELF, $slony, $misc; + global $slony, $misc; global $lang; $misc->printTrail('database'); @@ -785,14 +785,14 @@ $misc->printTable($paths, $columns, $actions, $lang['strnopaths']); - echo "

    href}&no_id={$_REQUEST['no_id']}\">{$lang['strcreatepath']}

    \n"; + echo "

    href}&no_id={$_REQUEST['no_id']}\">{$lang['strcreatepath']}

    \n"; } /** * Display the properties of a path */ function doPath($msg = '') { - global $data, $slony, $misc, $PHP_SELF; + global $data, $slony, $misc; global $lang; $misc->printTrail('slony_path'); @@ -820,7 +820,7 @@ } else echo "

    {$lang['strnodata']}

    \n"; - echo "

    href}&no_id={$_REQUEST['no_id']}&path_id={$_REQUEST['path_id']}\">{$lang['strdrop']}

    \n"; + echo "

    href}&no_id={$_REQUEST['no_id']}&path_id={$_REQUEST['path_id']}\">{$lang['strdrop']}

    \n"; } /** @@ -828,7 +828,7 @@ */ function doCreatePath($confirm, $msg = '') { global $data, $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { if (!isset($_POST['pathserver'])) $_POST['pathserver'] = ''; @@ -842,7 +842,7 @@ $misc->printTitle($lang['strcreatepath']); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "
    {$lang['strid']}
    \n"; echo "\t\n\t\t\n"; @@ -893,7 +893,7 @@ */ function doDropPath($confirm) { global $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('slony_cluster'); @@ -901,7 +901,7 @@ echo "

    ", sprintf($lang['strconfdroppath'], $misc->printVal($_REQUEST['path_id'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -925,7 +925,7 @@ * List all the listens */ function doListens($msg = '') { - global $PHP_SELF, $slony, $misc; + global $slony, $misc; global $lang; $misc->printTrail('database'); @@ -963,14 +963,14 @@ $misc->printTable($listens, $columns, $actions, $lang['strnolistens']); - echo "

    href}&no_id={$_REQUEST['no_id']}\">{$lang['strcreatelisten']}

    \n"; + echo "

    href}&no_id={$_REQUEST['no_id']}\">{$lang['strcreatelisten']}

    \n"; } /** * Display the properties of a listen */ function doListen($msg = '') { - global $data, $slony, $misc, $PHP_SELF; + global $data, $slony, $misc; global $lang; $misc->printTrail('slony_path'); @@ -998,7 +998,7 @@ } else echo "

    {$lang['strnodata']}

    \n"; - echo "

    href}&no_id={$_REQUEST['no_id']}&listen_id={$_REQUEST['listen_id']}&origin_id={$listen->f['li_origin']}\">{$lang['strdrop']}

    \n"; + echo "

    href}&no_id={$_REQUEST['no_id']}&listen_id={$_REQUEST['listen_id']}&origin_id={$listen->f['li_origin']}\">{$lang['strdrop']}

    \n"; } /** @@ -1006,7 +1006,7 @@ */ function doCreateListen($confirm, $msg = '') { global $data, $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { if (!isset($_POST['listenorigin'])) $_POST['listenorigin'] = ''; @@ -1019,7 +1019,7 @@ $misc->printTitle($lang['strcreatelisten']); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "
    {$lang['strnodename']}
    \n"; echo "\t\n\t\t\n"; @@ -1063,7 +1063,7 @@ */ function doDropListen($confirm) { global $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('slony_cluster'); @@ -1071,7 +1071,7 @@ echo "

    ", sprintf($lang['strconfdroplisten'], $misc->printVal($_REQUEST['listen_id'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -1096,7 +1096,7 @@ * List all the replication sets */ function doReplicationSets($msg = '') { - global $PHP_SELF, $slony, $misc; + global $slony, $misc; global $lang; $misc->printTrail('slony_cluster'); @@ -1159,14 +1159,14 @@ $misc->printTable($sets, $columns, $actions, $lang['strnorepsets']); - echo "

    href}\">{$lang['strcreaterepset']}

    \n"; + echo "

    href}\">{$lang['strcreaterepset']}

    \n"; } /** * Display the properties of a replication set */ function doReplicationSet($msg = '') { - global $data, $slony, $misc, $PHP_SELF; + global $data, $slony, $misc; global $lang; $misc->printTrail('slony_set'); @@ -1200,12 +1200,12 @@ } else echo "

    {$lang['strnodata']}

    \n"; - echo "

    href}&set_id={$_REQUEST['set_id']}\">{$lang['strdrop']} |\n"; - echo "href}&set_id={$_REQUEST['set_id']}\">{$lang['strlock']} |\n"; - echo "href}&set_id={$_REQUEST['set_id']}\">{$lang['strunlock']} |\n"; - echo "href}&set_id={$_REQUEST['set_id']}\">{$lang['strmerge']} |\n"; - echo "href}&set_id={$_REQUEST['set_id']}\">{$lang['strmove']} |\n"; - echo "href}&set_id={$_REQUEST['set_id']}\">{$lang['strexecute']}

    \n"; + echo "

    href}&set_id={$_REQUEST['set_id']}\">{$lang['strdrop']} |\n"; + echo "href}&set_id={$_REQUEST['set_id']}\">{$lang['strlock']} |\n"; + echo "href}&set_id={$_REQUEST['set_id']}\">{$lang['strunlock']} |\n"; + echo "href}&set_id={$_REQUEST['set_id']}\">{$lang['strmerge']} |\n"; + echo "href}&set_id={$_REQUEST['set_id']}\">{$lang['strmove']} |\n"; + echo "href}&set_id={$_REQUEST['set_id']}\">{$lang['strexecute']}

    \n"; } /** @@ -1213,7 +1213,7 @@ */ function doCreateReplicationSet($confirm, $msg = '') { global $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { if (!isset($_POST['setid'])) $_POST['setid'] = ''; @@ -1223,7 +1223,7 @@ $misc->printTitle($lang['strcreaterepset']); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "
    Origin
    \n"; echo "\t\n\t\t\n"; @@ -1256,7 +1256,7 @@ */ function doDropReplicationSet($confirm) { global $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('slony_cluster'); @@ -1264,7 +1264,7 @@ echo "

    ", sprintf($lang['strconfdroprepset'], $misc->printVal($_REQUEST['set_id'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo $misc->form; @@ -1286,7 +1286,7 @@ */ function doLockReplicationSet($confirm) { global $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('slony_cluster'); @@ -1294,7 +1294,7 @@ echo "

    ", sprintf($lang['strconflockrepset'], $misc->printVal($_REQUEST['set_id'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo $misc->form; @@ -1316,7 +1316,7 @@ */ function doUnlockReplicationSet($confirm) { global $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('slony_cluster'); @@ -1324,7 +1324,7 @@ echo "

    ", sprintf($lang['strconfunlockrepset'], $misc->printVal($_REQUEST['set_id'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo $misc->form; @@ -1346,7 +1346,7 @@ */ function doMergeReplicationSet($confirm, $msg = '') { global $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { if (!isset($_POST['target'])) $_POST['target'] = ''; @@ -1357,7 +1357,7 @@ $misc->printTitle($lang['strmerge']); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "
    {$lang['strid']}
    \n"; echo "\t\n\t\t\n"; @@ -1393,7 +1393,7 @@ */ function doMoveReplicationSet($confirm, $msg = '') { global $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { if (!isset($_POST['new_origin'])) $_POST['new_origin'] = ''; @@ -1405,7 +1405,7 @@ $misc->printTitle($lang['strmove']); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "
    {$lang['strmergeinto']}
    \n"; echo "\t\n\t\t\n"; @@ -1442,7 +1442,7 @@ */ function doExecuteReplicationSet($confirm, $msg = '') { global $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { if (!isset($_POST['script'])) $_POST['script'] = ''; @@ -1453,7 +1453,7 @@ $misc->printTitle($lang['strexecute']); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "
    {$lang['strneworigin']}
    \n"; /* Slony 1.1 only @@ -1499,7 +1499,7 @@ * List all the tables in a replication set */ function doTables($msg = '') { - global $PHP_SELF, $data, $slony, $misc; + global $data, $slony, $misc; global $lang; $misc->printTrail('database'); @@ -1556,7 +1556,7 @@ $misc->printTable($tables, $columns, $actions, $lang['strnotables']); - echo "

    href}\">{$lang['straddtable']}

    \n"; + echo "

    href}\">{$lang['straddtable']}

    \n"; } /** @@ -1565,7 +1565,7 @@ */ function doAddTable($stage, $msg = '') { global $data, $slony, $misc; - global $PHP_SELF, $lang; + global $lang; switch ($stage) { case 1: @@ -1578,7 +1578,7 @@ $misc->printTitle($lang['straddtable']); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "
    \n"; echo "\t\n\t\t\n"; @@ -1639,7 +1639,7 @@ $misc->printTitle($lang['straddtable']); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "
    {$lang['strtable']}
    \n"; if ($indexes->recordCount() > 1) { @@ -1698,7 +1698,7 @@ */ function doMoveTable($stage, $msg = '') { global $data, $slony, $misc; - global $PHP_SELF, $lang; + global $lang; switch ($stage) { case 1: @@ -1710,7 +1710,7 @@ $misc->printTitle($lang['strmove']); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "
    \n"; echo "\t\n\t\t\n"; @@ -1750,7 +1750,7 @@ */ function doRemoveTable($confirm) { global $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('slony_cluster'); @@ -1759,7 +1759,7 @@ echo "

    ", sprintf($lang['strconfremovetablefromrepset'], $misc->printVal($_REQUEST['qualname']), $misc->printVal($_REQUEST['set_id'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -1783,7 +1783,7 @@ * List all the sequences in a replication set */ function doSequences($msg = '') { - global $PHP_SELF, $data, $slony, $misc; + global $data, $slony, $misc; global $lang; $misc->printTrail('database'); @@ -1829,7 +1829,7 @@ $misc->printTable($sequences, $columns, $actions, $lang['strnosequences']); - echo "

    href}\">{$lang['straddsequence']}

    \n"; + echo "

    href}\">{$lang['straddsequence']}

    \n"; } /** @@ -1838,7 +1838,7 @@ */ function doAddSequence($stage, $msg = '') { global $data, $slony, $misc; - global $PHP_SELF, $lang; + global $lang; switch ($stage) { case 1: @@ -1851,7 +1851,7 @@ $misc->printTitle($lang['straddsequence']); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "
    {$lang['strnewrepset']}
    \n"; echo "\t\n\t\t\n"; @@ -1904,7 +1904,7 @@ */ function doRemoveSequence($confirm) { global $slony, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('slony_cluster'); @@ -1913,7 +1913,7 @@ echo "

    ", sprintf($lang['strconfremovesequencefromrepset'], $misc->printVal($_REQUEST['qualname']), $misc->printVal($_REQUEST['set_id'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -1937,7 +1937,7 @@ */ function doMoveSequence($stage, $msg = '') { global $data, $slony, $misc; - global $PHP_SELF, $lang; + global $lang; switch ($stage) { case 1: @@ -1949,7 +1949,7 @@ $misc->printTitle($lang['strmove']); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "\n"; echo "\t\n\t\t\n"; @@ -2026,7 +2026,7 @@ * Display the properties of a subscription */ function doSubscription($msg = '') { - global $data, $slony, $misc, $PHP_SELF; + global $data, $slony, $misc; global $lang; $misc->printTrail('slony_subscription'); diff --git a/privileges.php b/privileges.php index a03f87e2..5dbc211c 100644 --- a/privileges.php +++ b/privileges.php @@ -3,7 +3,7 @@ /** * Manage privileges in a database * - * $Id: privileges.php,v 1.39.2.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: privileges.php,v 1.39.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -20,7 +20,7 @@ */ function doAlter($confirm, $mode, $msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if (!isset($_REQUEST['username'])) $_REQUEST['username'] = array(); if (!isset($_REQUEST['groupname'])) $_REQUEST['groupname'] = array(); @@ -44,7 +44,7 @@ } $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo "
    {$lang['strsequence']}
    {$lang['strnewrepset']}
    \n"; echo "\n"; echo "
    {$lang['strusers']}\n"; echo "\n"; @@ -94,7 +94,7 @@ */ function doProperties($msg = '') { global $data, $reportsdb, $misc; - global $PHP_SELF, $lang; + global $lang; $report = $reportsdb->getReport($_REQUEST['report_id']); @@ -117,8 +117,8 @@ } else echo "

    {$lang['strinvalidparam']}

    \n"; - echo "

    href}\">{$lang['strshowallreports']} |\n"; - echo "href}&report_id={$report->f['report_id']}\">{$lang['stredit']}

    \n"; + echo "

    href}\">{$lang['strshowallreports']} |\n"; + echo "href}&report_id={$report->f['report_id']}\">{$lang['stredit']}

    \n"; } /** @@ -126,7 +126,7 @@ */ function doCreate($msg = '') { global $data, $reportsdb, $misc; - global $PHP_SELF, $lang; + global $lang; if (!isset($_REQUEST['report_name'])) $_REQUEST['report_name'] = ''; if (!isset($_REQUEST['db_name'])) $_REQUEST['db_name'] = (isset($_REQUEST['database']) ? $_REQUEST['database'] : ''); @@ -139,7 +139,7 @@ $misc->printTitle($lang['strcreatereport']); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "
    {$lang['strname']}
    \n"; echo "\n"; @@ -198,7 +198,6 @@ function doDrop($confirm) { global $reportsdb, $misc; global $lang; - global $PHP_SELF; if ($confirm) { // Fetch report from the database @@ -210,7 +209,7 @@ echo "

    ", sprintf($lang['strconfdropreport'], $misc->printVal($report->f['report_name'])), "

    \n"; - echo "\n"; + echo "\n"; echo $misc->form; echo "\n"; echo "\n"; @@ -233,7 +232,7 @@ */ function doDefault($msg = '') { global $data, $misc, $reportsdb; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('server'); $misc->printTabs('server','reports'); @@ -263,12 +262,12 @@ ), ); - $return_url = urlencode("{$PHP_SELF}?{$misc->href}"); + $return_url = urlencode("reports.php?{$misc->href}"); $actions = array( 'properties' => array( 'title' => $lang['strproperties'], - 'url' => "{$PHP_SELF}?action=properties&{$misc->href}&", + 'url' => "reports.php?action=properties&{$misc->href}&", 'vars' => array('report_id' => 'report_id'), ), 'run' => array( @@ -278,19 +277,19 @@ ), 'edit' => array( 'title' => $lang['stredit'], - 'url' => "{$PHP_SELF}?action=edit&{$misc->href}&", + 'url' => "reports.php?action=edit&{$misc->href}&", 'vars' => array('report_id' => 'report_id'), ), 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&", + 'url' => "reports.php?action=confirm_drop&{$misc->href}&", 'vars' => array('report_id' => 'report_id'), ), ); $misc->printTable($reports, $columns, $actions, $lang['strnoreports']); - echo "

    href}\">{$lang['strcreatereport']}

    \n"; + echo "

    href}\">{$lang['strcreatereport']}

    \n"; } $misc->printHeader($lang['strreports']); diff --git a/roles.php b/roles.php index f8c775a2..df8d7c3f 100644 --- a/roles.php +++ b/roles.php @@ -17,7 +17,7 @@ */ function doCreate($msg = '') { global $data, $misc, $username; - global $PHP_SELF, $lang; + global $lang; if (!isset($_POST['formRolename'])) $_POST['formRolename'] = ''; if (!isset($_POST['formPassword'])) $_POST['formPassword'] = ''; @@ -32,7 +32,7 @@ $misc->printTitle($lang['strcreaterole'],'pg.role.create'); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "
    {$lang['strname']}
    \n"; echo "\t\n\t\t\n"; @@ -141,7 +141,7 @@ */ function doAlter($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('role'); $misc->printTitle($lang['stralterrole'],'pg.role.alter'); @@ -170,7 +170,7 @@ $_POST['formPassword'] = ''; } - echo "\n"; + echo "\n"; echo $misc->form; echo "
    {$lang['strrolename']}
    \n"; echo "\t\n\t\t\n"; @@ -326,7 +326,7 @@ */ function doDrop($confirm) { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('role'); @@ -334,7 +334,7 @@ echo "

    ", sprintf($lang['strconfdroprole'], $misc->printVal($_REQUEST['rolename'])), "

    \n"; - echo "\n"; + echo "\n"; echo $misc->form; echo "\n"; echo "\n"; @@ -356,7 +356,7 @@ */ function doProperties($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('role'); $misc->printTitle($lang['strproperties'],'pg.role'); @@ -425,10 +425,10 @@ } else echo "

    {$lang['strnodata']}

    \n"; - echo "

    href}\">{$lang['strshowallroles']} |\n"; - echo "href}&rolename=", + echo "

    href}\">{$lang['strshowallroles']} |\n"; + echo "href}&rolename=", urlencode($_REQUEST['rolename']), "\">{$lang['stralter']} |\n"; - echo "href}&rolename=", + echo "href}&rolename=", urlencode($_REQUEST['rolename']), "\">{$lang['strdrop']}\n"; } @@ -440,7 +440,7 @@ */ function doAccount($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $server_info = $misc->getServerInfo(); @@ -478,7 +478,7 @@ } else echo "

    {$lang['strnodata']}

    \n"; - echo "

    href}\">{$lang['strchangepassword']}

    \n"; + echo "

    href}\">{$lang['strchangepassword']}

    \n"; } /** @@ -486,7 +486,7 @@ */ function doChangePassword($confirm, $msg = '') { global $data, $misc; - global $PHP_SELF, $lang, $conf; + global $lang, $conf; $server_info = $misc->getServerInfo(); @@ -499,7 +499,7 @@ if (!isset($_POST['password'])) $_POST['password'] = ''; if (!isset($_POST['confirm'])) $_POST['confirm'] = ''; - echo "\n"; + echo "\n"; echo $misc->form; echo "
    {$lang['strrolename']}
    \n"; echo "\t\n\t\t\n"; @@ -536,7 +536,7 @@ */ function doDefault($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; function renderRoleConnLimit($val) { return $val == '-1' ? 'No limit' : htmlspecialchars($val); @@ -601,19 +601,19 @@ ), 'alter' => array( 'title' => $lang['stralter'], - 'url' => "{$PHP_SELF}?action=alter&{$misc->href}&", + 'url' => "roles.php?action=alter&{$misc->href}&", 'vars' => array('rolename' => 'rolname'), ), 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&", + 'url' => "roles.php?action=confirm_drop&{$misc->href}&", 'vars' => array('rolename' => 'rolname'), ), ); $misc->printTable($roles, $columns, $actions, $lang['strnoroles']); - echo "

    href}\">{$lang['strcreaterole']}

    \n"; + echo "

    href}\">{$lang['strcreaterole']}

    \n"; } diff --git a/rules.php b/rules.php index bd7b0a21..9982c7fa 100644 --- a/rules.php +++ b/rules.php @@ -3,7 +3,7 @@ /** * List rules on a table OR view * - * $Id: rules.php,v 1.27.2.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: rules.php,v 1.27.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -15,7 +15,7 @@ * Confirm and then actually create a rule */ function createRule($confirm, $msg = '') { - global $PHP_SELF, $data, $data, $misc; + global $data, $data, $misc; global $lang; if (!isset($_POST['name'])) $_POST['name'] = ''; @@ -29,7 +29,7 @@ $misc->printTitle($lang['strcreaterule'],'pg.rule.create'); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo "
    {$lang['strpassword']}
    \n"; echo "\n"; echo "
    {$lang['strname']}_maxNameLen}\" value=\"", @@ -86,7 +86,7 @@ */ function doDrop($confirm) { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail($_REQUEST['subject']); @@ -95,7 +95,7 @@ echo "

    ", sprintf($lang['strconfdroprule'], $misc->printVal($_REQUEST['rule']), $misc->printVal($_REQUEST[$_REQUEST['reltype']])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "printTrail($_REQUEST['subject']); @@ -154,14 +153,14 @@ $actions = array( 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&reltype={$subject}&{$subject}={$object}&subject=rule&", + 'url' => "rules.php?action=confirm_drop&{$misc->href}&reltype={$subject}&{$subject}={$object}&subject=rule&", 'vars' => array('rule' => 'rulename'), ), ); $misc->printTable($rules, $columns, $actions, $lang['strnorules']); - echo "

    href}&{$subject}={$object}&subject={$subject}\">{$lang['strcreaterule']}

    \n"; + echo "

    href}&{$subject}={$object}&subject={$subject}\">{$lang['strcreaterule']}

    \n"; } // Different header if we're view rules or table rules diff --git a/schemas.php b/schemas.php index 1b8e5a6e..73196073 100755 --- a/schemas.php +++ b/schemas.php @@ -3,7 +3,7 @@ /** * Manage schemas in a database * - * $Id: schemas.php,v 1.8.2.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: schemas.php,v 1.8.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -17,7 +17,7 @@ */ function doDefault($msg = '') { global $data, $misc, $conf; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('database'); $misc->printTabs('database','schemas'); @@ -53,7 +53,7 @@ ), 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=drop&{$misc->href}&", + 'url' => "schemas.php?action=drop&{$misc->href}&", 'vars' => array('schema' => 'nspname'), ), 'privileges' => array( @@ -63,14 +63,14 @@ ), 'alter' => array( 'title' => $lang['stralter'], - 'url' => "{$PHP_SELF}?action=alter&{$misc->href}&", + 'url' => "schemas.php?action=alter&{$misc->href}&", 'vars' => array('schema' => 'nspname'), ), ); $misc->printTable($schemas, $columns, $actions, $lang['strnoschemas']); - echo "

    href}\">{$lang['strcreateschema']}

    \n"; + echo "

    href}\">{$lang['strcreateschema']}

    \n"; } else { // If the database does not support schemas... echo "

    {$lang['strnoschemas']}

    \n"; @@ -82,7 +82,7 @@ */ function doCreate($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $server_info = $misc->getServerInfo(); @@ -98,7 +98,7 @@ $misc->printTitle($lang['strcreateschema'],'pg.schema.create'); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "\n"; echo "\t\n\t\t\n"; @@ -153,7 +153,7 @@ * TODO: permit changing name, owner */ function doAlter($msg = '') { - global $data, $misc,$PHP_SELF, $lang; + global $data, $misc, $lang; $misc->printTrail('schema'); $misc->printTitle($lang['stralter'],'pg.schema.alter'); @@ -165,7 +165,7 @@ if (!isset($_POST['schema'])) $_POST['schema'] = $_REQUEST['schema']; if (!isset($_POST['name'])) $_POST['name'] = $_REQUEST['schema']; - echo "\n"; + echo "\n"; echo "
    {$lang['strname']}
    \n"; echo "\t\n"; @@ -195,7 +195,7 @@ * Save the form submission containing changes to a schema */ function doSaveAlter($msg = '') { - global $data, $misc,$PHP_SELF, $lang; + global $data, $misc, $lang; $status = $data->updateSchema($_POST['schema'], $_POST['comment'], $_POST['name']); if ($status == 0) @@ -208,7 +208,7 @@ * Show confirmation of drop and perform actual drop */ function doDrop($confirm) { - global $PHP_SELF, $data, $data, $misc; + global $data, $data, $misc; global $lang, $_reload_browser; if ($confirm) { @@ -217,7 +217,7 @@ echo "

    ", sprintf($lang['strconfdropschema'], $misc->printVal($_REQUEST['schema'])), "

    \n"; - echo "\n"; + echo "\n"; echo $misc->form; echo "\n"; echo "\n"; @@ -246,7 +246,7 @@ * Generate XML for the browser tree. */ function doTree() { - global $misc, $data, $lang, $PHP_SELF, $slony; + global $misc, $data, $lang, $slony; $schemas = $data->getSchemas(); diff --git a/sequences.php b/sequences.php index fabbd3b2..47195022 100644 --- a/sequences.php +++ b/sequences.php @@ -3,7 +3,7 @@ /** * Manage sequences in a database * - * $Id: sequences.php,v 1.36.2.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: sequences.php,v 1.36.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -17,7 +17,7 @@ */ function doDefault($msg = '') { global $data, $conf, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('schema'); $misc->printTabs('schema', 'sequences'); @@ -47,7 +47,7 @@ $actions = array( 'properties' => array( 'title' => $lang['strproperties'], - 'url' => "{$PHP_SELF}?action=properties&{$misc->href}&", + 'url' => "sequences.php?action=properties&{$misc->href}&", 'vars' => array('sequence' => 'seqname'), ), 'alter' => array( @@ -57,7 +57,7 @@ ), 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&", + 'url' => "sequences.php?action=confirm_drop&{$misc->href}&", 'vars' => array('sequence' => 'seqname'), ), 'privileges' => array( @@ -70,7 +70,7 @@ if (!$data->hasAlterSequence()) unset($actions['alter']); $misc->printTable($sequences, $columns, $actions, $lang['strnosequences']); - echo "

    href}\">{$lang['strcreatesequence']}

    \n"; + echo "

    href}\">{$lang['strcreatesequence']}

    \n"; } /** @@ -104,7 +104,7 @@ * Display the properties of a sequence */ function doProperties($msg = '') { - global $data, $misc, $PHP_SELF; + global $data, $misc; global $lang; $misc->printTrail('sequence'); @@ -148,12 +148,12 @@ echo "
    "; if ($data->hasAlterSequence()) { - echo "

    href}&sequence=", urlencode($sequence->f['seqname']), "\">{$lang['straltersequence']} |\n"; + echo "

    href}&sequence=", urlencode($sequence->f['seqname']), "\">{$lang['straltersequence']} |\n"; } - echo "href}&sequence=", urlencode($sequence->f['seqname']), "\">{$lang['strsetval']} |\n"; - echo "href}&sequence=", urlencode($sequence->f['seqname']), "\">{$lang['strnextval']} |\n"; - echo "href}&sequence=", urlencode($sequence->f['seqname']), "\">{$lang['strreset']} |\n"; - echo "href}\">{$lang['strshowallsequences']}

    \n"; + echo "href}&sequence=", urlencode($sequence->f['seqname']), "\">{$lang['strsetval']} |\n"; + echo "href}&sequence=", urlencode($sequence->f['seqname']), "\">{$lang['strnextval']} |\n"; + echo "href}&sequence=", urlencode($sequence->f['seqname']), "\">{$lang['strreset']} |\n"; + echo "href}\">{$lang['strshowallsequences']}

    \n"; } else echo "

    {$lang['strnodata']}

    \n"; } @@ -163,7 +163,7 @@ */ function doDrop($confirm, $msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('sequence'); @@ -172,7 +172,7 @@ echo "

    ", sprintf($lang['strconfdropsequence'], $misc->printVal($_REQUEST['sequence'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo $misc->form; @@ -198,7 +198,7 @@ */ function doCreateSequence($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if (!isset($_POST['formSequenceName'])) $_POST['formSequenceName'] = ''; if (!isset($_POST['formIncrement'])) $_POST['formIncrement'] = ''; @@ -211,7 +211,7 @@ $misc->printTitle($lang['strcreatesequence'],'pg.sequence.create'); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; @@ -278,7 +278,7 @@ */ function doReset() { global $data; - global $PHP_SELF, $lang; + global $lang; $status = $data->resetSequence($_REQUEST['sequence']); if ($status == 0) @@ -292,7 +292,7 @@ */ function doNextval() { global $data; - global $PHP_SELF, $lang; + global $lang; $status = $data->nextvalSequence($_REQUEST['sequence']); if ($status == 0) @@ -319,7 +319,7 @@ */ function doSetval($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('sequence'); $misc->printTitle($lang['strsetval'], 'pg.sequence'); @@ -329,7 +329,7 @@ $sequence = $data->getSequence($_REQUEST['sequence']); if (is_object($sequence) && $sequence->recordCount() > 0) { - echo "\n"; + echo "\n"; echo "
    {$lang['strname']}
    "; echo "\n"; echo "
    {$lang['strlastvalue']}"; @@ -365,7 +365,7 @@ */ function doAlter($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('sequence'); $misc->printTitle($lang['stralter'], 'pg.sequence.alter'); @@ -379,7 +379,7 @@ $sequence->f['is_cycled'] = $data->phpBool($sequence->f['is_cycled']); if ($sequence->f['is_cycled']) $_POST['formCycledValue'] = 'on'; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; diff --git a/servers.php b/servers.php index 10d96ddf..fdddf415 100644 --- a/servers.php +++ b/servers.php @@ -3,7 +3,7 @@ /** * Manage servers * - * $Id: servers.php,v 1.5.2.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: servers.php,v 1.5.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -25,7 +25,7 @@ function doDefault($msg = '') { global $conf, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTabs('root','servers'); $misc->printMsg($msg); @@ -67,7 +67,7 @@ ), 'logout' => array( 'title' => $lang['strlogout'], - 'url' => "{$PHP_SELF}?action=logout&", + 'url' => "servers.php?action=logout&", 'vars' => array('logoutServer' => 'id'), ), ); diff --git a/sqledit.php b/sqledit.php index c6a1373c..65342cdd 100644 --- a/sqledit.php +++ b/sqledit.php @@ -3,7 +3,7 @@ /** * Alternative SQL editing window * - * $Id: sqledit.php,v 1.30.2.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: sqledit.php,v 1.30.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -82,7 +82,7 @@ * Searches for a named database object */ function doFind() { - global $PHP_SELF, $data, $misc; + global $data, $misc; global $lang, $conf; if (!isset($_GET['term'])) $_GET['term'] = ''; @@ -139,7 +139,7 @@ * Allow execution of arbitrary SQL statements on a database */ function doDefault() { - global $PHP_SELF, $data, $misc; + global $data, $misc; global $lang, $conf; if (!isset($_REQUEST['query'])) $_REQUEST['query'] = ''; diff --git a/tables.php b/tables.php index 9f75b693..58c33205 100644 --- a/tables.php +++ b/tables.php @@ -3,7 +3,7 @@ /** * List tables in a database * - * $Id: tables.php,v 1.82.2.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: tables.php,v 1.82.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -16,7 +16,7 @@ */ function doCreate($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if (!isset($_REQUEST['stage'])) { $_REQUEST['stage'] = 1; @@ -38,7 +38,7 @@ $misc->printTitle($lang['strcreatetable'], 'pg.table.create'); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo "
    {$lang['strincrementby']}
    \n"; echo "\t\n\t\t\n"; echo "\t\t
    {$lang['strname']}_maxNameLen}\" value=\"", @@ -104,7 +104,7 @@ $misc->printMsg($msg); echo ""; - echo "\n"; + echo "\n"; // Output table header echo "\n"; @@ -241,7 +241,6 @@ function doSelectRows($confirm, $msg = '') { global $data, $misc, $_no_output; global $lang; - global $PHP_SELF; if ($confirm) { $misc->printTrail('table'); @@ -250,7 +249,7 @@ $attrs = $data->getTableAttributes($_REQUEST['table']); - echo "\n"; + echo "\n"; if ($attrs->recordCount() > 0) { // JavaScript for select all feature echo ""; - echo "\n"; + echo "\n"; // Output table header echo "
    \n"; @@ -345,7 +345,7 @@ */ function doProperties($msg = '') { global $data, $misc, $_reload_browser; - global $PHP_SELF, $lang; + global $lang; if (!isset($_REQUEST['stage'])) $_REQUEST['stage'] = 1; @@ -358,7 +358,7 @@ $misc->printMsg($msg); echo ""; - echo "\n"; + echo "\n"; // Output table header echo "
    \n"; @@ -407,6 +407,7 @@ htmlspecialchars($_REQUEST['field']), "\" />"; // Column type + $escaped_predef_types = array(); // the JS escaped array elements if ($data->hasAlterColumnType()) { // Fetch all available types $types = $data->getTypes(true, false, true); @@ -435,7 +436,6 @@ echo "\n"; echo ""; $predefined_size_types = array_intersect($data->predefined_size_types,array_keys($types_for_js)); - $escaped_predef_types = array(); // the JS escaped array elements foreach($predefined_size_types as $value) { $escaped_predef_types[] = "'{$value}'"; } @@ -513,7 +513,7 @@ */ function doDrop($confirm) { global $data, $database, $misc, $_reload_browser; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('column'); @@ -523,7 +523,7 @@ $misc->printVal($_REQUEST['table'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -593,7 +593,7 @@ */ function doDefault($msg = '') { global $data, $conf, $misc; - global $PHP_SELF, $lang; + global $lang; function attPre(&$rowdata) { global $data; @@ -649,12 +649,12 @@ ), 'alter' => array( 'title' => $lang['stralter'], - 'url' => "{$PHP_SELF}?action=properties&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", + 'url' => "tableproperties.php?action=properties&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", 'vars' => array('column' => 'attname'), ), 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", + 'url' => "tblproperties.php?action=confirm_drop&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", 'vars' => array('column' => 'attname'), ), ); @@ -673,8 +673,8 @@ echo "\t
  • href}&table=", urlencode($_REQUEST['table']),"\">{$lang['strinsert']}
    • \n"; echo "\t
  • href}&table=", urlencode($_REQUEST['table']),"\">{$lang['strempty']}
    • \n"; echo "\t
  • href}&table=", urlencode($_REQUEST['table']),"\">{$lang['strdrop']}
    • \n"; - echo "\t
  • href}&table=", urlencode($_REQUEST['table']),"\">{$lang['straddcolumn']}
    • \n"; - echo "\t
  • href}&table=", urlencode($_REQUEST['table']),"\">{$lang['stralter']}
    • \n"; + echo "\t
  • href}&table=", urlencode($_REQUEST['table']),"\">{$lang['straddcolumn']}
    • \n"; + echo "\t
  • href}&table=", urlencode($_REQUEST['table']),"\">{$lang['stralter']}
    • \n"; echo "\n"; } diff --git a/triggers.php b/triggers.php index 7541c92c..de3e5632 100644 --- a/triggers.php +++ b/triggers.php @@ -3,7 +3,7 @@ /** * List triggers on a table * - * $Id: triggers.php,v 1.30.2.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: triggers.php,v 1.30.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -30,7 +30,7 @@ */ function doAlter($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('trigger'); $misc->printTitle($lang['stralter'],'pg.trigger.alter'); @@ -42,7 +42,7 @@ if (!isset($_POST['name'])) $_POST['name'] = $triggerdata->f['tgname']; - echo "\n"; + echo "\n"; echo "
    \n"; echo "\n"; echo "
    {$lang['strname']}"; @@ -65,7 +65,7 @@ */ function doDrop($confirm) { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('trigger'); @@ -74,7 +74,7 @@ echo "

    ", sprintf($lang['strconfdroptrigger'], $misc->printVal($_REQUEST['trigger']), $misc->printVal($_REQUEST['table'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -102,7 +102,7 @@ */ function doEnable($confirm) { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('trigger'); @@ -111,7 +111,7 @@ echo "

    ", sprintf($lang['strconfenabletrigger'], $misc->printVal($_REQUEST['trigger']), $misc->printVal($_REQUEST['table'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -135,7 +135,7 @@ */ function doDisable($confirm) { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('trigger'); @@ -144,7 +144,7 @@ echo "

    ", sprintf($lang['strconfdisabletrigger'], $misc->printVal($_REQUEST['trigger']), $misc->printVal($_REQUEST['table'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -168,7 +168,7 @@ */ function doCreate($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('table'); $misc->printTitle($lang['strcreatetrigger'],'pg.trigger.create'); @@ -200,7 +200,7 @@ $sel3 = new XHTML_Select('formFrequency'); $sel3->set_data($data->triggerFrequency); - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo " \n"; @@ -236,7 +236,7 @@ */ function doSaveCreate() { global $data; - global $PHP_SELF, $lang; + global $lang; // Check that they've given a name and a definition @@ -262,7 +262,6 @@ */ function doDefault($msg = '') { global $data, $misc, $database; - global $PHP_SELF; global $lang; function tgPre(&$rowdata) { @@ -296,12 +295,12 @@ $actions = array( 'alter' => array( 'title' => $lang['stralter'], - 'url' => "{$PHP_SELF}?action=confirm_alter&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", + 'url' => "triggers.php?action=confirm_alter&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", 'vars' => array('trigger' => 'tgname'), ), 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", + 'url' => "triggers.php?action=confirm_drop&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", 'vars' => array('trigger' => 'tgname'), ), ); @@ -309,13 +308,13 @@ if(!$data->phpBool($triggers->fields["tgenabled"])) { $actions['enable'] = array( 'title' => $lang['strenable'], - 'url' => "{$PHP_SELF}?action=confirm_enable&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", + 'url' => "triggers.php?action=confirm_enable&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", 'vars' => array('trigger' => 'tgname'), ); } else { $actions['disable'] = array( 'title' => $lang['strdisable'], - 'url' => "{$PHP_SELF}?action=confirm_disable&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", + 'url' => "triggers.php?action=confirm_disable&{$misc->href}&table=".urlencode($_REQUEST['table'])."&", 'vars' => array('trigger' => 'tgname'), ); } @@ -325,7 +324,7 @@ $misc->printTable($triggers, $columns, $actions, $lang['strnotriggers'], 'tgPre'); - echo "

    href}&table=", urlencode($_REQUEST['table']), "\">{$lang['strcreatetrigger']}

    \n"; + echo "

    href}&table=", urlencode($_REQUEST['table']), "\">{$lang['strcreatetrigger']}

    \n"; } $misc->printHeader($lang['strtables'] . ' - ' . $_REQUEST['table'] . ' - ' . $lang['strtriggers']); diff --git a/types.php b/types.php index 9f92a77a..885325c8 100644 --- a/types.php +++ b/types.php @@ -3,7 +3,7 @@ /** * Manage types in a database * - * $Id: types.php,v 1.31.2.1 2007/05/28 17:21:56 ioguix Exp $ + * $Id: types.php,v 1.31.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -17,7 +17,7 @@ */ function doProperties($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; // Get type (using base name) $typedata = $data->getType($_REQUEST['type']); @@ -75,7 +75,7 @@ echo "
    {$lang['strname']}
    \n"; } - echo "

    href}\">{$lang['strshowalltypes']}

    \n"; + echo "

    href}\">{$lang['strshowalltypes']}

    \n"; } else doDefault($lang['strinvalidparam']); } @@ -85,7 +85,7 @@ */ function doDrop($confirm) { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('type'); @@ -93,7 +93,7 @@ echo "

    ", sprintf($lang['strconfdroptype'], $misc->printVal($_REQUEST['type'])), "

    \n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo $misc->form; @@ -120,7 +120,7 @@ */ function doCreateComposite($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if (!isset($_REQUEST['stage'])) $_REQUEST['stage'] = 1; if (!isset($_REQUEST['name'])) $_REQUEST['name'] = ''; @@ -133,7 +133,7 @@ $misc->printTitle($lang['strcreatecomptype'], 'pg.type.create'); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo "\n"; echo "\t\n\t\t\n"; echo "\t\t
    {$lang['strname']}_maxNameLen}\" value=\"", @@ -176,7 +176,7 @@ $misc->printTitle($lang['strcreatecomptype'], 'pg.type.create'); $misc->printMsg($msg); - echo "\n"; + echo "\n"; // Output table header echo "\n"; @@ -268,7 +268,7 @@ */ function doCreate($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if (!isset($_POST['typname'])) $_POST['typname'] = ''; if (!isset($_POST['typin'])) $_POST['typin'] = ''; @@ -288,7 +288,7 @@ $misc->printTitle($lang['strcreatetype'], 'pg.type.create'); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo "
    \n"; echo "\n"; echo "
    {$lang['strname']}_maxNameLen}\" value=\"", @@ -393,7 +393,7 @@ */ function doDefault($msg = '') { global $data, $conf, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('schema'); $misc->printTabs('schema','types'); @@ -438,21 +438,21 @@ $actions = array( 'properties' => array( 'title' => $lang['strproperties'], - 'url' => "{$PHP_SELF}?action=properties&{$misc->href}&", + 'url' => "types.php?action=properties&{$misc->href}&", 'vars' => array('type' => 'basename'), ), 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&", + 'url' => "types.php?action=confirm_drop&{$misc->href}&", 'vars' => array('type' => 'basename'), ), ); $misc->printTable($types, $columns, $actions, $lang['strnotypes']); - echo "

    href}\">{$lang['strcreatetype']}"; + echo "

    href}\">{$lang['strcreatetype']}"; if ($data->hasCompositeTypes()) - echo "\n| href}\">{$lang['strcreatecomptype']}"; + echo "\n| href}\">{$lang['strcreatecomptype']}"; echo "

    \n"; } diff --git a/users.php b/users.php index 3679b467..ed4d1617 100644 --- a/users.php +++ b/users.php @@ -3,7 +3,7 @@ /** * Manage users in a database cluster * - * $Id: users.php,v 1.32.2.1 2007/05/28 17:21:57 ioguix Exp $ + * $Id: users.php,v 1.32.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -20,7 +20,7 @@ */ function doAccount($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $server_info = $misc->getServerInfo(); @@ -47,7 +47,7 @@ } else echo "

    {$lang['strnodata']}

    \n"; - echo "

    href}\">{$lang['strchangepassword']}

    \n"; + echo "

    href}\">{$lang['strchangepassword']}

    \n"; } /** @@ -55,7 +55,7 @@ */ function doChangePassword($confirm, $msg = '') { global $data, $misc; - global $PHP_SELF, $lang, $conf; + global $lang, $conf; $server_info = $misc->getServerInfo(); @@ -68,7 +68,7 @@ if (!isset($_POST['password'])) $_POST['password'] = ''; if (!isset($_POST['confirm'])) $_POST['confirm'] = ''; - echo "\n"; + echo "\n"; echo $misc->form; echo "\n"; echo "\t\n\t\t\n"; @@ -105,7 +105,7 @@ */ function doEdit($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('user'); $misc->printTitle($lang['stralter'],'pg.user.alter'); @@ -127,7 +127,7 @@ $_POST['formPassword'] = ''; } - echo "\n"; + echo "\n"; echo $misc->form; echo "
    {$lang['strpassword']}
    \n"; echo "\t\n\t\t\n"; @@ -180,7 +180,7 @@ */ function doDrop($confirm) { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; if ($confirm) { $misc->printTrail('user'); @@ -188,7 +188,7 @@ echo "

    ", sprintf($lang['strconfdropuser'], $misc->printVal($_REQUEST['username'])), "

    \n"; - echo "\n"; + echo "\n"; echo $misc->form; echo "\n"; echo "\n"; @@ -210,7 +210,7 @@ */ function doCreate($msg = '') { global $data, $misc, $username; - global $PHP_SELF, $lang; + global $lang; if (!isset($_POST['formUsername'])) $_POST['formUsername'] = ''; if (!isset($_POST['formPassword'])) $_POST['formPassword'] = ''; @@ -221,7 +221,7 @@ $misc->printTitle($lang['strcreateuser'],'pg.user.create'); $misc->printMsg($msg); - echo "\n"; + echo "\n"; echo $misc->form; echo "
    {$lang['strusername']}
    \n"; echo "\t\n\t\t\n"; @@ -272,7 +272,7 @@ */ function doDefault($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; function renderUseExpires($val) { return $val == 'infinity' ? '' : htmlspecialchars($val); @@ -317,12 +317,12 @@ $actions = array( 'alter' => array( 'title' => $lang['stralter'], - 'url' => "{$PHP_SELF}?action=edit&{$misc->href}&", + 'url' => "users.php?action=edit&{$misc->href}&", 'vars' => array('username' => 'usename'), ), 'drop' => array( 'title' => $lang['strdrop'], - 'url' => "{$PHP_SELF}?action=confirm_drop&{$misc->href}&", + 'url' => "users.php?action=confirm_drop&{$misc->href}&", 'vars' => array('username' => 'usename'), ), ); @@ -331,7 +331,7 @@ $misc->printTable($users, $columns, $actions, $lang['strnousers']); - echo "

    href}\">{$lang['strcreateuser']}

    \n"; + echo "

    href}\">{$lang['strcreateuser']}

    \n"; } diff --git a/viewproperties.php b/viewproperties.php index 5136c2f2..b277a40a 100755 --- a/viewproperties.php +++ b/viewproperties.php @@ -3,7 +3,7 @@ /** * List views in a database * - * $Id: viewproperties.php,v 1.21.2.1 2007/05/28 17:21:57 ioguix Exp $ + * $Id: viewproperties.php,v 1.21.2.2 2007/07/09 14:55:22 xzilla Exp $ */ // Include application functions @@ -29,7 +29,7 @@ */ function doEdit($msg = '') { global $data, $misc; - global $PHP_SELF, $lang; + global $lang; $misc->printTrail('view'); $misc->printTitle($lang['stredit'],'pg.view.alter'); @@ -44,7 +44,7 @@ $_POST['formComment'] = $viewdata->f['relcomment']; } - echo "\n"; + echo "\n"; echo "
    {$lang['strusername']}
    \n"; echo "\t\n\t\t\n"; echo "\t\t
    {$lang['strdefinition']}