The branch, master has been updated
via 7f1b1df69f3ded0025d5df5cfcf720caf8644a8c (commit)
via bf8a597d78c7314523b388539113996e47a141a5 (commit)
from 0c7e5b3f758607f43ab563738559bc2cd96b5641 (commit)
- Log -----------------------------------------------------------------
commit 7f1b1df69f3ded0025d5df5cfcf720caf8644a8c
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon Aug 30 11:01:31 2010 +0200
[core] Remove last remaining parts of profiling code which was removed in 2006.
commit bf8a597d78c7314523b388539113996e47a141a5
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon Aug 30 10:54:17 2010 +0200
Remove dead code.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
Documentation.html | 24 --------------------
libraries/config.default.php | 23 --------------------
libraries/config/messages.inc.php | 1 -
libraries/config/setup.forms.php | 5 +--
libraries/config/user_preferences.forms.php | 5 +--
libraries/dbg/setup.php | 31 ---------------------------
libraries/footer.inc.php | 29 -------------------------
libraries/user_preferences.inc.php | 15 -------------
libraries/user_preferences.lib.php | 3 +-
10 files changed, 6 insertions(+), 131 deletions(-)
delete mode 100644 libraries/dbg/setup.php
diff --git a/ChangeLog b/ChangeLog
index 03197d8..944449a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,6 +111,7 @@ $Id$
- rfe #806035, #686260 [relations] Export relations to Dia, SVG and others
+ [interface] Added charts to status tab, profiling page and query results
+ [interface] AJAXification on various pages
+- [core] Remove last remaining parts of profiling code which was removed in 2006.
3.3.7.0 (not yet released)
- patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after
diff --git a/Documentation.html b/Documentation.html
index 2ee298b..5a31aed 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2274,30 +2274,6 @@ setfacl -d -m "g:www-data:rwx" tmp
Enable logging queries and execution times to be displayed in the bottom
of main page (right frame).</dd>
- <dt id="cfg_DBG_enable_php">$cfg['DBG']['php']
boolean</dt>
- <dd><b>DEVELOPERS ONLY!</b><br />
- Enable the DBG extension for debugging phpMyAdmin. Required for profiling
- the code.<br />
- For help in setting up your system to this, see the
- <a href="#developersdbg">Developers</a>
section.</dd>
-
- <dt
id="cfg_DBG_profile_enable">$cfg['DBG']['profile']['enable']
boolean</dt>
- <dd><b>DEVELOPERS ONLY!</b><br />
- Enable profiling support for phpMyAdmin. This will append a chunk of data
- to the end of every page displayed in the main window with profiling
- statistics for that page.<br />
- You may need to increase the maximum execution time for this to
- complete successfully.<i>Profiling was removed from the code for
- version 2.9.0 due to licensing issues.</i></dd>
-
- <dt
id="cfg_DBG_profile_threshold">$cfg['DBG']['profile']['threshold']
float (units in milliseconds)</dt>
- <dd><b>DEVELOPERS ONLY!</b><br />
- When profiling data is displayed, this variable controls the threshold of
- display for any profiling data, based on the average time each time has
- taken. If it is over the threshold it is displayed, otherwise it is not
- displayed. This takes a value in milliseconds. In most cases you don't need
- to edit this.</dd>
-
<dt id="cfg_ColumnTypes">$cfg['ColumnTypes']
array</dt>
<dd>All possible types of a MySQL column. In most cases you don't need to
edit this.</dd>
diff --git a/libraries/config.default.php b/libraries/config.default.php
index b637e58..466dc2c 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2653,29 +2653,6 @@ $cfg['DBG'] = array();
*/
$cfg['DBG']['sql'] = false;
-/**
- * Make the DBG stuff available
- * To use the following, please install the DBG extension from
http://dd.cron.ru/dbg/
- *
- * @global boolean $cfg['DBG']['php']
- */
-$cfg['DBG']['php'] = false;
-
-/**
- * Produce profiling results of PHP
- *
- * @global boolean $cfg['DBG']['profile']['enable']
- */
-$cfg['DBG']['profile']['enable'] = false;
-
-/**
- * Threshold of long running code to display
- * Anything below the threshold is not displayed
- *
- * @global float $cfg['DBG']['profile']['threshold']
- */
-$cfg['DBG']['profile']['threshold'] = 0.5;
-
/*******************************************************************************
* MySQL settings
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index a771ee6..33a4f31 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -40,7 +40,6 @@ $strConfigConfigurationFile = __('Configuration file');
$strConfigConfirm_desc = __('Whether a warning ("Are your really
sure...") should be displayed when you\'re about to lose data');
$strConfigConfirm_name = __('Confirm DROP queries');
$strConfigCtrlArrowsMoving_name = __('Field navigation using Ctrl+Arrows');
-$strConfigDBG_php_name = __('Debug PHP');
$strConfigDBG_sql_name = __('Debug SQL');
$strConfigDefaultDisplay_name = __('Default display direction');
$strConfigDefaultPropDisplay_desc = __('[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or
a number that indicates maximum number for which vertical model is used');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index ebaaf27..48d195a 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -118,8 +118,7 @@ $forms['Features']['Developer'] = array(
'UserprefsDeveloperTab',
'Error_Handler/display',
'Error_Handler/gather',
- 'DBG/sql',
- 'DBG/php');
+ 'DBG/sql');
$forms['Features']['Other_core_settings'] = array(
'NaturalOrder',
'InitialSlidersState',
@@ -370,4 +369,4 @@ $forms['Export']['Texy'] = array('Export'
=> array(
':group:' . __('Data'),
'texytext_null',
'texytext_columns'));
-?>
\ No newline at end of file
+?>
diff --git a/libraries/config/user_preferences.forms.php
b/libraries/config/user_preferences.forms.php
index 3f4814f..a82a351 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -51,8 +51,7 @@ $forms['Features']['Warnings'] = array(
$forms['Features']['Developer'] = array(
'Error_Handler/display',
'Error_Handler/gather',
- 'DBG/sql',
- 'DBG/php');
+ 'DBG/sql');
$forms['Sql_queries']['Sql_queries'] = array(
'ShowSQL',
'Confirm',
@@ -272,4 +271,4 @@ $forms['Export']['Texy'] = array(
':group:' . __('Data'),
'Export/texytext_null',
'Export/texytext_columns');
-?>
\ No newline at end of file
+?>
diff --git a/libraries/dbg/setup.php b/libraries/dbg/setup.php
deleted file mode 100644
index 7b80ce2..0000000
--- a/libraries/dbg/setup.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @package phpMyAdmin-DBG
- */
-if (! defined('PHPMYADMIN')) {
- exit;
-}
-
-/**
- * checks for DBG extension
- *
- * allways use $GLOBALS here, as this script is included by footer.inc.hp
- * which can also be included from inside a function
- */
-if ($GLOBALS['cfg']['DBG']['php']) {
- /**
- * Loads the DBG extension if needed
- */
- if (! @extension_loaded('dbg') ) {
- $message = PMA_Message::error(__('The %s extension is missing. Please check
your PHP configuration.'),
-
$message->addParam(sprintf('[a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a]',
'dbg'));
- $message->addMessage('<a href="./Documentation.html#faqdbg"
target="documentation">', false);
- $message->addString(__('Documentation'));
- $message->addMessage('</a>', false);
- $message->display();
- } else {
- $GLOBALS['DBG'] = true;
- }
-}
-?>
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index 7e01216..f5e6e98 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -29,8 +29,6 @@
* @uses $GLOBALS['userlink'] to close it
* @uses $cfg['Server']['user']
* @uses $cfg['NavigationBarIconic']
- * @uses $cfg['DBG']['enable']
- * @uses $cfg['DBG']['profile']['enable']
* @uses $cfg['MaxCharactersInDisplayedSQL']
* @uses PMA_isValid()
* @uses PMA_setHistory()
@@ -186,14 +184,6 @@ setURLHash("<?php echo PMA_generate_common_url($url_params,
'text', ''); ?>");
echo '<a href="index.php' . PMA_generate_common_url($url_params) .
'"'
. ' title="' . __('Open new phpMyAdmin window') .
'" target="_blank">';
- /*
- echo '<a href="index.php?target=' .
basename(PMA_getenv('SCRIPT_NAME'));
- $url = PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']);
- if (!empty($url)) {
- echo '&' . $url;
- }
- echo '" target="_blank">';
- */
if ($GLOBALS['cfg']['NavigationBarIconic']) {
echo '<img class="icon" src="'.
$GLOBALS['pmaThemeImage'] . 'window-new.png"'
. ' alt="' . __('Open new phpMyAdmin window') .
'" />';
@@ -210,25 +200,6 @@ if (! $GLOBALS['is_ajax_request'] &&
file_exists(CUSTOM_FOOTER_FILE)) {
require CUSTOM_FOOTER_FILE;
}
-
-/**
- * Generates profiling data if requested
- */
-
-// profiling deactivated due to licensing issues
-if (! empty($GLOBALS['cfg']['DBG']['php'])
- && !
empty($GLOBALS['cfg']['DBG']['profile']['enable'])) {
- //run the basic setup code first
- require_once './libraries/dbg/setup.php';
- //if the setup ran fine, then do the profiling
- /*
- if (! empty($GLOBALS['DBG'])) {
- require_once './libraries/dbg/profiling.php';
- dbg_dump_profiling_results();
- }
- */
-}
-
/**
* If we are in an AJAX request, we do not need to generate the closing tags for
* body and html.
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index b86e4a1..e173d55 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -48,21 +48,6 @@ if (!empty($_GET['saved'])) {
$message->display();
}
-// debug info
-if ($cfg['DBG']['php']) {
- $arr = ConfigFile::getInstance()->getConfigArray();
- $arr2 = array();
- foreach ($arr as $k => $v) {
- $arr2[] = "<b>$k</b> " . var_export($v, true);
- }
- $arr2 = implode(', ', $arr2);
- $arr2 .= '<br />Blacklist: ' .
(empty($cfg['UserprefsDisallow'])
- ? '<i>empty</i>'
- : implode(', ', $cfg['UserprefsDisallow']));
- $msg = PMA_Message::notice('Settings: ' . $arr2);
- $msg->display();
-}
-
// warn about using session storage for settings
$cfgRelation = PMA_getRelationsParam();
if (!$cfgRelation['userconfigwork']) {
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index c513a19..bf84b25 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -164,7 +164,6 @@ function PMA_apply_userprefs(array $config_data)
$blacklist['Error_Handler/display'] = true;
$blacklist['Error_Handler/gather'] = true;
$blacklist['DBG/sql'] = true;
- $blacklist['DBG/php'] = true;
}
$whitelist = array_flip(PMA_read_userprefs_fieldnames());
// whitelist some additional fields which are custom handled
@@ -313,4 +312,4 @@ function PMA_userprefs_autoload_header()
</div>
<?php
}
-?>
\ No newline at end of file
+?>
hooks/post-receive
--
phpMyAdmin