- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5920-gcdcc5d7
by Marc Delisle 25 Jul '10

25 Jul '10

The branch, master has been updated via cdcc5d74437e0cf21e797fb5935bce39cbf540f7 (commit) via 053d6ca88e1a72a839f517b22f3389f59575baf7 (commit) via 368cf8d74f77cf71d279c1c87f4feac4c862c44f (commit) from 0a05b396b366460ca1ffaae2cc3ba3bd5404e1de (commit) - Log ----------------------------------------------------------------- commit cdcc5d74437e0cf21e797fb5935bce39cbf540f7 Merge: 0a05b396b366460ca1ffaae2cc3ba3bd5404e1de 053d6ca88e1a72a839f517b22f3389f59575baf7 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 25 13:33:03 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_privileges.php | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e2e9ae..dfdf92f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,7 @@ $Id$ 3.3.6.0 (not yet released) - bug #3031705 [core] Do not use CONCAT for DECIMAL fields. +- bug #3033063 [core] Navi gets wrong db name 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/server_privileges.php b/server_privileges.php index bd2ddb3..9577d77 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -971,6 +971,8 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { $message = PMA_Message::rawError(PMA_DBI_getError()); break; } + // this is needed in case tracking is on: + $GLOBALS['db'] = $username; $GLOBALS['reload'] = TRUE; PMA_reloadNavigation(); @@ -1284,6 +1286,9 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[ } } } + // tracking sets this, causing the deleted db to be shown in navi + unset($GLOBALS['db']); + $sql_query = join("\n", $queries); if (! empty($drop_user_error)) { $message = PMA_Message::rawError($drop_user_error); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_5RC1-6-g053d6ca
by Marc Delisle 25 Jul '10

25 Jul '10

The branch, QA_3_3 has been updated via 053d6ca88e1a72a839f517b22f3389f59575baf7 (commit) from 368cf8d74f77cf71d279c1c87f4feac4c862c44f (commit) - Log ----------------------------------------------------------------- commit 053d6ca88e1a72a839f517b22f3389f59575baf7 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 25 13:32:35 2010 -0400 bug #3033063 [core] Navi gets wrong db name ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_privileges.php | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc317e9..d7cb453 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.6.0 (not yet released) - bug #3031705 [core] Do not use CONCAT for DECIMAL fields. +- bug #3033063 [core] Navi gets wrong db name 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/server_privileges.php b/server_privileges.php index fd2796f..3f14c3f 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -942,6 +942,8 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { $message = PMA_Message::rawError(PMA_DBI_getError()); break; } + // this is needed in case tracking is on: + $GLOBALS['db'] = $username; $GLOBALS['reload'] = TRUE; PMA_reloadNavigation(); @@ -1255,6 +1257,9 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[ } } } + // tracking sets this, causing the deleted db to be shown in navi + unset($GLOBALS['db']); + $sql_query = join("\n", $queries); if (! empty($drop_user_error)) { $message = PMA_Message::rawError($drop_user_error); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5917-g0a05b39
by Marc Delisle 25 Jul '10

25 Jul '10

The branch, master has been updated via 0a05b396b366460ca1ffaae2cc3ba3bd5404e1de (commit) via 58021a8e6c5c9fe7963864480c365f8f49f390b4 (commit) from 084c0dbcf51dea488d99b7bfffffa23832ace4f3 (commit) - Log ----------------------------------------------------------------- commit 0a05b396b366460ca1ffaae2cc3ba3bd5404e1de Merge: 084c0dbcf51dea488d99b7bfffffa23832ace4f3 58021a8e6c5c9fe7963864480c365f8f49f390b4 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 25 07:54:43 2010 -0400 Merge branch 'MAINT_3_3_5' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + scripts/create_tables.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc2ec78..4e2e9ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ $Id$ - bug [export] CSV for MS Excel (Windows) should have semi-colon as separator - [core] Update library PHPExcel to version 1.7.3c - bug #2994885, bug #3029168 [import] Convert Excel column name correctly +- bug [scripts] MySQL 5.5.5 does not accept TIMESTAMP(14) in create_tables.sql 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index bcb8b35..e4d0fc8 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -80,7 +80,7 @@ CREATE TABLE IF NOT EXISTS `pma_history` ( `username` varchar(64) NOT NULL default '', `db` varchar(64) NOT NULL default '', `table` varchar(64) NOT NULL default '', - `timevalue` timestamp(14) NOT NULL, + `timevalue` timestamp NOT NULL, `sqlquery` text NOT NULL, PRIMARY KEY (`id`), KEY `username` (`username`,`db`,`table`,`timevalue`) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_5RC1-5-g368cf8d
by Marc Delisle 25 Jul '10

