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

functions.js included automatically

Browse Source
This commit is contained in:
Marc Delisle
2010-07-24 08:11:48 -04:00
parent aec1adb0e0
commit 084c0dbcf5
23 changed files with 1 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
chk_rel.php
View File

@@ -9,7 +9,6 @@
* Gets some core libraries * Gets some core libraries
*/ */
require_once './libraries/common.inc.php'; require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';
require_once './libraries/relation.lib.php'; require_once './libraries/relation.lib.php';

1
db_create.php
View File

@@ -9,7 +9,6 @@
* Gets some core libraries * Gets some core libraries
*/ */
require_once './libraries/common.inc.php'; require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/mysql_charsets.lib.php'; require_once './libraries/mysql_charsets.lib.php';
PMA_checkParameters(array('new_db')); PMA_checkParameters(array('new_db'));

5
export.php
View File

@@ -59,7 +59,6 @@ if (empty($_REQUEST['asfile'])) {
// Does export require to be into file? // Does export require to be into file?
if (isset($export_list[$type]['force_file']) && ! $asfile) { if (isset($export_list[$type]['force_file']) && ! $asfile) {
$message = PMA_Message::error(__('Selected export type has to be saved in file!')); $message = PMA_Message::error(__('Selected export type has to be saved in file!'));
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';
if ($export_type == 'server') { if ($export_type == 'server') {
$active_page = 'server_export.php'; $active_page = 'server_export.php';
@@ -298,7 +297,6 @@ if ($save_on_server) {
} }
} }
if (isset($message)) { if (isset($message)) {
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';
if ($export_type == 'server') { if ($export_type == 'server') {
$active_page = 'server_export.php'; $active_page = 'server_export.php';
@@ -350,7 +348,6 @@ if (!$save_on_server) {
$num_tables = count($tables); $num_tables = count($tables);
if ($num_tables == 0) { if ($num_tables == 0) {
$message = PMA_Message::error(__('No tables found in database.')); $message = PMA_Message::error(__('No tables found in database.'));
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';
$active_page = 'db_export.php'; $active_page = 'db_export.php';
require './db_export.php'; require './db_export.php';
@@ -565,7 +562,6 @@ if (!PMA_exportFooter()) {
// End of fake loop // End of fake loop
if ($save_on_server && isset($message)) { if ($save_on_server && isset($message)) {
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';
if ($export_type == 'server') { if ($export_type == 'server') {
$active_page = 'server_export.php'; $active_page = 'server_export.php';
@@ -622,7 +618,6 @@ if (!empty($asfile)) {
$message = new PMA_Message(__('Dump has been saved to file %s.'), PMA_Message::SUCCESS, $save_filename); $message = new PMA_Message(__('Dump has been saved to file %s.'), PMA_Message::SUCCESS, $save_filename);
} }
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';
if ($export_type == 'server') { if ($export_type == 'server') {
$active_page = 'server_export.php'; $active_page = 'server_export.php';

1
import.php
View File

@@ -12,7 +12,6 @@
*/ */
require_once './libraries/common.inc.php'; require_once './libraries/common.inc.php';
//require_once './libraries/display_import_functions.lib.php'; //require_once './libraries/display_import_functions.lib.php';
$GLOBALS['js_include'][] = 'functions.js';
// reset import messages for ajax request // reset import messages for ajax request
$_SESSION['Import_message']['message'] = null; $_SESSION['Import_message']['message'] = null;

1
libraries/db_common.inc.php
View File

@@ -65,7 +65,6 @@ if (isset($submitcollation) && !empty($db_collation)) {
unset($db_charset, $db_collation); unset($db_charset, $db_collation);
} }
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';
/** /**

1
libraries/header_scripts.inc.php
View File

@@ -30,6 +30,7 @@ $title = PMA_expandUserString(
// here, the function does not exist with this configuration: $cfg['ServerDefault'] = 0; // here, the function does not exist with this configuration: $cfg['ServerDefault'] = 0;
$is_superuser = function_exists('PMA_isSuperuser') && PMA_isSuperuser(); $is_superuser = function_exists('PMA_isSuperuser') && PMA_isSuperuser();
$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'tooltip.js'; $GLOBALS['js_include'][] = 'tooltip.js';
$params = array('lang' => $GLOBALS['lang']); $params = array('lang' => $GLOBALS['lang']);
if (isset($GLOBALS['db'])) { if (isset($GLOBALS['db'])) {

1
libraries/mult_submits.inc.php
View File

@@ -127,7 +127,6 @@ if (! empty($submit_mult)
* Displays the confirmation form if required * Displays the confirmation form if required
*/ */
if (!empty($submit_mult) && !empty($what)) { if (!empty($submit_mult) && !empty($what)) {
$GLOBALS['js_include'][] = 'functions.js';
unset($message); unset($message);
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';

1
libraries/tbl_links.inc.php
View File

@@ -37,7 +37,6 @@ $err_url = $cfg['DefaultTabTable'] . PMA_generate_common_url($url_params);
/** /**
* Displays headers * Displays headers
*/ */
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';
/** /**

1
querywindow.php
View File

@@ -155,7 +155,6 @@ $sql_query = '';
* prepare JavaScript functionality * prepare JavaScript functionality
*/ */
$js_include[] = 'common.js'; $js_include[] = 'common.js';
$js_include[] = 'functions.js';
$js_include[] = 'querywindow.js'; $js_include[] = 'querywindow.js';
if (PMA_isValid($_REQUEST['auto_commit'], 'identical', 'true')) { if (PMA_isValid($_REQUEST['auto_commit'], 'identical', 'true')) {

2
server_databases.php
View File

@@ -10,8 +10,6 @@
*/ */
require_once './libraries/common.inc.php'; require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'functions.js';
require './libraries/server_common.inc.php'; require './libraries/server_common.inc.php';
require './libraries/replication.inc.php'; require './libraries/replication.inc.php';

2
server_export.php
View File

@@ -10,8 +10,6 @@
*/ */
require_once './libraries/common.inc.php'; require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'functions.js';
/** /**
* Displays the links * Displays the links
*/ */

1
server_privileges.php
View File

@@ -14,7 +14,6 @@ require_once './libraries/common.inc.php';
* Does the common work * Does the common work
*/ */
$GLOBALS['js_include'][] = 'server_privileges.js'; $GLOBALS['js_include'][] = 'server_privileges.js';
$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'password_generation.js'; $GLOBALS['js_include'][] = 'password_generation.js';
require './libraries/server_common.inc.php'; require './libraries/server_common.inc.php';

1
server_replication.php
View File

@@ -14,7 +14,6 @@ require_once './libraries/common.inc.php';
* Does the common work * Does the common work
*/ */
$GLOBALS['js_include'][] = 'server_privileges.js'; $GLOBALS['js_include'][] = 'server_privileges.js';
$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'replication.js'; $GLOBALS['js_include'][] = 'replication.js';
require './libraries/server_common.inc.php'; require './libraries/server_common.inc.php';

1
server_sql.php
View File

@@ -13,7 +13,6 @@ require_once './libraries/common.inc.php';
/** /**
* Does the common work * Does the common work
*/ */
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/server_common.inc.php'; require_once './libraries/server_common.inc.php';
require_once './libraries/sql_query_form.lib.php'; require_once './libraries/sql_query_form.lib.php';

1
server_synchronize.php
View File

@@ -14,7 +14,6 @@ require_once './libraries/common.inc.php';
/** /**
* Does the common work * Does the common work
*/ */
$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'server_synchronize.js'; $GLOBALS['js_include'][] = 'server_synchronize.js';
require_once './libraries/server_common.inc.php'; require_once './libraries/server_common.inc.php';

5
sql.php
View File

@@ -545,10 +545,6 @@ if (0 == $num_rows || $is_affected) {
$goto = 'main.php'; $goto = 'main.php';
} }
// Loads to target script // Loads to target script
if (strpos($goto, 'db_') === 0
|| strpos($goto, 'tbl_') === 0) {
$GLOBALS['js_include'][] = 'functions.js';
}
if ($goto != 'main.php') { if ($goto != 'main.php') {
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';
} }
@@ -573,7 +569,6 @@ else {
if (isset($printview) && $printview == '1') { if (isset($printview) && $printview == '1') {
require_once './libraries/header_printview.inc.php'; require_once './libraries/header_printview.inc.php';
} else { } else {
$GLOBALS['js_include'][] = 'functions.js';
unset($message); unset($message);
if (strlen($table)) { if (strlen($table)) {
require './libraries/tbl_common.php'; require './libraries/tbl_common.php';

1
tbl_addfield.php
View File

@@ -11,7 +11,6 @@
require_once './libraries/common.inc.php'; require_once './libraries/common.inc.php';
require_once './libraries/Table.class.php'; require_once './libraries/Table.class.php';
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';
// Check parameters // Check parameters

1
tbl_alter.php
View File

@@ -15,7 +15,6 @@
require_once './libraries/common.inc.php'; require_once './libraries/common.inc.php';
require_once './libraries/Table.class.php'; require_once './libraries/Table.class.php';
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';
// Check parameters // Check parameters

1
tbl_create.php
View File

@@ -36,7 +36,6 @@
require_once './libraries/common.inc.php'; require_once './libraries/common.inc.php';
require_once './libraries/Table.class.php'; require_once './libraries/Table.class.php';
$GLOBALS['js_include'][] = 'functions.js';
$action = 'tbl_create.php'; $action = 'tbl_create.php';
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';

1
tbl_indexes.php
View File

@@ -111,7 +111,6 @@ if (isset($_REQUEST['do_save_data'])) {
*/ */
// Displays headers (if needed) // Displays headers (if needed)
$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'indexes.js'; $GLOBALS['js_include'][] = 'indexes.js';
require_once './libraries/tbl_info.inc.php'; require_once './libraries/tbl_info.inc.php';

2
tbl_replace.php
View File

@@ -328,7 +328,6 @@ if ($is_insert && count($value_sets) > 0) {
} elseif (empty($query)) { } elseif (empty($query)) {
// No change -> move back to the calling script // No change -> move back to the calling script
$message = PMA_Message::success(__('No change')); $message = PMA_Message::success(__('No change'));
$GLOBALS['js_include'][] = 'functions.js';
$active_page = $goto_include; $active_page = $goto_include;
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';
require './' . PMA_securePath($goto_include); require './' . PMA_securePath($goto_include);
@@ -428,7 +427,6 @@ if (isset($return_to_sql_query)) {
} }
$GLOBALS['js_include'][] = 'tbl_change.js'; $GLOBALS['js_include'][] = 'tbl_change.js';
$GLOBALS['js_include'][] = 'functions.js';
// in case we call sql.php which needs those: // in case we call sql.php which needs those:
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';

1
tbl_row_action.php
View File

@@ -71,7 +71,6 @@ switch($submit_mult) {
} }
$GLOBALS['js_include'][] = 'tbl_change.js'; $GLOBALS['js_include'][] = 'tbl_change.js';
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/header.inc.php'; require_once './libraries/header.inc.php';

1
tbl_tracking.php
View File

@@ -233,7 +233,6 @@ if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldump')
$table_temp = $table; $table_temp = $table;
$db = $table = ''; $db = $table = '';
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/sql_query_form.lib.php'; require_once './libraries/sql_query_form.lib.php';
PMA_sqlQueryForm($new_query, 'sql'); PMA_sqlQueryForm($new_query, 'sql');