From 3a029001f4473fb9cea643c8dbb870c13509a068 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Mon, 13 Apr 2020 14:23:29 +0000 Subject: [PATCH] Fixing style errors. --- htdocs/admin/notification.php | 114 ++++++++++++++++------------------ 1 file changed, 55 insertions(+), 59 deletions(-) diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index b28b0b3840f..99643401386 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -43,7 +43,7 @@ $action = GETPOST('action', 'aZ09'); /* * Actions */ - + // Action to update or add a constant if ($action == 'update' || $action == 'add') { @@ -181,75 +181,71 @@ $notificationtrigger = new InterfaceNotification($db); $listofnotifiedevents = $notificationtrigger->getListOfManagedEvents(); -if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { -// Editing global variables not related to a specific theme -$constantes=array(); -foreach ($listofnotifiedevents as $notifiedevent) -{ - $label = $langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label']; - $elementLabel = $langs->trans(ucfirst($notifiedevent['elementtype'])); +if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { + // Editing global variables not related to a specific theme + $constantes=array(); + foreach ($listofnotifiedevents as $notifiedevent) + { + $label = $langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label']; + $elementLabel = $langs->trans(ucfirst($notifiedevent['elementtype'])); - if ($notifiedevent['elementtype'] == 'order_supplier') $elementLabel = $langs->trans('SupplierOrder'); - elseif ($notifiedevent['elementtype'] == 'propal') $elementLabel = $langs->trans('Proposal'); - elseif ($notifiedevent['elementtype'] == 'facture') $elementLabel = $langs->trans('Bill'); - elseif ($notifiedevent['elementtype'] == 'commande') $elementLabel = $langs->trans('Order'); - elseif ($notifiedevent['elementtype'] == 'ficheinter') $elementLabel = $langs->trans('Intervention'); - elseif ($notifiedevent['elementtype'] == 'shipping') $elementLabel = $langs->trans('Shipping'); - elseif ($notifiedevent['elementtype'] == 'expensereport') $elementLabel = $langs->trans('ExpenseReport'); - -if ($notifiedevent['elementtype'] == 'propal') $model = 'propal_send'; -elseif ($notifiedevent['elementtype'] == 'commande') $model = 'order_send'; -elseif ($notifiedevent['elementtype'] == 'facture') $model = 'facture_send'; -elseif ($notifiedevent['elementtype'] == 'shipping') $model = 'shipping_send'; -elseif ($notifiedevent['elementtype'] == 'ficheinter') $model = 'fichinter_send'; -elseif ($notifiedevent['elementtype'] == 'expensereport') $model = 'expensereport_send'; -elseif ($notifiedevent['elementtype'] == 'order_supplier') $model = 'order_supplier_send'; -//elseif ($notifiedevent['elementtype'] == 'invoice_supplier') $model = 'invoice_supplier_send'; -elseif ($notifiedevent['elementtype'] == 'member') $model = 'member'; + if ($notifiedevent['elementtype'] == 'order_supplier') $elementLabel = $langs->trans('SupplierOrder'); + elseif ($notifiedevent['elementtype'] == 'propal') $elementLabel = $langs->trans('Proposal'); + elseif ($notifiedevent['elementtype'] == 'facture') $elementLabel = $langs->trans('Bill'); + elseif ($notifiedevent['elementtype'] == 'commande') $elementLabel = $langs->trans('Order'); + elseif ($notifiedevent['elementtype'] == 'ficheinter') $elementLabel = $langs->trans('Intervention'); + elseif ($notifiedevent['elementtype'] == 'shipping') $elementLabel = $langs->trans('Shipping'); + elseif ($notifiedevent['elementtype'] == 'expensereport') $elementLabel = $langs->trans('ExpenseReport'); - $constantes[$notifiedevent['code'].'_TEMPLATE'] = array('type'=>'emailtemplate:'.$model, 'label'=>$label); -} + if ($notifiedevent['elementtype'] == 'propal') $model = 'propal_send'; + elseif ($notifiedevent['elementtype'] == 'commande') $model = 'order_send'; + elseif ($notifiedevent['elementtype'] == 'facture') $model = 'facture_send'; + elseif ($notifiedevent['elementtype'] == 'shipping') $model = 'shipping_send'; + elseif ($notifiedevent['elementtype'] == 'ficheinter') $model = 'fichinter_send'; + elseif ($notifiedevent['elementtype'] == 'expensereport') $model = 'expensereport_send'; + elseif ($notifiedevent['elementtype'] == 'order_supplier') $model = 'order_supplier_send'; + //elseif ($notifiedevent['elementtype'] == 'invoice_supplier') $model = 'invoice_supplier_send'; + elseif ($notifiedevent['elementtype'] == 'member') $model = 'member'; -$helptext=''; -form_constantes($constantes, 0, $helptext); + $constantes[$notifiedevent['code'].'_TEMPLATE'] = array('type'=>'emailtemplate:'.$model, 'label'=>$label); + } + $helptext=''; + form_constantes($constantes, 0, $helptext); } else { + print ''; + print ''; + print ''; + /*print ''; + print '';*/ + //print ''; + print "\n"; -print '
'.$langs->trans("Label").''.$langs->trans("Code").''.$langs->trans("Label").''.$langs->trans("NbOfTargetedContacts").'
'; -print ''; -print ''; -/*print ''; - print '';*/ -//print ''; -print "\n"; + print ''; + print ''; -print ''; -print '
'.$langs->trans("Label").''.$langs->trans("Code").''.$langs->trans("Label").''.$langs->trans("NbOfTargetedContacts").'
'; -print '
'; + $i = 0; + foreach ($listofnotifiedevents as $notifiedevent) + { + $label = $langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label']; + $elementLabel = $langs->trans(ucfirst($notifiedevent['elementtype'])); -$i = 0; -foreach ($listofnotifiedevents as $notifiedevent) -{ + if ($notifiedevent['elementtype'] == 'order_supplier') $elementLabel = $langs->trans('SupplierOrder'); + elseif ($notifiedevent['elementtype'] == 'propal') $elementLabel = $langs->trans('Proposal'); + elseif ($notifiedevent['elementtype'] == 'facture') $elementLabel = $langs->trans('Bill'); + elseif ($notifiedevent['elementtype'] == 'commande') $elementLabel = $langs->trans('Order'); + elseif ($notifiedevent['elementtype'] == 'ficheinter') $elementLabel = $langs->trans('Intervention'); + elseif ($notifiedevent['elementtype'] == 'shipping') $elementLabel = $langs->trans('Shipping'); + elseif ($notifiedevent['elementtype'] == 'expensereport') $elementLabel = $langs->trans('ExpenseReport'); - $label = $langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label']; - $elementLabel = $langs->trans(ucfirst($notifiedevent['elementtype'])); + if ($i) print ', '; + print $label; - if ($notifiedevent['elementtype'] == 'order_supplier') $elementLabel = $langs->trans('SupplierOrder'); - elseif ($notifiedevent['elementtype'] == 'propal') $elementLabel = $langs->trans('Proposal'); - elseif ($notifiedevent['elementtype'] == 'facture') $elementLabel = $langs->trans('Bill'); - elseif ($notifiedevent['elementtype'] == 'commande') $elementLabel = $langs->trans('Order'); - elseif ($notifiedevent['elementtype'] == 'ficheinter') $elementLabel = $langs->trans('Intervention'); - elseif ($notifiedevent['elementtype'] == 'shipping') $elementLabel = $langs->trans('Shipping'); - elseif ($notifiedevent['elementtype'] == 'expensereport') $elementLabel = $langs->trans('ExpenseReport'); + $i++; + } - if ($i) print ', '; - print $label; - - $i++; - -} - -print '
'; + print ''; + print ''; } print '
';