Completed
Pull Request — dev (#76)
by Sarah
02:56 queued 32s
created
views/admin/module/listPurchases.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
             <div class="col-md-6">
17 17
                 <div class="form-group form-group-search">
18 18
                     <?= Html::textInput("licenceKey", $licenceKey, ["class" => "form-control form-search", "placeholder" => Yii::t('AdminModule.base', 'Add purchased module by licence key')]); ?>
19
-                    <?= Html::submitButton(Yii::t('AdminModule.module_listOnline', 'Register'), ['class' => 'btn btn-default btn-sm form-button-search' , 'data-ui-loader' => ""]); ?>
19
+                    <?= Html::submitButton(Yii::t('AdminModule.module_listOnline', 'Register'), ['class' => 'btn btn-default btn-sm form-button-search', 'data-ui-loader' => ""]); ?>
20 20
                 </div>
21 21
                 <?php if ($message != ""): ?>
22 22
                     <div style="color:<?= ($hasError) ? 'red' : 'green'; ?>"><?= Html::encode($message); ?></div>
Please login to merge, or discard this 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.
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/loader.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<div <?= $id ? 'id="'.$id.'"' : ''?> class="loader humhub-ui-loader <?= $cssClass; ?>" <?php if(isset($show) && !$show) : ?> style="display:none;" <?php endif; ?>>
1
+<div <?= $id ? 'id="' . $id . '"' : ''?> class="loader humhub-ui-loader <?= $cssClass; ?>" <?php if (isset($show) && !$show) : ?> style="display:none;" <?php endif; ?>>
2 2
     <div class="sk-spinner sk-spinner-three-bounce">
3 3
         <div class="sk-bounce1"></div>
4 4
         <div class="sk-bounce2"></div>
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/dataSaved.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <!-- check if flash message exists -->
2
-<?php if(Yii::$app->getSession()->hasFlash('data-saved')): ?>
2
+<?php if (Yii::$app->getSession()->hasFlash('data-saved')): ?>
3 3
 
4 4
     <script type="text/javascript">
5 5
         $(function() {
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/friendship/manage/sent-requests.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,10 +22,10 @@
 block discarded – undo
22 22
                 'header' => 'Actions',
23 23
                 'class' => 'yii\grid\ActionColumn',
24 24
                 'buttons' => [
25
-                    'update' => function () {
25
+                    'update' => function() {
26 26
                         return;
27 27
                     },
28
-                    'view' => function () {
28
+                    'view' => function() {
29 29
                         return;
30 30
                     },
31 31
                     'delete' => function($url, $model) {
Please login to merge, or discard this patch.
views/comment/widgets/link.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 
6 6
 $commentCount = $this->context->getCommentsCount();
7 7
 $hasComments = ($commentCount > 0);
8
-$commentCountSpan = Html::tag('span', ' ('.$commentCount.')', [
8
+$commentCountSpan = Html::tag('span', ' (' . $commentCount . ')', [
9 9
     'class' => 'comment-count',
10 10
     'data-count' => $commentCount,
11 11
     'style' => ($hasComments) ? null : 'display:none'
@@ -15,10 +15,10 @@  discard block
 block discarded – undo
15 15
 <?php if ($mode == \humhub\modules\comment\widgets\CommentLink::MODE_POPUP): ?>
16 16
     <?php $url = Url::to(['/comment/comment/show', 'contentModel' => $objectModel, 'contentId' => $objectId, 'mode' => 'popup']); ?>
17 17
     <a href="#" data-action-click="ui.modal.load" data-action-url="<?= $url ?>">
18
-        <?= Yii::t('CommentModule.widgets_views_link', "Comment").'('.$this->context->getCommentsCount().')' ?>
18
+        <?= Yii::t('CommentModule.widgets_views_link', "Comment") . '(' . $this->context->getCommentsCount() . ')' ?>
19 19
     </a>
20
-<?php elseif(Yii::$app->user->isGuest): ?>
21
-    <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment").$commentCountSpan, Yii::$app->user->loginUrl, ['data-target' => '#globalModal']) ?>
20
+<?php elseif (Yii::$app->user->isGuest): ?>
21
+    <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment") . $commentCountSpan, Yii::$app->user->loginUrl, ['data-target' => '#globalModal']) ?>
22 22
 <?php else : ?>
23
-    <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment").$commentCountSpan, "#",['onClick' => "$('#comment_" . $id . "').slideToggle('fast');$('#newCommentForm_" . $id . "').focus();return false;"]); ?>
23
+    <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment") . $commentCountSpan, "#", ['onClick' => "$('#comment_" . $id . "').slideToggle('fast');$('#newCommentForm_" . $id . "').focus();return false;"]); ?>
24 24
 <?php endif; ?>
25 25
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,6 +19,9 @@
 block discarded – undo
19 19
     </a>
20 20
 <?php elseif(Yii::$app->user->isGuest): ?>
21 21
     <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment").$commentCountSpan, Yii::$app->user->loginUrl, ['data-target' => '#globalModal']) ?>
22
-<?php else : ?>
23
-    <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment").$commentCountSpan, "#",['onClick' => "$('#comment_" . $id . "').slideToggle('fast');$('#newCommentForm_" . $id . "').focus();return false;"]); ?>
22
+<?php else {
23
+    : ?>
24
+    <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment").$commentCountSpan, "#",['onClick' => "$('#comment_" . $id . "').slideToggle('fast');$('#newCommentForm_" . $id . "').focus();return false;"]);
25
+}
26
+?>
24 27
 <?php endif; ?>
25 28
\ No newline at end of file
Please login to merge, or discard this patch.