Merge branch 'skinnable-master'

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

diff --git a/nucleus/libs/ACTIONS.php b/nucleus/libs/ACTIONS.php
index 37cc913..db41cfc 100644 (file)
--- a/nucleus/libs/ACTIONS.php
+++ b/nucleus/libs/ACTIONS.php
@@ -15,7 +15,11 @@
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
  * @version $Id: ACTIONS.php 1863 2012-05-19 10:50:27Z sakamocchi $
+=======
+ * @version $Id: ACTIONS.php 1886 2012-06-17 08:27:27Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 class Actions extends BaseActions
@@ -69,10 +73,17 @@ class Actions extends BaseActions
        );
        
        /**
+<<<<<<< HEAD
         * Actions::$skin_type_friendly_names
         * friendly name for wrapped page types
         */
        static public $default_skin_types = array(
+=======
+        * Actions::$normal_skin_types
+        * friendly name for wrapped page types
+        */
+       static public $normal_skin_types = array(
+>>>>>>> skinnable-master
                'index'                 => _SKIN_PART_MAIN,
                'item'                  => _SKIN_PART_ITEM,
                'archivelist'   => _SKIN_PART_ALIST,
@@ -84,15 +95,25 @@ class Actions extends BaseActions
        );
        
        /**
+<<<<<<< HEAD
         * Actions::getAvailableSkinTypes()
+=======
+        * Actions::getNormalSkinTypes()
+>>>>>>> skinnable-master
         * 
         * @static
         * @param       void
         * @return      array   list of friendly names for page actions
         */
+<<<<<<< HEAD
        static public function getAvailableSkinTypes()
        {
                return self::$default_skin_types;
+=======
+       static public function getNormalSkinTypes()
+       {
+               return self::$normal_skin_types;
+>>>>>>> skinnable-master
        }
        
        /**
@@ -405,7 +426,11 @@ class Actions extends BaseActions
                $params = func_get_args();
                array_shift($params);
                
+<<<<<<< HEAD
                return call_user_func_array(array(&$plugin, 'doIf'), $params);
+=======
+               return call_user_func_array(array($plugin, 'doIf'), $params);
+>>>>>>> skinnable-master
        }
        
        /**
@@ -552,8 +577,13 @@ class Actions extends BaseActions
                // TODO: Move request uri to linkparams. this is ugly. sorry for that.
                $startpos       = (integer) $startpos;
                $parsed         = parse_url(serverVar('REQUEST_URI'));
+<<<<<<< HEAD
                $path           = $parsed['path'];
                $parsed         = $parsed['query'];
+=======
+               $path           = ( in_array('path', $parsed) ) ? $parsed['path'] : '';
+               $parsed         = ( in_array('query', $parsed) ) ? $parsed['query'] : '';
+>>>>>>> skinnable-master
                $url            = '';
                
                if ( $direction == 'prev' )
@@ -709,7 +739,12 @@ class Actions extends BaseActions
        private function preBlogContent($type, &$blog)
        {
                global $manager;
+<<<<<<< HEAD
                $manager->notify('PreBlogContent',array('blog' => &$blog, 'type' => $type));
+=======
+               $data = array('blog' => &$blog, 'type' => $type);
+               $manager->notify('PreBlogContent', $data);
+>>>>>>> skinnable-master
                return;
        }
 
@@ -724,7 +759,12 @@ class Actions extends BaseActions
        private function postBlogContent($type, &$blog)
        {
                global $manager;
+<<<<<<< HEAD
                $manager->notify('PostBlogContent', array('blog' => &$blog, 'type' => $type));
+=======
+               $data = array('blog' => &$blog, 'type' => $type);
+               $manager->notify('PostBlogContent', $data);
+>>>>>>> skinnable-master
                return;
        }
        
@@ -813,6 +853,7 @@ class Actions extends BaseActions
         * Actions::parse_archivedate()
         * %archivedate(locale,date format)%
         * 
+<<<<<<< HEAD
         * @param       string  $locale
         * @return      void
         */
@@ -832,6 +873,15 @@ class Actions extends BaseActions
                }
                 */
                
+=======
+        * @param       deprecated      $locale 
+        * @return      void
+        */
+       public function parse_archivedate($locale='')
+       {
+               global $archive;
+               
+>>>>>>> skinnable-master
                // get archive date
                sscanf($archive,'%d-%d-%d',$y,$m,$d);
                
@@ -1042,7 +1092,12 @@ class Actions extends BaseActions
        public function parse_callback($eventName, $type)
        {
                global $manager;
+<<<<<<< HEAD
                $manager->notify($eventName, array('type' => $type));
+=======
+               $data = array('type' => $type);
+               $manager->notify($eventName, $data);
+>>>>>>> skinnable-master
                return;
        }
        
@@ -1221,7 +1276,11 @@ class Actions extends BaseActions
                global $manager, $blog, $highlight, $itemid;
                
                $template =& $manager->getTemplate($template);
+<<<<<<< HEAD
                $item =& $manager->getItem($itemid, 0, 0);
+=======
+               $item =& $manager->getitem($itemid, 0, 0);
+>>>>>>> skinnable-master
                
                // create parser object & action handler
                $handler = new ItemActions($blog);
@@ -1422,7 +1481,11 @@ class Actions extends BaseActions
        public function parse_itemtitle($format = '')
        {
                global $manager, $itemid;
+<<<<<<< HEAD
                $item =& $manager->getItem($itemid,0,0);
+=======
+               $item =& $manager->getItem($itemid, 1, 1);
+>>>>>>> skinnable-master
                
                switch ( $format )
                {
@@ -1874,7 +1937,11 @@ class Actions extends BaseActions
                // add skin type on front
                array_unshift($params, $this->skintype);
                
+<<<<<<< HEAD
                call_user_func_array(array(&$plugin,'doSkinVar'), $params);
+=======
+               call_user_func_array(array($plugin,'doSkinVar'), $params);
+>>>>>>> skinnable-master
                return;
        }
        
@@ -2204,6 +2271,7 @@ class Actions extends BaseActions
         * @param       string  $template       name of template
         * @return      void
         */
+<<<<<<< HEAD
        public function parse_sticky($itemnumber = 0, $template = '')
        {
                global $manager;
@@ -2215,6 +2283,21 @@ class Actions extends BaseActions
                $this->preBlogContent('sticky',$b);
                $this->amountfound = $b->readLogFromList($itemarray, $template);
                $this->postBlogContent('sticky',$b);
+=======
+       public function parse_sticky($itemid = 0, $template = '')
+       {
+               global $manager;
+               
+               $itemid = (integer) $itemid;
+               $itemarray = array($itemid);
+               
+               $item =& $manager->getItem($post['itemid'], 1, 1);
+               $blog =& $manager->getBlog($item['blogid']);
+               
+               $this->preBlogContent('sticky', $blog);
+               $this->amountfound = $blog->readLogFromList($itemarray, $template);
+               $this->postBlogContent('sticky', $blog);
+>>>>>>> skinnable-master
                return;
        }
 }