From 13aa6d30defcbed0f594156310e3f76de18bf31d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 9 Jun 2016 16:07:06 +0200
Subject: [install] Add/refine more module's install scripts

---
 modules-available/baseconfig/install.inc.php       |  2 +-
 .../baseconfig_partitions_cdn/install.inc.php      | 36 ++++++++++++++++++----
 modules-available/citymanagement/install.inc.php   | 27 ++++++++++++----
 modules-available/minilinux/page.inc.php           |  5 +--
 modules-available/sysconfig/install.inc.php        |  3 +-
 modules-available/vmstore/page.inc.php             |  4 ++-
 6 files changed, 60 insertions(+), 17 deletions(-)

(limited to 'modules-available')

diff --git a/modules-available/baseconfig/install.inc.php b/modules-available/baseconfig/install.inc.php
index 8f1cb1e7..b4eada5d 100644
--- a/modules-available/baseconfig/install.inc.php
+++ b/modules-available/baseconfig/install.inc.php
@@ -6,7 +6,7 @@ $res[] = tableCreate('setting_global', "
   `setting` varchar(28) NOT NULL,
   `value` text NOT NULL,
   `displayvalue` text NOT NULL,
-  `enabled` tinyint(1) UNSIGNED NOT NULL DEFAULT '1'
+  `enabled` tinyint(1) UNSIGNED NOT NULL DEFAULT '1',
   PRIMARY KEY (`setting`)
 ");
 
diff --git a/modules-available/baseconfig_partitions_cdn/install.inc.php b/modules-available/baseconfig_partitions_cdn/install.inc.php
index 3ae2ed7b..f4092078 100644
--- a/modules-available/baseconfig_partitions_cdn/install.inc.php
+++ b/modules-available/baseconfig_partitions_cdn/install.inc.php
@@ -1,7 +1,31 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sr
- * Date: 09.06.16
- * Time: 15:46
- */
\ No newline at end of file
+
+$res = array();
+
+$res[] = tableCreate('setting_partition', "
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `partition_id` varchar(110) NOT NULL,
+  `size` varchar(110) NOT NULL,
+  `mount_point` varchar(110) NOT NULL,
+  `options` varchar(110) NOT NULL,
+  `user` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `user` (`user`)
+");
+
+if (in_array(UPDATE_DONE, $res)) {
+	Database::exec("ALTER TABLE `setting_partition`
+		ADD CONSTRAINT `setting_partition_ibfk_1` FOREIGN KEY (`user`) REFERENCES `user` (`userid`)");
+}
+
+// Update path
+
+// -- none --
+
+// Create response for browser
+
+if (in_array(UPDATE_DONE, $res)) {
+	finalResponse(UPDATE_DONE, 'Tables created successfully');
+}
+
+finalResponse(UPDATE_NOOP, 'Everything already up to date');
diff --git a/modules-available/citymanagement/install.inc.php b/modules-available/citymanagement/install.inc.php
index 71f13299..b051ca5c 100644
--- a/modules-available/citymanagement/install.inc.php
+++ b/modules-available/citymanagement/install.inc.php
@@ -1,7 +1,22 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sr
- * Date: 09.06.16
- * Time: 15:39
- */
\ No newline at end of file
+
+$res = array();
+
+$res[] = tableCreate('cities', "
+	`cityid` int(10) unsigned NOT NULL AUTO_INCREMENT,
+	`name` varchar(100) NOT NULL,
+	`ip` varchar(10) NOT NULL,
+	PRIMARY KEY (`cityid`)
+");
+
+// Update path
+
+// -- none --
+
+// Create response for browser
+
+if (in_array(UPDATE_DONE, $res)) {
+	finalResponse(UPDATE_DONE, 'Tables created successfully');
+}
+
+finalResponse(UPDATE_NOOP, 'Everything already up to date');
diff --git a/modules-available/minilinux/page.inc.php b/modules-available/minilinux/page.inc.php
index a7a70d13..2623500b 100644
--- a/modules-available/minilinux/page.inc.php
+++ b/modules-available/minilinux/page.inc.php
@@ -27,9 +27,10 @@ class Page_MiniLinux extends Page
 	{
 		$data = Property::getVersionCheckInformation();
 		if (!is_array($data) || !isset($data['systems'])) {
-			echo Render::parse('messagebox-error', array(
+			echo Render::parse('messagebox', array(
+				'type' => 'danger',
 				'message' => 'Failed to retrieve the list: ' . print_r($data, true)
-			),'main');
+			), 'main');
 			return;
 		}
 		$action = Request::any('action');
diff --git a/modules-available/sysconfig/install.inc.php b/modules-available/sysconfig/install.inc.php
index 0b7bbc1b..35697d1f 100644
--- a/modules-available/sysconfig/install.inc.php
+++ b/modules-available/sysconfig/install.inc.php
@@ -34,7 +34,8 @@ $res[] = tableCreate('configtgz_x_module', "
 // Constraints
 if (in_array(UPDATE_DONE, $res)) {
 	Database::exec("ALTER TABLE `configtgz_x_module`
-		ADD CONSTRAINT `configtgz_x_module_ibfk_1` FOREIGN KEY (`configid`) REFERENCES `configtgz` (`configid`) ON DELETE CASCADE,
+		ADD CONSTRAINT `configtgz_x_module_ibfk_1` FOREIGN KEY (`configid`) REFERENCES `configtgz` (`configid`) ON DELETE CASCADE");
+	Database::exec("ALTER TABLE `configtgz_x_module`
 		ADD CONSTRAINT `configtgz_x_module_ibfk_2` FOREIGN KEY (`moduleid`) REFERENCES `configtgz_module` (`moduleid`)");
 }
 
diff --git a/modules-available/vmstore/page.inc.php b/modules-available/vmstore/page.inc.php
index 23b7375c..6ef04669 100644
--- a/modules-available/vmstore/page.inc.php
+++ b/modules-available/vmstore/page.inc.php
@@ -57,7 +57,9 @@ class Page_VmStore extends Page
 			Util::redirect('?do=VmStore');
 		}
 		$this->mountTask = Trigger::mount($vmstore);
-		TaskmanagerCallback::addCallback($this->mountTask, 'manualMount', $vmstore);
+		if ($this->mountTask !== false) {
+			TaskmanagerCallback::addCallback($this->mountTask, 'manualMount', $vmstore);
+		}
 	}
 
 }
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522