[Upcase-project-cvs] UpCase/admin category.php,1.4,1.5

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

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

Modified Files:
	category.php 
Log Message:
uninstall link, demo link, use of getPackage rather than getStatus


Index: category.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/admin/category.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** category.php	20 Nov 2002 16:00:20 -0000	1.4
--- category.php	21 Nov 2002 15:18:35 -0000	1.5
***************
*** 60,85 ****
  	$tmpl->Mxtext("packages.pkghome", $package->homePage);
  	$tmpl->MxUrl("packages.pkghome", $package->homePage);
  	$tmpl->MxText("packages.pkgver", $package->version);
  	$tmpl->MxUrl("packages.installer",
  						$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"],
! 								"cat" => $catname,
! 								"uninstall" => "do"));
  		$tmpl->MxBloc("packages.instances", "loop");
  	}
  	$tmpl->MxBloc("packages", "loop");
  }
--- 60,95 ----
  	$tmpl->Mxtext("packages.pkghome", $package->homePage);
  	$tmpl->MxUrl("packages.pkghome", $package->homePage);
+ 	$tmpl->Mxtext("packages.pkgdemo", $package->demoPage);
+ 	$tmpl->MxUrl("packages.pkgdemo", $package->demoPage);
  	$tmpl->MxText("packages.pkgver", $package->version);
  	$tmpl->MxUrl("packages.installer",
  						$ucConfig->upcaseUrl . "/admin/installer.php",
  						array("cat" => $catname, "pkg" => $package->name));
! 	
! 	if ($package->supported == 0)
! 		$tmpl->MxBloc("packages.support", "modify",
! 				$ucConfig->upcaseRoot . "/templates/en/unsupported.mxt");
! 	else
! 		$tmpl->MxBloc("packages.support", "delete");
! 
! 	$instances = $inst->getPackages($package->name);
  	foreach ($instances as $instance)
  	{
! 		$tmpl->MxText("packages.instances.pkgver", $instance->version);
! 		$tmpl->MxText("packages.instances.pkgurl",
! 						$ucConfig->siteUrl . "/" . $instance->path);
! 		$tmpl->MxAttribut("packages.instances.pkgurl", 
! 					$ucConfig->siteUrl . "/" . $instance->path);
! 		$tmpl->MxText("packages.instances.pkgstatus", $instance->status);
  		$tmpl->MxUrl("packages.instances.uninstall",
  						$ucConfig->upcaseUrl . "/admin/installer.php",
! 						array("pkg" => $instance->name,
! 							"ver" => $instance->version,
! 							"url" => $instance->path,
! 							"cat" => $catname,
! 							"uninstall" => "do"));
  		$tmpl->MxBloc("packages.instances", "loop");
  	}
+ 
  	$tmpl->MxBloc("packages", "loop");
  }