- Git - lists.phpmyadmin.net

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

21 Jul '11

The branch, master has been updated via dd641ef16437e9c3c232889fd2181833ef8a4e2c (commit) from 85e680c39689f60a913cfa15c5392f0aafd79fc8 (commit) - Log ----------------------------------------------------------------- commit dd641ef16437e9c3c232889fd2181833ef8a4e2c Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:49:25 2011 +0200 Wrap some long lines ----------------------------------------------------------------------- Summary of changes: libraries/export/sql.php | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index c87f926..81058a8 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -27,7 +27,9 @@ if (isset($plugin_list)) { 'mime_type' => 'text/x-sql', 'options' => array()); - $plugin_list['sql']['options'][] = array('type' => 'begin_group', 'name' => 'general_opts'); + $plugin_list['sql']['options'][] = array( + 'type' => 'begin_group', + 'name' => 'general_opts'); /* comments */ $plugin_list['sql']['options'][] = array( @@ -77,7 +79,10 @@ if (isset($plugin_list)) { 'type' => 'bool', 'name' => 'disable_fk', 'text' => __('Disable foreign key checks'), - 'doc' => array('manual_MySQL_Database_Administration', 'server-system-variables', 'sysvar_foreign_key_checks') + 'doc' => array( + 'manual_MySQL_Database_Administration', + 'server-system-variables', + 'sysvar_foreign_key_checks') ); $plugin_list['sql']['options_text'] = __('Options'); @@ -94,7 +99,9 @@ if (isset($plugin_list)) { 'name' => 'compatibility', 'text' => __('Database system or older MySQL server to maximize output compatibility with:'), 'values' => $values, - 'doc' => array('manual_MySQL_Database_Administration', 'Server_SQL_mode') + 'doc' => array( + 'manual_MySQL_Database_Administration', + 'Server_SQL_mode') ); unset($values); } @@ -324,9 +331,12 @@ function PMA_exportRoutines($db) { foreach ($procedure_names as $procedure_name) { if (! empty($GLOBALS['sql_drop_table'])) { - $text .= 'DROP PROCEDURE IF EXISTS ' . PMA_backquote($procedure_name) . $delimiter . $crlf; + $text .= 'DROP PROCEDURE IF EXISTS ' + . PMA_backquote($procedure_name) + . $delimiter . $crlf; } - $text .= PMA_DBI_get_definition($db, 'PROCEDURE', $procedure_name) . $delimiter . $crlf . $crlf; + $text .= PMA_DBI_get_definition($db, 'PROCEDURE', $procedure_name) + . $delimiter . $crlf . $crlf; } } @@ -338,9 +348,12 @@ function PMA_exportRoutines($db) { foreach ($function_names as $function_name) { if (! empty($GLOBALS['sql_drop_table'])) { - $text .= 'DROP FUNCTION IF EXISTS ' . PMA_backquote($function_name) . $delimiter . $crlf; + $text .= 'DROP FUNCTION IF EXISTS ' + . PMA_backquote($function_name) + . $delimiter . $crlf; } - $text .= PMA_DBI_get_definition($db, 'FUNCTION', $function_name) . $delimiter . $crlf . $crlf; + $text .= PMA_DBI_get_definition($db, 'FUNCTION', $function_name) + . $delimiter . $crlf . $crlf; } } hooks/post-receive -- phpMyAdmin

1 0

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

21 Jul '11

