gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-07-26 13:01:56 +02:00
commit 0632241a64
2 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libraries/user_preferences.lib.php
View File

@ -9,6 +9,8 @@ if (! defined('PHPMYADMIN')) {
exit;
}
require_once './libraries/Template.class.php';
/**
* Common initialization for user preferences modification pages
*
@ -266,35 +268,23 @@ function PMA_userprefsRedirect($file_name,
*/
function PMA_userprefsAutoloadGetHeader()
{
$retval = '';
if (isset($_REQUEST['prefs_autoload'])
&& $_REQUEST['prefs_autoload'] == 'hide'
) {
$_SESSION['userprefs_autoload'] = true;
} else {
$script_name = basename(basename($GLOBALS['PMA_PHP_SELF']));
$return_url = htmlspecialchars(
$script_name . '?' . http_build_query($_GET, '', '&')
);
$retval .= '<div id="prefs_autoload" class="notice print_ignore" style="display:none">';
$retval .= '<form action="prefs_manage.php" method="post" class="disableAjax">';
$retval .= PMA_URL_getHiddenInputs();
$retval .= '<input type="hidden" name="json" value="" />';
$retval .= '<input type="hidden" name="submit_import" value="1" />';
$retval .= '<input type="hidden" name="return_url" value="'
. $return_url . '" />';
$retval .= __(
'Your browser has phpMyAdmin configuration for this domain. '
. 'Would you like to import it for current session?'
);
$retval .= '<br />';
$retval .= '<a href="#yes">' . __('Yes') . '</a>';
$retval .= ' / ';
$retval .= '<a href="#no">' . __('No') . '</a>';
$retval .= '</form>';
$retval .= '</div>';
return '';
}
return $retval;
$script_name = basename(basename($GLOBALS['PMA_PHP_SELF']));
$return_url = htmlspecialchars(
$script_name . '?' . http_build_query($_GET, '', '&')
);
return PMA\Template::get('prefs_autoload')
->render(
array(
'hiddenInputs' => PMA_URL_getHiddenInputs(),
'return_url' => $return_url,
)
);
}

17
templates/prefs_autoload.phtml Normal file
View File

@ -0,0 +1,17 @@
<div id="prefs_autoload" class="notice print_ignore" style="display:none">
<form action="prefs_manage.php" method="post" class="disableAjax">
<?php echo $hiddenInputs; ?>
<input type="hidden" name="json" value="" />
<input type="hidden" name="submit_import" value="1" />
<input type="hidden" name="return_url" value="<?php echo $return_url ?>" />
<?php
echo __(
'Your browser has phpMyAdmin configuration for this domain. '
. 'Would you like to import it for current session?'
);
?>
<br />
<a href="#yes"><?php echo __('Yes') ?></a>
/ <a href="#no"><?php echo __('No') ?></a>
</form>
</div>