Commit Graph

4942 Commits

Author SHA1 Message Date
envoyr
e638511826
merge branch '0.11-dev' of github.com:Froxlor/Froxlor into 0.11-dev 2022-04-21 18:20:13 +02:00
envoyr
cb7f180d8d
update cron fpm config builder and webpack assets 2022-04-21 18:19:23 +02:00
Michael Kaufmann
f82d78ad5d
add 'back to overview' links when adding/editing entities
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-20 17:08:49 +02:00
Michael Kaufmann
35a8fe7372 Merge branch '0.11-dev' of github.com:Froxlor/Froxlor into 0.11-dev 2022-04-20 17:06:57 +02:00
envoyr
16c38b4066
merge branch '0.11-dev' of https://github.com/Froxlor/Froxlor into 0.11-dev 2022-04-20 17:01:33 +02:00
envoyr
8c942178d2
fix font assets path, logo path, database installation and checks 2022-04-20 17:01:25 +02:00
Michael Kaufmann
74021ae142
fix ftp-action-links in listing; fix display of running/scheduled backup-job
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-20 16:51:40 +02:00
Michael Kaufmann
949f258f54
reflect same permission requirement for documentroot in Domains.add() and Domains.update()
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-20 16:18:02 +02:00
Michael Kaufmann
b1191917b8
avoid redirect-loop when displaying error in admin-autoupdate; fix description for 'move to domain to other customer'
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-20 16:12:42 +02:00
Michael Kaufmann
ebceab96b4
introduce static configs to enable/disable web-update (and possibly more later on)
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-20 15:18:50 +02:00
Michael Kaufmann
b362c1f232 remove unused IgnorantRecursiveDirectoryIterator and fix uninitialized variables
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-20 15:13:35 +02:00
Michael Kaufmann
58c646f59e
allow api interaction via kind-of-RESTful style via api.php?/module/command/
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-17 20:59:25 +02:00
Michael Kaufmann
d1dda00a1c Merge branch '0.11-dev' of github.com:Froxlor/Froxlor into 0.11-dev 2022-04-17 17:18:13 +02:00
Michael Kaufmann
9f0253819b
adjustments
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-17 17:18:09 +02:00
Dennis Dudek
25d9c52c58
remove unnecessary ternaries (#1027)
* remove unnecessary ternaries

* fix: !($id <= 0);

* remove ternary
2022-04-14 09:02:10 +02:00
Dennis Dudek
d90676a793
Optimised phpdoc and array value use in foreach (#1026)
* use array values by already destructed values in foreach
corrected php docs to use string|array

* use values by already desctructered array values in foreach
2022-04-13 10:37:25 +02:00
Dennis Dudek
7a13e4a421
remove nested dirname and use level parameter for better readability (#1025) 2022-04-13 10:14:03 +02:00
Michael Kaufmann
3fbf23cb47
switch from crypt() to password_hash() and password_verify(), thx to kapsonfire for the hint
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-10 14:35:20 +02:00
Michael Kaufmann
90682b774a
fine-tuning configservices cli script
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-10 14:32:43 +02:00
envoyr
cf19331f75
Merge branch '0.11-dev' of github.com:Froxlor/Froxlor into 0.11-dev 2022-04-10 13:41:19 +02:00
envoyr
e9d1f9d68f
update search 2022-04-10 13:41:07 +02:00
Michael Kaufmann
5081d6d916
fix php compatibility hopefully for real now
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-10 10:29:43 +02:00
Michael Kaufmann
f540ed4eb5
require correct version of symfony/console to be php7.4 compatible
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-10 10:15:29 +02:00
Michael Kaufmann
0f4325f68d
migrate shell/helper scripts to symfony/console components
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-10 10:05:21 +02:00
Michael Kaufmann
7f0eb97f9b
show apikey details in modal-overlay; todo: edit allowed_from and valid_until
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-09 13:32:08 +02:00
Michael Kaufmann
9272c15706
add advanced_mode flag to various settings; exclude from output and global-search when settings-mode is 'basic'
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-08 18:41:28 +02:00
Michael Kaufmann
578b2811a5
add new settings_mode setting to switch between basic and advanced view
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-08 15:53:20 +02:00
Michael Kaufmann
01c6096998
use correct (new) class to call getThemes()
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-03 23:00:14 +02:00
Michael Kaufmann
2bb5c31a0f
use correct method to get CurrentUser data-field
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-03 20:04:55 +02:00
Michael Kaufmann
64994e6444
don't try to globalsearch specific 'settings' search
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-03 18:56:40 +02:00
Michael Kaufmann
a4b780e7f7
don't search setting when using specific search and not settings: specified
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-03 18:54:37 +02:00
Michael Kaufmann
7779ec376a
remove unused lib/version.inc.php file; added module-specific search to global-search; added new table for user-column-settings
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-03 18:42:49 +02:00
Michael Kaufmann
07049909ef remove accidentally added character
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-03 14:44:13 +02:00
Michael Kaufmann
c7833beff4 fix exit statement in cli scripts
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-03 14:42:02 +02:00
Michael Kaufmann
d18fa771f4 respect domain.writeerrorlog and domain.writeaccesslog when using log-to-pipe
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-03 14:35:09 +02:00
Michael Kaufmann
1441ed9a99
make search-result links a filter/search for the overview instead of the direct edit-link; show number of total entries in overview; show 'back to overview' button when showing search-result
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-01 16:47:22 +02:00
Michael Kaufmann
0312548e88 don't rely on executable flag for php-sessionclean script
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-01 14:48:55 +02:00
Michael Kaufmann
ef04d6532a
fix phpunit-tests for dev-versions
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-01 10:36:27 +02:00
Michael Kaufmann
eacf383928
set valid version
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-01 10:32:39 +02:00
Michael Kaufmann
5f0429ef77
set development version to 0.11.0-dev
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-01 10:27:37 +02:00
Michael Kaufmann
78a4c109e4
validate sql_search and sql_orderby API parameters, fix unit-tests as of new default skin is 'Froxlor'
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-04-01 09:37:07 +02:00
envoyr
6ce2afa6a4
remove compiled assets from git 2022-03-27 16:02:07 +02:00
envoyr
957f41ae87
update default theme in froxlor.sql 2022-03-27 15:36:13 +02:00
Michael Kaufmann
4e8fddadff
fix filename of template
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-03-27 15:00:44 +02:00
Michael Kaufmann
60433358f6
remove Sparkle-theme (old template-engine)
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-03-27 14:59:17 +02:00
Michael Kaufmann
fb7091403c
migrate recalc.resource-usage
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-03-27 14:58:52 +02:00
Michael Kaufmann
51ba6c757e
migrate customer::backups
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-03-27 13:19:26 +02:00
Michael Kaufmann
943301e908
refactor error-reporting for admin/customer; remove now unused Froxlor\UI\Template class
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-03-27 12:44:44 +02:00
FliegenKLATSCH
2a91dafe20 Fix distro in postfix smtpd banner (#1014) 2022-03-27 11:11:05 +02:00
Michael Kaufmann
0b7443e875
refactor admin_acpuinfo
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2022-03-26 16:47:46 +01:00