Merge branch 'develop'

.github/CONTRIBUTING.md

@@ -1,6 +1,8 @@
-## Contribution
+# Contribution
+
 Please read [Development section](https://github.com/ampache/ampache/wiki#development).
 
 ## Bug report
+
 Be sure the bug is not already fixed in `develop` branch or already reported in current open issues.
 Please add [some logs](https://github.com/ampache/ampache/wiki/Troubleshooting#enable-logging) with your new issue.

.github/ISSUE_TEMPLATE.md

@@ -1,35 +1,55 @@
+# Issue Template
+
 <!--
-1. Delete any not relevant section in this template.
-2. Before posting any issue, please try to reproduce with latest `develop` branch. Development is quite active and your issue may already have a fix pending for next version. No issue will be considered before confirmation on the `develop` branch.
-3. Don't worry for text between `<!--` and `--\>`, it will be automatically removed from the output.
+1. Delete any section that is not relevant in this template.
+2. Before posting an issue, please try to reproduce with the latest `develop` branch. There is a good chance a fix is already pending for the next version. No issue will be considered before confirmation on the `develop` branch.
+3. Any text between `<!--` and `--\>` will be removed automatically.
 -->
 
-# Environment
+## Description
+
+**Describe the bug**
+<!-- Explain in detail what is happening. -->
+
+**To reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+<!-- What you believe should have happened -->
+
+**Screenshots**
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+## Environment
+
+* Ampache version:
+* Web server + version:
+* Server operating system:
+* Client operating system:
 
- * Ampache version:
- * Web server + version:
- * Server operating system:
- * Client operating system:
+<!-- Keep only the affected clients in the list below. Add the client application name and version to the right of the client type used. -->
 
-<!-- Keep only the affected clients in the list below. Add client application name and version on the right of the client type you use. -->
+**Client type:**
 
- * Client type:
- - Web
- - Ampache
- - SubSonic
- - Plex
- - DAAP
- - UPnP
- - WebDAV
+* Web
+* Ampache
+* SubSonic
+* DAAP
+* UPnP
+* WebDAV
 
-# Settings
+## Settings
 
-<!-- Put here a description of your settings or attach ampache.cfg.php after removing sensitive information (server host, database connection...) -->
+<!-- Either put a description of your settings, or paste the contents of `conf/ampache.cfg.php` after removing sensitive information (server host, database connection, etc.). If posting full config file, make sure to put triple back-ticks ``` at the top and bottom to make it into a code block.
 
-# Description
+It may also make sense to post PHP settings depending on the situation. -->
 
-<!-- Put here the bug/feature description and how to reproduce/integrate it. -->
+## Logs
 
-# Logs
+<!-- To enable logging, visit https://github.com/ampache/ampache/wiki/Troubleshooting#enable-logging
 
-<!-- [Ampache logs](https://github.com/ampache/ampache/wiki/Troubleshooting#enable-logging) and web server access/error logs in attached files. Please also add client application logs if appropriate. -->
+Please post relevant Ampache logs, and web server access/error logs, making sure to surround in triple back-ticks ``` to make into a code block. If you have large logs, it may make sense to trim them to a shorter time-frame if you know exactly when the error occurred. If appropriate, post any client error logs as well -->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,64 @@
+---
+name: Bug report
+about: Help Ampache improve by submitting an issue.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+1. Delete any section that is not relevant in this template.
+2. Before posting an issue, please try to reproduce with the latest `develop` branch. There is a good chance a fix is already pending for the next version. No issue will be considered before confirmation on the `develop` branch.
+3. Any text between `<!--` and `--\>` will be removed automatically.
+-->
+
+## Description
+
+### Describe the bug
+<!-- Explain in detail what is happening. -->
+
+### To reproduce
+
+Steps to reproduce the behavior:
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+### Expected behavior
+<!-- What you believe should have happened -->
+
+### Screenshots
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+## Environment
+
+* Ampache version:
+* Web server + version:
+* Server operating system:
+* Client operating system:
+
+<!-- Keep only the affected clients in the list below. Add the client application name and version to the right of the client type used. -->
+
+### Client type
+
+* Web
+* Ampache
+* SubSonic
+* DAAP
+* UPnP
+* WebDAV
+
+## Settings
+
+<!-- Either put a description of your settings, or paste the contents of `conf/ampache.cfg.php` after removing sensitive information (server host, database connection, etc.). If posting full config file, make sure to put triple back-ticks ``` at the top and bottom to make it into a code block.
+
+It may also make sense to post PHP settings depending on the situation. -->
+
+## Logs
+
+<!-- To enable logging, visit https://github.com/ampache/ampache/wiki/Troubleshooting#enable-logging
+
+Please post relevant Ampache logs, and web server access/error logs, making sure to surround in triple back-ticks ``` to make into a code block. If you have large logs, it may make sense to trim them to a shorter time-frame if you know exactly when the error occurred. If appropriate, post any client error logs as well -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,18 @@
+---
+name: Feature request
+about: Suggest a new feature for Ampache
+title: "[Feature Request]"
+labels: ''
+assignees: ''
+
+---
+
+<!-- Before submitting a feature request, make sure to search to see if it's already been suggested.
+
+Please be as descriptive as you can be about your feature. No request is too big or too small and if it make sense, there is a good chance it will be approved and make it into Ampache. However, there is no guarantee on the time-frame.
+
+The quickest way for a feature to make it into Ampache, is for you to submit a pull request yourself! -->
+
+## Describe what you don't like about Ampache, or what it is missing
+
+## Describe how you would like the feature to work**

.gitignore

@@ -18,7 +18,6 @@
 /lib/vendor/
 /lib/components/
 web.config
-/config/motd.php
 /config/registration_agreement.php
 /.maintenance
 /modules/plugins/ampache-*
@@ -30,20 +29,20 @@ cs_fixer_tmp_*
 .env
 .project
 .settings/
-<<<<<<< HEAD
+
 components/
 node_modules/
 vendor/
-<<<<<<< HEAD
-
-=======
->>>>>>> 52c2c20... Cleaned up user-agent and header messages.
-=======
+.vscode/
 bootstrap/
 components/
 node_modules/
 public/
 resources/
 storage/
 vendor/
->>>>>>> develop
+core/
+develop/
+master/
+*.swp
+*.save

.maintenance.example

@@ -7,16 +7,15 @@
 header("Access-Control-Allow-Origin: *");
 header("Access-Control-Allow-Methods: GET, POST");
 
-$domain = $_SERVER['HTTP_HOST'];
+$domain = Core::get_server('HTTP_HOST');
 if (empty($domain)) {
  $domain = $_SERVER['SERVER_NAME'];
 }
 $scheme = "http";
-if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+if (filter_has_var(INPUT_SERVER, 'HTTPS') && Core::get_server('HTTPS') == 'on') {
  $scheme = "https";
 }
 $fromurl = rawurlencode($scheme . ":https://" . $domain . $_SERVER[REQUEST_URI]);
 
 header("Location: http:https://ampache.org/maintenance/?from=" . $fromurl);
-exit;
-?>
+exit; ?>

.php_cs

@@ -1,11 +1,14 @@
 <?php
 
 $finder = PhpCsFixer\Finder::create()
+ ->exclude('master')
+ ->exclude('develop')
+ ->exclude('core')
  ->exclude('lib/components')
  ->exclude('lib/vendor')
  ->exclude('modules')
- ->exclude('modules/captcha')
- ->exclude('modules/oauth')
+ ->exclude('modules/captcha')
+ ->exclude('modules/oauth')
  ->exclude('nbproject')
  ->notPath('src/Symfony/Component/Translation/Tests/fixtures/resources.php')
  ->in(__DIR__)
@@ -18,20 +21,20 @@ return PhpCsFixer\Config::create()
  ->setRules([
  '@PSR2' => true,
  'strict_param' => false,
- 'no_trailing_whitespace' => true,
- 'blank_line_before_return' => true,
- 'full_opening_tag' => true,
- 'braces' => ['allow_single_line_closure' => true],
- 'single_blank_line_at_eof' => true,
- 'visibility_required' => true,
- 'binary_operator_spaces' => ['align_equals' => true],
- 'concat_space' => ['spacing' => 'one'],
- 'elseif' => true,
- 'blank_line_after_namespace' => true,
- 'lowercase_constants' => true,
- 'encoding' => true,
- 'no_break_comment' => false,
- 'method_argument_space' => false,
+ 'no_trailing_whitespace' => true,
+ 'blank_line_before_return' => true,
+ 'full_opening_tag' => true,
+ 'braces' => ['allow_single_line_closure' => true],
+ 'single_blank_line_at_eof' => true,
+ 'visibility_required' => true,
+ 'binary_operator_spaces' => ['align_equals' => true],
+ 'concat_space' => ['spacing' => 'one'],
+ 'elseif' => true,
+ 'blank_line_after_namespace' => true,
+ 'lowercase_constants' => true,
+ 'encoding' => true,
+ 'no_break_comment' => false,
+ 'method_argument_space' => false,
  ])
  ->setIndent(" ")
  ->setUsingCache(false)

.scrutinizer.yml

@@ -4,7 +4,7 @@ filter:
  - 'lib/vendor/*'
  - 'modules/*'
  paths: { }
- 
+
 tools:
  php_mess_detector:
  enabled: true

.tgitconfig

@@ -1,6 +1,6 @@
 [bugtraq]
- url = "https://github.com/ampache/ampache/issues/#BUGID#"
- label = GitHub Issue Number
- warnifnoissue = false
- number = true
- logregex = "#\\d+\n\\d+"
+ url = "https://github.com/ampache/ampache/issues/#BUGID#"
+ label = GitHub Issue Number
+ warnifnoissue = false
+ number = true
+ logregex = "#\\d+\n\\d+"

.travis.yml

@@ -1,12 +1,12 @@
 language: php
 sudo: false
 php:
- - 5.6
+ - 7.1
  - 7.3
 
 before_install:
  - export PATH="$PATH:$HOME/.composer/vendor/bin"
- - composer global require friendsofphp/php-cs-fixer:~2.12.0
+ - composer global require friendsofphp/php-cs-fixer:~2.15.0
  - 
 before_script:
  - chmod +x scripts/tests/syntax.sh