From 75632e70f0d49048f4ce72a0fa8bbcbcd7b2d312 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 29 Aug 2019 12:02:05 +0200 Subject: Provide email address verification feature (#2481) * Add an email field to the profile page I reuse the `mail_login` from the configuration. I'm not sure if it's useful today (I would say it was used when Persona login was available). A good improvement would be to rename `mail_login` into `email` so it would be more intuitive to use. * Add boolean to the conf to force email validation This commit only adds a configuration item. * Add email during registration if email must be validated * Set email token to validate when email changes * Block access to FreshRSS if email is not validated * Send email when address is changed * Allow to resend the validation email * Allow the user to change its email while blocked * Document the email validation feature * fixup! Allow the user to change its email while blocked * tec: Autoload PHPMailer lib * Validate email address format * Add feedback on validation email resend action * Allow to logout when user is blocked * fix: Change default email "from" * Reorganize i18n keys * Complete all the locales with default english * Hide sidebar (profile page) if email is not validated * Check email requirements on registration * Allow admin to specify email when creating users * Don't check email format if value is empty * Remove trailing comma in userController Co-Authored-By: Alexandre Alapetite * Set PHPMailer validator to html5 before sending email * fixup! Remove trailing comma in userController --- app/layout/simple.phtml | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 app/layout/simple.phtml (limited to 'app/layout/simple.phtml') diff --git a/app/layout/simple.phtml b/app/layout/simple.phtml new file mode 100644 index 000000000..5546966be --- /dev/null +++ b/app/layout/simple.phtml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + +

+ + + render(); ?> +

+ +notification)) { + $msg = $this->notification['content']; + $status = $this->notification['type']; + + invalidateHttpCache(); + } +?> +

+ + +

