From 15fd23c374eb32c50733de1906065f552afbfbc4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 14 Feb 2021 09:15:51 +0300
Subject: use shortcut echo syntax for php templates

---
 classes/pref/feeds.php   | 74 ++++++++++++++++++++++++------------------------
 classes/pref/filters.php | 20 ++++++-------
 classes/pref/labels.php  | 12 ++++----
 classes/pref/system.php  | 42 +++++++++++++--------------
 4 files changed, 74 insertions(+), 74 deletions(-)

(limited to 'classes/pref')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 72a8344ad..6b5df0289 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1223,52 +1223,52 @@ class Pref_Feeds extends Handler_Protected {
 			<div region='top' dojoType="fox.Toolbar">
 				<div style='float : right'>
 					<input dojoType="dijit.form.TextBox" id="feed_search" size="20" type="search"
-						value="<?php echo htmlspecialchars($feed_search) ?>">
+						value="<?= htmlspecialchars($feed_search) ?>">
 					<button dojoType="dijit.form.Button" onclick="dijit.byId('feedTree').reload()">
-						<?php echo __('Search') ?></button>
+						<?= __('Search') ?></button>
 				</div>
 
 				<div dojoType="fox.form.DropDownButton">
-					<span><?php echo __('Select') ?></span>
+					<span><?= __('Select') ?></span>
 					<div dojoType="dijit.Menu" style="display: none;">
 						<div onclick="dijit.byId('feedTree').model.setAllChecked(true)"
-							dojoType="dijit.MenuItem"><?php echo __('All') ?></div>
+							dojoType="dijit.MenuItem"><?= __('All') ?></div>
 						<div onclick="dijit.byId('feedTree').model.setAllChecked(false)"
-							dojoType="dijit.MenuItem"><?php echo __('None') ?></div>
+							dojoType="dijit.MenuItem"><?= __('None') ?></div>
 					</div>
 				</div>
 
 				<div dojoType="fox.form.DropDownButton">
-					<span><?php echo __('Feeds') ?></span>
+					<span><?= __('Feeds') ?></span>
 					<div dojoType="dijit.Menu" style="display: none">
 						<div onclick="CommonDialogs.quickAddFeed()"
-							dojoType="dijit.MenuItem"><?php echo __('Subscribe to feed') ?></div>
+							dojoType="dijit.MenuItem"><?= __('Subscribe to feed') ?></div>
 						<div onclick="dijit.byId('feedTree').editSelectedFeed()"
-							dojoType="dijit.MenuItem"><?php echo __('Edit selected feeds') ?></div>
+							dojoType="dijit.MenuItem"><?= __('Edit selected feeds') ?></div>
 						<div onclick="dijit.byId('feedTree').resetFeedOrder()"
-							dojoType="dijit.MenuItem"><?php echo __('Reset sort order') ?></div>
+							dojoType="dijit.MenuItem"><?= __('Reset sort order') ?></div>
 						<div onclick="dijit.byId('feedTree').batchSubscribe()"
-							dojoType="dijit.MenuItem"><?php echo __('Batch subscribe') ?></div>
+							dojoType="dijit.MenuItem"><?= __('Batch subscribe') ?></div>
 						<div dojoType="dijit.MenuItem" onclick="dijit.byId('feedTree').removeSelectedFeeds()">
-							<?php echo __('Unsubscribe') ?></div>
+							<?= __('Unsubscribe') ?></div>
 					</div>
 				</div>
 
 				<?php if (get_pref('ENABLE_FEED_CATS')) { ?>
 					<div dojoType="fox.form.DropDownButton">
-						<span><?php echo __('Categories') ?></span>
+						<span><?= __('Categories') ?></span>
 						<div dojoType="dijit.Menu" style="display: none">
 							<div onclick="dijit.byId('feedTree').createCategory()"
-								dojoType="dijit.MenuItem"><?php echo __('Add category') ?></div>
+								dojoType="dijit.MenuItem"><?= __('Add category') ?></div>
 							<div onclick="dijit.byId('feedTree').resetCatOrder()"
-								dojoType="dijit.MenuItem"><?php echo __('Reset sort order') ?></div>
+								dojoType="dijit.MenuItem"><?= __('Reset sort order') ?></div>
 							<div onclick="dijit.byId('feedTree').removeSelectedCategories()"
-								dojoType="dijit.MenuItem"><?php echo __('Remove selected') ?></div>
+								dojoType="dijit.MenuItem"><?= __('Remove selected') ?></div>
 						</div>
 					</div>
 				<?php } ?>
-				<?php echo $error_button ?>
-				<?php echo $inactive_button ?>
+				<?= $error_button ?>
+				<?= $inactive_button ?>
 			</div>
 			<div style="padding : 0px" dojoType="dijit.layout.ContentPane" region="center">
 				<div dojoType="fox.PrefFeedStore" jsId="feedStore"
@@ -1283,7 +1283,7 @@ class Pref_Feeds extends Handler_Protected {
 				<div dojoType="fox.PrefFeedTree" id="feedTree"
 					dndController="dijit.tree.dndSource"
 					betweenThreshold="5"
-					autoExpand="<?php echo (!empty($feed_search) ? "true" : "false") ?>"
+					autoExpand="<?= (!empty($feed_search) ? "true" : "false") ?>"
 					persist="true"
 					model="feedModel"
 					openOnClick="false">
@@ -1311,19 +1311,19 @@ class Pref_Feeds extends Handler_Protected {
 	private function index_opml() {
 		?>
 
-		<h3><?php echo __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") ?></h3>
+		<h3><?= __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") ?></h3>
 
 		<?php print_notice("Only main settings profile can be migrated using OPML.") ?>
 
 		<form id='opml_import_form' method='post' enctype='multipart/form-data'>
-			<label class='dijitButton'><?php echo __("Choose file...") ?>
+			<label class='dijitButton'><?= __("Choose file...") ?>
 				<input style='display : none' id='opml_file' name='opml_file' type='file'>
 			</label>
 			<input type='hidden' name='op' value='pref-feeds'>
-			<input type='hidden' name='csrf_token' value="<?php echo $_SESSION['csrf_token'] ?>">
+			<input type='hidden' name='csrf_token' value="<?= $_SESSION['csrf_token'] ?>">
 			<input type='hidden' name='method' value='importOpml'>
 			<button dojoType='dijit.form.Button' class='alt-primary' onclick="return Helpers.OPML.import()" type="submit">
-				<?php echo __('Import OPML') ?>
+				<?= __('Import OPML') ?>
 			</button>
 		</form>
 
@@ -1331,26 +1331,26 @@ class Pref_Feeds extends Handler_Protected {
 
 		<form dojoType='dijit.form.Form' id='opmlExportForm' style='display : inline-block'>
 			<button dojoType='dijit.form.Button' onclick='Helpers.OPML.export()'>
-				<?php echo __('Export OPML') ?>
+				<?= __('Export OPML') ?>
 			</button>
 
 			<label class='checkbox'>
 				<?php print_checkbox("include_settings", true, "1", "") ?>
-				<?php echo __("Include settings") ?>
+				<?= __("Include settings") ?>
 			</label>
 		</form>
 
 		<hr/>
 
-		<h2><?php echo __("Published OPML") ?></h2>
+		<h2><?= __("Published OPML") ?></h2>
 
 		<p>
-			<?php echo __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') ?>
-			<?php echo __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") ?>
+			<?= __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') ?>
+			<?= __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") ?>
 		</p>
 
 		<button dojoType='dijit.form.Button' class='alt-primary' onclick="return CommonDialogs.publishedOPML()">
-			<?php echo __('Display published OPML URL') ?>
+			<?= __('Display published OPML URL') ?>
 		</button>
 
 		<?php
@@ -1362,15 +1362,15 @@ class Pref_Feeds extends Handler_Protected {
 			"/public.php?op=rss&id=-2&view-mode=all_articles");
 		?>
 
-		<h3><?php echo __('Published articles can be subscribed by anyone who knows the following URL:') ?></h3>
+		<h3><?= __('Published articles can be subscribed by anyone who knows the following URL:') ?></h3>
 
 		<button dojoType='dijit.form.Button' class='alt-primary'
-			onclick='CommonDialogs.generatedFeed(-2, false, "<?php echo $rss_url ?>", "<?php echo __("Published articles") ?>")'>
-			<?php echo __('Display URL') ?>
+			onclick='CommonDialogs.generatedFeed(-2, false, "<?= $rss_url ?>", "<?= __("Published articles") ?>")'>
+			<?= __('Display URL') ?>
 		</button>
 
 		<button class='alt-danger' dojoType='dijit.form.Button' onclick='return Helpers.Feeds.clearFeedAccessKeys()'>
-			<?php echo __('Clear all generated URLs') ?>
+			<?= __('Clear all generated URLs') ?>
 		</button>
 
 		<?php
@@ -1382,17 +1382,17 @@ class Pref_Feeds extends Handler_Protected {
 
 		<div dojoType='dijit.layout.TabContainer' tabPosition='left-h'>
 			<div style='padding : 0px' dojoType='dijit.layout.ContentPane'
-				title="<i class='material-icons'>rss_feed</i> <?php echo __('My feeds') ?>">
+				title="<i class='material-icons'>rss_feed</i> <?= __('My feeds') ?>">
 				<?php $this->index_feeds() ?>
 			</div>
 
 			<div dojoType='dijit.layout.ContentPane'
-						title="<i class='material-icons'>import_export</i> <?php echo __('OPML') ?>">
+						title="<i class='material-icons'>import_export</i> <?= __('OPML') ?>">
 						<?php $this->index_opml() ?>
 					</div>
 
 			<div dojoType="dijit.layout.ContentPane"
-				title="<i class='material-icons'>share</i> <?php echo __('Sharing') ?>">
+				title="<i class='material-icons'>share</i> <?= __('Sharing') ?>">
 				<?php $this->index_shared() ?>
 			</div>
 
@@ -1405,10 +1405,10 @@ class Pref_Feeds extends Handler_Protected {
 
 			<?php if ($plugin_data) { ?>
 				<div dojoType='dijit.layout.ContentPane'
-					title="<i class='material-icons'>extension</i> <?php echo __('Plugins') ?>">
+					title="<i class='material-icons'>extension</i> <?= __('Plugins') ?>">
 
 					<div dojoType='dijit.layout.AccordionContainer' region='center'>
-						<?php echo $plugin_data ?>
+						<?= $plugin_data ?>
 					</div>
 				</div>
 			<?php } ?>
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 571ddce4a..c898a8b67 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -717,31 +717,31 @@ class Pref_Filters extends Handler_Protected {
 
 					<div style='float : right; padding-right : 4px;'>
 						<input dojoType="dijit.form.TextBox" id="filter_search" size="20" type="search"
-							value="<?php echo htmlspecialchars($filter_search) ?>">
+							value="<?= htmlspecialchars($filter_search) ?>">
 						<button dojoType="dijit.form.Button" onclick="dijit.byId('filterTree').reload()">
-							<?php echo __('Search') ?></button>
+							<?= __('Search') ?></button>
 					</div>
 
 					<div dojoType="fox.form.DropDownButton">
-						<span><?php echo __('Select') ?></span>
+						<span><?= __('Select') ?></span>
 						<div dojoType="dijit.Menu" style="display: none;">
 							<div onclick="dijit.byId('filterTree').model.setAllChecked(true)"
-								dojoType="dijit.MenuItem"><?php echo __('All') ?></div>
+								dojoType="dijit.MenuItem"><?= __('All') ?></div>
 							<div onclick="dijit.byId('filterTree').model.setAllChecked(false)"
-								dojoType="dijit.MenuItem"><?php echo __('None') ?></div>
+								dojoType="dijit.MenuItem"><?= __('None') ?></div>
 						</div>
 					</div>
 
 					<button dojoType="dijit.form.Button" onclick="return Filters.edit()">
-						<?php echo __('Create filter') ?></button>
+						<?= __('Create filter') ?></button>
 					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').joinSelectedFilters()">
-						<?php echo __('Combine') ?></button>
+						<?= __('Combine') ?></button>
 					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').editSelectedFilter()">
-						<?php echo __('Edit') ?></button>
+						<?= __('Edit') ?></button>
 					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').resetFilterOrder()">
-						<?php echo __('Reset sort order') ?></button>
+						<?= __('Reset sort order') ?></button>
 					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').removeSelectedFilters()">
-						<?php echo __('Remove') ?></button>
+						<?= __('Remove') ?></button>
 
 				</div>
 			</div>
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index 22a2dddea..d182a0995 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -195,23 +195,23 @@ class Pref_Labels extends Handler_Protected {
 			<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>
 				<div dojoType='fox.Toolbar'>
 					<div dojoType='fox.form.DropDownButton'>
-						<span><?php echo __('Select') ?></span>
+						<span><?= __('Select') ?></span>
 						<div dojoType='dijit.Menu' style='display: none'>
 						<div onclick="dijit.byId('labelTree').model.setAllChecked(true)"
-							dojoType='dijit.MenuItem'><?php echo('All') ?></div>
+							dojoType='dijit.MenuItem'><?=('All') ?></div>
 						<div onclick="dijit.byId('labelTree').model.setAllChecked(false)"
-							dojoType='dijit.MenuItem'><?php echo('None') ?></div>
+							dojoType='dijit.MenuItem'><?=('None') ?></div>
 					</div>
 				</div>
 
 				<button dojoType='dijit.form.Button' onclick='CommonDialogs.addLabel()'>
-					<?php echo('Create label') ?></button dojoType='dijit.form.Button'>
+					<?=('Create label') ?></button dojoType='dijit.form.Button'>
 
 				<button dojoType='dijit.form.Button' onclick="dijit.byId('labelTree').removeSelected()">
-					<?php echo('Remove') ?></button dojoType='dijit.form.Button'>
+					<?=('Remove') ?></button dojoType='dijit.form.Button'>
 
 				<button dojoType='dijit.form.Button' onclick="dijit.byId('labelTree').resetColors()">
-					<?php echo('Clear colors') ?></button dojoType='dijit.form.Button'>
+					<?=('Clear colors') ?></button dojoType='dijit.form.Button'>
 
 				</div>
 			</div>
diff --git a/classes/pref/system.php b/classes/pref/system.php
index 72e15e4f3..1adddf116 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -76,30 +76,30 @@ class Pref_System extends Handler_Protected {
 			<div region='top' dojoType='fox.Toolbar'>
 
 				<button dojoType='dijit.form.Button' onclick='Helpers.EventLog.refresh()'>
-					<?php echo __('Refresh') ?>
+					<?= __('Refresh') ?>
 				</button>
 
-				<button dojoType='dijit.form.Button' <?php echo ($page <= 0 ? "disabled" : "") ?>
+				<button dojoType='dijit.form.Button' <?= ($page <= 0 ? "disabled" : "") ?>
 					onclick='Helpers.EventLog.prevPage()'>
-					<?php echo __('&lt;&lt;') ?>
+					<?= __('&lt;&lt;') ?>
 				</button>
 
 				<button dojoType='dijit.form.Button' disabled>
-					<?php echo T_sprintf('Page %d of %d', $page+1, $total_pages+1) ?>
+					<?= T_sprintf('Page %d of %d', $page+1, $total_pages+1) ?>
 				</button>
 
-				<button dojoType='dijit.form.Button' <?php echo ($page >= $total_pages ? "disabled" : "") ?>
+				<button dojoType='dijit.form.Button' <?= ($page >= $total_pages ? "disabled" : "") ?>
 					onclick='Helpers.EventLog.nextPage()'>
-					<?php echo __('&gt;&gt;') ?>
+					<?= __('&gt;&gt;') ?>
 				</button>
 
 				<button dojoType='dijit.form.Button'
 					onclick='Helpers.EventLog.clear()'>
-					<?php echo __('Clear') ?>
+					<?= __('Clear') ?>
 				</button>
 
 				<div class='pull-right'>
-					<?php echo __("Severity:") ?>
+					<?= __("Severity:") ?>
 
 					<?php print_select_hash("severity", $severity,
 						[
@@ -115,11 +115,11 @@ class Pref_System extends Handler_Protected {
 				<table width='100%' class='event-log'>
 
 					<tr class='title'>
-						<td width='5%'><?php echo __("Error") ?></td>
-						<td><?php echo __("Filename") ?></td>
-						<td><?php echo __("Message") ?></td>
-						<td width='5%'><?php echo __("User") ?></td>
-						<td width='5%'><?php echo __("Date") ?></td>
+						<td width='5%'><?= __("Error") ?></td>
+						<td><?= __("Filename") ?></td>
+						<td><?= __("Message") ?></td>
+						<td width='5%'><?= __("User") ?></td>
+						<td width='5%'><?= __("Date") ?></td>
 					</tr>
 
 					<?php
@@ -140,13 +140,13 @@ class Pref_System extends Handler_Protected {
 						?>
 						<tr>
 							<td class='errno'>
-								<?php echo Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")" ?>
+								<?= Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")" ?>
 							</td>
-							<td class='filename'><?php echo  $line["filename"] . ":" . $line["lineno"] ?></td>
-							<td class='errstr'><?php echo  $line["errstr"] . "\n" .  $line["context"] ?></td>
-							<td class='login'><?php echo  $line["login"] ?></td>
+							<td class='filename'><?= $line["filename"] . ":" . $line["lineno"] ?></td>
+							<td class='errstr'><?= $line["errstr"] . "\n" .  $line["context"] ?></td>
+							<td class='login'><?= $line["login"] ?></td>
 							<td class='timestamp'>
-								<?php echo TimeHelper::make_local_datetime($line["created_at"], false) ?>
+								<?= TimeHelper::make_local_datetime($line["created_at"], false) ?>
 							</td>
 						</tr>
 					<?php } ?>
@@ -162,7 +162,7 @@ class Pref_System extends Handler_Protected {
 		$page = (int) ($_REQUEST["page"] ?? 0);
 		?>
 		<div dojoType='dijit.layout.AccordionContainer' region='center'>
-			<div dojoType='dijit.layout.AccordionPane' style='padding : 0' title='<i class="material-icons">report</i> <?php echo __('Event Log') ?>'>
+			<div dojoType='dijit.layout.AccordionPane' style='padding : 0' title='<i class="material-icons">report</i> <?= __('Event Log') ?>'>
 				<?php
 					if (LOG_DESTINATION == "sql") {
 						$this->log_viewer($page, $severity);
@@ -172,11 +172,11 @@ class Pref_System extends Handler_Protected {
 				?>
 			</div>
 
-			<div dojoType='dijit.layout.AccordionPane' title='<i class="material-icons">info</i> <?php echo __('PHP Information') ?>'>
+			<div dojoType='dijit.layout.AccordionPane' title='<i class="material-icons">info</i> <?= __('PHP Information') ?>'>
 				<script type='dojo/method' event='onSelected' args='evt'>
 					Helpers.System.getPHPInfo(this);
 				</script>
-				<div class='phpinfo'><?php echo __("Loading, please wait...") ?></div>
+				<div class='phpinfo'><?= __("Loading, please wait...") ?></div>
 			</div>
 
 			<?php PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, "prefSystem") ?>
-- 
cgit v1.2.3-54-g00ecf