From 822da2795d15951c01148383e7185172d0ff61e8 Mon Sep 17 00:00:00 2001
From: Baptiste <baptiste.rebillard@outlook.fr>
Date: Tue, 25 Oct 2022 21:05:09 +0200
Subject: [PATCH] photos patch

---
 photos.php | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/photos.php b/photos.php
index c64e69f..852770a 100644
--- a/photos.php
+++ b/photos.php
@@ -33,7 +33,7 @@ function getActivePath()
 function GetActiveFolder($path)
 {
         $dir = explode(DIRECTORY_SEPARATOR, $path);
-       return $dir[sizeof($dir) - 1]; // Last item after /
+       return ".".DIRECTORY_SEPARATOR.$dir[sizeof($dir) - 1]; // Last item after /
 }
 
 /**
@@ -251,25 +251,9 @@ function generatePath($path)
 //CAS
 require_once("phpCAS-1.3.6/CAS.php");
 
-// Initialize phpCAS
 phpCAS::client(CAS_VERSION_2_0, "cas.insa-toulouse.fr", 443, 'cas', true);
-
-// For production use set the CA certificate that is the issuer of the cert
-// on the CAS server and uncomment the line below
-// phpCAS::setCasServerCACert($cas_server_ca_cert_path);
-
-// For quick testing you can disable SSL validation of the CAS server.
-// THIS SETTING IS NOT RECOMMENDED FOR PRODUCTION.
-// VALIDATING THE CAS SERVER IS CRUCIAL TO THE SECURITY OF THE CAS PROTOCOL!
 phpCAS::setNoCasServerValidation();
-
-// force CAS authentication
 phpCAS::forceAuthentication();
-
-// at this step, the user has been authenticated by the CAS server
-// and the user's login name can be read with phpCAS::getUser().
-
-// logout if desired
 if (isset($_REQUEST['logout'])) {
         phpCAS::logout();
 }
@@ -313,12 +297,10 @@ if (isset($_REQUEST['logout'])) {
                     <?php endif; ?>
                 </ul>
                 <?php if (isAlbumAvailable(getActivePath())): ?>
-                        <a download=""
-                                       href="photos_folders/photos<?php echo getActivePath() . DIRECTORY_SEPARATOR . GetActiveFolder(getActivePath()) ?>.zip"
-                                       id="downloadAlbum">
-                                <span id="downloadText"><i class="fas fa-download"></i>Télécharger</span>
+                        <a download="" href="photos_folders/photos<?php echo getActivePath().DIRECTORY_SEPARATOR.GetActiveFolder(getActivePath()); ?>.zip" id="downloadAlbum">
+                                <span id="downloadText">Télécharger</span>
                                 <span id="albumPhotoCount"><?php echo getPhotoCount(photoRoot . getActivePath()) ?> photos</span>
-                            </a>
+                        </a>
                     <?php endif; ?>
                <?php if (getPhotoCount(photoRoot . getActivePath()) > 0): ?>
                         <div class="photos">
@@ -331,7 +313,6 @@ if (isset($_REQUEST['logout'])) {
     </div>
 <br>
 
-
 <?php
 $infopage = ["", "Photos", ob_get_clean(), "", "photos"]; //relativepath, pagetitle, pagecontent, pagescript, pagename | cf structure/template.php ligne 2 à 6
 include("structure/template.php");