diff --git a/lib/classes/ACL.class.php b/lib/classes/ACL.class.php
index ba2bd03ff8..1add39cc48 100644
--- a/lib/classes/ACL.class.php
+++ b/lib/classes/ACL.class.php
@@ -189,8 +189,9 @@ class ACL implements cache_cacheableInterface
 
         $key = $record->get_serialize_key();
 
-        if (array_key_exists($key, $this->_rights_records_preview))
+        if (array_key_exists($key, $this->_rights_records_preview)) {
             return true;
+        }
 
         return false;
     }
diff --git a/lib/classes/API/OAuth2/Adapter.class.php b/lib/classes/API/OAuth2/Adapter.class.php
index ece19af220..9993fe00ac 100644
--- a/lib/classes/API/OAuth2/Adapter.class.php
+++ b/lib/classes/API/OAuth2/Adapter.class.php
@@ -610,8 +610,8 @@ class API_OAuth2_Adapter extends OAuth2
     {
         $token_param = $this->getAccessTokenParams();
 
-
-        if ($token_param === FALSE) { // Access token was not provided
+        // Access token was not provided
+        if ($token_param === false) {
             return $exit_not_present ? $this->errorWWWAuthenticateResponseHeader(OAUTH2_HTTP_BAD_REQUEST, $realm, OAUTH2_ERROR_INVALID_REQUEST, 'The request is missing a required parameter, includes an unsupported parameter or parameter value, repeats the same parameter, uses more than one method for including an access token, or is otherwise malformed.', NULL, $scope) : FALSE;
         }
 
diff --git a/lib/classes/Bridge/Api/Dailymotion.class.php b/lib/classes/Bridge/Api/Dailymotion.class.php
index 1d5b8ab5f3..0c737d8e43 100644
--- a/lib/classes/Bridge/Api/Dailymotion.class.php
+++ b/lib/classes/Bridge/Api/Dailymotion.class.php
@@ -637,6 +637,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
                 /**
                  * @todo Retieve thumb
                  */
+
                 return new Bridge_Api_Dailymotion_Container($entry, $object, '');
                 break;
             default:
diff --git a/lib/classes/Bridge/Api/Flickr.class.php b/lib/classes/Bridge/Api/Flickr.class.php
index 0a1753c3bd..a62c9b4305 100644
--- a/lib/classes/Bridge/Api/Flickr.class.php
+++ b/lib/classes/Bridge/Api/Flickr.class.php
@@ -353,7 +353,8 @@ class Bridge_Api_Flickr extends Bridge_Api_Abstract implements Bridge_Api_Interf
                         $response = $this->_api->executeMethod('flickr.photosets.addPhoto', $params);
 
                         if ( ! $response->isOk()) {
-                            if ($response->err_code === 3) { //Already exists in photoset
+                            //Already exists in photoset
+                            if ($response->err_code === 3) {
                                 return;
                             }
 
diff --git a/lib/classes/Bridge/Api/Youtube.class.php b/lib/classes/Bridge/Api/Youtube.class.php
index b2d86303a6..4d36c2e813 100644
--- a/lib/classes/Bridge/Api/Youtube.class.php
+++ b/lib/classes/Bridge/Api/Youtube.class.php
@@ -871,8 +871,9 @@ class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Inter
     protected function get_PlaylistEntry_from_Id($element_id)
     {
         foreach ($this->_api->getPlaylistListFeed('default') as $playlist_entry) {
-            if ($element_id == $playlist_entry->getPlaylistId()->getText())
+            if ($element_id == $playlist_entry->getPlaylistId()->getText()) {
                 return $playlist_entry;
+            }
         }
 
         return null;
@@ -891,8 +892,9 @@ class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Inter
         );
         if ( ! is_null($this->locale)) {
             $youtube_format_locale = str_replace('_', '-', $this->locale);
-            if (in_array(trim($youtube_format_locale), $youtube_available_locale))
+            if (in_array(trim($youtube_format_locale), $youtube_available_locale)) {
                 return $this->locale;
+            }
         }
 
         return "en-US";
diff --git a/lib/classes/Feed/Adapter.class.php b/lib/classes/Feed/Adapter.class.php
index f4161523de..905f55ba1d 100644
--- a/lib/classes/Feed/Adapter.class.php
+++ b/lib/classes/Feed/Adapter.class.php
@@ -243,8 +243,10 @@ class Feed_Adapter extends Feed_Abstract implements Feed_Interface, cache_cachea
      */
     public function has_access(User_Adapter $user)
     {
-        if ($this->get_collection() instanceof collection)
+        if ($this->get_collection() instanceof collection) {
             return $user->ACL()->has_access_to_base($this->collection->get_base_id());
+        }
+
         return true;
     }
 
@@ -286,8 +288,9 @@ class Feed_Adapter extends Feed_Abstract implements Feed_Interface, cache_cachea
      */
     public function add_publisher(User_Adapter $user)
     {
-        if (in_array($user->get_id(), array_keys($this->get_publishers())))
+        if (in_array($user->get_id(), array_keys($this->get_publishers()))) {
             return $this;
+        }
 
         Feed_Publisher_Adapter::create($this->appbox, $user, $this, false);
         $this->publishers = null;
@@ -301,8 +304,9 @@ class Feed_Adapter extends Feed_Abstract implements Feed_Interface, cache_cachea
      */
     protected function load_publishers()
     {
-        if (is_array($this->publishers))
+        if (is_array($this->publishers)) {
             return $this->publishers;
+        }
 
         $sql = 'SELECT id, usr_id, owner FROM feed_publishers
             WHERE feed_id = :feed_id';
@@ -581,8 +585,10 @@ class Feed_Adapter extends Feed_Abstract implements Feed_Interface, cache_cachea
      */
     public function get_homepage_link(registryInterface $registry, $format, $page = null)
     {
-        if ( ! $this->is_public())
+        if ( ! $this->is_public()) {
             return null;
+        }
+
         switch ($format) {
             case self::FORMAT_ATOM:
                 return new Feed_Link(
diff --git a/lib/classes/Session/Handler.class.php b/lib/classes/Session/Handler.class.php
index 914220ef35..144f5b6e00 100644
--- a/lib/classes/Session/Handler.class.php
+++ b/lib/classes/Session/Handler.class.php
@@ -228,8 +228,10 @@ class Session_Handler
     public function get_session_prefs($key)
     {
         $datas = $this->storage()->get('temp_prefs');
-        if (isset($datas[$key]))
+        if (isset($datas[$key])) {
             return $datas[$key];
+        }
+
         return null;
     }
 
@@ -248,6 +250,7 @@ class Session_Handler
         } elseif ($default_value !== null) {
             return $default_value;
         }
+
         return null;
     }
 
diff --git a/lib/classes/setup.class.php b/lib/classes/setup.class.php
index bddec87e62..9988e4e5fa 100644
--- a/lib/classes/setup.class.php
+++ b/lib/classes/setup.class.php
@@ -486,6 +486,7 @@ class setup
             </form>
 
             <?php
+
             return;
         }
 
diff --git a/lib/classes/task/period/archive.class.php b/lib/classes/task/period/archive.class.php
index e0ca15c4be..3418ac397b 100644
--- a/lib/classes/task/period/archive.class.php
+++ b/lib/classes/task/period/archive.class.php
@@ -220,27 +220,27 @@ class task_period_archive extends task_abstract
         ob_start();
         ?>
         <form name="graphicForm" onsubmit="return(false);" method="post">
-            <?php echo _('task::archive:archivage sur base/collection/') ?> :
+        <?php echo _('task::archive:archivage sur base/collection/') ?> :
 
             <select onchange="chgxmlpopup(this, 'base_id');" name="base_id">
                 <option value="">...</option>
-                <?php
-                foreach ($appbox->get_databoxes() as $databox) {
-                    foreach ($databox->get_collections() as $collection) {
-                        print("<option value=\"" . $collection->get_base_id() . "\">" . $databox->get_viewname() . " / " . $collection->get_name() . "</option>");
-                    }
-                }
-                ?>
+        <?php
+        foreach ($appbox->get_databoxes() as $databox) {
+            foreach ($databox->get_collections() as $collection) {
+                print("<option value=\"" . $collection->get_base_id() . "\">" . $databox->get_viewname() . " / " . $collection->get_name() . "</option>");
+            }
+        }
+        ?>
             </select>
             <br/>
             <br/>
-            <?php echo _('task::_common_:hotfolder') ?>
+        <?php echo _('task::_common_:hotfolder') ?>
             <input type="text" name="hotfolder" style="width:400px;" onchange="chgxmltxt(this, 'hotfolder');" value=""><br/>
             <br/>
-            <?php echo _('task::_common_:periodicite de la tache') ?>&nbsp;:&nbsp;
+        <?php echo _('task::_common_:periodicite de la tache') ?>&nbsp;:&nbsp;
             <input type="text" name="period" style="width:40px;" onchange="chgxmltxt(this, 'period');" value="">&nbsp;<?php echo _('task::_common_:secondes (unite temporelle)') ?><br/>
             <br/>
-            <?php echo _('task::archive:delai de \'repos\' avant traitement') ?>&nbsp;:&nbsp;
+        <?php echo _('task::archive:delai de \'repos\' avant traitement') ?>&nbsp;:&nbsp;
             <input type="text" name="cold" style="width:40px;" onchange="chgxmltxt(this, 'cold');" value="">&nbsp;<?php echo _('task::_common_:secondes (unite temporelle)') ?><br/>
             <br/>
             <input type="checkbox" name="move_archived" onchange="chgxmlck(this, 'move_archived');">&nbsp;<?php echo _('task::archive:deplacer les fichiers archives dans _archived') ?>
@@ -850,8 +850,9 @@ class task_period_archive extends task_abstract
         if ($depth == 0)
             $iloop = 0;
 
-        if ($depth == 0 && ($node->getAttribute('temperature') == 'hot' || $node->getAttribute('cid') == '-1'))
+        if ($depth == 0 && ($node->getAttribute('temperature') == 'hot' || $node->getAttribute('cid') == '-1')) {
             return;
+        }
 
         $xpath = new DOMXPath($dom); // useful
 
@@ -984,8 +985,9 @@ class task_period_archive extends task_abstract
 
         $ret = false;
 
-        if ($depth == 0 && $node->getAttribute('temperature') == 'hot') // if root of hotfolder if hot, die...
+        if ($depth == 0 && $node->getAttribute('temperature') == 'hot') { // if root of hotfolder if hot, die...
             return($ret);
+        }
 
         $nodesToDel = array();
         for ($n = $node->firstChild; $n; $n = $n->nextSibling) {
@@ -1058,8 +1060,9 @@ class task_period_archive extends task_abstract
         if ($depth == 0)
             $iloop = 0;
 
-        if ($node->getAttribute('temperature') == 'hot')
+        if ($node->getAttribute('temperature') == 'hot') {
             return;
+        }
 
         $nodesToDel = array();
         for ($n = $node->firstChild; $n; $n = $n->nextSibling) {
@@ -1125,8 +1128,9 @@ class task_period_archive extends task_abstract
         if ($depth == 0)
             $iloop = 0;
 
-        if ($node->getAttribute('temperature') == 'hot')
+        if ($node->getAttribute('temperature') == 'hot') {
             return;
+        }
 
         $ret = 0;
         for ($n = $node->firstChild; $n; $n = $n->nextSibling) {
@@ -1186,8 +1190,9 @@ class task_period_archive extends task_abstract
 
         $ret = false;
 
-        if ($depth == 0 && $node->getAttribute('temperature') == 'hot') // if root of hotfolder if hot, die...
+        if ($depth == 0 && $node->getAttribute('temperature') == 'hot') { // if root of hotfolder if hot, die...
             return($ret);
+        }
 
 //printf("%s : \n", __LINE__);
         $nodesToDel = array();
diff --git a/lib/classes/task/period/cindexer.class.php b/lib/classes/task/period/cindexer.class.php
index 23d1da197d..edb4b8eaf4 100644
--- a/lib/classes/task/period/cindexer.class.php
+++ b/lib/classes/task/period/cindexer.class.php
@@ -177,6 +177,7 @@ class task_period_cindexer extends task_abstract
                 parent.calccmd();
             </script>
             <?php
+
             return("");
         } else { // ... so we NEVER come here
             // bad xml
@@ -243,6 +244,7 @@ class task_period_cindexer extends task_abstract
             }
         </script>
         <?php
+
         return;
     }
 
diff --git a/lib/classes/task/period/ftp.class.php b/lib/classes/task/period/ftp.class.php
index 6431703b67..bfaf892e12 100644
--- a/lib/classes/task/period/ftp.class.php
+++ b/lib/classes/task/period/ftp.class.php
@@ -98,6 +98,7 @@ class task_period_ftp extends task_appboxAbstract
             <?php echo $form ?>.period.value           = "<?php echo p4string::MakeString($sxml->period, "js", '"') ?>";
             </script>
             <?php
+
             return("");
         } else { // ... so we NEVER come here
             // bad xml
@@ -127,6 +128,7 @@ class task_period_ftp extends task_appboxAbstract
             }
         </script>
         <?php
+
         return;
     }
 
diff --git a/lib/classes/task/period/ftpPull.class.php b/lib/classes/task/period/ftpPull.class.php
index 66e36fd39b..7f94e74df5 100644
--- a/lib/classes/task/period/ftpPull.class.php
+++ b/lib/classes/task/period/ftpPull.class.php
@@ -99,6 +99,7 @@ class task_period_ftpPull extends task_appboxAbstract
             <?php echo $form ?>.passive.checked  = <?php echo p4field::isyes($sxml->passive) ? "true" : 'false' ?>;
             </script>
             <?php
+
             return("");
         } else { // ... so we NEVER come here
             // bad xml
diff --git a/lib/classes/task/period/outofdate.class.php b/lib/classes/task/period/outofdate.class.php
index 11cb17dfe2..a1f9a89087 100644
--- a/lib/classes/task/period/outofdate.class.php
+++ b/lib/classes/task/period/outofdate.class.php
@@ -155,6 +155,7 @@ class task_period_outofdate extends task_abstract
                 parent.calcSQL();
             </script>
             <?php
+
             return("");
         }
         else { // ... so we NEVER come here
diff --git a/lib/classes/task/period/subdef.class.php b/lib/classes/task/period/subdef.class.php
index 7395b15061..b44e0fa18d 100644
--- a/lib/classes/task/period/subdef.class.php
+++ b/lib/classes/task/period/subdef.class.php
@@ -142,6 +142,7 @@ class task_period_subdef extends task_databoxAbstract
             <?php echo $form ?>.maxmegs.value = "<?php echo p4string::MakeString($sxml->maxmegs, "js", '"') ?>";
             </script>
             <?php
+
             return("");
         }
         else {
diff --git a/lib/classes/task/period/workflow01.class.php b/lib/classes/task/period/workflow01.class.php
index d8b27f80c4..0051e1bcb7 100644
--- a/lib/classes/task/period/workflow01.class.php
+++ b/lib/classes/task/period/workflow01.class.php
@@ -118,6 +118,7 @@ class task_period_workflow01 extends task_databoxAbstract
                 parent.calccmd();
             </script>
             <?php
+
             return("");
         }
         else { // ... so we NEVER come here
diff --git a/lib/classes/task/period/writemeta.class.php b/lib/classes/task/period/writemeta.class.php
index 30376e31ef..fb97432c66 100644
--- a/lib/classes/task/period/writemeta.class.php
+++ b/lib/classes/task/period/writemeta.class.php
@@ -112,6 +112,7 @@ class task_period_writemeta extends task_databoxAbstract
             <?php echo $form ?>.maxmegs.value       = "<?php echo p4string::MakeString($sxml->maxmegs, "js", '"') ?>";
             </script>
             <?php
+
             return("");
         }
         else { // ... so we NEVER come here
diff --git a/www/thesaurus2/patch/th_2.0.3.php b/www/thesaurus2/patch/th_2.0.3.php
index a5667a9fd2..5d04cb9eea 100644
--- a/www/thesaurus2/patch/th_2.0.3.php
+++ b/www/thesaurus2/patch/th_2.0.3.php
@@ -140,8 +140,11 @@ class patch_th_2_0_3
     function fixIds(connection_pdo &$connbas, &$node)
     {
         global $debug;
-        if ($node->nodeType != XML_ELEMENT_NODE)
+
+        if ($node->nodeType != XML_ELEMENT_NODE) {
             return;
+        }
+
         if ($node->parentNode && $node->parentNode->nodeType == XML_ELEMENT_NODE) {
             $pid = $node->parentNode->getAttribute("id");
             if ($pid != "") {
diff --git a/www/thesaurus2/patch/th_2.0.4.php b/www/thesaurus2/patch/th_2.0.4.php
index d4a2909851..c7235f1732 100644
--- a/www/thesaurus2/patch/th_2.0.4.php
+++ b/www/thesaurus2/patch/th_2.0.4.php
@@ -143,8 +143,11 @@ class patch_th_2_0_4
     function fixIds(connection_pdo &$connbas, &$node)
     {
         global $debug;
-        if ($node->nodeType != XML_ELEMENT_NODE)
+
+        if ($node->nodeType != XML_ELEMENT_NODE) {
             return;
+        }
+
         if ($node->parentNode && $node->parentNode->nodeType == XML_ELEMENT_NODE) {
             $pid = $node->parentNode->getAttribute("id");
             if ($pid != "") {