Completed
Pull Request — dev (#76)
by Sarah
02:56 queued 32s
created
views/admin/user-profile/editCategory.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,8 +12,11 @@
 block discarded – undo
12 12
 
13 13
     <?php if (!$category->isNewRecord) : ?>
14 14
         <h4><?= Yii::t('AdminModule.views_userprofile_editCategory', 'Edit profile category'); ?></h4>
15
-    <?php else: ?>
16
-        <h4><?= Yii::t('AdminModule.views_userprofile_editCategory', 'Create new profile category'); ?></h4>
15
+    <?php else {
16
+    : ?>
17
+        <h4><?= Yii::t('AdminModule.views_userprofile_editCategory', 'Create new profile category');
18
+}
19
+?></h4>
17 20
     <?php endif; ?>
18 21
     <br>
19 22
 
Please login to merge, or discard this patch.
views/admin/group/_manageLayout.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,8 +9,11 @@
 block discarded – undo
9 9
 
10 10
     <?php if (!$group->isNewRecord) : ?>
11 11
         <h4><?= Yii::t('AdminModule.user', 'Manage group: {groupName}', ['groupName' => $group->name]); ?></h4>
12
-    <?php else: ?>
13
-        <h4><?= Yii::t('AdminModule.user', 'Add new group'); ?></h4>
12
+    <?php else {
13
+    : ?>
14
+        <h4><?= Yii::t('AdminModule.user', 'Add new group');
15
+}
16
+?></h4>
14 17
     <?php endif; ?>
15 18
 </div>
16 19
 
Please login to merge, or discard this patch.
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/space/index.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -42,8 +42,9 @@  discard block
 block discarded – undo
42 42
                 'options' => ['width' => '40px'],
43 43
                 'format' => 'raw',
44 44
                 'value' => function($data) use ($visibilities) {
45
-                    if (isset($visibilities[$data->visibility]))
46
-                        return $visibilities[$data->visibility];
45
+                    if (isset($visibilities[$data->visibility])) {
46
+                                            return $visibilities[$data->visibility];
47
+                    }
47 48
                         return Html::encode($data->visibility);
48 49
                     },
49 50
             ],
@@ -53,8 +54,9 @@  discard block
 block discarded – undo
53 54
                 'filter' => \yii\helpers\Html::activeDropDownList($searchModel, 'join_policy', array_merge(['' => ''], $joinPolicies)),
54 55
                 'format' => 'raw',
55 56
                 'value' => function($data) use ($joinPolicies) {
56
-                    if (isset($joinPolicies[$data->join_policy]))
57
-                        return $joinPolicies[$data->join_policy];
57
+                    if (isset($joinPolicies[$data->join_policy])) {
58
+                                            return $joinPolicies[$data->join_policy];
59
+                    }
58 60
                         return Html::encode($data->join_policy);
59 61
                     },
60 62
             ],
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/_header.php 1 patch
Braces   +16 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,11 +23,23 @@
 block discarded – undo
23 23
 </div>
24 24
 <div class="tab-menu">
25 25
     <ul class="nav nav-tabs" id="moduleTabs">
26
-        <li <?php if ($this->context->action->id == 'list') echo 'class="active"'; ?>><?= Html::a(Yii::t('AdminModule.views_module_header', 'Installed'), Url::to(['list'])); ?></li>
26
+        <li <?php if ($this->context->action->id == 'list') {
27
+    echo 'class="active"';
28
+}
29
+?>><?= Html::a(Yii::t('AdminModule.views_module_header', 'Installed'), Url::to(['list'])); ?></li>
27 30
         <?php if (Yii::$app->getModule('admin')->marketplaceEnabled) : ?>
28
-            <li <?php if ($this->context->action->id == 'list-online') echo 'class="active"'; ?>><?= Html::a(Yii::t('AdminModule.views_module_header', 'Browse online'), Url::to(['list-online'])); ?></li>
29
-            <li <?php if ($this->context->action->id == 'list-purchases') echo 'class="active"'; ?>><?= Html::a(Yii::t('AdminModule.views_module_header', 'Purchases'), Url::to(['list-purchases'])); ?></li>
30
-            <li <?php if ($this->context->action->id == 'list-updates') echo 'class="active"'; ?>><?= Html::a(Yii::t('AdminModule.views_module_header', 'Available updates') . $updatesBadge, Url::to(['list-updates'])); ?></li>
31
+            <li <?php if ($this->context->action->id == 'list-online') {
32
+    echo 'class="active"';
33
+}
34
+?>><?= Html::a(Yii::t('AdminModule.views_module_header', 'Browse online'), Url::to(['list-online'])); ?></li>
35
+            <li <?php if ($this->context->action->id == 'list-purchases') {
36
+    echo 'class="active"';
37
+}
38
+?>><?= Html::a(Yii::t('AdminModule.views_module_header', 'Purchases'), Url::to(['list-purchases'])); ?></li>
39
+            <li <?php if ($this->context->action->id == 'list-updates') {
40
+    echo 'class="active"';
41
+}
42
+?>><?= Html::a(Yii::t('AdminModule.views_module_header', 'Available updates') . $updatesBadge, Url::to(['list-updates'])); ?></li>
31 43
         <?php endif; ?>
32 44
     </ul>
33 45
 </div>
Please login to merge, or discard this patch.
views/admin/module/listPurchases.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,8 @@  discard block
 block discarded – undo
35 35
                 <br><br>
36 36
             </div>
37 37
 
38
-        <?php else: ?>
38
+        <?php else {
39
+    : ?>
39 40
 
40 41
 
41 42
             <?php foreach ($modules as $module): ?>
@@ -44,6 +45,7 @@  discard block
 block discarded – undo
44 45
 
45 46
                     <?php
46 47
                     $moduleImageUrl = Yii::getAlias('@web-static/img/default_module.jpg');
48
+}
47 49
                     if (isset($module['moduleImageUrl']) && $module['moduleImageUrl'] != "") {
48 50
                         $moduleImageUrl = $module['moduleImageUrl'];
49 51
                     }
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.