[TASK] run php-cs-fixer

php-cs-fixer fix --rules=@PSR2 .

Signed-off-by: Jerome Jutteau <jerome@jutteau.fr>

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e7ee9c3d4d01ade18824b4318acf56a9625b7ac5..06929221499a5ff4438300c299e8dc8be0b8b911 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -91,6 +91,7 @@ Quick walktrough:
 ## New Releases
 
 * If the release is not done for security purposes: create a new issue and freeze next-release branch for at least week.
 ## New Releases
 
 * If the release is not done for security purposes: create a new issue and freeze next-release branch for at least week.

+* Make sure to run `php-cs-fixer fix --rules=@PSR2 .` and commit.

 * Compare the [»next-release« branch to »master«](https://gitlab.com/mojo42/Jirafeau/compare/master...next-release)
 * Add a list of noteworthy features and bugfixes to `CHANGELOG.md`
 * Add eventual upgrade procedure to `CHANGELOG.md`
 * Compare the [»next-release« branch to »master«](https://gitlab.com/mojo42/Jirafeau/compare/master...next-release)
 * Add a list of noteworthy features and bugfixes to `CHANGELOG.md`
 * Add eventual upgrade procedure to `CHANGELOG.md`

diff --git a/admin.php b/admin.php
index bcc291b2e9b4683f819abca9999913624551f2d0..cfdfe3010dc26a12fab2b644329aa33b585eb7a4 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -43,40 +43,40 @@ if (php_sapi_name() == "cli") {
     }
 } else {
     /* Disable admin interface if we have a empty admin password. */
     }
 } 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>'.
+    if (empty($cfg['admin_password']) && empty($cfg['admin_http_auth_user'])) {
+        require(JIRAFEAU_ROOT . 'lib/template/header.php');
+        echo '<div class="error"><p>'.

            t('NO_ADMIN') .
            '</p></div>';
            t('NO_ADMIN') .
            '</p></div>';

-      require(JIRAFEAU_ROOT.'lib/template/footer.php');
-      exit;
-  }
+        require(JIRAFEAU_ROOT.'lib/template/footer.php');
+        exit;
+    }

 
 

-  /* Unlog if asked. */
-  if (jirafeau_admin_session_logged() && isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
-      jirafeau_admin_session_end();
-  }
+    /* Unlog if asked. */
+    if (jirafeau_admin_session_logged() && isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
+        jirafeau_admin_session_end();
+    }

 
 

