git.p6c8.net
/
jirafeau_project.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Hotfix for link name length"
[jirafeau_project.git]
/
script.php
diff --git
a/script.php
b/script.php
index 7d5e25c37d5238f78f436371892c398ebb0177a1..1d420b60dd126521941fd0846ea14706e1a7d1c7 100755
(executable)
--- a/
script.php
+++ b/
script.php
@@
-25,7
+25,7
@@
\r
define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
\r
\r
\r
define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
\r
\r
-require (JIRAFEAU_ROOT . 'lib/config.php');
\r
+require (JIRAFEAU_ROOT . 'lib/config.
original.
php');
\r
require (JIRAFEAU_ROOT . 'lib/settings.php');
\r
require (JIRAFEAU_ROOT . 'lib/functions.php');
\r
require (JIRAFEAU_ROOT . 'lib/lang.php');
\r
require (JIRAFEAU_ROOT . 'lib/settings.php');
\r
require (JIRAFEAU_ROOT . 'lib/functions.php');
\r
require (JIRAFEAU_ROOT . 'lib/lang.php');
\r
@@
-293,7
+293,7
@@
if (isset ($_FILES['file']) && is_writable (VAR_FILES)
$res = jirafeau_upload ($_FILES['file'],
\r
isset ($_POST['one_time_download']),
\r
$key, $time, $_SERVER['REMOTE_ADDR'],
\r
$res = jirafeau_upload ($_FILES['file'],
\r
isset ($_POST['one_time_download']),
\r
$key, $time, $_SERVER['REMOTE_ADDR'],
\r
- $cfg['enable_crypt']);
\r
+ $cfg['enable_crypt']
, $cfg['link_name_lenght']
);
\r
\r
if (empty($res) || $res['error']['has_error'])
\r
{
\r
\r
if (empty($res) || $res['error']['has_error'])
\r
{
\r
@@
-319,7
+319,7
@@
elseif (isset ($_GET['h']))
if (isset ($_GET['d']))
\r
$d = $_GET['d'];
\r
\r
if (isset ($_GET['d']))
\r
$d = $_GET['d'];
\r
\r
- if (!preg_match ('/[0-9a-zA-Z_-]
{22}
$/', $link_name))
\r
+ if (!preg_match ('/[0-9a-zA-Z_-]
+
$/', $link_name))
\r
{
\r
echo "Error";
\r
exit;
\r
{
\r
echo "Error";
\r
exit;
\r
@@
-584,7
+584,7
@@
elseif (isset ($_GET['end_async']))
|| !isset ($_POST['code']))
\r
echo "Error";
\r
else
\r
|| !isset ($_POST['code']))
\r
echo "Error";
\r
else
\r
- echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt']);
\r
+ echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt']
, $cfg['link_name_lenght']
);
\r
}
\r
/* Initialize block. */
\r
elseif (isset ($_GET['init_block']) && $cfg['enable_blocks'])
\r
}
\r
/* Initialize block. */
\r
elseif (isset ($_GET['init_block']) && $cfg['enable_blocks'])
\r
patrick-canterino.de