Completed
Push — dev ( db2df6...716f17 )
by Sarah
10s
created
views/like/widgets/likeLink.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,14 +10,17 @@
 block discarded – undo
10 10
     <?php if (Yii::$app->user->isGuest): ?>
11 11
 
12 12
         <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', 'Like'), Yii::$app->user->loginUrl, ['data-target' => '#globalModal']); ?>
13
-    <?php else: ?>
13
+    <?php else {
14
+    : ?>
14 15
         <a href="#" data-action-click="like.toggleLike" data-action-url="<?= $likeUrl ?>" class="like likeAnchor" style="<?= (!$currentUserLiked) ? '' : 'display:none'?>">
15 16
             <?= Yii::t('LikeModule.widgets_views_likeLink', 'Like') ?>
16 17
         </a>
17 18
         <a href="#" data-action-click="like.toggleLike" data-action-url="<?= $unlikeUrl ?>" class="unlike likeAnchor" style="<?= ($currentUserLiked) ? '' : 'display:none'?>">
18 19
             <?= Yii::t('LikeModule.widgets_views_likeLink', 'Unlike') ?>
19 20
         </a>
20
-    <?php endif; ?>
21
+    <?php endif;
22
+}
23
+?>
21 24
 
22 25
     <?php if (count($likes) > 0) { ?>
23 26
         <!-- Create link to show all users, who liked this -->
Please login to merge, or discard this patch.
views/file/widgets/showFiles.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,11 +16,11 @@  discard block
 block discarded – undo
16 16
                 <a data-ui-gallery="<?= "gallery-" . $object->getUniqueId(); ?>" href="<?= $file->getUrl(); ?>#.jpeg" title="<?= Html::encode($file->file_name) ?>">
17 17
                     <?= $previewImage->render(); ?>
18 18
                 </a>
19
-            <?php elseif(FileHelper::getExtension($file->file_name) == 'mp4'): ?>
19
+            <?php elseif (FileHelper::getExtension($file->file_name) == 'mp4'): ?>
20 20
                 <a data-ui-gallery="<?= "gallery-" . $object->getUniqueId(); ?>" type="video/mp4" href="<?= $file->getUrl(); ?>#.mp4" title="<?= Html::encode($file->file_name) ?>">
21 21
                     <video src="<?= $file->getUrl() ?>" height="130" />
22 22
                 </a>
23
-            <?php elseif(FileHelper::getExtension($file->file_name) == 'ogv'): ?>
23
+            <?php elseif (FileHelper::getExtension($file->file_name) == 'ogv'): ?>
24 24
                 <a data-ui-gallery="<?= "gallery-" . $object->getUniqueId(); ?>" type="video/ogg" href="<?= $file->getUrl(); ?>#.ogv" title="<?= Html::encode($file->file_name) ?>">
25 25
                     <video src="<?= $file->getUrl() ?>" height="130" />
26 26
                 </a>
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
     <?= \humhub\modules\file\widgets\FilePreview::widget([
47 47
         'hideImageFileInfo' => $hideImageFileInfo,
48 48
         'model' => $object,
49
-    ]);?>
49
+    ]); ?>
50 50
     
51 51
 </div>
52 52
 <?php endif; ?>
Please login to merge, or discard this patch.
views/search/search/index.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -110,16 +110,22 @@
 block discarded – undo
110 110
                                 <?= humhub\modules\stream\actions\Stream::renderEntry($result) ?>
111 111
                             <?php elseif ($result instanceof ContentContainerActiveRecord) : ?>
112 112
                                  <?= $result->getWallOut(); ?>
113
-                            <?php else: ?>
114
-                                No Output for Class <?php echo get_class($result); ?>
113
+                            <?php else {
114
+    : ?>
115
+                                No Output for Class <?php echo get_class($result);
116
+}
117
+?>
115 118
                             <?php endif; ?>
116 119
                         <?php endforeach; ?>
117
-                    <?php else: ?>
120
+                    <?php else {
121
+    : ?>
118 122
 
119 123
 
120 124
                         <div class="panel panel-default">
121 125
                             <div class="panel-body">
122
-                                <p><strong><?php echo Yii::t('SearchModule.views_search_index', 'Your search returned no matches.'); ?></strong></p>
126
+                                <p><strong><?php echo Yii::t('SearchModule.views_search_index', 'Your search returned no matches.');
127
+}
128
+?></strong></p>
123 129
                             </div>
124 130
                         </div>
125 131
                     <?php endif; ?>
Please login to merge, or discard this patch.
views/user/auth/login_modal.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -35,11 +35,17 @@
 block discarded – undo
35 35
 
36 36
                     <?php if (AuthChoice::hasClients()): ?>
37 37
                         <?= AuthChoice::widget([]) ?>
38
-                    <?php else: ?>
38
+                    <?php else {
39
+    : ?>
39 40
                         <?php if ($canRegister) : ?>
40
-                            <p><?php echo Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password."); ?></p>
41
-                        <?php else: ?>
42
-                            <p><?php echo Yii::t('UserModule.views_auth_login', "Please login with your username/email and password."); ?></p>
41
+                            <p><?php echo Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password.");
42
+}
43
+?></p>
44
+                        <?php else {
45
+    : ?>
46
+                            <p><?php echo Yii::t('UserModule.views_auth_login', "Please login with your username/email and password.");
47
+}
48
+?></p>
43 49
                         <?php endif; ?>                    <?php endif; ?>
