maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,743 Commits 6 Branches 188 Tags
ad302fb5c24e21eaf7de9da0928b0dd805b66104
Commit Graph

2743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann (d00p)
37ca78913c respect possible empty-value when validating string::validate_ip 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-12 13:02:50 +01:00
Michael Kaufmann (d00p)
df3b97c5dd change comments for better understanding, fixes #1496 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-12 09:22:59 +01:00
Michael Kaufmann (d00p)
953e3f5ba6 Merge branch 'master' of github.com:Froxlor/Froxlor 2015-02-11 21:21:13 +01:00
Michael Kaufmann (d00p)
74b73c6446 rename 'MySQL User' to 'Froxlor Customer' as username for users read from db via libnss; fix language strings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-11 21:21:09 +01:00
Roman Schmerold (BNoiZe)
bc80fb71df Restyling configfiles with textareas instead of pre 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-11 19:35:18 +01:00
Michael Kaufmann (d00p)
b0279025d0 add numbrows to commands and files for BNoiZe's template magic; added possibility to use sql-data inside xml-config; updates xml-configs a bit when socket is used (not 100% done) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-11 14:30:30 +01:00
Roman Schmerold (BNoiZe)
a45712198b Update configfiles templates 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-11 13:01:48 +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)
d6c708e6ee only show restart command of php-fcgi for nginx if fcgid/fpm is not used 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-11 08:25:19 +01:00
Michael Kaufmann (d00p)
1f24ca9ba2 split codename and version from version field in config-xml file as this eases automation 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-11 07:15:05 +01:00
Michael Kaufmann (d00p)
c482db8c89 prepare database-class to have a separate socket-option, not as replacement for 'host' 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-10 16:13:14 +01:00
Michael Kaufmann (d00p)
c356639ce9 fix move-customer-to-admin 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-10 16:12:47 +01:00
Michael Kaufmann (d00p)
8b0572add1 fix visibility of fields in admin/formfields.admin.php 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-10 16:11:35 +01:00
Michael Kaufmann (d00p)
61b1adfb3d fix typo 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-10 16:11:08 +01:00
Michael Kaufmann (d00p)
2f5ea4b305 added postfix-3.x configs for gentoo 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-10 08:39:05 +01:00
Michael Kaufmann
ccc321be8a Merge pull request #230 from junkpad92/patch-1 
"discard changes" and "save" on top of each other in security options; there was missing this additional template to fix the bug definitely, fixes #1488
 2015-02-09 22:53:22 +01:00
junkpad92
b68861c175 Fix Bug #1488 
"discard changes" and "save" on top of each other in security options; there was missing this additional template to fix the bug definitely.
 2015-02-09 22:49:40 +01:00
Roman Schmerold (BNoiZe)
2ffcba78cc Remove another remainent of Smarty 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-09 15:00:21 +01:00
Michael Kaufmann (d00p)
855226d01a sort distribution-names in admin_configfiles, it's confusing otherwise; display the default/recommended daemon of every service; fix small c'n'p error (courier is not our recommended default) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-09 14:49:53 +01:00
Michael Kaufmann (d00p)
b8e548d1df clean variable after subfile-block 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-09 14:28:24 +01:00
Michael Kaufmann (d00p)
095f1df947 add Ubuntu Precise 12.04 XML-config 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-09 13:55:10 +01:00
Michael Kaufmann (d00p)
4bd91a811d change admin_configfiles to handle the new XML-configs instead of the old php-arrays 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-09 13:54:55 +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
Roman Schmerold (BNoiZe)
677ed371a9 Remove another template we only used for webftp 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-08 19:01:03 +01:00
Roman Schmerold (BNoiZe)
987caa632b Add Cancel-Button to template selection 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-08 19:00:21 +01:00
Michael Kaufmann (d00p)
3df581152d remove webftp.php as it: pulls smarty-tplengine we don't use anywhere else, is unknown to most of our users, a possible security-issue, etc. etc. etc.; just don't use webftp stuff 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-08 18:56:31 +01:00
Michael Kaufmann (d00p)
f0ca931dfc update idna_convert class 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-08 18:49:32 +01:00
Michael Kaufmann
52541f18f1 Merge pull request #229 from stweil/typos 
Fix typos found by codespell, thx to stweil
 2015-02-08 18:34:32 +01:00
Stefan Weil
4ee200e9f6 english: Fix typos found by codespell 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2015-02-08 17:52:53 +01:00
Stefan Weil
47ef9f74a7 classes: Fix typos 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2015-02-08 17:52:53 +01:00
Stefan Weil
92478d0e4f smarty: Fix typo 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2015-02-08 17:52:53 +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
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)
be387ccf35 show whether a customer is deavtivated after successful login rather then nothing at all 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-08 16:07:24 +01:00
Michael Kaufmann (d00p)
6f73afe265 don't use -1 for standard-subdomains as the parentdomainid field is declared as unsigned int and therefore converted to 0 anyways 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-08 15:21:19 +01:00
Michael Kaufmann (d00p)
65d548d4f9 fix undefined variable in cases 'custom-notes-show' is not set when adding/editing an admin/a customer 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-08 12:43:04 +01:00
Florian Aders (EleRas)
682b27fdd8 Added when to execute an autogenerated file in ConfigDaemon 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2015-02-08 12:05:22 +01:00
Roman Schmerold (BNoiZe)
d213d65a24 Fixed buttons on top of each other, fixes #1488 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-08 12:01:05 +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)
5a3bbd928a fix nscd restart command in rhel/centos XML 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-07 23:29:38 +01:00
Michael Kaufmann (d00p)
69854a8e0c minor fixes to rhel-configfiles + new rhel/centos config-XML 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-07 17:54:08 +01:00
Michael Kaufmann (d00p)
78667ce08b update config-file-xml's: gentoo.xml and wheezy.xml; added trusty.xml 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-07 15:32:07 +01:00
Michael Kaufmann (d00p)
0ef5749925 use correct restart commands for trusty 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-07 15:29:50 +01:00
Michael Kaufmann (d00p)
218104e6e2 add new configuration-template-XML-files for future use (they will replace [dist].inc.php + text-file-templates) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-07 10:59:28 +01:00
Michael Kaufmann (d00p)
38b7d44e3a remove unuused lang-indeces 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2015-02-07 10:56:22 +01:00
Florian Aders (EleRas)
332cb64b71 Group file-commands for easier processing in ConfigDaemon 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2015-02-07 10:41:54 +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
Florian Aders (EleRas)
269c24a398 Added file - parameter to command if command was created by expanding file - attributes in ConfigDaemon 2015-02-06 13:27:01 +01:00
Michael Kaufmann
bad427bfba Merge pull request #228 from HolySephi/master 
fixed some rhel/centos 7 config issues, thx to Sephi
 2015-02-06 10:56:23 +01:00