-  if (!jirafeau_admin_session_logged()) {
-      /* Test HTTP authentification. */
-      if (!empty($cfg['admin_http_auth_user']) &&
+    if (!jirafeau_admin_session_logged()) {
+        /* Test HTTP authentification. */
+        if (!empty($cfg['admin_http_auth_user']) &&

           $cfg['admin_http_auth_user'] == $_SERVER['PHP_AUTH_USER']) {
           $cfg['admin_http_auth_user'] == $_SERVER['PHP_AUTH_USER']) {

-          jirafeau_admin_session_start();
-      }
-      /* Test web password authentification. */
-      else if (!empty($cfg['admin_password']) && isset($_POST['admin_password'])) {
-          if ($cfg['admin_password'] === hash('sha256', $_POST['admin_password'])) {
-              jirafeau_admin_session_start();
-          } else {
-              require(JIRAFEAU_ROOT . 'lib/template/header.php');
-              echo '<div class="error"><p>'. t('BAD_PSW') . '</p></div>';
-              require(JIRAFEAU_ROOT.'lib/template/footer.php');
-              exit;
-          }
-      }
-      /* Admin password prompt form. */
-      else {
-          require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?>
+            jirafeau_admin_session_start();
+        }
+        /* Test web password authentification. */
+        elseif (!empty($cfg['admin_password']) && isset($_POST['admin_password'])) {
+            if ($cfg['admin_password'] === hash('sha256', $_POST['admin_password'])) {
+                jirafeau_admin_session_start();
+            } else {
+                require(JIRAFEAU_ROOT . 'lib/template/header.php');
+                echo '<div class="error"><p>'. t('BAD_PSW') . '</p></div>';
+                require(JIRAFEAU_ROOT.'lib/template/footer.php');
+                exit;
+            }
+        }
+        /* Admin password prompt form. */
+        else {
+            require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?>

           <form method="post" class="form login">
           <fieldset>
               <table>
           <form method="post" class="form login">
           <fieldset>
               <table>


@@ -102,18 +102,18 @@ if (php_sapi_name() == "cli") {
           </form>
           <?php
           require(JIRAFEAU_ROOT.'lib/template/footer.php');
           </form>
           <?php
           require(JIRAFEAU_ROOT.'lib/template/footer.php');

-          exit;
-      }
-  }
+            exit;
+        }
+    }

 
 

-  /* Operations may take a long time.
-   * Be sure PHP's safe mode is off.
-   */
-  @set_time_limit(0);
+    /* Operations may take a long time.
+     * Be sure PHP's safe mode is off.
+     */
+    @set_time_limit(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
+    /* 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

           ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php
 
           ?><div id = "admin">
           ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php
 
           ?><div id = "admin">


@@ -223,64 +223,64 @@ if (php_sapi_name() == "cli") {
               <input type = "submit" value = "<?php echo t('LOGOUT'); ?>" />
           </form>
           </fieldset></div><?php
               <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();
-          echo '<div class="message">' . NL;
-          echo '<p>';
-          echo t('CLEANED_FILES_CNT') . ' : ' . $total;
-          echo '</p></div>';
-      } elseif (strcmp($_POST['action'], 'clean_async') == 0) {
-          $total = jirafeau_admin_clean_async();
-          echo '<div class="message">' . NL;
-          echo '<p>';
-          echo t('CLEANED_FILES_CNT') . ' : ' . $total;
-          echo '</p></div>';
-      } elseif (strcmp($_POST['action'], 'size') == 0) {
-          $size = jirafeau_dir_size($cfg['var_root']);
-          $human_size = jirafeau_human_size($size);
-          echo '<div class="message">' . NL;
-          echo '<p>' . t('SIZE_DATA') . ': ' . $human_size .'</p>';
-          echo '</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']);
-          echo '<div class="message">' . NL;
-          echo '<p>' . t('LINK_DELETED') . '</p></div>';
-      } elseif (strcmp($_POST['action'], 'delete_file') == 0) {
-          $count = jirafeau_delete_file($_POST['hash']);
-          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)) {
-              return;
-          }
-          $p = s2p($l['hash']);
-          header('Content-Length: ' . $l['file_size']);
-          header('Content-Type: ' . $l['mime_type']);
-          header('Content-Disposition: attachment; filename="' .
+    /* Check for actions */
+    if (isset($_POST['action'])) {
+        if (strcmp($_POST['action'], 'clean') == 0) {
+            $total = jirafeau_admin_clean();
+            echo '<div class="message">' . NL;
+            echo '<p>';
+            echo t('CLEANED_FILES_CNT') . ' : ' . $total;
+            echo '</p></div>';
+        } elseif (strcmp($_POST['action'], 'clean_async') == 0) {
+            $total = jirafeau_admin_clean_async();
+            echo '<div class="message">' . NL;
+            echo '<p>';
+            echo t('CLEANED_FILES_CNT') . ' : ' . $total;
+            echo '</p></div>';
+        } elseif (strcmp($_POST['action'], 'size') == 0) {
+            $size = jirafeau_dir_size($cfg['var_root']);
+            $human_size = jirafeau_human_size($size);
+            echo '<div class="message">' . NL;
+            echo '<p>' . t('SIZE_DATA') . ': ' . $human_size .'</p>';
+            echo '</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']);
+            echo '<div class="message">' . NL;
+            echo '<p>' . t('LINK_DELETED') . '</p></div>';
+        } elseif (strcmp($_POST['action'], 'delete_file') == 0) {
+            $count = jirafeau_delete_file($_POST['hash']);
+            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)) {
+                return;
+            }
+            $p = s2p($l['hash']);
+            header('Content-Length: ' . $l['file_size']);
+            header('Content-Type: ' . $l['mime_type']);
+            header('Content-Disposition: attachment; filename="' .

                   $l['file_name'] . '"');
                   $l['file_name'] . '"');

-          if (file_exists(VAR_FILES . $p . $l['hash'])) {
-              $r = fopen(VAR_FILES . $p . $l['hash'], 'r');
-              while (!feof($r)) {
-                  print fread($r, 1024);
-              }
-              fclose($r);
-          }
-          exit;
-      }
-  }
+            if (file_exists(VAR_FILES . $p . $l['hash'])) {
+                $r = fopen(VAR_FILES . $p . $l['hash'], 'r');
+                while (!feof($r)) {
+                    print fread($r, 1024);
+                }
+                fclose($r);
+            }
+            exit;
+        }
+    }

 
     require(JIRAFEAU_ROOT.'lib/template/footer.php');
 }
 
     require(JIRAFEAU_ROOT.'lib/template/footer.php');
 }

