Index: trunk/xpressme_integration_kit/admin/mymenu.php
===================================================================
--- trunk/xpressme_integration_kit/admin/mymenu.php	(revision 736)
+++ trunk/xpressme_integration_kit/admin/mymenu.php	(revision 738)
@@ -1,7 +1,24 @@
 <?php
+if ( preg_match ( "/^XOOPS Cube/" , XOOPS_VERSION ) )
+{ $modversion['image'] = "files/wakulogoxc.png"; }
+else if ( preg_match ( "/^ImpressCMS/" , XOOPS_VERSION ) )
+{ $modversion['image'] = "files/wakulogoic.png"; }
+else
+{ $modversion['image'] = "files/wakulogo.png"; }
 
 if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ;
 
 if( empty( $mydirname ) ) $mydirname = basename(dirname(dirname(__FILE__))) ;
+
+// Detect Altsys
+// Not Active ALTSYS => $active_altsys = false;
+// Active ALTSYS =>     $active_altsys = true;
+$module_handler =& xoops_gethandler('module');
+$criteria = new CriteriaCompo();
+$criteria->add(new Criteria('dirname','altsys'));
+$criteria->add(new Criteria('isactive', 1));
+$altsys_mod = $module_handler->getObjects($criteria);
+if(empty($altsys_mod)) $active_altsys = false; else $active_altsys = true;
+
 
 if( ! defined( 'XOOPS_ORETEKI' ) ) {
@@ -22,57 +39,52 @@
 	include( './menu.php' ) ;
 
-//	array_push( $adminmenu , array( 'title' => _PREFERENCES , 'link' => '../system/admin.php?fct=preferences&op=showmod&mod=' . $module->getvar('mid') ) ) ;
 	$menuitem_dirname = $module->getvar('dirname') ;
 
-	if( defined( 'XOOPS_TRUST_PATH' ) ) {
-
-		// with XOOPS_TRUST_PATH and altsys
-
-		if( file_exists( XOOPS_TRUST_PATH.'/libs/altsys/mytplsadmin.php' ) ) {
-			// mytplsadmin (TODO check if this module has tplfile)
-			$title = defined( '_MD_A_MYMENU_MYTPLSADMIN' ) ? _MD_A_MYMENU_MYTPLSADMIN : 'tplsadmin' ;
-			array_push( $adminmenu , array( 'title' => $title , 'link' => 'admin/index.php?mode=admin&lib=altsys&page=mytplsadmin' ) ) ;
-		}
-
-		if( file_exists( XOOPS_TRUST_PATH.'/libs/altsys/myblocksadmin.php' ) ) {
-			// myblocksadmin
-			$title = defined( '_MD_A_MYMENU_MYBLOCKSADMIN' ) ? _MD_A_MYMENU_MYBLOCKSADMIN : 'blocksadmin' ;
-			array_push( $adminmenu , array( 'title' => $title , 'link' => 'admin/index.php?mode=admin&lib=altsys&page=myblocksadmin' ) ) ;
-		}
-
-		if( file_exists( XOOPS_TRUST_PATH.'/libs/altsys/mylangadmin.php' ) ) {
-			// mylangadmin
-			$title = defined( '_MD_A_MYMENU_MYLANGADMIN' ) ? _MD_A_MYMENU_MYLANGADMIN : 'langadmin' ;
-			array_push( $adminmenu , array( 'title' => $title , 'link' => 'admin/index.php?mode=admin&lib=altsys&page=mylangadmin' ) ) ;
-		}
-
-		// preferences
-		$config_handler =& xoops_gethandler('config');
-		if( count( $config_handler->getConfigs( new Criteria( 'conf_modid' , $module->mid() ) ) ) > 0 ) {
-			if( file_exists( XOOPS_TRUST_PATH.'/libs/altsys/mypreferences.php' ) ) {
-				// mypreferences
-				$title = defined( '_MD_A_MYMENU_MYPREFERENCES' ) ? _MD_A_MYMENU_MYPREFERENCES : _PREFERENCES ;
-				array_push( $adminmenu , array( 'title' => $title , 'link' => 'admin/index.php?mode=admin&lib=altsys&page=mypreferences' ) ) ;
-			} else if( defined( 'XOOPS_CUBE_LEGACY' ) ) {
-				// Cube Legacy without altsys
-				array_push( $adminmenu , array( 'title' => _PREFERENCES , 'link' => XOOPS_URL.'/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id=' . $module->getvar('mid') ) ) ;
-			} else {
-				// system->preferences
-				array_push( $adminmenu , array( 'title' => _PREFERENCES , 'link' => XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$module->mid() ) ) ;
-			}
-		}
-
+	// mytplsadmin (TODO check if this module has tplfile)
+	if( $active_altsys ) {
+		$title = defined( '_MD_A_MYMENU_MYTPLSADMIN' ) ? _MD_A_MYMENU_MYTPLSADMIN : 'tplsadmin' ;
+		array_push( $adminmenu , array( 'title' => $title , 'link' => 'admin/index.php?mode=admin&lib=altsys&page=mytplsadmin' ) ) ;
+	}
+	
+	// myblocksadmin
+	$title = defined( '_MD_A_MYMENU_MYBLOCKSADMIN' ) ? _MD_A_MYMENU_MYBLOCKSADMIN : 'blocksadmin' ;
+	if( $active_altsys ){
+		// mypreferences
+		array_push( $adminmenu , array( 'title' => $title , 'link' => 'admin/index.php?mode=admin&lib=altsys&page=myblocksadmin' ) ) ;
 	} else if( defined( 'XOOPS_CUBE_LEGACY' ) ) {
 		// Cube Legacy without altsys
-		if( $module->getvar('hasconfig') ) array_push( $adminmenu , array( 'title' => _PREFERENCES , 'link' => XOOPS_URL.'/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id=' . $module->getvar('mid') ) ) ;
+		array_push( $adminmenu , array( 'title' => $title , 'link' => XOOPS_URL.'/modules/legacy/admin/index.php?action=BlockList') ) ;
+	} else if ( preg_match ( "/^ImpressCMS/" , XOOPS_VERSION ) ){
+		// ImpressCMS
+		array_push( $adminmenu , array( 'title' => $title , 'link' => XOOPS_URL.'/modules/system/admin.php?fct=blocksadmin&filtersel=mid&filtersel2='.$module->getvar('mid') ) ) ;
 	} else {
-		// conventinal X2
-		if( $module->getvar('hasconfig') ) array_push( $adminmenu , array( 'title' => _PREFERENCES , 'link' => XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $module->getvar('mid') ) ) ;
+		array_push( $adminmenu , array( 'title' => $title , 'link' => XOOPS_URL.'/modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen='.$module->getvar('mid').'&selmod=-2&selgrp=-1&selvis=-1' ) ) ;
 	}
-
+	
+	// mylangadmin
+	if( $active_altsys ){
+		$title = defined( '_MD_A_MYMENU_MYLANGADMIN' ) ? _MD_A_MYMENU_MYLANGADMIN : 'langadmin' ;
+		array_push( $adminmenu , array( 'title' => $title , 'link' => 'admin/index.php?mode=admin&lib=altsys&page=mylangadmin' ) ) ;
+	}
+	
+	// preferences
+	if( $module->getvar('hasconfig') ){
+		if( $active_altsys ){
+			// mypreferences
+			$title = defined( '_MD_A_MYMENU_MYPREFERENCES' ) ? _MD_A_MYMENU_MYPREFERENCES : _PREFERENCES ;
+			array_push( $adminmenu , array( 'title' => _PREFERENCES , 'link' => 'admin/index.php?mode=admin&lib=altsys&page=mypreferences' ) ) ;
+		} else if( defined( 'XOOPS_CUBE_LEGACY' ) ) {
+			// Cube Legacy without altsys
+			array_push( $adminmenu , array( 'title' => _PREFERENCES , 'link' => XOOPS_URL.'/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id=' . $module->getvar('mid') ) ) ;
+		} else {
+			// system->preferences
+			array_push( $adminmenu , array( 'title' => _PREFERENCES , 'link' => XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$module->mid() ) ) ;
+		}
+	}
+	
+	// hilight
 	$mymenu_uri = empty( $mymenu_fake_uri ) ? $_SERVER['REQUEST_URI'] : $mymenu_fake_uri ;
 	$mymenu_link = substr( strstr( $mymenu_uri , '/admin/' ) , 1 ) ;
 
-	// hilight
 	foreach( array_keys( $adminmenu ) as $i ) {
 		if( $mymenu_link == $adminmenu[$i]['link'] ) {