The branch, master has been updated
via 62c2c74583cb64239f13d9ae9f93a903da1648a3 (commit)
via 719861c8a8ab7951ac3aa62c673e135d336583a1 (commit)
via 037224c85e38c9536ee72126c3c5095cad1ada2f (commit)
via e936ce72c568aa6acce6b26f6d8bf5a178d304bd (commit)
from 8e511c16ff125c36dd27ceab0e1f93013bd81d75 (commit)
- Log -----------------------------------------------------------------
commit 62c2c74583cb64239f13d9ae9f93a903da1648a3
Author: Michal Čihař <[email protected]>
Date: Thu Jul 21 11:54:30 2011 +0200
Allign comments
commit 719861c8a8ab7951ac3aa62c673e135d336583a1
Author: Michal Čihař <[email protected]>
Date: Thu Jul 21 11:53:26 2011 +0200
Fix variable names
commit 037224c85e38c9536ee72126c3c5095cad1ada2f
Author: Michal Čihař <[email protected]>
Date: Thu Jul 21 11:52:12 2011 +0200
if and elseif coding style
commit e936ce72c568aa6acce6b26f6d8bf5a178d304bd
Author: Michal Čihař <[email protected]>
Date: Thu Jul 21 11:51:42 2011 +0200
Whitespace fixup
-----------------------------------------------------------------------
Summary of changes:
libraries/server_synchronize.lib.php | 52 +++++++++++++++++-----------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/libraries/server_synchronize.lib.php
b/libraries/server_synchronize.lib.php
index a2381b7..3521d14 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -17,9 +17,9 @@
*/
function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables,
&$uncommon_source_tables)
{
- for($k=0; $k< sizeof($src_tables); $k++) {
+ for ($k=0; $k< sizeof($src_tables); $k++) {
$present_in_target = false;
- for($l=0; $l < sizeof($trg_tables); $l++) {
+ for ($l=0; $l < sizeof($trg_tables); $l++) {
if ($src_tables[$k] === $trg_tables[$l]) {
$present_in_target = true;
$matching_tables[] = $src_tables[$k];
@@ -43,9 +43,9 @@ function PMA_getMatchingTables($trg_tables, $src_tables,
&$matching_tables, &$un
*/
function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables,
&$uncommon_target_tables)
{
- for($c=0; $c<sizeof($trg_tables) ;$c++) {
+ 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;
@@ -67,21 +67,21 @@ function PMA_getNonMatchingTargetTables($trg_tables,
$matching_tables, &$uncommo
* Otherwise that entry is placed in the $insert_array.
*
*
- * @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_table array containing matching table names
- * @param $matching_tables_fields A two dimensional array passed by
reference to contain names of fields for each matching table
- * @param $update_array A three dimensional array passed by reference to
- * contain updates required for each matching table
- * @param $insert_array A three dimensional array passed by reference to
- * contain inserts required for each matching table
- * @param $delete_array Unused
- * @param $fields_num A two dimensional array passed by reference to
- * contain number of fields for each matching 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_table array containing matching table names
+ * @param &$matching_tables_fields A two dimensional array passed by
reference to contain names of fields for each matching table
+ * @param $update_array A three dimensional array passed by
reference to
+ * contain updates required for each
matching table
+ * @param $insert_array A three dimensional array passed by
reference to
+ * contain inserts required for each
matching table
+ * @param $delete_array Unused
+ * @param $fields_num A two dimensional array passed by
reference to
+ * contain number of fields for each
matching table
* @param $matching_table_index Index of a table from $matching_table
array
- * @param $matching_tables_keys A two dimensional array passed by
reference to contain names of keys for each matching table
+ * @param &$matching_tables_keys A two dimensional array passed by
reference to contain names of keys for each matching table
*/
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)
@@ -141,7 +141,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link,
$trg_link, &$matching
} elseif (sizeof($is_key) > 1){
for ($k=0; $k < sizeof($is_key); $k++) {
$trg_select_query .= $is_key[$k] . "='" .
$source_result_set[$j][$is_key[$k]] . "'";
- if ($k < (sizeof($is_key)-1)){
+ if ($k < (sizeof($is_key)-1)) {
$trg_select_query .= " AND ";
}
}
@@ -156,10 +156,10 @@ function PMA_dataDiffInTables($src_db, $trg_db,
$src_link, $trg_link, &$matching
if (sizeof($is_key) == 1) {
$src_select_query .= $is_key[0] . "='" .
$source_result_set[$j] . "'";
- } else if(sizeof($is_key) > 1){
+ } elseif (sizeof($is_key) > 1) {
for ($k=0; $k< sizeof($is_key); $k++) {
$src_select_query .= $is_key[$k] . "='" .
$source_result_set[$j][$is_key[$k]] . "'";
- if ($k < (sizeof($is_key) - 1)){
+ if ($k < (sizeof($is_key) - 1)) {
$src_select_query .= " AND ";
}
}
@@ -259,7 +259,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link,
$trg_link, &$matching
$insert_array[$matching_table_index][$insert_row][$is_key[0]] =
$source_result_set[$j];
}
} elseif (sizeof($is_key) > 1) {
- for($l = 0; $l < sizeof($is_key); $l++) {
+ for ($l = 0; $l < sizeof($is_key); $l++) {
if
(isset($source_result_set[$j][$matching_tables_fields[$matching_table_index][$l]]))
{
$insert_array[$matching_table_index][$insert_row][$is_key[$l]] =
$source_result_set[$j][$matching_tables_fields[$matching_table_index][$l]];
}
@@ -681,10 +681,10 @@ function PMA_populateTargetTables($src_db, $trg_db,
$src_link, $trg_link, $uncom
*/
function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables,
$table_index, $target_tables_keys, $delete_array, $display)
{
- for($i = 0; $i < sizeof($delete_array[$table_index]); $i++) {
+ for ($i = 0; $i < sizeof($delete_array[$table_index]); $i++) {
if (isset($target_tables_keys[$table_index])) {
$delete_query = 'DELETE FROM ' . PMA_backquote($trg_db) . '.'
.PMA_backquote($matching_tables[$table_index]) . ' WHERE ';
- for($y = 0; $y < sizeof($target_tables_keys[$table_index]); $y++) {
+ for ($y = 0; $y < sizeof($target_tables_keys[$table_index]); $y++)
{
$delete_query .= $target_tables_keys[$table_index][$y] . " =
'";
if (sizeof($target_tables_keys[$table_index]) == 1) {
@@ -1030,7 +1030,7 @@ function PMA_alterTargetTableStructure($trg_db,
$trg_link, $matching_tables, &$s
}
$check = false;
$query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' .
PMA_backquote($matching_tables[$matching_table_index]);
- for($p = 0; $p < sizeof($matching_tables_keys[$matching_table_index]);
$p++) {
+ for ($p = 0; $p < sizeof($matching_tables_keys[$matching_table_index]);
$p++) {
if
((isset($alter_str_array[$matching_table_index][$matching_tables_keys[$matching_table_index][$p]]['Key'])))
{
$check = true;
$query .= ' MODIFY ' .
$matching_tables_keys[$matching_table_index][$p] . ' '
@@ -1340,7 +1340,7 @@ function PMA_syncDisplayBeginTableRow($odd_row) {
function PMA_get_column_values($database, $table, $column, $link = null)
{
$query = 'SELECT ';
- for($i=0; $i< sizeof($column); $i++)
+ for ($i=0; $i< sizeof($column); $i++)
{
$query.= PMA_backquote($column[$i]);
if($i < (sizeof($column)-1))
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
5 Ways to Improve & Secure Unified Communications
Unified Communications promises greater efficiencies for business. UC can
improve internal communications as well as offer faster, more efficient ways
to interact with customers and streamline customer service. Learn more!
http://www.accelacomm.com/jaw/sfnl/114/51426253/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
