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

848 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
96bcb34d81 show correct error-message when loginname has too many characters, fixes #811 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-02 10:57:12 +01:00
Michael Kaufmann (d00p)
f50268c806 update lng-files (thx oschn0r) and fixed dropdown of default-php-config in fcgid/fpm settings (thx Sephi) 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-01 18:37:17 +01:00
BNoiZe
e5e0ae7527 Fixed some bugs, made activationcode more secure, added update script, merged missing commit 2013-12-01 10:34:31 +01:00
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)
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)
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)
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)
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)
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 (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
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)
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
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
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
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
BNoiZe
37e6158b57 Added fallback if allow_url_fopen is off 2013-11-20 18:16:24 +01:00
Michael Kaufmann (d00p)
ee19c268cc migrated ApsInstaller and ApsUpdater, fixed typo in traffic-cron (thx to Sephi), refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-20 15:02:49 +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
Michael Kaufmann (d00p)
7a45a534fc added functions to get sql-data to Database-class, migrated backup-cron to new PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-20 10:01:34 +01:00
Michael Kaufmann (d00p)
345ba3a202 migrated autoresponder-cron to new PDO database class, beautify sql-query in paging-class, fix typos in traffic-cron (thx to Dessa), refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-20 08:15:30 +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
BNoiZe
00375949b5 improve admin_index-information part 2/2 2013-11-17 19:30:09 +01:00
BNoiZe
7e383fcc10 Merge branch 'master' of git://github.com/Froxlor/Froxlor 2013-11-17 18:41:49 +01:00
Michael Kaufmann
464ca7a61b Merge pull request #153 from BNoiZe/master 
Initial version of newsfeed in admin dashboard, needs a setting to enable/disable
 2013-11-17 08:36:37 -08:00
Michael Kaufmann (d00p)
0b3df4c7d7 removed unused global db-variables 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-17 12:31:15 +01:00
BNoiZe
401dd7c96c Added check if simplexml is activated 2013-11-16 17:36:47 +01:00
BNoiZe
a431cbcf9e Cleaning up admin newsfeed 2013-11-15 22:50:54 +01:00
BNoiZe
c2bae1f25a Initial version of newsfeed in admin dashboard 2013-11-15 22:11:25 +01:00
Michael Kaufmann (d00p)
f1cfe41d07 fix getCustomerDetail()-query, thx to Sephi 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-15 08:29:53 +01:00
Michael Kaufmann (d00p)
e25597106e make fpm socket directory a setting, fixes #1300 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-14 09:29:55 +01:00
Michael Kaufmann (d00p)
12800b730d remove some unused functions and migrated some more functions to PDO database class, refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-14 08:27:57 +01:00
Michael Kaufmann (d00p)
6a2b81bc17 read open_basedir value properly from php.ini template, thx to s_v_e_n 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-11 12:42:50 +01:00
Michael Kaufmann (d00p)
a97c24634b improve logging user-storage, thx oschn0r 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-10 20:56:37 +01:00
Michael Kaufmann (d00p)
d2a8877069 fix query in admin-customers, improve admin-ipsandports, clean up getThemes(), refs #1287 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-09 13:56:27 +01:00
Michael Kaufmann (d00p)
a152ae3e06 fix some ticket-system issues related with migrating to PDO 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-11-08 14:25:19 +01:00