Completed
Push — dev ( b096af...1ea862 )
by Sarah
10s
created
views/admin/widgets/prerequisitesList.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,9 +8,12 @@
 block discarded – undo
8 8
                         <i class="fa fa-check-circle check-ok animated bounceIn"></i>
9 9
                     <?php elseif ($check['state'] == 'WARNING') : ?>
10 10
                         <i class="fa fa-exclamation-triangle check-warning animated swing"></i>
11
-                    <?php else : ?>
11
+                    <?php else {
12
+    : ?>
12 13
                         <i class="fa fa-minus-circle check-error animated wobble"></i>
13
-                    <?php endif; ?>
14
+                    <?php endif;
15
+}
16
+?>
14 17
 
15 18
                     <strong><?= $check['title']; ?></strong>
16 19
 
Please login to merge, or discard this patch.
views/admin/authentication/authentication_ldap.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,11 @@
 block discarded – undo
23 23
     <?php if ($enabled): ?>
24 24
         <?php if ($errorMessage != ""): ?>
25 25
             <div class="alert alert-danger"><?= Yii::t('AdminModule.views_setting_authentication_ldap', 'Status: Error! (Message: {message})', ['{message}' => $errorMessage]); ?></div>
26
-            <?php else: ?>
27
-            <div class="alert alert-success"><?= Yii::t('AdminModule.views_setting_authentication_ldap', 'Status: OK! ({userCount} Users)', ['{userCount}' => $userCount]); ?></div>
26
+            <?php else {
27
+    : ?>
28
+            <div class="alert alert-success"><?= Yii::t('AdminModule.views_setting_authentication_ldap', 'Status: OK! ({userCount} Users)', ['{userCount}' => $userCount]);
29
+}
30
+?></div>
28 31
             <?php endif; ?>
29 32
         <?php endif; ?>
30 33
 
Please login to merge, or discard this patch.
views/admin/module/info.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,8 +18,11 @@
 block discarded – undo
18 18
 
19 19
                     <?= \yii\helpers\Markdown::process($content); ?>
20 20
 
21
-                <?php else: ?>
22
-                    <?= $description; ?>
21
+                <?php else {
22
+    : ?>
23
+                    <?= $description;
24
+}
25
+?>
23 26
                     <br>
24 27
                     <br>
25 28
 
Please login to merge, or discard this patch.
views/admin/module/listOnline.php 1 patch
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -34,11 +34,14 @@  discard block
 block discarded – undo
34 34
                 <br><br>
35 35
             </div>
36 36
 
37
-        <?php else: ?>
37
+        <?php else {
38
+    : ?>
38 39
 
39 40
             <?php foreach ($modules as $module): ?>
40 41
                 <hr>
41
-                <div class="media <?php if (Yii::$app->moduleManager->hasModule($module['id'])): ?>module-installed<?php endif; ?>">
42
+                <div class="media <?php if (Yii::$app->moduleManager->hasModule($module['id'])): ?>module-installed<?php endif;
43
+}
44
+?>">
42 45
 
43 46
                     <?php
44 47
                     $moduleImageUrl = Yii::getAlias('@web-static/img/default_module.jpg');
@@ -82,14 +85,20 @@  discard block
 block discarded – undo
82 85
                                     <?php if (isset($module['price_eur']) && $module['price_eur'] != 0 && !$module['purchased']) : ?>
83 86
                                         <?php $checkoutUrl = str_replace('-returnToUrl-', Url::to(['/admin/module/list-purchases'], true), $module['checkoutUrl']); ?>
84 87
                                         &middot; <?= Html::a(Yii::t('AdminModule.views_module_listOnline', 'Buy (%price%)', ['%price%' => $module['price_eur'] . '&euro;']), $checkoutUrl, ['style' => 'font-weight:bold', 'target' => '_blank']); ?>