+ + + -- cgit v1.2.3 From 84f9311fd53f5fa58ae55986ece9bfa7dac455c1 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 29 Aug 2019 18:08:43 +0200 Subject: fix: Fix "validate email"-related issues (#2512) * fix: Make sure $disable_aside is initialized There was a warning for an uninitialized variable, hidden in production but visible in development mode. * fix: Allow to delete account when email isn't validated --- app/Controllers/userController.php | 1 + app/FreshRSS.php | 4 +++- app/layout/simple.phtml | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'app/layout/simple.phtml') diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php index 9e909a3b5..a1d649c0a 100644 --- a/app/Controllers/userController.php +++ b/app/Controllers/userController.php @@ -123,6 +123,7 @@ class FreshRSS_user_Controller extends Minz_ActionController { } $email_not_verified = FreshRSS_Context::$user_conf->email_validation_token !== ''; + $this->view->disable_aside = false; if ($email_not_verified) { $this->view->_layout('simple'); $this->view->disable_aside = true; diff --git a/app/FreshRSS.php b/app/FreshRSS.php index c48ad2093..d472a2147 100644 --- a/app/FreshRSS.php +++ b/app/FreshRSS.php @@ -153,7 +153,9 @@ class FreshRSS extends Minz_FrontController { Minz_Request::is('user', 'validateEmail') || Minz_Request::is('user', 'sendValidationEmail') || Minz_Request::is('user', 'profile') || - Minz_Request::is('auth', 'logout') + Minz_Request::is('user', 'delete') || + Minz_Request::is('auth', 'logout') || + Minz_Request::is('javascript', 'nonce') ); if ($email_not_verified && !$action_is_allowed) { Minz_Request::forward(array( diff --git a/app/layout/simple.phtml b/app/layout/simple.phtml index 5546966be..b62e35988 100644 --- a/app/layout/simple.phtml +++ b/app/layout/simple.phtml @@ -5,6 +5,9 @@ + -- cgit v1.2.3 From 7a5236de3f13f08b8c51eb183c0dcf1c8c85beca Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 23 Oct 2019 11:18:20 +0200 Subject: Take advantage of PHP 5.4+ short echo (#2585) * Take advantage of PHP 5.4+ short echo https://php.net/migration54.new-features thanks to https://github.com/FreshRSS/FreshRSS/pull/2495 Use `` instead of `` 10kB of code saved :-) Done with regular expression: ``` <\?php echo (.+?);? *\?> ``` * Try Travis fix https://github.com/squizlabs/PHP_CodeSniffer/issues/2045#issuecomment-395238272 --- app/install.php | 190 +++++++++++----------- app/layout/aside_configure.phtml | 52 +++--- app/layout/aside_feed.phtml | 68 ++++---- app/layout/aside_stats.phtml | 14 +- app/layout/aside_subscription.phtml | 14 +- app/layout/header.phtml | 72 ++++---- app/layout/layout.phtml | 28 ++-- app/layout/nav_entries.phtml | 6 +- app/layout/nav_menu.phtml | 80 ++++----- app/layout/simple.phtml | 34 ++-- app/views/auth/formLogin.phtml | 22 +-- app/views/auth/index.phtml | 40 ++--- app/views/auth/register.phtml | 28 ++-- app/views/configure/archiving.phtml | 46 +++--- app/views/configure/display.phtml | 104 ++++++------ app/views/configure/queries.phtml | 60 +++---- app/views/configure/reading.phtml | 126 +++++++------- app/views/configure/sharing.phtml | 50 +++--- app/views/configure/shortcut.phtml | 114 ++++++------- app/views/configure/system.phtml | 46 +++--- app/views/error/index.phtml | 6 +- app/views/extension/index.phtml | 38 ++--- app/views/feed/add.phtml | 58 +++---- app/views/helpers/category/update.phtml | 32 ++-- app/views/helpers/extension/configure.phtml | 8 +- app/views/helpers/extension/details.phtml | 12 +- app/views/helpers/feed/update.phtml | 160 +++++++++--------- app/views/helpers/index/normal/entry_bottom.phtml | 38 ++--- app/views/helpers/index/normal/entry_header.phtml | 12 +- app/views/helpers/logs_pagination.phtml | 12 +- app/views/helpers/pagination.phtml | 16 +- app/views/importExport/index.phtml | 36 ++-- app/views/index/about.phtml | 26 +-- app/views/index/global.phtml | 16 +- app/views/index/logs.phtml | 14 +- app/views/index/normal.phtml | 24 +-- app/views/index/reader.phtml | 28 ++-- app/views/index/rss.phtml | 22 +-- app/views/index/tos.phtml | 10 +- app/views/stats/idle.phtml | 18 +- app/views/stats/index.phtml | 60 +++---- app/views/stats/repartition.phtml | 34 ++-- app/views/subscription/bookmarklet.phtml | 20 +-- app/views/subscription/feed.phtml | 4 +- app/views/subscription/index.phtml | 70 ++++---- app/views/update/apply.phtml | 4 +- app/views/update/checkInstall.phtml | 18 +- app/views/update/index.phtml | 18 +- app/views/user/manage.phtml | 66 ++++---- app/views/user/profile.phtml | 68 ++++---- app/views/user/validateEmail.phtml | 12 +- app/views/user_mailer/email_need_validation.txt | 6 +- docs/en/developers/03_Backend/05_Extensions.md | 6 +- docs/fr/developers/03_Backend/05_Extensions.md | 6 +- phpcs.xml | 4 +- 55 files changed, 1089 insertions(+), 1087 deletions(-) (limited to 'app/layout/simple.phtml') diff --git a/app/install.php b/app/install.php index f8bc6dd4e..96bee34a1 100644 --- a/app/install.php +++ b/app/install.php @@ -334,18 +334,18 @@ function printStep0() { $languages = Minz_Translate::availableLanguages(); ?> -

- +

@@ -354,10 +354,10 @@ function printStep0() {

- - + + - +

@@ -369,118 +369,118 @@ function printStep0() { function printStep1() { $res = checkRequirements(); ?> - + -

- - + + - + -

- - + + - +

@@ -576,23 +576,23 @@ function printStep3() { $user_default_config = Minz_Configuration::get('default_user'); ?> -

- +

- tabindex="5" /> - + tabindex="5" /> +

- - + +

- - + + - +

@@ -635,14 +635,14 @@ function printStep3() { function printStep4() { ?> -

- +

+ -

- <?php echo _t('install.title'); ?> - - + <?= _t('install.title') ?> + +

@@ -729,6 +729,6 @@ case 5: ?>

- + diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml index 747858f4e..1267f747c 100644 --- a/app/layout/aside_configure.phtml +++ b/app/layout/aside_configure.phtml @@ -1,54 +1,54 @@

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index 637acf4a4..4d5682001 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -8,30 +8,30 @@ } ?> -

- +

- - + +

- + - +

+
- +
+
- +
+
- - + +
-
- +
- - - name(); ?> + + name() ?>
  -
  - ❌
  - + form="mark-read-aside" formaction="" + type="submit">
  @@ -112,21 +112,21 @@ - - - - + + + + - + allow_referrer) { ?> - + rss_title)) { @@ -29,14 +29,14 @@ $url_rss['params']['hours'] = FreshRSS_Context::$user_conf->since_hours_posts_per_rss; } ?> - + allow_robots) { ?> - + - + partial('header'); @@ -62,9 +62,9 @@ invalidateHttpCache(); } ?> -
  - - +
  + +
  diff --git a/app/layout/nav_entries.phtml b/app/layout/nav_entries.phtml index ca6849193..cbc514737 100644 --- a/app/layout/nav_entries.phtml +++ b/app/layout/nav_entries.phtml @@ -1,5 +1,5 @@
  \ No newline at end of file diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index af7267bac..da33d3e20 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -9,7 +9,7 @@
  - + @@ -27,28 +27,28 @@ $url_state = Minz_Request::currentRequest(); $url_state['params']['state'] = FreshRSS_Context::getRevertState($state); ?> - +
  - +
  
  ❌
  
  - - + +
  queries as $query) { ?>
  - +
  @@ -61,7 +61,7 @@ $url_query['c'] = 'configure'; $url_query['a'] = 'addQuery'; ?> -
  
  +
  @@ -96,24 +96,24 @@
  reading_confirm ? 'confirm" disabled="disabled' : ''; ?> - + formaction="" + type="submit">
  - +
  - +
  
  ❌
  
  - + formaction="" + type="submit">
  
  - + formaction="" + type="submit">
  
  - + formaction="" + type="submit">
  
  - + formaction="" + type="submit">
  @@ -158,8 +158,8 @@ /** @var FreshRSS_ReadingMode $mode */ foreach ($readingModes as $mode) { ?> - - getName(); ?> + + getName() ?> since_hours_posts_per_rss; } ?> - - + +
  - + + echo htmlspecialchars(htmlspecialchars_decode(FreshRSS_Context::$search, ENT_QUOTES), ENT_COMPAT, 'UTF-8'); ?>" placeholder="" /> - + - + - +
  @@ -215,11 +215,11 @@ $url_order = Minz_Request::currentRequest(); $url_order['params']['order'] = $order; ?> - - + + allow_anonymous_refresh) { ?> - +
  diff --git a/app/layout/simple.phtml b/app/layout/simple.phtml index b62e35988..89fe69005 100644 --- a/app/layout/simple.phtml +++ b/app/layout/simple.phtml @@ -1,24 +1,24 @@ - + - + - - - - + + + + - + - + @@ -27,9 +27,9 @@
  
  - - - title; ?> + + + title ?>
  
  @@ -38,10 +38,10 @@
  - - + + - () + ()
  @@ -60,9 +60,9 @@ invalidateHttpCache(); } ?> -
  - - +
  + +
  diff --git a/app/views/auth/formLogin.phtml b/app/views/auth/formLogin.phtml index 01d1d4736..ecac7aced 100644 --- a/app/views/auth/formLogin.phtml +++ b/app/views/auth/formLogin.phtml @@ -1,33 +1,33 @@
  -
  +
  - + -
  - + +
  - - + +
  
  - +
  - +
  
  - cookie_days); ?> + cookie_days) ?>
  
  - +
  
  -
  +
  
  diff --git a/app/views/auth/index.phtml b/app/views/auth/index.phtml index 20966f24e..c1cf95b2b 100644 --- a/app/views/auth/index.phtml +++ b/app/views/auth/index.phtml @@ -1,22 +1,22 @@ partial('aside_configure'); ?>
  - + -
  - - + + +
  - +
  - auth_type, array('form', 'http_auth', 'none'))) { ?> - - - + + +
  
  @@ -25,8 +25,8 @@
  allow_anonymous ? ' checked="checked"' : '', - FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> data-leave-validation="allow_anonymous; ?>"/> - default_user); ?> + FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> data-leave-validation="allow_anonymous ?>"/> + default_user) ?>
  
  @@ -35,8 +35,8 @@
  allow_anonymous_refresh ? ' checked="checked"' : '', - FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> data-leave-validation="allow_anonymous_refresh; ?>"/> - + FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> data-leave-validation="allow_anonymous_refresh ?>"/> +
  
  @@ -45,9 +45,9 @@
  unsafe_autologin_enabled ? ' checked="checked"' : '', - FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> data-leave-validation="unsafe_autologin_enabled; ?>"/> - - 'auth', 'a' => 'login', 'params' => array('u' => 'alice', 'p' => '1234')), 'html', true); ?> + FreshRSS_Auth::accessNeedsAction() ? '' : ' disabled="disabled"'; ?> data-leave-validation="unsafe_autologin_enabled ?>"/> + + 'auth', 'a' => 'login', 'params' => array('u' => 'alice', 'p' => '1234')), 'html', true) ?>
  
  @@ -56,16 +56,16 @@
  api_enabled ? ' checked="checked"' : '', - FreshRSS_Auth::accessNeedsLogin() ? '' : ' disabled="disabled"'; ?> data-leave-validation="api_enabled; ?>"/> - + FreshRSS_Auth::accessNeedsLogin() ? '' : ' disabled="disabled"'; ?> data-leave-validation="api_enabled ?>"/> +

