From bb414788868115823edf7e6dc93a9a92d8b2b64c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 28 Aug 2011 17:45:06 +0000 Subject: [PATCH] Qual: Remove errors reported by PHP Code Sniffer --- htdocs/bookmarks/bookmarks.lib.php | 4 +-- htdocs/bookmarks/class/bookmark.class.php | 38 +++++++++++++---------- htdocs/bookmarks/liste.php | 2 +- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php index 2789bda7b1c..30fa7e774ed 100644 --- a/htdocs/bookmarks/bookmarks.lib.php +++ b/htdocs/bookmarks/bookmarks.lib.php @@ -24,8 +24,8 @@ /** * Add area with bookmarks in menu * - * @param $aDb - * @param $aLangs + * @param DoliDb $aDb Database handler + * @param Translate $aLangs Object lang * @return string */ function printBookmarksList ($aDb, $aLangs) diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php index 065974fd511..afe18f165b8 100644 --- a/htdocs/bookmarks/class/bookmark.class.php +++ b/htdocs/bookmarks/class/bookmark.class.php @@ -41,9 +41,10 @@ class Bookmark /** - * \brief Manufacturer - * \param db Handler for Database Access - * \param id Bookmark Id + * Constructor + * + * @param DoliDB $db Handler for Database Access + * @param int $id Bookmark Id */ function Bookmark($db, $id=-1) { @@ -52,8 +53,10 @@ class Bookmark } /** - * \brief Directs the bookmark - * \param id Bookmark Id Loader + * Directs the bookmark + * + * @param int $id Bookmark Id Loader + * @return int <0 if KO, >0 if OK */ function fetch($id) { @@ -63,7 +66,7 @@ class Bookmark $sql.= " WHERE rowid = ".$id; dol_syslog("Bookmark::fetch sql=".$sql, LOG_DEBUG); - $resql = $this->db->query ($sql); + $resql = $this->db->query($sql); if ($resql) { $obj = $this->db->fetch_object($resql); @@ -90,8 +93,9 @@ class Bookmark } /** - * \brief Insere bookmark en base - * \return int <0 si ko, rowid du bookmark cree si ok + * Insert bookmark into database + * + * @return int <0 si ko, rowid du bookmark cree si ok */ function create() { @@ -114,7 +118,7 @@ class Bookmark $sql.= ")"; dol_syslog("Bookmark::update sql=".$sql, LOG_DEBUG); - $resql = $this->db->query ($sql); + $resql = $this->db->query($sql); if ($resql) { $id = $this->db->last_insert_id(MAIN_DB_PREFIX."bookmark"); @@ -142,8 +146,9 @@ class Bookmark } /** - * \brief Update bookmark record - * \return int <0 si ko, >0 si ok + * Update bookmark record + * + * @return int <0 if KO, > if OK */ function update() { @@ -163,7 +168,7 @@ class Bookmark $sql.= " WHERE rowid = ".$this->id; dol_syslog("Bookmark::update sql=".$sql, LOG_DEBUG); - if ($this->db->query ($sql)) + if ($this->db->query($sql)) { return 1; } @@ -175,9 +180,10 @@ class Bookmark } /** - * \brief Removes the bookmark - * \param id Id removed bookmark - * \return int <0 si ko, >0 si ok + * Removes the bookmark + * + * @param int $id Id removed bookmark + * @return int <0 si ko, >0 si ok */ function remove($id) { @@ -185,7 +191,7 @@ class Bookmark $sql .= " WHERE rowid = ".$id; dol_syslog("Bookmark::remove sql=".$sql, LOG_DEBUG); - $resql=$this->db->query ($sql); + $resql=$this->db->query($sql); if ($resql) { return 1; diff --git a/htdocs/bookmarks/liste.php b/htdocs/bookmarks/liste.php index b95f9ffd2e7..cb05a23c77e 100644 --- a/htdocs/bookmarks/liste.php +++ b/htdocs/bookmarks/liste.php @@ -75,7 +75,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bookmark as b LEFT JOIN ".MAIN_DB_PREFIX."user a $sql.= " WHERE 1=1"; if (! $user->admin) $sql.= " AND (b.fk_user = ".$user->id." OR b.fk_user is NULL OR b.fk_user = 0)"; $sql.= $db->order($sortfield.", position",$sortorder); -$sql.= $db->plimit( $limit, $offset); +$sql.= $db->plimit($limit, $offset); $resql=$db->query($sql); if ($resql)