Merge pull request #2599 from FreshRSS/dev1.15.0

FreshRSS 1.15

1 files changed, 18 insertions, 18 deletions

diff --git a/app/views/importExport/index.phtml b/app/views/importExport/index.phtml
index 139e715c5..e5a24dbc4 100644
--- a/app/views/importExport/index.phtml
+++ b/app/views/importExport/index.phtml
@@ -1,14 +1,14 @@
 <?php $this->partial('aside_subscription'); ?>
 
 <div class="post ">
-	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('gen.action.back_to_rss_feeds'); ?></a>
+	<a href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a>
 
-	<form method="post" action="<?php echo _url('importExport', 'import'); ?>" enctype="multipart/form-data">
-		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
-		<legend><?php echo _t('sub.import_export.import'); ?></legend>
+	<form method="post" action="<?= _url('importExport', 'import') ?>" enctype="multipart/form-data">
+		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
+		<legend><?= _t('sub.import_export.import') ?></legend>
 		<div class="form-group">
 			<label class="group-name" for="file">
-				<?php echo extension_loaded('zip') ? _t('sub.import_export.file_to_import') : _t('sub.import_export.file_to_import_no_zip'); ?>
+				<?= extension_loaded('zip') ? _t('sub.import_export.file_to_import') : _t('sub.import_export.file_to_import_no_zip') ?>
 			</label>
 			<div class="group-controls">
 				<input type="file" name="file" id="file" />
@@ -17,30 +17,30 @@
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.import'); ?></button>
+				<button type="submit" class="btn btn-important"><?= _t('gen.action.import') ?></button>
 			</div>
 		</div>
 	</form>
 
 	<?php if (count($this->feeds) > 0) { ?>
-	<form method="post" action="<?php echo _url('importExport', 'export'); ?>">
-		<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
-		<legend><?php echo _t('sub.import_export.export'); ?></legend>
+	<form method="post" action="<?= _url('importExport', 'export') ?>">
+		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
+		<legend><?= _t('sub.import_export.export') ?></legend>
 		<div class="form-group">
 			<div class="group-controls">
 				<label class="checkbox" for="export_opml">
 					<input type="checkbox" name="export_opml" id="export_opml" value="1" checked="checked" />
-					<?php echo _t('sub.import_export.export_opml'); ?>
+					<?= _t('sub.import_export.export_opml') ?>
 				</label>
 
 				<label class="checkbox" for="export_labelled">
-					<input type="checkbox" name="export_labelled" id="export_labelled" value="1" <?php echo extension_loaded('zip') ? 'checked="checked"' : ''; ?> />
-					<?php echo _t('sub.import_export.export_labelled'); ?>
+					<input type="checkbox" name="export_labelled" id="export_labelled" value="1" <?= extension_loaded('zip') ? 'checked="checked"' : '' ?> />
+					<?= _t('sub.import_export.export_labelled') ?>
 				</label>
 
 				<label class="checkbox" for="export_starred">
-					<input type="checkbox" name="export_starred" id="export_starred" value="1" <?php echo extension_loaded('zip') ? 'checked="checked"' : ''; ?> />
-					<?php echo _t('sub.import_export.export_starred'); ?>
+					<input type="checkbox" name="export_starred" id="export_starred" value="1" <?= extension_loaded('zip') ? 'checked="checked"' : '' ?> />
+					<?= _t('sub.import_export.export_starred') ?>
 				</label>
 
 				<?php
@@ -49,10 +49,10 @@
 						$select_args = ' size="' . min(10, count($this->feeds)) .'" multiple="multiple"';
 					}
 				?>
-				<select name="export_feeds[]"<?php echo $select_args; ?> size="10">
-					<?php echo extension_loaded('zip') ? '' : '<option></option>'; ?>
+				<select name="export_feeds[]"<?= $select_args ?> size="10">
+					<?= extension_loaded('zip') ? '' : '<option></option>' ?>
 					<?php foreach ($this->feeds as $feed) { ?>
-					<option value="<?php echo $feed->id(); ?>"><?php echo $feed->name(); ?></option>
+					<option value="<?= $feed->id() ?>"><?= $feed->name() ?></option>
 					<?php } ?>
 				</select>
 			</div>
@@ -60,7 +60,7 @@
 
 		<div class="form-group form-actions">
 			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo _t('gen.action.export'); ?></button>
+				<button type="submit" class="btn btn-important"><?= _t('gen.action.export') ?></button>
 			</div>
 		</div>
 	</form>