mambax7 / references

class/PEAR.php

Doc Comments +1 added lines, -1 removed lines

@@ -492,7 +492,7 @@
      * handling applied.  If the $mode and $options parameters are not
      * specified, the object's defaults are used.
      *
-     * @param mixed  $message     a text error message or a PEAR error object
+     * @param string|null  $message     a text error message or a PEAR error object
      *
      * @param int    $code        a numeric error code (it is up to your class
      *                            to define these if you want to use codes)

Spacing +16 added lines, -16 removed lines

@@ -763,7 +763,7 @@ 
                 $suffix = '.so';
             }
 
-            return @dl('php_' . $ext . $suffix) || @dl($ext . $suffix);
+            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
         }
 
         return true;
@@ -877,7 +877,7 @@ 
                 unset($this->backtrace[0]['object']);
             }
         }
-        if ($mode & references_PEAR_ERROR_CALLBACK) {
+        if ($mode&references_PEAR_ERROR_CALLBACK) {
             $this->level    = E_USER_NOTICE;
             $this->callback = $options;
         } else {
@@ -887,7 +887,7 @@ 
             $this->level    = $options;
             $this->callback = null;
         }
-        if ($this->mode & references_PEAR_ERROR_PRINT) {
+        if ($this->mode&references_PEAR_ERROR_PRINT) {
             if (is_null($options) || is_int($options)) {
                 $format = '%s';
             } else {
@@ -895,10 +895,10 @@ 
             }
             printf($format, $this->getMessage());
         }
-        if ($this->mode & references_PEAR_ERROR_TRIGGER) {
+        if ($this->mode&references_PEAR_ERROR_TRIGGER) {
             trigger_error($this->getMessage(), $this->level);
         }
-        if ($this->mode & references_PEAR_ERROR_DIE) {
+        if ($this->mode&references_PEAR_ERROR_DIE) {
             $msg = $this->getMessage();
             if (is_null($options) || is_int($options)) {
                 $format = '%s';
@@ -910,12 +910,12 @@ 
             }
             die(sprintf($format, $msg));
         }
-        if ($this->mode & references_PEAR_ERROR_CALLBACK) {
+        if ($this->mode&references_PEAR_ERROR_CALLBACK) {
             if (is_callable($this->callback)) {
                 call_user_func($this->callback, $this);
             }
         }
-        if ($this->mode & references_PEAR_ERROR_EXCEPTION) {
+        if ($this->mode&references_PEAR_ERROR_EXCEPTION) {
             trigger_error('references_PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions', E_USER_WARNING);
             eval('$e = new Exception($this->message, $this->code);throw($e);');
         }
@@ -960,7 +960,7 @@ 
      */
     public function getMessage()
     {
-        return ($this->error_message_prefix . $this->message);
+        return ($this->error_message_prefix.$this->message);
     }
 
     // }}}
@@ -1071,29 +1071,29 @@ 
             E_USER_WARNING => 'warning',
             E_USER_ERROR   => 'error'
         );
-        if ($this->mode & references_PEAR_ERROR_CALLBACK) {
+        if ($this->mode&references_PEAR_ERROR_CALLBACK) {
             if (is_array($this->callback)) {
-                $callback = (is_object($this->callback[0]) ? strtolower(get_class($this->callback[0])) : $this->callback[0]) . '::' . $this->callback[1];
+                $callback = (is_object($this->callback[0]) ? strtolower(get_class($this->callback[0])) : $this->callback[0]).'::'.$this->callback[1];
             } else {
                 $callback = $this->callback;
             }
 
-            return sprintf('[%s: message="%s" code=%d mode=callback ' . 'callback=%s prefix="%s" info="%s"]', strtolower(get_class($this)), $this->message, $this->code, $callback, $this->error_message_prefix, $this->userinfo);
+            return sprintf('[%s: message="%s" code=%d mode=callback '.'callback=%s prefix="%s" info="%s"]', strtolower(get_class($this)), $this->message, $this->code, $callback, $this->error_message_prefix, $this->userinfo);
         }
-        if ($this->mode & references_PEAR_ERROR_PRINT) {
+        if ($this->mode&references_PEAR_ERROR_PRINT) {
             $modes[] = 'print';
         }
-        if ($this->mode & references_PEAR_ERROR_TRIGGER) {
+        if ($this->mode&references_PEAR_ERROR_TRIGGER) {
             $modes[] = 'trigger';
         }
-        if ($this->mode & references_PEAR_ERROR_DIE) {
+        if ($this->mode&references_PEAR_ERROR_DIE) {
             $modes[] = 'die';
         }
-        if ($this->mode & references_PEAR_ERROR_RETURN) {
+        if ($this->mode&references_PEAR_ERROR_RETURN) {
             $modes[] = 'return';
         }
 
-        return sprintf('[%s: message="%s" code=%d mode=%s level=%s ' . 'prefix="%s" info="%s"]', strtolower(get_class($this)), $this->message, $this->code, implode('|', $modes), $levels[$this->level], $this->error_message_prefix, $this->userinfo);
+        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.'prefix="%s" info="%s"]', strtolower(get_class($this)), $this->message, $this->code, implode('|', $modes), $levels[$this->level], $this->error_message_prefix, $this->userinfo);
     }
 
     // }}}

class/PersistableObjectHandler.php

Doc Comments +2 added lines, -2 removed lines

@@ -235,7 +235,7 @@ 
      * @param boolean $as_object
      * @param string  $fields    Requested fields from the query
      *
-     * @return array
+     * @return string
      */
     protected function convertResultSet($result, $id_as_key = false, $as_object = true, $fields = '*')
     {
@@ -502,7 +502,7 @@ 
     /**
      * delete an object from the database
      *
-     * @param  XoopsObject $obj reference to the object to delete
+     * @param  references_articles $obj reference to the object to delete
      * @param  bool        $force
      * @return bool   FALSE if failed.
      */

Spacing +59 added lines, -59 removed lines

@@ -129,7 +129,7 @@ 
      */
     protected function _getIdForCache($query, $start, $limit)
     {
-        $id = md5($query . '-' . (string)$start . '-' . (string)$limit);
+        $id = md5($query.'-'.(string) $start.'-'.(string) $limit);
 
         return $id;
     }
@@ -164,17 +164,17 @@ 
             $criteria = new CriteriaCompo();
             $vnb      = count($this->keyName);
             for ($i = 0; $i < $vnb; ++$i) {
-                $criteria->add(new Criteria($this->keyName[$i], (int)$id[$i]));
+                $criteria->add(new Criteria($this->keyName[$i], (int) $id[$i]));
             }
         } else {
-            $criteria = new Criteria($this->keyName, (int)$id);
+            $criteria = new Criteria($this->keyName, (int) $id);
         }
         $criteria->setLimit(1);
-        $obj_array =& $this->getObjects($criteria, false, $as_object);
+        $obj_array = & $this->getObjects($criteria, false, $as_object);
         if (count($obj_array) != 1) {
             $ret = null;
         } else {
-            $ret =& $obj_array[0];
+            $ret = & $obj_array[0];
         }
 
         return $ret;
@@ -193,19 +193,19 @@ 
      */
     public function &getObjects(CriteriaElement $criteria = null, $id_as_key = false, $as_object = true, $fields = '*', $autoSort = true)
     {
-        require_once __DIR__ . '/lite.php';
+        require_once __DIR__.'/lite.php';
         $ret   = array();
         $limit = $start = 0;
-        $sql   = 'SELECT ' . $fields . ' FROM ' . $this->table;
+        $sql   = 'SELECT '.$fields.' FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->groupby != '') {
                 $sql .= $criteria->getGroupby();
             }
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             } elseif ($this->identifierName != '' && $autoSort) {
-                $sql .= ' ORDER BY ' . $this->identifierName;
+                $sql .= ' ORDER BY '.$this->identifierName;
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -241,11 +241,11 @@ 
     {
         $ret = array();
         while ($myrow = $this->db->fetchArray($result)) {
-            $obj =& $this->create(false);
+            $obj = & $this->create(false);
             $obj->assignVars($myrow);
             if (!$id_as_key) {
                 if ($as_object) {
-                    $ret[] =& $obj;
+                    $ret[] = & $obj;
                 } else {
                     $row     = array();
                     $vars    = $obj->getVars();
@@ -258,9 +258,9 @@ 
             } else {
                 if ($as_object) {
                     if ($fields === '*') {
-                        $ret[$myrow[$this->keyName]] =& $obj;
+                        $ret[$myrow[$this->keyName]] = & $obj;
                     } else {
-                        $ret[] =& $obj;
+                        $ret[] = & $obj;
                     }
                 } else {
                     $row     = array();
@@ -286,20 +286,20 @@ 
      */
     public function getIds($criteria = null)
     {
-        require_once __DIR__ . '/lite.php';
+        require_once __DIR__.'/lite.php';
         $limit = $start = 0;
 
         $Cache_Lite = new references_Cache_Lite($this->cacheOptions);
-        $sql        = 'SELECT ' . $this->keyName . ' FROM ' . $this->table;
+        $sql        = 'SELECT '.$this->keyName.' FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->groupby != '') {
                 $sql .= $criteria->getGroupby();
             }
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             } elseif ($this->identifierName != '') {
-                $sql .= ' ORDER BY ' . $this->identifierName;
+                $sql .= ' ORDER BY '.$this->identifierName;
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -329,26 +329,26 @@ 
      */
     public function getList($criteria = null)
     {
-        require_once __DIR__ . '/lite.php';
+        require_once __DIR__.'/lite.php';
         $limit      = $start = 0;
         $Cache_Lite = new references_Cache_Lite($this->cacheOptions);
 
         $ret = array();
 
-        $sql = 'SELECT ' . $this->keyName;
+        $sql = 'SELECT '.$this->keyName;
         if (!empty($this->identifierName)) {
-            $sql .= ', ' . $this->identifierName;
+            $sql .= ', '.$this->identifierName;
         }
-        $sql .= ' FROM ' . $this->table;
+        $sql .= ' FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->groupby != '') {
                 $sql .= $criteria->getGroupby();
             }
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             } elseif ($this->identifierName != '') {
-                $sql .= ' ORDER BY ' . $this->identifierName;
+                $sql .= ' ORDER BY '.$this->identifierName;
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -389,11 +389,11 @@ 
         $ret = array();
         if (is_array($ids) && count($ids) > 0) {
             $criteria = new CriteriaCompo();
-            $criteria->add(new Criteria($this->keyName, '(' . implode(',', $ids) . ')', 'IN'));
+            $criteria->add(new Criteria($this->keyName, '('.implode(',', $ids).')', 'IN'));
             if (!is_null($additionnal)) {
                 $criteria->add($additionnal);
             }
-            $ret =& $this->getObjects($criteria, true);
+            $ret = & $this->getObjects($criteria, true);
         }
 
         return $ret;
@@ -410,17 +410,17 @@ 
         $field   = '';
         $groupby = false;
         $limit   = $start = 0;
-        require_once __DIR__ . '/lite.php';
+        require_once __DIR__.'/lite.php';
 
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             if ($criteria->groupby != '') {
                 $groupby = true;
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
+                $field   = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
             }
         }
-        $sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table;
+        $sql = 'SELECT '.$field.'COUNT(*) FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->groupby != '') {
                 $sql .= $criteria->getGroupby();
             }
@@ -467,11 +467,11 @@ 
     public function getSum($field, $criteria = null)
     {
         $limit = $start = 0;
-        require_once __DIR__ . '/lite.php';
+        require_once __DIR__.'/lite.php';
 
-        $sql = 'SELECT Sum(' . $field . ') as cpt FROM ' . $this->table;
+        $sql = 'SELECT Sum('.$field.') as cpt FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->groupby != '') {
                 $sql .= $criteria->getGroupby();
             }
@@ -512,13 +512,13 @@ 
             $clause = array();
             $vnb    = count($this->keyName);
             for ($i = 0; $i < $vnb; ++$i) {
-                $clause[] = $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
+                $clause[] = $this->keyName[$i].' = '.$obj->getVar($this->keyName[$i]);
             }
             $whereclause = implode(' AND ', $clause);
         } else {
-            $whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
+            $whereclause = $this->keyName.' = '.$obj->getVar($this->keyName);
         }
-        $sql = 'DELETE FROM ' . $this->table . ' WHERE ' . $whereclause;
+        $sql = 'DELETE FROM '.$this->table.' WHERE '.$whereclause;
         if (false != $force) {
             $result = $this->db->queryF($sql);
         } else {
@@ -545,7 +545,7 @@ 
     {
         $object = $this->create(true);
         $object->setVars($vars);
-        $retval =& $this->insert($object, $force);
+        $retval = & $this->insert($object, $force);
         unset($object);
 
         // Clear cache
@@ -576,7 +576,7 @@ 
              * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
              */
             if (!is_a($obj, $this->className)) {
-                $obj->setErrors(get_class($obj) . ' Differs from ' . $this->className);
+                $obj->setErrors(get_class($obj).' Differs from '.$this->className);
 
                 return false;
             }
@@ -595,7 +595,7 @@ 
         }
         foreach ($obj->cleanVars as $k => $v) {
             if ($obj->vars[$k]['data_type'] == XOBJ_DTYPE_INT) {
-                $cleanvars[$k] = (int)$v;
+                $cleanvars[$k] = (int) $v;
             } elseif (is_array($v)) {
                 $cleanvars[$k] = $this->db->quoteString(implode(',', $v));
             } else {
@@ -608,16 +608,16 @@ 
         if ($obj->isNew()) {
             if (!is_array($this->keyName)) {
                 if ($cleanvars[$this->keyName] < 1) {
-                    $cleanvars[$this->keyName] = $this->db->genId($this->table . '_' . $this->keyName . '_seq');
+                    $cleanvars[$this->keyName] = $this->db->genId($this->table.'_'.$this->keyName.'_seq');
                 }
             }
             $ignore = '';
             if ($ignoreInsert) {
                 $ignore = 'IGNORE';
             }
-            $sql = "INSERT $ignore INTO " . $this->table . ' (' . implode(',', array_keys($cleanvars)) . ') VALUES (' . implode(',', array_values($cleanvars)) . ')';
+            $sql = "INSERT $ignore INTO ".$this->table.' ('.implode(',', array_keys($cleanvars)).') VALUES ('.implode(',', array_values($cleanvars)).')';
         } else {
-            $sql = 'UPDATE ' . $this->table . ' SET';
+            $sql = 'UPDATE '.$this->table.' SET';
             foreach ($cleanvars as $key => $value) {
                 if ((!is_array($this->keyName) && $key == $this->keyName) || (is_array($this->keyName) && in_array($key, $this->keyName))) {
                     continue;
@@ -625,7 +625,7 @@ 
                 if (isset($notfirst)) {
                     $sql .= ',';
                 }
-                $sql .= ' ' . $key . ' = ' . $value;
+                $sql .= ' '.$key.' = '.$value;
                 $notfirst = true;
             }
             if (is_array($this->keyName)) {
@@ -635,12 +635,12 @@ 
                     if ($i > 0) {
                         $whereclause .= ' AND ';
                     }
-                    $whereclause .= $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
+                    $whereclause .= $this->keyName[$i].' = '.$obj->getVar($this->keyName[$i]);
                 }
             } else {
-                $whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
+                $whereclause = $this->keyName.' = '.$obj->getVar($this->keyName);
             }
-            $sql .= ' WHERE ' . $whereclause;
+            $sql .= ' WHERE '.$whereclause;
         }
 
         if (false != $force) {
@@ -674,7 +674,7 @@ 
      */
     public function updateAll($fieldname, $fieldvalue, $criteria = null, $force = false)
     {
-        $set_clause = $fieldname . ' = ';
+        $set_clause = $fieldname.' = ';
         if (is_numeric($fieldvalue)) {
             $set_clause .= $fieldvalue;
         } elseif (is_array($fieldvalue)) {
@@ -682,9 +682,9 @@ 
         } else {
             $set_clause .= $this->db->quoteString($fieldvalue);
         }
-        $sql = 'UPDATE ' . $this->table . ' SET ' . $set_clause;
+        $sql = 'UPDATE '.$this->table.' SET '.$set_clause;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if ($force) {
             $result = $this->db->queryF($sql);
@@ -732,8 +732,8 @@ 
     public function deleteAll($criteria = null)
     {
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql = 'DELETE FROM ' . $this->table;
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql = 'DELETE FROM '.$this->table;
+            $sql .= ' '.$criteria->renderWhere();
             if (!$this->db->queryF($sql)) {
                 return false;
             }
@@ -779,15 +779,15 @@ 
      */
     public function getDistincts($field, $criteria = null, $format = 's')
     {
-        require_once __DIR__ . '/lite.php';
+        require_once __DIR__.'/lite.php';
         $limit = $start = 0;
-        $sql   = 'SELECT ' . $this->keyName . ', ' . $field . ' FROM ' . $this->table;
+        $sql   = 'SELECT '.$this->keyName.', '.$field.' FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         }
-        $sql .= ' GROUP BY ' . $field . ' ORDER BY ' . $field;
+        $sql .= ' GROUP BY '.$field.' ORDER BY '.$field;
 
         $Cache_Lite = new references_Cache_Lite($this->cacheOptions);
         $id         = $this->_getIdForCache($sql, $start, $limit);
@@ -835,7 +835,7 @@ 
         $critere->setStart($start);
         $critere->setSort($sort);
         $critere->setOrder($order);
-        $items =& $this->getObjects($critere, $idAsKey);
+        $items = & $this->getObjects($critere, $idAsKey);
 
         return $items;
     }
@@ -845,7 +845,7 @@ 
      */
     public function forceCacheClean()
     {
-        require_once __DIR__ . '/lite.php';
+        require_once __DIR__.'/lite.php';
         $Cache_Lite = new references_Cache_Lite($this->cacheOptions);
         $Cache_Lite->clean();
     }

class/references_articles.php

Doc Comments +2 added lines, -2 removed lines

@@ -499,7 +499,7 @@ 
     /**
      * Notification de la publication d'une nouvelle référence
      *
-     * @param object|references_articles $article L'annonce pour laquelle on fait la notification
+     * @param references_articles $article L'annonce pour laquelle on fait la notification
      * @return bool
      */
     public function notifyNewArticle(references_articles $article)
@@ -574,7 +574,7 @@ 
     /**
      * Indique si une référence est visible d'un utilisateur
      *
-     * @param object|references_articles $article L'article à controler
+     * @param references_articles $article L'article à controler
      * @param integer                    $uid     L'id de l'utilisateur à controler
      * @return bool
      */

Spacing +45 added lines, -45 removed lines

@@ -20,13 +20,13 @@ 
  */
 defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-require_once XOOPS_ROOT_PATH . '/kernel/object.php';
+require_once XOOPS_ROOT_PATH.'/kernel/object.php';
 if (!class_exists('references_XoopsPersistableObjectHandler')) {
-    require_once XOOPS_ROOT_PATH . '/modules/references/class/PersistableObjectHandler.php';
+    require_once XOOPS_ROOT_PATH.'/modules/references/class/PersistableObjectHandler.php';
 }
 
-define('REFERENCES_STATUS_ONLINE', 1);    // Articles en ligne
-define('REFERENCES_STATUS_OFFLINE', 0);    // Articles hors ligne
+define('REFERENCES_STATUS_ONLINE', 1); // Articles en ligne
+define('REFERENCES_STATUS_OFFLINE', 0); // Articles hors ligne
 
 class references_articles extends references_Object
 {
@@ -87,9 +87,9 @@ 
     public function getOnlinePicture()
     {
         if ($this->isArticleOnline()) {
-            return REFERENCES_IMAGES_URL . 'status_online.png';
+            return REFERENCES_IMAGES_URL.'status_online.png';
         } else {
-            return REFERENCES_IMAGES_URL . 'status_offline.png';
+            return REFERENCES_IMAGES_URL.'status_offline.png';
         }
     }
 
@@ -112,8 +112,8 @@ 
     public function pictureExists($indice)
     {
         $return    = false;
-        $fieldName = 'article_picture' . $indice;
-        if (xoops_trim($this->getVar($fieldName)) != '' && file_exists(references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . $this->getVar($fieldName))) {
+        $fieldName = 'article_picture'.$indice;
+        if (xoops_trim($this->getVar($fieldName)) != '' && file_exists(references_utils::getModuleOption('images_path').DIRECTORY_SEPARATOR.$this->getVar($fieldName))) {
             $return = true;
         }
 
@@ -128,9 +128,9 @@ 
      */
     public function deletePicture($indice)
     {
-        $fieldName = 'article_picture' . $indice;
+        $fieldName = 'article_picture'.$indice;
         if ($this->pictureExists($indice)) {
-            @unlink(references_utils::getModuleOption('images_path') . references_utils::getModuleOption('images_path') . $this->getVar($fieldName));
+            @unlink(references_utils::getModuleOption('images_path').references_utils::getModuleOption('images_path').$this->getVar($fieldName));
         }
         $this->setVar($fieldName, '');
     }
@@ -143,11 +143,11 @@ 
      */
     public function getPictureUrl($indice)
     {
-        $fieldName = 'article_picture' . $indice;
+        $fieldName = 'article_picture'.$indice;
         if (xoops_trim($this->getVar($fieldName)) != '' && $this->pictureExists($indice)) {
-            return references_utils::getModuleOption('images_url') . '/' . $this->getVar($fieldName);
+            return references_utils::getModuleOption('images_url').'/'.$this->getVar($fieldName);
         } else {
-            return REFERENCES_IMAGES_URL . 'blank.gif';
+            return REFERENCES_IMAGES_URL.'blank.gif';
         }
     }
 
@@ -159,9 +159,9 @@ 
      */
     public function getPicturePath($indice)
     {
-        $fieldName = 'article_picture' . $indice;
+        $fieldName = 'article_picture'.$indice;
         if (xoops_trim($this->getVar($fieldName)) != '') {
-            return references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . $this->getVar($fieldName);
+            return references_utils::getModuleOption('images_path').DIRECTORY_SEPARATOR.$this->getVar($fieldName);
         } else {
             return '';
         }
@@ -175,9 +175,9 @@ 
      */
     public function thumbExists($indice)
     {
-        $fieldName = 'article_picture' . $indice;
+        $fieldName = 'article_picture'.$indice;
         $return    = false;
-        if (xoops_trim($this->getVar($fieldName)) != '' && file_exists(references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . REFERENCES_THUMBS_PREFIX . $this->getVar($fieldName))) {
+        if (xoops_trim($this->getVar($fieldName)) != '' && file_exists(references_utils::getModuleOption('images_path').DIRECTORY_SEPARATOR.REFERENCES_THUMBS_PREFIX.$this->getVar($fieldName))) {
             $return = true;
         }
 
@@ -192,11 +192,11 @@ 
      */
     public function getThumbUrl($indice)
     {
-        $fieldName = 'article_picture' . $indice;
+        $fieldName = 'article_picture'.$indice;
         if (xoops_trim($this->getVar($fieldName)) != '') {
-            return references_utils::getModuleOption('images_url') . '/' . REFERENCES_THUMBS_PREFIX . $this->getVar($fieldName);
+            return references_utils::getModuleOption('images_url').'/'.REFERENCES_THUMBS_PREFIX.$this->getVar($fieldName);
         } else {
-            return REFERENCES_IMAGES_URL . 'blank.gif';
+            return REFERENCES_IMAGES_URL.'blank.gif';
         }
     }
 
@@ -208,9 +208,9 @@ 
      */
     public function getThumbPath($indice)
     {
-        $fieldName = 'article_picture' . $indice;
+        $fieldName = 'article_picture'.$indice;
         if (xoops_trim($this->getVar($fieldName)) != '') {
-            return references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . REFERENCES_THUMBS_PREFIX . $this->getVar($fieldName);
+            return references_utils::getModuleOption('images_path').DIRECTORY_SEPARATOR.REFERENCES_THUMBS_PREFIX.$this->getVar($fieldName);
         } else {
             return '';
         }
@@ -224,7 +224,7 @@ 
     public function attachmentExists()
     {
         $return = false;
-        if (xoops_trim($this->getVar('article_attached_file')) != '' && file_exists(references_utils::getModuleOption('attached_path') . DIRECTORY_SEPARATOR . $this->getVar('article_attached_file'))) {
+        if (xoops_trim($this->getVar('article_attached_file')) != '' && file_exists(references_utils::getModuleOption('attached_path').DIRECTORY_SEPARATOR.$this->getVar('article_attached_file'))) {
             $return = true;
         }
 
@@ -239,7 +239,7 @@ 
     public function getAttachmentUrl()
     {
         if (xoops_trim($this->getVar('article_attached_file')) != '' && $this->attachmentExists()) {
-            return references_utils::getModuleOption('attached_url') . '/' . $this->getVar('article_attached_file');
+            return references_utils::getModuleOption('attached_url').'/'.$this->getVar('article_attached_file');
         } else {
             return '';
         }
@@ -253,7 +253,7 @@ 
     public function getAttachmentPath()
     {
         if (xoops_trim($this->getVar('article_attached_file')) != '' && $this->attachmentExists()) {
-            return references_utils::getModuleOption('attached_path') . DIRECTORY_SEPARATOR . $this->getVar('article_attached_file');
+            return references_utils::getModuleOption('attached_path').DIRECTORY_SEPARATOR.$this->getVar('article_attached_file');
         } else {
             return '';
         }
@@ -265,7 +265,7 @@ 
     public function deleteAttachment()
     {
         if ($this->attachmentExists()) {
-            @unlink(references_utils::getModuleOption('attached_path') . DIRECTORY_SEPARATOR . $this->getVar('article_attached_file'));
+            @unlink(references_utils::getModuleOption('attached_path').DIRECTORY_SEPARATOR.$this->getVar('article_attached_file'));
         }
         $this->setVar('article_attached_file', '');
     }
@@ -278,9 +278,9 @@ 
      */
     public function deleteThumb($indice)
     {
-        $fieldName = 'article_picture' . $indice;
+        $fieldName = 'article_picture'.$indice;
         if ($this->thumbExists($indice)) {
-            @unlink(references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . REFERENCES_THUMBS_PREFIX . $this->getVar($fieldName));
+            @unlink(references_utils::getModuleOption('images_path').DIRECTORY_SEPARATOR.REFERENCES_THUMBS_PREFIX.$this->getVar($fieldName));
         }
     }
 
@@ -348,9 +348,9 @@ 
     public function getUrl($shortVersion = false)
     {
         if (!$shortVersion) {
-            return REFERENCES_URL . 'reference.php?article_id=' . $this->getVar('article_id');
+            return REFERENCES_URL.'reference.php?article_id='.$this->getVar('article_id');
         } else {
-            return 'reference.php?article_id=' . $this->getVar('article_id');
+            return 'reference.php?article_id='.$this->getVar('article_id');
         }
     }
 
@@ -373,11 +373,11 @@ 
             $ret['article_picture_exists'] = true;
             for ($i = 1; $i <= 10; ++$i) {
                 if ($this->pictureExists($i)) {
-                    $ret['article_picture_url' . $i]  = $this->getPictureUrl($i);
-                    $ret['article_picture_path' . $i] = $this->getPicturePath($i);
+                    $ret['article_picture_url'.$i]  = $this->getPictureUrl($i);
+                    $ret['article_picture_path'.$i] = $this->getPicturePath($i);
                     $ret['article_pictures_urls'][]   = $this->getPictureUrl($i);
                     $ret['article_pictures_paths'][]  = $this->getPicturePath($i);
-                    $fieldName                        = 'article_picture' . $i . '_text';
+                    $fieldName                        = 'article_picture'.$i.'_text';
                     if (xoops_trim($this->getVar($fieldName)) != '') {
                         $ret['article_pictures_texts'][] = references_utils::makeHrefTitle($this->getVar($fieldName));
                     } else {
@@ -402,8 +402,8 @@ 
             $ret['article_thumb_exists'] = true;
             for ($i = 1; $i <= 10; ++$i) {
                 if ($this->thumbExists($i)) {
-                    $ret['article_thumb_url' . $i]  = $this->getThumbUrl($i);
-                    $ret['article_thumb_path' . $i] = $this->getThumbPath($i);
+                    $ret['article_thumb_url'.$i]  = $this->getThumbUrl($i);
+                    $ret['article_thumb_path'.$i] = $this->getThumbPath($i);
                     $ret['article_thumbs_urls'][]   = $this->getThumbUrl($i);
                     $ret['article_thumbs_paths'][]  = $this->getThumbPath($i);
                 }
@@ -444,7 +444,7 @@ 
         $gperm_handler = xoops_getHandler('groupperm');
         $categories    = $gperm_handler->getItemIds($permissionsType, $groups, $currentModule->getVar('mid'));
         if (is_array($categories) && count($categories) > 0) {
-            $permissions[$permissionsType] = new Criteria('article_category_id', '(' . implode(',', $categories) . ')', 'IN');
+            $permissions[$permissionsType] = new Criteria('article_category_id', '('.implode(',', $categories).')', 'IN');
         } else {    // Ne peut rien voir
             $permissions[$permissionsType] = new Criteria('article_category_id', '0', '=');
         }
@@ -472,7 +472,7 @@ 
             $criteria->add(new Criteria('article_online', REFERENCES_STATUS_ONLINE, '='));
         }
         if (is_array($categoryId) && count($categoryId) > 0) {
-            $criteria->add(new Criteria('article_category_id', '(' . implode(',', $categoryId) . ')', 'IN'));
+            $criteria->add(new Criteria('article_category_id', '('.implode(',', $categoryId).')', 'IN'));
         } elseif ($categoryId > 0) {
             $criteria->add(new Criteria('article_category_id', $categoryId, '='));
         }
@@ -529,8 +529,8 @@ 
     public function getDistinctCategoriesIds()
     {
         $ret = array();
-        $sql = 'SELECT distinct(article_category_id) FROM ' . $this->table;
-        $sql .= ' ' . $this->getPermissionsCategoriesCriteria()->renderWhere();    // Permissions
+        $sql = 'SELECT distinct(article_category_id) FROM '.$this->table;
+        $sql .= ' '.$this->getPermissionsCategoriesCriteria()->renderWhere(); // Permissions
         $sql .= ' GROUP BY article_category_id ORDER BY article_category_id';
         $result = $this->db->query($sql);
         if (!$result) {
@@ -598,17 +598,17 @@ 
      */
     public function moveUp($currentId, $currentOrder)
     {
-        $sql_plus = 'SELECT article_id FROM ' . $this->table . ' WHERE article_weight = ' . ((int)$currentOrder - 1);
+        $sql_plus = 'SELECT article_id FROM '.$this->table.' WHERE article_weight = '.((int) $currentOrder - 1);
         $res_plus = $this->db->query($sql_plus);
         if ($this->db->getRowsNum($res_plus) == 0) {
             return;
         }
         $row_plus = $this->db->fetchArray($res_plus);
 
-        $upd1 = 'UPDATE ' . $this->table . ' SET article_weight = (article_weight + 1) WHERE article_id = ' . $row_plus['article_id'];
+        $upd1 = 'UPDATE '.$this->table.' SET article_weight = (article_weight + 1) WHERE article_id = '.$row_plus['article_id'];
         $this->db->queryF($upd1);
 
-        $upd2 = 'UPDATE ' . $this->table . ' SET article_weight = (article_weight - 1) WHERE article_id = ' . (int)$currentId;
+        $upd2 = 'UPDATE '.$this->table.' SET article_weight = (article_weight - 1) WHERE article_id = '.(int) $currentId;
         $this->db->queryF($upd2);
         $this->forceCacheClean();
     }
@@ -622,17 +622,17 @@ 
      */
     public function moveDown($currentId, $currentOrder)
     {
-        $sql_moins = 'SELECT article_id FROM ' . $this->table . ' WHERE article_weight = ' . ((int)$currentOrder + 1);
+        $sql_moins = 'SELECT article_id FROM '.$this->table.' WHERE article_weight = '.((int) $currentOrder + 1);
         $res_moins = $this->db->query($sql_moins);
         if ($this->db->getRowsNum($res_moins) == 0) {
             return;
         }
 
         $row_moins = $this->db->fetchArray($res_moins);
-        $upd1      = 'UPDATE ' . $this->table . ' SET article_weight = (article_weight - 1) WHERE article_id = ' . $row_moins['article_id'];
+        $upd1      = 'UPDATE '.$this->table.' SET article_weight = (article_weight - 1) WHERE article_id = '.$row_moins['article_id'];
         $this->db->queryF($upd1);
 
-        $upd2 = 'UPDATE ' . $this->table . ' SET article_weight =( article_weight + 1) WHERE article_id = ' . (int)$currentId;
+        $upd2 = 'UPDATE '.$this->table.' SET article_weight =( article_weight + 1) WHERE article_id = '.(int) $currentId;
         $this->db->queryF($upd2);
         $this->forceCacheClean();
     }

class/references_categories.php

Doc Comments +2 added lines, -2 removed lines

@@ -185,7 +185,7 @@ 
     /**
      * Notification de la création d'une nouvelle catégorie
      *
-     * @param object|references_categories $category
+     * @param references_categories $category
      * @return bool
      */
     public function notifyNewCategory(references_categories $category)
@@ -199,7 +199,7 @@ 
     /**
      * Indique si une catégorie est visible d'un utilisateur
      *
-     * @param object|references_categories $category La catégorie à controler
+     * @param references_categories $category La catégorie à controler
      * @param integer                      $uid      L'id de l'utilisateur à controler
      * @return bool
      */

Spacing +7 added lines, -7 removed lines

@@ -20,9 +20,9 @@ 
  */
 defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-require_once XOOPS_ROOT_PATH . '/kernel/object.php';
+require_once XOOPS_ROOT_PATH.'/kernel/object.php';
 if (!class_exists('references_XoopsPersistableObjectHandler')) {
-    require_once XOOPS_ROOT_PATH . '/modules/references/class/PersistableObjectHandler.php';
+    require_once XOOPS_ROOT_PATH.'/modules/references/class/PersistableObjectHandler.php';
 }
 
 class references_categories extends references_Object
@@ -56,9 +56,9 @@ 
     public function getUrl($shortVersion = false)
     {
         if (!$shortVersion) {
-            return REFERENCES_URL . 'category.php?category_id=' . $this->getVar('category_id');
+            return REFERENCES_URL.'category.php?category_id='.$this->getVar('category_id');
         } else {
-            return 'category.php?category_id=' . $this->getVar('category_id');
+            return 'category.php?category_id='.$this->getVar('category_id');
         }
     }
 
@@ -108,7 +108,7 @@ 
         $gperm_handler = xoops_getHandler('groupperm');
         $categories    = $gperm_handler->getItemIds($permissionsType, $groups, $currentModule->getVar('mid'));
         if (is_array($categories) && count($categories) > 0) {
-            $permissions[$permissionsType] = new Criteria('category_id', '(' . implode(',', $categories) . ')', 'IN');
+            $permissions[$permissionsType] = new Criteria('category_id', '('.implode(',', $categories).')', 'IN');
         } else {    // Ne peut rien voir
             $permissions[$permissionsType] = new Criteria('category_id', '0', '=');
         }
@@ -174,8 +174,8 @@ 
         if (count($categories) == 0) {
             return $ret;
         }
-        $jump  = REFERENCES_URL . 'category.php?category_id=';
-        $extra = " onchange='location=\"" . $jump . "\"+this.options[this.selectedIndex].value'";
+        $jump  = REFERENCES_URL.'category.php?category_id=';
+        $extra = " onchange='location=\"".$jump."\"+this.options[this.selectedIndex].value'";
 
         return references_utils::htmlSelect($selectName, $categories, $selected, true, '', false, 1, $extra);
     }

class/references_listFilter.php

Doc Comments +9 added lines, -9 removed lines

@@ -253,7 +253,7 @@ 
     /**
      * Retourne les noms à utiliser pour les champs de tri (sélecteur de champ et ordre de tri)
      *
-     * @return array [0] = Nom du sélecteur de champs, [1] = Nom du sélecteur pour le sens du tri
+     * @return string[] [0] = Nom du sélecteur de champs, [1] = Nom du sélecteur pour le sens du tri
      */
     private function getSortPlaceHolderNames()
     {
@@ -279,7 +279,7 @@ 
      *
      * @param  string $optionName
      * @param  mixed  $optionValue
-     * @return object
+     * @return references_listFilter
      */
     public function setOption($optionName, $optionValue)
     {
@@ -408,7 +408,7 @@ 
      *                            [data]            A ne pas renseigner, contient la valeur saisie par l'utilisateur
      *                            [operator]        Opérateur de comparaison pour le Criteria
      *                            [autoComplete]  Indique si on active l'auto complétion sur le champs
-     * @return object L'objet courant pour pouvoir chainer
+     * @return references_listFilter L'objet courant pour pouvoir chainer
      */
     public function initFilter($fieldName, $parameters)
     {
@@ -464,7 +464,7 @@ 
     /**
      * Ajoute les critères par défaut au critère général
      *
-     * @return void
+     * @return references_listFilter
      */
     private function addDefaultCriterias()
     {
@@ -592,7 +592,7 @@ 
     /**
      * Méthode à appeler juste après le constructeur pour qu'elle récupère les données saisies
      *
-     * @return object L'objet courant pour pouvoir chainer
+     * @return references_listFilter L'objet courant pour pouvoir chainer
      */
     public function filter()
     {
@@ -717,7 +717,7 @@ 
      *
      * @param  string $key
      * @param  string $value
-     * @return object
+     * @return references_listFilter
      */
     public function addAdditionnalParameterToPager($key, $value = '')
     {
@@ -731,7 +731,7 @@ 
      *
      * @param  string $key
      * @param  string $value
-     * @return object
+     * @return references_listFilter
      */
     public function addAdditionnalParameterToClearButton($key, $value = '')
     {
@@ -744,7 +744,7 @@ 
      * Permet d'ajouter des paramètres supplémentaires au pager
      *
      * @param $array
-     * @return object
+     * @return references_listFilter
      * @internal param string $key
      * @internal param string $value
      */
@@ -762,7 +762,7 @@ 
     /**
      * Retourne le pager à utiliser
      *
-     * @return mixed Null s'il n'y a pas lieu d'y avoir un pager, sinon un objet de type {@link XoopsPageNav}
+     * @return XoopsPageNav|null Null s'il n'y a pas lieu d'y avoir un pager, sinon un objet de type {@link XoopsPageNav}
      */
     public function getPager()
     {

Spacing +43 added lines, -43 removed lines

@@ -200,7 +200,7 @@ 
         $this->jsFolderUrl                      = '';
         $this->additionnalPagerParameters       = array();
         $this->additionnalClearButtonParameters = array();
-        $this->sortFields                       = array();    // Les champs qui peuvent être utilisés pour trier
+        $this->sortFields                       = array(); // Les champs qui peuvent être utilisés pour trier
     }
 
     /**
@@ -257,7 +257,7 @@ 
      */
     private function getSortPlaceHolderNames()
     {
-        return array(self::PREFIX . 'sortFields', self::PREFIX . 'sortOrder');
+        return array(self::PREFIX.'sortFields', self::PREFIX.'sortOrder');
     }
 
     /**
@@ -271,7 +271,7 @@ 
         $sortFieldsHtml = references_utils::htmlSelect($sortNames[0], $this->sortFields, $this->sortField, false);
         $sortOrderHtml  = references_utils::htmlSelect($sortNames[1], array('asc' => _MD_REFERENCES_ASC, 'desc' => _MD_REFERENCES_DESC), $this->sortOrder, false);
 
-        return _MD_REFERENCES_SORT_BY . ' ' . $sortFieldsHtml . ' ' . $sortOrderHtml;
+        return _MD_REFERENCES_SORT_BY.' '.$sortFieldsHtml.' '.$sortOrderHtml;
     }
 
     /**
@@ -309,7 +309,7 @@ 
     private function getArrayValue($array, $index, $defaultValue = false)
     {
         if ($index === 'autoComplete' && isset($array[$index]) && isset($array[$index]) == true) {
-            $this->hasAutoComplete = true;    // On en profite pour vérifier si un champ utilise l'autocomplétion
+            $this->hasAutoComplete = true; // On en profite pour vérifier si un champ utilise l'autocomplétion
         }
 
         return isset($array[$index]) ? $array[$index] : $defaultValue;
@@ -333,14 +333,14 @@ 
         if (isset($this->vars[$fieldName])) {    // On vérifie que le champ demandé est bien en autocomplétion
             if ($this->vars[$fieldName]['autoComplete'] == true) {
                 if ($this->vars[$fieldName]['dataType'] == self::FILTER_DATA_TEXT) {
-                    $criteria = new Criteria($fieldName, $query . '%', 'LIKE');
+                    $criteria = new Criteria($fieldName, $query.'%', 'LIKE');
                 }
-                $criteria->setLimit((int)$limit);
+                $criteria->setLimit((int) $limit);
                 $ret = $this->handler->getObjects($criteria);
 
                 if (count($ret) > 0) {
                     foreach ($ret as $object) {
-                        $return .= $object->getVar($fieldName, 'n') . "\n";
+                        $return .= $object->getVar($fieldName, 'n')."\n";
                     }
                 }
             }
@@ -362,23 +362,23 @@ 
             return $return;
         }
         $return = '';
-        $return .= "<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" title=\"Style sheet\" href=\"" . $this->jsFolderUrl . "autocomplete/jquery.autocomplete.css\" />\n";
+        $return .= "<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" title=\"Style sheet\" href=\"".$this->jsFolderUrl."autocomplete/jquery.autocomplete.css\" />\n";
         if (!$jqueryAlreadyLoaded) {
-            $return .= "<script type=\"text/javascript\" src=\"" . $this->jsFolderUrl . "jquery/jquery.js\"></script>\n";
+            $return .= "<script type=\"text/javascript\" src=\"".$this->jsFolderUrl."jquery/jquery.js\"></script>\n";
         }
-        $return .= "<script type=\"text/javascript\" src=\"" . $this->jsFolderUrl . "noconflict.js\"></script>\n";
-        $return .= "<script type=\"text/javascript\" src=\"" . $this->jsFolderUrl . "autocomplete/jquery.autocomplete.min.js\"></script>\n";
+        $return .= "<script type=\"text/javascript\" src=\"".$this->jsFolderUrl."noconflict.js\"></script>\n";
+        $return .= "<script type=\"text/javascript\" src=\"".$this->jsFolderUrl."autocomplete/jquery.autocomplete.min.js\"></script>\n";
         $return .= "<script type=\"text/javascript\">\n";
         $return .= "jQuery(function($) {\n";
-        $return .= "var url='" . $this->baseUrl . "';\n";    // TODO: Supprimer "var" car cela limite sa portée !
-        $return .= "var handlerName='" . $this->handler->className . "';\n";
+        $return .= "var url='".$this->baseUrl."';\n"; // TODO: Supprimer "var" car cela limite sa portée !
+        $return .= "var handlerName='".$this->handler->className."';\n";
 
         foreach ($this->vars as $fieldName => $parameters) {
             if ($parameters['autoComplete'] == true) {
-                $field = self::PREFIX . $fieldName;
-                $return .= "$('#" . $field . "').autocomplete(url, {\n";
+                $field = self::PREFIX.$fieldName;
+                $return .= "$('#".$field."').autocomplete(url, {\n";
                 $return .= "extraParams: {\n";
-                $return .= "    field: '" . $fieldName . "',\n";
+                $return .= "    field: '".$fieldName."',\n";
                 $return .= "    op: 'autocomplete',\n";
                 $return .= "    handler: handlerName\n";
                 $return .= "}\n";
@@ -431,7 +431,7 @@ 
      */
     private function getSessionName()
     {
-        return self::MODULE_NAME . '_' . $this->handler->table;
+        return self::MODULE_NAME.'_'.$this->handler->table;
     }
 
     /**
@@ -441,7 +441,7 @@ 
      */
     private function getStartSessionName()
     {
-        return $this->getSessionName() . '_start';
+        return $this->getSessionName().'_start';
     }
 
     /**
@@ -533,11 +533,11 @@ 
             $sortField = $_REQUEST[$orderFieldsNames[0]];
             $sortOrder = $_REQUEST[$orderFieldsNames[1]];
         } else {
-            if (isset($_SESSION[$cookieName . '_sortField'])) {
-                $sortField = $_SESSION[$cookieName . '_sortField'];
+            if (isset($_SESSION[$cookieName.'_sortField'])) {
+                $sortField = $_SESSION[$cookieName.'_sortField'];
             }
-            if (isset($_SESSION[$cookieName . '_sortOrder'])) {
-                $sortOrder = $_SESSION[$cookieName . '_sortOrder'];
+            if (isset($_SESSION[$cookieName.'_sortOrder'])) {
+                $sortOrder = $_SESSION[$cookieName.'_sortOrder'];
             }
         }
 
@@ -546,8 +546,8 @@ 
             $this->sortOrder = $sortOrder;
         }
         if (trim($sortField) != '' && trim($sortOrder) != '') {
-            $_SESSION[$cookieName . '_sortField'] = $sortField;
-            $_SESSION[$cookieName . '_sortOrder'] = $sortOrder;
+            $_SESSION[$cookieName.'_sortField'] = $sortField;
+            $_SESSION[$cookieName.'_sortOrder'] = $sortOrder;
         }
     }
 
@@ -596,19 +596,19 @@ 
      */
     public function filter()
     {
-        $this->setupFilter();                // Réinitialisations
+        $this->setupFilter(); // Réinitialisations
         $ts = MyTextSanitizer::getInstance();
-        $this->setSortFieldsFromRequest();    // On récupère la zone de tri éventuellement passée dans la requête
+        $this->setSortFieldsFromRequest(); // On récupère la zone de tri éventuellement passée dans la requête
         $this->isSetCleanFilter();
 
         foreach ($this->vars as $fieldName => $fieldProperties) {
             // On commence par récupérer toutes les valeurs
-            $formFieldName           = self::PREFIX . $fieldName;    // "filter_website_id" par exemple
-            $fieldProperties['data'] = null;    // Valeur par défaut
+            $formFieldName           = self::PREFIX.$fieldName; // "filter_website_id" par exemple
+            $fieldProperties['data'] = null; // Valeur par défaut
             if (isset($_REQUEST[$formFieldName])) {
                 if ($fieldProperties['dataType'] == self::FILTER_DATA_NUMERIC) {    // Zone numérique
-                    if ((int)$_REQUEST[$formFieldName] != 0) {
-                        $fieldProperties['data'] = (int)$_REQUEST[$formFieldName];
+                    if ((int) $_REQUEST[$formFieldName] != 0) {
+                        $fieldProperties['data'] = (int) $_REQUEST[$formFieldName];
                         if (!$fieldProperties['minusOne']) {
                             $this->criteria->add(new Criteria($fieldName, $fieldProperties['data'], $fieldProperties['operator']));
                         } else {
@@ -620,9 +620,9 @@ 
                     if (trim($_REQUEST[$formFieldName]) != '') {
                         $fieldProperties['data'] = $_REQUEST[$formFieldName];
                         if (!REFERENCES_EXACT_SEARCH) {
-                            $this->criteria->add(new Criteria($fieldName, '%' . $ts->addSlashes($fieldProperties['data']) . '%', 'LIKE'));
+                            $this->criteria->add(new Criteria($fieldName, '%'.$ts->addSlashes($fieldProperties['data']).'%', 'LIKE'));
                         } else {
-                            $this->criteria->add(new Criteria($fieldName, $ts->addSlashes($fieldProperties['data']) . '%', 'LIKE'));
+                            $this->criteria->add(new Criteria($fieldName, $ts->addSlashes($fieldProperties['data']).'%', 'LIKE'));
                         }
                         $this->newFilter = true;
                     }
@@ -686,7 +686,7 @@ 
     {
         if ($this->keepStart) {
             $startSessionName            = $this->getStartSessionName();
-            $_SESSION[$startSessionName] = (int)$start;
+            $_SESSION[$startSessionName] = (int) $start;
         }
     }
 
@@ -699,11 +699,11 @@ 
     {
         $start = 0;
         if (isset($_REQUEST[$this->startName])) {
-            $start = (int)$_REQUEST[$this->startName];
+            $start = (int) $_REQUEST[$this->startName];
         } elseif ($this->keepStart) {
             $startSessionName = $this->getStartSessionName();
             if (isset($_SESSION[$startSessionName])) {
-                $start = (int)$_SESSION[$startSessionName];
+                $start = (int) $_SESSION[$startSessionName];
             }
         }
         // Mise en session
@@ -769,7 +769,7 @@ 
         if (!$this->isInitialized) {
             $this->filter();
         }
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
         $itemsCount  = $this->getCount();
         $queryString = array();
         if (trim($this->op) != '') {
@@ -779,7 +779,7 @@ 
 
         if ($itemsCount > $this->limit) {
             foreach ($this->vars as $fieldName => $fieldProperties) {
-                $formFieldName               = self::PREFIX . $fieldName;    // "filter_website_id" par exemple
+                $formFieldName               = self::PREFIX.$fieldName; // "filter_website_id" par exemple
                 $queryString[$formFieldName] = $fieldProperties['data'];
             }
             // Ajout des paramètres supplémentaires éventuels
@@ -839,15 +839,15 @@ 
             return $html;
         }
         $fieldData     = $this->vars[$fieldName];
-        $htmlFieldName = self::PREFIX . $fieldName;
+        $htmlFieldName = self::PREFIX.$fieldName;
 
         switch ($fieldData['fieldType']) {
             case self::FILTER_FIELD_TEXT:    // Zone de texte
                 $ts   = MyTextSanitizer::getInstance();
-                $html = "<input type='text' name='$htmlFieldName' id='$htmlFieldName' size='" . $fieldData['size'] . "' maxlength='" . $fieldData['maxLength'] . "' value='" . $ts->htmlSpecialChars($fieldData['data']) . "' />";
+                $html = "<input type='text' name='$htmlFieldName' id='$htmlFieldName' size='".$fieldData['size']."' maxlength='".$fieldData['maxLength']."' value='".$ts->htmlSpecialChars($fieldData['data'])."' />";
                 break;
 
-            case self::FILTER_FIELD_SELECT;     // Select
+            case self::FILTER_FIELD_SELECT; // Select
                 $style = '';
                 if (isset($fieldData['style']) && trim($fieldData['style']) != '') {
                     $style = $fieldData['style'];
@@ -900,7 +900,7 @@ 
         $queryString['cleanFilter'] = '1';
         $baseurl                    = $this->baseUrl;
 
-        return "&nbsp;&nbsp;<a href='$baseurl?" . http_build_query($queryString) . "' title='" . _MD_REFERENCES_CLEAN_FILTER . "'><img align='top' src='../assets/images/clear_left.png' alt='" . _MD_REFERENCES_CLEAN_FILTER . "' /></a>";
+        return "&nbsp;&nbsp;<a href='$baseurl?".http_build_query($queryString)."' title='"._MD_REFERENCES_CLEAN_FILTER."'><img align='top' src='../assets/images/clear_left.png' alt='"._MD_REFERENCES_CLEAN_FILTER."' /></a>";
     }
 
     /**
@@ -914,11 +914,11 @@ 
     {
         $html = '';
         if (trim($this->operationName) != '' && trim($this->op) != '') {
-            $html .= "<input type='hidden' name='" . $this->operationName . "' id='" . $this->operationName . "' value='" . $this->op . "' />";
+            $html .= "<input type='hidden' name='".$this->operationName."' id='".$this->operationName."' value='".$this->op."' />";
         }
         if (!is_null($additionnals)) {
             foreach ($additionnals as $key => $value) {
-                $html .= "<input type='hidden' name='" . $key . "' id='" . $key . "' value='" . $value . "' />";
+                $html .= "<input type='hidden' name='".$key."' id='".$key."' value='".$value."' />";
             }
         }
         $html .= "<input type='submit' name='btngo' id='btngo' value='$description' />";

class/references_plugins.php

Doc Comments +4 added lines, -4 removed lines

@@ -95,7 +95,7 @@ 
     /**
      * Retourne l'instance unique de la classe
      *
-     * @return object
+     * @return references_plugins
      */
     public static function getInstance()
     {
@@ -177,8 +177,8 @@ 
      * Déclenchement d'une action et appel des plugins liés
      *
      * @param string                       $eventToFire L'action déclenchée
-     * @param object|references_parameters $parameters  Les paramètres à passer à chaque plugin
-     * @return object L'objet lui même pour chaîner
+     * @param references_parameters $parameters  Les paramètres à passer à chaque plugin
+     * @return references_plugins L'objet lui même pour chaîner
      */
     public function fireAction($eventToFire, references_parameters $parameters = null)
     {
@@ -212,7 +212,7 @@ 
      * Déclenchement d'un filtre et appel des plugins liés
      *
      * @param string                       $eventToFire Le filtre appelé
-     * @param object|references_parameters $parameters  Les paramètres à passer à chaque plugin
+     * @param references_parameters $parameters  Les paramètres à passer à chaque plugin
      * @return object Le contenu de l'objet passé en paramètre
      */
     public function fireFilter($eventToFire, references_parameters $parameters)

Spacing +9 added lines, -9 removed lines

@@ -59,11 +59,11 @@ 
      * Priorités des plugins
      * @var constant
      */
-    const EVENT_PRIORITY_1 = 1;    // Priorité la plus haute
+    const EVENT_PRIORITY_1 = 1; // Priorité la plus haute
     const EVENT_PRIORITY_2 = 2;
     const EVENT_PRIORITY_3 = 3;
     const EVENT_PRIORITY_4 = 4;
-    const EVENT_PRIORITY_5 = 5;    // Priorité la plus basse
+    const EVENT_PRIORITY_5 = 5; // Priorité la plus basse
 
     /**
      * Utilisé pour construire le nom de la classe
@@ -123,8 +123,8 @@ 
      */
     public function loadPlugins()
     {
-        $this->loadPluginsFiles(REFERENCES_PLUGINS_PATH . $this->pluginsTypesFolder[self::PLUGIN_ACTION], self::PLUGIN_ACTION);
-        $this->loadPluginsFiles(REFERENCES_PLUGINS_PATH . $this->pluginsTypesFolder[self::PLUGIN_FILTER], self::PLUGIN_FILTER);
+        $this->loadPluginsFiles(REFERENCES_PLUGINS_PATH.$this->pluginsTypesFolder[self::PLUGIN_ACTION], self::PLUGIN_ACTION);
+        $this->loadPluginsFiles(REFERENCES_PLUGINS_PATH.$this->pluginsTypesFolder[self::PLUGIN_FILTER], self::PLUGIN_FILTER);
     }
 
     /**
@@ -138,14 +138,14 @@ 
     {
         require_once $fullPathName;
         // Du style referencesRegionalizationFilter
-        $className = self::MODULE_DIRNAME . ucfirst(strtolower($pluginFolder)) . $this->pluginsTypeLabel[$type];
+        $className = self::MODULE_DIRNAME.ucfirst(strtolower($pluginFolder)).$this->pluginsTypeLabel[$type];
         if (class_exists($className) && get_parent_class($className) == $this->pluginsClassName[$type]) {
             // TODO: Vérifier que l'évènement n'est pas déjà en mémoire
             $events = call_user_func(array($className, self::PLUGIN_DESCRIBE_METHOD));
             foreach ($events as $event) {
                 $eventName                                         = $event[0];
                 $eventPriority                                     = $event[1];
-                $fileToInclude                                     = REFERENCES_PLUGINS_PATH . $this->pluginsTypesFolder[$type] . DIRECTORY_SEPARATOR . $pluginFolder . DIRECTORY_SEPARATOR . $event[2];
+                $fileToInclude                                     = REFERENCES_PLUGINS_PATH.$this->pluginsTypesFolder[$type].DIRECTORY_SEPARATOR.$pluginFolder.DIRECTORY_SEPARATOR.$event[2];
                 $classToCall                                       = $event[3];
                 $methodToCall                                      = $event[4];
                 $this->events[$type][$eventName][$eventPriority][] = array('fullPathName' => $fileToInclude, 'className' => $classToCall, 'method' => $methodToCall);
@@ -165,7 +165,7 @@ 
         $objects = new DirectoryIterator($path);
         foreach ($objects as $object) {
             if ($object->isDir() && !$object->isDot()) {
-                $file = $path . DIRECTORY_SEPARATOR . $object->current() . DIRECTORY_SEPARATOR . self::PLUGIN_SCRIPT_NAME;
+                $file = $path.DIRECTORY_SEPARATOR.$object->current().DIRECTORY_SEPARATOR.self::PLUGIN_SCRIPT_NAME;
                 if (file_exists($file)) {
                     $this->loadClass($file, $type, $object->current());
                 }
@@ -187,7 +187,7 @@ 
 
             return $this;
         }
-        ksort($this->events[self::PLUGIN_ACTION][$eventToFire]);    // Tri par priorit�
+        ksort($this->events[self::PLUGIN_ACTION][$eventToFire]); // Tri par priorit�
         foreach ($this->events[self::PLUGIN_ACTION][$eventToFire] as $priority => $events) {
             foreach ($events as $event) {
                 if ($this->isUnplug(self::PLUGIN_ACTION, $eventToFire, $event['fullPathName'], $event['className'], $event['method'])) {
@@ -222,7 +222,7 @@ 
 
             return $this;
         }
-        ksort($this->events[self::PLUGIN_FILTER][$eventToFire]);    // Tri par priorité
+        ksort($this->events[self::PLUGIN_FILTER][$eventToFire]); // Tri par priorité
         foreach ($this->events[self::PLUGIN_FILTER][$eventToFire] as $priority => $events) {
             foreach ($events as $event) {
                 if ($this->isUnplug(self::PLUGIN_FILTER, $eventToFire, $event['fullPathName'], $event['className'], $event['method'])) {

class/registryfile.php

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     /**
      * Access the only instance of this class
      *
-     * @return object
+     * @return references_registryfile
      *
      * @static
      * @staticvar   object

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
  */
 class references_registryfile
 {
-    public $filename;    // Nom du fichier � traiter
+    public $filename; // Nom du fichier � traiter
 
     /**
      * Access the only instance of this class
@@ -49,7 +49,7 @@ 
     public function setfile($fichier = null)
     {
         if ($fichier) {
-            $this->filename = XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . $fichier;
+            $this->filename = XOOPS_UPLOAD_PATH.DIRECTORY_SEPARATOR.$fichier;
         }
     }
 
@@ -59,7 +59,7 @@ 
         if (!$fichier) {
             $fw = $this->filename;
         } else {
-            $fw = XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . $fichier;
+            $fw = XOOPS_UPLOAD_PATH.DIRECTORY_SEPARATOR.$fichier;
         }
         if (file_exists($fw)) {
             return file_get_contents($fw);
@@ -74,12 +74,12 @@ 
         if (!$fichier) {
             $fw = $this->filename;
         } else {
-            $fw = XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . $fichier;
+            $fw = XOOPS_UPLOAD_PATH.DIRECTORY_SEPARATOR.$fichier;
         }
         if (file_exists($fw)) {
             @unlink($fw);
         }
-        $fp = fopen($fw, 'w') || exit('Error, impossible to create the file ' . $this->filename);
+        $fp = fopen($fw, 'w') || exit('Error, impossible to create the file '.$this->filename);
         fwrite($fp, $content);
         fclose($fp);
 

plugins/actions/twitter/Twitter.class.php

Doc Comments +7 added lines

@@ -16,6 +16,10 @@ 
     private $debug = false;
     public  $error = false;
 
+    /**
+     * @param string $user
+     * @param string $pass
+     */
     function __construct($user, $pass, $debug = false)
     {
         // Store an auth key for the HTTP Authorization: header
@@ -23,6 +27,9 @@ 
         $this->debug = $debug;
     }
 
+    /**
+     * @param string $new_status
+     */
     function update($new_status)
     {
         if (strlen($new_status) > 140) {

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
     function __construct($user, $pass, $debug = false)
     {
         // Store an auth key for the HTTP Authorization: header
-        $this->auth  = base64_encode($user . ':' . $pass);
+        $this->auth  = base64_encode($user.':'.$pass);
         $this->debug = $debug;
     }
 
@@ -34,12 +34,12 @@ 
             $this->error = "Socket error #{$errno}: {$errstr}";
             return false;
         }
-        $post_data = 'status=' . urlencode($new_status);
+        $post_data = 'status='.urlencode($new_status);
         $to_send   = "POST /statuses/update.xml HTTP/1.1\r\n";
         $to_send .= "Host: twitter.com\r\n";
-        $to_send .= 'Content-Length: ' . strlen($post_data) . "\r\n";
+        $to_send .= 'Content-Length: '.strlen($post_data)."\r\n";
         $to_send .= "Authorization: Basic {$this->auth}\r\n\r\n";
-        $to_send .= $post_data . "\r\n\r\n";
+        $to_send .= $post_data."\r\n\r\n";
         $bytes = fwrite($fp, $to_send);
         if ($bytes === false) {
             $this->error = 'Socket error: Error sending data.';
@@ -59,7 +59,7 @@ 
             $response .= $buf;
         }
         if ($this->debug) echo "Received:\n{$response}";
-        $was_error = preg_match('#' . preg_quote('<error>') . '(.+)' . preg_quote('</error>') . '#i', $response, $matches);
+        $was_error = preg_match('#'.preg_quote('<error>').'(.+)'.preg_quote('</error>').'#i', $response, $matches);
         if ($was_error) {
             $this->error = "Twitter error: {$matches[1]}";
             return false;

language/english/modinfo.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 
 //Help
 define('_MI_REFERENCES_DIRNAME', basename(dirname(dirname(__DIR__))));
-define('_MI_REFERENCES_HELP_HEADER', __DIR__ . '/help/helpheader.html');
+define('_MI_REFERENCES_HELP_HEADER', __DIR__.'/help/helpheader.html');
 define('_MI_REFERENCES_BACK_2_ADMIN', 'Back to Administration of ');
 define('_MI_REFERENCES_HELP_OVERVIEW', 'Overview');