X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/c793d074896f3b22e18d7c3ad45a517f5cebaa1c..29fffe4a12cc764c9087796ecded32a6e5814a65:/lib/functions.php

diff --git a/lib/functions.php b/lib/functions.php
index 1dd03e5..ae3516a 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -2,7 +2,7 @@
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2008  Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
- *  Copyright (C) 2015  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Copyright (C) 2015  Jerome Jutteau <jerome@jutteau.fr>
  *  Copyright (C) 2015  Nicola Spanti (RyDroid) <dev@nicola-spanti.info>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -569,6 +569,14 @@ function check_errors($cfg)
     if (!is_writable(VAR_ASYNC)) {
         add_error(t('ASYNC_DIR_W'), VAR_ASYNC);
     }
+
+    if ($cfg['enable_crypt'] && $cfg['litespeed_workaround']) {
+        add_error(t('INCOMPATIBLE_OPTIONS_W'), 'enable_crypt=true<br>litespeed_workaround=true');
+    }
+
+    if ($cfg['one_time_download'] && $cfg['litespeed_workaround']) {
+        add_error(t('INCOMPATIBLE_OPTIONS_W'), 'one_time_download=true<br>litespeed_workaround=true');
+    }
 }
 
 /**
@@ -619,15 +627,9 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
         echo t('LS_FILES');
     }
     echo '</legend>';
-    echo '<table border="1" width="1100">';
+    echo '<table>';
     echo '<tr>';
-    echo '<th>' . t('FILENAME') . '</th>';
-    echo '<th>' . t('TYPE') . '</th>';
-    echo '<th>' . t('SIZE') . '</th>';
-    echo '<th>' . t('EXPIRE') . '</th>';
-    echo '<th>' . t('ONETIME') . '</th>';
-    echo '<th>' . t('UPLOAD_DATE') . '</th>';
-    echo '<th>' . t('ORIGIN') . '</th>';
+    echo '<th></th>';
     echo '<th>' . t('ACTION') . '</th>';
     echo '</tr>';
 
@@ -664,22 +666,15 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
                 echo '<tr>';
                 echo '<td>' .
                 '<strong><a id="upload_link" href="f.php?h='. jirafeau_escape($node) .'" title="' .
-                    t('DL_PAGE') . '">' . jirafeau_escape($l['file_name']) . '</a></strong>';
-                echo '</td>';
-                echo '<td>' . jirafeau_escape($l['mime_type']) . '</td>';
-                echo '<td>' . jirafeau_human_size($l['file_size']) . '</td>';
-                echo '<td>' . ($l['time'] == -1 ? '∞' : jirafeau_get_datetimefield($l['time'])) . '</td>';
-                echo '<td>';
-                if ($l['onetime'] == 'O') {
-                    echo 'Y';
-                } else {
-                    echo 'N';
-                }
-                echo '</td>';
-                echo '<td>' . jirafeau_get_datetimefield($l['upload_date']) . '</td>';
-                echo '<td>' . $l['ip'] . '</td>';
-                echo '<td>' .
-                '<form method="post">' .
+                    t('DL_PAGE') . '">' . jirafeau_escape($l['file_name']) . '</a></strong><br/>';
+                echo t('TYPE') . ': ' . jirafeau_escape($l['mime_type']) . '<br/>';
+                echo t('SIZE') . ': ' . jirafeau_human_size($l['file_size']) . '<br>';
+                echo t('EXPIRE') . ': ' . ($l['time'] == -1 ? '∞' : jirafeau_get_datetimefield($l['time'])) . '<br/>';
+                echo t('ONETIME') . ': ' . ($l['onetime'] == 'O' ? 'Yes' : 'No') . '<br/>';
+                echo t('UPLOAD_DATE') . ': ' . jirafeau_get_datetimefield($l['upload_date']) . '<br/>';
+                echo t('ORIGIN') . ': ' . $l['ip'] . '<br/>';
+                echo '</td><td>';
+                echo '<form method="post">' .
                 '<input type = "hidden" name = "action" value = "download"/>' .
                 '<input type = "hidden" name = "link" value = "' . $node . '"/>' .
                 jirafeau_admin_csrf_field() .
@@ -858,6 +853,10 @@ function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip)
         return;
     }
 
+    /* touch empty data file */
+    $w_path = $p . $ref . '_data';
+    touch($w_path);
+
     /* md5 password or empty */
     $password = '';
     if (!empty($key)) {
@@ -1005,7 +1004,7 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_m
     $l = s2p("$hash_link");
     if (!@mkdir(VAR_LINKS . $l, 0755, true) ||
         !rename($link_tmp_name, VAR_LINKS . $l . $hash_link)) {
-        echo "Error";
+        return 'Error';
     }
 
     /* Clean async upload. */
@@ -1336,3 +1335,12 @@ function jirafeau_admin_csrf_field()
 {
     return "<input type='hidden' name='admin_csrf' value='". $_SESSION['admin_csrf'] . "'/>";
 }
+
+function jirafeau_dir_size($dir)
+{
+    $size = 0;
+    foreach (glob(rtrim($dir, '/').'/*', GLOB_NOSORT) as $entry) {
+        $size += is_file($entry) ? filesize($entry) : jirafeau_dir_size($entry);
+    }
+    return $size;
+}