From: Dan Untenzu <untenzu@webit.de>
Date: Tue, 24 Jan 2017 12:08:59 +0000 (+0100)
Subject: [FEATURE] Switch to PSR-2
X-Git-Tag: 3.0.0~17
X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/commitdiff_plain/96707e02b8b24054e0827eaf169cc88504a1e78c?hp=719b7e58a95d36a081e4cf7ee2028e0d0e95408e

[FEATURE] Switch to PSR-2

Convert all PHP files to PSR-2, which defined
a basic Coding Style Guide for PHP projects.

Using the awesome friendsofphp/php-cs-fixer tool,
running with the @PSR2 ruleset.

1) script.php (no_spaces_after_function_name, braces)
2) f.php (indentation_type, no_spaces_after_function_name, braces)
3) install.php (indentation_type, function_declaration, elseif, no_spaces_after_function_name, braces)
4) lib/functions.php (no_spaces_inside_parenthesis, method_argument_space, function_declaration, elseif, no_spaces_after_function_name, lowercase_constants, lowercase_keywords, braces, single_blank_line_at_eof)
5) lib/functions.js.php (no_spaces_after_function_name)
6) lib/lang.php (function_declaration, no_spaces_after_function_name, lowercase_constants, no_closing_tag, braces, single_blank_line_at_eof)
7) lib/template/footer.php (braces)
8) lib/config.local.bak.php (method_argument_space, no_spaces_after_function_name, no_closing_tag, single_blank_line_at_eof)
9) lib/config.original.php (no_spaces_after_function_name, no_closing_tag, single_blank_line_at_eof)
0) lib/settings.php (indentation_type, no_spaces_after_function_name, braces)
1) lib/config.local.php (no_spaces_after_function_name, single_blank_line_at_eof)
2) index.php (indentation_type, no_spaces_after_function_name, braces)
3) admin.php (no_spaces_after_function_name, braces)
4) tos.php (no_spaces_after_function_name, no_closing_tag, single_blank_line_at_eof)

Refs #103
---

diff --git a/admin.php b/admin.php
index d602dcd..e4321db 100644
--- a/admin.php
+++ b/admin.php
@@ -17,45 +17,38 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
+define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
 