- - + +

diff --git a/app/views/auth/register.phtml b/app/views/auth/register.phtml index b90950510..4233f7fd4 100644 --- a/app/views/auth/register.phtml +++ b/app/views/auth/register.phtml @@ -1,36 +1,36 @@

diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml index 0387a2b96..7d76e4dcc 100644 --- a/app/views/configure/archiving.phtml +++ b/app/views/configure/archiving.phtml @@ -1,17 +1,17 @@ partial('aside_configure'); ?>

- + -

- - -

+ + + +

- +

- () + ?> ()

@@ -94,7 +94,7 @@

- +

@@ -102,46 +102,46 @@

- - + +

- - -

- +

- size_total); ?> + size_total) ?>

diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml index 60b7748c5..c1cfecc2a 100644 --- a/app/views/configure/display.phtml +++ b/app/views/configure/display.phtml @@ -1,47 +1,47 @@ partial('aside_configure'); ?>

- + -

- - + + +

- +

- - +

- +

- +

- ‹ + ‹ - › + ›

-
-
-
+
+
+

- +

- + - - -

- + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - - + + + + + - - + +


	topline_read ? ' checked="checked"' : ''; ?> data-leave-validation="topline_read; ?>"/>	topline_favorite ? ' checked="checked"' : ''; ?> data-leave-validation="topline_favorite; ?>"/>		topline_read ? ' checked="checked"' : '' ?> data-leave-validation="topline_read ?>"/>	topline_favorite ? ' checked="checked"' : '' ?> data-leave-validation="topline_favorite ?>"/>			topline_display_authors ? ' checked="checked"' : ''; ?> data-leave-validation="topline_display_authors; ?>"/>	topline_date ? ' checked="checked"' : ''; ?> data-leave-validation="topline_date; ?>"/>	topline_link ? ' checked="checked"' : ''; ?> data-leave-validation="topline_link; ?>"/>	topline_display_authors ? ' checked="checked"' : '' ?> data-leave-validation="topline_display_authors ?>"/>	topline_date ? ' checked="checked"' : '' ?> data-leave-validation="topline_date ?>"/>	topline_link ? ' checked="checked"' : '' ?> data-leave-validation="topline_link ?>"/>
	bottomline_read ? ' checked="checked"' : ''; ?> data-leave-validation="bottomline_read; ?>"/>	bottomline_favorite ? ' checked="checked"' : ''; ?> data-leave-validation="bottomline_favorite; ?>"/>	bottomline_tags ? ' checked="checked"' : ''; ?> data-leave-validation="bottomline_tags; ?>"/>	bottomline_sharing ? ' checked="checked"' : ''; ?> data-leave-validation="bottomline_sharing; ?>"/>		bottomline_read ? ' checked="checked"' : '' ?> data-leave-validation="bottomline_read ?>"/>	bottomline_favorite ? ' checked="checked"' : '' ?> data-leave-validation="bottomline_favorite ?>"/>	bottomline_tags ? ' checked="checked"' : '' ?> data-leave-validation="bottomline_tags ?>"/>	bottomline_sharing ? ' checked="checked"' : '' ?> data-leave-validation="bottomline_sharing ?>"/>		bottomline_date ? ' checked="checked"' : ''; ?> data-leave-validation="bottomline_date; ?>"/>	bottomline_link ? ' checked="checked"' : ''; ?> data-leave-validation="bottomline_link; ?>"/>	bottomline_date ? ' checked="checked"' : '' ?> data-leave-validation="bottomline_date ?>"/>	bottomline_link ? ' checked="checked"' : '' ?> data-leave-validation="bottomline_link ?>"/>

