{
$myRep = new GLCASRepo($this->config);
+ $kos = getKnownOSList();
+
$wasyum = false;
$wasapt = false;
if($_REQUEST["repotype"] == "yumbase") {
$extratext = "";
$provides = "";
if($glt["nrepos"] > 0) {
- $kos = getKnownOSList();
+
foreach($glt["knownrepo"] as $key => $val) {
$reponame = $kos["apt"][$val];
//echo "Fount a repo, $val which is $reponame<br>";
$version = $glt["versions"];
$archs = $glt["arch"];
+ echo "<pre>";
+ print_r($glt);
+ echo "</pre>";
+
echo "<form method=\"post\" action=\"?action=addrepoapt\">";
echo "<input type=\"hidden\" name=\"repourl\" value=\"$repourl\">";
echo "<input type=\"hidden\" name=\"distro\" value=\"$distros\">";
- echo "<input type=\"hidden\" name=\"version\" value=\"$version\">";
echo "<input type=\"hidden\" name=\"arch\" value=\"$archs\">";
echo "<table>";
echo "<tr><td>Description</td><td><input type=\"text\" name=\"desc\" value=\"APT Repo$extratext\"></td>";
- echo "<tr><td>Provides</td><td><textarea name=\"provides\" rows=\"".$glt["nrepos"]."\" cols=\"100\">$provides</textarea></td></tr>";
+ // TODO change this "provides" bit with a bit that allows us to choose which versions
+ // of ubuntu will be made available from the ones we found
+ echo "<tr><td>Provides (tick those you wish to BLOCK)</td><td>";
+ foreach($glt["knownrepo"] as $key => $val) {
+ $reponame = $kos["apt"][$val["name"]];
+ $a = "";
+ $b = "";
+ if($glt["knownrepo"][$key]["i386"]) $a = "i386";
+ if($glt["knownrepo"][$key]["amd64"]) $b = "x86_64";
+ if($a != "" && $b != "") $archs = "$a/$b";
+ else $archs = "$a$b";
+ echo "<input type=\"checkbox\" name=\"$val\"> $reponame ($archs)<br>";
+ }
+
+ echo "</td></tr>";
+ //echo "<tr><td>Provides</td><td><textarea name=\"provides\" rows=\"".$glt["nrepos"]."\" cols=\"100\">$provides</textarea></td></tr>";
echo "<tr><td>Short URL</td><td><input type=\"text\" name=\"shorturl\"></td></tr>";
echo "<tr><td>URL Prefix (blank for none)</td><td><input type=\"text\" name=\"prefix\"></td></tr>";
echo "<tr><td>Expire time for Meta Data</td><td><input type=\"text\" name=\"expiretime\" value=\"3\"> days</td></tr>";
$desc = $_REQUEST["desc"];
$OS = $_REQUEST["distro"];
- $version = $_REQUEST["version"];
+ $version = $_REQUEST["provides"];
$arch = $_REQUEST["arch"];
$shorturl = $_REQUEST["shorturl"];
$prefix = $_REQUEST["prefix"];
echo "Type <select name=\"repotype\">";
echo "<option value=\"yumbase\">YUM (Base URL)</option>";
echo "<option value=\"yummirrorlist\">YUM (Mirror List) - not implemented</option>";
- echo "<option value=\"apt\">APT - not implemented</option>";
+ echo "<option value=\"apt\">APT</option>";
echo "</select><br>";
echo "URL <input type=\"text\" name=\"repourl\"><br>";
echo "<input type=\"submit\" name=\"Add\" value=\"Add\"><br>";