zikula-modules · Kaik · Mar 8, 2017 · Feb 1, 2017 · Feb 1, 2017 · Mar 7, 2017
diff --git a/Command/mailcron.php b/Command/mailcron.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Dizkus
+ *
+ * @copyright (c) 2001-now, Dizkus Development Team
+ * @see https://github.com/zikula-modules/Dizkus
+ * @license GNU/GPL - http://www.gnu.org/copyleft/gpl.html
+ */
+
+//
+// This file was most probably called by os cron
+// If so this should be moved
+//
+
+//
+// store the absolute path to your Zikula folder here
+//
+//chdir('/opt/webdev/htdocs');
+////
+//// no changes necessary beyond this point!
+////
+//include 'lib/ZLoader.php';
+//ZLoader::register();
+//System::init();
+//$debug = $this->request->query->get('debug', $this->request->request->get('debug', 0));
+//$debug = $debug == 1 ? true : false;
+//// user userId = 2 (site owner) to avoid perm limits
+//$forums = ModUtil::apiFunc('ZikulaDizkusModule', 'forum', 'getForumIdsByPermission', array('userId' => 2));
+//if (is_array($forums) && count($forums) > 0) {
+//    echo count($forums) . ' forums read<br />';
+//    foreach ($forums as $forum) {
+//        if ($forum['externalsource'] == 1) {
+//            // Mail
+//            ModUtil::apiFunc('ZikulaDizkusModule', 'cron', 'mail', array('forum' => $forum, 'debug' => $debug));
+//        }
+//    }
+//}
diff --git a/rss2dizkus.php → Command/rss2dizkus.php b/rss2dizkus.php → Command/rss2dizkus.php
@@ -55,22 +55,23 @@
             $lastuser = $connection['coreUser']->getUid();
             $loggedin = true;
         } else {
+            //something should happend here?
         }
     } else {
         // we have been here before
         $loggedin = true;
     }
     if ($loggedin == true) {
         $rss = ModUtil::apiFunc('Feeds', 'user', 'get', [
-                    'fid' => $connection['server']]);
+            'fid' => $connection['server']]);
         if (!$rss) {
             // this feed does not exist
             die;
         }
         // Get the feed
         $dump = ModUtil::apiFunc('Feeds', 'user', 'getfeed', [
-                    'fid' => $rss['fid'],
-                    'url' => $rss['url']]);
+            'fid' => $rss['fid'],
+            'url' => $rss['url']]);
         if (!$dump) {
             // this feed does not exist
             die;
@@ -83,9 +84,10 @@
         $items = $dump['feed']->get_items();
         // See the function below...
         $insert = ModUtil::apiFunc('ZikulaDizkusModule', 'user', 'insertrss', [
-                    'items' => $items,
-                    'forum' => $forum]);
+            'items' => $items,
+            'forum' => $forum]);
         if (!$insert) {
+            // something should happend here as well
         }
     }
 }
diff --git a/Container/HookContainer.php b/Container/HookContainer.php
@@ -61,13 +61,13 @@ protected function setupHookBundles()
         $this->registerHookSubscriberBundle($bundle3);
         // Topic Provider Hooks
         $bundle5 = new ProviderBundle('ZikulaDizkusModule', self::PROVIDER_UIAREANAME, 'ui_hooks', $this->__('Dizkus topic provider hook'));
