Fixed every error detected by php-cs-fixer (except the single_space_around_construct...

diff --git a/admin.php b/admin.php
index a6bacd337f379507b8d242f27b0f68fd6623aea6..f8270a28d3bef505f8888b1de17483d8cf780f1c 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -37,17 +37,18 @@ if (php_sapi_name() == "cli") {
     if ($cfg['installation_done'] == false) {
         die("Installation not completed yet.\n");
     }
     if ($cfg['installation_done'] == false) {
         die("Installation not completed yet.\n");
     }

-    if ((count($argv)>1) && $argv[1]=="clean_expired") {
+    if ((count($argv) > 1) && $argv[1] == 'clean_expired') {

         $total = jirafeau_admin_clean();
         echo "$total expired files deleted.\n";
         $total = jirafeau_admin_clean();
         echo "$total expired files deleted.\n";

-    } elseif ((count($argv)>1) && $argv[1]=="clean_async") {
+    } elseif ((count($argv) > 1) && $argv[1] == 'clean_async') {

         $total = jirafeau_admin_clean_async();
         echo "$total old unfinished transfers deleted.\n";
     } else {
         die("No command found. Should be admin.php <clean_expired|clean_async>.\n");
     }
         $total = jirafeau_admin_clean_async();
         echo "$total old unfinished transfers deleted.\n";
     } else {
         die("No command found. Should be admin.php <clean_expired|clean_async>.\n");
     }

-// Second check: Challenge by IP
-} elseif (true === jirafeau_challenge_admin_ip($cfg, get_ip_address($cfg))) {
+}
+/* Second check: Challenge by IP */
+elseif (true === jirafeau_challenge_admin_ip($cfg, get_ip_address($cfg))) {

     /* 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');
     /* 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');

diff --git a/index.php b/index.php
index da6ee2f67e39900b644b47eb020404aca17e96fb..435e059711db7532e24bb67c6c8ef37f1c5dee49 100644 (file)
--- a/index.php
+++ b/index.php
@@ -130,7 +130,7 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
         <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.";
+                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.";
             }
             } elseif ($cfg['maximal_upload_size'] > 0) {
                 echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB.";
             }


@@ -143,26 +143,26 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
         if ($cfg['one_time_download']) {
             echo '<tr><td>' . t('ONE_TIME_DL') . ':</td>';
             echo '<td><input type="checkbox" id="one_time_download"';
         if ($cfg['one_time_download']) {
             echo '<tr><td>' . t('ONE_TIME_DL') . ':</td>';
             echo '<td><input type="checkbox" id="one_time_download"';

-            
+

             if ($cfg['one_time_download_preselected']) {
                 echo ' checked';
             }
 
             echo ' /></td></tr>';
         }
             if ($cfg['one_time_download_preselected']) {
                 echo ' checked';
             }
 
             echo ' /></td></tr>';
         }

-        if ($cfg['download_password_requirement'] === 'generated') {
-            echo '<input type="hidden" name="key" id="input_key" value="' . $download_pass .'"/>';
-        } else {
-            echo '<tr><td><label for="input_key">' . t('PSW') . ':' . '</label></td>';
-            echo '<td><input type="password" name="key" id="input_key" autocomplete = "new-password"';
-            if ($cfg['download_password_policy'] === 'regex') {
-                echo ' pattern="' . substr($cfg['download_password_policy_regex'], 1, strlen($cfg['download_password_policy_regex']) - 2) . '"'; //remove php delimiters
-            }
-            if ($cfg['download_password_requirement'] === 'required') {
-                echo ' required';
-            }
-            echo '/></td></tr>';
-        }?>
+if ($cfg['download_password_requirement'] === 'generated') {
+    echo '<input type="hidden" name="key" id="input_key" value="' . $download_pass .'"/>';
+} else {
+    echo '<tr><td><label for="input_key">' . t('PSW') . ':' . '</label></td>';
+    echo '<td><input type="password" name="key" id="input_key" autocomplete = "new-password"';
+    if ($cfg['download_password_policy'] === 'regex') {
+        echo ' pattern="' . substr($cfg['download_password_policy_regex'], 1, strlen($cfg['download_password_policy_regex']) - 2) . '"'; //remove php delimiters
+    }
+    if ($cfg['download_password_requirement'] === 'required') {
+        echo ' required';
+    }
+    echo '/></td></tr>';
+}?>

         <tr>
         <td><label for="select_time"><?php echo t('TIME_LIM') . ':'; ?></label></td>
         <td>
         <tr>
         <td><label for="select_time"><?php echo t('TIME_LIM') . ':'; ?></label></td>
         <td>

diff --git a/install.php b/install.php
index 2550aa615fb3247df811486290c6ad264eb455b3..ebda6f566af9d0de581c5a102101eac03687881e 100644 (file)
--- a/install.php
+++ b/install.php
@@ -153,7 +153,7 @@ break;
           'abcdefghijklmnopqrstuvwxyz' . '0123456789';
                 $len_alphanum = strlen($alphanum);
                 $var = 'var-';
           'abcdefghijklmnopqrstuvwxyz' . '0123456789';
                 $len_alphanum = strlen($alphanum);
                 $var = 'var-';

-                for ($i = 0; $i <JIRAFEAU_VAR_RAND_LENGTH; $i++) {
+                for ($i = 0; $i < JIRAFEAU_VAR_RAND_LENGTH; $i++) {

                     $var .= substr($alphanum, mt_rand(0, $len_alphanum - 1), 1);
                 }
                 echo JIRAFEAU_ROOT . $var . '/';
                     $var .= substr($alphanum, mt_rand(0, $len_alphanum - 1), 1);
                 }
                 echo JIRAFEAU_ROOT . $var . '/';

diff --git a/lib/functions.js.php b/lib/functions.js.php
index 64154d3be3c0bd481da7231df7f11eaad4174aed..b8888a69f90114cba914523fc738301e46e93fd7 100644 (file)
--- a/lib/functions.js.php
+++ b/lib/functions.js.php
@@ -19,7 +19,8 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 

- function template_js_preview_link() {
+function template_js_preview_link()
+{

     ?>
     if (!!document.getElementById('preview_link'))
     {
     ?>
     if (!!document.getElementById('preview_link'))
     {


@@ -44,8 +45,9 @@
         }
     } 
     <?php
         }
     } 
     <?php

- }
-function template_js_download_page() {
+}
+function template_js_download_page()
+{

     ?>
     // Download page
     var download_link_href = 'f.php?h=' + reference;
     ?>
     // Download page
     var download_link_href = 'f.php?h=' + reference;


@@ -60,7 +62,8 @@ function template_js_download_page() {
     }
     <?php
 }
     }
     <?php
 }

-function template_js_email_link() {
+function template_js_email_link()
+{

     ?>
     // Email link
     var b = encodeURIComponent("<?php echo t("DL"); ?> \"" + filename + "\":") + "%0D" + "%0A";
     ?>
     // Email link
     var b = encodeURIComponent("<?php echo t("DL"); ?> \"" + filename + "\":") + "%0D" + "%0A";


@@ -72,7 +75,8 @@ function template_js_email_link() {
     }
     <?php
 }
     }
     <?php
 }

-function template_js_delete_link() {
+function template_js_delete_link()
+{

     ?>
     // Delete link
     var delete_link_href = 'f.php?h=' + reference + '&d=' + delete_code;
     ?>
     // Delete link
     var delete_link_href = 'f.php?h=' + reference + '&d=' + delete_code;


@@ -80,7 +84,8 @@ function template_js_delete_link() {
     document.getElementById('delete_link_text').innerHTML = web_root + delete_link_href;
     <?php
 }
     document.getElementById('delete_link_text').innerHTML = web_root + delete_link_href;
     <?php
 }

- function template_js_direct_download() {
+function template_js_direct_download()
+{

     ?>
     // Direct download link
     var direct_download_link_href = 'f.php?h=' + reference + '&d=1';
     ?>
     // Direct download link
     var direct_download_link_href = 'f.php?h=' + reference + '&d=1';


@@ -91,8 +96,9 @@ function template_js_delete_link() {
     document.getElementById('direct_link').href = direct_download_link_href;
     document.getElementById('direct_link_text').innerHTML = web_root + direct_download_link_href;
     <?php
     document.getElementById('direct_link').href = direct_download_link_href;
     document.getElementById('direct_link_text').innerHTML = web_root + direct_download_link_href;
     <?php

- }
- function template_js_date_function() {
+}
+function template_js_date_function()
+{

     ?>
     // Validity date
     if (isEmpty(date))
     ?>
     // Validity date
     if (isEmpty(date))


@@ -111,7 +117,7 @@ function template_js_delete_link() {
             document.getElementById('date').style.display = '';
     }
     <?php
             document.getElementById('date').style.display = '';
     }
     <?php

- }
+}

 
 
 
 
 
 

diff --git a/lib/functions.php b/lib/functions.php
index f70e0dede238480eeb9339c6633d5ad8c19f3c72..2843e29d685f34fd0963ac7fe2d4fc203a77e163 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -93,7 +93,7 @@ function jirafeau_gen_random($l)
         return 42;
     }
 
         return 42;
     }
 

-    $code="";
+    $code = '';

     for ($i = 0; $i < $l; $i++) {
         $code .= dechex(rand(0, 15));
     }
     for ($i = 0; $i < $l; $i++) {
         $code .= dechex(rand(0, 15));
     }


@@ -106,7 +106,7 @@ function jirafeau_gen_download_pass($length, $allowed_chars)
     if ($length <= 0) {
         return false;
     }
     if ($length <= 0) {
         return false;
     }

-    $pass="";
+    $pass = '';

     for ($i = 0; $i < $length; $i++) {
         $pass .= $allowed_chars[rand(0, strlen($allowed_chars) - 1)];
     }
     for ($i = 0; $i < $length; $i++) {
         $pass .= $allowed_chars[rand(0, strlen($allowed_chars) - 1)];
     }


@@ -143,10 +143,10 @@ function jirafeau_human_size($octets)
 // Convert UTC timestamp to a datetime field
 function jirafeau_get_datetimefield($timestamp)
 {
 // Convert UTC timestamp to a datetime field
 function jirafeau_get_datetimefield($timestamp)
 {

-    $ts = date_create("@" . $timestamp);
+    $ts = date_create('@' . $timestamp);

     $content = '<span class="datetime" data-datetime="' . date_format($ts, 'Y-m-d H:i') . '">'
         . date_format($ts, 'Y-m-d H:i') . ' (GMT)</span>';
     $content = '<span class="datetime" data-datetime="' . date_format($ts, 'Y-m-d H:i') . '">'
         . date_format($ts, 'Y-m-d H:i') . ' (GMT)</span>';

-    
+

     return $content;
 }
 
     return $content;
 }
 


@@ -397,7 +397,7 @@ function jirafeau_hash_file($method, $file_path)
 function jirafeau_md5_outside($file_path)
 {
     $out = false;
 function jirafeau_md5_outside($file_path)
 {
     $out = false;

-    $handle = fopen($file_path, "r");
+    $handle = fopen($file_path, 'r');

     if ($handle === false) {
         return false;
     }
     if ($handle === false) {
         return false;
     }


@@ -450,12 +450,13 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l
 }
 
 /**
 }
 
 /**

- * 
- * @param bool $crypt_module_enabled 
- * @param string $file_path 
+ *
+ * @param bool $crypt_module_enabled
+ * @param string $file_path

  * @return array [bool, string]
  */
  * @return array [bool, string]
  */

-function jirafeau_handle_add_file_encryption($crypt_module_enabled, $file_path) {
+function jirafeau_handle_add_file_encryption($crypt_module_enabled, $file_path)
+{

     /* Crypt file if option is enabled. */
     $crypted = false;
     $crypt_key = '';
     /* Crypt file if option is enabled. */
     $crypted = false;
     $crypt_key = '';


@@ -501,7 +502,6 @@ function jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt,
     $crypt_key = '';
     list($crypted, $crypt_key) = jirafeau_handle_add_file_encryption($crypt, $file['tmp_name']);
 
     $crypt_key = '';
     list($crypted, $crypt_key) = jirafeau_handle_add_file_encryption($crypt, $file['tmp_name']);
 

-    

     /* file information */
     $hash = jirafeau_hash_file($file_hash_method, $file['tmp_name']);
     $name = str_replace(NL, '', trim($file['name']));
     /* file information */
     $hash = jirafeau_hash_file($file_hash_method, $file['tmp_name']);
     $name = str_replace(NL, '', trim($file['name']));


@@ -513,12 +513,9 @@ function jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt,
     $p = s2p("$hash");
     if (file_exists(VAR_FILES . $p .  $hash)) {
         $rc = unlink($file['tmp_name']);
     $p = s2p("$hash");
     if (file_exists(VAR_FILES . $p .  $hash)) {
         $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 . $hash)) 
-            $move_operation($file['tmp_name'], VAR_FILES . $p . $hash))
-            {
-            
+    } elseif (
+        (file_exists(VAR_FILES . $p) || @mkdir(VAR_FILES . $p, 0755, true)) &&
+        $move_operation($file['tmp_name'], VAR_FILES . $p . $hash)) {

         $rc = true;
     }
     if (!$rc) {
         $rc = true;
     }
     if (!$rc) {


@@ -526,7 +523,7 @@ function jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt,
                  'error' =>
                    array('has_error' => true,
                           'why' => t('INTERNAL_ERROR_DEL')),
                  'error' =>
                    array('has_error' => true,
                           'why' => t('INTERNAL_ERROR_DEL')),

-                 'link' =>'',
+                 'link' => '',

                  'delete_link' => ''));
     }
 
                  'delete_link' => ''));
     }
 