25 Jul '10

The branch, QA_3_3 has been updated via 368cf8d74f77cf71d279c1c87f4feac4c862c44f (commit) via 58021a8e6c5c9fe7963864480c365f8f49f390b4 (commit) from 8b592a365bc46992223ea041dce3e992dba3c839 (commit) - Log ----------------------------------------------------------------- commit 368cf8d74f77cf71d279c1c87f4feac4c862c44f Merge: 8b592a365bc46992223ea041dce3e992dba3c839 58021a8e6c5c9fe7963864480c365f8f49f390b4 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 25 07:53:41 2010 -0400 Merge branch 'MAINT_3_3_5' into QA_3_3 ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + scripts/create_tables.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5323907..fc317e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug [export] CSV for MS Excel (Windows) should have semi-colon as separator - [core] Update library PHPExcel to version 1.7.3c - bug #2994885, bug #3029168 [import] Convert Excel column name correctly +- bug [scripts] MySQL 5.5.5 does not accept TIMESTAMP(14) in create_tables.sql 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index bcb8b35..e4d0fc8 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -80,7 +80,7 @@ CREATE TABLE IF NOT EXISTS `pma_history` ( `username` varchar(64) NOT NULL default '', `db` varchar(64) NOT NULL default '', `table` varchar(64) NOT NULL default '', - `timevalue` timestamp(14) NOT NULL, + `timevalue` timestamp NOT NULL, `sqlquery` text NOT NULL, PRIMARY KEY (`id`), KEY `username` (`username`,`db`,`table`,`timevalue`) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_5, updated. RELEASE_3_3_5RC1-1-g58021a8
by Marc Delisle 25 Jul '10

25 Jul '10

The branch, MAINT_3_3_5 has been updated via 58021a8e6c5c9fe7963864480c365f8f49f390b4 (commit) from 31c18cbe11c929b8ff7b95d2bcf478c8c6212d65 (commit) - Log ----------------------------------------------------------------- commit 58021a8e6c5c9fe7963864480c365f8f49f390b4 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 25 07:53:07 2010 -0400 bug [scripts] MySQL 5.5.5 does not accept TIMESTAMP(14) in create_tables.sql ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + scripts/create_tables.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b0c93f..555c6f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug [export] CSV for MS Excel (Windows) should have semi-colon as separator - [core] Update library PHPExcel to version 1.7.3c - bug #2994885, bug #3029168 [import] Convert Excel column name correctly +- bug [scripts] MySQL 5.5.5 does not accept TIMESTAMP(14) in create_tables.sql 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index bcb8b35..e4d0fc8 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -80,7 +80,7 @@ CREATE TABLE IF NOT EXISTS `pma_history` ( `username` varchar(64) NOT NULL default '', `db` varchar(64) NOT NULL default '', `table` varchar(64) NOT NULL default '', - `timevalue` timestamp(14) NOT NULL, + `timevalue` timestamp NOT NULL, `sqlquery` text NOT NULL, PRIMARY KEY (`id`), KEY `username` (`username`,`db`,`table`,`timevalue`) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5915-g084c0db
by Marc Delisle 24 Jul '10

24 Jul '10