-require (JIRAFEAU_ROOT . 'lib/settings.php');
-require (JIRAFEAU_ROOT . 'lib/functions.php');
-require (JIRAFEAU_ROOT . 'lib/lang.php');
+require(JIRAFEAU_ROOT . 'lib/settings.php');
+require(JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/lang.php');
 
 /* Check if installation is OK. */
-if (file_exists (JIRAFEAU_ROOT . 'install.php')
-    && !file_exists (JIRAFEAU_ROOT . 'lib/config.local.php'))
-{
+if (file_exists(JIRAFEAU_ROOT . 'install.php')
+    && !file_exists(JIRAFEAU_ROOT . 'lib/config.local.php')) {
     header('Location: install.php');
     exit;
 }
 
 /* If called from CLI, no password or graphical interface */
 if (php_sapi_name() == "cli") {
-     if ((count($argv)>1) && $argv[1]=="clean_expired") {
-          $total = jirafeau_admin_clean ();
-          echo "$total expired files deleted.";
-     }
-     elseif ((count($argv)>1) && $argv[1]=="clean_async") {
-          $total = jirafeau_admin_clean_async ();
-          echo "$total old unfinished transfers deleted.";
-     }
-     else
-     {
-          die("No command found. Should be admin.php <clean_expired|clean_async>.");
-     }
-}
-else
-{
-  /* Disable admin interface if we have a empty admin password. */
-  if (empty($cfg['admin_password']) && empty($cfg['admin_http_auth_user']))
-  {
-      require (JIRAFEAU_ROOT . 'lib/template/header.php');
+    if ((count($argv)>1) && $argv[1]=="clean_expired") {
+        $total = jirafeau_admin_clean();
+        echo "$total expired files deleted.";
+    } elseif ((count($argv)>1) && $argv[1]=="clean_async") {
+        $total = jirafeau_admin_clean_async();
+        echo "$total old unfinished transfers deleted.";
+    } else {
+        die("No command found. Should be admin.php <clean_expired|clean_async>.");
+    }
+} else {
+    /* Disable admin interface if we have a empty admin password. */
+  if (empty($cfg['admin_password']) && empty($cfg['admin_http_auth_user'])) {
+      require(JIRAFEAU_ROOT . 'lib/template/header.php');
       echo '<div class="error"><p>'.
            t('Sorry, the admin interface is not enabled.') .
            '</p></div>';
-      require (JIRAFEAU_ROOT.'lib/template/footer.php');
+      require(JIRAFEAU_ROOT.'lib/template/footer.php');
       exit;
   }
 
@@ -63,36 +56,34 @@ else
   session_start();
 
   /* Unlog if asked. */
-  if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0))
+  if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
       $_SESSION['admin_auth'] = false;
+  }
 
   /* Check classic admin password authentification. */
-  if (isset ($_POST['admin_password']) && empty($cfg['admin_http_auth_user']))
-  {
+  if (isset($_POST['admin_password']) && empty($cfg['admin_http_auth_user'])) {
       if ($cfg['admin_password'] === $_POST['admin_password'] ||
-          $cfg['admin_password'] === hash('sha256', $_POST['admin_password']))
+          $cfg['admin_password'] === hash('sha256', $_POST['admin_password'])) {
           $_SESSION['admin_auth'] = true;
-      else
-      {
+      } else {
           $_SESSION['admin_auth'] = false;
-          require (JIRAFEAU_ROOT . 'lib/template/header.php');
+          require(JIRAFEAU_ROOT . 'lib/template/header.php');
           echo '<div class="error"><p>'.
                t('Wrong password.') . '</p></div>';
-          require (JIRAFEAU_ROOT.'lib/template/footer.php');
+          require(JIRAFEAU_ROOT.'lib/template/footer.php');
           exit;
       }
   }
   /* Ask for classic admin password authentification. */
-  elseif ((!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true)
-          && empty($cfg['admin_http_auth_user']))
-  {
-      require (JIRAFEAU_ROOT . 'lib/template/header.php'); ?>
+  elseif ((!isset($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true)
+          && empty($cfg['admin_http_auth_user'])) {
+      require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?>
       <form action = "<?php echo basename(__FILE__); ?>" method = "post">
       <fieldset>
           <table>
           <tr>
               <td class = "label"><label for = "enter_password">
-              <?php echo t('Administration password') . ':';?></label>
+              <?php echo t('Administration password') . ':'; ?></label>
               </td>
               <td class = "field"><input type = "password"
               name = "admin_password" id = "admin_password"
@@ -110,27 +101,26 @@ else
       </fieldset>
       </form>
       <?php
-      require (JIRAFEAU_ROOT.'lib/template/footer.php');
+      require(JIRAFEAU_ROOT.'lib/template/footer.php');
       exit;
   }
   /* Check authenticated user if HTTP authentification is enable. */
-  elseif ((!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true)
-          && !empty($cfg['admin_http_auth_user']))
-  {
-      if ($cfg['admin_http_auth_user'] == $_SERVER['PHP_AUTH_USER'])
+  elseif ((!isset($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true)
+          && !empty($cfg['admin_http_auth_user'])) {
+      if ($cfg['admin_http_auth_user'] == $_SERVER['PHP_AUTH_USER']) {
           $_SESSION['admin_auth'] = true;
+      }
   }
 
   /* Be sure that no one can access further without admin_auth. */
-  if (!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true)
-  {
-           $_SESSION['admin_auth'] = false;
-          require (JIRAFEAU_ROOT . 'lib/template/header.php');
-          echo '<div class="error"><p>'.
+  if (!isset($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true) {
+      $_SESSION['admin_auth'] = false;
+      require(JIRAFEAU_ROOT . 'lib/template/header.php');
+      echo '<div class="error"><p>'.
            t('Sorry, you are not authenticated on admin interface.') .
            '</p></div>';
-          require (JIRAFEAU_ROOT.'lib/template/footer.php');
-          exit;
+      require(JIRAFEAU_ROOT.'lib/template/footer.php');
+      exit;
   }
 
   /* Operations may take a long time.
@@ -141,14 +131,12 @@ else
   @error_reporting(0);
 
   /* Show admin interface if not downloading a file. */
-  if (!(isset ($_POST['action']) && strcmp ($_POST['action'], 'download') == 0))
-  {
-          require (JIRAFEAU_ROOT . 'lib/template/header.php');
-          ?><h2><?php echo t('Admin interface'); ?></h2><?php
+  if (!(isset($_POST['action']) && strcmp($_POST['action'], 'download') == 0)) {
+      require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?><h2><?php echo t('Admin interface'); ?></h2><?php
           ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php
 
           ?><div id = "admin">
-          <fieldset><legend><?php echo t('Actions');?></legend>
+          <fieldset><legend><?php echo t('Actions'); ?></legend>
           <table>
           <form action = "<?php echo basename(__FILE__); ?>" method = "post">
           <tr>
@@ -234,71 +222,56 @@ else
               <input type = "submit" value = "<?php echo t('Logout'); ?>" />
           </form>
           </fieldset></div><?php
+
   }
 
   /* Check for actions */
-  if (isset ($_POST['action']))
-  {
-      if (strcmp ($_POST['action'], 'clean') == 0)
-      {
-          $total = jirafeau_admin_clean ();
+  if (isset($_POST['action'])) {
+      if (strcmp($_POST['action'], 'clean') == 0) {
+          $total = jirafeau_admin_clean();
           echo '<div class="message">' . NL;
           echo '<p>';
           echo t('Number of cleaned files') . ' : ' . $total;
           echo '</p></div>';
-      }
-      elseif (strcmp ($_POST['action'], 'clean_async') == 0)
-      {
-          $total = jirafeau_admin_clean_async ();
+      } elseif (strcmp($_POST['action'], 'clean_async') == 0) {
+          $total = jirafeau_admin_clean_async();
           echo '<div class="message">' . NL;
           echo '<p>';
           echo t('Number of cleaned files') . ' : ' . $total;
           echo '</p></div>';
-      }
-      elseif (strcmp ($_POST['action'], 'list') == 0)
-      {
-          jirafeau_admin_list ("", "", "");
-      }
-      elseif (strcmp ($_POST['action'], 'search_by_name') == 0)
-      {
-          jirafeau_admin_list ($_POST['name'], "", "");
-      }
-      elseif (strcmp ($_POST['action'], 'search_by_file_hash') == 0)
-      {
-          jirafeau_admin_list ("", $_POST['hash'], "");
-      }
-      elseif (strcmp ($_POST['action'], 'search_link') == 0)
-      {
-          jirafeau_admin_list ("", "", $_POST['link']);
-      }
-      elseif (strcmp ($_POST['action'], 'delete_link') == 0)
-      {
-          jirafeau_delete_link ($_POST['link']);
+      } elseif (strcmp($_POST['action'], 'list') == 0) {
+          jirafeau_admin_list("", "", "");
+      } elseif (strcmp($_POST['action'], 'search_by_name') == 0) {
+          jirafeau_admin_list($_POST['name'], "", "");
+      } elseif (strcmp($_POST['action'], 'search_by_file_hash') == 0) {
+          jirafeau_admin_list("", $_POST['hash'], "");
+      } elseif (strcmp($_POST['action'], 'search_link') == 0) {
+          jirafeau_admin_list("", "", $_POST['link']);
+      } elseif (strcmp($_POST['action'], 'delete_link') == 0) {
+          jirafeau_delete_link($_POST['link']);
           echo '<div class="message">' . NL;
           echo '<p>' . t('Link deleted') . '</p></div>';
-      }
-      elseif (strcmp ($_POST['action'], 'delete_file') == 0)
-      {
-          $count = jirafeau_delete_file ($_POST['md5']);
+      } elseif (strcmp($_POST['action'], 'delete_file') == 0) {
+          $count = jirafeau_delete_file($_POST['md5']);
           echo '<div class="message">' . NL;
           echo '<p>' . t('Deleted links') . ' : ' . $count . '</p></div>';
-      }
-      elseif (strcmp ($_POST['action'], 'download') == 0)
-      {
-          $l = jirafeau_get_link ($_POST['link']);
-          if (!count ($l))
+      } elseif (strcmp($_POST['action'], 'download') == 0) {
+          $l = jirafeau_get_link($_POST['link']);
+          if (!count($l)) {
               return;
-          $p = s2p ($l['md5']);
-          header ('Content-Length: ' . $l['file_size']);
-          header ('Content-Type: ' . $l['mime_type']);
-          header ('Content-Disposition: attachment; filename="' .
+          }
+          $p = s2p($l['md5']);
+          header('Content-Length: ' . $l['file_size']);
+          header('Content-Type: ' . $l['mime_type']);
+          header('Content-Disposition: attachment; filename="' .
                   $l['file_name'] . '"');
-          if (file_exists(VAR_FILES . $p . $l['md5']))
-              readfile (VAR_FILES . $p . $l['md5']);
+          if (file_exists(VAR_FILES . $p . $l['md5'])) {
+              readfile(VAR_FILES . $p . $l['md5']);
+          }
           exit;
       }
   }
 
-  require (JIRAFEAU_ROOT.'lib/template/footer.php');
+    require(JIRAFEAU_ROOT.'lib/template/footer.php');
 }
 ?>
diff --git a/f.php b/f.php
index 109ac53..d94b55b 100644
--- a/f.php
+++ b/f.php
@@ -17,15 +17,14 @@
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
+define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
 
-require (JIRAFEAU_ROOT . 'lib/settings.php');
-require (JIRAFEAU_ROOT . 'lib/functions.php');
-require (JIRAFEAU_ROOT . 'lib/lang.php');
+require(JIRAFEAU_ROOT . 'lib/settings.php');
+require(JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/lang.php');
 
-if (!isset ($_GET['h']) || empty ($_GET['h']))
-{
-    header ('Location: ' . $cfg['web_root']);
+if (!isset($_GET['h']) || empty($_GET['h'])) {
+    header('Location: ' . $cfg['web_root']);
     exit;
 }
 
@@ -38,95 +37,91 @@ if (!isset ($_GET['h']) || empty ($_GET['h']))
 
 $link_name = $_GET['h'];
 
-if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
-{
-    require (JIRAFEAU_ROOT.'lib/template/header.php');
+if (!preg_match('/[0-9a-zA-Z_-]+$/', $link_name)) {
+    require(JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div class="error"><p>' . t('Sorry, the requested file is not found') . '</p></div>';
-    require (JIRAFEAU_ROOT.'lib/template/footer.php');
+    require(JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
 }
 
-$link = jirafeau_get_link ($link_name);
-if (count ($link) == 0)
-{
+$link = jirafeau_get_link($link_name);
+if (count($link) == 0) {
     /* Try alias. */
-    $alias = jirafeau_get_alias (md5 ($link_name));
-    if (count ($alias) > 0)
-        $link = jirafeau_get_link ($alias["destination"]);
+    $alias = jirafeau_get_alias(md5($link_name));
+    if (count($alias) > 0) {
+        $link = jirafeau_get_link($alias["destination"]);
+    }
 }
-if (count ($link) == 0)
-{
-    require (JIRAFEAU_ROOT.'lib/template/header.php');
+if (count($link) == 0) {
+    require(JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div class="error"><p>' . t('Sorry, the requested file is not found') .
     '</p></div>';
-    require (JIRAFEAU_ROOT.'lib/template/footer.php');
+    require(JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
 }
 
 $delete_code = '';
-if (isset ($_GET['d']) && !empty ($_GET['d']) &&  $_GET['d'] != '1')
+if (isset($_GET['d']) && !empty($_GET['d']) &&  $_GET['d'] != '1') {
     $delete_code = $_GET['d'];
+}
 
 $crypt_key = '';
-if (isset ($_GET['k']) && !empty ($_GET['k']))
+if (isset($_GET['k']) && !empty($_GET['k'])) {
     $crypt_key = $_GET['k'];
+}
 
 $do_download = false;
-if (isset ($_GET['d']) && $_GET['d'] == '1')
+if (isset($_GET['d']) && $_GET['d'] == '1') {
     $do_download = true;
+}
 
 $do_preview = false;
-if (isset ($_GET['p']) && !empty ($_GET['p']))
+if (isset($_GET['p']) && !empty($_GET['p'])) {
     $do_preview = true;
+}
 
-$p = s2p ($link['md5']);
-if (!file_exists (VAR_FILES . $p . $link['md5']))
-{
-    jirafeau_delete_link ($link_name);
-    require (JIRAFEAU_ROOT.'lib/template/header.php');
+$p = s2p($link['md5']);
+if (!file_exists(VAR_FILES . $p . $link['md5'])) {
+    jirafeau_delete_link($link_name);
+    require(JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div class="error"><p>'.t('File not available.').
     '</p></div>';
-    require (JIRAFEAU_ROOT.'lib/template/footer.php');
+    require(JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
 }
 
-if (!empty ($delete_code) && $delete_code == $link['link_code'])
-{
-    jirafeau_delete_link ($link_name);
-    require (JIRAFEAU_ROOT.'lib/template/header.php');
+if (!empty($delete_code) && $delete_code == $link['link_code']) {
+    jirafeau_delete_link($link_name);
+    require(JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div class="message"><p>'.t('File has been deleted.').
      '</p></div>';
-    require (JIRAFEAU_ROOT.'lib/template/footer.php');
+    require(JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
 }
 
-if ($link['time'] != JIRAFEAU_INFINITY && time () > $link['time'])
-{
-    jirafeau_delete_link ($link_name);
-    require (JIRAFEAU_ROOT.'lib/template/header.php');
+if ($link['time'] != JIRAFEAU_INFINITY && time() > $link['time']) {
+    jirafeau_delete_link($link_name);
+    require(JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div class="error"><p>'.
     t('The time limit of this file has expired.') . ' ' .
     t('File has been deleted.') .
     '</p></div>';
-    require (JIRAFEAU_ROOT . 'lib/template/footer.php');
+    require(JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;
 }
 
-if (empty ($crypt_key) && $link['crypted'])
-{
-    require (JIRAFEAU_ROOT.'lib/template/header.php');
+if (empty($crypt_key) && $link['crypted']) {
+    require(JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div class="error"><p>' . t('Sorry, the requested file is not found') .
     '</p></div>';
-    require (JIRAFEAU_ROOT.'lib/template/footer.php');
+    require(JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
 }
 
 $password_challenged = false;
-if (!empty ($link['key']))
-{
-    if (!isset ($_POST['key']))
-    {
-        require (JIRAFEAU_ROOT.'lib/template/header.php');
+if (!empty($link['key'])) {
+    if (!isset($_POST['key'])) {
+        require(JIRAFEAU_ROOT.'lib/template/header.php');
         echo '<div>' .
              '<form action = "';
         echo JIRAFEAU_ABSPREFIX . 'f.php';
@@ -143,57 +138,50 @@ if (!empty ($link['key']))
              t('By using our services, you accept our'). ' <a href="' . JIRAFEAU_ABSPREFIX . 'tos.php' . '">' . t('Terms of Service') . '</a>.' .
              '</td></tr>';
 
-        if ($link['onetime'] == 'O')
-        {
+        if ($link['onetime'] == 'O') {
             echo '<tr><td id="self_destruct">' .
                  t('Warning, this file will self-destruct after being read') .
                  '</td></tr>';
-        }
-
-        ?><tr><td><input type="submit" id = "submit_download"  value="<?php echo t('Download'); ?>"
+        } ?><tr><td><input type="submit" id = "submit_download"  value="<?php echo t('Download'); ?>"
         onclick="document.getElementById('submit_post').action='<?php
         echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;d=1';
-        if (!empty($crypt_key))
+        if (!empty($crypt_key)) {
             echo '&amp;k=' . urlencode($crypt_key);
-?>';
+        } ?>';
         document.getElementById('submit_download').submit ();"/><?php
-        if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type']))
-        {
+        if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type'])) {
             ?><input type="submit" id = "submit_preview"  value="<?php echo t('Preview'); ?>"
             onclick="document.getElementById('submit_post').action='<?php
             echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;p=1';
-            if (!empty($crypt_key))
+            if (!empty($crypt_key)) {
                 echo '&amp;k=' . urlencode($crypt_key);
-            ?>';
+            } ?>';
             document.getElementById('submit_preview').submit ();"/><?php
+
         }
         echo '</td></tr></table></fieldset></form></div>';
-        require (JIRAFEAU_ROOT.'lib/template/footer.php');
+        require(JIRAFEAU_ROOT.'lib/template/footer.php');
         exit;
-    }
-    else
-    {
-        if ($link['key'] == md5 ($_POST['key']))
+    } else {
+        if ($link['key'] == md5($_POST['key'])) {
             $password_challenged = true;
-	else
-        {
-            sleep (2);
-            require (JIRAFEAU_ROOT.'lib/template/header.php');
+        } else {
+            sleep(2);
+            require(JIRAFEAU_ROOT.'lib/template/header.php');
             echo '<div class="error"><p>' . t('Access denied') .
             '</p></div>';
-            require (JIRAFEAU_ROOT.'lib/template/footer.php');
+            require(JIRAFEAU_ROOT.'lib/template/footer.php');
             exit;
         }
     }
 }
 
-if (!$password_challenged && !$do_download && !$do_preview)
-{
-        require (JIRAFEAU_ROOT.'lib/template/header.php');
-        echo '<div>' .
+if (!$password_challenged && !$do_download && !$do_preview) {
+    require(JIRAFEAU_ROOT.'lib/template/header.php');
+    echo '<div>' .
              '<form action="';
-        echo JIRAFEAU_ABSPREFIX . 'f.php';
-        echo '" ' .
+    echo JIRAFEAU_ABSPREFIX . 'f.php';
+    echo '" ' .
              'method = "post" id = "submit_post">'; ?>
              <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
         echo '<fieldset><legend>' . htmlspecialchars($link['file_name']) . '</legend><table>' .
@@ -204,84 +192,79 @@ if (!$password_challenged && !$do_download && !$do_preview)
              t('By using our services, you accept our'). ' <a href="' . JIRAFEAU_ABSPREFIX . 'tos.php' . '">' . t('Terms of Service') . '</a>.' .
              '</td></tr>';
 
-        if ($link['onetime'] == 'O')
-        {
-            echo '<tr><td id="self_destruct">' .
+    if ($link['onetime'] == 'O') {
+        echo '<tr><td id="self_destruct">' .
                  t('Warning, this file will self-destruct after being read') .
                  '</td></tr>';
-        }
-
-        ?>
+    } ?>
         <tr><td><input type="submit" id = "submit_download"  value="<?php echo t('Download'); ?>"
         onclick="document.getElementById('submit_post').action='<?php
         echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;d=1';
-        if (!empty($crypt_key))
-            echo '&amp;k=' . urlencode($crypt_key);
-?>';
+    if (!empty($crypt_key)) {
+        echo '&amp;k=' . urlencode($crypt_key);
+    } ?>';
         document.getElementById('submit_post').submit ();"/><?php
 
-        if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type']))
-        {
+        if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type'])) {
             ?><input type="submit" id = "submit_preview"  value="<?php echo t('Preview'); ?>"
             onclick="document.getElementById('submit_post').action='<?php
         echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;p=1';
-        if (!empty($crypt_key))
-            echo '&amp;k=' . urlencode($crypt_key);
-?>';
+            if (!empty($crypt_key)) {
+                echo '&amp;k=' . urlencode($crypt_key);
+            } ?>';
         document.getElementById('submit_post').submit ();"/><?php
+
         }
-        echo '</td></tr>';
-        echo '</table></fieldset></form></div>';
-        require (JIRAFEAU_ROOT.'lib/template/footer.php');
-        exit;
+    echo '</td></tr>';
+    echo '</table></fieldset></form></div>';
+    require(JIRAFEAU_ROOT.'lib/template/footer.php');
+    exit;
 }
 
-header ('HTTP/1.0 200 OK');
-header ('Content-Length: ' . $link['file_size']);
-if (!jirafeau_is_viewable ($link['mime_type']) || !$cfg['preview'] || $do_download)
-    header ('Content-Disposition: attachment; filename="' . $link['file_name'] . '"');
-else
-    header ('Content-Disposition: filename="' . $link['file_name'] . '"');
-header ('Content-Type: ' . $link['mime_type']);
-header ('Content-MD5: ' . hex_to_base64($link['md5']));
+header('HTTP/1.0 200 OK');
+header('Content-Length: ' . $link['file_size']);
+if (!jirafeau_is_viewable($link['mime_type']) || !$cfg['preview'] || $do_download) {
+    header('Content-Disposition: attachment; filename="' . $link['file_name'] . '"');
+} else {
+    header('Content-Disposition: filename="' . $link['file_name'] . '"');
+}
+header('Content-Type: ' . $link['mime_type']);
+header('Content-MD5: ' . hex_to_base64($link['md5']));
 
 /* Read encrypted file. */
-if ($link['crypted'])
-{
+if ($link['crypted']) {
     /* Init module */
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Extract key and iv. */
-    $md5_key = md5 ($crypt_key);
-    $iv = jirafeau_crypt_create_iv ($md5_key, mcrypt_enc_get_iv_size($m));
+    $md5_key = md5($crypt_key);
+    $iv = jirafeau_crypt_create_iv($md5_key, mcrypt_enc_get_iv_size($m));
     /* Init module. */
-    mcrypt_generic_init ($m, $md5_key, $iv);
+    mcrypt_generic_init($m, $md5_key, $iv);
     /* Decrypt file. */
-    $r = fopen (VAR_FILES . $p . $link['md5'], 'r');
-    while (!feof ($r))
-    {
-        $dec = mdecrypt_generic($m, fread ($r, 1024));
+    $r = fopen(VAR_FILES . $p . $link['md5'], 'r');
+    while (!feof($r)) {
+        $dec = mdecrypt_generic($m, fread($r, 1024));
         print $dec;
         ob_flush();
     }
-    fclose ($r);
+    fclose($r);
     /* Cleanup. */
     mcrypt_generic_deinit($m);
     mcrypt_module_close($m);
 }
 /* Read file. */
-else
-{
-    $r = fopen (VAR_FILES . $p . $link['md5'], 'r');
-    while (!feof ($r))
-    {
-        print fread ($r, 1024);
+else {
+    $r = fopen(VAR_FILES . $p . $link['md5'], 'r');
+    while (!feof($r)) {
+        print fread($r, 1024);
         ob_flush();
     }
-    fclose ($r);
+    fclose($r);
 }
 
-if ($link['onetime'] == 'O')
-    jirafeau_delete_link ($link_name);
+if ($link['onetime'] == 'O') {
+    jirafeau_delete_link($link_name);
+}
 exit;
 
 ?>
diff --git a/index.php b/index.php
index 2002ad7..b8feabd 100644
--- a/index.php
+++ b/index.php
@@ -18,66 +18,59 @@
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
+define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
 
-require (JIRAFEAU_ROOT . 'lib/settings.php');
-require (JIRAFEAU_ROOT . 'lib/functions.php');
-require (JIRAFEAU_ROOT . 'lib/lang.php');
+require(JIRAFEAU_ROOT . 'lib/settings.php');
+require(JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/lang.php');
 
-check_errors ($cfg);
-if (has_error ())
-{
-    show_errors ();
-    require (JIRAFEAU_ROOT . 'lib/template/footer.php');
+check_errors($cfg);
+if (has_error()) {
+    show_errors();
+    require(JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;
 }
 
-require (JIRAFEAU_ROOT . 'lib/template/header.php');
+require(JIRAFEAU_ROOT . 'lib/template/header.php');
 
 /* Check if user is allowed to upload. */
-if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
-{
+if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
     echo '<div class="error"><p>' . t('Access denied') . '</p></div>';
-    require (JIRAFEAU_ROOT.'lib/template/footer.php');
+    require(JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
 }
 
 /* Ask password if upload password is set. */
-if (jirafeau_has_upload_password ($cfg))
-{
+if (jirafeau_has_upload_password($cfg)) {
     session_start();
 
     /* Unlog if asked. */
-    if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0))
-        session_unset ();
+    if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
+        session_unset();
+    }
 
     /* Auth. */
-    if (isset ($_POST['upload_password']))
-    {
-        if (jirafeau_challenge_upload_password ($cfg, $_POST['upload_password']))
-        {
+    if (isset($_POST['upload_password'])) {
+        if (jirafeau_challenge_upload_password($cfg, $_POST['upload_password'])) {
             $_SESSION['upload_auth'] = true;
             $_SESSION['user_upload_password'] = $_POST['upload_password'];
-        }
-        else
-        {
+        } else {
             $_SESSION['admin_auth'] = false;
             echo '<div class="error"><p>' . t('Wrong password.') . '</p></div>';
-            require (JIRAFEAU_ROOT.'lib/template/footer.php');
+            require(JIRAFEAU_ROOT.'lib/template/footer.php');
             exit;
         }
     }
 
     /* Show auth page. */
-    if (!isset ($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true)
-    {
-	?>
+    if (!isset($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true) {
+        ?>
         <form action = "<?php echo basename(__FILE__); ?>" method = "post">
         <fieldset>
             <table>
             <tr>
                 <td class = "label"><label for = "enter_password">
-                <?php echo t('Upload password') . ':';?></label>
+                <?php echo t('Upload password') . ':'; ?></label>
                 </td>
                 <td class = "field"><input type = "password"
                 name = "upload_password" id = "upload_password"
@@ -95,7 +88,7 @@ if (jirafeau_has_upload_password ($cfg))
         </fieldset>
         </form>
         <?php
-        require (JIRAFEAU_ROOT.'lib/template/footer.php');
+        require(JIRAFEAU_ROOT.'lib/template/footer.php');
         exit;
     }
 }
@@ -112,12 +105,14 @@ if (jirafeau_has_upload_password ($cfg))
     <p><a id="upload_link" href=""></a></p>
     </div>
 
-    <?php if ($cfg['preview'] == true) { ?>
+    <?php if ($cfg['preview'] == true) {
+    ?>
     <div id="upload_finished_preview">
     <p><?php echo t('View link') ?>:</p>
     <p><a id="preview_link" href=""></a></p>
     </div>
-    <?php } ?>
+    <?php 
+} ?>
 
     <div id="upload_direct_download">
     <p><?php echo t('Direct download link') ?>:</p>
@@ -137,7 +132,7 @@ if (jirafeau_has_upload_password ($cfg))
 
 <div id="uploading">
     <p>
-    <?php echo t ('Uploading ...'); ?>
+    <?php echo t('Uploading ...'); ?>
     <div id="uploaded_percentage"></div>
     <div id="uploaded_speed"></div>
     <div id="uploaded_time"></div>
@@ -154,7 +149,7 @@ if (jirafeau_has_upload_password ($cfg))
     </legend>
     <p>
     <input type="file" id="file_select" size="30"
-    onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php echo t ('File is too big') . ', ' . t ('File size is limited to') . " " . $cfg['maximal_upload_size'] . " MB"; ?>')"/>
+    onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php echo t('File is too big') . ', ' . t('File size is limited to') . " " . $cfg['maximal_upload_size'] . " MB"; ?>')"/>
     </p>
 
     <div id="options">
@@ -206,59 +201,57 @@ if (jirafeau_has_upload_password ($cfg))
           )
         );
         foreach ($expirationTimeOptions as $expirationTimeOption) {
-          $selected = ($expirationTimeOption['value'] === $cfg['availability_default'])? 'selected="selected"' : '';
-          if(true === $cfg['availabilities'][$expirationTimeOption['value']]) {
-            echo '<option value="' . $expirationTimeOption['value'] . '" ' .
+            $selected = ($expirationTimeOption['value'] === $cfg['availability_default'])? 'selected="selected"' : '';
+            if (true === $cfg['availabilities'][$expirationTimeOption['value']]) {
+                echo '<option value="' . $expirationTimeOption['value'] . '" ' .
               $selected . '>' . t($expirationTimeOption['label']) . '</option>';
-          }
+            }
         }
         ?>
         </select></td>
         </tr>
 
         <?php
-        if ($cfg['maximal_upload_size'] > 0)
-        {
-        echo '<p class="config">' . t ('File size is limited to');
-        echo " " . $cfg['maximal_upload_size'] . " MB</p>";
+        if ($cfg['maximal_upload_size'] > 0) {
+            echo '<p class="config">' . t('File size is limited to');
+            echo " " . $cfg['maximal_upload_size'] . " MB</p>";
         }
         ?>
 
 		<p id="max_file_size" class="config"></p>
     <p>
     <?php
-    if (jirafeau_has_upload_password ($cfg) && $_SESSION['upload_auth'])
-    {
-    ?>
+    if (jirafeau_has_upload_password($cfg) && $_SESSION['upload_auth']) {
+        ?>
     <input type="hidden" id="upload_password" name="upload_password" value="<?php echo $_SESSION['user_upload_password'] ?>"/>
     <?php
-    }
-    else
-    {
-    ?>
+
+    } else {
+        ?>
     <input type="hidden" id="upload_password" name="upload_password" value=""/>
     <?php
+
     }
     ?>
     <input type="submit" id="send" value="<?php echo t('Send'); ?>"
     onclick="
         document.getElementById('upload').style.display = 'none';
         document.getElementById('uploading').style.display = '';
-        upload ('<?php echo $cfg['web_root']; ?>', <?php echo jirafeau_get_max_upload_size_bytes (); ?>);
+        upload ('<?php echo $cfg['web_root']; ?>', <?php echo jirafeau_get_max_upload_size_bytes(); ?>);
     "/>
     </p>
         </table>
     </div> </fieldset>
 
     <?php
-    if (jirafeau_has_upload_password ($cfg))
-    {
-    ?>
+    if (jirafeau_has_upload_password($cfg)) {
+        ?>
     <form action = "<?php echo basename(__FILE__); ?>" method = "post">
         <input type = "hidden" name = "action" value = "logout"/>
         <input type = "submit" value = "<?php echo t('Logout'); ?>" />
     </form>
     <?php
+
     }
     ?>
 
@@ -272,7 +265,7 @@ if (jirafeau_has_upload_password ($cfg))
     document.getElementById('send').style.display = 'none';
     if (!check_html5_file_api ())
         document.getElementById('max_file_size').innerHTML = '<?php
-             echo t('You browser may not support HTML5 so the maximum file size is ') . jirafeau_get_max_upload_size ();
+             echo t('You browser may not support HTML5 so the maximum file size is ') . jirafeau_get_max_upload_size();
              ?>';
 </script>
-<?php require (JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>
+<?php require(JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>
diff --git a/install.php b/install.php
index fbd3667..9e05b8c 100644
--- a/install.php
+++ b/install.php
@@ -17,30 +17,28 @@
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
+define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
 
-define ('JIRAFEAU_CFG', JIRAFEAU_ROOT . 'lib/config.local.php');
-define ('JIRAFEAU_VAR_RAND_LENGTH', 15);
+define('JIRAFEAU_CFG', JIRAFEAU_ROOT . 'lib/config.local.php');
+define('JIRAFEAU_VAR_RAND_LENGTH', 15);
 
-require (JIRAFEAU_ROOT . 'lib/settings.php');
-require (JIRAFEAU_ROOT . 'lib/functions.php');
-require (JIRAFEAU_ROOT . 'lib/lang.php');
+require(JIRAFEAU_ROOT . 'lib/settings.php');
+require(JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/lang.php');
 
 /**
  * Prepend used functions
  **/
 
-function
-jirafeau_quoted ($str)
+function jirafeau_quoted($str)
 {
-    return QUOTE . str_replace (QUOTE, "\'", $str) . QUOTE;
+    return QUOTE . str_replace(QUOTE, "\'", $str) . QUOTE;
 }
 
-function
-jirafeau_export_cfg ($cfg)
+function jirafeau_export_cfg($cfg)
 {
     $content = '<?php' . NL;
-    $content .= '/* ' . t ('This file was generated by the install process. ' .
+    $content .= '/* ' . t('This file was generated by the install process. ' .
                'You can edit it. Please see config.original.php to understand the ' .
                'configuration items.') . ' */' . NL;
     $content .= '$cfg = ' . var_export($cfg, true) . ';';
@@ -52,10 +50,9 @@ jirafeau_export_cfg ($cfg)
     }
 }
 
-function
-jirafeau_mkdir ($path)
+function jirafeau_mkdir($path)
 {
-    return !(!file_exists ($path) && !@mkdir ($path, 0755));
+    return !(!file_exists($path) && !@mkdir($path, 0755));
 }
 
 /**
@@ -64,15 +61,13 @@ jirafeau_mkdir ($path)
  * @param $path is the file or directory to be tested.
  * @return true if $path is writable.
  */
-function
-jirafeau_is_writable ($path)
+function jirafeau_is_writable($path)
 {
     /* "@" gets rid of error messages. */
-    return is_writable ($path) || @chmod ($path, 0777);
+    return is_writable($path) || @chmod($path, 0777);
 }
 
-function
-jirafeau_check_var_dir ($path)
+function jirafeau_check_var_dir($path)
 {
     $mkdir_str1 = t('The following directory could not be created') . ':';
     $mkdir_str2 = t('You should create this directory manually.');
@@ -81,37 +76,36 @@ jirafeau_check_var_dir ($path)
                     'this directory.');
     $solution_str = t('Here is a solution') . ':';
 
-    if (!jirafeau_mkdir ($path) || !jirafeau_is_writable ($path))
-        return array ('has_error' => true,
+    if (!jirafeau_mkdir($path) || !jirafeau_is_writable($path)) {
+        return array('has_error' => true,
                       'why' => $mkdir_str1 . '<br /><code>' .
                                $path . '</code><br />' . $solution_str .
                                '<br />' . $mkdir_str2);
+    }
 
-    foreach (array ('files', 'links', 'async', 'alias') as $subdir)
-    {
+    foreach (array('files', 'links', 'async', 'alias') as $subdir) {
         $subpath = $path.$subdir;
 
-        if (!jirafeau_mkdir ($subpath) || !jirafeau_is_writable ($subpath))
-            return array ('has_error' => true,
+        if (!jirafeau_mkdir($subpath) || !jirafeau_is_writable($subpath)) {
+            return array('has_error' => true,
                           'why' => $mkdir_str1 . '<br /><code>' .
                                    $subpath . '</code><br />' . $solution_str .
                                    '<br />' . $mkdir_str2);
+        }
     }
 
-    return array ('has_error' => false, 'why' => '');
+    return array('has_error' => false, 'why' => '');
 }
 
-function
-jirafeau_add_ending_slash ($path)
+function jirafeau_add_ending_slash($path)
 {
-    return $path . ((substr ($path, -1) == '/') ? '' : '/');
+    return $path . ((substr($path, -1) == '/') ? '' : '/');
 }
 
-function
-jirafeau_fatal_error($errorText)
+function jirafeau_fatal_error($errorText)
 {
     echo '<div class="error"><h2>Error</h2><p>' . $errorText . '</p></div>';
-    require (JIRAFEAU_ROOT . 'lib/template/footer.php');
+    require(JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;
 }
 
@@ -121,24 +115,21 @@ jirafeau_fatal_error($errorText)
 
 // Is the installation process done already?
 // Then there is nothing to do here → redirect to the main page.
-if ($cfg['installation_done'] === true)
-{
-	header('Location: index.php');
-	exit;
+if ($cfg['installation_done'] === true) {
+    header('Location: index.php');
+    exit;
 }
 
 /**
  * Prepare installation process
  **/
 
-require (JIRAFEAU_ROOT . 'lib/template/header.php');
+require(JIRAFEAU_ROOT . 'lib/template/header.php');
 
 // does the local configuration file exist?
-if (!file_exists (JIRAFEAU_CFG))
-{
+if (!file_exists(JIRAFEAU_CFG)) {
     // show an error if it is not possible to create the file
-    if (!@touch (JIRAFEAU_CFG))
-    {
+    if (!@touch(JIRAFEAU_CFG)) {
         jirafeau_fatal_error(
             t('The local configuration file could not be created. Create a ' .
                '<code>lib/config.local.php</code> file and give the write ' .
@@ -150,8 +141,7 @@ if (!file_exists (JIRAFEAU_CFG))
 }
 
 // is the local configuration writable?
-if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666'))
-{
+if (!is_writable(JIRAFEAU_CFG) && !@chmod(JIRAFEAU_CFG, '0666')) {
     jirafeau_fatal_error(
         t('The local configuration is not writable by the web server. ' .
             'Give the write permission to the web server on the ' .
@@ -163,48 +153,45 @@ if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666'))
  * Run trough each installation step
  **/
 
-if (isset ($_POST['step']) && isset ($_POST['next']))
-{
-    switch ($_POST['step'])
-    {
+if (isset($_POST['step']) && isset($_POST['next'])) {
+    switch ($_POST['step']) {
     case 1:
         $cfg['lang'] = $_POST['lang'];
-        jirafeau_export_cfg ($cfg);
+        jirafeau_export_cfg($cfg);
         break;
 
     case 2:
         $cfg['admin_password'] = hash('sha256', $_POST['admin_password']);
-        jirafeau_export_cfg ($cfg);
+        jirafeau_export_cfg($cfg);
         break;
 
     case 3:
-        $cfg['web_root'] = jirafeau_add_ending_slash ($_POST['web_root']);
-        $cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']);
-        jirafeau_export_cfg ($cfg);
+        $cfg['web_root'] = jirafeau_add_ending_slash($_POST['web_root']);
+        $cfg['var_root'] = jirafeau_add_ending_slash($_POST['var_root']);
+        jirafeau_export_cfg($cfg);
         break;
 
     case 4:
-        $cfg['web_root'] = jirafeau_add_ending_slash ($_POST['web_root']);
-        $cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']);
-        jirafeau_export_cfg ($cfg);
+        $cfg['web_root'] = jirafeau_add_ending_slash($_POST['web_root']);
+        $cfg['var_root'] = jirafeau_add_ending_slash($_POST['var_root']);
+        jirafeau_export_cfg($cfg);
         break;
     }
-
 }
 
 $current = 1;
-if (isset ($_POST['next']))
+if (isset($_POST['next'])) {
     $current = $_POST['step'] + 1;
-else if (isset ($_POST['previous']))
+} elseif (isset($_POST['previous'])) {
     $current = $_POST['step'] - 1;
-else if (isset ($_POST['retry']))
+} elseif (isset($_POST['retry'])) {
     $current = $_POST['step'];
+}
 
-switch ($current)
-{
+switch ($current) {
 case 1:
 default:
-    ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
+    ?><h2><?php printf(t('Installation of Jirafeau') . ' - ' . t('step') .
     ' %d ' . t('out of') . ' %d', 1, 4);
     ?></h2> <div id = "install"> <form method="post"> <input type =
         "hidden" name = "jirafeau" value =
@@ -212,16 +199,14 @@ default:
         "step" value = "1" /><fieldset> <legend><?php echo t('Language');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo
-        t
-        ('Jirafeau is internationalised. Choose a specific langage or ' .
+        t('Jirafeau is internationalised. Choose a specific langage or ' .
          'choose Automatic (langage is provided by user\'s browser).');
     ?></td> </tr> <tr> <td class = "label"><label for = "select_lang"
        ><?php echo t('Choose the default language') . ':';
     ?></label></td>
         <td class = "field">
         <select name = "lang" id = "select_lang">
-        <?php foreach ($languages_list as $key => $item)
-    {
+        <?php foreach ($languages_list as $key => $item) {
         echo '<option value="'.$key.'"'.($key ==
                       $cfg['lang'] ? ' selected="selected"'
                       : '').'>'.$item.'</option>'.NL;
@@ -237,7 +222,7 @@ default:
 break;
 
 case 2:
-    ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
+    ?><h2><?php printf(t('Installation of Jirafeau') . ' - ' . t('step') .
     ' %d ' . t('out of') . ' %d', 2, 4);
     ?></h2> <div id = "install"> <form method="post"> <input type =
         "hidden" name = "jirafeau" value =
@@ -246,8 +231,7 @@ case 2:
         echo t('Administration password');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo
-        t
-        ('Jirafeau has an administration interface (through admin.php). ' .
+        t('Jirafeau has an administration interface (through admin.php). ' .
         'You can set a password to access the interface or leave it empty ' .
         'to disable the interface.');
     ?></td> </tr> <tr> <td class = "label"><label for = "select_password"
@@ -268,7 +252,7 @@ case 2:
 break;
 
 case 3:
-    ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
+    ?><h2><?php printf(t('Installation of Jirafeau') . ' - ' . t('step') .
     ' %d ' . t('out of') . ' %d', 3, 4);
     ?></h2> <div id = "install"> <form method="post"> <input type =
         "hidden" name = "jirafeau" value =
@@ -277,8 +261,7 @@ case 3:
         "3" /><fieldset> <legend><?php echo t('Information');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo
-        t
-        ('The base address of Jirafeau is the first part of the URL, until ' .
+        t('The base address of Jirafeau is the first part of the URL, until ' .
          '(and including) the last slash. For example: ' .
          '"http://www.example.com/". Do not forget the trailing slash!');
     ?></td> </tr> <tr> <td class = "label"><label for = "input_web_root"
@@ -286,7 +269,7 @@ case 3:
     ?></label></td>
         <td class = "field"><input type = "text" name = "web_root"
         id = "input_web_root" value = "<?php
-        echo (empty($cfg['web_root']) ?
+        echo(empty($cfg['web_root']) ?
           'http://' . $_SERVER['HTTP_HOST'] . str_replace(basename(__FILE__),
           '', $_SERVER['REQUEST_URI']) : $cfg['web_root']);
       ?>" size = "40" /></td>
@@ -300,18 +283,18 @@ case 3:
     ?></label></td>
         <td class = "field"><input type = "text" name = "var_root"
         id = "input_var_root" value = "<?php
-        if(empty($cfg['var_root'])) {
-          $alphanum = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' .
+        if (empty($cfg['var_root'])) {
+            $alphanum = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' .
           'abcdefghijklmnopqrstuvwxyz' . '0123456789';
-          $len_alphanum = strlen($alphanum);
-          $var = 'var-';
-          for($i = 0; $i <JIRAFEAU_VAR_RAND_LENGTH; $i++) {
-            $var .= substr($alphanum, mt_rand(0, $len_alphanum - 1), 1);
-          }
-          echo JIRAFEAU_ROOT . $var . '/';
+            $len_alphanum = strlen($alphanum);
+            $var = 'var-';
+            for ($i = 0; $i <JIRAFEAU_VAR_RAND_LENGTH; $i++) {
+                $var .= substr($alphanum, mt_rand(0, $len_alphanum - 1), 1);
+            }
+            echo JIRAFEAU_ROOT . $var . '/';
+        } else {
+            echo $cfg['var_root'];
         }
-        else
-          echo $cfg['var_root'];
       ?>" size = "40" /></td>
         </tr> <tr> <td colspan = "2"><input type = "submit"
         class = "navleft" name = "previous" value = "<?php
@@ -323,7 +306,7 @@ case 3:
 break;
 
 case 4:
-    ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
+    ?><h2><?php printf(t('Installation of Jirafeau') . ' - ' . t('step') .
     ' %d ' . t('out of') . ' %d', 4, 4);
     ?></h2> <div id = "install"> <form method="post"> <input type =
         "hidden" name = "jirafeau" value =
@@ -332,7 +315,7 @@ case 4:
         "4" /><fieldset> <legend><?php echo t('Finalisation');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo
-        t ('Jirafeau is setting the website according to the configuration ' .
+        t('Jirafeau is setting the website according to the configuration ' .
            'you provided.');
     ?></td> </tr> <tr> <td class = "nav previous"><input type =
         "submit" name = "previous" value =
@@ -342,21 +325,17 @@ case 4:
     ?>" /></td> <td></td> </tr>
         </table> </fieldset> </form> </div>
     <?php
-    $err = jirafeau_check_var_dir ($cfg['var_root']);
-    if ($err['has_error'])
-    {
-        echo '<div class="error"><p>'.$err['why'].'<br />'.NL;
-        ?><form method="post"> <input type = "hidden" name = "jirafeau" value =
+    $err = jirafeau_check_var_dir($cfg['var_root']);
+    if ($err['has_error']) {
+        echo '<div class="error"><p>'.$err['why'].'<br />'.NL; ?><form method="post"> <input type = "hidden" name = "jirafeau" value =
             "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
             "step" value = "4" /><input type = "submit" name =
             "retry" value =
             "<?php echo t('Retry this step'); ?>" /></form>
             <?php echo '</p></div>';
-    }
-    else
-    {
+    } else {
         $cfg['installation_done'] = true;
-        jirafeau_export_cfg ($cfg);
+        jirafeau_export_cfg($cfg);
         echo '<div class="message"><p>' .
              t('Jirafeau is now fully operational') . ':' .
              '<br /><a href="' . $cfg['web_root'] . '">' .
@@ -365,4 +344,4 @@ case 4:
 break;
 }
 
-require (JIRAFEAU_ROOT . 'lib/template/footer.php');
+require(JIRAFEAU_ROOT . 'lib/template/footer.php');
diff --git a/lib/config.original.php b/lib/config.original.php
index 2cc93e7..a81b207 100644
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -109,7 +109,7 @@ $cfg['admin_http_auth_user'] = '';
  * 'year': file available for one year
  * 'none': unlimited availability
  */
-$cfg['availabilities'] = array (
+$cfg['availabilities'] = array(
     'minute' => true,
     'hour' => true,
     'day' => true,
@@ -143,5 +143,3 @@ $cfg['proxy_ip'] = array();
  * or needs to start the installation script
  */
 $cfg['installation_done'] = false;
-
-?>
\ No newline at end of file
diff --git a/lib/functions.js.php b/lib/functions.js.php
index 31cefe3..dab491c 100644
--- a/lib/functions.js.php
+++ b/lib/functions.js.php
@@ -20,16 +20,16 @@
 
 header('Content-Type: text/javascript');
 
-define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/../');
+define('JIRAFEAU_ROOT', dirname(__FILE__) . '/../');
 
-require (JIRAFEAU_ROOT . 'lib/settings.php');
-require (JIRAFEAU_ROOT . 'lib/functions.php');
-require (JIRAFEAU_ROOT . 'lib/lang.php');
+require(JIRAFEAU_ROOT . 'lib/settings.php');
+require(JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/lang.php');
 ?>
 
 function translate (expr)
 {
-    var lang_array = <?php echo json_lang_generator () ?>;
+    var lang_array = <?php echo json_lang_generator() ?>;
     if (lang_array.hasOwnProperty(expr))
         return lang_array[expr];
     return expr;
diff --git a/lib/functions.php b/lib/functions.php
index 6c9c832..4d698c2 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -23,12 +23,12 @@
  * Transform a string in a path by seperating each letters by a '/'.
  * @return path finishing with a '/'
  */
-function
-s2p ($s)
+function s2p($s)
 {
     $p = '';
-    for ($i = 0; $i < strlen ($s); $i++)
+    for ($i = 0; $i < strlen($s); $i++) {
         $p .= $s{$i} . '/';
+    }
     return $p;
 }
 
@@ -36,11 +36,10 @@ s2p ($s)
  * Convert base 16 to base 64
  * @returns A string based on 64 characters (0-9, a-z, A-Z, "-" and "_")
  */
-function
-base_16_to_64 ($num)
+function base_16_to_64($num)
 {
     $m = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_';
-    $hex2bin = array ('0000',  # 0
+    $hex2bin = array('0000',  # 0
                       '0001',  # 1
                       '0010',  # 2
                       '0011',  # 3
@@ -60,16 +59,19 @@ base_16_to_64 ($num)
     $b = '';
     $i = 0;
     # Convert long hex string to bin.
-    $size = strlen ($num);
-    for ($i = 0; $i < $size; $i++)
-        $b .= $hex2bin{hexdec ($num{$i})};
+    $size = strlen($num);
+    for ($i = 0; $i < $size; $i++) {
+        $b .= $hex2bin{hexdec($num{$i})};
+    }
     # Convert long bin to base 64.
     $size *= 4;
-    for ($i = $size - 6; $i >= 0; $i -= 6)
-        $o = $m{bindec (substr ($b, $i, 6))} . $o;
+    for ($i = $size - 6; $i >= 0; $i -= 6) {
+        $o = $m{bindec(substr($b, $i, 6))} . $o;
+    }
     # Some few bits remaining ?
-    if ($i < 0 && $i > -6)
-        $o = $m{bindec (substr ($b, 0, $i + 6))} . $o;
+    if ($i < 0 && $i > -6) {
+        $o = $m{bindec(substr($b, 0, $i + 6))} . $o;
+    }
     return $o;
 }
 
@@ -78,80 +80,81 @@ base_16_to_64 ($num)
   * @param $l code length
   * @return  random code.
   */
-function
-jirafeau_gen_random ($l)
+function jirafeau_gen_random($l)
 {
-    if ($l <= 0)
+    if ($l <= 0) {
         return 42;
+    }
 
     $code="";
-    for ($i = 0; $i < $l; $i++)
-        $code .= dechex (rand (0, 15));
+    for ($i = 0; $i < $l; $i++) {
+        $code .= dechex(rand(0, 15));
+    }
 
     return $code;
 }
 
-function
-is_ssl() {
-    if ( isset($_SERVER['HTTPS']) ) {
-        if ( 'on' == strtolower($_SERVER['HTTPS']) ||
-             '1' == $_SERVER['HTTPS'] )
+function is_ssl()
+{
+    if (isset($_SERVER['HTTPS'])) {
+        if ('on' == strtolower($_SERVER['HTTPS']) ||
+             '1' == $_SERVER['HTTPS']) {
             return true;
-    } elseif ( isset($_SERVER['SERVER_PORT']) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
+        }
+    } elseif (isset($_SERVER['SERVER_PORT']) && ('443' == $_SERVER['SERVER_PORT'])) {
         return true;
     } elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
-        if ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')
+        if ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') {
             return true;
+        }
     }
     return false;
 }
 
-function
-jirafeau_human_size ($octets)
+function jirafeau_human_size($octets)
 {
-    $u = array ('B', 'KB', 'MB', 'GB', 'TB');
-    $o = max ($octets, 0);
-    $p = min (floor (($o ? log ($o) : 0) / log (1024)), count ($u) - 1);
-    $o /= pow (1024, $p);
-    return round ($o, 1) . $u[$p];
+    $u = array('B', 'KB', 'MB', 'GB', 'TB');
+    $o = max($octets, 0);
+    $p = min(floor(($o ? log($o) : 0) / log(1024)), count($u) - 1);
+    $o /= pow(1024, $p);
+    return round($o, 1) . $u[$p];
 }
 
-function
-jirafeau_clean_rm_link ($link)
+function jirafeau_clean_rm_link($link)
 {
-    $p = s2p ("$link");
-    if (file_exists (VAR_LINKS . $p . $link))
-        unlink (VAR_LINKS . $p . $link);
+    $p = s2p("$link");
+    if (file_exists(VAR_LINKS . $p . $link)) {
+        unlink(VAR_LINKS . $p . $link);
+    }
     $parse = VAR_LINKS . $p;
     $scan = array();
-    while (file_exists ($parse)
-           && ($scan = scandir ($parse))
-           && count ($scan) == 2 // '.' and '..' folders => empty.
-           && basename ($parse) != basename (VAR_LINKS))
-    {
-        rmdir ($parse);
-        $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
+    while (file_exists($parse)
+           && ($scan = scandir($parse))
+           && count($scan) == 2 // '.' and '..' folders => empty.
+           && basename($parse) != basename(VAR_LINKS)) {
+        rmdir($parse);
+        $parse = substr($parse, 0, strlen($parse) - strlen(basename($parse)) - 1);
     }
 }
 
-function
-jirafeau_clean_rm_file ($md5)
+function jirafeau_clean_rm_file($md5)
 {
-    $p = s2p ("$md5");
+    $p = s2p("$md5");
     $f = VAR_FILES . $p . $md5;
-    if (file_exists ($f) && is_file ($f))
-        unlink ($f);
-    if (file_exists ($f . '_count') && is_file ($f . '_count'))
-        unlink ($f . '_count');
+    if (file_exists($f) && is_file($f)) {
+        unlink($f);
+    }
+    if (file_exists($f . '_count') && is_file($f . '_count')) {
+        unlink($f . '_count');
+    }
     $parse = VAR_FILES . $p;
     $scan = array();
-    while (file_exists ($parse)
-           && ($scan = scandir ($parse))
-           && count ($scan) == 2 // '.' and '..' folders => empty.
-           && basename ($parse) != basename (VAR_FILES))
-    {
-        rmdir ($parse);
-        $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
+    while (file_exists($parse)
+           && ($scan = scandir($parse))
+           && count($scan) == 2 // '.' and '..' folders => empty.
+           && basename($parse) != basename(VAR_FILES)) {
+        rmdir($parse);
+        $parse = substr($parse, 0, strlen($parse) - strlen(basename($parse)) - 1);
     }
 }
 
@@ -160,13 +163,11 @@ jirafeau_clean_rm_file ($md5)
  * @param $value the value from php.ini
  * @returns an integer for this value
  */
-function
-jirafeau_ini_to_bytes ($value)
+function jirafeau_ini_to_bytes($value)
 {
-    $modifier = substr ($value, -1);
-    $bytes = substr ($value, 0, -1);
-    switch (strtoupper ($modifier))
-    {
+    $modifier = substr($value, -1);
+    $bytes = substr($value, 0, -1);
+    switch (strtoupper($modifier)) {
     case 'P':
         $bytes *= 1024;
     case 'T':
@@ -185,23 +186,21 @@ jirafeau_ini_to_bytes ($value)
  * gets the maximum upload size according to php.ini
  * @returns the maximum upload size in bytes
  */
-function
-jirafeau_get_max_upload_size_bytes ()
+function jirafeau_get_max_upload_size_bytes()
 {
-    return min (jirafeau_ini_to_bytes (ini_get ('post_max_size')),
-                jirafeau_ini_to_bytes (ini_get ('upload_max_filesize')));
+    return min(jirafeau_ini_to_bytes(ini_get('post_max_size')),
+                jirafeau_ini_to_bytes(ini_get('upload_max_filesize')));
 }
 
 /**
  * gets the maximum upload size according to php.ini
  * @returns the maximum upload size string
  */
-function
-jirafeau_get_max_upload_size ()
+function jirafeau_get_max_upload_size()
 {
     return jirafeau_human_size(
-            min (jirafeau_ini_to_bytes (ini_get ('post_max_size')),
-                 jirafeau_ini_to_bytes (ini_get ('upload_max_filesize'))));
+            min(jirafeau_ini_to_bytes(ini_get('post_max_size')),
+                 jirafeau_ini_to_bytes(ini_get('upload_max_filesize'))));
 }
 
 /**
@@ -209,11 +208,9 @@ jirafeau_get_max_upload_size ()
  * @param $code the error code
  * @returns a string explaining the error
  */
-function
-jirafeau_upload_errstr ($code)
+function jirafeau_upload_errstr($code)
 {
-    switch ($code)
-    {
+    switch ($code) {
     case UPLOAD_ERR_INI_SIZE:
     case UPLOAD_ERR_FORM_SIZE:
         return t('Your file exceeds the maximum authorized file size. ');
@@ -235,76 +232,70 @@ jirafeau_upload_errstr ($code)
  * @param $link the link's name (hash)
  */
 
-function
-jirafeau_delete_link ($link)
+function jirafeau_delete_link($link)
 {
-    $l = jirafeau_get_link ($link);
-    if (!count ($l))
+    $l = jirafeau_get_link($link);
+    if (!count($l)) {
         return;
+    }
 
-    jirafeau_clean_rm_link ($link);
+    jirafeau_clean_rm_link($link);
 
     $md5 = $l['md5'];
-    $p = s2p ("$md5");
+    $p = s2p("$md5");
 
     $counter = 1;
-    if (file_exists (VAR_FILES . $p . $md5. '_count'))
-    {
-        $content = file (VAR_FILES . $p . $md5. '_count');
-        $counter = trim ($content[0]);
+    if (file_exists(VAR_FILES . $p . $md5. '_count')) {
+        $content = file(VAR_FILES . $p . $md5. '_count');
+        $counter = trim($content[0]);
     }
     $counter--;
 
-    if ($counter >= 1)
-    {
-        $handle = fopen (VAR_FILES . $p . $md5. '_count', 'w');
-        fwrite ($handle, $counter);
-        fclose ($handle);
+    if ($counter >= 1) {
+        $handle = fopen(VAR_FILES . $p . $md5. '_count', 'w');
+        fwrite($handle, $counter);
+        fclose($handle);
     }
 
-    if ($counter == 0)
-        jirafeau_clean_rm_file ($md5);
+    if ($counter == 0) {
+        jirafeau_clean_rm_file($md5);
+    }
 }
 
 /**
  * Delete a file and it's links.
  */
-function
-jirafeau_delete_file ($md5)
+function jirafeau_delete_file($md5)
 {
     $count = 0;
     /* Get all links files. */
-    $stack = array (VAR_LINKS);
-    while (($d = array_shift ($stack)) && $d != NULL)
-    {
-        $dir = scandir ($d);
-
-        foreach ($dir as $node)
-        {
-            if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
-                preg_match ('/\.tmp/i', "$node"))
+    $stack = array(VAR_LINKS);
+    while (($d = array_shift($stack)) && $d != null) {
+        $dir = scandir($d);
+
+        foreach ($dir as $node) {
+            if (strcmp($node, '.') == 0 || strcmp($node, '..') == 0 ||
+                preg_match('/\.tmp/i', "$node")) {
                 continue;
+            }
 
-            if (is_dir ($d . $node))
-            {
+            if (is_dir($d . $node)) {
                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';
-            }
-            elseif (is_file ($d . $node))
-            {
+            } elseif (is_file($d . $node)) {
                 /* Read link informations. */
-                $l = jirafeau_get_link (basename ($node));
-                if (!count ($l))
+                $l = jirafeau_get_link(basename($node));
+                if (!count($l)) {
                     continue;
-                if ($l['md5'] == $md5)
-                {
+                }
+                if ($l['md5'] == $md5) {
                     $count++;
-                    jirafeau_delete_link ($node);
+                    jirafeau_delete_link($node);
                 }
             }
         }
     }
-    jirafeau_clean_rm_file ($md5);
+    jirafeau_clean_rm_file($md5);
     return $count;
 }
 
@@ -322,57 +313,52 @@ jirafeau_delete_file ($md5)
  *   'link' => the link name of the uploaded file
  *   'delete_link' => the link code to delete file
  */
-function
-jirafeau_upload ($file, $one_time_download, $key, $time, $ip, $crypt, $link_name_length)
+function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $link_name_length)
 {
-    if (empty ($file['tmp_name']) || !is_uploaded_file ($file['tmp_name']))
-    {
+    if (empty($file['tmp_name']) || !is_uploaded_file($file['tmp_name'])) {
         return (array(
                  'error' =>
-                   array ('has_error' => true,
-                          'why' => jirafeau_upload_errstr ($file['error'])),
+                   array('has_error' => true,
+                          'why' => jirafeau_upload_errstr($file['error'])),
                  'link' => '',
                  'delete_link' => ''));
     }
 
     /* array representing no error */
-    $noerr = array ('has_error' => false, 'why' => '');
+    $noerr = array('has_error' => false, 'why' => '');
 
     /* Crypt file if option is enabled. */
     $crypted = false;
     $crypt_key = '';
-    if ($crypt == true && !(extension_loaded('mcrypt') == true))
-        error_log ("PHP extension mcrypt not loaded, won't encrypt in Jirafeau");
-    if ($crypt == true && extension_loaded('mcrypt') == true)
-    {
-        $crypt_key = jirafeau_encrypt_file ($file['tmp_name'], $file['tmp_name']);
-        if (strlen($crypt_key) > 0)
+    if ($crypt == true && !(extension_loaded('mcrypt') == true)) {
+        error_log("PHP extension mcrypt not loaded, won't encrypt in Jirafeau");
+    }
+    if ($crypt == true && extension_loaded('mcrypt') == true) {
+        $crypt_key = jirafeau_encrypt_file($file['tmp_name'], $file['tmp_name']);
+        if (strlen($crypt_key) > 0) {
             $crypted = true;
+        }
     }
 
     /* file informations */
-    $md5 = md5_file ($file['tmp_name']);
-    $name = str_replace (NL, '', trim ($file['name']));
+    $md5 = md5_file($file['tmp_name']);
+    $name = str_replace(NL, '', trim($file['name']));
     $mime_type = $file['type'];
     $size = $file['size'];
 
     /* does file already exist ? */
     $rc = false;
-    $p = s2p ("$md5");
-    if (file_exists (VAR_FILES . $p .  $md5))
-    {
-        $rc = unlink ($file['tmp_name']);
-    }
-    elseif ((file_exists (VAR_FILES . $p) || @mkdir (VAR_FILES . $p, 0755, true))
-            && move_uploaded_file ($file['tmp_name'], VAR_FILES . $p . $md5))
-    {
+    $p = s2p("$md5");
+    if (file_exists(VAR_FILES . $p .  $md5)) {
+        $rc = unlink($file['tmp_name']);
+    } elseif ((file_exists(VAR_FILES . $p) || @mkdir(VAR_FILES . $p, 0755, true))
+            && move_uploaded_file($file['tmp_name'], VAR_FILES . $p . $md5)) {
         $rc = true;
     }
-    if (!$rc)
-    {
+    if (!$rc) {
         return (array(
                  'error' =>
-                   array ('has_error' => true,
+                   array('has_error' => true,
                           'why' => t('Internal error during file creation.')),
                  'link' =>'',
                  'delete_link' => ''));
@@ -380,59 +366,56 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip, $crypt, $link_name
 
     /* Increment or create count file. */
     $counter = 0;
-    if (file_exists (VAR_FILES . $p . $md5 . '_count'))
-    {
-        $content = file (VAR_FILES . $p . $md5. '_count');
-        $counter = trim ($content[0]);
+    if (file_exists(VAR_FILES . $p . $md5 . '_count')) {
+        $content = file(VAR_FILES . $p . $md5. '_count');
+        $counter = trim($content[0]);
     }
     $counter++;
-    $handle = fopen (VAR_FILES . $p . $md5. '_count', 'w');
-    fwrite ($handle, $counter);
-    fclose ($handle);
+    $handle = fopen(VAR_FILES . $p . $md5. '_count', 'w');
+    fwrite($handle, $counter);
+    fclose($handle);
 
     /* Create delete code. */
-    $delete_link_code = jirafeau_gen_random (5);
+    $delete_link_code = jirafeau_gen_random(5);
 
     /* md5 password or empty. */
     $password = '';
-    if (!empty ($key))
-        $password = md5 ($key);
+    if (!empty($key)) {
+        $password = md5($key);
+    }
 
     /* create link file */
-    $link_tmp_name =  VAR_LINKS . $md5 . rand (0, 10000) . '.tmp';
-    $handle = fopen ($link_tmp_name, 'w');
-    fwrite ($handle,
+    $link_tmp_name =  VAR_LINKS . $md5 . rand(0, 10000) . '.tmp';
+    $handle = fopen($link_tmp_name, 'w');
+    fwrite($handle,
             $name . NL. $mime_type . NL. $size . NL. $password . NL. $time .
-            NL . $md5. NL . ($one_time_download ? 'O' : 'R') . NL . time () .
+            NL . $md5. NL . ($one_time_download ? 'O' : 'R') . NL . time() .
             NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O'));
-    fclose ($handle);
-    $md5_link = substr(base_16_to_64 (md5_file ($link_tmp_name)), 0, $link_name_length);
-    $l = s2p ("$md5_link");
-    if (!@mkdir (VAR_LINKS . $l, 0755, true) ||
-        !rename ($link_tmp_name,  VAR_LINKS . $l . $md5_link))
-    {
-        if (file_exists ($link_tmp_name))
-            unlink ($link_tmp_name);
+    fclose($handle);
+    $md5_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);
+    $l = s2p("$md5_link");
+    if (!@mkdir(VAR_LINKS . $l, 0755, true) ||
+        !rename($link_tmp_name, VAR_LINKS . $l . $md5_link)) {
+        if (file_exists($link_tmp_name)) {
+            unlink($link_tmp_name);
+        }
 
         $counter--;
-        if ($counter >= 1)
-        {
-            $handle = fopen (VAR_FILES . $p . $md5. '_count', 'w');
-            fwrite ($handle, $counter);
-            fclose ($handle);
-        }
-        else
-        {
-            jirafeau_clean_rm_file ($md5_link);
+        if ($counter >= 1) {
+            $handle = fopen(VAR_FILES . $p . $md5. '_count', 'w');
+            fwrite($handle, $counter);
+            fclose($handle);
+        } else {
+            jirafeau_clean_rm_file($md5_link);
         }
         return array(
                  'error' =>
-                   array ('has_error' => true,
+                   array('has_error' => true,
                           'why' => t('Internal error during file creation. ')),
                  'link' =>'',
                  'delete_link' => '');
     }
-   return array ( 'error' => $noerr,
+    return array( 'error' => $noerr,
                   'link' => $md5_link,
                   'delete_link' => $delete_link_code,
                   'crypt_key' => $crypt_key);
@@ -443,30 +426,27 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip, $crypt, $link_name
  * @param $mime the mime type
  * @returns a boolean telling if a mime type is viewable
  */
-function
-jirafeau_is_viewable ($mime)
+function jirafeau_is_viewable($mime)
 {
-    if (!empty ($mime))
-    {
+    if (!empty($mime)) {
         /* Actually, verify if mime-type is an image or a text. */
-        $viewable = array ('image', 'text', 'video', 'audio');
-        $decomposed = explode ('/', $mime);
-        return in_array ($decomposed[0], $viewable);
+        $viewable = array('image', 'text', 'video', 'audio');
+        $decomposed = explode('/', $mime);
+        return in_array($decomposed[0], $viewable);
     }
     return false;
 }
 
 // Error handling functions.
 //! Global array that contains all registered errors.
-$error_list = array ();
+$error_list = array();
 
 /**
  * Adds an error to the list of errors.
  * @param $title the error's title
  * @param $description is a human-friendly description of the problem.
  */
-function
-add_error ($title, $description)
+function add_error($title, $description)
 {
     global $error_list;
     $error_list[] = '<p>' . $title. '<br />' . $description. '</p>';
@@ -476,79 +456,77 @@ add_error ($title, $description)
  * Informs whether any error has been registered yet.
  * @return true if there are errors.
  */
-function
-has_error ()
+function has_error()
 {
     global $error_list;
-    return !empty ($error_list);
+    return !empty($error_list);
 }
 
 /**
  * Displays all the errors.
  */
-function
-show_errors ()
+function show_errors()
 {
-    if (has_error ())
-    {
+    if (has_error()) {
         global $error_list;
         echo '<div class="error">';
-        foreach ($error_list as $error)
-        {
+        foreach ($error_list as $error) {
             echo $error;
         }
         echo '</div>';
     }
 }
 
-function check_errors ($cfg)
+function check_errors($cfg)
 {
-    if (file_exists (JIRAFEAU_ROOT . 'install.php')
-        && !($cfg['installation_done'] === true))
-    {
+    if (file_exists(JIRAFEAU_ROOT . 'install.php')
+        && !($cfg['installation_done'] === true)) {
         header('Location: install.php');
         exit;
     }
 
     /* check if the destination dirs are writable */
-    $writable = is_writable (VAR_FILES) && is_writable (VAR_LINKS);
+    $writable = is_writable(VAR_FILES) && is_writable(VAR_LINKS);
 
     /* Checking for errors. */
-    if (!is_writable (VAR_FILES))
-        add_error (t('The file directory is not writable!'), VAR_FILES);
+    if (!is_writable(VAR_FILES)) {
+        add_error(t('The file directory is not writable!'), VAR_FILES);
+    }
 
-    if (!is_writable (VAR_LINKS))
-        add_error (t('The link directory is not writable!'), VAR_LINKS);
+    if (!is_writable(VAR_LINKS)) {
+        add_error(t('The link directory is not writable!'), VAR_LINKS);
+    }
 
-    if (!is_writable (VAR_ASYNC))
-        add_error (t('The async directory is not writable!'), VAR_ASYNC);
+    if (!is_writable(VAR_ASYNC)) {
+        add_error(t('The async directory is not writable!'), VAR_ASYNC);
+    }
 }
 
 /**
  * Read link informations
  * @return array containing informations.
  */
-function
-jirafeau_get_link ($hash)
+function jirafeau_get_link($hash)
 {
-    $out = array ();
-    $link = VAR_LINKS . s2p ("$hash") . $hash;
+    $out = array();
+    $link = VAR_LINKS . s2p("$hash") . $hash;
 
-    if (!file_exists ($link))
+    if (!file_exists($link)) {
         return $out;
+    }
 
-    $c = file ($link);
-    $out['file_name'] = trim ($c[0]);
-    $out['mime_type'] = trim ($c[1]);
-    $out['file_size'] = trim ($c[2]);
-    $out['key'] = trim ($c[3], NL);
-    $out['time'] = trim ($c[4]);
-    $out['md5'] = trim ($c[5]);
-    $out['onetime'] = trim ($c[6]);
-    $out['upload_date'] = trim ($c[7]);
-    $out['ip'] = trim ($c[8]);
-    $out['link_code'] = trim ($c[9]);
-    $out['crypted'] = trim ($c[10]) == 'C';
+    $c = file($link);
+    $out['file_name'] = trim($c[0]);
+    $out['mime_type'] = trim($c[1]);
+    $out['file_size'] = trim($c[2]);
+    $out['key'] = trim($c[3], NL);
+    $out['time'] = trim($c[4]);
+    $out['md5'] = trim($c[5]);
+    $out['onetime'] = trim($c[6]);
+    $out['upload_date'] = trim($c[7]);
+    $out['ip'] = trim($c[8]);
+    $out['link_code'] = trim($c[9]);
+    $out['crypted'] = trim($c[10]) == 'C';
 
     return $out;
 }
@@ -556,18 +534,21 @@ jirafeau_get_link ($hash)
 /**
  * List files in admin interface.
  */
-function
-jirafeau_admin_list ($name, $file_hash, $link_hash)
+function jirafeau_admin_list($name, $file_hash, $link_hash)
 {
     echo '<fieldset><legend>';
-    if (!empty ($name))
+    if (!empty($name)) {
         echo t('Filename') . ": $name ";
-    if (!empty ($file_hash))
+    }
+    if (!empty($file_hash)) {
         echo t('file') . ": $file_hash ";
-    if (!empty ($link_hash))
+    }
+    if (!empty($link_hash)) {
         echo t('link') . ": $link_hash ";
-    if (empty ($name) && empty ($file_hash) && empty ($link_hash))
+    }
+    if (empty($name) && empty($file_hash) && empty($link_hash)) {
         echo t('List all files');
+    }
     echo '</legend>';
     echo '<table>';
     echo '<tr>';
@@ -582,34 +563,34 @@ jirafeau_admin_list ($name, $file_hash, $link_hash)
     echo '</tr>';
 
     /* Get all links files. */
-    $stack = array (VAR_LINKS);
-    while (($d = array_shift ($stack)) && $d != NULL)
-    {
-        $dir = scandir ($d);
-        foreach ($dir as $node)
-        {
-            if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
-                preg_match ('/\.tmp/i', "$node"))
+    $stack = array(VAR_LINKS);
+    while (($d = array_shift($stack)) && $d != null) {
+        $dir = scandir($d);
+        foreach ($dir as $node) {
+            if (strcmp($node, '.') == 0 || strcmp($node, '..') == 0 ||
+                preg_match('/\.tmp/i', "$node")) {
                 continue;
-            if (is_dir ($d . $node))
-            {
+            }
+            if (is_dir($d . $node)) {
                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';
-            }
-            elseif (is_file ($d . $node))
-            {
+            } elseif (is_file($d . $node)) {
                 /* Read link informations. */
-                $l = jirafeau_get_link ($node);
-                if (!count ($l))
+                $l = jirafeau_get_link($node);
+                if (!count($l)) {
                     continue;
+                }
 
                 /* Filter. */
-                if (!empty ($name) && !preg_match ("/$name/i", htmlspecialchars($l['file_name'])))
+                if (!empty($name) && !preg_match("/$name/i", htmlspecialchars($l['file_name']))) {
                     continue;
-                if (!empty ($file_hash) && $file_hash != $l['md5'])
+                }
+                if (!empty($file_hash) && $file_hash != $l['md5']) {
                     continue;
-                if (!empty ($link_hash) && $link_hash != $node)
+                }
+                if (!empty($link_hash) && $link_hash != $node) {
                     continue;
+                }
                 /* Print link informations. */
                 echo '<tr>';
                 echo '<td>' .
@@ -617,16 +598,17 @@ jirafeau_admin_list ($name, $file_hash, $link_hash)
                     t('Download page') . '">' . htmlspecialchars($l['file_name']) . '</a></strong>';
                 echo '</td>';
                 echo '<td>' . $l['mime_type'] . '</td>';
-                echo '<td>' . jirafeau_human_size ($l['file_size']) . '</td>';
-                echo '<td>' . ($l['time'] == -1 ? '' : strftime ('%c', $l['time'])) .
+                echo '<td>' . jirafeau_human_size($l['file_size']) . '</td>';
+                echo '<td>' . ($l['time'] == -1 ? '' : strftime('%c', $l['time'])) .
                      '</td>';
                 echo '<td>';
-                if ($l['onetime'] == 'O')
+                if ($l['onetime'] == 'O') {
                     echo 'Y';
-                else
+                } else {
                     echo 'N';
+                }
                 echo '</td>';
-                echo '<td>' . strftime ('%c', $l['upload_date']) . '</td>';
+                echo '<td>' . strftime('%c', $l['upload_date']) . '</td>';
                 echo '<td>' . $l['ip'] . '</td>';
                 echo '<td>' .
                 '<form action = "admin.php" method = "post">' .
@@ -656,39 +638,34 @@ jirafeau_admin_list ($name, $file_hash, $link_hash)
  * Clean expired files.
  * @return number of cleaned files.
  */
-function
-jirafeau_admin_clean ()
+function jirafeau_admin_clean()
 {
     $count = 0;
     /* Get all links files. */
-    $stack = array (VAR_LINKS);
-    while (($d = array_shift ($stack)) && $d != NULL)
-    {
-        $dir = scandir ($d);
-
-        foreach ($dir as $node)
-        {
-            if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
-                preg_match ('/\.tmp/i', "$node"))
+    $stack = array(VAR_LINKS);
+    while (($d = array_shift($stack)) && $d != null) {
+        $dir = scandir($d);
+
+        foreach ($dir as $node) {
+            if (strcmp($node, '.') == 0 || strcmp($node, '..') == 0 ||
+                preg_match('/\.tmp/i', "$node")) {
                 continue;
+            }
 
-            if (is_dir ($d . $node))
-            {
+            if (is_dir($d . $node)) {
                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';
-            }
-            elseif (is_file ($d . $node))
-            {
+            } elseif (is_file($d . $node)) {
                 /* Read link informations. */
-                $l = jirafeau_get_link (basename ($node));
-                if (!count ($l))
+                $l = jirafeau_get_link(basename($node));
+                if (!count($l)) {
                     continue;
-                $p = s2p ($l['md5']);
-                if ($l['time'] > 0 && $l['time'] < time () || // expired
-                    !file_exists (VAR_FILES . $p . $l['md5']) || // invalid
-                    !file_exists (VAR_FILES . $p . $l['md5'] . '_count')) // invalid
-                {
-                    jirafeau_delete_link ($node);
+                }
+                $p = s2p($l['md5']);
+                if ($l['time'] > 0 && $l['time'] < time() || // expired
+                    !file_exists(VAR_FILES . $p . $l['md5']) || // invalid
+                    !file_exists(VAR_FILES . $p . $l['md5'] . '_count')) { // invalid
+                    jirafeau_delete_link($node);
                     $count++;
                 }
             }
@@ -702,37 +679,32 @@ jirafeau_admin_clean ()
  * Clean old async transferts.
  * @return number of cleaned files.
  */
-function
-jirafeau_admin_clean_async ()
+function jirafeau_admin_clean_async()
 {
     $count = 0;
     /* Get all links files. */
-    $stack = array (VAR_ASYNC);
-    while (($d = array_shift ($stack)) && $d != NULL)
-    {
-        $dir = scandir ($d);
-
-        foreach ($dir as $node)
-        {
-            if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
-                preg_match ('/\.tmp/i', "$node"))
+    $stack = array(VAR_ASYNC);
+    while (($d = array_shift($stack)) && $d != null) {
+        $dir = scandir($d);
+
+        foreach ($dir as $node) {
+            if (strcmp($node, '.') == 0 || strcmp($node, '..') == 0 ||
+                preg_match('/\.tmp/i', "$node")) {
                 continue;
+            }
 
-            if (is_dir ($d . $node))
-            {
+            if (is_dir($d . $node)) {
                 /* Push new found directory. */
                 $stack[] = $d . $node . '/';
-            }
-            elseif (is_file ($d . $node))
-            {
+            } elseif (is_file($d . $node)) {
                 /* Read async informations. */
-                $a = jirafeau_get_async_ref (basename ($node));
-                if (!count ($a))
+                $a = jirafeau_get_async_ref(basename($node));
+                if (!count($a)) {
                     continue;
+                }
                 /* Delete transferts older than 1 hour. */
-                if (time () - $a['last_edited'] > 3600)
-                {
-                    jirafeau_async_delete (basename ($node));
+                if (time() - $a['last_edited'] > 3600) {
+                    jirafeau_async_delete(basename($node));
                     $count++;
                 }
             }
@@ -744,47 +716,47 @@ jirafeau_admin_clean_async ()
  * Read async transfert informations
  * @return array containing informations.
  */
-function
-jirafeau_get_async_ref ($ref)
+function jirafeau_get_async_ref($ref)
 {
-    $out = array ();
-    $refinfos = VAR_ASYNC . s2p ("$ref") . "$ref";
+    $out = array();
+    $refinfos = VAR_ASYNC . s2p("$ref") . "$ref";
 
-    if (!file_exists ($refinfos))
+    if (!file_exists($refinfos)) {
         return $out;
+    }
 
-    $c = file ($refinfos);
-    $out['file_name'] = trim ($c[0]);
-    $out['mime_type'] = trim ($c[1]);
-    $out['key'] = trim ($c[2], NL);
-    $out['time'] = trim ($c[3]);
-    $out['onetime'] = trim ($c[4]);
-    $out['ip'] = trim ($c[5]);
-    $out['last_edited'] = trim ($c[6]);
-    $out['next_code'] = trim ($c[7]);
+    $c = file($refinfos);
+    $out['file_name'] = trim($c[0]);
+    $out['mime_type'] = trim($c[1]);
+    $out['key'] = trim($c[2], NL);
+    $out['time'] = trim($c[3]);
+    $out['onetime'] = trim($c[4]);
+    $out['ip'] = trim($c[5]);
+    $out['last_edited'] = trim($c[6]);
+    $out['next_code'] = trim($c[7]);
     return $out;
 }
 
 /**
  * Delete async transfert informations
  */
-function
-jirafeau_async_delete ($ref)
+function jirafeau_async_delete($ref)
 {
-    $p = s2p ("$ref");
-    if (file_exists (VAR_ASYNC . $p . $ref))
-        unlink (VAR_ASYNC . $p . $ref);
-    if (file_exists (VAR_ASYNC . $p . $ref . '_data'))
-        unlink (VAR_ASYNC . $p . $ref . '_data');
+    $p = s2p("$ref");
+    if (file_exists(VAR_ASYNC . $p . $ref)) {
+        unlink(VAR_ASYNC . $p . $ref);
+    }
+    if (file_exists(VAR_ASYNC . $p . $ref . '_data')) {
+        unlink(VAR_ASYNC . $p . $ref . '_data');
+    }
     $parse = VAR_ASYNC . $p;
     $scan = array();
-    while (file_exists ($parse)
-           && ($scan = scandir ($parse))
-           && count ($scan) == 2 // '.' and '..' folders => empty.
-           && basename ($parse) != basename (VAR_ASYNC))
-    {
-        rmdir ($parse);
-        $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
+    while (file_exists($parse)
+           && ($scan = scandir($parse))
+           && count($scan) == 2 // '.' and '..' folders => empty.
+           && basename($parse) != basename(VAR_ASYNC)) {
+        rmdir($parse);
+        $parse = substr($parse, 0, strlen($parse) - strlen(basename($parse)) - 1);
     }
 }
 
@@ -797,41 +769,39 @@ jirafeau_async_delete ($ref)
   * @param $ip ip address of the client
   * @return a string containing a temporary reference followed by a code or the string 'Error'
   */
-function
-jirafeau_async_init ($filename, $type, $one_time, $key, $time, $ip)
+function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip)
 {
     $res = 'Error';
 
     /* Create temporary folder. */
     $ref;
     $p;
-    $code = jirafeau_gen_random (4);
-    do
-    {
-        $ref = jirafeau_gen_random (32);
-        $p = VAR_ASYNC . s2p ($ref);
-    } while (file_exists ($p));
-    @mkdir ($p, 0755, true);
-    if (!file_exists ($p))
-    {
+    $code = jirafeau_gen_random(4);
+    do {
+        $ref = jirafeau_gen_random(32);
+        $p = VAR_ASYNC . s2p($ref);
+    } while (file_exists($p));
+    @mkdir($p, 0755, true);
+    if (!file_exists($p)) {
         echo 'Error';
         return;
     }
 
     /* md5 password or empty */
     $password = '';
-    if (!empty ($key))
-        $password = md5 ($key);
+    if (!empty($key)) {
+        $password = md5($key);
+    }
 
     /* Store informations. */
     $p .= $ref;
-    $handle = fopen ($p, 'w');
-    fwrite ($handle,
-            str_replace (NL, '', trim ($filename)) . NL .
-            str_replace (NL, '', trim ($type)) . NL . $password . NL .
+    $handle = fopen($p, 'w');
+    fwrite($handle,
+            str_replace(NL, '', trim($filename)) . NL .
+            str_replace(NL, '', trim($type)) . NL . $password . NL .
             $time . NL . ($one_time ? 'O' : 'R') . NL . $ip . NL .
-            time () . NL . $code . NL);
-    fclose ($handle);
+            time() . NL . $code . NL);
+    fclose($handle);
 
     return $ref . NL . $code ;
 }
@@ -844,20 +814,20 @@ jirafeau_async_init ($filename, $type, $one_time, $key, $time, $ip)
   * @param $max_file_size maximum allowed file size
   * @return a string containing a next code to use or the string "Error"
   */
-function
-jirafeau_async_push ($ref, $data, $code, $max_file_size)
+function jirafeau_async_push($ref, $data, $code, $max_file_size)
 {
     /* Get async infos. */
-    $a = jirafeau_get_async_ref ($ref);
+    $a = jirafeau_get_async_ref($ref);
 
     /* Check some errors. */
-    if (count ($a) == 0
+    if (count($a) == 0
         || $a['next_code'] != "$code"
-        || empty ($data['tmp_name'])
-        || !is_uploaded_file ($data['tmp_name']))
+        || empty($data['tmp_name'])
+        || !is_uploaded_file($data['tmp_name'])) {
         return 'Error';
+    }
 
-    $p = s2p ($ref);
+    $p = s2p($ref);
 
     /* File path. */
     $r_path = $data['tmp_name'];
@@ -865,37 +835,34 @@ jirafeau_async_push ($ref, $data, $code, $max_file_size)
 
     /* Check that file size is not above upload limit. */
     if ($max_file_size > 0 &&
-        filesize ($r_path) + filesize ($w_path) > $max_file_size * 1024 * 1024)
-    {
-        jirafeau_async_delete ($ref);
+        filesize($r_path) + filesize($w_path) > $max_file_size * 1024 * 1024) {
+        jirafeau_async_delete($ref);
         return 'Error';
     }
 
     /* Concatenate data. */
-    $r = fopen ($r_path, 'r');
-    $w = fopen ($w_path, 'a');
-    while (!feof ($r))
-    {
-        if (fwrite ($w, fread ($r, 1024)) === false)
-        {
-            fclose ($r);
-            fclose ($w);
-            jirafeau_async_delete ($ref);
+    $r = fopen($r_path, 'r');
+    $w = fopen($w_path, 'a');
+    while (!feof($r)) {
+        if (fwrite($w, fread($r, 1024)) === false) {
+            fclose($r);
+            fclose($w);
+            jirafeau_async_delete($ref);
             return 'Error';
         }
     }
-    fclose ($r);
-    fclose ($w);
-    unlink ($r_path);
+    fclose($r);
+    fclose($w);
+    unlink($r_path);
 
     /* Update async file. */
-    $code = jirafeau_gen_random (4);
-    $handle = fopen (VAR_ASYNC . $p . $ref, 'w');
-    fwrite ($handle,
+    $code = jirafeau_gen_random(4);
+    $handle = fopen(VAR_ASYNC . $p . $ref, 'w');
+    fwrite($handle,
             $a['file_name'] . NL. $a['mime_type'] . NL. $a['key'] . NL .
             $a['time'] . NL . $a['onetime'] . NL . $a['ip'] . NL .
-            time () . NL . $code . NL);
-    fclose ($handle);
+            time() . NL . $code . NL);
+    fclose($handle);
     return $code;
 }
 
@@ -907,77 +874,80 @@ jirafeau_async_push ($ref, $data, $code, $max_file_size)
   * @param $link_name_length link name length
   * @return a string containing the download reference followed by a delete code or the string 'Error'
   */
-function
-jirafeau_async_end ($ref, $code, $crypt, $link_name_length)
+function jirafeau_async_end($ref, $code, $crypt, $link_name_length)
 {
     /* Get async infos. */
-    $a = jirafeau_get_async_ref ($ref);
-    if (count ($a) == 0
-        || $a['next_code'] != "$code")
+    $a = jirafeau_get_async_ref($ref);
+    if (count($a) == 0
+        || $a['next_code'] != "$code") {
         return "Error";
+    }
 
     /* Generate link infos. */
-    $p = VAR_ASYNC . s2p ($ref) . $ref . "_data";
-    if (!file_exists($p))
+    $p = VAR_ASYNC . s2p($ref) . $ref . "_data";
+    if (!file_exists($p)) {
         return 'Error';
+    }
 
     $crypted = false;
     $crypt_key = '';
-    if ($crypt == true && extension_loaded('mcrypt') == true)
-    {
-        $crypt_key = jirafeau_encrypt_file ($p, $p);
-        if (strlen($crypt_key) > 0)
+    if ($crypt == true && extension_loaded('mcrypt') == true) {
+        $crypt_key = jirafeau_encrypt_file($p, $p);
+        if (strlen($crypt_key) > 0) {
             $crypted = true;
+        }
     }
 
-    $md5 = md5_file ($p);
+    $md5 = md5_file($p);
     $size = filesize($p);
-    $np = s2p ($md5);
-    $delete_link_code = jirafeau_gen_random (5);
+    $np = s2p($md5);
+    $delete_link_code = jirafeau_gen_random(5);
 
     /* File already exist ? */
-    if (!file_exists (VAR_FILES . $np))
-        @mkdir (VAR_FILES . $np, 0755, true);
-    if (!file_exists (VAR_FILES . $np . $md5))
-        rename ($p, VAR_FILES . $np . $md5);
+    if (!file_exists(VAR_FILES . $np)) {
+        @mkdir(VAR_FILES . $np, 0755, true);
+    }
+    if (!file_exists(VAR_FILES . $np . $md5)) {
+        rename($p, VAR_FILES . $np . $md5);
+    }
 
     /* Increment or create count file. */
     $counter = 0;
-    if (file_exists (VAR_FILES . $np . $md5 . '_count'))
-    {
-        $content = file (VAR_FILES . $np . $md5. '_count');
-        $counter = trim ($content[0]);
+    if (file_exists(VAR_FILES . $np . $md5 . '_count')) {
+        $content = file(VAR_FILES . $np . $md5. '_count');
+        $counter = trim($content[0]);
     }
     $counter++;
-    $handle = fopen (VAR_FILES . $np . $md5. '_count', 'w');
-    fwrite ($handle, $counter);
-    fclose ($handle);
+    $handle = fopen(VAR_FILES . $np . $md5. '_count', 'w');
+    fwrite($handle, $counter);
+    fclose($handle);
 
     /* Create link. */
-    $link_tmp_name =  VAR_LINKS . $md5 . rand (0, 10000) . '.tmp';
-    $handle = fopen ($link_tmp_name, 'w');
-    fwrite ($handle,
+    $link_tmp_name =  VAR_LINKS . $md5 . rand(0, 10000) . '.tmp';
+    $handle = fopen($link_tmp_name, 'w');
+    fwrite($handle,
             $a['file_name'] . NL . $a['mime_type'] . NL . $size . NL .
             $a['key'] . NL . $a['time'] . NL . $md5 . NL . $a['onetime'] . NL .
-            time () . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O'));
-    fclose ($handle);
-    $md5_link = substr(base_16_to_64 (md5_file ($link_tmp_name)), 0, $link_name_length);
-    $l = s2p ("$md5_link");
-    if (!@mkdir (VAR_LINKS . $l, 0755, true) ||
-        !rename ($link_tmp_name,  VAR_LINKS . $l . $md5_link))
+            time() . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O'));
+    fclose($handle);
+    $md5_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);
+    $l = s2p("$md5_link");
+    if (!@mkdir(VAR_LINKS . $l, 0755, true) ||
+        !rename($link_tmp_name, VAR_LINKS . $l . $md5_link)) {
         echo "Error";
+    }
 
     /* Clean async upload. */
-    jirafeau_async_delete ($ref);
+    jirafeau_async_delete($ref);
     return $md5_link . NL . $delete_link_code . NL . urlencode($crypt_key);
 }
 
-function
-jirafeau_crypt_create_iv($base, $size)
+function jirafeau_crypt_create_iv($base, $size)
 {
     $iv = '';
-    while (strlen ($iv) < $size)
+    while (strlen($iv) < $size) {
         $iv = $iv . $base;
+    }
     $iv = substr($iv, 0, $size);
     return $iv;
 }
@@ -988,32 +958,32 @@ jirafeau_crypt_create_iv($base, $size)
  * @param $fp_dst file path to the file to write crypted file (could be the same).
  * @return decrypt key composed of the key and the iv separated by a point ('.')
  */
-function
-jirafeau_encrypt_file ($fp_src, $fp_dst)
+function jirafeau_encrypt_file($fp_src, $fp_dst)
 {
-    $fs = filesize ($fp_src);
-    if ($fs === false || $fs == 0 || !(extension_loaded('mcrypt') == true))
+    $fs = filesize($fp_src);
+    if ($fs === false || $fs == 0 || !(extension_loaded('mcrypt') == true)) {
         return '';
+    }
 
     /* Prepare module. */
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Generate key. */
-    $crypt_key = jirafeau_gen_random (10);
+    $crypt_key = jirafeau_gen_random(10);
     $md5_key = md5($crypt_key);
-    $iv = jirafeau_crypt_create_iv ($md5_key, mcrypt_enc_get_iv_size($m));
+    $iv = jirafeau_crypt_create_iv($md5_key, mcrypt_enc_get_iv_size($m));
     /* Init module. */
     mcrypt_generic_init($m, $md5_key, $iv);
     /* Crypt file. */
-    $r = fopen ($fp_src, 'r');
-    $w = fopen ($fp_dst, 'c');
-    while (!feof ($r))
-    {
-        $enc = mcrypt_generic($m, fread ($r, 1024));
-        if (fwrite ($w, $enc) === false)
+    $r = fopen($fp_src, 'r');
+    $w = fopen($fp_dst, 'c');
+    while (!feof($r)) {
+        $enc = mcrypt_generic($m, fread($r, 1024));
+        if (fwrite($w, $enc) === false) {
             return '';
+        }
     }
-    fclose ($r);
-    fclose ($w);
+    fclose($r);
+    fclose($w);
     /* Cleanup. */
     mcrypt_generic_deinit($m);
     mcrypt_module_close($m);
@@ -1027,30 +997,30 @@ jirafeau_encrypt_file ($fp_src, $fp_dst)
  * @param $k string composed of the key and the iv separated by a point ('.')
  * @return key used to decrypt. a string of length 0 is returned if failed.
  */
-function
-jirafeau_decrypt_file ($fp_src, $fp_dst, $k)
+function jirafeau_decrypt_file($fp_src, $fp_dst, $k)
 {
-    $fs = filesize ($fp_src);
-    if ($fs === false || $fs == 0 || extension_loaded('mcrypt') == false)
+    $fs = filesize($fp_src);
+    if ($fs === false || $fs == 0 || extension_loaded('mcrypt') == false) {
         return false;
+    }
 
     /* Init module */
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Extract key and iv. */
     $crypt_key = $k;
     $md5_key = md5($crypt_key);
-    $iv = jirafeau_crypt_create_iv ($md5_key, mcrypt_enc_get_iv_size($m));
+    $iv = jirafeau_crypt_create_iv($md5_key, mcrypt_enc_get_iv_size($m));
     /* Decrypt file. */
-    $r = fopen ($fp_src, 'r');
-    $w = fopen ($fp_dst, 'c');
-    while (!feof ($r))
-    {
-        $dec = mdecrypt_generic($m, fread ($r, 1024));
-        if (fwrite ($w, $dec) === false)
+    $r = fopen($fp_src, 'r');
+    $w = fopen($fp_dst, 'c');
+    while (!feof($r)) {
+        $dec = mdecrypt_generic($m, fread($r, 1024));
+        if (fwrite($w, $dec) === false) {
             return false;
+        }
     }
-    fclose ($r);
-    fclose ($w);
+    fclose($r);
+    fclose($w);
     /* Cleanup. */
     mcrypt_generic_deinit($m);
     mcrypt_module_close($m);
@@ -1061,10 +1031,9 @@ jirafeau_decrypt_file ($fp_src, $fp_dst, $k)
  * Check if Jirafeau is password protected for visitors.
  * @return true if Jirafeau is password protected, false otherwise.
  */
-function
-jirafeau_has_upload_password ($cfg)
+function jirafeau_has_upload_password($cfg)
 {
-    return count ($cfg['upload_password']) > 0;
+    return count($cfg['upload_password']) > 0;
 }
 
 /**
@@ -1072,14 +1041,16 @@ jirafeau_has_upload_password ($cfg)
  * @param $password password to be challenged
  * @return true if password is valid, false otherwise.
  */
-function
-jirafeau_challenge_upload_password ($cfg, $password)
+function jirafeau_challenge_upload_password($cfg, $password)
 {
-    if (!jirafeau_has_upload_password($cfg))
+    if (!jirafeau_has_upload_password($cfg)) {
         return false;
-    forEach ($cfg['upload_password'] as $p)
-        if ($password == $p)
+    }
+    foreach ($cfg['upload_password'] as $p) {
+        if ($password == $p) {
             return true;
+        }
+    }
     return false;
 }
 
@@ -1088,62 +1059,60 @@ jirafeau_challenge_upload_password ($cfg, $password)
  * @param $ip IP to be challenged
  * @return true if IP is authorized, false otherwise.
  */
-function
-jirafeau_challenge_upload_ip ($cfg, $ip)
+function jirafeau_challenge_upload_ip($cfg, $ip)
 {
-    if (count ($cfg['upload_ip']) == 0)
+    if (count($cfg['upload_ip']) == 0) {
         return true;
-    forEach ($cfg['upload_ip'] as $i)
-    {
-        if ($i == $ip)
+    }
+    foreach ($cfg['upload_ip'] as $i) {
+        if ($i == $ip) {
             return true;
+        }
         // CIDR test for IPv4 only.
-        if (strpos ($i, '/') !== false)
-        {
-            list ($subnet, $mask) = explode('/', $i);
-            if ((ip2long ($ip) & ~((1 << (32 - $mask)) - 1) ) == ip2long ($subnet))
+        if (strpos($i, '/') !== false) {
+            list($subnet, $mask) = explode('/', $i);
+            if ((ip2long($ip) & ~((1 << (32 - $mask)) - 1)) == ip2long($subnet)) {
                 return true;
+            }
         }
     }
     return false;
 }
 
 /** Tell if we have some HTTP headers generated by a proxy */
-function
-has_http_forwarded()
+function has_http_forwarded()
 {
     return
-        !empty ($_SERVER['HTTP_X_FORWARDED_FOR']) ||
-        !empty ($_SERVER['http_X_forwarded_for']);
+        !empty($_SERVER['HTTP_X_FORWARDED_FOR']) ||
+        !empty($_SERVER['http_X_forwarded_for']);
 }
 
 /**
  * Generate IP list from HTTP headers generated by a proxy
  * @return  array of IP strings
  */
-function
-get_ip_list_http_forwarded()
+function get_ip_list_http_forwarded()
 {
     $ip_list = array();
-    if (!empty ($_SERVER['HTTP_X_FORWARDED_FOR']))
-    {
-        $l = explode (',', $_SERVER['HTTP_X_FORWARDED_FOR']);
-        if ($l === FALSE)
+    if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+        $l = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
+        if ($l === false) {
             return array();
-        foreach ($l as $ip)
-            array_push ($ip_list, preg_replace ('/\s+/', '', $ip));
-    }
-    if (!empty ($_SERVER['http_X_forwarded_for']))
-    {
-        $l = explode (',', $_SERVER['http_X_forwarded_for']);
-        foreach ($l as $ip)
-        {
+        }
+        foreach ($l as $ip) {
+            array_push($ip_list, preg_replace('/\s+/', '', $ip));
+        }
+    }
+    if (!empty($_SERVER['http_X_forwarded_for'])) {
+        $l = explode(',', $_SERVER['http_X_forwarded_for']);
+        foreach ($l as $ip) {
             // Separate IP from port
-            $ipa = explode (':', $ip);
-            if ($ipa === FALSE)
+            $ipa = explode(':', $ip);
+            if ($ipa === false) {
                 continue;
+            }
             $ip = $ipa[0];
-            array_push ($ip_list, preg_replace ('/\s+/', '', $ip));
+            array_push($ip_list, preg_replace('/\s+/', '', $ip));
         }
     }
     return $ip_list;
@@ -1154,23 +1123,24 @@ get_ip_list_http_forwarded()
  * or from HTTP_X_FORWARDED_FOR if behind a proxy
  * @returns the client ip address
  */
-function
-get_ip_address($cfg)
+function get_ip_address($cfg)
 {
     $remote = $_SERVER['REMOTE_ADDR'];
-    if (count ($cfg['proxy_ip']) == 0 || !has_http_forwarded ())
+    if (count($cfg['proxy_ip']) == 0 || !has_http_forwarded()) {
         return $remote;
+    }
 
-    $ip_list = get_ip_list_http_forwarded ();
-    if (count ($ip_list) == 0)
+    $ip_list = get_ip_list_http_forwarded();
+    if (count($ip_list) == 0) {
         return $remote;
+    }
 
-    foreach ($cfg['proxy_ip'] as $proxy_ip)
-    {
-        if ($remote != $proxy_ip)
+    foreach ($cfg['proxy_ip'] as $proxy_ip) {
+        if ($remote != $proxy_ip) {
             continue;
+        }
         // Take the last IP (the one which has been set by the defined proxy).
-        return end ($ip_list);
+        return end($ip_list);
     }
     return $remote;
 }
@@ -1181,29 +1151,30 @@ get_ip_address($cfg)
 function hex_to_base64($hex)
 {
     $b = '';
-    foreach (str_split ($hex, 2) as $pair)
-        $b .= chr (hexdec ($pair));
-    return base64_encode ($b);
+    foreach (str_split($hex, 2) as $pair) {
+        $b .= chr(hexdec($pair));
+    }
+    return base64_encode($b);
 }
 
 /**
  * Read alias informations
  * @return array containing informations.
  */
-function
-jirafeau_get_alias ($hash)
+function jirafeau_get_alias($hash)
 {
-    $out = array ();
-    $link = VAR_ALIAS . s2p ("$hash") . $hash;
+    $out = array();
+    $link = VAR_ALIAS . s2p("$hash") . $hash;
 
-    if (!file_exists ($link))
+    if (!file_exists($link)) {
         return $out;
+    }
 
-    $c = file ($link);
-    $out['md5_password'] = trim ($c[0]);
-    $out['ip'] = trim ($c[1]);
-    $out['update_date'] = trim ($c[2]);
-    $out['destination'] = trim ($c[3], NL);
+    $c = file($link);
+    $out['md5_password'] = trim($c[0]);
+    $out['ip'] = trim($c[1]);
+    $out['update_date'] = trim($c[2]);
+    $out['destination'] = trim($c[3], NL);
 
     return $out;
 }
@@ -1215,44 +1186,47 @@ jirafeau_get_alias ($hash)
  * @param $ip client's IP
  * @return  a string containing the edit code of the alias or the string "Error"
  */
-function
-jirafeau_alias_create ($alias, $destination, $password, $ip)
+function jirafeau_alias_create($alias, $destination, $password, $ip)
 {
     /* Check that alias and password are long enough. */
-    if (strlen ($alias) < 8 ||
-        strlen ($alias) > 32 ||
-        strlen ($password) < 8 ||
-        strlen ($password) > 32)
+    if (strlen($alias) < 8 ||
+        strlen($alias) > 32 ||
+        strlen($password) < 8 ||
+        strlen($password) > 32) {
         return 'Error';
+    }
 
     /* Check that destination exists. */
-    $l = jirafeau_get_link ($destination);
-    if (!count ($l))
+    $l = jirafeau_get_link($destination);
+    if (!count($l)) {
         return 'Error';
+    }
 
     /* Check that alias does not already exists. */
-    $alias = md5 ($alias);
-    $p = VAR_ALIAS . s2p ($alias);
-    if (file_exists ($p))
+    $alias = md5($alias);
+    $p = VAR_ALIAS . s2p($alias);
+    if (file_exists($p)) {
         return 'Error';
+    }
 
     /* Create alias folder. */
-    @mkdir ($p, 0755, true);
-    if (!file_exists ($p))
+    @mkdir($p, 0755, true);
+    if (!file_exists($p)) {
         return 'Error';
+    }
 
     /* Generate password. */
-    $md5_password = md5 ($password);
+    $md5_password = md5($password);
 
     /* Store informations. */
     $p .= $alias;
-    $handle = fopen ($p, 'w');
-    fwrite ($handle,
+    $handle = fopen($p, 'w');
+    fwrite($handle,
             $md5_password . NL .
             $ip . NL .
-            time () . NL .
+            time() . NL .
             $destination . NL);
-    fclose ($handle);
+    fclose($handle);
 
     return 'Ok';
 }
@@ -1265,41 +1239,44 @@ jirafeau_alias_create ($alias, $destination, $password, $ip)
  * @param $ip client's IP
  * @return "Ok" or "Error" string
  */
-function
-jirafeau_alias_update ($alias, $destination, $password,
+function jirafeau_alias_update($alias, $destination, $password,
                        $new_password, $ip)
 {
-    $alias = md5 ($alias);
+    $alias = md5($alias);
     /* Check that alias exits. */
-    $a = jirafeau_get_alias ($alias);
-    if (!count ($a))
+    $a = jirafeau_get_alias($alias);
+    if (!count($a)) {
         return 'Error';
+    }
 
     /* Check that destination exists. */
-    $l = jirafeau_get_link ($a["destination"]);
-    if (!count ($l))
+    $l = jirafeau_get_link($a["destination"]);
+    if (!count($l)) {
         return 'Error';
+    }
 
     /* Check password. */
-    if ($a["md5_password"] != md5 ($password))
+    if ($a["md5_password"] != md5($password)) {
         return 'Error';
+    }
 
     $p = $a['md5_password'];
-    if (strlen ($new_password) >= 8 &&
-        strlen ($new_password) <= 32)
-        $p = md5 ($new_password);
-    else if (strlen ($new_password) > 0)
+    if (strlen($new_password) >= 8 &&
+        strlen($new_password) <= 32) {
+        $p = md5($new_password);
+    } elseif (strlen($new_password) > 0) {
         return 'Error';
+    }
 
     /* Rewrite informations. */
-    $p = VAR_ALIAS . s2p ($alias) . $alias;
-    $handle = fopen ($p, 'w');
-    fwrite ($handle,
+    $p = VAR_ALIAS . s2p($alias) . $alias;
+    $handle = fopen($p, 'w');
+    fwrite($handle,
             $p . NL .
             $ip . NL .
-            time () . NL .
+            time() . NL .
             $destination . NL);
-    fclose ($handle);
+    fclose($handle);
     return 'Ok';
 }
 
@@ -1307,33 +1284,32 @@ jirafeau_alias_update ($alias, $destination, $password,
  * @param $alias alias to get
  * @return alias destination or "Error" string
  */
-function
-jirafeau_alias_get ($alias)
+function jirafeau_alias_get($alias)
 {
-    $alias = md5 ($alias);
+    $alias = md5($alias);
     /* Check that alias exits. */
-    $a = jirafeau_get_alias ($alias);
-    if (!count ($a))
+    $a = jirafeau_get_alias($alias);
+    if (!count($a)) {
         return 'Error';
+    }
 
     return $a['destination'];
 }
 
-function
-jirafeau_clean_rm_alias ($alias)
+function jirafeau_clean_rm_alias($alias)
 {
-    $p = s2p ("$alias");
-    if (file_exists (VAR_ALIAS . $p . $alias))
-        unlink (VAR_ALIAS . $p . $alias);
+    $p = s2p("$alias");
+    if (file_exists(VAR_ALIAS . $p . $alias)) {
+        unlink(VAR_ALIAS . $p . $alias);
+    }
     $parse = VAR_ALIAS . $p;
     $scan = array();
-    while (file_exists ($parse)
-           && ($scan = scandir ($parse))
-           && count ($scan) == 2 // '.' and '..' folders => empty.
-           && basename ($parse) != basename (VAR_ALIAS))
-    {
-        rmdir ($parse);
-        $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
+    while (file_exists($parse)
+           && ($scan = scandir($parse))
+           && count($scan) == 2 // '.' and '..' folders => empty.
+           && basename($parse) != basename(VAR_ALIAS)) {
+        rmdir($parse);
+        $parse = substr($parse, 0, strlen($parse) - strlen(basename($parse)) - 1);
     }
 }
 
@@ -1342,20 +1318,21 @@ jirafeau_clean_rm_alias ($alias)
  * @param $password password to protect alias
  * @return "Ok" or "Error" string
  */
-function
-jirafeau_alias_delete ($alias, $password)
+function jirafeau_alias_delete($alias, $password)
 {
-    $alias = md5 ($alias);
+    $alias = md5($alias);
     /* Check that alias exits. */
-    $a = jirafeau_get_alias ($alias);
-    if (!count ($a))
+    $a = jirafeau_get_alias($alias);
+    if (!count($a)) {
         return "Error";
+    }
 
     /* Check password. */
-    if ($a["md5_password"] != md5 ($password))
+    if ($a["md5_password"] != md5($password)) {
         return 'Error';
+    }
 
-    jirafeau_clean_rm_alias ($alias);
+    jirafeau_clean_rm_alias($alias);
     return 'Ok';
 }
 
@@ -1368,8 +1345,7 @@ jirafeau_alias_delete ($alias, $password)
  * @param $htmllinebreaks boolean Convert linebreaks to BR-Tags
  * @return Template with replaced markers
  */
-function
-jirafeau_replace_markers ($content, $htmllinebreaks = false)
+function jirafeau_replace_markers($content, $htmllinebreaks = false)
 {
     $patterns = array(
         '/###ORGANISATION###/',
@@ -1388,4 +1364,4 @@ jirafeau_replace_markers ($content, $htmllinebreaks = false)
     }
 
     return $content;
-}
\ No newline at end of file
+}
diff --git a/lib/lang.php b/lib/lang.php
index 7748054..4c5bce2 100644
--- a/lib/lang.php
+++ b/lib/lang.php
@@ -18,7 +18,7 @@
  */
 
 global $languages_list;
-$languages_list = array ('auto' => 'Automatic',
+$languages_list = array('auto' => 'Automatic',
                          'de'   => 'Deutsch',
                          'en'   => 'English',
                          'el'   => 'Ελληνικά',
@@ -34,78 +34,85 @@ $languages_list = array ('auto' => 'Automatic',
                          'zh'   => '汉语');
 
 /* Translation */
-function t ($text)
+function t($text)
 {
     $cfg = $GLOBALS['cfg'];
     $languages_list = $GLOBALS['languages_list'];
 
     /* Detect user's langage if we are in automatic mode. */
-    if (strcmp ($cfg['lang'], 'auto') == 0)
-    {
-        if (isset ($_SERVER['HTTP_ACCEPT_LANGUAGE']))
-            $l = substr ($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
-        else
+    if (strcmp($cfg['lang'], 'auto') == 0) {
+        if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+            $l = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
+        } else {
             $l = "en";
-    }
-    else
+        }
+    } else {
         $l = $cfg['lang'];
+    }
 
     /* Is the langage in the list ? */
     $found = false;
-    foreach ($languages_list as $key => $v)
-        if (strcmp ($l, $key) == 0)
+    foreach ($languages_list as $key => $v) {
+        if (strcmp($l, $key) == 0) {
             $found = true;
+        }
+    }
 
     /* Don't translate english. */
-    if (!($found && strcmp ($l, "en")))
+    if (!($found && strcmp($l, "en"))) {
         return $text;
+    }
 
     /* Open translation file. */
-    $trans_j = file_get_contents (JIRAFEAU_ROOT . "lib/locales/$l.json");
-    if ($trans_j === FALSE)
+    $trans_j = file_get_contents(JIRAFEAU_ROOT . "lib/locales/$l.json");
+    if ($trans_j === false) {
         return $text;
+    }
 
     /* Decode JSON. */
-    $trans = json_decode ($trans_j, true);
-    if ($trans === NULL)
+    $trans = json_decode($trans_j, true);
+    if ($trans === null) {
         return $text;
+    }
 
     /* Try to find translation. */
-    if (!array_key_exists ($text, $trans))
+    if (!array_key_exists($text, $trans)) {
         return $text;
+    }
 
     return $trans[$text];
 }
 
-function json_lang_generator ()
+function json_lang_generator()
 {
     $cfg = $GLOBALS['cfg'];
     $languages_list = $GLOBALS['languages_list'];
 
     /* Detect user's langage if we are in automatic mode. */
-    if (strcmp ($cfg['lang'], 'auto') == 0)
-    {
-        if (isset ($_SERVER['HTTP_ACCEPT_LANGUAGE']))
-            $l = substr ($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
-        else
+    if (strcmp($cfg['lang'], 'auto') == 0) {
+        if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+            $l = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
+        } else {
             $l = "en";
-    }
-    else
+        }
+    } else {
         $l = $cfg['lang'];
+    }
 
     /* Is the langage in the list ? */
     $found = false;
-    foreach ($languages_list as $key => $v)
-        if (strcmp ($l, $key) == 0)
+    foreach ($languages_list as $key => $v) {
+        if (strcmp($l, $key) == 0) {
             $found = true;
+        }
+    }
 
     /* Don't translate english. */
-    if (!($found && strcmp ($l, "en")))
+    if (!($found && strcmp($l, "en"))) {
         return "{}";
+    }
 
     /* Open translation file. */
-    $trans_j = file_get_contents (JIRAFEAU_ROOT . "lib/locales/$l.json");
+    $trans_j = file_get_contents(JIRAFEAU_ROOT . "lib/locales/$l.json");
     return $trans_j;
 }
-
-?>
diff --git a/lib/settings.php b/lib/settings.php
index 33c76da..2c3cb05 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -20,50 +20,49 @@
 global $cfg;
 
 // Read config files
-require (JIRAFEAU_ROOT . 'lib/config.original.php');
-if (file_exists(JIRAFEAU_ROOT . 'lib/config.local.php'))
-{
-	// read local copy and merge with original values
-	$cfgOriginal = $cfg;
-	require (JIRAFEAU_ROOT . 'lib/config.local.php');
-	$cfg = array_merge($cfgOriginal, $cfg);
-	unset($cfgOriginal);
+require(JIRAFEAU_ROOT . 'lib/config.original.php');
+if (file_exists(JIRAFEAU_ROOT . 'lib/config.local.php')) {
+    // read local copy and merge with original values
+    $cfgOriginal = $cfg;
+    require(JIRAFEAU_ROOT . 'lib/config.local.php');
+    $cfg = array_merge($cfgOriginal, $cfg);
+    unset($cfgOriginal);
 }
 
 // Set constants
 
 /* Jirafeau package */
-define ('JIRAFEAU_PACKAGE', 'Jirafeau');
-define ('JIRAFEAU_VERSION', '2.0.0');
+define('JIRAFEAU_PACKAGE', 'Jirafeau');
+define('JIRAFEAU_VERSION', '2.0.0');
 
 /* Directories. */
-define ('VAR_FILES', $cfg['var_root'] . 'files/');
-define ('VAR_LINKS', $cfg['var_root'] . 'links/');
-define ('VAR_ASYNC', $cfg['var_root'] . 'async/');
-define ('VAR_ALIAS', $cfg['var_root'] . 'alias/');
+define('VAR_FILES', $cfg['var_root'] . 'files/');
+define('VAR_LINKS', $cfg['var_root'] . 'links/');
+define('VAR_ASYNC', $cfg['var_root'] . 'async/');
+define('VAR_ALIAS', $cfg['var_root'] . 'alias/');
 
 // helping variable to build absolute link to
 // root of the domain without handling the URL scheme
 $absPrefix = parse_url($cfg['web_root'], PHP_URL_PATH);
-if(true === empty($absPrefix)) {
-	// fallback if installation isnt done yet: relative links to same level on the current page
-	$absPrefix = './';
+if (true === empty($absPrefix)) {
+    // fallback if installation isnt done yet: relative links to same level on the current page
+    $absPrefix = './';
 }
-define ('JIRAFEAU_ABSPREFIX', $absPrefix);
+define('JIRAFEAU_ABSPREFIX', $absPrefix);
 
 /* Useful constants. */
-if (!defined ('NL')) {
-    define ('NL', "\n");
+if (!defined('NL')) {
+    define('NL', "\n");
 }
-if (!defined ('QUOTE')) {
-    define ('QUOTE', "'");
+if (!defined('QUOTE')) {
+    define('QUOTE', "'");
 }
 
-define ('JIRAFEAU_INFINITY', -1);
-define ('JIRAFEAU_MINUTE', 60); // 60
-define ('JIRAFEAU_HOUR', 3600); // JIRAFEAU_MINUTE * 60
-define ('JIRAFEAU_DAY', 86400); // JIRAFEAU_HOUR * 24
-define ('JIRAFEAU_WEEK', 604800); // JIRAFEAU_DAY * 7
-define ('JIRAFEAU_MONTH', 2419200); // JIRAFEAU_WEEK * 4
-define ('JIRAFEAU_QUARTER', 7257600); // JIRAFEAU_MONTH * 3
-define ('JIRAFEAU_YEAR', 29030400); // JIRAFEAU_MONTH * 12
+define('JIRAFEAU_INFINITY', -1);
+define('JIRAFEAU_MINUTE', 60); // 60
+define('JIRAFEAU_HOUR', 3600); // JIRAFEAU_MINUTE * 60
+define('JIRAFEAU_DAY', 86400); // JIRAFEAU_HOUR * 24
+define('JIRAFEAU_WEEK', 604800); // JIRAFEAU_DAY * 7
+define('JIRAFEAU_MONTH', 2419200); // JIRAFEAU_WEEK * 4
+define('JIRAFEAU_QUARTER', 7257600); // JIRAFEAU_MONTH * 3
+define('JIRAFEAU_YEAR', 29030400); // JIRAFEAU_MONTH * 12
diff --git a/lib/template/footer.php b/lib/template/footer.php
index c910e71..5bc158f 100644
--- a/lib/template/footer.php
+++ b/lib/template/footer.php
@@ -9,10 +9,9 @@
         ?>
         <!-- Installation dependend links -->
         <?php
-        if (true == $cfg['installation_done'])
-        {
-          echo ' | ';
-          echo '<a href="' . JIRAFEAU_ABSPREFIX . 'tos.php">' . t('Terms of Service') . '</a>';
+        if (true == $cfg['installation_done']) {
+            echo ' | ';
+            echo '<a href="' . JIRAFEAU_ABSPREFIX . 'tos.php">' . t('Terms of Service') . '</a>';
         }
         ?>
     </p>
diff --git a/script.php b/script.php
index 9da9221..2eb6b4a 100644
--- a/script.php
+++ b/script.php
@@ -22,14 +22,14 @@
  * If you don't want this feature, you can simply delete this file from your
  * web directory.
  */
-define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
+define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
 
-require (JIRAFEAU_ROOT . 'lib/settings.php');
-require (JIRAFEAU_ROOT . 'lib/functions.php');
-require (JIRAFEAU_ROOT . 'lib/lang.php');
+require(JIRAFEAU_ROOT . 'lib/settings.php');
+require(JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/lang.php');
 
  global $script_langages;
- $script_langages = array ('bash' => 'Bash');
+ $script_langages = array('bash' => 'Bash');
 
 /* Operations may take a long time.
  * Be sure PHP's safe mode is off.
@@ -38,17 +38,14 @@ require (JIRAFEAU_ROOT . 'lib/lang.php');
 /* Remove errors. */
 @error_reporting(0);
 
-if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
-{
-    require (JIRAFEAU_ROOT . 'lib/template/header.php');
-    check_errors ($cfg);
-    if (has_error ())
-    {
-        show_errors ();
-        require (JIRAFEAU_ROOT . 'lib/template/footer.php');
+if ($_SERVER['REQUEST_METHOD'] == "GET" && count($_GET) == 0) {
+    require(JIRAFEAU_ROOT . 'lib/template/header.php');
+    check_errors($cfg);
+    if (has_error()) {
+        show_errors();
+        require(JIRAFEAU_ROOT . 'lib/template/footer.php');
         exit;
-    }
-    ?>
+    } ?>
     <div class="info">
     <h2>Scripting interface</h2>
     <p>This interface permits to script your uploads and downloads.</p>
@@ -57,51 +54,45 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
     </div>
     <br />
     <?php
-    require (JIRAFEAU_ROOT . 'lib/template/footer.php');
+    require(JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;
 }
 
 /* Lets use interface now. */
 header('Content-Type: text/plain; charset=utf-8');
 
-check_errors ($cfg);
-if (has_error ())
-{
+check_errors($cfg);
+if (has_error()) {
     echo 'Error 1';
     exit;
 }
 
 /* Upload file */
-if (isset ($_FILES['file']) && is_writable (VAR_FILES)
-    && is_writable (VAR_LINKS))
-{
-    if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
-    {
+if (isset($_FILES['file']) && is_writable(VAR_FILES)
+    && is_writable(VAR_LINKS)) {
+    if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
         echo 'Error 2';
         exit;
     }
 
-    if (jirafeau_has_upload_password ($cfg) &&
-         (!isset ($_POST['upload_password']) ||
-          !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
-    {
+    if (jirafeau_has_upload_password($cfg) &&
+         (!isset($_POST['upload_password']) ||
+          !jirafeau_challenge_upload_password($cfg, $_POST['upload_password']))) {
         echo 'Error 3';
         exit;
     }
 
     $key = '';
-    if (isset ($_POST['key']))
+    if (isset($_POST['key'])) {
         $key = $_POST['key'];
+    }
 
-    $time = time ();
-    if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']])
-    {
+    $time = time();
+    if (!isset($_POST['time']) || !$cfg['availabilities'][$_POST['time']]) {
         echo 'Error 4: The parameter time is invalid.';
         exit;
-    }
-    else
-        switch ($_POST['time'])
-        {
+    } else {
+        switch ($_POST['time']) {
             case 'minute':
                 $time += JIRAFEAU_MINUTE;
                 break;
@@ -127,22 +118,21 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
                 $time = JIRAFEAU_INFINITY;
                 break;
         }
+    }
 
     // Check file size
     if ($cfg['maximal_upload_size'] > 0 &&
-        $_FILES['file']['size'] > $cfg['maximal_upload_size'] * 1024 * 1024)
-    {
+        $_FILES['file']['size'] > $cfg['maximal_upload_size'] * 1024 * 1024) {
         echo 'Error 5: Your file exceeds the maximum authorized file size.';
         exit;
     }
 
-    $res = jirafeau_upload ($_FILES['file'],
-                            isset ($_POST['one_time_download']),
+    $res = jirafeau_upload($_FILES['file'],
+                            isset($_POST['one_time_download']),
                             $key, $time, get_ip_address($cfg),
                             $cfg['enable_crypt'], $cfg['link_name_length']);
 
-    if (empty($res) || $res['error']['has_error'])
-    {
+    if (empty($res) || $res['error']['has_error']) {
         echo 'Error 6 ' . $res['error']['why'];
         exit;
     }
@@ -154,91 +144,76 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     /* Print decrypt key. */
     echo NL;
     echo urlencode($res['crypt_key']);
-}
-elseif (isset ($_GET['h']))
-{
+} elseif (isset($_GET['h'])) {
     $link_name = $_GET['h'];
     $key = '';
-    if (isset ($_POST['key']))
+    if (isset($_POST['key'])) {
         $key = $_POST['key'];
+    }
     $d = '';
-    if (isset ($_GET['d']))
+    if (isset($_GET['d'])) {
         $d = $_GET['d'];
+    }
 
-    if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
-    {
+    if (!preg_match('/[0-9a-zA-Z_-]+$/', $link_name)) {
         echo 'Error 7';
         exit;
     }
 
-    $link = jirafeau_get_link ($link_name);
-    if (count ($link) == 0)
-    {
+    $link = jirafeau_get_link($link_name);
+    if (count($link) == 0) {
         echo 'Error 8';
         exit;
     }
-    if (strlen ($d) > 0 && $d == $link['link_code'])
-    {
-        jirafeau_delete_link ($link_name);
+    if (strlen($d) > 0 && $d == $link['link_code']) {
+        jirafeau_delete_link($link_name);
         echo "Ok";
         exit;
     }
-    if ($link['time'] != JIRAFEAU_INFINITY && time () > $link['time'])
-    {
-        jirafeau_delete_link ($link_name);
+    if ($link['time'] != JIRAFEAU_INFINITY && time() > $link['time']) {
+        jirafeau_delete_link($link_name);
         echo 'Error 9';
         exit;
     }
-    if (strlen ($link['key']) > 0 && md5 ($key) != $link['key'])
-    {
-        sleep (2);
+    if (strlen($link['key']) > 0 && md5($key) != $link['key']) {
+        sleep(2);
         echo 'Error 10';
         exit;
     }
-    $p = s2p ($link['md5']);
-    if (!file_exists (VAR_FILES . $p . $link['md5']))
-    {
+    $p = s2p($link['md5']);
+    if (!file_exists(VAR_FILES . $p . $link['md5'])) {
         echo 'Error 11';
         exit;
     }
 
     /* Read file. */
-    header ('Content-Length: ' . $link['file_size']);
-    header ('Content-Type: ' . $link['mime_type']);
-    header ('Content-Disposition: attachment; filename="' .
+    header('Content-Length: ' . $link['file_size']);
+    header('Content-Type: ' . $link['mime_type']);
+    header('Content-Disposition: attachment; filename="' .
             $link['file_name'] . '"');
 
-    $r = fopen (VAR_FILES . $p . $link['md5'], 'r');
-    while (!feof ($r))
-    {
-        print fread ($r, 1024);
+    $r = fopen(VAR_FILES . $p . $link['md5'], 'r');
+    while (!feof($r)) {
+        print fread($r, 1024);
         ob_flush();
     }
-    fclose ($r);
+    fclose($r);
 
-    if ($link['onetime'] == 'O')
-        jirafeau_delete_link ($link_name);
+    if ($link['onetime'] == 'O') {
+        jirafeau_delete_link($link_name);
+    }
     exit;
-}
-elseif (isset ($_GET['get_capacity']))
-{
-    echo min (jirafeau_ini_to_bytes (ini_get ('post_max_size')),
-              jirafeau_ini_to_bytes (ini_get ('upload_max_filesize')));
-}
-elseif (isset ($_GET['get_maximal_upload_size']))
-{
+} elseif (isset($_GET['get_capacity'])) {
+    echo min(jirafeau_ini_to_bytes(ini_get('post_max_size')),
+              jirafeau_ini_to_bytes(ini_get('upload_max_filesize')));
+} elseif (isset($_GET['get_maximal_upload_size'])) {
     echo $cfg['maximal_upload_size'];
-}
-elseif (isset ($_GET['get_version']))
-{
+} elseif (isset($_GET['get_version'])) {
     echo JIRAFEAU_VERSION;
-}
-elseif (isset ($_GET['lang']))
-{
+} elseif (isset($_GET['lang'])) {
     $l=$_GET['lang'];
-    if ($l == "bash")
-    {
-?>
+    if ($l == "bash") {
+        ?>
 #!/bin/bash
 
 # This script has been auto-generated by Jirafeau but you can still edit options below.
@@ -382,129 +357,114 @@ elif [ "$1" == "delete" ]; then
     $curl $proxy "$2"
 fi
 <?php
-    }
-    else
-    {
+
+    } else {
         echo 'Error 12';
         exit;
     }
 }
 /* Create alias. */
-elseif (isset ($_GET['alias_create']))
-{
+elseif (isset($_GET['alias_create'])) {
     $ip = get_ip_address($cfg);
-    if (!jirafeau_challenge_upload_ip ($cfg, $ip))
-    {
+    if (!jirafeau_challenge_upload_ip($cfg, $ip)) {
         echo 'Error 13';
         exit;
     }
 
-    if (jirafeau_has_upload_password ($cfg) &&
-         (!isset ($_POST['upload_password']) ||
-          !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
-    {
+    if (jirafeau_has_upload_password($cfg) &&
+         (!isset($_POST['upload_password']) ||
+          !jirafeau_challenge_upload_password($cfg, $_POST['upload_password']))) {
         echo 'Error 14';
         exit;
     }
 
-    if (!isset ($_POST['alias']) ||
-        !isset ($_POST['destination']) ||
-        !isset ($_POST['password']))
-    {
+    if (!isset($_POST['alias']) ||
+        !isset($_POST['destination']) ||
+        !isset($_POST['password'])) {
         echo 'Error 15';
         exit;
     }
 
-    echo jirafeau_alias_create ($_POST['alias'],
+    echo jirafeau_alias_create($_POST['alias'],
                                 $_POST['destination'],
                                 $_POST['password'],
                                 $ip);
 }
 /* Get alias. */
-elseif (isset ($_GET['alias_get']))
-{
-    if (!isset ($_POST['alias']))
-    {
+elseif (isset($_GET['alias_get'])) {
+    if (!isset($_POST['alias'])) {
         echo 'Error 16';
         exit;
     }
 
-    echo jirafeau_alias_get ($_POST['alias']);
+    echo jirafeau_alias_get($_POST['alias']);
 }
 /* Update alias. */
-elseif (isset ($_GET['alias_update']))
-{
-    if (!isset ($_POST['alias']) ||
-        !isset ($_POST['destination']) ||
-        !isset ($_POST['password']))
-    {
+elseif (isset($_GET['alias_update'])) {
+    if (!isset($_POST['alias']) ||
+        !isset($_POST['destination']) ||
+        !isset($_POST['password'])) {
         echo 'Error 17';
         exit;
     }
 
     $new_password = '';
-    if (isset ($_POST['new_password']))
+    if (isset($_POST['new_password'])) {
         $new_password = $_POST['new_password'];
+    }
 
-    echo jirafeau_alias_update ($_POST['alias'],
+    echo jirafeau_alias_update($_POST['alias'],
                                 $_POST['destination'],
                                 $_POST['password'],
                                 $new_password,
                                 get_ip_address($cfg));
 }
 /* Delete alias. */
-elseif (isset ($_GET['alias_delete']))
-{
-    if (!isset ($_POST['alias']) ||
-        !isset ($_POST['password']))
-    {
+elseif (isset($_GET['alias_delete'])) {
+    if (!isset($_POST['alias']) ||
+        !isset($_POST['password'])) {
         echo 'Error 18';
         exit;
     }
 
-    echo jirafeau_alias_delete ($_POST['alias'],
+    echo jirafeau_alias_delete($_POST['alias'],
                                 $_POST['password']);
 }
 /* Initialize an asynchronous upload. */
-elseif (isset ($_GET['init_async']))
-{
-    if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
-    {
+elseif (isset($_GET['init_async'])) {
+    if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
         echo 'Error 19';
         exit;
     }
 
-    if (jirafeau_has_upload_password ($cfg) &&
-         (!isset ($_POST['upload_password']) ||
-          !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
-    {
+    if (jirafeau_has_upload_password($cfg) &&
+         (!isset($_POST['upload_password']) ||
+          !jirafeau_challenge_upload_password($cfg, $_POST['upload_password']))) {
         echo 'Error 20';
         exit;
     }
 
-    if (!isset ($_POST['filename']))
-    {
+    if (!isset($_POST['filename'])) {
         echo 'Error 21';
         exit;
     }
 
     $type = '';
-    if (isset ($_POST['type']))
+    if (isset($_POST['type'])) {
         $type = $_POST['type'];
+    }
 
     $key = '';
-    if (isset ($_POST['key']))
+    if (isset($_POST['key'])) {
         $key = $_POST['key'];
+    }
 
-    $time = time ();
-    if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']])
-    {
+    $time = time();
+    if (!isset($_POST['time']) || !$cfg['availabilities'][$_POST['time']]) {
         echo 'Error 22';
         exit;
-    }
-    else
-        switch ($_POST['time'])
-        {
+    } else {
+        switch ($_POST['time']) {
             case 'minute':
                 $time += JIRAFEAU_MINUTE;
                 break;
@@ -530,38 +490,37 @@ elseif (isset ($_GET['init_async']))
                 $time = JIRAFEAU_INFINITY;
                 break;
         }
-    echo jirafeau_async_init ($_POST['filename'],
+    }
+    echo jirafeau_async_init($_POST['filename'],
                               $type,
-                              isset ($_POST['one_time_download']),
+                              isset($_POST['one_time_download']),
                               $key,
                               $time,
                               get_ip_address($cfg));
 }
 /* Continue an asynchronous upload. */
-elseif (isset ($_GET['push_async']))
-{
-    if ((!isset ($_POST['ref']))
-        || (!isset ($_FILES['data']))
-        || (!isset ($_POST['code'])))
+elseif (isset($_GET['push_async'])) {
+    if ((!isset($_POST['ref']))
+        || (!isset($_FILES['data']))
+        || (!isset($_POST['code']))) {
         echo 'Error 23';
-    else
-    {
-        echo jirafeau_async_push ($_POST['ref'],
+    } else {
+        echo jirafeau_async_push($_POST['ref'],
                                   $_FILES['data'],
                                   $_POST['code'],
                                   $cfg['maximal_upload_size']);
     }
 }
 /* Finalize an asynchronous upload. */
-elseif (isset ($_GET['end_async']))
-{
-    if (!isset ($_POST['ref'])
-        || !isset ($_POST['code']))
+elseif (isset($_GET['end_async'])) {
+    if (!isset($_POST['ref'])
+        || !isset($_POST['code'])) {
         echo 'Error 24';
-    else
-        echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length']);
-}
-else
+    } else {
+        echo jirafeau_async_end($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length']);
+    }
+} else {
     echo 'Error 25';
+}
 exit;
 ?>
diff --git a/tos.php b/tos.php
index 44fc86c..826358d 100644
--- a/tos.php
+++ b/tos.php
@@ -16,11 +16,11 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
+define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
 
-require (JIRAFEAU_ROOT . 'lib/settings.php');
-require (JIRAFEAU_ROOT . 'lib/functions.php');
-require (JIRAFEAU_ROOT . 'lib/lang.php');
+require(JIRAFEAU_ROOT . 'lib/settings.php');
+require(JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/lang.php');
 
 // Read ToS template
 if (is_readable(JIRAFEAU_ROOT . 'lib/tos.local.txt')) {
@@ -30,11 +30,9 @@ if (is_readable(JIRAFEAU_ROOT . 'lib/tos.local.txt')) {
 }
 
 // Replace markers and print ToS
-require (JIRAFEAU_ROOT . 'lib/template/header.php');
+require(JIRAFEAU_ROOT . 'lib/template/header.php');
 
 echo '<h2>Terms of Service</h2>';
 echo '<div>' . jirafeau_replace_markers($content, true) . '</div>';
 
-require (JIRAFEAU_ROOT . 'lib/template/footer.php');
-
-?>
\ No newline at end of file
+require(JIRAFEAU_ROOT . 'lib/template/footer.php');