-        $bundle5->addServiceHandler('display_view', 'Zikula\DizkusModule\HookHandlers', 'uiView', 'dizkus.hooks.topic');
-        $bundle5->addServiceHandler('form_edit', 'Zikula\DizkusModule\HookHandlers', 'uiEdit', 'dizkus.hooks.topic');
-        $bundle5->addServiceHandler('form_delete', 'Zikula\DizkusModule\HookHandlers', 'uiDelete', 'dizkus.hooks.topic');
-        $bundle5->addServiceHandler('validate_edit', 'Zikula\DizkusModule\HookHandlers', 'validateEdit', 'dizkus.hooks.topic');
-        $bundle5->addServiceHandler('validate_delete', 'Zikula\DizkusModule\HookHandlers', 'validateDelete', 'dizkus.hooks.topic');
-        $bundle5->addServiceHandler('process_edit', 'Zikula\DizkusModule\HookHandlers', 'processEdit', 'dizkus.hooks.topic');
-        $bundle5->addServiceHandler('process_delete', 'Zikula\DizkusModule\HookHandlers', 'processDelete', 'dizkus.hooks.topic');
+        $bundle5->addServiceHandler('display_view', 'Zikula\DizkusModule\HookHandler\TopicHookHandler', 'uiView', 'dizkus.hooks.topic');
+        $bundle5->addServiceHandler('form_edit', 'Zikula\DizkusModule\HookHandler\TopicHookHandler', 'uiEdit', 'dizkus.hooks.topic');
+        $bundle5->addServiceHandler('form_delete', 'Zikula\DizkusModule\HookHandler\TopicHookHandler', 'uiDelete', 'dizkus.hooks.topic');
+        $bundle5->addServiceHandler('validate_edit', 'Zikula\DizkusModule\HookHandler\TopicHookHandler', 'validateEdit', 'dizkus.hooks.topic');
+        $bundle5->addServiceHandler('validate_delete', 'Zikula\DizkusModule\HookHandler\TopicHookHandler', 'validateDelete', 'dizkus.hooks.topic');
+        $bundle5->addServiceHandler('process_edit', 'Zikula\DizkusModule\HookHandler\TopicHookHandler', 'processEdit', 'dizkus.hooks.topic');
+        $bundle5->addServiceHandler('process_delete', 'Zikula\DizkusModule\HookHandler\TopicHookHandler', 'processDelete', 'dizkus.hooks.topic');
         $this->registerHookProviderBundle($bundle5);
     }
 }
diff --git a/Controller/AdminController.php b/Controller/AdminController.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Dizkus
  *
@@ -112,7 +111,7 @@ public function preferencesAction(Request $request)
         }
 
         return $this->render('@ZikulaDizkusModule/Admin/preferences.html.twig', [
-                    'form' => $form->createView(),
+            'form' => $form->createView(),
         ]);
     }
 
@@ -207,12 +206,12 @@ public function assignranksAction(Request $request)
             throw new AccessDeniedException();
         }
 
-        $page = (int)$request->query->get('page', 1);
+        $page = (int) $request->query->get('page', 1);
         $letter = $request->query->get('letter');
 
         if ($request->getMethod() == 'POST') {
             $letter = $request->request->get('letter');
-            $page = (int)$request->request->get('page', 1);
+            $page = (int) $request->request->get('page', 1);
 
             $setrank = $request->request->get('setrank');
 
@@ -226,15 +225,15 @@ public function assignranksAction(Request $request)
         $em = $this->getDoctrine()->getManager();
         $qb = $em->createQueryBuilder();
         $qb->select('u')
-                ->from('Zikula\UsersModule\Entity\UserEntity', 'u')
-                ->orderBy('u.uname', 'ASC');
+        ->from('Zikula\UsersModule\Entity\UserEntity', 'u')
+        ->orderBy('u.uname', 'ASC');
         if ($letter != '*') {
             $qb->andWhere('u.uname LIKE :letter')
-                ->setParameter('letter', strtolower($letter) . '%');
+            ->setParameter('letter', strtolower($letter) . '%');
         }
         $query = $qb->getQuery();
         $query->setFirstResult(($page - 1) * $perpage)
-            ->setMaxResults($perpage);
+        ->setMaxResults($perpage);
 
         // Paginator
         $allusers = new Paginator($query);
@@ -256,13 +255,13 @@ public function assignranksAction(Request $request)
         list($rankimages, $ranks) = $this->get('zikula_dizkus_module.rank_helper')->getAll(['ranktype' => RankEntity::TYPE_HONORARY]);
 
         return $this->render('@ZikulaDizkusModule/Admin/assignranks.html.twig', [
-                    'ranks' => $ranks,
-                    'rankimages' => $rankimages,
-                    'allusers' => $userArray,
-                    'letter' => $letter,
-                    'page' => $page,
-                    'perpage' => $perpage,
-                    'usercount' => $count
+            'ranks' => $ranks,
+            'rankimages' => $rankimages,
+            'allusers' => $userArray,
+            'letter' => $letter,
+            'page' => $page,
+            'perpage' => $perpage,
+            'usercount' => $count
         ]);
     }
 
