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

245 Commits

Author SHA1 Message Date
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
Michael Kaufmann (d00p)
b480a0be57 a few fixes here and there, imporved autoloader, updated database-class (ugly old php4 style), removed two functions which will be included in the following updated installer 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-13 10:39:11 +02:00
Michael Kaufmann (d00p)
47d595edda fix checklastguid, thx oschni 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-02 10:23:58 +02:00
Michael Kaufmann (d00p)
09b408c375 make changing default theme in settings recurse through customers and admins if changing themes for them is disallowed, fixes #1233 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-10-01 10:07:36 +02:00
Michael Kaufmann (d00p)
bacf60df59 Sephi doesn't like missing B's in KB :P 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-23 17:38:52 +02:00
Michael Kaufmann (d00p)
0475751cee fix minor issues; re-added cronjob for lighttpd-webserver (i swear i don't know what happened :P) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-09-19 22:13:12 +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
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)
1870a88f6b fix possible undefined variable in error-message, thx to Dessa 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-07-09 21:46:56 +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)
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)
f2d10046b6 fix axfr-server-stuff (and close allow-transfer block), let updater and settings validate ipv4/ipv6 via function validate_ip 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-22 16:39:35 +02:00
Michael Kaufmann (d00p)
7adc2dd35c Update version_compare function; fix syntax-error in bind-config generation, thx to monumentum 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-19 13:55:38 +02:00
Michael Kaufmann (d00p)
65b3d536b6 just needed it and thought it'd be helpful for all :) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-14 22:57:57 +02:00
Michael Kaufmann (d00p)
fb045c3fe1 let admin chose what password-hash-algorithm is to be used to crypt() passwords; fixes #852 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-14 18:41:21 +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)
090d4a6835 fix escaping of spaces in dir/filename 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-06 18:57:49 +02:00
Michael Kaufmann (d00p)
350e1b2d2d if empty string is allowed for file/folder in settings by definition, really allow empty string; fixes #1160 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-06 13:38:57 +02:00
Michael Kaufmann (d00p)
95efc2f3a7 trim path before checking, fixes #927 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-04-04 16:10:17 +02:00
Michael Kaufmann (d00p)
ab410cc91e don't insert task if feature is disabled even though they are not run but might be irritating for the admin, thx to fuchsi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-29 20:10:37 +01:00
Michael Kaufmann (d00p)
cbc745ff72 remove mod_log_sql as planned 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-15 08:38:29 +01: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
Michael Kaufmann (d00p)
3b1be99814 use correct linker-property to set the hostname in redirectTo() function, fixes #1151 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-07 09:35:20 +01:00
Michael Kaufmann (d00p)
12e57c5f10 fix maildirExists() function to check also 'old' maildir layout, refs #1103 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-03-07 09:13:20 +01:00
Arnold Bechtoldt
78f286cbda Implement *deactivate-catchall*-feature, refs #fixes 1114 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-21 20:08:20 +02:00
Arnold Bechtoldt
68308c4fca using more UTF-8, optimized the initial froxlor.sql statements, refs #1117 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-17 15:47:27 +02:00
Arnold Bechtoldt
1943747594 adding global variable to buildNavigation() to grant templates of the Classic template access to $theme 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
 2012-08-15 16:52:43 +02: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
Andreas Burchert (scarya)
5b15de8e9a Merged upstream/master to encrypted passwords, refs #852 
Signed-off-by: Andreas Burchert (scarya) <scarya@froxlor.org>
 2012-07-25 09:01:52 +02:00
Andreas Burchert (scarya)
46e788f875 Added support for encrypted passwords, refs #852 
Thanks to sardyna12

Signed-off-by: Andreas Burchert (scarya) <scarya@froxlor.org>
 2012-07-20 11:35:33 +02:00
Fabrício Zimmerer Murta
432e898318 Additional modifications to domain/user/Maildir email file structure 
- Added email settings' option to specify Maildir directory (depending
  on postfix version this is ./Maildir/, .maildir/ or, optionally, one
  can choose to leave Maildir file structure directly on user's
  directory.
