maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
3,927 Commits 6 Branches 188 Tags
28bb614489b49806a9c703debb4396c3b98ace91
Commit Graph

49 Commits

Author SHA1 Message Date
Michael Kaufmann
0401e6971a Revert "refactor global array" 
This reverts commit c5a58e3f36.
 2018-12-22 08:15:31 +01:00
Michael Kaufmann
7e39a7bc60 Revert "refactor global array" 
This reverts commit 370ccbdb74.
 2018-12-22 08:15:31 +01:00
Michael Kaufmann
370ccbdb74 refactor global array 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 20:51:44 +01:00
Michael Kaufmann
c5a58e3f36 refactor global array 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 20:31:17 +01:00
Michael Kaufmann
7563907df5 convert html-related functions 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 18:31:06 +01:00
Michael Kaufmann
97b5439c0d auto-format all files; add table-definitions to test-bootstrap file 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 12:24:07 +01:00
Michael Kaufmann
c0e89bbd05 refactor UI functions 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-21 11:22:03 +01:00
Michael Kaufmann
8e84a4ff44 correct use of Database use 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-19 16:57:03 +01:00
Michael Kaufmann
6329042d40 use namespaces in modules 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-18 13:45:05 +01:00
Michael Kaufmann
ab819129dd return the subdomain-names in PhpSettings::listing() instead of only the amount 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-11 11:45:39 +01:00
Michael Kaufmann
8d966aebee Show number of subdomains that use a php-config; fixes #532 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-12-11 10:12:37 +01:00
Michael Kaufmann
5752f7b64e Merge remote-tracking branch 'origin/master' into 0.10.0 2018-09-30 10:04:15 +02:00
Michael Kaufmann
6c7ee0c222 add possibility to specify pm-related settings per php-config (if override of fpm-daemon settings is set to yes), fixes #573 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2018-09-28 10:55:08 +02:00
Michael Kaufmann (d00p)
cadb6618ec list() is a reserved php keyword, changed ApiCommand::list() to ApiCommand::listing() 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-03-02 17:22:47 +01:00
Michael Kaufmann (d00p)
b2ac1fb593 add FpmDaemons ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-19 13:58:39 +01:00
Michael Kaufmann (d00p)
8c6ae4f3a3 add PhpSettings ApiCommand 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-19 13:36:15 +01:00
Michael Kaufmann (d00p)
05b4c58aa8 fix updating wrong column when deleting a fpm configuration 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-09 09:20:46 +01:00
Michael Kaufmann (d00p)
f290497b64 fix selected phpfpm daemon when editing php-configuration, fixes #514 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-02-09 07:33:28 +01:00
Michael Kaufmann (d00p)
eed3a91385 fix (not yet perfect) regex for limit_extension setting 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-10 15:45:21 +01:00
Michael Kaufmann (d00p)
62006d584e fix limit_extensions setting 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-10 15:42:11 +01:00
Michael Kaufmann (d00p)
f2a79d4d96 add new security.limit_extensions setting to fpm-daemon settings 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-10 15:20:19 +01:00
Michael Kaufmann (d00p)
6b44dfe9b2 well, we should also save the new settings :) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-09 17:22:20 +01:00
Michael Kaufmann (d00p)
3dc6a64252 fix pm select when editing fpmdaemon; fix saving of pm value 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-08 10:22:09 +01:00
Michael Kaufmann (d00p)
ebd636494a fix wrong table constant 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-08 10:11:38 +01:00
Michael Kaufmann (d00p)
af55fe5b82 add possibility to add multiple php-fpm instances 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2018-01-07 14:55:25 +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
Johannes Feichtner
5c5e736776 Order vhost and php settings ascending by domain 2016-02-21 14:56:03 +01: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
Roman Schmerold (BNoiZe)
457e378d1e Reverting HTMLform2 changes 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-06-10 14:59:38 +02:00
Roman Schmerold (BNoiZe)
6dad29cae7 Even more HTMLform2 migrations 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2015-02-16 17:56:37 +01:00
Michael Kaufmann (d00p)
c59fe0e4ad fix wrong variable 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-20 11:18:46 +01:00
Michael Kaufmann (d00p)
4f4689c4e9 also check for php.configs that are set as default on deletion; emphasize default config in overview 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-18 17:13:25 +01:00
Michael Kaufmann (d00p)
8ff2c930ee show and check whether a php-config is used by the system-hostname 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-02-18 17:01:02 +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)
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)
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)
04012e5fff more fixes for migration to PDO, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-06 11:08:48 +01:00
Michael Kaufmann (d00p)
661c081a77 fix execute of statement if variables != replacers in sql-prepare query 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-04 22:23:49 +01:00
Michael Kaufmann (d00p)
3ec08a8f48 migrate admin_message, admin_phpsettings and admin_templates to PDO, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-02 12:07:34 +01:00
Michael Kaufmann (d00p)
1c0937f29b don't show subdomains in php-configuration-overview + allow to hide standard-subdomains (they are full-domains) via panel-setting; fixes #744 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-14 11:10:51 +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)
43770d37e1 manually merged re-design changes to 80% of the files 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2011-02-08 12:53:24 +01:00
Florian Aders (EleRas)
ad31b07a04 Reverting the multiserver-stuff, we'll do this inside the branch 2010-10-23 10:20:23 +00:00
Michael Kaufmann (d00p)
382bd88344 - prepare inserttask()-function for multiserver-support 2010-10-17 01:44:58 +00:00
Michael Kaufmann (d00p)
9d48bbf2f3 - fix logger-message in phpsettings when adding new php-config, thx freaky[t] 2010-04-30 05:07:34 +00:00
Robert Foerster (Dessa)
883963d2e2 svn:eol-style got murdered on some files for whatever reason so it gets resurrected now, also set some svn:keywords 2010-01-27 08:54:31 +00:00
Michael Kaufmann (d00p)
632c7051fc changing file-headers; 
fixing $needrootdb in cron_init.php (why was this disabled?);
 2010-01-25 10:06:34 +00:00
Florian Aders (EleRas)
66ac89698f Set svn:keywords "Id" on every file except images and configfiles 2010-01-25 09:11:52 +00:00
Michael Kaufmann (d00p)
9907afe630 ininitial froxlor commit; 
'reverted' old-style update-process;
removed billing-classes, -functions and -templates;
some sql-fixes;
 2010-01-20 09:12:52 +00:00