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

58 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
350e3d733a do not check for options if field is disabled, unset enabled-ownvhost flags for fcgid/fpm if the corresponding other one is activated; fixes #518 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-16 09:22:34 +01:00
Michael Kaufmann (d00p)
f8996ad767 catch exception thrown by new IdnaConverter when encoding a non-valid domain, fixes #1678 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-22 15:08:42 +01:00
Michael Kaufmann (d00p)
432645431c allow CIDR values in AXFR setting, fixes #1672 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-15 08:03:34 +01:00
Michael Kaufmann (d00p)
7e4164da26 do not double validate openbasedir-values, as appendOpenbasedirPath() already takes care of that; also fix /dev/urandom as openbasedir-path-value to be treated as file correctly, fixes #1669 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-11-10 10:07:00 +01:00
Michael Kaufmann (d00p)
5228e0f3d6 normalize path in appendOpenBasedirPath() after empty check as this results in an assert in makeCorrectDir() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-01 09:35:31 +01:00
Michael Kaufmann (d00p)
accfd6fa14 allow /dev/urandom to be used in open_basedir path, as some applications may require that (*cough* owncloud), thx to J-BBB 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-11-20 14:20:15 +01:00
Michael Kaufmann (d00p)
bdb2115c16 allow one-character usernames (or mysql-prefix) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-09-09 23:01:24 +02:00
Michael Kaufmann (d00p)
4da3a87772 instead of env-variable, show ditro editor which is defined in the xml 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-08-13 15:42:57 +02:00
Michael Kaufmann (d00p)
909c6a8bdf allow private-network ip-addresses for database-connection, fixes #1489 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-08 17:35:31 +01:00
Michael Kaufmann (d00p)
a0a2977b7f allow to disable fcgid also with lighttpd because we allow it to be enabled with lighttpd 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-03 19:55:46 +01:00
Michael Kaufmann (d00p)
f4dff676d6 do not allow to enable fcgid/fpm at the same time when both are set to 'yes' simultaneously in settings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-01 18:02:29 +01:00
Michael Kaufmann (d00p)
4d60b19194 only update hash if password matches, fixes #1479 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-31 12:51:20 +01:00
Michael Kaufmann (d00p)
7b8341d826 add function to validate different password-hashes and update them to the currently set hash if login successfull and hash differs (unimplemented yet because of required db-updates which are hold back until 0.9.33-rc2), refs #1289 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-27 11:09:27 +01:00
Michael Kaufmann (d00p)
c1ff010283 allow 'localhost' or any local-hostname for db-connection 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-01-08 14:39:52 +01:00
Michael Kaufmann (d00p)
4523ef87b7 show correct errormessage when sql-prefix is wrong 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-12-23 13:56:49 +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)
25fa9a8121 various tiny improvements 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-07-09 09:39:26 +02:00
Michael Kaufmann (d00p)
addd70dfe8 correct validating list of AXFR-servers, fixes #1440 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-06-23 08:51:04 +02:00
Michael Kaufmann (d00p)
74b71bb926 fix validation of system-hostname setting, thx to lando 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-06-07 15:04:51 +02:00
Michael Kaufmann (d00p)
9c500f290e when cleaning strings, actually return them after that or it's senseless 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-05-15 08:20:52 +02:00
Dennis Hildenbrand
40fd5cd41e added support for new TLDs that are longer than 6 characters like .photography 2014-04-28 19:51:33 +02:00
Michael Kaufmann (d00p)
52536e0e45 fix unwanted NULL value when logging a cleaned string, thx to an error-reporter 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-01-16 18:46:34 +01:00
Michael Kaufmann (d00p)
52aaedd33a migrated a few functions to new Settings class and removed unused function createAWStatsVhost(), refs #1325 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-15 13:05:19 +01:00
Michael Kaufmann (d00p)
3b0387901f don't cast mysql-max to integer as for admins-usernames, it may be '' instead of 0 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-08 22:00:23 +01:00
Michael Kaufmann (d00p)
96bcb34d81 show correct error-message when loginname has too many characters, fixes #811 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-02 10:57:12 +01:00
Michael Kaufmann (d00p)
25687953c5 correct author :P damn copy'n'paste 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-27 08:36:28 +01:00
Michael Kaufmann (d00p)
4381eff384 check for fcgid being enabled when switching the webserver as only apache2 can handle fcgid (prevent a possible deadlock in the panel) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-27 08:34:49 +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)
6b93b973e2 add new directory-validator 'confdir' to check against disallowed paths (like /, /bin, /home, etc.) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-16 08:54:39 +02:00
misdoro
d90af956de Update function.validateDomain.php 
Fix pattern to support IDN TLDs, like .рф that becomes .xn--p1ai in punycode at this point. (inserted as .рф in domain edit page)
 2013-08-25 20:46:08 +02:00
