[Xoops-cvs2] xoops-current/html/modules/system/admin/modulesadmin modulesadmin.php,1.3,1.4 main.php,1.1.1.1,1.2

[<on...@us...>]

Update of /cvsroot/xoops/xoops-current/html/modules/system/admin/modulesadmin
In directory usw-pr-cvs1:/tmp/cvs-serv30481

Modified Files:
	modulesadmin.php main.php 
Log Message:
no message

Index: modulesadmin.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/modulesadmin/modulesadmin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** modulesadmin.php	10 Sep 2002 04:09:16 -0000	1.3
--- modulesadmin.php	18 Sep 2002 11:13:59 -0000	1.4
***************
*** 59,64 ****
  	while ($file = readdir($handle)) {
  		clearstatcache();
! 		if ( !ereg("^[.]{1,2}$",$file) && is_dir($modules_dir."/".$file) ) {
! 			if ( !in_array(trim($file), $listed_mods) ) {
  				$module = new XoopsModule();
  				$module->loadModInfo($file);
--- 59,65 ----
  	while ($file = readdir($handle)) {
  		clearstatcache();
! 		$file = trim($file);
! 		if ($file != '' && !preg_matcgh("/^[.]{1,2}$/",$file) && is_dir($modules_dir.'/'.$file)) {
! 			if ( !in_array($file, $listed_mods) ) {
  				$module = new XoopsModule();
  				$module->loadModInfo($file);
***************
*** 112,116 ****
  			return $ret;
  		} else {
! 			$groups = $xoopsUser->groups();
  			// retrieve all block ids for this module
  			$blocks =& XoopsBlock::getByModule($newmid, false);
--- 113,117 ----
  			return $ret;
  		} else {
! 			$groups =& $xoopsUser->getGroups();
  			// retrieve all block ids for this module
  			$blocks =& XoopsBlock::getByModule($newmid, false);
***************
*** 300,304 ****
  				foreach ( $adminmenu as $menuitem ) {
  					$menuitem['link'] = trim($menuitem['link']);
! 					$menuitem['target'] = trim($menuitem['target']);
  					$tree[$cnt][0] = 2;
  					$tree[$cnt][1] = trim($menuitem['title']);
--- 301,305 ----
  				foreach ( $adminmenu as $menuitem ) {
  					$menuitem['link'] = trim($menuitem['link']);
! 					$menuitem['target'] = isset($menuitem['target']) ? trim($menuitem['target']) : '';
  					$tree[$cnt][0] = 2;
  					$tree[$cnt][1] = trim($menuitem['title']);

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/modulesadmin/main.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** main.php	15 Jul 2002 08:13:45 -0000	1.1.1.1
--- main.php	18 Sep 2002 11:13:59 -0000	1.2
***************
*** 13,16 ****
--- 13,17 ----
  if ( $op == "list" ) {
  	module_list();
+ 	exit();
  }
  
***************
*** 95,98 ****
--- 96,100 ----
  	CloseTable();
  	xoops_cp_footer();
+ 	exit();
  }
  if ( $op == "submit" ) {