[Upcase-project-cvs] UpCase/admin category.php,1.2,1.3

[<jhe...@us...>]

Update of /cvsroot/upcase-project/UpCase/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv30026

Modified Files:
	category.php 
Log Message:
uninstall link added


Index: category.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/admin/category.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** category.php	14 Nov 2002 10:39:16 -0000	1.2
--- category.php	20 Nov 2002 14:25:52 -0000	1.3
***************
*** 51,60 ****
  $packages = $category->getPackages();
  
  $tmpl->MxText("catdescr", $category->description[$user->lang]);
  
  foreach ($packages as $package)
  {
- 	$tmpl->MxUrl("packages.pkgurl", $ucConfig->upcaseUrl . "/admin/package.php",
- 						array("name" => $package->name));
  	$tmpl->MxText("packages.pkgname", $package->name);
  	$tmpl->MxText("packages.pkgdescr", $package->description[$user->lang]);
--- 51,59 ----
  $packages = $category->getPackages();
  
+ 
  $tmpl->MxText("catdescr", $category->description[$user->lang]);
  
  foreach ($packages as $package)
  {
  	$tmpl->MxText("packages.pkgname", $package->name);
  	$tmpl->MxText("packages.pkgdescr", $package->description[$user->lang]);
***************
*** 65,78 ****
  						$ucConfig->upcaseUrl . "/admin/installer.php",
  						array("cat" => $catname, "pkg" => $package->name));
! 
! 	$instances = $inst->getStatus($package);
  	foreach ($instances as $instance)
  	{
  		$tmpl->MxText("packages.instances.pkgver", $instance["version"]);
! 		$tmpl->MxText("packages.instances.pkgurl", $instance["url"]);
  		$tmpl->MxText("packages.instances.pkgstatus", $instance["status"]);
  		$tmpl->MxBloc("packages.instances", "loop");
  	}
- 
  	$tmpl->MxBloc("packages", "loop");
  }
--- 64,84 ----
  						$ucConfig->upcaseUrl . "/admin/installer.php",
  						array("cat" => $catname, "pkg" => $package->name));
! 	$instances = $inst->getStatus($package->name);
  	foreach ($instances as $instance)
  	{
  		$tmpl->MxText("packages.instances.pkgver", $instance["version"]);
! 		$tmpl->MxText("packages.instances.pkgurl", $ucConfig->siteUrl . "/" . 
! 														$instance["url"]);
! 		$tmpl->MxAttribut("packages.instances.pkgurl", $ucConfig->siteUrl . "/"
! 													. $instance["url"]);
  		$tmpl->MxText("packages.instances.pkgstatus", $instance["status"]);
+ 		$tmpl->MxUrl("packages.instances.uninstall",
+ 						$ucConfig->upcaseUrl . "/admin/installer.php",
+ 						array("pkg" => $package->name,
+ 								"ver" => $instance["version"],
+ 								"url" => $instance["url"],
+ 								"uninstall" => "do"));
  		$tmpl->MxBloc("packages.instances", "loop");
  	}
  	$tmpl->MxBloc("packages", "loop");
  }