[xoops-svn] SF.net SVN: xoops:[9536] XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme. php

[<for...@us...>]

Revision: 9536
          http://xoops.svn.sourceforge.net/xoops/?rev=9536&view=rev
Author:   forxoops
Date:     2012-05-17 11:50:23 +0000 (Thu, 17 May 2012)
Log Message:
-----------
Add some new variables for theme

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php

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	2012-05-17 11:49:42 UTC (rev 9535)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme.php	2012-05-17 11:50:23 UTC (rev 9536)
@@ -125,14 +125,14 @@
         $inst->path = XOOPS_ADMINTHEME_PATH . '/' . $inst->folderName;
         $inst->url = XOOPS_ADMINTHEME_URL . '/' . $inst->folderName;
         $inst->template->assign(array(
-            'theme_path'  => $inst->path,
-            'theme_tpl'   => $inst->path . '/xotpl',
-            'theme_url'   => $inst->url,
-            'theme_img'   => $inst->url . '/img',
+            'theme_path' => $inst->path,
+            'theme_tpl' => $inst->path . '/xotpl',
+            'theme_url' => $inst->url,
+            'theme_img' => $inst->url . '/img',
             'theme_icons' => $inst->url . '/icons',
-            'theme_css'   => $inst->url . '/css',
-            'theme_js'    => $inst->url . '/js',
-            'theme_lang'  => $inst->url . '/language',
+            'theme_css' => $inst->url . '/css',
+            'theme_js' => $inst->url . '/js',
+            'theme_lang' => $inst->url . '/language',
         ));
 
         return $inst;
@@ -238,8 +238,8 @@
      * @var array
      */
     public $metas = array(
-        'meta'   => array(),
-        'link'   => array(),
+        'meta' => array(),
+        'link' => array(),
         'script' => array()
     );
 
@@ -300,31 +300,41 @@
         $this->template->currentTheme = $this;
         $this->template->assign_by_ref('xoTheme', $this);
         $this->template->assign(array(
-            'xoops_theme'      => $xoops->getConfig('theme_set'),
-            'xoops_imageurl'   => XOOPS_THEME_URL . '/' . $xoops->getConfig('theme_set') . '/',
-            'xoops_themecss'   => $xoops->getCss($xoops->getConfig('theme_set')),
+            'xoops_theme' => $xoops->getConfig('theme_set'),
+            'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoops->getConfig('theme_set') . '/',
+            'xoops_themecss' => $xoops->getCss($xoops->getConfig('theme_set')),
             'xoops_requesturi' => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
-            'xoops_sitename'   => htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES),
-            'xoops_slogan'     => htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES),
-            'xoops_dirname'    => $xoops->moduleDirname,
-            'xoops_banner'     => $this->renderBanner ? $xoops->getBanner() : ' ',
-            'xoops_pagetitle'  => $xoops->isModule() ? $xoops->module->getVar('name') : htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES)
+            'xoops_sitename' => htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES),
+            'xoops_slogan' => htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES),
+            'xoops_dirname' => $xoops->moduleDirname,
+            'xoops_banner' => $this->renderBanner ? $xoops->getBanner() : ' ',
+            'xoops_pagetitle' => $xoops->isModule() ? $xoops->module->getVar('name') : htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES)
         ));
+        $this->template->assign(array(
+            'theme_path' => $this->path,
+            'theme_tpl' => $this->path . '/xotpl',
+            'theme_url' => $this->url,
+            'theme_img' => $this->url . '/img',
+            'theme_icons' => $this->url . '/icons',
+            'theme_css' => $this->url . '/css',
+            'theme_js' => $this->url . '/js',
+            'theme_lang' => $this->url . '/language',
+        ));
 
         if ($xoops->isUser()) {
             $this->template->assign(array(
-                'xoops_isuser'     => true,
-                'xoops_avatar'     => XOOPS_UPLOAD_URL . "/" . $xoops->user->getVar('user_avatar'),
-                'xoops_userid'     => $xoops->user->getVar('uid'),
-                'xoops_uname'      => $xoops->user->getVar('uname'),
-                'xoops_name'       => $xoops->user->getVar('name'),
-                'xoops_isadmin'    => $xoops->isAdmin(),
+                'xoops_isuser' => true,
+                'xoops_avatar' => XOOPS_UPLOAD_URL . "/" . $xoops->user->getVar('user_avatar'),
+                'xoops_userid' => $xoops->user->getVar('uid'),
+                'xoops_uname' => $xoops->user->getVar('uname'),
+                'xoops_name' => $xoops->user->getVar('name'),
+                'xoops_isadmin' => $xoops->isAdmin(),
                 'xoops_usergroups' => $xoops->user->getGroups()
             ));
         } else {
             $this->template->assign(array(
-                'xoops_isuser'     => false,
-                'xoops_isadmin'    => false,
+                'xoops_isuser' => false,
+                'xoops_isadmin' => false,
                 'xoops_usergroups' => array(XOOPS_GROUP_ANONYMOUS)
             ));
         }
@@ -429,7 +439,7 @@
             $this->contentCacheId = $this->generateCacheId('page_' . substr(md5($uri), 0, 8));
             if ($this->template->is_cached($template, $this->contentCacheId)) {
                 XoopsLogger::getInstance()
-                        ->addExtra($template, sprintf('Cached (regenerates every %d seconds)', $this->contentCacheLifetime));
+                    ->addExtra($template, sprintf('Cached (regenerates every %d seconds)', $this->contentCacheLifetime));
                 $this->render(null, null, $template);
                 return true;
             }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.