maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
956 Commits 6 Branches 188 Tags
e9000a7e99f21af84d08342c65e0496b4e607a3f
Commit Graph

956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Aders (EleRas)
e9000a7e99 Merge branch 'quota' 2011-06-23 11:18:18 +02:00
Florian Aders (EleRas)
44a53492e6 Moving to smarty - escaping in webftp, refs #819 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-23 11:09:44 +02:00
Florian Aders (EleRas)
7cf0fa7284 Destroy session if password was entered wrong in webftp, refs #819 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-23 11:02:16 +02:00
Florian Aders (EleRas)
9aa86e1dee Show warnings if login failed, optimized handling of data in session, refs #819 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-23 10:47:29 +02:00
Florian Aders (EleRas)
961aad43d1 Added first rework of webftp - module, please not, this still needs a hell lot of work, but anyway: fixes #819 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-23 10:30:59 +02:00
Florian Aders (EleRas)
6e84ca4ae4 Added helperscript for smarty - gettext 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-23 10:29:34 +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)
a24d809428 Added Smarty 3.0.8 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-23 10:28:00 +02:00
Florian Aders (EleRas)
0fa64ea943 Fixed small bug in JS and navigation - element - template 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-23 01:04:59 +02:00
Florian Aders (EleRas)
fe0b71b628 Added updated french languagefile, fixes #817 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-21 21:30:38 +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)
1836132c28 Use setting instead of hardcoded name, refs #814 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-18 23:06:39 +02:00
Florian Aders (EleRas)
aae635bf5d More secure way to get the used quota, refs #814 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-18 22:53:27 +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)
8bfdd0bc14 Update filesystem - quota when config-updates shall be written as well, refs #814 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-18 19:54:43 +02:00
Florian Aders (EleRas)
30344b0dce Forgot to add settings, fixes #814 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-18 19:52:47 +02:00
Florian Aders (EleRas)
8019629a28 Added task 10 (setting filesystem - quota) where necessary, fixes #814 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-18 19:48:16 +02:00
Florian Aders (EleRas)
7a28108475 Added usage of filesystem - quota to diskusage - calculation and added a new task to cron_tasks.php for setting the quota, refs #814 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-18 19:42:01 +02:00
Florian Aders (EleRas)
cfa94c5837 Added new settings for disk quota, refs #814 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-18 19:03:20 +02:00
Florian Aders (EleRas)
c9c0530461 Removed warning on deactivation of safemode since it is deprecated and will be removed, fixes #812, fixes #556 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-16 20:54:54 +02:00
Florian Aders (EleRas)
093ebfa457 Fixed a bug for PHP < 5.3.0 (used func_get_arg as argument, which does not work on older PHP versions) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-16 20:23:59 +02:00
Florian Aders (EleRas)
3800f31823 Added security related HTTP - header for browser which support this (non supporting browsers will just ignore it and everything is fine) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-16 20:17:44 +02:00
Florian Aders (EleRas)
cc26584f01 Updated jquery to jquery-1.6.1.min.js 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-16 20:05:14 +02:00
Florian Aders (EleRas)
8131e9e92c Just beautification 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-16 19:06:49 +02:00
Florian Aders (EleRas)
38e472a623 Use correct JS - file 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-16 19:05:25 +02:00
Florian Aders (EleRas)
3e21cb0298 Moved inline - javascript to external file in preparation of X-Content-Security-Policy (also, the code looks cleaner, yay) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-16 18:59:16 +02:00
Florian Aders (EleRas)
b9bb1a1286 A bit better ticket-delete - view (not 100% sufficient, but better than nothing) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-14 19:10:38 +02:00
Florian Aders (EleRas)
25609a7068 Moved ticket - formfields to correct directory 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-14 18:47:09 +02:00
Florian Aders (EleRas)
35d8b3f8a1 Moved autoresponder - formfields to own directory 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-14 18:45:11 +02:00
Florian Aders (EleRas)
d593a217a4 Moved autoresponder - templates to own directory (now following correct schema) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-14 18:41:18 +02:00
Florian Aders (EleRas)
960fa58799 Renamed ticket - templates to follow the rest of the Froxlor scheme: templatedir = <section> = [admin|customer]_<section>.php 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-14 18:34:43 +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
Florian Aders (EleRas)
4d10c72ae9 Fixed bug in link-class where protocol was added to URL withour hostname 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 21:55:27 +02:00
Florian Aders (EleRas)
0a21ede3d2 Missing linker-link in classic - admin-customers-overview fixed 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 21:15:16 +02:00
Florian Aders (EleRas)
3669822064 Missing linker-links in traffic - files fixed 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 21:12:31 +02:00
Florian Aders (EleRas)
b68f9fe395 Implemented linker - class for admin_setting.php (resource-recalculation) (templates only) 2011-06-13 21:05:52 +02:00
Florian Aders (EleRas)
e101d01e11 Implemented linker - class for customer_tickets.php (templates automatic replace only) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 20:56:08 +02:00
Florian Aders (EleRas)
bdce761af0 Implemented linker - class for customer_traffic.php (templates automatic replace only) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 20:54:02 +02:00
Florian Aders (EleRas)
784d1a62f7 Implemented linker - class for customer_mysql.php (templates automatic replace only) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 20:53:29 +02:00
Florian Aders (EleRas)
c84602d560 Implemented linker - class for customer_ftp.php (templates automatic replace only) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 20:51:28 +02:00
Florian Aders (EleRas)
3bcba9fa40 Implemented linker - class for customer_extras.php (templates automatic replace only) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 20:50:41 +02:00
Florian Aders (EleRas)
7246dc124e Implemented linker - class for customer_[autoresponder|emails].php (templates automatic replace only) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 20:48:37 +02:00
Florian Aders (EleRas)
fcdcd4d6cb Implemented linker - class for customer_domains.php (templates automatic replace only) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 20:40:19 +02:00
Florian Aders (EleRas)
07d981ac25 Implemented linker - class for customer_index.php (templates automatic replace only) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 20:38:46 +02:00
Florian Aders (EleRas)
1bf764c5c3 Implemented linker - class for admin_updates.php (templates automatic replace only) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 20:36:20 +02:00
Florian Aders (EleRas)
79b886994c Implemented linker - class for admin_traffic.php (templates automatic replace only) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 20:35:07 +02:00
Florian Aders (EleRas)
62f8c7d1b6 Implemented linker - class for admin_tickets.php (templates automatic replace only) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2011-06-13 20:34:15 +02:00