- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11010-g167d103
by Madhura Jayaratne 21 Jul '11

21 Jul '11

The branch, master has been updated via 167d10385d610ec235d791d9b76da7bfdb008363 (commit) via 58b48a3d4555d0469ee6fed361a9cf8820fb8c9d (commit) from 75bb94f923ab454fe0db509996793d0164c5e103 (commit) - Log ----------------------------------------------------------------- commit 167d10385d610ec235d791d9b76da7bfdb008363 Merge: 75bb94f923ab454fe0db509996793d0164c5e103 58b48a3d4555d0469ee6fed361a9cf8820fb8c9d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jul 21 08:59:35 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/header.inc.php | 5 ++--- sql.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d438c06..94861f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ phpMyAdmin - ChangeLog - remove version number in /setup - bug #3367993 [usability] Missing "Generate Password" button - bug #3363221 [display] Missing Server Parameter on inline sql query +- bug #3367986 [navi] Drop field -> lost active table 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 80763e7..270b421 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -138,10 +138,9 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { htmlspecialchars($GLOBALS['db']), __('Database'), 's_db.png'); - // if the table is being dropped, $_REQUEST['purge'] is set - // (it always contains "1") + // if the table is being dropped, $_REQUEST['purge'] is set to '1' // so do not display the table name in upper div - if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) { + if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1')) { require_once './libraries/tbl_info.inc.php'; echo $separator; diff --git a/sql.php b/sql.php index 543c115..6d705fc 100644 --- a/sql.php +++ b/sql.php @@ -821,7 +821,7 @@ if (0 == $num_rows || $is_affected) { $goto = PMA_securePath($goto); // Checks for a valid target script $is_db = $is_table = false; - if (isset($_REQUEST['purge'])) { + if (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1') { $table = ''; unset($url_params['table']); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-34-g58b48a3
by Madhura Jayaratne 21 Jul '11

21 Jul '11

The branch, QA_3_4 has been updated via 58b48a3d4555d0469ee6fed361a9cf8820fb8c9d (commit) from 9eba5726bd809ab874fc29360ac6ff351d86335b (commit) - Log ----------------------------------------------------------------- commit 58b48a3d4555d0469ee6fed361a9cf8820fb8c9d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jul 21 08:55:57 2011 +0530 bug #3367986 [navi] Drop field -> lost active table ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/header.inc.php | 5 ++--- sql.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d3e081a..95bb4fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog - remove version number in /setup - bug #3367993 [usability] Missing "Generate Password" button - bug #3363221 [display] Missing Server Parameter on inline sql query +- bug #3367986 [navi] Drop field -> lost active table 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/libraries/header.inc.php b/libraries/header.inc.php index a23d2fa..9cc2785 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -124,10 +124,9 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { htmlspecialchars($GLOBALS['db']), __('Database'), 's_db.png'); - // if the table is being dropped, $_REQUEST['purge'] is set - // (it always contains "1") + // if the table is being dropped, $_REQUEST['purge'] is set to '1' // so do not display the table name in upper div - if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) { + if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1')) { require_once './libraries/tbl_info.inc.php'; echo $separator; diff --git a/sql.php b/sql.php index 9b19174..10e472a 100644 --- a/sql.php +++ b/sql.php @@ -760,7 +760,7 @@ if (0 == $num_rows || $is_affected) { $goto = PMA_securePath($goto); // Checks for a valid target script $is_db = $is_table = false; - if (isset($_REQUEST['purge'])) { + if (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1') { $table = ''; unset($url_params['table']); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11008-g75bb94f
by Piotr Przybylski 20 Jul '11

20 Jul '11

The branch, master has been updated via 75bb94f923ab454fe0db509996793d0164c5e103 (commit) from e386d589864d3ca346653429caddf24502526dc8 (commit) - Log ----------------------------------------------------------------- commit 75bb94f923ab454fe0db509996793d0164c5e103 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 20 18:52:28 2011 +0200 Fix strings ----------------------------------------------------------------------- Summary of changes: js/messages.php | 2 +- server_status.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/messages.php b/js/messages.php index 1345a8e..5b91d79 100644 --- a/js/messages.php +++ b/js/messages.php @@ -128,7 +128,7 @@ $js_messages['strEnableVar'] = __('Enable %s'); $js_messages['strDisableVar'] = __('Disable %s'); /* l10n: %d seconds */ $js_messages['setSetLongQueryTime'] = __('Set long_query_time to %ds'); -$js_messages['strNoSuperUser'] = __('You don\'t have super user rights to change this variables. Please log in as root account or contact your database administrator.'); +$js_messages['strNoSuperUser'] = __('You can\'t change these variables. Please log in as root or contact your database administrator.'); $js_messages['strChangeSettings'] = __('Change settings'); $js_messages['strCurrentSettings'] = __('Current settings'); diff --git a/server_status.php b/server_status.php index 2bdae64..a16896b 100644 --- a/server_status.php +++ b/server_status.php @@ -1332,7 +1332,7 @@ function printMonitor() { <div id="monitorInstructionsDialog" title="<?php echo __('Monitor Instructions'); ?>" style="display:none;"> <?php echo __('The phpMyAdmin Monitor can assist you in optimizing the server configuration and track down time intensive - queries. For the latter you will need to log_output set to \'TABLE\' and have either the slow_query_log or general_log enabled.'); ?> + queries. For the latter you will need to set log_output to \'TABLE\' and have either the slow_query_log or general_log enabled.'); ?> <p></p> <img class="ajaxIcon" src="<?php echo $GLOBALS['pmaThemeImage']; ?>ajax_clock_small.gif" alt="Loading"> <div class="ajaxContent"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11007-ge386d58
by Piotr Przybylski 20 Jul '11

