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

2300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BNoiZe
2a36a0c22f Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-12-01 09:59:16 +01:00
BNoiZe
cd342691ca Updating method to reset password to use a activation link, fixes #729 2013-11-30 21:30:24 +01:00
Michael Kaufmann (d00p)
f8e7f1a975 remove not-functional method 'maildirExists' as maildirs have chmod 700, show 'remove files' on overview-delete if mail-address is an account, fixes #1275 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-30 16:40:27 +01:00
Michael Kaufmann (d00p)
f278b42353 fix wrong parameter-name in admin-customers; check for disabled imap/pop3 when adding mail-accounts as customer, fixes #1298 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-30 16:07:23 +01:00
Michael Kaufmann (d00p)
1e87c21956 removed deprecated db-class (mysql-extension) as it is not needed anymore 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-30 15:32:57 +01:00
Michael Kaufmann (d00p)
b1ae352d88 migrated install-class to new PDO database class, needs testing, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-30 14:25:49 +01:00
Michael Kaufmann (d00p)
cf3de1c657 fix customer-mysql overview, set better email address for error-reports to send to 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-29 23:13:26 +01:00
Michael Kaufmann
380d358a54 Merge pull request #168 from BNoiZe/master 
sizes are displayed correctly, fixes #1277
 2013-11-29 13:56:28 -08:00
BNoiZe
87bc9432f3 Fixed typos, refs #1287 2013-11-29 18:22:50 +01:00
BNoiZe
7731d69929 Updated to reflect 1024 size calculation systemwide, refs #1277 
Fixed decimal places in customer_mysql.php
 2013-11-29 18:03:02 +01:00
BNoiZe
d1cb2625ca Made display of database errors wider 2013-11-29 14:24:16 +01:00
BNoiZe
9986c3405e Manually trigger window resize to fix circular missbehaviour on several browsers 2013-11-29 13:55:27 +01:00
Michael Kaufmann
b38479f92d Merge pull request #167 from BNoiZe/master 
Updated language definitions for the new error reporting system; added templates for Froxlor-theme
 2013-11-29 04:51:12 -08:00
BNoiZe
21f7c82a95 Updated language definitions for the new error reporting system, added templates to "Froxlor" theme 2013-11-29 13:44:57 +01:00
Michael Kaufmann (d00p)
88ec1a15f1 make linker available in Database class 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-29 12:55:10 +01:00
Michael Kaufmann (d00p)
3774b967f8 fix minor errors 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-29 11:28:48 +01:00
Michael Kaufmann (d00p)
defdaeee2e first implementation of error-reporting 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-29 11:09:16 +01:00
Michael Kaufmann (d00p)
6f61c7b5e7 show std-subdomain (if any) to customer on the dashboard, fixes #1297 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-28 13:07:53 +01:00
Michael Kaufmann (d00p)
4426ab52d3 migrate ALL the crons to new PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-28 12:35:20 +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)
4cbd92abf3 migrated lib/init.php to new PDO database class, no more in the frontend now, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-28 10:58:37 +01:00
Michael Kaufmann
7b3937af11 Merge pull request #166 from BNoiZe/master 
Fixed an error in webftp template, refs #1312
 2013-11-28 01:59:28 -08:00
BNoiZe
fc363925cd Fixed an error in the correct file, refs #1312 2013-11-28 10:56:42 +01:00
BNoiZe
34c6ab3e06 Revert "Fixed an error in webftp template, refs #1312" - Wrong file 
This reverts commit 0e977b45cb.
 2013-11-27 23:03:47 +01:00
Florian Aders (EleRas)
b748270249 Fixed type 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-11-27 08:59:00 +01:00
Michael Kaufmann (d00p)
25687953c5 correct author :P damn copy'n'paste 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-27 08:36:28 +01:00
Michael Kaufmann (d00p)
4381eff384 check for fcgid being enabled when switching the webserver as only apache2 can handle fcgid (prevent a possible deadlock in the panel) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-27 08:34:49 +01:00
Florian Aders
87fae7f2e4 Merge pull request #165 from BNoiZe/master 
Fixed an error in webftp template, refs #1312
 2013-11-26 22:02:08 -08:00
BNoiZe
0e977b45cb Fixed an error in webftp template, refs #1312 
$linker->getLink() will not work in webftp
 2013-11-27 05:27:29 +01:00
Dessa
e47cc86259 Merge pull request #164 from BNoiZe/master 
fixed an error, refs #1287
 2013-11-26 11:39:18 -08:00
BNoiZe
2d1e7f7756 fixed an error, refs #1287 2013-11-26 20:38:27 +01:00
Michael Kaufmann
35c3f3d71e Merge pull request #163 from BNoiZe/master 
More PDO migration. Merge multiple location-blocks of the same directory in ngnix, fixes #1309
 2013-11-26 09:25:22 -08:00
Michael Kaufmann (d00p)
567f789dab at this stage in the updater, it's too late to inform about pdo 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-26 10:16:19 +01:00
Michael Kaufmann (d00p)
84ed13d791 update-note about php-pdo being used now 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-26 09:41:40 +01:00
Michael Kaufmann (d00p)
81c0771f3b corrected Database::needSqlData() and Database::getSqlData(), refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-26 09:08:27 +01:00
Michael Kaufmann (d00p)
a2dbf56d2e migrated correctMysqlUsers() function to new PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-26 08:13:05 +01:00
BNoiZe
589e422767 Migrated updateCounters to new PDO database class, refs #1287 2013-11-25 22:32:22 +01:00
BNoiZe
fc5c4658d1 Added mergeVhostBlocks() for nginx cron, refs #1309 2013-11-25 19:32:01 +01:00
Michael Kaufmann (d00p)
c5937077c4 add needed sql-root-data to customer-mysql 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-25 10:01:39 +01:00
Michael Kaufmann (d00p)
7297ce88b5 fixed missed statement-fetch in cron-task when adding a new ftp-user 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-25 09:21:51 +01:00
Michael Kaufmann (d00p)
7a3d696c6a migrated DomainSSL-class to new PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-25 09:18:11 +01:00
Michael Kaufmann (d00p)
ae4bc4471e migrated APS parser class to new PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-25 08:47:54 +01:00
Michael Kaufmann (d00p)
c4fc03d7af separate certificate and chainfile by newline, fixes #1307 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-23 15:14:41 +01:00
Robert Förster (Dessa)
94e63e78d1 fix typo 
Signed-off-by: Robert Förster (Dessa) <Dessa@froxlor.org>
 2013-11-23 10:28:29 +01:00
Michael Kaufmann (d00p)
02f7a56aeb fix syntax-error in getLanguages, thx to Sephi, refs #1306 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-22 22:46:48 +01:00
Michael Kaufmann (d00p)
000bf6aebc restored missing function and migrated it to new PDO database class, fixes #1306 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-22 15:56:25 +01:00
Florian Aders (EleRas)
fcd537b091 Fixed newsfeed with curl 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-11-21 10:09:05 +01:00
Florian Aders
a9a2d296bf Merge pull request #162 from BNoiZe/master 
Added fallback if allow_url_fopen is off
 2013-11-21 01:01:11 -08:00
BNoiZe
df95189e87 Added check if curl is enabled 2013-11-21 09:56:06 +01:00
BNoiZe
dc09840f99 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-11-21 08:59:23 +01:00