- +

- show_nav_buttons ? ' checked="checked"' : ''; ?> data-leave-validation="show_nav_buttons; ?>"/> - + show_nav_buttons ? ' checked="checked"' : '' ?> data-leave-validation="show_nav_buttons ?>"/> +

- - + +

- + -

- - + + + queries as $key => $query) { ?> -

'> - - + + sharing as $key => $share_options) { $share = FreshRSS_Share::get($share_options['type']); $share->update($share_options); ?> -

- - + +

diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml index 412ea676d..4412266cc 100644 --- a/app/views/configure/shortcut.phtml +++ b/app/views/configure/shortcut.phtml @@ -1,181 +1,181 @@ partial('aside_configure'); ?>

- + list_keys as $key) { ?> - shortcuts; ?> -

- - + + + - + - +

- +

- + -

- +

- - + +

- +

- - + +

- +

- - + +

- +

- - + +

diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml index eb0e68dfc..1a718e20f 100644 --- a/app/views/configure/system.phtml +++ b/app/views/configure/system.phtml @@ -1,31 +1,31 @@ partial('aside_configure'); ?>

- + -

- +

- - + +

diff --git a/app/views/error/index.phtml b/app/views/error/index.phtml index 8fd74e8bf..d5618d54c 100644 --- a/app/views/error/index.phtml +++ b/app/views/error/index.phtml @@ -1,9 +1,9 @@

code; ?>

code ?>

- errorMessage, ENT_NOQUOTES, 'UTF-8'); ?>
- + errorMessage, ENT_NOQUOTES, 'UTF-8') ?>
+

diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml index 6439a0333..f5c5bf032 100644 --- a/app/views/extension/index.phtml +++ b/app/views/extension/index.phtml @@ -1,14 +1,14 @@ partial('aside_configure'); ?>

- + -

available_extensions)) { ?> -

- - - - + + + + available_extensions as $ext) { ?> - - - + + +

- + extensions_installed[$ext['name']])) { ?> extensions_installed[$ext['name']], $ext['version']) >= 0) { ?> - + extensions_installed[$ext['name']] != $ext['version']) { ?> - + @@ -69,8 +69,8 @@ extension) ? ' class="active"' : ''; ?> -> -

> +> +

