- remove multiserver-stuff from trunk/

- allow admins with customer_see_all-flag to see their support-tickets too
- sanitize date-stuff in install.php
- fixed wrong usage of standard_error() in ticket::sendMail()
- fix issue with lighttpd server.bind when IP is IPv6

actions/admin/settings/125.multiserver.php

@@ -1,36 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Settings
- * @version    $Id$
- */
-
-return array(
-	'groups' => array(
-		'multiserver' => array(
-			'title' => $lng['admin']['multiserver'],
-			'fields' => array(
-				'multiserver_enabled' => array(
-					'label' => $lng['multiserver']['enabled'],
-					'settinggroup' => 'multiserver',
-					'varname' => 'enabled',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'overview_option' => true,
-					'disabled' => true
-					)
-				)
-			)
-		)
-	);

admin_tickets.php

@@ -56,7 +56,7 @@ if($page == 'tickets'
 		$paging = new paging($userinfo, $db, TABLE_PANEL_TICKETS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
 		$paging->sortfield = 'lastchange';
 		$paging->sortorder = 'desc';
-		$result = $db->query('SELECT `main`.`id`, `main`.`customerid`, (SELECT COUNT(`sub`.`id`) FROM `' . TABLE_PANEL_TICKETS . '` `sub` WHERE `sub`.`answerto` = `main`.`id`) as `ticket_answers`, `main`.`lastchange`, `main`.`subject`, `main`.`status`, `main`.`lastreplier`, `main`.`priority` FROM `' . TABLE_PANEL_TICKETS . '` as `main` WHERE `main`.`answerto` = "0"  AND `archived` = "0" AND `adminid` = "' . (int)$userinfo['adminid'] . '" ' . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+		$result = $db->query('SELECT `main`.`id`, `main`.`customerid`, (SELECT COUNT(`sub`.`id`) FROM `' . TABLE_PANEL_TICKETS . '` `sub` WHERE `sub`.`answerto` = `main`.`id`) as `ticket_answers`, `main`.`lastchange`, `main`.`subject`, `main`.`status`, `main`.`lastreplier`, `main`.`priority` FROM `' . TABLE_PANEL_TICKETS . '` as `main` WHERE `main`.`answerto` = "0"  AND `archived` = "0" ' . ($userinfo['customers_see_all'] ? '' : ' AND  `adminid` = "' . (int)$userinfo['adminid'] . '"') . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
 		$paging->setEntries($db->num_rows($result));
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);

install/install.php

@@ -22,6 +22,12 @@
  * installer, (c) 1999 - 2004 phpBB Group.
  */
 
+// ensure that default timezone is set
+if(function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get"))
+{
+	@date_default_timezone_set(@date_default_timezone_get());
+}
+
 if(file_exists('../lib/userdata.inc.php'))
 {
 	/**

lib/classes/ticket/class.ticket.php

@@ -320,7 +320,7 @@ class ticket
 			if ($_mailerror) {
 				$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'ticket_class'), $this->db, $this->settings);
 				$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-				standard_error(array('errorsendingmail', $usr['email']));
+				standard_error('errorsendingmail', $usr['email']);
 			}
 
 			$mail->ClearAddresses();
@@ -348,7 +348,7 @@ class ticket
 			if ($_mailerror) {
 				$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'ticket_class'), $this->db, $this->settings);
 				$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-				standard_error(array('errorsendingmail', $admin['email']));
+				standard_error('errorsendingmail', $admin['email']);
 			}
 
 			$mail->ClearAddresses();

scripts/jobs/cron_tasks.inc.http.20.lighttpd.php

@@ -77,11 +77,13 @@ class lighttpd
 			{
 				$ip = '[' . $row_ipsandports['ip'] . ']';
 				$port = $row_ipsandports['port'];
+				$ipv6 = 'server.use-ipv6 = "enable"'."\n";
 			}
 			else
 			{
 				$ip = $row_ipsandports['ip'];
 				$port = $row_ipsandports['port'];
+				$ipv6 = '';
 			}
 
 			fwrite($this->debugHandler, '  lighttpd::createIpPort: creating ip/port settings for  ' . $ip . ":" . $port . "\n");
@@ -99,6 +101,7 @@ class lighttpd
 			{
 				$this->lighttpd_data[$vhost_filename].= 'server.port = ' . $port . "\n";
 				$this->lighttpd_data[$vhost_filename].= 'server.bind = "' . $ip . '"' . "\n";
+				$this->lighttpd_data[$vhost_filename].= $ipv6;
 			}
 			
 			if($row_ipsandports['vhostcontainer'] == '1')