The branch, master has been updated via 084c0dbcf51dea488d99b7bfffffa23832ace4f3 (commit) from aec1adb0e077f2a9521bfa9ed367e9d5b6911042 (commit) - Log ----------------------------------------------------------------- commit 084c0dbcf51dea488d99b7bfffffa23832ace4f3 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 24 08:11:48 2010 -0400 functions.js included automatically ----------------------------------------------------------------------- Summary of changes: chk_rel.php | 1 - db_create.php | 1 - export.php | 5 ----- import.php | 1 - libraries/db_common.inc.php | 1 - libraries/header_scripts.inc.php | 1 + libraries/mult_submits.inc.php | 1 - libraries/tbl_links.inc.php | 1 - querywindow.php | 1 - server_databases.php | 2 -- server_export.php | 2 -- server_privileges.php | 1 - server_replication.php | 1 - server_sql.php | 1 - server_synchronize.php | 1 - sql.php | 5 ----- tbl_addfield.php | 1 - tbl_alter.php | 1 - tbl_create.php | 1 - tbl_indexes.php | 1 - tbl_replace.php | 2 -- tbl_row_action.php | 1 - tbl_tracking.php | 1 - 23 files changed, 1 insertions(+), 33 deletions(-) diff --git a/chk_rel.php b/chk_rel.php index 38ca5c1..323befd 100644 --- a/chk_rel.php +++ b/chk_rel.php @@ -9,7 +9,6 @@ * Gets some core libraries */ require_once './libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; require_once './libraries/relation.lib.php'; diff --git a/db_create.php b/db_create.php index 9b1959a..50e4cf6 100644 --- a/db_create.php +++ b/db_create.php @@ -9,7 +9,6 @@ * Gets some core libraries */ require_once './libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/mysql_charsets.lib.php'; PMA_checkParameters(array('new_db')); diff --git a/export.php b/export.php index 2db992d..64ae7d3 100644 --- a/export.php +++ b/export.php @@ -59,7 +59,6 @@ if (empty($_REQUEST['asfile'])) { // Does export require to be into file? if (isset($export_list[$type]['force_file']) && ! $asfile) { $message = PMA_Message::error(__('Selected export type has to be saved in file!')); - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; if ($export_type == 'server') { $active_page = 'server_export.php'; @@ -298,7 +297,6 @@ if ($save_on_server) { } } if (isset($message)) { - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; if ($export_type == 'server') { $active_page = 'server_export.php'; @@ -350,7 +348,6 @@ if (!$save_on_server) { $num_tables = count($tables); if ($num_tables == 0) { $message = PMA_Message::error(__('No tables found in database.')); - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; $active_page = 'db_export.php'; require './db_export.php'; @@ -565,7 +562,6 @@ if (!PMA_exportFooter()) { // End of fake loop if ($save_on_server && isset($message)) { - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; if ($export_type == 'server') { $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); } - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; if ($export_type == 'server') { $active_page = 'server_export.php'; diff --git a/import.php b/import.php index b123064..dbc4d56 100644 --- a/import.php +++ b/import.php @@ -12,7 +12,6 @@ */ require_once './libraries/common.inc.php'; //require_once './libraries/display_import_functions.lib.php'; -$GLOBALS['js_include'][] = 'functions.js'; // reset import messages for ajax request $_SESSION['Import_message']['message'] = null; diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index b9a4a97..ea019cb 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -65,7 +65,6 @@ if (isset($submitcollation) && !empty($db_collation)) { unset($db_charset, $db_collation); } -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; /** diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php index a292d0f..8021c34 100644 --- a/libraries/header_scripts.inc.php +++ b/libraries/header_scripts.inc.php @@ -30,6 +30,7 @@ $title = PMA_expandUserString( // here, the function does not exist with this configuration: $cfg['ServerDefault'] = 0; $is_superuser = function_exists('PMA_isSuperuser') && PMA_isSuperuser(); +$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'tooltip.js'; $params = array('lang' => $GLOBALS['lang']); if (isset($GLOBALS['db'])) { diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 0b3413b..2fab680 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -127,7 +127,6 @@ if (! empty($submit_mult) * Displays the confirmation form if required */ if (!empty($submit_mult) && !empty($what)) { - $GLOBALS['js_include'][] = 'functions.js'; unset($message); require_once './libraries/header.inc.php'; diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index 1f695a5..ef61293 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -37,7 +37,6 @@ $err_url = $cfg['DefaultTabTable'] . PMA_generate_common_url($url_params); /** * Displays headers */ -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; /** diff --git a/querywindow.php b/querywindow.php index 7b2b08d..84b0e82 100644 --- a/querywindow.php +++ b/querywindow.php @@ -155,7 +155,6 @@ $sql_query = ''; * prepare JavaScript functionality */ $js_include[] = 'common.js'; -$js_include[] = 'functions.js'; $js_include[] = 'querywindow.js'; if (PMA_isValid($_REQUEST['auto_commit'], 'identical', 'true')) { diff --git a/server_databases.php b/server_databases.php index 0c7d598..16b2cdc 100644 --- a/server_databases.php +++ b/server_databases.php @@ -10,8 +10,6 @@ */ require_once './libraries/common.inc.php'; - -$GLOBALS['js_include'][] = 'functions.js'; require './libraries/server_common.inc.php'; require './libraries/replication.inc.php'; diff --git a/server_export.php b/server_export.php index 9d78ce7..f9808d8 100644 --- a/server_export.php +++ b/server_export.php @@ -10,8 +10,6 @@ */ require_once './libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'functions.js'; - /** * Displays the links */ diff --git a/server_privileges.php b/server_privileges.php index a909ef5..bd2ddb3 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -14,7 +14,6 @@ require_once './libraries/common.inc.php'; * Does the common work */ $GLOBALS['js_include'][] = 'server_privileges.js'; -$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'password_generation.js'; require './libraries/server_common.inc.php'; diff --git a/server_replication.php b/server_replication.php index 1dbd42e..9ac1816 100644 --- a/server_replication.php +++ b/server_replication.php @@ -14,7 +14,6 @@ require_once './libraries/common.inc.php'; * Does the common work */ $GLOBALS['js_include'][] = 'server_privileges.js'; -$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'replication.js'; require './libraries/server_common.inc.php'; diff --git a/server_sql.php b/server_sql.php index 1b8027c..73c1379 100644 --- a/server_sql.php +++ b/server_sql.php @@ -13,7 +13,6 @@ require_once './libraries/common.inc.php'; /** * Does the common work */ -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/server_common.inc.php'; require_once './libraries/sql_query_form.lib.php'; diff --git a/server_synchronize.php b/server_synchronize.php index 1272dda..6f0941b 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -14,7 +14,6 @@ require_once './libraries/common.inc.php'; /** * Does the common work */ -$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'server_synchronize.js'; require_once './libraries/server_common.inc.php'; diff --git a/sql.php b/sql.php index c4ae9ff..9175532 100644 --- a/sql.php +++ b/sql.php @@ -545,10 +545,6 @@ if (0 == $num_rows || $is_affected) { $goto = 'main.php'; } // Loads to target script - if (strpos($goto, 'db_') === 0 - || strpos($goto, 'tbl_') === 0) { - $GLOBALS['js_include'][] = 'functions.js'; - } if ($goto != 'main.php') { require_once './libraries/header.inc.php'; } @@ -573,7 +569,6 @@ else { if (isset($printview) && $printview == '1') { require_once './libraries/header_printview.inc.php'; } else { - $GLOBALS['js_include'][] = 'functions.js'; unset($message); if (strlen($table)) { require './libraries/tbl_common.php'; diff --git a/tbl_addfield.php b/tbl_addfield.php index b61327f..6d6c14a 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -11,7 +11,6 @@ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php'; -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; // Check parameters diff --git a/tbl_alter.php b/tbl_alter.php index 7f81c41..423156e 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -15,7 +15,6 @@ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php'; -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; // Check parameters diff --git a/tbl_create.php b/tbl_create.php index 8f77bb3..fc1119b 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -36,7 +36,6 @@ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php'; -$GLOBALS['js_include'][] = 'functions.js'; $action = 'tbl_create.php'; require_once './libraries/header.inc.php'; diff --git a/tbl_indexes.php b/tbl_indexes.php index 172191a..eb6deb9 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -111,7 +111,6 @@ if (isset($_REQUEST['do_save_data'])) { */ // Displays headers (if needed) -$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'indexes.js'; require_once './libraries/tbl_info.inc.php'; diff --git a/tbl_replace.php b/tbl_replace.php index bcf64af..92331b9 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -328,7 +328,6 @@ if ($is_insert && count($value_sets) > 0) { } elseif (empty($query)) { // No change -> move back to the calling script $message = PMA_Message::success(__('No change')); - $GLOBALS['js_include'][] = 'functions.js'; $active_page = $goto_include; require_once './libraries/header.inc.php'; require './' . PMA_securePath($goto_include); @@ -428,7 +427,6 @@ if (isset($return_to_sql_query)) { } $GLOBALS['js_include'][] = 'tbl_change.js'; -$GLOBALS['js_include'][] = 'functions.js'; // in case we call sql.php which needs those: $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; diff --git a/tbl_row_action.php b/tbl_row_action.php index 356ad57..62fc204 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -71,7 +71,6 @@ switch($submit_mult) { } $GLOBALS['js_include'][] = 'tbl_change.js'; -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; diff --git a/tbl_tracking.php b/tbl_tracking.php index 698076a..6312262 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -233,7 +233,6 @@ if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldump') $table_temp = $table; $db = $table = ''; - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/sql_query_form.lib.php'; PMA_sqlQueryForm($new_query, 'sql'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5914-gaec1adb
by Marc Delisle 23 Jul '10

