This file is responsible for initializing the application, loading configurations, and setting up the environment for standalone env.
+ *With this file, we don't load CMW routes / router.
+ */ + +use CMW\Manager\Loader\Loader; + +// Set the environment to standalone +$GLOBALS['CMW_ENV'] = 'standalone'; + +// Set error reporting level +error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_WARNING); + +// Standard CMW loading process +require_once('App/Manager/Loader/Loader.php'); +Loader::loadProject(); +Loader::manageErrors(); +Loader::loadAttributes(); +Loader::setLocale(); \ No newline at end of file diff --git a/App/Manager/Env/EnvManager.php b/App/Manager/Env/EnvManager.php index cd1646b0..82041176 100644 --- a/App/Manager/Env/EnvManager.php +++ b/App/Manager/Env/EnvManager.php @@ -2,13 +2,36 @@ namespace CMW\Manager\Env; +use Closure; use CMW\Manager\Error\ErrorManager; use CMW\Utils\Utils; -use Closure; use Exception; - +use function array_key_exists; +use function bin2hex; +use function count; +use function dirname; +use function explode; +use function fclose; +use function file; +use function file_exists; +use function file_get_contents; +use function file_put_contents; +use function fopen; +use function fwrite; +use function is_file; use function is_readable; use function is_writable; +use function mb_strtoupper; +use function openssl_random_pseudo_bytes; +use function putenv; +use function random_int; +use function str_replace; +use function str_starts_with; +use function trim; +use function unlink; +use const FILE_IGNORE_NEW_LINES; +use const FILE_SKIP_EMPTY_LINES; +use const PHP_EOL; /** * Class: @EnvManager @@ -20,7 +43,7 @@ class EnvManager { private static EnvManager $_instance; - private string $envFileName = '.env'; + private string $envFileName; private string $envPath; private string $path; private string $absPath; @@ -32,6 +55,7 @@ class EnvManager public function __construct() { $this->absPath = dirname(__DIR__, 3) . '/'; + $this->setFileName(); $this->envPath = $this->absPath; $this->path = $this->envPath . $this->envFileName; $this->apiURL = 'https://apiv2.craftmywebsite.fr'; @@ -43,7 +67,7 @@ public function __construct() if (!$this->hasReadPerms()) { ErrorManager::showCustomErrorPage( 'Permission error:', - 'The file .env is not readable. Please check the permissions of the file.', + "The file $this->envFileName is not readable. Please check the permissions of the file.", ); } @@ -68,6 +92,16 @@ public function __isset(string $key) return $this->valueExist($key); } + private function setFileName(): void + { + if (isset($GLOBALS['CMW_ENV']) && $GLOBALS['CMW_ENV'] === 'standalone') { + $this->envFileName = '.env.standalone'; + return; + } + + $this->envFileName = '.env'; + } + private function doWithFile(Closure $fn): void { $lines = file($this->path, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); diff --git a/App/Manager/Error/ErrorManager.php b/App/Manager/Error/ErrorManager.php index d2c533b0..4b3529d4 100644 --- a/App/Manager/Error/ErrorManager.php +++ b/App/Manager/Error/ErrorManager.php @@ -4,6 +4,7 @@ use CMW\Manager\Env\EnvManager; use CMW\Manager\Permission\PermissionManager; +use CMW\Manager\Theme\Loader\ThemeLoader; use CMW\Manager\Theme\ThemeManager; use CMW\Manager\Views\View; use DateTime; @@ -184,7 +185,7 @@ public static function showError(int $errorCode): void // Here, we get data page we don't want to redirect user, just show him an error. // Route /error get error file : $errorCode.view.php, if that file don't exist, we call Default.view.php (from errors package) - $currentTheme = ThemeManager::getInstance()->getCurrentTheme()->name(); + $currentTheme = ThemeLoader::getInstance()->getCurrentTheme()->name(); $defaultErrorFile = EnvManager::getInstance()->getValue('DIR') . "Public/Themes/$currentTheme/Views/Errors/default.view.php"; $errorFile = EnvManager::getInstance()->getValue('DIR') . "Public/Themes/$currentTheme/Views/Errors/$errorCode.view.php"; diff --git a/App/Manager/Filter/FilterManager.php b/App/Manager/Filter/FilterManager.php index 2fe03b65..f2c0f12e 100644 --- a/App/Manager/Filter/FilterManager.php +++ b/App/Manager/Filter/FilterManager.php @@ -7,6 +7,7 @@ use function html_entity_decode; use function is_null; use function mb_substr; +use function preg_match; use function preg_replace; use function trim; use const ENT_QUOTES; @@ -62,12 +63,21 @@ public static function filterMultiplesData(int $maxLength = 128, string ...$valu * @param string $data * @param int|null $maxLength * @param mixed|null $orElse + * @param bool $allowScript * @return mixed - * @desc Securely filter data with maxlength parameter => optimized for strings. - *If orElse parameter is used, you can return anything you want if value is not set or null.
- *If $maxLength is NULL, we are ignoring this parameter.
+ *
+ *
*/
- public static function filterInputStringPost(string $data, ?int $maxLength = 255, mixed $orElse = false): mixed
+ public static function filterInputStringPost(
+ string $data,
+ ?int $maxLength = 255,
+ mixed $orElse = false,
+ bool $allowScript = false,
+ ): mixed
{
if ((!$orElse) && !isset($_POST[$data]) && !is_null($_POST[$data])) {
return $orElse;
@@ -75,13 +85,45 @@ public static function filterInputStringPost(string $data, ?int $maxLength = 255
$formattedData = trim(filter_input(INPUT_POST, $data, FILTER_UNSAFE_RAW));
+ if (!$allowScript) {
+ $formattedData = preg_replace('#Securely filter data with maxlength parameter => optimized for strings.
+ *If orElse parameter is used, you can return anything you want if value is not set or null.
+ *If $maxLength is NULL, we are ignoring this parameter.
+ *If $allowScript is true, we are removing all the data inside script tag.
+ *
+ *
+ */
+ public static function filterInputStringPostStrict(string $data, ?int $maxLength = 255, mixed $orElse = false): mixed
+ {
+ if ((!$orElse) && !isset($_POST[$data]) && !is_null($_POST[$data])) {
+ return $orElse;
+ }
+
+ $formattedData = trim(filter_input(INPUT_POST, $data, FILTER_UNSAFE_RAW));
+
+ if (!is_null($maxLength)) {
+ return mb_substr($formattedData, 0, $maxLength);
+ }
+
+ return preg_replace('/^[a-zA-Z0-9_-]+$/u', '', $formattedData);
+ }
+
/**
* @param string $data
* @param int $maxLength
@@ -130,6 +172,34 @@ public static function filterInputIntGet(string $data, int $maxLength = 11, mixe
return mb_substr(trim(filter_input(INPUT_GET, $data, FILTER_SANITIZE_NUMBER_INT)), 0, $maxLength);
}
+
+ /**
+ * @param string $data
+ * @param string $pattern
+ * @param int|null $maxLength
+ * @param mixed $orElse
+ * @return mixed
+ */
+ public static function filterInputPostWithPattern(string $data, string $pattern, ?int $maxLength = 255, mixed $orElse = false): mixed
+ {
+ if ((!$orElse) && !isset($_POST[$data]) && !is_null($_POST[$data])) {
+ return $orElse;
+ }
+
+ $formattedData = trim(filter_input(INPUT_POST, $data, FILTER_UNSAFE_RAW));
+
+ if (!is_null($maxLength)) {
+ $formattedData = mb_substr($formattedData, 0, $maxLength);
+ }
+
+ if (!preg_match($pattern, $formattedData)) {
+ return $orElse;
+ }
+
+ return $formattedData;
+ }
+
+
/**
* @param string $mail
* @return bool
diff --git a/App/Manager/Flash/Flash.php b/App/Manager/Flash/Flash.php
index 4f6b037a..ea8c82cf 100644
--- a/App/Manager/Flash/Flash.php
+++ b/App/Manager/Flash/Flash.php
@@ -2,35 +2,82 @@
namespace CMW\Manager\Flash;
+use CMW\Manager\Flash\Implementations\BaseFlashImplementation;
+use CMW\Manager\Loader\Loader;
use JetBrains\PhpStorm\ExpectedValues;
class Flash
{
+ private static ?IFlash $instance = null;
+
+ public static function __callStatic(string $name, array $arguments)
+ {
+ if (self::$instance === null) {
+ self::$instance = self::loadFlashInstance();
+ }
+
+ if (!method_exists(self::$instance, $name)) {
+ throw new \BadMethodCallException("Method $name does not exist in " . get_class(self::$instance));
+ }
+
+ return self::$instance->$name(...$arguments);
+ }
+
+
+ private static function loadFlashInstance(): IFlash
+ {
+ return self::getHighestImplementation() ?? new BaseFlashImplementation();
+ }
+
+ private static function getHighestImplementation(): IFlash
+ {
+ $implementations = Loader::loadManagerImplementations(IFlash::class, 'Flash');
+
+ $highest = array_reduce($implementations, static function (?IFlash $highest, IFlash $current) {
+ return ($highest === null || $current->weight() > $highest->weight()) ? $current : $highest;
+ });
+
+ return $highest ?? new BaseFlashImplementation();
+ }
+
/**
* @return Alert[]
*/
public static function load(): array
{
- if (!isset($_SESSION['alerts'])) {
- $_SESSION['alerts'] = array();
+ if (self::$instance === null) {
+ self::$instance = self::loadFlashInstance();
}
- return $_SESSION['alerts'];
+
+ return self::$instance::load();
}
+ /**
+ * @return void
+ * Securely filter data with maxlength parameter => optimized for strings with strict validation.
+ *Strict validation means that we are checking if the string contains only alphanumeric characters, underscores, and dashes.
+ *If orElse parameter is used, you can return anything you want if value is not set or null.
+ *If $maxLength is NULL, we are ignoring this parameter.
+ *Clear Flash data
+ */ public static function clear(): void { - $_SESSION['alerts'] = array(); + if (self::$instance === null) { + self::$instance = self::loadFlashInstance(); + } + + self::$instance::clear(); } + /** + * @param string $alertType + * @param string $title + * @param string $message + * @param bool $isAdmin + * @return Alert + */ public static function send(#[ExpectedValues(flagsFromClass: Alert::class)] string $alertType, string $title, string $message, bool $isAdmin = false): Alert { - $alert = self::create($alertType, $title, $message, $isAdmin); - $_SESSION['alerts'][] = $alert; - return $alert; - } + if (self::$instance === null) { + self::$instance = self::loadFlashInstance(); + } - private static function create(string $type, string $title, string $msg, bool $isAdmin): Alert - { - return new Alert($type, $title, $msg, $isAdmin); + return self::$instance::send($alertType, $title, $message, $isAdmin); } } diff --git a/App/Manager/Flash/IFlash.php b/App/Manager/Flash/IFlash.php new file mode 100644 index 00000000..5218704a --- /dev/null +++ b/App/Manager/Flash/IFlash.php @@ -0,0 +1,25 @@ + 'GET', + 'headers' => [], + 'timeout' => 30, + 'encoding' => 'utf-8', + 'body' => true, + 'follow' => true, + ]; + + public string|null $content = null; + public CurlHandle|false $curl; + public array $curlOpt = []; + public int $errorCode; + public string $errorMessage; + public array $headers = []; + public array $info = []; + public array $options = []; + + public function __construct(string $url, array $options = []) + { + $defaults = static::$defaultsOptions; + + $this->options = array_merge($defaults, $options); + $this->options['url'] = $url; + + $this->fetch(); + } + + public function __call(string $method, array $arguments = []) + { + $method = str_replace('-', '_', Str::kebab($method)); + return $this->info[$method] ?? null; + } + + public static function __callStatic(string $method, array $arguments = []): static + { + return new static( + url: $arguments[0], + options: array_merge( + ['method' => strtoupper($method)], + $arguments[1] ?? [] + ) + ); + } + + /** + *Fetch the request
+ * @return $this + */ + public function fetch(): static + { + // curl options + $this->curlOpt = [ + CURLOPT_URL => $this->options['url'], + CURLOPT_ENCODING => $this->options['encoding'], + CURLOPT_CONNECTTIMEOUT => $this->options['timeout'], + CURLOPT_TIMEOUT => $this->options['timeout'], + CURLOPT_AUTOREFERER => true, + CURLOPT_RETURNTRANSFER => $this->options['body'], + CURLOPT_FOLLOWLOCATION => $this->options['follow'] ?? true, + CURLOPT_MAXREDIRS => 10, + CURLOPT_HEADER => false, + CURLOPT_HEADERFUNCTION => $this->prepareHeaders(), + ]; + + // Set Progress + if (isset($this->options['progress']) && is_callable($this->options['progress'])) { + $this->curlOpt[CURLOPT_NOPROGRESS] = false; + $this->curlOpt[CURLOPT_PROGRESSFUNCTION] = $this->options['progress']; + } + + // Add headers + if (empty($this->options['headers']) === false) { + $headers = []; + foreach ($this->options['headers'] as $key => $value) { + if (is_string($key) === true) { + $value = $key . ': ' . $value; + } + + $headers[] = $value; + } + + $this->curlOpt[CURLOPT_HTTPHEADER] = $headers; + } + + // Set agent + if (empty($this->options['agent']) === false) { + $this->curlOpt[CURLOPT_USERAGENT] = $this->options['agent']; + } + + // Prepare for specific methods + $this->prepareCurlOptions(); + + // Start curl request + $this->curl = curl_init(); + + curl_setopt_array($this->curl, $this->curlOpt); + + $this->content = curl_exec($this->curl); + $this->info = curl_getinfo($this->curl); + $this->errorCode = curl_errno($this->curl); + $this->errorMessage = curl_error($this->curl); + + if ($this->errorCode) { + throw new RuntimeException($this->errorMessage, $this->errorCode); + } + + curl_close($this->curl); + + return $this; + } + + /** + * @param string $url + * @param array $params + * @return static + */ + public static function request(string $url, array $params = []): static + { + return new static($url, $params); + } + + /** + *Send a simple GET request
+ * @param string $url + * @param array $params + * @return static + */ + public static function get(string $url, array $params = []): static + { + $options = ['method' => 'GET', 'data' => $params]; + $query = http_build_query($options['data']); + + if (!empty($query)) { + $url .= Url::hasQuery($url) ? '&' . $query : '?' . $query; + } + + unset($options['data']); + return new static($url, $options); + } + + /** + *Decode the json response content
+ * @param bool $array + * @return array|stdClass|null + */ + public function json(bool $array = true): array|stdClass|null + { + try { + return json_decode($this->getContent(), $array, 512, JSON_THROW_ON_ERROR); + } catch (JsonException) { + return null; + } + } + + /** + * @return Closure + */ + public function prepareHeaders(): Closure + { + return function ($curl, $header): int { + $parts = Str::split($header, ':'); + + if (empty($parts[0]) === false && empty($parts[1]) === false) { + $key = array_shift($parts); + $this->headers[$key] = implode(':', $parts); + } + + return strlen($header); + }; + } + + /** + *Prepare data for post fields
+ * @param array|string $data + * @return string + */ + protected function preparePostFields(mixed $data): string + { + if (is_object($data) || is_array($data)) { + return http_build_query($data); + } + + return $data; + } + + /** + *Return the http status code
+ * @return int|null + */ + public function getStatusCode(): ?int + { + return $this->info['http_code'] ?? null; + } + + /** + *Return the response content
+ * @return string|null + */ + public function getContent(): ?string + { + return $this->content; + } + + /** + *Return the response headers
+ * @return array + */ + public function getHeaders(): array + { + return $this->headers; + } + + /** + *Return the response info
+ * @return array + */ + public function getInfo(): array + { + return $this->info; + } + + /** + *Return the error code
+ * @return int + */ + public function getErrorCode(): int + { + return $this->errorCode; + } + + /** + *Return the error message
+ * @return string + */ + public function getErrorMessage(): string + { + return $this->errorMessage; + } + + /** + *Return the request method
+ * @return string + */ + public function getMethod(): string + { + return $this->options['method']; + } + + /** + *Return the request URL
+ * @return string + */ + public function getUrl(): string + { + return $this->options['url']; + } + + /** + *Return the request options
+ * @return array + */ + public function getOptions(): array + { + return $this->options; + } + + /** + * @return void + */ + private function prepareCurlOptions(): void + { + switch (HttpMethodsType::fromName(Str::upper($this->options['method']))) { + case HttpMethodsType::POST: + $this->curlOpt[CURLOPT_POST] = true; + $this->curlOpt[CURLOPT_CUSTOMREQUEST] = 'POST'; + $this->curlOpt[CURLOPT_POSTFIELDS] = $this->preparePostFields($this->options['data']); + break; + case HttpMethodsType::PUT: + $this->curlOpt[CURLOPT_CUSTOMREQUEST] = 'PUT'; + $this->curlOpt[CURLOPT_POSTFIELDS] = $this->preparePostFields($this->options['data']); + + if ($this->options['file']) { + $this->curlOpt[CURLOPT_INFILE] = fopen($this->options['file'], 'rb'); + $this->curlOpt[CURLOPT_INFILESIZE] = File::size($this->options['file']) ?? 0; + } + break; + case HttpMethodsType::PATCH: + $this->curlOpt[CURLOPT_CUSTOMREQUEST] = 'PATCH'; + $this->curlOpt[CURLOPT_POSTFIELDS] = $this->preparePostFields($this->options['data']); + break; + case HttpMethodsType::DELETE: + $this->curlOpt[CURLOPT_CUSTOMREQUEST] = 'DELETE'; + $this->curlOpt[CURLOPT_POSTFIELDS] = $this->preparePostFields($this->options['data']); + break; + case HttpMethodsType::HEAD: + $this->curlOpt[CURLOPT_CUSTOMREQUEST] = 'HEAD'; + $this->curlOpt[CURLOPT_POSTFIELDS] = $this->preparePostFields($this->options['data']); + $this->curlOpt[CURLOPT_NOBODY] = true; + break; + case HttpMethodsType::GET: + $this->curlOpt[CURLOPT_CUSTOMREQUEST] = 'GET'; + break; + } + } +} \ No newline at end of file diff --git a/App/Manager/Http/Url.php b/App/Manager/Http/Url.php new file mode 100644 index 00000000..a7e91f48 --- /dev/null +++ b/App/Manager/Http/Url.php @@ -0,0 +1,61 @@ + 'App/Package/', + 'Controller', 'Model', 'Mapper', 'Entity', 'Implementation', 'Interface', 'Event', 'Exception', 'Type', 'Component', 'Classes', 'PackageInfo', 'Package', 'Permissions' => 'App/Package/', 'Manager' => 'App/Manager/', 'Utils' => 'App/Utils/', 'Theme' => 'Public/Themes/', @@ -134,6 +134,7 @@ private static function getPackageElements(array $namespace, string $elementName 'Exception' => 'Exception/', 'Type' => 'Type/', 'Component' => 'Components/', + 'Classes' => 'Classes/', 'PackageInfo', 'Manager' => '', 'Package', 'Theme' => '/', 'Permissions' => 'Init/', diff --git a/App/Manager/Loader/Loader.php b/App/Manager/Loader/Loader.php index f7a36d3d..9b64f574 100644 --- a/App/Manager/Loader/Loader.php +++ b/App/Manager/Loader/Loader.php @@ -2,6 +2,7 @@ namespace CMW\Manager\Loader; +use Closure; use CMW\Controller\Core\PackageController; use CMW\Controller\Installer\InstallerController; use CMW\Manager\Class\PackageManager; @@ -15,10 +16,18 @@ use ReflectionClass; use function array_diff; use function class_exists; +use function date_default_timezone_set; use function file_exists; +use function in_array; +use function is_array; use function is_dir; +use function is_file; +use function is_null; +use function is_subclass_of; +use function method_exists; use function pathinfo; use function scandir; +use function ucfirst; use const PATHINFO_FILENAME; class Loader @@ -122,7 +131,11 @@ public static function loadManagerImplementations($interface, string $managerNam continue; } - $instance = $namespace::getInstance(); + if (method_exists($namespace, 'getInstance')) { + $instance = $namespace::getInstance(); + } else { + $instance = new $namespace(); + } if (!($instance instanceof $interface)) { continue; @@ -237,6 +250,14 @@ public static function loadAttributes(): void } } + /** + * @param string $path + * @param string $fileName + * @param string $package + * @param string|null $name + * @param int $weight + * @return void + */ public static function createSimpleRoute(string $path, string $fileName, string $package, ?string $name = null, int $weight = 2): void { Router::getInstance()->get($path, function () use ($package, $fileName) { @@ -244,6 +265,17 @@ public static function createSimpleRoute(string $path, string $fileName, string }, $name, $weight); } + /** + * @param string $path + * @param Closure $callable + * @param int $weight + * @return void + */ + public static function createSimpleRouteCallable(string $path, Closure $callable, int $weight = 2): void + { + Router::getInstance()->get($path, $callable, $path, $weight); + } + public static function listAttributes(string $file): void { if (in_array($file, self::$fileLoadedAttr, true)) { diff --git a/App/Manager/Mail/MailManager.php b/App/Manager/Mail/MailManager.php index e0067fe4..e75bec18 100644 --- a/App/Manager/Mail/MailManager.php +++ b/App/Manager/Mail/MailManager.php @@ -60,10 +60,13 @@ public function sendMailSMTP(string $receiver, string $subject, string $body, ?s $mail->addAddress($receiver); $mail->addReplyTo($config?->getMailReply()); + $emailTemplate = $config?->getBody() ?? '[MAIL_CONTENT]'; + $finalBody = str_replace('[MAIL_CONTENT]', $body, $emailTemplate); + // Content $mail->isHTML(); $mail->Subject = $subject; - $mail->Body = $body . '' . $config?->getFooter(); + $mail->Body = $finalBody; // Send mail $status = $mail->send(); diff --git a/App/Manager/Package/AbstractEntity.php b/App/Manager/Package/AbstractEntity.php index 499d9712..e2a2f881 100644 --- a/App/Manager/Package/AbstractEntity.php +++ b/App/Manager/Package/AbstractEntity.php @@ -175,4 +175,17 @@ public function toArray(): array return $data; } + + /** + * @param static[] $data + * @return array + */ + public static function fromEntitiesToArray(array $data): array + { + $toReturn = []; + foreach ($data as $item) { + $toReturn[] = $item->toArray(); + } + return $toReturn; + } } diff --git a/App/Manager/Requests/Request.php b/App/Manager/Requests/Request.php index 6c795f60..55eb1163 100644 --- a/App/Manager/Requests/Request.php +++ b/App/Manager/Requests/Request.php @@ -7,19 +7,19 @@ class Request { private string $url; - private string $method; + private HttpMethodsType $method; private array $params; private array $data; private string $emitUrl; /** * @param string $url - * @param string $method + * @param HttpMethodsType $method * @param array $params * @param array $data * @param string $emitUrl */ - public function __construct(string $url, #[ExpectedValues(['GET', 'POST'])] string $method, array $params, + public function __construct(string $url, HttpMethodsType $method, array $params, array $data, string $emitUrl) { $this->url = $url; @@ -38,9 +38,9 @@ public function getUrl(): string } /** - * @return string + * @return HttpMethodsType */ - public function getMethod(): string + public function getMethod(): HttpMethodsType { return $this->method; } diff --git a/App/Manager/Router/Implementations/BaseRouterImplementation.php b/App/Manager/Router/Implementations/BaseRouterImplementation.php index 8fef2ee9..744f6094 100644 --- a/App/Manager/Router/Implementations/BaseRouterImplementation.php +++ b/App/Manager/Router/Implementations/BaseRouterImplementation.php @@ -63,7 +63,9 @@ public function weight(): int private function registerGetRoute(Link $link, ReflectionMethod $method): Route { return $this->get($link->getPath(), function (...$values) use ($method) { - $request = new Request(url: $this->url, method: 'GET', + $request = new Request( + url: $this->url, + method: HttpMethodsType::GET, params: $this->getRouteByUrl($this->url)?->getParams() ?? [], data: $_GET ?? [], emitUrl: $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); @@ -88,7 +90,7 @@ private function registerPostRoute(Link $link, ReflectionMethod $method): Route $request = new Request( url: $this->url, - method: 'POST', + method: HttpMethodsType::POST, params: $this->getRouteByUrl($this->url)?->getParams() ?? [], data: $_POST ?? [], emitUrl: $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], diff --git a/App/Manager/Router/Link.php b/App/Manager/Router/Link.php index 4ee3f867..fbdf7ca3 100644 --- a/App/Manager/Router/Link.php +++ b/App/Manager/Router/Link.php @@ -4,6 +4,7 @@ use JetBrains\PhpStorm\ExpectedValues; use Attribute; +use function str_contains; #[Attribute(Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)] class Link @@ -93,4 +94,13 @@ public function isSecure(): bool { return $this->secure; } + + /** + *
Check if the route contains 'cmw-admin'
+ * @return bool + */ + public function isAdmin(): bool + { + return str_contains($this->path, 'cmw-admin') || str_contains($this->scope, 'cmw-admin'); + } } diff --git a/App/Manager/Router/Request.php b/App/Manager/Router/Request.php new file mode 100644 index 00000000..c4cea77b --- /dev/null +++ b/App/Manager/Router/Request.php @@ -0,0 +1,64 @@ +method = HttpMethodsType::fromName($_SERVER['REQUEST_METHOD']); + $this->url = Website::getUrl(); + } + + /** + * @return HttpMethodsType + */ + public function getMethod(): HttpMethodsType + { + return $this->method; + } + + /** + * @return string + */ + public function getUrl(): string + { + return $this->url; + } + + /** + * @return array + */ + public function getHeaders(): array + { + if (empty($this->headers)) { + $this->headers = getallheaders(); + } + + return $this->headers; + } + + /** + * @param string $name + * @param string|null $defaultValue + * @return string|null + */ + public function getHeader(string $name, ?string $defaultValue = null): ?string + { + $headers = $this->getHeaders(); + $name = str_replace('-', '_', strtoupper($name)); + + return $headers[$name] ?? $defaultValue; + } + + +} \ No newline at end of file diff --git a/App/Manager/Security/HealthReport.php b/App/Manager/Security/HealthReport.php index 80a48358..274ff290 100644 --- a/App/Manager/Security/HealthReport.php +++ b/App/Manager/Security/HealthReport.php @@ -6,6 +6,7 @@ use CMW\Controller\Users\UsersSessionsController; use CMW\Manager\Database\DatabaseManager; use CMW\Manager\Env\EnvManager; +use CMW\Manager\Theme\Loader\ThemeLoader; use CMW\Manager\Theme\ThemeManager; use CMW\Manager\Updater\UpdatesManager; use CMW\Model\Core\CoreModel; @@ -60,8 +61,8 @@ public function generateReport(): string // Themes $themes = ''; - foreach (ThemeManager::getInstance()->getInstalledThemes() as $theme) { - $isActiveTheme = ThemeManager::getInstance()->getCurrentTheme()->name() === $theme->name(); + foreach (ThemeLoader::getInstance()->getInstalledThemes() as $theme) { + $isActiveTheme = ThemeLoader::getInstance()->getCurrentTheme()->name() === $theme->name(); $themes .= ' - ' . $theme->name() . ' @' . $theme->version(); diff --git a/App/Manager/Theme/Config/ThemeConfigResolver.php b/App/Manager/Theme/Config/ThemeConfigResolver.php new file mode 100644 index 00000000..115e465e --- /dev/null +++ b/App/Manager/Theme/Config/ThemeConfigResolver.php @@ -0,0 +1,124 @@ +getDefaultThemeValue($menuKey, $themeKey); + if (!$conf['theme_config_value'] || $conf['theme_config_value'] === $default) { + return EnvManager::getInstance()->getValue('PATH_SUBFOLDER') . "Public/Themes/{$themeName}/{$default}"; + } + return EnvManager::getInstance()->getValue('PATH_SUBFOLDER') . "Public/Uploads/{$themeName}/Img/{$conf['theme_config_value']}"; + } + return $conf['theme_config_value'] ?? "UNDEFINED_$themeConfigNameFormatted"; + } + } + + return null; + } + + /** + * Récupère la valeur par défaut d'une clé de thème depuis le fichier de configuration. + * + * @param string $MenuKey + * @param string $key + * @return string + */ + public function getDefaultThemeValue(string $MenuKey, string $key): string + { + $themeName = ThemeLoader::getInstance()->getCurrentTheme()->name(); + $configPath = EnvManager::getInstance()->getValue('DIR') . "Public/Themes/{$themeName}/Config/config.settings.php"; + + if (!file_exists($configPath)) { + return ''; + } + + $menus = include $configPath; + + foreach ($menus as $menu) { + if (isset($menu->requiredPackage) && !PackageController::isInstalled($menu->requiredPackage)) { + continue; + } + if ($menu->key === $MenuKey) { + foreach ($menu->values as $value) { + if ($value->themeKey === $key) { + return $value->defaultValue; + } + } + } + + } + return ''; + } + + /** + * @param string $menuKey + * @param string $themeKey + * @return string|null + */ + public function getEditorType(string $menuKey, string $themeKey): ?string + { + foreach (ThemeEditorProcessor::getInstance()->getThemeMenus() as $menu) { + if ($menu->getMenuKey() === $menuKey) { + foreach ($menu->values as $value) { + if ($value->themeKey === $themeKey) { + return $value->type; + } + } + } + } + + return null; + } + + /** + * @param string $menuKey + * @param string $themeKey + * @return EditorRangeOptions|null + */ + public function getEditorRangeOptions(string $menuKey, string $themeKey): ?EditorRangeOptions + { + + foreach (ThemeEditorProcessor::getInstance()->getThemeMenus() as $menu) { + if ($menu->key !== $menuKey) continue; + foreach ($menu->values as $val) { + if ($val->themeKey === $themeKey && isset($val->rangeOptions[0])) { + return $val->rangeOptions[0]; + } + } + } + return null; + } + + public function resolveImagePath(string $themeName, ?string $value, string $menuKey, string $themeKey): string + { + $default = $this->getDefaultThemeValue($menuKey, $themeKey); + $subfolder = EnvManager::getInstance()->getValue('PATH_SUBFOLDER'); + + if (!$value || $value === $default) { + return $subfolder . "Public/Themes/{$themeName}/{$default}"; + } + + return $subfolder . "Public/Uploads/{$themeName}/Img/{$value}"; + } +} \ No newline at end of file diff --git a/App/Manager/Theme/Config/ThemeMapper.php b/App/Manager/Theme/Config/ThemeMapper.php new file mode 100644 index 00000000..1cc18c68 --- /dev/null +++ b/App/Manager/Theme/Config/ThemeMapper.php @@ -0,0 +1,10 @@ +getValue('DIR') . "Public/Themes/$themeName/Config/config.settings.php"; + + if (!file_exists($configPath)) { + return []; + } + + $menus = include $configPath; + $flat = []; + + foreach ($menus as $menu) { + if (isset($menu->requiredPackage) && !PackageController::isInstalled($menu->requiredPackage)) { + continue; + } + + foreach ($menu->values as $value) { + $key = ThemeMapper::mapConfigKey($menu->key, $value->themeKey); + $flat[$key] = $value->defaultValue; + } + } + + return $flat; + } +} diff --git a/App/Manager/Theme/Editor/Entities/EditorMenu.php b/App/Manager/Theme/Editor/Entities/EditorMenu.php new file mode 100644 index 00000000..c9043f94 --- /dev/null +++ b/App/Manager/Theme/Editor/Entities/EditorMenu.php @@ -0,0 +1,72 @@ +title = $title; + $this->key = $key; + $this->scope = $scope; + $this->requiredPackage = $requiredPackage; + $this->values = $values; + } + + /** + * @return string + */ + public function getTitle(): string + { + return $this->title; + } + + /** + * @return string + */ + public function getMenuKey(): string + { + return $this->key; + } + + /** + * @return string|null + */ + public function getScope(): ?string + { + return $this->scope; + } + + /** + * @return string|null + */ + public function getRequiredPackage(): ?string + { + return $this->requiredPackage; + } + + /** + * @return \CMW\Manager\Theme\Editor\Entities\EditorValue[] + */ + public function getValues(): array + { + return $this->values; + } +} diff --git a/App/Manager/Theme/Editor/Entities/EditorRangeOptions.php b/App/Manager/Theme/Editor/Entities/EditorRangeOptions.php new file mode 100644 index 00000000..46addb01 --- /dev/null +++ b/App/Manager/Theme/Editor/Entities/EditorRangeOptions.php @@ -0,0 +1,71 @@ +min = $min; + $this->max = $max; + $this->step = $step; + $this->prefix = $prefix; + $this->suffix = $suffix; + } + + /** + * @return float + */ + public function getMin(): float + { + return $this->min; + } + + /** + * @return float + */ + public function getMax(): float + { + return $this->max; + } + + /** + * @return float + */ + public function getStep(): float + { + return $this->step; + } + + /** + * @return string|null + */ + public function getPrefix(): ?string + { + return $this->prefix; + } + + /** + * @return string|null + */ + public function getSuffix(): ?string + { + return $this->suffix; + } + +} diff --git a/App/Manager/Theme/Editor/Entities/EditorSelectOptions.php b/App/Manager/Theme/Editor/Entities/EditorSelectOptions.php new file mode 100644 index 00000000..f0d34499 --- /dev/null +++ b/App/Manager/Theme/Editor/Entities/EditorSelectOptions.php @@ -0,0 +1,31 @@ +value = $value; + $this->text = $text; + } + + public function getValue(): string + { + return $this->value; + } + + public function getText(): string + { + return $this->text; + } +} diff --git a/App/Manager/Theme/Editor/Entities/EditorType.php b/App/Manager/Theme/Editor/Entities/EditorType.php new file mode 100644 index 00000000..9646393c --- /dev/null +++ b/App/Manager/Theme/Editor/Entities/EditorType.php @@ -0,0 +1,18 @@ +title = $title; + $this->themeKey = $themeKey; + $this->defaultValue = $defaultValue; + $this->type = $type; + $this->selectOptions = $selectOptions; + $this->rangeOptions = $rangeOptions; + } + + /** + * @return string + */ + public function getTitle(): string + { + return $this->title; + } + + /** + * @return string + */ + public function getThemeKey(): string + { + return $this->themeKey; + } + + /** + * @return mixed + */ + public function getDefaultValue(): mixed + { + return $this->defaultValue; + } + + /** + * @return string + */ + public function getType(): string + { + return $this->type; + } + + /** + * @return EditorSelectOptions[] + */ + public function getSelectOptions(): array + { + return $this->selectOptions; + } + + /** + * @return EditorRangeOptions[] + */ + public function getRangeOptions(): array + { + return $this->rangeOptions; + } +} diff --git a/App/Manager/Theme/Editor/ThemeEditorProcessor.php b/App/Manager/Theme/Editor/ThemeEditorProcessor.php new file mode 100644 index 00000000..7051b8e2 --- /dev/null +++ b/App/Manager/Theme/Editor/ThemeEditorProcessor.php @@ -0,0 +1,389 @@ +loadHTML('' . $html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD); + + $xpath = new DOMXPath($dom); + + $this->processCmwVisible($xpath); + $this->processCmwText($xpath); + $this->processCmwStyle($xpath); + $this->processCmwClass($xpath); + $this->processCmwAttr($xpath); + $this->processCmwVar($xpath); + $this->processCmwStyleComments($xpath); + + return $dom->saveHTML(); + } + + /** + * @param \DOMXPath $xpath + * @return void + */ + private function processCmwVisible(DOMXPath $xpath): void + { + $elements = $xpath->query('//*[@data-cmw-visible]'); + foreach ($elements as $element) { + $data = $element->getAttribute('data-cmw-visible'); + + if (preg_match('/^([\w-]+):([\w-]+)$/', $data, $matches)) { + $menu = $matches[1]; + $key = $matches[2]; + $visible = ThemeModel::getInstance()->fetchConfigValue($menu, $key); + + if (!$visible || $visible === '0') { + $element->parentNode?->removeChild($element); + } else { + $element->removeAttribute('data-cmw-visible'); + } + } + } + } + + /** + * @param \DOMXPath $xpath + * @return void + */ + private function processCmwText(DOMXPath $xpath): void + { + $nodes = $xpath->query('//*[@data-cmw]'); + foreach ($nodes as $node) { + if (preg_match('/^([\w-]+):([\w-]+)$/', $node->getAttribute('data-cmw'), $m)) { + $menu = $m[1]; + $key = $m[2]; + $val = ThemeModel::getInstance()->fetchConfigValue($menu, $key); + $editorType = ThemeConfigResolver::getInstance()->getEditorType($menu, $key); + + while ($node->firstChild) { + $node->removeChild($node->firstChild); + } + + if ($editorType === EditorType::HTML) { + $tmpDoc = new DOMDocument(); + $tmpDoc->loadHTML('' . $val . '
', LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
+ foreach ($tmpDoc->documentElement->childNodes as $child) {
+ $node->appendChild($node->ownerDocument->importNode($child, true));
+ }
+ } else {
+ $node->appendChild($node->ownerDocument->createTextNode($val));
+ }
+
+ $node->removeAttribute('data-cmw');
+ }
+ }
+ }
+
+ /**
+ * @param \DOMXPath $xpath
+ * @return void
+ */
+ private function processCmwStyle(DOMXPath $xpath): void
+ {
+ $nodes = $xpath->query('//*[@data-cmw-style]');
+ foreach ($nodes as $node) {
+ $styleAttr = $node->getAttribute('style');
+ $existingStyles = [];
+
+ if ($styleAttr) {
+ foreach (explode(';', $styleAttr) as $styleLine) {
+ if (strpos($styleLine, ':') !== false) {
+ [$k, $v] = explode(':', $styleLine, 2);
+ $existingStyles[trim($k)] = trim($v);
+ }
+ }
+ }
+
+ $rules = explode(';', $node->getAttribute('data-cmw-style'));
+ foreach ($rules as $rule) {
+ if (count(explode(':', $rule)) === 3) {
+ [$prop, $menu, $key] = explode(':', $rule);
+
+ $val = ThemeModel::getInstance()->fetchConfigValue($menu, $key);
+ $editorType = ThemeConfigResolver::getInstance()->getEditorType($menu, $key);
+
+ if ($editorType === EditorType::RANGE) {
+ $opts = ThemeConfigResolver::getInstance()->getEditorRangeOptions($menu, $key);
+ $val = $opts->getPrefix() . $val . $opts->getSuffix();
+ }
+
+ if ($editorType === EditorType::IMAGE && in_array(trim($prop), ['background', 'background-image', 'list-style-image', 'mask-image'])) {
+ $val = "url('{$val}')";
+ }
+
+ $existingStyles[trim($prop)] = $val;
+ }
+ }
+
+ $finalStyle = implode('; ', array_map(fn($k, $v) => "$k: $v", array_keys($existingStyles), $existingStyles));
+ $node->setAttribute('style', $finalStyle);
+ $node->removeAttribute('data-cmw-style');
+ }
+ }
+
+ /**
+ * @param \DOMXPath $xpath
+ * @return void
+ */
+ private function processCmwClass(DOMXPath $xpath): void
+ {
+ $nodes = $xpath->query('//*[@data-cmw-class]');
+ foreach ($nodes as $node) {
+ $refs = explode(' ', $node->getAttribute('data-cmw-class'));
+
+ $dynamicClasses = [];
+ foreach ($refs as $ref) {
+ [$menu, $key] = explode(':', $ref);
+ $val = ThemeModel::getInstance()->fetchConfigValue($menu, $key);
+
+ $editorType = ThemeConfigResolver::getInstance()->getEditorType($menu, $key);
+ if ($editorType === EditorType::RANGE) {
+ $opts = ThemeConfigResolver::getInstance()->getEditorRangeOptions($menu, $key);
+ if ($opts instanceof EditorRangeOptions) {
+ $val = $opts->getPrefix() . $val . $opts->getSuffix();
+ }
+ }
+
+ if ($val) {
+ $dynamicClasses[] = trim($val);
+ }
+ }
+
+ $existingClasses = explode(' ', $node->getAttribute('class') ?? '');
+ $finalClasses = array_filter(array_merge($existingClasses, $dynamicClasses));
+ $node->setAttribute('class', implode(' ', $finalClasses));
+ $node->removeAttribute('data-cmw-class');
+ }
+ }
+
+ /**
+ * @param \DOMXPath $xpath
+ * @return void
+ */
+ private function processCmwAttr(DOMXPath $xpath): void
+ {
+ $nodes = $xpath->query('//*[@data-cmw-attr]');
+ foreach ($nodes as $node) {
+ $defs = explode(' ', $node->getAttribute('data-cmw-attr'));
+
+ foreach ($defs as $def) {
+ [$attr, $menu, $key] = explode(':', $def);
+ $val = ThemeModel::getInstance()->fetchConfigValue($menu, $key);
+ $node->setAttribute($attr, $val);
+ }
+
+ $node->removeAttribute('data-cmw-attr');
+ }
+ }
+
+ private function processCmwVar(DOMXPath $xpath): void
+ {
+ $nodes = $xpath->query('//*[@data-cmw-var]');
+ foreach ($nodes as $node) {
+ $defs = explode(' ', $node->getAttribute('data-cmw-var'));
+
+ foreach ($defs as $def) {
+ [$varName, $menu, $key] = explode(':', $def);
+ $val = ThemeModel::getInstance()->fetchConfigValue($menu, $key);
+ $node->setAttribute('style', $node->getAttribute('style') . "; $varName: $val");
+ }
+
+ $node->removeAttribute('data-cmw-var');
+ }
+ }
+
+ private function processCmwStyleComments(DOMXPath $xpath): void
+ {
+ $styleTags = $xpath->query('//style');
+
+ foreach ($styleTags as $styleTag) {
+ $css = $styleTag->textContent;
+
+ $css = preg_replace_callback('/\/\*cmw:([\w-]+):([\w-]+)\*\//', function ($matches) {
+ [$full, $menu, $key] = $matches;
+ $val = ThemeModel::getInstance()->fetchConfigValue($menu, $key);
+
+ $editorType = ThemeConfigResolver::getInstance()->getEditorType($menu, $key);
+
+ if ($editorType === EditorType::RANGE) {
+ $opts = ThemeConfigResolver::getInstance()->getEditorRangeOptions($menu, $key);
+ $val = $opts->getPrefix() . $val . $opts->getSuffix();
+ }
+
+ return $val . " /*cmw:$menu:$key*/";
+ }, $css);
+
+ $styleTag->textContent = $css;
+ }
+ }
+
+
+ /**
+ * @return EditorMenu[]
+ */
+ public function getThemeMenus(): array
+ {
+ $themeName = ThemeLoader::getInstance()->getCurrentTheme()->name();
+
+ $configPath = EnvManager::getInstance()->getValue('DIR') . "Public/Themes/$themeName/Config/config.settings.php";
+
+ if (!file_exists($configPath)) {
+ return [];
+ }
+
+ $menus = include $configPath;
+
+ return array_filter($menus, function ($menu) {
+ return !isset($menu->requiredPackage) || PackageController::isInstalled($menu->requiredPackage);
+ });
+ }
+
+ /**
+ * @param $value
+ * @param $menuKey
+ * @param $val
+ * @return string
+ * @description render input by EditorType in builder menu
+ */
+ public function renderInput($value, $menuKey, $val) :string
+ {
+ $inputName = ThemeMapper::mapConfigKey($menuKey, $value->themeKey);
+ $inputId = htmlspecialchars($value->themeKey);
+ $label = htmlspecialchars($value->title);
+ $valEscaped = htmlspecialchars($val);
+
+ switch ($value->type) {
+ case 'color':
+ return <<{$label}
+
+HTML;
+
+ case 'number':
+ return <<{$label}
+
+HTML;
+
+ case 'text':
+ return <<{$label}
+
+HTML;
+
+ case 'html':
+ return <<{$label}
+
+
+
+HTML;
+
+
+ case 'faPicker':
+ return <<
+HTML;
+
+ case 'textarea':
+ case 'css':
+ return <<{$label}
+
+HTML;
+
+ case 'boolean':
+ $checked = ($val === "1" || ($val === null && $value->defaultValue === "1")) ? "checked" : "";
+ return <<
+ {$valEscaped}
+{$label}
+ + + +HTML; + + case 'select': + $optionsHtml = ''; + foreach ($value->selectOptions ?? [] as $option) { + $selected = ($val === $option->value || ($val === null && $value->defaultValue === $option->value)) ? 'selected' : ''; + $optVal = htmlspecialchars($option->value); + $optText = htmlspecialchars($option->text); + $optionsHtml .= ""; + } + return <<{$label} + +HTML; + + case 'image': + return <<{$label} + +HTML; + + case 'range': + $range = $value->rangeOptions[0] ?? null; + + if (!$range) { + return ''; // si mal configuré + } + + $min = $range->getMin(); + $max = $range->getMax(); + $step = $range->getStep(); + $prefix = htmlspecialchars($range->getPrefix()); + $suffix = htmlspecialchars($range->getSuffix()); + + return <<{$label} ({$prefix}{$valEscaped}{$suffix}) + +
+
+
+HTML;
+
+
+ default:
+ return <<{$label}
+
+HTML;
+ }
+ }
+}
\ No newline at end of file
diff --git a/App/Manager/Theme/File/ThemeFileManager.php b/App/Manager/Theme/File/ThemeFileManager.php
new file mode 100644
index 00000000..e007edca
--- /dev/null
+++ b/App/Manager/Theme/File/ThemeFileManager.php
@@ -0,0 +1,131 @@
+getValue('PATH_SUBFOLDER') . 'Admin/Resources/Assets/Img/local-theme.jpg';
+ }
+
+ /**
+ * @param string $theme
+ * @return void
+ * @desc Apply the settings of a theme and overwrite existing values.
+ */
+ public function installThemeSettings(string $theme): void
+ {
+ $themeConfigFile = "Public/Themes/$theme/Config/config.settings.php";
+
+ if (!file_exists($themeConfigFile)) {
+ return;
+ }
+
+ $menus = include $themeConfigFile;
+
+ foreach ($menus as $menu) {
+ if (!($menu instanceof EditorMenu)) {
+ continue;
+ }
+
+ foreach ($menu->values as $value) {
+ if (!($value instanceof EditorValue)) {
+ continue;
+ }
+
+ $configKey = ThemeMapper::mapConfigKey($menu->key, $value->themeKey);
+ $defaultValue = $value->defaultValue;
+
+ ThemeModel::getInstance()->storeThemeConfig($configKey, $defaultValue, $theme);
+ }
+ }
+ }
+
+ /**
+ * @param string $theme
+ * @return void
+ * @desc Update the settings of a theme without overwriting existing values.
+ */
+ public function updateThemeSettings(string $theme): void
+ {
+ $themeConfigFile = "Public/Themes/$theme/Config/config.settings.php";
+
+ if (!file_exists($themeConfigFile)) {
+ return;
+ }
+
+ $menus = include $themeConfigFile;
+
+ $existingKeys = ThemeModel::getInstance()->getExistingThemeConfigKeys($theme);
+
+
+ foreach ($menus as $menu) {
+ if (!($menu instanceof EditorMenu)) {
+ continue;
+ }
+
+ foreach ($menu->values as $value) {
+ if (!($value instanceof EditorValue)) {
+ continue;
+ }
+
+ $configKey = ThemeMapper::mapConfigKey($menu->key, $value->themeKey);
+
+ $newConfigs = [];
+
+ if (!in_array($configKey, $existingKeys, true)) {
+ $newConfigs[] = [
+ 'name' => $configKey,
+ 'value' => $value->defaultValue
+ ];
+ }
+ }
+ }
+ if (!empty($newConfigs)) {
+ ThemeModel::getInstance()->storeThemeConfigBulk($newConfigs, $theme);
+ }
+ }
+
+ /**
+ * @param string $name
+ * @return UninstallThemeType
+ * @desc Completely uninstall a local theme (delete files and database)
+ */
+ public static function uninstallLocalTheme(string $name): UninstallThemeType
+ {
+ if (!ThemeLoader::getInstance()->isLocalThemeExist($name)) {
+ return UninstallThemeType::ERROR_THEME_NOT_FOUND;
+ }
+
+ //Prevent default theme uninstallation
+ if ($name === ThemeManager::$defaultThemeName) {
+ return UninstallThemeType::ERROR_THEME_IS_DEFAULT;
+ }
+
+ // Uninstall DB
+ $configPdo = ThemeModel::getInstance()->getInstance()->transactionalDeleteThemeConfig($name);
+
+ // Uninstall files
+ if (!Directory::delete(EnvManager::getInstance()->getValue('DIR') . "Public/Themes/$name")) {
+ $configPdo->rollBack();
+ return UninstallThemeType::ERROR_THEME_DELETE_FILES;
+ }
+
+ //If all is good, we commit the transaction
+ $configPdo->commit();
+
+ return UninstallThemeType::SUCCESS;
+ }
+}
\ No newline at end of file
diff --git a/App/Manager/Theme/Loader/ThemeLoader.php b/App/Manager/Theme/Loader/ThemeLoader.php
new file mode 100644
index 00000000..e6649380
--- /dev/null
+++ b/App/Manager/Theme/Loader/ThemeLoader.php
@@ -0,0 +1,96 @@
+getValue('INSTALLSTEP') !== '-1';
+
+ if (!$isInstallation) {
+ $currentThemeName = CoreModel::getInstance()->fetchOption('Theme');
+ }
+
+ if (!$this::getInstance()->isLocalThemeExist($currentThemeName)) {
+ (new ThemeNotFoundException($currentThemeName))->invokeErrorPage();
+ }
+
+ return $this::getInstance()->getTheme($currentThemeName);
+ }
+
+ /**
+ * @param string $themeName
+ * @return IThemeConfig|null
+ */
+ public function getTheme(string $themeName): ?IThemeConfig
+ {
+ $namespace = 'CMW\\Theme\\' . $themeName . '\Theme';
+
+ if (!class_exists($namespace)) {
+ return null;
+ }
+
+ $classInstance = new $namespace();
+
+ if (!is_subclass_of($classInstance, IThemeConfig::class)) {
+ return null;
+ }
+
+ return $classInstance;
+ }
+
+ /**
+ * @return IThemeConfig[]
+ */
+ public function getInstalledThemes(): array
+ {
+ $toReturn = [];
+ $themesFolder = 'Public/Themes';
+ $themeDirs = Directory::getFolders($themesFolder);
+
+ foreach ($themeDirs as $theme) {
+ $themeFile = "$themesFolder/$theme/Theme.php";
+ if (file_exists($themeFile) && !empty(file_get_contents($themeFile))) {
+ $toReturn[] = $this->getTheme($theme);
+ }
+ }
+
+ return $toReturn;
+ }
+
+
+ /**
+ * @param string $theme
+ * @return bool
+ */
+ public function isThemeInstalled(string $theme): bool
+ {
+ foreach ($this->getInstalledThemes() as $installedTheme) {
+ if ($theme === $installedTheme->name()) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * @param string $name
+ * @return bool
+ */
+ public function isLocalThemeExist(string $name): bool
+ {
+ return file_exists("Public/Themes/$name/Theme.php");
+ }
+
+}
\ No newline at end of file
diff --git a/App/Manager/Theme/Market/ThemeMarketManager.php b/App/Manager/Theme/Market/ThemeMarketManager.php
new file mode 100644
index 00000000..169dde7a
--- /dev/null
+++ b/App/Manager/Theme/Market/ThemeMarketManager.php
@@ -0,0 +1,44 @@
+getInstalledThemes();
+
+ $marketThemesName = [];
+
+ foreach ($this->getMarketThemes() as $marketTheme):
+ $marketThemesName[] = $marketTheme['name'];
+ endforeach;
+
+ foreach ($installedThemes as $installedTheme):
+ if (!in_array($installedTheme->name(), $marketThemesName, true)):
+ $toReturn[] = $installedTheme;
+ endif;
+ endforeach;
+
+ return $toReturn;
+ }
+}
\ No newline at end of file
diff --git a/App/Manager/Theme/ThemeManager.php b/App/Manager/Theme/ThemeManager.php
index 233f4eb6..24165c64 100644
--- a/App/Manager/Theme/ThemeManager.php
+++ b/App/Manager/Theme/ThemeManager.php
@@ -2,116 +2,32 @@
namespace CMW\Manager\Theme;
-use CMW\Manager\Api\PublicAPI;
-use CMW\Manager\Env\EnvManager;
use CMW\Manager\Manager\AbstractManager;
-use CMW\Manager\Theme\Exceptions\ThemeNotFoundException;
-use CMW\Model\Core\CoreModel;
-use CMW\Model\Core\ThemeModel;
-use CMW\Utils\Directory;
+use CMW\Manager\Theme\Loader\ThemeLoader;
class ThemeManager extends AbstractManager
{
public static string $defaultThemeName = "Sampler";
- public function defaultImageLink(): string
- {
- return EnvManager::getInstance()->getValue('PATH_SUBFOLDER') . 'Admin/Resources/Assets/Img/local-theme.jpg';
- }
-
- public function getCurrentTheme(): IThemeConfig
- {
- $currentThemeName = self::$defaultThemeName;
- $isInstallation = EnvManager::getInstance()->getValue('INSTALLSTEP') !== '-1';
-
- if (!$isInstallation) {
- $currentThemeName = CoreModel::getInstance()->fetchOption('Theme');
- }
- if (!$this->isLocalThemeExist($currentThemeName)) {
- (new ThemeNotFoundException($currentThemeName))->invokeErrorPage();
- }
- return $this->getTheme($currentThemeName);
- }
-
- /**
- * @param string $themeName
- * @return IThemeConfig|null
- */
- public function getTheme(string $themeName): ?IThemeConfig
- {
- $namespace = 'CMW\\Theme\\' . $themeName . '\Theme';
- if (!class_exists($namespace)) {
- return null;
- }
- $classInstance = new $namespace();
- if (!is_subclass_of($classInstance, IThemeConfig::class)) {
- return null;
- }
- return $classInstance;
- }
- /**
- * @return IThemeConfig[]
- */
- public function getInstalledThemes(): array
- {
- $toReturn = [];
- $themesFolder = 'Public/Themes';
- $contentDirectory = array_diff(scandir("$themesFolder/"), ['..', '.']);
- foreach ($contentDirectory as $theme) {
- if (file_exists("$themesFolder/$theme/Theme.php") && !empty(file_get_contents("$themesFolder/$theme/Theme.php"))) {
- $toReturn[] = $this->getTheme($theme);
- }
- }
- return $toReturn;
- }
-
- /**
- * @return IThemeConfig[]
- * @desc Return all themes local (remove thème get from the public market)
- */
- public function getLocalThemes(): array
- {
- $toReturn = [];
- $installedThemes = $this->getInstalledThemes();
-
- $marketThemesName = [];
-
- foreach ($this->getMarketThemes() as $marketTheme):
- $marketThemesName[] = $marketTheme['name'];
- endforeach;
-
- foreach ($installedThemes as $installedTheme):
- if (!in_array($installedTheme->name(), $marketThemesName, true)):
- $toReturn[] = $installedTheme;
- endif;
- endforeach;
-
- return $toReturn;
- }
-
- /**
- * @return void
- */
- public function getCurrentThemeConfigFile(): void
- {
- $themeConfigFile = 'Public/Themes/' . $this->getCurrentTheme()->name() . '/Config/config.php';
- require_once $themeConfigFile;
- }
+ /*
+ * deprecated and unused method waiting for deletion
+ * */
/**
* @return array
+ * @deprecated Sera supprimé en alpha-10 remplacé par : getFlattenedThemeConfigSettings
*/
public function getCurrentThemeConfigSettings(): array
{
- $themeConfigFile = 'Public/Themes/' . $this->getCurrentTheme()->name() . '/Config/config.settings.php';
+ $themeConfigFile = 'Public/Themes/' . ThemeLoader::getInstance()->getCurrentTheme()->name() . '/Config/config.settings.php';
if (!file_exists($themeConfigFile)) {
return [];
@@ -130,92 +46,10 @@ public function getCurrentThemeConfigSettings(): array
* @param string $setting
* @return ?string
* @Desc Return a specific local setting
+ * @deprecated Sera supprimé en alpha-10. La methode est utilisée dans des méthodes dépréciées
*/
public function getCurrentThemeConfigSetting(string $setting): ?string
{
return $this->getCurrentThemeConfigSettings()[$setting] ?? null;
}
-
- /**
- * @param string $theme
- * @return bool
- */
- public function isThemeInstalled(string $theme): bool
- {
- foreach ($this->getInstalledThemes() as $installedTheme) {
- if ($theme === $installedTheme->name()) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * @param string $theme
- * @return void
- */
- public function installThemeSettings(string $theme): void
- {
- $themeConfigFile = "Public/Themes/$theme/Config/config.settings.php";
-
- if (!file_exists($themeConfigFile)) {
- return;
- }
-
- $content = include $themeConfigFile;
-
- foreach ($content as $config => $value) {
- ThemeModel::getInstance()->getInstance()->storeThemeConfig($config, $value, $theme);
- }
- }
-
- /**
- * @return array
- * @desc Return the list of public thèmes from our market
- */
- public function getMarketThemes(): array
- {
- return PublicAPI::getData('market/resources/filtered/0');
- }
-
- /**
- * @param string $name
- * @return bool
- */
- public function isLocalThemeExist(string $name): bool
- {
- return file_exists("Public/Themes/$name/Theme.php");
- }
-
- /**
- * @param string $name
- * @return UninstallThemeType
- * @desc Completely uninstall a local theme (delete files and database)
- */
- public function uninstallLocalTheme(string $name): UninstallThemeType
- {
- if (!$this->isLocalThemeExist($name)) {
- return UninstallThemeType::ERROR_THEME_NOT_FOUND;
- }
-
- //Prevent default theme uninstallation
- if ($name === self::$defaultThemeName) {
- return UninstallThemeType::ERROR_THEME_IS_DEFAULT;
- }
-
- // Uninstall DB
- $configPdo = ThemeModel::getInstance()->getInstance()->transactionalDeleteThemeConfig($name);
-
- // Uninstall files
- if (!Directory::delete(EnvManager::getInstance()->getValue('DIR') . "Public/Themes/$name")) {
- $configPdo->rollBack();
- return UninstallThemeType::ERROR_THEME_DELETE_FILES;
- }
-
- //If all is good, we commit the transaction
- $configPdo->commit();
-
- return UninstallThemeType::SUCCESS;
- }
}
diff --git a/App/Manager/Updater/CMSUpdaterManager.php b/App/Manager/Updater/CMSUpdaterManager.php
index a8b6674a..cc4530c6 100644
--- a/App/Manager/Updater/CMSUpdaterManager.php
+++ b/App/Manager/Updater/CMSUpdaterManager.php
@@ -8,13 +8,25 @@
use CMW\Manager\Flash\Alert;
use CMW\Manager\Flash\Flash;
use CMW\Manager\Lang\LangManager;
+use CMW\Manager\Manager\AbstractManager;
+use CMW\Utils\Directory;
+use CMW\Utils\Log;
use JsonException;
use ZipArchive;
-class CMSUpdaterManager
+class CMSUpdaterManager extends AbstractManager
{
- private static string $archivePath = 'Public/Uploads/cmw.zip';
- private static string $archiveUpdatePath = 'Public/Uploads/update.zip';
+ private readonly string $archivePath;
+ private readonly string $archiveUpdatePath;
+
+ private readonly string $dir;
+
+ public function __construct()
+ {
+ $this->dir = EnvManager::getInstance()->getValue('DIR');
+ $this->archivePath = $this->dir . 'Public/Uploads/cmw.zip';
+ $this->archiveUpdatePath = $this->dir . 'Public/Uploads/update.zip';
+ }
/**
* @param array $updateData
@@ -80,8 +92,7 @@ private function downloadUpdateFile(mixed $data): ?bool
return null;
}
- if (!file_put_contents(EnvManager::getInstance()->getValue('DIR') . self::$archivePath,
- fopen($data, 'rb'))) {
+ if (!file_put_contents($this->archivePath, fopen($data, 'rb'))) {
return false;
}
return true;
@@ -93,18 +104,27 @@ private function downloadUpdateFile(mixed $data): ?bool
*/
private function prepareArchive(): bool
{
+ $isInstallationFolderExist = is_dir($this->dir . 'Installation');
+
$archiveUpdate = new ZipArchive;
- if ($archiveUpdate->open(EnvManager::getInstance()->getValue('DIR') . self::$archivePath) === TRUE) {
- $archiveUpdate->extractTo(EnvManager::getInstance()->getValue('DIR') . 'Public/Uploads/');
+
+ if ($archiveUpdate->open($this->archivePath) === TRUE) {
+ $extractPath = $this->dir . 'Public/Uploads/';
+ $archiveUpdate->extractTo($extractPath);
$archiveUpdate->close();
// Delete download archive
- unlink(EnvManager::getInstance()->getValue('DIR') . self::$archivePath);
+ unlink($this->archivePath);
+
+ // Remove Installation files in Updated if the website doesn't use it
+ if (!$isInstallationFolderExist) {
+ $this->removeInstallationFolder($extractPath . 'Installation');
+ }
- if ($archiveUpdate->open(EnvManager::getInstance()->getValue('DIR') . self::$archiveUpdatePath) === TRUE) {
- $archiveUpdate->extractTo(EnvManager::getInstance()->getValue('DIR'));
+ if ($archiveUpdate->open($this->archiveUpdatePath) === TRUE) {
+ $archiveUpdate->extractTo($this->dir);
$archiveUpdate->close();
// Delete download archive
- unlink(EnvManager::getInstance()->getValue('DIR') . self::$archiveUpdatePath);
+ unlink($this->archiveUpdatePath);
return true;
}
return false;
@@ -112,13 +132,25 @@ private function prepareArchive(): bool
return false;
}
+ /**
+ * @param string $installationPath
+ * @return void
+ * @desc Remove the Installation folder if exists
+ */
+ private function removeInstallationFolder(string $installationPath): void
+ {
+ if (is_dir($installationPath)) {
+ Directory::delete($installationPath);
+ }
+ }
+
/**
* @return bool
* @desc Delete files, based on delete_files.json
*/
private function deletedFiles(): bool
{
- $filePath = EnvManager::getInstance()->getValue('DIR') . 'Public/Uploads/delete_files.json';
+ $filePath = $this->dir . 'Public/Uploads/delete_files.json';
if (!file_exists($filePath)) {
return true;
@@ -130,7 +162,7 @@ private function deletedFiles(): bool
$json = json_decode($deletedFiles, true, 512, JSON_THROW_ON_ERROR);
foreach ($json as $file) {
- if (!unlink(EnvManager::getInstance()->getValue('DIR') . $file)) {
+ if (!unlink($this->dir . $file)) {
Flash::send(Alert::ERROR, LangManager::translate('core.toaster.error'),
LangManager::translate('core.updates.errors.deleteFile', ['file' => $file]));
}
@@ -148,7 +180,7 @@ private function deletedFiles(): bool
*/
private function sqlUpdate(): bool
{
- $filePath = EnvManager::getInstance()->getValue('DIR') . 'Public/Uploads/sql_update.sql';
+ $filePath = $this->dir . 'Public/Uploads/sql_update.sql';
if (!file_exists($filePath)) {
return true;
diff --git a/App/Manager/Views/IView.php b/App/Manager/Views/IView.php
new file mode 100644
index 00000000..c772d882
--- /dev/null
+++ b/App/Manager/Views/IView.php
@@ -0,0 +1,50 @@
+package = $package;
+ $this->viewFile = $viewFile;
+ $this->includes = $this->generateInclude();
+ $this->variables = [];
+ $this->needAdminControl = false;
+ $this->isAdminFile = $isAdminFile;
+ $this->isPublicView = false;
+ $this->themeName = ThemeLoader::getInstance()->getCurrentTheme()->name();
+ $this->overrideBackendMode = false;
+ }
+
+ public function weight(): int
+ {
+ return 1;
+ }
+
+ public static function getInstance(): self
+ {
+ if (!isset(self::$_instance)) {
+ self::$_instance = new self();
+ }
+
+ return self::$_instance;
+ }
+
+
+ public function setPackage(string $package): static
+ {
+ $this->package = $package;
+ return $this;
+ }
+
+ public function setViewFile(string $viewFile): static
+ {
+ $this->viewFile = $viewFile;
+ return $this;
+ }
+
+ public function needAdminControl(bool $needAdminControl = true): static
+ {
+ $this->needAdminControl = $needAdminControl;
+ return $this;
+ }
+
+ public function setAdminView(bool $isAdminFile = true): static
+ {
+ $this->isAdminFile = $isAdminFile;
+ return $this;
+ }
+
+ public function addVariable(string $variableName, mixed $variable): static
+ {
+ $this->variables[$variableName] = $variable;
+ return $this;
+ }
+
+ public function addVariableList(array $variableList): static
+ {
+ foreach ($variableList as $key => $value) {
+ $this->addVariable($key, $value);
+ }
+ return $this;
+ }
+
+ public function addScriptBefore(string ...$script): static
+ {
+ foreach ($script as $s) {
+ $this->includes['scripts']['before'][] = $s;
+ }
+ return $this;
+ }
+
+ public function addScriptAfter(string ...$script): static
+ {
+ foreach ($script as $s) {
+ $this->includes['scripts']['after'][] = $s;
+ }
+ return $this;
+ }
+
+ public function addPhpBefore(string ...$php): static
+ {
+ foreach ($php as $p) {
+ $this->includes['php']['before'][] = $p;
+ }
+ return $this;
+ }
+
+ public function addPhpAfter(string ...$php): static
+ {
+ foreach ($php as $p) {
+ $this->includes['php']['after'][] = $p;
+ }
+ return $this;
+ }
+
+ public function addStyle(string ...$style): static
+ {
+ foreach ($style as $s) {
+ $this->includes['styles'][] = $s;
+ }
+ return $this;
+ }
+
+ public function setCustomPath(string $path): static
+ {
+ $this->customPath = $path;
+ return $this;
+ }
+
+ public function setCustomTemplate(string $path): static
+ {
+ $this->customTemplate = $path;
+ return $this;
+ }
+
+ public function setOverrideBackendMode(bool $overrideBackendMode): static
+ {
+ $this->overrideBackendMode = $overrideBackendMode;
+ return $this;
+ }
+
+ /**
+ * @param array $includes
+ * @param string ...$files
+ * @return void
+ */
+ public static function loadInclude(array $includes, #[ExpectedValues(flags: ['beforeScript', 'afterScript', 'beforePhp', 'afterPhp', 'styles'])] string ...$files): void
+ {
+ foreach ($files as $file) {
+ self::loadIncludeFile($includes, $file);
+ }
+ }
+
+ /**
+ * @param string $package
+ * @param string $viewFile
+ * @return void
+ * @throws RouterException
+ */
+ public function basicPublicView(string $package, string $viewFile): void
+ {
+ $view = new self($package, $viewFile);
+ $view->view();
+ }
+
+ /**
+ * @param string $package
+ * @param string $viewFile
+ * @return self
+ */
+ public function createPublicView(string $package, string $viewFile): self
+ {
+ $view = new self($package, $viewFile);
+
+ $view->isPublicView = true;
+
+ return $view;
+ }
+
+ /**
+ * @param string $package
+ * @param string $viewFile
+ * @return self
+ */
+ public static function createAdminView(string $package, string $viewFile): self
+ {
+ $view = new self($package, $viewFile);
+
+ $view->setAdminView()->needAdminControl();
+
+ return $view;
+ }
+
+ /**
+ * @throws RouterException
+ */
+ public function view(): void
+ {
+ // Check admin permissions
+ if ($this->needAdminControl) {
+ UsersController::redirectIfNotHavePermissions('core.dashboard');
+ }
+
+ extract($this->variables);
+ $includes = $this->includes;
+
+ //Backend mode view logic
+ $this->backendView();
+
+ if (is_null($this->customPath) && Utils::containsNullValue($this->package, $this->viewFile)) {
+ throw new RouterException('Invalid View usage. Please set a correct path.', 404);
+ }
+
+ $path = $this->getViewPath();
+
+ if (!is_file($path)) {
+ throw new RouterException(null, 404);
+ }
+
+ //Load Elements
+ ComponentsManager::getInstance()->loadThemeComponents($this->themeName);
+
+ ob_start();
+ require_once $path;
+ echo $this->callAlerts();
+ if ($this->isPublicView) {
+ $content = ob_get_clean();
+ $editorMode = isset($_GET['editor']) && $_GET['editor'] == '1';
+ $content = ThemeEditorProcessor::getInstance()->replaceThemeValues($content, $editorMode);
+
+ // bufferisation de template pour la gestion de replaceThemeValue
+ ob_start();
+ require_once($this->getTemplateFile());
+ $templateContent = ob_get_clean();
+ $templateContent = ThemeEditorProcessor::getInstance()->replaceThemeValues($templateContent, $editorMode);
+ echo $templateContent;
+ } else {
+ $content = ob_get_clean();
+ require_once($this->getTemplateFile());
+ }
+ }
+
+ /**
+ * @param array $includes
+ * @param string $fileType
+ * @return void
+ */
+ private static function loadIncludeFile(array $includes, #[ExpectedValues(['beforeScript', 'afterScript', 'beforePhp', 'afterPhp', 'styles'])] string $fileType): void
+ {
+ if (!in_array($fileType, ['beforeScript', 'afterScript', 'beforePhp', 'afterPhp', 'styles'])) {
+ return;
+ }
+
+ // STYLES
+ if ($fileType === 'styles') {
+ foreach ($includes['styles'] as $style) {
+ $styleLink = EnvManager::getInstance()->getValue('PATH_SUBFOLDER') . $style;
+ echo <<
+ HTML;
+ }
+ }
+
+ // SCRIPTS
+ if (in_array($fileType, ['beforeScript', 'afterScript'])) {
+ $arrayAccessJs = $fileType === 'beforeScript' ? 'before' : 'after';
+ foreach ($includes['scripts'][$arrayAccessJs] as $script) {
+ $scriptLink = EnvManager::getInstance()->getValue('PATH_SUBFOLDER') . $script;
+ echo <<
+ HTML;
+ }
+ }
+
+ // PHP
+ if (in_array($fileType, ['beforePhp', 'afterPhp'])) {
+ $arrayAccessPhp = $fileType === 'beforePhp' ? 'before' : 'after';
+ foreach ($includes['php'][$arrayAccessPhp] as $php) {
+ $phpLink = EnvManager::getInstance()->getValue('DIR') . $php;
+ include_once $phpLink;
+ }
+ }
+ }
+
+ /**
+ * @return array|array[]
+ */
+ #[ArrayShape(['styles' => 'array', 'scripts' => 'array', 'php' => 'array'])]
+ private function generateInclude(): array
+ {
+ $array = ['styles' => [], 'scripts' => [], 'array' => []];
+
+ $array['scripts']['before'] = [];
+ $array['scripts']['after'] = [];
+
+ $array['php']['before'] = [];
+ $array['php']['after'] = [];
+
+ return $array;
+ }
+
+ /**
+ * @return string
+ */
+ private function getTemplateFile(): string
+ {
+ if ($this->customTemplate !== null) {
+ return $this->customTemplate;
+ }
+
+ return ($this->isAdminFile)
+ ? EnvManager::getInstance()->getValue('PATH_ADMIN_VIEW') . 'template.php'
+ : "Public/Themes/$this->themeName/Views/template.php";
+ }
+
+ /**
+ * @throws RouterException
+ */
+ private function callAlerts(): string
+ {
+ $alerts = Flash::load();
+ $alertContent = '';
+ foreach ($alerts as $alert) {
+ if (!$alert->isAdmin()) {
+ $view = new self('Core', 'Alerts/' . $alert->getType());
+ } else {
+ $view = new self('Core', 'Alerts/' . $alert->getType(), true);
+ }
+ $view->addVariable('alert', $alert);
+ $alertContent .= $view->loadFile();
+ }
+ Flash::clear();
+ return $alertContent;
+ }
+
+ /**
+ * @throws RouterException
+ */
+ public function loadFile(): string
+ {
+ $path = $this->getViewPath();
+
+ if (!is_file($path)) {
+ throw new RouterException(null, 404);
+ }
+
+ extract($this->variables);
+ $includes = $this->includes;
+
+ ob_start();
+ require($path);
+ return ob_get_clean();
+ }
+
+ /**
+ * @return string
+ */
+ private function getViewPath(): string
+ {
+ if ($this->customPath !== null) {
+ return $this->customPath;
+ }
+
+ if ($this->isAdminFile) {
+ return "App/Package/$this->package/Views/$this->viewFile.admin.view.php";
+ }
+
+ $publicPath = "Public/Themes/$this->themeName/Views/$this->package/$this->viewFile.view.php";
+
+ if (is_file($publicPath)) {
+ return $publicPath;
+ }
+
+ $this->isPublicView = true;
+ return "App/Package/$this->package/Public/$this->viewFile.view.php";
+ }
+
+
+ /**
+ * @return void
+ * @desc Return the view data if the backend mode is enabled
+ */
+ private function backendView(): void
+ {
+ $isBackendModeEnabled = EnvManager::getInstance()->getValue('ENABLE_BACKEND_MODE') === 'true';
+
+ if ($this->overrideBackendMode) {
+ return;
+ }
+
+ if ($isBackendModeEnabled && !$this->needAdminControl) {
+ print_r(
+ APIManager::createResponse(
+ data: [
+ 'package' => $this->package,
+ 'viewFile' => $this->viewFile,
+ 'viewFilePath' => $this->getViewPath(),
+ 'variables' => $this->variables,
+ 'includes' => $this->includes,
+ ],
+ )
+ );
+ die();
+ }
+ }
+}
\ No newline at end of file
diff --git a/App/Manager/Views/View.php b/App/Manager/Views/View.php
index 1f4eb795..6df94cd5 100644
--- a/App/Manager/Views/View.php
+++ b/App/Manager/Views/View.php
@@ -2,36 +2,14 @@
namespace CMW\Manager\Views;
-use CMW\Controller\Users\UsersController;
-use CMW\Manager\Api\APIManager;
-use CMW\Manager\Components\ComponentsManager;
-use CMW\Manager\Env\EnvManager;
-use CMW\Manager\Flash\Flash;
-use CMW\Manager\Router\RouterException;
-use CMW\Manager\Theme\ThemeManager;
-use CMW\Utils\Utils;
-use JetBrains\PhpStorm\ArrayShape;
+use CMW\Manager\Loader\Loader;
+use CMW\Manager\Views\Implementations\BaseViewImplementation;
use JetBrains\PhpStorm\ExpectedValues;
-use function extract;
-use function in_array;
-use function is_file;
-use function is_null;
-use function ob_get_clean;
-use function ob_start;
-use function print_r;
+use function array_reduce;
class View
{
- private ?string $package;
- private ?string $viewFile;
- private ?string $customPath = null;
- private ?string $customTemplate = null;
- private array $includes;
- private array $variables;
- private bool $needAdminControl;
- private bool $isAdminFile;
- private string $themeName;
- private bool $overrideBackendMode;
+ private static ?IView $_instance = null;
/**
* @param string|null $package
@@ -40,381 +18,198 @@ class View
*/
public function __construct(?string $package = null, ?string $viewFile = null, ?bool $isAdminFile = false)
{
- $this->package = $package;
- $this->viewFile = $viewFile;
- $this->includes = $this->generateInclude();
- $this->variables = [];
- $this->needAdminControl = false;
- $this->isAdminFile = $isAdminFile;
- $this->themeName = ThemeManager::getInstance()->getCurrentTheme()->name();
- $this->overrideBackendMode = false;
+ $instance = self::getInstance();
+
+ $instance->setPackage($package);
+ $instance->setViewFile($viewFile);
+ $instance->setAdminView($isAdminFile);
}
- /**
- * @param string $package
- * @param string $viewFile
- * @return void
- * @throws RouterException
- */
- public static function basicPublicView(string $package, string $viewFile): void
+ public static function getInstance(): IView
{
- $view = new self($package, $viewFile);
- $view->view();
+ if (self::$_instance === null) {
+ self::$_instance = self::loadViewInstance();
+ }
+
+ return self::$_instance;
}
- /**
- * @param string $package
- * @param string $viewFile
- * @return View
- */
- public static function createPublicView(string $package, string $viewFile): View
+ private static function loadViewInstance(): IView
{
- return new self($package, $viewFile);
+ return self::getHighestImplementation() ?? BaseViewImplementation::getInstance();
}
- /**
- * @param string $package
- * @param string $viewFile
- * @return View
- */
- public static function createAdminView(string $package, string $viewFile): View
+ private static function getHighestImplementation(): ?IView
{
- $view = new self($package, $viewFile);
+ $implementations = Loader::loadManagerImplementations(IView::class, 'Views');
- $view->setAdminView()->needAdminControl();
-
- return $view;
+ return array_reduce($implementations, static function (?IView $highest, IView $current) {
+ return ($highest === null || $current->weight() > $highest->weight()) ? $current : $highest;
+ });
}
+
/**
- * @return array|array[]
+ * @param string $package
+ * @param string $viewFile
+ * @return void
*/
- #[ArrayShape(['styles' => 'array', 'scripts' => 'array', 'php' => 'array'])]
- private function generateInclude(): array
+ public static function basicPublicView(string $package, string $viewFile): void
{
- $array = ['styles' => [], 'scripts' => [], 'array' => []];
-
- $array['scripts']['before'] = [];
- $array['scripts']['after'] = [];
-
- $array['php']['before'] = [];
- $array['php']['after'] = [];
-
- return $array;
+ self::getInstance()->basicPublicView($package, $viewFile);
}
/**
- * @param string $position
- * @param string $fileName
- * @return void
+ * @param string $package
+ * @param string $viewFile
+ * @return IView
*/
- private function addScript(#[ExpectedValues(['after', 'before'])] string $position, string $fileName): void
+ public static function createPublicView(string $package, string $viewFile): IView
{
- $this->includes['scripts'][$position][] = $fileName;
+ return self::getInstance()->createPublicView($package, $viewFile);
}
/**
- * @param string $position
- * @param string $fileName
- * @return void
+ * @param string $package
+ * @param string $viewFile
+ * @return IView
*/
- private function addPhp(#[ExpectedValues(['after', 'before'])] string $position, string $fileName): void
+ public static function createAdminView(string $package, string $viewFile): IView
{
- $this->includes['php'][$position][] = $fileName;
+ return self::getInstance()->createAdminView($package, $viewFile);
}
/**
* @param string $package
- * @return $this
+ * @return IView
*/
- public function setPackage(string $package): self
+ public function setPackage(string $package): IView
{
- $this->package = $package;
- return $this;
+ return self::getInstance()->setPackage($package);
}
/**
* @param string $viewFile
- * @return $this
+ * @return IView
*/
- public function setViewFile(string $viewFile): self
+ public function setViewFile(string $viewFile): IView
{
- $this->viewFile = $viewFile;
- return $this;
+ return self::getInstance()->setViewFile($viewFile);
}
/**
* @param bool $needAdminControl
- * @return $this
+ * @return IView
*/
- public function needAdminControl(bool $needAdminControl = true): self
+ public function needAdminControl(bool $needAdminControl = true): IView
{
- $this->needAdminControl = $needAdminControl;
- return $this;
+ return self::getInstance()->needAdminControl($needAdminControl);
}
/**
* @param bool $isAdminFile
- * @return $this
+ * @return IView
*/
- public function setAdminView(bool $isAdminFile = true): self
+ public function setAdminView(bool $isAdminFile = true): IView
{
- $this->isAdminFile = $isAdminFile;
- return $this;
+ return self::getInstance()->setAdminView($isAdminFile);
}
/**
* @param string $variableName
* @param mixed $variable
- * @return $this
+ * @return IView
*/
- public function addVariable(string $variableName, mixed $variable): self
+ public function addVariable(string $variableName, mixed $variable): IView
{
- $this->variables[$variableName] ??= $variable;
- return $this;
+ return self::getInstance()->addVariable($variableName, $variable);
}
/**
* @param array $variableList
- * @return $this
+ * @return IView
*/
- public function addVariableList(array $variableList): self
+ public function addVariableList(array $variableList): IView
{
- foreach ($variableList as $key => $value) {
- $this->addVariable($key, $value);
- }
-
- return $this;
+ return self::getInstance()->addVariableList($variableList);
}
/**
* @param string ...$script
- * @return $this
+ * @return IView
*/
- public function addScriptBefore(string ...$script): self
+ public function addScriptBefore(string ...$script): IView
{
- foreach ($script as $scriptFile) {
- $this->addScript('before', $scriptFile);
- }
-
- return $this;
+ return self::getInstance()->addScriptBefore(...$script);
}
/**
* @param string ...$script
- * @return $this
+ * @return IView
*/
- public function addScriptAfter(string ...$script): self
+ public function addScriptAfter(string ...$script): IView
{
- foreach ($script as $scriptFile) {
- $this->addScript('after', $scriptFile);
- }
-
- return $this;
+ return self::getInstance()->addScriptAfter(...$script);
}
/**
* @param string ...$php
- * @return $this
+ * @return IView
*/
- public function addPhpBefore(string ...$php): self
+ public function addPhpBefore(string ...$php): IView
{
- foreach ($php as $scriptFile) {
- $this->addPhp('before', $scriptFile);
- }
-
- return $this;
+ return self::getInstance()->addPhpBefore(...$php);
}
/**
* @param string ...$php
- * @return $this
+ * @return IView
*/
- public function addPhpAfter(string ...$php): self
+ public function addPhpAfter(string ...$php): IView
{
- foreach ($php as $scriptFile) {
- $this->addPhp('after', $scriptFile);
- }
-
- return $this;
+ return self::getInstance()->addPhpAfter(...$php);
}
/**
* @param string ...$style
- * @return $this
+ * @return IView
*/
- public function addStyle(string ...$style): self
+ public function addStyle(string ...$style): IView
{
- foreach ($style as $styleFile) {
- $this->includes['styles'][] = $styleFile;
- }
-
- return $this;
+ return self::getInstance()->addStyle(...$style);
}
/**
* @param string $path
- * @return $this
+ * @return IView
*/
- public function setCustomPath(string $path): self
+ public function setCustomPath(string $path): IView
{
- $this->customPath = $path;
- return $this;
+ return self::getInstance()->setCustomPath($path);
}
/**
* @param string $path
- * @return $this
+ * @return IView
*/
- public function setCustomTemplate(string $path): self
+ public function setCustomTemplate(string $path): IView
{
- $this->customTemplate = $path;
- return $this;
+ return self::getInstance()->setCustomTemplate($path);
}
/**
* @param bool $overrideBackendMode
- * @return View
+ * @return IView
* If true, the view will be displayed even if the backend mode is enabled
*/
- public function setOverrideBackendMode(bool $overrideBackendMode): self
- {
- $this->overrideBackendMode = $overrideBackendMode;
- return $this;
- }
-
- /**
- * @return string
- */
- private function getViewPath(): string
- {
- if ($this->customPath !== null) {
- return $this->customPath;
- }
-
- if ($this->isAdminFile) {
- return "App/Package/$this->package/Views/$this->viewFile.admin.view.php";
- }
-
- $publicPath = "Public/Themes/$this->themeName/Views/$this->package/$this->viewFile.view.php";
-
- if (is_file($publicPath)) {
- return $publicPath;
- }
-
- return "App/Package/$this->package/Public/$this->viewFile.view.php";
- }
-
- /**
- * @return string
- */
- private function getTemplateFile(): string
+ public function setOverrideBackendMode(bool $overrideBackendMode): IView
{
- if ($this->customTemplate !== null) {
- return $this->customTemplate;
- }
-
- return ($this->isAdminFile)
- ? EnvManager::getInstance()->getValue('PATH_ADMIN_VIEW') . 'template.php'
- : "Public/Themes/$this->themeName/Views/template.php";
+ return self::getInstance()->setOverrideBackendMode($overrideBackendMode);
}
- /**
- * @param array $includes
- * @param string $fileType
- * @return void
- */
- private static function loadIncludeFile(array $includes, #[ExpectedValues(['beforeScript', 'afterScript', 'beforePhp', 'afterPhp', 'styles'])] string $fileType): void
- {
- if (!in_array($fileType, ['beforeScript', 'afterScript', 'beforePhp', 'afterPhp', 'styles'])) {
- return;
- }
-
- // STYLES
- if ($fileType === 'styles') {
- foreach ($includes['styles'] as $style) {
- $styleLink = EnvManager::getInstance()->getValue('PATH_SUBFOLDER') . $style;
- echo <<
- HTML;
- }
- }
-
- // SCRIPTS
- if (in_array($fileType, ['beforeScript', 'afterScript'])) {
- $arrayAccessJs = $fileType === 'beforeScript' ? 'before' : 'after';
- foreach ($includes['scripts'][$arrayAccessJs] as $script) {
- $scriptLink = EnvManager::getInstance()->getValue('PATH_SUBFOLDER') . $script;
- echo <<
- HTML;
- }
- }
-
- // PHP
- if (in_array($fileType, ['beforePhp', 'afterPhp'])) {
- $arrayAccessPhp = $fileType === 'beforePhp' ? 'before' : 'after';
- foreach ($includes['php'][$arrayAccessPhp] as $php) {
- $phpLink = EnvManager::getInstance()->getValue('DIR') . $php;
- include_once $phpLink;
- }
- }
- }
-
- /**
- * @throws RouterException
- */
- public function loadFile(): string
- {
- $path = $this->getViewPath();
-
- if (!is_file($path)) {
- throw new RouterException(null, 404);
- }
-
- extract($this->variables);
- $includes = $this->includes;
-
- ob_start();
- require($path);
- return ob_get_clean();
- }
-
- /**
- * @throws RouterException
- */
public function view(): void
{
- // Check admin permissions
- if ($this->needAdminControl) {
- UsersController::redirectIfNotHavePermissions('core.dashboard');
- }
-
- extract($this->variables);
- $includes = $this->includes;
-
- //Backend mode view logic
- $this->backendView();
-
- if (is_null($this->customPath) && Utils::containsNullValue($this->package, $this->viewFile)) {
- throw new RouterException("Invalid View usage. Please set a correct path.", 404);
- }
-
- $path = $this->getViewPath();
-
- if (!is_file($path)) {
- throw new RouterException(null, 404);
- }
-
- //Load Elements
- ComponentsManager::getInstance()->loadThemeComponents($this->themeName);
-
- ob_start();
- require_once $path;
- echo $this->callAlerts();
- $content = ob_get_clean();
-
- require_once($this->getTemplateFile());
+ self::getInstance()->view();
}
/**
@@ -424,56 +219,6 @@ public function view(): void
*/
public static function loadInclude(array $includes, #[ExpectedValues(flags: ['beforeScript', 'afterScript', 'beforePhp', 'afterPhp', 'styles'])] string ...$files): void
{
- foreach ($files as $file) {
- self::loadIncludeFile($includes, $file);
- }
- }
-
- /**
- * @throws RouterException
- */
- private function callAlerts(): string
- {
- $alerts = Flash::load();
- $alertContent = '';
- foreach ($alerts as $alert) {
- if (!$alert->isAdmin()) {
- $view = new View('Core', 'Alerts/' . $alert->getType());
- } else {
- $view = new View('Core', 'Alerts/' . $alert->getType(), true);
- }
- $view->addVariable('alert', $alert);
- $alertContent .= $view->loadFile();
- }
- Flash::clear();
- return $alertContent;
- }
-
- /**
- * @return void
- * @desc Return the view data if the backend mode is enabled
- */
- private function backendView(): void
- {
- $isBackendModeEnabled = EnvManager::getInstance()->getValue('ENABLE_BACKEND_MODE') === 'true';
-
- if ($this->overrideBackendMode) {
- return;
- }
-
- if ($isBackendModeEnabled && !$this->needAdminControl) {
- print_r(
- APIManager::createResponse(
- data: [
- 'package' => $this->package,
- 'viewFile' => $this->viewFile,
- 'viewFilePath' => $this->getViewPath(),
- 'variables' => $this->variables,
- 'includes' => $this->includes,
- ],
- )
- );
- die();
- }
+ self::getInstance()->loadInclude($includes, ...$files);
}
}
diff --git a/App/Package/Core/Controllers/MailController.php b/App/Package/Core/Controllers/MailController.php
index 07e63ed7..f6935d8a 100644
--- a/App/Package/Core/Controllers/MailController.php
+++ b/App/Package/Core/Controllers/MailController.php
@@ -3,10 +3,13 @@
namespace CMW\Controller\Core;
use CMW\Controller\Users\UsersController;
+use CMW\Interface\Core\IMailTemplate;
+use CMW\Interface\Shop\IVirtualItems;
use CMW\Manager\Filter\FilterManager;
use CMW\Manager\Flash\Alert;
use CMW\Manager\Flash\Flash;
use CMW\Manager\Lang\LangManager;
+use CMW\Manager\Loader\Loader;
use CMW\Manager\Mail\MailManager;
use CMW\Manager\Package\AbstractController;
use CMW\Manager\Router\Link;
@@ -34,6 +37,15 @@ private function mailConfiguration(): void
UsersController::redirectIfNotHavePermissions('core.dashboard', 'core.settings.mails');
$config = MailModel::getInstance()->getConfig();
+ $mailTemplates = $this->getMailTemplateMethods();
+
+ usort($mailTemplates, function ($a, $b) {
+ $priority = ['empty', 'empty_signed'];
+ $aPriority = in_array($a->getVarName(), $priority) ? array_search($a->getVarName(), $priority) : PHP_INT_MAX;
+ $bPriority = in_array($b->getVarName(), $priority) ? array_search($b->getVarName(), $priority) : PHP_INT_MAX;
+
+ return $aPriority <=> $bPriority;
+ });
View::createAdminView('Core', 'Mail/mailConfig')
->addStyle('Admin/Resources/Vendors/Izitoast/iziToast.min.css')
@@ -41,7 +53,7 @@ private function mailConfiguration(): void
'App/Package/Core/Views/Mail/Resources/tinyMCEConfig.js')
->addScriptAfter('App/Package/Core/Views/Mail/Resources/sendMail.js',
'Admin/Resources/Vendors/Izitoast/iziToast.min.js')
- ->addVariableList(['config' => $config])
+ ->addVariableList(['config' => $config, 'mailTemplates' => $mailTemplates])
->view();
}
@@ -50,10 +62,15 @@ private function mailConfigurationPost(): void
{
UsersController::redirectIfNotHavePermissions('core.dashboard', 'core.settings.mails');
- [$mail, $mailReply, $addressSMTP, $user, $password, $port, $protocol, $footer, $enableSMTP] = Utils::filterInput(
- 'mail', 'mailReply', 'addressSMTP', 'user', 'password', 'port', 'protocol', 'footer', 'enableSMTP'
+ [$mail, $mailReply, $addressSMTP, $user, $password, $port, $protocol, $body, $enableSMTP] = Utils::filterInput(
+ 'mail', 'mailReply', 'addressSMTP', 'user', 'password', 'port', 'protocol', 'body', 'enableSMTP'
);
+ if (!str_contains($body, '[MAIL_CONTENT]')) {
+ Flash::send(Alert::ERROR, LangManager::translate('core.toaster.error'), LangManager::translate('core.mail.editor.render_alert'));
+ Redirect::redirectPreviousRoute();
+ }
+
MailModel::getInstance()->create($mail,
$mailReply,
$addressSMTP,
@@ -61,7 +78,7 @@ private function mailConfigurationPost(): void
$password,
$port,
$protocol,
- $footer,
+ $body,
(is_null($enableSMTP) ? 0 : 1),
);
@@ -82,7 +99,7 @@ private function testMailConfigurationPost(): void
}
$receiver = FilterManager::filterInputStringPost('receiver');
- $status = MailManager::getInstance()->sendMail($receiver, 'Test CraftMyWebsite - MAILS', 'Hello World !
'); + $status = MailManager::getInstance()->sendMail($receiver, LangManager::translate('core.mail.test.object'), LangManager::translate('core.mail.test.body')); if ($status) { http_response_code(204); @@ -90,4 +107,12 @@ private function testMailConfigurationPost(): void http_response_code(500); } } + + /** + * @return IMailTemplate[] + */ + public function getMailTemplateMethods(): array + { + return Loader::loadImplementations(IMailTemplate::class); + } } diff --git a/App/Package/Core/Controllers/ThemeController.php b/App/Package/Core/Controllers/ThemeController.php index b37247ba..5281e4f4 100644 --- a/App/Package/Core/Controllers/ThemeController.php +++ b/App/Package/Core/Controllers/ThemeController.php @@ -15,6 +15,12 @@ use CMW\Manager\Package\AbstractController; use CMW\Manager\Router\Link; use CMW\Manager\Security\SecurityManager; +use CMW\Manager\Theme\Config\ThemeMapper; +use CMW\Manager\Theme\Config\ThemeSettingsMapper; +use CMW\Manager\Theme\Editor\ThemeEditorProcessor; +use CMW\Manager\Theme\File\ThemeFileManager; +use CMW\Manager\Theme\Loader\ThemeLoader; +use CMW\Manager\Theme\Market\ThemeMarketManager; use CMW\Manager\Theme\ThemeManager; use CMW\Manager\Theme\UninstallThemeType; use CMW\Manager\Updater\UpdatesManager; @@ -42,9 +48,9 @@ private function adminThemeMarket(): void { UsersController::redirectIfNotHavePermissions('core.dashboard', 'core.themes.market'); - $currentTheme = ThemeManager::getInstance()->getCurrentTheme(); - $installedThemes = ThemeManager::getInstance()->getInstalledThemes(); - $themesList = ThemeManager::getInstance()->getMarketThemes(); + $currentTheme = ThemeLoader::getInstance()->getCurrentTheme(); + $installedThemes = ThemeLoader::getInstance()->getInstalledThemes(); + $themesList = ThemeMarketManager::getInstance()->getMarketThemes(); $themeConfigs = ThemeModel::getInstance()->getInstance()->fetchThemeConfigs($currentTheme->name()); SimpleCacheManager::storeCache($themeConfigs, 'config', 'Themes/' . $currentTheme->name()); @@ -60,9 +66,9 @@ private function adminThemeConfiguration(): void { UsersController::redirectIfNotHavePermissions('core.dashboard', 'core.themes.manage'); - $currentTheme = ThemeManager::getInstance()->getCurrentTheme(); - $installedThemes = ThemeManager::getInstance()->getInstalledThemes(); - $themesList = ThemeManager::getInstance()->getMarketThemes(); + $currentTheme = ThemeLoader::getInstance()->getCurrentTheme(); + $installedThemes = ThemeLoader::getInstance()->getInstalledThemes(); + $themesList = ThemeMarketManager::getInstance()->getMarketThemes(); $themeConfigs = ThemeModel::getInstance()->getInstance()->fetchThemeConfigs($currentTheme->name()); SimpleCacheManager::storeCache($themeConfigs, 'config', 'Themes/' . $currentTheme->name()); @@ -94,9 +100,9 @@ private function adminThemeConfigurationRegenerate(): void { UsersController::redirectIfNotHavePermissions('core.dashboard', 'core.themes.edit'); - $themeName = ThemeManager::getInstance()->getCurrentTheme()->name(); + $themeName = ThemeLoader::getInstance()->getCurrentTheme()->name(); ThemeModel::getInstance()->getInstance()->deleteThemeConfig($themeName); - ThemeManager::getInstance()->installThemeSettings($themeName); + ThemeFileManager::getInstance()->updateThemeSettings($themeName); $themeConfigs = ThemeModel::getInstance()->getInstance()->fetchThemeConfigs($themeName); SimpleCacheManager::storeCache($themeConfigs, 'config', 'Themes/' . $themeName); @@ -137,7 +143,7 @@ private function adminThemeInstallation(int $id): void } // Install Theme settings - ThemeManager::getInstance()->installThemeSettings($theme['name']); + ThemeFileManager::getInstance()->installThemeSettings($theme['name']); CoreModel::getInstance()->updateOption('theme', $theme['name']); $themeConfigs = ThemeModel::getInstance()->getInstance()->fetchThemeConfigs($theme['name']); @@ -153,9 +159,55 @@ private function adminThemeInstallation(int $id): void private function adminThemeManage(): void { UsersController::redirectIfNotHavePermissions('core.dashboard', 'core.themes.edit'); - View::createAdminView('Core', 'Theme/themeManage') - ->addScriptBefore('Admin/Resources/Vendors/Tinymce/tinymce.min.js', 'Admin/Resources/Vendors/Tinymce/Config/full.js', 'Admin/Resources/Vendors/PageLoader/main.js') - ->view(); + + //Vérifie si la valeur par défaut est en base de donnée si ce n'est pas le cas, on l'ajoute, cela permet aux mises à jour des thèmes de gérer les nouvelles valeurs :) + $themeMenus = ThemeEditorProcessor::getInstance()->getThemeMenus(); + $currentTheme = ThemeLoader::getInstance()->getCurrentTheme()->name(); + $themeConfigs = ThemeModel::getInstance()->fetchThemeConfigs($currentTheme); + $configNames = array_column($themeConfigs, 'theme_config_name'); + $menuKeys = []; + + foreach ($themeMenus as $themeMenu) { + $menuKey = $themeMenu->getMenuKey(); + + // Warning si le menu est défini plusieurs fois + if (in_array($menuKey, $menuKeys)) { + Flash::send(Alert::ERROR, LangManager::translate('core.toaster.theme.editor.title'), LangManager::translate('core.toaster.theme.editor.multipleMenu', ['menukey' => $menuKey])); + } else { + $menuKeys[] = $menuKey; + } + + $themeKeys = []; + + foreach ($themeMenu->getValues() as $value) { + $key = $value->getThemeKey(); + + if (in_array($key, $themeKeys)) { + Flash::send(Alert::ERROR, LangManager::translate('core.toaster.theme.editor.title'), LangManager::translate('core.toaster.theme.editor.multipleMenuKey', ['key' => $key, 'menukey' => $menuKey])); + } else { + $themeKeys[] = $key; + } + + $dbKey = $menuKey ? ThemeMapper::mapConfigKey($menuKey, $key) : $key; + + if (!in_array($dbKey, $configNames)) { + ThemeModel::getInstance()->storeThemeConfig($dbKey, $value->getDefaultValue(), $currentTheme); + // Ajoute ici aussi à $themeConfigs pour éviter de devoir reload + $themeConfigs[] = [ + 'theme_config_name' => $dbKey, + 'theme_config_value' => $value->getDefaultValue(), + 'theme_config_theme' => $currentTheme, + ]; + } + } + } + + $view = new View('Core', 'Editor/themeManage'); + $view + ->addVariableList(['themeMenus' => $themeMenus, 'themeConfigs' => $themeConfigs]) + ->setCustomPath(EnvManager::getInstance()->getValue('DIR') . "App/Package/Core/Views/Theme/Editor/themeManage.admin.view.php") + ->setCustomTemplate(EnvManager::getInstance()->getValue('DIR') . 'App/Package/Core/Views/Theme/Editor/template.php'); + $view->view(); } #[NoReturn] @@ -166,6 +218,7 @@ private function adminThemeManagePost(): void UsersController::redirectIfNotHavePermissions('core.dashboard', 'core.themes.edit'); + $themeName = ThemeLoader::getInstance()->getCurrentTheme()->name(); try { $newCsrfTokenId = bin2hex(random_bytes(8)); $newCsrfToken = SecurityManager::getInstance()->getCSRFToken($newCsrfTokenId); @@ -176,30 +229,27 @@ private function adminThemeManagePost(): void $aresFiles['__images__'][$conf] = true; if ($file['name'] !== '') { - $imageName = ImagesManager::convertAndUpload($file, ThemeManager::getInstance()->getCurrentTheme()->name() . '/Img'); - $remoteImageValue = ThemeModel::getInstance()->getInstance()->fetchConfigValue($conf); - $localImageValue = ThemeManager::getInstance()->getCurrentThemeConfigSetting($conf); + $imageName = ImagesManager::convertAndUpload($file, $themeName . '/Img'); - if ($remoteImageValue !== $file && $remoteImageValue !== $localImageValue) { - ImagesManager::deleteImage(ThemeManager::getInstance()->getCurrentTheme()->name() . "/Img/$remoteImageValue"); - } + $currentImage = ThemeModel::getInstance()->getConfigValue($conf); + ImagesManager::deleteImage($themeName . "/Img/$currentImage"); - ThemeModel::getInstance()->getInstance()->updateThemeConfig($conf, $imageName, ThemeManager::getInstance()->getCurrentTheme()->name()); + ThemeModel::getInstance()->getInstance()->updateThemeConfig($conf, $imageName, $themeName); } } - foreach (ThemeManager::getInstance()->getCurrentThemeConfigSettings() as $conf => $value) { + foreach (ThemeSettingsMapper::getFlattened($themeName) as $conf => $defaultValue) { if (isset($aresFiles['__images__'][$conf])) { continue; } - if (!isset($_POST[$conf]) || !empty($_POST[$conf])) { - ThemeModel::getInstance()->getInstance()->updateThemeConfig($conf, $_POST[$conf] ?? '0', ThemeManager::getInstance()->getCurrentTheme()->name()); + if (isset($_POST[$conf])) { + ThemeModel::getInstance()->updateThemeConfig($conf, $_POST[$conf], $themeName); } } - $themeConfigs = ThemeModel::getInstance()->getInstance()->fetchThemeConfigs(ThemeManager::getInstance()->getCurrentTheme()->name()); - SimpleCacheManager::storeCache($themeConfigs, 'config', 'Themes/' . ThemeManager::getInstance()->getCurrentTheme()->name()); + $themeConfigs = ThemeModel::getInstance()->getInstance()->fetchThemeConfigs($themeName); + SimpleCacheManager::storeCache($themeConfigs, 'config', 'Themes/' . $themeName); echo json_encode([ 'success' => true, @@ -262,6 +312,9 @@ private function adminThemeUpdate(int $id, string $actualVersion, string $themeN } } + //Une fois que toutes les mises à jour sont terminé, on rajoute les nouvelles configs : + ThemeFileManager::getInstance()->updateThemeSettings($themeName); + SimpleCacheManager::deleteSpecificCacheFile("config", "Themes/$themeName"); Flash::send(Alert::SUCCESS, LangManager::translate('core.toaster.success'), @@ -301,9 +354,9 @@ private function adminThemeDelete(string $theme): void UsersController::redirectIfNotHavePermissions('core.dashboard', 'core.themes.manage'); $themeName = base64_decode($theme); - $currentTheme = ThemeManager::getInstance()->getCurrentTheme(); + $currentTheme = ThemeLoader::getInstance()->getCurrentTheme(); - switch (ThemeManager::getInstance()->uninstallLocalTheme($themeName)) { + switch (ThemeFileManager::uninstallLocalTheme($themeName)) { case UninstallThemeType::SUCCESS: if ($themeName === $currentTheme->name()) { CoreModel::getInstance()->updateOption('theme', ThemeManager::$defaultThemeName); diff --git a/App/Package/Core/Controllers/UpdatesController.php b/App/Package/Core/Controllers/UpdatesController.php index 58ee430b..14c28ca5 100644 --- a/App/Package/Core/Controllers/UpdatesController.php +++ b/App/Package/Core/Controllers/UpdatesController.php @@ -93,7 +93,7 @@ private function adminUpdatesInstall(): void $versions = PublicAPI::postData('cms/update', ['current_version' => UpdatesManager::getVersion()]); foreach ($versions as $version) { - (new CMSUpdaterManager())->doUpdate($version); + CMSUpdaterManager::getInstance()->doUpdate($version); } SimpleCacheManager::deleteAllFiles(); diff --git a/App/Package/Core/Entities/MailConfigEntity.php b/App/Package/Core/Entities/MailConfigEntity.php index 48a220f1..57ce00b2 100644 --- a/App/Package/Core/Entities/MailConfigEntity.php +++ b/App/Package/Core/Entities/MailConfigEntity.php @@ -14,6 +14,7 @@ class MailConfigEntity extends AbstractEntity private ?string $password; private ?int $port; private ?string $protocol; + private ?string $body; private ?string $footer; private ?int $enable; @@ -26,11 +27,12 @@ class MailConfigEntity extends AbstractEntity * @param string|null $password * @param int|null $port * @param string|null $protocol + * @param string|null $body * @param string|null $footer * @param int|null $enable */ public function __construct(?int $id, ?string $mail, ?string $mailReply, ?string $addressSMTP, ?string $user, - ?string $password, ?int $port, ?string $protocol, ?string $footer, ?int $enable) + ?string $password, ?int $port, ?string $protocol, ?string $body, ?string $footer, ?int $enable) { $this->id = $id; $this->mail = $mail; @@ -40,6 +42,7 @@ public function __construct(?int $id, ?string $mail, ?string $mailReply, ?str $this->password = $password; $this->port = $port; $this->protocol = $protocol; + $this->body = $body; $this->footer = $footer; $this->enable = $enable; } @@ -108,6 +111,14 @@ public function getProtocol(): ?string return $this->protocol; } + /** + * @return string|null + */ + public function getBody(): ?string + { + return $this->body; + } + /** * @return string|null */ diff --git a/App/Package/Core/Implementations/Core/BasicSignTemplateImplementations.php b/App/Package/Core/Implementations/Core/BasicSignTemplateImplementations.php new file mode 100644 index 00000000..992a8a5a --- /dev/null +++ b/App/Package/Core/Implementations/Core/BasicSignTemplateImplementations.php @@ -0,0 +1,45 @@ + +body { + font-family: Arial, sans-serif; + background-color: #f4f4f4; + margin: 0; + padding: 0; +} + + +[MAIL_CONTENT]
+--
+' . Website::getWebsiteName() . '
+'; + } + + public function getPreviewImg(): string + { + return EnvManager::getInstance()->getValue('PATH_SUBFOLDER').'App/Package/Core/Views/Mail/Resources/Images/signed.png'; + } +} \ No newline at end of file diff --git a/App/Package/Core/Implementations/Core/EmptyMailTemplateImplementations.php b/App/Package/Core/Implementations/Core/EmptyMailTemplateImplementations.php new file mode 100644 index 00000000..e9f48c0c --- /dev/null +++ b/App/Package/Core/Implementations/Core/EmptyMailTemplateImplementations.php @@ -0,0 +1,30 @@ +getValue('PATH_SUBFOLDER').'App/Package/Core/Views/Mail/Resources/Images/empty.png'; + } +} \ No newline at end of file diff --git a/App/Package/Core/Implementations/Core/RedMailTemplateImplementations.php b/App/Package/Core/Implementations/Core/RedMailTemplateImplementations.php new file mode 100644 index 00000000..11c41879 --- /dev/null +++ b/App/Package/Core/Implementations/Core/RedMailTemplateImplementations.php @@ -0,0 +1,105 @@ + + + + + + + + +
+
+
+';
+ }
+
+ public function getPreviewImg(): string
+ {
+ return EnvManager::getInstance()->getValue('PATH_SUBFOLDER').'App/Package/Core/Views/Mail/Resources/Images/red.png';
+ }
+}
\ No newline at end of file
diff --git a/App/Package/Core/Interfaces/IMailTemplate.php b/App/Package/Core/Interfaces/IMailTemplate.php
new file mode 100644
index 00000000..1a286b0c
--- /dev/null
+++ b/App/Package/Core/Interfaces/IMailTemplate.php
@@ -0,0 +1,35 @@
+ [
'test' => 'Mail send to %mail%',
],
- 'Theme' => [
+ 'theme' => [
'regenerate' => 'Theme configuration regenerate',
'installed' => '%theme% just installed and activated.',
'reset' => 'Theme configuration reset',
@@ -145,6 +145,11 @@
'delete_files' => 'Unable to delete theme files',
],
],
+ 'editor' => [
+ 'title' => 'Editor - DEV',
+ 'multipleMenu' => 'Warning: the menu %menukey% is defined multiple times!',
+ 'multipleMenuKey' => 'Warning: the key %key% is present multiple times in the menu %menukey%!',
+ ],
],
'package' => [
'updateBeforeInstall' => 'Please update CMS before installing this package!',
@@ -197,7 +202,10 @@
'notVerified' => 'Not verified by CMW.',
'active' => 'Active theme',
'configure' => 'Configure',
- 'reset' => 'Reset',
+ 'reset' => 'Reset %theme%',
+ "leave" => "Leave editor",
+ "menu" => "EDITOR MENU",
+ "backMenu" => "Back to menu",
'reinstall' => 'Reinstall',
'description' => 'Description : ',
'update' => 'An update is available !',
@@ -292,7 +300,7 @@
'replyMail' => 'Email reply',
'serverSMTP' => 'SMTP address',
'userSMTP' => 'SMTP user',
- 'passwordSMTP' => 'Password',
+ 'passwordSMTP' => 'Password SMTP',
'portSMTP' => 'Port SMTP',
'protocol' => 'Sending protocol',
'footer' => 'Mails footer',
@@ -308,6 +316,28 @@
'receiverMailPlaceholder' => 'Enter your mail',
],
],
+ 'test' => [
+ 'object' => '✅ CraftMyWebsite Email Sending Test',
+ 'body' => '
+ ' . Website::getWebsiteName() . '
+
+
+ [MAIL_CONTENT]
+
+
+Hello,
This message was sent automatically to verify that the email sending system on your site is working properly.
If you received this message, it means everything is configured correctly.
Thank you for using CraftMyWebsite! 🚀
', + ], + 'editor' => [ + 'title' => 'Mail Editor (HTML)', + 'select' => 'Select a template', + 'select_alert' => 'Selecting a template will overwrite your current model!', + 'apply_btn' => 'Apply', + 'modal_title' => 'Good to know', + 'modal_text_1' => 'This editor allows you to customize the appearance of your emails. You must understand that this template is used every time an email is sent, regardless of its type (shop, forum, newsletter, login, registration...), so keep that in mind when configuring your template.', + 'modal_text_2' => 'It is essential to use[MAIL_CONTENT] in your template. This is where the message sent by the site will be placed.',
+ 'modal_text_3' => 'Tip: The fonts supported by most email clients by default are:',
+ 'render' => 'Live email preview',
+ 'render_example' => '[EXAMPLE]
This is an example of your email content.
The message will be automatically inserted here.
[EXAMPLE]
', + 'render_alert' => 'The email content must contain [MAIL_CONTENT]!', + ], + 'implementations' => [ + 'basicSign' => 'No style - With signature', + 'emptyMail' => 'No style', + 'redMail' => 'Red with centered card', + ], ], 'downloads' => [ 'errors' => [ @@ -424,6 +454,7 @@ 'disable' => 'Disable', 'disabled' => 'Disabled', 'saving' => 'Saving ...', + 'reset' => 'Reset', ], 'months' => [ 'list' => '["January","February","March","April","May","June","July","August","September","October","November","December"]', diff --git a/App/Package/Core/Lang/fr.php b/App/Package/Core/Lang/fr.php index dd0e60fd..f4f646d2 100644 --- a/App/Package/Core/Lang/fr.php +++ b/App/Package/Core/Lang/fr.php @@ -145,6 +145,11 @@ 'delete_files' => 'Impossible de supprimer les fichiers du thème', ], ], + 'editor' => [ + 'title' => 'Editeur - DEV', + 'multipleMenu' => 'Attention le menu %menukey% est défini plusieurs fois !', + 'multipleMenuKey' => 'Attention la clé %key% est présente plusieurs fois dans le menu %menukey% !', + ], ], 'package' => [ 'updateBeforeInstall' => 'Veuillez mettre à jour le CMS avant d\'installer ce package !', @@ -197,7 +202,10 @@ "notVerified" => "Non verifié par CMW.", "active" => "Thème actif", "configure" => "Configurer", - "reset" => "Réinitialiser", + "reset" => "Réinitialiser %theme%", + "leave" => "Quitter l'éditeur", + "menu" => "MENU D'ÉDITION", + "backMenu" => "Retour au menu", "reinstall" => "Réinstaller", "description" => "Description : ", "update" => "Mise à jour disponible !", @@ -292,7 +300,7 @@ 'replyMail' => 'Adresse mail de réponse', 'serverSMTP' => 'Adresse du serveur SMTP', 'userSMTP' => 'Utilisateur SMTP', - 'passwordSMTP' => 'Mot de passe', + 'passwordSMTP' => 'Mot de passe SMTP', 'portSMTP' => 'Port SMTP', 'protocol' => "Protocole d'envoi", 'footer' => 'Signature de vos mails', @@ -308,6 +316,28 @@ 'receiverMailPlaceholder' => "Entrez l'adresse mail", ], ], + 'test' => [ + 'object' => '✅ Test d’envoi d’email CraftMyWebsite', + 'body' => 'Bonjour,
Ce message a été envoyé automatiquement pour vérifier le bon fonctionnement du système d’envoi d’emails de votre site.
Si vous avez bien reçu ce message, cela signifie que tout est configuré correctement.
Merci d’utiliser CraftMyWebsite ! 🚀
', + ], + 'editor' => [ + 'title' => 'Éditeur de mail (HTML)', + 'select' => 'Sélectionnez un template', + 'select_alert' => 'La selection d\'un template écrasera votre model actuel !', + 'apply_btn' => 'Appliquer', + 'modal_title' => 'Bon à savoir', + 'modal_text_1' => 'Cet éditeur vous permet de personnaliser l\'apparence de vos e-Mails, vous devez comprendre que ce model est envoyé à chaque fois qu\'un mail part peu importe le type de mail envoyé (shop, forum, newsletter, connexion, inscription...), gardez-bien cela a l\'esprit quand vous configurez votre template.', + 'modal_text_2' => 'Il est impératif d\'utiliser[MAIL_CONTENT] dans votre template, c\'est ici que sera placé le message envoyé par le site',
+ 'modal_text_3' => 'Tips : Les police d\'écriture pris en charge par défaut par la plupart des boites mails sont :',
+ 'render' => 'Rendu en direct des mails',
+ 'render_example' => '[EXEMPLE]
Ceci est un exemple de contenu de vos mails envoyés.
Le message sera inséré automatiquement ici.
[EXEMPLE]
', + 'render_alert' => 'Le contenu du mail doit contenir [MAIL_CONTENT] !', + ], + 'implementations' => [ + 'basicSign' => 'Sans style - Avec signature', + 'emptyMail' => 'Sans style', + 'redMail' => 'Rouge avec carte centré', + ], ], 'downloads' => [ 'errors' => [ @@ -427,6 +457,7 @@ 'disable' => 'Désactiver', 'disabled' => 'Désactivée', 'saving' => 'Sauvegarde ...', + 'reset' => 'Réinitialiser', ], 'months' => [ 'list' => '["Janvier","Février","Mars","Avril","Mai","Juin","Juillet","Août","Septembre","Octobre","Novembre","Décembre"]', diff --git a/App/Package/Core/Models/CoreModel.php b/App/Package/Core/Models/CoreModel.php index 64d3db40..74601258 100644 --- a/App/Package/Core/Models/CoreModel.php +++ b/App/Package/Core/Models/CoreModel.php @@ -2,9 +2,11 @@ namespace CMW\Model\Core; -use CMW\Manager\Cache\SimpleCacheManager; use CMW\Manager\Database\DatabaseManager; use CMW\Manager\Package\AbstractModel; +use function get_defined_constants; +use function mb_strtoupper; +use function str_starts_with; /** * Class: @coreController @@ -14,7 +16,7 @@ */ class CoreModel extends AbstractModel { - public function fetchOption(string $option): string + public function fetchOption(string $option): ?string { // TODO Le cache ne fonctionne pas et du coup ralenti le chargement des page /*if (SimpleCacheManager::cacheExist('options', "Options")){ @@ -29,9 +31,17 @@ public function fetchOption(string $option): string $db = DatabaseManager::getInstance(); $req = $db->prepare('SELECT option_value FROM cmw_core_options WHERE option_name = ?'); - $req->execute(array($option)); + + if (!$req->execute([$option])){ + return null; + } + $option = $req->fetch(); + if (!$option){ + return null; + } + return $option['option_value']; } @@ -45,7 +55,7 @@ public static function getOptionValue(string $option): string $db = DatabaseManager::getInstance(); $req = $db->prepare('SELECT option_value FROM cmw_core_options WHERE option_name = ?'); - return ($req->execute(array($option))) ? $req->fetch()['option_value'] : ''; + return ($req->execute([$option])) ? $req->fetch()['option_value'] : ''; } public function fetchOptions(): array @@ -60,22 +70,18 @@ public function fetchOptions(): array return ($req->execute()) ? $req->fetchAll() : []; } + /** + * @param string $option_name + * @param string $option_value + * @return bool + */ public function updateOption(string $option_name, string $option_value): bool { + $sql = 'INSERT INTO cmw_core_options (option_name, option_value, option_updated) + VALUES (:option_name, :option_value, NOW()) + ON DUPLICATE KEY UPDATE option_value=VALUES(option_value), option_updated=NOW()'; $db = DatabaseManager::getInstance(); - $req = $db->prepare('UPDATE cmw_core_options SET option_value=:option_value, option_updated=NOW() WHERE option_name=:option_name'); - return $req->execute(array('option_name' => $option_name, 'option_value' => $option_value)); - } - - public static function getLanguages(string $prefix): array|string - { - foreach (get_defined_constants(false) as $key => $value) { - if (str_starts_with($key, mb_strtoupper($prefix, 'UTF-8'))) { - $dump[$key] = $value; - } - } - // Todo Error Manager. - return !empty($dump) ? $dump : "Error: No Constants found with prefix '" . $prefix . "'"; + return $db->prepare($sql)->execute(['option_name' => $option_name, 'option_value' => $option_value]); } } diff --git a/App/Package/Core/Models/MailModel.php b/App/Package/Core/Models/MailModel.php index a99a4926..b37bb433 100644 --- a/App/Package/Core/Models/MailModel.php +++ b/App/Package/Core/Models/MailModel.php @@ -17,17 +17,17 @@ class MailModel extends AbstractModel * @param string $password * @param int $port * @param string $protocol - * @param string $footer + * @param string $body * @param int $enable * @return \CMW\Entity\Core\MailConfigEntity|null * @desc Create or edit a config (only 1 config is allowed) */ - public function create(string $mail, string $mailReply, string $addressSMTP, string $user, string $password, int $port, string $protocol, string $footer, int $enable): ?MailConfigEntity + public function create(string $mail, string $mailReply, string $addressSMTP, string $user, string $password, int $port, string $protocol, string $body, int $enable): ?MailConfigEntity { if ($this->configExist() && !is_null($this->getConfig())) { $id = $this->getConfig()?->getId(); - return $this->update($id, $mail, $mailReply, $addressSMTP, $user, $password, $port, $protocol, $footer, $enable); + return $this->update($id, $mail, $mailReply, $addressSMTP, $user, $password, $port, $protocol, $body, $enable); } $var = array( @@ -103,6 +103,7 @@ public function getConfig(): ?MailConfigEntity EnvManager::getInstance()->getValue('SMTP_PASSWORD') ?? '', $res['mail_config_port'] ?? '', $res['mail_config_protocol'] ?? '', + $res['mail_config_body'] ?? '', $res['mail_config_footer'] ?? '', $res['mail_config_enable'] ?? '' ); @@ -117,12 +118,12 @@ public function getConfig(): ?MailConfigEntity * @param string $password * @param int $port * @param string $protocol - * @param string $footer + * @param string $body * @param int $enable * @return \CMW\Entity\Core\MailConfigEntity|null * @desc Update the current config */ - public function update(int $id, string $mail, string $mailReply, string $addressSMTP, string $user, string $password, int $port, string $protocol, string $footer, int $enable): ?MailConfigEntity + public function update(int $id, string $mail, string $mailReply, string $addressSMTP, string $user, string $password, int $port, string $protocol, string $body, int $enable): ?MailConfigEntity { $var = array( 'id' => $id, @@ -132,13 +133,13 @@ public function update(int $id, string $mail, string $mailReply, string $address 'user' => $user, 'port' => $port, 'protocol' => $protocol, - 'footer' => $footer, + 'body' => $body, 'enable' => $enable ); $sql = 'UPDATE cmw_mail_config_smtp SET mail_config_mail = :mail, mail_config_mail_reply = :mailReply, mail_config_address_smtp = :addressSMTP, mail_config_user = :user, mail_config_port = :port, - mail_config_protocol = :protocol, mail_config_footer = :footer, mail_config_enable = :enable + mail_config_protocol = :protocol, mail_config_body = :body, mail_config_enable = :enable WHERE mail_config_id = :id'; $db = DatabaseManager::getInstance(); diff --git a/App/Package/Core/Models/ThemeModel.php b/App/Package/Core/Models/ThemeModel.php index 482ac6c3..4308e2e7 100644 --- a/App/Package/Core/Models/ThemeModel.php +++ b/App/Package/Core/Models/ThemeModel.php @@ -2,11 +2,17 @@ namespace CMW\Model\Core; -use CMW\Manager\Cache\SimpleCacheManager; use CMW\Manager\Database\DatabaseManager; use CMW\Manager\Env\EnvManager; use CMW\Manager\Package\AbstractModel; +use CMW\Manager\Theme\Config\ThemeConfigResolver; +use CMW\Manager\Theme\Config\ThemeMapper; +use CMW\Manager\Theme\Editor\Entities\EditorType; +use CMW\Manager\Theme\Loader\ThemeLoader; use CMW\Manager\Theme\ThemeManager; +use Exception; +use PDO; +use RuntimeException; /** * Class: @ThemeModel @@ -17,7 +23,8 @@ class ThemeModel extends AbstractModel { /** - * @param string $config + * @param string $menuKey + * @param string $themeKey * @param string|null $themeName ** If empty, we take the current active Theme @@ -25,30 +32,34 @@ class ThemeModel extends AbstractModel * @return string|null * @desc Fetch config data */ - public function fetchConfigValue(string $config, string $themeName = null): ?string + public function fetchConfigValue(string $menuKey, string $themeKey, string $themeName = null): ?string { if ($themeName === null) { - $themeName = ThemeManager::getInstance()->getCurrentTheme()->name(); + $themeName = ThemeLoader::getInstance()->getCurrentTheme()->name(); } - // TODO Add a toggle ? - if (SimpleCacheManager::cacheExist('config', "Themes/$themeName")) { - $data = SimpleCacheManager::getCache('config', "Themes/$themeName"); + $type = ThemeConfigResolver::getInstance()->getEditorType($menuKey, $themeKey); + $themeConfigNameFormatted = ThemeMapper::mapConfigKey($menuKey, $themeKey); - foreach ($data as $conf) { - if ($conf['theme_config_name'] === $config) { - return $conf['theme_config_value'] ?? "UNDEFINED_$config"; - } - } + $cachedValue = ThemeConfigResolver::getInstance()->getConfigValueFromCache($themeName, $themeConfigNameFormatted, $menuKey, $themeKey, $type); + if ($cachedValue !== null) { + return $cachedValue; } + $data = ['config' => $themeConfigNameFormatted, 'theme' => $themeName]; + $db = DatabaseManager::getInstance(); - $req = $db->prepare('SELECT theme_config_value FROM cmw_theme_config - WHERE theme_config_name = :config AND theme_config_theme = :theme'); + $req = $db->prepare('SELECT theme_config_value FROM cmw_theme_config WHERE theme_config_name = :config AND theme_config_theme = :theme'); - $req->execute(['config' => $config, 'theme' => $themeName]); + if ($req->execute($data)) { + $value = $req->fetch()['theme_config_value'] ?? null; + } - return $req->fetch()['theme_config_value'] ?? ''; + if ($type === EditorType::IMAGE) { + return ThemeConfigResolver::getInstance()->resolveImagePath($themeName, $value ?? null, $menuKey, $themeKey); + } + + return $value ?? ThemeConfigResolver::getInstance()->getDefaultThemeValue($menuKey, $themeKey); } /** @@ -59,11 +70,12 @@ public function fetchConfigValue(string $config, string $themeName = null): ?str *
* @return string|null * @desc Fetch config data + * @deprecated Sera supprimé en alpha-10 gérer nativement dans fetchConfigValue */ public function fetchImageLink(string $configName, string $theme = null): ?string { if ($theme === null) { - $theme = ThemeManager::getInstance()->getCurrentTheme()->name(); + $theme = ThemeLoader::getInstance()->getCurrentTheme()->name(); } $db = DatabaseManager::getInstance(); @@ -90,11 +102,12 @@ public function fetchImageLink(string $configName, string $theme = null): ?strin * * @return string|null * @desc Fetch config data + * @deprecated Sera supprimé en alpha-10 gérer nativement dans fetchConfigValue */ public function fetchVideoLink(string $configName, string $theme = null): ?string { if ($theme === null) { - $theme = ThemeManager::getInstance()->getCurrentTheme()->name(); + $theme = ThemeLoader::getInstance()->getCurrentTheme()->name(); } $db = DatabaseManager::getInstance(); @@ -113,6 +126,10 @@ public function fetchVideoLink(string $configName, string $theme = null): ?strin return EnvManager::getInstance()->getValue('PATH_SUBFOLDER') . 'Public/Uploads/' . $theme . '/Videos/' . $value; } + /** + * @param string $theme + * @return array + */ public function fetchThemeConfigs(string $theme): array { $db = DatabaseManager::getInstance(); @@ -163,4 +180,80 @@ public function transactionalDeleteThemeConfig(string $themeName): \PDO return $db; } + + /** + * @param string $config + * @param string|null $themeName + * @return string|null + * @desc Retourne simplement la valeur en DB par rapport à la clé complete + */ + public function getConfigValue(string $config, string $themeName = null): ?string + { + if ($themeName === null) { + $themeName = ThemeLoader::getInstance()->getCurrentTheme()->name(); + } + + $data = [ + 'config' => $config, + 'theme' => $themeName + ]; + + $db = DatabaseManager::getInstance(); + $req = $db->prepare('SELECT theme_config_value FROM cmw_theme_config WHERE theme_config_name = :config AND theme_config_theme = :theme'); + + if ($req->execute($data)) { + $value = $req->fetch()['theme_config_value'] ?? null; + } + + return $value ?? null; + } + + public function getExistingThemeConfigKeys(string $theme): array + { + $db = DatabaseManager::getInstance(); + $req = $db->prepare('SELECT theme_config_name FROM cmw_theme_config WHERE theme_config_theme = :theme'); + + if (!$req->execute(['theme' => $theme])) { + return []; + } + + $results = $req->fetchAll(PDO::FETCH_ASSOC); + if (!is_array($results)) { + return []; + } + + return array_column($results, 'theme_config_name'); + } + + + public function storeThemeConfigBulk(array $configs, string $theme): bool + { + if (empty($configs)) return true; + + $db = DatabaseManager::getInstance(); + $db->beginTransaction(); + + try { + $stmt = $db->prepare('INSERT INTO cmw_theme_config (theme_config_name, theme_config_value, theme_config_theme) VALUES (:name, :value, :theme)'); + + foreach ($configs as $config) { + $data = [ + 'name' => $config['name'], + 'value' => $config['value'], + 'theme' => $theme + ]; + + if (!$stmt->execute($data)) { + throw new RuntimeException('Failed to insert config'); + } + } + + $db->commit(); + return true; + } catch (Exception $e) { + $db->rollBack(); + return false; + } + } + } diff --git a/App/Package/Core/Package.php b/App/Package/Core/Package.php index dbe94a6e..4dc4c2d8 100644 --- a/App/Package/Core/Package.php +++ b/App/Package/Core/Package.php @@ -6,6 +6,7 @@ use CMW\Manager\Package\IPackageConfig; 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; @@ -101,7 +102,7 @@ public function menus(): ?array permission: null, subMenus: [ new PackageSubMenuType( - title: LangManager::translate('core.menu.themes.edit') . ThemeManager::getInstance()->getCurrentTheme()->name(), + title: LangManager::translate('core.menu.themes.edit') . ThemeLoader::getInstance()->getCurrentTheme()->name(), permission: 'core.themes.edit', url: 'theme/manage', subMenus: [] diff --git a/App/Package/Core/Views/Configuration/configuration.admin.view.php b/App/Package/Core/Views/Configuration/configuration.admin.view.php index 224837c3..2597d828 100644 --- a/App/Package/Core/Views/Configuration/configuration.admin.view.php +++ b/App/Package/Core/Views/Configuration/configuration.admin.view.php @@ -1,4 +1,5 @@->getValue('PATH_SUBFOLDER') ?>Public/Uploads/Favicon/favicon.ico)
-
+
*
diff --git a/App/Package/Core/Views/Mail/Resources/Images/empty.png b/App/Package/Core/Views/Mail/Resources/Images/empty.png new file mode 100644 index 00000000..05802525 Binary files /dev/null and b/App/Package/Core/Views/Mail/Resources/Images/empty.png differ diff --git a/App/Package/Core/Views/Mail/Resources/Images/red.png b/App/Package/Core/Views/Mail/Resources/Images/red.png new file mode 100644 index 00000000..2b33b3a4 Binary files /dev/null and b/App/Package/Core/Views/Mail/Resources/Images/red.png differ diff --git a/App/Package/Core/Views/Mail/Resources/Images/signed.png b/App/Package/Core/Views/Mail/Resources/Images/signed.png new file mode 100644 index 00000000..f9a04a5d Binary files /dev/null and b/App/Package/Core/Views/Mail/Resources/Images/signed.png differ diff --git a/App/Package/Core/Views/Mail/mailConfig.admin.view.php b/App/Package/Core/Views/Mail/mailConfig.admin.view.php index 167d4ce1..17487fce 100644 --- a/App/Package/Core/Views/Mail/mailConfig.admin.view.php +++ b/App/Package/Core/Views/Mail/mailConfig.admin.view.php @@ -1,109 +1,246 @@ +