Merge pull request #49 from Guite/master

Added filtering for hook areas

Author: Guite

lib/EZComments/Api/User.php

@@ -63,6 +63,11 @@ public function getall($args = array())
         // object id
         if (isset($args['mod'])) {
             $whereclause[] = "$columns[modname] = '" . DataUtil::formatForStore($args['mod']) . "'";
+            if (isset($args['areaId'])) {
+                $whereclause[] = "$columns[areaid] = '" . DataUtil::formatForStore($args['areaId']) . "'";
+            } elseif (isset($args['areaid'])) {
+                $whereclause[] = "$columns[areaid] = '" . DataUtil::formatForStore($args['areaid']) . "'";
+            }
             if (isset($args['objectid'])) {
                 $whereclause[] = "$columns[objectid] = '" . DataUtil::formatForStore($args['objectid']) . "'";
             }

lib/EZComments/HookHandlers.php

@@ -32,6 +32,7 @@ public function uiView(Zikula_DisplayHook $hook)
     {
         // work out the input from the hook
         $mod = $hook->getCaller();
+        $areaId = $hook->getAreaId();
         $objectid = $hook->getId();
 
         // first check if the user is allowed to do any comments for this module/objectid
@@ -70,7 +71,7 @@ public function uiView(Zikula_DisplayHook $hook)
             $numitems = -1;
         }
 
-        $params = compact('mod', 'objectid', 'sortorder', 'status', 'numitems', 'startnum');
+        $params = compact('mod', 'areaId', 'objectid', 'sortorder', 'status', 'numitems', 'startnum');
         $items = ModUtil::apiFunc('EZComments', 'user', 'getall', $params);
 
         if ($items === false) {
@@ -88,16 +89,16 @@ public function uiView(Zikula_DisplayHook $hook)
         // create the output object
         $view = Zikula_View::getInstance('EZComments', false, null, true);
 
-        $view->assign('areaid', $hook->getAreaId());
-        $view->assign('comments', $items);
-        $view->assign('commentcount', $commentcount);
-        $view->assign('ezcomment', $ezcomment);
-        $view->assign('ezc_info', compact('mod', 'objectid', 'sortorder', 'status'));
-        $view->assign('modinfo', ModUtil::getInfo(ModUtil::getIdFromName($mod)));
-        $view->assign('msgmodule', System::getVar('messagemodule', ''));
-        $view->assign('prfmodule', System::getVar('profilemodule', ''));
-        $view->assign('allowadd', SecurityUtil::checkPermission('EZComments::', "$mod:$objectid:", ACCESS_COMMENT));
-        $view->assign('loggedin', UserUtil::isLoggedIn());
+        $view->assign('areaid', $areaId)
+             ->assign('comments', $items)
+             ->assign('commentcount', $commentcount)
+             ->assign('ezcomment', $ezcomment)
+             ->assign('ezc_info', compact('mod', 'objectid', 'sortorder', 'status'))
+             ->assign('modinfo', ModUtil::getInfo(ModUtil::getIdFromName($mod)))
+             ->assign('msgmodule', System::getVar('messagemodule', ''))
+             ->assign('prfmodule', System::getVar('profilemodule', ''))
+             ->assign('allowadd', SecurityUtil::checkPermission('EZComments::', "$mod:$objectid:", ACCESS_COMMENT))
+             ->assign('loggedin', UserUtil::isLoggedIn());
 
         $modUrl = $hook->getUrl();
         $redirect = (!is_null($modUrl)) ? $modUrl->getUrl() : '';