Commit Graph

93 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
7680cd441c force integer conversion for domainimport-offset-field, as POST sends it as string; filter IP-addresses that are unknown to froxlor when importing domains.
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2015-01-30 17:55:27 +01:00
Michael Kaufmann (d00p)
b2eeef8d38 beautification and fallback just in case
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-12-22 14:14:53 +01:00
Michael Kaufmann (d00p)
d674f4dd70 same alias-ip-stuff when adding a new domain and aliasdomain is selected
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-12-22 13:37:35 +01:00
Michael Kaufmann (d00p)
0406948c4b remove unneeded functions; fix ip-assigning when a domain is an alias of another domain and the ip's from the alias-domain are being read, no check for ssl/non-ssl was made resulting in an integrity constraint violation in the database
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-12-22 13:32:37 +01:00
Michael Kaufmann (d00p)
c1ca72dd3c fix validation of offset-value in domain import + minor fixes
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-12-19 09:29:25 +01:00
Michael Kaufmann (d00p)
cd5e8801e4 add domain-bulk-import, fixes #1452
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-12-15 14:49:34 +01:00
Michael Kaufmann (d00p)
58ec17ce10 don't allow subdomains as alias-domains as it could lead to a possible dead-end for editing ip/port for the domain
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-10-27 10:41:29 +01:00
Michael Kaufmann (d00p)
92eea6d7b2 insert task for rebuilding config files after changing the ips (not perfect yet but better then no task)
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-07-09 17:52:16 +02:00
Michael Kaufmann (d00p)
ff549a5ab0 re-add line-breaks for nicer display of ip/port combos in domain::add and domain::edit
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-06-07 15:05:21 +02:00
Michael Kaufmann (d00p)
d73e5f8dc7 fix prepending of domain-name to domain.documentroot if admin has 'edit-server-settings == false' when adding a new domain
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-04-12 09:37:51 +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)
cdd1f0bb65 fix sql-error in new code from previous commit
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-02-11 18:20:43 +01:00
Michael Kaufmann (d00p)
b726a8528b when ssl-ip/port is being removed from a main-domain, set ssl_redirect to 0 as it cannot be changed with no ssl-ip/port afterwards
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2014-02-11 15:39:24 +01:00
Michael Kaufmann (d00p)
e97e377723 fix query when admin/reseller has ips != unlimited, fixes #1345
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-12-30 15:00:36 +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)
85ee0751bd Merge remote-tracking branch 'origin/removal' 2013-12-05 09:02:40 +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
BNoiZe
cd464ed01e Fixed a typo in admin_domains, fixed <strong>-tags not being strong in sparkle 2013-12-04 21:02:15 +01:00
Michael Kaufmann (d00p)
990e39cadb forgot replacer in prepared statement, thx BNoiZe
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-28 11:01:14 +01:00
Michael Kaufmann (d00p)
b8952259ba fix creating of ssl-redirect without ssl-ip/port, fixes #1303
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-21 08:01:43 +01:00
Michael Kaufmann (d00p)
cf2eea43c9 fix wrong usage of rowCount()
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-20 14:14:33 +01:00
BNoiZe
88382d2856 Fixed a typo 2013-11-20 12:29:48 +01:00
Michael Kaufmann (d00p)
0db0b3bd88 require is a statement and not a function
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-18 12:53:33 +01:00
Michael Kaufmann (d00p)
a4ee4be2b4 migrate paging class to new PDO database class, refs #1287
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-18 09:09:06 +01:00
Michael Kaufmann (d00p)
868b472b98 fix undefined variable because of re-structuring, thx Dessa
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-13 17:52:00 +01:00
Michael Kaufmann (d00p)
11393abfbe every day is typo day, again...thx oschn0r
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-13 17:41:39 +01:00
Michael Kaufmann (d00p)
c21b767654 every day is typo day...thx oschn0r
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-13 17:22:37 +01:00
Michael Kaufmann (d00p)
5f7ab0330a fix another typo, thx to oschn0r
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-13 16:55:54 +01:00
Michael Kaufmann (d00p)
e07596b642 fix typo, thx to oschn0r
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-13 16:27:27 +01:00
Michael Kaufmann (d00p)
0d7a16ad46 migrated admin_domains to new PDO Database class, refs #1287
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-11-13 15:39:20 +01:00
Michael Kaufmann (d00p)
89877f7ff2 fix wrong error-message of non-existing ip/port combo when a ssl-ip/port exists but not checked when adding a domain
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-10-27 16:53:14 +01:00
Michael Kaufmann (d00p)
03ba127fab use new directory-validator 'confdir'; fix if last ssl-ipport got deactivated and a security question is being asked
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-10-16 16:23:10 +02:00
Michael Kaufmann (d00p)
207f5c69d4 select correct value for serveralias-option when editing domain; customer now has same options as admin; refs #1147
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-10-14 10:08:15 +02:00
Michael Kaufmann (d00p)
1a99a272b1 let the admin set the server-alias completely (either wildcard, www. or none), customer option follows, this fixes #1147
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-10-14 09:50:55 +02:00
Michael Kaufmann (d00p)
2e52b95d37 fix weird behavior when adding/editing the aliasdomain value and no ssl-ip/port is given, thx datenfalke
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-09-30 12:12:04 +02:00
Michael Kaufmann (d00p)
b3280e2264 use same aliasdomain-check queryin 'add' like we do in 'edit' of domains
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-09-29 18:15:46 +02:00
Michael Kaufmann (d00p)
879302623b dirty fix for adding new domains when alias-domain is set (IP-check etc. were not done in tilman19-master branch), I'll get into that later
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-09-29 15:08:45 +02:00
Michael Kaufmann (d00p)
f7c014e14f remove unecessary and weird conditional (how's that supposed to work?) and fix editing of domain as admin (not always reproducible though...)
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-09-27 16:28:33 +02:00
Michael Kaufmann (d00p)
6b3a54995c fix enabling of 'speciallogfile' if security questions are asked when editing a domain, fixes #1213
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-09-23 09:35:33 +02:00
Michael Kaufmann (d00p)
9e405dafce merge tilman19-master branch (multistack support) - note: this is a very early stage, don't expect everything to work 100%, use at your own risk. Testers are very very welcome (only apache2 and nginx (even more testing) so far)
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-09-19 19:36:06 +02:00
Michael Kaufmann (d00p)
46e260fc91 correcting variable name, now really fixes #1264
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-09-19 08:04:25 +02:00
Michael Kaufmann (d00p)
a62eff0819 fix deactivating of nameserver-option in admin_domains when editing a domain, fixes #1264
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-09-18 23:29:41 +02:00
Michael Kaufmann (d00p)
d4d02bfa7d fix undefined variables and domain-edit of php-config when FPM is enabled
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-07-14 11:23:52 +02:00
Michael Kaufmann (d00p)
b7a4b69ee0 enhance php-fpm configuration options to use custom-ini-settings, refs #587
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-07-05 10:54:52 +02:00
Michael Kaufmann (d00p)
d9e7cd349b fix in display of error for path-field when dropdown is chosen (customer/domains); update change in speciallogfile also for subdomains of that domain, fixes #1223
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-06-09 15:18:38 +02:00
Michael Kaufmann (d00p)
b5fc0ad532 fix error when security question is being asked when adding a domain as admin, thx to Sephi
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-05-08 16:34:04 +02:00
Michael Kaufmann (d00p)
9691a39102 fix setting of default IP/Port (which still used panel_domain's ipandport-field), don't show ssl-enabled IP/Ports for default-ip (wrong default parameter of function getIpPortCombinations()), smaller fixes in bind- and lighttpdcronjob
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-05-02 10:38:44 +02:00
Michael Kaufmann (d00p)
8aa74a9b90 fixes for dualstack by tilman19
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-04-29 10:02:44 +02:00
Tilman Klaeger (tilman19)
80f19c7dfb Add multistack options to userpanel, fixes #586 2013-04-29 09:06:40 +02:00
Michael Kaufmann (d00p)
82973267f3 respect deactivation of 'nameserver' yes|no in domain-edit (thx to monumentum); beautify preconfig
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-04-19 15:32:10 +02:00