From a2bfcfae31011e6d0b02630ca3d7ac6043a1df6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Ferry?= Date: Sat, 15 Mar 2014 18:28:38 +0100 Subject: [PATCH] Qual : codesniffer --- htdocs/resource/class/actions_resource.class.php | 13 +++++++++++++ htdocs/resource/class/html.formresource.class.php | 15 ++++++--------- htdocs/resource/class/resource.class.php | 11 +++++------ 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/htdocs/resource/class/actions_resource.class.php b/htdocs/resource/class/actions_resource.class.php index 16cf5e27d32..7185ce07192 100644 --- a/htdocs/resource/class/actions_resource.class.php +++ b/htdocs/resource/class/actions_resource.class.php @@ -20,6 +20,11 @@ * \brief Place module actions */ +/** + * Actions class file for resources + * + * \class ActionsResource + */ class ActionsResource { @@ -37,6 +42,14 @@ class ActionsResource $this->db = $db; } + /** + * doActions + * + * @param array $parameters parameters + * @param object &$object object + * @param string &$action action + * @return void + */ function doActions($parameters, &$object, &$action) { global $langs,$user; diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php index de7b3d23f3d..739e4a82311 100644 --- a/htdocs/resource/class/html.formresource.class.php +++ b/htdocs/resource/class/html.formresource.class.php @@ -18,20 +18,17 @@ /** * \file place/class/html.place.class.php * \ingroup core - * \brief Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire + * \brief Class file to manage forms into resource module */ require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php"); /** + * Classe permettant la gestion des formulaire du module resource * - * Classe permettant la gestion des formulaire du module place - * - * @package resource - -* \remarks Utilisation: $formresource = new FormResource($db) -* \remarks $formplace->proprietes=1 ou chaine ou tableau de valeurs -*/ + * \remarks Utilisation: $formresource = new FormResource($db) + * \remarks $formplace->proprietes=1 ou chaine ou tableau de valeurs + */ class FormResource { var $db; @@ -45,7 +42,7 @@ class FormResource /** * Constructor * - * @param DoliDB $DB Database handler + * @param DoliDB $db Database handler */ function __construct($db) { diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php index 2652c3eb499..42abfcf78f2 100644 --- a/htdocs/resource/class/resource.class.php +++ b/htdocs/resource/class/resource.class.php @@ -62,7 +62,8 @@ class Resource extends CommonObject /** * Load object in memory from database - * @param id id object + * + * @param int $id id object * @return int <0 if KO, >0 if OK */ function fetch($id) @@ -154,7 +155,7 @@ class Resource extends CommonObject } } $sql.= " GROUP BY t.rowid"; - $sql.= " ORDER BY $sortfield $sortorder " . $this->db->plimit( $limit + 1 ,$offset); + $sql.= " ORDER BY $sortfield $sortorder " . $this->db->plimit($limit+1,$offset); dol_syslog(get_class($this)."::fetch_all sql=".$sql, LOG_DEBUG); $resql=$this->db->query($sql); @@ -207,7 +208,7 @@ class Resource extends CommonObject * @param array $filter filter output * @return int <0 if KO, >0 if OK */ - function fetch_all_used($sortorder="ASC",$sortfield="t.rowid",$limit, $offset, $filter='') + function fetch_all_used($sortorder="ASC", $sortfield="t.rowid", $limit=25, $offset=1, $filter='') { global $conf; $sql="SELECT "; @@ -235,7 +236,7 @@ class Resource extends CommonObject } } $sql.= " GROUP BY t.resource_id"; - $sql.= " ORDER BY $sortfield $sortorder " . $this->db->plimit( $limit + 1 ,$offset); + $sql.= " ORDER BY " . $sortfield . " " . $sortorder . " " . $this->db->plimit($limit+1,$offset); dol_syslog(get_class($this)."::fetch_all sql=".$sql, LOG_DEBUG); $resql=$this->db->query($sql); @@ -276,10 +277,8 @@ class Resource extends CommonObject /** * Fetch all resources available, declared by modules - * * Load available resource in array $this->available_resources * - * * @return int number of available resources declared by modules */ function fetch_all_available() {