X-Git-Url: http://git.pjr.cc/?a=blobdiff_plain;f=plugins%2Fadmin.php;h=e7dcd142e81f10eb956bd970450387cd4471aef9;hb=155c0a1bc81dff4fc1bb4bcebb754c961e457499;hp=609047f56c4ce723a7e4906ff34671aaa53e491e;hpb=671e643949bab1c87d175bfc98ff086deb9c44ff;p=glcas.git

diff --git a/plugins/admin.php b/plugins/admin.php
index 609047f..e7dcd14 100644
--- a/plugins/admin.php
+++ b/plugins/admin.php
@@ -2,6 +2,10 @@
 
 error_log("admin loaded");
 
+global $BASE_URL, $MENU_ITEMS;
+$MENU_ITEMS["10admin"]["name"] = "Admin";
+$MENU_ITEMS["10admin"]["link"] = "$BASE_URL/admin";
+
 global $URL_HANDLERS;
 $URL_HANDLERS["admin.*"] = "GLCASAdmin";
 global $CRON_CLASSES;
@@ -30,6 +34,9 @@ class GLCASAdmin {
 					GLCASpageBuilder($this,"doRepoNextForm");
 					return;
 					break;
+				case "addrepoapt":
+					GLCASpageBuilder($this,"doAddRepoApt");
+					return;
 				case "addrepoyum":
 					GLCASpageBuilder($this,"doAddRepoYum");
 					return;
@@ -41,6 +48,10 @@ class GLCASAdmin {
 					error_log("call setstorage");
 					GLCASpageBuilder($this, "setStorage");
 					return;
+				case "freezerepo":
+					error_log("call freezerepo");
+					GLCASpageBuilder($this, "freezeRepo");
+					return;
 				case "scanrepo":
 					break;
 			}
@@ -90,6 +101,22 @@ class GLCASAdmin {
 		$this->mainBody($url);
 	}
 	
+	function freezeRepo($url)
+	{
+		$repo = $_REQUEST["repo"];
+		
+		
+		$myRep = new GLCASRepo($this->config);
+		
+		
+		error_log("called freeze repo on $repo");
+		$myRep->freezeRepo($repo);
+		
+		global $WEB_ROOT_FS, $URL_HANDLERS, $BASE_URL;
+		header("Location: $BASE_URL/admin/");
+		
+	}
+	
 	function doRemoveRepo($url)
 	{
 		$repo = $_REQUEST["repo"];
@@ -113,6 +140,8 @@ class GLCASAdmin {
 	{
 		$myRep = new GLCASRepo($this->config);
 		
+		$kos = getKnownOSList();
+		
 		$wasyum = false;
 		$wasapt = false;
 		if($_REQUEST["repotype"] == "yumbase") {
@@ -138,7 +167,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>";
@@ -148,15 +177,48 @@ class GLCASAdmin {
 			} else {
 				//echo "Looks like an apt repo, but I cant find any known distro's<br>";
 			}
+			//$existing_repos["distros"] = "Ubuntu, Debian";
+			//$existing_repos["versions"] = "8.04LTS, 9.10, 10.04LTS, 10.10, 11.04, 11.10";
+			//$existing_repos["arch"] = "x86_64, i386";
 			
+			
+			$distros = $glt["distros"];
+			$version = $glt["versions"];
+			$archs = $glt["arch"];
+			
+			//echo "<pre>";
+			//print_r($glt);
+			//echo "</pre>";
+			
+			echo "The joy of apt is that there could be a million distro's under the root of an apt mirror";
+			echo "if it doesn't list here, but you know its there, its still usable for glcas";
 			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=\"provides\" value=\"Multiple\">";
+			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\">$provides</text area></td></tr>";
+			
+			// TODO: deal with block bit
+			echo "<tr><td>Provides (tick those you wish to BLOCK - not implemented)</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=\"blocked-".$val["name"]."\"> $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\"> days</td></tr>";
+			echo "<tr><td>Expire time for Meta Data</td><td><input type=\"text\" name=\"expiretime\" value=\"3\"> days</td></tr>";
+			echo "<tr><td><input type=\"submit\" name=\"Add\" value=\"Add\"></td></tr>";
 			echo "</table>";
 			echo "</form>";
 			return true;
@@ -179,12 +241,52 @@ class GLCASAdmin {
 			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>Do Initial Update (can take a while, but done in background)</td><td><input type=\"checkbox\" name=\"initial\" checked></td></tr>";
-			echo "<tr><td>Expire time for Meta Data</td><td><input type=\"text\" name=\"expiretime\"> days</td></tr>";
+			echo "<tr><td>Expire time for Meta Data</td><td><input type=\"text\" name=\"expiretime\" value=\"3\"> days</td></tr>";
 			echo "<tr><td><input type=\"submit\" name=\"Add\" value=\"Add\"></td></tr>";
 			echo "</table>";
 			echo "</form>";
 		}
 	}
+
+	function doAddRepoApt($url)
+	{
+		$repo = new GLCASRepo($this->config);
+		
+		$desc = $_REQUEST["desc"];
+		$OS = $_REQUEST["distro"];
+		$version = $_REQUEST["provides"];
+		$arch = $_REQUEST["arch"];
+		$shorturl = $_REQUEST["shorturl"];
+		$prefix = $_REQUEST["prefix"];
+		$repurl = $_REQUEST["repourl"];
+		$expiretime = $REQUEST["expiretime"];
+		$init = false;
+		if(isset($_REQUEST["initial"])) $init = true;
+		
+		$blocklist = null;
+		$bn = 0;
+		foreach($_REQUEST as $key => $val) {
+			if(preg_match("/^blocked-*/", $key)) {
+				$blocked = preg_replace("/^blocked-/", "", $key);
+				//echo "<br>got block for $blocked<br>";
+				$blocklist[$bn] = "dists\/$blocked.*";
+				$bn++;
+			}
+		}
+		
+		//echo "<pre>";
+		//print_r($_REQUEST);
+		//echo "</pre>";
+		
+		//exit(0);
+		
+		$repo->addRepo($desc, $OS, $version, $arch, "-", $shorturl, $prefix, $repurl, "APT", $init, $expiretime, $blocklist);
+		
+		// next we need to deal with that "blocked" bit
+		
+		global $WEB_ROOT_FS, $URL_HANDLERS, $BASE_URL;
+		header("Location: $BASE_URL/admin/");
+	}
 	
 	function doAddRepoYum($url)
 	{
@@ -213,6 +315,8 @@ class GLCASAdmin {
 	function doUpdateRepo($url)
 	{
 		$rkey = $_REQUEST["repo"];
+
+		error_log("would update for repo");
 		
 		$repo = new GLCASRepo($this->config);
 		
@@ -243,9 +347,18 @@ class GLCASAdmin {
 			$repotype = $rval["repotype"];
 			$prefix = $rval["prefix"];
 			$shorturl = $rval["shorturl"];
+			if(isset($rval["frozen"])) $frozen = $rval["frozen"];
+			else $frozen = false;
 			if($prefix == "") $prefix = "-";
 			if($shorturl == "") $shorturl = "-";
-			echo "<tr><td>$desc</td><td>$repotype</td><td>$os</td><td>$version</td><td>$arch</td><td>$other</td><td>$prefix</td><td>$shorturl</td>";
+			if($frozen) {
+				$bgcol = "bgcolor=\"#bbbbff\"";
+				$frotext = "Unfreeze";
+			} else {
+				$frotext = "Freeze";
+				$bgcol = "";
+			}
+			echo "<tr $bgcol><td>$desc</td><td>$repotype</td><td>$os</td><td>$version</td><td>$arch</td><td>$other</td><td>$prefix</td><td>$shorturl</td>";
 			
 			// get url
 			$browseurl = "$BASE_URL/repo/$rkey";
@@ -260,9 +373,9 @@ class GLCASAdmin {
 			// Edit
 			echo "<a href=\"?action=editrepo&repo=$rkey\">Edit</a> ";
 			// update
-			echo "<a href=\"?action=updaterepo&repo=$rkey\">Update</a> ";
+			if(!$frozen) echo "<a href=\"?action=updaterepo&repo=$rkey\">Update</a> ";
 			// freeze
-			echo "<a href=\"?action=freezerepo&repo=$rkey\">Freeze</a> ";
+			echo "<a href=\"?action=freezerepo&repo=$rkey\">$frotext</a> ";
 			// deactivate
 			echo "<a href=\"?action=disablerepo&repo=$rkey\">Disable</a> ";
 			// clean
@@ -280,14 +393,13 @@ class GLCASAdmin {
 		//echo "</pre>";
 		
 		// wrap all this in a table
-		echo "<table><tr><td valign=\"top\">";
+		echo "<table border=\"1\"><tr><td valign=\"top\">";
 		// now, add a repo
 		echo "<h3>Add A Repo</h3>";
 		echo "<form method=\"post\" action=\"?action=reponext\">";
 		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>";
@@ -301,21 +413,52 @@ class GLCASAdmin {
 		echo "Hint <select name=\"repohint\">";
 			echo "<option value=\"fedora\">Fedora</option>";
 			echo "<option value=\"centos\">Centos</option>";
-			echo "<option value=\"ubuntu\">Ubuntu</option>";
 			echo "</select><br>";
 		echo "URL <input type=\"text\" name=\"repourl\"><br>";
 		echo "<input type=\"submit\" name=\"Scan\" value=\"Scan\"><br>";
 		echo "</form>";
 		
-		echo "</td></tr></table><hr>";
+		echo "</td><td valign=\"top\">";
+		
+		// now for mirror lists
+		echo "<h3>Via Mirrolist - not implemented</h3>";
+		echo "<form method=\"post\" action=\"?action=mirrorlist\">";
+		echo "Distro <select name=\"mirrordistro\">";
+			echo "<option value=\"fedora\">Fedora</option>";
+			echo "<option value=\"centos\">Centos</option>";
+			echo "</select><br>";
+		echo "Architecture <select name=\"arch\">";
+			echo "<option value=\"x86_64\">64 bit</option>";
+			echo "<option value=\"i386\">32 bit</option>";
+			echo "</select><br>";
+		echo "Version <input type=\"text\" name=\"version\"><br>";
+		echo "Get updates too <input type=\"checkbox\" name=\"getupdates\"><br>";
+		echo "<input type=\"submit\" name=\"Scan\" value=\"Scan\"><br>";
+		echo "</form>";
+		
+		
+		echo "</td></tr></table>";
 		
 		// repo storage location
-		echo "<h3>Storage<h3><br>";
+		echo "<h3>Storage</h3><br>";
 		echo "<form method=\"post\" action=\"?action=setstorage\">";
-		$storloc = $this->config->getConfigVar("storagelocation");
-		echo "<input type=\"text\" name=\"storageloc\" value=\"$storloc\" size=\"100\">";
+		$storloc = $this->config->getConfig("storagelocation");
+		echo "<input class=\"storage\" type=\"text\" name=\"storageloc\" value=\"$storloc\" size=\"100\">";
 		echo "<input type=\"submit\" name=\"Set\" value=\"Set\">";
 		echo "</form>";
+		
+		echo "<hr>";
+		echo "<h3>Proxy Config</h3><br>";
+		echo "<form method=\"post\" action=\"?action=setproxy\">";
+		$proxyaddress = $this->config->getConfig("proxyaddress");
+		$proxylogin = $this->config->getConfig("proxylogin");
+		$proxypass = $this->config->getConfig("proxypass");
+		echo "Proxy Address <input type=\"text\" name=\"proxyaddress\" value=\"$proxyaddress\" size=\"100\"><br>";
+		echo "Proxy Login <input type=\"text\" name=\"proxylogin\" value=\"$proxylogin\" size=\"100\"><br>";
+		echo "Proxy Password <input type=\"text\" name=\"proxypassword\" value=\"$proxypass\" size=\"100\"><br>";
+		echo "<input type=\"submit\" name=\"Set\" value=\"Set\">";
+		echo "</form>";
+		
 	}
 
 	private $config;