Commit: 415bd2cf056ab85464df7c76b4022592a6d46af1 - xoopscubelegacy (git)

XOOPS Cube Legacy base repository

Commit MetaInfo

• Revision: 415bd2cf056ab85464df7c76b4022592a6d46af1 (tree)
• Zeit: 2011-11-10 23:46:31
• Autor: nbuy <nbuy@704c...>
• Commiter: nbuy

Log Message

enhance mainmenu block. cache enabled. show all submenus.

git-svn-id: https://xoopscube.svn.sourceforge.net/svnroot/xoopscube/Package_Legacy/trunk@1043 704cf05f-ae62-4b0e-a484-234ee0250e75

Ändern Zusammenfassung

• modified: extras/extra_languages/czech/modules/legacy/language/czech/blocks.php
• modified: extras/extra_languages/fr_utf8/modules/legacy/language/fr_utf8/blocks.php
• modified: extras/extra_languages/french/modules/legacy/language/french/blocks.php
• modified: extras/extra_languages/greek/modules/legacy/language/greek/blocks.php
• modified: extras/extra_languages/ja_utf8/modules/legacy/language/ja_utf8/blocks.php
• modified: extras/extra_languages/japanese/modules/legacy/language/japanese/blocks.php
• modified: extras/extra_languages/ko_utf8/html/modules/legacy/language/ko_utf8/blocks.php
• modified: extras/extra_languages/korean/modules/legacy/language/korean/blocks.php
• modified: extras/extra_languages/portuguese/modules/legacy/language/portuguese/blocks.php
• modified: extras/extra_languages/pt_utf8/modules/legacy/language/pt_utf8/blocks.php
• modified: extras/extra_languages/russian/modules/legacy/language/russian/main.php
• modified: extras/extra_languages/schinese/modules/legacy/language/schinese/blocks.php
• modified: extras/extra_languages/tw_utf-8/html/modules/legacy/language/tw_utf-8/blocks.php
• modified: extras/extra_languages/zh-tw/modules/legacy/language/zh-tw/blocks.php
• modified: html/modules/legacy/blocks/legacy_mainmenu.php
• modified: html/modules/legacy/kernel/Legacy_CacheInformation.class.php
• modified: html/modules/legacy/language/english/blocks.php
• modified: html/modules/legacy/xoops_version.php
• modified: html/modules/stdCache/preload/Initialize.class.php

Diff

