Wrote a script for automatically keeping cache files (stage3, install ISO, etc.) up to date by ftp, updated frontend and backend to reflect storing stage3 and iso filenames in the 'cache' table instead of 'gentoo_profiles'

1 files changed, 4 insertions, 4 deletions

diff --git a/frontend/modules/gentoo/step3.php b/frontend/modules/gentoo/step3.php
index 6af5b2e..83b101c 100644
--- a/frontend/modules/gentoo/step3.php
+++ b/frontend/modules/gentoo/step3.php
@@ -21,8 +21,8 @@ if (strlen($pkgsets=$this->get_opt('pkgsets'))) {
 		$this->checkbox_array('pkgset-'.$pkgset->id, 'pkgset-'.$pkgset->id, $pkgset->name, $pkgs);
 	}
 }
-if (in_array('pruneinit', $opts)) {
-	$r=query('SELECT * FROM `gentoo_baseinit` WHERE `profile`='.$profile->id.' ORDER BY `name`, `runlevel`');
+if (in_array('prune_init', $opts)) {
+	$r=query('SELECT * FROM `gentoo_baseinit` WHERE `key`="'.$profile->get_identifier().'" ORDER BY `name`, `runlevel`');
 	$scripts=array();
 	while ($script=$r->fetch(PDO::FETCH_ASSOC)) {
 		$script=new sql_gentoo_baseinit($script);
@@ -30,8 +30,8 @@ if (in_array('pruneinit', $opts)) {
 	}
 	$this->checkbox_array('pruneinit', 'pruneinit', 'Remove the following init scripts', $scripts);
 }
-if ($this->get_opt('basesystem') == 'manual') {
-	$r=query('SELECT * FROM `gentoo_basepkgs` WHERE `profile`='.$profile->id.' ORDER BY `pkg`');
+if ($this->get_opt('basesystem') == 'user_prune') {
+	$r=query('SELECT * FROM `gentoo_basepkgs` WHERE `key`="'.$profile->get_identifier().'" ORDER BY `pkg`');
 	$pkgs=array();
 	while ($pkg=$r->fetch(PDO::FETCH_ASSOC)) {
 		$pkg=$pkg['pkg'];