add AdminResponse and check. refs #2112 and refs #2500

zikula · Jun 23, 2015 · f60791d · f60791d
1 parent 504bdb2
commit f60791d
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 1 deletion.
diff --git a/src/lib/Zikula/Bundle/CoreBundle/EventListener/ThemeListener.php b/src/lib/Zikula/Bundle/CoreBundle/EventListener/ThemeListener.php
@@ -16,8 +16,10 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
+use Zikula\Core\Response\AdminResponse;
 use Zikula\Core\Response\PlainResponse;
 use Zikula_View_Theme;
+use Zikula\Core\Event\GenericEvent;
 
 class ThemeListener implements EventSubscriberInterface
 {
@@ -43,7 +45,25 @@ public function onKernelResponse(FilterResponseEvent $event)
             return;
         }
 
-        Zikula_View_Theme::getInstance()->themefooter($response);
+        $themeName = '';
+        $smartyCaching = null;
+
+        /**
+         * If Response is an AdminResponse, then change theme to the requested Admin theme (if set)
+         */
+        if ($response instanceof AdminResponse) {
+            $adminTheme = \ModUtil::getVar('ZikulaAdminModule', 'admintheme');
+            if (!empty($adminTheme)) {
+                $themeInfo = \ThemeUtil::getInfo(\ThemeUtil::getIDFromName($adminTheme));
+                if ($themeInfo && $themeInfo['state'] == \ThemeUtil::STATE_ACTIVE && is_dir('themes/' . \DataUtil::formatForOS($themeInfo['directory']))) {
+                    $event = new GenericEvent(null, array('type' => 'admin-theme'), $themeInfo['name']);
+                    $themeName = \EventUtil::dispatch('user.gettheme', $event)->getData();
+                    $smartyCaching = false;
+                    $_GET['type'] = 'admin'; // required for smarty and FormUtil::getPassedValue() to use the right pagetype from pageconfigurations.ini
+                }
+            }
+        }
+        Zikula_View_Theme::getInstance($themeName, $smartyCaching)->themefooter($response);
     }
 
     public static function getSubscribedEvents()

diff --git a/src/lib/Zikula/Core/Response/AdminResponse.php b/src/lib/Zikula/Core/Response/AdminResponse.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright Zikula Foundation 2015 - Zikula Application Framework
+ *
+ * This work is contributed to the Zikula Foundation under one or more
+ * Contributor Agreements and licensed to You under the following license:
+ *
+ * @license GNU/LGPLv3 (or at your option, any later version).
+ * @package Zikula
+ * @subpackage Response
+ *
+ * Please see the NOTICE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ */
+
+namespace Zikula\Core\Response;
+
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * Admin response will override theme.
+ */
+class AdminResponse extends Response
+{
+}