@@ -282,8 +281,8 @@ public function treeAction()
         }
 
         return $this->render('@ZikulaDizkusModule/Admin/tree.html.twig', [
-                    'tree' => $this->getDoctrine()->getManager()->getRepository('Zikula\DizkusModule\Entity\ForumEntity')->childrenHierarchy(null, false)
-            ]);
+            'tree' => $this->getDoctrine()->getManager()->getRepository('Zikula\DizkusModule\Entity\ForumEntity')->childrenHierarchy(null, false)
+        ]);
     }
 
     /**
@@ -338,11 +337,11 @@ public function modifyForumAction(Request $request, $id = null)
         }
 
         return $this->render('@ZikulaDizkusModule/Admin/modifyforum.html.twig', [
-                    'topiccount' => $topiccount,
-                    'postcount' => $postcount,
-                    'forum' => $forum,
-                    'form' => $form->createView(),
-            ]);
+            'topiccount' => $topiccount,
+            'postcount' => $postcount,
+            'forum' => $forum,
+            'form' => $form->createView(),
+        ]);
     }
 
     /**
@@ -359,6 +358,7 @@ public function deleteforumAction(Request $request, $id = null)
         if ($id) {
             $forum = $this->getDoctrine()->getManager()->find('Zikula\DizkusModule\Entity\ForumEntity', $id);
             if ($forum) {
+                //nothing to do here? @todo rearange this if
             } else {
                 $this->addFlash('error', $this->__f('Forum with id %s not found', ['%s' => $id]), 403);
 
@@ -375,36 +375,36 @@ public function deleteforumAction(Request $request, $id = null)
 
         // @todo move to form handler
         $form = $this->createFormBuilder([])
-                ->add('action', 'choice', [
-                    'choices' => ['0' => $this->__('Remove them'),
-                                  '1' => $this->__('Move them to a new parent forum')],
-                    'multiple' => false,
-                    'expanded' => false,
-                    'required' => true])
-                ->add('destination', 'choice', [
-                    'choices' => $destinations,
-                    'choice_value' => function ($destination) {
-                        //for some reason last element is null @FIXME
-                        return $destination === null ? null : $destination->getForum_id();
-                    },
-                    'choice_label' => function ($destination) use ($forum) {
-                        $isChild = $destination->getLft() > $forum->getLft() && $destination->getRgt() < $forum->getRgt() ? ' (' . $this->__("is child forum") . ')' : '';
-                        $current = $destination->getForum_id() === $forum->getForum_id() ? ' (' . $this->__("current") . ')' : '';
-                        $locked = $destination->isLocked() ? ' (' . $this->__("is locked") . ')' : '';
-
-                        return str_repeat("--", $destination->getLvl()) . $destination->getName() . $current . $locked. $isChild;
-                    },
-                    'choice_attr' => function ($destination) use ($forum) {
-                        $isChild = $destination->getLft() > $forum->getLft() && $destination->getRgt() < $forum->getRgt() ? true : false;
-
-                        return $destination->getForum_id() === $forum->getForum_id() || $destination->isLocked() || $isChild ? ['disabled' => 'disabled'] : [];
-                    },
-                    'choices_as_values' => true,
-                    'multiple' => false,
-                    'expanded' => false,
-                    'required' => true])
-                ->add('remove', 'submit')
-                ->getForm();
+        ->add('action', 'choice', [
+            'choices' => ['0' => $this->__('Remove them'),
+                '1' => $this->__('Move them to a new parent forum')],
+            'multiple' => false,
+            'expanded' => false,
+            'required' => true])
+        ->add('destination', 'choice', [
+            'choices' => $destinations,
+            'choice_value' => function ($destination) {
+                //for some reason last element is null @FIXME
+                return $destination === null ? null : $destination->getForum_id();
+            },
+            'choice_label' => function ($destination) use ($forum) {
+                $isChild = $destination->getLft() > $forum->getLft() && $destination->getRgt() < $forum->getRgt() ? ' (' . $this->__("is child forum") . ')' : '';
+                $current = $destination->getForum_id() === $forum->getForum_id() ? ' (' . $this->__("current") . ')' : '';
+                $locked = $destination->isLocked() ? ' (' . $this->__("is locked") . ')' : '';
+
+                return str_repeat("--", $destination->getLvl()) . $destination->getName() . $current . $locked . $isChild;
+            },
+            'choice_attr' => function ($destination) use ($forum) {
+                $isChild = $destination->getLft() > $forum->getLft() && $destination->getRgt() < $forum->getRgt() ? true : false;
+
+                return $destination->getForum_id() === $forum->getForum_id() || $destination->isLocked() || $isChild ? ['disabled' => 'disabled'] : [];
+            },
+            'choices_as_values' => true,
+            'multiple' => false,
+            'expanded' => false,
+            'required' => true])
+        ->add('remove', 'submit')
+        ->getForm();
 
         $form->handleRequest($request);
 
@@ -450,9 +450,9 @@ public function deleteforumAction(Request $request, $id = null)
         }
 
         return $this->render('@ZikulaDizkusModule/Admin/deleteforum.html.twig', [
-                    'forum' => $forum,
-                    'form' => $form->createView(),
-            ]);
+            'forum' => $forum,
+            'form' => $form->createView(),
+        ]);
     }
 
     /**
@@ -496,11 +496,11 @@ public function manageSubscriptionsAction(Request $request, $uid = null)
         }
 
         return $this->render('@ZikulaDizkusModule/Admin/managesubscriptions.html.twig', [
-                    'uid' => $uid,
-                    'username' => $username,
-                    'topicsubscriptions' => $topicsubscriptions,
-                    'forumsubscriptions' => $forumsubscriptions
-            ]);
+            'uid' => $uid,
+            'username' => $username,
+            'topicsubscriptions' => $topicsubscriptions,
+            'forumsubscriptions' => $forumsubscriptions
+        ]);
     }
 
     /**
@@ -520,12 +520,10 @@ public function hookConfigAction($moduleName)
 
         $hookconfig = $this->get('zikula_extensions_module.api.variable')->get($moduleName, 'dizkushookconfig');
         // looks like module should always exist it would not be hooked
-        $module = $this->get('zikula_extensions_module.api.extension')->getModule($moduleName);
-        $moduleCapabilities = $module->getCapabilities();
-        // same hook_subscriber class should always exist right?
-        // maybe use CapabilityApi here ??
-        // $capabilities = $this->get('zikula_extensions_module.api.capability')->isCapable($moduleName, 'hook_subscriber');
-        $moduleHookContainerClass = $moduleCapabilities['hook_subscriber']['class'];
+        $module = $this->get('zikula_extensions_module.api.extension')->getModuleInstanceOrNull($moduleName);
+        $moduleHookCapable = $this->get('zikula_extensions_module.api.capability')->isCapable($moduleName, 'hook_subscriber');
+
+        $moduleHookContainerClass = $moduleHookCapable['class'];
         $moduleHookContainer = new $moduleHookContainerClass($this->get('translator.default'));
         $bindingsBetweenOwners = $this->get('hook_dispatcher')->getBindingsBetweenOwners($moduleName, $this->name);
         foreach ($bindingsBetweenOwners as $k => $binding) {
@@ -535,11 +533,11 @@ public function hookConfigAction($moduleName)
         }
 
         return $this->render('@ZikulaDizkusModule/Hook/modifyconfig.html.twig', [
-                    'areas' => $bindingsBetweenOwners,
-                    'dizkushookconfig' => $hookconfig,
-                    'activeModule' => $module,
-                    'forums' => $this->get('zikula_dizkus_module.synchronization_helper')->getParents(null, true),
-            ]);
+            'areas' => $bindingsBetweenOwners,
+            'dizkushookconfig' => $hookconfig,
+            'activeModule' => $module,
+            'forums' => $this->get('zikula_dizkus_module.forum_manager')->getParents(null, true),
+        ]);
     }
 
     /**

diff --git a/DependencyInjection/ZikulaDizkusExtension.php b/DependencyInjection/ZikulaDizkusExtension.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Dizkus.
  *
@@ -27,7 +26,7 @@ class ZikulaDizkusExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__.'/../Resources/config')));
+        $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__ . '/../Resources/config')));
 
         $loader->load('services.yml');
     }