- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5340-g6ea4101
by Marc Delisle 12 Jul '10

12 Jul '10

The branch, master has been updated via 6ea41018b2c17ad01f80aea6aefd3b7a1687fd0b (commit) via 768de14815c5076a560ad3d1c46d18198f60edf0 (commit) from f6ef0c87a814d96cea4a1e868fcac15935deca13 (commit) - Log ----------------------------------------------------------------- commit 6ea41018b2c17ad01f80aea6aefd3b7a1687fd0b Merge: f6ef0c87a814d96cea4a1e868fcac15935deca13 768de14815c5076a560ad3d1c46d18198f60edf0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 12 09:01:05 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: libraries/export/csv.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/export/csv.php b/libraries/export/csv.php index d4b1811..8e1973f 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -75,10 +75,10 @@ function PMA_exportHeader() { // as tested on Windows with Excel 2002 and Excel 2007 $csv_separator = ';'; break; - case 'max_excel2003': + case 'mac_excel2003': $csv_separator = ';'; break; - case 'max_excel2008': + case 'mac_excel2008': $csv_separator = ','; break; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-24-g768de14
by Marc Delisle 12 Jul '10

12 Jul '10

The branch, QA_3_3 has been updated via 768de14815c5076a560ad3d1c46d18198f60edf0 (commit) from cda9df71016cd7a85d93fbe5b38da6f532c938de (commit) - Log ----------------------------------------------------------------- commit 768de14815c5076a560ad3d1c46d18198f60edf0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 12 09:00:39 2010 -0400 typo ----------------------------------------------------------------------- Summary of changes: libraries/export/csv.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/export/csv.php b/libraries/export/csv.php index ebcf0cd..e59e3bd 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -75,10 +75,10 @@ function PMA_exportHeader() { // as tested on Windows with Excel 2002 and Excel 2007 $csv_separator = ';'; break; - case 'max_excel2003': + case 'mac_excel2003': $csv_separator = ';'; break; - case 'max_excel2008': + case 'mac_excel2008': $csv_separator = ','; break; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5338-gf6ef0c8
by Marc Delisle 12 Jul '10

12 Jul '10

The branch, master has been updated via f6ef0c87a814d96cea4a1e868fcac15935deca13 (commit) via cda9df71016cd7a85d93fbe5b38da6f532c938de (commit) from ce2cad288666f2bfd71dc21ae8e0277288834657 (commit) - Log ----------------------------------------------------------------- commit f6ef0c87a814d96cea4a1e868fcac15935deca13 Merge: ce2cad288666f2bfd71dc21ae8e0277288834657 cda9df71016cd7a85d93fbe5b38da6f532c938de Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 12 08:57:05 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/export/csv.php | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6373434..c0ce1ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ $Id$ - bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from master, todo: update PHP excel?) - bug #3023507 [core] No result set display from stored procedure SELECT +- bug [export] CSV for MS Excel (Windows) should have semi-colon as separator 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/export/csv.php b/libraries/export/csv.php index e3d78f2..d4b1811 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -70,7 +70,18 @@ function PMA_exportHeader() { // Here we just prepare some values for export if ($what == 'excel') { $csv_terminated = "\015\012"; - $csv_separator = isset($GLOBALS['excel_edition']) && $GLOBALS['excel_edition'] == 'mac_excel2003' ? ';' : ','; + switch($GLOBALS['excel_edition']) { + case 'win': + // as tested on Windows with Excel 2002 and Excel 2007 + $csv_separator = ';'; + break; + case 'max_excel2003': + $csv_separator = ';'; + break; + case 'max_excel2008': + $csv_separator = ','; + break; + } $csv_enclosed = '"'; $csv_escaped = '"'; if (isset($GLOBALS['excel_columns'])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-23-gcda9df7
by Marc Delisle 12 Jul '10

12 Jul '10

The branch, QA_3_3 has been updated via cda9df71016cd7a85d93fbe5b38da6f532c938de (commit) from b55ba34d43138b11b71d8eeae6b09ea160ded213 (commit) - Log ----------------------------------------------------------------- commit cda9df71016cd7a85d93fbe5b38da6f532c938de Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 12 08:56:30 2010 -0400 bug [export] CSV for MS Excel (Windows) should have semi-colon as separator ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/export/csv.php | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index de56291..ab9802e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from master, todo: update PHP excel?) - bug #3023507 [core] No result set display from stored procedure SELECT +- bug [export] CSV for MS Excel (Windows) should have semi-colon as separator 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 9a8e520..ebcf0cd 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -70,7 +70,18 @@ function PMA_exportHeader() { // Here we just prepare some values for export if ($what == 'excel') { $csv_terminated = "\015\012"; - $csv_separator = isset($GLOBALS['excel_edition']) && $GLOBALS['excel_edition'] == 'mac_excel2003' ? ';' : ','; + switch($GLOBALS['excel_edition']) { + case 'win': + // as tested on Windows with Excel 2002 and Excel 2007 + $csv_separator = ';'; + break; + case 'max_excel2003': + $csv_separator = ';'; + break; + case 'max_excel2008': + $csv_separator = ','; + break; + } $csv_enclosed = '"'; $csv_escaped = '"'; if (isset($GLOBALS['excel_columns'])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5336-gce2cad2
by Marc Delisle 11 Jul '10

