Changeset 737 for branches/Ver3.0

Timestamp:

May 9, 2011, 3:34:00 PM (14 years ago)

Author:

toemon

Message:

ALTSYSがない場合のモジュールブロック管理メニューを追加

Location:

branches/Ver3.0/xpressme_integration_kit

Files:

• admin/mymenu.php (modified) (2 diffs)
• language/english/admin.php (modified) (1 diff)
• language/ja_utf8/admin.php (modified) (1 diff)
• language/japanese/admin.php (modified) (1 diff)
• language/pt-br_utf8/admin.php (modified) (1 diff)

branches/Ver3.0/xpressme_integration_kit/admin/mymenu.php

@@ -1 +1 @@
 <?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 +39 @@
         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'] ) {

branches/Ver3.0/xpressme_integration_kit/language/english/admin.php

@@ -5 +5 @@
 // altsys
         define('_MD_A_MYMENU_MYTPLSADMIN','templates');
-        define('_MD_A_MYMENU_MYBLOCKSADMIN','blocks/permissions');
+        define('_MD_A_MYMENU_MYBLOCKSADMIN','blocks');
         define('_MD_A_MYMENU_MYLANGADMIN','languages');
         define('_MD_A_MYMENU_MYPREFERENCES','general');

branches/Ver3.0/xpressme_integration_kit/language/ja_utf8/admin.php

@@ -5 +5 @@
 // altsys
         define('_MD_A_MYMENU_MYTPLSADMIN','テンプレート管理');
-        define('_MD_A_MYMENU_MYBLOCKSADMIN','ブロック管理/アクセス権限');
+        define('_MD_A_MYMENU_MYBLOCKSADMIN','ブロック管理');
         define('_MD_A_MYMENU_MYLANGADMIN','言語定数管理');
         define('_MD_A_MYMENU_MYPREFERENCES','一般設定');

branches/Ver3.0/xpressme_integration_kit/language/japanese/admin.php

@@ -5 +5 @@
 // altsys
         define('_MD_A_MYMENU_MYTPLSADMIN','¥Æ¥ó¥×¥ì¡¼¥È´ÉÍý');
-        define('_MD_A_MYMENU_MYBLOCKSADMIN','¥Ö¥í¥Ã¥¯´ÉÍý/¥¢¥¯¥»¥¹¸¢¸Â');
+        define('_MD_A_MYMENU_MYBLOCKSADMIN','¥Ö¥í¥Ã¥¯´ÉÍý');
         define('_MD_A_MYMENU_MYLANGADMIN','¸À¸ìÄê¿ô´ÉÍý');
         define('_MD_A_MYMENU_MYPREFERENCES','°ìÈÌÀßÄê');

branches/Ver3.0/xpressme_integration_kit/language/pt-br_utf8/admin.php

@@ -5 +5 @@
 // altsys
         define('_MD_A_MYMENU_MYTPLSADMIN','Templates');
-        define('_MD_A_MYMENU_MYBLOCKSADMIN','Blocos/permissões');
+        define('_MD_A_MYMENU_MYBLOCKSADMIN','Blocos');
         define('_MD_A_MYMENU_MYLANGADMIN','Idiomas');
         define('_MD_A_MYMENU_MYPREFERENCES','Preferências');