Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/openid.php2
-rw-r--r--examples/signon.php2
-rw-r--r--libraries/Config.class.php2
-rw-r--r--libraries/Footer.class.php2
-rw-r--r--libraries/List_Database.class.php5
-rw-r--r--libraries/Theme.class.php2
-rw-r--r--libraries/Theme_Manager.class.php2
-rw-r--r--libraries/build_html_for_db.lib.php6
-rw-r--r--libraries/display_select_lang.lib.php2
-rw-r--r--libraries/navigation_header.inc.php4
-rw-r--r--libraries/plugins/auth/AuthenticationCookie.class.php6
-rw-r--r--libraries/select_server.lib.php4
-rw-r--r--main.php2
-rw-r--r--navigation.php8
-rw-r--r--user_password.php2
15 files changed, 25 insertions, 26 deletions
diff --git a/examples/openid.php b/examples/openid.php
index 563b23032a..914f061704 100644
--- a/examples/openid.php
+++ b/examples/openid.php
@@ -150,7 +150,7 @@ if (isset($_POST['start'])) {
$_SESSION['PMA_single_signon_password'] = $AUTH_MAP[$id]['password'];
session_write_close();
/* Redirect to phpMyAdmin (should use absolute URL here!) */
- header('Location: ../index.php');
+ header('Location: ../main.php');
} else {
show_page('<p>User not allowed!</p>');
exit;
diff --git a/examples/signon.php b/examples/signon.php
index 6ab9e240aa..dbdf99a041 100644
--- a/examples/signon.php
+++ b/examples/signon.php
@@ -31,7 +31,7 @@ if (isset($_POST['user'])) {
/* Close that session */
session_write_close();
/* Redirect to phpMyAdmin (should use absolute URL here!) */
- header('Location: ../index.php');
+ header('Location: ../main.php');
} else {
/* Show simple form */
header('Content-Type: text/html; charset=utf-8');
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 3d62595996..f967fc2501 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -1545,7 +1545,7 @@ class PMA_Config
static public function getFontsizeForm()
{
return '<form name="form_fontsize_selection" id="form_fontsize_selection"'
- . ' method="post" action="index.php" target="_parent">' . "\n"
+ . ' method="post" action="main.php" target="_parent">' . "\n"
. PMA_generate_common_hidden_inputs() . "\n"
. PMA_Config::getFontsizeSelection() . "\n"
. '</form>';
diff --git a/libraries/Footer.class.php b/libraries/Footer.class.php
index d0b30dba9c..9f25a7371e 100644
--- a/libraries/Footer.class.php
+++ b/libraries/Footer.class.php
@@ -193,7 +193,7 @@ class PMA_Footer
{
$retval = '';
$retval .= '<div id="selflink" class="print_ignore">';
- $retval .= '<a href="index.php' . PMA_generate_common_url($url_params) . '"'
+ $retval .= '<a href="main.php' . PMA_generate_common_url($url_params) . '"'
. ' title="' . __('Open new phpMyAdmin window') . '" target="_blank">';
if ($GLOBALS['cfg']['NavigationBarIconic']) {
$retval .= PMA_Util::getImage(
diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php
index 0aed8ebdf5..13b40bc3e1 100644
--- a/libraries/List_Database.class.php
+++ b/libraries/List_Database.class.php
@@ -360,8 +360,9 @@ class PMA_List_Database extends PMA_List
if (! empty($db['comment'])) {
$return .= ' title="' . htmlspecialchars($db['comment']) . '"';
}
- $return .= ' href="index.php?' . PMA_generate_common_url($db['name'])
- . '" target="_parent">';
+ $return .= ' href="' . $GLOBALS['cfg']['DefaultTabDatabase']
+ . '?' . PMA_generate_common_url($db['name'])
+ . '">';
if ($cut) {
$return .= htmlspecialchars($db['disp_name_cut']);
} else {
diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index 4658cb67da..c79e9224cc 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -437,7 +437,7 @@ class PMA_Theme
public function getPrintPreview()
{
$url_params = array('set_theme' => $this->getId());
- $url = 'index.php'. PMA_generate_common_url($url_params);
+ $url = 'main.php'. PMA_generate_common_url($url_params);
$retval = '<div class="theme_preview">';
$retval .= '<h2>';
diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php
index 2ecfb05c6a..c263e6ebb7 100644
--- a/libraries/Theme_Manager.class.php
+++ b/libraries/Theme_Manager.class.php
@@ -353,7 +353,7 @@ class PMA_Theme_Manager
$select_box = '';
if ($form) {
- $select_box .= '<form name="setTheme" method="post" action="index.php"'
+ $select_box .= '<form name="setTheme" method="post" action="main.php"'
.' target="_parent">';
$select_box .= PMA_generate_common_hidden_inputs();
}
diff --git a/libraries/build_html_for_db.lib.php b/libraries/build_html_for_db.lib.php
index 24788be1c9..d886a92d5d 100644
--- a/libraries/build_html_for_db.lib.php
+++ b/libraries/build_html_for_db.lib.php
@@ -87,10 +87,8 @@ function PMA_buildHtmlForDb(
$out .= ' /></td>';
}
$out .= '<td class="name">'
- . ' <a onclick="'
- . 'if (window.parent.openDb &amp;&amp; window.parent.openDb(\''
- . PMA_jsFormat($current['SCHEMA_NAME'], false) . '\')) return false;'
- . '" href="index.php?' . $url_query . '&amp;db='
+ . '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase']
+ . '?' . $url_query . '&amp;db='
. urlencode($current['SCHEMA_NAME']) . '" title="'
. sprintf(
__('Jump to database'),
diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php
index 2f9acf1488..0c19026f75 100644
--- a/libraries/display_select_lang.lib.php
+++ b/libraries/display_select_lang.lib.php
@@ -42,7 +42,7 @@ function PMA_Language_select($use_fieldset = false, $show_doc = true)
global $cfg, $lang;
- echo '<form method="post" action="index.php" target="_parent">';
+ echo '<form method="post" action="main.php" target="_parent">';
$_form_params = array(
'db' => $GLOBALS['db'],
diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php
index 20e65bc544..b9e1ccd229 100644
--- a/libraries/navigation_header.inc.php
+++ b/libraries/navigation_header.inc.php
@@ -58,8 +58,8 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) {
if ($server != 0) {
// Logout for advanced authentication
if ($GLOBALS['cfg']['Server']['auth_type'] != 'config') {
- echo '<a href="index.php?' . $query_url . '&amp;old_usr='
- .urlencode($PHP_AUTH_USER) . '" target="_parent"'
+ echo '<a href="main.php?' . $query_url . '&amp;old_usr='
+ . urlencode($PHP_AUTH_USER) . '" target="_parent"'
.' title="' . __('Log out') . '" >'
. PMA_Util::getImage('s_loggoff.png', __('Log out'))
.'</a>' . "\n";
diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php
index 40fa6512cb..2aa22fc323 100644
--- a/libraries/plugins/auth/AuthenticationCookie.class.php
+++ b/libraries/plugins/auth/AuthenticationCookie.class.php
@@ -168,7 +168,7 @@ class AuthenticationCookie extends AuthenticationPlugin
echo '</div>
<br />
<!-- Login form -->
- <form method="post" action="index.php" name="login_form"' . $autocomplete .
+ <form method="post" action="main.php" name="login_form"' . $autocomplete .
' target="_top" class="login hide js-show">
<fieldset>
<legend>';
@@ -516,7 +516,7 @@ class AuthenticationCookie extends AuthenticationPlugin
}
// URL where to go:
- $redirect_url = $cfg['PmaAbsoluteUri'] . 'index.php';
+ $redirect_url = $cfg['PmaAbsoluteUri'] . 'main.php';
// any parameters to pass?
$url_params = array();
@@ -528,7 +528,7 @@ class AuthenticationCookie extends AuthenticationPlugin
}
// any target to pass?
if (! empty($GLOBALS['target'])
- && $GLOBALS['target'] != 'index.php'
+ && $GLOBALS['target'] != 'main.php'
) {
$url_params['target'] = $GLOBALS['target'];
}
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index ec674ec110..e57fdef27e 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -28,7 +28,7 @@ function PMA_selectServer($not_only_options, $ommit_fieldset)
}
if ($not_only_options) {
- echo '<form method="post" action="index.php" target="_parent">';
+ echo '<form method="post" action="' . $GLOBALS['cfg']['DefaultTabServer'] . '" target="_parent">';
echo PMA_generate_common_hidden_inputs();
if (! $ommit_fieldset) {
@@ -79,7 +79,7 @@ function PMA_selectServer($not_only_options, $ommit_fieldset)
echo '<strong>' . htmlspecialchars($label) . '</strong>';
} else {
- echo '<a class="item" href="index.php'
+ echo '<a class="item" href="' . $GLOBALS['cfg']['DefaultTabServer']
. PMA_generate_common_url(array('server' => $key))
. '" target="_top">' . htmlspecialchars($label) . '</a>';
}
diff --git a/main.php b/main.php
index 61e56f8b7d..b56048082d 100644
--- a/main.php
+++ b/main.php
@@ -113,7 +113,7 @@ if ($server > 0
}
} // end if
echo ' <li id="li_select_mysql_collation">';
- echo ' <form method="post" action="index.php" target="_parent">' . "\n"
+ echo ' <form method="post" action="main.php" target="_parent">' . "\n"
. PMA_generate_common_hidden_inputs(null, null, 4, 'collation_connection')
. ' <label for="select_collation_connection">' . "\n"
. ' ' . __('Server connection collation') . "\n"
diff --git a/navigation.php b/navigation.php
index b5a0f78095..e7408b6b6e 100644
--- a/navigation.php
+++ b/navigation.php
@@ -121,7 +121,7 @@ require 'libraries/navigation_header.inc.php';
// display recently used tables
if ($GLOBALS['cfg']['LeftRecentTable'] > 0) {
echo '<div id="recentTableList">' . "\n"
- .'<form method="post" action="index.php" target="_parent">' . "\n"
+ .'<form method="post" action="main.php" target="_parent">' . "\n"
.PMA_generate_common_hidden_inputs() . "\n"
.PMA_RecentTable::getInstance()->getHtmlSelect()
.'</form>' . "\n"
@@ -157,7 +157,7 @@ if (! $GLOBALS['server']) {
?>
<div id="databaseList">
- <form method="post" action="index.php" target="_parent" id="left">
+ <form method="post" action="<?php echo $GLOBALS['cfg']['DefaultTabDatabase']; ?>" target="_parent" id="left">
<?php
echo PMA_generate_common_hidden_inputs() . "\n";
echo $GLOBALS['pma']->databases->getHtmlSelectGrouped(true, $_SESSION['tmp_user_values']['navi_limit_offset'], $GLOBALS['cfg']['MaxDbList']) . "\n"
@@ -414,7 +414,7 @@ function PMA_displayDbList($ext_dblist, $offset, $count)
?>
<a class="item"
id="<?php echo htmlspecialchars($db['name']); ?>"
- href="index.php?<?php echo $common_url_query; ?>"
+ href="<?php echo $GLOBALS['cfg']['DefaultTabDatabase']; ?>?<?php echo $common_url_query; ?>"
target="_parent"
title="<?php echo htmlspecialchars($db['comment']); ?>"
onclick="
@@ -568,7 +568,7 @@ function PMA_displayTableList(
}
echo '</a>';
?>
- <a href="index.php?<?php echo $common_url_query; ?>"
+ <a href="<?php echo $GLOBALS['cfg']['DefaultTabTable'];?>?<?php echo $common_url_query; ?>"
target="_parent"
onclick="
if (! toggle('<?php echo $element_counter; ?>', true))
diff --git a/user_password.php b/user_password.php
index 329fb9b9c1..1b13b831a0 100644
--- a/user_password.php
+++ b/user_password.php
@@ -234,7 +234,7 @@ function PMA_changePassDisplayPage($message, $sql_query, $_url_params)
echo PMA_Util::getMessage(
$message, $sql_query, 'success'
);
- echo '<a href="index.php'.PMA_generate_common_url($_url_params)
+ echo '<a href="main.php'.PMA_generate_common_url($_url_params)
.' target="_parent">'. "\n"
.'<strong>'.__('Back').'</strong></a>';
exit;