The branch, master has been updated via ba395f545e459da2548593876308989d7f4adb05 (commit) via bed0aad84322079d92fadc09660711180c02edd2 (commit) via 5de716446c08c3c36e62024b47af8fac8a94aafa (commit) via e9c512fb9f1f5d73daa124052e2d233472020aca (commit) via 869ffd82cc4ba8b287eede153f4eb0ad78b28a80 (commit) via 06ba6d36c06718ffbc5def195a74139ce5012628 (commit) via 4720ed20fd5414b20c577be6dfb007e8fccbb4d3 (commit) via 0f9de304798753303396a80f16729807b973eaf1 (commit) from 47dd2a01430f6a0c142734260cf11ce920bb4e32 (commit)

- Log ----------------------------------------------------------------- commit ba395f545e459da2548593876308989d7f4adb05 Merge: bed0aad84322079d92fadc09660711180c02edd2 47dd2a01430f6a0c142734260cf11ce920bb4e32 Author: Michal Čihař mcihar@suse.cz Date: Thu Jul 21 16:14:47 2011 +0200

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit bed0aad84322079d92fadc09660711180c02edd2 Author: Michal Čihař mcihar@suse.cz Date: Thu Jul 21 16:11:19 2011 +0200

Exclude build dir when examining code

commit 5de716446c08c3c36e62024b47af8fac8a94aafa Author: Michal Čihař mcihar@suse.cz Date: Thu Jul 21 16:10:29 2011 +0200

Fix coding style

commit e9c512fb9f1f5d73daa124052e2d233472020aca Author: Michal Čihař mcihar@suse.cz Date: Thu Jul 21 16:09:44 2011 +0200

Remove tabs

commit 869ffd82cc4ba8b287eede153f4eb0ad78b28a80 Author: Michal Čihař mcihar@suse.cz Date: Thu Jul 21 16:09:16 2011 +0200

Add file docblock

commit 06ba6d36c06718ffbc5def195a74139ce5012628 Author: Michal Čihař mcihar@suse.cz Date: Thu Jul 21 16:08:11 2011 +0200

Remove tabs

commit 4720ed20fd5414b20c577be6dfb007e8fccbb4d3 Author: Michal Čihař mcihar@suse.cz Date: Thu Jul 21 16:05:23 2011 +0200

Whitespace cleanup

commit 0f9de304798753303396a80f16729807b973eaf1 Author: Michal Čihař mcihar@suse.cz Date: Thu Jul 21 16:05:18 2011 +0200

Coding style

-----------------------------------------------------------------------

