Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12152] XoopsCore/branches/2.6.x/2.6.0_alain091/ htdocs_psr
|
From: <al...@us...> - 2013-10-06 18:36:32
|
Revision: 12152
http://sourceforge.net/p/xoops/svn/12152
Author: alain91
Date: 2013-10-06 18:36:28 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
save working version
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/common.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/object.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/comments/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/images/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/logger/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/menus/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/notifications/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/page/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/pdf/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/protector/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/qrcode/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/search/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/smilies/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/extension.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/module.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/menu.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/default.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/menu.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/userconfigs/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/xlanguage/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops/Locale.php
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/common.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/common.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/common.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -269,4 +269,4 @@
//Creates 'system_modules_active' cache file if it has been deleted.
$xoops->getActiveModules();
-$xoops->preload()->triggerEvent('core.include.common.end');
+$xoopsPreload->triggerEvent('core.include.common.end');
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/object.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/object.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/object.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -676,7 +676,8 @@
*/
public function __construct(XoopsDatabase $db = null, $table = '', $className = '', $keyName = '', $identifierName = '')
{
- $db = XoopsDatabaseFactory::getDatabaseConnection();
+ if ($db == null)
+ $db = XoopsDatabaseFactory::getDatabaseConnection();
$table = $db->prefix($table);
parent::__construct($db);
$this->table = $table;
@@ -722,7 +723,7 @@
*/
public function loadHandler($name, $args = null)
{
- static $handlers;
+ static $handlers = array();
if (!isset($handlers[$name])) {
$xmf = XoopsModelFactory::getInstance();
$handlers[$name] = $xmf->loadHandler($this, $name, $args);
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -23,13 +23,13 @@
// XOOPS Physical Paths
// Physical path to the XOOPS documents (served) directory WITHOUT trailing slash
- define("XOOPS_ROOT_PATH", "D:\MesApp\EasyPHP-2.0b1\www\xoops\htdocs");
+ define("XOOPS_ROOT_PATH", "D:\MesApp\EasyPHP\www\xoops\htdocs");
// For forward compatibility
// Physical path to the XOOPS library directory WITHOUT trailing slash
- define("XOOPS_PATH", "D:\MesApp\EasyPHP-2.0b1\www\xoops\htdocs\xoops_lib");
+ define("XOOPS_PATH", "D:\MesApp\EasyPHP\www\xoops\htdocs\xoops_lib");
// Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash
- define("XOOPS_VAR_PATH", "D:\MesApp\EasyPHP-2.0b1\www\xoops\htdocs\xoops_data");
+ define("XOOPS_VAR_PATH", "D:\MesApp\EasyPHP\www\xoops\htdocs\xoops_data");
// Alias of XOOPS_PATH, for compatibility, temporary solution
define("XOOPS_TRUST_PATH", XOOPS_PATH);
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,13 +29,16 @@
*/
class AvatarsCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
- 'avatars' => $path . '/class/helper.php',
- ));
+ 'avatars' => $path . '/class/helper.php',
+ 'avatarsavatar' => $path . '/class/avatar.php',
+ 'avatarsuserlink' => $path . '/class/userlink.php',
+ ));
}
+
public static function eventCoreUserinfoButton($args)
{
$link = 'modules/avatars/editavatar.php';
@@ -44,3 +47,4 @@
$args[0][] = array( 'link' => $link, 'title' => $title, 'icon' => $icon);
}
}
+AvatarsCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -31,13 +31,17 @@
*/
class BannersCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
'banners' => $path . '/class/helper.php',
+ 'bannersbanner' => $path . '/class/banner.php',
+ 'bannersclient' => $path . '/class/bannerclient.php',
+ 'bannersrender' => $path . '/class/bannerrender.php',
));
}
+
public static function eventCoreBannerDisplay($args)
{
require_once dirname(dirname(__FILE__)) . '/class/bannerrender.php';
@@ -45,3 +49,4 @@
$args[0] = $render->displayBanner();
}
}
+BannersCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/comments/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/comments/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/comments/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -27,7 +27,7 @@
*/
class CommentsCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -84,3 +84,4 @@
}
}
}
+CommentsCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/images/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/images/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/images/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,7 +29,7 @@
*/
class ImagesCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -62,3 +62,4 @@
Xoops::getInstance()->redirect("modules/images/imagemanager.php?{$uri}", 0);
}
}
+ImagesCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/logger/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/logger/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/logger/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -30,10 +30,14 @@
{
public static $registry = array();
+ public static function initialize()
+ {
+ $path = dirname(dirname(__FILE__));
+ XoopsLoad::addMap(array('logger' => $path . '/class/logger.php'));
+ }
+
public static function eventCoreIncludeCommonStart($args)
{
- //Load may fail is cache was erased
- XoopsLoad::addMap(array('logger' => dirname(dirname(__FILE__)) . '/class/logger.php'));
Logger::getInstance()->enable();//until we get a db connection debug is enabled
Logger::getInstance()->startTime();
Logger::getInstance()->startTime('XOOPS Boot');
@@ -46,7 +50,6 @@
*/
public static function eventCoreDatabaseNoconn($args)
{
- if (!class_exists('logger')) return;
/* @var $db XoopsDatabase */
$db = $args[0];
Logger::getInstance()->addQuery('', $db->error(), $db->errno());
@@ -54,7 +57,6 @@
public static function eventCoreDatabaseNodb($args)
{
- if (!class_exists('logger')) return;
/* @var $db XoopsDatabase */
$db = $args[0];
Logger::getInstance()->addQuery('', $db->error(), $db->errno());
@@ -114,8 +116,6 @@
public static function eventCoreIncludeCommonEnd($args)
{
- XoopsLoad::addMap(array('logger' => dirname(dirname(__FILE__)) . '/class/logger.php'));
-
$logger = Logger::getInstance();
$logger->stopTime('XOOPS Boot');
$logger->startTime('Module init');
@@ -222,3 +222,4 @@
Logger::getInstance()->addExtra($args[0], $args[1]);
}
}
+LoggerCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/menus/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/menus/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/menus/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,7 +29,7 @@
*/
class MenusCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -39,3 +39,4 @@
));
}
}
+MenusCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/notifications/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/notifications/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/notifications/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -27,7 +27,7 @@
*/
class NotificationsCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -153,3 +153,4 @@
}
}
}
+NotificationsCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/page/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/page/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/page/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -24,7 +24,7 @@
class PageCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -32,3 +32,4 @@
));
}
}
+PageCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/pdf/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/pdf/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/pdf/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,9 +29,11 @@
class PdfCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize($args)
{
- XoopsLoad::addMap(array('pdf' => dirname(dirname(__FILE__)) . '/class/pdf.php'));
+ $path = dirname(dirname(__FILE__));
+ XoopsLoad::addMap(array('pdf' => $path . '/class/pdf.php'));
}
}
+PdfCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/protector/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/protector/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/protector/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -31,12 +31,7 @@
*/
class ProtectorCorePreload extends XoopsPreloadItem
{
- /**
- * @static
- *
- * @param $args
- */
- public static function eventCoreIncludeCommonStart($args)
+ public static function initialize()
{
$xoops = Xoops::getInstance();
include $xoops->path('modules/protector/include/precheck.inc.php');
@@ -78,3 +73,4 @@
}
}
}
+ProtectorCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -28,7 +28,7 @@
*/
class PublisherCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -41,3 +41,4 @@
));
}
}
+PublisherCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/qrcode/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/qrcode/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/qrcode/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,9 +29,10 @@
class QrcodeCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
XoopsLoad::addMap(array('xoops_qrcode' => dirname(dirname(__FILE__)) . '/class/xoops_qrcode.php'));
}
}
+QrcodeCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/search/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/search/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/search/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -27,7 +27,7 @@
*/
class SearchCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -35,3 +35,4 @@
));
}
}
+SearchCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/smilies/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/smilies/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/smilies/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,11 +29,12 @@
*/
class SmiliesCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
'smilies' => $path . '/class/helper.php',
+ 'smiliessmiley' => $path . '/class/smiley.php',
));
}
@@ -78,3 +79,4 @@
return true;
}
}
+SmiliesCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/extension.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/extension.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/extension.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -74,7 +74,10 @@
if (round($module->getInfo('version'), 2) != $extension->getVar('version')) {
$module->setInfo('warning_update', true);
}
- $sadmin = $moduleperm_handler->checkRight('module_admin', $module->getInfo('mid'), $xoops->user->getGroups());
+ $groups = array();
+ if (is_object($xoops->user))
+ $groups = $xoops->user->getGroups();
+ $sadmin = $moduleperm_handler->checkRight('module_admin', $module->getInfo('mid'), $groups);
if ($sadmin && ($module->getVar('hasnotification') || is_array($module->getInfo('config')) || is_array($module->getInfo('comments')))) {
$module->setInfo('link_pref', XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $module->getInfo('mid'));
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/module.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/module.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/module.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -103,8 +103,11 @@
if ($module->getVar('isactive')) {
$module->setInfo('options', $module->getAdminMenu());
}
-
- $sadmin = $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoops->user->getGroups());
+
+ $groups = array();
+ if (is_object($xoops->user))
+ $groups = $xoops->user->getGroups();
+ $sadmin = $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $groups);
if ($sadmin && ($module->getVar('hasnotification') || is_array($module->getInfo('config')) || is_array($module->getInfo('comments')))) {
$module->setInfo('link_pref', XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $module->getVar('mid'));
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/menu.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/menu.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -22,7 +22,9 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
$xoops = Xoops::getInstance();
-$groups = $xoops->user->getGroups();
+$groups = array();
+if (is_object($xoops->user))
+ $groups = $xoops->user->getGroups();
$all_ok = false;
if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/default.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/default.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/default.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -57,7 +57,7 @@
$system_module = new SystemModule();
$system_extension = new SystemExtension();
- $adminmenu = null;
+ $adminmenu = array();
include dirname(__FILE__) . '/menu.php';
if (!$xoops->isModule() || 'system' == $xoops->module->getVar('dirname', 'n')) {
$modpath = XOOPS_URL . '/admin.php';
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/menu.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/menu.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -27,7 +27,10 @@
*/
$xoops = Xoops::getInstance();
-$groups = $xoops->user->getGroups();
+$groups = array();
+if (is_object($xoops->user))
+ $groups = $xoops->user->getGroups();
+
$all_ok = false;
if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
$sysperm_handler = $xoops->getHandlerGroupperm();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/userconfigs/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/userconfigs/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/userconfigs/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,7 +29,7 @@
*/
class UserconfigsCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -46,3 +46,4 @@
}
}
}
+UserconfigsCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/xlanguage/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/xlanguage/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/xlanguage/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -27,10 +27,8 @@
*/
class XlanguageCorePreload extends XoopsPreloadItem
{
- /**
- * @param array $args
- */
- public static function eventCoreIncludeCommonEnd($args)
+
+ public static function initialize()
{
if (XoopsLoad::fileExists($hnd_file = dirname(dirname(__FILE__)) . '/api.php')) {
include_once $hnd_file;
@@ -46,3 +44,4 @@
xlanguage_select_show(explode('|', $xoops->registry()->get('XLANGUAGE_THEME_OPTIONS')));
}
}
+XlanguageCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops/Locale.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops/Locale.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops/Locale.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -50,10 +50,11 @@
/**
* @param mixed $domain string: Module dirname; global language file will be loaded if $domain is set to 'global' or not specified
+ * @param string $locale Locale to be loaded, current language content will be loaded if not specified
*
* @return boolean
*/
- public static function loadLocale($domain = 'xoops')
+ public static function loadLocale($domain = 'xoops', $locale = null)
{
$xoops = Xoops::getInstance();
// expanded domain to multiple categories, e.g. module:system, framework:filter, etc.
@@ -62,7 +63,10 @@
} else {
$path = (is_array($domain)) ? array_shift($domain) : "modules/{$domain}";
}
- $locales = self::getUserLocales();
+ if (!isset($locale))
+ $locales = self::getUserLocales();
+ else
+ $locales = array($locale);
foreach ($locales as $locale) {
$fullPath = $xoops->path("{$path}/locale/{$locale}/locale.php");
$fullPath2 = $xoops->path("{$path}/locale/{$locale}/{$locale}.php");
|
