maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
5,881 Commits 6 Branches 188 Tags
c9c803900a90dd41eec4318151d2e567136d0ff1
Commit Graph

5881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann
7cdf6c8d64 don't output ipv6 in brackets for system.ipaddress setting as the brackets will be added to the value resulting in an invalid mysql-access-host; fixes #1215 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-01 17:04:02 +01:00
Michael Kaufmann
60621da243 dont use deprecated 'mysql_native_password' for mysql8; fixes #1214 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-01-01 12:24:45 +01:00
Michael Kaufmann
96ccdda304 use different language string for password-placeholder when adding a new customer; fixes #1216 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-31 18:01:39 +01:00
Michael Kaufmann
4073984fd7 traffic-cron: check for standardsubdomain to be in the domainlist array to avoid undefined index if e.g. an alias was set to the standardsubdomain 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-31 16:16:01 +01:00
Michael Kaufmann
ea31c8a64d fix font-color in apcu info; clear updatecheck-cache for nightly users 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-30 23:30:52 +01:00
Michael Kaufmann
832ee07e0e Don't show stats-icon for domains with redirect; hide goaccess output in traffic cron and keepalive database connection for long-running log-analysis; use same certificate-file if child-domain inherits the parentdomains certificate data (avoid possible http 421 Misdirected Request) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-29 10:15:45 +01:00
Michael Kaufmann
b542b140c6 set version to 2.1.3 for bugfix release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.1.3 		2023-12-22 14:33:11 +01:00
Michael Kaufmann
ac89fc7120 adjust order of css files 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-22 14:30:23 +01:00
Michael Kaufmann
150858485d include custom.css from config.json if preset correctly 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-21 10:59:15 +01:00
Michael Kaufmann
e7810e2066 correctly merge fielddetails with prefetched-formfielddata in form-processing 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-20 09:39:01 +01:00
Michael Kaufmann
4879446567 domains in php-configs are not sortable 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-19 17:17:51 +01:00
Michael Kaufmann
43eff78088 use panel.password_min_length setting for Froxlor.generatePassword() default length parameter; allow '::1' as valid mysql localhost value; wrapper to clean output for cli installation 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-16 20:20:58 +01:00
Gamerboy59
55a2ae3801 Add manual_config install var to cli (#1208) 
Make the manual_config var, which is available to the web installer, usuable for the cli installer too. If manual_config is set to true skip else (not set or false) proceed with auto config.
 2023-12-16 20:13:58 +01:00
Michael Kaufmann
a3b0332d13 set version to 2.1.2 for bugfix release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.1.2 		2023-12-15 09:41:16 +01:00
Michael Kaufmann
4b1846883d Merge pull request from GHSA-625g-fm5w-w7w4 
* fix possibility to have empty name/surname and empty company

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

* let js validation for customer add/edit form also trim() entered data to avoid empty values pass the client-side validation

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

---------

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-15 09:36:06 +01:00
Michael Kaufmann
778fd3ba65 fix wrong size-unit for mailquota-dashboard-info; fixes #1207 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-15 09:32:02 +01:00
Michael Kaufmann
00456a35e5 fix 2fa login when using email validation, thx to wysiwtf; adjusting row-format of larger tables 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-13 16:20:28 +01:00
Michael Kaufmann
5958f0516b do not css-check/clean passwords of the installation process; fixes #1203 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-12 09:33:28 +01:00
Michael Kaufmann
166ffedf04 correctly merge themeoptions array to use correct image on login when using darkmode 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-12 08:59:56 +01:00
Michael Kaufmann
36dfee1263 fix non-empty value for file-input fields when using uploaded logos 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-12 08:58:33 +01:00
Michael Kaufmann
ec0026ecfd fix wrong type when dns zone for system-hostname is active 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-11 14:20:08 +01:00
Michael Kaufmann
a721bb3f21 remove old 0.10.x and 2.0.x distribution-config-xml's for updaters 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-10 20:47:31 +01:00
Michael Kaufmann
83de3dd719 handle unknown distribution if there's a now unsupported distribution selected for the config-templates 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-10 19:23:58 +01:00
Michael Kaufmann
5615decd96 set version to 2.1.1 for bugfix release (dns and install) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.1.1 		2023-12-10 08:20:12 +01:00
Michael Kaufmann
0348b1ec7e fix wrong result in Domain::getMainSubdomainIds(); fixes #1202 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-09 14:25:58 +01:00
Michael Kaufmann
1467dab58f set version to 2.1.0 for upcoming stable release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.1.0 		2023-12-08 11:48:32 +01:00
Michael Kaufmann
3a8f48de35 check subclass for cli commands to be \Symfony\Component\Console\Command\Command as the installcommand does not use \Froxlor\Cli\CliCommand 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-07 11:16:53 +01:00
Michael Kaufmann
46391c06ec Merge branch 'main' of github.com:Froxlor/Froxlor 2023-12-06 08:11:17 +01:00
dependabot[bot]
7103f7dd51 Bump vite from 4.4.11 to 4.4.12 (#1201) 
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.4.11 to 4.4.12.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v4.4.12/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.4.12/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-12-06 08:11:01 +01:00
Michael Kaufmann
9fc1dfee41 better check for invalid cli classes 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-05 12:50:57 +01:00
Michael Kaufmann
82dc76fdc6 fix wrong escaping of backslash in class-names when updating cronjobs_run table; add missing validateFormField-method for type 'image' (needs to be present but image-validation is handled elsewhere 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-05 11:16:41 +01:00
Michael Kaufmann
02ae52e3df remove old files in updater; avoid including old cli files in froxlor-cli; fix css for card list-groups 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-12-05 10:22:12 +01:00
Michael Kaufmann
5c06683e27 set version to 2.1.0-rc3 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.1.0-rc3 		2023-12-01 21:41:21 +01:00
Michael Kaufmann
2684372156 little work on installation; replace hardcoded strings with variables/constants; update dependencies 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-11-30 11:41:20 +01:00
Michael Kaufmann
d80c6d5714 dynamically read in CLI commands for froxlor-bin 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-11-28 09:07:30 +01:00
Michael Kaufmann
1ae5311b81 disable default php-fpm config for apache as for some users, it is enabled and used prior to froxlor generated virtual-host configs resulting in no php-rendering 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-11-27 16:43:13 +01:00
Michael Kaufmann
e1e7555cce minor textual adjustments; add non-session-based csrf-token for js/axios as it is configured to append it to the http-request 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-11-27 16:42:15 +01:00
Michael Kaufmann
4f79d7cf4b check php-extension requirements not only on installation (e.g. when php version was changed) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-11-26 22:22:39 +01:00
Michael Kaufmann
b13b1e8ac7 correctly handle empty logger.logfile setting if 'file' is in the activated log-types and no file name was given, thx to Oops 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-11-26 17:56:30 +01:00
Michael Kaufmann
6a1e7cc539 actually create notice file for 'unconfigured/unmanaged domain' and redirect it for potential dynamic contents (e.g. file extension php) to work properly 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-11-26 15:19:49 +01:00
Michael Kaufmann
2e87633ef7 table-adjustments for panel_templates #2 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-11-26 10:58:19 +01:00
Michael Kaufmann
8a23d0b72c table-adjustments for panel_templates 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-11-26 10:55:24 +01:00
Michael Kaufmann
735ef85088 make unconfigured/unknown domain page a file-template 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-11-26 10:53:41 +01:00
Michael Kaufmann
75cf44a6d2 respect custom-theme variants in UI::getTheme(); add margin to customer-services dashboard-badges 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-11-26 09:24:44 +01:00
Michael Kaufmann
7e0073f4a3 on building nightly, of course also install composer dependencies 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-11-15 22:53:23 +01:00
Michael Kaufmann
c9291df345 rename validateFormFieldHiddenString to validateFormFieldPassword 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-11-15 22:37:25 +01:00
Michael Kaufmann
fd5e97d48c introduce nightly builds and nightly-update-channel 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-11-15 22:16:29 +01:00
Michael Kaufmann
64a9fb163a remove duplicated code-line 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-11-15 10:34:31 +01:00
Michael Kaufmann
b0256ffb7d add REBUILD_VHOST task if only openbasedir-path value changes; fixes #1200 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-11-15 08:08:48 +01:00
Michael Kaufmann
e606bdc97f Merge branch 'main' of github.com:Froxlor/Froxlor 2023-11-12 13:09:07 +01:00