stats ok
This commit is contained in:
parent
73aeea6874
commit
5fda899e88
@ -180,7 +180,7 @@ class download extends common {
|
|||||||
'file' => $this->getInput('downloadAddFile', helper::FILTER_STRING_SHORT, true),
|
'file' => $this->getInput('downloadAddFile', helper::FILTER_STRING_SHORT, true),
|
||||||
'fileVersion' => $this->getInput('downloadAddFileVersion', helper::FILTER_STRING_SHORT, true),
|
'fileVersion' => $this->getInput('downloadAddFileVersion', helper::FILTER_STRING_SHORT, true),
|
||||||
'fileDate' => $this->getInput('downloadAddFileDate', helper::FILTER_DATETIME, true),
|
'fileDate' => $this->getInput('downloadAddFileDate', helper::FILTER_DATETIME, true),
|
||||||
'fileCount' => 0,
|
'fileStats' => [],
|
||||||
'publishedOn' => $this->getInput('downloadAddPublishedOn', helper::FILTER_DATETIME, true),
|
'publishedOn' => $this->getInput('downloadAddPublishedOn', helper::FILTER_DATETIME, true),
|
||||||
'state' => $this->getInput('downloadAddState', helper::FILTER_BOOLEAN),
|
'state' => $this->getInput('downloadAddState', helper::FILTER_BOOLEAN),
|
||||||
'title' => $this->getInput('downloadAddTitle', helper::FILTER_STRING_SHORT, true),
|
'title' => $this->getInput('downloadAddTitle', helper::FILTER_STRING_SHORT, true),
|
||||||
@ -424,6 +424,9 @@ class download extends common {
|
|||||||
$toApprove = 0;
|
$toApprove = 0;
|
||||||
$approved = count($this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i],'comment']));
|
$approved = count($this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i],'comment']));
|
||||||
}
|
}
|
||||||
|
// Nombre de téléchargements
|
||||||
|
$stats = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i],'fileStats']), 'time');
|
||||||
|
|
||||||
// Met en forme le tableau
|
// Met en forme le tableau
|
||||||
$date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'fileDate'])), 'UTF-8', true)
|
$date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'fileDate'])), 'UTF-8', true)
|
||||||
? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'fileDate']))
|
? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'fileDate']))
|
||||||
@ -437,6 +440,7 @@ class download extends common {
|
|||||||
'</a>',
|
'</a>',
|
||||||
$this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'fileVersion']),
|
$this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'fileVersion']),
|
||||||
$date .' à '. $heure,
|
$date .' à '. $heure,
|
||||||
|
count($stats),
|
||||||
self::$states[$this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'state'])],
|
self::$states[$this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'state'])],
|
||||||
// Bouton pour afficher les commentaires de l'item
|
// Bouton pour afficher les commentaires de l'item
|
||||||
template::button('downloadConfigComment' . $itemIds[$i], [
|
template::button('downloadConfigComment' . $itemIds[$i], [
|
||||||
@ -539,7 +543,7 @@ class download extends common {
|
|||||||
'file' => $this->getInput('downloadEditFile', helper::FILTER_STRING_SHORT, true),
|
'file' => $this->getInput('downloadEditFile', helper::FILTER_STRING_SHORT, true),
|
||||||
'fileVersion' => $this->getInput('downloadEditFileVersion', helper::FILTER_STRING_SHORT, true),
|
'fileVersion' => $this->getInput('downloadEditFileVersion', helper::FILTER_STRING_SHORT, true),
|
||||||
'fileDate' => $this->getInput('downloadEditFileDate', helper::FILTER_DATETIME, true),
|
'fileDate' => $this->getInput('downloadEditFileDate', helper::FILTER_DATETIME, true),
|
||||||
'fileCount' => $this->getData(['module',$this->getUrl(0), 'items', $itemId, 'fileCount']),
|
'fileStats' => $this->getData(['module',$this->getUrl(0), 'items', $this->getUrl(2), 'fileStats']),
|
||||||
'publishedOn' => $this->getInput('downloadEditPublishedOn', helper::FILTER_DATETIME, true),
|
'publishedOn' => $this->getInput('downloadEditPublishedOn', helper::FILTER_DATETIME, true),
|
||||||
'state' => $this->getInput('downloadEditState', helper::FILTER_BOOLEAN),
|
'state' => $this->getInput('downloadEditState', helper::FILTER_BOOLEAN),
|
||||||
'title' => $this->getInput('downloadEditTitle', helper::FILTER_STRING_SHORT, true),
|
'title' => $this->getInput('downloadEditTitle', helper::FILTER_STRING_SHORT, true),
|
||||||
@ -786,12 +790,22 @@ class download extends common {
|
|||||||
$filePath = self::FILE_DIR . 'source/' . $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'file']);
|
$filePath = self::FILE_DIR . 'source/' . $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'file']);
|
||||||
$fileName = $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'file']);
|
$fileName = $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'file']);
|
||||||
if (file_exists($filePath)) {
|
if (file_exists($filePath)) {
|
||||||
|
// Statistiques de téléchargement
|
||||||
|
$statId = helper::increment(uniqid(), $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'fileStats']));
|
||||||
|
$this->setData(['module',
|
||||||
|
$this->getUrl(0),
|
||||||
|
'items',
|
||||||
|
$this->getUrl(2),
|
||||||
|
'fileStats',
|
||||||
|
$statId, [
|
||||||
|
'time' => time(),
|
||||||
|
'ip' => helper::getIp()
|
||||||
|
]]);
|
||||||
|
// Formatage http
|
||||||
header('Content-Type: application/octet-stream');
|
header('Content-Type: application/octet-stream');
|
||||||
header('Content-Disposition: attachment; filename="' . $fileName . '"');
|
header('Content-Disposition: attachment; filename="' . $fileName . '"');
|
||||||
header('Content-Length: ' . filesize($filePath));
|
header('Content-Length: ' . filesize($filePath));
|
||||||
readfile( $filePath);
|
readfile( $filePath);
|
||||||
// Incrémenter le compteur
|
|
||||||
$this->setData(['module',$this->getUrl(0), 'items', $this->getUrl(2), 'fileCount', helper::filter($this->setData(['module',$this->getUrl(0), 'items', $this->getUrl(2), 'fileCount']) + 1, helper::FILTER_INT) ]);
|
|
||||||
// Valeurs en sortie
|
// Valeurs en sortie
|
||||||
$this->addOutput([
|
$this->addOutput([
|
||||||
'display' => self::DISPLAY_RAW
|
'display' => self::DISPLAY_RAW
|
||||||
@ -805,7 +819,7 @@ class download extends common {
|
|||||||
// Valeurs en sortie
|
// Valeurs en sortie
|
||||||
$this->addOutput([
|
$this->addOutput([
|
||||||
'redirect' => helper::baseUrl() . $this->getUrl(0),
|
'redirect' => helper::baseUrl() . $this->getUrl(0),
|
||||||
'notification' => 'Aucun fichier à télécharger',
|
'notification' => 'Le fichier n\'existe pas',
|
||||||
'state' => false
|
'state' => false
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<?php echo template::formClose(); ?>
|
<?php echo template::formClose(); ?>
|
||||||
<?php if($module::$items): ?>
|
<?php if($module::$items): ?>
|
||||||
<?php echo template::table([4, 1, 3, 1, 1, 1, 1], $module::$items, ['Titre', 'Version', 'Du', 'État', 'Commentaires', '','']); ?>
|
<?php echo template::table([3, 1, 3, 1, 1, 1, 1, 1], $module::$items, ['Titre', 'Version', 'Du', 'Stats', 'État', 'Commentaires', '','']); ?>
|
||||||
<?php echo $module::$pages; ?>
|
<?php echo $module::$pages; ?>
|
||||||
<?php else: ?>
|
<?php else: ?>
|
||||||
<?php echo template::speech('Aucun item.'); ?>
|
<?php echo template::speech('Aucun item.'); ?>
|
||||||
|
Loading…
Reference in New Issue
Block a user