upcase-project-cvs

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

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

Modified Files:
	menu.php 
Log Message:
corected some path and urls


Index: menu.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/admin/menu.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** menu.php	12 Nov 2002 17:46:59 -0000	1.1
--- menu.php	20 Nov 2002 12:15:59 -0000	1.2
***************
*** 12,16 ****
  {
  	$sess->logout();
! 	header("Location: " . $ucConfig->wwwRoot . "/admin/menu.php?content=main.php");
  }
  
--- 12,16 ----
  {
  	$sess->logout();
! 	header("Location: " . $ucConfig->upcaseUrl . "/admin/menu.php?content=main.php");
  }
  
***************
*** 42,47 ****
  {
  	$tmpl->MxBloc("login", "modify", "../templates/" . $uc_tmpl['LOGOUT']);
! 	$tmpl->MxUrl("login.logout", $ucConfig->wwwRoot
! 			. "/admin/menu.php", array( "logout" => "1"));
  	$tmpl->MxText("login.username", $user->name);
  	$tmpl->MxUrl("login.myaccount", "myaccount.php");
--- 42,47 ----
  {
  	$tmpl->MxBloc("login", "modify", "../templates/" . $uc_tmpl['LOGOUT']);
! 	$tmpl->MxUrl("login.logout", $ucConfig->upcaseUrl . "/admin/menu.php",
! 											array( "logout" => "1"));
  	$tmpl->MxText("login.username", $user->name);
  	$tmpl->MxUrl("login.myaccount", "myaccount.php");
***************
*** 51,58 ****
  $tmpl->MxBloc("menu", "append", "../templates/" . $uc_tmpl['APP_MENU']);
  
! $apps = array( "WebCalendar" => $ucConfig->wwwModules . "/WebCalendar",
! 				"Owl" => $ucConfig->wwwModules . "/Owl",
! 				"phpBB" => $ucConfig->wwwModules . "/phpBB2",
! 				"SPIP" => $ucConfig->wwwModules . "/SPIP");
  
  foreach ($apps as $appName => $appUrl)
--- 51,58 ----
  $tmpl->MxBloc("menu", "append", "../templates/" . $uc_tmpl['APP_MENU']);
  
! $apps = array( "WebCalendar" => $ucConfig->siteUrl . "/WebCalendar",
! 				"Owl" => $ucConfig->siteUrl . "/Owl",
! 				"phpBB" => $ucConfig->siteUrl . "/phpBB2",
! 				"SPIP" => $ucConfig->siteUrl . "/SPIP");
  
  foreach ($apps as $appName => $appUrl)
***************
*** 68,72 ****
  	$tmpl->MxBloc("menu", "append", "../templates/" 
  												. $uc_tmpl['ADMIN_MENU']);
! 	$tmpl->MxUrl("menu.packages", "packages.php", "");
  	$tmpl->MxUrl("menu.accounts", "userslist.php");
  	$tmpl->MxUrl("menu.permissions", "permissions.php");
--- 68,72 ----
  	$tmpl->MxBloc("menu", "append", "../templates/" 
  												. $uc_tmpl['ADMIN_MENU']);
! 	$tmpl->MxUrl("menu.packages", "repository.php", "");
  	$tmpl->MxUrl("menu.accounts", "userslist.php");
  	$tmpl->MxUrl("menu.permissions", "permissions.php");