Completed
Push — dev ( 3a0c41...22dc54 )
by Sarah
10:18 queued 07:43
created
views/content/widgets/archiveLink.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,9 +12,12 @@
 block discarded – undo
12 12
         <a href="#" data-action-click="unarchive" data-action-url="<?= $unarchiveLink ?>">
13 13
             <i class="fa fa-archive"></i> <?= Yii::t('ContentModule.widgets_views_archiveLink', 'Unarchive'); ?>
14 14
         </a>
15
-    <?php else: ?>
15
+    <?php else {
16
+    : ?>
16 17
         <a href="#" data-action-click="archive" data-action-url="<?= $archiveLink ?>">
17
-            <i class="fa fa-archive"></i> <?= Yii::t('ContentModule.widgets_views_archiveLink', 'Move to archive'); ?>
18
+            <i class="fa fa-archive"></i> <?= Yii::t('ContentModule.widgets_views_archiveLink', 'Move to archive');
19
+}
20
+?>
18 21
         </a>
19 22
     <?php endif; ?>
20 23
 </li>
Please login to merge, or discard this patch.
views/content/widgets/visibilityLink.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
 
7 7
 ?>
8 8
 <li>
9
-    <?php if($content->isPrivate()) :?>
9
+    <?php if ($content->isPrivate()) :?>
10 10
         <a href="#"  class="makePublicLink" data-action-click="toggleVisibility" data-action-url="<?= $toggleLink ?>">
11 11
             <i class="fa fa-unlock makePublic"></i> <?= Yii::t('ContentModule.widgets_views_contentForm', 'Make public') ?>
12 12
         </a>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,9 +10,12 @@
 block discarded – undo
10 10
         <a href="#"  class="makePublicLink" data-action-click="toggleVisibility" data-action-url="<?= $toggleLink ?>">
11 11
             <i class="fa fa-unlock makePublic"></i> <?= Yii::t('ContentModule.widgets_views_contentForm', 'Make public') ?>
12 12
         </a>
13
-    <?php else: ?>
13
+    <?php else {
14
+    : ?>
14 15
         <a href="#" class="makePriavteLink" data-action-click="toggleVisibility" data-action-url="<?= $toggleLink ?>">
15 16
             <i class="fa fa-lock makePrivate"></i> <?= Yii::t('ContentModule.widgets_views_contentForm', 'Make private') ?>
16 17
         </a>
17
-    <?php endif; ?>
18
+    <?php endif;
19
+}
20
+?>
18 21
 </li>
Please login to merge, or discard this patch.
views/admin/setting/oembed.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
             <li><?= Html::a($providerUrl, Url::to(['oembed-edit', 'prefix' => $providerUrl]), ['data-method' => 'POST']); ?></li>
19 19
         <?php endforeach; ?>
20 20
     </ul>
21
-<?php else: ?>
22
-    <p><strong><?= Yii::t('AdminModule.views_setting_oembed', 'Currently no provider active!'); ?></strong></p>
21
+<?php else {
22
+    : ?>
23
+    <p><strong><?= Yii::t('AdminModule.views_setting_oembed', 'Currently no provider active!');
24
+}
25
+?></strong></p>
23 26
 <?php endif; ?>
24 27
 
25 28
 <?php $this->endContent(); ?>
Please login to merge, or discard this patch.
views/directory/directory/userPosts.php 1 patch
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -7,11 +7,9 @@
 block discarded – undo
7 7
 echo \humhub\modules\stream\widgets\StreamViewer::widget(array(
8 8
     'streamAction' => '//directory/directory/stream',
9 9
     'messageStreamEmpty' => (!Yii::$app->user->isGuest) ?
10
-            Yii::t('DirectoryModule.base', '<b>Nobody wrote something yet.</b><br>Make the beginning and post something...') :
11
-            Yii::t('DirectoryModule.base', '<b>There are no profile posts yet!</b>'),
10
+            Yii::t('DirectoryModule.base', '<b>Nobody wrote something yet.</b><br>Make the beginning and post something...') : Yii::t('DirectoryModule.base', '<b>There are no profile posts yet!</b>'),
12 11
     'messageStreamEmptyCss' => (!Yii::$app->user->isGuest) ?
13
-            'placeholder-empty-stream' :
14
-            '',
12
+            'placeholder-empty-stream' : '',
15 13
 ));
16 14
 ?>
17 15
 
Please login to merge, or discard this patch.
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/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.