ADD/FIX/CHANGE/REMOVE: スキン・テンプレート表示処理の改良

[nucleus-jp/nucleus-next.git] / nucleus / libs / ACTIONS.php

diff --git a/nucleus/libs/ACTIONS.php b/nucleus/libs/ACTIONS.php
index 9306a05..15ea24c 100644 (file)
--- a/nucleus/libs/ACTIONS.php
+++ b/nucleus/libs/ACTIONS.php
@@ -15,7 +15,7 @@
  *\r
  * @license http://nucleuscms.org/license.txt GNU General Public License\r
  * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
- * @version $Id: ACTIONS.php 1784 2012-04-22 04:28:30Z sakamocchi $\r
+ * @version $Id: ACTIONS.php 1863 2012-05-19 10:50:27Z sakamocchi $
  */\r
 \r
 class Actions extends BaseActions\r
@@ -28,9 +28,6 @@ class Actions extends BaseActions
        // generating links to items/archives/... (e.g. catid)\r
        private $linkparams;\r
        \r
-       // reference to the skin object for which a part is being parsed\r
-       private $skin;\r
-       \r
        // used when including templated forms from the include/ dir. The $formdata var\r
        // contains the values to fill out in there (assoc array name -> value)\r
        private $formdata;\r
@@ -50,7 +47,6 @@ class Actions extends BaseActions
                'archivelink',\r
                'bloglist',\r
                'category',\r
-               'charset',\r
                'loginform',\r
                'member',\r
                'nucleusbutton',\r
@@ -260,18 +256,6 @@ class Actions extends BaseActions
        }\r
        \r
        /**\r
-        * Actions::setSkin()\r
-        * Set the skin\r
-        * @param       object  $skin   an instance of Skin class\r
-        * @return      void\r
-        */\r
-       public function setSkin(&$skin)\r
-       {\r
-               $this->skin =& $skin;\r
-               return;\r
-       }\r
-       \r
-       /**\r
         * Actions::doForm()\r
         * Forms get parsedincluded now, using an extra <formdata> skinvar\r
         *\r
@@ -443,7 +427,7 @@ class Actions extends BaseActions
                }\r
                \r
                // check category name\r
-               if ( $name == 'catname' )\r
+               else if ( $name == 'catname' )
                {\r
                        $value = $blog->getCategoryIdFromName($value);\r
                        if ( $value == $catid )\r
@@ -453,7 +437,7 @@ class Actions extends BaseActions
                }\r
                \r
                // check category id\r
-               if ( ($name == 'catid') && ($value == $catid) )\r
+               else if ( ($name == 'catid') && ($value == $catid) )
                {\r
                        return $blog->isValidCategory($catid);\r
                }\r
@@ -570,8 +554,8 @@ class Actions extends BaseActions
                // TODO: Move request uri to linkparams. this is ugly. sorry for that.\r
                $startpos       = (integer) $startpos;\r
                $parsed         = parse_url(serverVar('REQUEST_URI'));\r
-               $path           = $parsed['path'];\r
-               $parsed         = $parsed['query'];\r
+               $path           = ( in_array('path', $parsed) ) ? $parsed['path'] : '';\r
+               $parsed         = ( in_array('query', $parsed) ) ? $parsed['query'] : '';\r
                $url            = '';\r
                \r
                if ( $direction == 'prev' )\r
@@ -588,7 +572,7 @@ class Actions extends BaseActions
                                {\r
                                        $url = $CONF['SearchURL'];\r
                                }\r
-                               $url .= '?' . alterQueryStr($parsed,'startpos',$startpos);\r
+                               $url .= '?' . alterQueryStr($parsed, 'startpos', $startpos);\r
                        }\r
                }\r
                else if ( $direction == 'next' )\r
@@ -1236,10 +1220,10 @@ class Actions extends BaseActions
         */\r
        public function parse_comments($template)\r
        {\r
-               global $itemid, $manager, $blog, $highlight;\r
+               global $manager, $blog, $highlight, $itemid;\r
                \r
                $template =& $manager->getTemplate($template);\r
-               $item = Item::getitem($itemid, 0, 0);\r
+               $item =& $manager->getitem($itemid, 0, 0);\r
                \r
                // create parser object & action handler\r
                $handler = new ItemActions($blog);\r
@@ -2132,7 +2116,7 @@ class Actions extends BaseActions
         */\r
        public function parse_skinname()\r
        {\r
-               echo $this->skin->getName();\r
+               echo $this->parser->skin->getName();\r
                return;\r
        }\r
        \r
@@ -2235,4 +2219,4 @@ class Actions extends BaseActions
                $this->postBlogContent('sticky',$b);\r
                return;\r
        }\r
-}
\ No newline at end of file
+}\r