clones/Froxlor
1
0
Fork 0
mirror of https://github.com/Froxlor/Froxlor.git synced 2024-09-21 10:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.9.31'

Browse Source
This commit is contained in:
Michael Kaufmann (d00p) 2013-12-17 07:57:58 +01:00
commit 6902868e58
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin_tickets.php
View File

@ -375,7 +375,7 @@ if ($page == 'tickets'
$priorities = makeoption($lng['ticket']['high'], '1', $mainticket->Get('priority'), true, true); $priorities = makeoption($lng['ticket']['high'], '1', $mainticket->Get('priority'), true, true);
$priorities.= makeoption($lng['ticket']['normal'], '2', $mainticket->Get('priority'), true, true); $priorities.= makeoption($lng['ticket']['normal'], '2', $mainticket->Get('priority'), true, true);
$priorities.= makeoption($lng['ticket']['low'], '3', $mainticket->Get('priority'), true, true); $priorities.= makeoption($lng['ticket']['low'], '3', $mainticket->Get('priority'), true, true);
$subject = $mainticket->Get('subject'); $subject = htmlentities($mainticket->Get('subject'));
$ticket_replies_count = $numrows_andere + 1; $ticket_replies_count = $numrows_andere + 1;
// don't forget the main-ticket! // don't forget the main-ticket!

2
customer_tickets.php
View File

@ -324,7 +324,7 @@ if ($page == 'overview') {
$priorities = makeoption($lng['ticket']['high'], '1', $mainticket->Get('priority'), true, true); $priorities = makeoption($lng['ticket']['high'], '1', $mainticket->Get('priority'), true, true);
$priorities.= makeoption($lng['ticket']['normal'], '2', $mainticket->Get('priority'), true, true); $priorities.= makeoption($lng['ticket']['normal'], '2', $mainticket->Get('priority'), true, true);
$priorities.= makeoption($lng['ticket']['low'], '3', $mainticket->Get('priority'), true, true); $priorities.= makeoption($lng['ticket']['low'], '3', $mainticket->Get('priority'), true, true);
$subject = $mainticket->Get('subject'); $subject = htmlentities($mainticket->Get('subject'));
$ticket_replies_count = $numrows_andere + 1; $ticket_replies_count = $numrows_andere + 1;
// don't forget the main-ticket! // don't forget the main-ticket!

4
install/froxlor.sql
View File

@ -431,8 +431,8 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('system', 'nameservers', ''), ('system', 'nameservers', ''),
('system', 'mxservers', ''), ('system', 'mxservers', ''),
('system', 'mod_fcgid', '0'), ('system', 'mod_fcgid', '0'),
('system', 'apacheconf_vhost', '/etc/apache2/vhosts.conf'), ('system', 'apacheconf_vhost', '/etc/apache2/sites-enabled/'),
('system', 'apacheconf_diroptions', '/etc/apache2/diroptions.conf'), ('system', 'apacheconf_diroptions', '/etc/apache2/sites-enabled/'),
('system', 'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'), ('system', 'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'),
('system', 'webalizer_quiet', '2'), ('system', 'webalizer_quiet', '2'),
('system', 'last_archive_run', '000000'), ('system', 'last_archive_run', '000000'),