Merge branch 'skinnable-master'

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

diff --git a/nucleus/libs/COMMENTACTIONS.php b/nucleus/libs/COMMENTACTIONS.php
index b320145..8ef2afb 100644 (file)
--- a/nucleus/libs/COMMENTACTIONS.php
+++ b/nucleus/libs/COMMENTACTIONS.php
@@ -232,8 +232,13 @@ class CommentActions extends BaseActions
        public function parse_blogurl()
        {
                global $manager;
+<<<<<<< HEAD
                $blogid = getBlogIDFromItemID($this->commentsObj->itemid);
                $blog =& $manager->getBlog($blogid);
+=======
+               $item =& $manager->getItem($this->commentsObj->itemid, 1, 1);
+               $blog =& $manager->getBlog($item['blogid']);
+>>>>>>> skinnable-master
                echo $blog->getURL();
                return;
        }
@@ -537,10 +542,19 @@ class CommentActions extends BaseActions
                array_shift($params);
                
                // pass info on current item and current comment as well
+<<<<<<< HEAD
                $params = array_merge(array(&$this->currentComment), $params);
                $params = array_merge(array(&$this->commentsObj->itemActions->currentItem), $params);
                
                call_user_func_array(array(&$plugin,'doTemplateCommentsVar'), $params);
+=======
+               $target = array(&$this->currentComment);
+               $params = array_merge($target, $params);
+               $target = array(&$this->commentsObj->itemActions->currentItem);
+               $params = array_merge($target, $params);
+               
+               call_user_func_array(array($plugin,'doTemplateCommentsVar'), $params);
+>>>>>>> skinnable-master
                return;
        }
        
@@ -641,7 +655,11 @@ class CommentActions extends BaseActions
         */
        public function parse_userlinkraw()
        {
+<<<<<<< HEAD
                echo $this->currentComment['userlinkraw'];
+=======
+               echo (array_key_exists('userlinkraw', $this->currentComment) && !empty($this->currentComment['userlinkraw'])) ? $this->currentComment['userlinkraw'] : '';
+>>>>>>> skinnable-master
                return;
        }
        
@@ -705,8 +723,14 @@ class CommentActions extends BaseActions
                                $condition = ($blog && ($blog->getSetting($name) == $value));
                                break;
                        case 'itemblogsetting':
+<<<<<<< HEAD
                                $b =& $manager->getBlog(getBlogIDFromItemID($this->currentComment['itemid']));
                                $condition = ($b && ($b->getSetting($name) == $value));
+=======
+                               $item =& $manager->getItem($this->currentComment['itemid'], 1, 1);
+                               $blog =& $manager->getBlog($item['blogid']);
+                               $condition = ($blog && ($blog->getSetting($name) == $value));
+>>>>>>> skinnable-master
                                break;
                        case 'loggedin':
                                $condition = $member->isLoggedIn();
@@ -781,6 +805,7 @@ class CommentActions extends BaseActions
                        return FALSE;
                }
                
+<<<<<<< HEAD
                $mem =& $manager->getMember($this->currentComment['memberid']);
                $b =& $manager->getBlog(getBlogIDFromItemID($this->currentComment['itemid']));
                $citem =& $manager->getItem($this->currentComment['itemid'], 1, 1);
@@ -788,6 +813,15 @@ class CommentActions extends BaseActions
                // when no parameter is defined, just check if item author is current visitor
                if (($key != 'isadmin' && $key != 'name' && $key != 'isauthor' && $key != 'isonteam')) {
                        return (intval($member->getID()) > 0 && intval($member->getID()) == intval($citem['authorid']));
+=======
+               $member =& $manager->getMember($this->currentComment['memberid']);
+               $item =& $manager->getItem($this->currentComment['itemid'], 1, 1);
+               
+               // when no parameter is defined, just check if item author is current visitor
+               if ( ($key != 'isadmin' && $key != 'name' && $key != 'isauthor' && $key != 'isonteam') )
+               {
+                       return (intval($memberber->getID()) > 0 && intval($memberber->getID()) == (integer) $item['authorid']);
+>>>>>>> skinnable-master
                }
                
                // check comment author name
@@ -798,7 +832,11 @@ class CommentActions extends BaseActions
                        {
                                return FALSE;
                        }
+<<<<<<< HEAD
                        if ( $value == strtolower($mem->getDisplayName()) )
+=======
+                       if ( $value == strtolower($member->getDisplayName()) )
+>>>>>>> skinnable-master
                        {
                                return TRUE;
                        }
@@ -807,24 +845,40 @@ class CommentActions extends BaseActions
                // check if comment author is admin
                if ( $key == 'isadmin' )
                {
+<<<<<<< HEAD
                        $blogid = intval($b->getID());
                        if ( $mem->isAdmin() )
                        {
                                return TRUE;
                        }
                        return $mem->isBlogAdmin($blogid);
+=======
+                       if ( $member->isAdmin() )
+                       {
+                               return TRUE;
+                       }
+                       return $member->isBlogAdmin($item['blogid']);
+>>>>>>> skinnable-master
                }
                
                // check if comment author is item author
                if ( $key == 'isauthor' )
                {
+<<<<<<< HEAD
                        return (intval($citem['authorid']) == intval($this->currentComment['memberid']));
+=======
+                       return ((integer) $item['authorid'] == (integer) $this->currentComment['memberid']);
+>>>>>>> skinnable-master
                }
                
                // check if comment author is on team
                if ( $key == 'isonteam' )
                {
+<<<<<<< HEAD
                        return $mem->teamRights(intval($b->getID()));
+=======
+                       return $member->teamRights((integer) $item['blogid']);
+>>>>>>> skinnable-master
                }
                return FALSE;
        }