--- a/extras/extra_languages/czech/modules/legacy/language/czech/blocks.php
+++ b/extras/extra_languages/czech/modules/legacy/language/czech/blocks.php
@@ -34,4 +34,7 @@ define('_MB_LEGACY_LANG_THWIDTH', "V
 define('_MB_LEGACY_LANG_RECOMMENDSITE', "Doporu鑼e tento web p?tel?");
 
 define('_MB_LEGACY_MESSAGE_CAN_NOT_THEME_CHANGE', "Promi?e, nyn nelze 啾blonu m?it.");
+
+define('_MB_LEGACY_MAINMENU_EXPAND_SUB', "Show all submenus");
+
 ?>

--- a/extras/extra_languages/fr_utf8/modules/legacy/language/fr_utf8/blocks.php
+++ b/extras/extra_languages/fr_utf8/modules/legacy/language/fr_utf8/blocks.php
@@ -34,4 +34,6 @@ define('_MB_LEGACY_LANG_RECOMMENDSITE', "Recommender ce Site a un(e) Ami(e)");
 
 define('_MB_LEGACY_MESSAGE_CAN_NOT_THEME_CHANGE', "Désolé, Il est actuellement impossible de changer les themes.");
 
+define('_MB_LEGACY_MAINMENU_EXPAND_SUB', "Voir toutes les sous-menus");
+
 ?>
\ No newline at end of file

--- a/extras/extra_languages/french/modules/legacy/language/french/blocks.php
+++ b/extras/extra_languages/french/modules/legacy/language/french/blocks.php
@@ -35,4 +35,6 @@ define("_MB_LEGACY_LANG_RECOMMENDSITE", "Recommender ce Site a un(e) Ami(e)");
 
 define("_MB_LEGACY_MESSAGE_CAN_NOT_THEME_CHANGE", "D駸ol? Il est actuellement impossible de changer les themes.");
 
+define('_MB_LEGACY_MAINMENU_EXPAND_SUB', "Voir toutes les sous-menus");
+
 ?>

--- a/extras/extra_languages/greek/modules/legacy/language/greek/blocks.php
+++ b/extras/extra_languages/greek/modules/legacy/language/greek/blocks.php
@@ -36,6 +36,8 @@ define('_MB_LEGACY_LANG_THWIDTH', "Screenshot image width");
 
 define('_MB_LEGACY_LANG_RECOMMENDSITE', "Recommend this Site to a Friend");
 
-define('_MB_LEGACY_MESSAGE_CAN_NOT_THEME_CHANGE', "Sorry, you can't change themes now.");
+define('_MB_LEGACY_MESSAGE_CAN_NOT_THEME_CHANGE', "Λυπούμαστε, αλλά δεν μπορείτε να αλλάξετε τα θέματα τώρα.");
+
+define('_MB_LEGACY_MAINMENU_EXPAND_SUB', "Εμφάνιση όλων των υπομενού");
 
 ?>

--- a/extras/extra_languages/ja_utf8/modules/legacy/language/ja_utf8/blocks.php
+++ b/extras/extra_languages/ja_utf8/modules/legacy/language/ja_utf8/blocks.php
@@ -35,4 +35,6 @@ define('_MB_LEGACY_LANG_RECOMMENDSITE', "当サイトを友達に薦める");
 
 define('_MB_LEGACY_MESSAGE_CAN_NOT_THEME_CHANGE', "ただいまテーマチェンジャーはご利用になれません");
 
+define('_MB_LEGACY_MAINMENU_EXPAND_SUB', "全てのサブメニューを表示する");
+
 ?>

--- a/extras/extra_languages/japanese/modules/legacy/language/japanese/blocks.php
+++ b/extras/extra_languages/japanese/modules/legacy/language/japanese/blocks.php
@@ -35,4 +35,6 @@ define('_MB_LEGACY_LANG_RECOMMENDSITE', "
 
 define('_MB_LEGACY_MESSAGE_CAN_NOT_THEME_CHANGE', "ただいまテーマチェンジャーはご利用になれません");
 
+define('_MB_LEGACY_MAINMENU_EXPAND_SUB', "全てのサブメニューを表示する");
+
 ?>

--- a/extras/extra_languages/ko_utf8/html/modules/legacy/language/ko_utf8/blocks.php
+++ b/extras/extra_languages/ko_utf8/html/modules/legacy/language/ko_utf8/blocks.php
@@ -65,4 +65,6 @@ define('_MB_LEGACY_LANG_RECOMMENDSITE', "친구에게 이 사이트를 추천");
 
 define('_MB_LEGACY_MESSAGE_CAN_NOT_THEME_CHANGE', "지금은 테마를 변경하실 수 없습니다.");
 
+define('_MB_LEGACY_MAINMENU_EXPAND_SUB', "모든 하위 메뉴를 표시");
+
 ?>
\ No newline at end of file

--- a/extras/extra_languages/korean/modules/legacy/language/korean/blocks.php
+++ b/extras/extra_languages/korean/modules/legacy/language/korean/blocks.php
@@ -65,4 +65,6 @@ define('_MB_LEGACY_LANG_RECOMMENDSITE', "庁
 
 define('_MB_LEGACY_MESSAGE_CAN_NOT_THEME_CHANGE', "走榎精 砺原研 痕井馬叔 呪 蒸柔艦陥.");
 
+define('_MB_LEGACY_MAINMENU_EXPAND_SUB', "乞窮 馬是 五敢研 妊獣");
+
 ?>
\ No newline at end of file

--- a/extras/extra_languages/portuguese/modules/legacy/language/portuguese/blocks.php
+++ b/extras/extra_languages/portuguese/modules/legacy/language/portuguese/blocks.php
@@ -43,4 +43,7 @@ define("_MB_LEGACY_SUBMS","Conte
 define("_MB_LEGACY_VACNT","Informa鋏es");
 define("_MB_LEGACY_WDLS","Arquivos pendentes");
 define("_MB_LEGACY_WLNKS","Endere輟s pendentes");
+
+define('_MB_LEGACY_MAINMENU_EXPAND_SUB', "Mostrar todos os submenus");
+
 ?>
\ No newline at end of file

--- a/extras/extra_languages/pt_utf8/modules/legacy/language/pt_utf8/blocks.php
+++ b/extras/extra_languages/pt_utf8/modules/legacy/language/pt_utf8/blocks.php
@@ -43,4 +43,7 @@ define("_MB_LEGACY_SUBMS","Conteúdo pendente");
 define("_MB_LEGACY_VACNT","Informações");
 define("_MB_LEGACY_WDLS","Arquivos pendentes");
 define("_MB_LEGACY_WLNKS","Endereços pendentes");
+
+define('_MB_LEGACY_MAINMENU_EXPAND_SUB', "Mostrar todos os submenus");
+
 ?>
\ No newline at end of file

--- a/extras/extra_languages/russian/modules/legacy/language/russian/main.php
+++ b/extras/extra_languages/russian/modules/legacy/language/russian/main.php
@@ -57,4 +57,6 @@ define('_MD_LEGACY_MESSAGE_LOGGEDOUT', "

 define('_MD_LEGACY_MESSAGE_THANKYOUFORVISIT', "廷瘰 闔聳謗矗鴾 轢 轢 騾蜥!");
 
+define('_MB_LEGACY_MAINMENU_EXPAND_SUB', "Show all submenus");
+
 ?>

--- a/extras/extra_languages/schinese/modules/legacy/language/schinese/blocks.php
+++ b/extras/extra_languages/schinese/modules/legacy/language/schinese/blocks.php
@@ -36,4 +36,6 @@ define('_MB_LEGACY_LANG_RECOMMENDSITE', "
 
 define('_MB_LEGACY_MESSAGE_CAN_NOT_THEME_CHANGE', "宇埜?艇?壓涙隈延厚麼籾。");
 
+define('_MB_LEGACY_MAINMENU_EXPAND_SUB', "顯示所有子菜單");
+
 ?>

--- a/extras/extra_languages/tw_utf-8/html/modules/legacy/language/tw_utf-8/blocks.php
+++ b/extras/extra_languages/tw_utf-8/html/modules/legacy/language/tw_utf-8/blocks.php
@@ -36,4 +36,6 @@ define('_MB_LEGACY_LANG_RECOMMENDSITE', "推薦本站");
 
 define('_MB_LEGACY_MESSAGE_CAN_NOT_THEME_CHANGE', "抱歉，您現在無法變更佈景。");
 
+define('_MB_LEGACY_MAINMENU_EXPAND_SUB', "顯示所有子菜單");
+
 ?>

--- a/extras/extra_languages/zh-tw/modules/legacy/language/zh-tw/blocks.php
+++ b/extras/extra_languages/zh-tw/modules/legacy/language/zh-tw/blocks.php
@@ -35,4 +35,6 @@ define('_MB_LEGACY_LANG_RECOMMENDSITE', '推薦這個網站給一個朋友');
 
 define('_MB_LEGACY_MESSAGE_CAN_NOT_THEME_CHANGE', '抱歉，您現在不能修改佈景。');
 
+define('_MB_LEGACY_MAINMENU_EXPAND_SUB', "顯示所有子菜單");
+
 ?>

--- a/html/modules/legacy/blocks/legacy_mainmenu.php
+++ b/html/modules/legacy/blocks/legacy_mainmenu.php
@@ -19,7 +19,7 @@
 //  This file has been modified for Legacy from XOOPS2 System module block   //
 // ------------------------------------------------------------------------- //
 
-function b_legacy_mainmenu_show() {
+function b_legacy_mainmenu_show( $options ) {
     $root =& XCube_Root::getSingleton();
     $xoopsModule =& $root->mContext->mXoopsModule;
     $xoopsUser =& $root->mController->mRoot->mContext->mXoopsUser;
@@ -35,20 +35,38 @@ function b_legacy_mainmenu_show() {
     $moduleperm_handler =& xoops_gethandler('groupperm');
     $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
     $read_allowed = $moduleperm_handler->getItemIds('module_read', $groups);
+    $all_links = (int)$options[0];
+	$mid = is_object($xoopsModule)?$xoopsModule->getVar('mid', 'N'):'';
     foreach (array_keys($modules) as $i) {
         if (in_array($i, $read_allowed)) {
-            $block['modules'][$i]['name'] = $modules[$i]->getVar('name');
-            $block['modules'][$i]['directory'] = $modules[$i]->getVar('dirname');
-            $sublinks =& $modules[$i]->subLink();
-            if ((count($sublinks) > 0) && (!empty($xoopsModule)) && ($i == $xoopsModule->getVar('mid'))) {
+			$module = &$modules[$i];
+			$blockm = &$block['modules'][$i];
+            $blockm['name'] = $module->getVar('name');
+			$moddir = XOOPS_URL.'/modules/';
+            $moddir .= $blockm['directory'] = $module->getVar('dirname', 'N');
+			$info = $module->getInfo();
+            $sublinks =& $module->subLink();
+            if (count($sublinks)>0 && ($all_links || $i==$mid)) {
                 foreach($sublinks as $sublink){
-                    $block['modules'][$i]['sublinks'][] = array('name' => $sublink['name'], 'url' => XOOPS_URL.'/modules/'.$modules[$i]->getVar('dirname').'/'.$sublink['url']);
+                    $blockm['sublinks'][] = array('name' => $sublink['name'], 'url' => $moddir.'/'.$sublink['url']);
                 }
             } else {
-                $block['modules'][$i]['sublinks'] = array();
+                $blockm['sublinks'] = array();
             }
         }
     }
     return $block;
 }
+
+function b_legacy_mainmenu_edit( $options ) {
+    $off='checked="checked"';
+    $on='';
+    if ($options[0]) {
+	$on = $off;
+	$off = '';
+    }
+    return "<div>"._MB_LEGACY_MAINMENU_EXPAND_SUB.
+	"<input type=\"radio\" name=\"options[0]\" value=\"0\" $off>"._NO.
+	" &nbsp; <input type=\"radio\" name=\"options[0]\" value=\"1\" $on>"._YES."</div>";
+}
 ?>

--- a/html/modules/legacy/kernel/Legacy_CacheInformation.class.php
+++ b/html/modules/legacy/kernel/Legacy_CacheInformation.class.php
@@ -216,8 +216,8 @@ class Legacy_BlockCacheInformation extends Legacy_AbstractCacheInformation
         $this->mGetCacheFilePath->call(new XCube_Ref($filepath), $this);
         
         if (!$filepath) {
-            $id = md5(XOOPS_SALT . $this->mBlock->get('bid') . "(" . implode("_", $this->mIdentityArr) . ")" . implode("_", $this->mGroupArr));
-            $filepath = XOOPS_CACHE_PATH . "/" . $id . ".cache.html";
+            $id = md5(XOOPS_SALT . "(" . implode("_", $this->mIdentityArr) . ")" . implode("_", $this->mGroupArr));
+            $filepath = XOOPS_CACHE_PATH . "/bid".$this->mBlock->get('bid') . '_' . $id . ".cache.html";
         }
         
         return $filepath;

--- a/html/modules/legacy/language/english/blocks.php
+++ b/html/modules/legacy/language/english/blocks.php
@@ -35,4 +35,6 @@ define('_MB_LEGACY_LANG_RECOMMENDSITE', "Recommend this Site to a Friend");
 
 define('_MB_LEGACY_MESSAGE_CAN_NOT_THEME_CHANGE', "Sorry, you can't change themes now.");
 
+define('_MB_LEGACY_MAINMENU_EXPAND_SUB', "Show all submenus");
+
 ?>

--- a/html/modules/legacy/xoops_version.php
+++ b/html/modules/legacy/xoops_version.php
@@ -9,7 +9,7 @@
  */
 
 $modversion['name'] = _MI_LEGACY_NAME;
-$modversion['version'] = 2.01;
+$modversion['version'] = 2.02;
 $modversion['description'] = _MI_LEGACY_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "XOOPS Cube Project";
@@ -151,9 +151,11 @@ $modversion['blocks'][2]['file'] = "legacy_mainmenu.php";
 $modversion['blocks'][2]['name'] = _MI_LEGACY_BLOCK_MAINMENU_NAME;
 $modversion['blocks'][2]['description'] = _MI_LEGACY_BLOCK_MAINMENU_DESC;
 $modversion['blocks'][2]['show_func'] = "b_legacy_mainmenu_show";
+$modversion['blocks'][2]['edit_func'] = "b_legacy_mainmenu_edit";
 $modversion['blocks'][2]['template'] = 'legacy_block_mainmenu.html';
 $modversion['blocks'][2]['visible_any'] = true;
 $modversion['blocks'][2]['show_all_module'] = true;
+$modversion['blocks'][2]['options'] = '0';
 
 $modversion['blocks'][3]['func_num'] = 3;
 $modversion['blocks'][3]['file'] = "legacy_search.php";

--- a/html/modules/stdCache/preload/Initialize.class.php
+++ b/html/modules/stdCache/preload/Initialize.class.php
@@ -17,6 +17,16 @@ class StdCache_Initialize extends XCube_ActionFilter
 	function setForBlock($cacheInfo)
 	{
 		$user =& $this->mRoot->mContext->mXoopsUser;
+		$block =& $cacheInfo->mBlock;
+		switch ($block->getVar('show_func','n')) {
+		case 'b_legacy_mainmenu_show':	// mainmenu context
+			list($option) = explode('|', $block->getVar('options','n'));
+			if ($option) break;			// but options setting no context
+			$module = $this->mRoot->mContext->mXoopsModule;
+			$cacheInfo->mIdentityArr['dirname'] = is_object($module)?$module->getVar('dirname'):'';
+			break;
+			// something other block with context cache
+		}
 		if (is_object($user)) {
 			$cacheInfo->mGroupArr = $user->getGroups();
 			$cacheInfo->setEnableCache(!in_array(XOOPS_GROUP_ADMIN, $user->getGroups()));