Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[7963] XoopsCore/branches/2.6.x/2.6.0/htdocs
|
From: <tr...@us...> - 2011-10-25 21:56:29
|
Revision: 7963
http://xoops.svn.sourceforge.net/xoops/?rev=7963&view=rev
Author: trabis
Date: 2011-10-25 21:56:21 +0000 (Tue, 25 Oct 2011)
Log Message:
-----------
updating system gui
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xml/rss/xmlrss2parser.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xml/xmltaghandler.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/module.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/gui.php
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/class/smarty/xoops_plugins/function.xoInboxCount.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php 2011-10-25 20:38:56 UTC (rev 7962)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php 2011-10-25 21:56:21 UTC (rev 7963)
@@ -2,28 +2,27 @@
function smarty_function_xoInboxCount($params, &$smarty)
{
- global $xoopsUser;
+ $xoops = Xoops::getInstance();
- if (!isset($xoopsUser) || !is_object($xoopsUser)) {
+ if (!$xoops->isUser()) {
return;
}
$time = time();
if (isset($_SESSION['xoops_inbox_count']) && @$_SESSION['xoops_inbox_count_expire'] > $time) {
$count = intval($_SESSION['xoops_inbox_count']);
} else {
- $pm_handler =& xoops_gethandler('privmessage');
+ $pm_handler = xoops_gethandler('privmessage');
- $xoopsPreload =& XoopsPreload::getInstance();
- $xoopsPreload->triggerEvent('core.class.smarty.xoops_plugins.xoinboxcount', array($pm_handler));
+ $xoops->preload->triggerEvent('core.class.smarty.xoops_plugins.xoinboxcount', array($pm_handler));
$criteria = new CriteriaCompo(new Criteria('read_msg', 0));
- $criteria->add(new Criteria('to_userid', $xoopsUser->getVar('uid')));
+ $criteria->add(new Criteria('to_userid', $xoops->user->getVar('uid')));
$count = intval($pm_handler->getCount($criteria));
$_SESSION['xoops_inbox_count'] = $count;
$_SESSION['xoops_inbox_count_expire'] = $time + 60;
}
- if (!@empty( $params['assign'])) {
- $smarty->assign( $params['assign'], $count );
+ if (!@empty($params['assign'])) {
+ $smarty->assign($params['assign'], $count);
} else {
echo $count;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php 2011-10-25 20:38:56 UTC (rev 7962)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php 2011-10-25 21:56:21 UTC (rev 7963)
@@ -83,7 +83,6 @@
*/
public function retrieveBlocks()
{
- $xoopsPreload = XoopsPreload::getInstance();
$xoops = Xoops::getinstance();
if ($xoops->isModule()) {
@@ -118,7 +117,7 @@
/* @var $block_handler XoopsBlockHandler */
$block_handler = xoops_getHandler('block');
$block_arr = $block_handler->getAllByGroupModule($groups, $mid, $isStart, XOOPS_BLOCK_VISIBLE);
- $xoopsPreload->triggerEvent('core.class.theme_blocks.retrieveBlocks', array(&$this, &$template, &$block_arr));
+ $xoops->preload->triggerEvent('core.class.theme_blocks.retrieveBlocks', array(&$this, &$template, &$block_arr));
foreach ($block_arr as $block) {
/* @var $block XoopsBlock */
$side = $oldzones[$block->getVar('side')];
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xml/rss/xmlrss2parser.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xml/rss/xmlrss2parser.php 2011-10-25 20:38:56 UTC (rev 7962)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xml/rss/xmlrss2parser.php 2011-10-25 21:56:21 UTC (rev 7963)
@@ -186,7 +186,7 @@
}
}
-class RssChannelHandler implements XmlTagHandler
+class RssChannelHandler extends XmlTagHandler
{
/**
* @return string
@@ -223,7 +223,7 @@
}
}
-class RssTitleHandler implements XmlTagHandler
+class RssTitleHandler extends XmlTagHandler
{
/**
* @return string
@@ -274,7 +274,7 @@
}
}
-class RssLinkHandler implements XmlTagHandler
+class RssLinkHandler extends XmlTagHandler
{
/**
* @return string
@@ -325,7 +325,7 @@
}
}
-class RssDescriptionHandler implements XmlTagHandler
+class RssDescriptionHandler extends XmlTagHandler
{
/**
* @return string
@@ -376,7 +376,7 @@
}
}
-class RssGeneratorHandler implements XmlTagHandler
+class RssGeneratorHandler extends XmlTagHandler
{
/**
@@ -422,7 +422,7 @@
}
-class RssCopyrightHandler implements XmlTagHandler
+class RssCopyrightHandler extends XmlTagHandler
{
/**
* @return string
@@ -467,7 +467,7 @@
}
-class RssNameHandler implements XmlTagHandler
+class RssNameHandler extends XmlTagHandler
{
/**
* @return string
@@ -512,7 +512,7 @@
}
-class RssManagingEditorHandler implements XmlTagHandler
+class RssManagingEditorHandler extends XmlTagHandler
{
/**
@@ -558,7 +558,7 @@
}
-class RssLanguageHandler implements XmlTagHandler
+class RssLanguageHandler extends XmlTagHandler
{
/**
@@ -604,7 +604,7 @@
}
-class RssWebMasterHandler implements XmlTagHandler
+class RssWebMasterHandler extends XmlTagHandler
{
/**
* @return string
@@ -649,7 +649,7 @@
}
-class RssDocsHandler implements XmlTagHandler
+class RssDocsHandler extends XmlTagHandler
{
/**
* @return string
@@ -694,7 +694,7 @@
}
-class RssTtlHandler implements XmlTagHandler
+class RssTtlHandler extends XmlTagHandler
{
/**
* @return string
@@ -739,7 +739,7 @@
}
-class RssTextInputHandler implements XmlTagHandler
+class RssTextInputHandler extends XmlTagHandler
{
/**
* @return string
@@ -779,7 +779,7 @@
}
-class RssLastBuildDateHandler implements XmlTagHandler
+class RssLastBuildDateHandler extends XmlTagHandler
{
/**
* @return string
@@ -824,7 +824,7 @@
}
-class RssImageHandler implements XmlTagHandler
+class RssImageHandler extends XmlTagHandler
{
/**
* @return string
@@ -862,7 +862,7 @@
}
-class RssUrlHandler implements XmlTagHandler
+class RssUrlHandler extends XmlTagHandler
{
/**
* @return string
@@ -903,7 +903,7 @@
}
-class RssWidthHandler implements XmlTagHandler
+class RssWidthHandler extends XmlTagHandler
{
/**
* @return string
@@ -944,7 +944,7 @@
}
-class RssHeightHandler implements XmlTagHandler
+class RssHeightHandler extends XmlTagHandler
{
/**
* @return string
@@ -985,7 +985,7 @@
}
-class RssItemHandler implements XmlTagHandler
+class RssItemHandler extends XmlTagHandler
{
/**
* @return string
@@ -1026,7 +1026,7 @@
}
-class RssCategoryHandler implements XmlTagHandler
+class RssCategoryHandler extends XmlTagHandler
{
/**
* @return string
@@ -1073,7 +1073,7 @@
}
-class RssCommentsHandler implements XmlTagHandler
+class RssCommentsHandler extends XmlTagHandler
{
/**
* @return string
@@ -1114,7 +1114,7 @@
}
-class RssPubDateHandler implements XmlTagHandler
+class RssPubDateHandler extends XmlTagHandler
{
/**
* @return string
@@ -1162,7 +1162,7 @@
}
-class RssGuidHandler implements XmlTagHandler
+class RssGuidHandler extends XmlTagHandler
{
/**
* @return string
@@ -1203,7 +1203,7 @@
}
-class RssAuthorHandler implements XmlTagHandler
+class RssAuthorHandler extends XmlTagHandler
{
/**
* @return string
@@ -1244,7 +1244,7 @@
}
-class RssSourceHandler implements XmlTagHandler
+class RssSourceHandler extends XmlTagHandler
{
/**
* @return string
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xml/xmltaghandler.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xml/xmltaghandler.php 2011-10-25 20:38:56 UTC (rev 7962)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xml/xmltaghandler.php 2011-10-25 21:56:21 UTC (rev 7963)
@@ -10,13 +10,13 @@
@author Ken Egervari, Remi Michalski<br>
*******************************************************************************/
-interface XmlTagHandler
+class XmlTagHandler
{
/**
* @abstract
* @return void
*/
- function getName();
+ function getName() {}
/**
* @abstract
@@ -24,14 +24,14 @@
* @param array $attributes
* @return void
*/
- function handleBeginElement(SaxParser &$parser, &$attributes);
+ function handleBeginElement(&$parser, &$attributes) {}
/**
* @abstract
* @param SaxParser $parser
* @return void
*/
- function handleEndElement(SaxParser &$parser);
+ function handleEndElement(&$parser) {}
/**
* @abstract
@@ -39,7 +39,7 @@
* @param $data
* @return void
*/
- function handleCharacterData(SaxParser &$parser, &$data);
+ function handleCharacterData(&$parser, &$data) {}
}
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php 2011-10-25 20:38:56 UTC (rev 7962)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php 2011-10-25 21:56:21 UTC (rev 7963)
@@ -155,49 +155,49 @@
static function loadCoreConfig()
{
return array(
- 'bloggerapi' => XOOPS_ROOT_PATH . '/xml/rpc/bloggerapi.php',
+ 'bloggerapi' => XOOPS_ROOT_PATH . '/class/xml/rpc/bloggerapi.php',
'criteria' => XOOPS_ROOT_PATH . '/class/criteria.php',
'criteriacompo' => XOOPS_ROOT_PATH . '/class/criteria.php',
'criteriaelement' => XOOPS_ROOT_PATH . '/class/criteria.php',
'formdhtmltextarea' => XOOPS_ROOT_PATH . '/class/xoopseditor/dhtmltextarea/dhtmltextarea.php',
'formtextarea' => XOOPS_ROOT_PATH . '/class/xoopseditor/textarea/textarea.php',
- 'metaweblogapi' => XOOPS_ROOT_PATH . '/xml/rpc/metaweblogapi.php',
- 'movabletypeapi' => XOOPS_ROOT_PATH . '/xml/rpc/movabletypeapi.php',
+ 'metaweblogapi' => XOOPS_ROOT_PATH . '/class/xml/rpc/metaweblogapi.php',
+ 'movabletypeapi' => XOOPS_ROOT_PATH . '/class/xml/rpc/movabletypeapi.php',
'mytextsanitizer' => XOOPS_ROOT_PATH . '/class/module.textsanitizer.php',
'mytextsanitizerextension' => XOOPS_ROOT_PATH . '/class/module.textsanitizer.php',
'phpmailer' => XOOPS_ROOT_PATH . '/class/mail/phpmailer/class.phpmailer.php',
- 'rssauthorhandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rsscategoryhandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rsscommentshandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rsscopyrighthandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rssdescriptionhandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rssdocshandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rssgeneratorhandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rssguidhandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rssheighthandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rssimagehandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rssitemhandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rsslanguagehandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rsslastbuilddatehandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rsslinkhandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rssmanagingeditorhandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rssnamehandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rsspubdatehandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rsssourcehandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rsstextinputhandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rsstitlehandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rssttlhandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rssurlhandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rsswebmasterhandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
- 'rsswidthhandler' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
+ 'rssauthorhandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rsscategoryhandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rsscommentshandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rsscopyrighthandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rssdescriptionhandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rssdocshandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rssgeneratorhandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rssguidhandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rssheighthandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rssimagehandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rssitemhandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rsslanguagehandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rsslastbuilddatehandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rsslinkhandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rssmanagingeditorhandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rssnamehandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rsspubdatehandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rsssourcehandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rsstextinputhandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rsstitlehandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rssttlhandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rssurlhandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rsswebmasterhandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
+ 'rsswidthhandler' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
'saxparser' => XOOPS_ROOT_PATH . '/class/xml/saxparser.php',
'smarty' => XOOPS_ROOT_PATH . '/class/smarty/Smarty.class.php',
'snoopy' => XOOPS_ROOT_PATH . '/class/snoopy.php',
'sqlutility' => XOOPS_ROOT_PATH . '/class/database/sqlutility.php',
'tar' => XOOPS_ROOT_PATH . '/class/class.tar.php',
- 'xmltaghandler' => XOOPS_ROOT_PATH . '/xml/xmltaghandler.php',
+ 'xmltaghandler' => XOOPS_ROOT_PATH . '/class/xml/xmltaghandler.php',
'xoops' => XOOPS_ROOT_PATH . '/class/xoops.php',
- 'xoopsapi' => XOOPS_ROOT_PATH . '/xml/rpc/xoopsapi.php',
+ 'xoopsapi' => XOOPS_ROOT_PATH . '/class/xml/rpc/xoopsapi.php',
'xoopsauth' => XOOPS_ROOT_PATH . '/class/auth/auth.php',
'xoopsauthfactory' => XOOPS_ROOT_PATH . '/class/auth/authfactory.php',
'xoopsauthldap' => XOOPS_ROOT_PATH . '/class/auth/auth_ldap.php',
@@ -273,22 +273,22 @@
'xoopsthemeform' => XOOPS_ROOT_PATH . '/class/xoopsform/themeform.php',
'xoopsuserutility' => XOOPS_ROOT_PATH . '/class/userutility.php',
'xoopsutility' => XOOPS_ROOT_PATH . '/class/utility/xoopsutility.php',
- 'xoopsxmlrpcapi' => XOOPS_ROOT_PATH . 'class/xml/rpc/xmlrpcapi.php',
- 'xoopsxmlrpcarray' => XOOPS_ROOT_PATH . 'class/xml/rpc/xmlrpctag.php',
- 'xoopsxmlrpcbase64'=> XOOPS_ROOT_PATH . 'class/xml/rpc/xmlrpctag.php',
- 'xoopsxmlrpcboolean' => XOOPS_ROOT_PATH . 'class/xml/rpc/xmlrpctag.php',
- 'xoopsxmlrpcdatetime' => XOOPS_ROOT_PATH . 'class/xml/rpc/xmlrpctag.php',
- 'xoopsxmlrpcdocument' => XOOPS_ROOT_PATH . 'class/xml/rpc/xmlrpctag.php',
- 'xoopsxmlrpcdouble' => XOOPS_ROOT_PATH . 'class/xml/rpc/xmlrpctag.php',
- 'xoopsxmlrpcfault' => XOOPS_ROOT_PATH . 'class/xml/rpc/xmlrpctag.php',
- 'xoopsxmlrpcint' => XOOPS_ROOT_PATH . 'class/xml/rpc/xmlrpctag.php',
- 'xoopsxmlrpcparser' => XOOPS_ROOT_PATH . 'class/xml/rpc/xmlrpcparser.php',
- 'xoopsxmlrpcrequest' => XOOPS_ROOT_PATH . 'class/xml/rpc/xmlrpctag.php',
- 'xoopsxmlrpcresponse' => XOOPS_ROOT_PATH . 'class/xml/rpc/xmlrpctag.php',
- 'xoopsxmlrpcstring' => XOOPS_ROOT_PATH . 'class/xml/rpc/xmlrpctag.php',
- 'xoopsxmlrpcstruct' => XOOPS_ROOT_PATH . 'class/xml/rpc/xmlrpctag.php',
- 'xoopsxmlrpctag' => XOOPS_ROOT_PATH . 'class/xml/rpc/xmlrpctag.php',
- 'xoopsxmlrss2parser' => XOOPS_ROOT_PATH . 'class/xml/rss/xmlrss2parser.php',
+ 'xoopsxmlrpcapi' => XOOPS_ROOT_PATH . '/class/xml/rpc/xmlrpcapi.php',
+ 'xoopsxmlrpcarray' => XOOPS_ROOT_PATH . '/class/xml/rpc/xmlrpctag.php',
+ 'xoopsxmlrpcbase64'=> XOOPS_ROOT_PATH . '/class/xml/rpc/xmlrpctag.php',
+ 'xoopsxmlrpcboolean' => XOOPS_ROOT_PATH . '/class/xml/rpc/xmlrpctag.php',
+ 'xoopsxmlrpcdatetime' => XOOPS_ROOT_PATH . '/class/xml/rpc/xmlrpctag.php',
+ 'xoopsxmlrpcdocument' => XOOPS_ROOT_PATH . '/class/xml/rpc/xmlrpctag.php',
+ 'xoopsxmlrpcdouble' => XOOPS_ROOT_PATH . '/class/xml/rpc/xmlrpctag.php',
+ 'xoopsxmlrpcfault' => XOOPS_ROOT_PATH . '/class/xml/rpc/xmlrpctag.php',
+ 'xoopsxmlrpcint' => XOOPS_ROOT_PATH . '/class/xml/rpc/xmlrpctag.php',
+ 'xoopsxmlrpcparser' => XOOPS_ROOT_PATH . '/class/xml/rpc/xmlrpcparser.php',
+ 'xoopsxmlrpcrequest' => XOOPS_ROOT_PATH . '/class/xml/rpc/xmlrpctag.php',
+ 'xoopsxmlrpcresponse' => XOOPS_ROOT_PATH . '/class/xml/rpc/xmlrpctag.php',
+ 'xoopsxmlrpcstring' => XOOPS_ROOT_PATH . '/class/xml/rpc/xmlrpctag.php',
+ 'xoopsxmlrpcstruct' => XOOPS_ROOT_PATH . '/class/xml/rpc/xmlrpctag.php',
+ 'xoopsxmlrpctag' => XOOPS_ROOT_PATH . '/class/xml/rpc/xmlrpctag.php',
+ 'xoopsxmlrss2parser' => XOOPS_ROOT_PATH . '/class/xml/rss/xmlrss2parser.php',
'xoopszipdownloader' => XOOPS_ROOT_PATH . '/class/zipdownloader.php',
'xos_opal_adminthemefactory' => XOOPS_ROOT_PATH . '/class/theme.php',
'xos_logos_pagebuilder' => XOOPS_ROOT_PATH . '/class/theme_blocks.php',
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php 2011-10-25 20:38:56 UTC (rev 7962)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php 2011-10-25 21:56:21 UTC (rev 7963)
@@ -539,9 +539,7 @@
function redirect_header($url, $time = 3, $message = '', $addredirect = true, $allowExternalLink = false)
{
$xoops = Xoops::getInstance();
- $xoopsLogger = XoopsLogger::getInstance();
- $xoopsPreload = XoopsPreload::getInstance();
- $xoopsPreload->triggerEvent('core.include.functions.redirectheader',
+ $xoops->preload->triggerEvent('core.include.functions.redirectheader',
array($url, $time, $message, $addredirect, $allowExternalLink));
if (preg_match("/[\\0-\\31]|about:|script:/i", $url)) {
@@ -565,24 +563,22 @@
$xoopsThemeFactory = new xos_opal_ThemeFactory();
$xoopsThemeFactory->allowedThemes = $xoops->config['theme_set_allowed'];
$xoopsThemeFactory->defaultTheme = $theme;
- $xoTheme = $xoopsThemeFactory->createInstance(array("plugins" => array(), "renderBanner" => false));
- $xoopsTpl = $xoTheme->template;
- $xoopsTpl->assign(array(
+ $xoops->theme = $xoopsThemeFactory->createInstance(array("plugins" => array(), "renderBanner" => false));
+ $xoops->tpl = $xoops->theme->template;
+ $xoops->tpl->assign(array(
'xoops_theme' => $theme, 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $theme . '/',
'xoops_themecss' => xoops_getcss($theme),
'xoops_requesturi' => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
'xoops_sitename' => htmlspecialchars($xoops->config['sitename'], ENT_QUOTES),
'xoops_slogan' => htmlspecialchars($xoops->config['slogan'], ENT_QUOTES),
- 'xoops_dirname' => isset($xoops->module) && is_object($xoops->module) ? $xoops->module->getVar('dirname')
- : 'system',
- 'xoops_pagetitle' => isset($xoops->module) && is_object($xoops->module) ? $xoops->module->getVar('name')
- : htmlspecialchars($xoops->config['slogan'], ENT_QUOTES)
+ 'xoops_dirname' => $xoops->isModule() ? $xoops->module->getVar('dirname') : 'system',
+ 'xoops_pagetitle' => $xoops->isModule() ? $xoops->module->getVar('name') : htmlspecialchars($xoops->config['slogan'], ENT_QUOTES)
));
if ($xoops->config['debug_mode'] == 2 && $xoops->userIsAdmin) {
- $xoopsTpl->assign('time', 300);
- $xoopsTpl->assign('xoops_logdump', $xoopsLogger->dump());
+ $xoops->tpl->assign('time', 300);
+ $xoops->tpl->assign('xoops_logdump', $xoops->logger->dump());
} else {
- $xoopsTpl->assign('time', intval($time));
+ $xoops->tpl->assign('time', intval($time));
}
if (!empty($_SERVER['REQUEST_URI']) && $addredirect && strstr($url, 'user.php')) {
if (!strstr($url, '?')) {
@@ -600,12 +596,11 @@
}
}
$url = preg_replace("/&/i", '&', htmlspecialchars($url, ENT_QUOTES));
- $xoopsTpl->assign('url', $url);
+ $xoops->tpl->assign('url', $url);
$message = trim($message) != '' ? $message : _TAKINGBACK;
- $xoopsTpl->assign('message', $message);
- $xoopsTpl->assign('lang_ifnotreload', sprintf(_IFNOTRELOAD, $url));
-
- $xoopsTpl->display('db:system_redirect.html');
+ $xoops->tpl->assign('message', $message);
+ $xoops->tpl->assign('lang_ifnotreload', sprintf(_IFNOTRELOAD, $url));
+ $xoops->tpl->display('db:system_redirect.html');
exit();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/module.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/module.php 2011-10-25 20:38:56 UTC (rev 7962)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/module.php 2011-10-25 21:56:21 UTC (rev 7963)
@@ -33,7 +33,7 @@
/**
*
- * @var string
+ * @var array
*/
public $adminmenu;
/**
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php 2011-10-25 20:38:56 UTC (rev 7962)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php 2011-10-25 21:56:21 UTC (rev 7963)
@@ -150,23 +150,23 @@
function b_system_user_show()
{
- global $xoopsUser;
- if (!is_object($xoopsUser)) {
+ $xoops = Xoops::getInstance();
+
+ if (!$xoops->isUser()) {
return false;
}
$block = array();
$block['lang_youraccount'] = _MB_SYSTEM_VACNT;
$block['lang_editaccount'] = _MB_SYSTEM_EACNT;
$block['lang_notifications'] = _MB_SYSTEM_NOTIF;
- $block['uid'] = $xoopsUser->getVar('uid');
+ $block['uid'] = $xoops->user->getVar('uid');
$block['lang_logout'] = _MB_SYSTEM_LOUT;
$criteria = new CriteriaCompo(new Criteria('read_msg', 0));
- $criteria->add(new Criteria('to_userid', $xoopsUser->getVar('uid')));
+ $criteria->add(new Criteria('to_userid', $xoops->user->getVar('uid')));
$pm_handler = xoops_gethandler('privmessage');
- $xoopsPreload = XoopsPreload::getInstance();
- $xoopsPreload->triggerEvent('system.blocks.system_blocks.usershow', array(&$pm_handler));
+ $xoops->preload->triggerEvent('system.blocks.system_blocks.usershow', array(&$pm_handler));
$block['new_messages'] = $pm_handler->getCount($criteria);
$block['lang_inbox'] = _MB_SYSTEM_INBOX;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/gui.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/gui.php 2011-10-25 20:38:56 UTC (rev 7962)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/gui.php 2011-10-25 21:56:21 UTC (rev 7963)
@@ -39,19 +39,31 @@
*/
var $xoTheme;
+ /**
+ * @param string $tpl_file
+ * @return bool
+ */
+ function header($tpl_file = '')
+ {
+ static $included = false;
+ if ($included) {
+ return false;
+ }
+ $included = true;
- function header()
- {
- global $xoops, $xoopsConfig, $xoopsModule, $xoopsUser, $xoopsOption, $xoTheme, $xoopsTpl;
+ $xoops = Xoops::getInstance();
+ if (empty($tpl_file)) {
+ $tpl_file = $xoops->option['template_main'];
+ }
+ $xoops->tpl_file = $tpl_file;
ob_start();
xoops_loadLanguage('admin', 'system');
xoops_loadLanguage('cpanel', 'system');
xoops_loadLanguage('modinfo', 'system');
- $xoopsLogger = XoopsLogger::getInstance();
- $xoopsLogger->stopTime('Module init');
- $xoopsLogger->startTime('XOOPS output init');
+ $xoops->logger->stopTime('Module init');
+ $xoops->logger->startTime('XOOPS output init');
if (!headers_sent()) {
header('Content-Type:text/html; charset=' . _CHARSET);
@@ -62,79 +74,89 @@
header("Pragma: no-cache");
}
- if (@$xoopsOption['template_main']) {
- if (false === strpos($xoopsOption['template_main'], ':')) {
- $xoopsOption['template_main'] = 'db:' . $xoopsOption['template_main'];
+ if ($xoops->tpl_file) {
+ if (false === strpos($xoops->tpl_file, ':')) {
+ $xoops->tpl_file = 'db:' . $xoops->tpl_file;
}
}
+ // for legacy support when template is sset after header.
+ $xoops->option['template_main'] = $xoops->tpl_file;
+
$adminThemeFactory = new xos_opal_AdminThemeFactory();
- $this->xoTheme = $adminThemeFactory->createInstance(array(
+ $xoops->theme = $adminThemeFactory->createInstance(array(
'folderName' => $this->foldername,
'themesPath' => 'modules/system/themes',
- 'contentTemplate' => @$xoopsOption['template_main']));
+ 'contentTemplate' => $xoops->tpl_file));
- $this->xoTheme->loadLocalization('admin');
- $this->template = $this->xoTheme->template;
+ $xoops->theme->loadLocalization('admin');
+ $xoops->tpl = $xoops->theme->template;
- $GLOBALS['xoTheme'] = $this->xoTheme;
- $GLOBALS['adminTpl'] = $this->xoTheme->template;
+ //for legacy
+ $this->xoTheme = $xoops->theme;
+ $this->template = $xoops->tpl;
- $xoopsLogger->stopTime('XOOPS output init');
- $xoopsLogger->startTime('Module display');
- $xoopsPreload = XoopsPreload::getInstance();
- $xoopsPreload->triggerEvent('system.class.gui.header');
+ $xoops->logger->stopTime('XOOPS output init');
+ $xoops->logger->startTime('Module display');
- if ( isset($xoopsModule) && $xoopsModule->getVar('dirname') == 'system' ) {
- $xoopsModule->loadAdminMenu();
+ $xoops->preload->triggerEvent('system.class.gui.header');
- foreach (array_keys($xoopsModule->adminmenu) as $item) {
- $sys_menu[$item]['link'] = XOOPS_URL . '/modules/'.$xoopsModule->getVar('dirname').'/' . $xoopsModule->adminmenu[$item]['link'];
- $GLOBALS['xoopsTpl']->append_by_ref('sys_menu', $sys_menu );
+ if ($xoops->isModule() && $xoops->module->getVar('dirname') == 'system' ) {
+ $xoops->module->loadAdminMenu();
+
+ foreach (array_keys($xoops->module->adminmenu) as $item) {
+ $sys_menu[$item]['link'] = XOOPS_URL . '/modules/'.$xoops->module->getVar('dirname').'/' . $xoops->module->adminmenu[$item]['link'];
+ $xoops->tpl->append_by_ref('sys_menu', $sys_menu);
unset($sys_menu);
}
}
// Module adminmenu
- if (isset($xoopsModule) && $xoopsModule->getVar('dirname') != 'system') {
+ if ($xoops->isModule() && $xoops->module->getVar('dirname') != 'system') {
- if ($xoopsModule->getInfo('system_menu')) {
- $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . '/modules/system/css/menu.css');
+ if ($xoops->module->getInfo('system_menu')) {
+ $xoops->theme->addStylesheet(XOOPS_URL . '/modules/system/css/menu.css');
- $xoopsModule->loadAdminMenu();
+ $xoops->module->loadAdminMenu();
// Get menu tab handler
$menu_handler = xoops_getmodulehandler('menu', 'system');
// Define top navigation
- $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=preferences&op=showmod&mod=" . $xoopsModule->getVar('mid', 'e'), _AM_SYSTEM_PREF);
- $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=update&module=" . $xoopsModule->getVar('dirname', 'e'), _AM_SYSTEM_UPDATE);
- $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen=" . $xoopsModule->getVar('mid', 'e') . "&selmod=-2&selgrp=-1&selvis=-1", _AM_SYSTEM_BLOCKS);
- $menu_handler->addMenuTop(XOOPS_URL . "/modules/" . $xoopsModule->getVar('dirname', 'e') . "/", _AM_SYSTEM_GOTOMODULE);
+ $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);
+ $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);
+ $menu_handler->addMenuTop(XOOPS_URL . "/modules/" . $xoops->module->getVar('dirname', 'e') . "/", _AM_SYSTEM_GOTOMODULE);
// Define main tab navigation
$i=0;
$current = $i;
- foreach ($xoopsModule->adminmenu as $menu) {
+ foreach ($xoops->module->adminmenu as $menu) {
if ( stripos( $_SERVER['REQUEST_URI'], $menu['link'] ) !== false ) $current = $i;
$menu_handler->addMenuTabs( $menu['link'], $menu['title']);
$i++;
}
- if ($xoopsModule->getInfo('help')) {
- if ( stripos( $_SERVER['REQUEST_URI'], 'admin/' . $xoopsModule->getInfo('help') ) !== false ) $current = $i;
- $menu_handler->addMenuTabs( '../system/help.php?mid=' . $xoopsModule->getVar('mid', 's') . '&' . $xoopsModule->getInfo('help'), _AM_SYSTEM_HELP);
+ 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
- $GLOBALS['xoopsTpl']->assign('xo_system_menu', $menu_handler->render($current, false));
+ $xoops->tpl->assign('xo_system_menu', $menu_handler->render($current, false));
}
}
+ return true;
}
+ /**
+ * @return bool
+ */
function footer()
{
- global $xoopsConfig, $xoopsOption, $xoopsTpl, $xoTheme;
+ static $included = false;
+ if ($included) {
+ return false;
+ }
+ $xoops = Xoops::getInstance();
+ $xoops->logger->stopTime('Module display');
- $xoopsLogger = XoopsLogger::getInstance();
- $xoopsLogger->stopTime('Module display');
-
if (!headers_sent()) {
header('Content-Type:text/html; charset='._CHARSET);
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -142,21 +164,19 @@
header('Pragma: no-cache');
}
- //@internal: using global $xoTheme dereferences the variable in old versions, this does not
- if (!isset($xoTheme)) $xoTheme = $GLOBALS['xoTheme'];
-
- if (isset($xoopsOption['template_main']) && $xoopsOption['template_main'] != $xoTheme->contentTemplate) {
- trigger_error("xoopsOption[template_main] should be defined before call xoops_cp_header function", E_USER_WARNING);
- if (false === strpos($xoopsOption['template_main'], ':')) {
- $xoTheme->contentTemplate = 'db:' . $xoopsOption['template_main'];
+ if (isset($xoops->option['template_main']) && $xoops->option['template_main'] != $xoops->theme->contentTemplate) {
+ trigger_error("xoopsOption[template_main] should be defined before including header.php", E_USER_WARNING);
+ if (false === strpos($xoops->tpl_file, ':')) {
+ $xoops->theme->contentTemplate = 'db:' . $xoops->tpl_file;
} else {
- $xoTheme->contentTemplate = $xoopsOption['template_main'];
+ $xoops->theme->contentTemplate = $xoops->tpl_file;
}
}
- $xoTheme->render();
- $xoopsLogger->stopTime();
+ $xoops->theme->render();
+ $xoops->logger->stopTime();
ob_end_flush();
+ return true;
}
static function validate() {}
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 2011-10-25 20:38:56 UTC (rev 7962)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php 2011-10-25 21:56:21 UTC (rev 7963)
@@ -44,10 +44,10 @@
function header()
{
parent::header();
+ $xoops = Xoops::getInstance();
+ $tpl = $xoops->tpl;
+ $xoTheme = $xoops->theme;
- global $xoopsConfig, $xoopsUser, $xoopsModule, $xoTheme, $xoopsTpl;
- $tpl = $this->template;
-
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
$xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/styleswitch.js');
$xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/formenu.js');
@@ -55,10 +55,13 @@
$xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/tooltip.js');
$xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/tabs.jquery.tools.min.js');
- $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/dark.css', array('title' => 'dark', 'media' => 'screen'));
- $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/silver.css', array('title' => 'silver', 'media' => 'screen'));
- $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/orange.css', array('title' => 'orange', 'media' => 'screen'));
- $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/style.css' );
+ $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/dark.css',
+ array('title' => 'dark', 'media' => 'screen'));
+ $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/silver.css',
+ array('title' => 'silver', 'media' => 'screen'));
+ $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/orange.css',
+ array('title' => 'orange', 'media' => 'screen'));
+ $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/style.css');
$tpl->assign('lang_cp', _CPHOME);
//start system overview
@@ -67,20 +70,20 @@
$tpl->assign('lang_mysql_version', mysql_get_server_info());
$tpl->assign('lang_server_api', PHP_SAPI);
$tpl->assign('lang_os_name', PHP_OS);
- $tpl->assign('safe_mode', ini_get( 'safe_mode' ) ? 'On' : 'Off');
- $tpl->assign('register_globals', ini_get( 'register_globals' ) ? 'On' : 'Off');
- $tpl->assign('magic_quotes_gpc', ini_get( 'magic_quotes_gpc' ) ? 'On' : 'Off');
- $tpl->assign('allow_url_fopen', ini_get( 'allow_url_fopen' ) ? 'On' : 'Off');
- $tpl->assign('fsockopen', function_exists( 'fsockopen' ) ? 'On' : 'Off');
- $tpl->assign('allow_call_time_pass_reference', ini_get( 'allow_call_time_pass_reference' ) ? 'On' : 'Off');
- $tpl->assign('post_max_size', ini_get( 'post_max_size' ));
- $tpl->assign('max_input_time', ini_get( 'max_input_time' ));
- $tpl->assign('output_buffering', ini_get( 'output_buffering' ));
- $tpl->assign('max_execution_time', ini_get( 'max_execution_time' ));
- $tpl->assign('memory_limit', ini_get( 'memory_limit' ));
- $tpl->assign('file_uploads', ini_get( 'file_uploads' ) ? 'On' : 'Off');
- $tpl->assign('upload_max_filesize', ini_get( 'upload_max_filesize' ));
- $tpl->assign('xoops_sitename', $xoopsConfig['sitename']);
+ $tpl->assign('safe_mode', ini_get('safe_mode') ? 'On' : 'Off');
+ $tpl->assign('register_globals', ini_get('register_globals') ? 'On' : 'Off');
+ $tpl->assign('magic_quotes_gpc', ini_get('magic_quotes_gpc') ? 'On' : 'Off');
+ $tpl->assign('allow_url_fopen', ini_get('allow_url_fopen') ? 'On' : 'Off');
+ $tpl->assign('fsockopen', function_exists('fsockopen') ? 'On' : 'Off');
+ $tpl->assign('allow_call_time_pass_reference', ini_get('allow_call_time_pass_reference') ? 'On' : 'Off');
+ $tpl->assign('post_max_size', ini_get('post_max_size'));
+ $tpl->assign('max_input_time', ini_get('max_input_time'));
+ $tpl->assign('output_buffering', ini_get('output_buffering'));
+ $tpl->assign('max_execution_time', ini_get('max_execution_time'));
+ $tpl->assign('memory_limit', ini_get('memory_limit'));
+ $tpl->assign('file_uploads', ini_get('file_uploads') ? 'On' : 'Off');
+ $tpl->assign('upload_max_filesize', ini_get('upload_max_filesize'));
+ $tpl->assign('xoops_sitename', $xoops->config['sitename']);
// ADD MENU *****************************************
@@ -101,7 +104,7 @@
//add SYSTEM Menu items
include dirname(__FILE__) . '/menu.php';
- if (empty($xoopsModule) || 'system' == $xoopsModule->getVar('dirname', 'n')) {
+ if (!$xoops->isModule() || 'system' == $xoops->module->getVar('dirname', 'n')) {
$modpath = XOOPS_URL . '/admin.php';
$modname = _OXYGEN_SYSOPTIONS;
$modid = 1;
@@ -109,20 +112,25 @@
$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'];
+ $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 = $xoopsModule->getVar('dirname', 'n');
+ $moddir = $xoops->module->getVar('dirname', 'n');
$modpath = XOOPS_URL . '/modules/' . $moddir;
- $modname = $xoopsModule->getVar('name');
- $modid = $xoopsModule->getVar('mid');
+ $modname = $xoops->module->getVar('name');
+ $modid = $xoops->module->getVar('mid');
- $mod_options = $xoopsModule->getAdminMenu();
+ $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 . "/modules/{$moddir}/" . $mod_options[$item]['icon'];
+ $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 . "/modules/{$moddir}/" . $mod_options[$item]['icon'];
}
}
@@ -141,91 +149,85 @@
$mods = $module_handler->getObjects($criteria);
$menu = array();
+ /* @var $moduleperm_handler XoopsGrouppermHandler*/
$moduleperm_handler = xoops_gethandler('groupperm');
foreach ($mods as $mod) {
+ /* @var $mod XoopsModule */
$rtn = array();
- $modOptions = array(); //add for sub menus
- $sadmin = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoopsUser->getGroups());
+ $modOptions = array(); //add for sub menus
+ $sadmin = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoops->user->getGroups());
if ($sadmin) {
$info = $mod->getInfo();
if (!empty($info['adminindex'])) {
- $rtn['link'] = XOOPS_URL . '/modules/'. $mod->getVar('dirname', 'n') . '/' . $info['adminindex'];
+ $rtn['link'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['adminindex'];
} else {
$rtn['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid');
}
$rtn['title'] = $mod->name();
$rtn['absolute'] = 1;
- $rtn['url'] = XOOPS_URL . '/modules/'. $mod->getVar('dirname', 'n') . '/'; //add for sub menus
- $modOptions = $mod->getAdminMenu(); //add for sub menus
- $rtn['options'] = $modOptions; //add for sub menus
+ $rtn['url'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/'; //add for sub menus
+ $modOptions = $mod->getAdminMenu(); //add for sub menus
+ $rtn['options'] = $modOptions; //add for sub menus
- if (isset($info['icon']) && $info['icon'] != '' ) {
+ if (isset($info['icon']) && $info['icon'] != '') {
$rtn['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info['icon'];
}
$menu[] = $rtn;
}
}
- $tpl->append('navitems', array('link' => XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin',
- 'text' => _AM_SYSTEM_MODULES, 'dir' => $mod->getVar('dirname', 'n'), 'menu' => $menu));
+ $tpl->append('navitems', array(
+ 'link' => XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin', 'text' => _AM_SYSTEM_MODULES,
+ 'dir' => $mod->getVar('dirname', 'n'), 'menu' => $menu
+ ));
// add preferences menu
$menu = array();
$OPT = array();
$OPT[] = array(
- 'link' => 'admin.php?fct=preferences&op=show&confcat_id=1',
- 'title' => _OXYGEN_GENERAL,
- 'absolute' => 1,
- 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png');
+ 'link' => 'admin.php?fct=preferences&op=show&confcat_id=1', 'title' => _OXYGEN_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' => _OXYGEN_USERSETTINGS,
- 'absolute' => 1,
- 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png');
+ 'link' => 'admin.php?fct=preferences&op=show&confcat_id=2', 'title' => _OXYGEN_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' => _OXYGEN_METAFOOTER,
- 'absolute' => 1,
- 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png');
+ 'link' => 'admin.php?fct=preferences&op=show&confcat_id=3', 'title' => _OXYGEN_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' => _OXYGEN_CENSOR,
- 'absolute' => 1,
- 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png');
+ 'link' => 'admin.php?fct=preferences&op=show&confcat_id=4', 'title' => _OXYGEN_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' => _OXYGEN_SEARCH,
- 'absolute' => 1,
- 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png');
+ 'link' => 'admin.php?fct=preferences&op=show&confcat_id=5', 'title' => _OXYGEN_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' => _OXYGEN_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' => _OXYGEN_AUTHENTICATION,
- 'absolute' => 1,
- 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png');
- $OPT[] = array(
- 'link' => 'admin.php?fct=preferences&op=showmod&mod=1',
- 'title' => _OXYGEN_MODULESETTINGS,
- 'absolute' => 1,
- 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png');
+ 'link' => 'admin.php?fct=preferences&op=show&confcat_id=6', 'title' => _OXYGEN_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' => _OXYGEN_AUTHENTICATION,
+ 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
+ );
+ $OPT[] = array(
+ 'link' => 'admin.php?fct=preferences&op=showmod&mod=1', 'title' => _OXYGEN_MODULESETTINGS,
+ 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
+ );
$menu[] = array(
- 'link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences',
- 'title' => _OXYGEN_SYSOPTIONS,
- 'absolute' => 1,
- 'url' => XOOPS_URL . '/modules/system/',
- 'options' => $OPT);
+ 'link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences', 'title' => _OXYGEN_SYSOPTIONS,
+ 'absolute' => 1, 'url' => XOOPS_URL . '/modules/system/', 'options' => $OPT
+ );
foreach ($mods as $mod) {
$rtn = array();
- $sadmin = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoopsUser->getGroups());
+ $sadmin = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoops->user->getGroups());
if ($sadmin && ($mod->getVar('hasnotification') || is_array($mod->getInfo('config')) || is_array($mod->getInfo('comments')))) {
$rtn['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid');
$rtn['title'] = $mod->name();
@@ -234,72 +236,69 @@
$menu[] = $rtn;
}
}
- $tpl->append('navitems', array('link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences', 'text' => _OXYGEN_SITEPREF, 'dir' => $mod->getVar('dirname', 'n'), 'menu' => $menu));
+ $tpl->append('navitems', array(
+ 'link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences', 'text' => _OXYGEN_SITEPREF,
+ 'dir' => $mod->getVar('dirname', 'n'), 'menu' => $menu
+ ));
//add OPTIONS/Links Menu Items
$menu = array();
$menu[] = array(
- 'link' => 'http://sourceforge.net/projects/xoops/',
- 'title' => _OXYGEN_XOOPSPROJECT,
- 'absolute' => 1);
+ 'link' => 'http://sourceforge.net/projects/xoops/', 'title' => _OXYGEN_XOOPSPROJECT, 'absolute' => 1
+ );
$menu[] = array(
- 'link' => 'http://xoops.org',
- 'title' => _OXYGEN_WEBSITE,
- 'absolute' => 1,
- 'icon' => XOOPS_ADMINTHEME_URL . '/default/images/xoops.png');
+ 'link' => 'http://xoops.org', 'title' => _OXYGEN_WEBSITE, 'absolute' => 1,
+ 'icon' => XOOPS_ADMINTHEME_URL . '/default/images/xoops.png'
+ );
$menu[] = array(
- 'link' => 'http://www.xoops.org/modules/repository/',
- 'title' => _OXYGEN_XOOPSMODULES,
- 'absolute' => 1,
- 'icon' => XOOPS_ADMINTHEME_URL . '/default/images/xoops.png');
+ 'link' => 'http://www.xoops.org/modules/repository/', 'title' => _OXYGEN_XOOPSMODULES, 'absolute' => 1,
+ 'icon' => XOOPS_ADMINTHEME_URL . '/default/images/xoops.png'
+ );
$menu[] = array(
- 'link' => 'http://www.xoops.org/modules/extgallery/',
- 'title' => _OXYGEN_XOOPSTHEMES,
- 'absolute' => 1,
- 'icon' => XOOPS_ADMINTHEME_URL . '/default/images/tweb.png');
+ 'link' => 'http://www.xoops.org/modules/extgallery/', 'title' => _OXYGEN_XOOPSTHEMES, 'absolute' => 1,
+ 'icon' => XOOPS_ADMINTHEME_URL . '/default/images/tweb.png'
+ );
- $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php','text' => _OXYGEN_INTERESTSITES, 'menu' => $menu));
+ $tpl->append('navitems',
+ array('link' => XOOPS_URL . '/admin.php', 'text' => _OXYGEN_INTERESTSITES, 'menu' => $menu));
//add OPTIONS/links for local support
- if (file_exists($file = XOOPS_ADMINTHEME_PATH . '/default/language/' . $xoopsConfig['language'] . '/localsupport.php' )) {
- $links = include XOOPS_ADMINTHEME_PATH . '/default/language/' . $xoopsConfig['language'] . '/localsupport.php';
- if ( count($links) > 0 ) {
- $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php','text' => _OXYGEN_LOCALSUPPORT, 'menu' => $links));
+ if (file_exists($file = XOOPS_ADMINTHEME_PATH . '/default/language/' . $xoops->config['language'] . '/localsupport.php')) {
+ $links = include $file;
+ if (count($links) > 0) {
+ $tpl->append('navitems',
+ array('link' => XOOPS_URL . '/admin.php', 'text' => _OXYGEN_LOCALSUPPORT, 'menu' => $links));
}
}
- if (is_object($xoopsModule) || !empty($_GET['xoopsorgnews'])) {
- if (is_object($xoopsModule) && file_exists($file = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->getInfo('adminmenu'))) {
+ if ($xoops->isModule() || !empty($_GET['xoopsorgnews'])) {
+ if ($xoops->isModule() && file_exists($file = XOOPS_ROOT_PATH . '/modules/' . $xoops->module->getVar('dirname') . '/' . $xoops->module->getInfo('adminmenu'))) {
include $file;
}
return;
}
- foreach ( $mods as $mod ) {
-
-
- $sadmin = $moduleperm_handler->checkRight ( 'module_admin', $mod->getVar ( 'mid' ), $xoopsUser->getGroups () );
+ foreach ($mods as $mod) {
+ $sadmin = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoops->user->getGroups());
if ($sadmin) {
- $rtn = array ();
- $info = $mod->getInfo ();
- if (! empty ( $info ['adminindex'] )) {
- $rtn ['link'] = XOOPS_URL . '/modules/' . $mod->getVar ( 'dirname', 'n' ) . '/' . $info ['adminindex'];
+ $rtn = array();
+ $info = $mod->getInfo();
+ if (!empty ($info ['adminindex'])) {
+ $rtn ['link'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info ['adminindex'];
} else {
- $rtn ['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar ( 'mid' );
+ $rtn ['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid');
}
- $rtn ['title'] = $mod->getVar ('name');
+ $rtn ['title'] = $mod->getVar('name');
$rtn ['description'] = $mod->getInfo('description');
$rtn ['absolute'] = 1;
- if (isset ( $info ['icon_big'] )) {
- $rtn ['icon'] = XOOPS_URL . '/modules/' . $mod->getVar ( 'dirname', 'n' ) . '/' . $info ['icon_big'];
- } elseif (isset ( $info ['image'] )) {
- $rtn ['icon'] = XOOPS_URL . '/modules/' . $mod->getVar ( 'dirname', 'n' ) . '/' . $info ['image'];
+ if (isset ($info ['icon_big'])) {
+ $rtn ['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info ['icon_big'];
+ } elseif (isset ($info ['image'])) {
+ $rtn ['icon'] = XOOPS_URL . '/modules/' . $mod->getVar('dirname', 'n') . '/' . $info ['image'];
}
- $tpl->append ( 'modules', $rtn );
+ $tpl->append('modules', $rtn);
}
-
-
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
