Skip to content

Commit

Permalink
* Removing checksums from the update stream by default to work around…
Browse files Browse the repository at this point in the history
… Joomla 3.9 bugs related to extension updates.
  • Loading branch information
Nicholas K. Dionysopoulos committed Nov 16, 2018
1 parent ac08e9e commit 532878b
Show file tree
Hide file tree
Showing 6 changed files with 90 additions and 44 deletions.
11 changes: 5 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# 4.1.3

**Bug fixes**
# 4.1.2

* [HIGH] Update streams lack a "type" attribute for files hosted externally
* [MEDIUM] Fixed JavaScript error on manual creation of a new Item
**Other changes**

# 4.1.2
* Removing checksums from the update stream by default to work around Joomla 3.9 bugs related to extension updates.

**Bug fixes**

* [HIGH] Automatic item descriptions cannot save multiple Environments
* [HIGH] Update streams lack a "type" attribute for files hosted externally
* [MEDIUM] Fixed JavaScript error on manual creation of a new Item

# 4.1.1

Expand Down
12 changes: 6 additions & 6 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ We are developing, testing and using Akeeba Release System using the latest vers
* PHP 7.2

Akeeba Release System should be compatible with:
* Joomla! 3.4, 3.5, 3.6, 3.7, 3.8
* PHP 5.4, 5.5, 5.6, 7.0, 7.1, 7.2.
* Joomla! 3.4, 3.5, 3.6, 3.7, 3.8, 3.9
* PHP 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3.

## Changelog

**Other changes**

* Joomla! 3.9 backend Components menu item compatibility

* Removing checksums from the update stream by default to work around Joomla 3.9 bugs related to extension updates.

**Bug fixes**

* Automatic Descriptions does not allow selection of multiple environments
* gh-155 Do not display unpublished Items in Latest view
* [HIGH] Automatic item descriptions cannot save multiple Environments
* [HIGH] Update streams lack a "type" attribute for files hosted externally
* [MEDIUM] Fixed JavaScript error on manual creation of a new Item
57 changes: 45 additions & 12 deletions component/backend/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@
label="COM_ARS_CONFIG_UPDATES_DESC_LABEL"
description="COM_ARS_CONFIG_UPDATES_DESC_DESC"
/>

<field name="show_checksums" type="radio" default="0"
label="COM_ARS_CONFIG_UPDATES_SHOW_CHECKSUMS_LABEL"
description="COM_ARS_CONFIG_UPDATES_SHOW_CHECKSUMS_DESC"
class="switcher btn-group"
>
<option value="0">JNo</option>
<option value="1">JYes</option>
</field>
</fieldset>

<fieldset name="frontend" label="COM_ARS_CONFIG_FRONTEND_HEADER_LABEL"
Expand All @@ -27,14 +36,18 @@

<field name="begenchangelog" type="radio" default="1"
label="COM_ARS_CONFIG_BEGENCHANGELOG_LABEL"
description="COM_ARS_CONFIG_BEGENCHANGELOG_DESC">
description="COM_ARS_CONFIG_BEGENCHANGELOG_DESC"
class="switcher btn-group"
>
<option value="0">JNo</option>
<option value="1">JYes</option>
</field>

<field name="becolorisechangelog" type="radio" default="1"
label="COM_ARS_CONFIG_BECOLORISECHANGELOG_LABEL"
description="COM_ARS_CONFIG_BECOLORISECHANGELOG_DESC">
description="COM_ARS_CONFIG_BECOLORISECHANGELOG_DESC"
class="switcher btn-group"
>
<option value="0">JNo</option>
<option value="1">JYes</option>
</field>
Expand All @@ -46,63 +59,81 @@

<field name="show_downloads" type="radio" default="1"
label="COM_ARS_CONFIG_SHOW_DOWNLOADS_LABEL"
description="COM_ARS_CONFIG_SHOW_DOWNLOADS_DESC">
description="COM_ARS_CONFIG_SHOW_DOWNLOADS_DESC"
class="switcher btn-group"
>
<option value="0">JNo</option>
<option value="1">JYes</option>
</field>

<field name="show_filesize" type="radio" default="1"
label="COM_ARS_CONFIG_SHOW_FILESIZE_LABEL"
description="COM_ARS_CONFIG_SHOW_FILESIZE_DESC">
description="COM_ARS_CONFIG_SHOW_FILESIZE_DESC"
class="switcher btn-group"
>
<option value="0">JNo</option>
<option value="1">JYes</option>
</field>

