maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
4,856 Commits 6 Branches 188 Tags
live
Commit Graph

74 Commits

Author SHA1 Message Date
Michael Kaufmann
bd48fb7328 catch exception of password-complexity check when changing account password; fixes #935 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-04-14 08:59:44 +02:00
Michael Kaufmann
57ae195930 for percentage calculation always use bytes so we don't compare KiB with GiB or similar 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-01-18 21:22:29 +01:00
Michael Kaufmann
9b86d576fa do not display usages on dashboard in fixed size-units but dynamically adjusted 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-01-18 20:49:55 +01:00
Michael Kaufmann
9f13aa9a12 only pass binding variable for prepared sql statement if variable exists 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2021-01-13 08:52:00 +01:00
Michael Kaufmann
fb54b887f2 remove unneeded apihelp-page code in admin/customer_index; set explicit version to api-doc URL; check for acme.sh cronjob and uninstall it, as froxlor manages that itself 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2019-10-10 16:42:32 +02:00
Michael Kaufmann
e64e8cafa6 define logger constants in logger class 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-26 15:51:26 +01:00
Michael Kaufmann
7416a41a42 get rid of most of the checkstyle warnings 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-24 13:50:45 +01:00
Michael Kaufmann
4cd005051b fixed last remaining function calls which are class-methods now 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-23 19:34:32 +01:00
Michael Kaufmann
3794003e63 minor fixes here and there 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-22 13:42:10 +01:00
Michael Kaufmann
0401e6971a Revert "refactor global array" 
This reverts commit c5a58e3f36.
 2018-12-22 08:15:31 +01:00
Michael Kaufmann
7e39a7bc60 Revert "refactor global array" 
This reverts commit 370ccbdb74.
 2018-12-22 08:15:31 +01:00
Michael Kaufmann
370ccbdb74 refactor global array 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 20:51:44 +01:00
Michael Kaufmann
c5a58e3f36 refactor global array 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 20:31:17 +01:00
Michael Kaufmann
5fa0f4b87e ugh, where was 2fa integration gone? 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 19:25:06 +01:00
Michael Kaufmann
7c68fa7bd0 fixed a few functions I've missed 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 19:16:49 +01:00
Michael Kaufmann
7563907df5 convert html-related functions 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 18:31:06 +01:00
Michael Kaufmann
1b090377ee even more function to class conversion 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 17:41:22 +01:00
Michael Kaufmann
0a28ef2af6 minor changes for unit-tests 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 16:32:44 +01:00
Michael Kaufmann
c0e89bbd05 refactor UI functions 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 11:22:03 +01:00
Michael Kaufmann
bed069f269 more function moving 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-20 08:33:32 +01:00
Michael Kaufmann
26510f0745 removing more ticket-stuff; update all unit-tests 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 19:42:50 +01:00
Michael Kaufmann
c4024c8107 use correct makeCorrect(Dir/File) everywhere 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 17:13:41 +01:00
Michael Kaufmann
8e84a4ff44 correct use of Database use 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 16:57:03 +01:00
Michael Kaufmann
6329042d40 use namespaces in modules 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-18 13:45:05 +01:00
Michael Kaufmann
c269cd5c5c added unit-tests for version-check; implemented settings import/export in API; minor variable declarations 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-11-25 11:17:56 +01:00
Michael Kaufmann (d00p)
697d972fba Merge remote-tracking branch 'origin/master' into 0.10.0 2018-04-01 10:35:33 +02:00
Michael Kaufmann (d00p)
e58192edc2 show whether curl extension is installed when trying to check for a new version in admin-dashboard 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-29 11:11:39 +02:00
Michael Kaufmann (d00p)
b07d6ceeaa started UI api-key management 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-04 12:40:47 +01:00
Michael Kaufmann (d00p)
662f537a0d fixes in Admins.update(); use ApiCommand for theme-, language- and password-change 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-23 12:48:17 +01:00
Michael Kaufmann (d00p)
b42a7b1b26 show basic api doc in webinterface (top-menu - options - API help) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-22 13:41:28 +01:00
Michael Kaufmann (d00p)
2da2912c9c set update-check-urls to api-version; started working on Customers-ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-16 10:56:27 +01:00
Michael Kaufmann (d00p)
4d3fa6eca5 get rid of the need for allow_url_fopen 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-09 10:50:14 +01:00
Michael Kaufmann (d00p)
421c29c491 remove each() keyword as it is deprecated as of php-7.2, fixes #479 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-10-31 13:03:06 +01:00
Michael Kaufmann (d00p)
f1f7d7dd14 add db-version to error-reporting 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-10-07 16:11:23 +02:00
Daniel Reichelt
56c8e90700 display system hostname and some memory info on dashboard 
hostname may be useful in situations where several froxlors are
reverse-proxied on a single webserver
 2016-09-16 09:16:19 +02:00
Florian Aders
deb19f2625 Removed unnecessary exit - calls 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-22 12:10:18 +01:00
Andreas Grundler
28f26cce72 fix for bug #1482 2015-02-01 12:25:26 +01:00
Michael Kaufmann (d00p)
2250b3c37a show custom-notes correctly on admin/customer index when activated + tiny fixes, refs #1471 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-15 22:19:28 +01:00
Michael Kaufmann (d00p)
d6fdf887ce don't add session-id to external redirects, thx to Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-19 11:08:43 +01:00
Michael Kaufmann (d00p)
db5a80a7e1 fix version-check to display output text again if a newer version is available 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-30 17:14:26 +01:00
Florian Aders (EleRas)
b4a345d182 Allow themes to have various variants 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-29 17:35:03 +01:00
Michael Kaufmann (d00p)
276d6b30d1 first few implementations of new Setting-class, refs #1325 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-15 11:47:23 +01:00
Michael Kaufmann (d00p)
296b8b36ab Merge remote-tracking branch 'origin/0.9.31' 2013-12-13 21:33:24 +01:00
Michael Kaufmann (d00p)
83b615bc37 why easy if you could do it the hard way? :P 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-13 08:14:01 +01:00
Michael Kaufmann (d00p)
18933ad118 Merge remote-tracking branch 'origin/0.9.31' 2013-12-12 11:38:32 +01:00
Michael Kaufmann (d00p)
8516cbb64d don't show 'there is a newer version of froxlor available' if a customzied (unknown) version is being checked 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-12 11:20:19 +01:00
Michael Kaufmann (d00p)
eca5265735 more removing of aps/autoresponder/backup 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-05 08:37:58 +01:00
Michael Kaufmann (d00p)
30f7d0a070 make send-report an option for admin and customer (section: security) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-02 20:26:39 +01:00
Michael Kaufmann (d00p)
cf3de1c657 fix customer-mysql overview, set better email address for error-reports to send to 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-29 23:13:26 +01:00
Michael Kaufmann (d00p)
3774b967f8 fix minor errors 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-29 11:28:48 +01:00