@@ -840,6 +894,7 @@ class CommentActions extends BaseActions
        private function ifItemCategory($key = '', $value = '')
        {
                global $catid, $manager;
+<<<<<<< HEAD
        
                $b =& $manager->getBlog(getBlogIDFromItemID($this->currentComment['itemid']));
                $citem =& $manager->getItem($this->currentComment['itemid'],1,1);
@@ -865,6 +920,32 @@ class CommentActions extends BaseActions
                if ( ($key == 'catid') && ($value == $icatid) )
                {
                        return $b->isValidCategory($icatid);
+=======
+               
+               $item =& $manager->getItem($this->currentComment['itemid'],1,1);
+               $blog =& $manager->getBlog($item['blogid']);
+               
+               // when no parameter is defined, just check if a category is selected
+               if ( ($key != 'catname' && $key != 'catid') || ($value == '') )
+               {
+                       return $blog->isValidCategory($item['catid']);
+               }
+               
+               // check category name
+               if ( $key == 'catname' )
+               {
+                       $value = $blog->getCategoryIdFromName($value);
+                       if ( $value == $item['catid'] )
+                       {
+                               return $blog->isValidCategory($item['catid']);
+                       }
+               }
+               
+               // check category id
+               if ( ($key == 'catid') && ($value == $item['catid']) )
+               {
+                       return $blog->isValidCategory($item['catid']);
+>>>>>>> skinnable-master
                }
                return FALSE;
        }
@@ -878,12 +959,22 @@ class CommentActions extends BaseActions
         */
        private function ifOnTeam($blogName = '')
        {
+<<<<<<< HEAD
                global $blog, $member, $manager;
                
                $b =& $manager->getBlog(getBlogIDFromItemID($this->currentComment['itemid']));
                
                // when no blog found
                if ( ($blogName == '') && (!is_object($b)) )
+=======
+               global $member, $manager;
+               
+               $item =& $manager->getItem($this->currentComment['itemid'], 1, 1);
+               $blog =& $manager->getBlog($item['blogid']);
+               
+               // when no blog found
+               if ( ($blogName == '') && !is_object($blog) )
+>>>>>>> skinnable-master
                {
                        return 0;
                }
@@ -897,7 +988,11 @@ class CommentActions extends BaseActions
                // use current blog
                if ( ($blogName == '') || !$manager->existsBlogID($blogid) )
                {
+<<<<<<< HEAD
                        $blogid = $b->getID();
+=======
+                       $blogid = $blog->getID();
+>>>>>>> skinnable-master
                }
                
                return $member->teamRights($blogid);
@@ -912,12 +1007,22 @@ class CommentActions extends BaseActions
         */
        private function ifAdmin($blogName = '')
        {
+<<<<<<< HEAD
                global $blog, $member, $manager;
                
                $b =& $manager->getBlog(getBlogIDFromItemID($this->currentComment['itemid']));
                
                // when no blog found
                if ( ($blogName == '') && (!is_object($b)) )
+=======
+               global $member, $manager;
+               
+               $item =& $manager->getItem($this->currentComment['itemid'], 1, 1);
+               $blog =& $manager->getBlog($item['blogid']);
+               
+               // when no blog found
+               if ( ($blogName == '') && !is_object($blog) )
+>>>>>>> skinnable-master
                {
                        return 0;
                }
@@ -931,7 +1036,11 @@ class CommentActions extends BaseActions
                // use current blog
                if ( ($blogName == '') || !$manager->existsBlogID($blogid) )
                {
+<<<<<<< HEAD
                        $blogid = $b->getID();
+=======
+                       $blogid = $blog->getID();
+>>>>>>> skinnable-master
                }
                
                return $member->isBlogAdmin($blogid);
@@ -1004,6 +1113,10 @@ class CommentActions 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
        }
 }