upcase-project-cvs

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

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

Modified Files:
	category.php 
Log Message:
fixed some bugs in modelixe loops


Index: category.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/admin/category.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** category.php	21 Nov 2002 15:18:35 -0000	1.5
--- category.php	28 Nov 2002 14:35:57 -0000	1.6
***************
*** 1,42 ****
  <?php
  include_once("../config/uc_config.inc");
- // ModeliXe tags:
- //
- // list_from : url of the package.xml file where info comes from
- // pkg_list : looped block that list packages info
- //	pkg_name : name of a package
- //	pkg_version : package version
- //	pkg_descr : package description, translated
- //	pkg_status : package status
- //	pkg_home : home page of the original package
- //	pkg_instlink : url of the script that will install the package
  
  // First lines to include
! include_once("lib/uc_page.php");
  // Start the session
  $p = new UcPage("category");
- 
- // Check permissions, log in if necessary
  $p->open();
  $sess = $p->getSession();
  $user = $sess->getUser();
- // other includes
- //include_once("lib/uc_packages.php");
- include_once("lib/uc_repository.php");
- include_once("lib/uc_installer.php");
  
  
! if (!empty($_GET["catname"]))
! 	$catname = $_GET["catname"];
! else if (!empty($_POST["catname"]))
! 	$catname = $_POST["catname"];
! else
! 	die("No category selected");
  
- // don't use the include_once directive unless you want
- // to always display this page in the default language
  include("config/uc_templates.inc");
- 
- // prepare template
  $tmpl = new ModeliXe($uc_tmpl["CATEGORY"]);
  $tmpl->SetModeliXe();
--- 1,21 ----
  <?php
  include_once("../config/uc_config.inc");
  
  // First lines to include
! include_once("uc_page.php");
  // Start the session
  $p = new UcPage("category");
  $p->open();
  $sess = $p->getSession();
  $user = $sess->getUser();
  
+ include_once("uc_repository.php");
+ include_once("uc_installer.php");
+ include_once("uc_utils.php");
  
! $catname = checkVar("catname", false)
! 		or die("No category selected");
  
  include("config/uc_templates.inc");
  $tmpl = new ModeliXe($uc_tmpl["CATEGORY"]);
  $tmpl->SetModeliXe();
***************
*** 65,95 ****
  	$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");
  }
--- 44,79 ----
  	$tmpl->MxUrl("packages.installer",
  						$ucConfig->upcaseUrl . "/admin/installer.php",
! 						array("cat" => $catname,
! 								"pkg" => $package->name,
! 								"op" => "preinstall"));
  	
! 	if ($package->supported == 1)
  		$tmpl->MxBloc("packages.support", "delete");
  
  	$instances = $inst->getPackages($package->name);
! 	if (count($instances) > 0)
  	{
! 		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,
! 								"op" => "uninstall"));
! 			$tmpl->MxBloc("packages.instances", "loop");
! 		}
! 	}
! 	else
! 	{
! 		$tmpl->MxBloc("packages.instances", "delete");
  	}
  	$tmpl->MxBloc("packages", "loop");
  }