mirror of
				https://gitlab.com/animath/si/plateforme.git
				synced 2025-11-04 03:42:11 +01:00 
			
		
		
		
	Optimisation des téléchargements ZIP
This commit is contained in:
		@@ -18,12 +18,11 @@ if (isset($_POST["validate"])) {
 | 
			
		||||
if (isset($_POST["select"])) {
 | 
			
		||||
	$team->selectForFinal(true);
 | 
			
		||||
	$team->setValidationStatus(ValidationStatus::NOT_READY);
 | 
			
		||||
 | 
			
		||||
	/** @noinspection SqlAggregates */
 | 
			
		||||
	$sols_req = $DB->prepare("SELECT `file_id`, `problem`, COUNT(`problem`) AS `version` FROM `solutions` WHERE `team` = ? AND `tournament` = ? GROUP BY `problem` ORDER BY `problem`, `uploaded_at` DESC;");
 | 
			
		||||
	$sols_req->execute([$team->getId(), $team->getTournamentId()]);
 | 
			
		||||
	while (($sol_data = $sols_req->fetch()) !== false) {
 | 
			
		||||
		$old_id = $sol_data["file_id"];
 | 
			
		||||
	$tournament = Tournament::fromId($team->getTournamentId());
 | 
			
		||||
	$sols = $tournament->getAllSolutions($team->getId());
 | 
			
		||||
	/** @var Solution $sol */
 | 
			
		||||
	foreach ($sols as $sol) {
 | 
			
		||||
		$old_id = $sol->getFileId();
 | 
			
		||||
		do
 | 
			
		||||
			$id = genRandomPhrase(64);
 | 
			
		||||
		while (file_exists("$LOCAL_PATH/files/$id"));
 | 
			
		||||
@@ -31,11 +30,24 @@ if (isset($_POST["select"])) {
 | 
			
		||||
		copy("$LOCAL_PATH/files/$old_id", "$LOCAL_PATH/files/$id");
 | 
			
		||||
		
 | 
			
		||||
		$req = $DB->prepare("INSERT INTO `solutions`(`file_id`, `team`, `tournament`, `problem`) VALUES (?, ?, ?, ?);");
 | 
			
		||||
		$req->execute([$id, $team->getId(), $_SESSION["final_id"], $sol_data["problem"]]);
 | 
			
		||||
		$req->execute([$id, $team->getId(), $FINAL->getId(), $sol->getFileId()]);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// TODO Télécharger en zip les documents personnels
 | 
			
		||||
if (isset($_POST["download_zip"])) {
 | 
			
		||||
	$final = isset($_POST["final"]);
 | 
			
		||||
	$tournament = $final ? $FINAL : Tournament::fromId($team->getTournamentId());
 | 
			
		||||
 | 
			
		||||
	$file_name = getZipFile(DocumentType::PARENTAL_CONSENT, $tournament->getId(), $team->getId());
 | 
			
		||||
 | 
			
		||||
	header("Content-Type: application/zip");
 | 
			
		||||
	header("Content-Disposition: attachment; filename=\"Documents de l'équipe " . $team->getTrigram() . ".zip\"");
 | 
			
		||||
	header("Content-Length: " . strval(filesize($file_name)));
 | 
			
		||||
 | 
			
		||||
	readfile($file_name);
 | 
			
		||||
 | 
			
		||||
	exit();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
$documents = $tournament->getAllDocuments($team->getId());
 | 
			
		||||
$documents_final = null;
 | 
			
		||||
 
 | 
			
		||||
@@ -5,36 +5,15 @@ if (!isset($_SESSION["role"]) || $_SESSION["role"] != Role::ADMIN && $_SESSION["
 | 
			
		||||
 | 
			
		||||
if (isset($_POST["download_zip"])) {
 | 
			
		||||
    $id = $_POST["tournament"];
 | 
			
		||||
    $tournament = Tournament::fromId($id);
 | 
			
		||||
    $sols = $tournament->getAllSolutions();
 | 
			
		||||
 | 
			
		||||
    $zip = new ZipArchive();
 | 
			
		||||
 | 
			
		||||
	$temp = tempnam("tmp", "tfjm-");
 | 
			
		||||
 | 
			
		||||
	if ($zip->open($temp, ZipArchive::CREATE) !== true) {
 | 
			
		||||
	    die("Impossible de créer le fichier zip.");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
	/** @var Solution $sol */
 | 
			
		||||
	foreach ($sols as $sol) {
 | 
			
		||||
        $file_id = $sol->getFileId();
 | 
			
		||||
        $problem = $sol->getProblem();
 | 
			
		||||
        $version = $sol->getVersion();
 | 
			
		||||
        $team = Team::fromId($sol->getTeamId());
 | 
			
		||||
        $team_name = $team->getName();
 | 
			
		||||
        $team_trigram = $team->getTrigram();
 | 
			
		||||
 | 
			
		||||
        $zip->addFile("$LOCAL_PATH/files/$file_id", "Problème $problem $team_trigram.pdf");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
	$zip->close();
 | 
			
		||||
    $file_name = getZipFile(DocumentType::SOLUTION, $id);
 | 
			
		||||
 | 
			
		||||
	header("Content-Type: application/zip");
 | 
			
		||||
	header("Content-Disposition: attachment; filename=\"Solutions du tournoi de " . $tournament->getName() . ".zip\"");
 | 
			
		||||
	header("Content-Length: " . strval(filesize($temp)));
 | 
			
		||||
	header("Content-Length: " . strval(filesize($file_name)));
 | 
			
		||||
 | 
			
		||||
	readfile($temp);
 | 
			
		||||
	readfile($file_name);
 | 
			
		||||
 | 
			
		||||
	exit();
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -4,35 +4,14 @@
 | 
			
		||||
if (isset($_POST["download_zip"])) {
 | 
			
		||||
    $id = $_POST["tournament"];
 | 
			
		||||
    $tournament = Tournament::fromId($id);
 | 
			
		||||
	$syntheses = $tournament->getAllSyntheses();
 | 
			
		||||
 | 
			
		||||
    $zip = new ZipArchive();
 | 
			
		||||
 | 
			
		||||
    $temp = tempnam("tmp", "tfjm-");
 | 
			
		||||
 | 
			
		||||
    if ($zip->open($temp, ZipArchive::CREATE) !== true) {
 | 
			
		||||
        die("Impossible de créer le fichier zip.");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
	/** @var Synthesis $synthesis */
 | 
			
		||||
	foreach ($syntheses as $synthesis) {
 | 
			
		||||
        $file_id = $synthesis->getFileId();
 | 
			
		||||
        $dest = $synthesis->getDest();
 | 
			
		||||
        $version = $synthesis->getVersion();
 | 
			
		||||
        $team = Team::fromId($synthesis->getTeamId());
 | 
			
		||||
        $team_name = $team->getName();
 | 
			
		||||
        $team_trigram = $team->getTrigram();
 | 
			
		||||
 | 
			
		||||
        $zip->addFile("$LOCAL_PATH/files/$file_id", "Note de synthèse $team_trigram pour " . ($dest == DestType::OPPOSANT ? "l'opposant" : "le rapporteur") . ".pdf");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    $zip->close();
 | 
			
		||||
    $file_name = getZipFile(DocumentType::SYNTHESIS, $id);
 | 
			
		||||
 | 
			
		||||
    header("Content-Type: application/zip");
 | 
			
		||||
    header("Content-Disposition: attachment; filename=\"Notes de syntèses du tournoi de " . $tournament->getName() . ".zip\"");
 | 
			
		||||
    header("Content-Length: " . filesize($temp));
 | 
			
		||||
    header("Content-Length: " . filesize($file_name));
 | 
			
		||||
 | 
			
		||||
    readfile($temp);
 | 
			
		||||
    readfile($file_name);
 | 
			
		||||
 | 
			
		||||
    exit();
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user