Skip to content

Commit

Permalink
PHPCS fixes after upmerge (#33479)
Browse files Browse the repository at this point in the history
  • Loading branch information
@richard67
richard67 authored May 1, 2021
1 parent a2a5c8c commit 53ea0df
Show file tree
Hide file tree
Showing 2 changed files with 119 additions and 119 deletions.
10 changes: 5 additions & 5 deletions administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,9 @@
<th class="extype col-md-4">
<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_TYPE'); ?>
</th>
<th class="instver hidden">
<th class="instver hidden">
<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_INSTALLED_VERSION'); ?>
</th>
</th>
<th class="upcomp hidden">
<?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_COMPATIBLE_WITH_JOOMLA_VERSION', isset($this->updateInfo['current']) ? $this->updateInfo['current'] : JVERSION); ?>
</th>
Expand All @@ -229,10 +229,10 @@
<td class="extype col-md-4">
<?php echo Text::_('COM_INSTALLER_TYPE_' . strtoupper($extension->type)); ?>
</td>
<td class="instver hidden">
<td class="instver hidden">
<?php echo $extension->version; ?>
</td>
<td id="available-version-<?php echo $extension->extension_id; ?>" class="currcomp hidden" />
</td>
<td id="available-version-<?php echo $extension->extension_id; ?>" class="currcomp hidden" />
<td
class="extension-check upcomp hidden"
data-extension-id="<?php echo $extension->extension_id; ?>"
Expand Down
228 changes: 114 additions & 114 deletions administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,126 +133,126 @@
</div>
</div>

<div id="preupdateCheckWarning" class="alert ">
<h4 class="alert-heading">
<?php echo Text::_('WARNING'); ?>
</h4>
<div class="alert-message">
<div class="preupdateCheckIncomplete">
<?php echo Text::_('COM_JOOMLAUPDATE_PREUPDATE_CHECK_NOT_COMPLETE'); ?>
</div>
</div>
</div>
<div id="preupdateCheckWarning" class="alert ">
<h4 class="alert-heading">
<?php echo Text::_('WARNING'); ?>
</h4>
<div class="alert-message">
<div class="preupdateCheckIncomplete">
<?php echo Text::_('COM_JOOMLAUPDATE_PREUPDATE_CHECK_NOT_COMPLETE'); ?>
</div>
</div>
</div>

<div id="preupdateCheckCompleteProblems" class="hidden">
<div class="alert ">
<h4 class="alert-heading">
<?php echo Text::_('WARNING'); ?>
</h4>
<div class="alert-message">
<div class="preupdateCheckComplete">
<?php echo Text::_('COM_JOOMLAUPDATE_PREUPDATE_CHECK_COMPLETED_YOU_HAVE_DANGEROUS_PLUGINS'); ?>
</div>
</div>
</div>
</div>
<div id="preupdateCheckCompleteProblems" class="hidden">
<div class="alert ">
<h4 class="alert-heading">
<?php echo Text::_('WARNING'); ?>
</h4>
<div class="alert-message">
<div class="preupdateCheckComplete">
<?php echo Text::_('COM_JOOMLAUPDATE_PREUPDATE_CHECK_COMPLETED_YOU_HAVE_DANGEROUS_PLUGINS'); ?>
</div>
</div>
</div>
</div>

<div id="preupdateconfirmation" >
<label class="preupdateconfirmation_label label label-warning span12">
<h3>
<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_PLUGIN_BEING_CHECKED'); ?>
</h3>
</label>
</div>
<div id="preupdateconfirmation" >
<label class="preupdateconfirmation_label label label-warning span12">
<h3>
<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_PLUGIN_BEING_CHECKED'); ?>
</h3>
</label>
</div>

<div id="preupdatecheckheadings">
<table class="table table-striped">
<thead>
<th>
<?php echo Text::_('COM_INSTALLER_TYPE_PLUGIN'); ?>
</th>
<th>
<?php echo Text::_('COM_INSTALLER_TYPE_PACKAGE'); ?>
</th>
<th>
<?php echo Text::_('COM_INSTALLER_AUTHOR_INFORMATION'); ?>
</th>
<th>
<?php echo Text::_('COM_JOOMLAUPDATE_PREUPDATE_CHECK_EXTENSION_AUTHOR_URL'); ?>
</th>
</thead>
<tbody>
<?php foreach ($this->nonCoreCriticalPlugins as $nonCoreCriticalPlugin) : ?>
<tr id='plg_<?php echo $nonCoreCriticalPlugin->extension_id ?>'>
<td>
<?php echo Text::_($nonCoreCriticalPlugin->name); ?>
</td>
<?php if ($nonCoreCriticalPlugin->package_id > 0) : ?>
<?php foreach ($this->nonCoreExtensions as $nonCoreExtension) : ?>
<?php if ($nonCoreCriticalPlugin->package_id == $nonCoreExtension->extension_id) : ?>
<td>
<?php echo $nonCoreExtension->name; ?>
</td>
<?php endif; ?>
<?php endforeach; ?>
<?php else : ?>
<td/>
<?php endif; ?>
<td>
<?php if (isset($nonCoreCriticalPlugin->manifest_cache->author)) : ?>
<?php echo Text::_($nonCoreCriticalPlugin->manifest_cache->author); ?>
<?php elseif ($nonCoreCriticalPlugin->package_id > 0) : ?>
<?php foreach ($this->nonCoreExtensions as $nonCoreExtension) : ?>
<?php if ($nonCoreCriticalPlugin->package_id == $nonCoreExtension->extension_id) : ?>
<td>
<?php echo $nonCoreExtension->name; ?>
</td>
<?php endif; ?>
<?php endforeach; ?>
<?php endif;?>
</td>
<td>
<?php
$authorURL = "";
if (isset($nonCoreCriticalPlugin->manifest_cache->authorUrl))
{
$authorURL = $nonCoreCriticalPlugin->manifest_cache->authorUrl;
}
elseif ($nonCoreCriticalPlugin->package_id > 0)
{
foreach ($this->nonCoreExtensions as $nonCoreExtension)
{
if ($nonCoreCriticalPlugin->package_id == $nonCoreExtension->extension_id)
{
$authorURL = $nonCoreExtension->manifest_cache->authorUrl;
}
}
}
?>
<?php if (!empty($authorURL)) : ?>
<a href="<?php echo $authorURL; ?>" target="_blank" >
<?php echo $authorURL; ?>
<span class="icon-out-2" aria-hidden="true"></span>
<span class="element-invisible"><?php echo Text::_('JBROWSERTARGET_NEW'); ?></span>
</a>
<?php endif;?>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
<div id="preupdatecheckheadings">
<table class="table table-striped">
<thead>
<th>
<?php echo Text::_('COM_INSTALLER_TYPE_PLUGIN'); ?>
</th>
<th>
<?php echo Text::_('COM_INSTALLER_TYPE_PACKAGE'); ?>
</th>
<th>
<?php echo Text::_('COM_INSTALLER_AUTHOR_INFORMATION'); ?>
</th>
<th>
<?php echo Text::_('COM_JOOMLAUPDATE_PREUPDATE_CHECK_EXTENSION_AUTHOR_URL'); ?>
</th>
</thead>
<tbody>
<?php foreach ($this->nonCoreCriticalPlugins as $nonCoreCriticalPlugin) : ?>
<tr id='plg_<?php echo $nonCoreCriticalPlugin->extension_id ?>'>
<td>
<?php echo Text::_($nonCoreCriticalPlugin->name); ?>
</td>
<?php if ($nonCoreCriticalPlugin->package_id > 0) : ?>
<?php foreach ($this->nonCoreExtensions as $nonCoreExtension) : ?>
<?php if ($nonCoreCriticalPlugin->package_id == $nonCoreExtension->extension_id) : ?>
<td>
<?php echo $nonCoreExtension->name; ?>
</td>
<?php endif; ?>
<?php endforeach; ?>
<?php else : ?>
<td/>
<?php endif; ?>
<td>
<?php if (isset($nonCoreCriticalPlugin->manifest_cache->author)) : ?>
<?php echo Text::_($nonCoreCriticalPlugin->manifest_cache->author); ?>
<?php elseif ($nonCoreCriticalPlugin->package_id > 0) : ?>
<?php foreach ($this->nonCoreExtensions as $nonCoreExtension) : ?>
<?php if ($nonCoreCriticalPlugin->package_id == $nonCoreExtension->extension_id) : ?>
<td>
<?php echo $nonCoreExtension->name; ?>
</td>
<?php endif; ?>
<?php endforeach; ?>
<?php endif;?>
</td>
<td>
<?php
$authorURL = "";
if (isset($nonCoreCriticalPlugin->manifest_cache->authorUrl))
{
$authorURL = $nonCoreCriticalPlugin->manifest_cache->authorUrl;
}
elseif ($nonCoreCriticalPlugin->package_id > 0)
{
foreach ($this->nonCoreExtensions as $nonCoreExtension)
{
if ($nonCoreCriticalPlugin->package_id == $nonCoreExtension->extension_id)
{
$authorURL = $nonCoreExtension->manifest_cache->authorUrl;
}
}
}
?>
<?php if (!empty($authorURL)) : ?>
<a href="<?php echo $authorURL; ?>" target="_blank" >
<?php echo $authorURL; ?>
<span class="icon-out-2" aria-hidden="true"></span>
<span class="element-invisible"><?php echo Text::_('JBROWSERTARGET_NEW'); ?></span>
</a>
<?php endif;?>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>

<table id="preupdatecheckbox" >
<td>
<table id="preupdatecheckbox" >
<td>
<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_PLUGIN_CONFIRMATION'); ?>
</td>
<td>
<input type="checkbox" id="noncoreplugins" name="noncoreplugins" value="1" required aria-required="true" />
</td>
</table>
</td>
<td>
<input type="checkbox" id="noncoreplugins" name="noncoreplugins" value="1" required aria-required="true" />
</td>
</table>

<hr>
<hr>

<div class="control-group">
<div class="controls">
Expand Down

0 comments on commit 53ea0df

Please sign in to comment.