X-Git-Url: http://git.pjr.cc/?p=glcas.git;a=blobdiff_plain;f=plugins%2Fadmin.php;h=af5ed85612d29a2d12b129c0f9c3bbd04e42f9e5;hp=8b6c2a9f119486864eb01b6dd41835f7f3a99958;hb=f3bb1ef4d1fb0297498f8a1a30c2332e2e5905e8;hpb=f99212f7d29b648f3698cf31cbcda6bc04cda182

diff --git a/plugins/admin.php b/plugins/admin.php
index 8b6c2a9..af5ed85 100644
--- a/plugins/admin.php
+++ b/plugins/admin.php
@@ -20,7 +20,7 @@ class GLCASAdmin {
 		if(isset($_REQUEST["action"])) {
 			switch($_REQUEST["action"]) {
 				case "addrepo":
-					GLCASpageBuilder($this,"doAddRepo");
+					GLCASpageBuilder($this,"doAddRepoForm");
 					return;
 					break;
 				case "scanrepo":
@@ -44,13 +44,37 @@ class GLCASAdmin {
 		$this->mainBody($url);
 	}
 	
-	function doAddRepo($url)
+	function doAddRepoForm($url)
 	{
 		$myRep = new GLCASRepo($this->config);
 		
-		$glt = $myRep->getRepoDetailsYum($_REQUEST["repourl"]);
+		$wasyum = false;
+		if($_REQUEST["repotype"] == "yumbase") {
+			$glt = $myRep->getRepoDetailsYum($_REQUEST["repourl"]);
+			$wasyum = true;
+		} else if($_REQUEST["repotype"] == "yummirrorlist") {
+			$glt = $myRep->getRepoDetailsYum($_REQUEST["repourl"], true);
+			$wasyum = true;
+		} else if($_REQUEST["repotype"] == "apt") {
+			$glt = $myRep->getRepoDetailsApt($_REQUEST["repourl"]);
+		}
+		
 		
-		echo "<pre>$glt</pre>";
+		if($wasyum) {
+			$os = $glt["OS"];
+			$version = $glt["version"];
+			$arch = $glt["arch"];
+			echo "<form method=\"post\" action=\"repoaddreal\">";
+			echo "OS: <input type=\"text\" name=\"OS\" value=\"$os\"><br>";
+			echo "Version: <input type=\"text\" name=\"version\" value=\"$version\"><br>";
+			echo "Architecture: <input type=\"text\" name=\"Architecture\" value=\"$arch\"><br>";
+			echo "Short URL <input type=\"text\" name=\"shorturl\"><br>";
+			echo "URL Prefix (blank for none) <input type=\"text\" name=\"shorturl\"><br>";
+			echo "<input type=\"submit\" name=\"Add\" value=\"add\"><br>";
+			echo "</form>";
+		} else {
+			// apt is much tricker cause one repo can provide multiple versions, OS's and architectures.
+		}
 	}
 	
 	function mainBody($url)