<field name="show_md5" type="radio" default="1"
label="COM_ARS_CONFIG_SHOW_MD5_LABEL"
description="COM_ARS_CONFIG_SHOW_MD5_DESC">
description="COM_ARS_CONFIG_SHOW_MD5_DESC"
class="switcher btn-group"
>
<option value="0">JNo</option>
<option value="1">JYes</option>
</field>

<field name="show_sha1" type="radio" default="1"
label="COM_ARS_CONFIG_SHOW_SHA1_LABEL"
description="COM_ARS_CONFIG_SHOW_SHA1_DESC">
description="COM_ARS_CONFIG_SHOW_SHA1_DESC"
class="switcher btn-group"
>
<option value="0">JNo</option>
<option value="1">JYes</option>
</field>

<field name="show_sha256" type="radio" default="1"
label="COM_ARS_CONFIG_SHOW_SHA256_LABEL"
description="COM_ARS_CONFIG_SHOW_SHA256_DESC">
description="COM_ARS_CONFIG_SHOW_SHA256_DESC"
class="switcher btn-group"
>
<option value="0">JNo</option>
<option value="1">JYes</option>
</field>

<field name="show_sha384" type="radio" default="1"
label="COM_ARS_CONFIG_SHOW_SHA384_LABEL"
description="COM_ARS_CONFIG_SHOW_SHA384_DESC">
description="COM_ARS_CONFIG_SHOW_SHA384_DESC"
class="switcher btn-group"
>
<option value="0">JNo</option>
<option value="1">JYes</option>
</field>

<field name="show_sha512" type="radio" default="1"
label="COM_ARS_CONFIG_SHOW_SHA512_LABEL"
description="COM_ARS_CONFIG_SHOW_SHA512_DESC">
description="COM_ARS_CONFIG_SHOW_SHA512_DESC"
class="switcher btn-group"
>
<option value="0">JNo</option>
<option value="1">JYes</option>
</field>

<field name="show_environments" type="radio" default="1"
label="COM_ARS_CONFIG_SHOW_ENVIRONMENTS_LABEL"
description="COM_ARS_CONFIG_SHOW_ENVIRONMENTS_DESC">
description="COM_ARS_CONFIG_SHOW_ENVIRONMENTS_DESC"
class="switcher btn-group"
>
<option value="0">JNo</option>
<option value="1">JYes</option>
</field>

<field name="show_directlink" type="radio" default="1"
label="COM_ARS_CONFIG_SHOW_DIRECTLINK_LABEL"
description="COM_ARS_CONFIG_SHOW_DIRECTLINK_DESC">
description="COM_ARS_CONFIG_SHOW_DIRECTLINK_DESC"
class="switcher btn-group"
>
<option value="0">JNo</option>
<option value="1">JYes</option>
</field>
Expand Down Expand Up @@ -137,7 +168,9 @@

<field name="banUnauth" type="radio" default="0"
label="COM_ARS_CONFIG_BAN_FAILED_LABEL"
description="COM_ARS_CONFIG_BAN_FAILED_DESC">
description="COM_ARS_CONFIG_BAN_FAILED_DESC"
class="switcher btn-group"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
Expand Down
11 changes: 9 additions & 2 deletions component/frontend/View/Update/Xml.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ class Xml extends Raw

public $published = false;

public $updates_name = '';
public $updates_desc = '';
public $category = 0;
public $envs = [];
public $showChecksums = false;

public function display($tpl = null)
{
$task = $this->getModel()->getState('task', 'all');
Expand Down Expand Up @@ -62,11 +68,12 @@ protected function onBeforeStream()
{
foreach ($rawenvs as $env)
{
$envs[ $env->id ] = $env;
$envs[$env->id] = $env;
}
}

$this->envs = $envs;
$this->envs = $envs;
$this->showChecksums = $this->container->params->get('show_checksums', 0) == 1;
$this->setLayout('stream');
}

Expand Down
38 changes: 21 additions & 17 deletions component/frontend/View/Update/tmpl/stream.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
use Akeeba\ReleaseSystem\Site\Helper\Router;
use Akeeba\ReleaseSystem\Site\Helper\Filter;