20 Jul '11

The branch, master has been updated via e386d589864d3ca346653429caddf24502526dc8 (commit) from 23c5e3282fb1ce89ec6cdb5004c6f36aedcda2bc (commit) - Log ----------------------------------------------------------------- commit e386d589864d3ca346653429caddf24502526dc8 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 20 18:42:50 2011 +0200 $server_db_isLocal - account for IPv6 loopback address Only the most common form ('::1') is recognized ----------------------------------------------------------------------- Summary of changes: server_status.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server_status.php b/server_status.php index 28d6858..2bdae64 100644 --- a/server_status.php +++ b/server_status.php @@ -557,7 +557,8 @@ $server = 1; if(isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']); $server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost' - || $cfg['Servers'][$server]['host'] == '127.0.0.1'; + || $cfg['Servers'][$server]['host'] == '127.0.0.1' + || $cfg['Servers'][$server]['host'] == '::1'; ?> <script type="text/javascript"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11006-g23c5e32
by Piotr Przybylski 20 Jul '11

20 Jul '11

The branch, master has been updated via 23c5e3282fb1ce89ec6cdb5004c6f36aedcda2bc (commit) from 4ee15be98627dcc5e7de721a9fe69d3aabeefd41 (commit) - Log ----------------------------------------------------------------- commit 23c5e3282fb1ce89ec6cdb5004c6f36aedcda2bc Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 20 18:38:37 2011 +0200 Code formatting ----------------------------------------------------------------------- Summary of changes: server_status.php | 135 +++++++++++++++++++++++++++++------------------------ 1 files changed, 74 insertions(+), 61 deletions(-) diff --git a/server_status.php b/server_status.php index 004a536..28d6858 100644 --- a/server_status.php +++ b/server_status.php @@ -44,16 +44,18 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { header('Content-Type: text/html; charset=UTF-8'); if (isset($_REQUEST['logging_vars'])) { - if(isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) { + if (isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) { $value = PMA_sqlAddslashes($_REQUEST['varValue']); - if(!is_numeric($value)) $value="'".$value."'"; + if (!is_numeric($value)) $value="'".$value."'"; - if(! preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName'])) - PMA_DBI_query('SET GLOBAL '.$_REQUEST['varName'].' = '.$value); + if (!preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName'])) + PMA_DBI_query('SET GLOBAL ' . $_REQUEST['varName'] . ' = '.$value); } - $loggingVars = PMA_DBI_fetch_result('SHOW GLOBAL VARIABLES WHERE Variable_name IN ("general_log","slow_query_log","long_query_time","log_output")', 0, 1); + $loggingVars = PMA_DBI_fetch_result( + "SHOW GLOBAL VARIABLES WHERE Variable_name IN ( + 'general_log', 'slow_query_log', 'long_query_time', 'log_output')", 0, 1); exit(json_encode($loggingVars)); } @@ -61,7 +63,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { if (isset($_REQUEST['chart_data'])) { switch($_REQUEST['type']) { case 'proc': - $c = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name="Connections"', 0, 1); + $c = PMA_DBI_fetch_result("SHOW GLOBAL STATUS WHERE Variable_name = 'Connections'", 0, 1); $result = PMA_DBI_query('SHOW PROCESSLIST'); $num_procs = PMA_DBI_num_rows($result); @@ -74,7 +76,10 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($ret)); case 'queries': - $queries = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name LIKE "Com_%" OR Variable_name="Questions" AND Value>0', 0, 1); + $queries = PMA_DBI_fetch_result( + "SHOW GLOBAL STATUS + WHERE (Variable_name LIKE 'Com_%' OR Variable_name = 'Questions') + AND Value > 0'", 0, 1); cleanDeprecated($queries); // admin commands are not queries unset($queries['Com_admin_commands']); @@ -91,7 +96,10 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($ret)); case 'traffic': - $traffic = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name="Bytes_received" OR Variable_name="Bytes_sent"', 0, 1); + $traffic = PMA_DBI_fetch_result( + "SHOW GLOBAL STATUS + WHERE Variable_name = 'Bytes_received' + OR Variable_name = 'Bytes_sent'", 0, 1); $ret = array( 'x' => microtime(true)*1000, @@ -102,16 +110,16 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($ret)); case 'chartgrid': - $ret = json_decode($_REQUEST['requiredData'],true); - $statusVars = Array(); + $ret = json_decode($_REQUEST['requiredData'], true); + $statusVars = array(); $sysinfo = $cpuload = $memory = 0; - foreach($ret as $chart_id=>$chartNodes) { - foreach($chartNodes as $node_id=>$node) { - switch($node['dataType']) { + foreach ($ret as $chart_id => $chartNodes) { + foreach ($chartNodes as $node_id => $node) { + switch ($node['dataType']) { case 'statusvar': // Some white list filtering - if(! preg_match('/[^a-zA-Z_]+/',$node['name'])) + if (!preg_match('/[^a-zA-Z_]+/',$node['name'])) $statusVars[] = $node['name']; break; @@ -121,14 +129,14 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { break; case 'cpu': - if(! $sysinfo) { + if (!$sysinfo) { require_once('libraries/sysinfo.lib.php'); $sysinfo = getSysInfo(); } - if(! $cpuload) + if (!$cpuload) $cpuload = $sysinfo->loadavg(); - if(PHP_OS == 'Linux') { + if (PHP_OS == 'Linux') { $ret[$chart_id][$node_id]['idle'] = $cpuload['idle']; $ret[$chart_id][$node_id]['busy'] = $cpuload['busy']; } else @@ -137,11 +145,11 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { break; case 'memory': - if(! $sysinfo) { + if (!$sysinfo) { require_once('libraries/sysinfo.lib.php'); $sysinfo = getSysInfo(); } - if(! $memory) + if (!$memory) $memory = $sysinfo->memory(); $ret[$chart_id][$node_id]['y'] = $memory[$node['name']]; @@ -150,11 +158,13 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } } - $vars = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name="' . implode('" OR Variable_name="',$statusVars) . '"', 0, 1); + $vars = PMA_DBI_fetch_result( + "SHOW GLOBAL STATUS + WHERE Variable_name='" . implode("' OR Variable_name='", $statusVars) . "'", 0, 1); - foreach($ret as $chart_id=>$chartNodes) { - foreach($chartNodes as $node_id=>$node) { - if($node['dataType'] == 'statusvar') + foreach ($ret as $chart_id => $chartNodes) { + foreach ($chartNodes as $node_id => $node) { + if ($node['dataType'] == 'statusvar') $ret[$chart_id][$node_id]['y'] = $vars[$node['name']]; } } @@ -165,11 +175,11 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } } - if(isset($_REQUEST['log_data'])) { + if (isset($_REQUEST['log_data'])) { $start = intval($_REQUEST['time_start']); $end = intval($_REQUEST['time_end']); - if($_REQUEST['type'] == 'slow') { + if ($_REQUEST['type'] == 'slow') { $q = 'SELECT SUM(query_time) AS TIME(query_time), SUM(lock_time) as lock_time, '. 'SUM(rows_sent) AS rows_sent, SUM(rows_examined) AS rows_examined, sql_text, COUNT(sql_text) AS \'#\' '. 'FROM `mysql`.`slow_log` WHERE event_time > FROM_UNIXTIME('.$start.') '. @@ -177,7 +187,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $result = PMA_DBI_try_query($q); - $return = array( 'rows' => array(), 'sum' => array()); + $return = array('rows' => array(), 'sum' => array()); $type = ''; while ($row = PMA_DBI_fetch_assoc($result)) { @@ -193,14 +203,14 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($return)); } - if($_REQUEST['type'] == 'general') { + if ($_REQUEST['type'] == 'general') { $q = 'SELECT TIME(event_time) as event_time, user_host, thread_id, server_id, argument, count(argument) as \'#\' FROM `mysql`.`general_log` WHERE command_type=\'Query\' '. 'AND event_time > FROM_UNIXTIME('.$start.') AND event_time < FROM_UNIXTIME('.$end.') '. 'AND argument REGEXP \'^(INSERT|SELECT|UPDATE|DELETE)\' GROUP by argument'; // HAVING count > 1'; $result = PMA_DBI_try_query($q); - $return = array( 'rows' => array(), 'sum' => array()); + $return = array('rows' => array(), 'sum' => array()); $type = ''; $insertTables = array(); $insertTablesFirst = -1; @@ -231,9 +241,10 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } // Cut off big selects, but append byte count therefor - if(strlen($row['argument']) > 180) + if (strlen($row['argument']) > 180) { $row['argument'] = substr($row['argument'],0,160) . '... [' . PMA_formatByteDown(strlen($row['argument']), 2).']'; + } } $return['rows'][] = $row; $i++; @@ -325,43 +336,44 @@ cleanDeprecated($server_status); */ // Key_buffer_fraction if (isset($server_status['Key_blocks_unused']) - && isset($server_variables['key_cache_block_size']) - && isset($server_variables['key_buffer_size'])) { + && isset($server_variables['key_cache_block_size']) + && isset($server_variables['key_buffer_size'])) { $server_status['Key_buffer_fraction_%'] = 100 - - $server_status['Key_blocks_unused'] - * $server_variables['key_cache_block_size'] - / $server_variables['key_buffer_size'] - * 100; -} elseif ( - isset($server_status['Key_blocks_used']) - && isset($server_variables['key_buffer_size'])) { + - $server_status['Key_blocks_unused'] + * $server_variables['key_cache_block_size'] + / $server_variables['key_buffer_size'] + * 100; +} elseif (isset($server_status['Key_blocks_used']) + && isset($server_variables['key_buffer_size'])) { $server_status['Key_buffer_fraction_%'] = $server_status['Key_blocks_used'] - * 1024 - / $server_variables['key_buffer_size']; + * 1024 + / $server_variables['key_buffer_size']; } // Ratio for key read/write if (isset($server_status['Key_writes']) - && isset($server_status['Key_write_requests']) - && $server_status['Key_write_requests'] > 0) - $server_status['Key_write_ratio_%'] = 100 * $server_status['Key_writes'] / $server_status['Key_write_requests']; + && isset($server_status['Key_write_requests']) + && $server_status['Key_write_requests'] > 0) { + $server_status['Key_write_ratio_%'] = 100 * $server_status['Key_writes'] / $server_status['Key_write_requests']; +} if (isset($server_status['Key_reads']) - && isset($server_status['Key_read_requests']) - && $server_status['Key_read_requests'] > 0) - $server_status['Key_read_ratio_%'] = 100 * $server_status['Key_reads'] / $server_status['Key_read_requests']; + && isset($server_status['Key_read_requests']) + && $server_status['Key_read_requests'] > 0) { + $server_status['Key_read_ratio_%'] = 100 * $server_status['Key_reads'] / $server_status['Key_read_requests']; +} // Threads_cache_hitrate if (isset($server_status['Threads_created']) - && isset($server_status['Connections']) - && $server_status['Connections'] > 0) { + && isset($server_status['Connections']) + && $server_status['Connections'] > 0) { $server_status['Threads_cache_hitrate_%'] = 100 - - $server_status['Threads_created'] - / $server_status['Connections'] - * 100; + - $server_status['Threads_created'] + / $server_status['Connections'] + * 100; } // Format Uptime_since_flush_status : show as days, hours, minutes, seconds @@ -450,23 +462,23 @@ $links['table'][__('Flush (close) all tables')] = $PMA_PHP_SELF . '?flush=TABLES&' . PMA_generate_common_url(); $links['table'][__('Show open tables')] = 'sql.php?sql_query=' . urlencode('SHOW OPEN TABLES') . - '&goto=server_status.php&' . PMA_generate_common_url(); + '&goto=server_status.php&' . PMA_generate_common_url(); if ($server_master_status) { - $links['repl'][__('Show slave hosts')] - = 'sql.php?sql_query=' . urlencode('SHOW SLAVE HOSTS') . - '&goto=server_status.php&' . PMA_generate_common_url(); - $links['repl'][__('Show master status')] = '#replication_master'; + $links['repl'][__('Show slave hosts')] + = 'sql.php?sql_query=' . urlencode('SHOW SLAVE HOSTS') . + '&goto=server_status.php&' . PMA_generate_common_url(); + $links['repl'][__('Show master status')] = '#replication_master'; } if ($server_slave_status) { - $links['repl'][__('Show slave status')] = '#replication_slave'; + $links['repl'][__('Show slave status')] = '#replication_slave'; } $links['repl']['doc'] = 'replication'; $links['qcache'][__('Flush query cache')] = $PMA_PHP_SELF . '?flush=' . urlencode('QUERY CACHE') . '&' . - PMA_generate_common_url(); + PMA_generate_common_url(); $links['qcache']['doc'] = 'query_cache'; //$links['threads'][__('Show processes')] @@ -483,7 +495,7 @@ $links['innodb'][__('Variables')] = 'server_engines.php?engine=InnoDB&' . PMA_generate_common_url(); $links['innodb'][__('InnoDB Status')] = 'server_engines.php?engine=InnoDB&page=Status&' . - PMA_generate_common_url(); + PMA_generate_common_url(); $links['innodb']['doc'] = 'innodb'; @@ -1453,6 +1465,8 @@ function refreshList($name,$defaultRate=5, $refreshRates=Array(1, 2, 5, 10, 20, /** * cleanup of some deprecated values + * + * @param array &$server_status */ function cleanDeprecated(&$server_status) { $deprecated = array( @@ -1462,8 +1476,7 @@ function cleanDeprecated(&$server_status) { ); foreach ($deprecated as $old => $new) { - if (isset($server_status[$old]) - && isset($server_status[$new])) { + if (isset($server_status[$old]) && isset($server_status[$new])) { unset($server_status[$old]); } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11005-g4ee15be
by Piotr Przybylski 20 Jul '11

20 Jul '11

The branch, master has been updated via 4ee15be98627dcc5e7de721a9fe69d3aabeefd41 (commit) via 6deed1fd2e0905c055f3f4b1c9da752fda6369f7 (commit) via b202936282dc7949dd5888ae3462999d6f4a999b (commit) from 7e27edbb6d15e0cbac446de4b7083568dbf20210 (commit) - Log ----------------------------------------------------------------- commit 4ee15be98627dcc5e7de721a9fe69d3aabeefd41 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 20 18:10:38 2011 +0200 PMA_lookForUse - require whitespace after USE commit 6deed1fd2e0905c055f3f4b1c9da752fda6369f7 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 20 18:08:04 2011 +0200 Change NULL to null commit b202936282dc7949dd5888ae3462999d6f4a999b Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 20 18:03:58 2011 +0200 Unify function comments ----------------------------------------------------------------------- Summary of changes: libraries/File.class.php | 8 +++--- libraries/Table.class.php | 2 +- libraries/blobstreaming.lib.php | 2 +- libraries/database_interface.lib.php | 2 +- libraries/import.lib.php | 50 ++++++++++++++------------------- libraries/import/csv.php | 6 ++-- libraries/import/ods.php | 4 +- libraries/import/xls.php | 4 +- libraries/import/xlsx.php | 4 +- libraries/import/xml.php | 12 ++++---- libraries/plugin_interface.lib.php | 2 +- tbl_change.php | 2 +- 12 files changed, 45 insertions(+), 53 deletions(-) diff --git a/libraries/File.class.php b/libraries/File.class.php index c2d5dad..553cc2d 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -73,7 +73,7 @@ class PMA_File /** * @staticvar string most recent BLOB repository reference */ - static $_recent_bs_reference = NULL; + static $_recent_bs_reference = null; /** * constructor @@ -254,7 +254,7 @@ class PMA_File $tmp_file_type = $file['type']; if (! $tmp_file_type) { - $tmp_file_type = NULL; + $tmp_file_type = null; } if (! $bs_db || ! $bs_table) { @@ -384,7 +384,7 @@ class PMA_File } if (! $tmp_file_type) { - $tmp_file_type = NULL; + $tmp_file_type = null; } if (! $bs_db || !$bs_table) { @@ -828,7 +828,7 @@ class PMA_File static function getRecentBLOBReference() { $ref = PMA_File::$_recent_bs_reference; - PMA_File::$_recent_bs_reference = NULL; + PMA_File::$_recent_bs_reference = null; return $ref; } diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 83e67fd..66ceaea 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1370,7 +1370,7 @@ class PMA_Table * @param string $table_create_time Needed for PROP_COLUMN_ORDER and PROP_COLUMN_VISIB * @return boolean|PMA_Message */ - public function setUiProp($property, $value, $table_create_time = NULL) + public function setUiProp($property, $value, $table_create_time = null) { if (! isset($this->uiprefs)) { $this->loadUiPrefs(); diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php index cd1e5d4..301403c 100644 --- a/libraries/blobstreaming.lib.php +++ b/libraries/blobstreaming.lib.php @@ -179,7 +179,7 @@ function checkBLOBStreamingPlugins() $PMA_Config->set('FILEINFO_EXISTS', false); // check if PECL's fileinfo library exist - $finfo = NULL; + $finfo = null; if (function_exists("finfo_open")) { $finfo = finfo_open(FILEINFO_MIME); diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index ca50600..a43a4af 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -472,7 +472,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals $each_tables[$table_name]['TABLE_COMMENT'] =& $each_tables[$table_name]['Comment']; if (strtoupper($each_tables[$table_name]['Comment']) === 'VIEW' - && $each_tables[$table_name]['Engine'] == NULL) { + && $each_tables[$table_name]['Engine'] == null) { $each_tables[$table_name]['TABLE_TYPE'] = 'VIEW'; } else { /** diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 5b8af20..79b4ade 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -44,7 +44,7 @@ function PMA_checkTimeout() /** * Detects what compression filse uses * - * @param string filename to check + * @param string $filepath filename to check * @return string MIME type of compression, none for none * @access public */ @@ -73,9 +73,9 @@ function PMA_detectCompression($filepath) * Runs query inside import buffer. This is needed to allow displaying * of last SELECT, SHOW or HANDLER results and similar nice stuff. * - * @param string query to run - * @param string query to display, this might be commented - * @param bool whether to use control user for queries + * @param string $sql query to run + * @param string $full query to display, this might be commented + * @param bool $controluser whether to use control user for queries * @access public */ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) @@ -207,17 +207,17 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) /** * Looks for the presence of USE to possibly change current db * - * @param string buffer to examine - * @param string current db - * @param boolean reload + * @param string $buffer buffer to examine + * @param string $db current db + * @param bool $reload reload * @return array (current or new db, whether to reload) * @access public */ function PMA_lookForUse($buffer, $db, $reload) { - if (preg_match('@^[\s]*USE[[:space:]]*([\S]+)@i', $buffer, $match)) { + if (preg_match('@^[\s]*USE[[:space:]]+([\S]+)@i', $buffer, $match)) { $db = trim($match[1]); - $db = trim($db,';'); // for example, USE abc; + $db = trim($db, ';'); // for example, USE abc; $reload = true; } return(array($db, $reload)); @@ -227,8 +227,7 @@ function PMA_lookForUse($buffer, $db, $reload) /** * Returns next part of imported file/buffer * - * @param integer size of buffer to read (this is maximal size - * function will return) + * @param int $size size of buffer to read (this is maximal size function will return) * @return string part of file/buffer * @access public */ @@ -436,7 +435,6 @@ define("SIZES", 1); /** * Obtains the precision (total # of digits) from a size of type decimal * - * * @access public * * @param string $last_cumulative_size @@ -449,7 +447,6 @@ function PMA_getM($last_cumulative_size) { /** * Obtains the scale (# of digits to the right of the decimal point) from a size of type decimal * - * * @access public * * @param string $last_cumulative_size @@ -462,7 +459,6 @@ function PMA_getD($last_cumulative_size) { /** * Obtains the decimal size of a given cell * - * * @access public * * @param string &$cell @@ -482,7 +478,6 @@ function PMA_getDecimalSize(&$cell) { /** * Obtains the size of the given cell * - * * @todo Handle the error cases more elegantly * * @access public @@ -696,7 +691,6 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type /** * Determines what MySQL type a cell is * - * * @access public * * @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or BIGINT or DECIMAL or NONE) @@ -710,7 +704,7 @@ function PMA_detectType($last_cumulative_type, &$cell) { */ if (! strcmp('NULL', $cell)) { - if ($last_cumulative_type === NULL || $last_cumulative_type == NONE) { + if ($last_cumulative_type === null || $last_cumulative_type == NONE) { return NONE; } else { return $last_cumulative_type; @@ -733,7 +727,6 @@ function PMA_detectType($last_cumulative_type, &$cell) { /** * Determines if the column types are int, decimal, or string * - * * @link http://wiki.phpmyadmin.net/pma/Import * * @todo Handle the error case more elegantly @@ -823,25 +816,24 @@ function PMA_analyzeTable(&$table) { } /* Needed to quell the beast that is PMA_Message */ -$import_notice = NULL; +$import_notice = null; /** * Builds and executes SQL statements to create the database and tables * as necessary, as well as insert all the data. * - * * @link http://wiki.phpmyadmin.net/pma/Import * * @access public * - * @param string $db_name Name of the database - * @param array &$tables Array of tables for the specified database - * @param array &$analyses = NULL Analyses of the tables - * @param array &$additional_sql = NULL Additional SQL statements to be executed - * @param array $options = NULL Associative array of options + * @param string $db_name Name of the database + * @param array &$tables Array of tables for the specified database + * @param array &$analyses Analyses of the tables + * @param array &$additional_sql Additional SQL statements to be executed + * @param array $options Associative array of options * @return void */ -function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = NULL, $options = NULL) { +function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = null, $options = null) { /* Take care of the options */ if (isset($options['db_collation'])&& ! is_null($options['db_collation'])) { $collation = $options['db_collation']; @@ -884,7 +876,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = unset($sql); /* Run the $additional_sql statements supplied by the caller plug-in */ - if ($additional_sql != NULL) { + if ($additional_sql != null) { /* Clean the SQL first */ $additional_sql_len = count($additional_sql); @@ -910,7 +902,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = } } - if ($analyses != NULL) { + if ($analyses != null) { $type_array = array(NONE => "NULL", VARCHAR => "varchar", INT => "int", DECIMAL => "decimal", BIGINT => "bigint"); /* TODO: Do more checking here to make sure they really are matched */ @@ -975,7 +967,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = $tempSQLStr .= "("; for ($k = 0; $k < $num_cols; ++$k) { - if ($analyses != NULL) { + if ($analyses != null) { $is_varchar = ($analyses[$i][TYPES][$col_count] === VARCHAR); } else { $is_varchar = !is_numeric($tables[$i][ROWS][$j][$k]); diff --git a/libraries/import/csv.php b/libraries/import/csv.php index 7735598..a0b3348 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -258,7 +258,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { // Need to strip trailing enclosing char? if ($need_end && $ch == $csv_enclosed) { if ($finished && $i == $len - 1) { - $ch = NULL; + $ch = null; } elseif ($i == $len - 1) { $i = $fallbacki; $ch = $buffer[$i]; @@ -417,11 +417,11 @@ if ($analyze) { $options = array('create_db' => false); } else { $db_name = 'CSV_DB'; - $options = NULL; + $options = null; } /* Non-applicable parameters */ - $create = NULL; + $create = null; /* Created and execute necessary SQL statements from data */ PMA_buildSQL($db_name, $tables, $analyses, $create, $options); diff --git a/libraries/import/ods.php b/libraries/import/ods.php index 7f850c6..79a920b 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -275,11 +275,11 @@ if (strlen($db)) { $options = array('create_db' => false); } else { $db_name = 'ODS_DB'; - $options = NULL; + $options = null; } /* Non-applicable parameters */ -$create = NULL; +$create = null; /* Created and execute necessary SQL statements from data */ PMA_buildSQL($db_name, $tables, $analyses, $create, $options); diff --git a/libraries/import/xls.php b/libraries/import/xls.php index 78cdef5..4db0a28 100644 --- a/libraries/import/xls.php +++ b/libraries/import/xls.php @@ -130,11 +130,11 @@ if (strlen($db)) { $options = array('create_db' => false); } else { $db_name = 'XLS_DB'; - $options = NULL; + $options = null; } /* Non-applicable parameters */ -$create = NULL; +$create = null; /* Created and execute necessary SQL statements from data */ PMA_buildSQL($db_name, $tables, $analyses, $create, $options); diff --git a/libraries/import/xlsx.php b/libraries/import/xlsx.php index 33308c6..08d151c 100644 --- a/libraries/import/xlsx.php +++ b/libraries/import/xlsx.php @@ -130,11 +130,11 @@ if (strlen($db)) { $options = array('create_db' => false); } else { $db_name = 'XLSX_DB'; - $options = NULL; + $options = null; } /* Non-applicable parameters */ -$create = NULL; +$create = null; /* Created and execute necessary SQL statements from data */ PMA_buildSQL($db_name, $tables, $analyses, $create, $options); diff --git a/libraries/import/xml.php b/libraries/import/xml.php index db9ba6e..17479f5 100644 --- a/libraries/import/xml.php +++ b/libraries/import/xml.php @@ -119,14 +119,14 @@ if ($db_attr instanceof SimpleXMLElement) { */ $db_attr = $xml->children()->attributes(); $db_name = (string)$db_attr['name']; - $collation = NULL; - $charset = NULL; + $collation = null; + $charset = null; } /** * The XML was malformed */ -if ($db_name === NULL) { +if ($db_name === null) { PMA_Message::error(__('The XML file specified was either malformed or incomplete. Please correct the issue and try again.'))->display(); unset($xml); $GLOBALS['finished'] = false; @@ -259,9 +259,9 @@ if ($data_present) { * to maintain PMA_buildSQL() call integrity */ if (! isset($analyses)) { - $analyses = NULL; + $analyses = null; if (! $struct_present) { - $create = NULL; + $create = null; } } } @@ -286,7 +286,7 @@ if (strlen($db)) { $db_name = $db; $options = array('create_db' => false); } else { - if ($db_name === NULL) { + if ($db_name === null) { $db_name = 'XML_DB'; } diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index 74e72c3..ea6869a 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -138,7 +138,7 @@ function PMA_pluginIsActive($section, $opt, $val) * @param string $cfgname name of config value, if none same as $name * @return string html select tag */ -function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL) +function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null) { if (! isset($cfgname)) { $cfgname = $name; diff --git a/tbl_change.php b/tbl_change.php index 7d5bba3..63f0d56 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -505,7 +505,7 @@ foreach ($rows as $row_id => $vrow) { //when copying row, it is useful to empty auto-increment column to prevent duplicate key error if (isset($default_action) && $default_action === 'insert') { if ($field['Key'] === 'PRI' && strpos($field['Extra'], 'auto_increment') !== false) { - $data = $special_chars_encoded = $special_chars = NULL; + $data = $special_chars_encoded = $special_chars = null; } } // If a timestamp field value is not included in an update hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11002-g7e27edb
by Piotr Przybylski 20 Jul '11

20 Jul '11

The branch, master has been updated via 7e27edbb6d15e0cbac446de4b7083568dbf20210 (commit) from b857e9580757a84132fc8ccd820a549115af7e2d (commit) - Log ----------------------------------------------------------------- commit 7e27edbb6d15e0cbac446de4b7083568dbf20210 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 20 16:57:07 2011 +0200 Hide warnings that may arise from ini_set('memory_limit', ...) and set_time_limit when used in safe_mode ----------------------------------------------------------------------- Summary of changes: bs_disp_as_mime_type.php | 2 +- libraries/import/ods.php | 4 ++-- libraries/import/xls.php | 4 ++-- libraries/import/xlsx.php | 4 ++-- libraries/import/xml.php | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bs_disp_as_mime_type.php b/bs_disp_as_mime_type.php index 03a8c8b..9ec0ec5 100644 --- a/bs_disp_as_mime_type.php +++ b/bs_disp_as_mime_type.php @@ -13,7 +13,7 @@ require_once './libraries/common.inc.php'; PMA_checkParameters(array('reference', 'c_type')); // Increase time limit, because fetching blob might take some time -set_time_limit(0); +@set_time_limit(0); $reference = $_REQUEST['reference']; /* diff --git a/libraries/import/ods.php b/libraries/import/ods.php index 29952f9..7f850c6 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -35,8 +35,8 @@ if (isset($plugin_list)) { return; } -ini_set('memory_limit', '128M'); -set_time_limit(120); +@ini_set('memory_limit', '128M'); +@set_time_limit(120); $i = 0; $len = 0; diff --git a/libraries/import/xls.php b/libraries/import/xls.php index f7e3d33..78cdef5 100644 --- a/libraries/import/xls.php +++ b/libraries/import/xls.php @@ -31,8 +31,8 @@ if (isset($plugin_list)) { return; } -ini_set('memory_limit', '256M'); -set_time_limit(120); +@ini_set('memory_limit', '256M'); +@set_time_limit(120); /* Append the PHPExcel directory to the include path variable */ set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PHPExcel/'); diff --git a/libraries/import/xlsx.php b/libraries/import/xlsx.php index 2b5f628..33308c6 100644 --- a/libraries/import/xlsx.php +++ b/libraries/import/xlsx.php @@ -31,8 +31,8 @@ if (isset($plugin_list)) { return; } -ini_set('memory_limit', '256M'); -set_time_limit(120); +@ini_set('memory_limit', '256M'); +@set_time_limit(120); /* Append the PHPExcel directory to the include path variable */ set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PHPExcel/'); diff --git a/libraries/import/xml.php b/libraries/import/xml.php index 8fe45d8..db9ba6e 100644 --- a/libraries/import/xml.php +++ b/libraries/import/xml.php @@ -28,8 +28,8 @@ if (isset($plugin_list)) { return; } -ini_set('memory_limit', '128M'); -set_time_limit(120); +@ini_set('memory_limit', '128M'); +@set_time_limit(120); $i = 0; $len = 0; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11001-gb857e95
by Michal Čihař 20 Jul '11

20 Jul '11

The branch, master has been updated via b857e9580757a84132fc8ccd820a549115af7e2d (commit) from fc387fe531b6ca1e95f3ba1ad6fbcc499e0f2ccf (commit) - Log ----------------------------------------------------------------- commit b857e9580757a84132fc8ccd820a549115af7e2d Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jul 20 15:20:59 2011 +0200 Avoid using overrides for jquery CSS It is better to modify the style itself instead of including another tiny file with changes. ----------------------------------------------------------------------- Summary of changes: libraries/header_meta_style.inc.php | 7 ------- themes/original/jquery/jquery-ui-1.8.custom.css | 6 ++++-- themes/original/jquery/jquery-ui-1.8.override.css | 8 -------- themes/pmahomme/jquery/jquery-ui-1.8.custom.css | 6 ++++-- themes/pmahomme/jquery/jquery-ui-1.8.override.css | 8 -------- 5 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 themes/original/jquery/jquery-ui-1.8.override.css delete mode 100644 themes/pmahomme/jquery/jquery-ui-1.8.override.css diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index e78b653..5e5c533 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -48,11 +48,4 @@ if ($GLOBALS['text_dir'] == 'ltr') { <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'])); ?>&js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&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.custom.css" /> -<?php - if (is_readable($GLOBALS['pmaThemePath'] . '/jquery/jquery-ui-1.8.override.css')) { -?> - <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.override.css" /> -<?php - } -?> <meta name="robots" content="noindex,nofollow" /> diff --git a/themes/original/jquery/jquery-ui-1.8.custom.css b/themes/original/jquery/jquery-ui-1.8.custom.css index bc1fb0e..edcb8e6 100644 --- a/themes/original/jquery/jquery-ui-1.8.custom.css +++ b/themes/original/jquery/jquery-ui-1.8.custom.css @@ -47,7 +47,7 @@ /* Component containers ----------------------------------*/ -.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; } +.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1em; } .ui-widget .ui-widget { font-size: 1em; } .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } @@ -485,4 +485,6 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad }/* Progressbar ----------------------------------*/ .ui-progressbar { height:2em; text-align: left; } -.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file +.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } +/* Timepicker */ +#ui-timepicker-div { z-index: 1003; } diff --git a/themes/original/jquery/jquery-ui-1.8.override.css b/themes/original/jquery/jquery-ui-1.8.override.css deleted file mode 100644 index 2835781..0000000 --- a/themes/original/jquery/jquery-ui-1.8.override.css +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Use this file to override styles set by jquery-ui-1.8.custom.css - */ - -/* Component containers -----------------------------------*/ -.ui-widget { font-size: 1em; } -#ui-timepicker-div { z-index: 1003; } diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.custom.css b/themes/pmahomme/jquery/jquery-ui-1.8.custom.css index a350461..ca2b44b 100644 --- a/themes/pmahomme/jquery/jquery-ui-1.8.custom.css +++ b/themes/pmahomme/jquery/jquery-ui-1.8.custom.css @@ -47,7 +47,7 @@ /* Component containers ----------------------------------*/ -.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; } +.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1em; } .ui-widget .ui-widget { font-size: 1em; } .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } @@ -485,4 +485,6 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad }/* Progressbar ----------------------------------*/ .ui-progressbar { height:2em; text-align: left; } -.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file +.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } +/* Timepicker */ +#ui-timepicker-div { z-index: 1003; } diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.override.css b/themes/pmahomme/jquery/jquery-ui-1.8.override.css deleted file mode 100644 index 2835781..0000000 --- a/themes/pmahomme/jquery/jquery-ui-1.8.override.css +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Use this file to override styles set by jquery-ui-1.8.custom.css - */ - -/* Component containers -----------------------------------*/ -.ui-widget { font-size: 1em; } -#ui-timepicker-div { z-index: 1003; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11000-gfc387fe
by Michal Čihař 20 Jul '11

20 Jul '11

The branch, master has been updated via fc387fe531b6ca1e95f3ba1ad6fbcc499e0f2ccf (commit) from fbc2bbdc49865d8dc39f80e0ea70e5d26da39ec7 (commit) - Log ----------------------------------------------------------------- commit fc387fe531b6ca1e95f3ba1ad6fbcc499e0f2ccf Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jul 20 15:10:20 2011 +0200 Load codemirror only when needed This needs verification with ajax requests. ----------------------------------------------------------------------- Summary of changes: db_events.php | 2 ++ db_routines.php | 2 ++ db_sql.php | 2 ++ db_triggers.php | 2 ++ libraries/header_scripts.inc.php | 2 -- server_sql.php | 2 ++ tbl_sql.php | 2 ++ 7 files changed, 12 insertions(+), 2 deletions(-) diff --git a/db_events.php b/db_events.php index c4397e7..9991f83 100644 --- a/db_events.php +++ b/db_events.php @@ -19,6 +19,8 @@ $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; $GLOBALS['js_include'][] = 'rte/common.js'; $GLOBALS['js_include'][] = 'rte/events.js'; +$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js'; +$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js'; /** * Include all other files diff --git a/db_routines.php b/db_routines.php index 739e69a..745d1f9 100644 --- a/db_routines.php +++ b/db_routines.php @@ -21,6 +21,8 @@ $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; $GLOBALS['js_include'][] = 'rte/common.js'; $GLOBALS['js_include'][] = 'rte/routines.js'; +$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js'; +$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js'; /** * Include all other files diff --git a/db_sql.php b/db_sql.php index 26a6299..38074e9 100644 --- a/db_sql.php +++ b/db_sql.php @@ -16,6 +16,8 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'makegrid.js'; $GLOBALS['js_include'][] = 'sql.js'; +$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js'; +$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js'; require './libraries/db_common.inc.php'; require_once './libraries/sql_query_form.lib.php'; diff --git a/db_triggers.php b/db_triggers.php index aef1642..4911f36 100644 --- a/db_triggers.php +++ b/db_triggers.php @@ -18,6 +18,8 @@ require_once './libraries/common.lib.php'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'rte/common.js'; $GLOBALS['js_include'][] = 'rte/triggers.js'; +$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js'; +$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js'; /** * Include all other files diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php index 2e0a9ca..c25aa99 100644 --- a/libraries/header_scripts.inc.php +++ b/libraries/header_scripts.inc.php @@ -39,8 +39,6 @@ if (isset($GLOBALS['db'])) { $params['db'] = $GLOBALS['db']; } $GLOBALS['js_include'][] = 'messages.php' . PMA_generate_common_url($params); -$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js'; -$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js'; /** * Here we add a timestamp when loading the file, so that users who diff --git a/server_sql.php b/server_sql.php index f8609f4..ddf90ed 100644 --- a/server_sql.php +++ b/server_sql.php @@ -16,6 +16,8 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'makegrid.js'; $GLOBALS['js_include'][] = 'sql.js'; +$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js'; +$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js'; require_once './libraries/server_common.inc.php'; require_once './libraries/sql_query_form.lib.php'; diff --git a/tbl_sql.php b/tbl_sql.php index 0321395..70f2177 100644 --- a/tbl_sql.php +++ b/tbl_sql.php @@ -16,6 +16,8 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'makegrid.js'; $GLOBALS['js_include'][] = 'sql.js'; +$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js'; +$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js'; require './libraries/tbl_common.php'; $url_query .= '&goto=tbl_sql.php&back=tbl_sql.php'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-10999-gfbc2bbd
by Michal Čihař 20 Jul '11

20 Jul '11

The branch, master has been updated via fbc2bbdc49865d8dc39f80e0ea70e5d26da39ec7 (commit) from ed66e5c66843eb77364e7ecb8ef2495791b8605f (commit) - Log ----------------------------------------------------------------- commit fbc2bbdc49865d8dc39f80e0ea70e5d26da39ec7 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jul 20 15:04:52 2011 +0200 Unlock session while serving JS messages ----------------------------------------------------------------------- Summary of changes: js/messages.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/js/messages.php b/js/messages.php index 2ab89dd..1345a8e 100644 --- a/js/messages.php +++ b/js/messages.php @@ -19,6 +19,8 @@ header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT'); // non-js-compatible stuff like DOCTYPE define('PMA_MINIMUM_COMMON', true); require_once './libraries/common.inc.php'; +// Close session early as we won't write anything there +session_write_close(); // But this one is needed for PMA_escapeJsString() require_once './libraries/js_escape.lib.php'; hooks/post-receive -- phpMyAdmin

1 0