psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent

This commit is contained in:
Frédéric FRANCE
2019-02-03 14:29:45 +01:00
parent 2e5382f40d
commit 80a12fcd1c
104 changed files with 2035 additions and 2058 deletions

View File

@@ -68,8 +68,7 @@ if (!function_exists('gzdecode')) {
* Action
*/
if ($action == 'addprinter' && $user->admin)
{
if ($action == 'addprinter' && $user->admin) {
$error=0;
$db->begin();
if (empty($printername)) {
@@ -81,8 +80,7 @@ if ($action == 'addprinter' && $user->admin)
setEventMessages($langs->trans("PrinterParameterEmpty"), null, 'warnings');
}
if (! $error)
{
if (! $error) {
$result= $printer->AddPrinter($printername, GETPOST('printertypeid', 'int'), GETPOST('printerprofileid', 'int'), $parameter);
if ($result > 0) $error++;
@@ -100,8 +98,7 @@ if ($action == 'addprinter' && $user->admin)
$action = '';
}
if ($action == 'deleteprinter' && $user->admin)
{
if ($action == 'deleteprinter' && $user->admin) {
$error=0;
$db->begin();
if (empty($printerid)) {
@@ -109,8 +106,7 @@ if ($action == 'deleteprinter' && $user->admin)
setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
}
if (! $error)
{
if (! $error) {
$result= $printer->DeletePrinter($printerid);
if ($result > 0) $error++;
@@ -128,8 +124,7 @@ if ($action == 'deleteprinter' && $user->admin)
$action = '';
}
if ($action == 'updateprinter' && $user->admin)
{
if ($action == 'updateprinter' && $user->admin) {
$error=0;
$db->begin();
if (empty($printerid)) {
@@ -137,18 +132,14 @@ if ($action == 'updateprinter' && $user->admin)
setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
}
if (! $error)
{
if (! $error) {
$result= $printer->UpdatePrinter($printername, GETPOST('printertypeid', 'int'), GETPOST('printerprofileid', 'int'), $parameter, $printerid);
if ($result > 0) $error++;
if (! $error)
{
if (! $error) {
$db->commit();
setEventMessages($langs->trans("PrinterUpdated",$printername), null);
}
else
{
} else {
$db->rollback();
dol_print_error($db);
}
@@ -156,24 +147,19 @@ if ($action == 'updateprinter' && $user->admin)
$action = '';
}
if ($action == 'testprinter' && $user->admin)
{
if ($action == 'testprinter' && $user->admin) {
$error=0;
if (empty($printerid)) {
$error++;
setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
}
if (! $error)
{
if (! $error) {
// test
$ret = $printer->SendTestToPrinter($printerid);
if ($ret == 0)
{
if ($ret == 0) {
setEventMessages($langs->trans("TestSentToPrinter", $printername), null);
}
else
{
} else {
setEventMessages($printer->error, $printer->errors, 'errors');
}
}
@@ -181,8 +167,7 @@ if ($action == 'testprinter' && $user->admin)
}
if ($action == 'updatetemplate' && $user->admin)
{
if ($action == 'updatetemplate' && $user->admin) {
$error=0;
$db->begin();
if (empty($templateid)) {
@@ -190,18 +175,14 @@ if ($action == 'updatetemplate' && $user->admin)
setEventMessages($langs->trans("TemplateIdEmpty"), null, 'errors');
}
if (! $error)
{
if (! $error) {
$result= $printer->UpdateTemplate($templatename, $template, $templateid);
if ($result > 0) $error++;
if (! $error)
{
if (! $error) {
$db->commit();
setEventMessages($langs->trans("TemplateUpdated",$templatename), null);
}
else
{
} else {
$db->rollback();
dol_print_error($db);
}
@@ -223,8 +204,7 @@ print load_fiche_titre($langs->trans("ReceiptPrinterSetup"),$linkback,'title_set
$head = receiptprinteradmin_prepare_head($mode);
if ($mode == 'config' && $user->admin)
{
if ($mode == 'config' && $user->admin) {
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=config" autocomplete="off">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
if ($action!='editprinter') {
@@ -253,11 +233,9 @@ if ($mode == 'config' && $user->admin)
if ($ret > 0) {
setEventMessages($printer->error, $printer->errors, 'errors');
} else {
for ($line=0; $line < $nbofprinters; $line++)
{
for ($line=0; $line < $nbofprinters; $line++) {
print '<tr class="oddeven">';
if ($action=='editprinter' && $printer->listprinters[$line]['rowid']==$printerid)
{
if ($action=='editprinter' && $printer->listprinters[$line]['rowid']==$printerid) {
print '<input type="hidden" name="printerid" value="'.$printer->listprinters[$line]['rowid'].'">';
print '<td><input size="50" type="text" name="printername" value="'.$printer->listprinters[$line]['name'].'"></td>';
$ret = $printer->selectTypePrinter($printer->listprinters[$line]['fk_type']);
@@ -269,7 +247,7 @@ if ($mode == 'config' && $user->admin)
print '<td></td>';
print '<td></td>';
print '</tr>';
} else {
} else {
print '<td>'.$printer->listprinters[$line]['name'].'</td>';
print '<td>'.$langs->trans($printer->listprinters[$line]['fk_type_name']).'</td>';
print '<td>'.$langs->trans($printer->listprinters[$line]['fk_profile_name']).'</td>';
@@ -291,10 +269,8 @@ if ($mode == 'config' && $user->admin)
}
}
if ($action!='editprinter')
{
if ($nbofprinters > 0)
{
if ($action!='editprinter') {
if ($nbofprinters > 0) {
print '<tr class="liste_titre">';
print '<th>'.$langs->trans("Name").'</th>';
print '<th>'.$langs->trans("Type").'</th>';
@@ -357,8 +333,7 @@ if ($mode == 'config' && $user->admin)
dol_fiche_end();
}
if ($mode == 'template' && $user->admin)
{
if ($mode == 'template' && $user->admin) {
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=template" autocomplete="off">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
if ($action!='edittemplate') {
@@ -429,8 +404,7 @@ if ($mode == 'template' && $user->admin)
print '<th>'.$langs->trans("Description").'</th>';
print "</tr>\n";
$max = count($printer->tags);
for ($tag=0; $tag < $max; $tag++)
{
for ($tag=0; $tag < $max; $tag++) {
print '<tr class="oddeven">';
print '<td>&lt;'.$printer->tags[$tag].'&gt;</td><td>'.$langs->trans(strtoupper($printer->tags[$tag])).'</td>';
print '</tr>';