Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on

parameter).
2014-09-27 17:13:15 +02:00 · 2014-09-27 17:13:15 +02:00 · 5fdd798e91
commit 5fdd798e91
parent e8b7c9c6bd
57 changed files with 42 additions and 98 deletions
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@ -534,4 +534,3 @@ print '<br>';
 llxFooter();

 $db->close();
-?>
--- a/htdocs/admin/menus/other.php
+++ b/htdocs/admin/menus/other.php
@ -143,4 +143,3 @@ print '</table>';

 llxFooter();
 $db->close();
-?>
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@ -329,7 +329,7 @@ if ($virtualdiffersfromphysical)
 	print '</table>';
 }

-$db->close();

 llxFooter();
-?>
+
+$db->close();
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@ -124,4 +124,5 @@ else
 }

 llxFooter();
-?>
+
+$db->close();
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@ -130,4 +130,3 @@ else

 llxFooter();
 $db->close();
-?>
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@ -379,4 +379,3 @@ print '</table>';
 llxFooter();

 $db->close();
-?>
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@ -118,5 +118,3 @@ print info_admin($langs->trans("SystemInfoDesc")).'<br>';
 llxFooter();

 $db->close();
-
-?>
--- a/htdocs/admin/tools/eaccelerator.php
+++ b/htdocs/admin/tools/eaccelerator.php
@ -350,4 +350,3 @@ print "<br><br>";
 llxFooter();

 $db->close();
-?>
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@ -166,4 +166,3 @@ if (preg_match('/^confirm/i',$choice))

 llxFooter();
 $db->close();
-?>
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@ -174,4 +174,3 @@ if (! empty($result['return']))

 llxFooter();
 $db->close();
-?>
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@ -69,4 +69,3 @@ print $langs->trans("SeeAlso").': <a href="'.$urlwikitranslatordoc.'" target="_b
 llxFooter();

 $db->close();
-?>
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@ -146,4 +146,3 @@ print '</table>';
 llxFooter();

 $db->close();
-?>
--- a/htdocs/cashdesk/affIndex.php
+++ b/htdocs/cashdesk/affIndex.php
@ -75,4 +75,3 @@ include_once 'affPied.php';

 print '</div></div></div>'."\n";
 print '</body></html>'."\n";
-?>
--- a/htdocs/cashdesk/facturation.php
+++ b/htdocs/cashdesk/facturation.php
@ -191,5 +191,3 @@ $obj_facturation->paiementLe('RESET');

 // Affichage des templates
 require ('tpl/facturation1.tpl.php');
-
-?>
--- a/htdocs/cashdesk/tpl/menu.tpl.php
+++ b/htdocs/cashdesk/tpl/menu.tpl.php
@ -78,4 +78,3 @@ if (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"]) && ! empty($conf->stock->enabled)
 }
 print '</li></ul>';
 print '</div>';
-?>
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@ -520,4 +520,3 @@ if($object->type == 4)

 llxFooter();
 $db->close();
-?>
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@ -1071,4 +1071,3 @@ class ActionComm extends CommonObject

 }

-?>
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@ -933,4 +933,3 @@ dol_htmloutput_mesg('',$mesgs);
 // End of page
 llxFooter();
 $db->close();
-?>
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@ -185,7 +185,7 @@ else
 	dol_print_error($db);
 }

+llxFooter();
+
 $db->close();

-llxFooter();
-?>
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@ -420,4 +420,3 @@ elseif (file_exists($fileimagebis))
 $db->close();

 llxFooter();
-?>
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@ -229,5 +229,3 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 	}

 }
-
-?>
--- a/htdocs/core/actions_setnotes.inc.php
+++ b/htdocs/core/actions_setnotes.inc.php
@ -43,5 +43,3 @@ else if ($action == 'setnote_private' && ! empty($permissionnote) && ! GETPOST('
 	$result=$object->update_note(dol_html_entity_decode(GETPOST('note_private'), ENT_QUOTES),'_private');
 	if ($result < 0) setEventMessage($object->error,'errors');
 }
-
-?>
--- a/htdocs/core/class/dolprintipp.class.php
+++ b/htdocs/core/class/dolprintipp.class.php
@ -201,4 +201,3 @@ class dolprintIPP
        return $ipp->printer_attributes;
    }
 }
-?>
--- a/htdocs/core/lib/holiday.lib.php
+++ b/htdocs/core/lib/holiday.lib.php
@ -50,4 +50,3 @@ function holiday_prepare_head($object)
 	return $head;
 }

-?>
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@ -357,5 +357,3 @@ function measuring_units_string($unit,$measuring_style='')

 	return $measuring_units[$unit];
 }
-
-?>
--- a/htdocs/core/lib/trip.lib.php
+++ b/htdocs/core/lib/trip.lib.php
@ -59,5 +59,3 @@ function trip_prepare_head($object)

 	return $head;
 }
-
-?>
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@ -342,4 +342,3 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
    print '</table>';
 }

