fa/breadcrumb-the-shire
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

big restructure

Browse Source
This commit is contained in:
Felix Schneider
2026-02-11 19:28:12 +01:00
parent cd59ccd99b
commit 3eb9cc0ac4
209 changed files with 5101 additions and 2459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Support/Guard.php
View File

@@ -3,9 +3,9 @@
namespace MintyPHP\Support;
use MintyPHP\Router;
use MintyPHP\Service\PermissionService;
use MintyPHP\Service\TenantService;
use MintyPHP\Service\AuthService;
use MintyPHP\Service\Access\PermissionService;
use MintyPHP\Service\Tenant\TenantService;
use MintyPHP\Service\Auth\AuthService;
use MintyPHP\Http\Request;
class Guard

80
lib/Support/SearchConfig.php
View File

@@ -2,8 +2,8 @@
namespace MintyPHP\Support;
use MintyPHP\Service\PermissionService;
use MintyPHP\Service\UserAvatarService;
use MintyPHP\Service\Access\PermissionService;
use MintyPHP\Service\User\UserAvatarService;
class SearchConfig
{
@@ -17,97 +17,125 @@ class SearchConfig
];
}
private static function normalizeLikeQuery(string $query): string
{
$query = trim($query);
if ($query === '') {
return '';
}
$query = str_replace('\\', '\\\\', $query);
$query = str_replace('_', '\\_', $query);
$query = str_replace('*', '%', $query);
if (!str_starts_with($query, '%')) {
$query = '%' . $query;
}
if (!str_ends_with($query, '%')) {
$query = $query . '%';
}
return $query;
}
public static function normalizeScoreQuery(string $query): string
{
$query = trim($query);
if ($query == '') {
return '';
}
return str_replace(['*', '%', '_'], '', $query);
}
public static function resources(string $query, string $locale): array
{
$like = '%' . $query . '%';
$like = self::normalizeLikeQuery($query);
return [
[
'key' => 'address-book',
'label' => t('Address book'),
'permission' => PermissionService::ADDRESS_BOOK_VIEW,
'countSql' => 'select count(*) from users where active = 1 and (first_name like ? or last_name like ? or email like ?) {{tenantFilter}}',
'countSql' => "select count(*) from users where active = 1 and (first_name like ? escape '\\\\' or last_name like ? escape '\\\\' or email like ? escape '\\\\') {{tenantFilter}}",
'countParams' => [$like, $like, $like],
'previewSql' => 'select uuid, first_name, last_name, email from users where active = 1 and (first_name like ? or last_name like ? or email like ?) {{tenantFilter}} order by last_name, first_name limit ?',
'previewSql' => "select uuid, first_name, last_name, email from users where active = 1 and (first_name like ? escape '\\\\' or last_name like ? escape '\\\\' or email like ? escape '\\\\') {{tenantFilter}} order by last_name, first_name limit ?",
'previewParams' => [$like, $like, $like],
'resultSql' => 'select uuid, first_name, last_name, email from users where active = 1 and (first_name like ? or last_name like ? or email like ?) {{tenantFilter}} order by last_name, first_name',
'resultSql' => "select uuid, first_name, last_name, email from users where active = 1 and (first_name like ? escape '\\\\' or last_name like ? escape '\\\\' or email like ? escape '\\\\') {{tenantFilter}} order by last_name, first_name",
'resultParams' => [$like, $like, $like],
],
[
'key' => 'users',
'label' => t('Users'),
'permission' => PermissionService::USERS_VIEW,
'countSql' => 'select count(*) from users where (first_name like ? or last_name like ? or email like ?) {{tenantFilter}}',
'countSql' => "select count(*) from users where (first_name like ? escape '\\\\' or last_name like ? escape '\\\\' or email like ? escape '\\\\') {{tenantFilter}}",
'countParams' => [$like, $like, $like],
'previewSql' => 'select uuid, first_name, last_name, email from users where (first_name like ? or last_name like ? or email like ?) {{tenantFilter}} order by last_name, first_name limit ?',
'previewSql' => "select uuid, first_name, last_name, email from users where (first_name like ? escape '\\\\' or last_name like ? escape '\\\\' or email like ? escape '\\\\') {{tenantFilter}} order by last_name, first_name limit ?",
'previewParams' => [$like, $like, $like],
'resultSql' => 'select uuid, first_name, last_name, email from users where (first_name like ? or last_name like ? or email like ?) {{tenantFilter}} order by last_name, first_name',
'resultSql' => "select uuid, first_name, last_name, email from users where (first_name like ? escape '\\\\' or last_name like ? escape '\\\\' or email like ? escape '\\\\') {{tenantFilter}} order by last_name, first_name",
'resultParams' => [$like, $like, $like],
],
[
'key' => 'tenants',
'label' => t('Tenants'),
'permission' => PermissionService::TENANTS_VIEW,
'countSql' => 'select count(*) from tenants where description like ? {{tenantFilter}}',
'countSql' => "select count(*) from tenants where description like ? escape '\\\\' {{tenantFilter}}",
'countParams' => [$like],
'previewSql' => 'select uuid, description from tenants where description like ? {{tenantFilter}} order by description limit ?',
'previewSql' => "select uuid, description from tenants where description like ? escape '\\\\' {{tenantFilter}} order by description limit ?",
'previewParams' => [$like],
'resultSql' => 'select uuid, description from tenants where description like ? {{tenantFilter}} order by description',
'resultSql' => "select uuid, description from tenants where description like ? escape '\\\\' {{tenantFilter}} order by description",
'resultParams' => [$like],
],
[
'key' => 'departments',
'label' => t('Departments'),
'permission' => PermissionService::DEPARTMENTS_VIEW,
'countSql' => 'select count(*) from departments where description like ? {{tenantFilter}}',
'countSql' => "select count(*) from departments where description like ? escape '\\\\' {{tenantFilter}}",
'countParams' => [$like],
'previewSql' => 'select uuid, description from departments where description like ? {{tenantFilter}} order by description limit ?',
'previewSql' => "select uuid, description from departments where description like ? escape '\\\\' {{tenantFilter}} order by description limit ?",
'previewParams' => [$like],
'resultSql' => 'select uuid, description from departments where description like ? {{tenantFilter}} order by description',
'resultSql' => "select uuid, description from departments where description like ? escape '\\\\' {{tenantFilter}} order by description",
'resultParams' => [$like],
],
[
'key' => 'roles',
'label' => t('Roles'),
'permission' => PermissionService::ROLES_VIEW,
'countSql' => 'select count(*) from roles where description like ?',
'countSql' => "select count(*) from roles where active = 1 and description like ? escape '\\\\'",
'countParams' => [$like],
'previewSql' => 'select uuid, description from roles where description like ? order by description limit ?',
'previewSql' => "select uuid, description from roles where active = 1 and description like ? escape '\\\\' order by description limit ?",
'previewParams' => [$like],
'resultSql' => 'select uuid, description from roles where description like ? order by description',
'resultSql' => "select uuid, description from roles where active = 1 and description like ? escape '\\\\' order by description",
'resultParams' => [$like],
],
[
'key' => 'permissions',
'label' => t('Permissions'),
'permission' => PermissionService::PERMISSIONS_VIEW,
'countSql' => 'select count(*) from permissions where `key` like ? or description like ?',
'countSql' => "select count(*) from permissions where active = 1 and (`key` like ? escape '\\\\' or description like ? escape '\\\\')",
'countParams' => [$like, $like],
'previewSql' => 'select id, description, `key` from permissions where `key` like ? or description like ? order by `key` limit ?',
'previewSql' => "select id, description, `key` from permissions where active = 1 and (`key` like ? escape '\\\\' or description like ? escape '\\\\') order by `key` limit ?",
'previewParams' => [$like, $like],
'resultSql' => 'select id, description, `key` from permissions where `key` like ? or description like ? order by `key`',
'resultSql' => "select id, description, `key` from permissions where active = 1 and (`key` like ? escape '\\\\' or description like ? escape '\\\\') order by `key`",
'resultParams' => [$like, $like],
],
[
'key' => 'pages',
'label' => t('Pages'),
'permission' => '',
'countSql' => 'select count(*) from pages p join page_contents pc on pc.page_id = p.id and pc.locale = ? where p.slug like ? or pc.content like ?',
'countSql' => "select count(*) from pages p join page_contents pc on pc.page_id = p.id and pc.locale = ? where p.slug like ? escape '\\\\' or pc.content like ? escape '\\\\'",
'countParams' => [$locale, $like, $like],
'previewSql' => 'select p.slug from pages p join page_contents pc on pc.page_id = p.id and pc.locale = ? where p.slug like ? or pc.content like ? order by p.slug limit ?',
'previewSql' => "select p.slug from pages p join page_contents pc on pc.page_id = p.id and pc.locale = ? where p.slug like ? escape '\\\\' or pc.content like ? escape '\\\\' order by p.slug limit ?",
'previewParams' => [$locale, $like, $like],
'resultSql' => 'select p.slug from pages p join page_contents pc on pc.page_id = p.id and pc.locale = ? where p.slug like ? or pc.content like ? order by p.slug',
'resultSql' => "select p.slug from pages p join page_contents pc on pc.page_id = p.id and pc.locale = ? where p.slug like ? escape '\\\\' or pc.content like ? escape '\\\\' order by p.slug",
'resultParams' => [$locale, $like, $like],
],
[
'key' => 'settings',
'label' => t('Settings'),
'permission' => PermissionService::SETTINGS_VIEW,
'countSql' => 'select count(*) from settings where `key` like ? or value like ?',
'countSql' => "select count(*) from settings where `key` like ? escape '\\\\' or value like ? escape '\\\\'",
'countParams' => [$like, $like],
'previewSql' => null,
'previewParams' => [],
'resultSql' => 'select `key`, value from settings where `key` like ? or value like ? order by `key`',
'resultSql' => "select `key`, value from settings where `key` like ? escape '\\\\' or value like ? escape '\\\\' order by `key`",
'resultParams' => [$like, $like],
],
];

2
lib/Support/Tile.php
View File

@@ -14,6 +14,8 @@ class Tile
'iconBg' => null,
'iconColor' => null,
'class' => '',
'tooltip' => '',
'tooltipPos' => 'top',
];
$data = array_merge($defaults, $options);

