clones/Froxlor
1
0
Fork 0
mirror of https://github.com/Froxlor/Froxlor.git synced 2024-09-21 10:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,919 Commits 7 Branches 181 Tags 53 MiB
6a10020e9b
Commit Graph

106 Commits

Author SHA1 Message Date
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
Florian Aders
deb19f2625 Removed unnecessary exit - calls 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-22 12:10:18 +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
Florian Aders
ddaadf81d6 Temporarily deactivate ssl_redirect if a new Let's Encrypt certificate needs to be generated 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-02-16 14:31:07 +01:00
Michael Kaufmann (d00p)
5109443346 output error message when letsencrypt is checked and wildcard-serveralias in enabled - not just silently disable letsencrypt, people don't read the description and are confused 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2016-02-16 08:51:36 +01:00
Stefan Heid
eae9c4d78a Typo correction 2016-02-10 22:23:46 +01:00
Stefan Heid
ae581c2da7 Added termination-date to domains 2016-02-10 21:22:52 +01:00
Florian Aders
d87fc4c717 Prevent enabling let's encrypt for wildcard - domains 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 14:46:00 +01:00
Florian Aders
c189ad759b Add Let's Encrypt to admin - GUI 
Signed-off-by: Florian Aders <eleras@froxlor.org>
 2016-01-30 14:34:26 +01:00
Stefan Weil
5df4b3e7df Don't assign variable from void function 
Database::pexecute is based on execute which is a void function.
It does not return a value which can be assigned to a variable.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2015-11-15 10:16:33 +01:00
rzeka
a3f2fa1b16 Better customers sorting based on name and company 2015-04-28 14:14:12 +02: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)
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