Merge pull request #22 from jojoc4/21-ldp

added privacy page
jojoc4 · Sep 7, 2023 · 2da7b98 · 2da7b98
2 parents 03e683c + 9a432a8
commit 2da7b98
Show file tree

Hide file tree

Showing 4 changed files with 240 additions and 140 deletions.
diff --git a/config_sample.php b/config_sample.php
@@ -15,10 +15,10 @@
 }
 
 $VERSION = 2;
-if(!needsUpdate($pdo, $VERSION)){
+if (!needsUpdate($pdo, $VERSION)) {
     $config = $pdo->query("SELECT * FROM config")->fetchAll(PDO::FETCH_ASSOC);
 
-    $USER_PASSWORD=$config[0]['value'];
-    $ADMIN_PASSWORD=$config[1]['value'];
-    $FORCE_HTTPS=$config[2]['value'] == "false" ? false : true;
-}
+    $USER_PASSWORD = $config[0]['value'];
+    $ADMIN_PASSWORD = $config[1]['value'];
+    $FORCE_HTTPS = $config[2]['value'] == "false" ? false : true;
+}
diff --git a/db.sql b/db.sql
@@ -17,7 +17,8 @@ CREATE TABLE `config` (
 INSERT INTO `config` (`id_cfg`, `name`, `value`) VALUES
 (1,	'USER_PASSWORD',	'userpass'),
 (2,	'ADMIN_PASSWORD',	'adminpass'),
-(3,	'FORCE_HTTPS',	'false');
+(3,	'FORCE_HTTPS',	'false'),
+(4,	'VERSION',	'1');
 
 CREATE TABLE `date` (
   `id_date` int(10) unsigned NOT NULL AUTO_INCREMENT,

diff --git a/index.php b/index.php
@@ -2,17 +2,17 @@
 require 'updater/tools.php';
 require 'config.php';
 
-if(needsUpdate($pdo, $VERSION)){
+if (needsUpdate($pdo, $VERSION)) {
     echo "L'application nécessite une mise à jour, veuillez contacter l'administrateur.";
     return;
 }
 
 //https redirection
-if($FORCE_HTTPS){
+if ($FORCE_HTTPS) {
     if (!(isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on' ||
-            $_SERVER['HTTPS'] == 1) ||
-            isset($_SERVER['HTTP_X_FORWARDED_PROTO']) &&
-            $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')) {
+        $_SERVER['HTTPS'] == 1) ||
+        isset($_SERVER['HTTP_X_FORWARDED_PROTO']) &&
+        $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')) {
         $redirect = 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
         header('HTTP/1.1 301 Moved Permanently');
         header('Location: ' . $redirect);
@@ -25,7 +25,7 @@
     if ($USER_PASSWORD == $_POST['password']) {
         setcookie("login", password_hash($USER_PASSWORD, PASSWORD_DEFAULT), time() + 60 * 60 * 24 * 3650);
         header('Location: /');
-    } elseif($ADMIN_PASSWORD == $_POST['password']){
+    } elseif ($ADMIN_PASSWORD == $_POST['password']) {
         setcookie("login", password_hash($USER_PASSWORD, PASSWORD_DEFAULT), time() + 60 * 60 * 24 * 3650);
         setcookie("admin", password_hash($ADMIN_PASSWORD, PASSWORD_DEFAULT), time() + 60 * 60 * 24 * 3650);
         header('Location: /');
@@ -37,77 +37,83 @@
 
 <!DOCTYPE html>
 <html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-        <title>Chœur à Cœur - privée</title>
-        <meta name="theme-color" content="rgb(178,21,30)">
-        <meta property="og:type" content="">
-        <link rel="icon" type="image/png" sizes="512x512" href="assets/img/index_logo.png">
-        <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
-        <link rel="manifest" href="manifest.json">
-        <link rel="apple-touch-icon" sizes="256x256" href="/assets/img/AppImages/ios/256.png">
-        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">
-        <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.0/css/all.css">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-        <link rel="stylesheet" href="assets/fonts/fontawesome5-overrides.min.css">
-    </head>
 
-    <body id="page-top">
-        <div id="wrapper">
-            <nav class="navbar navbar-dark align-items-start sidebar sidebar-dark accordion bg-gradient-primary p-0" style="background: rgb(178,21,30);">
-                <div class="container-fluid d-flex flex-column p-0">
-                    <div class="sidebar-brand-icon" style="margin-top:8px;"><img width="64px" src="assets/img/index_logo.png"></div><br>
-                    <hr class="sidebar-divider my-0">
-                    <ul class="navbar-nav text-light" id="accordionSidebar">
-                        <li class="nav-item"><a class="nav-link <?php if (!isset($_GET['p'])) echo "active"; ?>" href="/"><i class="fas fa-home"></i><span>Accueil</span></a></li>
-                        <li class="nav-item"><a class="nav-link <?php if (isset($_GET['p']) && $_GET['p'] == 'd') echo "active"; ?>" href="/?p=d"><i class="fas fa-calendar"></i><span>Dates</span></a></li>
-                    </ul>
-                    <hr class="sidebar-divider my-0">
-                    <ul class="navbar-nav text-light" id="accordionSidebar">
-                        <?php
-                        foreach ($pdo->query("SELECT * FROM folder ORDER BY name")->fetchAll(PDO::FETCH_ASSOC) as $f) {
-                            if ($f['active']) {
-                                $string = '<li class="nav-item"><a class="nav-link';
-                                if (isset($_GET['p']) && $_GET['p'] == "f" && $_GET['f'] == $f['id_fld']) {
-                                    $string .= " active";
-                                }
-                                $string .= '" href="/?p=f&f=' . $f['id_fld'] . '"><i class="fas fa-';
-                                $string .= $f['icon'] . '"></i><span>';
-                                $string .= $f['name'] . '</span></a></li>';
-                                echo $string;
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
+    <title>Chœur à Cœur - privée</title>
+    <meta name="theme-color" content="rgb(178,21,30)">
+    <meta property="og:type" content="">
+    <link rel="icon" type="image/png" sizes="512x512" href="assets/img/index_logo.png">
+    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
+    <link rel="manifest" href="manifest.json">
+    <link rel="apple-touch-icon" sizes="256x256" href="/assets/img/AppImages/ios/256.png">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.0/css/all.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="assets/fonts/fontawesome5-overrides.min.css">
+</head>
+
+<body id="page-top">
+    <div id="wrapper">
+        <nav class="navbar navbar-dark align-items-start sidebar sidebar-dark accordion bg-gradient-primary p-0" style="background: rgb(178,21,30);">
+            <div class="container-fluid d-flex flex-column p-0">
+                <div class="sidebar-brand-icon" style="margin-top:8px;"><img width="64px" src="assets/img/index_logo.png"></div><br>
+                <hr class="sidebar-divider my-0">
+                <ul class="navbar-nav text-light" id="accordionSidebar">
+                    <li class="nav-item"><a class="nav-link <?php if (!isset($_GET['p'])) echo "active"; ?>" href="/"><i class="fas fa-home"></i><span>Accueil</span></a></li>
+                    <li class="nav-item"><a class="nav-link <?php if (isset($_GET['p']) && $_GET['p'] == 'd') echo "active"; ?>" href="/?p=d"><i class="fas fa-calendar"></i><span>Dates</span></a></li>
+                </ul>
+                <hr class="sidebar-divider my-0">
+                <ul class="navbar-nav text-light" id="accordionSidebar">
+                    <?php
+                    foreach ($pdo->query("SELECT * FROM folder ORDER BY name")->fetchAll(PDO::FETCH_ASSOC) as $f) {
+                        if ($f['active']) {
+                            $string = '<li class="nav-item"><a class="nav-link';
+                            if (isset($_GET['p']) && $_GET['p'] == "f" && $_GET['f'] == $f['id_fld']) {
+                                $string .= " active";
                             }
+                            $string .= '" href="/?p=f&f=' . $f['id_fld'] . '"><i class="fas fa-';
+                            $string .= $f['icon'] . '"></i><span>';
+                            $string .= $f['name'] . '</span></a></li>';
+                            echo $string;
                         }
-                        ?>
-                    </ul>
-                    <hr class="sidebar-divider my-0">
-                    <ul class="navbar-nav text-light" id="accordionSidebar">
-                        <?php
-                        if (isset($_COOKIE['admin']) && password_verify($ADMIN_PASSWORD, $_COOKIE['admin'])) {
-                            ?>
-                            <li class="nav-item"><a class="nav-link" href="/admin/"><i class="fas fa-toolbox"></i><span>Administration</span></a></li>
-                            <?php
-                        }
-                        ?>
-                        <li class="nav-item"><a class="nav-link" href="https://cloud.host-free.ch/index.php/s/HnrDt4P9BLYCGCy"><i class="fas fa-file-upload"></i><span>Déposer un fichier</span></a></li>
-                        <li class="nav-item"><a class="nav-link" href="/logout.php"><i class="fas fa-lock"></i><span>Se déconnecter</span></a></li>
-                    </ul>
-                    <div class="text-center d-none d-md-inline"><button class="btn rounded-circle border-0" id="sidebarToggle" type="button"></button></div>
-                </div>
-            </nav>
-            <div class="d-flex flex-column" id="content-wrapper">
-                <div id="content">
-                    <nav class="navbar navbar-light navbar-expand bg-white shadow mb-4 topbar static-top">
-                        <div class="container-fluid"><button class="btn d-md-none rounded-circle me-3" style="color: rgb(178,21,30);" id="sidebarToggleTop" type="button"><i class="fas fa-bars"></i></button>
-                            <?php if (isset($_COOKIE['login']) && isset($_GET['p']) && ($_GET['p'] == "f" || $_GET['p'] == 's')) { ?>
-                                <audio id="player" controls>Votre navigateur n'est pas supporté</audio>
-                            <?php } ?>
-                            <!--<form class="d-none d-sm-inline-block me-auto ms-md-3 my-2 my-md-0 mw-100 navbar-search">
+                    }
+                    ?>
+                </ul>
+                <hr class="sidebar-divider my-0">
+                <ul class="navbar-nav text-light" id="accordionSidebar">
+                    <?php
+                    if (isset($_COOKIE['admin']) && password_verify($ADMIN_PASSWORD, $_COOKIE['admin'])) {
+                    ?>
+                        <li class="nav-item"><a class="nav-link" href="/admin/"><i class="fas fa-toolbox"></i><span>Administration</span></a></li>
+                    <?php
+                    }
+                    ?>
+                    <li class="nav-item"><a class="nav-link" href="https://cloud.host-free.ch/index.php/s/HnrDt4P9BLYCGCy"><i class="fas fa-file-upload"></i><span>Déposer un fichier</span></a></li>
+                    <li class="nav-item"><a class="nav-link" href="/logout.php"><i class="fas fa-lock"></i><span>Se déconnecter</span></a></li>
+
+                    <li class="nav-item"><a class="nav-link <?php if (isset($_GET['p']) && $_GET['p'] == 'privacy') echo "active"; ?>" href="/?p=privacy"><span>Protection des données</span></a></li>
+                </ul>
+                <div class="text-center d-none d-md-inline"><button class="btn rounded-circle border-0" id="sidebarToggle" type="button"></button></div>
+            </div>
+        </nav>
+        <div class="d-flex flex-column" id="content-wrapper">
+            <div id="content">
+                <nav class="navbar navbar-light navbar-expand bg-white shadow mb-4 topbar static-top">
+                    <div class="container-fluid"><button class="btn d-md-none rounded-circle me-3" style="color: rgb(178,21,30);" id="sidebarToggleTop" type="button"><i class="fas fa-bars"></i></button>
+                        <?php if (isset($_COOKIE['login']) && isset($_GET['p']) && ($_GET['p'] == "f" || $_GET['p'] == 's')) { ?>
+                            <audio id="player" controls>Votre navigateur n'est pas supporté</audio>
+                        <?php } ?>
+                        <!--<form class="d-none d-sm-inline-block me-auto ms-md-3 my-2 my-md-0 mw-100 navbar-search">
                                 <div class="input-group"><input class="bg-light form-control border-0 small" type="text" placeholder="Search for ..."><button class="btn btn-primary py-0" type="button" style="background: rgb(178,21,30);"><i class="fas fa-search"></i></button></div>
                             </form>-->
-                        </div>
-                    </nav>
-                    <?php
+                    </div>
+                </nav>
+                <?php
+                if (isset($_GET['p']) && $_GET['p'] == 'privacy') {
+                    include 'privacy.php';
+                } else {
                     if (!isset($_COOKIE['login']) || !password_verify($USER_PASSWORD, $_COOKIE['login'])) {
                         include 'login.php';
                     } else {
@@ -121,84 +127,84 @@
                                 case 'f':
                                     include 'folder.php';
                                     break;
-                                default :
+                                default:
                                     include 'error.php';
                                     break;
                             }
                         }
                     }
-                    ?>
-                </div>
-                <footer class="bg-white sticky-footer">
-                    <div class="container my-auto">
-                        <div class="text-center my-auto copyright"><span>Copyright © Chœur à Cœur 2021 | Site web créé par <a href="#" style="color: black;">Jonatan Baumgartner</a></span></div>
-                    </div>
-                </footer>
+                }
+                ?>
             </div>
+            <footer class="bg-white sticky-footer">
+                <div class="container my-auto">
+                    <div class="text-center my-auto copyright"><span>Copyright © Chœur à Cœur 2021 | Site web créé par <a href="#" style="color: black;">Jonatan Baumgartner</a></span></div>
+                </div>
+            </footer>
         </div>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>
-        <script src="assets/js/theme.js"></script>
-        <script>
-            var vw = Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0);
+    </div>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>
+    <script src="assets/js/theme.js"></script>
+    <script>
+        var vw = Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0);
 
-            if (vw < 768) {
-                var sidebar = document.querySelector('.sidebar');
-                var collapseElementList = [].slice.call(document.querySelectorAll('.sidebar .collapse'));
-                var sidebarCollapseList = collapseElementList.map(function (collapseEl) {
-                    return new bootstrap.Collapse(collapseEl, {toggle: false});
+        if (vw < 768) {
+            var sidebar = document.querySelector('.sidebar');
+            var collapseElementList = [].slice.call(document.querySelectorAll('.sidebar .collapse'));
+            var sidebarCollapseList = collapseElementList.map(function(collapseEl) {
+                return new bootstrap.Collapse(collapseEl, {
+                    toggle: false
                 });
+            });
 
-                document.body.classList.toggle('sidebar-toggled');
-                sidebar.classList.toggle('toggled');
+            document.body.classList.toggle('sidebar-toggled');
+            sidebar.classList.toggle('toggled');
 
-                if (sidebar.classList.contains('toggled')) {
-                    for (var bsCollapse of sidebarCollapseList) {
-                        bsCollapse.hide();
-                    }
+            if (sidebar.classList.contains('toggled')) {
+                for (var bsCollapse of sidebarCollapseList) {
+                    bsCollapse.hide();
                 }
             }
-        </script>
-        <?php
-        require 'tracking.php';
-        ?>
-
-        <script type="text/javascript">
-            function printPDF(pdfUrl)
-            {
-                var w = window.open(pdfUrl);
-                w.print();
-            }
-        </script>
-        <script>
-
-            $(document).ready(function () {
-                $(".song").on("click", function () {
-                    document.getElementById("player").src = $(this).attr("m");
-                    document.getElementById("player").load();
-                    document.getElementById("player").play();
-                });
+        }
+    </script>
+    <?php
+    require 'tracking.php';
+    ?>
 
+    <script type="text/javascript">
+        function printPDF(pdfUrl) {
+            var w = window.open(pdfUrl);
+            w.print();
+        }
+    </script>
+    <script>
+        $(document).ready(function() {
+            $(".song").on("click", function() {
+                document.getElementById("player").src = $(this).attr("m");
+                document.getElementById("player").load();
+                document.getElementById("player").play();
             });
 
-        </script>
-        <script>
-            if ('serviceWorker' in navigator) {
-                window.addEventListener('load', function () {
-                    navigator.serviceWorker.register('service-worker.js').then(function (registration) {
-                        // Registration was successful
-                        console.log('Registered!');
-                    }, function (err) {
-                        // registration failed :(
-                        console.log('ServiceWorker registration failed: ', err);
-                    }).catch(function (err) {
-                        console.log(err);
-                    });
+        });
+    </script>
+    <script>
+        if ('serviceWorker' in navigator) {
+            window.addEventListener('load', function() {
+                navigator.serviceWorker.register('service-worker.js').then(function(registration) {
+                    // Registration was successful
+                    console.log('Registered!');
+                }, function(err) {
+                    // registration failed :(
+                    console.log('ServiceWorker registration failed: ', err);
+                }).catch(function(err) {
+                    console.log(err);
                 });
-            } else {
-                console.log('service worker is not supported');
-            }
-        </script>
-    </body>
+            });
+        } else {
+            console.log('service worker is not supported');
+        }
+    </script>
+</body>
 
 </html>