Skip to content

Commit

Permalink
Begin the Ampache5 process
Browse files Browse the repository at this point in the history
  • Loading branch information
lachlan-00 authored and usox committed Feb 27, 2021
1 parent f8c9dab commit ef63154
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -7,6 +7,7 @@

**News:**

* Keep an eye on the incoming changes to develop branch at [Ampache-Next-Changes](https://github.com/ampache/ampache/wiki/Ampache-Next-Changes)
* The Ampache kodi plugin has merged into the official Kodi addons repo!
* Make sure you enable **hide_search** in your config to enable playlists in this initial version.
* Develop changes
Expand Down
7 changes: 6 additions & 1 deletion config/ampache.cfg.php.dist
Expand Up @@ -7,7 +7,7 @@
; if this config file is up to date
; this is compared against a value hard-coded
; into the init script
config_version = 48
config_version = 49

;#########################################################
; Auto Update #
Expand All @@ -24,6 +24,11 @@ config_version = 48
; DEFAULT: composer
;composer_binary_path = "composer"

; We sometimes need to talk and will show a warning to admin users
; Enable this setting if you don't want to see warnings (When we enable them)
; DEFAULT: false
;hide_ampache_messages = "true"

;#########################################################
; Path Vars #
;#########################################################
Expand Down
4 changes: 4 additions & 0 deletions docs/CHANGELOG.md
Expand Up @@ -2,6 +2,8 @@

## Ampache develop

Keep an eye on the incoming changes to develop at [Ampache-Next-Changes](https://github.com/ampache/ampache/wiki/Ampache-Next-Changes)

**IMPORTANT** instead of using date() we are now using IntlDateFormatter and your locale to identify formats.
This means that 'custom_datetime' based on the date() format is incorrect and will look weird.
Look here for the code to change your 'custom_datetime' string [(<http://userguide.icu-project.org/formatparse/datetime>)]
Expand All @@ -24,6 +26,8 @@ This means Ampache now **requires** php-intl module/dll to be enabled.
* get_datetime(): use IntlDateFormatter to format based on locale. [(<https://www.php.net/manual/en/intldateformatter.format.php>)]
* Renamed 'Tag' strings to 'Genre'
* Changed sidebar back to browse for artist/album
* Stop logging auth/passphrase strings
* Add Y scrolling to the current playlist box (rightbar)

### Removed

Expand Down
3 changes: 3 additions & 0 deletions public/templates/header.inc.php
Expand Up @@ -504,6 +504,9 @@ function libitem_action(item, action)
<?php
if (Access::check('interface', 100)) {
echo '<div id=update_notify>';
if (!AmpConfig::get('hide_ampache_messages', false)) {
AutoUpdate::show_ampache_message();
}
if (AmpConfig::get('autoupdate') && AutoUpdate::is_update_available()) {
AutoUpdate::show_new_version();
echo '<br />';
Expand Down
2 changes: 1 addition & 1 deletion src/Config/Init/InitializationHandlerConfig.php
Expand Up @@ -33,7 +33,7 @@
final class InitializationHandlerConfig implements InitializationHandlerInterface
{
private const VERSION = 'develop';
private const CONFIG_VERSION = '48';
private const CONFIG_VERSION = '49';

public const CONFIG_FILE_PATH = __DIR__ . '/../../../config/ampache.cfg.php';

Expand Down
14 changes: 14 additions & 0 deletions src/Module/System/AutoUpdate.php
Expand Up @@ -253,6 +253,20 @@ public static function is_update_available($force = false)
return $available;
}

/**
* Display information from the Ampache Project as a message. (Develop branch only)
*/
public static function show_ampache_message()
{
if (self::is_develop()) {
echo '<div id="autoupdate">';
echo '<span>' . T_("WARNING") . '</span>';
echo ' (Ampache Develop is about to go through a major change!)<br />';
echo '<a href="https://github.com/ampache/ampache/wiki/Ampache-Next-Changes' . '" target="_blank">' . T_('View changes') . '</a><br /> ';
echo '</div>';
}
}

/**
* Display new version information and update link if possible.
*/
Expand Down

0 comments on commit ef63154

Please sign in to comment.