aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.idea/workspace.xml5
-rw-r--r--index.php15
-rw-r--r--known/index.php102
-rw-r--r--test/.DS_Storebin6148 -> 0 bytes
-rw-r--r--test/cookie/index.php6
-rw-r--r--test/index.html12
-rw-r--r--test/value/index.php7
-rw-r--r--test/value/no/index.html12
-rw-r--r--test/value/yes/index.html12
-rw-r--r--version.txt2
-rw-r--r--yt.php27
11 files changed, 7 insertions, 193 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ffeae21..e1ba42d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e4941d36-f387-4fd6-8e3d-4cad435f2034" name="Changes" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/cdn/statusbar.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/statusbar.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/genealogy/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/genealogy/.gitlab-ci.yml" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/.gitlab-ci.yml" afterDir="false" />
@@ -61,6 +62,8 @@
<change beforePath="$PROJECT_DIR$/app/genealogy/styles/dark.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/styles/dark.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/genealogy/tree/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/tree/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/genealogy/tree/mktree.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/tree/mktree.php" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.php" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/known/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/known/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/version.txt" beforeDir="false" afterPath="$PROJECT_DIR$/version.txt" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
@@ -172,7 +175,7 @@
<workItem from="1654352763363" duration="147000" />
<workItem from="1654692815481" duration="319000" />
<workItem from="1654695589166" duration="74000" />
- <workItem from="1654708779061" duration="1099000" />
+ <workItem from="1654708779061" duration="2495000" />
</task>
<servers />
</component>
diff --git a/index.php b/index.php
index a153354..98a6b53 100644
--- a/index.php
+++ b/index.php
@@ -98,7 +98,7 @@ global $_FRENCH;
</a> -->
</div>
<div style="color: white;text-align: center;margin-top: 10px;opacity: .5;font-size: 14px;">
- <a style="color:white;display:inline-block;" href="https://app.familine.minteck.org/known"><?= l("Problèmes connus", "Known Issues") ?></a> · <a target="_blank" style="color:white;display:inline-block;" href="https://gitlab.minteck.org/familine"><?= l("Code source", "Source Code") ?></a> · version <?= str_replace("%ea%", l("accès anticipé", "early access"), file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/version.txt")) ?>
+ <a target="_blank" style="color:white;display:inline-block;" href="https://gitlab.minteck.org/familine"><?= l("Code source", "Source Code") ?></a> · version <?= str_replace("%ea%", l("accès anticipé", "early access"), file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/version.txt")) ?>
</div>
<br>
<br>
@@ -195,19 +195,6 @@ global $_FRENCH;
<script src="/js/iframe.js"></script>
<script src="/js/navigation.js"></script>
<script src="/js/statusbar.js"></script>
- <script>
- function openNews(news) {
- document.getElementById("news_internal-" + news + "-open").style.display = "none";
- document.getElementById("news_internal-" + news + "-close").style.display = "";
- document.getElementById("news_internal-" + news).open = true;
- }
-
- function closeNews(news) {
- document.getElementById("news_internal-" + news + "-close").style.display = "none";
- document.getElementById("news_internal-" + news + "-open").style.display = "";
- document.getElementById("news_internal-" + news).open = false;
- }
- </script>
<style>
summary { display: none; }
</style>
diff --git a/known/index.php b/known/index.php
index 4cfb1bc..e3416a4 100644
--- a/known/index.php
+++ b/known/index.php
@@ -1,103 +1,3 @@
<?php
-require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session.php";
-
-/** @var string $_FULLNAME
- * @var string $_USER
- * @var string $_SUID
- * @var array $_PROFILE
- */
-
-?>
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <title>Problèmes connus - Familine</title>
- <link rel="icon" href="https://familine.minteck.org/icns/familine.svg">
- <link rel="stylesheet" href="https://familine.minteck.org/styles.css">
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script>
- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
-</head>
-<body>
- <div class="container" style="margin-top:30px;">
- <h1>Problèmes connus avec Familine</h1>
- <p>Familine est une suite de logiciels intégrés les uns avec les autres de façon à former un uniforme parfait. Malheureusement, aucun logiciel n'est complet et fiable à 100%. Cette page liste les principaux problèmes connus avec les différentes applications de Familine.</p>
- <p style="text-align: center;"><i>Aucun problème connu n'est actuellement référencé. Si vous rencontrez un problème, vous pouvez <a href="mailto:support@familine.minteck.org">contacter les administrateurs</a> pour le signaler.</i></p>
- <ul class="list-group">
-<!-- <li class="list-group-item list-group-item-action">-->
-<!-- <details>-->
-<!-- <summary>-->
-<!-- <span class="badge badge-pill badge-secondary">Pages</span>-->
-<!-- Pied de page incomplet-->
-<!-- </summary>-->
-<!-- <br>-->
-<!-- <p>Le pied de page actuel est celui par défaut du thème Citizen pour le logiciel MediaWiki. Certaines mentions doivent être modifiées.</p>-->
-<!-- <p class="text-muted">Numéro de problème : FD-01</p>-->
-<!-- </details>-->
-<!-- </li>-->
-<!-- <li class="list-group-item list-group-item-action">-->
-<!-- <details>-->
-<!-- <summary>-->
-<!-- <span class="badge badge-pill badge-secondary">Aide</span>-->
-<!-- Pages d'aide incomplète-->
-<!-- </summary>-->
-<!-- <br>-->
-<!-- <p>Plus précisément :</p>-->
-<!-- <ul>-->
-<!--!-- <li>"Accéder à la nouvelle version de Famiwiki" est vide ;</li>---->
-<!--!-- <li>"Visualiser votre programme d'événements" est vide ;</li>---->
-<!-- <li>"Mentions légales" est vide ;</li>-->
-<!-- </ul>-->
-<!-- <p class="text-muted">Numéro de problème : FH-01</p>-->
-<!-- </details>-->
-<!-- </li>-->
-<!-- <li class="list-group-item list-group-item-action">-->
-<!-- <details>-->
-<!-- <summary>-->
-<!-- <span class="badge badge-pill badge-secondary">Films</span>-->
-<!-- Chargement de l'application lent-->
-<!-- </summary>-->
-<!-- <br>-->
-<!-- <p>Le chargement de l'application Familine Films est excessivement long en raison du fait que le serveur recalcule la durée de contenu à chaque fois ; ajouter un système de cache permettrait d'augmenter les performances.</p>-->
-<!-- <p class="text-muted">Numéro de problème : FM-01</p>-->
-<!-- </details>-->
-<!-- </li>-->
-<!-- <li class="list-group-item list-group-item-action">-->
-<!-- <details>-->
-<!-- <summary>-->
-<!-- <span class="badge badge-pill badge-secondary">Films</span>-->
-<!-- Suggestions "à suivre"-->
-<!-- </summary>-->
-<!-- <br>-->
-<!-- <p>L'ajout d'un système de recommendations, qui s'affiche après le visionnage d'un film, permettrait à un spectateur de rester plus longtemps sur la plate-forme en lui proposant du contenu similaire à celui qu'il vient de regarder.</p>-->
-<!-- <p class="text-muted">Numéro de problème : FM-02</p>-->
-<!-- </details>-->
-<!-- </li>-->
-<!-- <li class="list-group-item list-group-item-action">-->
-<!-- <details>-->
-<!-- <summary>-->
-<!-- <span class="badge badge-pill badge-secondary">Discussions</span>-->
-<!-- Page d'accueil incomplète-->
-<!-- </summary>-->
-<!-- <br>-->
-<!-- <p>La page d'accueil de Familine Discussions est incomplète et reste la page d'accueil par défaut du logiciel Rocket.Chat.</p>-->
-<!-- <p class="text-muted">Numéro de problème : FY-01</p>-->
-<!-- </details>-->
-<!-- </li>-->
- </ul>
- </div>
- <script>
- console.log("Injecting Familine header")
- document.body.innerHTML = document.body.innerHTML + "<iframe style=\"position:fixed;left:0;right:0;top:0;border: none;width: 100%;height:32px;\" src=\"https://<?= /** @var array $_CONFIG */
- $_CONFIG["Global"]["cdn"] ?>/statusbar.php\"></iframe>";
- document.getElementsByTagName("html")[0].style.marginTop = "32px";
- document.getElementsByTagName("html")[0].style.height = "calc(100vh - 32px)";
- </script>
-</body>
-</html> \ No newline at end of file
+header("Location: /") and die(); \ No newline at end of file
diff --git a/test/.DS_Store b/test/.DS_Store
deleted file mode 100644
index fa1260d..0000000
--- a/test/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/test/cookie/index.php b/test/cookie/index.php
deleted file mode 100644
index 7a11bf1..0000000
--- a/test/cookie/index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-setcookie("_flmobile_test", "This is a test value", 0, "/", ".familine.minteck.org", true, true);
-
-?>
-Cookie set, click the Button button now.
diff --git a/test/index.html b/test/index.html
deleted file mode 100644
index 36c09f1..0000000
--- a/test/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Title</title>
-</head>
-<body>
- <form action="/test/cookie">
- <input type="submit" value="Click to test">
- </form>
-</body>
-</html> \ No newline at end of file
diff --git a/test/value/index.php b/test/value/index.php
deleted file mode 100644
index 3e9ef74..0000000
--- a/test/value/index.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if (isset($_COOKIE["_flmobile_test"])) {
- header("Location: /test/value/yes");
-} else {
- header("Location: /test/value/no");
-} \ No newline at end of file
diff --git a/test/value/no/index.html b/test/value/no/index.html
deleted file mode 100644
index 36c09f1..0000000
--- a/test/value/no/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Title</title>
-</head>
-<body>
- <form action="/test/cookie">
- <input type="submit" value="Click to test">
- </form>
-</body>
-</html> \ No newline at end of file
diff --git a/test/value/yes/index.html b/test/value/yes/index.html
deleted file mode 100644
index 36c09f1..0000000
--- a/test/value/yes/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Title</title>
-</head>
-<body>
- <form action="/test/cookie">
- <input type="submit" value="Click to test">
- </form>
-</body>
-</html> \ No newline at end of file
diff --git a/version.txt b/version.txt
index 39a0fa7..0518ae5 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-4.10.6 (%ea%) \ No newline at end of file
+4.10.7 (%ea%) \ No newline at end of file
diff --git a/yt.php b/yt.php
deleted file mode 100644
index ec5107e..0000000
--- a/yt.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-ini_set('max_execution_time', 300);
-ini_set('request_terminate_timeout', 300);
-require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session.php";
-
-if (!isset($_GET['i'])) {
- die();
-}
-
-if (strpos($_GET['i'], ".") !== false || strpos($_GET['i'], "/") !== false) {
- die();
-}
-
-$film = $_GET['i'];
-$id = bin2hex(random_bytes(96));
-
-exec("bash -c \"rm -Rfvd /tmp/ytphp-*\"");
-mkdir("/tmp/ytphp-" . $id);
-exec("bash -c \"cd /tmp/ytphp-" . $id . " && yt-dlp -f 'bestaudio[ext=m4a]' -x -o 'audio.m4a' --audio-format m4a \\\"" . $film . "\\\"\"", $out);
-
-$fp = fopen("/tmp/ytphp-" . $id . "/audio.m4a", 'rb');
-header("Content-Type: " . mime_content_type("/tmp/ytphp-" . $id . "/audio.m4a"));
-header("Content-Length: " . filesize("/tmp/ytphp-" . $id . "/audio.m4a"));
-fpassthru($fp);
-exec("bash -c \"rm -Rfvd /tmp/ytphp-*\"");
-exit;