Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8269] XoopsCore/branches/2.6.x/2.6.0/htdocs
|
From: <tr...@us...> - 2011-11-11 19:00:10
|
Revision: 8269
http://xoops.svn.sourceforge.net/xoops/?rev=8269&view=rev
Author: trabis
Date: 2011-11-11 19:00:04 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
Changing xos_ classes to use Xoops prefix
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/logger/render.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/logger/xoopslogger.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/template.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/site-closed.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/gui.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/function.block.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/logger/render.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/logger/render.php 2011-11-11 17:02:16 UTC (rev 8268)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/logger/render.php 2011-11-11 19:00:04 UTC (rev 8269)
@@ -58,6 +58,17 @@
}
$this->addExtra(_LOGGER_INCLUDED_FILES, sprintf(_LOGGER_FILES, count(get_included_files())));
+/*
+$included_files = get_included_files();
+foreach ($included_files as $filename) {
+ $this->addExtra('files',$filename);
+}
+
+if (function_exists('memory_get_peak_usage')) {
+ $this->addExtra('Peak memory',memory_get_peak_usage());
+}
+
+*/
$memory = 0;
if (function_exists('memory_get_usage')) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/logger/xoopslogger.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/logger/xoopslogger.php 2011-11-11 17:02:16 UTC (rev 8268)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/logger/xoopslogger.php 2011-11-11 19:00:04 UTC (rev 8269)
@@ -180,7 +180,7 @@
* Log extra information
*
* @param string $name name for the entry
- * @param int $msg text message for the entry
+ * @param string $msg text message for the entry
*/
public function addExtra($name, $msg)
{
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/template.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/template.php 2011-11-11 17:02:16 UTC (rev 8268)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/template.php 2011-11-11 19:00:04 UTC (rev 8269)
@@ -33,7 +33,7 @@
class XoopsTpl extends Smarty
{
/**
- * @var xos_opal_Theme
+ * @var XoopsTheme
*/
public $currentTheme = null;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php 2011-11-11 17:02:16 UTC (rev 8268)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php 2011-11-11 19:00:04 UTC (rev 8269)
@@ -1,6 +1,6 @@
<?php
/**
- * xos_opal_Theme component class file
+ * XoopsTheme component class file
*
* 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
@@ -21,19 +21,19 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
/**
- * xos_opal_ThemeFactory
+ * XoopsThemeFactory
*
* @author Skalpa Keo
* @package xos_opal
- * @subpackage xos_opal_Theme
+ * @subpackage XoopsTheme
* @since 2.3.0
*/
-class xos_opal_ThemeFactory
+class XoopsThemeFactory
{
/**
* @var string
*/
- public $xoBundleIdentifier = 'xos_opal_ThemeFactory';
+ public $xoBundleIdentifier = 'XoopsThemeFactory';
/**
* Currently enabled themes (if empty, all the themes in themes/ are allowed)
@@ -60,7 +60,7 @@
* Instantiate the specified theme
*
* @param array $options
- * @return null|xos_opal_Theme
+ * @return null|XoopsTheme
*/
public function createInstance($options = array())
{
@@ -85,7 +85,7 @@
}
$options['path'] = XOOPS_THEME_PATH . '/' . $options['folderName'];
$inst = null;
- $inst = new xos_opal_Theme();
+ $inst = new XoopsTheme();
foreach ($options as $k => $v) {
$inst->$k = $v;
}
@@ -106,15 +106,15 @@
}
/**
- * xos_opal_AdminThemeFactory
+ * XoopsAdminThemeFactory
*
* @author Andricq Nicolas (AKA MusS)
* @author trabis
* @package xos_opal
- * @subpackage xos_opal_Theme
+ * @subpackage XoopsTheme
* @since 2.4.0
*/
-class xos_opal_AdminThemeFactory extends xos_opal_ThemeFactory
+class XoopsAdminThemeFactory extends XoopsThemeFactory
{
public function createInstance($options = array())
{
@@ -134,7 +134,7 @@
}
}
-class xos_opal_Theme
+class XoopsTheme
{
/**
* Should we render banner? Not for redirect pages or admin side
@@ -213,7 +213,7 @@
* @var array
* @access public
*/
- public $plugins = array('xos_logos_PageBuilder');
+ public $plugins = array('XoopsThemeBlocksPlugin');
/**
* @var int
@@ -345,7 +345,7 @@
// Instanciate and initialize all the theme plugins
foreach ($this->plugins as $k => $bundleId) {
if (!is_object($bundleId)) {
- /* @var $plugin xos_Opal_Plugin */
+ /* @var $plugin XoopsThemePlugin */
$plugin = new $bundleId();
$plugin->theme = $this;
$plugin->xoInit();
@@ -397,7 +397,7 @@
}
/**
- * xos_opal_Theme::checkCache()
+ * XoopsTheme::checkCache()
*
* @return bool
*/
@@ -703,7 +703,7 @@
}
/**
- * xos_opal_Theme::headContent()
+ * XoopsTheme::headContent()
*
* @param $params
* @param $content
@@ -719,7 +719,7 @@
}
/**
- * xos_opal_Theme::renderMetas()
+ * XoopsTheme::renderMetas()
*
* @param null $type
* @param bool|string $return
@@ -834,10 +834,10 @@
}
}
-abstract class xos_opal_Plugin
+abstract class XoopsThemePlugin
{
/**
- * @var xos_opal_theme
+ * @var XoopsTheme
*/
public $theme = false;
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-11-11 17:02:16 UTC (rev 8268)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php 2011-11-11 19:00:04 UTC (rev 8269)
@@ -1,6 +1,6 @@
<?php
/**
- * xos_logos_PageBuilder component class file
+ * XoopsThemeBlocksPlugin component class file
*
* 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
@@ -20,17 +20,17 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
/**
- * xos_logos_PageBuilder main class
+ * XoopsThemeBlocksPlugin main class
*
* @package xos_logos
- * @subpackage xos_logos_PageBuilder
+ * @subpackage XoopsThemeBlocksPlugin
* @author Skalpa Keo
* @since 2.3.0
*/
-class xos_logos_PageBuilder extends xos_opal_Plugin
+class XoopsThemeBlocksPlugin extends XoopsThemePlugin
{
/**
- * @var xos_opal_theme
+ * @var XoopsTheme
*/
public $theme = false;
@@ -40,7 +40,7 @@
public $blocks = array();
/**
- * xos_logos_PageBuilder::xoInit()
+ * XoopsThemeBlocksPlugin::xoInit()
*
* @return true
*/
@@ -74,7 +74,7 @@
}
/**
- * xos_logos_PageBuilder::retrieveBlocks()
+ * XoopsThemeBlocksPlugin::retrieveBlocks()
*
* @return void
*/
@@ -127,7 +127,7 @@
}
/**
- * xos_logos_PageBuilder::generateCacheId()
+ * XoopsThemeBlocksPlugin::generateCacheId()
*
* @param mixed $cache_id
* @return string
@@ -141,7 +141,7 @@
}
/**
- * xos_logos_PageBuilder::buildBlock()
+ * XoopsThemeBlocksPlugin::buildBlock()
*
* @param XoopsBlock $xobject
* @param XoopsTpl $template
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php 2011-11-11 17:02:16 UTC (rev 8268)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php 2011-11-11 19:00:04 UTC (rev 8269)
@@ -91,7 +91,7 @@
public $tpl = null;
/**
- * @var xos_opal_Theme|null
+ * @var XoopsTheme|null
*/
public $theme = null;
@@ -365,7 +365,7 @@
$this->option['template_main'] = $this->tpl_name;
$xoopsThemeFactory = null;
- $xoopsThemeFactory = new xos_opal_ThemeFactory();
+ $xoopsThemeFactory = new XoopsThemeFactory();
$xoopsThemeFactory->allowedThemes = $this->getConfig('theme_set_allowed');
$xoopsThemeFactory->defaultTheme = $this->getConfig('theme_set');
@@ -378,8 +378,8 @@
$this->theme->headContent(null, "<base href='" . XOOPS_URL . '/modules/' . $this->getConfig('startpage') . "/' />", null, null);
}
- if (@is_object($this->theme->plugins['xos_logos_PageBuilder'])) {
- $aggreg = $this->theme->plugins['xos_logos_PageBuilder'];
+ if (@is_object($this->theme->plugins['XoopsThemeBlocksPlugin'])) {
+ $aggreg = $this->theme->plugins['XoopsThemeBlocksPlugin'];
// Backward compatibility code for pre 2.0.14 themes
$this->tpl->assign_by_ref('xoops_lblocks', $aggreg->blocks['canvas_left']);
$this->tpl->assign_by_ref('xoops_rblocks', $aggreg->blocks['canvas_right']);
@@ -1264,7 +1264,7 @@
}
$xoopsThemeFactory = null;
- $xoopsThemeFactory = new xos_opal_ThemeFactory();
+ $xoopsThemeFactory = new XoopsThemeFactory();
$xoopsThemeFactory->allowedThemes = $this->getConfig('theme_set_allowed');
$xoopsThemeFactory->defaultTheme = $theme;
$this->theme = $xoopsThemeFactory->createInstance(array("plugins" => array(), "renderBanner" => false));
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-11-11 17:02:16 UTC (rev 8268)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsload.php 2011-11-11 19:00:04 UTC (rev 8269)
@@ -199,6 +199,7 @@
'tar' => XOOPS_ROOT_PATH . '/class/class.tar.php',
'xmltaghandler' => XOOPS_ROOT_PATH . '/class/xml/xmltaghandler.php',
'xoops' => XOOPS_ROOT_PATH . '/class/xoops.php',
+ 'xoopsadminthemefactory' => XOOPS_ROOT_PATH . '/class/theme.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',
@@ -327,7 +328,11 @@
'xoopssmilieshandler' => XOOPS_ROOT_PATH . '/kernel/smilies.php',
'xoopstableform' => XOOPS_ROOT_PATH . '/class/xoopsform/tableform.php',
'xoopstardownloader' => XOOPS_ROOT_PATH . '/class/tardownloader.php',
+ 'xoopstheme' => XOOPS_ROOT_PATH . '/class/theme.php',
+ 'xoopsthemeblocksplugin' => XOOPS_ROOT_PATH . '/class/theme_blocks.php',
+ 'xoopsthemefactory' => XOOPS_ROOT_PATH . '/class/theme.php',
'xoopsthemeform' => XOOPS_ROOT_PATH . '/class/xoopsform/themeform.php',
+ 'xoopsthemeplugin' => XOOPS_ROOT_PATH . '/class/theme.php',
'xoopsthemesetparser' => XOOPS_ROOT_PATH . '/class/xml/themesetparser.php',
'xoopstpl' => XOOPS_ROOT_PATH . '/class/template.php',
'xoopstplfile' => XOOPS_ROOT_PATH . '/kernel/tplfile.php',
@@ -355,11 +360,6 @@
'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',
- 'xos_opal_plugin' => XOOPS_ROOT_PATH . '/class/theme.php',
- 'xos_opal_theme' => XOOPS_ROOT_PATH . '/class/theme.php',
- 'xos_opal_themefactory' => XOOPS_ROOT_PATH . '/class/theme.php',
'zipfile' => XOOPS_ROOT_PATH . '/class/class.zipfile.php',
);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/site-closed.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/site-closed.php 2011-11-11 17:02:16 UTC (rev 8268)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/site-closed.php 2011-11-11 19:00:04 UTC (rev 8269)
@@ -39,7 +39,7 @@
if (!$allowed) {
$xoopsThemeFactory = null;
- $xoopsThemeFactory = new xos_opal_ThemeFactory();
+ $xoopsThemeFactory = new XoopsThemeFactory();
$xoopsThemeFactory->allowedThemes = $xoops->getConfig('theme_set_allowed');
$xoopsThemeFactory->defaultTheme = $xoops->getConfig('theme_set');
$xoops->theme = $xoopsThemeFactory->createInstance(array('plugins' => array()));
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-11-11 17:02:16 UTC (rev 8268)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/gui.php 2011-11-11 19:00:04 UTC (rev 8269)
@@ -87,7 +87,7 @@
// for legacy support when template is sset after header.
$xoops->option['template_main'] = $xoops->tpl_name;
- $adminThemeFactory = new xos_opal_AdminThemeFactory();
+ $adminThemeFactory = new XoopsAdminThemeFactory();
$xoops->theme = $adminThemeFactory->createInstance(array(
'folderName' => $this->foldername,
'themesPath' => 'modules/system/themes',
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/function.block.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/function.block.php 2011-11-11 17:02:16 UTC (rev 8268)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/function.block.php 2011-11-11 19:00:04 UTC (rev 8269)
@@ -79,7 +79,7 @@
}
$tpl = new XoopsTpl();
- $block_renderer = new xos_logos_PageBuilder();
+ $block_renderer = new XoopsThemeBlocksPlugin();
$block_renderer->theme = $xoops->theme;
$block = $block_renderer->buildBlock($blockObj, $tpl);
if (!$display_none) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