11 Jul '10

The branch, master has been updated via ce2cad288666f2bfd71dc21ae8e0277288834657 (commit) via b55ba34d43138b11b71d8eeae6b09ea160ded213 (commit) via b2616ac46ddbc72ee3a03f13ee4d4ec746518274 (commit) from 90ce4c77b38f5e51b35fea23125df861ed3bd1cc (commit) - Log ----------------------------------------------------------------- commit ce2cad288666f2bfd71dc21ae8e0277288834657 Merge: 90ce4c77b38f5e51b35fea23125df861ed3bd1cc b55ba34d43138b11b71d8eeae6b09ea160ded213 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 11 08:05:50 2010 -0400 fix merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ libraries/db_common.inc.php | 13 ++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 867bebf..6373434 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,9 @@ $Id$ - bug #3024344 [setup] Setup forces numeric MemoryLimit - bug #3025975 [auth] Odd LoginCookieValidity default value - bug #3026400 [PHP] ereg functions are deprecated +- bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from +master, todo: update PHP excel?) +- bug #3023507 [core] No result set display from stored procedure SELECT 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 955e7c8..5d16995 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -37,12 +37,19 @@ $err_url = $cfg['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db); * Ensures the database exists (else move to the "parent" script) and displays * headers */ -if (!isset($is_db) || !$is_db) { - // Not a valid db name -> back to the welcome page +if (! isset($is_db) || ! $is_db) { if (strlen($db)) { $is_db = PMA_DBI_select_db($db); + // This "Command out of sync" 2014 error may happen, for example + // after calling a MySQL procedure; at this point we can't select + // the db but it's not necessarily wrong + if (PMA_DBI_getError() && $GLOBALS['errno'] == 2014) { + $is_db = true; + unset($GLOBALS['errno']); + } } - if (! strlen($db) || !$is_db) { + // Not a valid db name -> back to the welcome page + if (! strlen($db) || ! $is_db) { PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'main.php?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1'); exit; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-22-gb55ba34
by Marc Delisle 11 Jul '10

11 Jul '10

The branch, QA_3_3 has been updated via b55ba34d43138b11b71d8eeae6b09ea160ded213 (commit) from b2616ac46ddbc72ee3a03f13ee4d4ec746518274 (commit) - Log ----------------------------------------------------------------- commit b55ba34d43138b11b71d8eeae6b09ea160ded213 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 11 08:00:42 2010 -0400 bug #3023507 [core] No result set display from stored procedure SELECT ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/db_common.inc.php | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc0822b..de56291 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3026400 [PHP] ereg functions are deprecated - bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from master, todo: update PHP excel?) +- bug #3023507 [core] No result set display from stored procedure SELECT 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 955e7c8..5d16995 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -37,12 +37,19 @@ $err_url = $cfg['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db); * Ensures the database exists (else move to the "parent" script) and displays * headers */ -if (!isset($is_db) || !$is_db) { - // Not a valid db name -> back to the welcome page +if (! isset($is_db) || ! $is_db) { if (strlen($db)) { $is_db = PMA_DBI_select_db($db); + // This "Command out of sync" 2014 error may happen, for example + // after calling a MySQL procedure; at this point we can't select + // the db but it's not necessarily wrong + if (PMA_DBI_getError() && $GLOBALS['errno'] == 2014) { + $is_db = true; + unset($GLOBALS['errno']); + } } - if (! strlen($db) || !$is_db) { + // Not a valid db name -> back to the welcome page + if (! strlen($db) || ! $is_db) { PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'main.php?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1'); exit; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-21-gb2616ac
by Marc Delisle 10 Jul '10

