Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

php cs for the pre upgrade checker #1

Merged
merged 1 commit into from
Jul 6, 2020
Merged

php cs for the pre upgrade checker #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
190 changes: 98 additions & 92 deletions administrator/components/com_joomlaupdate/views/default/tmpl/default_preupdatecheck.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,30 @@
defined('_JEXEC') or die;

/** @var JoomlaupdateViewDefault $this */

$compatibilityTypes = array(
'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS' => array(
'class' => 'label-default',
'notes' => 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS_NOTES'
),
'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PROBABLY_COMPATIBLE' => array(
'class' => 'label-success',
'notes' => 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PROBABLY_COMPATIBLE_NOTES'
),
'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_REQUIRING_UPGRADES_TO_BE_COMPATIBLE' => array(
'class' => 'label-warning',
'notes' => 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_REQUIRING_UPGRADES_TO_BE_COMPATIBLE_NOTES'
),
'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_UPDATE_SERVER_OFFERS_NO_COMPATIBLE_VERSION' => array(
'class' => 'label-important',
'notes' => 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_UPDATE_SERVER_OFFERS_NO_COMPATIBLE_VERSION_NOTES'
),
'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_JOOMLA_UPDATE_SYSTEM_NOT_SUPPORTED' => array(
'class' => 'label-important',
'notes' => 'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_JOOMLA_UPDATE_SYSTEM_NOT_SUPPORTED_NOTES'
),
);

?>
<h2>
<?php echo JText::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_PREUPDATE_CHECK', $this->updateInfo['latest']); ?>
Expand Down Expand Up @@ -71,21 +95,21 @@
</tr>
</thead>
<tbody>
<?php foreach ($this->phpSettings as $setting) : ?>
<tr>
<td>
<?php echo $setting->label; ?>
</td>
<td>
<?php echo JText::_($setting->recommended ? 'JON' : 'JOFF'); ?>
</td>
<td>
<span class="label label-<?php echo ($setting->state === $setting->recommended) ? 'success' : 'warning'; ?>">
<?php echo JText::_($setting->state ? 'JON' : 'JOFF'); ?>
</span>
</td>
</tr>
<?php endforeach; ?>
<?php foreach ($this->phpSettings as $setting) : ?>
<tr>
<td>
<?php echo $setting->label; ?>
</td>
<td>
<?php echo JText::_($setting->recommended ? 'JON' : 'JOFF'); ?>
</td>
<td>
<span class="label label-<?php echo ($setting->state === $setting->recommended) ? 'success' : 'warning'; ?>">
<?php echo JText::_($setting->state ? 'JON' : 'JOFF'); ?>
</span>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</fieldset>
Expand All @@ -95,85 +119,67 @@
<h3>
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS'); ?>
</h3>
<?php
$compatibilityTypes = array(
"COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS" => array('class' => "label-default", 'notes' => "COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS_NOTES"),
"COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PROBABLY_COMPATIBLE" => array('class' => "label-success", 'notes' => "COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_PROBABLY_COMPATIBLE_NOTES"),
"COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_REQUIRING_UPGRADES_TO_BE_COMPATIBLE" => array('class' => "label-warning", 'notes' => "COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_REQUIRING_UPGRADES_TO_BE_COMPATIBLE_NOTES"),
"COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_UPDATE_SERVER_OFFERS_NO_COMPATIBLE_VERSION" => array('class' => "label-important", 'notes' => "COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_UPDATE_SERVER_OFFERS_NO_COMPATIBLE_VERSION_NOTES"),
"COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_JOOMLA_UPDATE_SYSTEM_NOT_SUPPORTED" => array('class' => "label-important", 'notes' => "COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_JOOMLA_UPDATE_SYSTEM_NOT_SUPPORTED_NOTES"),
);
$compatibilityTypeCount = 0;
foreach ($compatibilityTypes as $compatibilityType => $compatibilityData)
{
$compatibilityDisplayClass = $compatibilityData['class'];
$compatibilityDisplayNotes = $compatibilityData['notes'];
?>
<fieldset id="compatibilitytype<?php echo $compatibilityTypeCount;?>" class="span12 compatibilitytypes">
<legend class="label <?php echo $compatibilityDisplayClass;?>">
<h3><?php echo JText::_($compatibilityType); ?></h3>
</legend>
<div class="compatibilityNotes">
<?php echo JText::_($compatibilityDisplayNotes); ?>
</div>
<table class="table">
<thead class="row-fluid">
<tr>
<th class="span4">
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NAME'); ?>
</th>
<th class="span2">
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_TYPE'); ?>
</th>
<th class="span2">
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_UPGRADE_COMPATIBLE'); ?>
</th>
<th class="span2">
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_CURRENTLY_COMPATIBLE'); ?>
</th>
<th class="span2">
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_INSTALLED_VERSION'); ?>
</th>
</tr>
</thead>
<tbody class="row-fluid">
<?php
// Only include this row once since the javascript moves the results into the right place
if ($compatibilityType == "COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS") :
foreach ($this->nonCoreExtensions as $extension) : ?>
<tr>
<td class="span4">
<?php echo JText::_($extension->name); ?>
</td>
<td class="span2">
<?php echo JText::_('COM_INSTALLER_TYPE_' . strtoupper($extension->type)); ?>
</td>
<td class="extension-check span2"
data-extension-id="<?php echo $extension->extension_id; ?>"
data-extension-current-version="<?php echo $extension->version; ?>">
<img src="../media/system/images/mootree_loader.gif" />
</td>
<td id="available-version-<?php echo $extension->extension_id; ?>" class="span2"/>
<td class="span2">
<?php echo $extension->version; ?>
</td>
</tr>
<?php endforeach; ?>
<?php endif; ?>
</tbody>
</table>
</fieldset>
<?php
$compatibilityTypeCount ++;
}
?>

