[statistics] Better check if locationid trigger exists

1 files changed, 4 insertions, 13 deletions

diff --git a/modules-available/statistics/install.inc.php b/modules-available/statistics/install.inc.php
index 54e844e0..3becce8f 100644
--- a/modules-available/statistics/install.inc.php
+++ b/modules-available/statistics/install.inc.php
@@ -1,8 +1,5 @@
 <?php
 
-// locationid trigger
-$addTrigger = false;
-
 $res = array();
 
 // The main statistic table used for log entries
@@ -24,7 +21,7 @@ $res[] = tableCreate('statistic', "
 
 // Main table containing all known clients
 
-$res[] = $machineCreate = tableCreate('machine', "
+$res[] = tableCreate('machine', "
   `machineuuid` char(36) CHARACTER SET ascii NOT NULL,
   `fixedlocationid` int(11) DEFAULT NULL           COMMENT 'Manually set location (e.g. roomplanner)',
   `subnetlocationid` int(11) DEFAULT NULL          COMMENT 'Automatically determined location (e.g. from subnet match)',
@@ -117,11 +114,6 @@ $res[] = tableCreate('setting_machine', '
 	KEY `setting` (`setting`)
 ');
 
-// need trigger?
-if ($machineCreate === UPDATE_DONE) {
-	$addTrigger = true;
-}
-
 //
 // This was added/changed later -- keep update path
 //
@@ -177,7 +169,6 @@ if (!tableHasColumn('machine', 'subnetlocationid')) {
 		finalResponse(UPDATE_FAILED, 'Adding subnetlocationid to machine failed: ' . Database::lastError());
 	}
 	$res[] = UPDATE_DONE;
-	$addTrigger = true;
 }
 // And fixedlocationid - manually set location, currently used by roomplanner
 if (!tableHasColumn('machine', 'fixedlocationid')) {
@@ -189,10 +180,10 @@ if (!tableHasColumn('machine', 'fixedlocationid')) {
 	// Now copy over the values from locationid, since this was used before
 	Database::exec("UPDATE machine SET fixedlocationid = locationid");
 	$res[] = UPDATE_DONE;
-	$addTrigger = true;
 }
-// If any of these was added, create the trigger
-if ($addTrigger) {
+
+$checkTrigger = Database::queryFirst("show triggers where `Trigger` = 'set_automatic_locationid'");
+if ($checkTrigger === false) {
 	$ret = Database::exec(" 
 	CREATE TRIGGER set_automatic_locationid
 		BEFORE UPDATE ON machine FOR EACH ROW