maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Commit Graph

  • 99c0bda7f2 Merge remote-tracking branch 'origin/0.9.31.1' Michael Kaufmann (d00p) 2013-12-22 19:21:34 +01:00
  • d831d06da9 don't show 'nice' error if no is specified and disguise passwords of sql-accounts, fixes #1336 Michael Kaufmann (d00p) 2013-12-22 18:14:55 +01:00
  • 429f748ad8 Fixing mailtraffic cron, fixes traffic graph sorting Roman Schmerold (BNoiZe) 2013-12-22 10:57:56 +01:00
  • 82f3d8d18c Fixes various traffic graph issues Roman Schmerold (BNoiZe) 2013-12-20 23:56:48 +01:00
  • 308cc0cfb9 Fixed a bug which prevented mailtraffic from being shown Roman Schmerold (BNoiZe) 2013-12-20 23:36:09 +01:00
  • 9acaa94895 Fixed mailtraffic not using lastrun time Roman Schmerold (BNoiZe) 2013-12-20 23:19:50 +01:00
  • a92cdb2926 Added cron for mailtraffic (with EleRas), fixes #69 Roman Schmerold (BNoiZe) 2013-12-20 23:12:47 +01:00
  • 7969edf1b4 Added title-tags to buttons, fixes 1328 Roman Schmerold (BNoiZe) 2013-12-20 19:14:24 +01:00
  • 7af7842fe9 Merge branch 'master' of github.com:Froxlor/Froxlor Roman Schmerold (BNoiZe) 2013-12-20 18:28:44 +01:00
  • 70dc53db6e Fixed missing template vars Roman Schmerold (BNoiZe) 2013-12-20 18:28:36 +01:00
  • 05dad04384 add 0.9.31.1 to updater of 0.9.32-dev Michael Kaufmann (d00p) 2013-12-19 18:30:00 +01:00
  • 261d6e7d76 backport bugfixes from current master 0.9.31.1 Michael Kaufmann (d00p) 2013-12-19 18:05:40 +01:00
  • 119eb5a4b8 Merge pull request #178 from RipClaw2971/sql_fix Michael Kaufmann 2013-12-19 08:47:47 -08:00
  • 18d93fb07d SQL Fix Andreas Grundler 2013-12-19 17:26:04 +01:00
  • 984624bdc4 fix initial value of function parameter as it leads to the first condition to be always true, fixes #1330 Michael Kaufmann (d00p) 2013-12-19 12:35:07 +01:00
  • d1211bdb1a make cronjob category stuff php-5.3 compatible, damn i'm way ahead the current stable versions of php :P Michael Kaufmann (d00p) 2013-12-19 12:17:56 +01:00
  • 996f53786f Fixed bug in webftp regarding email as ftp-login, fixes #1252 Florian Aders (EleRas) 2013-12-19 08:29:22 +01:00
  • 0fee9a3480 complete migration to new Settings class, fixes #1325 Michael Kaufmann (d00p) 2013-12-19 07:56:58 +01:00
  • ec59d3a8e8 Merge branch 'master' of github.com:Froxlor/Froxlor Michael Kaufmann (d00p) 2013-12-19 07:55:48 +01:00
  • c7d00d4d11 Switched traffic charts from jqPlot to flot Roman Schmerold (BNoiZe) 2013-12-18 18:30:57 +01:00
  • 7267c2dec9 Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-18 09:58:38 +01:00
  • 23a1a55bf2 set version to 0.9.31 for upcoming release 0.9.31 Michael Kaufmann (d00p) 2013-12-18 09:40:48 +01:00
  • 7a5be5456d categorize cronjob on cronjob-overview Michael Kaufmann (d00p) 2013-12-17 09:59:11 +01:00
  • 6902868e58 Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-17 07:57:58 +01:00
  • 7256d4ff91 fix possible xss-target Michael Kaufmann (d00p) 2013-12-17 07:57:38 +01:00
  • bdf03486d2 set better defaults (sites-enabled/* is included in apache by default on most systems) Michael Kaufmann (d00p) 2013-12-16 18:33:57 +01:00
  • baac572666 fix missing ::Get when using new Settings-class Michael Kaufmann (d00p) 2013-12-16 13:37:28 +01:00
  • 6a8cd15456 Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-16 13:37:01 +01:00
  • 41d33ae538 use correct quoting-character in sql-query Michael Kaufmann (d00p) 2013-12-16 13:34:08 +01:00
  • 5be5787afd fix wrong Database method-usage when toggling catchall for e-mail address Michael Kaufmann (d00p) 2013-12-16 13:28:03 +01:00
  • 8ad3c79589 add actually a www-alias if set, fixes #1326 Michael Kaufmann (d00p) 2013-12-16 12:26:10 +01:00
  • dc886c9fc5 added tooltips to webspace/traffic bars Roman Schmerold (BNoiZe) 2013-12-16 11:47:25 +01:00
  • 7c0ab217ee Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-16 11:34:25 +01:00
  • 28fbd2487e backport important changes of makePathfield for 0.9.31 Michael Kaufmann (d00p) 2013-12-16 11:33:13 +01:00
  • 6ed02e593c display phperror below fixed header in sparkle theme; fix wrong parameter-list and ignorance of in makePathfield Michael Kaufmann (d00p) 2013-12-16 11:32:25 +01:00
  • 37a242a679 migrate webftp stuff to new settings-class, refs #1325 Michael Kaufmann (d00p) 2013-12-16 11:03:09 +01:00
  • 164b40fef3 fix wrong language-string in settings/180.dkim.php, implemented Settings::Add() for updates later (much better than a manual query etc.), added new php-errorhandler so we can display php errors/warnings/notices (whatever is activated) in a nicer way Michael Kaufmann (d00p) 2013-12-16 10:43:38 +01:00
  • cd3554eecf migrated the themes to use the nice Settings-class Roman Schmerold (BNoiZe) 2013-12-16 10:25:25 +01:00
  • 14311eb8b0 Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-15 19:45:27 +01:00
  • f12428f80d don't rely on defined settings, just read in what's in the database, refs #1325 Michael Kaufmann (d00p) 2013-12-15 19:43:15 +01:00
  • 2f707974e2 fix missing variable in logger, tmp-fix dkim settings Michael Kaufmann (d00p) 2013-12-15 16:46:15 +01:00
  • 1af06b2413 fix typo, refs #1325 Michael Kaufmann (d00p) 2013-12-15 16:26:47 +01:00
  • 121669ee69 migrating more files to new Settings-class makes me dance, refs #1325 Roman Schmerold (BNoiZe) 2013-12-15 15:51:25 +01:00
  • e7c53e4abb some more migrating to new settings class, refs #1325 Michael Kaufmann (d00p) 2013-12-15 15:37:07 +01:00
  • 352749c798 cant stop migrating to new Settings class, refs #1325 Michael Kaufmann (d00p) 2013-12-15 15:21:30 +01:00
  • 1e87fb8d94 removed whitespace and german strings Roman Schmerold (BNoiZe) 2013-12-15 14:55:27 +01:00
  • 7f565c305c migrate more stuff to new Settings class, refs #1325 Michael Kaufmann (d00p) 2013-12-15 14:38:53 +01:00
  • bcf187761c still implementing the new Settings-class, refs #1325 Roman Schmerold (BNoiZe) 2013-12-15 14:35:07 +01:00
  • fd0a2bea2f tweaking the traffic-graphs Roman Schmerold (BNoiZe) 2013-12-15 14:21:23 +01:00
  • 528082b49f Merge branch 'master' of github.com:Froxlor/Froxlor Roman Schmerold (BNoiZe) 2013-12-15 13:16:08 +01:00
  • d5e0484de3 even moar implementations of new Settings-class, refs #1325 Roman Schmerold (BNoiZe) 2013-12-15 13:15:34 +01:00
  • 52aaedd33a migrated a few functions to new Settings class and removed unused function createAWStatsVhost(), refs #1325 Michael Kaufmann (d00p) 2013-12-15 13:05:19 +01:00
  • 558108008a more implementing of new Settings class, refs #1325 Michael Kaufmann (d00p) 2013-12-15 12:40:24 +01:00
  • eb33493c79 implemented new Setting-class, refs #1325 Roman Schmerold (BNoiZe) 2013-12-15 12:24:32 +01:00
  • 276d6b30d1 first few implementations of new Setting-class, refs #1325 Michael Kaufmann (d00p) 2013-12-15 11:47:23 +01:00
  • 4667ccbe43 Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-15 11:40:22 +01:00
  • b8f963cd29 fix pagination and sorting in customer-tickets, refs #701 Michael Kaufmann (d00p) 2013-12-15 10:48:54 +01:00
  • b18afacedb Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-15 08:41:29 +01:00
  • e4142571d7 removed duplicate of overview page (settings) Roman Schmerold (BNoiZe) 2013-12-14 19:09:45 +01:00
  • 40dbf85f77 added a.active class to the template css Roman Schmerold (BNoiZe) 2013-12-14 18:07:15 +01:00
  • 491ac02c0d added 'active' to class in navigation when link is active Roman Schmerold (BNoiZe) 2013-12-14 16:30:08 +01:00
  • eb7d7d7316 Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-14 15:44:34 +01:00
  • 7688f83134 beautify loadConfigArrayDir(); fix pagination and sorting in admin-tickets, fixes #701 Michael Kaufmann (d00p) 2013-12-14 15:43:51 +01:00
  • 36b6b6b857 Added logging of faulty login attempts, fixes #1321 Roman Schmerold (BNoiZe) 2013-12-14 10:28:33 +01:00
  • 296b8b36ab Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-13 21:33:24 +01:00
  • 83b615bc37 why easy if you could do it the hard way? :P Michael Kaufmann (d00p) 2013-12-13 08:14:01 +01:00
  • 682defcbcf fix tiny sql-query error when using APS and correct DbManager-replacers Michael Kaufmann (d00p) 2013-12-13 08:07:52 +01:00
  • 810399d337 Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-13 07:15:43 +01:00
  • 26b57e2d4d fix sql-query (thx to anonymous report) in admin-customers; fix german language-string (thx to dnano91) Michael Kaufmann (d00p) 2013-12-13 07:15:13 +01:00
  • fcaa2f8aa9 fixed translation of 'traffic' for german Roman Schmerold (BNoiZe) 2013-12-12 23:07:18 +01:00
  • 06cff22caa allow custom sendmail_path value in php.ini when using php-fpm, fixes #1323 Michael Kaufmann (d00p) 2013-12-12 14:27:24 +01:00
  • aa7d1d3f48 show customer name and loginname in ticket-archive if customer-exists Michael Kaufmann (d00p) 2013-12-12 13:39:18 +01:00
  • 18933ad118 Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-12 11:38:32 +01:00
  • 8516cbb64d don't show 'there is a newer version of froxlor available' if a customzied (unknown) version is being checked Michael Kaufmann (d00p) 2013-12-12 11:20:19 +01:00
  • 73f5547a5e add php-config for froxlor-vhost and set it as default for froxlor's vhost when fcgid/fpm is used (and the current default is set, custom settings won't be overwritten) Michael Kaufmann (d00p) 2013-12-12 10:44:32 +01:00
  • 0e6da344ba don't use -b for 'du' command as FreeBSD does not know it, fixes #1320 Michael Kaufmann (d00p) 2013-12-12 09:09:57 +01:00
  • ce28cb1f0e Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-12 08:27:10 +01:00
  • 911de0727f fixed search not calculating diskspace/traffic if no operator is used Roman Schmerold (BNoiZe) 2013-12-11 17:11:49 +01:00
  • e7678b8b6a Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-11 07:30:29 +01:00
  • 7eedf6e694 add logger to dbmanager, thx Sephi 0.9.31-rc2 Michael Kaufmann (d00p) 2013-12-10 08:18:27 +01:00
  • 7bf0299d33 Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-10 07:23:42 +01:00
  • 3e54fd765c darn, traffic_used is being calculated in the traffic cron, need to re-check what the heck is wrong there (if after all) Michael Kaufmann (d00p) 2013-12-09 18:49:45 +01:00
  • 220fb17824 add traffic-used when adding a customer; fix sql-error when removing a customer Michael Kaufmann (d00p) 2013-12-09 18:16:47 +01:00
  • be6c8462f0 use default lenght of 10 characters if no password-minimum is specified Michael Kaufmann (d00p) 2013-12-09 18:04:47 +01:00
  • 8822067311 fix search for webspace and traffic related values, also, for integer fields (like diskspace) you can now use the following operators when searching: >, < and =; fixes #772 Michael Kaufmann (d00p) 2013-12-09 17:24:11 +01:00
  • a5b1065195 generate spf-entry also for 'mail'-record when no mxservers are specified, fixes #1314 Michael Kaufmann (d00p) 2013-12-09 13:57:03 +01:00
  • 904f412495 set correct postmaster_address (using <SERVERNAME>-variable) for dovecot config-templates Michael Kaufmann (d00p) 2013-12-09 11:52:09 +01:00
  • 2fa6c5cd97 generate more secure password suggestions and respect password-min-length setting Michael Kaufmann (d00p) 2013-12-09 10:57:54 +01:00
  • 7bf4cc73b6 Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-09 09:54:44 +01:00
  • bafcf07300 adjust gitignore file to not stage error-logs Michael Kaufmann (d00p) 2013-12-09 09:23:54 +01:00
  • dc666e96b3 outsource monster-query to new WebserverBase class and adjust query which most likely fixes #1295 Michael Kaufmann (d00p) 2013-12-09 09:23:21 +01:00
  • 15bb78d447 remove some special characters from directory-names when validating, fixes #1231 and pull-request 73 partly Michael Kaufmann (d00p) 2013-12-09 07:49:33 +01:00
  • 0771ccc9a6 Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-08 22:00:51 +01:00
  • 3b0387901f don't cast mysql-max to integer as for admins-usernames, it may be '' instead of 0 Michael Kaufmann (d00p) 2013-12-08 22:00:23 +01:00
  • 2b13ae3ad8 fixed a wrong array-index in installation language file BNoiZe 2013-12-08 15:40:07 +01:00
  • 2e9310daf1 set master-branch version to next dev-version, so people don't break their database too early Michael Kaufmann (d00p) 2013-12-08 14:36:04 +01:00
  • e7ce62c7ff set version, please don't use this yet, if you're on git-version, switch to '0.9.31' branch Michael Kaufmann (d00p) 2013-12-08 14:00:28 +01:00
  • bf4c16b063 first work on permission-improvements by adding webserver-user to ftp-group of customer and therefore make it possible to chown the user-docroot to 750 keeping 'others' out, refs #532 Michael Kaufmann (d00p) 2013-12-08 11:13:43 +01:00
  • 0f80e66a01 Merge remote-tracking branch 'origin/0.9.31' Michael Kaufmann (d00p) 2013-12-08 10:22:21 +01:00
  • dde6581f9c create SuexecUserGroup-statement on apache/fpm if customer has perl enabled so perl-scripts run under the same username, fixes #1317 Michael Kaufmann (d00p) 2013-12-08 10:18:18 +01:00