diff --git a/f.php b/f.php
index f6fe6fd997b3f0e307db5743be5bee8da4753cb2..ed7d7827f534c4d187d9cc91cb93abc2d9657ae8 100644 (file)
--- a/f.php
+++ b/f.php
@@ -167,7 +167,6 @@ if (!empty($link['key'])) {
                 echo '&k=' . urlencode($crypt_key);
             } ?>';
             document.getElementById('submit_preview').submit ();"/><?php
                 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');
         }
         echo '</td></tr></table></fieldset></form></div>';
         require(JIRAFEAU_ROOT.'lib/template/footer.php');


@@ -220,7 +219,6 @@ if (!$password_challenged && !$do_download && !$do_preview) {
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
         document.getElementById('submit_post').submit ();"/><?php
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
         document.getElementById('submit_post').submit ();"/><?php

-

         }
     echo '</td></tr>';
     echo '</table></fieldset></form></div>';
         }
     echo '</td></tr>';
     echo '</table></fieldset></form></div>';


@@ -253,7 +251,7 @@ if ($cfg['litespeed_workaround']) {
     }
 }
 /* Read encrypted file. */
     }
 }
 /* Read encrypted file. */

-else if ($link['crypted']) {
+elseif ($link['crypted']) {

     /* Init module */
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Extract key and iv. */
     /* Init module */
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Extract key and iv. */

diff --git a/index.php b/index.php
index 63906c1c48cda2a58de343f4382ecc24b95de1a0..cf54193458915294e8dcd4ad27710855cbe90e49 100644 (file)
--- a/index.php
+++ b/index.php
@@ -92,8 +92,7 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
             exit;
         }
     }
             exit;
         }
     }

-}
-else {
+} else {

     jirafeau_fatal_error(t('ACCESS_KO'), $cfg);
 }
 
     jirafeau_fatal_error(t('ACCESS_KO'), $cfg);
 }
 


@@ -169,9 +168,9 @@ else {
         <input type="file" id="file_select" size="30"
     onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php
         if ($cfg['maximal_upload_size'] >= 1024) {
         <input type="file" id="file_select" size="30"
     onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php
         if ($cfg['maximal_upload_size'] >= 1024) {

-          echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . number_format($cfg['maximal_upload_size']/1024, 2) . " GB.";
-        } else if ($cfg['maximal_upload_size'] > 0) { 
-          echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB.";
+            echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . number_format($cfg['maximal_upload_size']/1024, 2) . " GB.";
+        } elseif ($cfg['maximal_upload_size'] > 0) {
+            echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB.";

         }
     ?>')"/>
     </p>
         }
     ?>')"/>
     </p>


@@ -241,11 +240,11 @@ else {
         if ($cfg['maximal_upload_size'] >= 1024) {
             echo '<p class="config">' . t('FILE_LIM');
             echo " " . number_format($cfg['maximal_upload_size'] / 1024, 2) . " GB.</p>";
         if ($cfg['maximal_upload_size'] >= 1024) {
             echo '<p class="config">' . t('FILE_LIM');
             echo " " . number_format($cfg['maximal_upload_size'] / 1024, 2) . " GB.</p>";

-        } else if ($cfg['maximal_upload_size'] > 0) {
+        } elseif ($cfg['maximal_upload_size'] > 0) {

             echo '<p class="config">' . t('FILE_LIM');
             echo " " . $cfg['maximal_upload_size'] . " MB.</p>";
         } else {
             echo '<p class="config">' . t('FILE_LIM');
             echo " " . $cfg['maximal_upload_size'] . " MB.</p>";
         } else {

-           echo '<p class="config"></p>';
+            echo '<p class="config"></p>';

         }
         ?>
 
         }
         ?>
 


@@ -256,12 +255,10 @@ else {
         ?>
     <input type="hidden" id="upload_password" name="upload_password" value="<?php echo $_SESSION['user_upload_password'] ?>"/>
     <?php
         ?>
     <input type="hidden" id="upload_password" name="upload_password" value="<?php echo $_SESSION['user_upload_password'] ?>"/>
     <?php

-

     } else {
         ?>
     <input type="hidden" id="upload_password" name="upload_password" value=""/>
     <?php
     } else {
         ?>
     <input type="hidden" id="upload_password" name="upload_password" value=""/>
     <?php

-

     }
     ?>
     <input type="submit" id="send" value="<?php echo t('SEND'); ?>"
     }
     ?>
     <input type="submit" id="send" value="<?php echo t('SEND'); ?>"


@@ -283,7 +280,6 @@ else {
         <input type = "submit" value = "<?php echo t('LOGOUT'); ?>" />
     </form>
     <?php
         <input type = "submit" value = "<?php echo t('LOGOUT'); ?>" />
     </form>
     <?php

-

     }
     ?>
 
     }
     ?>
 