> extension)) { $this->renderHelper('extension/configure'); diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml index 340970b25..e39f45a86 100644 --- a/app/views/feed/add.phtml +++ b/app/views/feed/add.phtml @@ -1,90 +1,90 @@ feed) { ?>

load_ok) { ?> -

- - + + + load_ok) { ?>

- +

- feed->name() ; ?> + feed->name() ?>

feed->description(); if ($desc != '') { ?>

- +

- feed->website(); ?> - + feed->website() ?> +

- +

- - + +

- +

- + feed->httpAuth(false); ?>

- +

- - + +

diff --git a/app/views/helpers/category/update.phtml b/app/views/helpers/category/update.phtml index 31482f163..6a4c041ba 100644 --- a/app/views/helpers/category/update.phtml +++ b/app/views/helpers/category/update.phtml @@ -1,17 +1,17 @@

category->name(); ?>

category->name() ?>

- +

- - + + +

- +

- category->id() == FreshRSS_CategoryDAO::DEFAULTCATEGORYID ? 'disabled="disabled"' : ''; ?> /> @@ -20,21 +20,21 @@

- + + data-str-confirm="" + formaction="category->id()) ?>" + formmethod="post"> category->isDefault()): ?> + data-str-confirm="" + formaction="category->id()) ?>" + formmethod="post">

- + category->attributes('archiving'); if (empty($archiving)) { @@ -138,7 +138,7 @@

- +

diff --git a/app/views/helpers/extension/configure.phtml b/app/views/helpers/extension/configure.phtml index cde872aa0..cb6ebd6bb 100644 --- a/app/views/helpers/extension/configure.phtml +++ b/app/views/helpers/extension/configure.phtml @@ -1,19 +1,19 @@

- extension->getName(); ?> (extension->getVersion(); ?>) — + extension->getName() ?> (extension->getVersion() ?>) — extension->isEnabled() ? _t('admin.extensions.enabled') : _t('admin.extensions.disabled'); ?>

extension->getDescription(); ?> — extension->getAuthor(); ?>

extension->getDescription() ?> — extension->getAuthor() ?>

extension->getConfigureView(); if ($configure_view !== false) { echo $configure_view; } else { ?> -

diff --git a/app/views/helpers/extension/details.phtml b/app/views/helpers/extension/details.phtml index acba4e816..ed9674e3d 100644 --- a/app/views/helpers/extension/details.phtml +++ b/app/views/helpers/extension/details.phtml @@ -3,19 +3,19 @@ ext_details->getType() === 'user' || FreshRSS_Auth::hasAccess('admin')) { ?> ext_details->getName()); ?>

- + ext_details->isEnabled()) { ?> - + - + - +

- + -

ext_details->getName(); ?>

ext_details->getName() ?>

diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml index 84461ed03..e5f186956 100644 --- a/app/views/helpers/feed/update.phtml +++ b/app/views/helpers/feed/update.phtml @@ -1,99 +1,99 @@

feed->name(); ?>

feed->name() ?>

- - - + + +

feed->description(); ?>

feed->description() ?>

feed->nbEntries(); ?> feed->inError()) { ?> -

- - - + + +

- +

- - + +

- +

- - + +

- +

- - + + + data-str-confirm="" + formaction="feed->id()) ?>" + formmethod="post">

- +

- - - + + +

@@ -201,14 +201,14 @@

- +

- feed->mute() ? ' checked="checked"' : ''; ?> /> - + feed->mute() ? ' checked="checked"' : '' ?> /> +

- +

- feed->pubSubHubbubEnabled() ? ' checked="checked"' : ''; ?> /> + feed->pubSubHubbubEnabled() ? ' checked="checked"' : '' ?> />

- - - + + +

- + feed->httpAuth(false); ?>

- +

- - + +

- +

- - + +

- +

- - + +

- +

- feed->attributes('clear_cache') ? ' checked="checked"' : ''; ?> /> + feed->attributes('clear_cache') ? ' checked="checked"' : '' ?> />

- +

- - + +

diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml index c0edbdf7d..dd84ca346 100644 --- a/app/views/helpers/index/normal/entry_bottom.phtml +++ b/app/views/helpers/index/normal/entry_bottom.phtml @@ -19,7 +19,7 @@ if ($this->entry->isRead()) { $arUrl['params']['is_read'] = 0; } - ?>entry->isRead() ? 'read' : 'unread'); ?>entry->isFavorite()) { $arUrl['params']['is_favorite'] = 0; } - ?>entry->isFavorite() ? 'starred' : 'non-starred'); ?>

@@ -70,10 +70,10 @@ ?>

entry->isFavorite()) { $arUrl['params']['is_favorite'] = 0; } - ?>entry->isFavorite() ? 'starred' : 'non-starred'); ?>

entry->authors(); @@ -42,6 +42,6 @@ ?>

entry->date(); ?>

entry->date() ?>

diff --git a/app/views/helpers/logs_pagination.phtml b/app/views/helpers/logs_pagination.phtml index bf9d91f04..e74074173 100755 --- a/app/views/helpers/logs_pagination.phtml +++ b/app/views/helpers/logs_pagination.phtml @@ -9,14 +9,14 @@ currentPage - 1; ?> @@ -24,9 +24,9 @@ 0 && $i <= $this->nbPage) { ?> currentPage) { ?> - + - + @@ -34,13 +34,13 @@ currentPage + 1; ?> nbPage; ?> diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml index fc37ce3f5..b7d62ceab 100755 --- a/app/views/helpers/pagination.phtml +++ b/app/views/helpers/pagination.phtml @@ -18,26 +18,26 @@ ?>

- +

- - + + -
+

- + - - - + + +

- +

@@ -17,30 +17,30 @@

- +

feeds) > 0) { ?> -

- - + + +

- + - /> - + /> + - /> - + /> + feeds)) .'" multiple="multiple"'; } ?> - size="10"> + ' ?> feeds as $feed) { ?> - +

