aboutsummaryrefslogtreecommitdiff
path: root/app/views/user
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2021-02-28 12:26:24 +0100
committerGravatar GitHub <noreply@github.com> 2021-02-28 12:26:24 +0100
commit947e918f05d70d5dce4efa4ef403e593581c3fa9 (patch)
treee66ef1ffe8a6cc0ffbea1bff1791588f72879637 /app/views/user
parentbf2718cada964fba66d8497592abcb73cb9520ba (diff)
Travis: Enforce phpcs line length + whitespace (#3488)
* Update Travis line length * Also check whitespace in CSS files * Fix line length ext.php * More syntax, string templates * Fix exclude-pattern * Test JS files as well
Diffstat (limited to 'app/views/user')
-rw-r--r--app/views/user/details.phtml139
-rw-r--r--app/views/user/manage.phtml8
-rw-r--r--app/views/user/profile.phtml9
3 files changed, 81 insertions, 75 deletions
diff --git a/app/views/user/details.phtml b/app/views/user/details.phtml
index b93cd4d72..582910285 100644
--- a/app/views/user/details.phtml
+++ b/app/views/user/details.phtml
@@ -5,82 +5,83 @@
<?php $enabled = $this->details['enabled']; ?>
<div class="post">
- <a href="<?= _url('user', 'manage'); ?>"><?= _t('admin.user.back_to_manage'); ?></a>
+ <a href="<?= _url('user', 'manage'); ?>"><?= _t('admin.user.back_to_manage'); ?></a>
- <legend><?= $this->username ?><?php if ($isAdmin) echo ' ― ', _t('admin.user.admin'); ?></legend>
- <form method="post" action="<?= _url('user', 'manage', 'username', $this->username); ?>">
- <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken(); ?>" />
+ <legend><?= $this->username ?><?php if ($isAdmin) echo ' ― ', _t('admin.user.admin'); ?></legend>
+ <form method="post" action="<?= _url('user', 'manage', 'username', $this->username); ?>">
+ <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken(); ?>" />
- <div class="form-group">
- <label class="group-name"><?= _t('admin.user.email') ?></label>
- <div class="group-controls">
- <?= $this->details['mail_login'] ?>
- </div>
- </div>
+ <div class="form-group">
+ <label class="group-name"><?= _t('admin.user.email') ?></label>
+ <div class="group-controls">
+ <?= $this->details['mail_login'] ?>
+ </div>
+ </div>
- <div class="form-group">
- <label class="group-name"><?= _t('admin.user.language') ?></label>
- <div class="group-controls">
- <?= _t("gen.lang.{$this->details['language']}") ?>
- </div>
- </div>
+ <div class="form-group">
+ <label class="group-name"><?= _t('admin.user.language') ?></label>
+ <div class="group-controls">
+ <?= _t("gen.lang.{$this->details['language']}") ?>
+ </div>
+ </div>
- <div class="form-group">
- <label class="group-name"><?= _t('admin.user.feed_count') ?></label>
- <div class="group-controls">
- <?= format_number($this->details['feed_count']) ?>
- </div>
- </div>
+ <div class="form-group">
+ <label class="group-name"><?= _t('admin.user.feed_count') ?></label>
+ <div class="group-controls">
+ <?= format_number($this->details['feed_count']) ?>
+ </div>
+ </div>
- <div class="form-group">
- <label class="group-name"><?= _t('admin.user.article_count') ?></label>
- <div class="group-controls">
- <?= format_number($this->details['article_count']) ?>
- </div>
- </div>
+ <div class="form-group">
+ <label class="group-name"><?= _t('admin.user.article_count') ?></label>
+ <div class="group-controls">
+ <?= format_number($this->details['article_count']) ?>
+ </div>
+ </div>
- <div class="form-group">
- <label class="group-name"><?= _t('admin.user.database_size') ?></label>
- <div class="group-controls">
- <?= format_bytes($this->details['database_size']) ?>
- </div>
- </div>
+ <div class="form-group">
+ <label class="group-name"><?= _t('admin.user.database_size') ?></label>
+ <div class="group-controls">
+ <?= format_bytes($this->details['database_size']) ?>
+ </div>
+ </div>
- <div class="form-group">
- <label class="group-name"><?= _t('admin.user.last_user_activity') ?></label>
- <div class="group-controls">
- <?= $this->details['last_user_activity'] ?>
- </div>
- </div>
+ <div class="form-group">
+ <label class="group-name"><?= _t('admin.user.last_user_activity') ?></label>
+ <div class="group-controls">
+ <?= $this->details['last_user_activity'] ?>
+ </div>
+ </div>
- <div class="form-group">
- <label class="group-name" for="newPasswordPlain"><?= _t('admin.user.password_form') ?></label>
- <div class="group-controls">
- <div class="stick">
- <input type="password" id="newPasswordPlain" name="newPasswordPlain" autocomplete="new-password" pattern=".{7,}" <?= cryptAvailable() ? '' : 'disabled="disabled" ' ?>/>
- <a class="btn toggle-password" data-toggle="password-<?= $this->username; ?>"><?= _i('key') ?></a>
- </div>
- <p class="help"><?= _i('help'); ?> <?= _t('admin.user.password_format') ?></p>
- </div>
- </div>
+ <div class="form-group">
+ <label class="group-name" for="newPasswordPlain"><?= _t('admin.user.password_form') ?></label>
+ <div class="group-controls">
+ <div class="stick">
+ <input type="password" id="newPasswordPlain" name="newPasswordPlain" autocomplete="new-password"
+ pattern=".{7,}" <?= cryptAvailable() ? '' : 'disabled="disabled" ' ?>/>
+ <a class="btn toggle-password" data-toggle="password-<?= $this->username; ?>"><?= _i('key') ?></a>
+ </div>
+ <p class="help"><?= _i('help'); ?> <?= _t('admin.user.password_format') ?></p>
+ </div>
+ </div>
- <div class="form-group form-actions">
- <noscript><b><?= _t('gen.js.should_be_activated'); ?></b></noscript>
- <div class="group-controls">
- <button type="submit" class="btn btn-important" name="action" value="update"><?= _t('gen.action.update') ?></button>
- <button type="submit" class="btn btn-attention confirm" name="action" value="purge"><?= _t('gen.action.purge') ?></button>
- <button type="submit" class="btn btn-attention confirm" name="action" value="delete"><?= _t('gen.action.remove') ?></button>
- <?php if ($isAdmin && !$isDefault): ?>
- <button type="submit" class="btn btn-attention confirm" name="action" value="demote"><?= _t('gen.action.demote') ?></button>
- <?php elseif (!$isAdmin): ?>
- <button type="submit" class="btn btn-attention confirm" name="action" value="promote"><?= _t('gen.action.promote') ?></button>
- <?php endif; ?>
- <?php if ($enabled && !$isDefault): ?>
- <button type="submit" class="btn btn-attention" name="action" value="disable"><?= _t('gen.action.disable') ?></button>
- <?php elseif (!$enabled): ?>
- <button type="submit" class="btn btn-attention" name="action" value="enable"><?= _t('gen.action.enable') ?></button>
- <?php endif; ?>
- <div>
- </div>
- </form>
+ <div class="form-group form-actions">
+ <noscript><b><?= _t('gen.js.should_be_activated'); ?></b></noscript>
+ <div class="group-controls">
+ <button type="submit" class="btn btn-important" name="action" value="update"><?= _t('gen.action.update') ?></button>
+ <button type="submit" class="btn btn-attention confirm" name="action" value="purge"><?= _t('gen.action.purge') ?></button>
+ <button type="submit" class="btn btn-attention confirm" name="action" value="delete"><?= _t('gen.action.remove') ?></button>
+ <?php if ($isAdmin && !$isDefault): ?>
+ <button type="submit" class="btn btn-attention confirm" name="action" value="demote"><?= _t('gen.action.demote') ?></button>
+ <?php elseif (!$isAdmin): ?>
+ <button type="submit" class="btn btn-attention confirm" name="action" value="promote"><?= _t('gen.action.promote') ?></button>
+ <?php endif; ?>
+ <?php if ($enabled && !$isDefault): ?>
+ <button type="submit" class="btn btn-attention" name="action" value="disable"><?= _t('gen.action.disable') ?></button>
+ <?php elseif (!$enabled): ?>
+ <button type="submit" class="btn btn-attention" name="action" value="enable"><?= _t('gen.action.enable') ?></button>
+ <?php endif; ?>
+ <div>
+ </div>
+ </form>
</div>
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index cf053d918..4332562e9 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -13,7 +13,8 @@
<select name="new_user_language" id="new_user_language">
<?php $languages = Minz_Translate::availableLanguages(); ?>
<?php foreach ($languages as $lang) { ?>
- <option value="<?= $lang ?>"<?= FreshRSS_Context::$user_conf->language === $lang ? ' selected="selected"' : '' ?>><?= _t('gen.lang.' . $lang) ?></option>
+ <option value="<?= $lang ?>"<?= FreshRSS_Context::$user_conf->language === $lang ?
+ ' selected="selected"' : '' ?>><?= _t('gen.lang.' . $lang) ?></option>
<?php } ?>
</select>
</div>
@@ -22,7 +23,8 @@
<div class="form-group">
<label class="group-name" for="new_user_name"><?= _t('admin.user.username') ?></label>
<div class="group-controls">
- <input id="new_user_name" name="new_user_name" type="text" size="16" required="required" autocomplete="off" pattern="<?= FreshRSS_user_Controller::USERNAME_PATTERN ?>" placeholder="demo" />
+ <input id="new_user_name" name="new_user_name" type="text" size="16" required="required" autocomplete="off"
+ pattern="<?= FreshRSS_user_Controller::USERNAME_PATTERN ?>" placeholder="demo" />
</div>
</div>
@@ -83,7 +85,7 @@
</thead>
<tbody>
<?php foreach ($this->users as $username => $values) : ?>
- <tr <?php if ($values['is_default']):?>class="default-user"<?php endif; ?>>
+ <tr <?= $values['is_default'] ? 'class="default-user"' : '' ?>>
<td><a href="<?= _url('user', 'details', 'username', $username) ?>"><?= $username ?></a></td>
<td><?= $values['enabled'] ? '✔' : ' ' ?></td>
<td><?= $values['is_admin'] ? '✔' : ' ' ?></td>
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index 9e272b20a..3fc79bb47 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -40,7 +40,8 @@
<label class="group-name" for="newPasswordPlain"><?= _t('conf.profile.password_form') ?></label>
<div class="group-controls">
<div class="stick">
- <input type="password" id="newPasswordPlain" name="newPasswordPlain" autocomplete="new-password" pattern=".{7,}" <?= cryptAvailable() ? '' : 'disabled="disabled" ' ?>/>
+ <input type="password" id="newPasswordPlain" name="newPasswordPlain" autocomplete="new-password"
+ pattern=".{7,}" <?= cryptAvailable() ? '' : 'disabled="disabled" ' ?>/>
<a class="btn toggle-password" data-toggle="newPasswordPlain"><?= _i('key') ?></a>
</div>
<p class="help"><?= _i('help') ?> <?= _t('conf.profile.password_format') ?></p>
@@ -56,7 +57,8 @@
<input type="text" id="token" name="token" value="<?= $token ?>" placeholder="<?= _t('gen.short.blank_to_disable') ?>"<?php
echo FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> data-leave-validation="<?= $token ?>"/>
<p class="help"><?= _i('help') ?> <?= _t('admin.auth.token_help') ?></p>
- <kbd><?= Minz_Url::display(array('a' => 'rss', 'params' => array('user' => Minz_Session::param('currentUser'), 'token' => $token, 'hours' => FreshRSS_Context::$user_conf->since_hours_posts_per_rss)), 'html', true) ?></kbd>
+ <kbd><?= Minz_Url::display(array('a' => 'rss', 'params' => array('user' => Minz_Session::param('currentUser'),
+ 'token' => $token, 'hours' => FreshRSS_Context::$user_conf->since_hours_posts_per_rss)), 'html', true) ?></kbd>
</div>
</div>
<?php } ?>
@@ -78,7 +80,8 @@
<label class="group-name" for="apiPasswordPlain"><?= _t('conf.profile.password_api') ?></label>
<div class="group-controls">
<div class="stick">
- <input type="password" id="apiPasswordPlain" name="apiPasswordPlain" autocomplete="new-password" pattern=".{7,}" <?= cryptAvailable() ? '' : 'disabled="disabled" ' ?>/>
+ <input type="password" id="apiPasswordPlain" name="apiPasswordPlain" autocomplete="new-password"
+ pattern=".{7,}" <?= cryptAvailable() ? '' : 'disabled="disabled" ' ?>/>
<a class="btn toggle-password" data-toggle="apiPasswordPlain"><?= _i('key') ?></a>
</div>
<p class="help"><?= _i('help') ?> <kbd><a href="../api/"><?= Minz_Url::display('/api/', 'html', true) ?></a></kbd></p>