Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 11 commits
  • 34 files changed
  • 0 commit comments
  • 1 contributor
View
2  admin.php
@@ -653,7 +653,7 @@ function enlight($f, $p) {
);
}
- $misc->printTable($autovac, $columns, $actions, $lang['strnovacuumconf'], null, 'admin-admin');
+ $misc->printTable($autovac, $columns, $actions, 'admin-admin', $lang['strnovacuumconf']);
if (($type == 'table') and ($autovac->recordCount() == 0)) {
echo "<br />";
View
2  aggregates.php
@@ -322,7 +322,7 @@ function doDefault($msg = '') {
);
if (!$data->hasAlterAggregate()) unset($actions['alter']);
- $misc->printTable($aggregates, $columns, $actions, $lang['strnoaggregates'], null, 'aggregates-aggregates');
+ $misc->printTable($aggregates, $columns, $actions, 'aggregates-aggregates', $lang['strnoaggregates']);
$navlinks = array (
array (
View
2  all_db.php
@@ -425,7 +425,7 @@ function doDefault($msg = '') {
if (!$data->hasDatabaseCollation()) unset($columns['lc_collate'], $columns['lc_ctype']);
if (!isset($data->privlist['database'])) unset($actions['privileges']);
- $misc->printTable($databases, $columns, $actions, $lang['strnodatabases'], null, 'all_db-databases');
+ $misc->printTable($databases, $columns, $actions, 'all_db-databases', $lang['strnodatabases']);
$navlinks = array (
array (
View
2  casts.php
@@ -62,7 +62,7 @@ function renderCastContext($val) {
$actions = array();
- $misc->printTable($casts, $columns, $actions, $lang['strnocasts'], null, 'casts-casts');
+ $misc->printTable($casts, $columns, $actions, 'casts-casts', $lang['strnocasts']);
}
/**
View
30 classes/Misc.php
@@ -1095,7 +1095,7 @@ function printTopbar() {
foreach ($toplinks as $link) {
$tag = "\t<li><a";
foreach ($link['attr'] as $attr => $value) {
- $tag.= " ".$attr."=\"".htmlentities($value)."\"";
+ $tag.= " ".htmlentities($attr)."=\"".htmlentities($value)."\"";
}
$tag.=">";
$tag.= $link['content'];
@@ -1134,7 +1134,7 @@ function getTopLinks() {
$server_info = $this->getServerInfo();
- $sql_url = "sqledit.php?{$this->href}&action=";
+ $sql_url = "sqledit.php?".$this->href;
$sql_window_id = htmlspecialchars('sqledit:'.$_REQUEST['server']);
$history_url = "history.php?{$this->href}&action=pophistory";
$history_window_id = htmlspecialchars('history:'.$_REQUEST['server']);
@@ -1143,9 +1143,9 @@ function getTopLinks() {
$toplinks = array (
array (
'attr' => array (
- 'href' => "{$sql_url}sql",
+ 'href' => "{$sql_url}&action=sql",
'target' => "sqledit",
- 'onclick' => "window.open('{$sql_url}sql','{$sql_window_id}','toolbar=no,width=700,height=500,resizable=yes,scrollbars=yes').focus(); return false;",
+ 'onclick' => "window.open('{$sql_url}&action=sql','{$sql_window_id}','toolbar=no,width=700,height=500,resizable=yes,scrollbars=yes').focus(); return false;",
),
'content' => $lang['strsql']
),
@@ -1158,9 +1158,9 @@ function getTopLinks() {
),
array (
'attr' => array (
- 'href' => "{$sql_url}find",
+ 'href' => "{$sql_url}&action=find",
'target' => "sqledit",
- 'onclick' => "window.open('{$sql_url}find','{$sql_window_id}','toolbar=no,width=700,height=500,resizable=yes,scrollbars=yes').focus(); return false;",
+ 'onclick' => "window.open('{$sql_url}&action=find','{$sql_window_id}','toolbar=no,width=700,height=500,resizable=yes,scrollbars=yes').focus(); return false;",
),
'content' => $lang['strfind']
),
@@ -1214,7 +1214,7 @@ function printNavLinks($navlinks=array(), $place) {
foreach ($navlinks as $navlink) {
$tag = "\t<li><a ";
foreach ($navlink['attr'] as $attr => $value) {
- $tag.= "{$attr}=\"{$value}\"";
+ $tag.= htmlspecialchars($attr)."=\"".$value."\"";
}
$tag.= ">".$navlink['content']."</a></li>\n";
echo $tag;
@@ -1681,17 +1681,15 @@ function printUrlVars(&$vars, &$fields) {
* @param $place - Place where the $actions are displayed. Like 'display-browse', where 'display' is the file (display.php)
* and 'browse' is the place inside that code (doBrowse).
*/
- function printTable(&$tabledata, &$columns, &$actions, $nodata = null, $pre_fn = null, $place = null) {
+ function printTable(&$tabledata, &$columns, &$actions, $place, $nodata = null, $pre_fn = null) {
global $data, $conf, $misc, $lang, $plugin_manager;
- if (strlen($place) > 0) {
- // Action buttons hook's place
- $plugin_functions_parameters = array(
- 'actionbuttons' => &$actions,
- 'place' => $place
- );
- $plugin_manager->do_hook('actionbuttons', $plugin_functions_parameters);
- }
+ // Action buttons hook's place
+ $plugin_functions_parameters = array(
+ 'actionbuttons' => &$actions,
+ 'place' => $place
+ );
+ $plugin_manager->do_hook('actionbuttons', $plugin_functions_parameters);
if ($has_ma = isset($actions['multiactions']))
$ma = $actions['multiactions'];
View
4 colproperties.php
@@ -226,7 +226,7 @@ function attPre(&$rowdata) {
}
$actions=array();
- $misc->printTable($attrs, $column, $actions, null, 'attPre', 'colproperties-colproperties');
+ $misc->printTable($attrs, $column, $actions, 'colproperties-colproperties', null, 'attPre');
echo "<br />\n";
@@ -266,7 +266,7 @@ function attPre(&$rowdata) {
} else {
$return_url = urlencode("colproperties.php?{$misc->href}&amp;view=". urlencode($tableName)
."&amp;column=". urlencode($_REQUEST['column']));
- $url = "\t<li><a href=\"display.php?{$misc->href}&amp;subject=column&amp;column=";
+ $url = "display.php?{$misc->href}&amp;subject=column&amp;column=";
$url.= urlencode($_REQUEST['column']). "&amp;return_url={$return_url}&amp;return_desc=". urlencode($lang['strback']);
$url.= "&amp;query={$query_url}";
/* Browse link */
View
2  constraints.php
@@ -470,7 +470,7 @@ function cnPre(&$rowdata) {
),
);
- $misc->printTable($constraints, $columns, $actions, $lang['strnoconstraints'], 'cnPre', 'constraints-constraints');
+ $misc->printTable($constraints, $columns, $actions, 'constraints-constraints', $lang['strnoconstraints'], 'cnPre');
$navlinks = array (
array (
View
2  conversions.php
@@ -51,7 +51,7 @@ function doDefault($msg = '') {
$actions = array();
- $misc->printTable($conversions, $columns, $actions, $lang['strnoconversions'], null, 'conversions-conversions');
+ $misc->printTable($conversions, $columns, $actions, 'conversions-conversions', $lang['strnoconversions']);
}
/**
View
8 database.php
@@ -376,7 +376,7 @@ function doVariables() {
$actions = array();
- $misc->printTable($variables, $columns, $actions, $lang['strnodata'], null, 'database-variables');
+ $misc->printTable($variables, $columns, $actions, 'database-variables', $lang['strnodata']);
}
/**
@@ -429,7 +429,7 @@ function currentProcesses($isAjax = false) {
$actions = array();
- $misc->printTable($prep_xacts, $columns, $actions, $lang['strnodata'], null, 'database-processes-preparedxacts');
+ $misc->printTable($prep_xacts, $columns, $actions, 'database-processes-preparedxacts', $lang['strnodata']);
}
// Fetch the processes from the database
@@ -483,7 +483,7 @@ function currentProcesses($isAjax = false) {
// Remove query start time for <7.4
if (!isset($processes->fields['query_start'])) unset($columns['start_time']);
- $misc->printTable($processes, $columns, $actions, $lang['strnodata'], null, 'database-processes');
+ $misc->printTable($processes, $columns, $actions, 'database-processes', $lang['strnodata']);
if ($isAjax) exit;
}
@@ -529,7 +529,7 @@ function currentLocks($isAjax = false) {
if (!$data->hasVirtualTransactionId()) unset($columns['vxid']);
$actions = array();
- $misc->printTable($variables, $columns, $actions, $lang['strnodata'], null, 'database-locks');
+ $misc->printTable($variables, $columns, $actions, 'database-locks', $lang['strnodata']);
if ($isAjax) exit;
}
View
4 display.php
@@ -635,10 +635,10 @@ function doBrowse($msg = '') {
$url .= "&amp;search_path=".urlencode($_REQUEST['search_path']);
$url .= "&amp;{$misc->href}";
- $content = $lang['strdownload'];
+
$navlinks[] = array (
'attr'=> array ('href' => $url),
- 'content' => $content
+ 'content' => $lang['strdownload']
);
}
View
9 domains.php
@@ -205,7 +205,7 @@ function doProperties($msg = '') {
$domaincons = $data->getDomainConstraints($_REQUEST['domain']);
$columns = array (
'name' => array (
- 'title' => $lang['strdatabase'],
+ 'title' => $lang['strname'],
'field' => field('conname')
),
'definition' => array (
@@ -221,12 +221,11 @@ function doProperties($msg = '') {
'drop' => array (
'title' => $lang['strdrop'],
'url' => "domains.php?action=confirm_drop_con&amp;{$misc->href}&amp;domain=".urlencode($_REQUEST['domain'])."&amp;",
- 'vars' => array ('constraint' => 'conname', 'type' => 'contype'),
- 'multiaction' => 'confirm_drop_con',
+ 'vars' => array ('constraint' => 'conname', 'type' => 'contype')
)
);
- $misc->printTable($domaincons, $columns, $actions, $lang['strnodata'], null, 'domains-properties');
+ $misc->printTable($domaincons, $columns, $actions, 'domains-properties', $lang['strnodata']);
}
}
else echo "<p>{$lang['strnodata']}</p>\n";
@@ -430,7 +429,7 @@ function doDefault($msg = '') {
if (!$data->hasAlterDomains()) unset($actions['alter']);
- $misc->printTable($domains, $columns, $actions, $lang['strnodomains'], null, 'domains-domains');
+ $misc->printTable($domains, $columns, $actions, 'domains-domains', $lang['strnodomains']);
$navlinks = array (
array (
View
8 fulltext.php
@@ -56,7 +56,7 @@ function doDefault($msg = '') {
),
);
- $misc->printTable($cfgs, $columns, $actions, $lang['strftsnoconfigs'], null, 'fulltext-fulltext');
+ $misc->printTable($cfgs, $columns, $actions, 'fulltext-fulltext', $lang['strftsnoconfigs']);
$navlinks = array (
array (
@@ -345,7 +345,7 @@ function doViewParsers($msg = '') {
$actions = array();
- $misc->printTable($parsers, $columns, $actions, $lang['strftsnoparsers'], null, 'fulltext-viewparsers');
+ $misc->printTable($parsers, $columns, $actions, 'fulltext-viewparsers', $lang['strftsnoparsers']);
//TODO: create parser
//$navlinks = array (
@@ -403,7 +403,7 @@ function doViewDicts($msg = '') {
),
);
- $misc->printTable($dicts, $columns, $actions, $lang['strftsnodicts'], null, 'fulltext-viewdicts');
+ $misc->printTable($dicts, $columns, $actions, 'fulltext-viewdicts', $lang['strftsnodicts']);
$navlinks = array (
array (
@@ -470,7 +470,7 @@ function doViewConfig($ftscfg, $msg = '') {
);
- $misc->printTable($map, $columns, $actions, $lang['strftsemptymap'], null, 'fulltext-viewconfig');
+ $misc->printTable($map, $columns, $actions, 'fulltext-viewconfig', $lang['strftsemptymap']);
$navlinks = array (
array (
View
2  functions.php
@@ -831,7 +831,7 @@ function doDefault($msg = '') {
),
);
- $misc->printTable($funcs, $columns, $actions, $lang['strnofunctions'], null, 'functions-functions');
+ $misc->printTable($funcs, $columns, $actions, 'functions-functions', $lang['strnofunctions']);
$navlinks = array (
array (
View
7 groups.php
@@ -88,12 +88,11 @@ function doProperties($msg = '') {
'drop' => array (
'title' => $lang['strdrop'],
'url' => "groups.php?action=confirm_drop_member&{$misc->href}&group=".urlencode($_REQUEST['group'])."&amp;",
- 'vars' => array ('user' => 'usename'),
- 'multiaction' => 'confirm_drop_member',
+ 'vars' => array ('user' => 'usename')
)
);
- $misc->printTable($groupdata, $columns, $actions, $lang['strnodata'], null, 'groups-properties');
+ $misc->printTable($groupdata, $columns, $actions, 'groups-properties', $lang['strnousers']);
}
// Display form for adding a user to the group
@@ -248,7 +247,7 @@ function doDefault($msg = '') {
),
);
- $misc->printTable($groups, $columns, $actions, $lang['strnogroups'], null, 'groups-groups');
+ $misc->printTable($groups, $columns, $actions, 'groups-groups', $lang['strnogroups']);
$navlinks = array (
array (
View
2  history.php
@@ -64,7 +64,7 @@ function doDefault() {
),
);
- $misc->printTable($history, $columns, $actions, $lang['strnohistory'], null, 'history-history');
+ $misc->printTable($history, $columns, $actions, 'history-history', $lang['strnohistory']);
}
else echo "<p>{$lang['strnohistory']}</p>\n";
View
2  indexes.php
@@ -309,7 +309,7 @@ function indPre(&$rowdata, $actions) {
),
);
- $misc->printTable($indexes, $columns, $actions, $lang['strnoindexes'], 'indPre', 'indexes-indexes');
+ $misc->printTable($indexes, $columns, $actions, 'indexes-indexes', $lang['strnoindexes'], 'indPre');
$navlinks = array (
array (
View
6 info.php
@@ -75,7 +75,7 @@ function doDefault($msg = '') {
)
);
- $misc->printTable($referrers, $columns, $actions, $lang['strnodata'], null, 'info-referrers');
+ $misc->printTable($referrers, $columns, $actions, 'info-referrers', $lang['strnodata']);
}
// Parent tables
@@ -104,7 +104,7 @@ function doDefault($msg = '') {
)
);
- $misc->printTable($parents, $columns, $actions, $lang['strnodata'], null, 'info-parents');
+ $misc->printTable($parents, $columns, $actions, 'info-parents', $lang['strnodata']);
}
// Child tables
@@ -133,7 +133,7 @@ function doDefault($msg = '') {
)
);
- $misc->printTable($children, $columns, $actions, $lang['strnodata'], null, 'info-children');
+ $misc->printTable($children, $columns, $actions, 'info-children', $lang['strnodata']);
}
// Row performance
View
2  languages.php
@@ -43,7 +43,7 @@ function doDefault($msg = '') {
$actions = array();
- $misc->printTable($languages, $columns, $actions, $lang['strnolanguages'], null, 'languages-languages');
+ $misc->printTable($languages, $columns, $actions, 'languages-languages', $lang['strnolanguages']);
}
/**
View
2  opclasses.php
@@ -51,7 +51,7 @@ function doDefault($msg = '') {
$actions = array();
- $misc->printTable($opclasses, $columns, $actions, $lang['strnoopclasses'], null, 'opclasses');
+ $misc->printTable($opclasses, $columns, $actions, 'opclasses-opclasses', $lang['strnoopclasses']);
}
/**
View
2  operators.php
@@ -158,7 +158,7 @@ function doDefault($msg = '') {
),
);
- $misc->printTable($operators, $columns, $actions, $lang['strnooperators'], null, 'operators-operators');
+ $misc->printTable($operators, $columns, $actions, 'operators-operators', $lang['strnooperators']);
// echo "<p><a class=\"navlink\" href=\"operators.php?action=create&amp;{$misc->href}\">{$lang['strcreateoperator']}</a></p>\n";
}
View
2  reports.php
@@ -303,7 +303,7 @@ function doDefault($msg = '') {
),
);
- $misc->printTable($reports, $columns, $actions, $lang['strnoreports'], null, 'reports-reports');
+ $misc->printTable($reports, $columns, $actions, 'reports-reports', $lang['strnoreports']);
$navlinks = array (
array (
View
2  roles.php
@@ -631,7 +631,7 @@ function renderRoleExpires($val) {
),
);
- $misc->printTable($roles, $columns, $actions, $lang['strnoroles'], null, 'roles-roles');
+ $misc->printTable($roles, $columns, $actions, 'roles-roles', $lang['strnoroles']);
$navlinks = array (
array (
View
2  rules.php
@@ -155,7 +155,7 @@ function doDefault($msg = '') {
),
);
- $misc->printTable($rules, $columns, $actions, $lang['strnorules'], null, 'rules-rules');
+ $misc->printTable($rules, $columns, $actions, 'rules-rules', $lang['strnorules']);
$navlinks = array (
array (
View
2  schemas.php
@@ -71,7 +71,7 @@ function doDefault($msg = '') {
if (!$data->hasAlterSchema()) unset($actions['alter']);
- $misc->printTable($schemas, $columns, $actions, $lang['strnoschemas'], null, 'schemas-schemas');
+ $misc->printTable($schemas, $columns, $actions, 'schemas-schemas', $lang['strnoschemas']);
$navlinks = array (
array (
View
2  sequences.php
@@ -69,7 +69,7 @@ function doDefault($msg = '') {
),
);
- $misc->printTable($sequences, $columns, $actions, $lang['strnosequences'], null, 'sequences-sequences');
+ $misc->printTable($sequences, $columns, $actions, 'sequences-sequences', $lang['strnosequences']);
$navlinks = array (
array (
View
2  servers.php
@@ -79,7 +79,7 @@ function svPre(&$rowdata, $actions) {
$actions['logout']['url'] .= "group=" . htmlentities($group) . "&amp;";
}
- $misc->printTable($servers, $columns, $actions, $lang['strnoobjects'], 'svPre', 'servers-servers');
+ $misc->printTable($servers, $columns, $actions, 'servers-servers', $lang['strnoobjects'], 'svPre');
if (isset($conf['srv_groups'])) {
$navlinks = array (
View
2  tables.php
@@ -825,7 +825,7 @@ function doDefault($msg = '') {
if (!$data->hasTablespaces()) unset($columns['tablespace']);
- $misc->printTable($tables, $columns, $actions, $lang['strnotables'], null, 'tables-tables');
+ $misc->printTable($tables, $columns, $actions, 'tables-tables', $lang['strnotables']);
$navlinks = array (
array (
View
2  tablespaces.php
@@ -254,7 +254,7 @@ function doDefault($msg = '') {
)
);
- $misc->printTable($tablespaces, $columns, $actions, $lang['strnotablespaces'], null, 'tablespaces-tablespaces');
+ $misc->printTable($tablespaces, $columns, $actions, 'tablespaces-tablespaces', $lang['strnotablespaces']);
$navlinks = array (
array (
View
2  tblproperties.php
@@ -565,7 +565,7 @@ function cstrRender($s, $p) {
),
);
- $misc->printTable($attrs, $columns, $actions, null, 'attPre', 'tblproperties-tblproperties');
+ $misc->printTable($attrs, $columns, $actions, 'tblproperties-tblproperties', null, 'attPre');
$navlinks = array (
array (
View
2  triggers.php
@@ -329,7 +329,7 @@ function tgPre(&$rowdata,$actions) {
);
}
- $misc->printTable($triggers, $columns, $actions, $lang['strnotriggers'], 'tgPre', 'triggers-triggers');
+ $misc->printTable($triggers, $columns, $actions, 'triggers-triggers', $lang['strnotriggers'], 'tgPre');
$navlinks = array (
array (
View
4 types.php
@@ -54,7 +54,7 @@ function attPre(&$rowdata) {
$actions = array();
- $misc->printTable($attrs, $columns, $actions, null, 'attPre', 'types-properties');
+ $misc->printTable($attrs, $columns, $actions, 'types-properties', null, 'attPre');
break;
case 'e':
@@ -579,7 +579,7 @@ function doDefault($msg = '') {
),
);
- $misc->printTable($types, $columns, $actions, $lang['strnotypes'], null, 'types-types');
+ $misc->printTable($types, $columns, $actions, 'types-types', $lang['strnotypes']);
$navlinks = array (
array (
View
2  users.php
@@ -334,7 +334,7 @@ function renderUseExpires($val) {
),
);
- $misc->printTable($users, $columns, $actions, $lang['strnousers'], null, 'users-users');
+ $misc->printTable($users, $columns, $actions, 'users-users', $lang['strnousers']);
$navlinks = array (
array (
View
2  viewproperties.php
@@ -430,7 +430,7 @@ function attPre(&$rowdata) {
),
);
- $misc->printTable($attrs, $columns, $actions, null, 'attPre', 'viewproperties-viewproperties');
+ $misc->printTable($attrs, $columns, $actions, 'viewproperties-viewproperties', null, 'attPre');
echo "<br />\n";
View
2  views.php
@@ -617,7 +617,7 @@ function doDefault($msg = '') {
),
);
- $misc->printTable($views, $columns, $actions, $lang['strnoviews'], null, 'views-views');
+ $misc->printTable($views, $columns, $actions, 'views-views', $lang['strnoviews']);
$navlinks = array (
array (

No commit comments for this range

Something went wrong with that request. Please try again.