<fieldset class="options-grid-form options-grid-form-full">
<legend>
<?php echo JText::_('NOTICE'); ?>
<?php $compatibilityTypeCount = 0; ?>
<?php foreach ($compatibilityTypes as $compatibilityType => $compatibilityData) : ?>
<?php $compatibilityDisplayClass = $compatibilityData['class']; ?>
<?php $compatibilityDisplayNotes = $compatibilityData['notes']; ?>
<fieldset id="compatibilitytype<?php echo $compatibilityTypeCount;?>" class="span12 compatibilitytypes">
<legend class="label <?php echo $compatibilityDisplayClass;?>">
<h3><?php echo JText::_($compatibilityType); ?></h3>
</legend>
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_COMPATIBLE_UPGRADE_WARNING'); ?>
<div class="compatibilityNotes">
<?php echo JText::_($compatibilityDisplayNotes); ?>
</div>
<table class="table">
<thead class="row-fluid">
<tr>
<th class="span4">
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_NAME'); ?>
</th>
<th class="span2">
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_TYPE'); ?>
</th>
<th class="span2">
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_UPGRADE_COMPATIBLE'); ?>
</th>
<th class="span2">
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_CURRENTLY_COMPATIBLE'); ?>
</th>
<th class="span2">
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_INSTALLED_VERSION'); ?>
</th>
</tr>
</thead>
<tbody class="row-fluid">
<?php // Only include this row once since the javascript moves the results into the right place ?>
<?php if ($compatibilityType == "COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS") : ?>
<?php foreach ($this->nonCoreExtensions as $extension) : ?>
<tr>
<td class="span4">
<?php echo JText::_($extension->name); ?>
</td>
<td class="span2">
<?php echo JText::_('COM_INSTALLER_TYPE_' . strtoupper($extension->type)); ?>
</td>
<td
class="extension-check span2"
data-extension-id="<?php echo $extension->extension_id; ?>"
data-extension-current-version="<?php echo $extension->version; ?>"
>
<img src="../media/jui/images/ajax-loader.gif" />
</td>
<td id="available-version-<?php echo $extension->extension_id; ?>" class="span2" />
<td class="span2">
<?php echo $extension->version; ?>
</td>
</tr>
<?php endforeach; ?>
<?php endif; ?>
</tbody>
</table>
</fieldset>
<?php $compatibilityTypeCount ++;?>
<?php endforeach; ?>
</div>
<?php else: ?>
<div class="row-fluid">
Expand Down