10 Jul '10

The branch, QA_3_3 has been updated via b2616ac46ddbc72ee3a03f13ee4d4ec746518274 (commit) from 20d4c3a894a70850b9bcac57a3d63af68d40ec2e (commit) - Log ----------------------------------------------------------------- commit b2616ac46ddbc72ee3a03f13ee4d4ec746518274 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jul 10 08:01:07 2010 -0400 bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from master, todo: update PHP excel?) ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/auth/swekey/swekey.auth.lib.php | 2 +- libraries/import/csv.php | 2 +- libraries/import/ldi.php | 2 +- server_synchronize.php | 8 ++++---- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 205dd32..fc0822b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3024344 [setup] Setup forces numeric MemoryLimit - bug #3025975 [auth] Odd LoginCookieValidity default value - bug #3026400 [PHP] ereg functions are deprecated +- bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from +master, todo: update PHP excel?) 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php index f1e7c58..3dbad75 100644 --- a/libraries/auth/swekey/swekey.auth.lib.php +++ b/libraries/auth/swekey/swekey.auth.lib.php @@ -21,7 +21,7 @@ function Swekey_auth_check() if ($_SESSION['SWEKEY']['ENABLED'] && empty($_SESSION['SWEKEY']['CONF_LOADED'])) { $_SESSION['SWEKEY']['CONF_LOADED'] = true; $_SESSION['SWEKEY']['VALID_SWEKEYS'] = array(); - $valid_swekeys = split("\n",@file_get_contents($confFile)); + $valid_swekeys = explode("\n",@file_get_contents($confFile)); foreach ($valid_swekeys as $line) { if (preg_match("/^[0-9A-F]{32}:.+$/", $line) != false) { diff --git a/libraries/import/csv.php b/libraries/import/csv.php index f7ab3ed..193a6e1 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -101,7 +101,7 @@ if (!$analyze) { } else { $sql_template .= ' ('; $fields = array(); - $tmp = split(',( ?)', $csv_columns); + $tmp = preg_split('/,( ?)/', $csv_columns); foreach ($tmp as $key => $val) { if (count($fields) > 0) { $sql_template .= ', '; diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index 77ba0c1..f939a2d 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -90,7 +90,7 @@ if ($skip_queries > 0) { } if (strlen($ldi_columns) > 0) { $sql .= ' ('; - $tmp = split(',( ?)', $ldi_columns); + $tmp = preg_split('/,( ?)/', $ldi_columns); $cnt_tmp = count($tmp); for ($i = 0; $i < $cnt_tmp; $i++) { if ($i > 0) { diff --git a/server_synchronize.php b/server_synchronize.php index 8e4a701..a3c3266 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -535,20 +535,20 @@ if (isset($_REQUEST['Table_ids'])) { for ($i = 0; isset($_REQUEST[$i]); $i++ ) { if (isset($_REQUEST[$i])) { - $table_id = split("US", $_REQUEST[$i]); + $table_id = explode("US", $_REQUEST[$i]); if (isset($table_id[1])) { $uncommon_table_structure_diff[] = $table_id[1]; } - $table_id = split("UD", $_REQUEST[$i]); + $table_id = explode("UD", $_REQUEST[$i]); if (isset($table_id[1])) { $uncommon_table_data_diff[] = $table_id[1]; } - $table_id = split("MS", $_REQUEST[$i]); + $table_id = explode("MS", $_REQUEST[$i]); if (isset($table_id[1])) { $matching_table_structure_diff[] = $table_id[1]; } - $table_id = split("MD", $_REQUEST[$i]); + $table_id = explode("MD", $_REQUEST[$i]); if (isset($table_id[1])) { $matching_table_data_diff[] = $table_id[1]; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5333-g90ce4c7
by Marc Delisle 08 Jul '10

08 Jul '10

