Version 5.0.1

supportpal · Aug 24, 2023 · c4f7b42 · c4f7b42
1 parent 7af3dda
commit c4f7b42
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/core/addons_sidebar.twig b/core/addons_sidebar.twig
@@ -31,9 +31,11 @@
                 <a href="{{ route('core.operator.integration.index') }}">{{ Lang.choice('core.third_party_integrations', 2) }}</a>
             </li>
         {% endif %}
-        <li {% if route starts with 'report.operator.manage' %}class="sp-active"{% endif %}>
-            <a href="{{ route('report.operator.manage.index') }}">{{ Lang.choice('report.report', 2) }}</a>
-        </li>
+        {% if isModuleEnabled('Report') and auth_user().hasPermission('view.report') %}
+            <li {% if route starts with 'report.operator.manage' %}class="sp-active"{% endif %}>
+                <a href="{{ route('report.operator.manage.index') }}">{{ Lang.choice('report.report', 2) }}</a>
+            </li>
+        {% endif %}
         <li {% if route starts with 'core.operator.widget' %}class="sp-active"{% endif %}>
             <a href="{{ route('core.operator.widget.index') }}">{{ Lang.choice('core.widget', 2) }}</a>
         </li>
@@ -46,4 +48,4 @@
             </li>
         {% endif %}
     </ul>
-</div>
+</div>
diff --git a/core/forms/smtp_tab.twig b/core/forms/smtp_tab.twig
@@ -19,9 +19,8 @@
         {{ form_label('smtp_encryption', Lang.get('core.smtp_encryption')) }}
         <div class="sp-input-container">
             {{ form_select('smtp_encryption', {
-                0     : Lang.get('general.none'),
+                '0'   : Lang.get('core.starttls_or_none'),
                 'ssl' : Lang.get('core.ssl'),
-                'tls' : Lang.get('core.tls')
             }) }}
         </div>
     </div>

diff --git a/core/settings_sidebar.twig b/core/settings_sidebar.twig
@@ -87,11 +87,5 @@
                 <a href="{{ route('core.operator.widget.index') }}">{{ Lang.choice('core.widget', 2) }}</a>
             </li>
         {% endif %}
-
-        {% if auth_user().hasPermission('view.addon') %}
-            <li {% if route starts with 'report.operator.manage' or route starts with 'report.' %}class="sp-active"{% endif %}>
-                <a href="{{ route('report.operator.manage.index') }}">{{ Lang.choice('report.report', 2) }}</a>
-            </li>
-        {% endif %}
     </ul>
-</div>
+</div>