diff --git a/install.php b/install.php
index 8d5f6fb81fd2a65e7d75fdf4e6c68d2fdb34d41f..3ba2d5b4ac0569f918de0c830e42d384b6fcaaac 100644 (file)
--- a/install.php
+++ b/install.php
@@ -225,8 +225,11 @@ case 2:
         <td class = "field"><input type = "text" name = "web_root"
         id = "input_web_root" value = "<?php
         echo(empty($cfg['web_root']) ?
         <td class = "field"><input type = "text" name = "web_root"
         id = "input_web_root" value = "<?php
         echo(empty($cfg['web_root']) ?

-          $_SERVER['HTTP_HOST'] . str_replace(basename(__FILE__),
-          '', $_SERVER['REQUEST_URI']) : $cfg['web_root']);
+          $_SERVER['HTTP_HOST'] . str_replace(
+              basename(__FILE__),
+              '',
+              $_SERVER['REQUEST_URI']
+          ) : $cfg['web_root']);

       ?>" size = "40" /></td>
         </tr> <tr> <td class = "info" colspan = "2"><?php
         echo t('DATA_DIR_EXPLAINATION');
       ?>" size = "40" /></td>
         </tr> <tr> <td class = "info" colspan = "2"><?php
         echo t('DATA_DIR_EXPLAINATION');

diff --git a/lib/config.original.php b/lib/config.original.php
index 0d2665c1e8f0ad4230675e7789099261db19dee2..1b16f3273a1a6abf8c6393f9b298911a3f55fdf6 100644 (file)
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -157,7 +157,7 @@ $cfg['proxy_ip'] = array();
  * By default, files are hashed through md5 but other methods are available.
  *
  * Possible values are 'md5', 'md5_outside' and 'random'.
  * By default, files are hashed through md5 but other methods are available.
  *
  * Possible values are 'md5', 'md5_outside' and 'random'.

- * 
+ *

  * With 'md5' option, the whole file is hashed through md5. This is the default.
  * With 'md5_outside', hash is computed using:
  *  - md5 of the first part of the file,
  * With 'md5' option, the whole file is hashed through md5. This is the default.
  * With 'md5_outside', hash is computed using:
  *  - md5 of the first part of the file,

diff --git a/lib/functions.php b/lib/functions.php
index ae3516a49f5331d2e1129d94c2fd3f2dfe416f5f..3c432b6f2e6ca7771d4c0665c41f0b495b299c83 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -192,12 +192,16 @@ function jirafeau_ini_to_bytes($value)
     switch (strtoupper($modifier)) {
     case 'P':
         $bytes *= 1024;
     switch (strtoupper($modifier)) {
     case 'P':
         $bytes *= 1024;

+        // no break

     case 'T':
         $bytes *= 1024;
     case 'T':
         $bytes *= 1024;

+        // no break

     case 'G':
         $bytes *= 1024;
     case 'G':
         $bytes *= 1024;

+        // no break

     case 'M':
         $bytes *= 1024;
     case 'M':
         $bytes *= 1024;

+        // no break

     case 'K':
         $bytes *= 1024;
     }
     case 'K':
         $bytes *= 1024;
     }


@@ -210,8 +214,10 @@ function jirafeau_ini_to_bytes($value)
  */
 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'))
+    );

 }
 
 /**
 }
 
 /**


@@ -459,10 +465,12 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l
     /* create link file */
     $link_tmp_name =  VAR_LINKS . $hash . rand(0, 10000) . '.tmp';
     $handle = fopen($link_tmp_name, 'w');
     /* create link file */
     $link_tmp_name =  VAR_LINKS . $hash . rand(0, 10000) . '.tmp';
     $handle = fopen($link_tmp_name, 'w');

