[TASK] Explain how to migrate to Jirafeau 4.0.0

[jirafeau.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
index 01d0638d2db57e4a587959375aaa98530ab0c7e5..df207da48ee9789c5ebf8008f1fb2dc66e549d6e 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -25,9 +25,16 @@
  */
 function s2p($s)
 {
  */
 function s2p($s)
 {

+    $block_size = 8;

     $p = '';
     for ($i = 0; $i < strlen($s); $i++) {
     $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;
 }
     }
     return $p;
 }


@@ -498,16 +505,13 @@ function check_errors($cfg)
         exit;
     }
 
         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)) {
     /* 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)) {
     }
 
     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)) {
     }
 
     if (!is_writable(VAR_ASYNC)) {


@@ -1111,6 +1115,21 @@ function jirafeau_challenge_upload ($cfg, $ip, $password)
         return true;
     }
 
         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) {
     // Allow if ip is in array
     foreach ($cfg['upload_ip'] as $i) {
         if ($i == $ip) {