Michael Kaufmann (d00p)
4229d8dda4
make path to acme.conf global alias file customizable
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-09-12 11:49:07 +02:00
Michael Kaufmann (d00p)
e4887362ec
added let's encrypt for froxlor vhost - untested for now, testers are welcome
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-09-05 17:01:10 +02:00
Michael Kaufmann (d00p)
45b6d8d571
add possibility to allow customers to select a shell for their ftp-users, with great thanks to KAPPER NETWORK-COMMUNICATIONS GmbH - kapper.net
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-08-26 10:46:15 +02:00
Michael Kaufmann (d00p)
8431a82f2c
check for correct extension for auto-update feature, fixes #1648
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-08-20 09:16:33 +02:00
Michael Kaufmann (d00p)
f5dc8aa1c9
set version to 0.9.37 for upcoming release
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-08-02 08:51:34 +02:00
Michael Wyraz
6ab8cb1d7c
Adding option to hide some elements in customer panel
2016-07-21 15:53:14 +02:00
Michael Kaufmann (d00p)
6589653667
set version to 0.9.37-rc1 for upcoming release candidate
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-07-18 16:47:19 +02:00
Michael Kaufmann (d00p)
8366e57512
Adding new setting for mod_php users to specify content of the global directory options file, fixes #1638
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-07-14 08:25:28 +02:00
Michael Kaufmann (d00p)
164e1108e5
fix for sql changes, refs #1635
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-06-24 07:49:52 +02:00
Michael Kaufmann (d00p)
8fe20251f3
try to be more strict-mode compatible, fixes #1635
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-06-24 07:42:23 +02:00
Daniel Reichelt
1e8bc553b8
fix/add SAPI checks to prevent execution via webserver
2016-06-19 23:43:42 +02:00
Michael Kaufmann (d00p)
5789e9a8a4
re-add old IDNA class so we do not have to force the php-5.6 requirement for froxlor
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-06-19 18:59:44 +02:00
Michael Kaufmann (d00p)
5866293a25
add script to change ip-addresses in froxlor from CLI and updated corresponding settings. Helpful for VM-template installations or similar. Use at own risk; feedback is appreciated
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-06-13 13:45:23 +02:00
Oliver Hader
2e7133d619
[SECURITY] Information disclosure on database failures
...
In case the database is not responding, e.g. due to "too many connections"
cut-off database credentials might be shown and system path be revealed.
In terms of security this is considered as information disclosure.
2016-06-04 20:41:03 +02:00
Stefan Heid
7faebbb197
BUGFIX: Cleaninstall fails due syntax error in froxlor.sql (missing comma) ( #356 )
2016-06-02 21:21:40 +02:00
Michael Kaufmann (d00p)
1f63ea10a0
adjust install sql file for dnsenabled flag and db-version
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-05-18 13:39:46 +02:00
Michael Kaufmann (d00p)
b4c7fb574c
increase DB version for db-updates
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-05-18 13:27:56 +02:00
Michael Kaufmann (d00p)
83fa0059de
add flag to allow access to dns-editor per customer; clean up dns-entries when domain gets deleted
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-05-18 13:25:31 +02:00
Michael Kaufmann (d00p)
b029fe113e
Merge remote-tracking branch 'origin/master' into dns-editor
2016-05-18 10:34:14 +02:00
Michael Kaufmann (d00p)
6ea4655fd8
set version to 0.9.36 for upcoming release
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-05-18 10:32:52 +02:00
Michael Kaufmann (d00p)
477c99b4de
Merge remote-tracking branch 'origin/master' into dns-editor
2016-05-18 10:31:05 +02:00
Michael Kaufmann (d00p)
41e4135f71
do not allow punycode input in domain-names
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-05-18 09:03:14 +02:00
Michael Kaufmann (d00p)
69443d95d5
add support for power-dns (untested); most config-templates missing for pdns; create SPF/DKIM entries only if domain is emaildomain
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-05-17 08:30:02 +02:00
Michael Kaufmann (d00p)
11eb08e031
add enabled-flag; enable dns-editor for customers; add german translations; few more fixes
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-05-13 13:27:33 +02:00
Michael Kaufmann (d00p)
bd9ef50e94
correct SPF dns entry for new layout
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-05-12 09:47:36 +02:00
Michael Kaufmann (d00p)
31d08d532c
fix missing auto-increment for new table
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-05-10 07:37:42 +02:00
Michael Kaufmann (d00p)
5acd51fdd3
add first part of new dns-editor
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-05-10 07:37:42 +02:00
Michael Kaufmann (d00p)
b1446d366e
add possibility to enable/disable backup function
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-04-29 10:27:19 +02:00
Michael Kaufmann (d00p)
c8bbefb2bb
add simple backup-function for customers (testing state)
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-04-29 10:27:18 +02:00
Michael Kaufmann (d00p)
72d1282651
require php-curl
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-04-11 08:00:38 +02:00
Michael Kaufmann (d00p)
5331127204
set version to 0.9.35.1; fix updater :x
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-04-08 13:52:06 +02:00
Michael Kaufmann (d00p)
57f9c439f2
set version to 0.9.35 final for upcoming release
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-04-08 12:54:17 +02:00
Michael Kaufmann (d00p)
924a607183
fix isDatabaseVersion if it does not yet exist, thx to andy__
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-03-23 00:00:35 +01:00
Michael Kaufmann (d00p)
3294bbf9b4
add a linebreak just in case some customizations did not end their lines with a linebreak
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-03-15 17:17:06 +01:00
Michael Kaufmann (d00p)
a849f35469
fix duplicate db-updates due to new db-version stuff
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-03-15 17:14:41 +01:00
Michael Kaufmann (d00p)
104383d31e
add a few opcache relevant php-ini directives to be used with php-fpm; add opcache.restrict_api to the default php-config for each domain with the customer's docroot as default value
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-03-15 17:05:09 +01:00
Michael Kaufmann (d00p)
efd64300c4
clearify that a special config is needed for LE in the webserver
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-03-08 14:50:31 +01:00
Daniel Reichelt
65fd6ac191
fix wrong column name in latest DB update, fixes #1602
2016-03-08 08:21:10 +01:00
Michael Kaufmann (d00p)
7ec62401e7
LE is disabled by default so should the cron be; also activate cron if updaters activate LE
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-03-07 14:08:59 +01:00
Michael Kaufmann (d00p)
604f37bd17
intriduce DB version (again) so we can keep release-version numbers while updating the database; added enable/disable switch for Let's Encrypt
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-03-07 13:47:22 +01:00
Michael Kaufmann (d00p)
77502efce7
enhance description of newsfeed-settings; ask whether to activate the newsfeed on install in case admin does not want any external requests
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-03-05 13:56:34 +01:00
Michael Kaufmann (d00p)
86252a22a0
fix wrong timestamp function for last_run value for lets-encrypt cron when updating; put mail/file templates to misc-category in the admin-menu; fix wrong html-tag (typo); enhance info-string for redirect-codes, fixes #1564
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-03-04 13:23:12 +01:00
Michael Kaufmann (d00p)
f9d949f90c
Revert "Merge pull request #318 from Churro/froxlorMerge_33ab67a"
...
This reverts commit 4f2ee129fd
, reversing
changes made to f284d67843
.
2016-03-03 23:38:02 +01:00
Michael Kaufmann (d00p)
f6e519d779
Revert "Merge pull request #326 from Churro/froxlorMerge_vhostTemplates"
...
This reverts commit 319668d384
, reversing
changes made to aa592c7369
.
Conflicts:
install/froxlor.sql
install/updates/froxlor/0.9/update_0.9.inc.php
lib/version.inc.php
2016-03-03 23:31:19 +01:00
Michael Kaufmann (d00p)
24f7d88a5c
set version to 0.9.35-rc1 for upcoming release candidate
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-03-02 15:32:12 +01:00
Florian Aders
6d8d01058b
Set Let's Encrypt to production
...
Signed-off-by: Florian Aders <eleras@froxlor.org>
2016-03-02 14:35:34 +01:00
Johannes Feichtner
088eef9728
Vhost templates: Added a field to select the target webserver
2016-02-27 20:18:16 +01:00
Michael Kaufmann
4f2ee129fd
Merge pull request #318 from Churro/froxlorMerge_33ab67a
...
Feature: vHost templates (version 2)
2016-02-26 19:16:49 +01:00
Johannes Feichtner
373cb912d8
- Hide the option on whether to include default directives with webservers different than nginx
...
- Typo fix
- Indentation fix
2016-02-26 19:08:08 +01:00
Stefan Weil
152b407cb7
Add missing function argument
...
The function "print_help" expects an argument.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-02-21 19:07:56 +01:00
Michael Kaufmann (d00p)
fc92e2655c
display update-status the way we always do them; fix language strings for new multiple-default-ips
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-02-21 14:53:50 +01:00
Johannes Feichtner
abe253bc31
Feature: Vhost templates
...
Reworked the initial implementation by hpmewes (https://github.com/Froxlor/Froxlor/pull/233 ) with
- bugfixes all over
- added support for apache and lighttpd also
- added an update sequence (instead of only modifying froxlor.sql)
- added english language variables
- added missing parts in admin_vhostsettings.php
- added parameter replacements as available since PR 244
2016-02-21 14:53:24 +01:00
Johannes Feichtner
387be846f1
Fix fatal error in phpErrHandler with PHP7 and suit cronjob for various PHP versions
2016-02-20 20:21:09 +01:00
Johannes Feichtner
1c467d71c7
Changed fastcgi IPC dir to a path that is definitely existing
2016-02-20 19:34:05 +01:00
Florian Aders
e621e02f92
Allow selecting new keysize, fixes #1594
...
Prepare database and cron for HSTS, refs #1593
Added option to re-use key and CSR for Let's Encrypt
Signed-off-by: Florian Aders <eleras@froxlor.org>
2016-02-19 17:35:44 +01:00
Michael Kaufmann (d00p)
7b29d43c66
Merge branch 'logging' of https://github.com/nachtgeist/Froxlor into nachtgeist-logging
2016-02-17 08:41:17 +01:00
Stefan Weil
60740973d7
Fix update process from Froxlor version 0.9.28-svn1
...
A typo in the name of a local variable prevented database updates.
Fix also an unrelated whitespace issue in an empty code line.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-02-16 21:17:54 +01:00
Daniel Reichelt
2fb091939f
remove unused setting system_send_cron_errors
2016-02-16 18:32:08 +01:00
Michael Kaufmann (d00p)
9ee661d44c
correct current dev-version for new installs
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-02-15 16:04:26 +01:00
Stefan Heid
ae581c2da7
Added termination-date to domains
2016-02-10 21:22:52 +01:00
Florian Aders
2472a52fed
Make some Let's encrypt settings configurable
...
Signed-off-by: Florian Aders <eleras@froxlor.org>
2016-02-03 17:21:48 +01:00
Florian Aders
ae276a2a59
Fixed updater - timestamp
...
Signed-off-by: Florian Aders <eleras@froxlor.org>
2016-02-03 16:45:32 +01:00
Florian Aders
e74a418405
Fixed description
...
Signed-off-by: Florian Aders <eleras@froxlor.org>
2016-01-31 12:13:15 +01:00
Florian Aders
7814499b87
Added cronjob to database and added a hint to the README
...
Signed-off-by: Florian Aders <eleras@froxlor.org>
2016-01-31 12:09:54 +01:00
Florian Aders
dd9e540ca3
inserttask(1) after updating certificates, updated install/update - SQL
...
Signed-off-by: Florian Aders <eleras@froxlor.org>
2016-01-30 15:19:40 +01:00
Florian Aders
44d08d6aa9
Add let's encrypt to customer domain - GUI
...
Signed-off-by: Florian Aders <eleras@froxlor.org>
2016-01-30 13:59:34 +01:00
Florian Aders
67df9dbf6b
Experiment with accountkeys per customer
...
Signed-off-by: Florian Aders <eleras@froxlor.org>
2016-01-30 13:06:42 +01:00
Florian Aders
4f0c1894a3
Initial version of let's encrypt renewal cron
...
Signed-off-by: Florian Aders <eleras@froxlor.org>
2016-01-29 14:29:30 +01:00
Robert Förster (Dessa)
39b50d05ec
fix lintian warning executable-not-elf-or-script
2016-01-18 10:54:46 +01:00
Michael Kaufmann (d00p)
a6182e2def
set new version for bugfix release :P
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-01-18 10:53:54 +01:00
Michael Kaufmann (d00p)
9fe55cb729
set version to 0.9.34.1 for upcoming maintenaince release
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-01-18 08:07:16 +01:00
Michael Kaufmann (d00p)
6a22fbbf78
fix wrong webserver-setting when chosing apache-2.4 in the installation process, thx to TByte
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-12-27 16:26:15 +01:00
Stefan Weil
fe5ab0d8da
Fix typos found by codespell
...
Fix also a grammar issue.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-11-13 07:56:12 +01:00
Michael Kaufmann (d00p)
d21391e8ba
add apache-2.4 to the installer so apache-2.4 users get the 2.4 mods activated right away, NOTE: we cannot find out whether you're on 2.2 or 2.4 - so you should now what you got and select the correct one, fixes #1566
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-11-12 08:27:07 +01:00
Robin Kluth
dc4d5c6953
Update froxlor.sql
...
Did someone forget the M after 128 in the Default PHP-Config? ;)
2015-10-18 18:09:26 +02:00
Michael Kaufmann (d00p)
9bf784f64e
set version to 0.9.34 for upcoming release
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-09-07 13:33:22 +02:00
Michael Kaufmann (d00p)
6abe0bdaec
allow customization of umask in php-fcgi-starter scripts, refs #1486
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-07-31 13:21:50 +02:00
Michael Kaufmann (d00p)
12723d4941
add update compatibility for bugfix-release 0.9.33.2
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-07-29 18:11:14 +02:00
Michael Kaufmann (d00p)
95475f7b52
change default ssl-cipher-list; minor changes in config-xmls, fixes #1541
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-07-08 16:08:31 +02:00
Michael Kaufmann (d00p)
565866c529
adjust default memory_limit to php's default (128M)
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-05-06 15:37:38 +02:00
Michael Kaufmann (d00p)
e0ef3e9984
fix mpm-itk stuff, thx to Ithariel; minor fixes in updater
2015-04-22 15:58:04 +02:00
Michael Kaufmann (d00p)
fe718ef67f
add requirement for mbstring-extension as we need to be multibyte-character-safe in generatePassword(); adjust special-character-default setting to be the same as on a fresh install; outsource version-definition to separate file; set version to 0.9.34-dev3
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-02-23 12:23:44 +01:00
Michael Kaufmann (d00p)
1374e08cd4
make sql-fields for ssl-certs larger as there are ca-bundle-certs larger then 64k; add new settings for apache-itk-mpm integration, fixes #1400
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-02-18 16:05:28 +01:00
Michael Kaufmann (d00p)
bbf05fa6fd
remove smarty-remnant; remove unnecessary variable assignment
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-02-17 13:27:30 +01:00
Michael Kaufmann (d00p)
927e6fe23a
add update compatibility for 0.9.33.1 users
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-02-16 09:45:55 +01:00
Michael Kaufmann (d00p)
704a0fce08
make integritycheck in update-procedure more clear whether there actually is a problem or not (if it's been fixed for example), fixes #1493
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-02-11 12:08:58 +01:00
Michael Kaufmann (d00p)
c3b45a62ca
use native word for the different languages
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-02-08 19:59:24 +01:00
Michael Kaufmann (d00p)
7b354eec0f
fix template->language issues (not html-encoded special-characters in language-name), set version to 0.9.34-dev1 due to db structure change / update
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-02-08 19:45:15 +01:00
Stefan Weil
0fc73b2bbb
Fix typos found by codespell
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-02-08 17:52:45 +01:00
Robert Förster (Dessa)
36780d53c2
remove some useless executable bits spotted by lintian
2015-02-08 05:12:37 +01:00
Michael Kaufmann (d00p)
f1360d8792
set version to 0.9.33 for upcoming stable release
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-02-07 09:57:06 +01:00
Michael Kaufmann (d00p)
77ae3aa387
generate only password that match our complexity-settings in customer_email.php; don't use md5() for the admin password in the installation process
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-02-01 13:57:06 +01:00
Michael Kaufmann (d00p)
e92b5e2c05
set version to 0.9.33-rc3 due to the password-hash-update-issue
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-01-31 12:54:00 +01:00
Michael Kaufmann (d00p)
d7f8586413
allow language-check against a specific language file
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-01-30 17:54:06 +01:00
Michael Kaufmann (d00p)
36c7527b2a
add function to validate different password-hashes and update them to the currently set hash if login successfull and hash differs, set default hash to SHA256, fixes #1289 - add custom-notes field to admin/customer, fixes #1471 - set version to 0.9.33-rc2 for upcoming second release-candidate
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-01-28 13:24:36 +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
Roman Schmerold (BNoiZe)
6c39ac80e6
Optimized images
...
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
2015-01-16 21:16:50 +01:00
Michael Kaufmann (d00p)
e578a29058
add option to display the custom-notes to the user and actually save the custom-note
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-01-15 22:10:37 +01:00
Michael Kaufmann (d00p)
7b8885c05e
add custom-notes field to admins and customers, fixes #1471
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-01-15 21:30:15 +01:00
Michael Kaufmann (d00p)
c7dc68c848
add froxlor-group to customer-group in case fcgid/fpm is used for froxlor
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-12-30 16:44:52 +01:00
Michael Kaufmann (d00p)
509033e2b8
put install-css-stuff into the correct install.css file
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-12-29 21:23:21 +01:00
Michael Kaufmann (d00p)
7584b0acc4
remove google-webfont-stuff (just create your own theme or overwrite Sparkle to use another font); remove more inline css and remove unnecessary JS in hints-templates
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-12-29 21:08:01 +01:00
Michael Kaufmann (d00p)
dd34ab8d9b
fix inline-css (violation of Content Security Policy)
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-12-29 20:48:56 +01:00
Michael Kaufmann (d00p)
c6f3b03891
do some sql-minor-fixing, refs #1486 - set version to 0.9.33-rc1 for possible upcoming release-candidate
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-12-29 14:59:58 +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
Michael Kaufmann (d00p)
19f5f2a7a4
remove static copyright-year in templates; fix possible undefined theme-variable in phpErrHandler by specifying a fallback-default
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-12-19 09:49:33 +01:00
Michael Kaufmann (d00p)
7dd6f9b97c
explicitly set charset / collation of database when installing + new integrity-check-function to validate the database charset / collation and optionally fix it; fixes #1426
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-12-13 19:19:10 +01:00
Michael Kaufmann (d00p)
5499388777
add possibility to use php-fpm over mod_proxy_fcgi with apache >=2.4.9
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-11-10 11:47:27 +01:00
Michael Kaufmann (d00p)
4cc3c01dcb
remove password-suggestion if a custom regex is defined; added password-complexity-settings for non-regex users to define what generated passwords should contain, thx to Marco Vogt; fixes #1216
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-11-10 10:07:32 +01:00
Michael Kaufmann (d00p)
0156c3a59d
few fixes in inline-css; added mail.log php.ini option and enabled it in default ini-config
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-10-31 09:14:28 +01:00
Michael Kaufmann (d00p)
bc8e56e7da
fix version_compare
2014-10-07 08:24:40 +02:00
Michael Kaufmann (d00p)
559fb4d4a4
done a few fixes for newer php-versions
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-09-22 10:17:42 +02:00
Michael Kaufmann (d00p)
74c493f39c
remove unnecessary fields that have been removed in updater a long time ago
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-09-13 09:32:19 +02:00
Michael Kaufmann (d00p)
37624a912e
add task 99 the correct way in installation as the constant FROXLOR_INSTALL_DIR is not set there
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-09-12 07:50:05 +02:00
Michael Kaufmann (d00p)
2ebb5259a0
after a new installation, insert a task for generating the cron.d file, also let cronjob's --force re-create the cron.d file
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-08-05 18:14:04 +02:00
Michael Kaufmann (d00p)
f1eb5420a7
add option to enable/disable generation of bind-configs for the system-hostname
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-06-02 12:35:45 +02:00
Roman Schmerold (BNoiZe)
3acfcd4a95
Adding a custom newsfeed to the customer-dashboard, fixes #1408
...
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
2014-06-01 18:46:15 +02:00
Michael Kaufmann (d00p)
acbaedb44f
setting version to 0.9.32 for release
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-05-23 08:29:28 +02:00
Robert Förster (Dessa)
73acfb5d7c
update js folder
...
- add images from jquery-ui to css folder, the stylesheet expects them being around even though we don't use them, adding them and not using them is better then editing the stylesheet and then forgetting about it again after every jquery-ui update, i suppose..
- fix html5shiv name, it was minified to begin with
- bump flot to 0.8.3, fix plugin name (no functional changes for us)
- bump tablesorter to 2.16.4 (likewise)
2014-05-20 19:50:57 +02:00
Michael Kaufmann (d00p)
4dc774c11c
also, add french to the available language-files for install-process
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-04-28 17:22:46 +02:00
Michael Kaufmann (d00p)
f48d97e132
add french language file for installation-process, thx to hurl for translating; fixes #1415
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-04-28 14:06:10 +02:00
Michael Kaufmann (d00p)
b341228dd9
fix invalid sql in very old update-procedure (happens when you update from 0.9.7-svn1 to 0.9.7-svn2)
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-04-27 09:23:36 +02:00
Roman Schmerold (BNoiZe)
4994a90be9
Removing old languages from database, pushing version to 0.9.32-rc3
...
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
2014-04-14 09:48:39 +02:00
Michael Kaufmann (d00p)
08ce6be3ff
fix 'field does not have a default value' error reported via email
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-03-05 08:11:56 +01:00
Michael Kaufmann (d00p)
2d68216699
remove old and unused setting from install-sql-file
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-03-05 08:00:04 +01:00
Michael Kaufmann (d00p)
d00cdec296
added cronjob-auto-update-feature (beware and READ), fixes #1342 ; remove old backup-ftp-users on update, fixes #1381
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-02-25 07:48:46 +01:00
Michael Kaufmann (d00p)
bad1183f42
set correct default php-ini for own-vhost, thx Sephi
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-02-14 14:08:58 +01:00
Michael Kaufmann (d00p)
20d54d5a04
put cron.d-generation task directly to froxlor.sql as there might be no userdata.inc.php after the installation (only in /tmp or plaintext for copy'n'paste) so the database action fails
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-02-14 11:18:02 +01:00
Michael Kaufmann (d00p)
938bb429d8
insert task to generate cron.d file after installation
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-02-14 11:03:08 +01:00
Florian Aders (EleRas)
d7c94726fd
Add a basic integritychecker after every update
...
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
2014-02-07 18:25:35 +01:00
Michael Kaufmann (d00p)
ec7d006069
forgot the 'TABLE' in the query
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-02-07 16:48:50 +01:00
Michael Kaufmann (d00p)
a1aa87940b
fix non-default value of data-field in tasks-table (thx to an error-report), set version to 0.9.32-rc1 for upcoming release candidate
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-02-07 15:49:40 +01:00
Michael Kaufmann (d00p)
fe5922c0a0
code beautification and variable-name-fix
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-01-26 20:53:31 +01:00
Michael Kaufmann (d00p)
019da862dd
use the same cron.d-name as in the config-template as the 'default' cronjob is not needed after the first generation of the new one; generate different lockfiles for the different jobs to avoid unnecessary conflicts
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-01-23 13:59:09 +01:00
Michael Kaufmann (d00p)
6d1899d72e
fix typo
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-01-23 13:25:03 +01:00
Michael Kaufmann (d00p)
abcdfb03d9
add cron-daemon reload command in order for new cron.d file to be applied, fixes #858
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-01-23 13:22:11 +01:00
Michael Kaufmann (d00p)
17255de669
bugfix new cron.d-file generation and don't overwrite our master, refs #858
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-01-13 13:42:02 +01:00
Michael Kaufmann (d00p)
4be52f76eb
introducing new way of controling the cronjobs by creating a cron.d-file
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-01-13 08:55:39 +01:00
Roman Schmerold (BNoiZe)
30add37bd6
Fixed a missing comma (thx Johannes Gilges)
...
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
2014-01-05 08:04:04 +01:00
Johannes Matheis
f320daa93c
make color of input fields consistent to body color
2014-01-04 16:24:02 +00:00
Johannes Matheis
d596eb754a
override fg color to obtain readability
2014-01-03 17:00:42 +00:00
Florian Aders (EleRas)
63d5547d1e
Fixed typo in updater
...
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
2014-01-03 08:22:40 +01:00
Roman Schmerold (BNoiZe)
0c2aa8de45
Add description field to FTP accounts, fixes #1340
...
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
2014-01-02 22:45:30 +01:00
Florian Aders (EleRas)
2d1fd0c8c5
Delete old froxlor-theme and automatically move users to CSS - version of theme
...
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
2014-01-01 13:11:27 +01:00
Michael Kaufmann (d00p)
0fb0d3b2db
Merge remote-tracking branch 'origin/0.9.31.2'
2013-12-27 16:46:33 +01:00
Michael Kaufmann (d00p)
01d825fc2a
set version to 0.9.31.2 for bugfix release
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-27 16:20:11 +01:00
Michael Kaufmann (d00p)
0c9d62977c
Merge remote-tracking branch 'origin/0.9.31.2'
2013-12-24 15:41:33 +01:00
Michael Kaufmann (d00p)
d34515b9e0
also add curl check to master-branch, dunno why this was not merged automatically, git is teh shit
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-24 15:35:47 +01:00
Michael Kaufmann (d00p)
da371fa560
Merge remote-tracking branch 'origin/0.9.31.2' and fix install-SQL file
2013-12-24 15:29:57 +01:00
Michael Kaufmann (d00p)
44ae470d7e
add check for optional php-curl extension
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-24 14:43:47 +01:00
Michael Kaufmann (d00p)
2dc0bf2104
use better german
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-24 14:36:11 +01:00
Michael Kaufmann (d00p)
3b9727942a
we need php-5.3 not 5.2 - check is correct but text was not
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-24 14:34:27 +01:00
Michael Kaufmann (d00p)
0031e19c70
damn automatic merge...stupid thing
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-22 19:24:40 +01:00
Michael Kaufmann (d00p)
99c0bda7f2
Merge remote-tracking branch 'origin/0.9.31.1'
2013-12-22 19:21:34 +01:00
Roman Schmerold (BNoiZe)
a92cdb2926
Added cron for mailtraffic (with EleRas), fixes #69
...
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
2013-12-20 23:12:47 +01:00
Michael Kaufmann (d00p)
05dad04384
add 0.9.31.1 to updater of 0.9.32-dev
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-19 18:30:00 +01:00
Michael Kaufmann (d00p)
261d6e7d76
backport bugfixes from current master
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-19 18:05:40 +01:00
Andreas Grundler
18d93fb07d
SQL Fix
2013-12-19 17:26:04 +01:00
Michael Kaufmann (d00p)
7267c2dec9
Merge remote-tracking branch 'origin/0.9.31'
2013-12-18 09:58:38 +01:00
Michael Kaufmann (d00p)
23a1a55bf2
set version to 0.9.31 for upcoming release
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-18 09:40:48 +01:00
Michael Kaufmann (d00p)
6902868e58
Merge remote-tracking branch 'origin/0.9.31'
2013-12-17 07:57:58 +01:00
Michael Kaufmann (d00p)
bdf03486d2
set better defaults (sites-enabled/* is included in apache by default on most systems)
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-16 18:33:57 +01:00
Michael Kaufmann (d00p)
7f565c305c
migrate more stuff to new Settings class, refs #1325
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-15 14:38:53 +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)
73f5547a5e
add php-config for froxlor-vhost and set it as default for froxlor's vhost when fcgid/fpm is used (and the current default is set, custom settings won't be overwritten)
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-12 10:44:32 +01:00
Michael Kaufmann (d00p)
0771ccc9a6
Merge remote-tracking branch 'origin/0.9.31'
2013-12-08 22:00:51 +01:00
BNoiZe
2b13ae3ad8
fixed a wrong array-index in installation language file
2013-12-08 15:40:07 +01:00
Michael Kaufmann (d00p)
2e9310daf1
set master-branch version to next dev-version, so people don't break their database too early
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-08 14:36:04 +01:00
Michael Kaufmann (d00p)
bf4c16b063
first work on permission-improvements by adding webserver-user to ftp-group of customer and therefore make it possible to chown the user-docroot to 750 keeping 'others' out, refs #532
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-08 11:13:43 +01:00
Michael Kaufmann (d00p)
0f80e66a01
Merge remote-tracking branch 'origin/0.9.31'
2013-12-08 10:22:21 +01:00
Michael Kaufmann (d00p)
6a6c5db88d
forgot the update-status
2013-12-06 14:43:01 +01:00
Michael Kaufmann (d00p)
9f8a6a6f5e
set version everywhere so updater takes effect :P
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-06 14:40:59 +01:00
Michael Kaufmann (d00p)
2035739131
added setting to enable/disable news-feed on admin-dashboard
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-06 14:37:27 +01:00
Michael Kaufmann (d00p)
3064477066
remove more aps/autoresponder/backup stuff
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-05 12:17:47 +01:00
Michael Kaufmann (d00p)
85ee0751bd
Merge remote-tracking branch 'origin/removal'
2013-12-05 09:02:40 +01:00
Robert Förster (Dessa)
29ae767c17
fix typo
2013-12-05 00:39:42 +01:00
Michael Kaufmann (d00p)
2800ca05a1
began to 'clean up' for future releases (APS, Autoresponder and Backup)
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-04 18:32:46 +01:00
Michael Kaufmann (d00p)
47b1675dea
set version to 0.9.31-rc1 for upcoming release-candidate
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-04 14:52:25 +01:00
Michael Kaufmann (d00p)
9c8ebdd1d3
fix mysqldump for backup (if db exists) on install-process
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-03 15:55:30 +01:00
Michael Kaufmann (d00p)
61c04d5e31
use better defaults for fpm-slowlog settings, refs #1051
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-03 11:21:22 +01:00
Michael Kaufmann (d00p)
2853d6e1a4
added possibility to enable slowlog for fpm-users in the php-config (domain based logs), fixes #1051
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-03 11:14:32 +01:00
Michael Kaufmann (d00p)
cf23980f0b
minor fixes in installation-class, better error-handling
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-03 09:46:00 +01:00
Michael Kaufmann (d00p)
84f973ce26
fix html-tag in preconfig, fix missing global in database-class, change description of password-reset-setting accordingly to new activation-link-procedure
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-02 20:39:15 +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
Mark Constable
b551c931e9
Renamed exceute() to execute() in class.FroxlorInstall.php
2013-12-02 11:38:08 +10:00
BNoiZe
f74ed8ed93
Added preconfig hint for 0.9.31-dev4
2013-12-01 11:06:33 +01:00
BNoiZe
e5e0ae7527
Fixed some bugs, made activationcode more secure, added update script, merged missing commit
2013-12-01 10:34:31 +01:00
Michael Kaufmann (d00p)
b1ae352d88
migrated install-class to new PDO database class, needs testing, refs #1287
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-30 14:25:49 +01:00
Michael Kaufmann (d00p)
567f789dab
at this stage in the updater, it's too late to inform about pdo
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-26 10:16:19 +01:00
Michael Kaufmann (d00p)
84ed13d791
update-note about php-pdo being used now
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-26 09:41:40 +01:00
Michael Kaufmann (d00p)
e25597106e
make fpm socket directory a setting, fixes #1300
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-14 09:29:55 +01:00
Michael Kaufmann (d00p)
26d9aa570c
remove unused code and database-tables; set version to 0.9.31-dev1
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-07 18:49:16 +01:00
Michael Kaufmann (d00p)
3e7df9cb7a
remove parameter from FroxorLogger class and migrated it to PDO database class, refs #1287
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-04 13:28:23 +01:00
Michael Kaufmann (d00p)
9a187b8e82
removed unused htpasswd-htaccess-remover script; removed non-existing language-string-indeces from langfile
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-04 13:03:53 +01:00
Michael Kaufmann (d00p)
2614c86079
migrated preconfig to PDO database class, refs #1287
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-04 11:38:09 +01:00
Michael Kaufmann (d00p)
af2c068970
migrated update script to PDO database class, refs #1287
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-04 11:34:57 +01:00
Michael Kaufmann (d00p)
e3750a2988
remove unused upgrade procedures, migrated a few minor functions and files to PDO database, fixed FROXLOR_INSTALL_DIR define for master-cronjob, fixes #1294
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-04 09:03:29 +01:00
Michael Kaufmann (d00p)
e549ab2cbb
finally removed super-old syscp-update-procedures, we now require the last available syscp for upgrading; migrate some functions to PDO database class, refs #1287
...
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-03 10:54:43 +01:00
coacx
c21bf7014e
fixed apache path in install/froxlor.sql
2013-10-31 15:03:27 +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