diff options
| -rw-r--r-- | .idea/workspace.xml | 3 | ||||
| -rw-r--r-- | index.php | 13 | ||||
| -rw-r--r-- | news_internal/index.php | 9 |
3 files changed, 21 insertions, 4 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 665cded..5c125cf 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -64,7 +64,6 @@ <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$/news_internal/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/news_internal/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" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -175,7 +174,7 @@ <workItem from="1654352763363" duration="147000" />
<workItem from="1654692815481" duration="319000" />
<workItem from="1654695589166" duration="74000" />
- <workItem from="1654708779061" duration="743000" />
+ <workItem from="1654708779061" duration="1089000" />
</task>
<servers />
</component>
@@ -1,6 +1,7 @@ <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session.php"; +global $_FRENCH; /** @var string $_FULLNAME * @var string $_USER @@ -167,7 +168,17 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session.php"; </script> <br> <?php foreach (array_reverse(scandir($_SERVER["DOCUMENT_ROOT"] . "/private/news")) as $article): if (str_ends_with($article, ".json")): ?> - <?php $data = json_decode(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/private/news/" . $article), true); $html = file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/private/news/" . substr($article, 0, -5) . ".html"); $summary = trim(explode("<!---->", $html)[0]); $full = trim($html); ?> + <?php $data = json_decode(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/private/news/" . $article), true); + + if (!$_FRENCH && file_exists($_SERVER["DOCUMENT_ROOT"] . "/private/news/" . substr($article, 0, -5) . ".en.html")) { + $html = file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/private/news/" . substr($article, 0, -5) . ".en.html"); + } else { + $html = file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/private/news/" . substr($article, 0, -5) . ".html"); + } + + $summary = trim(explode("<!---->", $html)[0]); + $full = trim($html); + ?> <?php if ($data["limited"] === null || in_array($_USER, $data["limited"])): ?> <div class="jumbotron"> <h5><?= $data["date"][l("fr","en")] ?></h5> diff --git a/news_internal/index.php b/news_internal/index.php index 63b691a..c5016d8 100644 --- a/news_internal/index.php +++ b/news_internal/index.php @@ -26,6 +26,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session.php"; +global $_FRENCH; /** @var string $_FULLNAME * @var string $_USER @@ -37,7 +38,13 @@ if (isset($_GET['a'])) { if (!str_contains($_GET['a'], "/") && !str_contains($_GET['a'], ".")) { if (file_exists($_SERVER["DOCUMENT_ROOT"] . "/private/news/" . $_GET['a'] . ".json")) { $data = json_decode(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/private/news/" . $_GET['a'] . ".json"), true); - $html = file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/private/news/" . $_GET['a'] . ".html"); + + if (!$_FRENCH && file_exists($_SERVER["DOCUMENT_ROOT"] . "/private/news/" . $_GET['a'] . ".en.html")) { + $html = file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/private/news/" . $_GET['a'] . ".en.html"); + } else { + $html = file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/private/news/" . $_GET['a'] . ".html"); + } + $summary = trim(explode("<!---->", $html)[0]); $full = trim($html); if (!($data["limited"] === null || in_array($_USER, $data["limited"]))) { |