add_machine() new

2 files changed, 33 insertions, 30 deletions

diff --git a/html/db.php b/html/db.php
index 503ef13..3e87fcc 100644
--- a/html/db.php
+++ b/html/db.php
@@ -34,6 +34,38 @@ class MyDB extends SQLite3 {
     $stm -> close();
     return $key_id;
   }
+  function add_machine($machine) {
+    $stm = $this -> prepare('SELECT COUNT(1) FROM machines WHERE machines.name=:name');
+    $stm -> bindValue('name', $machine);
+    $result = $stm -> execute();
+    $result = $result -> fetchArray();
+    $stm -> close();
+
+    if ($result[0] == 0) {
+      $stm = $this -> prepare('INSERT INTO machines (name) VALUES (:machine)');
+      $stm -> bindValue('machine', $machine);
+      $stm -> execute();
+      $machine_id = $this -> lastInsertRowID();
+      $stm -> close();
+
+      $stm = $this -> prepare(
+        'INSERT INTO "values" (machine_id, state_id) VALUES (:machine, :state)'
+      );
+      $stm -> bindValue('machine', $machine_id);
+      $result = $this -> query(
+        'SELECT states.name, states.id FROM states'
+      );
+      while ($row = $result -> fetchArray()) {
+        if ($row['name'] == 'running')
+          $running_id = $row['id'];
+        $stm -> bindValue('state', $row['id']);
+        $stm -> execute();
+      }
+      $stm -> close();
+
+      $this -> add_key_for($machine_id, $running_id, 'self');
+    }
+  }
   function get_value_id_of($machine, $state) {
     if (is_int($machine) && is_int($state)) {
       $stm = $this -> prepare(
diff --git a/html/maintenance.php b/html/maintenance.php
index 18230df..c74b924 100644
--- a/html/maintenance.php
+++ b/html/maintenance.php
@@ -31,36 +31,7 @@ if (array_key_exists('drop',$_GET) && ($_GET['drop']=='DROP')) {
 }
 
 if (array_key_exists('machine',$_GET)) {
-  $stm = $db -> prepare('SELECT COUNT(1) FROM machines WHERE machines.name=:name');
-  $stm -> bindValue('name', $_GET['machine']);
-  $result = $stm -> execute();
-  $result = $result -> fetchArray();
-  $stm -> close();
-
-  if ($result[0] == 0) {
-    $stm = $db -> prepare('INSERT INTO machines (name) VALUES (:machine)');
-    $stm -> bindValue('machine', $_GET['machine']);
-    $stm -> execute();
-    $machine_id = $db -> lastInsertRowID();
-    $stm -> close();
-
-    $stm = $db -> prepare(
-      'INSERT INTO "values" (machine_id, state_id) VALUES (:machine, :state)'
-    );
-    $stm -> bindValue('machine', $machine_id);
-    $result = $db -> query(
-      'SELECT states.name, states.id FROM states'
-    );
-    while ($row = $result -> fetchArray()) {
-      if ($row['name'] == 'running')
-        $running_id = $row['id'];
-      $stm -> bindValue('state', $row['id']);
-      $stm -> execute();
-    }
-    $stm -> close();
-
-    $db -> add_key_for($machine_id, $running_id, 'self');
-  }
+  $db -> add_machine($_GET['machine']);
 
   if (array_key_exists('new_key', $_GET) && array_key_exists('comment', $_GET))
     $db -> add_key_for($_GET['machine'], $_GET['new_key'], $_GET['comment']);