44 50
 
45 51
                     <?php $form = ActiveForm::begin(['enableClientValidation' => false]); ?>
Please login to merge, or discard this patch.
views/user/auth/login.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,11 +27,17 @@
 block discarded – undo
27 27
 
28 28
             <?php if (AuthChoice::hasClients()): ?>
29 29
                 <?= AuthChoice::widget([]) ?>
30
-            <?php else: ?>
30
+            <?php else {
31
+    : ?>
31 32
                 <?php if ($canRegister) : ?>
32
-                    <p><?php echo Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password."); ?></p>
33
-                <?php else: ?>
34
-                    <p><?php echo Yii::t('UserModule.views_auth_login', "Please login with your username/email and password."); ?></p>
33
+                    <p><?php echo Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password.");
34
+}
35
+?></p>
36
+                <?php else {
37
+    : ?>
38
+                    <p><?php echo Yii::t('UserModule.views_auth_login', "Please login with your username/email and password.");
39
+}
40
+?></p>
35 41
                 <?php endif; ?>
36 42
             <?php endif; ?>
37 43
 
Please login to merge, or discard this patch.
views/user/registration/success.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
                     <p><?php echo Yii::t('UserModule.views_auth_createAccount_success', 'After activating your account by the administrator, you will receive a notification by email.'); ?></p>
19 19
                     <br/>
20 20
                     <a href="<?php echo Url::home() ?>" class="btn btn-primary" data-ui-loader><?php echo Yii::t('UserModule.views_auth_createAccount_success', 'back to home') ?></a>
21
-                <?php else: ?>
22
-                    <p><?php echo Yii::t('UserModule.views_auth_createAccount_success', 'To log in with your new account, click the button below.'); ?></p>
21
+                <?php else {
22
+    : ?>
23
+                    <p><?php echo Yii::t('UserModule.views_auth_createAccount_success', 'To log in with your new account, click the button below.');
24
+}
25
+?></p>
23 26
                     <br/>
24 27
                     <a href="<?php echo Url::home() ?>"
25 28
                        class="btn btn-primary" data-ui-loader><?php echo Yii::t('UserModule.views_auth_createAccount_success', 'Go to login page') ?></a>
Please login to merge, or discard this patch.
views/user/profile/about.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -37,14 +37,20 @@
 block discarded – undo
37 37
                                     <div class="col-sm-9">
38 38
                                         <p class="form-control-static"><?php echo RichText::widget(['text' => $field->getUserValue($user, true)]); ?></p>
39 39
                                     </div>
40
-                                <?php else: ?>
40
+                                <?php else {
41
+    : ?>
41 42
                                     <div class="col-sm-9">
42 43
                                         <?php if ($field->field_type_class == MarkdownEditor::className()): ?>
43 44
                                             <p class="form-control-static" style="min-height: 0 !important;padding-top:0;">
44
-                                                <?= MarkdownView::widget(['markdown' => $field->getUserValue($user, false)]); ?>
45
+                                                <?= MarkdownView::widget(['markdown' => $field->getUserValue($user, false)]);
46
+}
47
+?>
45 48
                                             </p>
46
-                                        <?php else: ?>
47
-                                            <p class="form-control-static"><?php echo $field->getUserValue($user, false); ?></p>                     
49
+                                        <?php else {
50
+    : ?>
51
+                                            <p class="form-control-static"><?php echo $field->getUserValue($user, false);
52
+}
53
+?></p>                     
48 54
                                         <?php endif; ?>
49 55
                                     </div>
50 56
                                 <?php endif; ?>
Please login to merge, or discard this patch.
views/user/profile/_layout.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,9 +16,12 @@
 block discarded – undo
16 16
             <div class="col-md-10 layout-content-container">
17 17
                 <?php echo $content; ?>
18 18
             </div>
19
-        <?php else: ?>
19
+        <?php else {
20
+    : ?>
20 21
             <div class="col-md-7 layout-content-container">
21
-                <?php echo $content; ?>
22
+                <?php echo $content;
23
+}
24
+?>
22 25
             </div>
23 26
             <div class="col-md-3 layout-sidebar-container">
24 27
                 <?php
Please login to merge, or discard this patch.
views/space/widgets/spaceNameColorInput.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-    $containerId = time().'space-color-chooser-edit';
2
+    $containerId = time() . 'space-color-chooser-edit';
3 3
     
4
-    if($model->color == null) {
4
+    if ($model->color == null) {
5 5
         $model->color = '#d1d1d1';
6 6
     }
7 7
 ?>
@@ -18,5 +18,5 @@  discard block
 block discarded – undo
18 18
             {input}
19 19
         </div>
20 20
         {error}{hint}'
21
-        ])->textInput(['placeholder' => Yii::t('SpaceModule.views_create_create', 'Space name'), 'maxlength' => 45 ]) ?>
21
+        ])->textInput(['placeholder' => Yii::t('SpaceModule.views_create_create', 'Space name'), 'maxlength' => 45]) ?>
22 22
 </div>
Please login to merge, or discard this patch.