git.p6c8.net
/
jirafeau.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master'
[jirafeau.git]
/
script.php
diff --git
a/script.php
b/script.php
index 8d6947b042815ed7e947b1d60d65b77ac5c2dba2..c5adf95cd648b838c2200ba3fd6603ad6533d08f 100644
(file)
--- a/
script.php
+++ b/
script.php
@@
-14,7
+14,7
@@
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http
s
://www.gnu.org/licenses/>.
*/
/*
*/
/*
@@
-52,9
+52,10
@@
if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
}
?>
<div class="info">
}
?>
<div class="info">
- <h2>Scriting interface</h2>
+ <h2>Scri
p
ting interface</h2>
<p>This interface permits to script your uploads and downloads.</p>
<p>This interface permits to script your uploads and downloads.</p>
- <p>See <a href="https://gitlab.com/mojo42/Jirafeau/blob/master/script.php">source code</a> of this interface to understand availablee calls :)</p>
+ <p>See <a href="https://gitlab.com/mojo42/Jirafeau/blob/master/script.php">source code</a> of this interface to get available calls :)</p>
+ <p>Alternatively, go to <a href="<?php echo $cfg['web_root'] . 'script.php?lang=bash'; ?>">this page</a> to download a bash script.</p>
</div>
<br />
<?php
</div>
<br />
<?php
@@
-68,7
+69,7
@@
header('Content-Type: text; charset=utf-8');
check_errors ($cfg);
if (has_error ())
{
check_errors ($cfg);
if (has_error ())
{
- echo
"Error"
;
+ echo
'Error 1'
;
exit;
}
exit;
}
@@
-78,7
+79,7
@@
if (isset ($_FILES['file']) && is_writable (VAR_FILES)
{
if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
{
{
if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
{
- echo
"Error"
;
+ echo
'Error 2'
;
exit;
}
exit;
}
@@
-86,7
+87,7
@@
if (isset ($_FILES['file']) && is_writable (VAR_FILES)
(!isset ($_POST['upload_password']) ||
!jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
{
(!isset ($_POST['upload_password']) ||
!jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
{
- echo
"Error"
;
+ echo
'Error 3'
;
exit;
}
exit;
}
@@
-97,7
+98,7
@@
if (isset ($_FILES['file']) && is_writable (VAR_FILES)
$time = time ();
if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']])
{
$time = time ();
if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']])
{
- echo
"Error"
;
+ echo
'Error 4: The parameter time is invalid.'
;
exit;
}
else
exit;
}
else
@@
-118,6
+119,9
@@
if (isset ($_FILES['file']) && is_writable (VAR_FILES)
case 'month':
$time += JIRAFEAU_MONTH;
break;
case 'month':
$time += JIRAFEAU_MONTH;
break;
+ case 'quarter':
+ $time += JIRAFEAU_QUARTER;
+ break;
case 'year':
$time += JIRAFEAU_YEAR;
break;
case 'year':
$time += JIRAFEAU_YEAR;
break;
@@
-130,7
+134,7
@@
if (isset ($_FILES['file']) && is_writable (VAR_FILES)
if ($cfg['maximal_upload_size'] > 0 &&
$_FILES['file']['size'] > $cfg['maximal_upload_size'] * 1024 * 1024)
{
if ($cfg['maximal_upload_size'] > 0 &&
$_FILES['file']['size'] > $cfg['maximal_upload_size'] * 1024 * 1024)
{
- echo
"Error"
;
+ echo
'Error 5: Your file exceeds the maximum authorized file size.'
;
exit;
}
exit;
}
@@
-138,10
+142,10
@@
if (isset ($_FILES['file']) && is_writable (VAR_FILES)
isset ($_POST['one_time_download']),
$key, $time, get_ip_address($cfg),
$cfg['enable_crypt'], $cfg['link_name_length']);
isset ($_POST['one_time_download']),
$key, $time, get_ip_address($cfg),
$cfg['enable_crypt'], $cfg['link_name_length']);
-
+
if (empty($res) || $res['error']['has_error'])
{
if (empty($res) || $res['error']['has_error'])
{
- echo
"Error"
;
+ echo
'Error 6 ' . $res['error']['why']
;
exit;
}
/* Print direct link. */
exit;
}
/* Print direct link. */
@@
-162,17
+166,17
@@
elseif (isset ($_GET['h']))
$d = '';
if (isset ($_GET['d']))
$d = $_GET['d'];
$d = '';
if (isset ($_GET['d']))
$d = $_GET['d'];
-
+
if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
{
if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
{
- echo
"Error"
;
+ echo
'Error 7'
;
exit;
}
exit;
}
-
+
$link = jirafeau_get_link ($link_name);
if (count ($link) == 0)
{
$link = jirafeau_get_link ($link_name);
if (count ($link) == 0)
{
- echo
"Error"
;
+ echo
'Error 8'
;
exit;
}
if (strlen ($d) > 0 && $d == $link['link_code'])
exit;
}
if (strlen ($d) > 0 && $d == $link['link_code'])
@@
-184,18
+188,19
@@
elseif (isset ($_GET['h']))
if ($link['time'] != JIRAFEAU_INFINITY && time () > $link['time'])
{
jirafeau_delete_link ($link_name);
if ($link['time'] != JIRAFEAU_INFINITY && time () > $link['time'])
{
jirafeau_delete_link ($link_name);
- echo
"Error"
;
+ echo
'Error 9'
;
exit;
}
if (strlen ($link['key']) > 0 && md5 ($key) != $link['key'])
{
exit;
}
if (strlen ($link['key']) > 0 && md5 ($key) != $link['key'])
{
- echo "Error";
+ sleep (2);
+ echo 'Error 10';
exit;
}
$p = s2p ($link['md5']);
if (!file_exists (VAR_FILES . $p . $link['md5']))
{
exit;
}
$p = s2p ($link['md5']);
if (!file_exists (VAR_FILES . $p . $link['md5']))
{
- echo
"Error"
;
+ echo
'Error 11'
;
exit;
}
exit;
}
@@
-238,13
+243,13
@@
elseif (isset ($_GET['lang']))
?>
#!/bin/bash
?>
#!/bin/bash
-# This script has been auto-generated by Jirafeau but you can still edit
+# This script has been auto-generated by Jirafeau but you can still edit
# options below.
# Config
proxy='' # ex: proxy='proxysever.test.com:3128' or set JIRAFEAU_PROXY global variable
url='<?php echo $cfg['web_root'] . 'script.php'; ?>' # or set JIRAFEAU_URL ex: url='http://mysite/jirafeau/script.php'
# options below.
# Config
proxy='' # ex: proxy='proxysever.test.com:3128' or set JIRAFEAU_PROXY global variable
url='<?php echo $cfg['web_root'] . 'script.php'; ?>' # or set JIRAFEAU_URL ex: url='http://mysite/jirafeau/script.php'
-time='
none' # minute, hour, day, week, month
, year or none. Or set JIRAFEAU_TIME.
+time='
<?php echo $cfg['availability_default']; ?>' # minute, hour, day, week, month, quarted
, year or none. Or set JIRAFEAU_TIME.
one_time='' # ex: one_time="1" or set JIRAFEAU_ONE_TIME.
curl='' # curl path to download or set JIRAFEAU_CURL_PATH.
# End of config
one_time='' # ex: one_time="1" or set JIRAFEAU_ONE_TIME.
curl='' # curl path to download or set JIRAFEAU_CURL_PATH.
# End of config
@@
-295,7
+300,7
@@
if [ -z "$2" ]; then
echo "Global variables to export:"
echo " JIRAFEAU_PROXY : example: proxysever.test.com:3128"
echo " JIRAFEAU_URL : example: http://mysite/jirafeau/script.php"
echo "Global variables to export:"
echo " JIRAFEAU_PROXY : example: proxysever.test.com:3128"
echo " JIRAFEAU_URL : example: http://mysite/jirafeau/script.php"
- echo " JIRAFEAU_TIME : minute, hour, day, week, year, month or none"
+ echo " JIRAFEAU_TIME : minute, hour, day, week,
quarter,
year, month or none"
echo " JIRAFEAU_ONE_TIME : set anything or set empty"
echo " JIRAFEAU_CURL : path to your curl binary"
echo " JIRAFEAU_ONE_TIME : set anything or set empty"
echo " JIRAFEAU_CURL : path to your curl binary"
@@
-329,8
+334,9
@@
if [ "$1" == "send" ]; then
-F "file=@$2" \
$url)
-F "file=@$2" \
$url)
- if [[ "$res" ==
"Error"
]]; then
+ if [[ "$res" ==
Error*
]]; then
echo "Error while uploading."
echo "Error while uploading."
+ echo $res
exit
fi
exit
fi
@@
-347,7
+353,11
@@
if [ "$1" == "send" ]; then
fi
cnt=$(( cnt + 1 ))
done)
fi
cnt=$(( cnt + 1 ))
done)
+ echo "Download link:"
echo "${url}?h=$code"
echo "${url}?h=$code"
+ echo "Direct download link:"
+ echo "${url}?h=$code&d=1"
+ echo "Delete link:"
echo "${url}?h=$code&d=$del_code"
elif [ "$1" == "get" ]; then
if [ -z "$password" ]; then
echo "${url}?h=$code&d=$del_code"
elif [ "$1" == "get" ]; then
if [ -z "$password" ]; then
@@
-362,7
+372,7
@@
fi
}
else
{
}
else
{
- echo
"Error"
;
+ echo
'Error 12'
;
exit;
}
}
exit;
}
}
@@
-372,7
+382,7
@@
elseif (isset ($_GET['alias_create']))
$ip = get_ip_address($cfg);
if (!jirafeau_challenge_upload_ip ($cfg, $ip))
{
$ip = get_ip_address($cfg);
if (!jirafeau_challenge_upload_ip ($cfg, $ip))
{
- echo
"Error"
;
+ echo
'Error 13'
;
exit;
}
exit;
}
@@
-380,7
+390,7
@@
elseif (isset ($_GET['alias_create']))
(!isset ($_POST['upload_password']) ||
!jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
{
(!isset ($_POST['upload_password']) ||
!jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
{
- echo
"Error"
;
+ echo
'Error 14'
;
exit;
}
exit;
}
@@
-388,7
+398,7
@@
elseif (isset ($_GET['alias_create']))
!isset ($_POST['destination']) ||
!isset ($_POST['password']))
{
!isset ($_POST['destination']) ||
!isset ($_POST['password']))
{
- echo
"Error"
;
+ echo
'Error 15'
;
exit;
}
exit;
}
@@
-402,7
+412,7
@@
elseif (isset ($_GET['alias_get']))
{
if (!isset ($_POST['alias']))
{
{
if (!isset ($_POST['alias']))
{
- echo
"Error"
;
+ echo
'Error 16'
;
exit;
}
exit;
}
@@
-415,7
+425,7
@@
elseif (isset ($_GET['alias_update']))
!isset ($_POST['destination']) ||
!isset ($_POST['password']))
{
!isset ($_POST['destination']) ||
!isset ($_POST['password']))
{
- echo
"Error"
;
+ echo
'Error 17'
;
exit;
}
exit;
}
@@
-435,7
+445,7
@@
elseif (isset ($_GET['alias_delete']))
if (!isset ($_POST['alias']) ||
!isset ($_POST['password']))
{
if (!isset ($_POST['alias']) ||
!isset ($_POST['password']))
{
- echo
"Error"
;
+ echo
'Error 18'
;
exit;
}
exit;
}
@@
-447,7
+457,7
@@
elseif (isset ($_GET['init_async']))
{
if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
{
{
if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
{
- echo
"Error"
;
+ echo
'Error 19'
;
exit;
}
exit;
}
@@
-455,20
+465,20
@@
elseif (isset ($_GET['init_async']))
(!isset ($_POST['upload_password']) ||
!jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
{
(!isset ($_POST['upload_password']) ||
!jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
{
- echo
"Error"
;
+ echo
'Error 20'
;
exit;
}
if (!isset ($_POST['filename']))
{
exit;
}
if (!isset ($_POST['filename']))
{
- echo
"Error"
;
+ echo
'Error 21'
;
exit;
}
$type = '';
if (isset ($_POST['type']))
$type = $_POST['type'];
exit;
}
$type = '';
if (isset ($_POST['type']))
$type = $_POST['type'];
-
+
$key = '';
if (isset ($_POST['key']))
$key = $_POST['key'];
$key = '';
if (isset ($_POST['key']))
$key = $_POST['key'];
@@
-476,7
+486,7
@@
elseif (isset ($_GET['init_async']))
$time = time ();
if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']])
{
$time = time ();
if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']])
{
- echo
"Error"
;
+ echo
'Error 22'
;
exit;
}
else
exit;
}
else
@@
-497,6
+507,9
@@
elseif (isset ($_GET['init_async']))
case 'month':
$time += JIRAFEAU_MONTH;
break;
case 'month':
$time += JIRAFEAU_MONTH;
break;
+ case 'quarter':
+ $time += JIRAFEAU_QUARTER;
+ break;
case 'year':
$time += JIRAFEAU_YEAR;
break;
case 'year':
$time += JIRAFEAU_YEAR;
break;
@@
-517,7
+530,7
@@
elseif (isset ($_GET['push_async']))
if ((!isset ($_POST['ref']))
|| (!isset ($_FILES['data']))
|| (!isset ($_POST['code'])))
if ((!isset ($_POST['ref']))
|| (!isset ($_FILES['data']))
|| (!isset ($_POST['code'])))
- echo
"Error"
;
+ echo
'Error 23'
;
else
{
echo jirafeau_async_push ($_POST['ref'],
else
{
echo jirafeau_async_push ($_POST['ref'],
@@
-531,12
+544,11
@@
elseif (isset ($_GET['end_async']))
{
if (!isset ($_POST['ref'])
|| !isset ($_POST['code']))
{
if (!isset ($_POST['ref'])
|| !isset ($_POST['code']))
- echo
"Error"
;
+ echo
'Error 24'
;
else
echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length']);
}
else
else
echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length']);
}
else
- echo
"Error"
;
+ echo
'Error 25'
;
exit;
?>
exit;
?>
-
patrick-canterino.de