getType()->label()) ?>
+ +
+ getContent() ?>
+
+Update the option value in the cache only.
+ * @param string $optionName + * @param string $optionValue + * @return void + */ + private function updateOptionCacheValue(string $optionName, string $optionValue): void + { + if (SimpleCacheManager::cacheExist(self::CACHE_KEY, self::CACHE_SUBFOLDER)) { + $cachedOptions = SimpleCacheManager::getCache(self::CACHE_KEY, self::CACHE_SUBFOLDER); + + if (\is_array($cachedOptions)) { + foreach ($cachedOptions as &$conf) { + if ($conf['option_name'] === $optionName) { + $conf['option_value'] = $optionValue; + SimpleCacheManager::storeCache($cachedOptions, self::CACHE_KEY, self::CACHE_SUBFOLDER); + return; + } + } + unset($conf); + + // If not found, add it + $cachedOptions[] = ['option_name' => $optionName, 'option_value' => $optionValue]; + SimpleCacheManager::storeCache($cachedOptions, self::CACHE_KEY, self::CACHE_SUBFOLDER); + } + } + } + + /** + *Clear the options cache
+ * @return void + */ + public function clearOptionsCache(): void + { + if (SimpleCacheManager::cacheExist(self::CACHE_KEY, self::CACHE_SUBFOLDER)) { + SimpleCacheManager::deleteSpecificCacheFile(self::CACHE_KEY, self::CACHE_SUBFOLDER); + } } } diff --git a/App/Package/Core/Models/TermsModel.php b/App/Package/Core/Models/TermsModel.php new file mode 100644 index 00000000..f2f3969f --- /dev/null +++ b/App/Package/Core/Models/TermsModel.php @@ -0,0 +1,213 @@ +getUserById((int)$row['term_last_editor']); + } + + return new TermsEntity( + (int)$row['term_id'], + TermType::from((string)$row['term_type']), + (string)$row['term_content'], + (int)$row['term_requires_accept'], + (string)$row['term_published_at'], + $editor + ); + } + + /** + * @param \CMW\Type\Core\Enum\TermType $type + * @return \CMW\Entity\Core\TermsEntity|null + */ + public function getLatestByType(TermType $type): ?TermsEntity + { + $stmt = $this->pdo()->prepare( + 'SELECT * FROM cmw_core_terms WHERE term_type = :type ORDER BY term_id DESC LIMIT 1' + ); + if (!$stmt->execute(['type' => $type->value])) return null; + $row = $stmt->fetch(PDO::FETCH_ASSOC); + return $row ? $this->hydrate($row) : null; + } + + /** @return TermsEntity[] */ + public function getLatestPerType(): array + { + $sql = " + SELECT t.* + FROM cmw_core_terms t + INNER JOIN ( + SELECT term_type, MAX(term_id) AS last_id + FROM cmw_core_terms + GROUP BY term_type + ) m ON m.term_type = t.term_type AND m.last_id = t.term_id + ORDER BY t.term_type + "; + $stmt = $this->pdo()->prepare($sql); + if (!$stmt->execute()) return []; + + $out = []; + while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) { + $out[] = $this->hydrate($row); + } + return $out; + } + + /** @return TermsEntity[] */ + public function listHistory(TermType $type, int $limit = 50, int $offset = 0): array + { + $sql = " + SELECT * + FROM cmw_core_terms + WHERE term_type = :type + ORDER BY term_id DESC + LIMIT :limit OFFSET :offset + "; + $stmt = $this->pdo()->prepare($sql); + $stmt->bindValue(':type', $type->value, PDO::PARAM_STR); + $stmt->bindValue(':limit', $limit, PDO::PARAM_INT); + $stmt->bindValue(':offset', $offset, PDO::PARAM_INT); + + if (!$stmt->execute()) return []; + + $out = []; + while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) { + $out[] = $this->hydrate($row); + } + return $out; + } + + /** + * Publie une nouvelle version (INSERT-only). + * @return int|null term_id inséré + */ + public function publish(TermType $type, string $htmlContent, bool $requiresAccept, int $editorUserId): ?int + { + $stmt = $this->pdo()->prepare(" + INSERT INTO cmw_core_terms (term_type, term_content, term_requires_accept, term_published_at, term_last_editor) + VALUES (:type, :content, :req, NOW(), :editor) + "); + + $ok = $stmt->execute([ + 'type' => $type->value, + 'content' => $htmlContent, + 'req' => $requiresAccept ? 1 : 0, + 'editor' => $editorUserId, + ]); + + return $ok ? (int)$this->pdo()->lastInsertId() : null; + } + + /** + * Dernière date de publication qui REQUIERT re-acceptation (cutoff global). + */ + public function getLastRequiredCutoff(): DateTimeImmutable + { + $row = $this->pdo()->query( + "SELECT MAX(term_published_at) AS last_update FROM cmw_core_terms WHERE term_requires_accept = 1" + )?->fetch(PDO::FETCH_ASSOC); + + $ts = $row['last_update'] ?? '1970-01-01 00:00:00'; + return new DateTimeImmutable($ts); + } + + /** @return TermType[] */ + public function getOutdatedTypesSince(DateTimeInterface $acceptedAt): array + { + $sql = " + SELECT term_type, MAX(term_published_at) AS latest + FROM cmw_core_terms + WHERE term_requires_accept = 1 + GROUP BY term_type + HAVING latest > :cutoff + "; + $stmt = $this->pdo()->prepare($sql); + $stmt->execute(['cutoff' => $acceptedAt->format('Y-m-d H:i:s')]); + + $types = []; + foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) { + $types[] = TermType::from($row['term_type']); + } + return $types; + } + + public function isTypeActive(TermType $type): bool + { + if ($type->isMandatory()) { + return true; + } + + $stmt = $this->pdo()->prepare( + "SELECT is_active FROM cmw_core_terms_settings WHERE term_type = :t LIMIT 1" + ); + $stmt->execute(['t' => $type->value]); + $row = $stmt->fetch(\PDO::FETCH_ASSOC); + + // défaut: actif si non configuré (change en false si tu veux) + return $row ? (bool)$row['is_active'] : true; + } + + public function setTypeActive(TermType $type, bool $active): void + { + if ($active === false && $type->isMandatory()) { + throw new \RuntimeException('This term type is mandatory and cannot be disabled.'); + } + + $stmt = $this->pdo()->prepare(" + INSERT INTO cmw_core_terms_settings (term_type, is_active) + VALUES (:t, :a) + ON DUPLICATE KEY UPDATE is_active = VALUES(is_active) + "); + $stmt->execute(['t' => $type->value, 'a' => $active ? 1 : 0]); + } + + /** @return TermsEntity[] actifs seulement */ + public function getLatestPerTypeActive(): array + { + $all = $this->getLatestPerType(); + $out = []; + foreach ($all as $term) { + if ($this->isTypeActive($term->getType())) { + $out[] = $term; + } + } + return $out; + } + + /** @return TermType[] */ + public function getActiveTypes(): array + { + $types = []; + foreach (TermType::cases() as $t) { + if ($this->isTypeActive($t)) { + $types[] = $t; + } + } + return $types; + } + +} diff --git a/App/Package/Core/Package.php b/App/Package/Core/Package.php index 4dc4c2d8..667f6dc0 100644 --- a/App/Package/Core/Package.php +++ b/App/Package/Core/Package.php @@ -3,18 +3,17 @@ namespace CMW\Package\Core; use CMW\Manager\Lang\LangManager; -use CMW\Manager\Package\IPackageConfig; +use CMW\Manager\Package\IPackageConfigV2; use CMW\Manager\Package\PackageMenuType; use CMW\Manager\Package\PackageSubMenuType; use CMW\Manager\Theme\Loader\ThemeLoader; -use CMW\Manager\Theme\ThemeManager; use CMW\Manager\Updater\UpdatesManager; /** * @var $isUpToDate bool */ -class Package implements IPackageConfig +class Package implements IPackageConfigV2 { public function name(): string { @@ -26,9 +25,19 @@ public function version(): string return '1.0.0'; } + public function cmwVersion(): string + { + return "2.0"; + } + + public function imageLink(): ?string + { + return null; + } + public function authors(): array { - return ['CraftMyWebsiteTeam']; + return ['CraftMyWebsite']; } public function isGame(): bool @@ -72,7 +81,7 @@ public function menus(): ?array new PackageSubMenuType( title: LangManager::translate('core.menu.setting.cg'), permission: 'core.settings.conditions', - url: 'condition', + url: 'terms', subMenus: [] ), new PackageSubMenuType( @@ -144,6 +153,11 @@ public function menus(): ?array ]; } + public function compatiblesPackages(): array + { + return ["Core"]; + } + public function requiredPackages(): array { return []; diff --git a/App/Package/Core/Public/Terms/acceptable_use.view.php b/App/Package/Core/Public/Terms/acceptable_use.view.php new file mode 100644 index 00000000..66c8ba6b --- /dev/null +++ b/App/Package/Core/Public/Terms/acceptable_use.view.php @@ -0,0 +1,33 @@ +getType()->label())); +Website::setDescription(htmlspecialchars($term->getType()->label()) . ' ' . htmlspecialchars($term->getPublishedAt())); +?> + + + +
+
+ value; if (!isset($terms[$key])) continue; $term=$terms[$key]; ?>
+
+
+
+
\ No newline at end of file
diff --git a/App/Package/Core/Public/Terms/cookie_policy.view.php b/App/Package/Core/Public/Terms/cookie_policy.view.php
new file mode 100644
index 00000000..66c8ba6b
--- /dev/null
+++ b/App/Package/Core/Public/Terms/cookie_policy.view.php
@@ -0,0 +1,33 @@
+getType()->label()));
+Website::setDescription(htmlspecialchars($term->getType()->label()) . ' ' . htmlspecialchars($term->getPublishedAt()));
+?>
+
+
+
+label()) ?>
+ +getContent(); ?>
+ getType()->label()) ?>
+ +
+ getContent() ?>
+
+getType()->label()) ?>
+ +
+ getContent() ?>
+
+getType()->label()) ?>
+ +
+ getContent() ?>
+
+getType()->label()) ?>
+ +
+ getContent() ?>
+
+getType()->label()) ?>
+ +
+ getContent() ?>
+
+getType()->label()) ?>
+ +
+ getContent() ?>
+
+getType()->label()) ?>
+ +
+ getContent() ?>
+
+Écrit par getLastEditor()->getPseudo() ?>, mis à jour le getUpdate() ?>
- -Écrit par getLastEditor()->getPseudo() ?>, mis à jour le getUpdate() ?>
- -
-
-
-
\ No newline at end of file
diff --git a/App/Package/Core/Views/Mail/mailConfig.admin.view.php b/App/Package/Core/Views/Mail/mailConfig.admin.view.php
index 17487fce..cd82b936 100644
--- a/App/Package/Core/Views/Mail/mailConfig.admin.view.php
+++ b/App/Package/Core/Views/Mail/mailConfig.admin.view.php
@@ -302,7 +302,7 @@ class="btn-primary">
enableSnippets: false
})
- if (localStorage.getItem('theme') === 'theme-dark') {
+ if (localStorage.getItem('color-theme') === 'dark') {
editor.setTheme("ace/theme/cmw_dark");
} else {
editor.setTheme("ace/theme/cmw_light");
diff --git a/App/Package/Core/Views/Maintenance/maintenance.admin.view.php b/App/Package/Core/Views/Maintenance/maintenance.admin.view.php
index 8122e489..b2f72508 100644
--- a/App/Package/Core/Views/Maintenance/maintenance.admin.view.php
+++ b/App/Package/Core/Views/Maintenance/maintenance.admin.view.php
@@ -42,6 +42,14 @@ class="toggle-input">
- -
+
-
+
+
-
-
-
diff --git a/App/Package/Core/Views/Notification/main.admin.view.php b/App/Package/Core/Views/Notification/main.admin.view.php
index c1b903c5..9d9b4a91 100644
--- a/App/Package/Core/Views/Notification/main.admin.view.php
+++ b/App/Package/Core/Views/Notification/main.admin.view.php
@@ -6,7 +6,7 @@
use CMW\Manager\Security\SecurityManager;
/* @var \CMW\Manager\Notification\NotificationEntity[] $notifications */
-/* @var \CMW\Manager\Package\IPackageConfig[] $packages */
+/* @var \CMW\Manager\Package\IPackageConfigV2[] $packages */
/* @var string $showOnDiscord */
/* @var string $webhookDiscord */
/* @var string $sendMail */
diff --git a/App/Package/Core/Views/Package/market.admin.view.php b/App/Package/Core/Views/Package/market.admin.view.php
index 94699a86..b8a1df8f 100644
--- a/App/Package/Core/Views/Package/market.admin.view.php
+++ b/App/Package/Core/Views/Package/market.admin.view.php
@@ -1,5 +1,7 @@
+
+ Votre site est en mode test API.
+ +
-