Summary of changes: build.xml | 3 ++- import.php | 2 +- js/makegrid.js | 3 ++- js/server_privileges.js | 2 +- js/sql.js | 18 ++++++++++-------- setup/styles.css | 2 +- tbl_triggers.php | 11 ++++++++++- 7 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/build.xml b/build.xml index 62273df..ad4dc40 100644 --- a/build.xml +++ b/build.xml @@ -46,6 +46,7 @@ <exec executable="phpcpd"> <arg line="--log-pmd ${basedir}/build/logs/pmd-cpd.xml --exclude test + --exclude build --exclude libraries/PHPExcel --exclude libraries/tcpdf ${source}" /> @@ -61,7 +62,7 @@ <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding test, PHPExcel, tcpdf directories"> <exec executable="phpcs"> <arg line=" - --ignore=*/PHPExcel/*,*/php-gettext/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/highcharts/*,*/openlayers/*,*/jquery/* + --ignore=*/PHPExcel/*,*/php-gettext/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/highcharts/*,*/openlayers/*,*/jquery/*,*/build/* --report=checkstyle --report-file=${basedir}/build/logs/checkstyle.xml --standard=PEAR diff --git a/import.php b/import.php index afc513c..b9b7d15 100644 --- a/import.php +++ b/import.php @@ -264,7 +264,7 @@ if ($import_file != 'none' && !$error) { $file_to_unlink = $import_file_new; }

- $size = filesize($import_file); + $size = filesize($import_file); } }

diff --git a/js/makegrid.js b/js/makegrid.js index a5bbdb8..00d839f 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -70,8 +70,9 @@ dragMove: function(e) { if (this.colRsz) { var dx = e.pageX - this.colRsz.x0; - if (this.colRsz.objWidth + dx > this.minColWidth) + if (this.colRsz.objWidth + dx > this.minColWidth) { $(this.colRsz.obj).css('left', this.colRsz.objLeft + dx + 'px'); + } } else if (this.colMov) { // dragged column animation var dx = e.pageX - this.colMov.x0; diff --git a/js/server_privileges.js b/js/server_privileges.js index d5729d9..35c34aa 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -210,7 +210,7 @@ $(document).ready(function() { /* post request for get the updated userForm table */ $.post($form.attr('action' ), url, function(priv_data) {

- /*Remove the old userForm table*/ + /*Remove the old userForm table*/ if ($('#userFormDiv').length != 0) { $('#userFormDiv').remove(); } else { diff --git a/js/sql.js b/js/sql.js index 6ee84dd..fb24f5d 100644 --- a/js/sql.js +++ b/js/sql.js @@ -143,7 +143,7 @@ $(document).ready(function() { .parent() .toggle($(this).attr('value').length > 0); }).trigger('keyup'); - + /** * Attach the {@link appendInlineAnchor} function to a custom event, which * will be triggered manually everytime the table of results is reloaded @@ -152,7 +152,7 @@ $(document).ready(function() { $("#sqlqueryresults").live('appendAnchor',function() { appendInlineAnchor(); }) - + /** * Attach the {@link makegrid} function to a custom event, which will be * triggered manually everytime the table of results is reloaded @@ -161,7 +161,7 @@ $(document).ready(function() { $("#sqlqueryresults").live('makegrid', function() { $('#table_results').makegrid(); }) - + /** * Attach the {@link refreshgrid} function to a custom event, which will be * triggered manually everytime the table of results is manipulated (e.g., by inline edit) @@ -497,7 +497,7 @@ $(document).ready(function() { $(this).prev().prev().remove(); $(this).prev().remove(); $(this).remove(); - + // refresh the grid $("#sqlqueryresults").trigger('refreshgrid'); }); @@ -711,10 +711,10 @@ $(document).ready(function() { $this_field.data('original_data', 'NULL'); } }); - + // refresh the grid $("#sqlqueryresults").trigger('refreshgrid'); - + }) // End On click, replace the current field with an input/textarea

/** @@ -986,7 +986,7 @@ $(document).ready(function() { });

/** - * Click action for "Go" button in ajax dialog insertForm -> insertRowTable + * Click action for "Go" button in ajax dialog insertForm -> insertRowTable */ $("#insertForm .insertRowTable.ajax input[value=Go]").live('click', function(event) { event.preventDefault(); @@ -1231,7 +1231,9 @@ $(document).ready(function() { * Profiling Chart */ function createProfilingChart() { - if($('#profilingchart').length==0) return; + if ($('#profilingchart').length == 0) { + return; + }

var cdata = new Array(); $.each(jQuery.parseJSON($('#profilingchart').html()),function(key,value) { diff --git a/setup/styles.css b/setup/styles.css index 93c4887..07979b4 100644 --- a/setup/styles.css +++ b/setup/styles.css @@ -243,7 +243,7 @@ fieldset .inline_errors { /* field error list */ padding: 0; list-style: none; color: #9A0000; - font-size: small; + font-size: small; }

fieldset table { diff --git a/tbl_triggers.php b/tbl_triggers.php index a5d8a3e..f20eecb 100644 --- a/tbl_triggers.php +++ b/tbl_triggers.php @@ -1 +1,10 @@ -<?php require_once './db_triggers.php'; ?> +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Triggers management. + * + * @package phpMyAdmin + */ + +require_once './db_triggers.php'; +?>

hooks/post-receive