23 Jul '10

The branch, master has been updated via aec1adb0e077f2a9521bfa9ed367e9d5b6911042 (commit) from 790b52857d269aac40282c85e24845e1fd27b924 (commit) - Log ----------------------------------------------------------------- commit aec1adb0e077f2a9521bfa9ed367e9d5b6911042 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 23 10:13:49 2010 -0400 credit for new BLOB streaming support ----------------------------------------------------------------------- Summary of changes: Documentation.html | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Documentation.html b/Documentation.html index a62413f..3e5edee 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4855,6 +4855,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA <li>Replication support</li> </ul></li> +<li>Barrie Leslie +<ul> + <li>BLOBstreaming support with PBMS PHP extension</li> +</ul></li> + </ul> <p> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5913-g790b528
by Marc Delisle 23 Jul '10

23 Jul '10

The branch, master has been updated via 790b52857d269aac40282c85e24845e1fd27b924 (commit) from 9232e0237244556102c494b0779fc7ebfd30a204 (commit) - Log ----------------------------------------------------------------- commit 790b52857d269aac40282c85e24845e1fd27b924 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 23 09:20:51 2010 -0400 remove tabs ----------------------------------------------------------------------- Summary of changes: libraries/blobstreaming.lib.php | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php index 3c614e6..17a05e0 100644 --- a/libraries/blobstreaming.lib.php +++ b/libraries/blobstreaming.lib.php @@ -13,7 +13,7 @@ function initPBMSDatabase() * table in an already existing database which will cause the PBMS * daemon to create the 'pbms' database. */ - $db_array = PMA_DBI_fetch_result('SHOW DATABASES;'); + $db_array = PMA_DBI_fetch_result('SHOW DATABASES;'); if (! empty($db_array)) { $target = ""; foreach ($db_array as $current_db) { @@ -26,7 +26,7 @@ function initPBMSDatabase() } } } - + if ($target != "") { $query = "select * from $target.pbms_metadata_header"; // If it exists this table will not contain much } @@ -100,7 +100,7 @@ function checkBLOBStreamingPlugins() foreach ($existing_plugins as $one_existing_plugin) { // check if required plugins exist if ( strtolower($one_existing_plugin['Library']) == 'libpbms.so' - && $one_existing_plugin['Status'] == "ACTIVE") { + && $one_existing_plugin['Status'] == "ACTIVE") { $has_blobstreaming = true; break; } @@ -303,16 +303,16 @@ function PMA_BS_CreateReferenceLink($bs_reference, $db_name) } if (pbms_get_info(trim($bs_reference)) == FALSE) { - PMA_BS_ReportPBMSError("PBMS get BLOB info failed: pbms_get_info($bs_reference)"); + PMA_BS_ReportPBMSError("PBMS get BLOB info failed: pbms_get_info($bs_reference)"); PMA_do_disconnect(); return 'Error'; } - $content_type = pbms_get_metadata_value("Content-Type"); + $content_type = pbms_get_metadata_value("Content-Type"); if ($content_type == FALSE) { $br = trim($bs_reference); PMA_BS_ReportPBMSError("'$content_type' PMA_BS_CreateReferenceLink('$br', '$db_name'): get BLOB Content-Type failed: "); - } + } PMA_do_disconnect(); @@ -322,9 +322,9 @@ function PMA_BS_CreateReferenceLink($bs_reference, $db_name) $bs_url = PMA_BS_getURL($bs_reference); if (empty($bs_url)) { - PMA_BS_ReportPBMSError("No blob streaming server configured!"); + PMA_BS_ReportPBMSError("No blob streaming server configured!"); return 'Error'; - } + } $output = "<a href=\"#\" onclick=\"requestMIMETypeChange('" . urlencode($db_name) . "', '" . urlencode($GLOBALS['table']) . "', '" . urlencode($bs_reference) . "', '" . urlencode($content_type) . "')\">$content_type</a>"; @@ -339,7 +339,7 @@ function PMA_BS_CreateReferenceLink($bs_reference, $db_name) case 'image/png': $output .= ' (<a href="' . $bs_url . '" target="new">' . __('View image') . '</a>)'; break; - // audio content + // audio content case 'audio/mpeg': $output .= ' (<a href="#" onclick="popupBSMedia(\'' . PMA_generate_common_url() . '\',\'' . urlencode($bs_reference) . '\', \'' . urlencode($content_type) . '\',' . ($is_custom_type ? 1 : 0) . ', 640, 120)">' . __('Play audio'). '</a>)'; break; @@ -379,7 +379,7 @@ function PMA_BS_IsTablePBMSEnabled($db_name, $tbl_name, $tbl_type) return FALSE; } - if (! $PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST')) { + if (! $PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST')) { return FALSE; } @@ -403,7 +403,7 @@ function PMA_BS_UpLoadFile($db_name, $tbl_name, $file_type, $file_name) if (PMA_cacheGet('skip_blobstreaming', true)) { return FALSE; } - + if (PMA_do_connect($db_name, FALSE) == FALSE) { return FALSE; } @@ -411,9 +411,9 @@ function PMA_BS_UpLoadFile($db_name, $tbl_name, $file_type, $file_name) $fh = fopen($file_name, 'r'); if (! $fh) { PMA_do_disconnect(); - PMA_showMessage("Could not open file: $file_name"); + PMA_showMessage("Could not open file: $file_name"); return FALSE; - } + } pbms_add_metadata("Content-Type", $file_type); @@ -433,7 +433,7 @@ function PMA_BS_SetContentType($db_name, $bsTable, $blobReference, $contentType) if (PMA_cacheGet('skip_blobstreaming', true)) { return FALSE; } - + // This is a really ugly way to do this but currently there is nothing better. // In a future version of PBMS the system tables will be redesigned to make this // more eficient. @@ -447,7 +447,7 @@ function PMA_BS_SetContentType($db_name, $bsTable, $blobReference, $contentType) $where = "WHERE Repository_id=" . $data['Repository_id'] . " AND Repo_blob_offset=" . $data['Repo_blob_offset'] ; $query = "SELECT name from pbms_metadata $where"; $result = PMA_DBI_query($query); - + if (PMA_DBI_num_rows($result) == 0) { $query = "INSERT into pbms_metadata Values( ". $data['Repository_id'] . ", " . $data['Repo_blob_offset'] . ", 'Content_type', '" . PMA_sqlAddslashes($contentType) . "')"; } else { @@ -489,7 +489,7 @@ function PMA_BS_getURL($reference) if (empty($bs_server)) { return FALSE; } - + $bs_url = 'http://' . $bs_server . '/' . rtrim($reference); return $bs_url; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5912-g9232e02
by Marc Delisle 23 Jul '10

23 Jul '10

The branch, master has been updated via 9232e0237244556102c494b0779fc7ebfd30a204 (commit) from 18166bd49227fde30323f47196a384d463d257cf (commit) - Log ----------------------------------------------------------------- commit 9232e0237244556102c494b0779fc7ebfd30a204 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 23 09:10:24 2010 -0400 BLOB streaming doc ----------------------------------------------------------------------- Summary of changes: Documentation.html | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Documentation.html b/Documentation.html index c35cfae..a62413f 100644 --- a/Documentation.html +++ b/Documentation.html @@ -69,7 +69,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 </li> <li>To support uploading of ZIP files, you need the PHP <tt>zip</tt> extension.</li> <li>For proper support of multibyte strings (eg. UTF-8, which is - currently default), you should install mbstring and ctype + currently the default), you should install the mbstring and ctype extensions. </li> <li>You need GD2 support in PHP to display inline @@ -84,6 +84,9 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 </li> <li>To support upload progress bars, see <a href="#faq2_9"> <abbr title="Frequently Asked Questions">FAQ</abbr> 2.9</a>.</li> + <li>To support BLOB streaming, see PHP and MySQL requirements + in <a href="#faq6_25"> + <abbr title="Frequently Asked Questions">FAQ</abbr> 6.25</a>.</li> </ul> </li> <li><b>MySQL</b> 5.0 or newer (<a href="#faq1_17">details</a>);</li> @@ -4306,13 +4309,20 @@ chmod o+rwx tmp <h4 id="faq6_25"> <a href="#faq6_25">6.25 How does BLOB streaming work in phpMyAdmin?</a></h4> -<p> First, for general information about BLOB streaming on MySQL, visit <a href="http://blobstreaming.org">blobstreaming.org</a>. We currently support streaming if you are running MySQL 5.1 with the PBXT and PBMS storage engines. Moreover, only PBMS 0.5.04 is supported.</p> +<p> For general information about BLOB streaming on MySQL, visit <a href="http://blobstreaming.org">blobstreaming.org</a>. You need the following components:</p> +<ul> + <li>PBMS BLOB Streaming Daemon for MySQL (0.5.15 or later)</li> + <li>Streaming enabled PBXT Storage engine for MySQL (1.0.11-6 or + later)</li> + <li>PBMS Client Library for MySQL (0.5.15 or later)</li> + <li>PBMS PHP Extension for MySQL (0.1.1 or later)</li> +</ul> + +<p>Here are details about configuration and operation:</p> <ol> - <li>In <tt>config.inc.php</tt> your host should be defined with a FQDN (fully qualified domain name) instead of something like "localhost".</li> - <li>A current limitation is that your first login via phpMyAdmin to a freshly-started server must be done with an account that has the SUPER privilege.</li> - <li>On your target database, go to Operations and in the "BLOB Repository" section, click "Enable". This creates the PBMS system tables inside your database.</li> - <li>Ensure that your target table is under the PBXT storage engine and has a LONGBLOB column.</li> + <li>In <tt>config.inc.php</tt> your host should be defined with a FQDN (fully qualified domain name) instead of "localhost".</li> + <li>Ensure that your target table is under the PBXT storage engine and has a LONGBLOB column and a primary key.</li> <li>When you insert or update a row in this table, put a checkmark on the "Upload to BLOB repository" optional choice; otherwise, the upload will be done directly in your column instead of the repository.</li> <li>Finally when you browse your table, you'll see in your column a link to stream your data, for example "View image". A header containing the correct MIME-type will be sent to your browser; this MIME-type was stored at upload time but in case it's incorrect, it's possible to edit it by clicking on the displayed MIME-type.</li> </ol> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5911-g18166bd
by Marc Delisle 23 Jul '10