@@ -60,7 +60,7 @@

- +

diff --git a/app/views/index/about.phtml b/app/views/index/about.phtml index 649729952..320847886 100644 --- a/app/views/index/about.phtml +++ b/app/views/index/about.phtml @@ -1,26 +1,26 @@

- + -

diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml index 2f25b6dc2..a49e16525 100644 --- a/app/views/index/global.phtml +++ b/app/views/index/global.phtml @@ -9,7 +9,7 @@ } ?> -

name(); ?>

name() ?>

- - name(); ?> +
+ + name() ?>

@@ -51,7 +51,7 @@

- +

display_posts ? '' : ' class="hide_posts"'; ?>> +

display_posts ? '' : ' class="hide_posts"' ?>>

diff --git a/app/views/index/logs.phtml b/app/views/index/logs.phtml index a88f89278..2deb1c315 100644 --- a/app/views/index/logs.phtml +++ b/app/views/index/logs.phtml @@ -1,11 +1,11 @@

- + -

- logsPaginator->items(); ?> @@ -15,12 +15,12 @@ logsPaginator->render('logs_pagination.phtml', 'page'); ?> -

date())); ?>info(), ENT_NOQUOTES, 'UTF-8'); ?>

date())) ?>info(), ENT_NOQUOTES, 'UTF-8') ?>

logsPaginator->render('logs_pagination.phtml','page'); ?>

diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml index ac2ea812d..f556df201 100644 --- a/app/views/index/normal.phtml +++ b/app/views/index/normal.phtml @@ -14,9 +14,9 @@ if (!empty($this->entries)) { $today = @strtotime('today'); ?> -

- +

entries as $item) { $this->entry = Minz_ExtensionManager::callHook('entry_before_display', $item); @@ -36,23 +36,23 @@ if (!empty($this->entries)) { if ($display_today && $this->entry->isDay(FreshRSS_Days::TODAY, $today)) { ?>

— —

entry->isDay(FreshRSS_Days::YESTERDAY, $today)) { ?>

— —

entry->isDay(FreshRSS_Days::BEFORE_YESTERDAY, $today)) { ?>

entries)) { $this->renderHelper('index/normal/entry_header'); ?>

entry->title(); ?>

entry->title() ?>

entry->authors(); if (is_array($authors)): @@ -75,7 +75,7 @@ if (!empty($this->entries)) { echo $first ? _t('gen.short.by_author') . ' ' : '· '; $first = false; ?> - +

entries)) {

-

+

diff --git a/app/views/index/reader.phtml b/app/views/index/reader.phtml index 129fae937..bbb6bd22b 100644 --- a/app/views/index/reader.phtml +++ b/app/views/index/reader.phtml @@ -9,16 +9,16 @@ if (!empty($this->entries)) {

- +

entries as $item) { $item = Minz_ExtensionManager::callHook('entry_before_display', $item); if (is_null($item)) { continue; } - ?>

+ ?>

categories, $item->feed()); //We most likely already have the feed object in cache if (empty($feed)) $feed = $item->feed(true); @@ -31,16 +31,16 @@ if (!empty($this->entries)) { $readUrl['params']['is_read'] = 0; } ?> - - isRead() ? 'read' : 'unread'); ?> + + isRead() ? 'read' : 'unread') ?> - - isFavorite() ? 'starred' : 'non-starred'); ?> + + isFavorite() ? 'starred' : 'non-starred') ?> - -

name(); ?> + +

name() ?> -

title(); ?>

title() ?>

authors(); @@ -50,7 +50,7 @@ if (!empty($this->entries)) { echo $first ? _t('gen.short.by_author') . ' ' : '· '; $first = false; ?> - + entries)) { echo $item->date(); ?>

- content(); ?> + content() ?>

@@ -69,7 +69,7 @@ if (!empty($this->entries)) {

-

+

diff --git a/app/views/index/rss.phtml b/app/views/index/rss.phtml index dcfaa0a57..00be01c28 100755 --- a/app/views/index/rss.phtml +++ b/app/views/index/rss.phtml @@ -1,18 +1,18 @@ -'; ?> +'; ?> - <?php echo $this->rss_title; ?> - - rss_title); ?> - - GMT - + <?= $this->rss_title ?> + + rss_title) ?> + + GMT + entries as $item) { ?> - <?php echo $item->title(); ?> - link(); ?> + <?= $item->title() ?> + link() ?> authors(); if (is_array($authors)) { @@ -30,8 +30,8 @@ foreach ($this->entries as $item) { content(); ?>]]> - date(true)); ?> - id(); ?> + date(true)) ?> + id() ?> diff --git a/app/views/index/tos.phtml b/app/views/index/tos.phtml index 1b3498134..38dd0add6 100644 --- a/app/views/index/tos.phtml +++ b/app/views/index/tos.phtml @@ -1,13 +1,13 @@