- Fixed database 'insert' command to describe the new structure using
  specified Maildir directory into new accounts.
- Fixed maildirExists function to the new file structure
- Fixed older bug that email exclusions that were scheduled (task 7)
  were not being displayed on overview.
- Added entries on 'english' language file for the new entries on panel
- Changed task id 6 (delete customer) behavior on scrips/jobs/cron_tasks.php
  to assure email account is owned to mail uid/gid and the target is an
  actual directory before zapping it.
- Fixed task id 7 (delete customer mail data) behavior on script above
  to correctly fill and find Maildir and also do additional paranoid
  checks before zapping the mail account directory. Notice this is not
  the same from above directory-wise: here we erase a single account's
  data, while in task id a entire customer set of accounts and domains
  are eliminated.
 2012-07-09 23:46:51 -03:00
Fabrício Zimmerer Murta
42b9964e9c Fix 'task id 9' issue. 
Adds a message on Admin's Overview page if a task is of an unknown type.
Removes task '9' adding on function.inserttask and ignores task id 9 on
CronJobFunctions.
 2012-06-18 02:05:55 -03:00
root
12d137aac4 Apply patch from d00p from http://redmine.froxlor.org/issues/1097 
Fixes the following error:
Fatal error: Cannot access private property db::$password in
/var/www/froxlor/lib/functions/database/function.correctMysqlUsers.php
on line 27

But ID on Redmine: #1097 2012-05-30
 2012-06-07 15:47:05 -03:00
blackice2999
173e40b0e4 added new config option for php fpm fixes #1089 2012-05-08 23:12:51 +02:00
Florian Aders (EleRas)
aa7cf38f7e Trying to fix MySQL server has gone away, thx for all the hints and help - let us hope it works, ref #1025 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2012-02-27 20:47:21 +01:00
Andreas Burchert (scarya)
c0d2d2dddd Small fix in makeChownWithNewStats(). 
Signed-off-by: Andreas Burchert (scarya) <scarya@froxlor.org>
 2012-01-17 18:42:02 +01:00
Florian Aders (EleRas)
4ab80e6144 Corrected year in some copyrights and templates 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2012-01-02 14:36:48 +01: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
Christoph Burchert (Chb)
418990e271 Fixes fix 
Signed-off-by: Christoph Burchert (Chb) <derchb@froxlor.org>
 2011-09-26 03:47:12 +02:00
Andreas Burchert (scarya)
8e07768996 Fixes 'unknown user' for disabled accounts (traffic overview), fixes #791 
Thanks to monotek
 2011-09-19 11:07:09 +02:00
Andreas Burchert (scarya)
14f9344c50 Prevent empty 'ServerName', fixes #870 
Thanks to h4cc
 2011-09-19 10:56:27 +02:00
Florian Aders (EleRas)
6daec3c975 Fixed gettext - support for smarty, now you are able to change the language for real and the translated string is no longer saved in the cached template, refs #819 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-23 12:56:18 +02:00
Florian Aders (EleRas)
e9000a7e99 Merge branch 'quota' 2011-06-23 11:18:18 +02:00
Florian Aders (EleRas)
f79e351b72 Added gettext - filter for smarty 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-23 10:28:52 +02:00
Florian Aders (EleRas)
a23260fb7f Added task 10 to description of outstanding tasks, refs #814 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-19 13:43:56 +02:00
Florian Aders (EleRas)
eb984c2f4c Moved redundant code into single function, refs #814 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-19 11:31:00 +02:00
Florian Aders (EleRas)
8599ff775b Tell Froxlor there exists a task-type 10, refs #814 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-18 22:53:15 +02:00
Florian Aders (EleRas)
76b716d41d redirectTo now uses the new linker class 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-14 18:22:29 +02:00
Florian Aders (EleRas)
0b3e788b86 Revert "Changed redirectTo to use new link-class" 
This reverts commit b88246b112.
 2011-06-13 22:08:38 +02:00
Florian Aders (EleRas)
b88246b112 Changed redirectTo to use new link-class 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 21:55:46 +02:00