-    fwrite($handle,
-            $name . NL. $mime_type . NL. $size . NL. $password . NL. $time .
+    fwrite(
+        $handle,
+        $name . NL. $mime_type . NL. $size . NL. $password . NL. $time .

             NL . $hash. NL . ($one_time_download ? 'O' : 'R') . NL . time() .
             NL . $hash. NL . ($one_time_download ? 'O' : 'R') . NL . time() .

-            NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O'));
+            NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O')
+    );

     fclose($handle);
     $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);
     $l = s2p("$hash_link");
     fclose($handle);
     $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);
     $l = s2p("$hash_link");


@@ -866,11 +874,13 @@ function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip)
     /* Store informations. */
     $p .= $ref;
     $handle = fopen($p, 'w');
     /* Store informations. */
     $p .= $ref;
     $handle = fopen($p, 'w');

-    fwrite($handle,
-            str_replace(NL, '', trim($filename)) . NL .
+    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 .
             str_replace(NL, '', trim($type)) . NL . $password . NL .
             $time . NL . ($one_time ? 'O' : 'R') . NL . $ip . NL .

-            time() . NL . $code . NL);
+            time() . NL . $code . NL
+    );

     fclose($handle);
 
     return $ref . NL . $code ;
     fclose($handle);
 
     return $ref . NL . $code ;


@@ -928,10 +938,12 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size)
     /* Update async file. */
     $code = jirafeau_gen_random(4);
     $handle = fopen(VAR_ASYNC . $p . $ref, 'w');
     /* Update async file. */
     $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 .
+    fwrite(
+        $handle,
+        $a['file_name'] . NL. $a['mime_type'] . NL. $a['key'] . NL .

             $a['time'] . NL . $a['onetime'] . NL . $a['ip'] . NL .
             $a['time'] . NL . $a['onetime'] . NL . $a['ip'] . NL .

-            time() . NL . $code . NL);
+            time() . NL . $code . NL
+    );

     fclose($handle);
     return $code;
 }
     fclose($handle);
     return $code;
 }


@@ -995,10 +1007,12 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_m
     /* Create link. */
     $link_tmp_name =  VAR_LINKS . $hash . rand(0, 10000) . '.tmp';
     $handle = fopen($link_tmp_name, 'w');
     /* Create link. */
     $link_tmp_name =  VAR_LINKS . $hash . rand(0, 10000) . '.tmp';
     $handle = fopen($link_tmp_name, 'w');

-    fwrite($handle,
-            $a['file_name'] . NL . $a['mime_type'] . NL . $size . NL .
+    fwrite(
+        $handle,
+        $a['file_name'] . NL . $a['mime_type'] . NL . $size . NL .

             $a['key'] . NL . $a['time'] . NL . $hash . NL . $a['onetime'] . NL .
             $a['key'] . NL . $a['time'] . NL . $hash . NL . $a['onetime'] . NL .

-            time() . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O'));
+            time() . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O')
+    );

     fclose($handle);
     $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);
     $l = s2p("$hash_link");
     fclose($handle);
     $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);
     $l = s2p("$hash_link");


@@ -1152,7 +1166,8 @@ function jirafeau_challenge_ip($allowedIpList, $challengedIp)
  * Check if Jirafeau has a restriction on the IP address for uploading.
  * @return true if uploading is IP restricted, false otherwise.
  */
  * Check if Jirafeau has a restriction on the IP address for uploading.
  * @return true if uploading is IP restricted, false otherwise.
  */

-function jirafeau_upload_has_ip_restriction($cfg) {
+function jirafeau_upload_has_ip_restriction($cfg)
+{

     return count($cfg['upload_ip']) > 0;
 }
 
     return count($cfg['upload_ip']) > 0;
 }
 


@@ -1190,7 +1205,7 @@ function jirafeau_challenge_upload_ip_without_password($cfg, $challengedIp)
  * @param $password password to be challenged
  * @return true if access is valid, false otherwise.
  */
  * @param $password password to be challenged
  * @return true if access is valid, false otherwise.
  */

