[rebootcontrol] Simplify some logic, improve scheduler

1 files changed, 9 insertions, 6 deletions

diff --git a/modules-available/rebootcontrol/install.inc.php b/modules-available/rebootcontrol/install.inc.php
index 008d26aa..f400129e 100644
--- a/modules-available/rebootcontrol/install.inc.php
+++ b/modules-available/rebootcontrol/install.inc.php
@@ -39,10 +39,10 @@ $output[] = tableCreate('reboot_subnet_x_subnet', "
 
 $output[] = tableCreate('reboot_scheduler', "
 	`locationid` INT(11) NOT NULL,
-	`action` ENUM('wol', 'sd'),
+	`action` ENUM('wol', 'sd', 'rb'),
 	`nextexecution` INT(10) UNSIGNED NOT NULL DEFAULT 0,
 	`options` BLOB,
-	PRIMARY KEY (`locationid`, `action`)");
+	PRIMARY KEY (`locationid`)");
 
 $output[] = tableAddConstraint('reboot_jumphost_x_subnet', 'hostid', 'reboot_jumphost', 'hostid',
 	'ON UPDATE CASCADE ON DELETE CASCADE');
@@ -55,11 +55,14 @@ $output[] = tableAddConstraint('reboot_subnet_x_subnet', 'dstid', 'reboot_subnet
 $output[] = tableAddConstraint('reboot_scheduler', 'locationid', 'location', 'locationid',
 	'ON UPDATE CASCADE ON DELETE CASCADE');
 
-if (tableExists('reboot_scheduler')) {
-	Database::exec("ALTER TABLE `reboot_scheduler` DROP PRIMARY KEY , ADD PRIMARY KEY (`locationid`)");
+if (tableColumnKeyType('reboot_scheduler', 'action') === 'PRI') {
+	Database::exec("DELETE FROM reboot_scheduler WHERE action <> 'wol'");
+	$res = Database::exec("ALTER TABLE `reboot_scheduler` DROP PRIMARY KEY, ADD PRIMARY KEY (`locationid`)");
+	$output[] = $res !== false ? UPDATE_DONE : UPDATE_FAILED;
 }
-if (tableHasColumn('reboot_scheduler', 'action')) {
-	Database::exec("ALTER TABLE `reboot_scheduler` MODIFY COLUMN `action` ENUM('wol', 'sd', 'rb')");
+if (strpos(tableColumnType('reboot_scheduler', 'action'), 'rb') === false) {
+	$res = Database::exec("ALTER TABLE `reboot_scheduler` MODIFY COLUMN `action` ENUM('wol', 'sd', 'rb')");
+	$output[] = $res !== false ? UPDATE_DONE : UPDATE_FAILED;
 }