Git July 2011

git@phpmyadmin.net

6 participants
320 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11155-g64dd497
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 64dd497a6f33625ef04bc43b29365e4640b99002 (commit) from 56a3f0c874b669a2001618ec19d4361544354ec7 (commit) - Log ----------------------------------------------------------------- commit 64dd497a6f33625ef04bc43b29365e4640b99002 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 13:39:32 2011 +0200 Fix indentation ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 40 +++++++++++++++++----------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index aabee6b..ef65e05 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -7,18 +7,18 @@ */ /** -* PMA_getMatchingTables places matching tables in source -* and target databases in $matching_tables array whereas -* $uncommon_source_tables array gets the tables present in -* source database but are absent from target database. -* Criterion for matching tables is just comparing their names. -* -* @param array $trg_tables array of target database table names, -* @param array $src_tables array of source database table names, -* @param array &$matching_tables empty array passed by reference to save names of matching tables, -* @param array &$uncommon_source_tables empty array passed by reference to save names of tables present in -* source database but absent from target database -*/ + * PMA_getMatchingTables places matching tables in source + * and target databases in $matching_tables array whereas + * $uncommon_source_tables array gets the tables present in + * source database but are absent from target database. + * Criterion for matching tables is just comparing their names. + * + * @param array $trg_tables array of target database table names, + * @param array $src_tables array of source database table names, + * @param array &$matching_tables empty array passed by reference to save names of matching tables, + * @param array &$uncommon_source_tables empty array passed by reference to save names of tables present in + * source database but absent from target database + */ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$uncommon_source_tables) { for ($k=0; $k< sizeof($src_tables); $k++) { @@ -36,14 +36,14 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$un } /** -* PMA_getNonMatchingTargetTables() places tables present -* in target database but are absent from source database -* -* @param array $trg_tables array of target database table names, -* @param array $matching_tables $matching tables array containing names of matching tables, -* @param array &$uncommon_target_tables empty array passed by reference to save names of tables presnet in -* target database but absent from source database -*/ + * PMA_getNonMatchingTargetTables() places tables present + * in target database but are absent from source database + * + * @param array $trg_tables array of target database table names, + * @param array $matching_tables $matching tables array containing names of matching tables, + * @param array &$uncommon_target_tables empty array passed by reference to save names of tables presnet in + * target database but absent from source database + */ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommon_target_tables) { for ($c=0; $c<sizeof($trg_tables) ;$c++) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11154-g56a3f0c
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 56a3f0c874b669a2001618ec19d4361544354ec7 (commit) from ab1e5a3755dcf8c70f9be60a89ac10d825d84d92 (commit) - Log ----------------------------------------------------------------- commit 56a3f0c874b669a2001618ec19d4361544354ec7 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 13:39:04 2011 +0200 Fix function docblock ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 504b8fc..aabee6b 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -39,10 +39,9 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$un * PMA_getNonMatchingTargetTables() places tables present * in target database but are absent from source database * -* @param $trg_tables array of target database table names, -* -* @param $matching_tables $matching tables array containing names of matching tables, -* @param &$uncommon_target_tables empty array passed by reference to save names of tables presnet in +* @param array $trg_tables array of target database table names, +* @param array $matching_tables $matching tables array containing names of matching tables, +* @param array &$uncommon_target_tables empty array passed by reference to save names of tables presnet in * target database but absent from source database */ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommon_target_tables) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11153-gab1e5a3
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via ab1e5a3755dcf8c70f9be60a89ac10d825d84d92 (commit) via d1c5d981e515fddf6ae9aeaa82a6738d81729dcb (commit) from e55d178a42a6ee574018ae2de863362867da28ef (commit) - Log ----------------------------------------------------------------- commit ab1e5a3755dcf8c70f9be60a89ac10d825d84d92 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 13:38:14 2011 +0200 Fix function docblock commit d1c5d981e515fddf6ae9aeaa82a6738d81729dcb Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 13:37:07 2011 +0200 Add file level docblock ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index c04ddb2..504b8fc 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -1,5 +1,10 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Server synchronisation functions. + * + * @package phpMyAdmin + */ /** * PMA_getMatchingTables places matching tables in source @@ -8,11 +13,10 @@ * source database but are absent from target database. * Criterion for matching tables is just comparing their names. * -* @param $trg_tables array of target database table names, -* @param $src_tables array of source database table names, -* -* @param &$matching_tables empty array passed by reference to save names of matching tables, -* @param &$uncommon_source_tables empty array passed by reference to save names of tables present in +* @param array $trg_tables array of target database table names, +* @param array $src_tables array of source database table names, +* @param array &$matching_tables empty array passed by reference to save names of matching tables, +* @param array &$uncommon_source_tables empty array passed by reference to save names of tables present in * source database but absent from target database */ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$uncommon_source_tables) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11151-ge55d178
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via e55d178a42a6ee574018ae2de863362867da28ef (commit) via b790300deb7385f44485b0b2924ac065e53c56d9 (commit) from 42cd233d6955011a97564771df2c9889f2d27805 (commit) - Log ----------------------------------------------------------------- commit e55d178a42a6ee574018ae2de863362867da28ef Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 13:32:11 2011 +0200 This @todo does not make sense commit b790300deb7385f44485b0b2924ac065e53c56d9 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 13:31:49 2011 +0200 Whitespace cleanup ----------------------------------------------------------------------- Summary of changes: libraries/List_Database.class.php | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index 5e3912c..7616f60 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -71,8 +71,6 @@ require_once './libraries/List.class.php'; /** * checks if the configuration wants to hide some databases - * - * @todo temporaly use this docblock to test how to doc $GLOBALS */ protected function _checkHideDatabase() { @@ -128,14 +126,14 @@ require_once './libraries/List.class.php'; $this->_show_databases_disabled = true; } } - + if ($GLOBALS['cfg']['NaturalOrder']) { natsort($database_list); } else { // need to sort anyway, otherwise information_schema // goes at the top sort($database_list); - } + } return $database_list; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11149-g42cd233
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 42cd233d6955011a97564771df2c9889f2d27805 (commit) via a7716192c3304da2becf72a0c7743c93864d6daa (commit) from 07487b01b4cd7a7f48c83bc139538ccf17ca259c (commit) - Log ----------------------------------------------------------------- commit 42cd233d6955011a97564771df2c9889f2d27805 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 13:26:01 2011 +0200 Move custom CSS out of jquery generated files commit a7716192c3304da2becf72a0c7743c93864d6daa Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 13:25:46 2011 +0200 Whitespace cleanup ----------------------------------------------------------------------- Summary of changes: themes/original/css/theme_right.css.php | 10 ++++++---- themes/original/jquery/jquery-ui-1.8.custom.css | 2 -- themes/pmahomme/css/theme_right.css.php | 12 +++++++----- themes/pmahomme/jquery/jquery-ui-1.8.custom.css | 2 -- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 22a5494..94cd84a 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -965,7 +965,7 @@ img.sortableIcon { } h3#serverstatusqueries span { - font-size:60%; + font-size:60%; display:inline; } @@ -1046,9 +1046,9 @@ div#serverstatus table .tblFooters a:after { } div.liveChart { - clear:both; - min-width:500px; - height:400px; + clear:both; + min-width:500px; + height:400px; padding-bottom:80px; } @@ -2290,3 +2290,5 @@ span.mysql-number { .navigation select { margin: 0 0.8em; } +/* Timepicker */ +#ui-timepicker-div { z-index: 1003; } diff --git a/themes/original/jquery/jquery-ui-1.8.custom.css b/themes/original/jquery/jquery-ui-1.8.custom.css index edcb8e6..0ae653b 100644 --- a/themes/original/jquery/jquery-ui-1.8.custom.css +++ b/themes/original/jquery/jquery-ui-1.8.custom.css @@ -486,5 +486,3 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad ----------------------------------*/ .ui-progressbar { height:2em; text-align: left; } .ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } -/* Timepicker */ -#ui-timepicker-div { z-index: 1003; } diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 95f5cd6..0896b3f 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1171,7 +1171,7 @@ img.sortableIcon { } h3#serverstatusqueries span { - font-size:60%; + font-size:60%; display:inline; } @@ -1244,9 +1244,9 @@ div#serverstatus table .tblFooters a { } div.liveChart { - clear:both; - min-width:500px; - height:400px; + clear:both; + min-width:500px; + height:400px; padding-bottom:80px; } @@ -2680,7 +2680,7 @@ span.mysql-number { border-radius: 5px; -webkit-border-radius: 5px; -moz-border-radius: 5px; - + background-image: url(./themes/svg_gradient.php?from=eeeeee&to=cccccc); background-size: 100% 100%; background: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#cccccc)); @@ -2734,3 +2734,5 @@ span.mysql-number { .navigation select { margin: 0 0.8em; } +/* Timepicker */ +#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 ca2b44b..fd337dd 100644 --- a/themes/pmahomme/jquery/jquery-ui-1.8.custom.css +++ b/themes/pmahomme/jquery/jquery-ui-1.8.custom.css @@ -486,5 +486,3 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad ----------------------------------*/ .ui-progressbar { height:2em; text-align: left; } .ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } -/* Timepicker */ -#ui-timepicker-div { z-index: 1003; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11147-g07487b0
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 07487b01b4cd7a7f48c83bc139538ccf17ca259c (commit) from a7b1a56b28908a526a3b5ecdd001bf0648996869 (commit) - Log ----------------------------------------------------------------- commit 07487b01b4cd7a7f48c83bc139538ccf17ca259c Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 13:18:46 2011 +0200 Coding style ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 12d40c2..4b9ae81 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -80,11 +80,10 @@ function PMA_setDisplayMode(&$the_disp_mode, &$the_total) $do_display['bkm_form'] = (string) '0'; $do_display['text_btn'] = (string) '0'; $do_display['pview_lnk'] = (string) '0'; - } // 2.1 Statement is a "SELECT COUNT", a // "CHECK/ANALYZE/REPAIR/OPTIMIZE", an "EXPLAIN" one or // contains a "PROC ANALYSE" part - elseif ($GLOBALS['is_count'] || $GLOBALS['is_analyse'] || $GLOBALS['is_maint'] || $GLOBALS['is_explain']) { + } elseif ($GLOBALS['is_count'] || $GLOBALS['is_analyse'] || $GLOBALS['is_maint'] || $GLOBALS['is_explain']) { $do_display['edit_lnk'] = 'nn'; // no edit link $do_display['del_lnk'] = 'nn'; // no delete link $do_display['sort_lnk'] = (string) '0'; @@ -97,9 +96,8 @@ function PMA_setDisplayMode(&$the_disp_mode, &$the_total) $do_display['text_btn'] = (string) '0'; } $do_display['pview_lnk'] = (string) '1'; - } // 2.2 Statement is a "SHOW..." - elseif ($GLOBALS['is_show']) { + } elseif ($GLOBALS['is_show']) { /** * 2.2.1 * @todo defines edit/delete links depending on show statement @@ -120,11 +118,10 @@ function PMA_setDisplayMode(&$the_disp_mode, &$the_total) $do_display['bkm_form'] = (string) '1'; $do_display['text_btn'] = (string) '1'; $do_display['pview_lnk'] = (string) '1'; - } // 2.3 Other statements (ie "SELECT" ones) -> updates // $do_display['edit_lnk'], $do_display['del_lnk'] and // $do_display['text_btn'] (keeps other default values) - else { + } else { $prev_table = $fields_meta[0]->table; $do_display['text_btn'] = (string) '1'; for ($i = 0; $i < $GLOBALS['fields_cnt']; $i++) { @@ -310,7 +307,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di $pageNow = @floor($_SESSION['tmp_user_values']['pos'] / $_SESSION['tmp_user_values']['max_rows']) + 1; $nbTotalPage = @ceil($unlim_num_rows / $_SESSION['tmp_user_values']['max_rows']); - if ($nbTotalPage > 1){ //if2 + if ($nbTotalPage > 1) { //if2 ?> <td> <?php @@ -388,7 +385,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di } // end move toward // show separator if pagination happen - if ($nbTotalPage > 1){ + if ($nbTotalPage > 1) { echo '<td><div class="navigation_separator">|</div></td>'; } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11146-ga7b1a56
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via a7b1a56b28908a526a3b5ecdd001bf0648996869 (commit) from f1c526f17a7e0307fa9bcc52d40c643cb0dafff8 (commit) - Log ----------------------------------------------------------------- commit a7b1a56b28908a526a3b5ecdd001bf0648996869 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 13:09:30 2011 +0200 Fix indentation ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 64 ++++++++++++++++----------------- 1 files changed, 31 insertions(+), 33 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index ffbbea7..c04ddb2 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -174,35 +174,34 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching */ for ($m = 0; ($m < $fields_num[$matching_table_index]) && ($starting_index == 0) ; $m++) { if (isset($src_result_set[0][$fld[$m]])) { - if (isset($target_result_set[0][$fld[$m]])) { - if (($src_result_set[0][$fld[$m]] != $target_result_set[0][$fld[$m]]) && (! (in_array($fld[$m], $is_key)))) { - if (sizeof($is_key) == 1) { - if ($source_result_set[$j]) { - $update_array[$matching_table_index][$update_row][$is_key[0]] = $source_result_set[$j]; - } - } elseif (sizeof($is_key) > 1) { - for ($n=0; $n < sizeof($is_key); $n++) { - if (isset($src_result_set[0][$is_key[$n]])) { - $update_array[$matching_table_index][$update_row][$is_key[$n]] = $src_result_set[0][$is_key[$n]]; + if (isset($target_result_set[0][$fld[$m]])) { + if (($src_result_set[0][$fld[$m]] != $target_result_set[0][$fld[$m]]) && (! (in_array($fld[$m], $is_key)))) { + if (sizeof($is_key) == 1) { + if ($source_result_set[$j]) { + $update_array[$matching_table_index][$update_row][$is_key[0]] = $source_result_set[$j]; + } + } elseif (sizeof($is_key) > 1) { + for ($n=0; $n < sizeof($is_key); $n++) { + if (isset($src_result_set[0][$is_key[$n]])) { + $update_array[$matching_table_index][$update_row][$is_key[$n]] = $src_result_set[0][$is_key[$n]]; + } } } - } - $update_array[$matching_table_index][$update_row][$update_field] = $fld[$m]; + $update_array[$matching_table_index][$update_row][$update_field] = $fld[$m]; - $update_field++; - if (isset($src_result_set[0][$fld[$m]])) { - $update_array[$matching_table_index][$update_row][$update_field] = $src_result_set[0][$fld[$m]]; $update_field++; + if (isset($src_result_set[0][$fld[$m]])) { + $update_array[$matching_table_index][$update_row][$update_field] = $src_result_set[0][$fld[$m]]; + $update_field++; + } + $starting_index = $m; + $update_row++; } - $starting_index = $m; - $update_row++; - } - } else { - if (sizeof($is_key) == 1) { + } else { + if (sizeof($is_key) == 1) { if ($source_result_set[$j]) { $update_array[$matching_table_index][$update_row][$is_key[0]] = $source_result_set[$j]; - } } elseif (sizeof($is_key) > 1) { for ($n = 0; $n < sizeof($is_key); $n++) { @@ -221,25 +220,24 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching } $starting_index = $m; $update_row++; + } } - } } - for ($m = $starting_index + 1; $m < $fields_num[$matching_table_index] ; $m++) - { + for ($m = $starting_index + 1; $m < $fields_num[$matching_table_index] ; $m++) { if (isset($src_result_set[0][$fld[$m]])) { if (isset($target_result_set[0][$fld[$m]])) { if (($src_result_set[0][$fld[$m]] != $target_result_set[0][$fld[$m]]) && (!(in_array($fld[$m], $is_key)))) { - $update_row--; - $update_array[$matching_table_index][$update_row][$update_field] = $fld[$m]; - $update_field++; - if ($src_result_set[0][$fld[$m]]) { - $update_array[$matching_table_index][$update_row][$update_field] = $src_result_set[0][$fld[$m]]; + $update_row--; + $update_array[$matching_table_index][$update_row][$update_field] = $fld[$m]; $update_field++; + if ($src_result_set[0][$fld[$m]]) { + $update_array[$matching_table_index][$update_row][$update_field] = $src_result_set[0][$fld[$m]]; + $update_field++; + } + $update_row++; } - $update_row++; - } - } else { - $update_row--; + } else { + $update_row--; $update_array[$matching_table_index][$update_row][$update_field] = $fld[$m]; $update_field++; if ($src_result_set[0][$fld[$m]]) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11145-gf1c526f
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via f1c526f17a7e0307fa9bcc52d40c643cb0dafff8 (commit) via b2173a8e4e2197cffce1086927a4dd149842f6e3 (commit) from c8c68cc5882e498fe9cbd5e6954b5a5a2f55bb4f (commit) - Log ----------------------------------------------------------------- commit f1c526f17a7e0307fa9bcc52d40c643cb0dafff8 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 13:01:32 2011 +0200 Whitespace cleanup commit b2173a8e4e2197cffce1086927a4dd149842f6e3 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 13:01:23 2011 +0200 Localize error message ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index f0451b6..9e27e6c 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1339,7 +1339,7 @@ function PMA_localizeNumber($value) * @param integer $digits_left number of digits left of the comma * @param integer $digits_right number of digits right of the comma * @param boolean $only_down do not reformat numbers below 1 - * @param boolean $noTrailingZero removes trailing zeros right of the comma (default: true) + * @param boolean $noTrailingZero removes trailing zeros right of the comma (default: true) * * @return string the formatted value and its unit * @@ -1348,13 +1348,13 @@ function PMA_localizeNumber($value) function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_down = false, $noTrailingZero = true) { if($value==0) return '0'; - + $originalValue = $value; //number_format is not multibyte safe, str_replace is safe if ($digits_left === 0) { $value = number_format($value, $digits_right); if($originalValue!=0 && floatval($value) == 0) $value = ' <'.(1/PMA_pow(10,$digits_right)); - + return PMA_localizeNumber($value); } @@ -1388,7 +1388,7 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow } $dh = PMA_pow(10, $digits_right); - + // This gives us the right SI prefix already, but $digits_left parameter not incorporated $d = floor(log10($value) / 3); // Lowering the SI prefix by 1 gives us an additional 3 zeros @@ -1397,18 +1397,18 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow if($digits_left > $cur_digits) { $d-= floor(($digits_left - $cur_digits)/3); } - + if($d<0 && $only_down) $d=0; - + $value = round($value / (PMA_pow(1000, $d, 'pow') / $dh)) /$dh; $unit = $units[$d]; - + // If we dont want any zeros after the comma just add the thousand seperator if($noTrailingZero) $value = PMA_localizeNumber(preg_replace("/(?<=\d)(?=(\d{3})+(?!\d))/",",",$value)); else $value = PMA_localizeNumber(number_format($value, $digits_right)); //number_format is not multibyte safe, str_replace is safe - + if($originalValue!=0 && floatval($value) == 0) return ' <'.(1/PMA_pow(10,$digits_right)).' '.$unit; return $sign . $value . ' ' . $unit; @@ -1843,7 +1843,6 @@ function PMA_flipstring($string, $Separator = "<br />\n") * Not sure we could use a strMissingParameter message here, * would have to check if the error message file is always available * - * @todo localize error message * @todo use PMA_fatalError() if $die === true? * @param array $params The names of the parameters needed by the calling script. * @param bool $die Stop the execution? @@ -1874,7 +1873,8 @@ function PMA_checkParameters($params, $die = true, $request = true) if (! isset($GLOBALS[$param])) { $error_message .= $reported_script_name - . ': Missing parameter: ' . $param + . ': ' . __('Missing parameter:') . ' ' + . $param . PMA_showDocu('faqmissingparameters') . '<br />'; $found_error = true; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11143-gc8c68cc
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via c8c68cc5882e498fe9cbd5e6954b5a5a2f55bb4f (commit) from 95465b848906e6f9c74d29ef86ae3e127ae0cc92 (commit) - Log ----------------------------------------------------------------- commit c8c68cc5882e498fe9cbd5e6954b5a5a2f55bb4f Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 12:57:28 2011 +0200 Need to set db parameter when we're checking for it ----------------------------------------------------------------------- Summary of changes: test/libraries/common/PMA_checkParameters_test.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/test/libraries/common/PMA_checkParameters_test.php b/test/libraries/common/PMA_checkParameters_test.php index 5337650..3bf4ed8 100644 --- a/test/libraries/common/PMA_checkParameters_test.php +++ b/test/libraries/common/PMA_checkParameters_test.php @@ -38,6 +38,7 @@ class PMA_checkParameters_test extends PHPUnit_Extensions_OutputTestCase { $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF'); $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath(); + $GLOBALS['db'] = "dbDatabase"; $GLOBALS['table'] = "tblTable"; $GLOBALS['field'] = "test_field"; $GLOBALS['sql_query'] = "SELECT * FROM tblTable;"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11142-g95465b8
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 95465b848906e6f9c74d29ef86ae3e127ae0cc92 (commit) via 8ccc854095bc1a1242501cd76da81e207501c8d5 (commit) from 0a782293e698b2fb31043b90b76bc4714598ffb6 (commit) - Log ----------------------------------------------------------------- commit 95465b848906e6f9c74d29ef86ae3e127ae0cc92 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 12:03:54 2011 +0200 We care only about PHP 5 commit 8ccc854095bc1a1242501cd76da81e207501c8d5 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 12:03:37 2011 +0200 Localize some more error messages. ----------------------------------------------------------------------- Summary of changes: libraries/File.class.php | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/libraries/File.class.php b/libraries/File.class.php index 8ae0262..031a266 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -207,7 +207,6 @@ class PMA_File } /** - * @todo replace error message with localized string * @access public * @param string name of file uploaded * @return boolean success @@ -218,7 +217,7 @@ class PMA_File if (! $this->isUploaded()) { $this->setName(null); - $this->_error_message = 'not an uploaded file'; + $this->_error_message = __('File was not an uploaded file.'); return false; } @@ -318,7 +317,6 @@ class PMA_File * $file['error'] = [value] * </code> * - * @todo re-check if requirements changes to PHP >= 4.2.0 * @access public * @static * @param array $file the array @@ -482,7 +480,6 @@ class PMA_File * before opening it. The FAQ 1.11 explains how to create the "./tmp" * directory - if needed * - * @todo replace error message with localized string * @todo move check of $cfg['TempDir'] into PMA_Config? * @access public * @return boolean whether uploaded fiel is fine or not @@ -507,7 +504,7 @@ class PMA_File $move_uploaded_file_result = move_uploaded_file($this->getName(), $new_file_to_upload); ob_end_clean(); if (! $move_uploaded_file_result) { - $this->_error_message = 'error while moving uploaded file'; + $this->_error_message = __('Error while moving uploaded file.'); return false; } @@ -515,7 +512,7 @@ class PMA_File $this->isTemp(true); if (! $this->isReadable()) { - $this->_error_message = 'cannot read (moved) upload file'; + $this->_error_message = __('Cannot read (moved) upload file.'); return false; } hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git July 2011