-function jirafeau_challenge_upload ($cfg, $ip, $password)
+function jirafeau_challenge_upload($cfg, $ip, $password)

 {
     return jirafeau_challenge_upload_ip_without_password($cfg, $ip) ||
             (!jirafeau_has_upload_password($cfg) && !jirafeau_upload_has_ip_restriction($cfg)) ||
 {
     return jirafeau_challenge_upload_ip_without_password($cfg, $ip) ||
             (!jirafeau_has_upload_password($cfg) && !jirafeau_upload_has_ip_restriction($cfg)) ||

diff --git a/lib/lang.php b/lib/lang.php
index bd7478c304bd4e29d6939f89cbff314cb1a38746..cfb8f80cf7aa290325f10a83d6a35f417137cb00 100644 (file)
--- a/lib/lang.php
+++ b/lib/lang.php
@@ -40,13 +40,15 @@ function t($string_id)
     return "FIX ME";
 }
 
     return "FIX ME";
 }
 

-function t_visitor_langs() {
+function t_visitor_langs()
+{

     $visitor_langs = t_parse_accept_language();
     array_push($visitor_langs, "en");
     return $visitor_langs;
 }
 
     $visitor_langs = t_parse_accept_language();
     array_push($visitor_langs, "en");
     return $visitor_langs;
 }
 

-function t_parse_accept_language() {
+function t_parse_accept_language()
+{

     if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
         return [];
     }
     if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
         return [];
     }


@@ -63,7 +65,8 @@ function t_parse_accept_language() {
     return $langs;
 }
 
     return $langs;
 }
 

