From 634132a0d83a3c83a3927e2aa943c035030d6b80 Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.com>
Date: Thu, 19 Nov 2015 17:12:54 -0500
Subject: [PATCH] Added possibility to delete backups
---
server/lib/classes/cron.d/100-monitor_raid.inc.php | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/server/lib/classes/cron.d/100-monitor_raid.inc.php b/server/lib/classes/cron.d/100-monitor_raid.inc.php
index 9edd061..439ab8c 100644
--- a/server/lib/classes/cron.d/100-monitor_raid.inc.php
+++ b/server/lib/classes/cron.d/100-monitor_raid.inc.php
@@ -177,7 +177,9 @@
system('which tw_cli', $retval);
if($retval === 0) {
- $data['output'] = shell_exec('tw_cli info c0');
+ // TYPOWORX FIX | Determine Controler-ID
+ $availableControlers = shell_exec('tw_cli info | grep -Eo "c[0-9]+');
+ $data['output'] = shell_exec('tw_cli info ' . $availableControlers);
$state = 'ok';
if(is_array($data['output'])) {
@@ -238,14 +240,8 @@
* Insert the data into the database
*/
$sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
- 'VALUES (' .
- $res['server_id'] . ', ' .
- "'" . $app->dbmaster->quote($res['type']) . "', " .
- 'UNIX_TIMESTAMP(), ' .
- "'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
- "'" . $res['state'] . "'" .
- ')';
- $app->dbmaster->query($sql);
+ 'VALUES (?, ?, UNIX_TIMESTAMP(), ?, ?)';
+ $app->dbmaster->query($sql, $res['server_id'], $res['type'], serialize($res['data']), $res['state']);
/* The new data is written, now we can delete the old one */
$this->_tools->delOldRecords($res['type'], $res['server_id']);
--
Gitblit v1.9.1