@@ -580,7 +577,7 @@ function jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt,
                  'error' =>
                    array('has_error' => true,
                           'why' => t('Internal error during file creation. ')),
                  'error' =>
                    array('has_error' => true,
                           'why' => t('Internal error during file creation. ')),

-                 'link' =>'',
+                 'link' => '',

                  'delete_link' => '');
     }
     return array( 'error' => $noerr,
                  'delete_link' => '');
     }
     return array( 'error' => $noerr,


@@ -589,8 +586,8 @@ function jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt,
                   'crypt_key' => $crypt_key);
 }
 
                   'crypt_key' => $crypt_key);
 }
 

-
-function jirafeau_admin_list_table ($name, $file_hash, $link_hash, $visitor_function = null) {
+function jirafeau_admin_list_table($name, $file_hash, $link_hash, $visitor_function = null)
+{

     echo '<fieldset><legend>';
     if (!empty($name)) {
         echo t('FILENAME') . ": " . jirafeau_escape($name);
     echo '<fieldset><legend>';
     if (!empty($name)) {
         echo t('FILENAME') . ": " . jirafeau_escape($name);


@@ -616,10 +613,6 @@ function jirafeau_admin_list_table ($name, $file_hash, $link_hash, $visitor_func
     echo '</table></fieldset>';
 }
 
     echo '</table></fieldset>';
 }
 

-
-
-
-

 /**
  * Tells if a mime-type is viewable in a browser
  * @param $mime the mime type
 /**
  * Tells if a mime-type is viewable in a browser
  * @param $mime the mime type


@@ -748,8 +741,8 @@ function jirafeau_get_link($hash)
  */
 function jirafeau_admin_list($name, $file_hash, $link_hash)
 {
  */
 function jirafeau_admin_list($name, $file_hash, $link_hash)
 {

-    $function = function($name, $file_hash, $link_hash) {
-         /* Get all links files. */
+    $function = function ($name, $file_hash, $link_hash) {
+        /* Get all links files. */

         $stack = array(VAR_LINKS);
         while (($d = array_shift($stack)) && $d != null) {
             $dir = scandir($d);
         $stack = array(VAR_LINKS);
         while (($d = array_shift($stack)) && $d != null) {
             $dir = scandir($d);


@@ -785,8 +778,7 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
                     if (!$l['crypted'] && !$l['crypted_legacy']) {
                         echo'<a href="f.php?h='. jirafeau_escape($node) .'" title="' .
                         t('DL_PAGE') . '">' . jirafeau_escape($l['file_name']) . '</a>';
                     if (!$l['crypted'] && !$l['crypted_legacy']) {
                         echo'<a href="f.php?h='. jirafeau_escape($node) .'" title="' .
                         t('DL_PAGE') . '">' . jirafeau_escape($l['file_name']) . '</a>';

-                    }
-                    else {
+                    } else {

                         echo jirafeau_escape($l['file_name']);
                     }
 
                         echo jirafeau_escape($l['file_name']);
                     }
 


@@ -829,8 +821,9 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
                 }
             }
         }
                 }
             }
         }

-        };
-        jirafeau_admin_list_table($name, $file_hash, $link_hash, $function);
+    };
+
+    jirafeau_admin_list_table($name, $file_hash, $link_hash, $function);

 }
 
 /**
 }
 
 /**


@@ -1341,7 +1334,7 @@ function jirafeau_decrypt_file($fp_src, $fp_dst, $k)
     for ($i = SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES; $i < $fs; $i += JIRAFEAU_SODIUM_CHUNKSIZE + SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES) {
         $to_dec = fread($r, JIRAFEAU_SODIUM_CHUNKSIZE + SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES);
         [$dec, $crypt_tag] = sodium_crypto_secretstream_xchacha20poly1305_pull($crypt_state, $to_dec);
     for ($i = SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES; $i < $fs; $i += JIRAFEAU_SODIUM_CHUNKSIZE + SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES) {
         $to_dec = fread($r, JIRAFEAU_SODIUM_CHUNKSIZE + SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES);
         [$dec, $crypt_tag] = sodium_crypto_secretstream_xchacha20poly1305_pull($crypt_state, $to_dec);

-        
+

         if (fwrite($w, $dec) === false) {
             return false;
         }
         if (fwrite($w, $dec) === false) {
             return false;
         }


@@ -1758,7 +1751,7 @@ function jirafeau_get_download_stats($hash)
     $filename = VAR_LINKS . s2p("$hash") . $hash . '_download';
 
     if (!file_exists($filename)) {
     $filename = VAR_LINKS . s2p("$hash") . $hash . '_download';
 
     if (!file_exists($filename)) {

-        return array('count'=>0);
+        return array('count' => 0);

     }
 
     $c = file($filename);
     }
 
     $c = file($filename);


@@ -1782,7 +1775,8 @@ function jirafeau_write_download_stats($hash, $ip)
     fclose($handle);
 }
 
     fclose($handle);
 }
 

-function jirafeau_create_upload_finished_box($preview = true) {
+function jirafeau_create_upload_finished_box($preview = true)
+{

     ?>
 
     <div id="upload_finished">
     ?>
 
     <div id="upload_finished">


@@ -1798,8 +1792,8 @@ function jirafeau_create_upload_finished_box($preview = true) {
     </p>
     </div>
 
     </p>
     </div>
 

-    <?php if ($preview == true) {
-    ?>
+    <?php
+    if ($preview == true) { ?>

     <div id="upload_finished_preview">
     <p>
         <a id="preview_link" href=""><?php echo t('VIEW_LINK') ?></a>
     <div id="upload_finished_preview">
     <p>
         <a id="preview_link" href=""><?php echo t('VIEW_LINK') ?></a>


@@ -1809,7 +1803,8 @@ function jirafeau_create_upload_finished_box($preview = true) {
     </p>
     </div>
     <?php
     </p>
     </div>
     <?php

-} ?>
+    }
+    ?>

 
     <div id="upload_direct_download">
     <p>
 
     <div id="upload_direct_download">
     <p>


@@ -1834,77 +1829,76 @@ function jirafeau_create_upload_finished_box($preview = true) {
     <p id="date"></p>
     </div>
 </div>
     <p id="date"></p>
     </div>
 </div>

-<?php 
+<?php

 }
 
 }
 

-function jirafeau_get_expiration_time_options() {
-    return 
-    array(
+function jirafeau_get_expiration_time_options()
+{
+    return array(

         array(
         array(

-          'value' => 'minute',
-          'label' => '1_MIN'
+            'value' => 'minute',
+            'label' => '1_MIN'

         ),
         array(
         ),
         array(

-          'value' => 'hour',
-          'label' => '1_H'
+            'value' => 'hour',
+            'label' => '1_H'

         ),
         array(
         ),
         array(

-          'value' => 'day',
-          'label' => '1_D'
+            'value' => 'day',
+            'label' => '1_D'

         ),
         array(
         ),
         array(

-          'value' => 'week',
-          'label' => '1_W'
+            'value' => 'week',
+            'label' => '1_W'

         ),
         array(
             'value' => 'fortnight',
             'label' => '2_W'
         ),
         array(
         ),
         array(
             'value' => 'fortnight',
             'label' => '2_W'
         ),
         array(

-          'value' => 'month',
-          'label' => '1_M'
+            'value' => 'month',
+            'label' => '1_M'

         ),
         array(
         ),
         array(

-          'value' => 'quarter',
-          'label' => '1_Q'
+            'value' => 'quarter',
+            'label' => '1_Q'

         ),
         array(
         ),
         array(

-          'value' => 'year',
-          'label' => '1_Y'
+            'value' => 'year',
+            'label' => '1_Y'

         ),
         array(
         ),
         array(

-          'value' => 'none',
-          'label' => 'NONE'
+            'value' => 'none',
+            'label' => 'NONE'

         )
         )

-      );
+        );

 }
 
 }
 

+/**
+ *
+ * creates the time selection field
+ * @param mixed $cfg
+ * @return void
+ */
+function jirafeau_create_selection_array($cfg)
+{
+    echo '<select name="time" id="select_time">';

 
 

+    $expirationTimeOptions = jirafeau_get_expiration_time_options();

 
 

- /**
-  * 
-  * creates the time selection field
-  * @param mixed $cfg 
-  * @return void 
-  */
-  function jirafeau_create_selection_array($cfg) {
-    echo 
-    '<select name="time" id="select_time">';
-        
-        
-        $expirationTimeOptions = jirafeau_get_expiration_time_options();
-
-        foreach ($expirationTimeOptions as $expirationTimeOption) {
-            $selected = ($expirationTimeOption['value'] === $cfg['availability_default'])? 'selected="selected"' : '';
-            if (true === $cfg['availabilities'][$expirationTimeOption['value']]) {
-                echo '<option value="' . $expirationTimeOption['value'] . '" ' .
-              $selected . '>' . t($expirationTimeOption['label']) . '</option>';
-            }
+    foreach ($expirationTimeOptions as $expirationTimeOption) {
+        $selected = ($expirationTimeOption['value'] === $cfg['availability_default']) ? 'selected="selected"' : '';
+        if (true === $cfg['availabilities'][$expirationTimeOption['value']]) {
+            echo '<option value="' . $expirationTimeOption['value'] . '" ' .
+            $selected . '>' . t($expirationTimeOption['label']) . '</option>';

         }
         }

-        echo '</select>';
- }
+    }
+
+    echo '</select>';
+}

 
 

