Git

git@phpmyadmin.net

19 participants
38305 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12900-g4fb5b65
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 4fb5b65fd2a2e740842fd0592ebd698d46f46c8b (commit) from 7a07c42de50c1f23bec33fc82b98179e4c452f26 (commit) - Log ----------------------------------------------------------------- commit 4fb5b65fd2a2e740842fd0592ebd698d46f46c8b Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 13:47:44 2011 +0200 Remove unused parameter $container from PMA_getIcon ----------------------------------------------------------------------- Summary of changes: db_operations.php | 2 +- libraries/common.lib.php | 37 +++++++------- libraries/display_tbl.lib.php | 20 ++++---- tbl_structure.php | 50 ++++++++++---------- .../common/PMA_buildActionTitles_test.php | 34 +++++++------- test/libraries/common/PMA_getIcon_test.php | 23 ++------- 6 files changed, 76 insertions(+), 90 deletions(-) diff --git a/db_operations.php b/db_operations.php index 2382389..6b40947 100644 --- a/db_operations.php +++ b/db_operations.php @@ -359,7 +359,7 @@ if (!$is_information_schema) { <?php echo PMA_generate_common_hidden_inputs($db); ?> <fieldset> <legend> - <?php echo PMA_getIcon('b_comment.png', __('Database comment: '), false, true); ?> + <?php echo PMA_getIcon('b_comment.png', __('Database comment: '), true); ?> </legend> <input type="text" name="comment" class="textfield" size="30" value="<?php diff --git a/libraries/common.lib.php b/libraries/common.lib.php index fec1c86..fa95d86 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -74,12 +74,11 @@ function PMA_pow($base, $exp, $use_function = false) * * @param string $icon name of icon file * @param string $alternate alternate text - * @param boolean $container include in container * @param boolean $force_text whether to force alternate text to be displayed * @param boolean $noSprite If true, the image source will be not replaced with a CSS Sprite * @return html img tag */ -function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = false, $noSprite = false) +function PMA_getIcon($icon, $alternate = '', $force_text = false, $noSprite = false) { $include_icon = false; $include_text = false; @@ -2889,23 +2888,23 @@ function PMA_selectUploadFile($import_list, $uploaddir) { function PMA_buildActionTitles() { $titles = array(); - $titles['Browse'] = PMA_getIcon('b_browse.png', __('Browse'), true); - $titles['NoBrowse'] = PMA_getIcon('bd_browse.png', __('Browse'), true); - $titles['Search'] = PMA_getIcon('b_select.png', __('Search'), true); - $titles['NoSearch'] = PMA_getIcon('bd_select.png', __('Search'), true); - $titles['Insert'] = PMA_getIcon('b_insrow.png', __('Insert'), true); - $titles['NoInsert'] = PMA_getIcon('bd_insrow.png', __('Insert'), true); - $titles['Structure'] = PMA_getIcon('b_props.png', __('Structure'), true); - $titles['Drop'] = PMA_getIcon('b_drop.png', __('Drop'), true); - $titles['NoDrop'] = PMA_getIcon('bd_drop.png', __('Drop'), true); - $titles['Empty'] = PMA_getIcon('b_empty.png', __('Empty'), true); - $titles['NoEmpty'] = PMA_getIcon('bd_empty.png', __('Empty'), true); - $titles['Edit'] = PMA_getIcon('b_edit.png', __('Edit'), true); - $titles['NoEdit'] = PMA_getIcon('bd_edit.png', __('Edit'), true); - $titles['Export'] = PMA_getIcon('b_export.png', __('Export'), true); - $titles['NoExport'] = PMA_getIcon('bd_export.png', __('Export'), true); - $titles['Execute'] = PMA_getIcon('b_nextpage.png', __('Execute'), true); - $titles['NoExecute'] = PMA_getIcon('bd_nextpage.png', __('Execute'), true); + $titles['Browse'] = PMA_getIcon('b_browse.png', __('Browse')); + $titles['NoBrowse'] = PMA_getIcon('bd_browse.png', __('Browse')); + $titles['Search'] = PMA_getIcon('b_select.png', __('Search')); + $titles['NoSearch'] = PMA_getIcon('bd_select.png', __('Search')); + $titles['Insert'] = PMA_getIcon('b_insrow.png', __('Insert')); + $titles['NoInsert'] = PMA_getIcon('bd_insrow.png', __('Insert')); + $titles['Structure'] = PMA_getIcon('b_props.png', __('Structure')); + $titles['Drop'] = PMA_getIcon('b_drop.png', __('Drop')); + $titles['NoDrop'] = PMA_getIcon('bd_drop.png', __('Drop')); + $titles['Empty'] = PMA_getIcon('b_empty.png', __('Empty')); + $titles['NoEmpty'] = PMA_getIcon('bd_empty.png', __('Empty')); + $titles['Edit'] = PMA_getIcon('b_edit.png', __('Edit')); + $titles['NoEdit'] = PMA_getIcon('bd_edit.png', __('Edit')); + $titles['Export'] = PMA_getIcon('b_export.png', __('Export')); + $titles['NoExport'] = PMA_getIcon('bd_export.png', __('Export')); + $titles['Execute'] = PMA_getIcon('b_nextpage.png', __('Execute')); + $titles['NoExecute'] = PMA_getIcon('bd_nextpage.png', __('Execute')); return $titles; } diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index b29b36a..5243dff 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1301,8 +1301,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $edit_url = 'tbl_change.php' . PMA_generate_common_url($_url_params + array('default_action' => 'update')); $copy_url = 'tbl_change.php' . PMA_generate_common_url($_url_params + array('default_action' => 'insert')); - $edit_str = PMA_getIcon('b_edit.png', __('Edit'), true); - $copy_str = PMA_getIcon('b_insrow.png', __('Copy'), true); + $edit_str = PMA_getIcon('b_edit.png', __('Edit')); + $copy_str = PMA_getIcon('b_insrow.png', __('Copy')); // Class definitions required for inline editing jQuery scripts $edit_anchor_class = "edit_row_anchor"; @@ -1337,7 +1337,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $js_conf = 'DELETE FROM ' . PMA_jsFormat($db) . '.' . PMA_jsFormat($table) . ' WHERE ' . PMA_jsFormat($where_clause, false) . ($clause_is_unique ? '' : ' LIMIT 1'); - $del_str = PMA_getIcon('b_drop.png', __('Delete'), true); + $del_str = PMA_getIcon('b_drop.png', __('Delete')); } elseif ($is_display['del_lnk'] == 'kp') { // kill process case $_url_params = array( @@ -1356,7 +1356,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $del_url = 'sql.php' . PMA_generate_common_url($_url_params); $del_query = 'KILL ' . $row[0]; $js_conf = 'KILL ' . $row[0]; - $del_str = PMA_getIcon('b_drop.png', __('Kill'), true); + $del_str = PMA_getIcon('b_drop.png', __('Kill')); } // end if (1.2.2) // 1.3 Displays the links at left if required @@ -2438,14 +2438,14 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { echo PMA_linkOrButton( 'sql.php' . $url_query, - PMA_getIcon('b_print.png', __('Print view'), false, true), + PMA_getIcon('b_print.png', __('Print view')), '', true, true, 'print_view') . "\n"; if ($_SESSION['tmp_user_values']['display_text']) { $_url_params['display_text'] = 'F'; echo PMA_linkOrButton( 'sql.php' . PMA_generate_common_url($_url_params), - PMA_getIcon('b_print.png', __('Print view (with full texts)'), false, true), + PMA_getIcon('b_print.png', __('Print view (with full texts)')), '', true, true, 'print_view') . "\n"; unset($_url_params['display_text']); } @@ -2487,13 +2487,13 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { echo PMA_linkOrButton( 'tbl_export.php' . PMA_generate_common_url($_url_params), - PMA_getIcon('b_tblexport.png', __('Export'), false, true), + PMA_getIcon('b_tblexport.png', __('Export')), '', true, true, '') . "\n"; // show chart echo PMA_linkOrButton( 'tbl_chart.php' . PMA_generate_common_url($_url_params), - PMA_getIcon('b_chart.png', __('Display chart'), false, true), + PMA_getIcon('b_chart.png', __('Display chart')), '', true, true, '') . "\n"; // show GIS chart @@ -2508,7 +2508,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { if ($geometry_found) { echo PMA_linkOrButton( 'tbl_gis_visualization.php' . PMA_generate_common_url($_url_params), - PMA_getIcon('b_globe.gif', __('Visualize GIS data'), false, true), + PMA_getIcon('b_globe.gif', __('Visualize GIS data')), '', true, true, '') . "\n"; } } @@ -2528,7 +2528,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { if (! isset($analyzed_sql[0]['queryflags']['procedure'])) { echo PMA_linkOrButton( 'view_create.php' . $url_query, - PMA_getIcon('b_views.png', __('Create view'), false, true), + PMA_getIcon('b_views.png', __('Create view')), '', true, true, '') . "\n"; } if ($header_shown) { diff --git a/tbl_structure.php b/tbl_structure.php index a4e9692..77e9b39 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -149,34 +149,34 @@ $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table)); */ // action titles (image or string) $titles = array(); -$titles['Change'] = PMA_getIcon('b_edit.png', __('Change'), true); -$titles['Drop'] = PMA_getIcon('b_drop.png', __('Drop'), true); -$titles['NoDrop'] = PMA_getIcon('b_drop.png', __('Drop'), true); -$titles['Primary'] = PMA_getIcon('b_primary.png', __('Primary'), true); -$titles['Index'] = PMA_getIcon('b_index.png', __('Index'), true); -$titles['Unique'] = PMA_getIcon('b_unique.png', __('Unique'), true); -$titles['Spatial'] = PMA_getIcon('b_spatial.png', __('Spatial'), true); -$titles['IdxFulltext'] = PMA_getIcon('b_ftext.png', __('Fulltext'), true); -$titles['NoPrimary'] = PMA_getIcon('bd_primary.png', __('Primary'), true); -$titles['NoIndex'] = PMA_getIcon('bd_index.png', __('Index'), true); -$titles['NoUnique'] = PMA_getIcon('bd_unique.png', __('Unique'), true); -$titles['NoSpatial'] = PMA_getIcon('bd_spatial.png', __('Spatial'), true); -$titles['NoIdxFulltext'] = PMA_getIcon('bd_ftext.png', __('Fulltext'), true); -$titles['BrowseDistinctValues'] = PMA_getIcon('b_browse.png', __('Browse distinct values'), true); +$titles['Change'] = PMA_getIcon('b_edit.png', __('Change')); +$titles['Drop'] = PMA_getIcon('b_drop.png', __('Drop')); +$titles['NoDrop'] = PMA_getIcon('b_drop.png', __('Drop')); +$titles['Primary'] = PMA_getIcon('b_primary.png', __('Primary')); +$titles['Index'] = PMA_getIcon('b_index.png', __('Index')); +$titles['Unique'] = PMA_getIcon('b_unique.png', __('Unique')); +$titles['Spatial'] = PMA_getIcon('b_spatial.png', __('Spatial')); +$titles['IdxFulltext'] = PMA_getIcon('b_ftext.png', __('Fulltext')); +$titles['NoPrimary'] = PMA_getIcon('bd_primary.png', __('Primary')); +$titles['NoIndex'] = PMA_getIcon('bd_index.png', __('Index')); +$titles['NoUnique'] = PMA_getIcon('bd_unique.png', __('Unique')); +$titles['NoSpatial'] = PMA_getIcon('bd_spatial.png', __('Spatial')); +$titles['NoIdxFulltext'] = PMA_getIcon('bd_ftext.png', __('Fulltext')); +$titles['BrowseDistinctValues'] = PMA_getIcon('b_browse.png', __('Browse distinct values')); // hidden action titles (image and string) $hidden_titles = array(); -$hidden_titles['BrowseDistinctValues'] = PMA_getIcon('b_browse.png', __('Browse distinct values'), false, true); -$hidden_titles['Primary'] = PMA_getIcon('b_primary.png', __('Add primary key'), false, true); -$hidden_titles['NoPrimary'] = PMA_getIcon('bd_primary.png', __('Add primary key'), false, true); -$hidden_titles['Index'] = PMA_getIcon('b_index.png', __('Add index'), false, true); -$hidden_titles['NoIndex'] = PMA_getIcon('bd_index.png', __('Add index'), false, true); -$hidden_titles['Unique'] = PMA_getIcon('b_unique.png', __('Add unique index'), false, true); -$hidden_titles['NoUnique'] = PMA_getIcon('bd_unique.png', __('Add unique index'), false, true); -$hidden_titles['Spatial'] = PMA_getIcon('b_spatial.png', __('Add SPATIAL index'), false, true); -$hidden_titles['NoSpatial'] = PMA_getIcon('bd_spatial.png', __('Add SPATIAL index'), false, true); -$hidden_titles['IdxFulltext'] = PMA_getIcon('b_ftext.png', __('Add FULLTEXT index'), false, true); -$hidden_titles['NoIdxFulltext'] = PMA_getIcon('bd_ftext.png', __('Add FULLTEXT index'), false, true); +$hidden_titles['BrowseDistinctValues'] = PMA_getIcon('b_browse.png', __('Browse distinct values'), true); +$hidden_titles['Primary'] = PMA_getIcon('b_primary.png', __('Add primary key'), true); +$hidden_titles['NoPrimary'] = PMA_getIcon('bd_primary.png', __('Add primary key'), true); +$hidden_titles['Index'] = PMA_getIcon('b_index.png', __('Add index'), true); +$hidden_titles['NoIndex'] = PMA_getIcon('bd_index.png', __('Add index'), true); +$hidden_titles['Unique'] = PMA_getIcon('b_unique.png', __('Add unique index'), true); +$hidden_titles['NoUnique'] = PMA_getIcon('bd_unique.png', __('Add unique index'), true); +$hidden_titles['Spatial'] = PMA_getIcon('b_spatial.png', __('Add SPATIAL index'), true); +$hidden_titles['NoSpatial'] = PMA_getIcon('bd_spatial.png', __('Add SPATIAL index'), true); +$hidden_titles['IdxFulltext'] = PMA_getIcon('b_ftext.png', __('Add FULLTEXT index'), true); +$hidden_titles['NoIdxFulltext'] = PMA_getIcon('bd_ftext.png', __('Add FULLTEXT index'), true); /** * Displays the table structure ('show table' works correct since 3.23.03) diff --git a/test/libraries/common/PMA_buildActionTitles_test.php b/test/libraries/common/PMA_buildActionTitles_test.php index 6f23544..f6579da 100644 --- a/test/libraries/common/PMA_buildActionTitles_test.php +++ b/test/libraries/common/PMA_buildActionTitles_test.php @@ -24,23 +24,23 @@ class PMA_buildActionTitles_test extends PHPUnit_Framework_TestCase{ function testBuildActionTitles(){ $titles = array(); - $titles['Browse'] = PMA_getIcon('b_browse.png', __('Browse'), true); - $titles['NoBrowse'] = PMA_getIcon('bd_browse.png', __('Browse'), true); - $titles['Search'] = PMA_getIcon('b_select.png', __('Search'), true); - $titles['NoSearch'] = PMA_getIcon('bd_select.png', __('Search'), true); - $titles['Insert'] = PMA_getIcon('b_insrow.png', __('Insert'), true); - $titles['NoInsert'] = PMA_getIcon('bd_insrow.png', __('Insert'), true); - $titles['Structure'] = PMA_getIcon('b_props.png', __('Structure'), true); - $titles['Drop'] = PMA_getIcon('b_drop.png', __('Drop'), true); - $titles['NoDrop'] = PMA_getIcon('bd_drop.png', __('Drop'), true); - $titles['Empty'] = PMA_getIcon('b_empty.png', __('Empty'), true); - $titles['NoEmpty'] = PMA_getIcon('bd_empty.png', __('Empty'), true); - $titles['Edit'] = PMA_getIcon('b_edit.png', __('Edit'), true); - $titles['NoEdit'] = PMA_getIcon('bd_edit.png', __('Edit'), true); - $titles['Export'] = PMA_getIcon('b_export.png', __('Export'), true); - $titles['NoExport'] = PMA_getIcon('bd_export.png', __('Export'), true); - $titles['Execute'] = PMA_getIcon('b_nextpage.png', __('Execute'), true); - $titles['NoExecute'] = PMA_getIcon('bd_nextpage.png', __('Execute'), true); + $titles['Browse'] = PMA_getIcon('b_browse.png', __('Browse')); + $titles['NoBrowse'] = PMA_getIcon('bd_browse.png', __('Browse')); + $titles['Search'] = PMA_getIcon('b_select.png', __('Search')); + $titles['NoSearch'] = PMA_getIcon('bd_select.png', __('Search')); + $titles['Insert'] = PMA_getIcon('b_insrow.png', __('Insert')); + $titles['NoInsert'] = PMA_getIcon('bd_insrow.png', __('Insert')); + $titles['Structure'] = PMA_getIcon('b_props.png', __('Structure')); + $titles['Drop'] = PMA_getIcon('b_drop.png', __('Drop')); + $titles['NoDrop'] = PMA_getIcon('bd_drop.png', __('Drop')); + $titles['Empty'] = PMA_getIcon('b_empty.png', __('Empty')); + $titles['NoEmpty'] = PMA_getIcon('bd_empty.png', __('Empty')); + $titles['Edit'] = PMA_getIcon('b_edit.png', __('Edit')); + $titles['NoEdit'] = PMA_getIcon('bd_edit.png', __('Edit')); + $titles['Export'] = PMA_getIcon('b_export.png', __('Export')); + $titles['NoExport'] = PMA_getIcon('bd_export.png', __('Export')); + $titles['Execute'] = PMA_getIcon('b_nextpage.png', __('Execute')); + $titles['NoExecute'] = PMA_getIcon('bd_nextpage.png', __('Execute')); $this->assertEquals($titles, PMA_buildActionTitles()); diff --git a/test/libraries/common/PMA_getIcon_test.php b/test/libraries/common/PMA_getIcon_test.php index ab21651..7567207 100644 --- a/test/libraries/common/PMA_getIcon_test.php +++ b/test/libraries/common/PMA_getIcon_test.php @@ -21,17 +21,17 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{ $this->assertEquals( '', - PMA_getIcon('b_comment.png') + PMA_getIcon('b_comment.png') ); } function testGetIconWithPropertiesIconic(){ - + $GLOBALS['cfg']['PropertiesIconic'] = true; $this->assertEquals( '<img src="themes/dot.gif" title="" alt="" class="icon ic_b_comment" />', - PMA_getIcon('b_comment.png') + PMA_getIcon('b_comment.png') ); } @@ -47,20 +47,7 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{ ); } - function testGetIconWithContainer(){ - - $GLOBALS['cfg']['PropertiesIconic'] = true; - $alternate_text = 'alt_str'; - - $this->assertEquals( - '<img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text - . '" class="icon ic_b_comment" />', - PMA_getIcon('b_comment.png', $alternate_text, true) - ); - - } - - function testGetIconWithContainerAndForceText(){ + function testGetIconWithForceText(){ $GLOBALS['cfg']['PropertiesIconic'] = true; $alternate_text = 'alt_str'; @@ -68,7 +55,7 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{ $this->assertEquals( '<img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text . '" class="icon ic_b_comment" /> ' . $alternate_text . '', - PMA_getIcon('b_comment.png', $alternate_text, true, true) + PMA_getIcon('b_comment.png', $alternate_text, true) ); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 92bf2c50569e884caf3971ecd59b074d2e027104
by Herman van Rink 04 Aug '11