85
-                                    <?php else: ?>
86
-                                        &middot; <?= Html::a(Yii::t('AdminModule.views_module_listOnline', 'Install'), Url::to(['install', 'moduleId' => $module['id']]), ['style' => 'font-weight:bold', 'data-loader' => "modal", 'data-message' => Yii::t('AdminModule.views_module_listOnline', 'Installing module...'), 'data-method' => 'POST']); ?>
88
+                                    <?php else {
89
+    : ?>
90
+                                        &middot; <?= Html::a(Yii::t('AdminModule.views_module_listOnline', 'Install'), Url::to(['install', 'moduleId' => $module['id']]), ['style' => 'font-weight:bold', 'data-loader' => "modal", 'data-message' => Yii::t('AdminModule.views_module_listOnline', 'Installing module...'), 'data-method' => 'POST']);
91
+}
92
+?>
87 93
                                     <?php endif; ?>
88 94
                                 <?php endif; ?>
89 95
 
90
-                            <?php else : ?>
96
+                            <?php else {
97
+    : ?>
91 98
                                 &middot; <span
92
-                                    style="color:red"><?= Yii::t('AdminModule.views_module_listOnline', 'No compatible module version found!'); ?></span>
99
+                                    style="color:red"><?= Yii::t('AdminModule.views_module_listOnline', 'No compatible module version found!');
100
+}
101
+?></span>
93 102
                             <?php endif; ?>
94 103
                             &middot; <?= Html::a(Yii::t('AdminModule.views_module_listOnline', 'More info'), $module['marketplaceUrl'], ['target' => '_blank']); ?>
95 104
                             <?php if (isset($module['showDisclaimer']) && $module['showDisclaimer'] == 1): ?>
Please login to merge, or discard this patch.
views/admin/module/list.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,8 +42,11 @@
 block discarded – undo
42 42
 
43 43
                             &middot; <?= Html::a(Yii::t('AdminModule.views_module_list', 'Disable'), Url::to(['/admin/module/disable', 'moduleId' => $moduleId]), ['data-method' => 'POST', 'data-confirm' => Yii::t('AdminModule.views_module_list', 'Are you sure? *ALL* module data will be lost!')]); ?>
44 44
 
45
-                        <?php else: ?>
46
-                            &middot; <?= Html::a(Yii::t('AdminModule.views_module_list', 'Enable'), Url::to(['/admin/module/enable', 'moduleId' => $moduleId]), ['data-method' => 'POST', 'style' => 'font-weight:bold', 'data-loader' => "modal", 'data-message' => Yii::t('AdminModule.views_module_list', 'Enable module...')]); ?>
45
+                        <?php else {
46
+    : ?>
47
+                            &middot; <?= Html::a(Yii::t('AdminModule.views_module_list', 'Enable'), Url::to(['/admin/module/enable', 'moduleId' => $moduleId]), ['data-method' => 'POST', 'style' => 'font-weight:bold', 'data-loader' => "modal", 'data-message' => Yii::t('AdminModule.views_module_list', 'Enable module...')]);
48
+}
49
+?>
47 50
                         <?php endif; ?>
48 51
 
49 52
                         <?php if (Yii::$app->moduleManager->canRemoveModule($moduleId)): ?>
Please login to merge, or discard this patch.
views/widgets/logo.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,11 @@
 block discarded – undo
23 23
                  id="img-logo"/>
24 24
         </a>
25 25
         <br>
26
-    <?php else: ?>
27
-        <h1 id="app-title" class="animated fadeIn"><?php echo Html::encode(Yii::$app->name); ?></h1>
26
+    <?php else {
27
+    : ?>
28
+        <h1 id="app-title" class="animated fadeIn"><?php echo Html::encode(Yii::$app->name);
29
+}
30
+?></h1>
28 31
     <?php endif; ?>
29 32
 <?php endif; ?>
30 33
 
Please login to merge, or discard this patch.
views/widgets/modalDialog.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,12 +16,15 @@
 block discarded – undo
16 16
 
17 17
         <?php if ($dialogContent) : ?>
18 18
             <?= $dialogContent ?>
