X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/0d312b3c20fc8d17a4808442c49b72a499d0dc76..0b85af176ceecbd94fad0b48977abf6eeff9c0c0:/lib/functions.php?ds=sidebyside

diff --git a/lib/functions.php b/lib/functions.php
index 01d0638..c234f4c 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -25,9 +25,16 @@
  */
 function s2p($s)
 {
+    $block_size = 8;
     $p = '';
     for ($i = 0; $i < strlen($s); $i++) {
-        $p .= $s{$i} . '/';
+        $p .= $s{$i};
+        if (($i + 1) % $block_size == 0) {
+            $p .= '/';
+        }
+    }
+    if (strlen($s) % $block_size != 0) {
+        $p .= '/';
     }
     return $p;
 }
@@ -498,16 +505,13 @@ function check_errors($cfg)
         exit;
     }
 
-    /* check if the destination dirs are writable */
-    $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);
+        add_error(t('FILE_DIR_W'), VAR_FILES);
     }
 
     if (!is_writable(VAR_LINKS)) {
-        add_error(t('The link directory is not writable!'), VAR_LINKS);
+        add_error(t('LINK_DIR_W'), VAR_LINKS);
     }
 
     if (!is_writable(VAR_ASYNC)) {
@@ -563,16 +567,16 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
         echo t('LS_FILES');
     }
     echo '</legend>';
-    echo '<table>';
+    echo '<table border="1" width="1100">';
     echo '<tr>';
-    echo '<td>' . t('FILENAME') . '</td>';
-    echo '<td>' . t('TYPE') . '</td>';
-    echo '<td>' . t('SIZE') . '</td>';
-    echo '<td>' . t('EXPIRE') . '</td>';
-    echo '<td>' . t('ONETIME') . '</td>';
-    echo '<td>' . t('UPLOAD_DATE') . '</td>';
-    echo '<td>' . t('ORIGIN') . '</td>';
-    echo '<td>' . t('ACTION') . '</td>';
+    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>' . t('ACTION') . '</th>';
     echo '</tr>';
 
     /* Get all links files. */
@@ -1111,6 +1115,21 @@ function jirafeau_challenge_upload ($cfg, $ip, $password)
         return true;
     }
 
+    // Allow if ip is in array (no password)
+    foreach ($cfg['upload_ip_nopassword'] 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)) {
+                return true;
+            }
+        }
+    }
+
     // Allow if ip is in array
     foreach ($cfg['upload_ip'] as $i) {
         if ($i == $ip) {