Completed
Push — master ( f0f3ac...801072 )
by Sarah
05:52 queued 03:24
created
views/post/post/edit.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
                 'type' => 'POST',
34 34
                 'beforeSend' => new yii\web\JsExpression('function(html){  $("#post_input_' . $post->id . '_contenteditable").hide(); showLoader("' . $post->id . '"); }'),
35 35
                 'success' => new yii\web\JsExpression('function(html){ $(".wall_' . $post->getUniqueId() . '").replaceWith(html); }'),
36
-                'statusCode' => ['400' => new yii\web\JsExpression('function(xhr) { $("#post_edit_'. $post->id.'").replaceWith(xhr.responseText); }')],
36
+                'statusCode' => ['400' => new yii\web\JsExpression('function(xhr) { $("#post_edit_' . $post->id . '").replaceWith(xhr.responseText); }')],
37 37
                 'url' => $post->content->container->createUrl('/post/post/edit', ['id' => $post->id]),
38 38
             ],
39 39
             'htmlOptions' => [
Please login to merge, or discard this patch.
views/file/widgets/showFiles.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,8 +32,9 @@
 block discarded – undo
32 32
     <ul class="files" style="list-style: none; margin: 0;" id="files-<?php echo $object->getPrimaryKey(); ?>">
33 33
         <?php foreach ($files as $file) : ?>
34 34
             <?php
35
-            if ($file->getMimeBaseType() == "image" && $hideImageFileInfo)
36
-                continue;
35
+            if ($file->getMimeBaseType() == "image" && $hideImageFileInfo) {
36
+                            continue;
37
+            }
37 38
             ?>
38 39
             <li class="mime <?php echo \humhub\libs\MimeHelper::getMimeIconClassByExtension($file->getExtension()); ?>"><a
39 40
                     href="<?php echo $file->getUrl(); ?>" target="_blank"><span
Please login to merge, or discard this patch.
views/mail/mail/adduser.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
             </div>
20 20
 
21 21
             <?php
22
-            if(version_compare(Yii::$app->version, '1.0.0-beta.5', 'lt')) {
22
+            if (version_compare(Yii::$app->version, '1.0.0-beta.5', 'lt')) {
23 23
                 echo humhub\modules\user\widgets\UserPicker::widget(array(
24 24
                     'inputId' => 'addUserFrom_mail',
25 25
                     'model' => $inviteForm, // CForm Instanz
Please login to merge, or discard this patch.
views/mail/mail/notificationList.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,6 +3,9 @@
 block discarded – undo
3 3
     <?php foreach ($userMessages as $userMessage) : ?>
4 4
         <?php echo $this->render('_messagePreview', array('userMessage' => $userMessage)); ?>
5 5
     <?php endforeach; ?>
6
-<?php else: ?>
7
-    <li class="placeholder"> <?php echo Yii::t('MailModule.views_mail_list', 'There are no messages yet.'); ?></li>
6
+<?php else {
7
+    : ?>
8
+    <li class="placeholder"> <?php echo Yii::t('MailModule.views_mail_list', 'There are no messages yet.');
9
+}
10
+?></li>
8 11
 <?php endif; ?>
9 12
\ No newline at end of file
Please login to merge, or discard this patch.
views/mail/mail/index.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
 						<?php foreach ($userMessages as $userMessage) : ?>
19 19
 							<?php echo $this->render('_messagePreview', array('userMessage' => $userMessage)); ?>
20 20
 						<?php endforeach; ?>
21
-					<?php else: ?>
22
-						<li class="placeholder"><?php echo Yii::t('MailModule.views_mail_index', 'There are no messages yet.'); ?></li>
21
+					<?php else {
22
+    : ?>
23
+						<li class="placeholder"><?php echo Yii::t('MailModule.views_mail_index', 'There are no messages yet.');
24
+}
25
+?></li>
23 26
 					<?php endif; ?>
24 27
 				</ul>
25 28
 			</div>
Please login to merge, or discard this patch.
views/user/auth/login_modal.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
             <div class="tab-content">
35 35
                 <div class="tab-pane <?php echo (!isset($_POST['Invite'])) ? "active" : ""; ?>" id="login">
36 36
 
37
-                    <?php if(AuthChoice::hasClients()): ?>
37
+                    <?php if (AuthChoice::hasClients()): ?>
38 38
                         <?= AuthChoice::widget([]) ?>
39 39
                     <?php else: ?>
40 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>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,8 +36,11 @@
 block discarded – undo
36 36
 
37 37
                     <?php if(AuthChoice::hasClients()): ?>
38 38
                         <?= AuthChoice::widget([]) ?>
39
-                    <?php else: ?>
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>
39
+                    <?php else {
40
+    : ?>
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>
41 44
                     <?php endif; ?>
42 45
 
43 46
                     <?php $form = ActiveForm::begin(); ?>
Please login to merge, or discard this patch.
views/user/auth/login.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
                 </div>
26 26
             <?php endif; ?>
27 27
 
28
-            <?php if(AuthChoice::hasClients()): ?>
28
+            <?php if (AuthChoice::hasClients()): ?>
29 29
                 <?= AuthChoice::widget([]) ?>
30 30
             <?php else: ?>
31 31
                 <p><?php echo Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password."); ?></p>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,8 +27,11 @@
 block discarded – undo
27 27
 
28 28
             <?php if(AuthChoice::hasClients()): ?>
29 29
                 <?= AuthChoice::widget([]) ?>
30
-            <?php else: ?>
31
-                <p><?php echo Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password."); ?></p>
30
+            <?php else {
31
+    : ?>
32
+                <p><?php echo Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password.");
33
+}
34
+?></p>
32 35
             <?php endif; ?>
33 36
             
34 37
             <?php $form = ActiveForm::begin(['id' => 'account-login-form', 'enableClientValidation' => false]); ?>
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"><?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/account/editModules.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,8 +28,11 @@
 block discarded – undo
28 28
                     <?php if ($module->getContentContainerConfigUrl($user)) : ?>
29 29
                         <?php echo Html::a(Yii::t('UserModule.views_account_editModules', 'Configure'), $module->getContentContainerConfigUrl($user), array('class' => 'btn btn-sm')); ?>
30 30
                     <?php endif; ?>
31
-                <?php else: ?>
32
-                    <?php echo Html::a(Yii::t('UserModule.views_account_editModules', 'Enable'), Url::to(['/user/account/enable-module', 'moduleId' => $module->id]), array('data-method' => 'POST', 'class' => 'btn btn-sm btn-primary', 'data-ui-loader' => '')); ?>
31
+                <?php else {
32
+    : ?>
33
+                    <?php echo Html::a(Yii::t('UserModule.views_account_editModules', 'Enable'), Url::to(['/user/account/enable-module', 'moduleId' => $module->id]), array('data-method' => 'POST', 'class' => 'btn btn-sm btn-primary', 'data-ui-loader' => ''));
34
+}
35
+?>
33 36
                 <?php endif; ?>
34 37
             </div>
35 38
         </div>
Please login to merge, or discard this patch.