[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13014-ga73f144
Piotr Przybylski
crackpl at users.sourceforge.net
Fri Aug 5 00:38:24 CEST 2011
The branch, master has been updated
via a73f1449ea1a18fac1853f93afa826b20811893d (commit)
from c8a147c4eed04c4d344aa9e45acce7411d2a5603 (commit)
- Log -----------------------------------------------------------------
commit a73f1449ea1a18fac1853f93afa826b20811893d
Author: Piotr Przybylski <piotrprz at gmail.com>
Date: Fri Aug 5 00:37:49 2011 +0200
Coding style: space after for keyword
-----------------------------------------------------------------------
Summary of changes:
enum_editor.php | 4 ++--
libraries/advisor.lib.php | 2 +-
libraries/replication.inc.php | 2 +-
server_synchronize.php | 18 +++++++++---------
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/enum_editor.php b/enum_editor.php
index 9287bb3..77bf097 100644
--- a/enum_editor.php
+++ b/enum_editor.php
@@ -26,7 +26,7 @@ require_once './libraries/header_meta_style.inc.php';
if (isset($_GET['values'])) { // This page was displayed when the "add a new value" link or the link in tbl_alter.php was clicked
$values = explode(',', urldecode($_GET['values']));
} elseif (isset($_GET['num_fields'])) { // This page was displayed from submitting this form
- for($field_num = 1; $field_num <= $_GET['num_fields']; $field_num++) {
+ for ($field_num = 1; $field_num <= $_GET['num_fields']; $field_num++) {
$values[] = "'" . str_replace(array("'", '\\'), array("''", '\\\\'), $_GET['field' . $field_num]) . "'";
}
}
@@ -43,7 +43,7 @@ require_once './libraries/header_meta_style.inc.php';
// If extra empty fields are added, display them
if (isset($_GET['extra_fields'])) {
$total_fields += $_GET['extra_fields'];
- for($i = $field_counter+1; $i <= $total_fields; $i++) {
+ for ($i = $field_counter+1; $i <= $total_fields; $i++) {
echo '<input type="text" size="30" name="field' . $i . '"/>';
}
} else {
diff --git a/libraries/advisor.lib.php b/libraries/advisor.lib.php
index 165f068..038b4cf 100644
--- a/libraries/advisor.lib.php
+++ b/libraries/advisor.lib.php
@@ -132,7 +132,7 @@ class Advisor {
$j = -1;
$ruleLine = -1;
- for($i = 0; $i<$numLines; $i++) {
+ for ($i = 0; $i<$numLines; $i++) {
$line = $file[$i];
if($line[0] == '#' || $line[0] == "\n") continue;
diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php
index 2b4309b..36e656c 100644
--- a/libraries/replication.inc.php
+++ b/libraries/replication.inc.php
@@ -379,7 +379,7 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true)
/**
* Generating Create Table query for all the non-matching tables present in Source but not in Target and populating tables.
*/
- for($q = 0; $q < sizeof($source_tables_uncommon); $q++) {
+ for ($q = 0; $q < sizeof($source_tables_uncommon); $q++) {
if (isset($uncommon_tables[$q])) {
PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, false);
}
diff --git a/server_synchronize.php b/server_synchronize.php
index 8f79897..89e50d8 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -190,7 +190,7 @@ if ((isset($_REQUEST['submit_connect']))) {
*/
$criteria = array('Field', 'Type', 'Null', 'Collation', 'Key', 'Default', 'Comment');
- for($i = 0; $i < sizeof($matching_tables); $i++) {
+ for ($i = 0; $i < sizeof($matching_tables); $i++) {
/**
* Finding out all the differences structure, data and index diff for all the matching tables only
*/
@@ -204,7 +204,7 @@ if ((isset($_REQUEST['submit_connect']))) {
$add_indexes_array, $alter_indexes_array, $remove_indexes_array, $i);
}
- for($j = 0; $j < sizeof($source_tables_uncommon); $j++) {
+ for ($j = 0; $j < sizeof($source_tables_uncommon); $j++) {
/**
* Finding out the number of rows to be added in tables that need to be added in target database
*/
@@ -518,7 +518,7 @@ if (isset($_REQUEST['Table_ids'])) {
/**
* Applying the structure difference on selected matching tables
*/
- for($q = 0; $q < sizeof($matching_table_structure_diff); $q++)
+ for ($q = 0; $q < sizeof($matching_table_structure_diff); $q++)
{
if (isset($alter_str_array[$matching_table_structure_diff[$q]])) {
@@ -564,7 +564,7 @@ if (isset($_REQUEST['Table_ids'])) {
* Applying the data difference. First checks if structure diff is applied or not.
* If not, then apply structure difference first then apply data difference.
*/
- for($p = 0; $p < sizeof($matching_table_data_diff); $p++)
+ for ($p = 0; $p < sizeof($matching_table_data_diff); $p++)
{
if ($_REQUEST['checked'] == 'true') {
@@ -643,7 +643,7 @@ if (isset($_REQUEST['Table_ids'])) {
/**
* Applying structure difference to selected non-matching tables (present in Source but absent from Target).
*/
- for($s = 0; $s < sizeof($uncommon_table_structure_diff); $s++)
+ for ($s = 0; $s < sizeof($uncommon_table_structure_diff); $s++)
{
PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $uncommon_table_structure_diff[$s], $uncommon_tables_fields, false);
$_SESSION['uncommon_tables_fields'] = $uncommon_tables_fields;
@@ -654,7 +654,7 @@ if (isset($_REQUEST['Table_ids'])) {
* Applying data difference to selected non-matching tables (present in Source but absent from Target).
* Before data synchronization, structure synchronization is confirmed.
*/
- for($r = 0; $r < sizeof($uncommon_table_data_diff); $r++)
+ for ($r = 0; $r < sizeof($uncommon_table_data_diff); $r++)
{
if (!(in_array($uncommon_table_data_diff[$r], $uncommon_table_structure_diff))) {
if (isset($uncommon_tables[$uncommon_table_data_diff[$r]])) {
@@ -680,7 +680,7 @@ if (isset($_REQUEST['Table_ids'])) {
PMA_syncDisplayHeaderCompare($src_db, $trg_db);
$rows = array();
- for($i = 0; $i < count($matching_tables); $i++) {
+ for ($i = 0; $i < count($matching_tables); $i++) {
$num_alter_cols = 0;
$num_insert_cols = 0;
$num_remove_cols = 0;
@@ -950,7 +950,7 @@ if (isset($_REQUEST['synchronize_db'])) {
/**
* Applying all sorts of differences for each matching table
*/
- for($p = 0; $p < sizeof($matching_tables); $p++) {
+ for ($p = 0; $p < sizeof($matching_tables); $p++) {
/**
* If the check box is checked for deleting previous rows from the target database tables then
* first find out rows to be deleted and then delete the rows.
@@ -1009,7 +1009,7 @@ if (isset($_REQUEST['synchronize_db'])) {
/**
* Creating and populating tables present in source but absent from target database.
*/
- for($q = 0; $q < sizeof($source_tables_uncommon); $q++) {
+ for ($q = 0; $q < sizeof($source_tables_uncommon); $q++) {
if (isset($uncommon_tables[$q])) {
PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, true);
}
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list