The branch, master has been updated via 90ce4c77b38f5e51b35fea23125df861ed3bd1cc (commit) from c1be602a1edf316ce75234cdca36c4a60ba16aa3 (commit) - Log ----------------------------------------------------------------- commit 90ce4c77b38f5e51b35fea23125df861ed3bd1cc Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jul 8 08:29:27 2010 -0400 clarify code ----------------------------------------------------------------------- Summary of changes: db_structure.php | 20 ++++++++++---------- libraries/replication.inc.php | 15 +++++++++------ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/db_structure.php b/db_structure.php index 90b7824..e99cfa3 100644 --- a/db_structure.php +++ b/db_structure.php @@ -360,24 +360,24 @@ foreach ($tables as $keyname => $each_table) { ) { $do = true; } - foreach ($server_slave_Wild_Do_Table as $table) { - if (($db == PMA_replication_strout($table)) && (preg_match("@^" . substr(PMA_replication_strout($table, true), 0, strlen(PMA_replication_strout($table, true)) - 1) . "@", $truename))) + foreach ($server_slave_Wild_Do_Table as $db_table) { + $table_part = PMA_extract_db_or_table($db_table, 'table'); + if (($db == PMA_extract_db_or_table($db_table, 'db')) && (preg_match("@^" . substr($table_part, 0, strlen($table_part) - 1) . "@", $truename))) { $do = true; + } } //////////////////////////////////////////////////////////////////// if ((strlen(array_search($truename, $server_slave_Ignore_Table)) > 0) || (strlen(array_search($db, $server_slave_Ignore_DB)) > 0)) { $ignored = true; } - foreach ($server_slave_Wild_Ignore_Table as $table) { - if (($db == PMA_replication_strout($table)) && (preg_match("@^" . substr(PMA_replication_strout($table, true), 0, strlen(PMA_replication_strout($table, true)) - 1) . "@", $truename))) + foreach ($server_slave_Wild_Ignore_Table as $db_table) { + $table_part = PMA_extract_db_or_table($db_table, 'table'); + if (($db == PMA_extract_db_or_table($db_table)) && (preg_match("@^" . substr($table_part, 0, strlen($table_part) - 1) . "@", $truename))) { $ignored = true; + } } - }/* elseif ($server_master_status) { - if ((strlen(array_search($db, $server_master_Do_DB))>0) || count($server_master_Do_DB)==1) - $do = true; - elseif ((strlen(array_search($db, $server_master_Ignore_DB))>0) || count($server_master_Ignore_DB)==1) - $ignored = true; - }*/ + unset($table_part); + } ?> <tr class="<?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> <td align="center"> diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index f2681a6..7b8ca0a 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -116,14 +116,17 @@ foreach ($replication_types as $type) { /** - * @param $string - - * @param $table - - * @return + * @param $string contains "dbname.tablename" + * @param $what what to extract (db|table) + * @return $string the extracted part */ -function PMA_replication_strout($string, $table = false) { +function PMA_extract_db_or_table($string, $what = 'db') { $list = explode(".", $string); - - return $list[(int)$table]; + if ('db' == $what) { + return $list[0]; + } else { + return $list[1]; + } } /** * @param String $action - possible values: START or STOP hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5332-gc1be602
by Marc Delisle 08 Jul '10

08 Jul '10

The branch, master has been updated via c1be602a1edf316ce75234cdca36c4a60ba16aa3 (commit) via 20d4c3a894a70850b9bcac57a3d63af68d40ec2e (commit) from 638fe75a8b36df3049d4cc1dec7e734c71feff6c (commit) - Log ----------------------------------------------------------------- commit c1be602a1edf316ce75234cdca36c4a60ba16aa3 Merge: 638fe75a8b36df3049d4cc1dec7e734c71feff6c 20d4c3a894a70850b9bcac57a3d63af68d40ec2e Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jul 8 07:52:47 2010 -0400 fix merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + db_structure.php | 4 ++-- libraries/import.lib.php | 18 +++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 61d2c52..867bebf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ $Id$ - bug [js] Avoid loading twice a js file - bug #3024344 [setup] Setup forces numeric MemoryLimit - bug #3025975 [auth] Odd LoginCookieValidity default value +- bug #3026400 [PHP] ereg functions are deprecated 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/db_structure.php b/db_structure.php index 65b78b7..90b7824 100644 --- a/db_structure.php +++ b/db_structure.php @@ -361,7 +361,7 @@ foreach ($tables as $keyname => $each_table) { $do = true; } foreach ($server_slave_Wild_Do_Table as $table) { - if (($db == PMA_replication_strout($table)) && (ereg("^".substr(PMA_replication_strout($table, true), 0, strlen(PMA_replication_strout($table, true))-1), $truename))) + if (($db == PMA_replication_strout($table)) && (preg_match("@^" . substr(PMA_replication_strout($table, true), 0, strlen(PMA_replication_strout($table, true)) - 1) . "@", $truename))) $do = true; } //////////////////////////////////////////////////////////////////// @@ -369,7 +369,7 @@ foreach ($tables as $keyname => $each_table) { $ignored = true; } foreach ($server_slave_Wild_Ignore_Table as $table) { - if (($db == PMA_replication_strout($table)) && (ereg("^".substr(PMA_replication_strout($table, true), 0, strlen(PMA_replication_strout($table, true))-1), $truename))) + if (($db == PMA_replication_strout($table)) && (preg_match("@^" . substr(PMA_replication_strout($table, true), 0, strlen(PMA_replication_strout($table, true)) - 1) . "@", $truename))) $ignored = true; } }/* elseif ($server_master_status) { diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 2b5d80b..e012287 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -831,8 +831,8 @@ $import_notice = NULL; * @uses SIZES * @uses strcmp() * @uses count() - * @uses ereg() - * @uses ereg_replace() + * @uses preg_match() + * @uses preg_replace() * @uses PMA_isView() * @uses PMA_backquote() * @uses PMA_importRunQuery() @@ -903,17 +903,17 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = * * $pattern = 'CREATE (TABLE|VIEW|TRIGGER|FUNCTION|PROCEDURE)'; */ - $pattern = 'CREATE .*(TABLE)'; + $pattern = '/CREATE .*(TABLE)/'; $replacement = 'CREATE \\1 IF NOT EXISTS'; /* Change CREATE statements to CREATE IF NOT EXISTS to support inserting into existing structures */ for ($i = 0; $i < $additional_sql_len; ++$i) { - $additional_sql[$i] = ereg_replace($pattern, $replacement, $additional_sql[$i]); + $additional_sql[$i] = preg_replace($pattern, $replacement, $additional_sql[$i]); /* Execute the resulting statements */ PMA_importRunQuery($additional_sql[$i], $additional_sql[$i]); } } - + if ($analyses != NULL) { $type_array = array(NONE => "NULL", VARCHAR => "varchar", INT => "int", DECIMAL => "decimal"); @@ -1038,8 +1038,8 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = /* Add the viewable structures from $additional_sql to $tables so they are also displayed */ - $view_pattern = 'VIEW `[^`]+`\.`([^`]+)'; - $table_pattern = 'CREATE TABLE IF NOT EXISTS `([^`]+)`'; + $view_pattern = '@VIEW `[^`]+`\.`([^`]+)@'; + $table_pattern = '@CREATE TABLE IF NOT EXISTS `([^`]+)`@'; /* Check a third pattern to make sure its not a "USE `db_name`;" statement */ $regs = array(); @@ -1048,10 +1048,10 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = $additional_sql_len = count($additional_sql); for ($i = 0; $i < $additional_sql_len; ++$i) { - ereg($view_pattern, $additional_sql[$i], $regs); + preg_match($view_pattern, $additional_sql[$i], $regs); if (count($regs) == 0) { - ereg($table_pattern, $additional_sql[$i], $regs); + preg_match($table_pattern, $additional_sql[$i], $regs); } if (count($regs)) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-20-g20d4c3a
by Marc Delisle 08 Jul '10

08 Jul '10

The branch, QA_3_3 has been updated via 20d4c3a894a70850b9bcac57a3d63af68d40ec2e (commit) from 104b0ee99ac77845511c91dcaefe4f315c3c4435 (commit) - Log ----------------------------------------------------------------- commit 20d4c3a894a70850b9bcac57a3d63af68d40ec2e Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jul 8 07:49:11 2010 -0400 bug #3026400 [PHP] ereg functions are deprecated ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + db_structure.php | 12 ++++++------ libraries/import.lib.php | 18 +++++++++--------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9da63ad..205dd32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug [js] Avoid loading twice a js file - bug #3024344 [setup] Setup forces numeric MemoryLimit - bug #3025975 [auth] Odd LoginCookieValidity default value +- bug #3026400 [PHP] ereg functions are deprecated 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/db_structure.php b/db_structure.php index 845ffd3..2171ea5 100644 --- a/db_structure.php +++ b/db_structure.php @@ -349,26 +349,26 @@ foreach ($tables as $keyname => $each_table) { $ignored = false; $do = false; - + if ($server_slave_status) { //////////////////////////////////////////////////////////////// if ((strlen(array_search($truename, $server_slave_Do_Table)) > 0) - || (strlen(array_search($db, $server_slave_Do_DB))>0) - || (count($server_slave_Do_DB)==1 && count($server_slave_Ignore_DB)==1) + || (strlen(array_search($db, $server_slave_Do_DB)) > 0) + || (count($server_slave_Do_DB) == 1 && count($server_slave_Ignore_DB) == 1) ) { $do = true; } foreach ($server_slave_Wild_Do_Table as $table) { - if (($db == PMA_replication_strout($table)) && (ereg("^".substr(PMA_replication_strout($table, true), 0, strlen(PMA_replication_strout($table, true))-1), $truename))) + if (($db == PMA_replication_strout($table)) && (preg_match("@^" . substr(PMA_replication_strout($table, true), 0, strlen(PMA_replication_strout($table, true)) - 1) . "@", $truename))) $do = true; } //////////////////////////////////////////////////////////////////// - if ((strlen(array_search($truename, $server_slave_Ignore_Table))>0) || (strlen(array_search($db, $server_slave_Ignore_DB))>0)) { + if ((strlen(array_search($truename, $server_slave_Ignore_Table)) > 0) || (strlen(array_search($db, $server_slave_Ignore_DB)) > 0)) { $ignored = true; } foreach ($server_slave_Wild_Ignore_Table as $table) { - if (($db == PMA_replication_strout($table)) && (ereg("^".substr(PMA_replication_strout($table, true), 0, strlen(PMA_replication_strout($table, true))-1), $truename))) + if (($db == PMA_replication_strout($table)) && (preg_match("@^" . substr(PMA_replication_strout($table, true), 0, strlen(PMA_replication_strout($table, true)) - 1) . "@", $truename))) $ignored = true; } }/* elseif ($server_master_status) { diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 58f3fd1..56caeeb 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -840,8 +840,8 @@ $import_notice = NULL; * @uses SIZES * @uses strcmp() * @uses count() - * @uses ereg() - * @uses ereg_replace() + * @uses preg_match() + * @uses preg_replace() * @uses PMA_isView() * @uses PMA_backquote() * @uses PMA_importRunQuery() @@ -912,17 +912,17 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = * * $pattern = 'CREATE (TABLE|VIEW|TRIGGER|FUNCTION|PROCEDURE)'; */ - $pattern = 'CREATE .*(TABLE)'; + $pattern = '/CREATE .*(TABLE)/'; $replacement = 'CREATE \\1 IF NOT EXISTS'; /* Change CREATE statements to CREATE IF NOT EXISTS to support inserting into existing structures */ for ($i = 0; $i < $additional_sql_len; ++$i) { - $additional_sql[$i] = ereg_replace($pattern, $replacement, $additional_sql[$i]); + $additional_sql[$i] = preg_replace($pattern, $replacement, $additional_sql[$i]); /* Execute the resulting statements */ PMA_importRunQuery($additional_sql[$i], $additional_sql[$i]); } } - + if ($analyses != NULL) { $type_array = array(NONE => "NULL", VARCHAR => "varchar", INT => "int", DECIMAL => "decimal"); @@ -1047,8 +1047,8 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = /* Add the viewable structures from $additional_sql to $tables so they are also displayed */ - $view_pattern = 'VIEW `[^`]+`\.`([^`]+)'; - $table_pattern = 'CREATE TABLE IF NOT EXISTS `([^`]+)`'; + $view_pattern = '@VIEW `[^`]+`\.`([^`]+)@'; + $table_pattern = '@CREATE TABLE IF NOT EXISTS `([^`]+)`@'; /* Check a third pattern to make sure its not a "USE `db_name`;" statement */ $regs = array(); @@ -1057,10 +1057,10 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = $additional_sql_len = count($additional_sql); for ($i = 0; $i < $additional_sql_len; ++$i) { - ereg($view_pattern, $additional_sql[$i], $regs); + preg_match($view_pattern, $additional_sql[$i], $regs); if (count($regs) == 0) { - ereg($table_pattern, $additional_sql[$i], $regs); + preg_match($table_pattern, $additional_sql[$i], $regs); } if (count($regs)) { hooks/post-receive -- phpMyAdmin

1 0