The branch, master has been updated via 85e680c39689f60a913cfa15c5392f0aafd79fc8 (commit) from 0d2c07306507cf10b75ebb5ee369e82c77bfa00b (commit) - Log ----------------------------------------------------------------- commit 85e680c39689f60a913cfa15c5392f0aafd79fc8 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:45:43 2011 +0200 Remove function names used as first word in docblock ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 52232b8..3b929d3 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -7,11 +7,10 @@ */ /** - * 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. + * 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, @@ -38,8 +37,7 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$un } /** - * PMA_getNonMatchingTargetTables() places tables present - * in target database but are absent from source database + * 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 @@ -64,7 +62,7 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo } /** - * PMA_dataDiffInTables() finds the difference in source and target matching tables by + * Finds the difference in source and target matching tables by * first comparing source table's primary key entries with target table enteries. * It gets the field names for the matching table also for comparisons. * If the entry is found in target table also then it is checked for the remaining @@ -72,7 +70,6 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo * If update is required, it is placed in $update_array * Otherwise that entry is placed in the $insert_array. * - * * @param string $src_db name of source database * @param string $trg_db name of target database * @param db_link $src_link connection established with source server @@ -294,7 +291,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching } /** - * PMA_findDeleteRowsFromTargetTables finds the rows which are to be deleted from target table. + * Finds the rows which are to be deleted from target table. * * @param array &$delete_array array containing rows that are to be deleted * @param array $matching_table array containing matching table names @@ -306,7 +303,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching * @param string $src_db name of source database * @param db_link $src_link connection established with source server */ -function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link,$src_db, $src_link) +function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link, $src_db, $src_link) { if (isset($trg_keys[$matching_table_index])) { $target_key_values = PMA_get_column_values($trg_db, $matching_table[$matching_table_index], $trg_keys[$matching_table_index], $trg_link); hooks/post-receive -- phpMyAdmin

1 0

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

21 Jul '11

The branch, master has been updated via 0d2c07306507cf10b75ebb5ee369e82c77bfa00b (commit) via 8aa62d4931a3c83d095f5b8dc180dda252ebcbc2 (commit) via 4c16ac5d060493dc2aa9cb91491ade140a16d203 (commit) via 625a35bd87037ace91b4534c5fc9482e021e4257 (commit) from 7986ea8f35c539699f279b3bbd7a9196822a096d (commit) - Log ----------------------------------------------------------------- commit 0d2c07306507cf10b75ebb5ee369e82c77bfa00b Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:43:54 2011 +0200 Add parameter types commit 8aa62d4931a3c83d095f5b8dc180dda252ebcbc2 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:41:52 2011 +0200 Minor fix in coding style commit 4c16ac5d060493dc2aa9cb91491ade140a16d203 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:41:37 2011 +0200 Missing references in doc block commit 625a35bd87037ace91b4534c5fc9482e021e4257 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:40:46 2011 +0200 Wrap some long lines ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 47 ++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 22 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 3a6a666..52232b8 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -15,9 +15,11 @@ * * @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 + * @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) { @@ -40,16 +42,17 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$un * 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 + * @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++) { $match = false; - for ($d=0; $d < sizeof($matching_tables); $d++) - { + for ($d=0; $d < sizeof($matching_tables); $d++) { if ($trg_tables[$c] === $matching_tables[$d]) { $match=true; } @@ -74,14 +77,14 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo * @param string $trg_db name of target database * @param db_link $src_link connection established with source server * @param db_link $trg_link connection established with target server - * @param array $matching_table array containing matching table names + * @param array &$matching_table array containing matching table names * @param array &$matching_tables_fields A two dimensional array passed by reference to contain names of fields for each matching table - * @param array $update_array A three dimensional array passed by reference to + * @param array &$update_array A three dimensional array passed by reference to * contain updates required for each matching table - * @param array $insert_array A three dimensional array passed by reference to + * @param array &$insert_array A three dimensional array passed by reference to * contain inserts required for each matching table - * @param array $delete_array Unused - * @param array $fields_num A two dimensional array passed by reference to + * @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 array &$matching_tables_keys A two dimensional array passed by reference to contain names of keys for each matching table @@ -293,15 +296,15 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching /** * PMA_findDeleteRowsFromTargetTables finds the rows which are to be deleted from target table. * - * @param $delete_array array containing rows that are to be deleted - * @param $matching_table array containing matching table names - * @param $matching_table_index index of a table from $matching_table array - * @param $trg_keys array of target table keys - * @param $src_keys array of source table keys - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $src_db name of source database - * @param $src_link connection established with source server + * @param array &$delete_array array containing rows that are to be deleted + * @param array $matching_table array containing matching table names + * @param int $matching_table_index index of a table from $matching_table array + * @param array $trg_keys array of target table keys + * @param array $src_keys array of source table keys + * @param string $trg_db name of target database + * @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 */ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link,$src_db, $src_link) { hooks/post-receive -- phpMyAdmin

1 0

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

21 Jul '11

The branch, master has been updated via 7986ea8f35c539699f279b3bbd7a9196822a096d (commit) via dafefcd2759178980f8d9ed87edbbafe2ee94a5e (commit) from 008b96aaec574b7d3310883c893f6023d620fc01 (commit) - Log ----------------------------------------------------------------- commit 7986ea8f35c539699f279b3bbd7a9196822a096d Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:36:01 2011 +0200 Free result once we do not need it commit dafefcd2759178980f8d9ed87edbbafe2ee94a5e Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:35:43 2011 +0200 More replacement of double quotes ----------------------------------------------------------------------- Summary of changes: libraries/export/codegen.php | 54 +++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index a533dd4..35fe21d 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -242,44 +242,45 @@ class TableProperty function handleNHibernateCSBody($db, $table, $crlf) { $lines=array(); - $result=PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); + $result=PMA_DBI_query(sprintf('DESC %s.%s', PMA_backquote($db), PMA_backquote($table))); if ($result) { $tableProperties=array(); while ($row = PMA_DBI_fetch_row($result)) { $tableProperties[] = new TableProperty($row); } - $lines[] = "using System;"; - $lines[] = "using System.Collections;"; - $lines[] = "using System.Collections.Generic;"; - $lines[] = "using System.Text;"; - $lines[] = "namespace ".cgMakeIdentifier($db); - $lines[] = "{"; - $lines[] = " #region ".cgMakeIdentifier($table); - $lines[] = " public class ".cgMakeIdentifier($table); - $lines[] = " {"; - $lines[] = " #region Member Variables"; + PMA_DBI_free_result($result); + $lines[] = 'using System;'; + $lines[] = 'using System.Collections;'; + $lines[] = 'using System.Collections.Generic;'; + $lines[] = 'using System.Text;'; + $lines[] = 'namespace ' . cgMakeIdentifier($db); + $lines[] = '{'; + $lines[] = ' #region ' . cgMakeIdentifier($table); + $lines[] = ' public class ' . cgMakeIdentifier($table); + $lines[] = ' {'; + $lines[] = ' #region Member Variables'; foreach ($tableProperties as $tablePropertie) { - $lines[] = $tablePropertie->formatCs(" protected #dotNetPrimitiveType# _#name#;"); + $lines[] = $tablePropertie->formatCs(' protected #dotNetPrimitiveType# _#name#;'); } - $lines[] = " #endregion"; - $lines[] = " #region Constructors"; - $lines[] = " public ".cgMakeIdentifier($table)."() { }"; + $lines[] = ' #endregion'; + $lines[] = ' #region Constructors'; + $lines[] = ' public ' . cgMakeIdentifier($table).'() { }'; $temp = array(); foreach ($tableProperties as $tablePropertie) { if (! $tablePropertie->isPK()) { - $temp[] = $tablePropertie->formatCs("#dotNetPrimitiveType# #name#"); + $temp[] = $tablePropertie->formatCs('#dotNetPrimitiveType# #name#'); } } - $lines[] = " public ".cgMakeIdentifier($table)."(".implode(", ", $temp).")"; - $lines[] = " {"; + $lines[] = ' public ' . cgMakeIdentifier($table) . '(' . implode(', ', $temp) . ')'; + $lines[] = ' {'; foreach ($tableProperties as $tablePropertie) { if (! $tablePropertie->isPK()) { - $lines[] = $tablePropertie->formatCs(" this._#name#=#name#;"); + $lines[] = $tablePropertie->formatCs(' this._#name#=#name#;'); } } - $lines[] = " }"; - $lines[] = " #endregion"; - $lines[] = " #region Public Properties"; + $lines[] = ' }'; + $lines[] = ' #endregion'; + $lines[] = ' #region Public Properties'; foreach ($tableProperties as $tablePropertie) { $lines[] = $tablePropertie->formatCs('' . ' public virtual #dotNetPrimitiveType# #ucfirstName#' . "\n" @@ -289,11 +290,10 @@ class TableProperty . ' }' ); } - $lines[] = " #endregion"; - $lines[] = " }"; - $lines[] = " #endregion"; - $lines[] = "}"; - PMA_DBI_free_result($result); + $lines[] = ' #endregion'; + $lines[] = ' }'; + $lines[] = ' #endregion'; + $lines[] = '}'; } return implode("\n", $lines); } hooks/post-receive -- phpMyAdmin

1 0

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

21 Jul '11

The branch, master has been updated via 008b96aaec574b7d3310883c893f6023d620fc01 (commit) via 5330cabd37d043c1c63ca5406c726bbf83b6c428 (commit) from c03c7bbc69d7b05ad3290d3378d48f3debb80745 (commit) - Log ----------------------------------------------------------------- commit 008b96aaec574b7d3310883c893f6023d620fc01 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:29:36 2011 +0200 Coding style Wrap ling lines, add missing {} around for and if. commit 5330cabd37d043c1c63ca5406c726bbf83b6c428 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:28:22 2011 +0200 Remove rest of custom color support This seems to be stray code for it. Also adjusted documentation to represent real return value. ----------------------------------------------------------------------- Summary of changes: libraries/Config.class.php | 5 ++--- libraries/export/codegen.php | 33 ++++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 58ea577..28f9ac3 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -674,7 +674,7 @@ class PMA_Config * or the theme changes * must also check the pma_fontsize cookie in case there is no * config file - * @return int Unix timestamp + * @return int Summary of unix timestamps and fontsize, to be unique on theme parameters change */ function getThemeUniqueValue() { @@ -691,8 +691,7 @@ class PMA_Config $this->default_source_mtime + $this->get('user_preferences_mtime') + $_SESSION['PMA_Theme']->mtime_info + - $_SESSION['PMA_Theme']->filesize_info) - . (isset($_SESSION['tmp_user_values']['custom_color']) ? substr($_SESSION['tmp_user_values']['custom_color'], 1, 6) : ''); + $_SESSION['PMA_Theme']->filesize_info); } /** diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index 94971e8..a533dd4 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -245,8 +245,9 @@ class TableProperty $result=PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); if ($result) { $tableProperties=array(); - while ($row = PMA_DBI_fetch_row($result)) + while ($row = PMA_DBI_fetch_row($result)) { $tableProperties[] = new TableProperty($row); + } $lines[] = "using System;"; $lines[] = "using System.Collections;"; $lines[] = "using System.Collections.Generic;"; @@ -257,25 +258,37 @@ class TableProperty $lines[] = " public class ".cgMakeIdentifier($table); $lines[] = " {"; $lines[] = " #region Member Variables"; - foreach ($tableProperties as $tablePropertie) + foreach ($tableProperties as $tablePropertie) { $lines[] = $tablePropertie->formatCs(" protected #dotNetPrimitiveType# _#name#;"); + } $lines[] = " #endregion"; $lines[] = " #region Constructors"; $lines[] = " public ".cgMakeIdentifier($table)."() { }"; $temp = array(); - foreach ($tableProperties as $tablePropertie) - if (! $tablePropertie->isPK()) + foreach ($tableProperties as $tablePropertie) { + if (! $tablePropertie->isPK()) { $temp[] = $tablePropertie->formatCs("#dotNetPrimitiveType# #name#"); + } + } $lines[] = " public ".cgMakeIdentifier($table)."(".implode(", ", $temp).")"; $lines[] = " {"; - foreach ($tableProperties as $tablePropertie) - if (! $tablePropertie->isPK()) + foreach ($tableProperties as $tablePropertie) { + if (! $tablePropertie->isPK()) { $lines[] = $tablePropertie->formatCs(" this._#name#=#name#;"); + } + } $lines[] = " }"; $lines[] = " #endregion"; $lines[] = " #region Public Properties"; - foreach ($tableProperties as $tablePropertie) - $lines[] = $tablePropertie->formatCs(" public virtual #dotNetPrimitiveType# #ucfirstName#\n {\n get {return _#name#;}\n set {_#name#=value;}\n }"); + foreach ($tableProperties as $tablePropertie) { + $lines[] = $tablePropertie->formatCs('' + . ' public virtual #dotNetPrimitiveType# #ucfirstName#' . "\n" + . ' {' . "\n" + . ' get {return _#name#;}' . "\n" + . ' set {_#name#=value;}' . "\n" + . ' }' + ); + } $lines[] = " #endregion"; $lines[] = " }"; $lines[] = " #endregion"; @@ -292,7 +305,9 @@ class TableProperty $lines[] = '<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" ' . 'namespace="' . cgMakeIdentifier($db) . '" ' . 'assembly="' . cgMakeIdentifier($db) . '">'; - $lines[] = ' <class name="' . cgMakeIdentifier($table) . '" table="' . cgMakeIdentifier($table) . '">'; + $lines[] = ' <class ' + . 'name="' . cgMakeIdentifier($table) . '" ' + . 'table="' . cgMakeIdentifier($table) . '">'; $result = PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); if ($result) { while ($row = PMA_DBI_fetch_row($result)) { hooks/post-receive -- phpMyAdmin

1 0

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

21 Jul '11

The branch, master has been updated via c03c7bbc69d7b05ad3290d3378d48f3debb80745 (commit) via 7f629c66ff17ecfe5502fdf3fdc389d4c4bb5851 (commit) via b349356a83ad44bfc657101337f08c760e3bdd75 (commit) via 79af2a937435c04ab04ec2c0540d01fd27d7e0a8 (commit) from 73bb9302b6dec3befea195cfdd9c95614281a639 (commit) - Log ----------------------------------------------------------------- commit c03c7bbc69d7b05ad3290d3378d48f3debb80745 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:25:31 2011 +0200 Better formatting for code commit 7f629c66ff17ecfe5502fdf3fdc389d4c4bb5851 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:22:01 2011 +0200 Remove method used only in single place as a function commit b349356a83ad44bfc657101337f08c760e3bdd75 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:20:11 2011 +0200 Avoid storing table data when we don't need it commit 79af2a937435c04ab04ec2c0540d01fd27d7e0a8 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:19:07 2011 +0200 Minimize need for escaping by using single quotes ----------------------------------------------------------------------- Summary of changes: libraries/export/codegen.php | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index bc0dada..94971e8 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -123,8 +123,8 @@ function PMA_exportDBCreate($db) */ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { - global $CG_FORMATS, $CG_HANDLERS; - $format = cgGetOption("format"); + global $CG_FORMATS, $CG_HANDLERS, $what; + $format = $GLOBALS[$what . '_format']; if (isset($CG_FORMATS[$format])) { return PMA_exportOutputHandler($CG_HANDLERS[$format]($db, $table, $crlf)); } @@ -287,7 +287,7 @@ class TableProperty function handleNHibernateXMLBody($db, $table, $crlf) { - $lines=array(); + $lines = array(); $lines[] = '<?xml version="1.0" encoding="utf-8" ?' . '>'; $lines[] = '<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" ' . 'namespace="' . cgMakeIdentifier($db) . '" ' @@ -295,26 +295,25 @@ class TableProperty $lines[] = ' <class name="' . cgMakeIdentifier($table) . '" table="' . cgMakeIdentifier($table) . '">'; $result = PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); if ($result) { - $tableProperties = array(); - while ($row = PMA_DBI_fetch_row($result)) - $tableProperties[] = new TableProperty($row); - foreach ($tableProperties as $tablePropertie) { + while ($row = PMA_DBI_fetch_row($result)) { + $tablePropertie = new TableProperty($row); if ($tablePropertie->isPK()) - $lines[] = $tablePropertie->formatXml(" <id name=\"#ucfirstName#\" type=\"#dotNetObjectType#\" unsaved-value=\"0\">\n <column name=\"#name#\" sql-type=\"#type#\" not-null=\"#notNull#\" unique=\"#unique#\" index=\"PRIMARY\"/>\n <generator class=\"native\" />\n </id>"); + $lines[] = $tablePropertie->formatXml('' + . ' <id name="#ucfirstName#" type="#dotNetObjectType#" unsaved-value="0">' . "\n" + . ' <column name="#name#" sql-type="#type#" not-null="#notNull#" unique="#unique#" index="PRIMARY"/>' . "\n" + . ' <generator class="native" />' . "\n" + . ' </id>'); else - $lines[] = $tablePropertie->formatXml(" <property name=\"#ucfirstName#\" type=\"#dotNetObjectType#\">\n <column name=\"#name#\" sql-type=\"#type#\" not-null=\"#notNull#\" #indexName#/>\n </property>"); + $lines[] = $tablePropertie->formatXml('' + . ' <property name="#ucfirstName#" type="#dotNetObjectType#">' . "\n" + . ' <column name="#name#" sql-type="#type#" not-null="#notNull#" #indexName#/>' . "\n" + . ' </property>'); } PMA_DBI_free_result($result); } - $lines[]=" </class>"; - $lines[]="</hibernate-mapping>"; + $lines[] = ' </class>'; + $lines[] = '</hibernate-mapping>'; return implode("\n", $lines); } - - function cgGetOption($optionName) - { - global $what; - return $GLOBALS[$what . "_" . $optionName]; - } } ?> hooks/post-receive -- phpMyAdmin

1 0

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

21 Jul '11

The branch, master has been updated via 73bb9302b6dec3befea195cfdd9c95614281a639 (commit) via beb73226c421eed473a2cc06b0d3760dafd30ae1 (commit) via a8d8e0c89a6dcfee2b904220d12e0688c4e7a46e (commit) via abc7e01cf07d59f12d93875162005b6cdcc492f1 (commit) from 7dad0213b1f965abc5d1641f6bd72c9aaf4ac2b7 (commit) - Log ----------------------------------------------------------------- commit 73bb9302b6dec3befea195cfdd9c95614281a639 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:17:51 2011 +0200 Minimize need for escaping by using single quotes commit beb73226c421eed473a2cc06b0d3760dafd30ae1 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:15:35 2011 +0200 Minor fixes in coding style commit a8d8e0c89a6dcfee2b904220d12e0688c4e7a46e Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:13:24 2011 +0200 Add file description commit abc7e01cf07d59f12d93875162005b6cdcc492f1 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:11:55 2011 +0200 Minor fixes in coding style ----------------------------------------------------------------------- Summary of changes: libraries/Config.class.php | 12 +++++++----- libraries/export/codegen.php | 17 ++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 942ee9e..58ea577 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * + * Configuration handling. * * @package phpMyAdmin */ @@ -359,7 +359,7 @@ class PMA_Config if ($eval_result === false) { $this->error_config_file = true; - } else { + } else { $this->error_config_file = false; $this->source_mtime = filemtime($this->getSource()); } @@ -692,7 +692,7 @@ class PMA_Config $this->get('user_preferences_mtime') + $_SESSION['PMA_Theme']->mtime_info + $_SESSION['PMA_Theme']->filesize_info) - . (isset($_SESSION['tmp_user_values']['custom_color']) ? substr($_SESSION['tmp_user_values']['custom_color'],1,6) : ''); + . (isset($_SESSION['tmp_user_values']['custom_color']) ? substr($_SESSION['tmp_user_values']['custom_color'], 1, 6) : ''); } /** @@ -975,7 +975,7 @@ class PMA_Config // At first we try to parse REQUEST_URI, it might contain full URL, if (PMA_getenv('REQUEST_URI')) { $url = @parse_url(PMA_getenv('REQUEST_URI')); // produces E_WARNING if it cannot get parsed, e.g. '/foobar:/' - if($url === false) { + if ($url === false) { $url = array(); } } @@ -1068,7 +1068,9 @@ class PMA_Config /** * @todo finish */ - function save() {} + function save() + { + } /** * returns options for font size selection diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index 5ee114d..bc0dada 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -243,8 +243,7 @@ class TableProperty { $lines=array(); $result=PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); - if ($result) - { + if ($result) { $tableProperties=array(); while ($row = PMA_DBI_fetch_row($result)) $tableProperties[] = new TableProperty($row); @@ -289,17 +288,17 @@ class TableProperty function handleNHibernateXMLBody($db, $table, $crlf) { $lines=array(); - $lines[] = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"; - $lines[] = "<hibernate-mapping xmlns=\"urn:nhibernate-mapping-2.2\" namespace=\"".cgMakeIdentifier($db)."\" assembly=\"".cgMakeIdentifier($db)."\">"; - $lines[] = " <class name=\"".cgMakeIdentifier($table)."\" table=\"".cgMakeIdentifier($table)."\">"; + $lines[] = '<?xml version="1.0" encoding="utf-8" ?' . '>'; + $lines[] = '<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" ' + . 'namespace="' . cgMakeIdentifier($db) . '" ' + . 'assembly="' . cgMakeIdentifier($db) . '">'; + $lines[] = ' <class name="' . cgMakeIdentifier($table) . '" table="' . cgMakeIdentifier($table) . '">'; $result = PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); - if ($result) - { + if ($result) { $tableProperties = array(); while ($row = PMA_DBI_fetch_row($result)) $tableProperties[] = new TableProperty($row); - foreach ($tableProperties as $tablePropertie) - { + foreach ($tableProperties as $tablePropertie) { if ($tablePropertie->isPK()) $lines[] = $tablePropertie->formatXml(" <id name=\"#ucfirstName#\" type=\"#dotNetObjectType#\" unsaved-value=\"0\">\n <column name=\"#name#\" sql-type=\"#type#\" not-null=\"#notNull#\" unique=\"#unique#\" index=\"PRIMARY\"/>\n <generator class=\"native\" />\n </id>"); else hooks/post-receive -- phpMyAdmin

1 0

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

21 Jul '11

The branch, master has been updated via 7dad0213b1f965abc5d1641f6bd72c9aaf4ac2b7 (commit) from 5d24b4bd6161943d927bd635293090488e843b4b (commit) - Log ----------------------------------------------------------------- commit 7dad0213b1f965abc5d1641f6bd72c9aaf4ac2b7 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:06:31 2011 +0200 This should not be needed since a7b9f38 ----------------------------------------------------------------------- Summary of changes: themes/original/css/theme_right.css.php | 2 -- themes/pmahomme/css/theme_right.css.php | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 94cd84a..c949262 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -2290,5 +2290,3 @@ span.mysql-number { .navigation select { margin: 0 0.8em; } -/* 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 0896b3f..6c685c2 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -2734,5 +2734,3 @@ span.mysql-number { .navigation select { margin: 0 0.8em; } -/* 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-11162-gb2653bf
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via b2653bf6d054ded845bce2ef208b620608182960 (commit) via 3c679d0dcb0ea791abaa136e17671e3344a20763 (commit) via ac0ebe3053c1757d7b10a1c0524f024ea6d26cab (commit) via 9fcb84f4fb9272e63110ff09433373ce801f809d (commit) from a7b9f38c61d4c390b692719a6ba5c1594aa6d83e (commit) - Log ----------------------------------------------------------------- commit b2653bf6d054ded845bce2ef208b620608182960 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 13:53:39 2011 +0200 Fix docblock spacing and add parameter names commit 3c679d0dcb0ea791abaa136e17671e3344a20763 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 13:52:32 2011 +0200 Fix indentation commit ac0ebe3053c1757d7b10a1c0524f024ea6d26cab Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 13:50:46 2011 +0200 Fix docblock spacing and add variable names commit 9fcb84f4fb9272e63110ff09433373ce801f809d Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 13:50:14 2011 +0200 Proper placing of documentation ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 62 ++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 4b9ae81..0b3ef2f 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -70,8 +70,8 @@ function PMA_setDisplayMode(&$the_disp_mode, &$the_total) // 2. Display mode is not "false for all elements" -> updates the // display mode if ($the_disp_mode != 'nnnn000000') { - // 2.0 Print view -> set all elements to false! if (isset($GLOBALS['printview']) && $GLOBALS['printview'] == '1') { + // 2.0 Print view -> set all elements to false! $do_display['edit_lnk'] = 'nn'; // no edit link $do_display['del_lnk'] = 'nn'; // no delete link $do_display['sort_lnk'] = (string) '0'; @@ -80,10 +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']) { + // 2.1 Statement is a "SELECT COUNT", a + // "CHECK/ANALYZE/REPAIR/OPTIMIZE", an "EXPLAIN" one or + // contains a "PROC ANALYSE" part $do_display['edit_lnk'] = 'nn'; // no edit link $do_display['del_lnk'] = 'nn'; // no delete link $do_display['sort_lnk'] = (string) '0'; @@ -96,8 +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']) { + // 2.2 Statement is a "SHOW..." /** * 2.2.1 * @todo defines edit/delete links depending on show statement @@ -118,10 +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 { + // 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) $prev_table = $fields_meta[0]->table; $do_display['text_btn'] = (string) '1'; for ($i = 0; $i < $GLOBALS['fields_cnt']; $i++) { @@ -204,19 +204,19 @@ function PMA_isSelect() * Displays a navigation button * * - * @param string iconic caption for button - * @param string text for button - * @param integer position for next query - * @param string query ready for display - * @param string optional onsubmit clause - * @param string optional hidden field for special treatment - * @param string optional onclick clause + * @param string $caption iconic caption for button + * @param string $title text for button + * @param integer $pos position for next query + * @param string $html_sql_query query ready for display + * @param string $onsubmit optional onsubmit clause + * @param string $input_for_real_end optional hidden field for special treatment + * @param string $onclick optional onclick clause * - * @global string $db the database name - * @global string $table the table name - * @global string $goto the URL to go back in case of errors + * @global string $db the database name + * @global string $table the table name + * @global string $goto the URL to go back in case of errors * - * @access private + * @access private * * @see PMA_displayTableNavigation() */ @@ -251,10 +251,10 @@ function PMA_displayTableNavigationOneButton($caption, $title, $pos, $html_sql_q /** * Displays a navigation bar to browse among the results of a SQL query * - * @param integer the offset for the "next" page - * @param integer the offset for the "previous" page - * @param string the URL-encoded query - * @param string the id for the direction dropdown + * @param integer $pos_next the offset for the "next" page + * @param integer $pos_prev the offset for the "previous" page + * @param string $sql_query the URL-encoded query + * @param string $id_for_direction_dropdown the id for the direction dropdown * * @global string $db the database name * @global string $table the table name @@ -321,14 +321,14 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di // and also to know what to execute when the selector changes echo '<form action="sql.php' . PMA_generate_common_url($_url_params). '" method="post">'; echo PMA_pageselector( - $_SESSION['tmp_user_values']['max_rows'], - $pageNow, - $nbTotalPage, - 200, - 5, - 5, - 20, - 10 + $_SESSION['tmp_user_values']['max_rows'], + $pageNow, + $nbTotalPage, + 200, + 5, + 5, + 20, + 10 ); ?> </form> hooks/post-receive -- phpMyAdmin

1 0

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

21 Jul '11

The branch, master has been updated via a7b9f38c61d4c390b692719a6ba5c1594aa6d83e (commit) from 9fb8bf6ce6f4380a96c7aaaad4711797d4e791e2 (commit) - Log ----------------------------------------------------------------- commit a7b9f38c61d4c390b692719a6ba5c1594aa6d83e Author: Tyron Madlener <tyronx(a)gmail.com> Date: Tue Jul 19 12:59:13 2011 +0300 Fixes wrong z-index of timepicker ----------------------------------------------------------------------- Summary of changes: js/functions.js | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/js/functions.js b/js/functions.js index 2a147d8..7f0c90f 100644 --- a/js/functions.js +++ b/js/functions.js @@ -157,6 +157,11 @@ function PMA_addDatepicker($this_element) { // Remember that we came from the datepicker; this is used // in tbl_change.js by verificationsAfterFieldChange() $this_element.data('comes_from', 'datepicker'); + + // Fix wrong timepicker z-index, doesn't work without timeout + setTimeout(function() { + $('#ui-timepicker-div').css('z-index',$('#ui-datepicker-div').css('z-index')) + },0); }, constrainInput: false }); hooks/post-receive -- phpMyAdmin

1 0