23 Jul '10

The branch, master has been updated via 18166bd49227fde30323f47196a384d463d257cf (commit) via 36402785de6e5d93779a8e84c5d5d40692bbc82b (commit) from e02935a1d5ad5090434ff6a258d367814832a1df (commit) - Log ----------------------------------------------------------------- commit 18166bd49227fde30323f47196a384d463d257cf Merge: 36402785de6e5d93779a8e84c5d5d40692bbc82b e02935a1d5ad5090434ff6a258d367814832a1df Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 23 08:36:03 2010 -0400 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 36402785de6e5d93779a8e84c5d5d40692bbc82b Author: Barry Leslie <barry_leslie(a)users.sourceforge.net> Date: Fri Jul 23 08:32:16 2010 -0400 Use PBMS pool connections ----------------------------------------------------------------------- Summary of changes: libraries/blobstreaming.lib.php | 42 ++++++++++++++++++++++++++++---------- 1 files changed, 31 insertions(+), 11 deletions(-) diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php index 5403e76..3c614e6 100644 --- a/libraries/blobstreaming.lib.php +++ b/libraries/blobstreaming.lib.php @@ -131,6 +131,20 @@ function checkBLOBStreamingPlugins() return FALSE; } // end if (!$BS_PORT) + // Ping PBMS: the database doesn't need to exist for this to work. + if (pbms_connect($serverCfg['host'], $BS_PORT, "anydb") == FALSE) { + $PMA_Config->set('BLOBSTREAMING_PLUGINS_EXIST', FALSE); + PMA_cacheSet('skip_blobstreaming', true, true); + return FALSE; + } + pbms_close(); + + if (function_exists("pbms_pconnect")) { + $PMA_Config->set('PBMS_PCONNECT_EXISTS', TRUE); + } else { + $PMA_Config->set('PBMS_PCONNECT_EXISTS', FALSE); + } + // add selected BS, CURL and fileinfo library variables to PMA configuration $PMA_Config->set('BLOBSTREAMING_PORT', $BS_PORT); $PMA_Config->set('BLOBSTREAMING_HOST', $serverCfg['host']); @@ -242,9 +256,16 @@ function PMA_do_connect($db_name, $quiet) $pbms_host = $PMA_Config->get('BLOBSTREAMING_HOST'); $pbms_port = $PMA_Config->get('BLOBSTREAMING_PORT'); - if (pbms_connect($pbms_host, $pbms_port, $db_name) == FALSE) { + if ($PMA_Config->get('PBMS_PCONNECT_EXISTS')) { + // Open a persistent connection. + $ok = pbms_pconnect($pbms_host, $pbms_port, $db_name); + } else { + $ok = pbms_connect($pbms_host, $pbms_port, $db_name); + } + + if ($ok == FALSE) { if ($quiet == FALSE) { - PMA_BS_ReportPBMSError("PBMS Connectiuon failed: pbms_connect($pbms_host, $pbms_port, $db_name)"); + PMA_BS_ReportPBMSError("PBMS Connection failed: pbms_connect($pbms_host, $pbms_port, $db_name)"); } return FALSE; } @@ -268,11 +289,9 @@ function PMA_BS_IsPBMSReference($bs_reference, $db_name) return FALSE; } - if (PMA_do_connect($db_name, TRUE) == FALSE) { - return FALSE; - } + // You do not really need a connection to the PBMS Daemon + // to check if a reference looks valid. $ok = pbms_is_blob_reference($bs_reference); - PMA_do_disconnect(); return $ok ; } @@ -283,15 +302,16 @@ function PMA_BS_CreateReferenceLink($bs_reference, $db_name) return 'Error'; } - if (pbms_get_info($bs_reference) == FALSE) { + if (pbms_get_info(trim($bs_reference)) == FALSE) { PMA_BS_ReportPBMSError("PBMS get BLOB info failed: pbms_get_info($bs_reference)"); PMA_do_disconnect(); return 'Error'; } - $content_type = pbms_get_metadata_value("Content-type"); - if ($content_type == FALSE) { - PMA_BS_ReportPBMSError("PMA_BS_CreateReferenceLink($bs_reference, $db_name): get BLOB Content-type failed: "); + $content_type = pbms_get_metadata_value("Content-Type"); + if ($content_type == FALSE) { + $br = trim($bs_reference); + PMA_BS_ReportPBMSError("'$content_type' PMA_BS_CreateReferenceLink('$br', '$db_name'): get BLOB Content-Type failed: "); } PMA_do_disconnect(); @@ -395,7 +415,7 @@ function PMA_BS_UpLoadFile($db_name, $tbl_name, $file_type, $file_name) return FALSE; } - pbms_add_metadata("Content-type", $file_type); + pbms_add_metadata("Content-Type", $file_type); $pbms_blob_url = pbms_read_stream($fh, filesize($file_name), $tbl_name); if (! $pbms_blob_url) { hooks/post-receive -- phpMyAdmin

1 0