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

Removed the last references to the old header files

Browse Source
This commit is contained in:
Rouslan Placella 2012-05-30 14:16:57 +01:00
parent da1e70e1fb
commit 243727043d
9 changed files with 11 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation.html
View File

@ -2700,9 +2700,8 @@ setfacl -d -m "g:www-data:rwx" tmp
<p> This seems to be a PWS bug. Filippo Simoncini found a workaround (at this
time there is no better fix): remove or comment the <code>DOCTYPE</code>
declarations (2 lines) from the scripts <em>libraries/Header.class.php</em>,
<em>libraries/header_printview.inc.php</em>, <em>index.php</em>,
<em>navigation.php</em> and <em>libraries/common.lib.php</em>.</p>
declarations (2 lines) from the scripts <em>libraries/Header.class.php</em>
and <em>index.php</em>.</p>
<h4 id="faq1_7">
<a href="#faq1_7">1.7 How can I GZip or Bzip a dump or a

7
db_printview.php
View File

@ -10,10 +10,9 @@
*/
require_once 'libraries/common.inc.php';
/**
* Gets the variables sent or posted to this script, then displays headers
*/
require_once 'libraries/header_printview.inc.php';
$header = PMA_Header::getInstance();
$header->enablePrintView();
$header->display();
PMA_checkParameters(array('db'));

6
js/cross_framing_protection.js
View File

@ -1,7 +1,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Conditionally called from libraries/header_scripts.inc.php
* if third-party framing is not allowed
* Conditionally included if third-party framing is not allowed
*
*/
@ -13,8 +12,7 @@ try {
alert("Redirecting...");
top.location.replace(self.document.URL.substring(0, self.document.URL.lastIndexOf("/")+1));
}
}
catch(e) {
} catch(e) {
alert("Redirecting... (error: " + e);
top.location.replace(self.document.URL.substring(0, self.document.URL.lastIndexOf("/")+1));
}

2
libraries/auth/cookie.auth.lib.php
View File

@ -365,8 +365,6 @@ function PMA_auth_check()
// according to the PHP manual we should do this before the destroy:
//$_SESSION = array();
// but we still need some parts of the session information
// in libraries/header_meta_style.inc.php
session_destroy();
// -> delete password cookie(s)

50
libraries/header_meta_style.inc.php
View File

@ -1,50 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
exit;
}
/**
*
*/
if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) {
PMA_fatalError(__("GLOBALS overwrite attempt"));
}
/**
* Sends the beginning of the html page then returns to the calling script
*/
// Defines the cell alignment values depending on text direction
if ($GLOBALS['text_dir'] == 'ltr') {
$GLOBALS['cell_align_left'] = 'left';
$GLOBALS['cell_align_right'] = 'right';
} else {
$GLOBALS['cell_align_left'] = 'right';
$GLOBALS['cell_align_right'] = 'left';
}
// removes the bug with the horizontal scrollbar in IE (it's allways shown, if need it or not)
// xml declaration moves IE into quirks mode, making much trouble with CSS
/* echo '<?xml version="1.0" encoding="utf-8"?>'; */
?>
<!DOCTYPE HTML>
<html lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">
<head>
<meta charset="utf-8" />
<link rel="icon" href="favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<title><?php
if (!empty($page_title)) {
echo htmlspecialchars($page_title);
} else {
echo 'phpMyAdmin';
}
?></title>
<link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php<?php echo PMA_generate_common_url(array('server' => $GLOBALS['server'])); ?>&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
<link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>print.css" media="print" />
<link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.16.custom.css" />
<meta name="robots" content="noindex,nofollow" />

27
libraries/header_printview.inc.php
View File

@ -1,27 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
exit;
}
$header = PMA_Header::getInstance();
$header->enablePrintView();
$header->display();
/**
* Sends the beginning of the html page then returns to the calling script
*/
// Defines the cell alignment values depending on text direction
if ($text_dir == 'ltr') {
$cell_align_left = 'left';
$cell_align_right = 'right';
} else {
$cell_align_left = 'right';
$cell_align_right = 'left';
}
?>

95
libraries/header_scripts.inc.php
View File

