maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
3,910 Commits 6 Branches 188 Tags
b0e11f5708819b19ccaac483b3696e905e4b4342
Commit Graph

63 Commits

Author SHA1 Message Date
Michael Kaufmann
f9ad392e39 remove refactored functions 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 13:00:39 +01:00
Michael Kaufmann
97b5439c0d auto-format all files; add table-definitions to test-bootstrap file 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 12:24:07 +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
8c896d60d6 get rid of some more functions 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-20 07:43:40 +01:00
Michael Kaufmann
adc627ca4e minor fixes to template engine for now 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 20:38:29 +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
d39cebc70e Merge remote-tracking branch 'origin/master' into 0.10.0 2018-06-01 08:01:09 +02:00
Michael Kaufmann
10330f8a7a fix fallback redirect code when customredirect is enabled and default is selected 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-05-24 17:44:36 +02:00
Michael Kaufmann
926914788f Merge remote-tracking branch 'origin/master' into 0.10.0 2018-04-25 12:30:00 +02:00
Michael Kaufmann
b3d018c506 corrected usage of default redirect code from settings; fixes #546 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
 2018-04-25 12:27:40 +02:00
Michael Kaufmann (d00p)
a222114d0a remove unnecessary parameter-checks as they will never happen; make Customers.update callable for customers 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-25 15:02:58 +01:00
Michael Kaufmann (d00p)
603e14913b finished Customer::update(), untested 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-19 10:45:41 +01:00
Michael Kaufmann (d00p)
0fc2fbaf09 add language strings (english only currently) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-15 12:59:34 +01:00
Michael Kaufmann (d00p)
dd371c72a2 start api implementation 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-15 07:47:35 +01:00
Michael Kaufmann (d00p)
5612720342 only let admin select php-configs that the customer is allowed to use to avoid unwanted php-config changes when customer edits domain, refs #514 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-09 13:57:23 +01:00
Michael Kaufmann (d00p)
840b5ea229 add new feature: import/export of settings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-28 14:33:00 +01:00
Michael Kaufmann (d00p)
cf4f15a83c explicitly deactivate TLS (and auto-tls) when setting use-tls is OFF; fixes #496 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-12-19 08:00:39 +01:00
Michael Kaufmann (d00p)
1ebde2e6a4 return correct default redirectCode when none is set, thx to J-BBB 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2017-01-05 11:58:11 +01:00
Michael Kaufmann (d00p)
43ca4a28e4 add acme.conf alias also to froxlor vhost in case the acme-challenge path is not within the froxlor-docroot; fix empty redirect-code, fixes #1674 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-21 08:19:33 +01:00
Michael Kaufmann (d00p)
6197a97dc1 Add settings to speficy smtp auth data for mails sent by froxlor 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-09-20 09:41:36 +02:00
Roman Schmerold (BNoiZe)
a0b0fa48bb Fix that name is not returned for admins 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-02 11:01:26 +01:00
Michael Kaufmann (d00p)
83e062c845 remove unused Minify_HTML class 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-30 17:53:43 +01:00
Michael Kaufmann (d00p)
7904946862 push some upcoming changes (still holding back db changes b/c of version jump to rc2) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-27 23:04:46 +01:00
Michael Kaufmann (d00p)
bdfbe4947a fix undefined variables introduced in commit #b1acc9a8efc01a5139b042f8f9e97881e4a52b83 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-27 11:23:03 +01:00
Roman Schmerold (BNoiZe)
b1acc9a8ef Make the side navigation more styleable 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-01-26 17:19:40 +01:00
Michael Kaufmann (d00p)
4b0507c4d3 secure scripts which should not be called directly (install/update stuff); avoid url-manipulation 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-27 15:13:25 +01:00
Marco Vogt (vogti)
6bfa95f8a8 Import default subject/body for e-mails templates; fixes #496 
Signed-off-by: Marco Vogt (vogti) <mail@mdvogt.de>
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-12 19:26:06 +01:00
Michael Kaufmann (d00p)
cf7c11a106 keep original template filename for the possible error message to show the correct file that was not found 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-11-29 08:22:36 +01:00
Michael Kaufmann (d00p)
60d48f2002 make template-fallback work for overwriting themes partially 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-11-29 07:43:33 +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
Roman Schmerold (BNoiZe)
3621effb36 Fixed a bug where action links where highlighted even if they weren't active 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-29 19:16:22 +01:00
Michael Kaufmann (d00p)
984624bdc4 fix initial value of function parameter as it leads to the first condition to be always true, fixes #1330 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-19 12:35:07 +01:00
Roman Schmerold (BNoiZe)
491ac02c0d added 'active' to class in navigation when link is active 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-14 16:30:08 +01:00
Michael Kaufmann (d00p)
0b3df4c7d7 removed unused global db-variables 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-17 12:31:15 +01:00
Michael Kaufmann (d00p)
12800b730d remove some unused functions and migrated some more functions to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-14 08:27:57 +01:00
Michael Kaufmann (d00p)
a14f04c25b Added new database-class based on PHP-PDO to use prepared-statements; implemented new Database-class in admin_index (more to follow, old DB class still in use everywhere else); secure standard_error back-link output 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-29 08:22:17 +01:00
Michael Kaufmann (d00p)
1870a88f6b fix possible undefined variable in error-message, thx to Dessa 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-07-09 21:46:56 +02:00
Michael Kaufmann (d00p)
3b1be99814 use correct linker-property to set the hostname in redirectTo() function, fixes #1151 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-07 09:35:20 +01:00
Arnold Bechtoldt
1943747594 adding global variable to buildNavigation() to grant templates of the Classic template access to $theme 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-15 16:52:43 +02:00
Arnold Bechtoldt
601bf68d09 Implementing the whole template system using Smarty. This commit includes movements of ROOT/js, ROOT/images, etc. to theme specific directories like templates/<THEME>/. If you are attemping to use your own templates you won't need to modify Froxlor's core files. This commit may require additional work. 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-14 23:08:25 +02:00
Florian Aders (EleRas)
76b716d41d redirectTo now uses the new linker class 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-14 18:22:29 +02:00
Florian Aders (EleRas)
0b3e788b86 Revert "Changed redirectTo to use new link-class" 
This reverts commit b88246b112.
 2011-06-13 22:08:38 +02:00
Florian Aders (EleRas)
b88246b112 Changed redirectTo to use new link-class 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 21:55:46 +02:00
Andreas Burchert (scarya)
51a83d8b09 Removed @version in file header. This isn't used by git. 2011-05-04 11:59:20 +02:00
Andreas Burchert (scarya)
6b99f650ca Added label to unlimited checkboxes. 2011-03-26 21:50:57 +01:00
Andreas Burchert (scarya)
3fc3174788 Finished work for reuseable form data, fixes #672 @4h 2011-03-19 14:34:10 +01:00
Andreas Burchert (scarya)
38999a4f5e Added back button to standard_error page, refs #672 2011-03-19 14:34:10 +01:00
Andreas Burchert (scarya)
ef8c3d3cf7 Added support to reuse form data if validation fails, refs #672 2011-03-19 14:34:10 +01:00
Andreas Burchert (scarya)
dc1f33f494 Added fallback solution in getTemplate() for 3rd party modules. 
Thanks to atari.
 2011-03-02 10:15:46 +01:00
Michael Kaufmann (d00p)
bee19fabfa merged more of the re-design files to current state 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-08 13:17:24 +01:00