Skip to content

Commit 4a74037

Browse files
roccivicroccivic
committed
Dropped header.inc.php in favor of the PMA_Header class
1 parent 97449da commit 4a74037

63 files changed

Lines changed: 210 additions & 361 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎chk_rel.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Gets some core libraries
1111
*/
1212
require_once 'libraries/common.inc.php';
13-
require_once 'libraries/header.inc.php';
13+
PMA_Header::getInstance()->display();
1414

1515

1616
/**

‎db_create.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* Gets some core libraries
1010
*/
1111
require_once 'libraries/common.inc.php';
12-
$GLOBALS['js_include'][] = 'functions.js';
1312

1413
require_once 'libraries/mysql_charsets.lib.php';
1514
if (! PMA_DRIZZLE) {
@@ -67,8 +66,6 @@
6766
if ($GLOBALS['is_ajax_request'] == true) {
6867
PMA_ajaxResponse($message, false);
6968
}
70-
71-
include_once 'libraries/header.inc.php';
7269
include_once 'main.php';
7370
} else {
7471
$message = PMA_Message::success(__('Database %1$s has been created.'));
@@ -145,7 +142,6 @@
145142
PMA_ajaxResponse($message, true, $extra_data);
146143
}
147144

148-
include_once 'libraries/header.inc.php';
149145
include_once '' . $cfg['DefaultTabDatabase'];
150146
}
151147
?>

‎db_events.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
/**
1616
* Include JavaScript libraries
1717
*/
18-
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
19-
$GLOBALS['js_include'][] = 'rte/common.js';
20-
$GLOBALS['js_include'][] = 'rte/events.js';
18+
$scripts = PMA_Header::getInstance()->getScripts();
19+
$scripts->addFile('jquery/timepicker.js');
20+
$scripts->addFile('rte/common.js');
21+
$scripts->addFile('rte/events.js');
2122

2223
/**
2324
* Include all other files

‎db_export.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
*/
1212
require_once 'libraries/common.inc.php';
1313

14-
$GLOBALS['js_include'][] = 'export.js';
14+
$scripts = PMA_Header::getInstance()->getScripts();
15+
$scripts->addFile('export.js');
1516

1617
// $sub_part is also used in db_info.inc.php to see if we are coming from
1718
// db_export.php, in which case we don't obey $cfg['MaxTableList']

‎db_import.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
*/
1111
require_once 'libraries/common.inc.php';
1212

13-
$GLOBALS['js_include'][] = 'import.js';
13+
$scripts = PMA_Header::getInstance()->getScripts();
14+
$scripts->addFile('import.js');
1415

1516
/**
1617
* Gets tables informations and displays top links

‎db_operations.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
require_once 'libraries/mysql_charsets.lib.php';
2020

2121
// add a javascript file for jQuery functions to handle Ajax actions
22-
$GLOBALS['js_include'][] = 'db_operations.js';
22+
$scripts = PMA_Header::getInstance()->getScripts();
23+
$scripts->addFile('db_operations.js');
2324

2425
/**
2526
* Sets globals from $_REQUEST (we're using GET on ajax, POST otherwise)

‎db_routines.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
/**
1717
* Include JavaScript libraries
1818
*/
19-
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
20-
$GLOBALS['js_include'][] = 'rte/common.js';
21-
$GLOBALS['js_include'][] = 'rte/routines.js';
19+
$scripts = PMA_Header::getInstance()->getScripts();
20+
$scripts->addFile('jquery/timepicker.js');
21+
$scripts->addFile('rte/common.js');
22+
$scripts->addFile('rte/routines.js');
2223

2324
/**
2425
* Include all other files

‎db_search.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
*/
1414
require_once 'libraries/common.inc.php';
1515

16-
$GLOBALS['js_include'][] = 'db_search.js';
17-
$GLOBALS['js_include'][] = 'sql.js';
18-
$GLOBALS['js_include'][] = 'makegrid.js';
19-
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
16+
$scripts = PMA_Header::getInstance()->getScripts();
17+
$scripts->addFile('db_search.js');
18+
$scripts->addFile('sql.js');
19+
$scripts->addFile('makegrid.js');
20+
$scripts->addFile('jquery/timepicker.js');
2021

2122
/**
2223
* Gets some core libraries and send headers

‎db_sql.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
/**
1414
* Runs common work
1515
*/
16-
$GLOBALS['js_include'][] = 'functions.js';
17-
$GLOBALS['js_include'][] = 'makegrid.js';
18-
$GLOBALS['js_include'][] = 'sql.js';
16+
$scripts = PMA_Header::getInstance()->getScripts();
17+
$scripts->addFile('functions.js');
18+
$scripts->addFile('makegrid.js');
19+
$scripts->addFile('sql.js');
1920

2021
require 'libraries/db_common.inc.php';
2122
require_once 'libraries/sql_query_form.lib.php';

‎db_structure.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
*/
1111
require_once 'libraries/common.inc.php';
1212

13-
$GLOBALS['js_include'][] = 'db_structure.js';
14-
$GLOBALS['js_include'][] = 'tbl_change.js';
15-
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
13+
$scripts = PMA_Header::getInstance()->getScripts();
14+
$scripts->addFile('db_structure.js');
15+
$scripts->addFile('tbl_change.js');
16+
$scripts->addFile('jquery/timepicker.js');
1617

1718
/**
1819
* Sets globals from $_POST

0 commit comments

Comments
 (0)