-function t_in($string_id, $lang) {
+function t_in($string_id, $lang)
+{

     $trans = t_get_json($lang);
     if ($trans === false) {
         return false;
     $trans = t_get_json($lang);
     if ($trans === false) {
         return false;


@@ -74,7 +77,8 @@ function t_in($string_id, $lang) {
     return $trans[$string_id];
 }
 
     return $trans[$string_id];
 }
 

-function t_get_raw_json($lang) {
+function t_get_raw_json($lang)
+{

     $filename = str_replace("-", "_", $lang);
     if (preg_match('/[^A-Za-z_\w]/', $filename)) {
         return false;
     $filename = str_replace("-", "_", $lang);
     if (preg_match('/[^A-Za-z_\w]/', $filename)) {
         return false;


@@ -90,7 +94,8 @@ function t_get_raw_json($lang) {
     return $json;
 }
 
     return $json;
 }
 

-function t_get_json($lang) {
+function t_get_json($lang)
+{

     $raw_j = t_get_raw_json($lang);
     $array = json_decode($raw_j, true);
     if ($array === null) {
     $raw_j = t_get_raw_json($lang);
     $array = json_decode($raw_j, true);
     if ($array === null) {


@@ -99,14 +104,15 @@ function t_get_json($lang) {
     return $array;
 }
 
     return $array;
 }
 

-function json_lang_generator($lang) {
+function json_lang_generator($lang)
+{

     $r = false;
     if ($lang === null) {
         $lang_config = $GLOBALS['cfg']['lang'];
         if ($lang_config != "auto") {
             $r = t_get_raw_json($lang_config);
         } else {
     $r = false;
     if ($lang === null) {
         $lang_config = $GLOBALS['cfg']['lang'];
         if ($lang_config != "auto") {
             $r = t_get_raw_json($lang_config);
         } else {

-            foreach(t_visitor_langs() as $lang) {
+            foreach (t_visitor_langs() as $lang) {

                 $r = t_get_raw_json($lang);
                 if (!($r === false)) {
                     break;
                 $r = t_get_raw_json($lang);
                 if (!($r === false)) {
                     break;

diff --git a/lib/settings.php b/lib/settings.php
index fa9efaa8e0309650909258be11bc66db3451b7cf..063b38c807b4106f149fbbd4460c6cb4306a1a00 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -30,12 +30,9 @@ if (file_exists(JIRAFEAU_ROOT . 'lib/config.local.php')) {
 }
 
 // Setup debug mode
 }
 
 // Setup debug mode

-if ($cfg['debug'] === true)
-{
+if ($cfg['debug'] === true) {

     @error_reporting(E_ALL);
     @error_reporting(E_ALL);

-}
-else
-{
+} else {

     @error_reporting(0);
 }
 
     @error_reporting(0);
 }
 


@@ -78,4 +75,4 @@ define('JIRAFEAU_QUARTER', 7776000); // JIRAFEAU_DAY * 90
 define('JIRAFEAU_YEAR', 31536000); // JIRAFEAU_DAY * 365
 
 // set UTC as default timezone for all date/time functions
 define('JIRAFEAU_YEAR', 31536000); // JIRAFEAU_DAY * 365
 
 // set UTC as default timezone for all date/time functions

-date_default_timezone_set ('UTC');
+date_default_timezone_set('UTC');

diff --git a/script.php b/script.php
index 3f7d2f7205b356c6ef609b393129d427cc8aa67c..b8c4bcf10e92e0bce463ada017e7ecb875fa7608 100644 (file)
--- a/script.php
+++ b/script.php
@@ -65,7 +65,7 @@ if (has_error()) {
 /* Upload file */
 if (isset($_FILES['file']) && is_writable(VAR_FILES)
     && is_writable(VAR_LINKS)) {
 /* Upload file */
 if (isset($_FILES['file']) && is_writable(VAR_FILES)
     && is_writable(VAR_LINKS)) {

-    if (isset ($_POST['upload_password'])) {
+    if (isset($_POST['upload_password'])) {

         if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) {
             echo 'Error 3: Invalid password';
             exit;
         if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) {
             echo 'Error 3: Invalid password';
             exit;


@@ -127,11 +127,16 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
         exit;
     }
 
         exit;
     }
 

-    $res = jirafeau_upload($_FILES['file'],
-                           isset($_POST['one_time_download']),
-                           $key, $time, get_ip_address($cfg),
-                           $cfg['enable_crypt'], $cfg['link_name_length'],
-                           $cfg['file_hash']);
+    $res = jirafeau_upload(
+        $_FILES['file'],
+        isset($_POST['one_time_download']),
+        $key,
+        $time,
+        get_ip_address($cfg),
+        $cfg['enable_crypt'],
+        $cfg['link_name_length'],
+        $cfg['file_hash']
+    );

 
     if (empty($res) || $res['error']['has_error']) {
         echo 'Error 6 ' . $res['error']['why'];
 
     if (empty($res) || $res['error']['has_error']) {
         echo 'Error 6 ' . $res['error']['why'];


@@ -384,7 +389,6 @@ elif [ "$1" == "delete" ]; then
     $curl $proxy "$2"
 fi
 <?php
     $curl $proxy "$2"
 fi
 <?php

-

     } else {
         echo 'Error 12';
         exit;
     } else {
         echo 'Error 12';
         exit;


@@ -392,7 +396,7 @@ fi
 }
 /* Initialize an asynchronous upload. */
 elseif (isset($_GET['init_async'])) {
 }
 /* Initialize an asynchronous upload. */
 elseif (isset($_GET['init_async'])) {

-    if (isset($_POST['upload_password'])){
+    if (isset($_POST['upload_password'])) {

         if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) {
             echo 'Error 20: Invalid password';
             exit;
         if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) {
             echo 'Error 20: Invalid password';
             exit;


@@ -457,12 +461,14 @@ elseif (isset($_GET['init_async'])) {
                 break;
         }
     }
                 break;
         }
     }

-    echo jirafeau_async_init($_POST['filename'],
-                              $type,
-                              isset($_POST['one_time_download']),
-                              $key,
-                              $time,
-                              get_ip_address($cfg));
+    echo jirafeau_async_init(
+        $_POST['filename'],
+        $type,
+        isset($_POST['one_time_download']),
+        $key,
+        $time,
+        get_ip_address($cfg)
+    );

 }
 /* Continue an asynchronous upload. */
 elseif (isset($_GET['push_async'])) {
 }
 /* Continue an asynchronous upload. */
 elseif (isset($_GET['push_async'])) {


@@ -471,10 +477,12 @@ elseif (isset($_GET['push_async'])) {
         || (!isset($_POST['code']))) {
         echo 'Error 23';
     } else {
         || (!isset($_POST['code']))) {
         echo 'Error 23';
     } else {

-        echo jirafeau_async_push($_POST['ref'],
-                                  $_FILES['data'],
-                                  $_POST['code'],
-                                  $cfg['maximal_upload_size']);
+        echo jirafeau_async_push(
+            $_POST['ref'],
+            $_FILES['data'],
+            $_POST['code'],
+            $cfg['maximal_upload_size']
+        );

     }
 }
 /* Finalize an asynchronous upload. */
     }
 }
 /* Finalize an asynchronous upload. */