X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/a995e194d8f5e997cfc1032389497a9f20b7d7e3..3e79bc188ef0d5b603b26163c0d0048c9310ec4c:/script.php?ds=sidebyside
diff --git a/script.php b/script.php
index 25548e6..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');
@@ -182,6 +182,66 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
echo '' . t('This will return brut text content.') . ' ' .
t('First line is the download reference and the second line the delete code.') . '
';
+ if ($cfg['enable_blocks'])
+ {
+ echo '' . t('Create a data block') . ':
';
+ echo '';
+ echo t('This interface permits to create a block of data filled with zeros.') .
+ ' ' . t('You can read selected parts, write (using a code) and delete the block.') .
+ ' ' . t('Blocks may be removed after a month of non usage.');
+ echo '
';
+ echo '';
+ echo t('Send a GET query to') . ': ' . $web_root . 'script.php?init_block
';
+ echo '
';
+ echo t('Parameters') . ':
';
+ echo "size=size_in_bytes (" . t('Required') . ")
";
+ echo '
';
+ echo '' . t('This will return brut text content.') . ' ' .
+ t('First line is a block id the second line the edit/delete code.') . '
';
+
+ echo '' . t('Get block size') . ':
';
+ echo '';
+ echo t('Send a GET query to') . ': ' . $web_root . 'script.php?get_block_size
';
+ echo '
';
+ echo t('Parameters') . ':
';
+ echo "id=block_id (" . t('Required') . ")
";
+ echo '
';
+ echo '' . t('This will return asked data or "Error" string.') . '
';
+
+ echo '' . t('Read data in a block') . ':
';
+ echo '';
+ echo t('Send a GET query to') . ': ' . $web_root . 'script.php?read_block
';
+ echo '
';
+ echo t('Parameters') . ':
';
+ echo "id=block_id (" . t('Required') . ")
";
+ echo "start=byte_position_starting_from_zero (" . t('Required') . ")
";
+ echo "length=length_to_read_in_bytes (" . t('Required') . ")
";
+ echo '
';
+ echo '' . t('This will return asked data or "Error" string.') . '
';
+
+ echo '' . t('Write data in a block') . ':
';
+ echo '';
+ echo t('Send a GET query to') . ': ' . $web_root . 'script.php?write_block
';
+ echo '
';
+ echo t('Parameters') . ':
';
+ echo "id=block_id (" . t('Required') . ")
";
+ echo "code=block_code (" . t('Required') . ")
";
+ echo "start=byte_position_starting_from_zero (" . t('Required') . ")
";
+ echo "data=data_to_write (" . t('Required') . ")
";
+ echo '
';
+ echo '' . t('This will return "Ok" or "Error" string.') . '
';
+
+ echo '' . t('Delete a block') . ':
';
+ echo '';
+ echo t('Send a GET query to') . ': ' . $web_root . 'script.php?delete_block
';
+ echo '
';
+ echo t('Parameters') . ':
';
+ echo "id=block_id (" . t('Required') . ")
";
+ echo "code=block_code (" . t('Required') . ")
";
+ echo '
';
+ echo '' . t('This will return "Ok" or "Error" string.') . '
';
+ }
+
echo '
';
require (JIRAFEAU_ROOT . 'lib/template/footer.php');
exit;
@@ -190,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))
@@ -225,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'])
{
@@ -234,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']))
{
@@ -248,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;
@@ -513,7 +584,53 @@ 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'])
+{
+ if (!isset ($_POST['size']))
+ echo "Error";
+ 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'])
+{
+ if (!isset ($_POST['id'])
+ || !isset ($_POST['start'])
+ || !isset ($_POST['length']))
+ echo "Error";
+ else
+ jirafeau_block_read ($_POST['id'], $_POST['start'], $_POST['length']);
+}
+/* Write data in block. */
+elseif (isset ($_GET['write_block']) && $cfg['enable_blocks'])
+{
+ if (!isset ($_POST['id'])
+ || !isset ($_POST['start'])
+ || !isset ($_FILES['data'])
+ || !isset ($_POST['code']))
+ echo "Error";
+ else
+ echo jirafeau_block_write ($_POST['id'], $_POST['start'], $_FILES['data'], $_POST['code']);
+}
+/* Delete block. */
+elseif (isset ($_GET['delete_block']) && $cfg['enable_blocks'])
+{
+ if (!isset ($_POST['id'])
+ || !isset ($_POST['code']))
+ echo "Error";
+ else
+ echo jirafeau_block_delete ($_POST['id'], $_POST['code']);
}
else
echo "Error";