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

E_ALL fixes

Browse Source
This commit is contained in:
Rouslan 2011-05-21 19:33:42 +01:00
parent e80c65a88a
commit 0c6cceef13
6 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db_events.php
View File

@ -10,6 +10,7 @@ $GLOBALS['js_include'][] = 'db_events.js';
require_once './libraries/common.lib.php';
require_once './libraries/db_common.inc.php';
require_once './libraries/db_info.inc.php';
/**
* Create labels for the list

1
db_routines.php
View File

@ -10,6 +10,7 @@ $GLOBALS['js_include'][] = 'db_routines.js';
require_once './libraries/common.lib.php';
require_once './libraries/db_common.inc.php';
require_once './libraries/db_info.inc.php';
/**
* Create labels for the list

1
db_triggers.php
View File

@ -10,6 +10,7 @@ $GLOBALS['js_include'][] = 'display_triggers.js';
require_once './libraries/common.lib.php';
require_once './libraries/db_common.inc.php';
require_once './libraries/db_info.inc.php';
/**
* Create labels for the list

17
libraries/db_events.inc.php
View File

@ -10,6 +10,15 @@ if (! defined('PHPMYADMIN')) {
$events = PMA_DBI_fetch_result('SELECT EVENT_NAME, EVENT_TYPE FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';');
$conditional_class_add = '';
$conditional_class_drop = '';
$conditional_class_export = '';
if ($GLOBALS['cfg']['AjaxEnable']) {
$conditional_class_add = 'class="add_event_anchor"';
$conditional_class_drop = 'class="drop_event_anchor"';
$conditional_class_export = 'class="export_event_anchor"';
}
echo '<fieldset>' . "\n";
echo ' <legend>' . __('Events') . '</legend>' . "\n";
if (! $events) {
@ -28,14 +37,6 @@ if (! $events) {
__('Type'));
$ct=0;
$delimiter = '//';
$conditional_class_add = '';
$conditional_class_drop = '';
$conditional_class_export = '';
if ($GLOBALS['cfg']['AjaxEnable']) {
$conditional_class_add = 'class="add_event_anchor"';
$conditional_class_drop = 'class="drop_event_anchor"';
$conditional_class_export = 'class="export_event_anchor"';
}
foreach ($events as $event) {
// information_schema (at least in MySQL 5.1.22) does not return

17
libraries/db_routines.inc.php
View File

@ -22,6 +22,15 @@ if (! defined('PHPMYADMIN')) {
$routines = PMA_DBI_fetch_result('SELECT SPECIFIC_NAME,ROUTINE_NAME,ROUTINE_TYPE,DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';');
$conditional_class_add = '';
$conditional_class_drop = '';
$conditional_class_export = '';
if ($GLOBALS['cfg']['AjaxEnable']) {
$conditional_class_add = 'class="add_routine_anchor"';
$conditional_class_drop = 'class="drop_procedure_anchor"';
$conditional_class_export = 'class="export_procedure_anchor"';
}
echo '<fieldset>' . "\n";
echo ' <legend>' . __('Routines') . '</legend>' . "\n";
@ -44,14 +53,6 @@ if (! $routines) {
__('Return type'));
$ct=0;
$delimiter = '//';
$conditional_class_add = '';
$conditional_class_drop = '';
$conditional_class_export = '';
if ($GLOBALS['cfg']['AjaxEnable']) {
$conditional_class_add = 'class="add_routine_anchor"';
$conditional_class_drop = 'class="drop_procedure_anchor"';
$conditional_class_export = 'class="export_procedure_anchor"';
}
foreach ($routines as $routine) {
// information_schema (at least in MySQL 5.0.45)

17
libraries/display_triggers.inc.php
View File

@ -12,6 +12,15 @@ $url_query .= '&amp;goto=tbl_triggers.php';
$triggers = PMA_DBI_get_triggers($db, $table);
$conditional_class_add = '';
$conditional_class_drop = '';
$conditional_class_export = '';
if ($GLOBALS['cfg']['AjaxEnable']) {
$conditional_class_add = 'class="add_trigger_anchor"';
$conditional_class_drop = 'class="drop_trigger_anchor"';
$conditional_class_export = 'class="export_trigger_anchor"';
}
echo '<fieldset>' . "\n";
echo ' <legend>' . __('Triggers') . '</legend>' . "\n";
if (! $triggers) {
@ -36,14 +45,6 @@ if (! $triggers) {
$ct=0;
$delimiter = '//';
$conditional_class_add = '';
$conditional_class_drop = '';
$conditional_class_export = '';
if ($GLOBALS['cfg']['AjaxEnable']) {
$conditional_class_add = 'class="add_trigger_anchor"';
$conditional_class_drop = 'class="drop_trigger_anchor"';
$conditional_class_export = 'class="export_trigger_anchor"';
}
// Print table contents
foreach ($triggers as $trigger) {
$drop_and_create = $trigger['drop'] . $delimiter . "\n" . $trigger['create'] . "\n";