From 78ae7dc075dab3e97f42c815cf1e4791dfa2913f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 27 Mar 2012 09:59:28 +0200 Subject: [PATCH] Checkstyle --- .../pdf/pdf_canelle.modules.php | 2 +- .../interface_20_all_Logevents.class.php | 9 +++--- ...face_20_modPaypal_PaypalWorkflow.class.php | 3 +- ...e_20_modWorkflow_WorkflowManager.class.php | 10 +++---- ...terface_50_modAgenda_ActionsAuto.class.php | 3 +- ...interface_50_modLdap_Ldapsynchro.class.php | 9 +++--- ..._50_modNotification_Notification.class.php | 9 +++--- .../interface_90_all_Demo.class.php-NORUN | 26 +++++++++-------- .../fourn/class/fournisseur.facture.class.php | 6 ++-- htdocs/fourn/commande/fiche.php | 2 +- htdocs/fourn/facture/fiche.php | 2 +- htdocs/user/class/user.class.php | 28 +++++++++---------- .../webservices/server_productorservice.php | 16 +++++------ 13 files changed, 60 insertions(+), 65 deletions(-) diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 8d32bc126f0..0fdf0884ea0 100755 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -741,7 +741,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $y+=3; $row = $this->db->fetch_object($resql); - $pdf->SetXY($tab3_posx, $tab3_top+$y ); + $pdf->SetXY($tab3_posx, $tab3_top+$y); $pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date),'day',false,$outputlangs,true), 0, 'L', 0); $pdf->SetXY($tab3_posx+21, $tab3_top+$y); $pdf->MultiCell(20, 3, price($row->amount), 0, 'L', 0); diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php index 425b1d2983c..6e757345df6 100755 --- a/htdocs/core/triggers/interface_20_all_Logevents.class.php +++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php @@ -17,15 +17,14 @@ */ /** - * \file htdocs/core/triggers/interface_20_all_Logevents.class.php - * \ingroup core - * \brief Trigger file for + * \file htdocs/core/triggers/interface_20_all_Logevents.class.php + * \ingroup core + * \brief Trigger file for */ /** - * \class InterfaceLogevents - * \brief Class of triggers for security events + * Class of triggers for security events */ class InterfaceLogevents { diff --git a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php index 2d7b9ef6ee0..aacd600f478 100755 --- a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php +++ b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php @@ -23,8 +23,7 @@ /** - * \class InterfacePaypalWorkflow - * \brief Class of triggers for paypal module + * Class of triggers for paypal module */ class InterfacePaypalWorkflow { diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php index cac90487179..3c914faf0e1 100755 --- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php +++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php @@ -17,15 +17,14 @@ */ /** - * \file htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php - * \ingroup core - * \brief Trigger file for workflows + * \file htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php + * \ingroup core + * \brief Trigger file for workflows */ /** - * \class InterfaceWorkflowManager - * \brief Class of triggers for workflow module + * Class of triggers for workflow module */ class InterfaceWorkflowManager @@ -95,7 +94,6 @@ class InterfaceWorkflowManager * @param User $user Object user * @param Translate $langs Object langs * @param conf $conf Object conf - * @param string $entity Value for instance of data (Always 1 except if module MultiCompany is installed) * @return int <0 if KO, 0 if no triggered ran, >0 if OK */ function run_trigger($action,$object,$user,$langs,$conf) diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index 435b8afa554..8e0641e594f 100755 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -25,8 +25,7 @@ /** - * \class InterfaceActionsAuto - * \brief Class of triggered functions for agenda module + * Class of triggered functions for agenda module */ class InterfaceActionsAuto { diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php index 346ade67d03..2e2bc3642ab 100755 --- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php +++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php @@ -16,16 +16,15 @@ */ /** - * \file htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php - * \ingroup core - * \brief Fichier de gestion des triggers LDAP + * \file htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php + * \ingroup core + * \brief Fichier de gestion des triggers LDAP */ require_once (DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); /** - * \class InterfaceLdapsynchro - * \brief Class of triggers for ldap module + * Class of triggers for ldap module */ class InterfaceLdapsynchro { diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php index 4ea8db0e2ce..cf47057966d 100755 --- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php +++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php @@ -17,15 +17,14 @@ */ /** - * \file htdocs/core/triggers/interface_50_modNotification_Notification.class.php - * \ingroup notification - * \brief File of class of triggers for notification module + * \file htdocs/core/triggers/interface_50_modNotification_Notification.class.php + * \ingroup notification + * \brief File of class of triggers for notification module */ /** - * \class InterfaceNotification - * \brief Class of triggers for notification module + * Class of triggers for notification module */ class InterfaceNotification { diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN index 15ee6544a94..68789b03878 100755 --- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN +++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN @@ -17,22 +17,21 @@ */ /** - * \file htdocs/core/triggers/interface_90_all_Demo.class.php - * \ingroup core - * \brief Fichier de demo de personalisation des actions du workflow - * \remarks Son propre fichier d'actions peut etre cree par recopie de celui-ci: - * - Le nom du fichier doit etre: interface_99_modMymodule_Mytrigger.class.php - * ou: interface_99_all_Mytrigger.class.php - * - Le fichier doit rester stocke dans core/triggers - * - Le nom de la classe doit etre InterfaceMytrigger - * - Le nom de la methode constructeur doit etre InterfaceMytrigger - * - Le nom de la propriete name doit etre Mytrigger + * \file htdocs/core/triggers/interface_90_all_Demo.class.php + * \ingroup core + * \brief Fichier de demo de personalisation des actions du workflow + * \remarks Son propre fichier d'actions peut etre cree par recopie de celui-ci: + * - Le nom du fichier doit etre: interface_99_modMymodule_Mytrigger.class.php + * ou: interface_99_all_Mytrigger.class.php + * - Le fichier doit rester stocke dans core/triggers + * - Le nom de la classe doit etre InterfaceMytrigger + * - Le nom de la methode constructeur doit etre InterfaceMytrigger + * - Le nom de la propriete name doit etre Mytrigger */ /** - * \class InterfaceDemo - * \brief Class of triggers for demo module + * Class of triggers for demo module */ class InterfaceDemo { @@ -57,6 +56,7 @@ class InterfaceDemo /** * Return name of trigger file + * * @return string Name of trigger file */ function getName() @@ -66,6 +66,7 @@ class InterfaceDemo /** * Return description of trigger file + * * @return string Description of trigger file */ function getDesc() @@ -75,6 +76,7 @@ class InterfaceDemo /** * Return version of trigger file + * * @return string Version of trigger file */ function getVersion() diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 23b3b703d0a..6cdaa631da9 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -78,7 +78,7 @@ class FactureFournisseur extends Facture var $lines; var $fournisseur; - + var $extraparams=array(); @@ -194,7 +194,7 @@ class FactureFournisseur extends Facture $this->lines[$i]->localtax2_tx, $this->lines[$i]->qty, $this->lines[$i]->fk_product, - 'HT', + 'HT', $this->lines[$i]->info_bits, $this->lines[$i]->product_type ); @@ -345,7 +345,7 @@ class FactureFournisseur extends Facture $this->note_public = $obj->note_public; $this->model_pdf = $obj->model_pdf; $this->import_key = $obj->import_key; - + $this->extraparams = (array) json_decode($obj->extraparams, true); $this->socid = $obj->socid; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index ae043472587..8519f13347e 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -190,7 +190,7 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer) $_POST['idprodfournprice'], $productsupplier->fourn_ref, $remise_percent, - 'HT', + 'HT', $type ); } diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 20614672f50..7b52aa440af 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -316,7 +316,7 @@ elseif ($action == 'add' && $user->rights->fournisseur->facture->creer) $date_end, 0, $lines[$i]->info_bits, - 'HT', + 'HT', $product_type ); diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index be0b676e12e..95b97be7a80 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -25,14 +25,14 @@ /** * \file htdocs/user/class/user.class.php * \brief File of class to manage users + * \ingroup core */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); /** - * \class User - * \brief Class to manage users + * Class to manage users */ class User extends CommonObject { @@ -108,7 +108,7 @@ class User extends CommonObject $this->all_permissions_are_loaded = 0; $this->admin=0; - + $this->rights = (object) array(); $this->rights->user = (object) array(); $this->rights->user->user = (object) array(); @@ -1433,17 +1433,17 @@ class User extends CommonObject dol_syslog("User::send_password url=".$url); } $mailfile = new CMailFile( - $subject, - $this->email, - $conf->notification->email_from, - $mesg, - array(), - array(), - array(), - '', - '', - 0, - $msgishtml + $subject, + $this->email, + $conf->notification->email_from, + $mesg, + array(), + array(), + array(), + '', + '', + 0, + $msgishtml ); if ($mailfile->sendfile()) diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index e17d4102a3d..6b5c6dee643 100755 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -83,10 +83,10 @@ $server->wsdl->addComplexType( // Define other specific objects $server->wsdl->addComplexType( 'product', - 'complexType', - 'struct', - 'all', - '', + 'complexType', + 'struct', + 'all', + '', array( 'id' => array('name'=>'id','type'=>'xsd:string'), 'ref' => array('name'=>'ref','type'=>'xsd:string'), @@ -120,10 +120,10 @@ $server->wsdl->addComplexType( // Define other specific objects $server->wsdl->addComplexType( 'filterproduct', - 'complexType', - 'struct', - 'all', - '', + 'complexType', + 'struct', + 'all', + '', array( // 'limit' => array('name'=>'limit','type'=>'xsd:string'), 'type' => array('name'=>'type','type'=>'xsd:string'),