- function jirafeau_datestr_to_int ($time_str) {
+function jirafeau_datestr_to_int($time_str)
+{

     $time = time();
     switch ($time_str) {
         case 'minute':
     $time = time();
     switch ($time_str) {
         case 'minute':


@@ -1931,7 +1925,7 @@ function jirafeau_get_expiration_time_options() {
         case 'year':
             $time += JIRAFEAU_YEAR;
             break;
         case 'year':
             $time += JIRAFEAU_YEAR;
             break;

-       default:
+        default:

             $time = JIRAFEAU_INFINITY;
             break;
     }
             $time = JIRAFEAU_INFINITY;
             break;
     }


@@ -1942,10 +1936,10 @@ function jirafeau_get_expiration_time_options() {
 
 
 /**
 
 
 /**

- * links or copy a local file 
+ * links or copy a local file

  * TODO: boolean in config for linking
  * TODO: boolean in config for linking

- * @param string $filepath 
- * @param $one_time_download is the file a one time download ?
+ * @param string $filepath
+ * @param $one_time_download is the file a one time download?

  * @param $key if not empty, protect the file with this key
  * @param $time the time of validity of the file
  * @param $ip uploader's ip
  * @param $key if not empty, protect the file with this key
  * @param $time the time of validity of the file
  * @param $ip uploader's ip


@@ -1956,21 +1950,20 @@ function jirafeau_get_expiration_time_options() {
  *   'link' => the link name of the uploaded file
  *   'delete_link' => the link code to delete file
  */
  *   'link' => the link name of the uploaded file
  *   'delete_link' => the link code to delete file
  */

-function jirafeau_copy_local_file($local_file_path, $one_time_download, $key, $time, $ip, $crypt, $link_name_length, $file_hash_method) {
-    
+function jirafeau_copy_local_file($local_file_path, $one_time_download, $key, $time, $ip, $crypt, $link_name_length, $file_hash_method)
+{

     if (!file_exists($local_file_path)) {
         return (array(
             'error' =>
               array('has_error' => true,
                      'why' => t('INTERNAL_ERROR_FILE_NOT_EXIST')),
     if (!file_exists($local_file_path)) {
         return (array(
             'error' =>
               array('has_error' => true,
                      'why' => t('INTERNAL_ERROR_FILE_NOT_EXIST')),

-            'link' =>'',
+            'link' => '',

             'delete_link' => ''));
     }
             'delete_link' => ''));
     }

-    if(
+    if (

         // sanity check if file can be opened
         // sanity check if file can be opened

-        $file = fopen($local_file_path, "r")
-    )
-    {
+        $file = fopen($local_file_path, 'r')
+    ) {

         // close file pointer - it's not needed here
         fclose($file);
         $time_in_int = jirafeau_datestr_to_int($time);
         // close file pointer - it's not needed here
         fclose($file);
         $time_in_int = jirafeau_datestr_to_int($time);


@@ -1985,25 +1978,23 @@ function jirafeau_copy_local_file($local_file_path, $one_time_download, $key, $t
             $file_hash_method,
             false
         );
             $file_hash_method,
             false
         );

-    }
-    else {
+    } else {

         return (array(
             'error' =>
               array('has_error' => true,
                      'why' => t('INTERNAL_ERROR_FP_OPEN_LOCAL')),
         return (array(
             'error' =>
               array('has_error' => true,
                      'why' => t('INTERNAL_ERROR_FP_OPEN_LOCAL')),

-            'link' =>'',
+            'link' => '',

             'delete_link' => ''));
     }
             'delete_link' => ''));
     }

-    

 }
 
 
 }
 
 

-function jirafeau_create_file_array($file_path) {
-    return 
-    [
-       'type' => mime_content_type($file_path),
-       'tmp_name' => $file_path,
-       'name' => basename($file_path),
-       'size' => filesize($file_path),
+function jirafeau_create_file_array($file_path)
+{
+    return [
+        'type' => mime_content_type($file_path),
+        'tmp_name' => $file_path,
+        'name' => basename($file_path),
+        'size' => filesize($file_path),

     ];
 }
     ];
 }

diff --git a/lib/template/header.php b/lib/template/header.php
index 8be36c7213715974649826f308a7e007ad4267a7..93f7e1843d0f55c9025c81547b7eb45f42694bc4 100644 (file)
--- a/lib/template/header.php
+++ b/lib/template/header.php
@@ -6,7 +6,7 @@ header('x-ua-compatible: ie=edge');
 <html>
 <head>
   <meta charset="utf-8">
 <html>
 <head>
   <meta charset="utf-8">

-  <title><?php echo (true === empty($cfg['title']))? t('JI_WEB_RE') : $cfg['title']; ?></title>
+  <title><?php echo (true === empty($cfg['title'])) ? t('JI_WEB_RE') : $cfg['title']; ?></title>

   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link id="shortcut_icon" rel="shortcut icon" href="<?php echo 'media/' . $cfg['style'] . '/favicon.ico'; ?>">
   <link id="stylesheet" rel="stylesheet" href="<?php echo 'media/' . $cfg['style'] . '/style.css.php'; ?>" type="text/css" />
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link id="shortcut_icon" rel="shortcut icon" href="<?php echo 'media/' . $cfg['style'] . '/favicon.ico'; ?>">
   <link id="stylesheet" rel="stylesheet" href="<?php echo 'media/' . $cfg['style'] . '/style.css.php'; ?>" type="text/css" />


@@ -17,6 +17,6 @@ header('x-ua-compatible: ie=edge');
 <div id="content">
   <h1>
     <a href="./">
 <div id="content">
   <h1>
     <a href="./">

-      <?php echo (true === empty($cfg['title']))? t('JI_WEB_RE') : $cfg['title']; ?>
+      <?php echo (true === empty($cfg['title'])) ? t('JI_WEB_RE') : $cfg['title']; ?>

     </a>
   </h1>
     </a>
   </h1>

diff --git a/script.php b/script.php
index c0cee68b3d05b4ae4fe08ee541a1cc21d469fb2b..5f3bc6f359996bd866a89a5b410b9fd8921b05e2 100644 (file)
--- a/script.php
+++ b/script.php
@@ -175,7 +175,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
     }
     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";
+        echo 'Ok';

         exit;
     }
     if ($link['time'] != JIRAFEAU_INFINITY && time() > $link['time']) {
         exit;
     }
     if ($link['time'] != JIRAFEAU_INFINITY && time() > $link['time']) {


@@ -217,8 +217,8 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
 } elseif (isset($_GET['get_version'])) {
     echo JIRAFEAU_VERSION;
 } elseif (isset($_GET['lang'])) {
 } elseif (isset($_GET['get_version'])) {
     echo JIRAFEAU_VERSION;
 } elseif (isset($_GET['lang'])) {

-    $l=$_GET['lang'];
-    if ($l == "bash") {
+    $l = $_GET['lang'];
+    if ($l == 'bash') {

         ?>
 #!/bin/bash
 
         ?>
 #!/bin/bash