Merge branch 'stable-3.1'

Author: Marius Burkard

server/lib/classes/cron.d/550-bind_dnssec.inc.php

@@ -82,10 +82,14 @@ public function onRunJob() {
 
 		//* Load libraries
 		$app->uses("getconf,tpl");
+
+		//* load the server configuration options
+//		$dns_config = $app->getconf->get_server_config($conf["server_id"], 'dns');
 
 		//TODO : change this when distribution information has been integrated into server record
 //		$filespre = (file_exists('/etc/gentoo-release')) ? 'pri/' : 'pri.';
-		$soas = $app->db->queryAllRecords("SELECT id,serial,origin FROM dns_soa WHERE server_id = ? AND active= 'Y' AND dnssec_wanted = 'Y' AND dnssec_initialized = 'Y' AND (dnssec_last_signed < ? OR dnssec_last_signed > ?)", $conf['server_id'], time()-(3600*24*5)+900, time()+900); //Resign zones every 5 days (expiry is 16 days so we have enough safety, 15 minutes tolerance)
+//		$soas = $app->db->queryAllRecords("SELECT id,serial,origin FROM dns_soa WHERE server_id = ? AND active= 'Y' AND dnssec_wanted = 'Y' AND dnssec_initialized = 'Y' AND (dnssec_last_signed < ? OR dnssec_last_signed > ?)", $conf['server_id'], time()-(3600*24*5)+900, time()+900); //Resign zones every 5 days (expiry is 16 days so we have enough safety, 15 minutes tolerance)
+		$soas = $app->db->queryAllRecords("SELECT id,serial,origin FROM dns_soa WHERE active= 'Y' AND dnssec_wanted = 'Y' AND dnssec_initialized = 'Y' AND (dnssec_last_signed < ? OR dnssec_last_signed > ?)", time()-(3600*24*5)+900, time()+900); //Resign zones every 5 days (expiry is 16 days so we have enough safety, 15 minutes tolerance)
 
 		foreach ($soas as $data) {
 			$domain = substr($data['origin'], 0, strlen($data['origin'])-1);

server/plugins-available/apache2_plugin.inc.php

@@ -1,4 +1,4 @@
-_<?php
+<?php
 
 /*
 Copyright (c) 2007 - 2012, Till Brehm, projektfarm Gmbh