Michael Kaufmann (d00p)
7a69cf73ba don't require a port-declaration in validating an URL when an IP address is given, fixes #1179 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-23 15:58:03 +02:00
Michael Kaufmann (d00p)
79b2adea16 fix open_basedir path's for newer php-versions as a trailing slash won't allow the usage of subfolders within the given folder, fixes #797 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-14 10:05:49 +02:00
Michael Kaufmann (d00p)
4d0dfb1c88 allow ip:port in redirections, fixes #1173 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-12 19:26:21 +01: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)
64ddddd3d5 Fixing broken changing of hostname, thx philnate, fixes #928 @5m, fixes #946 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-10-30 12:11:10 +01:00
Andreas Burchert (scarya)
14f9344c50 Prevent empty 'ServerName', fixes #870 
Thanks to h4cc
 2011-09-19 10:56:27 +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
Michael Kaufmann (d00p)
80e338610f don't allow activation of FCGID and PHP-FPM at the same time 2010-12-03 10:41:12 +00:00
Michael Kaufmann (d00p)
44b53ffd2c - fixed regex for domains to allow a port and/or subfolders/files, fixes #431 2010-10-25 06:45:15 +00:00
Michael Kaufmann (d00p)
99696ff6cb - allow 4-character tld's (like .info or .mobi) 2010-10-23 07:50:26 +00:00
Michael Kaufmann (d00p)
3f0a491f8c - set used-ticket-cycle directly as INTERVAL for the cronjob 2010-10-12 06:21:08 +00:00
Michael Kaufmann (d00p)
5c87e2210c - be sure customer-docroot-prefix is never the same or within the fcgid-configurations-folder 2010-10-05 20:25:52 +00:00
Michael Kaufmann (d00p)
5f34dfa968 - add possibility to define password-complexity, fixes #292 2010-07-19 08:06:18 +00:00
Michael Kaufmann (d00p)
659d673ffa - renaming file (typo) 2010-05-12 06:52:41 +00:00
Michael Kaufmann (d00p)
65e0962111 - fixed open_basedir issues, fixes #227 2010-05-12 06:52:11 +00:00
Michael Kaufmann (d00p)
7e733e60ee - wups, one escaping too much :p 2010-05-04 10:31:25 +00:00
Michael Kaufmann (d00p)
1f6e3c271b - validateUrl needed to idna-convert the url if its a domain, also needed new regex (subfolder, etc.) 2010-05-04 10:30:02 +00:00
Michael Kaufmann (d00p)
9c79654cf4 - corrected validation of Domain and URL (stupid php-bug) 2010-05-04 09:54:10 +00:00
Michael Kaufmann (d00p)
31231a5f60 - fixed validateUrl-function to work with buggy php-5.2.13 and php-5.3.2 (filter_var-bug) 2010-04-21 10:40:58 +00:00
Michael Kaufmann (d00p)
b87e4277f2 fix regex to add domains when using php-5.2.13 or php-5.3.2, thx to felauten 2010-04-20 21:35:30 +00:00