fix #2046 and fix #3043 (#3047)

zikula · Aug 27, 2016 · fc3f702 · fc3f702
1 parent f4564b6
commit fc3f702
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/src/system/SecurityCenterModule/Controller/IdsLogController.php b/src/system/SecurityCenterModule/Controller/IdsLogController.php
@@ -51,7 +51,7 @@ public function viewAction(Request $request)
         }
 
         // sorting
-        $sort = $request->query->getAlpha('sort', 'date DESC');
+        $sort = $request->query->get('sort', 'date DESC');
         $sort_exp = explode(' ', $sort);
         $sortField = $sort_exp[0];
         $sortDirection = isset($sort_exp[1]) ? $sort_exp[1] : 'ASC';

diff --git a/src/system/SecurityCenterModule/Resources/views/IdsLog/export.html.twig b/src/system/SecurityCenterModule/Resources/views/IdsLog/export.html.twig
@@ -11,10 +11,12 @@
             {{ pageSetVar('title', __('Export IDS log')) }}
         </h3>
 
-        <ul class="navbar navbar-default navbar-modulelinks">
-            <li class="active"><span class="fa fa-download"> {{ __('Export IDS Log') }}</span></li>
-            <li><a href="{{ path('zikulasecuritycentermodule_idslog_purge') }}" title="{{ __('Delete the entire log') }}" class="fa fa-trash-o"> {{ __('Purge IDS Log') }}</a></li>
-        </ul>
+        <div class="navbar navbar-default navbar-modulelinks">
+            <ul class="navbar-nav">
+                <li class="active"><span class="fa fa-download"> {{ __('Export IDS Log') }}</span></li>
+                <li><a href="{{ path('zikulasecuritycentermodule_idslog_purge') }}" title="{{ __('Delete the entire log') }}" class="fa fa-trash-o"> {{ __('Purge IDS Log') }}</a></li>
+            </ul>
+        </div>
 
         {{ form_start(form) }}
         {{ form_errors(form) }}

diff --git a/src/system/SecurityCenterModule/Resources/views/IdsLog/purge.html.twig b/src/system/SecurityCenterModule/Resources/views/IdsLog/purge.html.twig
@@ -11,10 +11,12 @@
             {{ pageSetVar('title', __('Purge IDS log')) }}
         </h3>
 
-        <ul class="navbar navbar-default navbar-modulelinks">
-            <li><a href="{{ path('zikulasecuritycentermodule_idslog_export') }}" title="{{ __('Download the entire log to a csv file') }}" class="fa fa-arrow-circle-o-down"> {{ __('Export IDS Log') }}</a></li>
-            <li class="active"><span class="fa fa-trash-o"> {{ __('Purge IDS Log') }}</span></li>
-        </ul>
+        <div class="navbar navbar-default navbar-modulelinks">
+            <ul class="navbar-nav">
+                <li><a href="{{ path('zikulasecuritycentermodule_idslog_export') }}" title="{{ __('Download the entire log to a csv file') }}" class="fa fa-arrow-circle-o-down"> {{ __('Export IDS Log') }}</a></li>
+                <li class="active"><span class="fa fa-trash-o"> {{ __('Purge IDS Log') }}</span></li>
+            </ul>
+        </div>
 
         <p class="alert alert-warning">{{ __('Do you really want to delete the entire IDS log?') }}</p>
 

diff --git a/src/system/SecurityCenterModule/Resources/views/IdsLog/view.html.twig b/src/system/SecurityCenterModule/Resources/views/IdsLog/view.html.twig
@@ -7,10 +7,12 @@
             {{ pageSetVar('title', __('View IDS log')) }}
         </h3>
 
-        <ul class="navbar navbar-default navbar-modulelinks">
-            <li><a href="{{ path('zikulasecuritycentermodule_idslog_export') }}" title="{{ __('Download the entire log to a CSV file.') }}" class="fa fa-arrow-circle-o-down"> {{ __('Export IDS Log') }}</a></li>
-            <li><a href="{{ path('zikulasecuritycentermodule_idslog_purge') }}" title="{{ __('Delete the entire log.') }}" class="fa fa-trash-o"> {{ __('Purge IDS Log') }}</a></li>
-        </ul>
+        <div class="navbar navbar-default navbar-modulelinks">
+            <ul class="navbar-nav">
+                <li><a href="{{ path('zikulasecuritycentermodule_idslog_export') }}" title="{{ __('Download the entire log to a CSV file.') }}" class="fa fa-arrow-circle-o-down"> {{ __('Export IDS Log') }}</a></li>
+                <li><a href="{{ path('zikulasecuritycentermodule_idslog_purge') }}" title="{{ __('Delete the entire log.') }}" class="fa fa-trash-o"> {{ __('Purge IDS Log') }}</a></li>
+            </ul>
+        </div>
 
         {% if logEntries|length > 0 %}
             {% form_theme filterForm with [

diff --git a/src/system/ZAuthModule/Resources/views/UserAdministration/create.html.twig b/src/system/ZAuthModule/Resources/views/UserAdministration/create.html.twig
@@ -38,7 +38,7 @@
         </fieldset>
         {% set eventData = dispatchEvent(constant('Zikula\\UsersModule\\UserEvents::NEW_FORM')) %}
         {% for data in eventData %}
-            {{ data }}
+            {{ data|raw }}
         {% endfor %}
         {{ notifyDisplayHooks(constant('Zikula\\UsersModule\\Container\\HookContainer::EDIT_FORM')) }}