From: <du...@us...> - 2012-10-18 12:42:30
|
Revision: 10227 http://sourceforge.net/p/xoops/svn/10227 Author: dugris Date: 2012-10-18 12:42:23 +0000 (Thu, 18 Oct 2012) Log Message: ----------- Fix menu for extensions Modified Paths: -------------- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php Property Changed: ---------------- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php 2012-10-17 08:19:31 UTC (rev 10226) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php 2012-10-18 12:42:23 UTC (rev 10227) @@ -36,9 +36,18 @@ } } $system->loadLanguage('modulesadmin','system'); + // Get Action type $op = $system->cleanVars($_REQUEST, 'op', 'list', 'string'); +$module = $system->cleanVars($_REQUEST, 'module', '', 'string'); +if (in_array($op, array('install', 'update', 'uninstall'))) { + if (!$xoops->security->check()) { + $op = 'list'; + } +} +$myts = MyTextsanitizer::getInstance(); + switch ($op) { case 'list': Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php 2012-10-17 08:19:31 UTC (rev 10226) +++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php 2012-10-18 12:42:23 UTC (rev 10227) @@ -1,204 +1,208 @@ -<?php -/* - You may not change or alter any portion of this comment or credits - of supporting developers from this source code or any supporting source code - which is considered copyrighted (c) material of the original comment or credit authors. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ - - -/* - * Xoops Cpanel default GUI class - * - * @copyright The XOOPS project http://sf.net/projects/xoops/ - * @license http://www.fsf.org/copyleft/gpl.html GNU public license - * @package system - * @usbpackage GUI - * @since 2.4 - * @author Mamba XXXXXXXXXXXXXXXXXXX - * @author Mojtabajml <jam...@gm...> - * @author Voltan <djv...@gm...> - * @author BitC3R0 <Bi...@gm...> - * @author trabis <lus...@gm...> - * @version 1.2 - * @version $Id$ - */ - -class XoopsGuiDefault -{ - - function header() - { - $xoops = Xoops::getInstance(); - $xoops->loadLanguage('admin', 'system'); - $xoops->loadLanguage('cpanel', 'system'); - $xoops->loadLanguage('modinfo', 'system'); - - $xoops->theme->addStylesheet('media/xoops/css/moduladmin.css'); - $xoops->theme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/style.css'); - $xoops->theme->addStylesheet($xoops->url('/media/bootstrap/css/xoops.bootstrap.css')); - - - $xoops->theme->addScript($xoops->url('/media/jquery/jquery.js')); - $xoops->theme->addScript($xoops->url('/media/jquery/ui/jquery.ui.js')); - $xoops->theme->addScript($xoops->url('/media/bootstrap/js/bootstrap.min.js')); - // ddsmoothmenu - $xoops->theme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/ddsmoothmenu.js'); - $xoops->theme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/tooltip.js'); - - $quick = array(); - $quick[] = array('title' => _DEFAULT_CPHOME, 'link' => XOOPS_URL . '/admin.php'); - $quick[] = array('title' => _YOURHOME, 'link' => XOOPS_URL); - $quick[] = array('title' => _DEFAULT_NEWS, 'link' => XOOPS_URL . '/admin.php?xoopsorgnews=1'); - $quick[] = array('title' => 'separator'); - $quick[] = array('title' => _LOGOUT, 'link' => XOOPS_URL . '/user.php?op=logout'); - $xoops->tpl->assign('quick_menu', $quick); - - XoopsLoad::load('module', 'system'); - XoopsLoad::load('extension', 'system'); - $system_module = new SystemModule(); - $system_extension = new SystemExtension(); - - $adminmenu = null; - include dirname(__FILE__) . '/menu.php'; - if (!$xoops->isModule() || 'system' == $xoops->module->getVar('dirname', 'n')) { - $modpath = XOOPS_URL . '/admin.php'; - $modname = _DEFAULT_SYSOPTIONS; - $modid = 1; - $moddir = 'system'; - - $mod_options = $adminmenu; - foreach (array_keys($mod_options) as $item) { - $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) - ? XOOPS_URL . '/modules/' . $moddir . '/' . $mod_options[$item]['link'] - : $mod_options[$item]['link']; - $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' - : XOOPS_ADMINTHEME_URL . '/default/' . $mod_options[$item]['icon']; - unset($mod_options[$item]['icon_small']); - } - - } else { - $moddir = $xoops->module->getVar('dirname', 'n'); - $modpath = XOOPS_URL . '/modules/' . $moddir; - $modname = $xoops->module->getVar('name'); - $modid = $xoops->module->getVar('mid'); - - $mod_options = $xoops->module->getAdminMenu(); - foreach (array_keys($mod_options) as $item) { - $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) - ? XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['link'] : $mod_options[$item]['link']; - $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' - : XOOPS_URL . "/media/xoops/images/icons/32/" . $mod_options[$item]['icon']; - } - } - $xoops->tpl->assign('mod_options', $mod_options); - $xoops->tpl->assign('modpath', $modpath); - $xoops->tpl->assign('modname', $modname); - $xoops->tpl->assign('modid', $modid); - $xoops->tpl->assign('moddir', $moddir); - - // Modules list - $module_list = $system_module->getModuleList(); - $xoops->tpl->assign('module_menu', $module_list); - unset($module_list); - - // Extensions list - $extension_list = $system_extension->getExtensionList(); - $xoops->tpl->assign('extension_menu', $extension_list); - unset($extension_list); - - $extension_mod = $system_extension->getExtension( $moddir ); - $xoops->tpl->assign('extension_mod', $extension_mod); - - // add preferences menu - $menu = array(); - - $OPT = array(); - $OPT[] = array( - 'link' => 'admin.php?fct=preferences&op=show&confcat_id=1', 'title' => _DEFAULT_GENERAL, - 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png' - ); - $OPT[] = array( - 'link' => 'admin.php?fct=preferences&op=show&confcat_id=2', 'title' => _DEFAULT_USERSETTINGS, - 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png' - ); - $OPT[] = array( - 'link' => 'admin.php?fct=preferences&op=show&confcat_id=3', 'title' => _DEFAULT_METAFOOTER, - 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png' - ); - $OPT[] = array( - 'link' => 'admin.php?fct=preferences&op=show&confcat_id=4', 'title' => _DEFAULT_CENSOR, - 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png' - ); - $OPT[] = array( - 'link' => 'admin.php?fct=preferences&op=show&confcat_id=5', 'title' => _DEFAULT_SEARCH, - 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png' - ); - $OPT[] = array( - 'link' => 'admin.php?fct=preferences&op=show&confcat_id=6', 'title' => _DEFAULT_MAILER, - 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png' - ); - $OPT[] = array( - 'link' => 'admin.php?fct=preferences&op=show&confcat_id=7', 'title' => _DEFAULT_AUTHENTICATION, - 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png' - ); - $OPT[] = array( - 'link' => 'admin.php?fct=preferences&op=showmod&mod=1', 'title' => _DEFAULT_MODULESETTINGS, - 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png' - ); - - - $menu[] = array( - 'link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences', 'title' => _DEFAULT_SYSOPTIONS, - 'absolute' => 1, 'url' => XOOPS_URL . '/modules/system/', 'options' => $OPT - ); - $menu[] = array('title' => 'separator'); - - // Module adminmenu - if ($xoops->isModule() && $xoops->module->getVar('dirname') != 'system') { - - if ($xoops->module->getInfo('system_menu')) { - //$xoops->theme->addStylesheet('modules/system/css/menu.css'); - - $xoops->module->loadAdminMenu(); - // Get menu tab handler - /* @var $menu_handler SystemMenuHandler */ - $menu_handler = $xoops->getModuleHandler('menu', 'system'); - // Define top navigation - $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=preferences&op=showmod&mod=" . $xoops->module->getVar('mid', 'e'), _AM_SYSTEM_PREF); - $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=update&module=" . $xoops->module->getVar('dirname', 'e'), _AM_SYSTEM_UPDATE); - if ($xoops->module->getInfo('blocks')) { - $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen=" . $xoops->module->getVar('mid', 'e') . "&selmod=-2&selgrp=-1&selvis=-1", _AM_SYSTEM_BLOCKS); - } - if ($xoops->module->getInfo('hasMain')) { - $menu_handler->addMenuTop(XOOPS_URL . "/modules/" . $xoops->module->getVar('dirname', 'e') . "/", _AM_SYSTEM_GOTOMODULE); - } - // Define main tab navigation - $i = 0; - $current = $i; - foreach ($xoops->module->adminmenu as $menu) { - if (stripos($_SERVER['REQUEST_URI'], $menu['link']) !== false) { - $current = $i; - } - $menu_handler->addMenuTabs( $xoops->url('modules/' . $xoops->module->getVar('dirname') . '/' . $menu['link']), $menu['title']); - $i++; - } - if ($xoops->module->getInfo('help')) { - if (stripos($_SERVER['REQUEST_URI'], 'admin/' . $xoops->module->getInfo('help')) !== false) { - $current = $i; - } - $menu_handler->addMenuTabs('../../system/help.php?mid=' . $xoops->module->getVar('mid', 's') . '&' . $xoops->module->getInfo('help'), _AM_SYSTEM_HELP); - } - - // Display navigation tabs - $xoops->tpl->assign('xo_system_menu', $menu_handler->render($current, false)); - } - } - - } -} - +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + + +/* + * Xoops Cpanel default GUI class + * + * @copyright The XOOPS project http://sf.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package system + * @usbpackage GUI + * @since 2.4 + * @author Mamba XXXXXXXXXXXXXXXXXXX + * @author Mojtabajml <jam...@gm...> + * @author Voltan <djv...@gm...> + * @author BitC3R0 <Bi...@gm...> + * @author trabis <lus...@gm...> + * @version 1.2 + * @version $Id$ + */ + +class XoopsGuiDefault +{ + + function header() + { + $xoops = Xoops::getInstance(); + $xoops->loadLanguage('admin', 'system'); + $xoops->loadLanguage('cpanel', 'system'); + $xoops->loadLanguage('modinfo', 'system'); + + $xoops->theme->addStylesheet('media/xoops/css/moduladmin.css'); + $xoops->theme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/style.css'); + $xoops->theme->addStylesheet($xoops->url('/media/bootstrap/css/xoops.bootstrap.css')); + + + $xoops->theme->addScript($xoops->url('/media/jquery/jquery.js')); + $xoops->theme->addScript($xoops->url('/media/jquery/ui/jquery.ui.js')); + $xoops->theme->addScript($xoops->url('/media/bootstrap/js/bootstrap.min.js')); + // ddsmoothmenu + $xoops->theme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/ddsmoothmenu.js'); + $xoops->theme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/tooltip.js'); + + $quick = array(); + $quick[] = array('title' => _DEFAULT_CPHOME, 'link' => XOOPS_URL . '/admin.php'); + $quick[] = array('title' => _YOURHOME, 'link' => XOOPS_URL); + $quick[] = array('title' => _DEFAULT_NEWS, 'link' => XOOPS_URL . '/admin.php?xoopsorgnews=1'); + $quick[] = array('title' => 'separator'); + $quick[] = array('title' => _LOGOUT, 'link' => XOOPS_URL . '/user.php?op=logout'); + $xoops->tpl->assign('quick_menu', $quick); + + XoopsLoad::load('module', 'system'); + XoopsLoad::load('extension', 'system'); + $system_module = new SystemModule(); + $system_extension = new SystemExtension(); + + $adminmenu = null; + include dirname(__FILE__) . '/menu.php'; + if (!$xoops->isModule() || 'system' == $xoops->module->getVar('dirname', 'n')) { + $modpath = XOOPS_URL . '/admin.php'; + $modname = _DEFAULT_SYSOPTIONS; + $modid = 1; + $moddir = 'system'; + + $mod_options = $adminmenu; + foreach (array_keys($mod_options) as $item) { + $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) + ? XOOPS_URL . '/modules/' . $moddir . '/' . $mod_options[$item]['link'] + : $mod_options[$item]['link']; + $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' + : XOOPS_ADMINTHEME_URL . '/default/' . $mod_options[$item]['icon']; + unset($mod_options[$item]['icon_small']); + } + + } else { + $moddir = $xoops->module->getVar('dirname', 'n'); + $modpath = XOOPS_URL . '/modules/' . $moddir; + $modname = $xoops->module->getVar('name'); + $modid = $xoops->module->getVar('mid'); + + $mod_options = $xoops->module->getAdminMenu(); + foreach (array_keys($mod_options) as $item) { + $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) + ? XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['link'] : $mod_options[$item]['link']; + $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' + : XOOPS_URL . "/media/xoops/images/icons/32/" . $mod_options[$item]['icon']; + } + } + $xoops->tpl->assign('mod_options', $mod_options); + $xoops->tpl->assign('modpath', $modpath); + $xoops->tpl->assign('modname', $modname); + $xoops->tpl->assign('modid', $modid); + $xoops->tpl->assign('moddir', $moddir); + + // Modules list + $module_list = $system_module->getModuleList(); + $xoops->tpl->assign('module_menu', $module_list); + unset($module_list); + + // Extensions list + $extension_list = $system_extension->getExtensionList(); + $xoops->tpl->assign('extension_menu', $extension_list); + unset($extension_list); + + $extension_mod = $system_extension->getExtension( $moddir ); + $xoops->tpl->assign('extension_mod', $extension_mod); + + // add preferences menu + $menu = array(); + + $OPT = array(); + $OPT[] = array( + 'link' => 'admin.php?fct=preferences&op=show&confcat_id=1', 'title' => _DEFAULT_GENERAL, + 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png' + ); + $OPT[] = array( + 'link' => 'admin.php?fct=preferences&op=show&confcat_id=2', 'title' => _DEFAULT_USERSETTINGS, + 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png' + ); + $OPT[] = array( + 'link' => 'admin.php?fct=preferences&op=show&confcat_id=3', 'title' => _DEFAULT_METAFOOTER, + 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png' + ); + $OPT[] = array( + 'link' => 'admin.php?fct=preferences&op=show&confcat_id=4', 'title' => _DEFAULT_CENSOR, + 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png' + ); + $OPT[] = array( + 'link' => 'admin.php?fct=preferences&op=show&confcat_id=5', 'title' => _DEFAULT_SEARCH, + 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png' + ); + $OPT[] = array( + 'link' => 'admin.php?fct=preferences&op=show&confcat_id=6', 'title' => _DEFAULT_MAILER, + 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png' + ); + $OPT[] = array( + 'link' => 'admin.php?fct=preferences&op=show&confcat_id=7', 'title' => _DEFAULT_AUTHENTICATION, + 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png' + ); + $OPT[] = array( + 'link' => 'admin.php?fct=preferences&op=showmod&mod=1', 'title' => _DEFAULT_MODULESETTINGS, + 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png' + ); + + + $menu[] = array( + 'link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences', 'title' => _DEFAULT_SYSOPTIONS, + 'absolute' => 1, 'url' => XOOPS_URL . '/modules/system/', 'options' => $OPT + ); + $menu[] = array('title' => 'separator'); + + // Module adminmenu + if ($xoops->isModule() && $xoops->module->getVar('dirname') != 'system') { + + if ($xoops->module->getInfo('system_menu')) { + //$xoops->theme->addStylesheet('modules/system/css/menu.css'); + + $xoops->module->loadAdminMenu(); + // Get menu tab handler + /* @var $menu_handler SystemMenuHandler */ + $menu_handler = $xoops->getModuleHandler('menu', 'system'); + // Define top navigation + $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=preferences&op=showmod&mod=" . $xoops->module->getVar('mid', 'e'), _AM_SYSTEM_PREF); + if ($xoops->module->getInfo('extension')) { + $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=extensions&op=update&module=" . $xoops->module->getVar('dirname', 'e'), _AM_SYSTEM_UPDATE); + } else { + $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=update&module=" . $xoops->module->getVar('dirname', 'e'), _AM_SYSTEM_UPDATE); + } + if ($xoops->module->getInfo('blocks')) { + $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen=" . $xoops->module->getVar('mid', 'e') . "&selmod=-2&selgrp=-1&selvis=-1", _AM_SYSTEM_BLOCKS); + } + if ($xoops->module->getInfo('hasMain')) { + $menu_handler->addMenuTop(XOOPS_URL . "/modules/" . $xoops->module->getVar('dirname', 'e') . "/", _AM_SYSTEM_GOTOMODULE); + } + // Define main tab navigation + $i = 0; + $current = $i; + foreach ($xoops->module->adminmenu as $menu) { + if (stripos($_SERVER['REQUEST_URI'], $menu['link']) !== false) { + $current = $i; + } + $menu_handler->addMenuTabs( $xoops->url('modules/' . $xoops->module->getVar('dirname') . '/' . $menu['link']), $menu['title']); + $i++; + } + if ($xoops->module->getInfo('help')) { + if (stripos($_SERVER['REQUEST_URI'], 'admin/' . $xoops->module->getInfo('help')) !== false) { + $current = $i; + } + $menu_handler->addMenuTabs('../../system/help.php?mid=' . $xoops->module->getVar('mid', 's') . '&' . $xoops->module->getInfo('help'), _AM_SYSTEM_HELP); + } + + // Display navigation tabs + $xoops->tpl->assign('xo_system_menu', $menu_handler->render($current, false)); + } + } + + } +} + ?> \ No newline at end of file Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php ___________________________________________________________________ Deleted: svn:eol-style - native |