-?>
--- a/htdocs/core/login/functions_empty.php
+++ b/htdocs/core/login/functions_empty.php
@ -39,5 +39,3 @@ function check_user_password_empty($usertotest,$passwordtotest,$entitytotest)

 	return $login;
 }
-
-?>
--- a/htdocs/core/login/functions_forceuser.php
+++ b/htdocs/core/login/functions_forceuser.php
@ -46,6 +46,3 @@ function check_user_password_forceuser($usertotest,$passwordtotest,$entitytotest

 	return $login;
 }
-
-
-?>
--- a/htdocs/core/login/functions_http.php
+++ b/htdocs/core/login/functions_http.php
@ -43,6 +43,3 @@ function check_user_password_http($usertotest,$passwordtotest,$entitytotest)

 	return $login;
 }
-
-
-?>
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@ -227,5 +227,3 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
 	return $login;
 }

-
-?>
--- a/htdocs/core/login/functions_openid.php
+++ b/htdocs/core/login/functions_openid.php
@ -112,5 +112,3 @@ function check_user_password_openid($usertotest,$passwordtotest,$entitytotest)

    return $login;
 }
-
-?>
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@ -430,5 +430,3 @@ function dol_auguria_showmenu($type_user, &$menuentry, &$listofmodulesforexterna
 	if (! $menuentry['perms']) return 2;															// No permissions and user is external
 	return 1;
 }
-
-?>
--- a/htdocs/core/modules/propale/modules_propale.php
+++ b/htdocs/core/modules/propale/modules_propale.php
@ -253,4 +253,3 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
 	}
 }

-?>
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@ -131,7 +131,7 @@ else
 	print $langs->trans("ErrorUnknown");
 }

+
 llxFooter();

 $db->close();
-?>
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@ -190,7 +190,8 @@ print '</form>';

 dol_fiche_end();

+
 llxFooter();

 $db->close();
-?>
+
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@ -167,7 +167,7 @@ AccountancyDashboard=Accountancy summary
 ByProductsAndServices=By products and services
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
-LinkedOrder=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@ -968,5 +968,3 @@ class LivraisonLigne
 	}

 }
-
-?>
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@ -250,4 +250,3 @@ function ajouter_sondage()
 	exit();
 }

-?>
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@ -1083,4 +1083,3 @@ print '<a name="bas"></a>'."\n";
 llxFooterSurvey();

 $db->close();
-?>
--- a/htdocs/printipp/admin/printipp.php
+++ b/htdocs/printipp/admin/printipp.php
@ -209,7 +209,7 @@ if ($mode == 'test' && $user->admin)

 dol_fiche_end();

+
 llxFooter();

 $db->close();
-?>
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@ -110,5 +110,3 @@ else
 {
    echo json_encode(array('nom'=>'ErrorBadParameter','label'=>'ErrorBadParameter','key'=>'ErrorBadParameter','value'=>'ErrorBadParameter'));
 }
-
-?>
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@ -706,4 +706,3 @@ abstract class ActionsCardCommon

 }

-?>
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@ -338,4 +338,3 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
--- a/test/phpunit/CommandeTest.php
+++ b/test/phpunit/CommandeTest.php
@ -265,4 +265,3 @@ class CommandeTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
--- a/test/phpunit/CommonObjectTest.php
+++ b/test/phpunit/CommonObjectTest.php
@ -183,4 +183,3 @@ class CommonObjectTest extends PHPUnit_Framework_TestCase
    	return $result;
    }
 }
-?>
--- a/test/phpunit/CompanyBankAccountTest.php
+++ b/test/phpunit/CompanyBankAccountTest.php
@ -233,4 +233,4 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+
--- a/test/phpunit/EntrepotTest.php
+++ b/test/phpunit/EntrepotTest.php
@ -257,4 +257,3 @@ class EntrepotTest extends PHPUnit_Framework_TestCase
        return;
    }
 }
-?>
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@ -265,4 +265,4 @@ class ExportTest extends PHPUnit_Framework_TestCase
        return true;
    }
 }
-?>
+
--- a/test/phpunit/FactureRecTest.php
+++ b/test/phpunit/FactureRecTest.php
@ -196,4 +196,3 @@ class FactureRecTest extends PHPUnit_Framework_TestCase
        return $retAr;
    }
 }
-?>
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@ -329,4 +329,4 @@ class FactureTest extends PHPUnit_Framework_TestCase
        return $retAr;
    }
 }
-?>
+
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@ -799,4 +799,4 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+
--- a/test/phpunit/PropalTest.php
+++ b/test/phpunit/PropalTest.php
@ -265,4 +265,4 @@ class PropalTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@ -456,4 +456,4 @@ class SocieteTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@ -318,4 +318,3 @@ class UserTest extends PHPUnit_Framework_TestCase
    	return $retAr;
    }
 }
-?>
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@ -181,4 +181,4 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@ -181,4 +181,4 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+