19
-        <?php else : ?>
19
+        <?php else {
20
+    : ?>
20 21
             <!-- Body -->
21 22
             <div class="<?= $bodyClass ?>">
22 23
                 <?php if ($body !== null): ?>
23 24
                     <?= $body ?>
24
-                <?php endif; ?>
25
+                <?php endif;
26
+}
27
+?>
25 28
                 <?php if ($initialLoader): ?>
26 29
                     <?php echo \humhub\widgets\LoaderWidget::widget(); ?>
27 30
                 <?php endif; ?>
Please login to merge, or discard this patch.
views/user/widgets/accountTopMenu.php 1 patch
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,18 +8,24 @@  discard block
 block discarded – undo
8 8
     <a href="#" class="btn btn-enter" data-action-click="ui.modal.load" data-action-url="<?= Url::toRoute('/user/auth/login'); ?>">
9 9
         <?php if (Yii::$app->getModule('user')->settings->get('auth.anonymousRegistration')): ?>
10 10
             <?= Yii::t('UserModule.base', 'Sign in / up'); ?>
11
-        <?php else: ?>
12
-            <?= Yii::t('UserModule.base', 'Sign in'); ?>
11
+        <?php else {
12
+    : ?>
13
+            <?= Yii::t('UserModule.base', 'Sign in');
14
+}
15
+?>
13 16
         <?php endif; ?>
14 17
     </a>
15
-<?php else: ?>
18
+<?php else {
19
+    : ?>
16 20
     <ul class="nav">
17 21
         <li class="dropdown account">
18 22
             <a href="#" id="account-dropdown-link" class="dropdown-toggle" data-toggle="dropdown">
19 23
 
20 24
                 <?php if ($this->context->showUserName): ?>
21 25
                     <div class="user-title pull-left hidden-xs">
22
-                        <strong><?= Html::encode(Yii::$app->user->getIdentity()->displayName); ?></strong><br/><span class="truncate"><?= Html::encode(Yii::$app->user->getIdentity()->profile->title); ?></span>
26
+                        <strong><?= Html::encode(Yii::$app->user->getIdentity()->displayName);
27
+}
28
+?></strong><br/><span class="truncate"><?= Html::encode(Yii::$app->user->getIdentity()->profile->title); ?></span>
23 29
                     </div>
24 30
                 <?php endif; ?>
25 31
 
@@ -34,9 +40,12 @@  discard block
 block discarded – undo
34 40
                 <?php foreach ($this->context->getItems() as $item): ?>
35 41
                     <?php if ($item['label'] == '---'): ?>
36 42
                         <li class="divider"></li>
37
-                        <?php else: ?>
43
+                        <?php else {
44
+    : ?>
38 45
                         <li>
39
-                            <a <?= isset($item['id']) ? 'id="' . $item['id'] . '"' : '' ?> href="<?= $item['url']; ?>" <?= isset($item['pjax']) && $item['pjax'] === false ? 'data-pjax-prevent' : '' ?>>
46
+                            <a <?= isset($item['id']) ? 'id="' . $item['id'] . '"' : '' ?> href="<?= $item['url'];
47
+}
48
+?>" <?= isset($item['pjax']) && $item['pjax'] === false ? 'data-pjax-prevent' : '' ?>>
40 49
                                 <?= $item['icon'] . ' ' . $item['label']; ?>
41 50
                             </a>
42 51
                         </li>
Please login to merge, or discard this patch.
views/layouts/main.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -98,8 +98,11 @@
 block discarded – undo
98 98
                             <!-- start: show content (and check, if exists a sublayout -->
99 99
                             <?php if (isset($this->context->subLayout) && $this->context->subLayout != "") : ?>
100 100
                             <?= $this->render($this->context->subLayout, array('content' => $content)); ?>
101
-                                <?php else: ?>
102
-                                <?= $content; ?>
101
+                                <?php else {
102
+    : ?>
103
+                                <?= $content;
104
+}
105
+?>
103 106
                                     <?php endif; ?>
104 107
                                     <!-- end: show content -->
105 108
 
Please login to merge, or discard this patch.