mirror_php/Jirafeau
1
0
Fork 0
mirror of https://gitlab.com/mojo42/Jirafeau.git synced 2025-04-21 04:01:51 +02:00
Code Issues Projects Releases Wiki Activity

[TASK] Fix php-cs-fixer errors

Browse Source 
Signed-off-by: Jerome Jutteau <jerome@jutteau.fr>
This commit is contained in:
Jerome Jutteau 2022-08-25 00:08:43 +02:00
parent bfbbf72959
commit 17d5977bf8
5 changed files with 183 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin.php
View File

@ -117,9 +117,9 @@ if (php_sapi_name() == "cli") {
/* Show admin interface if not downloading a file. */
if (!(isset($_POST['action']) && strcmp($_POST['action'], 'download') == 0)) {
require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?><h2><?php echo t('ADMIN_INTERFACE'); ?></h2><?php
?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php
?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php
?><div id = "admin">
?><div id = "admin">
<fieldset><legend><?php echo t('ACTIONS'); ?></legend>
<table>
<form method="post">

153
index.php
View File

@ -41,7 +41,8 @@ if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
/* Check if user is allowed to upload. */
// First check: Is user already logged
if (jirafeau_user_session_logged()) {}
if (jirafeau_user_session_logged()) {
}
// Second check: Challenge by IP NO PASSWORD
elseif (true === jirafeau_challenge_upload_ip_without_password($cfg, get_ip_address($cfg))) {
jirafeau_user_session_start();
@ -108,7 +109,7 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
</div>
<?php if ($cfg['preview'] == true) {
?>
?>
<div id="upload_finished_preview">
<p>
<a id="preview_link" href=""><?php echo t('VIEW_LINK') ?></a>
@ -118,7 +119,7 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
</p>
</div>
<?php
} ?>
} ?>
<div id="upload_direct_download">
<p>
@ -164,22 +165,22 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
<p>
<input type="file" id="file_select" size="30"
onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php
if ($cfg['maximal_upload_size'] >= 1024) {
echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . number_format($cfg['maximal_upload_size']/1024, 2) . " GB.";
} elseif ($cfg['maximal_upload_size'] > 0) {
echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB.";
}
?>')"/>
if ($cfg['maximal_upload_size'] >= 1024) {
echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . number_format($cfg['maximal_upload_size']/1024, 2) . " GB.";
} elseif ($cfg['maximal_upload_size'] > 0) {
echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB.";
}
?>')"/>
</p>
<div id="options">
<table id="option_table">
<?php
if ($cfg['one_time_download']) {
echo '<tr><td>' . t('ONE_TIME_DL') . ':</td>';
echo '<td><input type="checkbox" id="one_time_download" /></td></tr>';
}
?>
if ($cfg['one_time_download']) {
echo '<tr><td>' . t('ONE_TIME_DL') . ':</td>';
echo '<td><input type="checkbox" id="one_time_download" /></td></tr>';
}
?>
<tr>
<td><label for="input_key"><?php echo t('PSW') . ':'; ?></label></td>
<td><input type="password" name="key" id="input_key" autocomplete = "new-password"/></td>
@ -188,66 +189,66 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
<td><label for="select_time"><?php echo t('TIME_LIM') . ':'; ?></label></td>
<td><select name="time" id="select_time">
<?php
$expirationTimeOptions = array(
array(
'value' => 'minute',
'label' => '1_MIN'
),
array(
'value' => 'hour',
'label' => '1_H'
),
array(
'value' => 'day',
'label' => '1_D'
),
array(
'value' => 'week',
'label' => '1_W'
),
array(
'value' => 'fortnight',
'label' => '2_W'
),
array(
'value' => 'month',
'label' => '1_M'
),
array(
'value' => 'quarter',
'label' => '1_Q'
),
array(
'value' => 'year',
'label' => '1_Y'
),
array(
'value' => 'none',
'label' => 'NONE'
)
);
foreach ($expirationTimeOptions as $expirationTimeOption) {
$selected = ($expirationTimeOption['value'] === $cfg['availability_default'])? 'selected="selected"' : '';
if (true === $cfg['availabilities'][$expirationTimeOption['value']]) {
echo '<option value="' . $expirationTimeOption['value'] . '" ' .
$expirationTimeOptions = array(
array(
'value' => 'minute',
'label' => '1_MIN'
),
array(
'value' => 'hour',
'label' => '1_H'
),
array(
'value' => 'day',
'label' => '1_D'
),
array(
'value' => 'week',
'label' => '1_W'
),
array(
'value' => 'fortnight',
'label' => '2_W'
),
array(
'value' => 'month',
'label' => '1_M'
),
array(
'value' => 'quarter',
'label' => '1_Q'
),
array(
'value' => 'year',
'label' => '1_Y'
),
array(
'value' => 'none',
'label' => 'NONE'
)
);
foreach ($expirationTimeOptions as $expirationTimeOption) {
$selected = ($expirationTimeOption['value'] === $cfg['availability_default'])? 'selected="selected"' : '';
if (true === $cfg['availabilities'][$expirationTimeOption['value']]) {
echo '<option value="' . $expirationTimeOption['value'] . '" ' .
$selected . '>' . t($expirationTimeOption['label']) . '</option>';
}
}
?>
}
}
?>
</select></td>
</tr>
<?php
if ($cfg['maximal_upload_size'] >= 1024) {
echo '<p class="config">' . t('FILE_LIM');
echo " " . number_format($cfg['maximal_upload_size'] / 1024, 2) . " GB.</p>";
} elseif ($cfg['maximal_upload_size'] > 0) {
echo '<p class="config">' . t('FILE_LIM');
echo " " . $cfg['maximal_upload_size'] . " MB.</p>";
} else {
echo '<p class="config"></p>';
}
?>
if ($cfg['maximal_upload_size'] >= 1024) {
echo '<p class="config">' . t('FILE_LIM');
echo " " . number_format($cfg['maximal_upload_size'] / 1024, 2) . " GB.</p>";
} elseif ($cfg['maximal_upload_size'] > 0) {
echo '<p class="config">' . t('FILE_LIM');
echo " " . $cfg['maximal_upload_size'] . " MB.</p>";
} else {
echo '<p class="config"></p>';
}
?>
<p id="max_file_size" class="config"></p>
<p>
@ -263,14 +264,14 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
<?php
if (jirafeau_user_session_logged()) {
?>
?>
<form method="post" class="form logout">
<input type = "hidden" name = "action" value = "logout"/>
<input type = "submit" value = "<?php echo t('LOGOUT'); ?>" />
</form>
<?php
}
?>
?>
</div>
@ -283,11 +284,11 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
document.getElementById('send').style.display = 'none';
if (!check_html5_file_api ())
document.getElementById('max_file_size').innerHTML = '<?php
$max_size = jirafeau_get_max_upload_size();
if ($max_size > 0) {
echo t('NO_BROWSER_SUPPORT') . $max_size;
}
?>';
$max_size = jirafeau_get_max_upload_size();
if ($max_size > 0) {
echo t('NO_BROWSER_SUPPORT') . $max_size;
}
?>';
addCopyListener('upload_link_button', 'upload_link');
addCopyListener('preview_link_button', 'preview_link');

142
install.php
View File

@ -62,26 +62,26 @@ if (!is_writable(JIRAFEAU_CFG) && !@chmod(JIRAFEAU_CFG, '0666')) {
if (isset($_POST['step']) && isset($_POST['next'])) {
switch ($_POST['step']) {
case 1:
if (strlen($_POST['admin_password'])) {
$cfg['admin_password'] = hash('sha256', $_POST['admin_password']);
} else {
$cfg['admin_password'] = '';
}
jirafeau_export_cfg($cfg);
break;
case 1:
if (strlen($_POST['admin_password'])) {
$cfg['admin_password'] = hash('sha256', $_POST['admin_password']);
} else {
$cfg['admin_password'] = '';
}
jirafeau_export_cfg($cfg);
break;
case 2:
$cfg['web_root'] = jirafeau_add_ending_slash($_POST['web_root']);
$cfg['var_root'] = jirafeau_add_ending_slash($_POST['var_root']);
jirafeau_export_cfg($cfg);
break;
case 2:
$cfg['web_root'] = jirafeau_add_ending_slash($_POST['web_root']);
$cfg['var_root'] = jirafeau_add_ending_slash($_POST['var_root']);
jirafeau_export_cfg($cfg);
break;
case 3:
$cfg['web_root'] = jirafeau_add_ending_slash($_POST['web_root']);
$cfg['var_root'] = jirafeau_add_ending_slash($_POST['var_root']);
jirafeau_export_cfg($cfg);
break;
case 3:
$cfg['web_root'] = jirafeau_add_ending_slash($_POST['web_root']);
$cfg['var_root'] = jirafeau_add_ending_slash($_POST['var_root']);
jirafeau_export_cfg($cfg);
break;
}
}
@ -95,20 +95,20 @@ if (isset($_POST['next'])) {
}
switch ($current) {
case 1:
default:
?><h2><?php printf(t('JI_INSTALL') . ' - ' . t('STEP') .
' %d ' . t('OUT_OF') . ' %d', 1, 3);
?></h2> <div id = "install"> <form method="post"> <input type =
case 1:
default:
?><h2><?php printf(t('JI_INSTALL') . ' - ' . t('STEP') .
' %d ' . t('OUT_OF') . ' %d', 1, 3);
?></h2> <div id = "install"> <form method="post"> <input type =
"hidden" name = "jirafeau" value =
"<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
"step" value = "1" /><fieldset> <legend><?php
echo t('ADMIN_PSW');
?></legend> <table> <tr> <td class = "info" colspan =
echo t('ADMIN_PSW');
?></legend> <table> <tr> <td class = "info" colspan =
"2"><?php echo t('ADMIN_INTERFACE_INFO');
?></td> </tr> <tr> <td class = "label"><label for = "select_password"
?></td> </tr> <tr> <td class = "label"><label for = "select_password"
><?php echo t('ADMIN_PSW') . ':';
?></label></td>
?></label></td>
<td class = "field"><input type = "password" name = "admin_password"
id = "admin_password" size = "40" autocomplete = "new-password"/></td>
</tr>
@ -117,90 +117,90 @@ default:
<td class = "nav next">
<input type = "submit"
class = "navleft" name = "previous" value = "<?php
echo t('PREV_STEP'); ?>" />
echo t('PREV_STEP'); ?>" />
<input type = "submit" name = "next" value =
"<?php echo t('NEXT_STEP'); ?>" /></td> </tr> </table>
</fieldset> </form> </div> <?php
break;
case 2:
?><h2><?php printf(t('JI_INSTALL') . ' - ' . t('STEP') .
' %d ' . t('OUT_OF') . ' %d', 2, 3);
?></h2> <div id = "install"> <form method="post"> <input type =
case 2:
?><h2><?php printf(t('JI_INSTALL') . ' - ' . t('STEP') .
' %d ' . t('OUT_OF') . ' %d', 2, 3);
?></h2> <div id = "install"> <form method="post"> <input type =
"hidden" name = "jirafeau" value =
"<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
"step" value =
"2" /><fieldset> <legend><?php echo t('INFO');
?></legend> <table> <tr> <td class = "info" colspan =
?></legend> <table> <tr> <td class = "info" colspan =
"2"><?php echo t('BASE_ADDR_INFO');
?></td> </tr> <tr> <td class = "label"><label for = "input_web_root"
?></td> </tr> <tr> <td class = "label"><label for = "input_web_root"
><?php echo t('BASE_ADDR') . ':';
?></label></td>
?></label></td>
<td class = "field"><input type = "text" name = "web_root"
id = "input_web_root" value = "<?php
echo(empty($cfg['web_root']) ? jirafeau_default_web_root() : $cfg['web_root']);
?>" size = "40" /></td>
echo(empty($cfg['web_root']) ? jirafeau_default_web_root() : $cfg['web_root']);
?>" size = "40" /></td>
</tr> <tr> <td class = "info" colspan = "2"><?php
echo t('DATA_DIR_EXPLAINATION');
?></td> </tr> <tr> <td class = "label"><label for = "input_var_root"
echo t('DATA_DIR_EXPLAINATION');
?></td> </tr> <tr> <td class = "label"><label for = "input_var_root"
><?php echo t('DATA_DIR') . ':';
?></label></td>
?></label></td>
<td class = "field"><input type = "text" name = "var_root"
id = "input_var_root" value = "<?php
if (empty($cfg['var_root'])) {
$alphanum = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' .
if (empty($cfg['var_root'])) {
$alphanum = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' .
'abcdefghijklmnopqrstuvwxyz' . '0123456789';
$len_alphanum = strlen($alphanum);
$var = 'var-';
for ($i = 0; $i <JIRAFEAU_VAR_RAND_LENGTH; $i++) {
$var .= substr($alphanum, mt_rand(0, $len_alphanum - 1), 1);
$len_alphanum = strlen($alphanum);
$var = 'var-';
for ($i = 0; $i <JIRAFEAU_VAR_RAND_LENGTH; $i++) {
$var .= substr($alphanum, mt_rand(0, $len_alphanum - 1), 1);
}
echo JIRAFEAU_ROOT . $var . '/';
} else {
echo $cfg['var_root'];
}
echo JIRAFEAU_ROOT . $var . '/';
} else {
echo $cfg['var_root'];
}
?>" size = "40" /></td>
?>" size = "40" /></td>
</tr> <tr> <td colspan = "2"><input type = "submit"
class = "navleft" name = "previous" value = "<?php
echo t('PREV_STEP'); ?>" />
echo t('PREV_STEP'); ?>" />
<input type = "submit" class = "navright" name = "next" value =
"<?php echo t('NEXT_STEP'); ?>" />
</td> </tr> </table> </fieldset>
</form> </div> <?php
break;
case 3:
?><h2><?php printf(t('JI_INSTALL') . ' - ' . t('STEP') .
' %d ' . t('OUT_OF') . ' %d', 3, 3);
?></h2> <div id = "install"> <form method="post"> <input type =
case 3:
?><h2><?php printf(t('JI_INSTALL') . ' - ' . t('STEP') .
' %d ' . t('OUT_OF') . ' %d', 3, 3);
?></h2> <div id = "install"> <form method="post"> <input type =
"hidden" name = "jirafeau" value =
"<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
"step" value =
"3" /><fieldset> <legend><?php echo t('FINALIZATION');
?></legend> <table> <tr> <td class = "info" colspan =
?></legend> <table> <tr> <td class = "info" colspan =
"2"><?php echo t('SETTING_UP');
?></td> </tr> <tr> <td class = "nav previous"><input type =
?></td> </tr> <tr> <td class = "nav previous"><input type =
"submit" name = "previous" value = " <?php echo t('PREV_STEP');
?>" /></td> <td></td> </tr>
?>" /></td> <td></td> </tr>
</table> </fieldset> </form> </div>
<?php
$err = jirafeau_check_var_dir($cfg['var_root']);
if ($err['has_error']) {
echo '<div class="error"><p>'.$err['why'].'<br />'.NL; ?><form method="post"> <input type = "hidden" name = "jirafeau" value =
$err = jirafeau_check_var_dir($cfg['var_root']);
if ($err['has_error']) {
echo '<div class="error"><p>'.$err['why'].'<br />'.NL; ?><form method="post"> <input type = "hidden" name = "jirafeau" value =
"<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
"step" value = "3" /><input type = "submit" name =
"retry" value =
"<?php echo t('RETRY_STEP'); ?>" /></form>
<?php echo '</p></div>';
} else {
$cfg['installation_done'] = true;
jirafeau_export_cfg($cfg);
echo '<div class="message"><p>' .
t('JI_FONCTIONAL') . ':' .
'<br /><a href="./">' .
$cfg['web_root'].'</a></p></div>';
}
break;
} else {
$cfg['installation_done'] = true;
jirafeau_export_cfg($cfg);
echo '<div class="message"><p>' .
t('JI_FONCTIONAL') . ':' .
'<br /><a href="./">' .
$cfg['web_root'].'</a></p></div>';
}
break;
}
require(JIRAFEAU_ROOT . 'lib/template/footer.php');

56
lib/functions.php
View File

@ -190,23 +190,23 @@ function jirafeau_ini_to_bytes($value)
$modifier = substr($value, -1);
$bytes = substr($value, 0, -1);
switch (strtoupper($modifier)) {
default:
return intval($value);
break;
case 'P':
$bytes *= 1024;
// no break
case 'T':
$bytes *= 1024;
// no break
case 'G':
$bytes *= 1024;
// no break
case 'M':
$bytes *= 1024;
// no break
case 'K':
$bytes *= 1024;
default:
return intval($value);
break;
case 'P':
$bytes *= 1024;
// no break
case 'T':
$bytes *= 1024;
// no break
case 'G':
$bytes *= 1024;
// no break
case 'M':
$bytes *= 1024;
// no break
case 'K':
$bytes *= 1024;
}
return $bytes;
}
@ -264,19 +264,19 @@ function jirafeau_get_max_upload_chunk_size_bytes($max_upload_chunk_size_bytes =
function jirafeau_upload_errstr($code)
{
switch ($code) {
case UPLOAD_ERR_INI_SIZE:
case UPLOAD_ERR_FORM_SIZE:
return t('Your file exceeds the maximum authorized file size. ');
case UPLOAD_ERR_INI_SIZE:
case UPLOAD_ERR_FORM_SIZE:
return t('Your file exceeds the maximum authorized file size. ');
case UPLOAD_ERR_PARTIAL:
case UPLOAD_ERR_NO_FILE:
return
t('Your file was not uploaded correctly. You may succeed in retrying. ');
case UPLOAD_ERR_PARTIAL:
case UPLOAD_ERR_NO_FILE:
return
t('Your file was not uploaded correctly. You may succeed in retrying. ');
case UPLOAD_ERR_NO_TMP_DIR:
case UPLOAD_ERR_CANT_WRITE:
case UPLOAD_ERR_EXTENSION:
return t('Internal error. You may not succeed in retrying. ');
case UPLOAD_ERR_NO_TMP_DIR:
case UPLOAD_ERR_CANT_WRITE:
case UPLOAD_ERR_EXTENSION:
return t('Internal error. You may not succeed in retrying. ');
}
return t('Unknown error. ');
}

10
script.php
View File

@ -25,8 +25,8 @@ require(JIRAFEAU_ROOT . 'lib/settings.php');
require(JIRAFEAU_ROOT . 'lib/functions.php');
require(JIRAFEAU_ROOT . 'lib/lang.php');
global $script_langages;
$script_langages = array('bash' => 'Bash');
global $script_langages;
$script_langages = array('bash' => 'Bash');
/* Operations may take a long time.
* Be sure PHP's safe mode is off.
@ -113,7 +113,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
case 'year':
$time += JIRAFEAU_YEAR;
break;
default:
default:
$time = JIRAFEAU_INFINITY;
break;
}
@ -407,8 +407,8 @@ fi
}
/* Initialize an asynchronous upload. */
elseif (isset($_GET['init_async'])) {
if (jirafeau_user_session_logged()) {}
elseif (isset($_POST['upload_password'])) {
if (jirafeau_user_session_logged()) {
} elseif (isset($_POST['upload_password'])) {
if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) {
echo 'Error 20: Invalid password';
exit;