Passed
Push — master ( 5454f0...ec892e )
by Sarah
04:24 queued 02:09
created
views/layouts/main.php 2 patches
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -119,8 +119,11 @@
 block discarded – undo
119 119
     <!-- start: show content (and check, if exists a sublayout -->
120 120
     <?php if (isset($this->context->subLayout) && $this->context->subLayout != "") : ?>
121 121
         <?php echo $this->render($this->context->subLayout, array('content' => $content)); ?>
122
-    <?php else: ?>
123
-        <?php echo $content; ?>
122
+    <?php else {
123
+    : ?>
124
+        <?php echo $content;
125
+}
126
+?>
124 127
     <?php endif; ?>
125 128
     <!-- end: show content -->
126 129
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
     <body>
83 83
 	
84
-	<script src="<?php echo $this->theme->getBaseUrl() . '/js/lightbox-plus-jquery.min.js'; ?>"></script>
84
+	<script src="<?php echo $this->theme->getBaseUrl().'/js/lightbox-plus-jquery.min.js'; ?>"></script>
85 85
 	
86 86
     <?php $this->beginBody() ?>
87 87
 	
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 		</div>
151 151
 	</div>
152 152
 
153
-	<script src="<?php echo $this->theme->getBaseUrl() . '/js/plugins-scroll.js'; ?>"></script>
153
+	<script src="<?php echo $this->theme->getBaseUrl().'/js/plugins-scroll.js'; ?>"></script>
154 154
 	<script>
155 155
 	$(document).ready(function() {
156 156
 		try {
Please login to merge, or discard this patch.
views/like/widgets/likeLink.php 2 patches
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 (Yii::$app->user->isGuest): ?>
11 11
         <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', '<i class="fa fa-heart-o"></i>'), Yii::$app->user->loginUrl, array('data-target' => '#globalModal')); ?>
12
-    <?php else: ?>
13
-        <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', '<i class="fa fa-thumbs-o-up"></i>'), $likeUrl, ['style' => 'display:' . ((!$currentUserLiked) ? 'inline' : 'none'), 'class' => 'like likeAnchor', 'data-objectId' => $id]); ?>
12
+    <?php else {
13
+    : ?>
14
+        <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', '<i class="fa fa-thumbs-o-up"></i>'), $likeUrl, ['style' => 'display:' . ((!$currentUserLiked) ? 'inline' : 'none'), 'class' => 'like likeAnchor', 'data-objectId' => $id]);
15
+}
16
+?>
14 17
         <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', '<i class="fa fa-thumbs-o-up"></i>'), $unlikeUrl, ['style' => 'display:' . (($currentUserLiked) ? 'inline' : 'none'), 'class' => 'unlike likeAnchor', 'data-objectId' => $id]); ?>
15 18
     <?php endif; ?>
16 19
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@
 block discarded – undo
10 10
     <?php if (Yii::$app->user->isGuest): ?>
11 11
         <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', '<i class="fa fa-heart-o"></i>'), Yii::$app->user->loginUrl, array('data-target' => '#globalModal')); ?>
12 12
     <?php else: ?>
13
-        <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', '<i class="fa fa-thumbs-o-up"></i>'), $likeUrl, ['style' => 'display:' . ((!$currentUserLiked) ? 'inline' : 'none'), 'class' => 'like likeAnchor', 'data-objectId' => $id]); ?>
14
-        <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', '<i class="fa fa-thumbs-o-up"></i>'), $unlikeUrl, ['style' => 'display:' . (($currentUserLiked) ? 'inline' : 'none'), 'class' => 'unlike likeAnchor', 'data-objectId' => $id]); ?>
13
+        <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', '<i class="fa fa-thumbs-o-up"></i>'), $likeUrl, ['style' => 'display:'.((!$currentUserLiked) ? 'inline' : 'none'), 'class' => 'like likeAnchor', 'data-objectId' => $id]); ?>
14
+        <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', '<i class="fa fa-thumbs-o-up"></i>'), $unlikeUrl, ['style' => 'display:'.(($currentUserLiked) ? 'inline' : 'none'), 'class' => 'unlike likeAnchor', 'data-objectId' => $id]); ?>
15 15
     <?php endif; ?>
16 16
 
17 17
 <?php if (count($likes) > 0) { ?>
Please login to merge, or discard this patch.
views/space/space/_layout.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,10 +14,13 @@
 block discarded – undo
14 14
             <div class="col-md-12 layout-content-container">
15 15
                 <?php echo $content; ?>
16 16
             </div>
17
-        <?php else: ?>
17
+        <?php else {
18
+    : ?>
18 19
             <div class="col-md-4 layout-sidebar-container">
19 20
 				<div class="panel-light no-icons">
20
-					<?php echo \humhub\modules\space\widgets\Menu::widget(['space' => $space]); ?>
21
+					<?php echo \humhub\modules\space\widgets\Menu::widget(['space' => $space]);
22
+}
23
+?>
21 24
 				</div>
22 25
                 <?php
23 26
                 echo \humhub\modules\space\widgets\Sidebar::widget(['space' => $space, 'widgets' => [
Please login to merge, or discard this patch.
views/user/auth/createAccount_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"><?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"><?php echo Yii::t('UserModule.views_auth_createAccount_success', 'Go to login page') ?></a>
Please login to merge, or discard this patch.
views/user/layouts/main.php 2 patches
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,8 +81,11 @@
 block discarded – undo
81 81
         <!-- start: show content (and check, if exists a sublayout -->
82 82
         <?php if (isset($this->subLayout) && $this->subLayout != "") : ?>
83 83
             <?php echo $this->renderPartial($this->subLayout, array('content' => $content)); ?>
84
-        <?php else: ?>
85
-            <?php echo $content; ?>
84
+        <?php else {
85
+    : ?>
86
+            <?php echo $content;
87
+}
88
+?>
86 89
         <?php endif; ?>
87 90
         <!-- end: show content -->
88 91
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,8 +64,8 @@
 block discarded – undo
64 64
 		<div id="trailer" class="is_overlay">
65 65
 			<div class="is_frame"></div>
66 66
 			<video id="video" width="100%" height="auto" autoplay="autoplay" muted="" loop="loop" preload="auto">
67
-				<source src="<?php echo $this->theme->getBaseUrl() . '/video/intro.mp4'; ?>"></source>
68
-				<source src="<?php echo $this->theme->getBaseUrl() . '/video/intro.webm'; ?>" type="video/webm"></source>
67
+				<source src="<?php echo $this->theme->getBaseUrl().'/video/intro.mp4'; ?>"></source>
68
+				<source src="<?php echo $this->theme->getBaseUrl().'/video/intro.webm'; ?>" type="video/webm"></source>
69 69
 			</video>
70 70
 		</div>
71 71
 		
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
@@ -12,10 +12,13 @@
 block discarded – undo
12 12
             <div class="col-md-12 layout-content-container">
13 13
                 <?php echo $content; ?>
14 14
             </div>
15
-        <?php else: ?>
15
+        <?php else {
16
+    : ?>
16 17
 			<div class="col-md-4 layout-sidebar-container">
17 18
 				<div class="panel-light">
18
-					<?= \humhub\modules\user\widgets\ProfileMenu::widget(['user' => $this->context->user]); ?>
19
+					<?= \humhub\modules\user\widgets\ProfileMenu::widget(['user' => $this->context->user]);
20
+}
21
+?>
19 22
                 </div>
20 23
 				<?php
21 24
                 echo \humhub\modules\user\widgets\ProfileSidebar::widget([
Please login to merge, or discard this patch.
views/comment/widgets/link.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,11 +10,13 @@
 block discarded – undo
10 10
        class=""
11 11
        title="" data-target="#globalModal"
12 12
        data-original-title="Comments">Comments - <?php echo $this->context->getCommentsCount(); ?></a>
13
-<?php else: ?>
13
+<?php else {
14
+    : ?>
14 15
 	<div class="pull-right">
15 16
     <?php
16 17
     if (Yii::$app->user->isGuest) {
17 18
         echo Html::a(Yii::t('CommentModule.widgets_views_link', "<i class='fa fa-comments-o'></i>"), Yii::$app->user->loginUrl, array('data-target' => '#globalModal'));
19
+}
18 20
     } else {
19 21
         echo Html::a(Yii::t('CommentModule.widgets_views_link', "<i class='fa fa-comments-o'></i>"), "#", array('onClick' => "$('#comment_" . $id . "').show();$('#newCommentForm_" . $id . "_contenteditable').focus();return false;"));
20 22
     }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
     if (Yii::$app->user->isGuest) {
17 17
         echo Html::a(Yii::t('CommentModule.widgets_views_link', "<i class='fa fa-comments-o'></i>"), Yii::$app->user->loginUrl, array('data-target' => '#globalModal'));
18 18
     } else {
19
-        echo Html::a(Yii::t('CommentModule.widgets_views_link', "<i class='fa fa-comments-o'></i>"), "#", array('onClick' => "$('#comment_" . $id . "').show();$('#newCommentForm_" . $id . "_contenteditable').focus();return false;"));
19
+        echo Html::a(Yii::t('CommentModule.widgets_views_link', "<i class='fa fa-comments-o'></i>"), "#", array('onClick' => "$('#comment_".$id."').show();$('#newCommentForm_".$id."_contenteditable').focus();return false;"));
20 20
     }
21 21
     ?>
22 22
 	</div>
Please login to merge, or discard this patch.
views/comment/widgets/showComment.php 2 patches
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -24,16 +24,16 @@  discard block
 block discarded – undo
24 24
 						<?php if ($canWrite): ?>
25 25
 							<li>
26 26
 								<?php
27
-								echo AjaxButton::widget([
28
-									'label' => '<i class="fa fa-pencil"></i> ' . Yii::t('CommentModule.widgets_views_showComment', 'Edit'),
29
-									'ajaxOptions' => [
30
-										'type' => 'POST',
31
-										'success' => new yii\web\JsExpression("function(html){ $('.preferences .dropdown').removeClass('open'); $('#comment_editarea_" . $comment->id . "').replaceWith(html); $('#comment_input_" . $comment->id . "_contenteditable').focus(); }"),
32
-										'url' => Url::to(['/comment/comment/edit', 'contentModel' => $comment->object_model, 'contentId' => $comment->object_id, 'id' => $comment->id]),
33
-									],
34
-									'tag' => 'a'
35
-								]);
36
-								?>
27
+                                echo AjaxButton::widget([
28
+                                    'label' => '<i class="fa fa-pencil"></i> ' . Yii::t('CommentModule.widgets_views_showComment', 'Edit'),
29
+                                    'ajaxOptions' => [
30
+                                        'type' => 'POST',
31
+                                        'success' => new yii\web\JsExpression("function(html){ $('.preferences .dropdown').removeClass('open'); $('#comment_editarea_" . $comment->id . "').replaceWith(html); $('#comment_input_" . $comment->id . "_contenteditable').focus(); }"),
32
+                                        'url' => Url::to(['/comment/comment/edit', 'contentModel' => $comment->object_model, 'contentId' => $comment->object_id, 'id' => $comment->id]),
33
+                                    ],
34
+                                    'tag' => 'a'
35
+                                ]);
36
+                                ?>
37 37
 
38 38
 							</li>
39 39
 						<?php endif; ?>
@@ -43,18 +43,18 @@  discard block
 block discarded – undo
43 43
 
44 44
 								<!-- load modal confirm widget -->
45 45
 								<?php
46
-								echo humhub\widgets\ModalConfirm::widget(array(
47
-									'uniqueID' => 'modal_commentdelete_' . $comment->id,
48
-									'linkOutput' => 'a',
49
-									'title' => Yii::t('CommentModule.widgets_views_showComment', '<strong>Confirm</strong> comment deleting'),
50
-									'message' => Yii::t('CommentModule.widgets_views_showComment', 'Do you really want to delete this comment?'),
51
-									'buttonTrue' => Yii::t('CommentModule.widgets_views_showComment', 'Delete'),
52
-									'buttonFalse' => Yii::t('CommentModule.widgets_views_showComment', 'Cancel'),
53
-									'linkContent' => '<i class="fa fa-trash-o"></i> ' . Yii::t('CommentModule.widgets_views_showComment', 'Delete'),
54
-									'linkHref' => Url::to(["/comment/comment/delete", 'contentModel' => $comment->object_model, 'contentId' => $comment->object_id, 'id' => $comment->id]),
55
-									'confirmJS' => "function(html) { $('#comment_" . $comment->id . "').slideUp(); }"
56
-								));
57
-								?>
46
+                                echo humhub\widgets\ModalConfirm::widget(array(
47
+                                    'uniqueID' => 'modal_commentdelete_' . $comment->id,
48
+                                    'linkOutput' => 'a',
49
+                                    'title' => Yii::t('CommentModule.widgets_views_showComment', '<strong>Confirm</strong> comment deleting'),
50
+                                    'message' => Yii::t('CommentModule.widgets_views_showComment', 'Do you really want to delete this comment?'),
51
+                                    'buttonTrue' => Yii::t('CommentModule.widgets_views_showComment', 'Delete'),
52
+                                    'buttonFalse' => Yii::t('CommentModule.widgets_views_showComment', 'Cancel'),
53
+                                    'linkContent' => '<i class="fa fa-trash-o"></i> ' . Yii::t('CommentModule.widgets_views_showComment', 'Delete'),
54
+                                    'linkHref' => Url::to(["/comment/comment/delete", 'contentModel' => $comment->object_model, 'contentId' => $comment->object_id, 'id' => $comment->id]),
55
+                                    'confirmJS' => "function(html) { $('#comment_" . $comment->id . "').slideUp(); }"
56
+                                ));
57
+                                ?>
58 58
 							</li>
59 59
 						<?php endif; ?>
60 60
 					</ul>
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -25,10 +25,10 @@  discard block
 block discarded – undo
25 25
 							<li>
26 26
 								<?php
27 27
 								echo AjaxButton::widget([
28
-									'label' => '<i class="fa fa-pencil"></i> ' . Yii::t('CommentModule.widgets_views_showComment', 'Edit'),
28
+									'label' => '<i class="fa fa-pencil"></i> '.Yii::t('CommentModule.widgets_views_showComment', 'Edit'),
29 29
 									'ajaxOptions' => [
30 30
 										'type' => 'POST',
31
-										'success' => new yii\web\JsExpression("function(html){ $('.preferences .dropdown').removeClass('open'); $('#comment_editarea_" . $comment->id . "').replaceWith(html); $('#comment_input_" . $comment->id . "_contenteditable').focus(); }"),
31
+										'success' => new yii\web\JsExpression("function(html){ $('.preferences .dropdown').removeClass('open'); $('#comment_editarea_".$comment->id."').replaceWith(html); $('#comment_input_".$comment->id."_contenteditable').focus(); }"),
32 32
 										'url' => Url::to(['/comment/comment/edit', 'contentModel' => $comment->object_model, 'contentId' => $comment->object_id, 'id' => $comment->id]),
33 33
 									],
34 34
 									'tag' => 'a'
@@ -44,15 +44,15 @@  discard block
 block discarded – undo
44 44
 								<!-- load modal confirm widget -->
45 45
 								<?php
46 46
 								echo humhub\widgets\ModalConfirm::widget(array(
47
-									'uniqueID' => 'modal_commentdelete_' . $comment->id,
47
+									'uniqueID' => 'modal_commentdelete_'.$comment->id,
48 48
 									'linkOutput' => 'a',
49 49
 									'title' => Yii::t('CommentModule.widgets_views_showComment', '<strong>Confirm</strong> comment deleting'),
50 50
 									'message' => Yii::t('CommentModule.widgets_views_showComment', 'Do you really want to delete this comment?'),
51 51
 									'buttonTrue' => Yii::t('CommentModule.widgets_views_showComment', 'Delete'),
52 52
 									'buttonFalse' => Yii::t('CommentModule.widgets_views_showComment', 'Cancel'),
53
-									'linkContent' => '<i class="fa fa-trash-o"></i> ' . Yii::t('CommentModule.widgets_views_showComment', 'Delete'),
53
+									'linkContent' => '<i class="fa fa-trash-o"></i> '.Yii::t('CommentModule.widgets_views_showComment', 'Delete'),
54 54
 									'linkHref' => Url::to(["/comment/comment/delete", 'contentModel' => $comment->object_model, 'contentId' => $comment->object_id, 'id' => $comment->id]),
55
-									'confirmJS' => "function(html) { $('#comment_" . $comment->id . "').slideUp(); }"
55
+									'confirmJS' => "function(html) { $('#comment_".$comment->id."').slideUp(); }"
56 56
 								));
57 57
 								?>
58 58
 							</li>
Please login to merge, or discard this patch.
views/user/layouts/main_auth.php 2 patches
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,8 +81,11 @@
 block discarded – undo
81 81
         <!-- start: show content (and check, if exists a sublayout -->
82 82
         <?php if (isset($this->subLayout) && $this->subLayout != "") : ?>
83 83
             <?php echo $this->renderPartial($this->subLayout, array('content' => $content)); ?>
84
-        <?php else: ?>
85
-            <?php echo $content; ?>
84
+        <?php else {
85
+    : ?>
86
+            <?php echo $content;
87
+}
88
+?>
86 89
         <?php endif; ?>
87 90
         <!-- end: show content -->
88 91
 
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -14,19 +14,19 @@
 block discarded – undo
14 14
         <?php $ver = HVersion::VERSION; ?>
15 15
 
16 16
         <?php
17
-        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/css/animate.min.css');
18
-        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/css/bootstrap.min.css');
19
-        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/css/animate.min.css');
20
-        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/css/style.css');
21
-        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/css/flatelements.css');
22
-        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/resources/font-awesome/css/font-awesome.min.css');
23
-
24
-
25
-        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/bootstrap.min.js');
26
-        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/modernizr.js');
27
-        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/jquery.cookie.js');
28
-        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/jquery.flatelements.js');
29
-        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/jquery.placeholder.js');
17
+        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/css/animate.min.css');
18
+        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/css/bootstrap.min.css');
19
+        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/css/animate.min.css');
20
+        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/css/style.css');
21
+        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/css/flatelements.css');
22
+        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/resources/font-awesome/css/font-awesome.min.css');
23
+
24
+
25
+        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl.'/js/bootstrap.min.js');
26
+        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl.'/js/modernizr.js');
27
+        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl.'/js/jquery.cookie.js');
28
+        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl.'/js/jquery.flatelements.js');
29
+        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl.'/js/jquery.placeholder.js');
30 30
         ?>
31 31
 
32 32
         <!-- The HTML5 shim, for IE6-8 support of HTML5 elements -->
Please login to merge, or discard this patch.