04 Aug '11

The branch, master has been updated via 92bf2c50569e884caf3971ecd59b074d2e027104 (commit) from ed7fc69cfb5cfea1ed3086a303672813108ac474 (commit) - Log ----------------------------------------------------------------- commit 92bf2c50569e884caf3971ecd59b074d2e027104 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Aug 4 13:41:04 2011 +0200 Added CVE IDs ----------------------------------------------------------------------- Summary of changes: templates/security/PMASA-2011-11 | 1 + templates/security/PMASA-2011-12 | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/templates/security/PMASA-2011-11 b/templates/security/PMASA-2011-11 index 8c1b162..f6f98fd 100644 --- a/templates/security/PMASA-2011-11 +++ b/templates/security/PMASA-2011-11 @@ -40,6 +40,7 @@ This issue was found by Norman Hippert from <a href="http://www.the-wildcat.de/" </py:def>  +<py:def function="announcement_cve">CVE-2011-2718</py:def> <py:def function="announcement_cwe">661 98</py:def> diff --git a/templates/security/PMASA-2011-12 b/templates/security/PMASA-2011-12 index 7405881..3a958f2 100644 --- a/templates/security/PMASA-2011-12 +++ b/templates/security/PMASA-2011-12 @@ -49,6 +49,7 @@ This issue was found by Frans Pehrson from <a href="http://www.xxor.se">Xxor AB< </py:def>  +<py:def function="announcement_cve">CVE-2011-2719</py:def> <py:def function="announcement_cwe">661 473</py:def> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12899-g7a07c42
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 7a07c42de50c1f23bec33fc82b98179e4c452f26 (commit) via eae8396f1e10ce9fbbf5dd5755947e23130afe38 (commit) from 269599e4767d95ee0ad8f770e56fe4677e0391ce (commit) - Log ----------------------------------------------------------------- commit 7a07c42de50c1f23bec33fc82b98179e4c452f26 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 13:40:49 2011 +0200 Variable include_box is not used commit eae8396f1e10ce9fbbf5dd5755947e23130afe38 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 13:39:11 2011 +0200 Factor out pow function detection ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index d812262..fec1c86 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -7,6 +7,25 @@ */ /** + * Detects which function to use for PMA_pow. + * + * @return string Function name. + */ +function PMA_detect_pow() +{ + if (function_exists('bcpow')) { + // BCMath Arbitrary Precision Mathematics Function + return 'bcpow'; + } elseif (function_exists('gmp_pow')) { + // GMP Function + return 'gmp_pow'; + } else { + // PHP function + return 'pow'; + } +} + +/** * Exponential expression / raise number into power * * @param string $base base to raise @@ -19,16 +38,7 @@ function PMA_pow($base, $exp, $use_function = false) static $pow_function = null; if (null == $pow_function) { - if (function_exists('bcpow')) { - // BCMath Arbitrary Precision Mathematics Function - $pow_function = 'bcpow'; - } elseif (function_exists('gmp_pow')) { - // GMP Function - $pow_function = 'gmp_pow'; - } else { - // PHP function - $pow_function = 'pow'; - } + $pow_function = PMA_detect_pow(); } if (! $use_function) { @@ -73,7 +83,6 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f { $include_icon = false; $include_text = false; - $include_box = false; $alternate = htmlspecialchars($alternate); $button = ''; @@ -87,11 +96,6 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f $include_text = true; } - if ($include_text && $include_icon && $container) { - // we have icon, text and request for container - $include_box = true; - } - // Always use a span (we rely on this in js/sql.js) $button .= ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12897-g269599e
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 269599e4767d95ee0ad8f770e56fe4677e0391ce (commit) via ea99a180bff2ec9ab6ee9ad8374eecf06768a7c6 (commit) from 8bd454a47f8c5b5bee2fc9f1c5c30ea5f0050576 (commit) - Log ----------------------------------------------------------------- commit 269599e4767d95ee0ad8f770e56fe4677e0391ce Merge: 8bd454a47f8c5b5bee2fc9f1c5c30ea5f0050576 ea99a180bff2ec9ab6ee9ad8374eecf06768a7c6 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 13:33:55 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-63-gea99a18
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, QA_3_4 has been updated via ea99a180bff2ec9ab6ee9ad8374eecf06768a7c6 (commit) from 68e21b05e46f144735faa849b80734d83812c7e6 (commit) - Log ----------------------------------------------------------------- commit ea99a180bff2ec9ab6ee9ad8374eecf06768a7c6 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 13:30:09 2011 +0200 Update from master ----------------------------------------------------------------------- Summary of changes: po/ko.po | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index 0cfd870..6ac185e 100644 --- a/po/ko.po +++ b/po/ko.po @@ -105,7 +105,7 @@ msgstr "디스크 쓰기에 실패했습니다." #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" -msgstr "" +msgstr "원격 URL 열기 실패했습니다" #: changelog.php:32 license.php:28 #, php-format @@ -113,6 +113,8 @@ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" +"%s 파일은 사용할 수 없습니다. www.phpmyadmin.net에 방문하여 정보를 확인하세" +"요." #: db_create.php:58 #, php-format @@ -626,13 +628,13 @@ msgstr "" #: db_structure.php:393 db_structure.php:407 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:206 test/theme.php:73 msgid "View" -msgstr "" +msgstr "뷰" #: db_structure.php:444 libraries/db_structure.lib.php:40 #: libraries/server_links.inc.php:90 server_replication.php:31 #: server_replication.php:162 server_status.php:383 msgid "Replication" -msgstr "" +msgstr "복제" #: db_structure.php:448 msgid "Sum" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 90f09a3253f558425ca72c85177defb91fd91d5f
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 90f09a3253f558425ca72c85177defb91fd91d5f (commit) from e00c7de9627881d16286d5f63b34c113082df12e (commit) - Log ----------------------------------------------------------------- commit 90f09a3253f558425ca72c85177defb91fd91d5f Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 13:27:39 2011 +0200 Update ----------------------------------------------------------------------- Summary of changes: output/tr/Documentation.html | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/output/tr/Documentation.html b/output/tr/Documentation.html index 6c9ad73..7416164 100644 --- a/output/tr/Documentation.html +++ b/output/tr/Documentation.html @@ -2299,17 +2299,18 @@ doldurulmasada gösterilmesini tanımlar. $cfg['QueryHistoryMax'] tam sayı </dt> <dd> - All those variables affect the query window feature. A <tt><abbr -title="structured query language">SQL</abbr></tt> link or icon is always -displayed on the left panel. If JavaScript is enabled in your browser, a -click on this opens a distinct query window, which is a direct interface to -enter <abbr title="structured query language">SQL</abbr> queries. Otherwise, -the right panel changes to display a query box. - - The size of this query window can be customized with -<tt>$cfg['QueryWindowWidth']</tt> and <tt>$cfg['QueryWindowHeight']</tt> - -both integers for the size in pixels. Note that normally, those parameters -will be modified in <tt>layout.inc.php</tt> for the theme you are using. + Tüm bu değişkenler sorgu penceresi özelliğini etkiler. <tt><abbr +title="structured query language">SQL</abbr></tt> bağlantısı ve simgesi +daima sol panelde görüntülenir. Eğer tarayıcınızda JavaScript etkinse, bunun +üzerine tıklamak <abbr title="structured query language">SQL</abbr> +sorgularını girmek için doğrudan arabirim olan ayrı sorgu penceresi +açar. Yoksa sağ panel sorgu kutusunu görüntülemek için değişir. + + Sorgu penceresinin boyutu <tt>$cfg['QueryWindowWidth']</tt> ve +<tt>$cfg['QueryWindowHeight']</tt> ile özelleştirilebilir - her iki tam sayı +piksel cinsinden boyut içindir. Normalde unutmayın, bu parametreler +kullandığınız temalar için <tt>layout.inc.php</tt> içinden +değiştirilecektir. If <tt>$cfg['EditInWindow']</tt> is set to true, a click on [Edit] from the results page (in the "Showing Rows" section) opens the query hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12895-g8bd454a
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 8bd454a47f8c5b5bee2fc9f1c5c30ea5f0050576 (commit) via 58a43a0a076047d349472408608c050e11db6594 (commit) via 2a60c4a63f219d5b26fb1a8a2ba261f197a0c35a (commit) via 93f06e74496c2fba29930070b1766ab1acdf320e (commit) via 2f926bfc202e49659b34917d4d8380b1553e7e65 (commit) via 2e4de7e14401296314127fe9260005e37171f21c (commit) via c5d73fb6fb221858946676b03dab03ef807f627b (commit) via c79c1d3259cb865ef5ab7017f66e53b6d72c575b (commit) from ae1d967043caa926e1db8eafaa5e98ccca0c8f97 (commit) - Log ----------------------------------------------------------------- commit 8bd454a47f8c5b5bee2fc9f1c5c30ea5f0050576 Author: Chung-Ook Lee <hantip(a)gmail.com> Date: Thu Aug 4 11:57:27 2011 +0200 Translation update done using Pootle. commit 58a43a0a076047d349472408608c050e11db6594 Author: Chung-Ook Lee <hantip(a)gmail.com> Date: Thu Aug 4 11:57:19 2011 +0200 Translation update done using Pootle. commit 2a60c4a63f219d5b26fb1a8a2ba261f197a0c35a Author: Chung-Ook Lee <hantip(a)gmail.com> Date: Thu Aug 4 11:55:57 2011 +0200 Translation update done using Pootle. commit 93f06e74496c2fba29930070b1766ab1acdf320e Author: Chung-Ook Lee <hantip(a)gmail.com> Date: Thu Aug 4 11:55:18 2011 +0200 Translation update done using Pootle. commit 2f926bfc202e49659b34917d4d8380b1553e7e65 Author: Chung-Ook Lee <hantip(a)gmail.com> Date: Thu Aug 4 11:54:47 2011 +0200 Translation update done using Pootle. commit 2e4de7e14401296314127fe9260005e37171f21c Author: Chung-Ook Lee <hantip(a)gmail.com> Date: Thu Aug 4 11:53:01 2011 +0200 Translation update done using Pootle. commit c5d73fb6fb221858946676b03dab03ef807f627b Author: Chung-Ook Lee <hantip(a)gmail.com> Date: Thu Aug 4 11:51:11 2011 +0200 Translation update done using Pootle. commit c79c1d3259cb865ef5ab7017f66e53b6d72c575b Author: Chung-Ook Lee <hantip(a)gmail.com> Date: Thu Aug 4 11:50:55 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ko.po | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/po/ko.po b/po/ko.po index 3957bf5..bf99ec4 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-30 14:14-0400\n" -"PO-Revision-Date: 2010-06-16 18:18+0200\n" -"Last-Translator: <cihar(a)nvyu.net>\n" +"PO-Revision-Date: 2011-08-04 11:57+0200\n" +"Last-Translator: Chung-Ook Lee <hantip(a)gmail.com>\n" "Language-Team: korean <ko(a)li.org>\n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 #: libraries/display_tbl.lib.php:351 libraries/display_tbl.lib.php:418 @@ -27,7 +27,7 @@ msgstr "모두 보기" #: libraries/schema/Pdf_Relation_Schema.class.php:1105 #: libraries/schema/User_Schema.class.php:355 msgid "Page number:" -msgstr "페이지:" +msgstr "페이지 번호:" #: browse_foreigners.php:133 msgid "" @@ -110,14 +110,14 @@ msgstr "디스크 쓰기에 실패했습니다." #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" -msgstr "" +msgstr "원격 URL 열기 실패했습니다" #: changelog.php:32 license.php:28 #, php-format msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." -msgstr "" +msgstr "%s 파일은 사용할 수 없습니다. www.phpmyadmin.net에 방문하여 정보를 확인하세요." #: db_create.php:58 #, php-format @@ -279,10 +279,9 @@ msgid "Rename database to" msgstr "데이터베이스 이름 변경" #: db_operations.php:427 -#, fuzzy #| msgid "Rename database to" msgid "Remove database" -msgstr "데이터베이스 이름 변경" +msgstr "데이터베이스 제거" #: db_operations.php:439 #, php-format @@ -290,9 +289,8 @@ msgid "Database %s has been dropped." msgstr "데이터베이스 %s 를 제거했습니다." #: db_operations.php:444 -#, fuzzy msgid "Drop the database (DROP)" -msgstr "데이터베이스가 없습니다" +msgstr "데이터베이스 제거" #: db_operations.php:473 msgid "Copy database to" @@ -635,13 +633,13 @@ msgstr "" #: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:151 #: libraries/tbl_info.inc.php:60 tbl_structure.php:212 msgid "View" -msgstr "" +msgstr "뷰" #: db_structure.php:438 libraries/db_structure.lib.php:35 #: libraries/server_links.inc.php:90 server_replication.php:31 #: server_replication.php:162 server_status.php:477 msgid "Replication" -msgstr "" +msgstr "복제" #: db_structure.php:442 msgid "Sum" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. e00c7de9627881d16286d5f63b34c113082df12e
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via e00c7de9627881d16286d5f63b34c113082df12e (commit) via c448dfb44eb738fecb4a1158c150501f4c2af2da (commit) via ea0673530afd0f2f8ad862494ca962e025b6e9cd (commit) from 78caa8533e9f47b061ba152eada574ecb34c5123 (commit) - Log ----------------------------------------------------------------- commit e00c7de9627881d16286d5f63b34c113082df12e Merge: 78caa8533e9f47b061ba152eada574ecb34c5123 c448dfb44eb738fecb4a1158c150501f4c2af2da Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 11:07:27 2011 +0200 Merge remote-tracking branch 'pootle/master' Conflicts: po/tr.po commit c448dfb44eb738fecb4a1158c150501f4c2af2da Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 2 18:54:59 2011 +0200 Translation update done using Pootle. commit ea0673530afd0f2f8ad862494ca962e025b6e9cd Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 2 18:51:18 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/po/tr.po b/po/tr.po index 8049e30..e45c0dd 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-02 17:04+0300\n" -"PO-Revision-Date: 2011-08-02 11:58+0200\n" +"PO-Revision-Date: 2011-08-02 18:54+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -6072,6 +6072,12 @@ msgid "" "enter <abbr title=\"structured query language\">SQL</abbr> queries. " "Otherwise, the right panel changes to display a query box." msgstr "" +"Tüm bu değişkenler sorgu penceresi özelliğini etkiler. <tt><abbr " +"title=\"structured query language\">SQL</abbr></tt> bağlantısı ve simgesi " +"daima sol panelde görüntülenir. Eğer tarayıcınızda JavaScript etkinse, bunun " +"üzerine tıklamak <abbr title=\"structured query language\">SQL</abbr> " +"sorgularını girmek için doğrudan arabirim olan ayrı sorgu penceresi açar. " +"Yoksa sağ panel sorgu kutusunu görüntülemek için değişir." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2171 @@ -6081,6 +6087,11 @@ msgid "" "integers for the size in pixels. Note that normally, those parameters will " "be modified in <tt>layout.inc.php</tt> for the theme you are using." msgstr "" +"Sorgu penceresinin boyutu <tt>$cfg['QueryWindowWidth']</tt> ve " +"<tt>$cfg['QueryWindowHeight']</tt> ile özelleştirilebilir - her iki tam sayı " +"piksel cinsinden boyut içindir. Normalde unutmayın, bu parametreler " +"kullandığınız temalar için <tt>layout.inc.php</tt> içinden " +"değiştirilecektir." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2177 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12887-gae1d967
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via ae1d967043caa926e1db8eafaa5e98ccca0c8f97 (commit) via 37d739f1566af5b890471cc6e69399b5226e1fef (commit) via 3ff348b7527e666f2e40cf5df4ff7456dcac9090 (commit) via 92cfe546dcb01f7c99dae990a38984454201b341 (commit) via caa620e4798726bce6d198d934818d3fd8588f2c (commit) via 7dacff102481122a44e7185bcf3b8e1d0c1e667e (commit) via 025d97b562113203725a6c8a560032d36cf07a98 (commit) via bfdd44ca03313058738989f78d1a8404be96257a (commit) via 255d7051c65af467a1b5557f3d220e2404129f8a (commit) via de77bdd48d014d28392f39f3e3000c27f1d2b9ed (commit) from 95e90bbba40f90f183b659d8c2d5db5cdfc415d6 (commit) - Log ----------------------------------------------------------------- commit ae1d967043caa926e1db8eafaa5e98ccca0c8f97 Merge: 37d739f1566af5b890471cc6e69399b5226e1fef 95e90bbba40f90f183b659d8c2d5db5cdfc415d6 Author: Pootle server <pootle(a)cihar.com> Date: Thu Aug 4 00:40:13 2011 +0200 Merge remote-tracking branch 'origin/master' commit 37d739f1566af5b890471cc6e69399b5226e1fef Merge: 3ff348b7527e666f2e40cf5df4ff7456dcac9090 55c6eacf3e56da064dae69650480d84acd92d5a3 Author: Pootle server <pootle(a)cihar.com> Date: Wed Aug 3 22:40:08 2011 +0200 Merge remote-tracking branch 'origin/master' commit 3ff348b7527e666f2e40cf5df4ff7456dcac9090 Merge: 92cfe546dcb01f7c99dae990a38984454201b341 c1f586b9fdc399ddc2cf86faa5a5e05194afa2e5 Author: Pootle server <pootle(a)cihar.com> Date: Wed Aug 3 18:40:15 2011 +0200 Merge remote-tracking branch 'origin/master' commit 92cfe546dcb01f7c99dae990a38984454201b341 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Aug 3 12:39:06 2011 +0200 Translation update done using Pootle. commit caa620e4798726bce6d198d934818d3fd8588f2c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Aug 3 12:36:20 2011 +0200 Translation update done using Pootle. commit 7dacff102481122a44e7185bcf3b8e1d0c1e667e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Aug 3 12:32:40 2011 +0200 Translation update done using Pootle. commit 025d97b562113203725a6c8a560032d36cf07a98 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Aug 3 12:26:33 2011 +0200 Translation update done using Pootle. commit bfdd44ca03313058738989f78d1a8404be96257a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Aug 3 12:20:28 2011 +0200 Translation update done using Pootle. commit 255d7051c65af467a1b5557f3d220e2404129f8a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Aug 3 12:04:23 2011 +0200 Translation update done using Pootle. commit de77bdd48d014d28392f39f3e3000c27f1d2b9ed Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Aug 3 11:57:18 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/po/ja.po b/po/ja.po index a6d0479..97d14b9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-30 14:14-0400\n" -"PO-Revision-Date: 2011-08-02 16:09+0200\n" +"PO-Revision-Date: 2011-08-03 12:39+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -1321,6 +1321,8 @@ msgid "" "However only the SQL query itself has been used as a grouping criteria, so " "the other attributes of queries, such as start time, may differ." msgstr "" +"この列は、グループ化された同一のクエリの数を示しています。しかし、１つの SQL " +"クエリをグループの基準として使用しています。そのため、開始時刻いったような属性は、他クエリでは異なる場合があります。" #: js/messages.php:144 msgid "" @@ -1328,6 +1330,8 @@ msgid "" "same table are also being grouped together, disregarding of the inserted " "data." msgstr "" +"INSERT クエリのグループ化が選択されています。そのため、同じテーブルへの INSERT " +"クエリは挿入されたデータ部は同一のようにみなされて、グループ化が行われます。" #: js/messages.php:145 msgid "Log data loaded. Queries executed in this time span:" @@ -1354,17 +1358,16 @@ msgstr "フィルタ" #: js/messages.php:154 msgid "Filter queries by word/regexp:" -msgstr "" +msgstr "単語／正規表現でクエリをフィルタ：" #: js/messages.php:155 msgid "Group queries, ignoring variable data in WHERE clauses" -msgstr "クエリをまとめる（WHERE 句内のデータ部（文字列や数値など）は同一として扱われます）" +msgstr "WHERE 句内のデータ部（文字列や数値など）は同一として扱いクエリをまとめる" #: js/messages.php:156 -#, fuzzy #| msgid "Number of inserted rows" msgid "Sum of grouped rows:" -msgstr "挿入する行数" +msgstr "グループ後の件数：" #: js/messages.php:157 #| msgid "Total" @@ -9938,7 +9941,7 @@ msgstr "SELECT、INSERT、UPDATE、DELETE 文のみ取得する" #: server_status.php:1459 msgid "Remove variable data in INSERT statements for better grouping" -msgstr "" +msgstr "結果を扱いやすくするために INSERT 文におけるデータ部を同一のように扱う" #: server_status.php:1462 msgid "" @@ -9947,10 +9950,9 @@ msgid "" msgstr "ログの統計元を選択することができます。結果はクエリ文でグループ化されます。" #: server_status.php:1465 -#, fuzzy #| msgid "Query type" msgid "Query analyzer" -msgstr "クエリ種別" +msgstr "クエリの解析" #: server_status.php:1501 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12877-g95e90bb
by Piotr Przybylski 03 Aug '11

03 Aug '11

The branch, master has been updated via 95e90bbba40f90f183b659d8c2d5db5cdfc415d6 (commit) from 55c6eacf3e56da064dae69650480d84acd92d5a3 (commit) - Log ----------------------------------------------------------------- commit 95e90bbba40f90f183b659d8c2d5db5cdfc415d6 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Aug 3 23:56:02 2011 +0200 Comments and formatting ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 30 ++-- libraries/server_synchronize.lib.php | 309 ++++++++++++++++------------------ 2 files changed, 161 insertions(+), 178 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 288743e..4eb1819 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -67,7 +67,13 @@ if (! PMA_DBI_checkMysqlExtension($GLOBALS['cfg']['Server']['extension'])) { require_once './libraries/dbi/' . $GLOBALS['cfg']['Server']['extension'] . '.dbi.lib.php'; /** - * Common Functions + * runs a query + * + * @param string $query + * @param mixed $link + * @param int $options + * @param bool $cache_affected_rows + * @return mixed */ function PMA_DBI_query($query, $link = null, $options = 0, $cache_affected_rows = true) { $res = PMA_DBI_try_query($query, $link, $options, $cache_affected_rows) @@ -78,9 +84,10 @@ function PMA_DBI_query($query, $link = null, $options = 0, $cache_affected_rows /** * runs a query and returns the result * - * @param string $query query to run + * @param string $query query to run * @param resource $link mysql link resource - * @param integer $options + * @param integer $options + * @param bool $cache_affected_rows * @return mixed */ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true) @@ -237,9 +244,6 @@ function PMA_DBI_get_tables($database, $link = null) * @return integer a value representing whether $a should be before $b in the * sorted array or not * - * @global string the column the array shall be sorted by - * @global string the sorting order ('ASC' or 'DESC') - * * @access private */ function PMA_usort_comparison_callback($a, $b) @@ -276,9 +280,9 @@ function PMA_usort_comparison_callback($a, $b) * * @todo move into PMA_Table * @param string $database database - * @param string|false $table table + * @param string|bool $table table or false * @param boolean|string $tbl_is_group $table is a table group - * @param resource $link mysql link + * @param mixed $link mysql link * @param integer $limit_offset zero-based offset for the count * @param boolean|integer $limit_count number of tables to return * @param string $sort_by table attribute to sort by @@ -438,12 +442,12 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals } if (! isset($each_tables[$table_name]['Type']) - && isset($each_tables[$table_name]['Engine'])) { + && isset($each_tables[$table_name]['Engine'])) { // pma BC, same parts of PMA still uses 'Type' $each_tables[$table_name]['Type'] =& $each_tables[$table_name]['Engine']; } elseif (! isset($each_tables[$table_name]['Engine']) - && isset($each_tables[$table_name]['Type'])) { + && isset($each_tables[$table_name]['Type'])) { // old MySQL reports Type, newer MySQL reports Engine $each_tables[$table_name]['Engine'] =& $each_tables[$table_name]['Type']; @@ -851,8 +855,6 @@ function PMA_DBI_get_columns($database, $table, $full = false, $link = null) * @param mixed $link mysql link resource|object * @return mixed value for mysql server variable */ - - function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null) { if ($link === null) { @@ -878,8 +880,8 @@ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null } /** - * Function called just after a connection to the MySQL database server has been established - * It sets the connection collation, and determins the version of MySQL which is running. + * Function called just after a connection to the MySQL database server has been established + * It sets the connection collation, and determins the version of MySQL which is running. * * @param mixed $link mysql link resource|object * @param boolean $is_controluser diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index b7b332c..513e7e9 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -19,7 +19,6 @@ * @param array &$uncommon_source_tables empty array passed by reference to save * names of tables present in source database * but absent from target database - * @return nothing */ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$uncommon_source_tables) { @@ -46,7 +45,6 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$un * @param array &$uncommon_target_tables empty array passed by reference to save * names of tables presnet in target database * but absent from source database - * @return nothing */ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommon_target_tables) { @@ -85,9 +83,8 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo * @param array &$delete_array Unused * @param array &$fields_num A two dimensional array passed by reference to * contain number of fields for each matching table - * @param array $matching_table_index Index of a table from $matching_table array + * @param int $matching_table_index Index of a table from $matching_table array * @param array &$matching_tables_keys A two dimensional array passed by reference to contain names of keys for each matching table - * @return nothing */ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching_table, &$matching_tables_fields, &$update_array, &$insert_array, &$delete_array, &$fields_num, $matching_table_index, &$matching_tables_keys) @@ -305,7 +302,6 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching * @param db_link $trg_link connection established with target server * @param string $src_db name of source database * @param db_link $src_link connection established with source server - * @return nothing */ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link, $src_db, $src_link) { @@ -372,12 +368,11 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma /** * PMA_dataDiffInUncommonTables() finds the data difference in $source_tables_uncommon * - * @param $source_tables_uncommon array of table names; containing table names that are in source db and not in target db - * @param $src_db name of source database - * @param $src_link connection established with source server - * @param $index index of a table from $matching_table array - * @param $row_count number of rows - * @return nothing + * @param array $source_tables_uncommon table names that are in source db and not in target db + * @param string $src_db name of source database + * @param mixed $src_link connection established with source server + * @param int $index index of a table from $matching_table array + * @param array $row_count number of rows */ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $index, &$row_count) { @@ -390,16 +385,15 @@ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_lin * PMA_updateTargetTables() sets the updated field values to target table rows using $update_array[$matching_table_index] * * - * @param $table Array containing matching tables' names - * @param $update_array A three dimensional array containing field - * value updates required for each matching table - * @param $src_db Name of source database - * @param $trg_db Name of target database - * @param $trg_link Connection established with target server - * @param $matching_table_index index of matching table in matching_table_array - * @param $matching_table_keys - * @param $display true/false value - * @return nothing + * @param array $table Matching tables' names + * @param array $update_array A three dimensional array containing field + * value updates required for each matching table + * @param string $src_db Name of source database + * @param string $trg_db Name of target database + * @param mixed $trg_link Connection established with target server + * @param int $matching_table_index index of matching table in matching_table_array + * @param array $matching_table_keys + * @param boolean $display */ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_link, $matching_table_index, $matching_table_keys, $display) { @@ -447,34 +441,33 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li /** * PMA_insertIntoTargetTable() inserts missing rows in the target table using $array_insert[$matching_table_index] * - * @param $matching_table array containing matching table names - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $table_fields array containing field names of a table - * @param $array_insert - * @param $matching_table_index index of matching table in matching_table_array - * @param $matching_tables_keys array containing field names that are keys in the matching table - * @param $source_columns array containing source column information - * @param $add_column_array array containing column names that are to be added in target table - * @param $criteria array containing criterias like type, null, collation, default etc - * @param $target_tables_keys array containing field names that are keys in the target table - * @param $uncommon_tables array containing table names that are present in source db but not in targt db - * @param $uncommon_tables_fields array containing field names of the uncommon tables - * @param $uncommon_cols column names that are present in target table and not in source table - * @param $alter_str_array array containing column names that are to be altered - * @param $source_indexes column names on which indexes are made in source table - * @param $target_indexes column names on which indexes are made in target table - * @param $add_indexes_array array containing column names on which index is to be added in target table - * @param $alter_indexes_array array containing column names whose indexes are to be altered. Only index name and uniqueness of an index can be changed - * @param $delete_array array containing rows that are to be deleted - * @param $update_array array containing rows that are to be updated in target - * @param $display true/false value - * @return nothing + * @param array $matching_table matching table names + * @param string $src_db name of source database + * @param string $trg_db name of target database + * @param mixed $src_link connection established with source server + * @param mixed $trg_link connection established with target server + * @param array $table_fields field names of a table + * @param array &$array_insert + * @param int $matching_table_index index of matching table in matching_table_array + * @param array $matching_tables_keys field names that are keys in the matching table + * @param array $source_columns source column information + * @param array &$add_column_array column names that are to be added in target table + * @param array $criteria criteria like type, null, collation, default etc + * @param array $target_tables_keys field names that are keys in the target table + * @param array $uncommon_tables table names that are present in source db but not in targt db + * @param array &$uncommon_tables_fields field names of the uncommon tables + * @param array $uncommon_cols column names that are present in target table and not in source table + * @param array &$alter_str_array column names that are to be altered + * @param array &$source_indexes column names on which indexes are made in source table + * @param array &$target_indexes column names on which indexes are made in target table + * @param array &$add_indexes_array column names on which index is to be added in target table + * @param array &$alter_indexes_array column names whose indexes are to be altered. Only index name and uniqueness of an index can be changed + * @param array &$delete_array rows that are to be deleted + * @param array &$update_array rows that are to be updated in target + * @param bool $display */ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, $trg_link, $table_fields, &$array_insert, $matching_table_index, - $matching_tables_keys, $source_columns, &$add_column_array, $criteria, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields,$uncommon_cols, + $matching_tables_keys, $source_columns, &$add_column_array, $criteria, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields, $uncommon_cols, &$alter_str_array,&$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$delete_array, &$update_array, $display) { if (isset($array_insert[$matching_table_index])) { @@ -587,15 +580,14 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, /** * PMA_createTargetTables() Create the missing table $uncommon_table in target database * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $uncommon_tables names of tables present in source but not in target - * @param $table_index index of table in $uncommon_tables array - * @param $uncommon_tables_fields field names of the uncommon table - * @param $display true/false value - * @return nothing + * @param string $src_db name of source database + * @param string $trg_db name of target database + * @param mixed $src_link connection established with source server + * @param mixed $trg_link connection established with target server + * @param array &$uncommon_tables names of tables present in source but not in target + * @param int $table_index index of table in $uncommon_tables array + * @param array &$uncommon_tables_fields field names of the uncommon table + * @param bool $display */ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncommon_tables, $table_index, &$uncommon_tables_fields, $display) { @@ -640,16 +632,14 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm /** * PMA_populateTargetTables() inserts data into uncommon tables after they have been created * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $uncommon_tables array containing uncommon table names (table names that are present in source but not in target db) - * @param $table_index index of table in matching_table_array - * @param $uncommon_tables_fields field names of the uncommon table - * @param $display true/false value - * - * @return nothing + * @param string $src_db name of source database + * @param string $trg_db name of target database + * @param mixed $src_link connection established with source server + * @param mixed $trg_link connection established with target server + * @param array $uncommon_tables uncommon table names (table names that are present in source but not in target db) + * @param int $table_index index of table in matching_table_array + * @param array $uncommon_tables_fields field names of the uncommon table + * @param bool $display * * @todo This turns NULL values into '' (empty string) */ @@ -682,14 +672,13 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom /** * PMA_deleteFromTargetTable() delete rows from target table * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing matching table names - * @param $table_index index of table in matching_table_array - * @param $target_tables_keys primary key names of the target tables - * @param $delete_array array containing the key values of rows that are to be deleted - * @param $display true/false value - * @return nothing + * @param string $trg_db name of target database + * @param mixed $trg_link connection established with target server + * @param array $matching_tables matching table names + * @param int $table_index index of table in matching_table_array + * @param array $target_tables_keys primary key names of the target tables + * @param array $delete_array key values of rows that are to be deleted + * @param bool $display */ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index, $target_tables_keys, $delete_array, $display) { @@ -739,22 +728,21 @@ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_ * Keys for all the source tables that have a corresponding target table are placed in $matching_tables_keys. * Keys for all the target tables that have a corresponding source table are placed in $target_tables_keys. * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $source_columns array containing columns information of the source tables - * @param $target_columns array containing columns information of the target tables - * @param $alter_str_array three dimensional associative array first index being the matching table index, second index being column name for which target - * column have some criteria different and third index containing the criteria which is different. - * @param $add_column_array two dimensional associative array, first index of the array contain the matching table number and second index contain the - * column name which is to be added in the target table - * @param $uncommon_columns array containing the columns that are present in the target table but not in the source table - * @param $criteria array containing the criterias which are to be checked for field that is present in source table and target table - * @param $target_tables_keys array containing the field names which is key in the target table - * @param $matching_table_index integer number of the matching table - * @return nothing + * @param string $src_db name of source database + * @param string $trg_db name of target database + * @param mixed $src_link connection established with source server + * @param mixed $trg_link connection established with target server + * @param array $matching_tables names of matching tables + * @param array &$source_columns columns information of the source tables + * @param array &$target_columns columns information of the target tables + * @param array &$alter_str_array three dimensional associative array first index being the matching table index, second index being column name for which target + * column have some criteria different and third index containing the criteria which is different. + * @param array &$add_column_array two dimensional associative array, first index of the array contain the matching table number and second index contain the + * column name which is to be added in the target table + * @param array &$uncommon_columns columns that are present in the target table but not in the source table + * @param array $criteria criteria which are to be checked for field that is present in source table and target table + * @param array &$target_tables_keys field names which is key in the target table + * @param int $matching_table_index number of the matching table */ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_columns, &$target_columns, &$alter_str_array, &$add_column_array, &$uncommon_columns, $criteria, &$target_tables_keys, $matching_table_index) @@ -764,7 +752,7 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matc $target_columns[$matching_table_index] = PMA_DBI_get_columns_full($trg_db, $matching_tables[$matching_table_index], null, $trg_link); foreach ($source_columns[$matching_table_index] as $column_name => $each_column) { if (isset($target_columns[$matching_table_index][$column_name]['Field'])) { - //If column exists in target table then matches criterias like type, null, collation, key, default, comment of the column + //If column exists in target table then matches criteria like type, null, collation, key, default, comment of the column for ($i = 0; $i < sizeof($criteria); $i++) { if ($source_columns[$matching_table_index][$column_name][$criteria[$i]] != $target_columns[$matching_table_index][$column_name][$criteria[$i]]) { if (($criteria[$i] == 'Default') && ($source_columns[$matching_table_index][$column_name][$criteria[$i]] == '' )) { @@ -802,23 +790,22 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matc /** * PMA_addColumnsInTargetTable() adds column that are present in source table but not in target table * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $source_columns array containing columns information of the source tables - * @param $add_column_array array containing the names of the column(field) that are to be added in the target - * @param $matching_tables_fields - * @param $criteria array containing the criterias - * @param $matching_tables_keys array containing the field names which is key in the source table - * @param $target_tables_keys array containing the field names which is key in the target table - * @param $uncommon_tables array containing the table names that are present in source db and not in target db - * @param $uncommon_tables_fields array containing the names of the fields of the uncommon tables - * @param $table_counter integer number of the matching table - * @param $uncommon_cols - * @param $display true/false value - * @return nothing + * @param string $src_db name of source database + * @param string $trg_db name of target database + * @param mixed $src_link connection established with source server + * @param mixed $trg_link connection established with target server + * @param array $matching_tables names of matching tables + * @param array $source_columns columns information of the source tables + * @param array &$add_column_array the names of the column(field) that are to be added in the target + * @param array $matching_tables_fields + * @param array $criteria criteria + * @param array $matching_tables_keys field names which is key in the source table + * @param array $target_tables_keys field names which is key in the target table + * @param array $uncommon_tables table names that are present in source db and not in target db + * @param array &$uncommon_tables_fields names of the fields of the uncommon tables + * @param int $table_counter number of the matching table + * @param array $uncommon_cols + * @param bool $display */ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, &$add_column_array, $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields, $table_counter, $uncommon_cols, $display) @@ -901,17 +888,16 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma * PMA_checkForeignKeys() checks if the referenced table have foreign keys. * uses PMA_createTargetTables() * - * @param $src_db name of source database - * @param $src_link connection established with source server - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $referenced_table table whose column is a foreign key in another table - * @param $uncommon_tables array containing names that are uncommon - * @param $uncommon_tables_fields field names of the uncommon table - * @param $display true/false value - * @return nothing + * @param string $src_db name of source database + * @param mixed $src_link connection established with source server + * @param string $trg_db name of target database + * @param mixed $trg_link connection established with target server + * @param string $referenced_table table whose column is a foreign key in another table + * @param array &$uncommon_tables names that are uncommon + * @param array &$uncommon_tables_fields field names of the uncommon table + * @param bool $display */ -function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$referenced_table, &$uncommon_tables, &$uncommon_tables_fields, $display) +function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link, $referenced_table, &$uncommon_tables, &$uncommon_tables_fields, $display) { $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $src_db . "' AND TABLE_NAME = '" . $referenced_table . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;"; @@ -932,18 +918,17 @@ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$reference /** * PMA_alterTargetTableStructure() alters structure of the target table using $alter_str_array * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $source_columns array containing columns information of the source table - * @param $alter_str_array array containing the column name and criteria which is to be altered for the targert table - * @param $matching_tables_fields array containing the name of the fields for the matching table - * @param $criteria array containing the criterias - * @param $matching_tables_keys array containing the field names which is key in the source table - * @param $target_tables_keys array containing the field names which is key in the target table - * @param $matching_table_index integer number of the matching table - * @param $display true/false value - * @return nothing + * @param string $trg_db name of target database + * @param mixed $trg_link connection established with target server + * @param array $matching_tables names of matching tables + * @param array &$source_columns columns information of the source table + * @param array &$alter_str_array column name and criteria which is to be altered for the targert table + * @param array $matching_tables_fields name of the fields for the matching table + * @param array $criteria criteria + * @param array &$matching_tables_keys field names which is key in the source table + * @param array &$target_tables_keys field names which is key in the target table + * @param int $matching_table_index number of the matching table + * @param bool $display */ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$source_columns, &$alter_str_array, $matching_tables_fields, $criteria, &$matching_tables_keys, &$target_tables_keys, $matching_table_index, $display) @@ -960,7 +945,8 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s } } } - $pri_query; + + $pri_query = null; if (! $check) { $pri_query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$matching_table_index]); if (sizeof($target_tables_keys[$matching_table_index]) > 0) { @@ -1067,13 +1053,12 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s /** * PMA_removeColumnsFromTargetTable() removes the columns which are present in target table but not in source table. * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $uncommon_columns array containing the names of the column which are to be dropped from the target table - * @param $table_counter index of the matching table as in $matchiing_tables array - * @param $display true/false value - * @return nothing + * @param string $trg_db name of target database + * @param mixed $trg_link connection established with target server + * @param array $matching_tables names of matching tables + * @param array $uncommon_columns array containing the names of the column which are to be dropped from the target table + * @param int $table_counter index of the matching table as in $matchiing_tables array + * @param bool $display */ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $table_counter, $display) { @@ -1123,18 +1108,17 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, * indexes to be altered in $alter_indexes_array and indexes to be removed from target table in $remove_indexes_array. * Only keyname and uniqueness characteristic of the indexes are altered. * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_tables array containing the matching tables name - * @param $source_indexes array containing the indexes of the source table - * @param $target_indexes array containing the indexes of the target table - * @param $add_indexes_array array containing the name of the column on which the index is to be added in the target table - * @param $alter_indexes_array array containing the key name which needs to be altered - * @param $remove_indexes_array array containing the key name of the index which is to be removed from the target table - * @param $table_counter number of the matching table - * @return nothing + * @param string $src_db name of source database + * @param string $trg_db name of target database + * @param mixed $src_link connection established with source server + * @param mixed $trg_link connection established with target server + * @param array $matching_tables matching tables name + * @param array &$source_indexes indexes of the source table + * @param array &$target_indexes indexes of the target table + * @param array &$add_indexes_array name of the column on which the index is to be added in the target table + * @param array &$alter_indexes_array key name which needs to be altered + * @param array &$remove_indexes_array key name of the index which is to be removed from the target table + * @param int $table_counter number of the matching table */ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$remove_indexes_array, $table_counter) @@ -1188,17 +1172,16 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi /** * PMA_applyIndexesDiff() create indexes, alters indexes and remove indexes. * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing the matching tables name - * @param $source_indexes array containing the indexes of the source table - * @param $target_indexes array containing the indexes of the target table - * @param $add_indexes_array array containing the column names on which indexes are to be created in target table - * @param $alter_indexes_array array containing the column names for which indexes are to be altered - * @param $remove_indexes_array array containing the key name of the indexes which are to be removed from the target table - * @param $table_counter number of the matching table - * @param $display true/false value - * @return nothing + * @param string $trg_db name of target database + * @param mixed $trg_link connection established with target server + * @param array $matching_tables matching tables name + * @param array $source_indexes indexes of the source table + * @param array $target_indexes indexes of the target table + * @param array $add_indexes_array column names on which indexes are to be created in target table + * @param array $alter_indexes_array column names for which indexes are to be altered + * @param array $remove_indexes_array key name of the indexes which are to be removed from the target table + * @param int $table_counter number of the matching table + * @param $display */ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, $remove_indexes_array, $table_counter, $display) @@ -1276,8 +1259,7 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind * PMA_displayQuery() displays a query, taking the maximum display size * into account * - * @param $query the query to display - * @return nothing + * @param string $query the query to display */ function PMA_displayQuery($query) { if (strlen($query) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { @@ -1291,7 +1273,6 @@ function PMA_displayQuery($query) { * * @param string $src_db source db name * @param string $trg_db target db name - * @return nothing */ function PMA_syncDisplayHeaderCompare($src_db, $trg_db) { echo '<fieldset style="padding:0"><div style="padding:1.5em; overflow:auto; height:220px">'; hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git