@ -1,95 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
exit;
}
// Cross-framing protection
if ( false === $GLOBALS['cfg']['AllowThirdPartyFraming']) {
echo PMA_includeJS('cross_framing_protection.js');
}
// generate title (unless we already have $page_title, from cookie auth)
if (! isset($page_title)) {
if ($GLOBALS['server'] > 0) {
if (! empty($GLOBALS['table'])) {
$temp_title = $GLOBALS['cfg']['TitleTable'];
} else if (! empty($GLOBALS['db'])) {
$temp_title = $GLOBALS['cfg']['TitleDatabase'];
} elseif (! empty($GLOBALS['cfg']['Server']['host'])) {
$temp_title = $GLOBALS['cfg']['TitleServer'];
} else {
$temp_title = $GLOBALS['cfg']['TitleDefault'];
}
$title = PMA_expandUserString($temp_title);
}
} else {
$title = $page_title;
}
// here, the function does not exist with this configuration:
// $cfg['ServerDefault'] = 0;
$is_superuser = function_exists('PMA_isSuperuser') && PMA_isSuperuser();
$GLOBALS['js_include'][] = 'jquery/jquery-1.6.2.js';
$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'jquery/jquery.qtip-1.0.0-rc3.js';
if ($GLOBALS['cfg']['CodemirrorEnable']) {
$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
}
$params = array('lang' => $GLOBALS['lang']);
if (isset($GLOBALS['db'])) {
$params['db'] = $GLOBALS['db'];
}
$GLOBALS['js_include'][] = 'messages.php' . PMA_generate_common_url($params);
// Append the theme id to this url to invalidate the cache on a theme change
$GLOBALS['js_include'][] = 'get_image.js.php?theme='
. urlencode($_SESSION['PMA_Theme']->getId());
/**
* Here we add a timestamp when loading the file, so that users who
* upgrade phpMyAdmin are not stuck with older .js files in their
* browser cache. This produces an HTTP 304 request for each file.
*/
// avoid loading twice a js file
$GLOBALS['js_include'] = array_unique($GLOBALS['js_include']);
foreach ($GLOBALS['js_include'] as $js_script_file) {
$ie_conditional = false;
if (is_array($js_script_file)) {
list($js_script_file, $ie_conditional) = $js_script_file;
}
echo PMA_includeJS($js_script_file, $ie_conditional);
}
$title_to_set = isset($title)
? PMA_sanitize(PMA_escapeJsString($title), false, true)
: '';
// Below javascript Updates the title of the frameset if possible
?>
<script type="text/javascript">
// <![CDATA[
if (typeof(parent.document) != 'undefined' && typeof(parent.document) != 'unknown'
&& typeof(parent.document.title) == 'string') {
parent.document.title = '<?php echo $title_to_set; ?>';
}
<?php
if (count($GLOBALS['js_script']) > 0) {
echo implode("\n", $GLOBALS['js_script'])."\n";
}
foreach ($GLOBALS['js_events'] as $js_event) {
echo "$(window.parent).bind('" . $js_event['event'] . "', "
. $js_event['function'] . ");\n";
}
?>
// ]]>
</script>
<?php
// Reloads the navigation frame via JavaScript if required
echo PMA_getReloadNavigationScript();
?>

4
sql.php
View File

@ -907,7 +907,9 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
if (isset($printview) && $printview == '1') {
PMA_checkParameters(array('db', 'full_sql_query'));
include_once 'libraries/header_printview.inc.php';
$header = PMA_Header::getInstance();
$header->enablePrintView();
$header->display();
$hostname = '';
if ($cfg['Server']['verbose']) {

8
tbl_printview.php
View File

@ -11,12 +11,7 @@
*/
require_once 'libraries/common.inc.php';
/**
* Gets the variables sent or posted to this script, then displays headers
*/
if (! isset($selected_tbl)) {
include_once 'libraries/header_printview.inc.php';
}
PMA_Header::getInstance()->enablePrintView();
require 'libraries/tbl_common.inc.php';
@ -61,7 +56,6 @@ if (isset($selected_tbl) && is_array($selected_tbl)) {
$multi_tables = (count($the_tables) > 1);
if ($multi_tables) {
PMA_Header::getInstance()->display();
$tbl_list = '';
foreach ($the_tables as $key => $table) {
$tbl_list .= (empty($tbl_list) ? '' : ', ')