can_register) { ?> - - + + - - + + - terms_of_service; ?> + terms_of_service ?>

diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml index 88c78d465..9421893fb 100644 --- a/app/views/stats/idle.phtml +++ b/app/views/stats/idle.phtml @@ -1,9 +1,9 @@ partial('aside_stats'); ?>

- + -

diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml index 2ff3e6c52..4af197c5b 100644 --- a/app/views/stats/index.phtml +++ b/app/views/stats/index.phtml @@ -1,63 +1,63 @@ partial('aside_stats'); ?>

- + -

- - + + - - - + + + - - - + + + - - - + + + - - - + + +


repartition['main_stream']['total']); ?>	repartition['all_feeds']['total']); ?>	repartition['main_stream']['total']) ?>	repartition['all_feeds']['total']) ?>
repartition['main_stream']['count_reads']); ?>	repartition['all_feeds']['count_reads']); ?>	repartition['main_stream']['count_reads']) ?>	repartition['all_feeds']['count_reads']) ?>
repartition['main_stream']['count_unreads']); ?>	repartition['all_feeds']['count_unreads']); ?>	repartition['main_stream']['count_unreads']) ?>	repartition['all_feeds']['count_unreads']) ?>
repartition['main_stream']['count_favorites']); ?>	repartition['all_feeds']['count_favorites']); ?>	repartition['main_stream']['count_favorites']) ?>	repartition['all_feeds']['count_favorites']) ?>

- - - - + + + + topFeed as $feed) { ?> - - - - + + + + @@ -65,18 +65,18 @@

@@ -90,4 +90,4 @@ echo htmlspecialchars(json_encode(array( 'entryByCategory' => $this->entryByCategory, ), JSON_UNESCAPED_UNICODE), ENT_NOQUOTES, 'UTF-8'); ?> - + diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml index 4bce418c9..7b445a7cc 100644 --- a/app/views/stats/repartition.phtml +++ b/app/views/stats/repartition.phtml @@ -1,12 +1,12 @@ partial('aside_stats'); ?>

- + -

feed) {?> - - + +


			repartition['all_feeds']['total'] * 100, 1);?>				repartition['all_feeds']['total'] * 100, 1) ?>

- - - - + + + + - - - - + + + +


repartition['total']; ?>	repartition['count_reads']; ?>	repartition['count_unreads']; ?>	repartition['count_favorites']; ?>	repartition['total'] ?>	repartition['count_reads'] ?>	repartition['count_unreads'] ?>	repartition['count_favorites'] ?>

averageHour); ?>

averageHour) ?>

averageDayOfWeek); ?>

averageDayOfWeek) ?>

averageMonth); ?>

averageMonth) ?>

@@ -71,4 +71,4 @@ echo htmlspecialchars(json_encode(array( 'months' => $this->months, ), JSON_UNESCAPED_UNICODE), ENT_NOQUOTES, 'UTF-8'); ?> - + diff --git a/app/views/subscription/bookmarklet.phtml b/app/views/subscription/bookmarklet.phtml index 76ac700e0..385ce8cea 100644 --- a/app/views/subscription/bookmarklet.phtml +++ b/app/views/subscription/bookmarklet.phtml @@ -1,17 +1,17 @@ partial('aside_subscription'); ?>

- + - -

- + +

+ - -

browser.contentHandlers.types.number.uri →  'feed', 'a' => 'add'), 'html', true); ?>&url_rss=%s

+ +

browser.contentHandlers.types.number.uri →  'feed', 'a' => 'add'), 'html', true) ?>&url_rss=%s

- -

 'feed', 'a' => 'add'), 'html', true); ?>&url_rss=%s

+ +

 'feed', 'a' => 'add'), 'html', true) ?>&url_rss=%s

\ No newline at end of file diff --git a/app/views/subscription/feed.phtml b/app/views/subscription/feed.phtml index 60664fdee..1a167777f 100644 --- a/app/views/subscription/feed.phtml +++ b/app/views/subscription/feed.phtml @@ -9,7 +9,7 @@ if ($this->feed) { } else { ?>

- - + +

diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml index 20f72ad66..da7593a8d 100644 --- a/app/views/subscription/index.phtml +++ b/app/views/subscription/index.phtml @@ -1,77 +1,77 @@ partial('aside_subscription'); ?>

- + -

- - + +

- + - +

- default_category->name()); ?> + default_category->name()) ?>

onlyFeedsWithError): ?>

- +

- - name(); ?> + + name() ?>

- - name(); ?> + + name() ?>

@@ -111,16 +111,16 @@

displaySlider ? ' class="active"' : ''; ?> -> -

> +> +

> feed)) { $this->renderHelper('feed/update'); diff --git a/app/views/update/apply.phtml b/app/views/update/apply.phtml index 8221929ae..c5e6884db 100644 --- a/app/views/update/apply.phtml +++ b/app/views/update/apply.phtml @@ -1,9 +1,9 @@ partial('aside_configure'); ?>

- + -

diff --git a/app/views/update/checkInstall.phtml b/app/views/update/checkInstall.phtml index 7ebbae869..183f914c0 100644 --- a/app/views/update/checkInstall.phtml +++ b/app/views/update/checkInstall.phtml @@ -1,12 +1,12 @@ partial('aside_configure'); ?>

- + -

status_php as $key => $status) { ?> -

status_files as $key => $status) { ?> -

- +

status_database as $key => $status) { ?> -

- +

*/ ?> diff --git a/app/views/update/index.phtml b/app/views/update/index.phtml index 0599d5b0d..041941e39 100644 --- a/app/views/update/index.phtml +++ b/app/views/update/index.phtml @@ -1,16 +1,16 @@ partial('aside_configure'); ?>

- + -

- +

- last_update_time); ?> + last_update_time) ?>

