From 7fe908c50c8dbc5cc05f571dbe11d66141caacd4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 09:01:22 -0500
Subject: [PATCH] Cleaning up code to match coding guidelines
---
server/plugins-available/openvz_plugin.inc.php | 136 ++++++++++++++++++++++----------------------
1 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/server/plugins-available/openvz_plugin.inc.php b/server/plugins-available/openvz_plugin.inc.php
index 9e0d75d..a50c3de 100644
--- a/server/plugins-available/openvz_plugin.inc.php
+++ b/server/plugins-available/openvz_plugin.inc.php
@@ -29,142 +29,142 @@
*/
class openvz_plugin {
-
+
var $plugin_name = 'openvz_plugin';
var $class_name = 'openvz_plugin';
-
+
//* This function is called during ispconfig installation to determine
// if a symlink shall be created for this plugin.
function onInstall() {
global $conf;
-
+
//* this is only true on openvz host servers, not in openvz guests
if(@file_exists('/proc/vz/version')) {
return true;
} else {
return false;
}
-
+
}
-
-
+
+
/*
This function is called when the plugin is loaded
*/
-
+
function onLoad() {
global $app;
-
+
/*
Register for the events
*/
-
+
//* Virtual machine
- $app->plugins->registerEvent('openvz_vm_insert',$this->plugin_name,'vm_insert');
- $app->plugins->registerEvent('openvz_vm_update',$this->plugin_name,'vm_update');
- $app->plugins->registerEvent('openvz_vm_delete',$this->plugin_name,'vm_delete');
-
+ $app->plugins->registerEvent('openvz_vm_insert', $this->plugin_name, 'vm_insert');
+ $app->plugins->registerEvent('openvz_vm_update', $this->plugin_name, 'vm_update');
+ $app->plugins->registerEvent('openvz_vm_delete', $this->plugin_name, 'vm_delete');
+
//* Register for actions
- $app->plugins->registerAction('openvz_start_vm',$this->plugin_name,'actions');
- $app->plugins->registerAction('openvz_stop_vm',$this->plugin_name,'actions');
- $app->plugins->registerAction('openvz_restart_vm',$this->plugin_name,'actions');
- $app->plugins->registerAction('openvz_create_ostpl',$this->plugin_name,'actions');
-
-
-
+ $app->plugins->registerAction('openvz_start_vm', $this->plugin_name, 'actions');
+ $app->plugins->registerAction('openvz_stop_vm', $this->plugin_name, 'actions');
+ $app->plugins->registerAction('openvz_restart_vm', $this->plugin_name, 'actions');
+ $app->plugins->registerAction('openvz_create_ostpl', $this->plugin_name, 'actions');
+
+
+
}
-
-
- function vm_insert($event_name,$data) {
+
+
+ function vm_insert($event_name, $data) {
global $app, $conf;
-
+
$veid = intval($data['new']['veid']);
-
+
if($veid == 0) {
- $app->log("VEID = 0, we stop here.",LOGLEVEL_WARN);
+ $app->log("VEID = 0, we stop here.", LOGLEVEL_WARN);
return;
}
-
+
$tmp = $app->db->queryOneRecord("SELECT template_file FROM openvz_ostemplate WHERE ostemplate_id = ".$data['new']['ostemplate_id']);
$ostemplate = escapeshellcmd($tmp['template_file']);
unset($tmp);
-
+
//* Create the virtual machine
exec("vzctl create $veid --ostemplate $ostemplate");
- $app->log("Create OpenVZ VM: vzctl create $veid --ostemplate $ostemplate",LOGLEVEL_DEBUG);
-
+ $app->log("Create OpenVZ VM: vzctl create $veid --ostemplate $ostemplate", LOGLEVEL_DEBUG);
+
//* Write the configuration of the VM
- file_put_contents('/etc/vz/conf/'.$veid.'.conf',$data['new']['config']);
-
+ file_put_contents('/etc/vz/conf/'.$veid.'.conf', $data['new']['config']);
+
//* Start the VM
if($data['new']['active'] == 'y') {
exec("vzctl start $veid");
- $app->log("Starting OpenVZ VM: vzctl start $veid",LOGLEVEL_DEBUG);
+ $app->log("Starting OpenVZ VM: vzctl start $veid", LOGLEVEL_DEBUG);
}
-
+
//* Set the root password in the virtual machine
exec("vzctl set $veid --userpasswd root:".escapeshellcmd($data['new']['vm_password']));
-
+
}
-
- function vm_update($event_name,$data) {
+
+ function vm_update($event_name, $data) {
global $app, $conf;
-
+
$veid = intval($data['new']['veid']);
-
+
if($veid == 0) {
- $app->log("VEID = 0, we stop here.",LOGLEVEL_WARN);
+ $app->log("VEID = 0, we stop here.", LOGLEVEL_WARN);
return;
}
-
+
//* Write the configuration of the VM
- file_put_contents('/etc/vz/conf/'.$veid.'.conf',$data['new']['config']);
- $app->log("Writing new configuration for $veid",LOGLEVEL_DEBUG);
-
+ file_put_contents('/etc/vz/conf/'.$veid.'.conf', $data['new']['config']);
+ $app->log("Writing new configuration for $veid", LOGLEVEL_DEBUG);
+
//* Apply config changes to the VM
if($data['new']['active'] == 'y' && $data['old']['active'] == 'y') {
exec("vzctl restart $veid");
- $app->log("Restarting OpenVZ VM: vzctl restart $veid",LOGLEVEL_DEBUG);
+ $app->log("Restarting OpenVZ VM: vzctl restart $veid", LOGLEVEL_DEBUG);
} elseif ($data['new']['active'] == 'y' && $data['old']['active'] == 'n') {
exec("vzctl start $veid");
- $app->log("Starting OpenVZ VM: vzctl start $veid",LOGLEVEL_DEBUG);
+ $app->log("Starting OpenVZ VM: vzctl start $veid", LOGLEVEL_DEBUG);
} elseif ($data['new']['active'] == 'n' && $data['old']['active'] == 'y') {
exec("vzctl stop $veid");
- $app->log("Stopping OpenVZ VM: vzctl stop $veid",LOGLEVEL_DEBUG);
+ $app->log("Stopping OpenVZ VM: vzctl stop $veid", LOGLEVEL_DEBUG);
}
-
+
//* Set the root password in the virtual machine
if($data['new']['vm_password'] != $data['old']['vm_password']) {
exec("vzctl set $veid --userpasswd root:".escapeshellcmd($data['new']['vm_password']));
}
-
-
+
+
}
-
- function vm_delete($event_name,$data) {
+
+ function vm_delete($event_name, $data) {
global $app, $conf;
-
+
$veid = intval($data['old']['veid']);
-
+
if($veid == 0) {
- $app->log("VEID = 0, we stop here.",LOGLEVEL_WARN);
+ $app->log("VEID = 0, we stop here.", LOGLEVEL_WARN);
return;
}
-
+
exec("vzctl stop $veid");
exec("vzctl destroy $veid");
- $app->log("Destroying OpenVZ VM: vzctl destroy $veid",LOGLEVEL_DEBUG);
-
+ $app->log("Destroying OpenVZ VM: vzctl destroy $veid", LOGLEVEL_DEBUG);
+
}
-
- function actions($action_name,$data) {
+
+ function actions($action_name, $data) {
global $app, $conf;
-
+
if ($action_name == 'openvz_start_vm') {
$veid = intval($data);
if($veid > 0) {
exec("vzctl start $veid");
- $app->log("Start VM: vzctl start $veid",LOGLEVEL_DEBUG);
+ $app->log("Start VM: vzctl start $veid", LOGLEVEL_DEBUG);
}
return 'ok';
}
@@ -172,7 +172,7 @@
$veid = intval($data);
if($veid > 0) {
exec("vzctl stop $veid");
- $app->log("Stop VM: vzctl stop $veid",LOGLEVEL_DEBUG);
+ $app->log("Stop VM: vzctl stop $veid", LOGLEVEL_DEBUG);
}
return 'ok';
}
@@ -180,12 +180,12 @@
$veid = intval($data);
if($veid > 0) {
exec("vzctl restart $veid");
- $app->log("Restart VM: vzctl restart $veid",LOGLEVEL_DEBUG);
+ $app->log("Restart VM: vzctl restart $veid", LOGLEVEL_DEBUG);
}
return 'ok';
}
if ($action_name == 'openvz_create_ostpl') {
- $parts = explode(':',$data);
+ $parts = explode(':', $data);
$veid = intval($parts[0]);
$template_cache_dir = '/vz/template/cache/';
$template_name = escapeshellcmd($parts[1]);
@@ -195,12 +195,12 @@
exec("mv ".$template_cache_dir."vzdump-openvz-".$veid."*.tgz ".$template_cache_dir.$template_name.".tar.gz");
exec("rm -f ".$template_cache_dir."vzdump-openvz-".$veid."*.log");
}
- $app->log("Created OpenVZ OStemplate $template_name from VM $veid",LOGLEVEL_DEBUG);
+ $app->log("Created OpenVZ OStemplate $template_name from VM $veid", LOGLEVEL_DEBUG);
return 'ok';
}
-
+
}
-
+
} // end class
--
Gitblit v1.9.1