- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2072-gdfa7121
by Michal Čihař 22 Apr '10

22 Apr '10

The branch, master has been updated via dfa712179b024896ea06cfc7b853e80829fef76f (commit) from ae63490dd98695bfc04b0ffff2027fae61b8414f (commit) - Log ----------------------------------------------------------------- commit dfa712179b024896ea06cfc7b853e80829fef76f Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 22 20:40:47 2010 +0200 Also this one is used later. ----------------------------------------------------------------------- Summary of changes: tbl_replace.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_replace.php b/tbl_replace.php index 3758811..ffa1574 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -325,7 +325,7 @@ if ($is_insert && count($value_sets) > 0) { . ' (' . implode(', ', $query_fields) . ') VALUES (' . implode('), (', $value_sets) . ')'; unset($insert_command); - unset($query_fields, $value_sets); + unset($query_fields); } elseif (empty($query)) { // No change -> move back to the calling script $message = PMA_Message::success('strNoModification'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2071-gae63490
by Michal Čihař 22 Apr '10

22 Apr '10

The branch, master has been updated via ae63490dd98695bfc04b0ffff2027fae61b8414f (commit) from cc5f5246788e08fd226472e809c818dfd57bfd80 (commit) - Log ----------------------------------------------------------------- commit ae63490dd98695bfc04b0ffff2027fae61b8414f Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 22 20:38:43 2010 +0200 Can not unset is_insert here, it is used later. ----------------------------------------------------------------------- Summary of changes: tbl_replace.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_replace.php b/tbl_replace.php index f19049b..3758811 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -335,7 +335,7 @@ if ($is_insert && count($value_sets) > 0) { require './' . PMA_securePath($goto_include); exit; } -unset($me_fields, $is_insert, $is_insertignore); +unset($me_fields, $is_insertignore); /** * Executes the sql query and get the result, then move back to the calling hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2070-gcc5f524
by Michal Čihař 22 Apr '10

22 Apr '10

The branch, master has been updated via cc5f5246788e08fd226472e809c818dfd57bfd80 (commit) from 87590bc79508ab7c864d6ca3708cb583bc178bf8 (commit) - Log ----------------------------------------------------------------- commit cc5f5246788e08fd226472e809c818dfd57bfd80 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 22 20:34:20 2010 +0200 Fix wrong translation. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/cs.po b/po/cs.po index 04eb1f8..cda9485 100644 --- a/po/cs.po +++ b/po/cs.po @@ -370,7 +370,7 @@ msgstr "Pravoúhlé spoje" #: libraries/messages.inc.php:68 #, php-format msgid "An index has been added on %s" -msgstr "K tabulce %s byl přidán index" +msgstr "Na sloupci %s byl vytvořen index" #: libraries/messages.inc.php:69 msgid "Any" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2069-g87590bc
by Michal Čihař 22 Apr '10

22 Apr '10

The branch, master has been updated via 87590bc79508ab7c864d6ca3708cb583bc178bf8 (commit) from c1f536637b6d7a8b8a5bacef6baa4f779100942d (commit) - Log ----------------------------------------------------------------- commit 87590bc79508ab7c864d6ca3708cb583bc178bf8 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 22 20:25:57 2010 +0200 Clarify code for calculating number of updates/inserts. ----------------------------------------------------------------------- Summary of changes: server_synchronize.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server_synchronize.php b/server_synchronize.php index afa7cce..4467a31 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -283,14 +283,14 @@ if ((isset($_REQUEST['submit_connect']))) { * Display the matching tables' names and difference, first */ for($i = 0; $i < count($matching_tables); $i++) { - $num_of_updates = 0; - $num_of_insertions = 0; /** * Calculating the number of updates for each matching table */ if (isset($update_array[$i]) && isset($update_array[$i][0]) && isset($update_array[$i][0][$matching_tables_keys[$i][0]])) { $num_of_updates = sizeof($update_array[$i]); + } else { + $num_of_updates = 0; } /** * Calculating the number of insertions for each matching table @@ -298,6 +298,8 @@ if ((isset($_REQUEST['submit_connect']))) { if (isset($insert_array[$i]) && isset($insert_array[$i][0]) && isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) { $num_of_insertions = sizeof($insert_array[$i]); + } else { + $num_of_insertions = 0; } /** * Displays the name of the matching table hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2068-gc1f5366
by Michal Čihař 22 Apr '10

22 Apr '10

The branch, master has been updated via c1f536637b6d7a8b8a5bacef6baa4f779100942d (commit) via 5951117ea1ab526ff64afd3e21323c975c22b312 (commit) from 9978dddea23153eaa11e03c1c7145729a5e58229 (commit) - Log ----------------------------------------------------------------- commit c1f536637b6d7a8b8a5bacef6baa4f779100942d Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 22 20:25:13 2010 +0200 All logic can be done in single if. We should also check if [0] element is set. commit 5951117ea1ab526ff64afd3e21323c975c22b312 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 22 20:23:45 2010 +0200 These values are initialized to 0, no need to explicitely reset them. ----------------------------------------------------------------------- Summary of changes: server_synchronize.php | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/server_synchronize.php b/server_synchronize.php index b263ba2..afa7cce 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -288,26 +288,16 @@ if ((isset($_REQUEST['submit_connect']))) { /** * Calculating the number of updates for each matching table */ - if (isset($update_array[$i])) { - if (isset($update_array[$i][0][$matching_tables_keys[$i][0]])) { - $num_of_updates = sizeof($update_array[$i]); - } else { - $num_of_updates = 0; - } - } else { - $num_of_updates = 0; + if (isset($update_array[$i]) && isset($update_array[$i][0]) && + isset($update_array[$i][0][$matching_tables_keys[$i][0]])) { + $num_of_updates = sizeof($update_array[$i]); } /** * Calculating the number of insertions for each matching table */ - if (isset($insert_array[$i])) { - if (isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) { - $num_of_insertions = sizeof($insert_array[$i]); - } else { - $num_of_insertions = 0; - } - } else { - $num_of_insertions = 0; + if (isset($insert_array[$i]) && isset($insert_array[$i][0]) && + isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) { + $num_of_insertions = sizeof($insert_array[$i]); } /** * Displays the name of the matching table hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2066-g9978ddd
by Michal Čihař 22 Apr '10

22 Apr '10

The branch, master has been updated via 9978dddea23153eaa11e03c1c7145729a5e58229 (commit) from 20925728e7266ee877049bffe4824b720c4b1549 (commit) - Log ----------------------------------------------------------------- commit 9978dddea23153eaa11e03c1c7145729a5e58229 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 22 20:22:53 2010 +0200 Avoid duplicate testing if array element is set. ----------------------------------------------------------------------- Summary of changes: server_synchronize.php | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/server_synchronize.php b/server_synchronize.php index ba905d3..b263ba2 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -290,28 +290,24 @@ if ((isset($_REQUEST['submit_connect']))) { */ if (isset($update_array[$i])) { if (isset($update_array[$i][0][$matching_tables_keys[$i][0]])) { - if (isset($update_array[$i])) { - $num_of_updates = sizeof($update_array[$i]); - } else { - $num_of_updates = 0; - } + $num_of_updates = sizeof($update_array[$i]); } else { - $num_of_updates = 0; + $num_of_updates = 0; } + } else { + $num_of_updates = 0; } /** * Calculating the number of insertions for each matching table */ if (isset($insert_array[$i])) { if (isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) { - if (isset($insert_array[$i])) { - $num_of_insertions = sizeof($insert_array[$i]); - } else { - $num_of_insertions = 0; - } + $num_of_insertions = sizeof($insert_array[$i]); } else { $num_of_insertions = 0; } + } else { + $num_of_insertions = 0; } /** * Displays the name of the matching table hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2065-g2092572
by Michal Čihař 22 Apr '10

22 Apr '10

The branch, master has been updated via 20925728e7266ee877049bffe4824b720c4b1549 (commit) from e7f528e0b7f5c9c370cd657e60c5f251353c87a1 (commit) - Log ----------------------------------------------------------------- commit 20925728e7266ee877049bffe4824b720c4b1549 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 22 20:21:07 2010 +0200 Replace other usages of deprecated split(). ----------------------------------------------------------------------- Summary of changes: libraries/auth/swekey/swekey.auth.lib.php | 2 +- libraries/import/csv.php | 28 ++++++++++++++-------------- libraries/import/ldi.php | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php index f1e7c58..729c882 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..c6aebdf 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -31,7 +31,7 @@ if (isset($plugin_list)) { ), 'options_text' => 'strOptions', ); - + if ($plugin_param !== 'table') { $plugin_list['csv']['options'][] = array('type' => 'bool', 'name' => 'col_names', 'text' => 'strImportColNames'); @@ -39,7 +39,7 @@ if (isset($plugin_list)) { $plugin_list['csv']['options'][] = array('type' => 'text', 'name' => 'columns', 'text' => 'strColumnNames'); } - + /* We do not define function when plugin is just queried for information above */ return; } @@ -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 .= ', '; @@ -126,7 +126,7 @@ if (!$analyze) { } $sql_template .= ') '; } - + $required_fields = count($fields); $sql_template .= ' VALUES ('; @@ -287,18 +287,18 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { if (!$csv_finish) { $values[] = ''; } - + if ($analyze) { foreach ($values as $ley => $val) { $tempRow[] = $val; ++$col_count; } - + if ($col_count > $max_cols) { $max_cols = $col_count; } $col_count = 0; - + $rows[] = $tempRow; $tempRow = array(); } else { @@ -315,7 +315,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { break; } } - + $first = TRUE; $sql = $sql_template; foreach ($values as $key => $val) { @@ -331,13 +331,13 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { $first = FALSE; } $sql .= ')'; - + /** * @todo maybe we could add original line to verbose SQL in comment */ PMA_importRunQuery($sql, $sql); } - + $line++; $csv_finish = FALSE; $values = array(); @@ -358,26 +358,26 @@ if ($analyze) { $rows[$i][] = 'NULL'; } } - + if ($_REQUEST['csv_col_names']) { $col_names = array_splice($rows, 0, 1); $col_names = $col_names[0]; } - + if ((isset($col_names) && count($col_names) != $max_cols) || !isset($col_names)) { // Fill out column names for ($i = 0; $i < $max_cols; ++$i) { $col_names[] = 'COL '.($i+1); } } - + if (strlen($db)) { $result = PMA_DBI_fetch_result('SHOW TABLES'); $tbl_name = 'TABLE '.(count($result) + 1); } else { $tbl_name = 'TBL_NAME'; } - + $tables[] = array($tbl_name, $col_names, $rows); /* Obtain the best-fit MySQL types for each column */ 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) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2064-ge7f528e
by Michal Čihař 22 Apr '10

22 Apr '10

The branch, master has been updated via e7f528e0b7f5c9c370cd657e60c5f251353c87a1 (commit) via 6f5267e68ddbb116b18c36d750e2d94e7258991b (commit) via f946775a6a5cd56baf784ef9ec71a323aca6b142 (commit) from a293cda14ef5a9f360e293ab6d46216af55463f0 (commit) - Log ----------------------------------------------------------------- commit e7f528e0b7f5c9c370cd657e60c5f251353c87a1 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 22 20:16:26 2010 +0200 Avoid using split which is deprecated. commit 6f5267e68ddbb116b18c36d750e2d94e7258991b Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 22 20:14:32 2010 +0200 Fix typo. commit f946775a6a5cd56baf784ef9ec71a323aca6b142 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 22 20:13:38 2010 +0200 Revert description to match reality, thanks to Marc for spotting this. ----------------------------------------------------------------------- Summary of changes: Documentation.html | 3 +-- po/cs.po | 4 ++-- server_synchronize.php | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Documentation.html b/Documentation.html index a928301..4bf19ed 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4512,8 +4512,7 @@ the source and target corresponding tables. The difference is depicted by the red and green buttons with S and D letters, indicating that either Structure or Data are not up to date. By -clicking on them, they will turn grey, what means that no -synchronisation will be done. +clicking on them, they will turn grey, what means that they will be synchronised.  diff --git a/po/cs.po b/po/cs.po index d633522..04eb1f8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -3659,7 +3659,7 @@ msgstr "Stav podřízeného" #: libraries/messages.inc.php:808 msgid "Synchronize databases with master" -msgstr "Synchronovat databáze s nadřízeným" +msgstr "Synchronizovat databáze s nadřízeným" #: libraries/messages.inc.php:809 msgid "Unable to change master" @@ -4976,7 +4976,7 @@ msgstr "" #: libraries/messages.inc.php:1071 msgid "Synchronize Databases" -msgstr "Synchronovat databáze" +msgstr "Synchronizovat databáze" #: libraries/messages.inc.php:1072 msgid "Synchronize" diff --git a/server_synchronize.php b/server_synchronize.php index 440103d..ba905d3 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_2-2061-ga293cda
by Marc Delisle 22 Apr '10

22 Apr '10

The branch, master has been updated via a293cda14ef5a9f360e293ab6d46216af55463f0 (commit) from a3d19e0c906d56d6c489186e416b2f4328a8135a (commit) - Log ----------------------------------------------------------------- commit a293cda14ef5a9f360e293ab6d46216af55463f0 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 22 12:57:40 2010 -0400 Clarify the text ----------------------------------------------------------------------- Summary of changes: Documentation.html | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation.html b/Documentation.html index 09856b6..a928301 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4479,12 +4479,12 @@ tables of the databases can also be synchronized. You need to fill in the host name of the server, the username and password of an user account already there in MySQL. Port is by default populated with 3306 (MySQL default port). Then the name of the database -should be mentioned at the end.All the information other than the port +should be mentioned at the end. All the information other than the port needs to be filled explicitly for the source as well as target servers. -After successfully by passing authentication phase, the source and +After successfully passing through the authentication phase, the source and target database table names will be displayed. It will be a tabular representation. @@ -4493,8 +4493,8 @@ representation. On the left, are listed the source database table names. Some of the names have a ‘+’ plus sign preceding them. This shows that these tables are only present in source database and they need to be added to the -target database in order to synchronize the target database.While those -table name that are not preceded by a ‘+’ sign are also present in +target database in order to synchronize the target database. The tables +whose names are not preceded by a ‘+’ sign are already present in the target database. @@ -4511,7 +4511,7 @@ the source and target corresponding tables. The difference is depicted by the red and green buttons with S and D -letters. Indicating that either Structure or Data are not up to date. By +letters, indicating that either Structure or Data are not up to date. By clicking on them, they will turn grey, what means that no synchronisation will be done. hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2060-ga3d19e0
by Michal Čihař 22 Apr '10

22 Apr '10

The branch, master has been updated via a3d19e0c906d56d6c489186e416b2f4328a8135a (commit) from 7faaf32f501187eaaa5e830ca97807f8f2ba1cd5 (commit) - Log ----------------------------------------------------------------- commit a3d19e0c906d56d6c489186e416b2f4328a8135a Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 22 15:55:34 2010 +0200 Fix typo introduced by last commit. ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index 9ed142e..09856b6 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1,4 +1,4 @@ -<G!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <!-- vim: expandtab ts=4 sw=4 sts=4 tw=78 hooks/post-receive -- phpMyAdmin

1 0