126
lib/Support/helpers/app.php
View File

@@ -10,6 +10,23 @@ function asset(string $path): string
return \MintyPHP\Router::getBaseUrl() . ltrim($path, '/');
}
function templatePath(string $path): string
{
return dirname(__DIR__, 3) . '/templates/' . ltrim($path, '/');
}
function assetVersion(string $path): string
{
$path = ltrim($path, '/');
$file = dirname(__DIR__, 3) . '/web/' . $path;
$url = asset($path);
$version = @filemtime($file);
if ($version === false) {
return $url;
}
return $url . '?v=' . $version;
}
function localeBase(): string
{
$locale = \MintyPHP\I18n::$locale ?? \MintyPHP\I18n::$defaultLocale;
@@ -58,6 +75,16 @@ function appUrl(string $path = ''): string
return $base . '/' . $path;
}
function currentUserDisplayName(): string
{
$user = $_SESSION['user'] ?? [];
$name = trim((string) (($user['first_name'] ?? '') . ' ' . ($user['last_name'] ?? '')));
if ($name !== '') {
return $name;
}
return trim((string) ($user['email'] ?? ''));
}
function appLogoUrlAbsolute(int $size = 128): string
{
$url = appLogoUrl($size);
@@ -79,6 +106,36 @@ function appSetting(string $key): ?string
return $value !== '' ? $value : null;
}
function appThemes(): array
{
$file = dirname(__DIR__, 3) . '/config/themes.php';
if (!is_file($file)) {
return [
'light' => 'Light',
'dark' => 'Dark',
];
}
$themes = include $file;
if (!is_array($themes)) {
return [
'light' => 'Light',
'dark' => 'Dark',
];
}
$clean = [];
foreach ($themes as $key => $label) {
$key = strtolower(trim((string) $key));
$label = trim((string) $label);
if ($key !== '' && $label !== '') {
$clean[$key] = $label;
}
}
return $clean ?: [
'light' => 'Light',
'dark' => 'Dark',
];
}
function appDefaultLocale(): ?string
{
$locale = appSetting('app_locale');
@@ -94,13 +151,29 @@ function appDefaultLocale(): ?string
function appDefaultTheme(): string
{
$themes = appThemes();
$setting = appSetting('app_theme');
if (in_array($setting, ['light', 'dark'], true)) {
if ($setting !== null && isset($themes[$setting])) {
return $setting;
}
$envTheme = getenv('APP_THEME') ?: 'light';
$envTheme = strtolower(trim((string) $envTheme));
return in_array($envTheme, ['light', 'dark'], true) ? $envTheme : 'light';
return isset($themes[$envTheme]) ? $envTheme : 'light';
}
function currentTheme(): string
{
$themes = appThemes();
$theme = appDefaultTheme();
if (!allowUserTheme()) {
return $theme;
}
$user = $_SESSION['user'] ?? [];
$userTheme = strtolower(trim((string) ($user['theme'] ?? '')));
if ($userTheme !== '' && isset($themes[$userTheme])) {
return $userTheme;
}
return $theme;
}
function allowUserTheme(): bool
@@ -112,6 +185,15 @@ function allowUserTheme(): bool
return in_array(strtolower($value), ['1', 'true', 'yes', 'on'], true);
}
function allowRegistration(): bool
{
$value = appSetting('app_registration');
if ($value === null || $value === '') {
return true;
}
return in_array(strtolower($value), ['1', 'true', 'yes', 'on'], true);
}
function appPrimaryColor(): ?string
{
$tenantColor = $_SESSION['current_tenant']['primary_color'] ?? null;
@@ -147,26 +229,40 @@ function appPrimaryCssVars(): string
$g = hexdec(substr($hex, 2, 2)) / 255;
$b = hexdec(substr($hex, 4, 2)) / 255;
$monoThreshold = 0.000001;
if (abs($r - $g) < $monoThreshold && abs($g - $b) < $monoThreshold) {
$l = round($r * 100, 2) . '%';
return "--app-primary-h-base: 0; --app-primary-s-base: 0%; --app-primary-l-base: {$l}; --app-primary-h-light: 0; --app-primary-s-light: 0%; --app-primary-l-light: {$l};";
}
$max = max($r, $g, $b);
$min = min($r, $g, $b);
$delta = $max - $min;
if ($delta == 0.0) {
$l = round((($max + $min) / 2) * 100, 2) . '%';
return "--app-primary-h-base: 0; --app-primary-s-base: 0%; --app-primary-l-base: {$l}; --app-primary-h-light: 0; --app-primary-s-light: 0%; --app-primary-l-light: {$l};";
}
$h = 0.0;
if ($delta !== 0.0) {
if ($max === $r) {
$h = 60 * fmod((($g - $b) / $delta), 6);
} elseif ($max === $g) {
$h = 60 * ((($b - $r) / $delta) + 2);
} else {
$h = 60 * ((($r - $g) / $delta) + 4);
}
if ($max === $r) {
$h = 60 * fmod((($g - $b) / $delta), 6);
} elseif ($max === $g) {
$h = 60 * ((($b - $r) / $delta) + 2);
} else {
$h = 60 * ((($r - $g) / $delta) + 4);
}
if ($h < 0) {
$h += 360;
}
$l = ($max + $min) / 2;
$s = $delta === 0.0 ? 0.0 : $delta / (1 - abs(2 * $l - 1));
$denominator = 1 - abs(2 * $l - 1);
if ($delta === 0.0 || $denominator == 0.0) {
$s = 0.0;
} else {
$s = $delta / $denominator;
}
$h = round($h, 2);
$s = round($s * 100, 2) . '%';
@@ -177,7 +273,7 @@ function appPrimaryCssVars(): string
function appLogoUrl(?int $size = null): string
{
if (class_exists('MintyPHP\\Service\\BrandingLogoService') && \MintyPHP\Service\BrandingLogoService::hasLogo()) {
if (class_exists('MintyPHP\\Service\\Branding\\BrandingLogoService') && \MintyPHP\Service\Branding\BrandingLogoService::hasLogo()) {
$query = $size ? '?size=' . (int) $size : '';
return lurl('branding/logo' . $query);
}
@@ -187,9 +283,9 @@ function appLogoUrl(?int $size = null): string
function appFaviconUrl(string $file): string
{
$tenantUuid = $_SESSION['current_tenant']['uuid'] ?? '';
if ($tenantUuid !== '' && class_exists('MintyPHP\\Service\\TenantFaviconService')) {
if (\MintyPHP\Service\TenantFaviconService::hasFavicon($tenantUuid)) {
return asset('favicon/tenants/' . $tenantUuid . '/' . ltrim($file, '/'));
if ($tenantUuid !== '' && class_exists('MintyPHP\\Service\\Tenant\\TenantFaviconService')) {
if (\MintyPHP\Service\Tenant\TenantFaviconService::hasFavicon($tenantUuid)) {
return asset('favicon/tenants/' . $tenantUuid . '/favicon/' . ltrim($file, '/'));
}
}
return asset('favicon/' . ltrim($file, '/'));

6
lib/Support/helpers/auth.php
View File

@@ -13,12 +13,12 @@ function can(string $permissionKey): bool
if ($userId <= 0) {
return false;
}
if (!class_exists('MintyPHP\\Service\\PermissionService')) {
if (!class_exists('MintyPHP\\Service\\Access\\PermissionService')) {
return false;
}
$keys = \MintyPHP\Service\PermissionService::getCachedPermissions($userId);
$keys = \MintyPHP\Service\Access\PermissionService::getCachedPermissions($userId);
if (!$keys) {
$keys = \MintyPHP\Service\PermissionService::getUserPermissions($userId);
$keys = \MintyPHP\Service\Access\PermissionService::getUserPermissions($userId);
if (!$keys) {
return false;
}