$rootURL = rtrim(JURI::base(), '/');
$subpathURL = JURI::base(true);
$rootURL = rtrim(JURI::base(), '/');
$subpathURL = JURI::base(true);
$showChecksums = isset($this->showChecksums) ? $this->showChecksums : false;

if (!empty($subpathURL) && ($subpathURL != '/'))
{
Expand Down Expand Up @@ -205,21 +206,24 @@
<maintainerurl><?php echo JURI::base(); ?></maintainerurl>
<section>Updates</section>
<targetplatform name="<?php echo $platformName ?>" version="<?php echo $platformVersion ?>"/>
<?php if (!empty($item->md5)): ?>
<md5><?php echo $this->escape($item->md5) ?></md5>
<?php endif; ?>
<?php if (!empty($item->sha1)): ?>
<sha1><?php echo $this->escape($item->sha1) ?></sha1>
<?php endif; ?>
<?php if (!empty($item->sha256)): ?>
<sha256><?php echo $this->escape($item->sha256) ?></sha256>
<?php endif; ?>
<?php if (!empty($item->sha384)): ?>
<sha384><?php echo $this->escape($item->sha384) ?></sha384>
<?php endif; ?>
<?php if (!empty($item->sha512)): ?>
<sha512><?php echo $this->escape($item->sha512) ?></sha512>
<?php endif; ?>
<?php if ($showChecksums): ?>
<?php if (!empty($item->md5)): ?>
<md5><?php echo $this->escape($item->md5) ?></md5>
<?php endif; ?>
<?php if (!empty($item->sha1)): ?>
<sha1><?php echo $this->escape($item->sha1) ?></sha1>
<?php endif; ?>
<?php if (!empty($item->sha256)): ?>
<sha256><?php echo $this->escape($item->sha256) ?></sha256>
<?php endif; ?>
<?php if (!empty($item->sha384)): ?>
<sha384><?php echo $this->escape($item->sha384) ?></sha384>
<?php endif; ?>
<?php if (!empty($item->sha512)): ?>
<sha512><?php echo $this->escape($item->sha512) ?></sha512>
<?php endif; ?>
<?php endif; // $showChecksums
?>
<?php if (($platformName == 'joomla') && (version_compare($platformVersion, '2.5', 'lt'))): ?>
<client_id><?php echo (int)$item->client_id ?></client_id>
<?php else: ?>
Expand Down
5 changes: 4 additions & 1 deletion translations/component/backend/en-GB/en-GB.com_ars.ini
Original file line number Diff line number Diff line change
Expand Up @@ -688,4 +688,7 @@ COM_ARS_CONFIG_BACKEND_LOAD_FEF_FRONTEND="Frontend only"
COM_ARS_CONFIG_BACKEND_LOAD_FEF_BACKEND="Backend only"
COM_ARS_CONFIG_BACKEND_LOAD_FEF_BOTH="Both"
COM_ARS_CONFIG_BACKEND_FEF_RESET="Load CSS reset with Akeeba FEF"
COM_ARS_CONFIG_BACKEND_FEF_RESET_DESC="When enabled we will apply CSS properties reset for basic HTML elements inside the FEF container i.e. inside the component's chunk of HTML on the page. This breaks the styling of third party HTML code, such as HTML editors, loaded inside the component. Disable this if your HTML editor looks broken or you want to make template overrides using a different CSS framework, such as Bootstrap. If you don't understand what any of that means just choose 'Both' (the default option)."
COM_ARS_CONFIG_BACKEND_FEF_RESET_DESC="When enabled we will apply CSS properties reset for basic HTML elements inside the FEF container i.e. inside the component's chunk of HTML on the page. This breaks the styling of third party HTML code, such as HTML editors, loaded inside the component. Disable this if your HTML editor looks broken or you want to make template overrides using a different CSS framework, such as Bootstrap. If you don't understand what any of that means just choose 'Both' (the default option)."
COM_ARS_CONFIG_UPDATES_SHOW_CHECKSUMS_LABEL = "Show Checksums"
COM_ARS_CONFIG_UPDATES_SHOW_CHECKSUMS_DESC = "Show MD5, SHA-1, SHA-256, etc checksums in the update stream? Disabled by default because the implementation of checksum checking in Joomla! is buggy – if Joomla! fails to extract the ZIP file it reports checksum violations."

0 comments on commit 532878b

Please sign in to comment.