Commit 60530d95 authored by Nicola Spanti's avatar Nicola Spanti

Minor changes to some PHP files

parent 0d424102
......@@ -212,8 +212,8 @@ if (!(isset ($_POST['action']) && strcmp ($_POST['action'], 'download') == 0))
</form>
</table>
<form action = "<?php echo basename(__FILE__); ?>" method = "post">
<input type = "hidden" name = "action" value = "logout"/>
<input type = "submit" value = "<?php echo t('Logout'); ?>" />
<input type = "hidden" name = "action" value = "logout" />
<input type = "submit" value = "<?php echo t('Logout'); ?>" />
</form>
</fieldset></div><?php
}
......
......@@ -16,7 +16,7 @@
* 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 <https://www.gnu.org/licenses/>.
*/
define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
......@@ -242,7 +242,7 @@ if (jirafeau_has_upload_password ($cfg))
</div>
<script lang="Javascript">
<script type="text/javascript" lang="Javascript">
document.getElementById('error_pop').style.display = 'none';
document.getElementById('uploading').style.display = 'none';
document.getElementById('upload_finished').style.display = 'none';
......
......@@ -2,6 +2,7 @@
/*
* Jirafeau, your web file repository
* Copyright (C) 2008 Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
* Copyright (C) 2015 Nicola Spanti (RyDroid) <dev@nicola-spanti.info>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
......@@ -14,7 +15,7 @@
* 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 <https://www.gnu.org/licenses/>.
*/
define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
define ('NL', "\n");
......@@ -67,9 +68,7 @@ jirafeau_export_cfg ($cfg)
function
jirafeau_mkdir ($path)
{
if (!file_exists ($path) && !@mkdir ($path, 0755))
return false;
return true;
return !(!file_exists ($path) && !@mkdir ($path, 0755));
}
/**
......@@ -182,8 +181,6 @@ if (isset ($_POST['step']) && isset ($_POST['next']))
$cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']);
jirafeau_export_cfg ($cfg);
break;
default: break;
}
}
......
......@@ -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
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/*
......@@ -68,7 +68,7 @@ header('Content-Type: text; charset=utf-8');
check_errors ($cfg);
if (has_error ())
{
echo "Error";
echo 'Error';
exit;
}
......@@ -78,7 +78,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
{
if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
{
echo "Error";
echo 'Error';
exit;
}
......@@ -86,7 +86,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
(!isset ($_POST['upload_password']) ||
!jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
{
echo "Error";
echo 'Error';
exit;
}
......@@ -97,7 +97,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
$time = time ();
if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']])
{
echo "Error";
echo 'Error';
exit;
}
else
......@@ -130,7 +130,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
if ($cfg['maximal_upload_size'] > 0 &&
$_FILES['file']['size'] > $cfg['maximal_upload_size'] * 1024 * 1024)
{
echo "Error";
echo 'Error';
exit;
}
......@@ -141,7 +141,7 @@ if (isset ($_FILES['file']) && is_writable (VAR_FILES)
if (empty($res) || $res['error']['has_error'])
{
echo "Error";
echo 'Error';
exit;
}
/* Print direct link. */
......@@ -165,14 +165,14 @@ elseif (isset ($_GET['h']))
if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
{
echo "Error";
echo 'Error';
exit;
}
$link = jirafeau_get_link ($link_name);
if (count ($link) == 0)
{
echo "Error";
echo 'Error';
exit;
}
if (strlen ($d) > 0 && $d == $link['link_code'])
......@@ -184,18 +184,18 @@ elseif (isset ($_GET['h']))
if ($link['time'] != JIRAFEAU_INFINITY && time () > $link['time'])
{
jirafeau_delete_link ($link_name);
echo "Error";
echo 'Error';
exit;
}
if (strlen ($link['key']) > 0 && md5 ($key) != $link['key'])
{
echo "Error";
echo 'Error';
exit;
}
$p = s2p ($link['md5']);
if (!file_exists (VAR_FILES . $p . $link['md5']))
{
echo "Error";
echo 'Error';
exit;
}
......@@ -362,7 +362,7 @@ fi
}
else
{
echo "Error";
echo 'Error';
exit;
}
}
......@@ -372,7 +372,7 @@ elseif (isset ($_GET['alias_create']))
$ip = get_ip_address($cfg);
if (!jirafeau_challenge_upload_ip ($cfg, $ip))
{
echo "Error";
echo 'Error';
exit;
}
......@@ -380,7 +380,7 @@ elseif (isset ($_GET['alias_create']))
(!isset ($_POST['upload_password']) ||
!jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
{
echo "Error";
echo 'Error';
exit;
}
......@@ -388,7 +388,7 @@ elseif (isset ($_GET['alias_create']))
!isset ($_POST['destination']) ||
!isset ($_POST['password']))
{
echo "Error";
echo 'Error';
exit;
}
......@@ -402,7 +402,7 @@ elseif (isset ($_GET['alias_get']))
{
if (!isset ($_POST['alias']))
{
echo "Error";
echo 'Error';
exit;
}
......@@ -415,7 +415,7 @@ elseif (isset ($_GET['alias_update']))
!isset ($_POST['destination']) ||
!isset ($_POST['password']))
{
echo "Error";
echo 'Error';
exit;
}
......@@ -435,7 +435,7 @@ elseif (isset ($_GET['alias_delete']))
if (!isset ($_POST['alias']) ||
!isset ($_POST['password']))
{
echo "Error";
echo 'Error';
exit;
}
......@@ -447,7 +447,7 @@ elseif (isset ($_GET['init_async']))
{
if (!jirafeau_challenge_upload_ip ($cfg, get_ip_address($cfg)))
{
echo "Error";
echo 'Error';
exit;
}
......@@ -455,13 +455,13 @@ elseif (isset ($_GET['init_async']))
(!isset ($_POST['upload_password']) ||
!jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])))
{
echo "Error";
echo 'Error';
exit;
}
if (!isset ($_POST['filename']))
{
echo "Error";
echo 'Error';
exit;
}
......@@ -476,7 +476,7 @@ elseif (isset ($_GET['init_async']))
$time = time ();
if (!isset ($_POST['time']) || !$cfg['availabilities'][$_POST['time']])
{
echo "Error";
echo 'Error';
exit;
}
else
......@@ -517,7 +517,7 @@ elseif (isset ($_GET['push_async']))
if ((!isset ($_POST['ref']))
|| (!isset ($_FILES['data']))
|| (!isset ($_POST['code'])))
echo "Error";
echo 'Error';
else
{
echo jirafeau_async_push ($_POST['ref'],
......@@ -531,12 +531,11 @@ elseif (isset ($_GET['end_async']))
{
if (!isset ($_POST['ref'])
|| !isset ($_POST['code']))
echo "Error";
echo 'Error';
else
echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_length']);
}
else
echo "Error";
echo 'Error';
exit;
?>
<?php
/*
* Jirafeau, your web file repository
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 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 <https://www.gnu.org/licenses/>.
*/
define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
require (JIRAFEAU_ROOT . 'lib/config.original.php');
require (JIRAFEAU_ROOT . 'lib/settings.php');
......
<?php
/* This license text is under Creative Commons - Attribution 3.0 Unported.
* It has been based on this work: <a href="http://opensource.org/ToS">http://opensource.org/ToS
* It has been based on this work: <a href="http://opensource.org/ToS">http://opensource.org/ToS</a>
*/
$tos="
TERMS OF SERVICE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment