X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/045f02b53953998c9cb0cff34f7f62664bdd66cd..89d002baaa196b21ac4d4072e21e7451c47a2355:/f.php
diff --git a/f.php b/f.php
index a5c6228..d94b55b 100644
--- a/f.php
+++ b/f.php
@@ -17,16 +17,14 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
+define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
-require (JIRAFEAU_ROOT . 'lib/lang.php');
-require (JIRAFEAU_ROOT . 'lib/config.original.php');
-require (JIRAFEAU_ROOT . 'lib/settings.php');
-require (JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/settings.php');
+require(JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/lang.php');
-if (!isset ($_GET['h']) || empty ($_GET['h']))
-{
- header ('Location: ' . $cfg['web_root']);
+if (!isset($_GET['h']) || empty($_GET['h'])) {
+ header('Location: ' . $cfg['web_root']);
exit;
}
@@ -39,93 +37,96 @@ if (!isset ($_GET['h']) || empty ($_GET['h']))
$link_name = $_GET['h'];
-if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
-{
- require (JIRAFEAU_ROOT.'lib/template/header.php');
+if (!preg_match('/[0-9a-zA-Z_-]+$/', $link_name)) {
+ require(JIRAFEAU_ROOT.'lib/template/header.php');
echo '
' . t('Sorry, the requested file is not found') . '
';
- require (JIRAFEAU_ROOT.'lib/template/footer.php');
+ require(JIRAFEAU_ROOT.'lib/template/footer.php');
exit;
}
-$link = jirafeau_get_link ($link_name);
-if (count ($link) == 0)
-{
- require (JIRAFEAU_ROOT.'lib/template/header.php');
+$link = jirafeau_get_link($link_name);
+if (count($link) == 0) {
+ /* Try alias. */
+ $alias = jirafeau_get_alias(md5($link_name));
+ if (count($alias) > 0) {
+ $link = jirafeau_get_link($alias["destination"]);
+ }
+}
+if (count($link) == 0) {
+ require(JIRAFEAU_ROOT.'lib/template/header.php');
echo '' . t('Sorry, the requested file is not found') .
'
';
- require (JIRAFEAU_ROOT.'lib/template/footer.php');
+ require(JIRAFEAU_ROOT.'lib/template/footer.php');
exit;
}
$delete_code = '';
-if (isset ($_GET['d']) && !empty ($_GET['d']))
+if (isset($_GET['d']) && !empty($_GET['d']) && $_GET['d'] != '1') {
$delete_code = $_GET['d'];
+}
$crypt_key = '';
-if (isset ($_GET['k']) && !empty ($_GET['k']))
+if (isset($_GET['k']) && !empty($_GET['k'])) {
$crypt_key = $_GET['k'];
+}
$do_download = false;
-if (isset ($_GET['d']) && !empty ($_GET['d']))
+if (isset($_GET['d']) && $_GET['d'] == '1') {
$do_download = true;
+}
$do_preview = false;
-if (isset ($_GET['p']) && !empty ($_GET['p']))
+if (isset($_GET['p']) && !empty($_GET['p'])) {
$do_preview = true;
+}
-$p = s2p ($link['md5']);
-if (!file_exists (VAR_FILES . $p . $link['md5']))
-{
- jirafeau_delete_link ($link_name);
- require (JIRAFEAU_ROOT.'lib/template/header.php');
+$p = s2p($link['md5']);
+if (!file_exists(VAR_FILES . $p . $link['md5'])) {
+ jirafeau_delete_link($link_name);
+ require(JIRAFEAU_ROOT.'lib/template/header.php');
echo ''.t('File not available.').
'
';
- require (JIRAFEAU_ROOT.'lib/template/footer.php');
+ require(JIRAFEAU_ROOT.'lib/template/footer.php');
exit;
}
-if (!empty ($delete_code) && $delete_code == $link['link_code'])
-{
- jirafeau_delete_link ($link_name);
- require (JIRAFEAU_ROOT.'lib/template/header.php');
+if (!empty($delete_code) && $delete_code == $link['link_code']) {
+ jirafeau_delete_link($link_name);
+ require(JIRAFEAU_ROOT.'lib/template/header.php');
echo ''.t('File has been deleted.').
'
';
- require (JIRAFEAU_ROOT.'lib/template/footer.php');
+ require(JIRAFEAU_ROOT.'lib/template/footer.php');
exit;
}
-if ($link['time'] != JIRAFEAU_INFINITY && time () > $link['time'])
-{
- jirafeau_delete_link ($link_name);
- require (JIRAFEAU_ROOT.'lib/template/header.php');
+if ($link['time'] != JIRAFEAU_INFINITY && time() > $link['time']) {
+ jirafeau_delete_link($link_name);
+ require(JIRAFEAU_ROOT.'lib/template/header.php');
echo ''.
t('The time limit of this file has expired.') . ' ' .
t('File has been deleted.') .
'
';
- require (JIRAFEAU_ROOT . 'lib/template/footer.php');
+ require(JIRAFEAU_ROOT . 'lib/template/footer.php');
exit;
}
-if (empty ($crypt_key) && $link['crypted'])
-{
- require (JIRAFEAU_ROOT.'lib/template/header.php');
+if (empty($crypt_key) && $link['crypted']) {
+ require(JIRAFEAU_ROOT.'lib/template/header.php');
echo '' . t('Sorry, the requested file is not found') .
'
';
- require (JIRAFEAU_ROOT.'lib/template/footer.php');
+ require(JIRAFEAU_ROOT.'lib/template/footer.php');
exit;
}
$password_challenged = false;
-if (!empty ($link['key']))
-{
- if (!isset ($_POST['key']))
- {
- require (JIRAFEAU_ROOT.'lib/template/header.php');
+if (!empty($link['key'])) {
+ if (!isset($_POST['key'])) {
+ require(JIRAFEAU_ROOT.'lib/template/header.php');
echo '';
- require (JIRAFEAU_ROOT.'lib/template/footer.php');
+ require(JIRAFEAU_ROOT.'lib/template/footer.php');
exit;
- }
- else
- {
- if ($link['key'] == md5 ($_POST['key']))
+ } else {
+ if ($link['key'] == md5($_POST['key'])) {
$password_challenged = true;
- else
- {
- header ("Access denied");
- require (JIRAFEAU_ROOT.'lib/template/header.php');
+ } else {
+ sleep(2);
+ require(JIRAFEAU_ROOT.'lib/template/header.php');
echo '' . t('Access denied') .
'
';
- require (JIRAFEAU_ROOT.'lib/template/footer.php');
+ require(JIRAFEAU_ROOT.'lib/template/footer.php');
exit;
}
}
}
-if ($cfg['download_page'] && !$password_challenged && !$do_download && !$do_preview)
-{
- require (JIRAFEAU_ROOT.'lib/template/header.php');
- echo '