getting apt up and running

[glcas.git] / plugins / admin.php

diff --git a/plugins/admin.php b/plugins/admin.php
index b37850a..13121c3 100644 (file)
--- a/plugins/admin.php
+++ b/plugins/admin.php
@@ -116,6 +116,8 @@ class GLCASAdmin {
        {
                $myRep = new GLCASRepo($this->config);
                
+               $kos = getKnownOSList();
+               
                $wasyum = false;
                $wasapt = false;
                if($_REQUEST["repotype"] == "yumbase") {
@@ -141,7 +143,7 @@ class GLCASAdmin {
                        $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>";
@@ -160,6 +162,10 @@ class GLCASAdmin {
                        $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\">";
@@ -168,7 +174,20 @@ class GLCASAdmin {
                        echo "<tr><td>Description</td><td><input type=\"text\" name=\"desc\" value=\"APT Repo$extratext\"></td>";
                        // 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</td><td><textarea name=\"provides\" rows=\"".$glt["nrepos"]."\" cols=\"100\">$provides</textarea></td></tr>";
+                       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>";