From ae6b86b02a9f8211a51966ac7150499da103dce9 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 18 Nov 2011 06:06:57 -0500
Subject: [PATCH] - Select sieve template depending on dovecot version as doevceot 1.0 does not support the new date based autoresponders. - Cleaned up opensuse dovecot-sql.conf file
---
interface/lib/plugins/vm_openvz_plugin.inc.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/interface/lib/plugins/vm_openvz_plugin.inc.php b/interface/lib/plugins/vm_openvz_plugin.inc.php
index a926c0a..b1ce8e6 100644
--- a/interface/lib/plugins/vm_openvz_plugin.inc.php
+++ b/interface/lib/plugins/vm_openvz_plugin.inc.php
@@ -140,13 +140,14 @@
private function makeOpenVZConfig() {
global $app, $conf;
- $vm = $app->tform->getDataRecord($this->id);
+ $vm = $app->db->queryOneRecord("SELECT * FROM openvz_vm WHERE vm_id = ".$this->id);
$vm_template = $app->db->queryOneRecord("SELECT * FROM openvz_template WHERE template_id = ".$vm['template_id']);
$burst_ram = $vm['ram_burst']*256;
$guar_ram = $vm['ram']*256;
+ $app->load('tpl');
$tpl = new tpl();
- $tpl->newTemplate('templates/openvz.conf.tpl');
+ $tpl->newTemplate('../vm/templates/openvz.conf.tpl');
$onboot = ($vm['start_boot'] == 'y')?'yes':'no';
$tpl->setVar('onboot',$onboot);
@@ -205,7 +206,7 @@
private function createDNS() {
global $app, $conf;
- $vm = $app->tform->getDataRecord($this->id);
+ $vm = $app->db->queryOneRecord("SELECT * FROM openvz_vm WHERE vm_id = ".$this->id);
if($vm['create_dns'] != 'y') return;
--
Gitblit v1.9.1