message)) { ?> @@ -28,9 +28,9 @@ break; } ?> -

- message['title']; ?> - message['body']; ?> +

+ message['title'] ?> + message['body'] ?>

@@ -38,11 +38,11 @@ if (empty($this->message) || $this->message['status'] !== 'good') { ?>

- +

update_to_apply) { ?> - +

diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml index 501257e5b..93d1008b5 100644 --- a/app/views/user/manage.phtml +++ b/app/views/user/manage.phtml @@ -1,35 +1,35 @@ partial('aside_configure'); ?>

- + -

- - + + +

- +

show_email_field) { ?>

- +

@@ -38,72 +38,72 @@

- +

- - + +

- -

- - + + +

- +

@@ -115,7 +115,7 @@

- +

diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml index de717b36e..b8bb5cee9 100644 --- a/app/views/user/profile.phtml +++ b/app/views/user/profile.phtml @@ -5,16 +5,16 @@ ?>

- + -

- +

- /> - + /> +

- - + +

api_enabled) { ?>

- +

- /> - + /> +

- +

- + token; ?>

- data-leave-validation=""/> - - 'rss', 'params' => array('user' => Minz_Session::param('currentUser'), 'token' => $token, 'hours' => FreshRSS_Context::$user_conf->since_hours_posts_per_rss)), 'html', true); ?> + data-leave-validation=""/> + + 'rss', 'params' => array('user' => Minz_Session::param('currentUser'), 'token' => $token, 'hours' => FreshRSS_Context::$user_conf->since_hours_posts_per_rss)), 'html', true) ?>

- - + +

diff --git a/app/views/user/validateEmail.phtml b/app/views/user/validateEmail.phtml index 51517f5eb..e525b1b6b 100644 --- a/app/views/user/validateEmail.phtml +++ b/app/views/user/validateEmail.phtml @@ -1,22 +1,22 @@

- title); ?> + title) ?>

- mail_login); ?> + mail_login) ?>

- +

diff --git a/app/views/user_mailer/email_need_validation.txt b/app/views/user_mailer/email_need_validation.txt index 13b63c1af..c1f4d9911 100644 --- a/app/views/user_mailer/email_need_validation.txt +++ b/app/views/user_mailer/email_need_validation.txt @@ -1,5 +1,5 @@ -username); ?> +username) ?> -site_title); ?> +site_title) ?> -validation_url; ?> +validation_url ?> diff --git a/docs/en/developers/03_Backend/05_Extensions.md b/docs/en/developers/03_Backend/05_Extensions.md index 0cfa5c8b7..4610e4b90 100644 --- a/docs/en/developers/03_Backend/05_Extensions.md +++ b/docs/en/developers/03_Backend/05_Extensions.md @@ -74,7 +74,7 @@ As explained above, the views consist of HTML mixed with PHP. Code example: ```html

- This is a parameter passed from the controller: a_variable; ?> + This is a parameter passed from the controller: a_variable ?>

``` @@ -247,8 +247,8 @@ Code example: ```html

- - + +

``` diff --git a/docs/fr/developers/03_Backend/05_Extensions.md b/docs/fr/developers/03_Backend/05_Extensions.md index 3a23e0c5a..37a4340af 100644 --- a/docs/fr/developers/03_Backend/05_Extensions.md +++ b/docs/fr/developers/03_Backend/05_Extensions.md @@ -75,7 +75,7 @@ Comme expliqué plus haut, les vues sont du code HTML mixé à du PHP. Exemple d ```html

- Phrase passée en paramètre : a_variable; ?> + Phrase passée en paramètre : a_variable ?>

``` @@ -246,8 +246,8 @@ Pour accéder à ces traductions, `Minz_Translate` va nous aider à l'aide de sa ```html

- - + +

``` diff --git a/phpcs.xml b/phpcs.xml index fba5624a8..9bea1f3ad 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -39,7 +39,9 @@ - + + + -- cgit v1.2.3

+ + + title; ?> + +

- - - title; ?> + + + title ?>

code; ?>

code ?>

category->name(); ?>

category->name() ?>

- extension->getName(); ?> (extension->getVersion(); ?>) — + extension->getName() ?> (extension->getVersion() ?>) — extension->isEnabled() ? _t('admin.extensions.enabled') : _t('admin.extensions.disabled'); ?>

feed->name(); ?>

feed->name() ?>

entry->title(); ?>

entry->title() ?>

title(); ?>

title() ?>

averageHour); ?>

averageHour) ?>

averageDayOfWeek); ?>

averageDayOfWeek) ?>

averageMonth); ?>

averageMonth) ?>