X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/8adcdf2e61aa2746235d99202ad07b59d0198b04..3e79bc188ef0d5b603b26163c0d0048c9310ec4c:/script.php?ds=sidebyside

diff --git a/script.php b/script.php
index 45ca635..1d420b6 100755
--- a/script.php
+++ b/script.php
@@ -25,7 +25,7 @@
 
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 
-require (JIRAFEAU_ROOT . 'lib/config.php');
+require (JIRAFEAU_ROOT . 'lib/config.original.php');
 require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');
 require (JIRAFEAU_ROOT . 'lib/lang.php');
@@ -199,6 +199,15 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
         echo '<p>' . t('This will return brut text content.') . ' ' .
              t('First line is a block id the second line the edit/delete code.') . '<br /></p>';
 
+        echo '<h3>' . t('Get block size') . ':</h3>';
+        echo '<p>';
+        echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?get_block_size</i><br />';
+        echo '<br />';
+        echo t('Parameters') . ':<br />';
+        echo "<b>id=</b>block_id<i> (" . t('Required') . ")</i> <br />";
+        echo '</p>';
+        echo '<p>' . t('This will return asked data or "Error" string.') . '<br /></p>';
+
         echo '<h3>' . t('Read data in a block') . ':</h3>';
         echo '<p>';
         echo t('Send a GET query to') . ': <i>' . $web_root . 'script.php?read_block</i><br />';
@@ -241,6 +250,13 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
 /* Lets use interface now. */
 header('Content-Type: text; charset=utf-8');
 
+check_errors ();
+if (has_error ())
+{
+    echo "Error";
+    exit;
+}
+
 /* Upload file */
 if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     && is_writable (VAR_LINKS))
@@ -276,7 +292,8 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
         }
     $res = jirafeau_upload ($_FILES['file'],
                             isset ($_POST['one_time_download']),
-                            $key, $time, $_SERVER['REMOTE_ADDR']);
+                            $key, $time, $_SERVER['REMOTE_ADDR'],
+                            $cfg['enable_crypt'], $cfg['link_name_lenght']);
     
     if (empty($res) || $res['error']['has_error'])
     {
@@ -285,9 +302,12 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
     }
     /* Print direct link. */
     echo $res['link'];
-    echo NL;
     /* Print delete link. */
+    echo NL;
     echo $res['delete_link'];
+    /* Print decrypt key. */
+    echo NL;
+    echo urlencode($res['crypt_key']);
 }
 elseif (isset ($_GET['h']))
 {
@@ -299,7 +319,7 @@ elseif (isset ($_GET['h']))
     if (isset ($_GET['d']))
         $d = $_GET['d'];
     
-    if (!preg_match ('/[0-9a-zA-Z_-]{22}$/', $link_name))
+    if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
     {
         echo "Error";
         exit;
@@ -564,7 +584,7 @@ elseif (isset ($_GET['end_async']))
         || !isset ($_POST['code']))
         echo "Error";
     else
-        echo jirafeau_async_end ($_POST['ref'], $_POST['code']);
+        echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_lenght']);
 }
 /* Initialize block. */
 elseif (isset ($_GET['init_block']) && $cfg['enable_blocks'])
@@ -574,6 +594,14 @@ elseif (isset ($_GET['init_block']) && $cfg['enable_blocks'])
     else
         echo jirafeau_block_init ($_POST['size']);
 }
+/* Get block size. */
+elseif (isset ($_GET['get_block_size']) && $cfg['enable_blocks'])
+{
+    if (!isset ($_POST['id']))
+        echo "Error";
+    else
+        echo jirafeau_block_get_size ($_POST['id']);
+}
 /* Read data in block. */
 elseif (isset ($_GET['read_block']) && $cfg['enable_blocks'])
 {