From 5e020cd1786b44cff2d0983321a64cc566af949d Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 11 Jul 2012 11:23:32 +0200 Subject: [PATCH] Fix: use array for external module --- htdocs/admin/delais.php | 301 ++++++++++++++++------------------------ 1 file changed, 116 insertions(+), 185 deletions(-) diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php index 1150949c7c6..bf8dd9b29f9 100644 --- a/htdocs/admin/delais.php +++ b/htdocs/admin/delais.php @@ -2,7 +2,7 @@ /* Copyright (C) 2001-2004 Rodolphe Quiedeville * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2005 Simon Tosser - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -72,10 +72,100 @@ print "
\n"; $form = new Form($db); $countrynotdefined=''.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')'; +$modules=array( + 'agenda' => array( + array( + 'label' => $langs->trans("DelaysOfToleranceActionsToDo"), + 'name' => 'ActionsToDo', + 'img' => 'action', + 'value' => (! empty($conf->global->MAIN_DELAY_ACTIONS_TODO)?$conf->global->MAIN_DELAY_ACTIONS_TODO:0) + ) + ), + 'propal' => array( + array( + 'label' => $langs->trans("DelaysOfTolerancePropalsToClose"), + 'name' => 'PropalsToClose', + 'img' => 'propal', + 'value' => (! empty($conf->global->MAIN_DELAY_PROPALS_TO_CLOSE)?$conf->global->MAIN_DELAY_PROPALS_TO_CLOSE:0) + ), + array( + 'label' => $langs->trans("DelaysOfTolerancePropalsToBill"), + 'name' => 'PropalsToBill', + 'img' => 'propal', + 'value' => (! empty($conf->global->MAIN_DELAY_PROPALS_TO_BILL)?$conf->global->MAIN_DELAY_PROPALS_TO_BILL:0) + ) + ), + 'commande' => array( + array( + 'label' => $langs->trans("DelaysOfToleranceOrdersToProcess"), + 'name' => 'OrdersToProcess', + 'img' => 'order', + 'value' => (! empty($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)?$conf->global->MAIN_DELAY_ORDERS_TO_PROCESS:0) + ) + ), + 'facture' => array( + array( + 'label' => $langs->trans("DelaysOfToleranceCustomerBillsUnpaid"), + 'name' => 'CustomerBillsUnpaid', + 'img' => 'bill', + 'value' => (! empty($conf->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED)?$conf->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED:0) + ) + ), + 'fournisseur' => array( + array( + 'label' => $langs->trans("DelaysOfToleranceSuppliersOrdersToProcess"), + 'name' => 'SuppliersOrdersToProcess', + 'img' => 'order', + 'value' => (! empty($conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS)?$conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS:0) + ), + array( + 'label' => $langs->trans("DelaysOfToleranceSupplierBillsToPay"), + 'name' => 'SupplierBillsToPay', + 'img' => 'bill', + 'value' => (! empty($conf->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY)?$conf->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY:0) + ) + ), + 'service' => array( + array( + 'label' => $langs->trans("DelaysOfToleranceNotActivatedServices"), + 'name' => 'BoardNotActivatedServices', + 'img' => 'service', + 'value' => (! empty($conf->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES)?$conf->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES:0) + ), + array( + 'label' => $langs->trans("DelaysOfToleranceRunningServices"), + 'name' => 'BoardRunningServices', + 'img' => 'service', + 'value' => (! empty($conf->global->MAIN_DELAY_RUNNING_SERVICES)?$conf->global->MAIN_DELAY_RUNNING_SERVICES:0) + ) + ), + 'banque' => array( + array( + 'label' => $langs->trans("DelaysOfToleranceTransactionsToConciliate"), + 'name' => 'TransactionsToConciliate', + 'img' => 'account', + 'value' => (! empty($conf->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE)?$conf->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE:0) + ), + array( + 'label' => $langs->trans("DelaysOfToleranceChequesToDeposit"), + 'name' => 'ChequesToDeposit', + 'img' => 'account', + 'value' => (! empty($conf->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT)?$conf->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT:0) + ) + ), + 'adherent' => array( + array( + 'label' => $langs->trans("DelaysOfToleranceMembers"), + 'name' => 'Members', + 'img' => 'user', + 'value' => (! empty($conf->global->MAIN_DELAY_MEMBERS)?$conf->global->MAIN_DELAY_MEMBERS:0) + ) + ), +); if ($action == 'edit') { - print '
'; + print ''; print ''; print ''; $var=true; @@ -83,99 +173,19 @@ if ($action == 'edit') print ''; print ''; - // - if (! empty($conf->agenda->enabled)) + foreach($modules as $module => $delays) { - $var=!$var; - print ''; - print ''; - print ''; - } - if (! empty($conf->commande->enabled)) - { - $var=!$var; - print ''; - print ''; - print ''; - } - if (! empty($conf->fournisseur->enabled)) - { - $var=!$var; - print ''; - print ''; - print ''; - } - if (! empty($conf->propal->enabled)) - { - $var=!$var; - print ''; - print ''; - print ''; - } - if (! empty($conf->propal->enabled)) - { - $var=!$var; - print ''; - print ''; - print ''; - } - if (! empty($conf->service->enabled)) - { - $var=!$var; - print ''; - print ''; - print ''; - } - if (! empty($conf->service->enabled)) - { - $var=!$var; - print ''; - print ''; - print ''; - } - if (! empty($conf->facture->enabled)) - { - $var=!$var; - print ''; - print ''; - print ''; - } - if (! empty($conf->fournisseur->enabled)) - { - $var=!$var; - print ''; - print ''; - print ''; - } - if (! empty($conf->banque->enabled)) - { - $var=!$var; - print ''; - print ''; - print ''; - $var=!$var; - print ''; - print ''; - print ''; - } - if (! empty($conf->adherent->enabled)) - { - $var=!$var; - print ''; - print ''; - print ''; + if (! empty($conf->$module->enabled)) + { + foreach($delays as $delay) + { + $var=!$var; + print ''; + print ''; + print ''; + } + } } print '
'.$langs->trans("DelaysOfToleranceBeforeWarning").''.$langs->trans("Value").'
'.img_object('','action').''.$langs->trans("DelaysOfToleranceActionsToDo").''; - print ' ' . $langs->trans("days") . '
'.img_object('','order').''.$langs->trans("DelaysOfToleranceOrdersToProcess").''; - print ' ' . $langs->trans("days") . '
'.img_object('','order').''.$langs->trans("DelaysOfToleranceSuppliersOrdersToProcess").''; - print ' ' . $langs->trans("days") . '
'.img_object('','propal').''.$langs->trans("DelaysOfTolerancePropalsToClose").''; - print ' ' . $langs->trans("days") . '
'.img_object('','propal').''.$langs->trans("DelaysOfTolerancePropalsToBill").''; - print ' ' . $langs->trans("days") . '
'.img_object('','service').''.$langs->trans("DelaysOfToleranceNotActivatedServices").''; - print ' ' . $langs->trans("days") . '
'.img_object('','service').''.$langs->trans("DelaysOfToleranceRunningServices").''; - print ' ' . $langs->trans("days") . '
'.img_object('','bill').''.$langs->trans("DelaysOfToleranceCustomerBillsUnpaid").''; - print ' ' . $langs->trans("days") . '
'.img_object('','bill').''.$langs->trans("DelaysOfToleranceSupplierBillsToPay").''; - print ' ' . $langs->trans("days") . '
'.img_object('','account').''.$langs->trans("DelaysOfToleranceTransactionsToConciliate").''; - print ' ' . $langs->trans("days") . '
'.img_object('','account').''.$langs->trans("DelaysOfToleranceChequesToDeposit").''; - print ' ' . $langs->trans("days") . '
'.img_object('','user').''.$langs->trans("DelaysOfToleranceMembers").''; - print ' ' . $langs->trans("days") . '
'.img_object('',$delay['img']).''.$delay['label'].''; + print ' '.$langs->trans("days").'
'; @@ -209,98 +219,19 @@ else print ''.$langs->trans("DelaysOfToleranceBeforeWarning").''.$langs->trans("Value").''; $var=true; - $var=!$var; - - if (! empty($conf->agenda->enabled)) + foreach($modules as $module => $delays) { - print ''; - print ''.img_object('','action').''; - print ''.$langs->trans("DelaysOfToleranceActionsToDo").'' . ($conf->global->MAIN_DELAY_ACTIONS_TODO+0) . ' ' . $langs->trans("days") . ''; - } - - if (! empty($conf->commande->enabled)) - { - $var=!$var; - print ''; - print ''.img_object('','order').''; - print ''.$langs->trans("DelaysOfToleranceOrdersToProcess").'' . ($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS+0) . ' ' . $langs->trans("days") . ''; - } - - if (! empty($conf->fournisseur->enabled)) - { - $var=!$var; - print ''; - print ''.img_object('','order').''; - print ''.$langs->trans("DelaysOfToleranceSuppliersOrdersToProcess").'' . ($conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS+0) . ' ' . $langs->trans("days") . ''; - } - - if (! empty($conf->propal->enabled)) - { - $var=!$var; - print ''; - print ''.img_object('','propal').''; - print ''.$langs->trans("DelaysOfTolerancePropalsToClose").'' . ($conf->global->MAIN_DELAY_PROPALS_TO_CLOSE+0). ' ' . $langs->trans("days") . ''; - } - - if (! empty($conf->propal->enabled)) - { - $var=!$var; - print ''; - print ''.img_object('','propal').''; - print ''.$langs->trans("DelaysOfTolerancePropalsToBill").'' . ($conf->global->MAIN_DELAY_PROPALS_TO_BILL+0) . ' ' . $langs->trans("days") . ''; - } - - if (! empty($conf->service->enabled)) - { - $var=!$var; - print ''; - print ''.img_object('','service').''; - print ''.$langs->trans("DelaysOfToleranceNotActivatedServices").'' . ($conf->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES+0) . ' ' . $langs->trans("days") . ''; - } - - if (! empty($conf->service->enabled)) - { - $var=!$var; - print ''; - print ''.img_object('','service').''; - print ''.$langs->trans("DelaysOfToleranceRunningServices").'' . ($conf->global->MAIN_DELAY_RUNNING_SERVICES+0). ' ' . $langs->trans("days") . ''; - } - - if (! empty($conf->facture->enabled)) - { - $var=!$var; - print ''; - print ''.img_object('','bill').''; - print ''.$langs->trans("DelaysOfToleranceCustomerBillsUnpaid").'' . ($conf->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED+0) . ' ' . $langs->trans("days") . ''; - } - - if (! empty($conf->fournisseur->enabled)) - { - $var=!$var; - print ''; - print ''.img_object('','bill').''; - print ''.$langs->trans("DelaysOfToleranceSupplierBillsToPay").'' . ($conf->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY+0) . ' ' . $langs->trans("days") . ''; - } - - if (! empty($conf->banque->enabled)) - { - $var=!$var; - print ''; - print ''.img_object('','account').''; - print ''.$langs->trans("DelaysOfToleranceTransactionsToConciliate").'' . ($conf->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE+0) . ' ' . $langs->trans("days") . ''; - - $var=!$var; - print ''; - print ''.img_object('','account').''; - print ''.$langs->trans("DelaysOfToleranceChequesToDeposit").'' . ($conf->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT+0) . ' ' . $langs->trans("days") . ''; - } - - if (! empty($conf->adherent->enabled)) - { - $var=!$var; - print ''; - print ''.img_object('','user').''; - print ''.$langs->trans("DelaysOfToleranceMembers").'' . ($conf->global->MAIN_DELAY_MEMBERS+0) . ' ' . $langs->trans("days") . ''; + if (! empty($conf->$module->enabled)) + { + foreach($delays as $delay) + { + $var=!$var; + print ''; + print ''.img_object('',$delay['img']).''; + print ''.$delay['label'].''; + print ''.$delay['value'].' '.$langs->trans("days").''; + } + } } print '';