From fce0f4c16ca6609f375cc8683b416c5fd44fe88b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 28 Mar 2018 12:39:19 +0200
Subject: [sysconfig] Add api call to rebuild all config.tgz

---
 install-all | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'install-all')

diff --git a/install-all b/install-all
index 50efd708..1bde77f7 100755
--- a/install-all
+++ b/install-all
@@ -51,5 +51,9 @@ while true; do
 	fi
 	NEXT=$MODULE
 done
+
+echo "Rebuilding config.tgz modules"
+php api.php sysconfig --action rebuild
+
 echo "Done."
 
-- 
cgit v1.2.3-55-g7522


From 6ba8c427310a64cb9c8d49e901fc016adb541bab Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 29 Mar 2018 12:38:35 +0200
Subject: Fix warnings

---
 install-all                                       | 1 +
 modules-available/sysconfig/inc/configtgz.inc.php | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'install-all')

diff --git a/install-all b/install-all
index 1bde77f7..362d2a4a 100755
--- a/install-all
+++ b/install-all
@@ -54,6 +54,7 @@ done
 
 echo "Rebuilding config.tgz modules"
 php api.php sysconfig --action rebuild
+echo ""
 
 echo "Done."
 
diff --git a/modules-available/sysconfig/inc/configtgz.inc.php b/modules-available/sysconfig/inc/configtgz.inc.php
index ea9ace4d..5b459a2e 100644
--- a/modules-available/sysconfig/inc/configtgz.inc.php
+++ b/modules-available/sysconfig/inc/configtgz.inc.php
@@ -289,7 +289,7 @@ class ConfigTgz
 		foreach ($moduleIds as $module) {
 			$idstr .= ',' . (int)$module; // Casting to int should make it safe
 		}
-		$res = Database::simpleQuery("SELECT moduleid, filepath, status FROM configtgz_module WHERE moduleid IN ($idstr)");
+		$res = Database::simpleQuery("SELECT moduleid, moduletype, filepath, status FROM configtgz_module WHERE moduleid IN ($idstr)");
 		// Make connection
 		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
 			Database::exec("INSERT INTO configtgz_x_module (configid, moduleid) VALUES (:configid, :moduleid)", array(
@@ -312,7 +312,7 @@ class ConfigTgz
 		$instance->configId = $ret['configid'];
 		$instance->configTitle = $ret['title'];
 		$instance->file = $ret['filepath'];
-		$ret = Database::simpleQuery("SELECT moduleid, filepath, status FROM configtgz_x_module "
+		$ret = Database::simpleQuery("SELECT moduleid, moduletype, filepath, status FROM configtgz_x_module "
 			. " INNER JOIN configtgz_module USING (moduleid) "
 			. " WHERE configid = :configid", array('configid' => $instance->configId));
 		$instance->modules = array();
@@ -341,7 +341,7 @@ class ConfigTgz
 			$instance->configId = $row['configid'];
 			$instance->configTitle = $row['title'];
 			$instance->file = $row['filepath'];
-			$innerRes = Database::simpleQuery("SELECT moduleid, filepath, status FROM configtgz_x_module "
+			$innerRes = Database::simpleQuery("SELECT moduleid, moduletype, filepath, status FROM configtgz_x_module "
 				. " INNER JOIN configtgz_module USING (moduleid) "
 				. " WHERE configid = :configid", array('configid' => $instance->configId));
 			$instance->modules = array();
-- 
cgit v1.2.3-55-g7522